- DEFAULT_TEST_TARGET=prove
- GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
- GIT_TEST_OPTS="--verbose-log"
- - GIT_TEST_HTTPD=true
- GIT_TEST_CLONE_2GB=YesPlease
# t9810 occasionally fails on Travis CI OS X
# t9816 occasionally fails with "TAP out of sequence errors" on Travis CI OS X
- >
case "${TRAVIS_OS_NAME:-linux}" in
linux)
+ export GIT_TEST_HTTPD=YesPlease
+
mkdir --parents custom/p4
pushd custom/p4
wget --quiet http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION/bin.linux26x86_64/p4d
--- /dev/null
+Git v2.10.3 Release Notes
+=========================
+
+Fixes since v2.10.2
+-------------------
+
+ * Extract a small helper out of the function that reads the authors
+ script file "git am" internally uses.
+ This by itself is not useful until a second caller appears in the
+ future for "rebase -i" helper.
+
+ * The command-line completion script (in contrib/) learned to
+ complete "git cmd ^mas<HT>" to complete the negative end of
+ reference to "git cmd ^master".
+
+ * "git send-email" attempts to pick up valid e-mails from the
+ trailers, but people in real world write non-addresses there, like
+ "Cc: Stable <add@re.ss> # 4.8+", which broke the output depending
+ on the availability and vintage of Mail::Address perl module.
+
+ * The code that we have used for the past 10+ years to cycle
+ 4-element ring buffers turns out to be not quite portable in
+ theoretical world.
+
+ * "git daemon" used fixed-length buffers to turn URL to the
+ repository the client asked for into the server side directory
+ path, using snprintf() to avoid overflowing these buffers, but
+ allowed possibly truncated paths to the directory. This has been
+ tightened to reject such a request that causes overlong path to be
+ required to serve.
+
+ * Recent update to git-sh-setup (a library of shell functions that
+ are used by our in-tree scripted Porcelain commands) included
+ another shell library git-sh-i18n without specifying where it is,
+ relying on the $PATH. This has been fixed to be more explicit by
+ prefixing $(git --exec-path) output in front.
+
+ * Fix for a racy false-positive test failure.
+
+ * Portability update and workaround for builds on recent Mac OS X.
+
+ * Update to the test framework made in 2.9 timeframe broke running
+ the tests under valgrind, which has been fixed.
+
+ * Improve the rule to convert "unsigned char [20]" into "struct
+ object_id *" in contrib/coccinelle/
+
+Also contains minor documentation updates and code clean-ups.
* Even though "git hash-objects", which is a tool to take an
on-filesystem data stream and put it into the Git object store,
- allowed to perform the "outside-world-to-Git" conversions (e.g.
+ can perform "outside-world-to-Git" conversions (e.g.
end-of-line conversions and application of the clean-filter), and
- it had the feature on by default from very early days, its reverse
+ it has had this feature on by default from very early days, its reverse
operation "git cat-file", which takes an object from the Git object
- store and externalize for the consumption by the outside world,
+ store and externalizes it for consumption by the outside world,
lacked an equivalent mechanism to run the "Git-to-outside-world"
conversion. The command learned the "--filters" option to do so.
- * Output from "git diff" can be made easier to read by selecting
+ * Output from "git diff" can be made easier to read by intelligently selecting
which lines are common and which lines are added/deleted
- intelligently when the lines before and after the changed section
- are the same. A command line option is added to help with the
- experiment to find a good heuristics.
+ when the lines before and after the changed section
+ are the same. A command line option (--indent-heuristic) and a
+ configuration variable (diff.indentHeuristic) are added to help with the
+ experiment to find good heuristics.
* In some projects, it is common to use "[RFC PATCH]" as the subject
prefix for a patch meant for discussion rather than application. A
- new option "--rfc" is a short-hand for "--subject-prefix=RFC PATCH"
+ new format-patch option "--rfc" is a short-hand for "--subject-prefix=RFC PATCH"
to help the participants of such projects.
- * "git add --chmod=+x <pathspec>" added recently only toggled the
+ * "git add --chmod={+,-}x <pathspec>" only changed the
executable bit for paths that are either new or modified. This has
- been corrected to flip the executable bit for all paths that match
+ been corrected to change the executable bit for all paths that match
the given pathspec.
* When "git format-patch --stdout" output is placed as an in-body
- header and it uses the RFC2822 header folding, "git am" failed to
+ header and it uses RFC2822 header folding, "git am" fails to
put the header line back into a single logical line. The
underlying "git mailinfo" was taught to handle this properly.
* "gitweb" can spawn "highlight" to show blob contents with
(programming) language-specific syntax highlighting, but only
when the language is known. "highlight" can however be told
- to make the guess itself by giving it "--force" option, which
+ to guess the language itself by giving it "--force" option, which
has been enabled.
* "git gui" l10n to Portuguese.
history leading to nth parent was looking the other way.
* In recent versions of cURL, GSSAPI credential delegation is
- disabled by default due to CVE-2011-2192; introduce a configuration
- to selectively allow enabling this.
+ disabled by default due to CVE-2011-2192; introduce a http.delegation
+ configuration variable to selectively allow enabling this.
(merge 26a7b23429 ps/http-gssapi-cred-delegation later to maint).
* "git mergetool" learned to honor "-O<orderfile>" to control the
order of paths to present to the end user.
* "git diff/log --ws-error-highlight=<kind>" lacked the corresponding
- configuration variable to set it by default.
+ configuration variable (diff.wsErrorHighlight) to set it by default.
- * "git ls-files" learned "--recurse-submodules" option that can be
- used to get a listing of tracked files across submodules (i.e. this
- only works with "--cached" option, not for listing untracked or
+ * "git ls-files" learned the "--recurse-submodules" option
+ to get a listing of tracked files across submodules (i.e. this
+ only works with the "--cached" option, not for listing untracked or
ignored files). This would be a useful tool to sit on the upstream
side of a pipe that is read with xargs to work on all working tree
files from the top-level superproject.
implementations of XDG Secret Service API has been added to
contrib/credential/.
- * The GPG verification status shown in "%G?" pretty format specifier
+ * The GPG verification status shown by the "%G?" pretty format specifier
was not rich enough to differentiate a signature made by an expired
key, a signature made by a revoked key, etc. New output letters
have been assigned to express them.
learned to turn "git describe" output (e.g. v2.9.3-599-g2376d31787)
into clickable links in its output.
- * When new paths were added by "git add -N" to the index, it was
- enough to circumvent the check by "git commit" to refrain from
- making an empty commit without "--allow-empty". The same logic
- prevented "git status" to show such a path as "new file" in the
+ * "git commit" created an empty commit when invoked with an index
+ consisting solely of intend-to-add paths (added with "git add -N").
+ It now requires the "--allow-empty" option to create such a commit.
+ The same logic prevented "git status" from showing such paths as "new files" in the
"Changes not staged for commit" section.
- * The smudge/clean filter API expect an external process is spawned
- to filter the contents for each path that has a filter defined. A
+ * The smudge/clean filter API spawns an external process
+ to filter the contents of each path that has a filter defined. A
new type of "process" filter API has been added to allow the first
request to run the filter for a path to spawn a single process, and
- all filtering need is served by this single process for multiple
+ all filtering is served by this single process for multiple
paths, reducing the process creation overhead.
* The user always has to say "stash@{$N}" when naming a single
script file "git am" internally uses.
(merge a77598e jc/am-read-author-file later to maint).
- * Lifts calls to exit(2) and die() higher in the callchain in
+ * Lift calls to exit(2) and die() higher in the callchain in
sequencer.c files so that more helper functions in it can be used
by callers that want to handle error conditions themselves.
does not advertise any refs, but "git fetch" was not prepared to
see such an advertisement. When the other side disconnects without
giving any ref advertisement, we used to say "there may not be a
- repository at that URL", but we may have seen other advertisement
+ repository at that URL", but we may have seen other advertisements
like "shallow" and ".have" in which case we definitely know that a
repository is there. The code to detect this case has also been
updated.
* Some codepaths in "git pack-objects" were not ready to use an
- existing pack bitmap; now they are and as the result they have
+ existing pack bitmap; now they are and as a result they have
become faster.
* The codepath in "git fsck" to detect malformed tree objects has
packfile first.
(merge c9af708b1a jk/pack-objects-optim-mru later to maint).
- * Codepaths involved in interacting alternate object store have
+ * Codepaths involved in interacting alternate object stores have
been cleaned up.
* In order for the receiving end of "git push" to inspect the
from the sending end need to be made available to the hook and
the mechanism for the connectivity check, and this was done
traditionally by storing the objects in the receiving repository
- and letting "git gc" to expire it. Instead, store the newly
+ and letting "git gc" expire them. Instead, store the newly
received objects in a temporary area, and make them available by
reusing the alternate object store mechanism to them only while we
decide if we accept the check, and once we decide, either migrate
replaced with a priority queue.
* "git diff --no-index" codepath has been updated not to try to peek
- into .git/ directory that happens to be under the current
+ into a .git/ directory that happens to be under the current
directory, when we know we are operating outside any repository.
* Update of the sequencer codebase to make it reusable to reimplement
holding onto them. Use O_CLOEXEC flag to open files in various
codepaths.
- * Update "interpret-trailers" machinery and teaches it that people in
- real world write all sorts of crufts in the "trailer" that was
+ * Update "interpret-trailers" machinery and teach it that people in
+ the real world write all sorts of cruft in the "trailer" that was
originally designed to have the neat-o "Mail-Header: like thing"
and nothing else.
has been removed.
* Having a submodule whose ".git" repository is somehow corrupt
- caused a few commands that recurse into submodules loop forever.
+ caused a few commands that recurse into submodules to loop forever.
* "git symbolic-ref -d HEAD" happily removes the symbolic ref, but
the resulting repository becomes an invalid one. Teach the command
forgot to update "git gui" to look at the configuration to match
this change.
- * "git add --chmod=+x" added recently lacked documentation, which has
+ * "git add --chmod={+,-}x" added recently lacked documentation, which has
been corrected.
* "git log --cherry-pick" used to include merge commits as candidates
to be matched up with other commits, resulting a lot of wasted time.
- The patch-id generation logic has been updated to ignore merges to
+ The patch-id generation logic has been updated to ignore merges and
avoid the wastage.
* The http transport (with curl-multi option, which is the default
line of the next one. This process may have to merge two adjacent
hunks, but the code forgot to do so in some cases.
- * Performance tests done via "t/perf" did not use the same set of
+ * Performance tests done via "t/perf" did not use the right
build configuration if the user relied on autoconf generated
configuration.
* "git format-patch --base=..." feature that was recently added
- showed the base commit information after "-- " e-mail signature
+ showed the base commit information after the "-- " e-mail signature
line, which turned out to be inconvenient. The base information
has been moved above the signature line.
* More i18n.
* Even when "git pull --rebase=preserve" (and the underlying "git
- rebase --preserve") can complete without creating any new commit
- (i.e. fast-forwards), it still insisted on having a usable ident
+ rebase --preserve") can complete without creating any new commits
+ (i.e. fast-forwards), it still insisted on having usable ident
information (read: user.email is set correctly), which was less
than nice. As the underlying commands used inside "git rebase"
would fail with a more meaningful error message and advice text
* Documentation around tools to import from CVS was fairly outdated.
* "git clone --recurse-submodules" lost the progress eye-candy in
- recent update, which has been corrected.
+ a recent update, which has been corrected.
* A low-level function verify_packfile() was meant to show errors
that were detected without dying itself, but under some conditions
to a design bug, which has been fixed.
* In the codepath that comes up with the hostname to be used in an
- e-mail when the user didn't tell us, we looked at ai_canonname
+ e-mail when the user didn't tell us, we looked at the ai_canonname
field in struct addrinfo without making sure it is not NULL first.
* "git worktree", even though it used the default_abbrev setting that
- ought to be affected by core.abbrev configuration variable, ignored
+ ought to be affected by the core.abbrev configuration variable, ignored
the variable setting. The command has been taught to read the
default set of configuration variables to correct this.
* "git init" tried to record core.worktree in the repository's
- 'config' file when GIT_WORK_TREE environment variable was set and
+ 'config' file when the GIT_WORK_TREE environment variable was set and
it was different from where GIT_DIR appears as ".git" at its top,
but the logic was faulty when .git is a "gitdir:" file that points
at the real place, causing trouble in working trees that are
managed by "git worktree". This has been corrected.
* Codepaths that read from an on-disk loose object were too loose in
- validating what they are reading is a proper object file and
+ validating that they are reading a proper object file and
sometimes read past the data they read from the disk, which has
been corrected. H/t to Gustavo Grieco for reporting.
time, and "git gui" was the last in-tree user of the syntax. This
is finally fixed, so that we can move forward with the deprecation.
- * An author name, that spelled a backslash-quoted double quote in the
- human readable part "My \"double quoted\" name", was not unquoted
+ * An author name that has a backslash-quoted double quote in the
+ human readable part ("My \"double quoted\" name"), was not unquoted
correctly while applying a patch from a piece of e-mail.
* Doc update to clarify what "log -3 --reverse" does.
has been fixed; this did not affect any existing code as nobody
tried to write anything after the padding on such a line, though.
- * The code that parses the format parameter of for-each-ref command
+ * The code that parses the format parameter of the for-each-ref command
has seen a micro-optimization.
- * When we started cURL to talk to imap server when a new enough
- version of cURL library is available, we forgot to explicitly add
+ * When we started to use cURL to talk to an imap server, we forgot to explicitly add
imap(s):// before the destination. To some folks, that didn't work
and the library tried to make HTTP(s) requests instead.
"Give me only the history since that version".
(merge cccf74e2da nd/shallow-deepen later to maint).
- * It is a common mistake to say "git blame --reverse OLD path",
- expecting that the command line is dwimmed as if asking how lines
+ * "git blame --reverse OLD path" is now DWIMmed to show how lines
in path in an old revision OLD have survived up to the current
commit.
(merge e1d09701a4 jc/blame-reverse later to maint).
- * http.emptyauth configuration is a way to allow an empty username to
+ * The http.emptyauth configuration variable is a way to allow an empty username to
pass when attempting to authenticate using mechanisms like
Kerberos. We took an unspecified (NULL) username and sent ":"
(i.e. no username, no password) to CURLOPT_USERPWD, but did not do
-p <paths>" adds to the current contents of the index to come up
with what to commit.
- * A stray symbolic link in $GIT_DIR/refs/ directory could make name
+ * A stray symbolic link in the $GIT_DIR/refs/ directory could make name
resolution loop forever, which has been corrected.
* The "submodule.<name>.path" stored in .gitmodules is never copied
to .git/config and such a key in .git/config has no meaning, but
- the documentation described it and submodule.<name>.url next to
- each other as if both belong to .git/config. This has been fixed.
+ the documentation described it next to submodule.<name>.url
+ as if both belong to .git/config. This has been fixed.
- * In a worktree connected to a repository elsewhere, created via "git
+ * In a worktree created via "git
worktree", "git checkout" attempts to protect users from confusion
by refusing to check out a branch that is already checked out in
another worktree. However, this also prevented checking out a
- branch, which is designated as the primary branch of a bare
- reopsitory, in a worktree that is connected to the bare
+ branch which is designated as the primary branch of a bare
+ repository, in a worktree that is connected to the bare
repository. The check has been corrected to allow it.
* "git rebase" immediately after "git clone" failed to find the fork
* When fetching from a remote that has many tags that are irrelevant
to branches we are following, we used to waste way too many cycles
- when checking if the object pointed at by a tag (that we are not
+ checking if the object pointed at by a tag (that we are not
going to fetch!) exists in our repository too carefully.
* Protect our code from over-eager compilers.
"." instead of the branch name; the documentation has been updated
to describe it.
- * A hot-fix for a test added by a recent topic that went to both
- 'master' and 'maint' already.
-
* "git send-email" attempts to pick up valid e-mails from the
- trailers, but people in real world write non-addresses there, like
+ trailers, but people in the real world write non-addresses there, like
"Cc: Stable <add@re.ss> # 4.8+", which broke the output depending
- on the availability and vintage of Mail::Address perl module.
+ on the availability and vintage of the Mail::Address perl module.
(merge dcfafc5214 mm/send-email-cc-cruft-after-address later to maint).
- * The Travis CI configuration we ship ran the tests with --verbose
+ * The Travis CI configuration we ship ran the tests with the --verbose
option but this risks non-TAP output that happens to be "ok" to be
misinterpreted as TAP signalling a test that passed. This resulted
- in unnecessary failure. This has been corrected by introducing a
+ in unnecessary failures. This has been corrected by introducing a
new mode to run our tests in the test harness to send the verbose
output separately to the log file.
- * Some AsciiDoc formatter mishandles a displayed illustration with
+ * Some AsciiDoc formatters mishandle a displayed illustration with
tabs in it. Adjust a few of them in merge-base documentation to
work around them.
- * A minor regression fix for "git submodule" that was introduced
+ * Fixed a minor regression in "git submodule" that was introduced
when more helper functions were reimplemented in C.
(merge 77b63ac31e sb/submodule-ignore-trailing-slash later to maint).
theoretical world.
(merge bb84735c80 rs/ring-buffer-wraparound later to maint).
- * "git daemon" used fixed-length buffers to turn URL to the
+ * "git daemon" used fixed-length buffers to turn URLs to the
repository the client asked for into the server side directory
- path, using snprintf() to avoid overflowing these buffers, but
+ paths, using snprintf() to avoid overflowing these buffers, but
allowed possibly truncated paths to the directory. This has been
- tightened to reject such a request that causes overlong path to be
- required to serve.
+ tightened to reject such a request that causes an overlong path to be
+ served.
(merge 6bdb0083be jk/daemon-path-ok-check-truncation later to maint).
* Recent update to git-sh-setup (a library of shell functions that
are used by our in-tree scripted Porcelain commands) included
another shell library git-sh-i18n without specifying where it is,
relying on the $PATH. This has been fixed to be more explicit by
- prefixing $(git --exec-path) output in front.
+ prefixing with $(git --exec-path) output.
(merge 1073094f30 ak/sh-setup-dot-source-i18n-fix later to maint).
+ * Fix for a racy false-positive test failure.
+ (merge fdf4f6c79b as/merge-attr-sleep later to maint).
+
+ * Portability update and workaround for builds on recent Mac OS X.
+ (merge a296bc0132 ls/macos-update later to maint).
+
+ * Using a %(HEAD) placeholder in "for-each-ref --format=" option
+ caused the command to segfault when on an unborn branch.
+ (merge 84679d470d jc/for-each-ref-head-segfault-fix later to maint).
+
+ * "git rebase -i" did not work well with the core.commentchar
+ configuration variable for two reasons, both of which have been
+ fixed.
+ (merge 882cd23777 js/rebase-i-commentchar-fix later to maint).
+
* Other minor doc, test and build updates and code cleanups.
(merge 5c238e29a8 jk/common-main later to maint).
(merge 5a5749e45b ak/pre-receive-hook-template-modefix later to maint).
(merge 4259d693fc sc/fmt-merge-msg-doc-markup-fix later to maint).
(merge 28fab7b23d nd/test-helpers later to maint).
(merge c2bb0c1d1e rs/cocci later to maint).
+ (merge 3285b7badb ps/common-info-doc later to maint).
+ (merge 2b090822e8 nd/worktree-lock later to maint).
+ (merge 4bd488ea7c jk/create-branch-remove-unused-param later to maint).
+ (merge 974e0044d6 tk/diffcore-delta-remove-unused later to maint).
--- /dev/null
+Git 2.12 Release Notes
+======================
+
+Backward compatibility notes.
+
+ * Use of an empty string that is used for 'everything matches' is
+ still warned and Git asks users to use a more explicit '.' for that
+ instead. The hope is that existing users will not mind this
+ change, and eventually the warning can be turned into a hard error,
+ upgrading the deprecation into removal of this (mis)feature. That
+ is not scheduled to happen in the upcoming release (yet).
+
+ * The historical argument order "git merge <msg> HEAD <commit>..."
+ has been deprecated for quite some time, and will be removed in the
+ upcoming release.
+
+
+Updates since v2.11
+-------------------
+
+UI, Workflows & Features
+
+ * Various updates to "git p4".
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ *
+
+
+Also contains various documentation updates and code clean-ups.
+
+ *
+
+
+Fixes since v2.10
+-----------------
+
+Unless otherwise noted, all the fixes since v2.9 in the maintenance
+track are contained in this release (see the maintenance releases'
+notes for details).
+
+ * We often decide if a session is interactive by checking if the
+ standard I/O streams are connected to a TTY, but isatty() that
+ comes with Windows incorrectly returned true if it is used on NUL
+ (i.e. an equivalent to /dev/null). This has been fixed.
+ (merge cbb3f3c9b1 js/mingw-isatty later to maint).
+
+ * "git svn" did not work well with path components that are "0", and
+ some configuration variable it uses were not documented.
+ (merge ea9a93dcc2 ew/svn-fixes later to maint).
+
+ * "git rev-parse --symbolic" failed with a more recent notation like
+ "HEAD^-1" and "HEAD^!".
+ (merge a2e7b04c44 jk/rev-parse-symbolic-parents-fix later to maint).
+
+ * An empty directory in a working tree that can simply be nuked used
+ to interfere while merging or cherry-picking a change to create a
+ submodule directory there, which has been fixed..
+ (merge 5423d2e700 dt/empty-submodule-in-merge later to maint).
+
+ * The code in "git push" to compute if any commit being pushed in the
+ superproject binds a commit in a submodule that hasn't been pushed
+ out was overly inefficient, making it unusable even for a small
+ project that does not have any submodule but have a reasonable
+ number of refs.
+ (merge 250ab24ab3 hv/submodule-not-yet-pushed-fix later to maint).
+
+ * "git push --dry-run --recurse-submodule=on-demand" wasn't
+ "--dry-run" in the submodules.
+ (merge 0301c821c5 bw/push-dry-run later to maint).
+
+ * The output from "git worktree list" was made in readdir() order,
+ and was unstable.
+ (merge 4df1d4d466 nd/worktree-list-fixup later to maint).
+
+ * mergetool.<tool>.trustExitCode configuration variable did not apply
+ to built-in tools, but now it does.
+ (merge 2967284456 da/mergetool-trust-exit-code later to maint).
+
+ * "git p4" LFS support was broken when LFS stores an empty blob.
+ (merge d5eb3cf5e7 ls/p4-empty-file-on-lfs later to maint).
+
+ * Other minor doc, test and build updates and code cleanups.
+ (merge fa6ca11105 nd/qsort-in-merge-recursive later to maint).
+ (merge fa3142c919 ak/lazy-prereq-mktemp later to maint).
Existing trailers are extracted from the input message by looking for
a group of one or more lines that (i) are all trailers, or (ii) contains at
-least one Git-generated trailer and consists of at least 25% trailers.
+least one Git-generated or user-configured trailer and consists of at
+least 25% trailers.
The group must be preceded by one or more empty (or whitespace-only) lines.
The group must either be at the end of the message or be the last
non-whitespace lines before a line that starts with '---'. Such three
submit manually or revert. This option always stops after the
first (oldest) commit. Git tags are not exported to p4.
+--shelve::
+ Instead of submitting create a series of shelved changelists.
+ After creating each shelve, the relevant files are reverted/deleted.
+ If you have multiple commits pending multiple shelves will be created.
+
+--update-shelve CHANGELIST::
+ Update an existing shelved changelist with this commit. Implies
+ --shelve.
+
--conflict=(ask|skip|quit)::
Conflicts can occur when applying a commit to p4. When this
happens, the default behavior ("ask") is to prompt whether to
Client specified as an option to all p4 commands, with
'-c <client>', including the client spec.
+git-p4.retries::
+ Specifies the number of times to retry a p4 command (notably,
+ 'p4 sync') if the network times out. The default value is 3.
+
Clone and sync variables
~~~~~~~~~~~~~~~~~~~~~~~~
git-p4.syncFromOrigin::
When retrieving svn commits into Git (as part of 'fetch', 'rebase', or
'dcommit' operations), look for the first `From:` or `Signed-off-by:` line
in the log message and use that as the author string.
++
+[verse]
+config key: svn.useLogAuthor
+
--add-author-from::
When committing to svn from Git (as part of 'commit-diff', 'set-tree' or 'dcommit'
operations), if the existing log message doesn't already have a
`From:` or `Signed-off-by:` line, append a `From:` line based on the
Git commit's author string. If you use this, then `--use-log-author`
will retrieve a valid author string for all commits.
-
++
+[verse]
+config key: svn.addAuthorFrom
ADVANCED OPTIONS
----------------
+
If the last path components in the working tree's path is unique among
working trees, it can be used to identify worktrees. For example if
-you only have to working trees at "/abc/def/ghi" and "/abc/def/ggg",
+you only have two working trees, at "/abc/def/ghi" and "/abc/def/ggg",
then "ghi" or "def/ghi" is enough to point to the former working tree.
DETAILS
branch of the `git.git` repository.
Documentation for older releases are available here:
+* link:v2.11.0/git.html[documentation for release 2.11]
+
+* release notes for
+ link:RelNotes/2.11.0.txt[2.11].
+
* link:v2.10.2/git.html[documentation for release 2.10.2]
* release notes for
info::
Additional information about the repository is recorded
in this directory. This directory is ignored if $GIT_COMMON_DIR
- is set and "$GIT_COMMON_DIR/index" will be used instead.
+ is set and "$GIT_COMMON_DIR/info" will be used instead.
info/refs::
This file helps dumb transports discover what refs are
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.11.0-rc0
+DEF_VER=v2.11.GIT
LF='
'
endif
endif
ifndef NO_APPLE_COMMON_CRYPTO
+ NO_OPENSSL = YesPlease
APPLE_COMMON_CRYPTO = YesPlease
COMPAT_CFLAGS += -DAPPLE_COMMON_CRYPTO
endif
-Documentation/RelNotes/2.11.0.txt
\ No newline at end of file
+Documentation/RelNotes/2.12.0.txt
\ No newline at end of file
}
int write_archive(int argc, const char **argv, const char *prefix,
- int setup_prefix, const char *name_hint, int remote)
+ const char *name_hint, int remote)
{
- int nongit = 0;
const struct archiver *ar = NULL;
struct archiver_args args;
- if (setup_prefix && prefix == NULL)
- prefix = setup_git_directory_gently(&nongit);
-
git_config_get_bool("uploadarchive.allowunreachable", &remote_allow_unreachable);
git_config(git_default_config, NULL);
init_zip_archiver();
argc = parse_archive_args(argc, argv, &ar, &args, name_hint, remote);
- if (nongit) {
+ if (!startup_info->have_repository) {
/*
* We know this will die() with an error, so we could just
* die ourselves; but its error message will be more specific
unsigned int mode);
extern int write_archive_entries(struct archiver_args *args, write_archive_entry_fn_t write_entry);
-extern int write_archive(int argc, const char **argv, const char *prefix, int setup_prefix, const char *name_hint, int remote);
+extern int write_archive(int argc, const char **argv, const char *prefix, const char *name_hint, int remote);
const char *archive_format_from_filename(const char *filename);
extern void *sha1_file_to_archive(const struct archiver_args *args,
"will track its remote counterpart, you may want to use\n"
"\"git push -u\" to set the upstream config as you push.");
-void create_branch(const char *head,
- const char *name, const char *start_name,
+void create_branch(const char *name, const char *start_name,
int force, int reflog, int clobber_head,
int quiet, enum branch_track track)
{
int replace_each_worktree_head_symref(const char *oldref, const char *newref)
{
int ret = 0;
- struct worktree **worktrees = get_worktrees();
+ struct worktree **worktrees = get_worktrees(0);
int i;
for (i = 0; worktrees[i]; i++) {
/* Functions for acting on the information about branches. */
/*
- * Creates a new branch, where head is the branch currently checked
- * out, name is the new branch name, start_name is the name of the
- * existing branch that the new branch should start from, force
- * enables overwriting an existing (non-head) branch, reflog creates a
- * reflog for the branch, and track causes the new branch to be
- * configured to merge the remote branch that start_name is a tracking
- * branch for (if any).
+ * Creates a new branch, where:
+ *
+ * - name is the new branch name
+ *
+ * - start_name is the name of the existing branch that the new branch should
+ * start from
+ *
+ * - force enables overwriting an existing (non-head) branch
+ *
+ * - reflog creates a reflog for the branch
+ *
+ * - track causes the new branch to be configured to merge the remote branch
+ * that start_name is a tracking branch for (if any).
*/
-void create_branch(const char *head, const char *name, const char *start_name,
+void create_branch(const char *name, const char *start_name,
int force, int reflog,
int clobber_head, int quiet, enum branch_track track);
const char *output = NULL;
const char *remote = NULL;
struct option local_opts[] = {
- OPT_STRING('o', "output", &output, N_("file"),
- N_("write the archive to this file")),
+ OPT_FILENAME('o', "output", &output,
+ N_("write the archive to this file")),
OPT_STRING(0, "remote", &remote, N_("repo"),
N_("retrieve the archive from remote repository <repo>")),
OPT_STRING(0, "exec", &exec, N_("command"),
setvbuf(stderr, NULL, _IOLBF, BUFSIZ);
- return write_archive(argc, argv, prefix, 1, output, 0);
+ return write_archive(argc, argv, prefix, output, 0);
}
static void reject_rebase_or_bisect_branch(const char *target)
{
- struct worktree **worktrees = get_worktrees();
+ struct worktree **worktrees = get_worktrees(0);
int i;
for (i = 0; worktrees[i]; i++) {
* create_branch takes care of setting up the tracking
* info and making sure new_upstream is correct
*/
- create_branch(head, branch->name, new_upstream, 0, 0, 0, quiet, BRANCH_TRACK_OVERRIDE);
+ create_branch(branch->name, new_upstream, 0, 0, 0, quiet, BRANCH_TRACK_OVERRIDE);
} else if (unset_upstream) {
struct branch *branch = branch_get(argv[0]);
struct strbuf buf = STRBUF_INIT;
strbuf_release(&buf);
branch_existed = ref_exists(branch->refname);
- create_branch(head, argv[0], (argc == 2) ? argv[1] : head,
+ create_branch(argv[0], (argc == 2) ? argv[1] : head,
force, reflog, 0, quiet, track);
/*
}
}
else
- create_branch(old->name, opts->new_branch, new->name,
+ create_branch(opts->new_branch, new->name,
opts->new_branch_force ? 1 : 0,
opts->new_branch_log,
opts->new_branch_force ? 1 : 0,
static const char mailinfo_usage[] =
"git mailinfo [-k | -b] [-m | --message-id] [-u | --encoding=<encoding> | -n] [--scissors | --no-scissors] <msg> <patch> < mail >info";
+static char *prefix_copy(const char *prefix, const char *filename)
+{
+ if (!prefix || is_absolute_path(filename))
+ return xstrdup(filename);
+ return xstrdup(prefix_filename(prefix, strlen(prefix), filename));
+}
+
int cmd_mailinfo(int argc, const char **argv, const char *prefix)
{
const char *def_charset;
struct mailinfo mi;
int status;
+ char *msgfile, *patchfile;
- /* NEEDSWORK: might want to do the optional .git/ directory
- * discovery
- */
setup_mailinfo(&mi);
def_charset = get_commit_output_encoding();
mi.input = stdin;
mi.output = stdout;
- status = !!mailinfo(&mi, argv[1], argv[2]);
+
+ msgfile = prefix_copy(prefix, argv[1]);
+ patchfile = prefix_copy(prefix, argv[2]);
+
+ status = !!mailinfo(&mi, msgfile, patchfile);
clear_mailinfo(&mi);
+ free(msgfile);
+ free(patchfile);
return status;
}
for (parents = commit->parents, parent_number = 1;
parents;
parents = parents->next, parent_number++) {
+ char *name = NULL;
+
if (exclude_parent && parent_number != exclude_parent)
continue;
+ if (symbolic)
+ name = xstrfmt("%s^%d", arg, parent_number);
show_rev(include_parents ? NORMAL : REVERSED,
- parents->item->object.oid.hash, arg);
+ parents->item->object.oid.hash, name);
+ free(name);
}
*dotdot = '^';
if (argc)
usage_with_options(stripspace_usage, options);
- if (mode == STRIP_COMMENTS || mode == COMMENT_LINES)
+ if (mode == STRIP_COMMENTS || mode == COMMENT_LINES) {
+ setup_git_directory_gently(NULL);
git_config(git_default_config, NULL);
+ }
if (strbuf_read(&buf, 0, 1024) < 0)
die_errno("could not read the input");
}
/* parse all options sent by the client */
- return write_archive(sent_argv.argc, sent_argv.argv, prefix, 0, NULL, 1);
+ return write_archive(sent_argv.argc, sent_argv.argv, prefix, NULL, 1);
}
__attribute__((format (printf, 1, 2)))
printf("HEAD %s\n", sha1_to_hex(wt->head_sha1));
if (wt->is_detached)
printf("detached\n");
- else
+ else if (wt->head_ref)
printf("branch %s\n", wt->head_ref);
}
printf("\n");
else {
strbuf_addf(&sb, "%-*s ", abbrev_len,
find_unique_abbrev(wt->head_sha1, DEFAULT_ABBREV));
- if (!wt->is_detached)
+ if (wt->is_detached)
+ strbuf_addstr(&sb, "(detached HEAD)");
+ else if (wt->head_ref)
strbuf_addf(&sb, "[%s]", shorten_unambiguous_ref(wt->head_ref, 0));
else
- strbuf_addstr(&sb, "(detached HEAD)");
+ strbuf_addstr(&sb, "(error)");
}
printf("%s\n", sb.buf);
if (ac)
usage_with_options(worktree_usage, options);
else {
- struct worktree **worktrees = get_worktrees();
+ struct worktree **worktrees = get_worktrees(GWT_SORT_LINKED);
int path_maxlen = 0, abbrev = DEFAULT_ABBREV, i;
if (!porcelain)
if (ac != 1)
usage_with_options(worktree_usage, options);
- worktrees = get_worktrees();
+ worktrees = get_worktrees(0);
wt = find_worktree(worktrees, prefix, av[0]);
if (!wt)
die(_("'%s' is not a working tree"), av[0]);
if (ac != 1)
usage_with_options(worktree_usage, options);
- worktrees = get_worktrees();
+ worktrees = get_worktrees(0);
wt = find_worktree(worktrees, prefix, av[0]);
if (!wt)
die(_("'%s' is not a working tree"), av[0]);
git_setup_gettext();
- argv[0] = git_extract_argv0_path(argv[0]);
+ git_extract_argv0_path(argv[0]);
restore_sigpipe_to_default();
* ANSI emulation wrappers
*/
+int winansi_isatty(int fd);
+#define isatty winansi_isatty
+
void winansi_init(void);
HANDLE winansi_get_osfhandle(int fd);
#include <wingdi.h>
#include <winreg.h>
+/* In this file, we actually want to use Windows' own isatty(). */
+#undef isatty
+
/*
ANSI codes used by git: m, K
#endif
+int winansi_isatty(int fd)
+{
+ int res = isatty(fd);
+
+ if (res) {
+ /*
+ * Make sure that /dev/null is not fooling Git into believing
+ * that we are connected to a terminal, as "_isatty() returns a
+ * nonzero value if the descriptor is associated with a
+ * character device."; for more information, see
+ *
+ * https://msdn.microsoft.com/en-us/library/f4s0ddew.aspx
+ */
+ HANDLE handle = (HANDLE)_get_osfhandle(fd);
+ if (fd == STDIN_FILENO) {
+ DWORD dummy;
+
+ if (!GetConsoleMode(handle, &dummy))
+ res = 0;
+ } else if (fd == STDOUT_FILENO || fd == STDERR_FILENO) {
+ CONSOLE_SCREEN_BUFFER_INFO dummy;
+
+ if (!GetConsoleScreenBufferInfo(handle, &dummy))
+ res = 0;
+ }
+ }
+
+ return res;
+}
+
void winansi_init(void)
{
int con1, con2;
if (DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
diff_populate_filespec(p->one, 0);
diff_populate_filespec(p->two, 0);
- diffcore_count_changes(p->one, p->two, NULL, NULL, 0,
+ diffcore_count_changes(p->one, p->two, NULL, NULL,
&copied, &added);
diff_free_filespec_data(p->one);
diff_free_filespec_data(p->two);
if (diffcore_count_changes(src, dst,
&src->cnt_data, &dst->cnt_data,
- 0,
&src_copied, &literal_added))
return 0;
struct diff_filespec *dst,
void **src_count_p,
void **dst_count_p,
- unsigned long delta_limit,
unsigned long *src_copied,
unsigned long *literal_added)
{
* call into this function in that case.
*/
unsigned long max_size, delta_size, base_size, src_copied, literal_added;
- unsigned long delta_limit;
int score;
/* We deal only with regular files. Symlink renames are handled
if (!dst->cnt_data && diff_populate_filespec(dst, 0))
return 0;
- delta_limit = (unsigned long)
- (base_size * (MAX_SCORE-minimum_score) / MAX_SCORE);
if (diffcore_count_changes(src, dst,
&src->cnt_data, &dst->cnt_data,
- delta_limit,
&src_copied, &literal_added))
return 0;
struct diff_filespec *dst,
void **src_count_p,
void **dst_count_p,
- unsigned long delta_limit,
unsigned long *src_copied,
unsigned long *literal_added);
return strbuf_detach(&d, NULL);
}
-const char *git_extract_argv0_path(const char *argv0)
+void git_extract_argv0_path(const char *argv0)
{
const char *slash;
if (!argv0 || !*argv0)
- return NULL;
+ return;
slash = find_last_dir_sep(argv0);
- if (slash) {
+ if (slash)
argv0_path = xstrndup(argv0, slash - argv0);
- return slash + 1;
- }
-
- return argv0;
}
void git_set_argv_exec_path(const char *exec_path)
struct argv_array;
extern void git_set_argv_exec_path(const char *exec_path);
-extern const char *git_extract_argv0_path(const char *path);
+extern void git_extract_argv0_path(const char *path);
extern const char *git_exec_path(void);
extern void setup_path(void);
extern const char **prepare_git_cmd(struct argv_array *out, const char **argv);
return ACK;
}
}
- die(_("git fetch_pack: expected ACK/NAK, got '%s'"), line);
+ die(_("git fetch-pack: expected ACK/NAK, got '%s'"), line);
}
static void send_request(struct fetch_pack_args *args,
}
merge_cmd () {
- trust_exit_code=$(git config --bool \
- "mergetool.$1.trustExitCode" || echo false)
- if test "$trust_exit_code" = "false"
- then
- touch "$BACKUP"
- ( eval $merge_tool_cmd )
- check_unchanged
- else
- ( eval $merge_tool_cmd )
- fi
+ ( eval $merge_tool_cmd )
}
}
echo "$1"
}
+ # Most tools' exit codes cannot be trusted, so By default we ignore
+ # their exit code and check the merged file's modification time in
+ # check_unchanged() to determine whether or not the merge was
+ # successful. The return value from run_merge_cmd, by default, is
+ # determined by check_unchanged().
+ #
+ # When a tool's exit code can be trusted then the return value from
+ # run_merge_cmd is simply the tool's exit code, and check_unchanged()
+ # is not called.
+ #
+ # The return value of exit_code_trustable() tells us whether or not we
+ # can trust the tool's exit code.
+ #
+ # User-defined and built-in tools default to false.
+ # Built-in tools advertise that their exit code is trustable by
+ # redefining exit_code_trustable() to true.
+
+ exit_code_trustable () {
+ false
+ }
+
+
if ! test -f "$MERGE_TOOLS_DIR/$tool"
then
setup_user_tool
fi
}
+trust_exit_code () {
+ if git config --bool "mergetool.$1.trustExitCode"
+ then
+ :; # OK
+ elif exit_code_trustable
+ then
+ echo true
+ else
+ echo false
+ fi
+}
+
+
# Entry point for running tools
run_merge_tool () {
# If GIT_PREFIX is empty then we cannot use it in tools
# Run a either a configured or built-in merge tool
run_merge_cmd () {
- merge_cmd "$1"
+ mergetool_trust_exit_code=$(trust_exit_code "$1")
+ if test "$mergetool_trust_exit_code" = "true"
+ then
+ merge_cmd "$1"
+ else
+ touch "$BACKUP"
+ merge_cmd "$1"
+ check_unchanged
+ fi
}
list_merge_tool_candidates () {
if len(client) > 0:
real_cmd += ["-c", client]
+ retries = gitConfigInt("git-p4.retries")
+ if retries is None:
+ # Perform 3 retries by default
+ retries = 3
+ real_cmd += ["-r", str(retries)]
if isinstance(cmd,basestring):
real_cmd = ' '.join(real_cmd) + ' ' + cmd
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)])
steps."""
if self.exceedsLargeFileThreshold(relPath, contents) or self.hasLargeFileExtension(relPath):
contentTempFile = self.generateTempFile(contents)
- (git_mode, contents, localLargeFile) = self.generatePointer(contentTempFile)
-
- # Move temp file to final location in large file system
- largeFileDir = os.path.dirname(localLargeFile)
- if not os.path.isdir(largeFileDir):
- os.makedirs(largeFileDir)
- shutil.move(contentTempFile, localLargeFile)
- self.addLargeFile(relPath)
- if gitConfigBool('git-p4.largeFilePush'):
- self.pushFile(localLargeFile)
- if verbose:
- sys.stderr.write("%s moved to large file system (%s)\n" % (relPath, localLargeFile))
+ (pointer_git_mode, contents, localLargeFile) = self.generatePointer(contentTempFile)
+ if pointer_git_mode:
+ git_mode = pointer_git_mode
+ if localLargeFile:
+ # Move temp file to final location in large file system
+ largeFileDir = os.path.dirname(localLargeFile)
+ if not os.path.isdir(largeFileDir):
+ os.makedirs(largeFileDir)
+ shutil.move(contentTempFile, localLargeFile)
+ self.addLargeFile(relPath)
+ if gitConfigBool('git-p4.largeFilePush'):
+ self.pushFile(localLargeFile)
+ if verbose:
+ sys.stderr.write("%s moved to large file system (%s)\n" % (relPath, localLargeFile))
return (git_mode, contents)
class MockLFS(LargeFileSystem):
the actual content. Return also the new location of the actual
content.
"""
+ if os.path.getsize(contentFile) == 0:
+ return (None, '', None)
+
pointerProcess = subprocess.Popen(
['git', 'lfs', 'pointer', '--file=' + contentFile],
stdout=subprocess.PIPE
optparse.make_option("--conflict", dest="conflict_behavior",
choices=self.conflict_behavior_choices),
optparse.make_option("--branch", dest="branch"),
+ optparse.make_option("--shelve", dest="shelve", action="store_true",
+ help="Shelve instead of submit. Shelved files are reverted, "
+ "restoring the workspace to the state before the shelve"),
+ optparse.make_option("--update-shelve", dest="update_shelve", action="store", type="int",
+ metavar="CHANGELIST",
+ help="update an existing shelved changelist, implies --shelve")
]
self.description = "Submit changes from git to the perforce depot."
self.usage += " [name of git branch to submit into perforce depot]"
self.detectRenames = False
self.preserveUser = gitConfigBool("git-p4.preserveUser")
self.dry_run = False
+ self.shelve = False
+ self.update_shelve = None
self.prepare_p4_only = False
self.conflict_behavior = None
self.isWindows = (platform.system() == "Windows")
return 1
return 0
- def prepareSubmitTemplate(self):
+ 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.
template = ""
inFilesSection = False
- for line in p4_read_pipe_lines(['change', '-o']):
+ args = ['change', '-o']
+ if changelist:
+ args.append(str(changelist))
+
+ for line in p4_read_pipe_lines(args):
if line.endswith("\r\n"):
line = line[:-2] + "\n"
if inFilesSection:
editedFiles = set()
pureRenameCopy = set()
filesToChangeExecBit = {}
+ all_files = list()
for line in diff:
diff = parseDiffTreeEntry(line)
modifier = diff['status']
path = diff['src']
+ all_files.append(path)
+
if modifier == "M":
p4_edit(path)
if isModeExecChanged(diff['src_mode'], diff['dst_mode']):
mode = filesToChangeExecBit[f]
setP4ExecBit(f, mode)
+ if self.update_shelve:
+ print("all_files = %s" % str(all_files))
+ p4_reopen_in_change(self.update_shelve, all_files)
+
#
# Build p4 change description, starting with the contents
# of the git commit message.
logMessage = logMessage.strip()
(logMessage, jobs) = self.separate_jobs_from_description(logMessage)
- template = self.prepareSubmitTemplate()
+ template = self.prepareSubmitTemplate(self.update_shelve)
submitTemplate = self.prepareLogMessage(template, logMessage, jobs)
if self.preserveUser:
if self.isWindows:
message = message.replace("\r\n", "\n")
submitTemplate = message[:message.index(separatorLine)]
- p4_write_pipe(['submit', '-i'], submitTemplate)
+
+ if self.update_shelve:
+ p4_write_pipe(['shelve', '-r', '-i'], submitTemplate)
+ elif self.shelve:
+ p4_write_pipe(['shelve', '-i'], submitTemplate)
+ else:
+ p4_write_pipe(['submit', '-i'], submitTemplate)
+ # The rename/copy happened by applying a patch that created a
+ # new file. This leaves it writable, which confuses p4.
+ for f in pureRenameCopy:
+ p4_sync(f, "-f")
if self.preserveUser:
if p4User:
changelist = self.lastP4Changelist()
self.modifyChangelistUser(changelist, p4User)
- # The rename/copy happened by applying a patch that created a
- # new file. This leaves it writable, which confuses p4.
- for f in pureRenameCopy:
- p4_sync(f, "-f")
submitted = True
finally:
# skip this patch
- if not submitted:
- print "Submission cancelled, undoing p4 changes."
- for f in editedFiles:
+ if not submitted or self.shelve:
+ if self.shelve:
+ print ("Reverting shelved files.")
+ else:
+ print ("Submission cancelled, undoing p4 changes.")
+ for f in editedFiles | filesToDelete:
p4_revert(f)
for f in filesToAdd:
p4_revert(f)
os.remove(f)
- for f in filesToDelete:
- p4_revert(f)
os.remove(fileName)
return submitted
if len(self.origin) == 0:
self.origin = upstream
+ if self.update_shelve:
+ self.shelve = True
+
if self.preserveUser:
if not self.canChangeChangelists():
die("Cannot preserve user names without p4 super-user or admin permissions")
break
chdir(self.oldWorkingDirectory)
-
+ shelved_applied = "shelved" if self.shelve else "applied"
if self.dry_run:
pass
elif self.prepare_p4_only:
pass
elif len(commits) == len(applied):
- print "All commits applied!"
+ print ("All commits {0}!".format(shelved_applied))
sync = P4Sync()
if self.branch:
else:
if len(applied) == 0:
- print "No commits applied."
+ print ("No commits {0}.".format(shelved_applied))
else:
- print "Applied only the commits marked with '*':"
+ print ("{0} only the commits marked with '*':".format(shelved_applied.capitalize()))
for c in commits:
if c in applied:
star = "*"
GIT_CHERRY_PICK_HELP="$resolvemsg"
export GIT_CHERRY_PICK_HELP
-comment_char=$(git config --get core.commentchar 2>/dev/null | cut -c1)
-: ${comment_char:=#}
+comment_char=$(git config --get core.commentchar 2>/dev/null)
+case "$comment_char" in
+'' | auto)
+ comment_char="#"
+ ;;
+?)
+ ;;
+*)
+ comment_char=$(echo "$comment_char" | cut -c1)
+ ;;
+esac
warn () {
printf '%s\n' "$*" >&2
{ "am", cmd_am, RUN_SETUP | NEED_WORK_TREE },
{ "annotate", cmd_annotate, RUN_SETUP },
{ "apply", cmd_apply, RUN_SETUP_GENTLY },
- { "archive", cmd_archive },
+ { "archive", cmd_archive, RUN_SETUP_GENTLY },
{ "bisect--helper", cmd_bisect__helper, RUN_SETUP },
{ "blame", cmd_blame, RUN_SETUP },
{ "branch", cmd_branch, RUN_SETUP },
{ "ls-files", cmd_ls_files, RUN_SETUP | SUPPORT_SUPER_PREFIX },
{ "ls-remote", cmd_ls_remote, RUN_SETUP_GENTLY },
{ "ls-tree", cmd_ls_tree, RUN_SETUP },
- { "mailinfo", cmd_mailinfo },
+ { "mailinfo", cmd_mailinfo, RUN_SETUP_GENTLY },
{ "mailsplit", cmd_mailsplit },
{ "merge", cmd_merge, RUN_SETUP | NEED_WORK_TREE },
{ "merge-base", cmd_merge_base, RUN_SETUP },
cmd = argv[0];
if (!cmd)
cmd = "git-help";
+ else {
+ const char *slash = find_last_dir_sep(cmd);
+ if (slash)
+ cmd = slash + 1;
+ }
trace_command_performance(argv);
return unmerged;
}
-static int string_list_df_name_compare(const void *a, const void *b)
+static int string_list_df_name_compare(const char *one, const char *two)
{
- const struct string_list_item *one = a;
- const struct string_list_item *two = b;
- int onelen = strlen(one->string);
- int twolen = strlen(two->string);
+ int onelen = strlen(one);
+ int twolen = strlen(two);
/*
* Here we only care that entries for D/F conflicts are
* adjacent, in particular with the file of the D/F conflict
* since in other cases any changes in their order due to
* sorting cause no problems for us.
*/
- int cmp = df_name_compare(one->string, onelen, S_IFDIR,
- two->string, twolen, S_IFDIR);
+ int cmp = df_name_compare(one, onelen, S_IFDIR,
+ two, twolen, S_IFDIR);
/*
* Now that 'foo' and 'foo/bar' compare equal, we have to make sure
* that 'foo' comes before 'foo/bar'.
string_list_append(&df_sorted_entries, next->string)->util =
next->util;
}
- qsort(df_sorted_entries.items, entries->nr, sizeof(*entries->items),
- string_list_df_name_compare);
+ df_sorted_entries.cmp = string_list_df_name_compare;
+ string_list_sort(&df_sorted_entries);
string_list_clear(&o->df_conflict_file_set, 1);
for (i = 0; i < df_sorted_entries.nr; i++) {
return strbuf_detach(&newpath, NULL);
}
-static int dir_in_way(const char *path, int check_working_copy)
+/**
+ * Check whether a directory in the index is in the way of an incoming
+ * file. Return 1 if so. If check_working_copy is non-zero, also
+ * check the working directory. If empty_ok is non-zero, also return
+ * 0 in the case where the working-tree dir exists but is empty.
+ */
+static int dir_in_way(const char *path, int check_working_copy, int empty_ok)
{
int pos;
struct strbuf dirpath = STRBUF_INIT;
}
strbuf_release(&dirpath);
- return check_working_copy && !lstat(path, &st) && S_ISDIR(st.st_mode);
+ return check_working_copy && !lstat(path, &st) && S_ISDIR(st.st_mode) &&
+ !(empty_ok && is_empty_dir(path));
}
static int was_tracked(const char *path)
{
char *renamed = NULL;
int ret = 0;
- if (dir_in_way(path, !o->call_depth)) {
+ if (dir_in_way(path, !o->call_depth, 0)) {
renamed = unique_path(o, path, a_oid ? o->branch1 : o->branch2);
}
remove_file(o, 0, rename->path, 0);
dst_name = unique_path(o, rename->path, cur_branch);
} else {
- if (dir_in_way(rename->path, !o->call_depth)) {
+ if (dir_in_way(rename->path, !o->call_depth, 0)) {
dst_name = unique_path(o, rename->path, cur_branch);
output(o, 1, _("%s is a directory in %s adding as %s instead"),
rename->path, other_branch, dst_name);
o->branch2 == rename_conflict_info->branch1) ?
pair1->two->path : pair1->one->path;
- if (dir_in_way(path, !o->call_depth))
+ if (dir_in_way(path, !o->call_depth,
+ S_ISGITLINK(pair1->two->mode)))
df_conflict_remains = 1;
}
if (merge_file_special_markers(o, &one, &a, &b,
oid = b_oid;
conf = _("directory/file");
}
- if (dir_in_way(path, !o->call_depth)) {
+ if (dir_in_way(path, !o->call_depth,
+ S_ISGITLINK(a_mode))) {
char *new_path = unique_path(o, path, add_branch);
clean_merge = 0;
output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
}
merge_cmd () {
- touch "$BACKUP"
if $base_present
then
"$merge_tool_path" -wait -merge -3 -a1 \
"$merge_tool_path" -wait -2 \
"$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
fi
- check_unchanged
}
translate_merge_tool_path() {
}
merge_cmd () {
- touch "$BACKUP"
if $base_present
then
"$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
"$merge_tool_path" "$LOCAL" "$REMOTE" \
-mergeoutput="$MERGED"
fi
- check_unchanged
}
translate_merge_tool_path() {
}
merge_cmd () {
- touch "$BACKUP"
if $base_present
then
"$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" -BF="$BASE" \
"$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" \
-RF="$MERGED"
fi
- check_unchanged
}
translate_merge_tool_path() {
fi >/dev/null 2>&1
}
-translate_merge_tool_path() {
+translate_merge_tool_path () {
echo DeltaWalker
}
+
+exit_code_trustable () {
+ true
+}
--result="$MERGED" "$LOCAL" "$REMOTE"
fi
}
+
+exit_code_trustable () {
+ true
+}
}
merge_cmd () {
- touch "$BACKUP"
if $base_present
then
"$merge_tool_path" \
"$merge_tool_path" \
"$LOCAL" "$MERGED" "$REMOTE" | cat
fi
- check_unchanged
}
}
merge_cmd () {
- touch "$BACKUP"
if $base_present
then
"$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \
"$merge_tool_path" "$LOCAL" "$REMOTE" \
--default --mode=merge2 --to="$MERGED"
fi
- check_unchanged
}
translate_merge_tool_path() {
echo emacs
}
+
+exit_code_trustable () {
+ true
+}
}
merge_cmd () {
- touch "$BACKUP"
if $base_present
then
"$merge_tool_path" -merge "$LOCAL" "$BASE" "$REMOTE" -o:"$MERGED" -nh
else
"$merge_tool_path" -merge "$LOCAL" "$REMOTE" -o:"$MERGED" -nh
fi
- check_unchanged
}
translate_merge_tool_path() {
>/dev/null 2>&1
fi
}
+
+exit_code_trustable () {
+ true
+}
diff_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE"
}
+
+exit_code_trustable () {
+ true
+}
then
check_meld_for_output_version
fi
- touch "$BACKUP"
+
if test "$meld_has_output_option" = true
then
"$merge_tool_path" --output "$MERGED" \
else
"$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
fi
- check_unchanged
}
# Check whether we should use 'meld --output <file>'
}
merge_cmd () {
- touch "$BACKUP"
if $base_present
then
"$merge_tool_path" "$LOCAL" "$REMOTE" \
"$merge_tool_path" "$LOCAL" "$REMOTE" \
-merge "$MERGED" | cat
fi
- check_unchanged
}
}
merge_cmd () {
- touch "$BACKUP"
if ! $base_present
then
cp -- "$LOCAL" "$BASE"
create_virtual_base "$BASE" "$REMOTE"
fi
"$merge_tool_path" "$BASE" "$REMOTE" "$LOCAL" "$MERGED"
- check_unchanged
}
create_empty_file () {
"$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
fi
}
+
+exit_code_trustable () {
+ true
+}
merge_cmd () {
if $base_present
then
- touch "$BACKUP"
basename="$(basename "$merge_tool_path" .exe)"
if test "$basename" = "tortoisegitmerge"
then
-base:"$BASE" -mine:"$LOCAL" \
-theirs:"$REMOTE" -merged:"$MERGED"
fi
- check_unchanged
else
echo "$merge_tool_path cannot be used without a base" 1>&2
return 1
}
merge_cmd () {
- touch "$BACKUP"
case "$1" in
gvimdiff|vimdiff)
if $base_present
fi
;;
esac
- check_unchanged
}
translate_merge_tool_path() {
;;
esac
}
+
+exit_code_trustable () {
+ true
+}
merge_cmd () {
# mergetool.winmerge.trustExitCode is implicitly false.
# touch $BACKUP so that we can check_unchanged.
- touch "$BACKUP"
"$merge_tool_path" -u -e -dl Local -dr Remote \
"$LOCAL" "$REMOTE" "$MERGED"
- check_unchanged
}
translate_merge_tool_path() {
}
merge_cmd () {
- touch "$BACKUP"
if $base_present
then
"$merge_tool_path" -X --show-merged-pane \
-R 'Accel.SearchForward: "Ctrl-G"' \
--merged-file "$MERGED" "$LOCAL" "$REMOTE"
fi
- check_unchanged
}
my $latest = $ra->get_latest_revnum;
$ra->get_log("", $latest, 0, 1, 0, 1, sub {});
};
- } while ($@ && ($c = shift @components));
+ } while ($@ && defined($c = shift @components));
return canonicalize_url($url);
}
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-08-27 23:21+0800\n"
-"PO-Revision-Date: 2016-08-28 10:32-0600\n"
+"POT-Creation-Date: 2016-11-25 22:50+0800\n"
+"PO-Revision-Date: 2016-11-28 20:03-0700\n"
"Last-Translator: Alex Henrie <alexhenrie24@gmail.com>\n"
"Language-Team: Catalan\n"
"Language: ca\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.8\n"
+"X-Generator: Poedit 1.8.11\n"
#: advice.c:55
#, c-format
"\n"
" git checkout -b <nom-de-branca-nova>\n"
-#: archive.c:12
-msgid "git archive [<options>] <tree-ish> [<path>...]"
-msgstr "git archive [<opcions>] <arbre> [<camí>...]"
+#: apply.c:57
+#, c-format
+msgid "unrecognized whitespace option '%s'"
+msgstr "opció d'espai en blanc '%s' no reconeguda"
-#: archive.c:13
-msgid "git archive --list"
-msgstr "git archive --list"
+#: apply.c:73
+#, c-format
+msgid "unrecognized whitespace ignore option '%s'"
+msgstr "opció d'ignoral d'espai en blanc '%s' no reconeguda"
-#: archive.c:14
-msgid ""
-"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
-msgstr ""
-"git archive --remote <dipòsit> [--exec <ordre>] [<opcions>] <arbre> "
-"[<camí>...]"
+#: apply.c:125
+msgid "--reject and --3way cannot be used together."
+msgstr "--reject i --3way no es poden usar junts."
-#: archive.c:15
-msgid "git archive --remote <repo> [--exec <cmd>] --list"
-msgstr "git archive --remote <dipòsit> [--exec <ordre>] --list"
+#: apply.c:127
+msgid "--cached and --3way cannot be used together."
+msgstr "--cached i --3way no es poden usar junts."
-#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327
-#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr "L'especificació de camí '%s' no ha coincidit amb cap fitxer"
+#: apply.c:130
+msgid "--3way outside a repository"
+msgstr "--3way fora d'un dipòsit"
-#: archive.c:429
-msgid "fmt"
-msgstr "format"
+#: apply.c:141
+msgid "--index outside a repository"
+msgstr "--index fora d'un dipòsit"
-#: archive.c:429
-msgid "archive format"
-msgstr "format d'arxiu"
+#: apply.c:144
+msgid "--cached outside a repository"
+msgstr "--cached fora d'un dipòsit"
-#: archive.c:430 builtin/log.c:1422
-msgid "prefix"
-msgstr "prefix"
+#: apply.c:845
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr "No es pot preparar l'expressió regular de marca de temps %s"
-#: archive.c:431
-msgid "prepend prefix to each pathname in the archive"
-msgstr "anteposa el prefix a cada nom de camí en l'arxiu"
+#: apply.c:854
+#, c-format
+msgid "regexec returned %d for input: %s"
+msgstr "regexec ha retornat %d per l'entrada: %s"
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553 builtin/blame.c:2554
-#: builtin/config.c:59 builtin/fast-export.c:987 builtin/fast-export.c:989
-#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:460
-#: builtin/ls-files.c:463 builtin/notes.c:399 builtin/notes.c:562
-#: builtin/read-tree.c:109 parse-options.h:153
-msgid "file"
-msgstr "fitxer"
+#: apply.c:938
+#, 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"
-#: archive.c:433 builtin/archive.c:89
-msgid "write the archive to this file"
-msgstr "escriu l'arxiu a aquest fitxer"
+#: apply.c:977
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
+msgstr ""
+"git apply: git-diff dolent - /dev/null esperat, %s rebut en la línia %d"
-#: archive.c:435
-msgid "read .gitattributes in working directory"
-msgstr "llegeix .gitattributes en el directori de treball"
+#: apply.c:983
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgstr ""
+"git apply: git-diff dolent - nom de fitxer nou inconsistent en la línia %d"
-#: archive.c:436
-msgid "report archived files on stderr"
-msgstr "informa de fitxers arxivats en stderr"
+#: apply.c:984
+#, c-format
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgstr ""
+"git apply: git-diff dolent - nom de fitxer antic inconsistent en la línia %d"
-#: archive.c:437
-msgid "store only"
-msgstr "només emmagatzema"
+#: apply.c:990
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null on line %d"
+msgstr "git apply: git-diff dolent - /dev/null esperat en la línia %d"
-#: archive.c:438
-msgid "compress faster"
-msgstr "comprimeix més ràpidament"
+#: apply.c:1488
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recompte: línia inesperada: %.*s"
-#: archive.c:446
-msgid "compress better"
-msgstr "comprimeix millor"
+#: apply.c:1557
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "fragment de pedaç sense capçalera a la línia %d: %.*s"
-#: archive.c:449
-msgid "list supported archive formats"
-msgstr "allista els formats d'arxiu admesos"
+#: apply.c:1577
+#, 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] ""
+"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)"
+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)"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
-#: builtin/submodule--helper.c:832
-msgid "repo"
-msgstr "dipòsit"
+#: apply.c:1589
+#, 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)"
-#: archive.c:452 builtin/archive.c:91
-msgid "retrieve the archive from remote repository <repo>"
-msgstr "recupera l'arxiu del dipòsit remot <dipòsit>"
+#: apply.c:1759
+msgid "new file depends on old contents"
+msgstr "el fitxer nou depèn dels continguts antics"
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483
-msgid "command"
-msgstr "ordre"
+#: apply.c:1761
+msgid "deleted file still has contents"
+msgstr "el fitxer suprimit encara té continguts"
-#: archive.c:454 builtin/archive.c:93
-msgid "path to the remote git-upload-archive command"
-msgstr "camí a l'ordre git-upload-archive remota"
+#: apply.c:1795
+#, c-format
+msgid "corrupt patch at line %d"
+msgstr "pedaç malmès a la línia %d"
-#: archive.c:461
-msgid "Unexpected option --remote"
-msgstr "Opció inesperada --remote"
+#: apply.c:1832
+#, c-format
+msgid "new file %s depends on old contents"
+msgstr "el fitxer nou %s depèn dels continguts antics"
-#: archive.c:463
-msgid "Option --exec can only be used together with --remote"
-msgstr "L'opció --exec només es pot usar junt amb --remote"
+#: apply.c:1834
+#, c-format
+msgid "deleted file %s still has contents"
+msgstr "el fitxer suprimit %s encara té continguts"
-#: archive.c:465
-msgid "Unexpected option --output"
-msgstr "Opció inesperada --output"
+#: 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"
-#: archive.c:487
+#: apply.c:1984
#, c-format
-msgid "Unknown archive format '%s'"
-msgstr "Format d'arxiu desconegut '%s'"
+msgid "corrupt binary patch at line %d: %.*s"
+msgstr "pedaç binari malmès a la línia %d: %.*s"
-#: archive.c:494
+#: apply.c:2021
#, c-format
-msgid "Argument not supported for format '%s': -%d"
-msgstr "Paràmetre no admet per al format '%s': -%d"
+msgid "unrecognized binary patch at line %d"
+msgstr "pedaç binari no reconegut a la línia %d"
-#: attr.c:263
-msgid ""
-"Negative patterns are ignored in git attributes\n"
-"Use '\\!' for literal leading exclamation."
-msgstr ""
-"Els patrons negatius s'ignoren en els atributs de git\n"
-"Useu '\\!' per exclamació capdavantera literal."
+#: apply.c:2182
+#, c-format
+msgid "patch with only garbage at line %d"
+msgstr "pedaç amb només escombraries a la línia %d"
-#: bisect.c:441
+#: apply.c:2274
#, c-format
-msgid "Could not open file '%s'"
-msgstr "No s'ha pogut obrir el fitxer '%s'"
+msgid "unable to read symlink %s"
+msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
-#: bisect.c:446
+#: apply.c:2278
#, c-format
-msgid "Badly quoted content in file '%s': %s"
-msgstr "Comentari amb cometes dolentes en el fitxer '%s': %s"
+msgid "unable to open or read %s"
+msgstr "no s'ha pogut obrir o llegir %s"
-#: bisect.c:655
+#: apply.c:2931
#, c-format
-msgid "We cannot bisect more!\n"
-msgstr "No podem bisecar més!\n"
+msgid "invalid start of line: '%c'"
+msgstr "inici de línia no vàlid: '%c'"
-#: bisect.c:708
+#: apply.c:3050
#, c-format
-msgid "Not a valid commit name %s"
-msgstr "No és un nom de comissió vàlid %s"
+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)."
-#: bisect.c:732
+#: apply.c:3062
#, c-format
-msgid ""
-"The merge base %s is bad.\n"
-"This means the bug has been fixed between %s and [%s].\n"
-msgstr ""
-"La base de fusió %s és dolenta.\n"
-"Això vol dir que el defecte s'ha arreglat entre %s i [%s].\n"
+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"
-#: bisect.c:737
+#: apply.c:3068
#, c-format
msgid ""
-"The merge base %s is new.\n"
-"The property has changed between %s and [%s].\n"
+"while searching for:\n"
+"%.*s"
msgstr ""
-"La base de fusió %s és nova.\n"
-"La propietat s'ha canviat entre %s i [%s].\n"
+"tot cercant:\n"
+"%.*s"
-#: bisect.c:742
+#: apply.c:3090
#, c-format
-msgid ""
-"The merge base %s is %s.\n"
-"This means the first '%s' commit is between %s and [%s].\n"
-msgstr ""
-"La base de fusió %s és %s.\n"
-"Això vol dir que la primera comissió '%s' és entre %s i [%s].\n"
+msgid "missing binary patch data for '%s'"
+msgstr "manquen les dades de pedaç binari de '%s'"
-#: bisect.c:750
+#: apply.c:3098
#, c-format
-msgid ""
-"Some %s revs are not ancestor of the %s rev.\n"
-"git bisect cannot work properly in this case.\n"
-"Maybe you mistook %s and %s revs?\n"
+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:3144
+#, c-format
+msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
-"Unes %s revisions no són els avantpassats de la revisió %s.\n"
-"git bisect no pot funcionar correctament en aquest cas.\n"
-"Potser heu confós les revisions %s i %s?\n"
+"no es pot aplicar un pedaç binari a '%s' sense la línia d'índex completa"
-#: bisect.c:763
+#: apply.c:3154
#, 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."
+"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
-"s'ha de saltar 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"
-"Continuem de totes maneres."
+"el pedaç s'aplica a '%s' (%s), el qual no coincideix amb els continguts "
+"actuals."
-#: bisect.c:798
+#: apply.c:3162
#, c-format
-msgid "Bisecting: a merge base must be tested\n"
-msgstr "Bisecant: s'ha de provar una base de fusió\n"
+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"
-#: bisect.c:849
+#: apply.c:3180
#, c-format
-msgid "a %s revision is needed"
-msgstr "es necessita una revisió %s"
+msgid "the necessary postimage %s for '%s' cannot be read"
+msgstr "no es pot llegir la postimatge necessari %s per a '%s'"
-#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
+#: apply.c:3193
#, c-format
-msgid "could not create file '%s'"
-msgstr "no s'ha pogut crear el fitxer '%s'"
+msgid "binary patch does not apply to '%s'"
+msgstr "el pedaç binari no s'aplica a '%s'"
-#: bisect.c:917
+#: apply.c:3199
#, c-format
-msgid "could not read file '%s'"
-msgstr "no s'ha pogut llegir el fitxer '%s'"
+msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
+msgstr ""
+"el pedaç binari a '%s' crea un resultat incorrecte (esperant %s, %s rebut)"
-#: bisect.c:947
-msgid "reading bisect refs failed"
-msgstr "la lectura de les referències de bisecció ha fallat"
+#: apply.c:3220
+#, c-format
+msgid "patch failed: %s:%ld"
+msgstr "el pedaç ha fallat: %s:%ld"
-#: bisect.c:967
+#: apply.c:3342
#, c-format
-msgid "%s was both %s and %s\n"
-msgstr "%s era ambdós %s i %s\n"
+msgid "cannot checkout %s"
+msgstr "no es pot agafar %s"
-#: bisect.c:975
+#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248
#, c-format
-msgid ""
-"No testable commit found.\n"
-"Maybe you started with bad path parameters?\n"
-msgstr ""
-"No s'ha trobat cap comissió provable.\n"
-"Potser heu començat amb paràmetres de camí dolents?\n"
+msgid "failed to read %s"
+msgstr "s'ha fallat en llegir %s"
-#: bisect.c:994
+#: apply.c:3398
#, c-format
-msgid "(roughly %d step)"
-msgid_plural "(roughly %d steps)"
-msgstr[0] "(aproximadament %d pas)"
-msgstr[1] "(aproximadament %d passos)"
+msgid "reading from '%s' beyond a symbolic link"
+msgstr "s'està llegint de '%s' més enllà d'un enllaç simbòlic"
-#. TRANSLATORS: the last %s will be replaced with
-#. "(roughly %d steps)" translation
-#: bisect.c:998
+#: apply.c:3427 apply.c:3667
#, 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"
+msgid "path %s has been renamed/deleted"
+msgstr "el camí %s s'ha canviat de nom / s'ha suprimit"
-#: branch.c:53
+#: apply.c:3510 apply.c:3681
#, 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"
-"Després de corregir la causa de l'error, podeu\n"
-"intentar corregir la informació de seguiment remot\n"
-"invocant \"git branch --set-upstream-to=%s%s%s\"."
+msgid "%s: does not exist in index"
+msgstr "%s: no existeix en l'índex"
-#: branch.c:67
+#: apply.c:3519 apply.c:3689
#, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "No s'està establint la branca %s com a la seva pròpia font."
+msgid "%s: does not match index"
+msgstr "%s: no coincideix amb l'índex"
-#: branch.c:93
-#, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+#: apply.c:3554
+msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
-"La branca %s està configurada per a seguir la branca remota %s de %s per "
-"rebasar."
+"al dipòsit li manca el blob necessari per a retrocedir a una fusió de 3 vies."
-#: branch.c:94
+#: apply.c:3557
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
-msgstr "La branca %s està configurada per a seguir la branca remota %s de %s."
+msgid "Falling back to three-way merge...\n"
+msgstr "S'està retrocedint a una fusió de 3 vies...\n"
-#: branch.c:98
+#: apply.c:3573 apply.c:3577
#, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
-msgstr ""
-"La branca %s està configurada per a seguir la branca local %s per rebasar."
+msgid "cannot read the current contents of '%s'"
+msgstr "no es poden llegir els continguts actuals de '%s'"
-#: branch.c:99
+#: apply.c:3589
#, c-format
-msgid "Branch %s set up to track local branch %s."
-msgstr "La branca %s està configurada per a seguir la branca local %s."
+msgid "Failed to fall back on three-way merge...\n"
+msgstr "S'ha fallat en retrocedir a una fusió de 3 vies...\n"
-#: branch.c:104
+#: apply.c:3603
#, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
-msgstr ""
-"La branca %s està configurada per a seguir la referència remota %s per "
-"rebasar."
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr "S'ha aplicat el pedaç a '%s' amb conflictes.\n"
-#: branch.c:105
+#: apply.c:3608
#, c-format
-msgid "Branch %s set up to track remote ref %s."
-msgstr "La branca %s està configurada per a seguir la referència remota %s."
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr "S'ha aplicat el pedaç a '%s' netament.\n"
-#: branch.c:109
-#, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
-msgstr ""
-"La branca %s està configurada per a seguir la referència local %s per "
-"rebasar."
+#: apply.c:3634
+msgid "removal patch leaves file contents"
+msgstr "el pedaç d'eliminació deixa els continguts dels fitxers"
-#: branch.c:110
+#: apply.c:3706
#, c-format
-msgid "Branch %s set up to track local ref %s."
-msgstr "La branca %s està configurada per a seguir la referència local %s."
-
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "No es pot escriure la configuració de la branca font"
+msgid "%s: wrong type"
+msgstr "%s: tipus erroni"
-#: branch.c:156
+#: apply.c:3708
#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr "No seguint: informació ambigua per a la referència %s"
+msgid "%s has type %o, expected %o"
+msgstr "%s és del tipus %o, s'esperava %o"
-#: branch.c:185
+#: apply.c:3859 apply.c:3861
#, c-format
-msgid "'%s' is not a valid branch name."
-msgstr "'%s' no és un nom de branca vàlid."
+msgid "invalid path '%s'"
+msgstr "camí no vàlid: %s"
-#: branch.c:190
+#: apply.c:3917
#, c-format
-msgid "A branch named '%s' already exists."
-msgstr "Una branca amb nom '%s' ja existeix."
-
-#: branch.c:198
-msgid "Cannot force update the current branch."
-msgstr "No es pot actualitzar la branca actual a la força."
+msgid "%s: already exists in index"
+msgstr "%s: ja existeix en l'índex"
-#: branch.c:218
+#: apply.c:3920
#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
-msgstr ""
-"No es pot configurar la informació de seguiment; el punt inicial '%s' no és "
-"una branca."
+msgid "%s: already exists in working directory"
+msgstr "%s: ja existeix en el directori de treball"
-#: branch.c:220
+#: apply.c:3940
#, c-format
-msgid "the requested upstream branch '%s' does not exist"
-msgstr "la branca font demanada '%s' no existeix"
-
-#: branch.c:222
-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"
-"Si teniu pensat basar el vostre treball en una branca\n"
-"font que ja existeix al remot, pot ser que necessiteu\n"
-"executar \"git fetch\" per a obtenir-la.\n"
-"\n"
-"Si teniu pensat pujar una branca local nova que seguirà\n"
-"la seva contrapart remota, pot ser que vulgueu usar\n"
-"\"git push -u\" per a establir la configuració font\n"
-"mentre pugeu."
+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)"
-#: branch.c:266
+#: apply.c:3945
#, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "No és un nom d'objecte vàlid: '%s'."
+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"
-#: branch.c:286
+#: apply.c:3965
#, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "Nom d'objecte ambigu: '%s'."
+msgid "affected file '%s' is beyond a symbolic link"
+msgstr "el fitxer afectat '%s' és més enllà d'un enllaç simbòlic"
-#: branch.c:291
+#: apply.c:3969
#, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "No és un punt de ramificació vàlid: '%s'."
+msgid "%s: patch does not apply"
+msgstr "%s: el pedaç no s'aplica"
-#: branch.c:345
+#: apply.c:3984
#, c-format
-msgid "'%s' is already checked out at '%s'"
-msgstr "'%s' ja s'ha agafat a '%s'"
+msgid "Checking patch %s..."
+msgstr "S'està comprovant el pedaç %s..."
-#: branch.c:364
+#: apply.c:4075
#, c-format
-msgid "HEAD of working tree %s is not updated"
-msgstr "La HEAD de l'arbre de treball %s no està actualitzat"
+msgid "sha1 information is lacking or useless for submodule %s"
+msgstr "falta la informació sha1 o és inútil per al submòdul %s"
-#: bundle.c:34
+#: apply.c:4082
#, c-format
-msgid "'%s' does not look like a v2 bundle file"
-msgstr "'%s' no sembla un fitxer de farcell v2"
+msgid "mode change for %s, which is not in current HEAD"
+msgstr "canvi de mode per a %s, el qual no està en el HEAD actual"
-#: bundle.c:61
+#: apply.c:4085
#, c-format
-msgid "unrecognized header: %s%s (%d)"
-msgstr "capçalera no reconeguda: %s%s (%d)"
+msgid "sha1 information is lacking or useless (%s)."
+msgstr "falta informació sha1 o és inútil (%s)."
-#: bundle.c:87 builtin/commit.c:778
+#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
-msgid "could not open '%s'"
-msgstr "no s'ha pogut obrir '%s'"
-
-#: bundle.c:139
-msgid "Repository lacks these prerequisite commits:"
-msgstr "Al dipòsit li manquen aquestes comissions prerequisits:"
+msgid "make_cache_entry failed for path '%s'"
+msgstr "make_cache_entry ha fallat per al camí '%s'"
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085
-#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348
-#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901
-#: builtin/merge.c:356 builtin/shortlog.c:170
-msgid "revision walk setup failed"
-msgstr "la configuració del passeig per revisions ha fallat"
+#: apply.c:4094
+#, c-format
+msgid "could not add %s to temporary index"
+msgstr "no s'ha pogut afegir %s a l'index temporal"
-#: bundle.c:185
+#: apply.c:4104
#, c-format
-msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %d refs:"
-msgstr[0] "El farcell conté aquesta referència:"
-msgstr[1] "El farcell conté aquestes %d referències:"
+msgid "could not write temporary index to %s"
+msgstr "no s'ha pogut escriure l'índex temporal a %s"
-#: bundle.c:192
-msgid "The bundle records a complete history."
-msgstr "El farcell registra una història completa."
+#: apply.c:4242
+#, c-format
+msgid "unable to remove %s from index"
+msgstr "no s'ha pogut eliminar %s de l'índex"
-#: bundle.c:194
+#: apply.c:4277
#, c-format
-msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %d refs:"
-msgstr[0] "El farcell requereix aquesta referència:"
-msgstr[1] "El farcell requereix aquestes %d referències:"
+msgid "corrupt patch for submodule %s"
+msgstr "pedaç malmès per al submòdul %s"
-#: bundle.c:253
-msgid "Could not spawn pack-objects"
-msgstr "No s'ha pogut executar el pack-objects"
+#: apply.c:4283
+#, c-format
+msgid "unable to stat newly created file '%s'"
+msgstr "no s'ha pogut fer stat al fitxer novament creat '%s'"
-#: bundle.c:264
-msgid "pack-objects died"
-msgstr "El pack-objects s'ha mort"
+#: apply.c:4291
+#, c-format
+msgid "unable to create backing store for newly created file %s"
+msgstr ""
+"no s'ha pogut crear un magatzem de recolzament per al fitxer novament creat "
+"%s"
-#: bundle.c:304
-msgid "rev-list died"
-msgstr "El rev-list s'ha mort"
+#: apply.c:4297 apply.c:4441
+#, c-format
+msgid "unable to add cache entry for %s"
+msgstr "no s'ha pogut afegir una entrada de cau per a %s"
-#: bundle.c:353
+#: apply.c:4338
#, 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'"
+msgid "failed to write to '%s'"
+msgstr "s'ha fallat en escriure a '%s'"
-#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273
+#: apply.c:4342
#, c-format
-msgid "unrecognized argument: %s"
-msgstr "paràmetre no reconegut: %s"
+msgid "closing file '%s'"
+msgstr "s'està tancant el fitxer '%s'"
-#: bundle.c:451
-msgid "Refusing to create empty bundle."
-msgstr "S'està refusant crear un farcell buit."
+#: apply.c:4412
+#, c-format
+msgid "unable to write file '%s' mode %o"
+msgstr "no s'ha pogut escriure el fitxer '%s' mode %o"
-#: bundle.c:463
+#: apply.c:4510
#, c-format
-msgid "cannot create '%s'"
-msgstr "no es pot crear '%s'"
+msgid "Applied patch %s cleanly."
+msgstr "El pedaç %s s'ha aplicat netament."
-#: bundle.c:491
-msgid "index-pack died"
-msgstr "L'index-pack s'ha mort"
+#: apply.c:4518
+msgid "internal error"
+msgstr "error intern"
-#: color.c:290
+#: apply.c:4521
#, c-format
-msgid "invalid color value: %.*s"
-msgstr "valor de color no vàlid: %.*s"
+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 rebuitjos..."
-#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505
-#: builtin/am.c:2119
+#: apply.c:4532
#, c-format
-msgid "could not parse %s"
-msgstr "no s'ha pogut analitzar %s"
+msgid "truncating .rej filename to %.*s.rej"
+msgstr "s'està truncant el nom del fitxer .rej a %.*s.rej"
-#: commit.c:42
+#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989
#, c-format
-msgid "%s %s is not a commit!"
-msgstr "%s %s no és una comissió!"
+msgid "cannot open %s"
+msgstr "no es pot obrir %s"
-#: compat/obstack.c:406 compat/obstack.c:408
-msgid "memory exhausted"
-msgstr "memòria esgotada"
+#: apply.c:4554
+#, c-format
+msgid "Hunk #%d applied cleanly."
+msgstr "El tros #%d s'ha aplicat netament."
-#: config.c:516
+#: apply.c:4558
#, c-format
-msgid "bad config line %d in blob %s"
-msgstr "línia de configuració dolenta %d en el blob %s"
+msgid "Rejected hunk #%d."
+msgstr "S'ha rebutjat el tros #%d."
-#: config.c:520
+#: apply.c:4668
#, c-format
-msgid "bad config line %d in file %s"
-msgstr "línia de configuració dolenta %d en el fitxer %s"
+msgid "Skipped patch '%s'."
+msgstr "S'ha saltat el pedaç '%s'."
-#: config.c:524
+#: apply.c:4676
+msgid "unrecognized input"
+msgstr "entrada no reconeguda"
+
+#: apply.c:4695
+msgid "unable to read index file"
+msgstr "no es pot llegir el fitxer d'índex"
+
+#: apply.c:4833
#, c-format
-msgid "bad config line %d in standard input"
-msgstr "línia de configuració dolenta %d en l'entrada estàndard"
+msgid "can't open patch '%s': %s"
+msgstr "no es pot obrir el pedaç '%s': %s"
-#: config.c:528
+#: apply.c:4858
#, c-format
-msgid "bad config line %d in submodule-blob %s"
-msgstr "línia de configuració dolenta %d en el blob de submòdul %s"
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] "s'ha omès %d error d'espai en blanc"
+msgstr[1] "s'han omès %d errors d'espai en blanc"
-#: config.c:532
+#: apply.c:4864 apply.c:4879
#, c-format
-msgid "bad config line %d in command line %s"
-msgstr "línia de configuració dolenta %d en la línia d'ordres %s"
+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."
-#: config.c:536
+#: apply.c:4872
#, c-format
-msgid "bad config line %d in %s"
-msgstr "línia de configuració dolenta %d en %s"
+msgid "%d line applied after fixing whitespace errors."
+msgid_plural "%d lines applied after fixing whitespace errors."
+msgstr[0] ""
+"S'ha aplicat %d línia desprès d'arreglar els errors d'espai en blanc."
+msgstr[1] ""
+"S'han aplicat %d línies desprès d'arreglar els errors d'espai en blanc."
-#: config.c:655
-msgid "out of range"
-msgstr "fora de rang"
+#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431
+msgid "Unable to write new index file"
+msgstr "no s'ha pogut escriure un fitxer d'índex nou"
-#: config.c:655
-msgid "invalid unit"
-msgstr "unitat no vàlida"
+#: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
+#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592
+#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947
+msgid "path"
+msgstr "camí"
-#: config.c:661
-#, c-format
-msgid "bad numeric config value '%s' for '%s': %s"
-msgstr "valor de configuració numèric dolent '%s' per '%s': %s"
+#: apply.c:4920
+msgid "don't apply changes matching the given path"
+msgstr "no apliquis els canvis que coincideixin amb el camí donat"
-#: config.c:666
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
-msgstr "valor de configuració numèric dolent '%s' per '%s' en el blob %s: %s"
+#: apply.c:4923
+msgid "apply changes matching the given path"
+msgstr "aplica els canvis que coincideixin amb el camí donat"
-#: config.c:669
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in file %s: %s"
-msgstr "valor de configuració numèric dolent '%s' per '%s' en el fitxer %s: %s"
+#: apply.c:4925 builtin/am.c:2286
+msgid "num"
+msgstr "número"
-#: config.c:672
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+#: apply.c:4926
+msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-"valor de configuració numèric dolent '%s' per '%s' en l'entrada estàndard: %s"
+"elimina <nombre> barres obliqües inicials dels camins de diferència "
+"tradicionals"
-#: config.c:675
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
-msgstr ""
-"valor de configuració numèric dolent '%s' per '%s' en el blob de submòdul "
-"%s: %s"
+#: apply.c:4929
+msgid "ignore additions made by the patch"
+msgstr "ignora afegiments fets pel pedaç"
-#: config.c:678
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+#: apply.c:4931
+msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-"valor de configuració numèric dolent '%s' per '%s' en la línia d'ordres %s: "
-"%s"
+"en lloc d'aplicar el pedaç, emet les estadístiques de diferència de l'entrada"
-#: config.c:681
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in %s: %s"
-msgstr "valor de configuració numèric dolent '%s' per '%s' en %s: %s"
+#: apply.c:4935
+msgid "show number of added and deleted lines in decimal notation"
+msgstr "mostra el nombre de línies afegides i suprimides en notació decimal"
-#: config.c:768
-#, c-format
-msgid "failed to expand user dir in: '%s'"
-msgstr "s'ha fallat en expandir el directori d'usuari en '%s'"
+#: apply.c:4937
+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"
-#: config.c:849 config.c:860
-#, c-format
-msgid "bad zlib compression level %d"
-msgstr "nivell de compressió de zlib dolent %d"
+#: apply.c:4939
+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"
-#: config.c:978
-#, c-format
-msgid "invalid mode for object creation: %s"
-msgstr "mode de creació d'objecte no vàlid: %s"
+#: apply.c:4941
+msgid "make sure the patch is applicable to the current index"
+msgstr "assegura que el pedaç sigui aplicable a l'índex actual"
-#: config.c:1312
-msgid "unable to parse command-line config"
-msgstr "no s'ha pogut analitzar la configuració de la línia d'ordres"
+#: apply.c:4943
+msgid "apply a patch without touching the working tree"
+msgstr "aplica un pedaç sense tocar l'arbre de treball"
-#: config.c:1362
-msgid "unknown error occurred while reading the configuration files"
-msgstr "un error desconegut ha ocorregut en llegir els fitxers de configuració"
+#: apply.c:4945
+msgid "accept a patch that touches outside the working area"
+msgstr "accepta un pedaç que toqui fora de l'àrea de treball"
-#: config.c:1716
-#, 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"
+#: apply.c:4947
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)"
-#: config.c:1718
-#, c-format
-msgid "bad config variable '%s' in file '%s' at line %d"
-msgstr "variable de configuració dolenta '%s' en el fitxer '%s' a la línia %d"
+#: apply.c:4949
+msgid "attempt three-way merge if a patch does not apply"
+msgstr "intenta una fusió de tres vies si el pedaç no s'aplica"
-#: config.c:1777
-#, c-format
-msgid "%s has multiple values"
-msgstr "%s té múltiples valors"
+#: apply.c:4951
+msgid "build a temporary index based on embedded index information"
+msgstr "construeix un índex temporal basat en la informació d'índex incrustada"
-#: config.c:2311
-#, c-format
-msgid "could not set '%s' to '%s'"
-msgstr "no s'ha pogut establir '%s' a '%s'"
+#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505
+msgid "paths are separated with NUL character"
+msgstr "els camins se separen amb el caràcter NUL"
-#: config.c:2313
-#, c-format
-msgid "could not unset '%s'"
-msgstr "no s'ha pogut desestablir '%s'"
+#: apply.c:4956
+msgid "ensure at least <n> lines of context match"
+msgstr "assegura't que almenys <n> línies de context coincideixin"
-#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
-msgid "Checking connectivity"
-msgstr "S'està comprovant la connectivitat"
+#: apply.c:4957 builtin/am.c:2265
+msgid "action"
+msgstr "acció"
-#: connected.c:74
-msgid "Could not run 'git rev-list'"
-msgstr "No s'ha pogut executar 'git rev-list'"
+#: apply.c:4958
+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"
-#: connected.c:94
-msgid "failed write to rev-list"
-msgstr "escriptura fallada a rev-list"
+#: apply.c:4961 apply.c:4964
+msgid "ignore changes in whitespace when finding context"
+msgstr "ignora els canvis d'espai en blanc en cercar context"
-#: connected.c:101
-msgid "failed to close rev-list's stdin"
-msgstr "s'ha fallat en tancar l'stdin del rev-list"
+#: apply.c:4967
+msgid "apply the patch in reverse"
+msgstr "aplica el pedaç al revés"
-#: date.c:97
-msgid "in the future"
-msgstr "en el futur"
+#: apply.c:4969
+msgid "don't expect at least one line of context"
+msgstr "no esperis almenys una línia de context"
-#: date.c:103
-#, c-format
-msgid "%lu second ago"
-msgid_plural "%lu seconds ago"
-msgstr[0] "fa %lu segon"
-msgstr[1] "fa %lu segons"
+#: apply.c:4971
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr "deixa els trossos rebutjats en fitxers *.reg corresponents"
-#: date.c:110
-#, c-format
-msgid "%lu minute ago"
-msgid_plural "%lu minutes ago"
-msgstr[0] "fa %lu minut"
-msgstr[1] "fa %lu minuts"
+#: apply.c:4973
+msgid "allow overlapping hunks"
+msgstr "permet trossos encavalcants"
-#: date.c:117
-#, c-format
-msgid "%lu hour ago"
-msgid_plural "%lu hours ago"
-msgstr[0] "fa %lu hora"
-msgstr[1] "fa %lu hores"
+#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19
+#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593
+#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114
+msgid "be verbose"
+msgstr "sigues detallat"
-#: date.c:124
-#, c-format
-msgid "%lu day ago"
-msgid_plural "%lu days ago"
-msgstr[0] "fa %lu dia"
-msgstr[1] "fa %lu dies"
+#: apply.c:4976
+msgid "tolerate incorrectly detected missing new-line at the end of file"
+msgstr "tolera una línia nova incorrectament detectada al final del fitxer"
-#: date.c:130
-#, c-format
-msgid "%lu week ago"
-msgid_plural "%lu weeks ago"
-msgstr[0] "fa %lu setmana"
-msgstr[1] "fa %lu setmanes"
+#: apply.c:4979
+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"
-#: date.c:137
-#, c-format
-msgid "%lu month ago"
-msgid_plural "%lu months ago"
-msgstr[0] "fa %lu mes"
-msgstr[1] "fa %lu mesos"
+#: apply.c:4981 builtin/am.c:2274
+msgid "root"
+msgstr "arrel"
-#: date.c:148
-#, c-format
-msgid "%lu year"
-msgid_plural "%lu years"
-msgstr[0] "%lu any"
-msgstr[1] "%lu anys"
+#: apply.c:4982
+msgid "prepend <root> to all filenames"
+msgstr "anteposa <arrel> a tots els noms de fitxer"
-#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:151
-#, c-format
-msgid "%s, %lu month ago"
-msgid_plural "%s, %lu months ago"
-msgstr[0] "fa %s i %lu mes"
-msgstr[1] "fa %s i %lu mesos"
+#: archive.c:12
+msgid "git archive [<options>] <tree-ish> [<path>...]"
+msgstr "git archive [<opcions>] <arbre> [<camí>...]"
-#: date.c:156 date.c:161
-#, c-format
-msgid "%lu year ago"
-msgid_plural "%lu years ago"
-msgstr[0] "fa %lu any"
-msgstr[1] "fa %lu anys"
+#: archive.c:13
+msgid "git archive --list"
+msgstr "git archive --list"
-#: diffcore-order.c:24
-#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "s'ha fallat en llegir el fitxer d'ordres '%s'"
+#: archive.c:14
+msgid ""
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
+msgstr ""
+"git archive --remote <dipòsit> [--exec <ordre>] [<opcions>] <arbre> "
+"[<camí>...]"
-#: diffcore-rename.c:540
-msgid "Performing inexact rename detection"
-msgstr "S'està realitzant una detecció inexacta de canvis de nom"
+#: archive.c:15
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr "git archive --remote <dipòsit> [--exec <ordre>] --list"
-#: diff.c:116
+#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327
#, c-format
-msgid " Failed to parse dirstat cut-off percentage '%s'\n"
-msgstr " S'ha fallat en analitzar el percentatge limitant de dirstat '%s'\n"
+msgid "pathspec '%s' did not match any files"
+msgstr "l'especificació de camí '%s' no ha coincidit amb cap fitxer"
-#: diff.c:121
-#, c-format
-msgid " Unknown dirstat parameter '%s'\n"
-msgstr " Paràmetre de dirstat desconegut '%s'\n"
+#: archive.c:429
+msgid "fmt"
+msgstr "format"
-#: diff.c:225
-#, c-format
-msgid "Unknown value for 'diff.submodule' config variable: '%s'"
-msgstr ""
-"Valor desconegut de la variable de configuració de 'diff.submodule': '%s'"
+#: archive.c:429
+msgid "archive format"
+msgstr "format d'arxiu"
-#: diff.c:277
-#, 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"
+#: archive.c:430 builtin/log.c:1429
+msgid "prefix"
+msgstr "prefix"
-#: diff.c:3017
-#, c-format
-msgid "external diff died, stopping at %s"
-msgstr "El diff external s'ha mort, s'està aturant a %s"
+#: archive.c:431
+msgid "prepend prefix to each pathname in the archive"
+msgstr "anteposa el prefix a cada nom de camí en l'arxiu"
-#: diff.c:3415
-msgid "--follow requires exactly one pathspec"
-msgstr "--follow requereix exactament una especificació de camí"
+#: archive.c:432 builtin/blame.c:2603 builtin/blame.c:2604 builtin/config.c:59
+#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:723
+#: builtin/hash-object.c:101 builtin/ls-files.c:539 builtin/ls-files.c:542
+#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109
+#: parse-options.h:153
+msgid "file"
+msgstr "fitxer"
-#: diff.c:3578
-#, c-format
-msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
-msgstr ""
-"S'ha fallat en analitzar el paràmetre d'opció de --dirstat/-X:\n"
-"%s"
+#: archive.c:433 builtin/archive.c:89
+msgid "write the archive to this file"
+msgstr "escriu l'arxiu a aquest fitxer"
-#: diff.c:3592
-#, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
-msgstr "S'ha fallat en analitzar el paràmetre d'opció de --submodule: %s"
+#: archive.c:435
+msgid "read .gitattributes in working directory"
+msgstr "llegeix .gitattributes en el directori de treball"
-#: dir.c:1823
-msgid "failed to get kernel name and information"
-msgstr "s'ha fallat en obtenir el nombre i la informació del nucli"
+#: archive.c:436
+msgid "report archived files on stderr"
+msgstr "informa de fitxers arxivats en stderr"
-#: dir.c:1942
-msgid "Untracked cache is disabled on this system or location."
-msgstr ""
-"La memòria cau no seguida està inhabilitada en aquest sistema o ubicació."
+#: archive.c:437
+msgid "store only"
+msgstr "només emmagatzema"
-#: gpg-interface.c:178
-msgid "gpg failed to sign the data"
-msgstr "gpg ha fallat en signar les dades"
+#: archive.c:438
+msgid "compress faster"
+msgstr "comprimeix més ràpidament"
-#: gpg-interface.c:208
-msgid "could not create temporary file"
-msgstr "no s'ha pogut crear el fitxer temporal"
+#: archive.c:446
+msgid "compress better"
+msgstr "comprimeix millor"
-#: gpg-interface.c:210
-#, c-format
-msgid "failed writing detached signature to '%s'"
-msgstr "s'ha fallat en escriure la signatura separada a '%s'"
+#: archive.c:449
+msgid "list supported archive formats"
+msgstr "allista els formats d'arxiu admesos"
-#: grep.c:1792
-#, c-format
-msgid "'%s': unable to read %s"
-msgstr "'%s': no s'ha pogut llegir %s"
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
+#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953
+msgid "repo"
+msgstr "dipòsit"
-#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "s'ha fallat en fer stat a '%s'"
+#: archive.c:452 builtin/archive.c:91
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "recupera l'arxiu del dipòsit remot <dipòsit>"
-#: grep.c:1820
-#, c-format
-msgid "'%s': short read"
-msgstr "'%s': lectura curta"
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
+msgid "command"
+msgstr "ordre"
-#: help.c:205
-#, c-format
-msgid "available git commands in '%s'"
-msgstr "ordres de git disponibles en '%s'"
+#: archive.c:454 builtin/archive.c:93
+msgid "path to the remote git-upload-archive command"
+msgstr "camí a l'ordre git-upload-archive remota"
-#: help.c:212
-msgid "git commands available from elsewhere on your $PATH"
-msgstr "ordres de git disponibles d'altres llocs en el vostre $PATH"
+#: archive.c:461
+msgid "Unexpected option --remote"
+msgstr "Opció inesperada --remote"
-#: help.c:244
-msgid "These are common Git commands used in various situations:"
-msgstr "Aquestes són ordres del Git comunament usades en diverses situacions:"
+#: archive.c:463
+msgid "Option --exec can only be used together with --remote"
+msgstr "L'opció --exec només es pot usar junt amb --remote"
-#: help.c:309
-#, 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 estropejat?"
+#: archive.c:465
+msgid "Unexpected option --output"
+msgstr "Opció inesperada --output"
-#: help.c:366
-msgid "Uh oh. Your system reports no Git commands at all."
-msgstr "Ai. El vostre sistema no informa de cap ordre de Git."
+#: archive.c:487
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Format d'arxiu desconegut '%s'"
-#: help.c:388
+#: archive.c:494
#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Paràmetre no admès per al format '%s': -%d"
+
+#: attr.c:263
msgid ""
-"WARNING: You called a Git command named '%s', which does not exist.\n"
-"Continuing under the assumption that you meant '%s'"
+"Negative patterns are ignored in git attributes\n"
+"Use '\\!' for literal leading exclamation."
msgstr ""
-"ADVERTÈNCIA: Heu invocat una ordre de Git amb nom '%s', la qual no "
-"existeix.\n"
-"S'està continuant sota l'assumpció que volíeu dir '%s'"
+"Els patrons negatius s'ignoren en els atributs de git\n"
+"Useu '\\!' per exclamació capdavantera literal."
-#: help.c:393
+#: bisect.c:441
#, c-format
-msgid "in %0.1f seconds automatically..."
-msgstr "en %0.1f segons automàticament..."
+msgid "Could not open file '%s'"
+msgstr "No s'ha pogut obrir el fitxer '%s'"
-#: help.c:400
+#: bisect.c:446
#, 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 "Badly quoted content in file '%s': %s"
+msgstr "Comentari amb cometes dolentes en el fitxer '%s': %s"
-#: help.c:404 help.c:470
-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?"
+#: bisect.c:655
+#, c-format
+msgid "We cannot bisect more!\n"
+msgstr "No podem bisecar més!\n"
-#: help.c:466
+#: bisect.c:708
#, c-format
-msgid "%s: %s - %s"
-msgstr "%s: %s - %s"
+msgid "Not a valid commit name %s"
+msgstr "No és un nom de comissió vàlid %s"
-#: lockfile.c:152
+#: bisect.c:732
#, 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."
+"The merge base %s is bad.\n"
+"This means the bug has been fixed between %s and [%s].\n"
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"
-"dipòsit, per exemple, un editor obert per 'git commit'. Si us\n"
-"plau, assegureu-vos que tots els processos s'hagin terminat i\n"
-"llavors trobeu de nou. Si encara falla, potser que un procés de\n"
-"git ha tingut una pana:\n"
-"elimineu el fitxer manualment per a continuar."
+"La base de fusió %s és dolenta.\n"
+"Això vol dir que el defecte s'ha arreglat entre %s i [%s].\n"
-#: lockfile.c:160
+#: bisect.c:737
#, c-format
-msgid "Unable to create '%s.lock': %s"
-msgstr "No es pot crear '%s.lock': %s"
+msgid ""
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
+msgstr ""
+"La base de fusió %s és nova.\n"
+"La propietat s'ha canviat entre %s i [%s].\n"
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "s'ha fallat en llegir la memòria cau"
+#: bisect.c:742
+#, c-format
+msgid ""
+"The merge base %s is %s.\n"
+"This means the first '%s' commit is between %s and [%s].\n"
+msgstr ""
+"La base de fusió %s és %s.\n"
+"Això vol dir que la primera comissió '%s' és entre %s i [%s].\n"
-#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375
-#: builtin/checkout.c:589 builtin/clone.c:732
-msgid "unable to write new index file"
-msgstr "no s'ha pogut escriure un fitxer d'índex nou"
+#: bisect.c:750
+#, c-format
+msgid ""
+"Some %s revs are not ancestor of the %s rev.\n"
+"git bisect cannot work properly in this case.\n"
+"Maybe you mistook %s and %s revs?\n"
+msgstr ""
+"Unes revisions %s no són els avantpassats de la revisió %s.\n"
+"git bisect no pot funcionar correctament en aquest cas.\n"
+"Potser heu confós les revisions %s i %s?\n"
-#: merge-recursive.c:209
-msgid "(bad commit)\n"
-msgstr "(comissió dolenta)\n"
+#: bisect.c:763
+#, 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'ha de saltar la base de fusió entre %s i [%s].\n"
+"Llavors, no podem estar segurs de que la primera comissió %s sigui entre %s "
+"i %s.\n"
+"Continuem de totes maneres."
-#: merge-recursive.c:231
+#: bisect.c:798
#, c-format
-msgid "addinfo_cache failed for path '%s'"
-msgstr "addinfo_cache ha fallat per al camí '%s'"
+msgid "Bisecting: a merge base must be tested\n"
+msgstr "Bisecant: s'ha de provar una base de fusió\n"
-#: merge-recursive.c:301
-msgid "error building trees"
-msgstr "error en construir arbres"
+#: bisect.c:849
+#, c-format
+msgid "a %s revision is needed"
+msgstr "es necessita una revisió %s"
-#: merge-recursive.c:720
+#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
#, c-format
-msgid "failed to create path '%s'%s"
-msgstr "s'ha fallat en crear el camí '%s' %s"
+msgid "could not create file '%s'"
+msgstr "no s'ha pogut crear el fitxer '%s'"
-#: merge-recursive.c:731
+#: bisect.c:917
#, 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 "could not read file '%s'"
+msgstr "no s'ha pogut llegir el fitxer '%s'"
-#: merge-recursive.c:745 merge-recursive.c:764
-msgid ": perhaps a D/F conflict?"
-msgstr ": potser un conflicte D/F?"
+#: bisect.c:947
+msgid "reading bisect refs failed"
+msgstr "la lectura de les referències de bisecció ha fallat"
-#: merge-recursive.c:754
+#: bisect.c:967
#, c-format
-msgid "refusing to lose untracked file at '%s'"
-msgstr "s'està refusant perdre el fitxer no seguit a '%s'"
+msgid "%s was both %s and %s\n"
+msgstr "%s era ambdós %s i %s\n"
-#: merge-recursive.c:796
+#: bisect.c:975
#, c-format
-msgid "cannot read object %s '%s'"
-msgstr "no es pot llegir l'objecte %s '%s'"
+msgid ""
+"No testable commit found.\n"
+"Maybe you started with bad path parameters?\n"
+msgstr ""
+"No s'ha trobat cap comissió provable.\n"
+"Potser heu començat amb paràmetres de camí dolents?\n"
-#: merge-recursive.c:798
+#: bisect.c:994
#, c-format
-msgid "blob expected for %s '%s'"
-msgstr "blob esperat per a %s '%s'"
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] "(aproximadament %d pas)"
+msgstr[1] "(aproximadament %d passos)"
-#: merge-recursive.c:822
+#. TRANSLATORS: the last %s will be replaced with
+#. "(roughly %d steps)" translation
+#: bisect.c:998
#, c-format
-msgid "failed to open '%s': %s"
-msgstr "s'ha fallat en obrir '%s': %s"
+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"
-#: merge-recursive.c:833
+#: branch.c:53
#, c-format
-msgid "failed to symlink '%s': %s"
-msgstr "s'ha fallat en fer l'enllaç simbòlic '%s': %s"
+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"
+"Després de corregir la causa de l'error, podeu\n"
+"intentar corregir la informació de seguiment remot\n"
+"invocant \"git branch --set-upstream-to=%s%s%s\"."
-#: merge-recursive.c:838
+#: branch.c:67
#, 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:978
-msgid "Failed to execute internal merge"
-msgstr "S'ha fallat en executar la fusió interna"
+msgid "Not setting branch %s as its own upstream."
+msgstr "No s'està establint la branca %s com a la seva pròpia font."
-#: merge-recursive.c:982
+#: branch.c:93
#, c-format
-msgid "Unable to add %s to database"
-msgstr "no s'ha pogut afegir %s a la base de dades"
+msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+msgstr ""
+"La branca %s està configurada per a seguir la branca remota %s de %s per "
+"rebasar."
-#: merge-recursive.c:1081 merge-recursive.c:1095
+#: branch.c:94
#, 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."
+msgid "Branch %s set up to track remote branch %s from %s."
+msgstr "La branca %s està configurada per a seguir la branca remota %s de %s."
-#: merge-recursive.c:1087 merge-recursive.c:1100
+#: branch.c:98
#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree at %s."
+msgid "Branch %s set up to track local branch %s by rebasing."
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:1143
-msgid "rename"
-msgstr "canvia de nom"
-
-#: merge-recursive.c:1143
-msgid "renamed"
-msgstr "canviat de nom"
+"La branca %s està configurada per a seguir la branca local %s per rebasar."
-#: merge-recursive.c:1200
+#: branch.c:99
#, 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ò"
+msgid "Branch %s set up to track local branch %s."
+msgstr "La branca %s està configurada per a seguir la branca local %s."
-#: merge-recursive.c:1225
+#: branch.c:104
#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
+msgid "Branch %s set up to track remote ref %s by rebasing."
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"
+"La branca %s està configurada per a seguir la referència remota %s per "
+"rebasar."
-#: merge-recursive.c:1230
-msgid " (left unresolved)"
-msgstr " (deixat sense resolució)"
+#: branch.c:105
+#, c-format
+msgid "Branch %s set up to track remote ref %s."
+msgstr "La branca %s està configurada per a seguir la referència remota %s."
-#: merge-recursive.c:1292
+#: branch.c:109
#, c-format
-msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
+msgid "Branch %s set up to track local ref %s by rebasing."
msgstr ""
-"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de "
-"nom %s->%s en %s"
+"La branca %s està configurada per a seguir la referència local %s per "
+"rebasar."
-#: merge-recursive.c:1325
+#: branch.c:110
#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
-msgstr "S'està canviant el nom de %s a %s i %s a %s en lloc d'això"
+msgid "Branch %s set up to track local ref %s."
+msgstr "La branca %s està configurada per a seguir la referència local %s."
-#: merge-recursive.c:1531
+#: branch.c:119
+msgid "Unable to write upstream branch configuration"
+msgstr "No es pot escriure la configuració de la branca font"
+
+#: branch.c:156
#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
-msgstr ""
-"CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s en %s. %s afegit en "
-"%s"
+msgid "Not tracking: ambiguous information for ref %s"
+msgstr "No seguint: informació ambigua per a la referència %s"
-#: merge-recursive.c:1546
+#: branch.c:185
#, c-format
-msgid "Adding merged %s"
-msgstr "S'està afegint %s fusionat"
+msgid "'%s' is not a valid branch name."
+msgstr "'%s' no és un nom de branca vàlid."
-#: merge-recursive.c:1553 merge-recursive.c:1766
+#: branch.c:190
#, c-format
-msgid "Adding as %s instead"
-msgstr "S'està afegint com a %s en lloc d'això"
+msgid "A branch named '%s' already exists."
+msgstr "Una branca amb nom '%s' ja existeix."
-#: merge-recursive.c:1610
+#: branch.c:198
+msgid "Cannot force update the current branch."
+msgstr "No es pot actualitzar la branca actual a la força."
+
+#: branch.c:218
#, c-format
-msgid "cannot read object %s"
-msgstr "no es pot llegir l'objecte %s"
+msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgstr ""
+"No es pot configurar la informació de seguiment; el punt inicial '%s' no és "
+"una branca."
-#: merge-recursive.c:1613
+#: branch.c:220
#, c-format
-msgid "object %s is not a blob"
-msgstr "L'objecte %s no és un blob"
+msgid "the requested upstream branch '%s' does not exist"
+msgstr "la branca font demanada '%s' no existeix"
-#: merge-recursive.c:1666
-msgid "modify"
-msgstr "modifica"
+#: branch.c:222
+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"
+"Si teniu pensat basar el vostre treball en una branca\n"
+"font que ja existeix al remot, pot ser que necessiteu\n"
+"executar \"git fetch\" per a obtenir-la.\n"
+"\n"
+"Si teniu pensat pujar una branca local nova que seguirà\n"
+"la seva contrapart remota, pot ser que vulgueu usar\n"
+"\"git push -u\" per a establir la configuració font\n"
+"mentre pugeu."
-#: merge-recursive.c:1666
-msgid "modified"
-msgstr "modificat"
+#: branch.c:265
+#, c-format
+msgid "Not a valid object name: '%s'."
+msgstr "No és un nom d'objecte vàlid: '%s'."
-#: merge-recursive.c:1676
-msgid "content"
-msgstr "contingut"
+#: branch.c:285
+#, c-format
+msgid "Ambiguous object name: '%s'."
+msgstr "Nom d'objecte ambigu: '%s'."
-#: merge-recursive.c:1683
-msgid "add/add"
-msgstr "afegiment/afegiment"
+#: branch.c:290
+#, c-format
+msgid "Not a valid branch point: '%s'."
+msgstr "No és un punt de ramificació vàlid: '%s'."
-#: merge-recursive.c:1718
+#: branch.c:344
#, c-format
-msgid "Skipped %s (merged same as existing)"
-msgstr "S'ha saltat %s (el fusionat és igual a l'existent)"
+msgid "'%s' is already checked out at '%s'"
+msgstr "'%s' ja s'ha agafat a '%s'"
-#: merge-recursive.c:1732
+#: branch.c:363
#, c-format
-msgid "Auto-merging %s"
-msgstr "S'està autofusionant %s"
+msgid "HEAD of working tree %s is not updated"
+msgstr "La HEAD de l'arbre de treball %s no està actualitzat"
-#: merge-recursive.c:1736 git-submodule.sh:919
-msgid "submodule"
-msgstr "submòdul"
+#: bundle.c:34
+#, c-format
+msgid "'%s' does not look like a v2 bundle file"
+msgstr "'%s' no sembla un fitxer de farcell v2"
-#: merge-recursive.c:1737
+#: bundle.c:61
#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "CONFLICTE (%s): Conflicte de fusió en %s"
+msgid "unrecognized header: %s%s (%d)"
+msgstr "capçalera no reconeguda: %s%s (%d)"
-#: merge-recursive.c:1831
+#: bundle.c:87 sequencer.c:963 builtin/commit.c:777
#, c-format
-msgid "Removing %s"
-msgstr "S'està eliminant %s"
+msgid "could not open '%s'"
+msgstr "no s'ha pogut obrir '%s'"
-#: merge-recursive.c:1857
-msgid "file/directory"
-msgstr "fitxer/directori"
+#: bundle.c:139
+msgid "Repository lacks these prerequisite commits:"
+msgstr "Al dipòsit li manquen aquestes comissions prerequisits:"
-#: merge-recursive.c:1863
-msgid "directory/file"
-msgstr "directori/fitxer"
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374
+#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348
+#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
+#: builtin/merge.c:356 builtin/shortlog.c:170
+msgid "revision walk setup failed"
+msgstr "la configuració del passeig per revisions ha fallat"
-#: merge-recursive.c:1868
+#: bundle.c:185
#, 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:1877
-#, c-format
-msgid "Adding %s"
-msgstr "S'està afegint %s"
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %d refs:"
+msgstr[0] "El farcell conté aquesta referència:"
+msgstr[1] "El farcell conté aquestes %d referències:"
-#: merge-recursive.c:1914
-msgid "Already up-to-date!"
-msgstr "Ja està al dia!"
+#: bundle.c:192
+msgid "The bundle records a complete history."
+msgstr "El farcell registra una història completa."
-#: merge-recursive.c:1923
+#: bundle.c:194
#, c-format
-msgid "merging of trees %s and %s failed"
-msgstr "la fusió dels arbres %s i %s ha fallat"
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %d refs:"
+msgstr[0] "El farcell requereix aquesta referència:"
+msgstr[1] "El farcell requereix aquestes %d referències:"
-#: merge-recursive.c:2006
-msgid "Merging:"
-msgstr "Fusionant:"
+#: bundle.c:253
+msgid "Could not spawn pack-objects"
+msgstr "No s'ha pogut executar el pack-objects"
-#: merge-recursive.c:2019
-#, c-format
-msgid "found %u common ancestor:"
-msgid_plural "found %u common ancestors:"
-msgstr[0] "s'ha trobat %u avantpassat:"
-msgstr[1] "s'han trobat %u avantpassats:"
+#: bundle.c:264
+msgid "pack-objects died"
+msgstr "El pack-objects s'ha mort"
-#: merge-recursive.c:2058
-msgid "merge returned no commit"
-msgstr "la fusió no ha retornat cap comissió"
+#: bundle.c:304
+msgid "rev-list died"
+msgstr "El rev-list s'ha mort"
-#: merge-recursive.c:2121
+#: bundle.c:353
#, c-format
-msgid "Could not parse object '%s'"
-msgstr "No s'ha pogut analitzar l'objecte '%s'"
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr "les opcions de la llista de revisions exclouen la referència '%s'"
-#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
-msgid "Unable to write index."
-msgstr "No s'ha pogut escriure l'índex."
+#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "paràmetre no reconegut: %s"
-#: notes-utils.c:41
-msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr "No es pot cometre un arbre de notes no inicialitzat / no referenciat"
+#: bundle.c:451
+msgid "Refusing to create empty bundle."
+msgstr "S'està refusant crear un farcell buit."
-#: notes-utils.c:100
+#: bundle.c:463
#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "Valor de notes.rewriteMode dolent: '%s'"
+msgid "cannot create '%s'"
+msgstr "no es pot crear '%s'"
-#: notes-utils.c:110
+#: bundle.c:491
+msgid "index-pack died"
+msgstr "L'index-pack s'ha mort"
+
+#: color.c:290
#, 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/)"
+msgid "invalid color value: %.*s"
+msgstr "valor de color no vàlid: %.*s"
-#. TRANSLATORS: The first %s is the name of the
-#. environment variable, the second %s is its value
-#: notes-utils.c:137
+#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493
+#: builtin/am.c:2127
#, c-format
-msgid "Bad %s value: '%s'"
-msgstr "Valor dolent de %s: '%s'"
+msgid "could not parse %s"
+msgstr "no s'ha pogut analitzar %s"
-#: object.c:242
+#: commit.c:42
#, c-format
-msgid "unable to parse object: %s"
-msgstr "no s'ha pogut analitzar l'objecte: %s"
+msgid "%s %s is not a commit!"
+msgstr "%s %s no és una comissió!"
-#: parse-options.c:572
-msgid "..."
-msgstr "..."
+#: commit.c:1514
+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 conformava a UTF-8.\n"
+"Potser voleu esemenar-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"
-#: parse-options.c:590
+#: compat/obstack.c:406 compat/obstack.c:408
+msgid "memory exhausted"
+msgstr "memòria esgotada"
+
+#: config.c:516
#, c-format
-msgid "usage: %s"
-msgstr "ús: %s"
+msgid "bad config line %d in blob %s"
+msgstr "línia de configuració dolenta %d en el blob %s"
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation
-#: parse-options.c:594
+#: config.c:520
#, c-format
-msgid " or: %s"
-msgstr " o: %s"
+msgid "bad config line %d in file %s"
+msgstr "línia de configuració dolenta %d en el fitxer %s"
-#: parse-options.c:597
+#: config.c:524
#, c-format
-msgid " %s"
-msgstr " %s"
+msgid "bad config line %d in standard input"
+msgstr "línia de configuració dolenta %d en l'entrada estàndard"
-#: parse-options.c:631
-msgid "-NUM"
-msgstr "-NUM"
+#: config.c:528
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
+msgstr "línia de configuració dolenta %d en el blob de submòdul %s"
-#: parse-options-cb.c:108
+#: config.c:532
#, c-format
-msgid "malformed object name '%s'"
-msgstr "nom de camp mal format '%s'"
+msgid "bad config line %d in command line %s"
+msgstr "línia de configuració dolenta %d en la línia d'ordres %s"
-#: path.c:798
+#: config.c:536
#, c-format
-msgid "Could not make %s writable by group"
-msgstr "No s'ha pogut fer %s escrivible pel grup"
+msgid "bad config line %d in %s"
+msgstr "línia de configuració dolenta %d en %s"
-#: pathspec.c:133
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
-msgstr ""
-"els ajusts d'especificació de camí 'glob' i 'noglob' globals són "
-"incompatibles"
+#: config.c:655
+msgid "out of range"
+msgstr "fora de rang"
-#: pathspec.c:143
-msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
-msgstr ""
-"l'ajust d'especificació de camí 'literal' global és incompatible amb tots "
-"els altres ajusts d'especificació de camí globals"
+#: config.c:655
+msgid "invalid unit"
+msgstr "unitat no vàlida"
-#: pathspec.c:177
-msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr "paràmetre no vàlid per a la màgia d'especificació de camí 'prefix'"
+#: config.c:661
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "valor de configuració numèric dolent '%s' per '%s': %s"
-#: pathspec.c:183
+#: config.c:666
#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
-msgstr "Màgia d'especificació de camí no vàlida '%.*s' en '%s'"
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgstr "valor de configuració numèric dolent '%s' per '%s' en el blob %s: %s"
-#: pathspec.c:187
+#: config.c:669
#, 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'"
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgstr "valor de configuració numèric dolent '%s' per '%s' en el fitxer %s: %s"
-#: pathspec.c:205
+#: config.c:672
#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "Màgia d'especificació de camí no implementada '%c' en '%s'"
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgstr ""
+"valor de configuració numèric dolent '%s' per '%s' en l'entrada estàndard: %s"
-#: pathspec.c:230
+#: config.c:675
#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
-msgstr "%s: 'literal' i 'glob' són incompatibles"
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+msgstr ""
+"valor de configuració numèric dolent '%s' per '%s' en el blob de submòdul "
+"%s: %s"
-#: pathspec.c:241
+#: config.c:678
#, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s: '%s' és fora del dipòsit"
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgstr ""
+"valor de configuració numèric dolent '%s' per '%s' en la línia d'ordres %s: "
+"%s"
-#: pathspec.c:291
+#: config.c:681
#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "L'especificació '%s' és en el submòdul '%.*s'"
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr "valor de configuració numèric dolent '%s' per '%s' en %s: %s"
-#: pathspec.c:353
+#: config.c:768
#, c-format
-msgid "%s: pathspec magic not supported by this command: %s"
-msgstr ""
-"%s: aquesta ordre no és compatible amb la màgia d'especificació de camí: %s"
+msgid "failed to expand user dir in: '%s'"
+msgstr "s'ha fallat en expandir el directori d'usuari en: '%s'"
-#: pathspec.c:433
+#: config.c:852 config.c:863
#, 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"
+msgid "bad zlib compression level %d"
+msgstr "nivell de compressió de zlib dolent %d"
-#: pathspec.c:442
-msgid ""
-"There is nothing to exclude from by :(exclude) patterns.\n"
-"Perhaps you forgot to add either ':/' or '.' ?"
-msgstr ""
-"No hi ha res a excloure per patrons :(exclusió).\n"
-"Potser heu oblidat afegir o ':/' o '.' ?"
+#: config.c:978
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "mode de creació d'objecte no vàlid: %s"
-#: pretty.c:973
-msgid "unable to parse --pretty format"
-msgstr "no s'ha pogut analitzar el format --pretty"
+#: config.c:1312
+msgid "unable to parse command-line config"
+msgstr "no s'ha pogut analitzar la configuració de la línia d'ordres"
-#: progress.c:235
-msgid "done"
-msgstr "fet"
+#: config.c:1362
+msgid "unknown error occurred while reading the configuration files"
+msgstr "un error desconegut ha ocorregut en llegir els fitxers de configuració"
-#: read-cache.c:1281
+#: config.c:1716
#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-"index.version establert, però el valor no és vàlid.\n"
-"S'està usant la versió %i"
+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"
-#: read-cache.c:1291
+#: config.c:1718
#, c-format
-msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-"GIT_INDEX_VERSION establert, però el valor no és vàlid.\n"
-"S'està usant la versió %i"
+msgid "bad config variable '%s' in file '%s' at line %d"
+msgstr "variable de configuració dolenta '%s' en el fitxer '%s' a la línia %d"
-#: refs.c:551 builtin/merge.c:840
+#: config.c:1777
#, c-format
-msgid "Could not open '%s' for writing"
-msgstr "No s'ha pogut obrir '%s' per a escriptura"
+msgid "%s has multiple values"
+msgstr "%s té múltiples valors"
-#: refs/files-backend.c:2534
+#: config.c:2311
#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "no s'ha pogut suprimir la referència %s: %s"
+msgid "could not set '%s' to '%s'"
+msgstr "no s'ha pogut establir '%s' a '%s'"
-#: refs/files-backend.c:2537
+#: config.c:2313
#, c-format
-msgid "could not delete references: %s"
-msgstr "no s'ha pogut suprimir les referències: %s"
+msgid "could not unset '%s'"
+msgstr "no s'ha pogut desestablir '%s'"
+
+#: connect.c:49
+msgid "The remote end hung up upon initial contact"
+msgstr "El costat remot ha penjat en el moment de contacte inicial"
+
+#: connect.c:51
+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 dipòsit remot.\n"
+"\n"
+"Si us plau, assegureu-vos que tingueu els drets\n"
+"d'accés correctes i que el dipòsit existeixi."
+
+#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
+msgid "Checking connectivity"
+msgstr "S'està comprovant la connectivitat"
+
+#: connected.c:75
+msgid "Could not run 'git rev-list'"
+msgstr "No s'ha pogut executar 'git rev-list'"
+
+#: connected.c:95
+msgid "failed write to rev-list"
+msgstr "escriptura fallada al rev-list"
-#: refs/files-backend.c:2546
+#: connected.c:102
+msgid "failed to close rev-list's stdin"
+msgstr "s'ha fallat en tancar l'stdin del rev-list"
+
+#: convert.c:201
#, c-format
-msgid "could not remove reference %s"
-msgstr "no s'ha pogut eliminar la referència %s"
+msgid ""
+"CRLF will be replaced by LF in %s.\n"
+"The file will have its original line endings in your working directory."
+msgstr ""
+"LF reemplaçarà CRLF en %s.\n"
+"El fitxer tindrà els seus terminadors de línia originals en el vostre "
+"directori de treball."
-#: ref-filter.c:55
+#: convert.c:205
#, c-format
-msgid "expected format: %%(color:<color>)"
-msgstr "format esperat: %%(color:<color>)"
+msgid "CRLF would be replaced by LF in %s."
+msgstr "LF reemplaçaria CRLF en %s."
-#: ref-filter.c:57
+#: convert.c:211
#, c-format
-msgid "unrecognized color: %%(color:%s)"
-msgstr "color no reconegut: %%(color:%s)"
+msgid ""
+"LF will be replaced by CRLF in %s.\n"
+"The file will have its original line endings in your working directory."
+msgstr ""
+"CRLF reemplaçarà LF en %s.\n"
+"El fitxer tindrà els seus terminadors de línia originals en el vostre "
+"directori de treball."
-#: ref-filter.c:71
+#: convert.c:215
#, c-format
-msgid "unrecognized format: %%(%s)"
-msgstr "format no reconegut: %%(%s)"
+msgid "LF would be replaced by CRLF in %s"
+msgstr "CRLF reemplaçaria LF en %s"
-#: ref-filter.c:77
+#: date.c:97
+msgid "in the future"
+msgstr "en el futur"
+
+#: date.c:103
#, c-format
-msgid "%%(body) does not take arguments"
-msgstr "%%(body) no accepta paràmetres"
+msgid "%lu second ago"
+msgid_plural "%lu seconds ago"
+msgstr[0] "fa %lu segon"
+msgstr[1] "fa %lu segons"
-#: ref-filter.c:84
+#: date.c:110
#, c-format
-msgid "%%(subject) does not take arguments"
-msgstr "%%(subject) no accepta paràmetres"
+msgid "%lu minute ago"
+msgid_plural "%lu minutes ago"
+msgstr[0] "fa %lu minut"
+msgstr[1] "fa %lu minuts"
-#: ref-filter.c:101
+#: date.c:117
#, c-format
-msgid "positive value expected contents:lines=%s"
-msgstr "valor positiu esperat contents:lines=%s"
+msgid "%lu hour ago"
+msgid_plural "%lu hours ago"
+msgstr[0] "fa %lu hora"
+msgstr[1] "fa %lu hores"
-#: ref-filter.c:103
+#: date.c:124
#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "paràmetre %%(contents) no reconegut: %s"
+msgid "%lu day ago"
+msgid_plural "%lu days ago"
+msgstr[0] "fa %lu dia"
+msgstr[1] "fa %lu dies"
-#: ref-filter.c:113
+#: date.c:130
#, c-format
-msgid "unrecognized %%(objectname) argument: %s"
-msgstr "paràmetre %%(objectname) no reconegut: %s"
+msgid "%lu week ago"
+msgid_plural "%lu weeks ago"
+msgstr[0] "fa %lu setmana"
+msgstr[1] "fa %lu setmanes"
-#: ref-filter.c:135
+#: date.c:137
#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
-msgstr "format esperat: %%(align:<amplada>,<posició>)"
+msgid "%lu month ago"
+msgid_plural "%lu months ago"
+msgstr[0] "fa %lu mes"
+msgstr[1] "fa %lu mesos"
-#: ref-filter.c:147
+#: date.c:148
#, c-format
-msgid "unrecognized position:%s"
-msgstr "posició no reconeguda:%s"
+msgid "%lu year"
+msgid_plural "%lu years"
+msgstr[0] "%lu any"
+msgstr[1] "%lu anys"
-#: ref-filter.c:151
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c:151
#, c-format
-msgid "unrecognized width:%s"
-msgstr "amplada no reconeguda:%s"
+msgid "%s, %lu month ago"
+msgid_plural "%s, %lu months ago"
+msgstr[0] "fa %s i %lu mes"
+msgstr[1] "fa %s i %lu mesos"
-#: ref-filter.c:157
+#: date.c:156 date.c:161
#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "paràmetre %%(align) no reconegut: %s"
+msgid "%lu year ago"
+msgid_plural "%lu years ago"
+msgstr[0] "fa %lu any"
+msgstr[1] "fa %lu anys"
-#: ref-filter.c:161
+#: diffcore-order.c:24
#, c-format
-msgid "positive width expected with the %%(align) atom"
-msgstr "amplada positiva esperada amb l'àtom %%(align)"
+msgid "failed to read orderfile '%s'"
+msgstr "s'ha fallat en llegir el fitxer d'ordres '%s'"
-#: ref-filter.c:244
+#: diffcore-rename.c:536
+msgid "Performing inexact rename detection"
+msgstr "S'està realitzant una detecció inexacta de canvis de nom"
+
+#: diff.c:62
#, c-format
-msgid "malformed field name: %.*s"
-msgstr "nom d'objecte mal format: %.*s"
+msgid "option '%s' requires a value"
+msgstr "l'opció '%s' requereix un valor"
-#: ref-filter.c:270
+#: diff.c:124
#, c-format
-msgid "unknown field name: %.*s"
-msgstr "nom de camp desconegut: %.*s"
+msgid " Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr " S'ha fallat en analitzar el percentatge limitant de dirstat '%s'\n"
-#: ref-filter.c:372
+#: diff.c:129
#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
-msgstr "format: s'ha usat l'àtom %%(end) sense l'àtom corresponent"
+msgid " Unknown dirstat parameter '%s'\n"
+msgstr " Paràmetre de dirstat desconegut '%s'\n"
-#: ref-filter.c:424
+#: diff.c:283
#, c-format
-msgid "malformed format string %s"
-msgstr "cadena de format mal format %s"
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr ""
+"Valor desconegut de la variable de configuració de 'diff.submodule': '%s'"
-#: ref-filter.c:878
-msgid ":strip= requires a positive integer argument"
-msgstr ":strip= requereix un paràmetre enter positiu"
+#: diff.c:346
+#, 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"
-#: ref-filter.c:883
+#: diff.c:3087
#, c-format
-msgid "ref '%s' does not have %ld components to :strip"
-msgstr "la referència '%s' no té %ld components per a :strip"
+msgid "external diff died, stopping at %s"
+msgstr "el diff external s'ha mort, s'està aturant a %s"
-#: ref-filter.c:1046
+#: diff.c:3412
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+msgstr "--name-only, --name-status, --check i -s són mutualment exclusius"
+
+#: diff.c:3502
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow requereix exactament una especificació de camí"
+
+#: diff.c:3665
#, c-format
-msgid "unknown %.*s format %s"
-msgstr "format de %.*s desconegut %s"
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+"S'ha fallat en analitzar el paràmetre d'opció de --dirstat/-X:\n"
+"%s"
-#: ref-filter.c:1066 ref-filter.c:1097
+#: diff.c:3679
#, c-format
-msgid "missing object %s for %s"
-msgstr "manca l'objecte %s per a %s"
+msgid "Failed to parse --submodule option parameter: '%s'"
+msgstr "S'ha fallat en analitzar el paràmetre d'opció de --submodule: '%s'"
-#: ref-filter.c:1069 ref-filter.c:1100
+#: diff.c:4700
+msgid "inexact rename detection was skipped due to too many files."
+msgstr "s'ha saltat la detecció de canvi de nom a causa de massa fitxers."
+
+#: diff.c:4703
+msgid "only found copies from modified paths due to too many files."
+msgstr ""
+"només s'han trobat còpies des de camins modificats a causa de massa fitxers."
+
+#: diff.c:4706
#, c-format
-msgid "parse_object_buffer failed on %s for %s"
-msgstr "parse_object_buffer ha fallat en %s per a %s"
+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."
-#: ref-filter.c:1311
+#: dir.c:1866
+msgid "failed to get kernel name and information"
+msgstr "s'ha fallat en obtenir el nombre i la informació del nucli"
+
+#: dir.c:1985
+msgid "Untracked cache is disabled on this system or location."
+msgstr ""
+"La memòria cau no seguida està inhabilitada en aquest sistema o ubicació."
+
+#: fetch-pack.c:213
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack: llista superficial esperada"
+
+#: fetch-pack.c:225
+msgid "git fetch-pack: expected ACK/NAK, got EOF"
+msgstr "git fetch-pack: ACK/NAK esperat, EOF rebut"
+
+#: fetch-pack.c:243
#, c-format
-msgid "malformed object at '%s'"
-msgstr "objecte mal format a '%s'"
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack: ACK/NAK esperat, '%s' rebut"
-#: ref-filter.c:1373
+#: fetch-pack.c:295
+msgid "--stateless-rpc requires multi_ack_detailed"
+msgstr "--stateless-rpc requereix multi_ack_detailed"
+
+#: fetch-pack.c:381
#, c-format
-msgid "ignoring ref with broken name %s"
-msgstr "s'està ignorant la referència amb nom trencat %s"
+msgid "invalid shallow line: %s"
+msgstr "línia de shallow no vàlida: %s"
-#: ref-filter.c:1378
+#: fetch-pack.c:387
#, c-format
-msgid "ignoring broken ref %s"
-msgstr "s'està ignorant la referència trencada %s"
+msgid "invalid unshallow line: %s"
+msgstr "línia d'unshallow no vàlida: %s"
-#: ref-filter.c:1651
+#: fetch-pack.c:389
#, c-format
-msgid "format: %%(end) atom missing"
-msgstr "format: manca l'àtom %%(end)"
+msgid "object not found: %s"
+msgstr "objecte no trobat: %s"
-#: ref-filter.c:1705
+#: fetch-pack.c:392
#, c-format
-msgid "malformed object name %s"
-msgstr "nom d'objecte %s mal format"
+msgid "error in object: %s"
+msgstr "error en objecte: %s"
-#: remote.c:746
+#: fetch-pack.c:394
#, c-format
-msgid "Cannot fetch both %s and %s to %s"
-msgstr "No es pot obtenir ambdós %s i %s a %s"
+msgid "no shallow found: %s"
+msgstr "no s'ha trobat cap superficial: %s"
-#: remote.c:750
+#: fetch-pack.c:397
#, c-format
-msgid "%s usually tracks %s, not %s"
-msgstr "%s generalment segueix %s, no %s"
+msgid "expected shallow/unshallow, got %s"
+msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
-#: remote.c:754
+#: fetch-pack.c:436
#, c-format
-msgid "%s tracks both %s and %s"
-msgstr "%s segueix ambdós %s i %s"
+msgid "got %s %d %s"
+msgstr "%s %d %s rebut"
-#: remote.c:762
-msgid "Internal error"
-msgstr "Error intern"
+#: fetch-pack.c:450
+#, c-format
+msgid "invalid commit %s"
+msgstr "comissió no vàlida %s"
-#: remote.c:1677 remote.c:1720
-msgid "HEAD does not point to a branch"
-msgstr "HEAD no assenyala cap branca"
+#: fetch-pack.c:483
+msgid "giving up"
+msgstr "s'està rendint"
-#: remote.c:1686
-#, c-format
-msgid "no such branch: '%s'"
-msgstr "no hi ha tal branca: '%s'"
+#: fetch-pack.c:493 progress.c:235
+msgid "done"
+msgstr "fet"
-#: remote.c:1689
+#: fetch-pack.c:505
#, c-format
-msgid "no upstream configured for branch '%s'"
-msgstr "cap font configurada per a la branca '%s'"
+msgid "got %s (%d) %s"
+msgstr "s'ha rebut %s (%d) %s"
-#: remote.c:1695
+#: fetch-pack.c:551
#, 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"
+msgid "Marking %s as complete"
+msgstr "S'està marcant %s com a complet"
-#: remote.c:1710
+#: fetch-pack.c:697
#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
-msgstr ""
-"el destí de pujada '%s' en el remot '%s' no té cap branca seguidora local"
+msgid "already have %s (%s)"
+msgstr "ja es té %s (%s)"
-#: remote.c:1725
+#: fetch-pack.c:735
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack: no s'ha pogut bifurcar del demultiplexor de banda lateral"
+
+#: fetch-pack.c:743
+msgid "protocol error: bad pack header"
+msgstr "error de protocol: capçalera de paquet dolent"
+
+#: fetch-pack.c:799
#, c-format
-msgid "branch '%s' has no remote for pushing"
-msgstr "la branca '%s' no té cap remot al qual pujar"
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack: no es pot bifurcar de %s"
-#: remote.c:1736
+#: fetch-pack.c:815
#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
-msgstr "les especificacions de referència de '%s' no inclouen '%s'"
+msgid "%s failed"
+msgstr "%s ha fallat"
-#: remote.c:1749
-msgid "push has no destination (push.default is 'nothing')"
-msgstr "push no té destí (push.default és 'nothing')"
+#: fetch-pack.c:817
+msgid "error in sideband demultiplexer"
+msgstr "error en demultiplexor de banda lateral"
-#: remote.c:1771
-msgid "cannot resolve 'simple' push to a single destination"
-msgstr "no es pot resoldre una pujada 'simple' a un sol destí"
+#: fetch-pack.c:844
+msgid "Server does not support shallow clients"
+msgstr "El servidor no permet clients superficials"
-#: remote.c:2073
-#, 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:2077
-msgid " (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr " (useu \"git branch --unset-upstream\" per a arreglar)\n"
-
-#: remote.c:2080
-#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
-msgstr "La vostra branca està al dia amb '%s'.\n"
+#: fetch-pack.c:848
+msgid "Server supports multi_ack_detailed"
+msgstr "El servidor accepta multi_ack_detailed"
-#: remote.c:2084
-#, c-format
-msgid "Your branch is ahead of '%s' by %d commit.\n"
-msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
-msgstr[0] "La vostra branca està davant de '%s' per %d comissió.\n"
-msgstr[1] "La vostra branca està davant de '%s' per %d comissions.\n"
+#: fetch-pack.c:851
+msgid "Server supports no-done"
+msgstr "El servidor accepta no-done"
-#: remote.c:2090
-msgid " (use \"git push\" to publish your local commits)\n"
-msgstr " (useu \"git push\" per a publicar les vostres comissions locals)\n"
+#: fetch-pack.c:857
+msgid "Server supports multi_ack"
+msgstr "El servidor accepta multi_ack"
-#: remote.c:2093
-#, 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à darrere de '%s' per %d comissió, i pot avançar-se "
-"ràpidament.\n"
-msgstr[1] ""
-"La vostra branca està darrere de '%s' per %d comissions, i pot avançar-se "
-"ràpidament.\n"
+#: fetch-pack.c:861
+msgid "Server supports side-band-64k"
+msgstr "El servidor accepta side-band-64k"
-#: remote.c:2101
-msgid " (use \"git pull\" to update your local branch)\n"
-msgstr " (useu \"git pull\" per a actualitzar la vostra branca local)\n"
+#: fetch-pack.c:865
+msgid "Server supports side-band"
+msgstr "El servidor accepta banda lateral"
-#: remote.c:2104
-#, 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' s'han divergit,\n"
-"i tenen %d i %d comissió distinta cada una, respectivament.\n"
-msgstr[1] ""
-"La vostra branca i '%s' s'han divergit,\n"
-"i tenen %d i %d comissions distintes cada una, respectivament.\n"
+#: fetch-pack.c:869
+msgid "Server supports allow-tip-sha1-in-want"
+msgstr "El servidor accepta allow-tip-sha1-in-want"
-#: remote.c:2114
-msgid " (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr " (useu \"git pull\" per a fusionar la branca remota a la vostra)\n"
+#: fetch-pack.c:873
+msgid "Server supports allow-reachable-sha1-in-want"
+msgstr "El servidor accepta allow-reachable-sha1-in-want"
-#: revision.c:2132
-msgid "your current branch appears to be broken"
-msgstr "la vostra branca actual sembla trencada"
+#: fetch-pack.c:883
+msgid "Server supports ofs-delta"
+msgstr "El servidor accepta ofs-delta"
-#: revision.c:2135
+#: fetch-pack.c:890
#, c-format
-msgid "your current branch '%s' does not have any commits yet"
-msgstr "la vostra branca actual '%s' encara no té cap comissió"
-
-#: revision.c:2329
-msgid "--first-parent is incompatible with --bisect"
-msgstr "--first-parent és incompatible amb --bisect"
-
-#: run-command.c:92
-msgid "open /dev/null failed"
-msgstr "s'ha fallat en obrir /dev/null"
+msgid "Server version is %.*s"
+msgstr "La versió del servidor és %.*s"
-#: run-command.c:94
-#, c-format
-msgid "dup2(%d,%d) failed"
-msgstr "dup2(%d,%d) ha fallat"
+#: fetch-pack.c:896
+msgid "Server does not support --shallow-since"
+msgstr "El servidor no admet --shallow-since"
-#: send-pack.c:298
-msgid "failed to sign the push certificate"
-msgstr "s'ha fallat en signar el certificat de pujada"
+#: fetch-pack.c:900
+msgid "Server does not support --shallow-exclude"
+msgstr "El servidor no admet --shallow-exclude"
-#: send-pack.c:411
-msgid "the receiving end does not support --signed push"
-msgstr "el destí receptor no admet pujar --signed"
+#: fetch-pack.c:902
+msgid "Server does not support --deepen"
+msgstr "El servidor no admet --deepen"
-#: send-pack.c:413
-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"
+#: fetch-pack.c:913
+msgid "no common commits"
+msgstr "cap comissió en comú"
-#: send-pack.c:425
-msgid "the receiving end does not support --atomic push"
-msgstr "el destí receptor no admet pujar --atomic"
+#: fetch-pack.c:925
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack: l'obtenció ha fallat."
-#: send-pack.c:430
-msgid "the receiving end does not support push options"
-msgstr "el destí receptor no admet opcions de pujada"
+#: fetch-pack.c:1087
+msgid "no matching remote head"
+msgstr "no hi ha cap cap remot coincident"
-#: sequencer.c:174
-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>'"
+#: gpg-interface.c:185
+msgid "gpg failed to sign the data"
+msgstr "gpg ha fallat en signar les dades"
-#: sequencer.c:177
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'\n"
-"and commit the result with 'git commit'"
-msgstr ""
-"després de resoldre els conflictes, marqueu els camins\n"
-"corregits amb 'git add <camins>' o 'git rm <camins>'\n"
-"i cometeu el resultat amb 'git commit'"
+#: gpg-interface.c:215
+msgid "could not create temporary file"
+msgstr "no s'ha pogut crear el fitxer temporal"
-#: sequencer.c:190 sequencer.c:841 sequencer.c:924
+#: gpg-interface.c:217
#, c-format
-msgid "Could not write to %s"
-msgstr "No s'ha pogut escriure a %s"
+msgid "failed writing detached signature to '%s'"
+msgstr "s'ha fallat en escriure la signatura separada a '%s'"
-#: sequencer.c:193 sequencer.c:843 sequencer.c:928
+#: grep.c:1782
#, c-format
-msgid "Error wrapping up %s."
-msgstr "Ha hagut un error en finalitzar %s."
-
-#: sequencer.c:208
-msgid "Your local changes would be overwritten by cherry-pick."
-msgstr "Els vostres canvis locals se sobreescriurien pel recull de cireres."
-
-#: sequencer.c:210
-msgid "Your local changes would be overwritten by revert."
-msgstr "Els vostres canvis locals se sobreescriurien per la reversió."
-
-#: sequencer.c:213
-msgid "Commit your changes or stash them to proceed."
-msgstr "Cometeu els vostres canvis o emmagatzemeu-los per a procedir."
+msgid "'%s': unable to read %s"
+msgstr "'%s': no s'ha pogut llegir %s"
-#: sequencer.c:228
+#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155
#, c-format
-msgid "%s: fast-forward"
-msgstr "%s: avanç ràpid"
+msgid "failed to stat '%s'"
+msgstr "s'ha fallat en fer stat a '%s'"
-#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:303
+#: grep.c:1810
#, c-format
-msgid "%s: Unable to write new index file"
-msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou"
-
-#: sequencer.c:321
-msgid "Could not resolve HEAD commit\n"
-msgstr "No s'ha pogut resoldre la comissió HEAD\n"
-
-#: sequencer.c:341
-msgid "Unable to update cache tree\n"
-msgstr "No s'ha pogut actualitzar l'arbre cau\n"
+msgid "'%s': short read"
+msgstr "'%s': lectura curta"
-#: sequencer.c:393
+#: help.c:203
#, c-format
-msgid "Could not parse commit %s\n"
-msgstr "No s'ha pogut analitzar la comissió %s\n"
+msgid "available git commands in '%s'"
+msgstr "ordres de git disponibles en '%s'"
-#: sequencer.c:398
-#, c-format
-msgid "Could not parse parent commit %s\n"
-msgstr "No s'ha pogut analitzar la comissió mare %s\n"
+#: help.c:210
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "ordres de git disponibles d'altres llocs en el vostre $PATH"
-#: sequencer.c:463
-msgid "Your index file is unmerged."
-msgstr "El vostre fitxer d'índex està sense fusionar."
+#: help.c:241
+msgid "These are common Git commands used in various situations:"
+msgstr "Aquestes són ordres del Git comunament usades en diverses situacions:"
-#: sequencer.c:482
+#: help.c:306
#, 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."
+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 estropejat?"
-#: sequencer.c:490
-#, c-format
-msgid "Commit %s does not have parent %d"
-msgstr "La comissió %s no té mare %d"
+#: help.c:361
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "Ai. El vostre sistema no informa de cap ordre de Git."
-#: sequencer.c:494
+#: help.c:383
#, c-format
-msgid "Mainline was specified but commit %s is not a merge."
+msgid ""
+"WARNING: You called a Git command named '%s', which does not exist.\n"
+"Continuing under the assumption that you meant '%s'"
msgstr ""
-"S'ha especificat la línia principal però la comissió %s no és una fusió."
+"ADVERTÈNCIA: Heu invocat una ordre de Git amb nom '%s', la qual no "
+"existeix.\n"
+"S'està continuant sota l'assumpció que volíeu dir '%s'"
-#. TRANSLATORS: The first %s will be "revert" or
-#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:507
+#: help.c:388
#, c-format
-msgid "%s: cannot parse parent commit %s"
-msgstr "%s: no es pot analitzar la comissió mare %s"
+msgid "in %0.1f seconds automatically..."
+msgstr "en %0.1f segons automàticament..."
-#: sequencer.c:511
+#: help.c:395
#, c-format
-msgid "Cannot get commit message for %s"
-msgstr "No es pot obtenir el missatge de comissió de %s"
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git: '%s' no és una ordre de git. Vegeu 'git --help'."
-#: sequencer.c:597
-#, c-format
-msgid "could not revert %s... %s"
-msgstr "no s'ha pogut revertir %s...%s"
+#: help.c:399 help.c:465
+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?"
-#: sequencer.c:598
+#: help.c:461
#, c-format
-msgid "could not apply %s... %s"
-msgstr "no s'ha pogut aplicar %s...%s"
+msgid "%s: %s - %s"
+msgstr "%s: %s - %s"
-#: sequencer.c:633
-msgid "empty commit set passed"
-msgstr "conjunt de comissions buit passat"
+#: ident.c:334
+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"
+"*** Si us plau, digueu-me qui sou.\n"
+"\n"
+"Executeu\n"
+"\n"
+" git config --global user.email \"vós@example.com\"\n"
+" git config --global user.name \"El Vostre Nom\"\n"
+"\n"
+"per a establir la identitat predeterminat del vostre compte.\n"
+"Ometeu --global per a establir la identitat només en aquest dipòsit.\n"
-#: sequencer.c:641
+#: lockfile.c:152
#, c-format
-msgid "git %s: failed to read the index"
-msgstr "git %s: s'ha fallat en llegir l'índex"
+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"
+"dipòsit, per exemple, un editor obert per 'git commit'. Si us\n"
+"plau, assegureu-vos que tots els processos s'hagin terminat i\n"
+"llavors trobeu de nou. Si encara falla, potser que un procés de\n"
+"git ha tingut una pana:\n"
+"elimineu el fitxer manualment per a continuar."
-#: sequencer.c:645
+#: lockfile.c:160
#, c-format
-msgid "git %s: failed to refresh the index"
-msgstr "git %s: s'ha fallat en actualitzar l'índex"
-
-#: sequencer.c:705
-msgid "Cannot revert during another revert."
-msgstr "No es pot revertir durant una altra reversió."
+msgid "Unable to create '%s.lock': %s"
+msgstr "No s'ha pogut crear '%s.lock': %s"
-#: sequencer.c:706
-msgid "Cannot revert during a cherry-pick."
-msgstr "No es pot revertir durant un recull de cireres."
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "s'ha fallat en llegir la memòria cau"
-#: sequencer.c:709
-msgid "Cannot cherry-pick during a revert."
-msgstr "No es pot recollir cireres durant una reversió."
+#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374
+#: builtin/checkout.c:588 builtin/clone.c:731
+msgid "unable to write new index file"
+msgstr "no s'ha pogut escriure un fitxer d'índex nou"
-#: sequencer.c:710
-msgid "Cannot cherry-pick during another cherry-pick."
-msgstr "No es pot recollir cireres durant altre recull de cireres."
+#: merge-recursive.c:209
+msgid "(bad commit)\n"
+msgstr "(comissió dolenta)\n"
-#: sequencer.c:732
+#: merge-recursive.c:231
#, c-format
-msgid "Could not parse line %d."
-msgstr "No s'ha pogut analitzar la línia %d."
+msgid "addinfo_cache failed for path '%s'"
+msgstr "addinfo_cache ha fallat per al camí '%s'"
-#: sequencer.c:737
-msgid "No commits parsed."
-msgstr "No s'ha analitzat cap comissió."
+#: merge-recursive.c:301
+msgid "error building trees"
+msgstr "error en construir arbres"
-#: sequencer.c:749
+#: merge-recursive.c:720
#, c-format
-msgid "Could not open %s"
-msgstr "No s'ha pogut obrir %s"
+msgid "failed to create path '%s'%s"
+msgstr "s'ha fallat en crear el camí '%s'%s"
-#: sequencer.c:753
+#: merge-recursive.c:731
#, c-format
-msgid "Could not read %s."
-msgstr "No s'ha pogut llegir %s."
+msgid "Removing %s to make room for subdirectory\n"
+msgstr "S'està eliminant %s per a fer espai per al subdirectori\n"
-#: sequencer.c:760
-#, c-format
-msgid "Unusable instruction sheet: %s"
-msgstr "Full d'instruccions inusable: %s"
+#: merge-recursive.c:745 merge-recursive.c:764
+msgid ": perhaps a D/F conflict?"
+msgstr ": potser un conflicte D/F?"
-#: sequencer.c:790
+#: merge-recursive.c:754
#, c-format
-msgid "Invalid key: %s"
-msgstr "Clau no vàlida: %s"
+msgid "refusing to lose untracked file at '%s'"
+msgstr "s'està refusant perdre el fitxer no seguit a '%s'"
-#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52
+#: merge-recursive.c:796 builtin/cat-file.c:34
#, c-format
-msgid "Invalid value for %s: %s"
-msgstr "Valor no vàlid per a %s: %s"
+msgid "cannot read object %s '%s'"
+msgstr "no es pot llegir l'objecte %s '%s'"
-#: sequencer.c:803
+#: merge-recursive.c:798
#, c-format
-msgid "Malformed options sheet: %s"
-msgstr "Full d'opcions mal format: %s"
-
-#: sequencer.c:822
-msgid "a cherry-pick or revert is already in progress"
-msgstr "un recull de cireres o una reversió ja està en curs"
-
-#: sequencer.c:823
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
-msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\""
+msgid "blob expected for %s '%s'"
+msgstr "blob esperat per a %s '%s'"
-#: sequencer.c:827
+#: merge-recursive.c:822
#, c-format
-msgid "Could not create sequencer directory %s"
-msgstr "No s'ha pogut crear el directori de seqüenciador %s"
-
-#: sequencer.c:862 sequencer.c:998
-msgid "no cherry-pick or revert in progress"
-msgstr "ni hi ha cap recull de cireres ni cap reversió en curs"
-
-#: sequencer.c:864
-msgid "cannot resolve HEAD"
-msgstr "no es pot resoldre HEAD"
-
-#: sequencer.c:866 sequencer.c:900
-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"
+msgid "failed to open '%s': %s"
+msgstr "s'ha fallat en obrir '%s': %s"
-#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970
+#: merge-recursive.c:833
#, c-format
-msgid "cannot open %s"
-msgstr "no es pot obrir %s"
+msgid "failed to symlink '%s': %s"
+msgstr "s'ha fallat en fer l'enllaç simbòlic '%s': %s"
-#: sequencer.c:888
+#: merge-recursive.c:838
#, c-format
-msgid "cannot read %s: %s"
-msgstr "no es pot llegir %s: %s"
-
-#: sequencer.c:889
-msgid "unexpected end of file"
-msgstr "final de fitxer inesperat"
-
-#: sequencer.c:895
-#, c-format
-msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
-msgstr "el fitxer HEAD emmagatzemat abans del recull de cireres '%s' és malmès"
-
-#: sequencer.c:921
-#, c-format
-msgid "Could not format %s."
-msgstr "No s'ha pogut formatar %s."
-
-#: sequencer.c:1066
-#, c-format
-msgid "%s: can't cherry-pick a %s"
-msgstr "%s: no es pot recollir com a cirera un %s"
-
-#: sequencer.c:1069
-#, c-format
-msgid "%s: bad revision"
-msgstr "%s: revisió dolenta"
+msgid "do not know what to do with %06o %s '%s'"
+msgstr "no se sap què fer amb %06o %s '%s'"
-#: sequencer.c:1102
-msgid "Can't revert as initial commit"
-msgstr "No es pot revertir com a comissió inicial"
+#: merge-recursive.c:978
+msgid "Failed to execute internal merge"
+msgstr "S'ha fallat en executar la fusió interna"
-#: setup.c:160
+#: merge-recursive.c:982
#, 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."
+msgid "Unable to add %s to database"
+msgstr "no s'ha pogut afegir %s a la base de dades"
-#: setup.c:173
+#: merge-recursive.c:1081 merge-recursive.c:1095
#, 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>...]'"
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
msgstr ""
-"paràmetre ambigu '%s': revisió no coneguda o camí no en l'arbre de treball.\n"
-"Useu '--' per a separar els camins de les revisions, com això:\n"
-"'git <ordre> [<revisió>...] -- [<fitxer>...]'"
+"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "
+"s'ha deixat en l'arbre."
-#: setup.c:223
+#: merge-recursive.c:1087 merge-recursive.c:1100
#, c-format
msgid ""
-"ambiguous argument '%s': both revision and filename\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
msgstr ""
-"paràmetre ambigu '%s': ambdós una revisió i un nom de fitxer\n"
-"Useu '--' per a separar els camins de les revisions, com això:\n"
-"'git <ordre> [<revisió>...] -- [<fitxer>...]'"
-
-#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419
-#, c-format
-msgid "failed to read %s"
-msgstr "s'ha fallat en llegir %s"
+"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "
+"s'ha deixat en l'arbre a %s."
-#: setup.c:468
-#, c-format
-msgid "Expected git repo version <= %d, found %d"
-msgstr "S'esperava una versió de dipòsit de git <= %d, s'ha trobat %d"
+#: merge-recursive.c:1143
+msgid "rename"
+msgstr "canvi de nom"
-#: setup.c:476
-msgid "unknown repository extensions found:"
-msgstr "s'han trobat extensions de dipòsit desconegudes:"
+#: merge-recursive.c:1143
+msgid "renamed"
+msgstr "canviat de nom"
-#: setup.c:762
+#: merge-recursive.c:1200
#, c-format
-msgid "Not a git repository (or any of the parent directories): %s"
-msgstr "No un dipòsit de git (ni cap dels directoris pares): %s"
-
-#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
-msgid "Cannot come back to cwd"
-msgstr "No es pot tornar al directori de treball actual"
-
-#: setup.c:845
-msgid "Unable to read current working directory"
-msgstr "No s'ha pogut llegir el directori de treball actual"
+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ò"
-#: setup.c:920
+#: merge-recursive.c:1225
#, 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)."
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
msgstr ""
-"No un dipòsit de git (ni cap pare fins el punt de muntatge %s)\n"
-"S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
-"no està establert)."
+"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom \"%s\"->\"%s\" en la "
+"branca \"%s\" canvi de nom \"%s\"->\"%s\" en \"%s\"%s"
-#: setup.c:927
-#, c-format
-msgid "Cannot change to '%s/..'"
-msgstr "No es pot canviar a '%s/..'"
+#: merge-recursive.c:1230
+msgid " (left unresolved)"
+msgstr " (deixat sense resolució)"
-#: setup.c:989
+#: merge-recursive.c:1292
#, c-format
-msgid ""
-"Problem with core.sharedRepository filemode value (0%.3o).\n"
-"The owner of files must always have read and write permissions."
+msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-"Problema amb el valor de mode de fitxer core.sharedRepository (0%.3o).\n"
-"El propietari dels fitxers sempre ha de tenir permissions de lectura i "
-"escriptura."
-
-#: sha1_file.c:1046
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)"
+"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de "
+"nom %s->%s en %s"
-#: sha1_file.c:2434
+#: merge-recursive.c:1325
#, 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?)"
+msgid "Renaming %s to %s and %s to %s instead"
+msgstr "S'està canviant el nom de %s a %s i %s a %s en lloc d'això"
-#: sha1_file.c:2438
+#: merge-recursive.c:1531
#, 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?)"
-
-#: sha1_name.c:462
-msgid ""
-"Git normally never creates a ref that ends with 40 hex characters\n"
-"because it will be ignored when you just specify 40-hex. These refs\n"
-"may be created by mistake. For example,\n"
-"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
-"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
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 checkout -b $br $(git rev-parse ...)\n"
-"\n"
-"on \"$br\" és d'alguna manera buit i una referència de 40 caràcters\n"
-"hexadecimals. Si us plau, examineu aquestes referències i potser\n"
-"suprimiu-les. Desactiveu aquest missatge executant\n"
-"\"git config advice.objectNameWarning false\""
+"CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s en %s. %s afegit en "
+"%s"
-#: submodule.c:64 submodule.c:98
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
-msgstr ""
-"No es pot canviar un .gitmodules no fusionat, primer resoldreu els "
-"conflictes de fusió"
+#: merge-recursive.c:1546
+#, c-format
+msgid "Adding merged %s"
+msgstr "S'està afegint %s fusionat"
-#: submodule.c:68 submodule.c:102
+#: merge-recursive.c:1553 merge-recursive.c:1766
#, 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"
+msgid "Adding as %s instead"
+msgstr "S'està afegint com a %s en lloc d'això"
-#: submodule.c:76
+#: merge-recursive.c:1610
#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "No s'ha pogut actualitzar l'entrada de .gitmodules %s"
+msgid "cannot read object %s"
+msgstr "no es pot llegir l'objecte %s"
-#: submodule.c:109
+#: merge-recursive.c:1613
#, c-format
-msgid "Could not remove .gitmodules entry for %s"
-msgstr "No s'ha pogut eliminar l'entrada de .gitmodules per a %s"
+msgid "object %s is not a blob"
+msgstr "l'objecte %s no és un blob"
-#: submodule.c:120
-msgid "staging updated .gitmodules failed"
-msgstr "L'allistament del .gitmodules actualitzat ha fallat"
+#: merge-recursive.c:1666
+msgid "modify"
+msgstr "modificació"
-#: submodule.c:177
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "no es permeten els valors negatius a submodule.fetchJobs"
+#: merge-recursive.c:1666
+msgid "modified"
+msgstr "modificat"
-#: submodule-config.c:358
-#, c-format
-msgid "invalid value for %s"
-msgstr "valor no vàlid per a %s"
+#: merge-recursive.c:1676
+msgid "content"
+msgstr "contingut"
-#: trailer.c:237
-#, c-format
-msgid "running trailer command '%s' failed"
-msgstr "l'execució de l'ordre de remolc '%s' ha fallat"
+#: merge-recursive.c:1683
+msgid "add/add"
+msgstr "afegiment/afegiment"
-#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558
-#: trailer.c:562
+#: merge-recursive.c:1718
#, c-format
-msgid "unknown value '%s' for key '%s'"
-msgstr "valor desconegut '%s' per a la clau '%s'"
+msgid "Skipped %s (merged same as existing)"
+msgstr "S'ha saltat %s (el fusionat és igual a l'existent)"
-#: trailer.c:544 trailer.c:549 builtin/remote.c:289
+#: merge-recursive.c:1732
#, c-format
-msgid "more than one %s"
-msgstr "més d'un %s"
+msgid "Auto-merging %s"
+msgstr "S'està autofusionant %s"
+
+#: merge-recursive.c:1736 git-submodule.sh:924
+msgid "submodule"
+msgstr "submòdul"
-#: trailer.c:582
+#: merge-recursive.c:1737
#, c-format
-msgid "empty trailer token in trailer '%.*s'"
-msgstr "fitxa de remolc buida en el remolc '%.*s'"
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "CONFLICTE (%s): Conflicte de fusió en %s"
-#: trailer.c:702
+#: merge-recursive.c:1831
#, c-format
-msgid "could not read input file '%s'"
-msgstr "no s'ha pogut llegir el fitxer d'entrada '%s'"
+msgid "Removing %s"
+msgstr "S'està eliminant %s"
-#: trailer.c:705
-msgid "could not read from stdin"
-msgstr "No s'ha pogut llegir des d'stdin"
+#: merge-recursive.c:1857
+msgid "file/directory"
+msgstr "fitxer/directori"
-#: trailer.c:857 builtin/am.c:42
-#, c-format
-msgid "could not stat %s"
-msgstr "no s'ha pogut fer stat a %s"
+#: merge-recursive.c:1863
+msgid "directory/file"
+msgstr "directori/fitxer"
-#: trailer.c:859
+#: merge-recursive.c:1868
#, c-format
-msgid "file %s is not a regular file"
-msgstr "el fitxer %s no és un fitxer regular"
+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"
-#: trailer.c:861
+#: merge-recursive.c:1877
#, c-format
-msgid "file %s is not writable by user"
-msgstr "el fitxer %s no és gravable per l'usuari"
+msgid "Adding %s"
+msgstr "S'està afegint %s"
-#: trailer.c:873
-msgid "could not open temporary file"
-msgstr "no s'ha pogut obrir el fitxer temporal"
+#: merge-recursive.c:1914
+msgid "Already up-to-date!"
+msgstr "Ja està al dia!"
-#: trailer.c:912
+#: merge-recursive.c:1923
#, c-format
-msgid "could not rename temporary file to %s"
-msgstr "no s'ha pogut canviar el nom del fitxer temporal a %s"
+msgid "merging of trees %s and %s failed"
+msgstr "la fusió dels arbres %s i %s ha fallat"
-#: transport.c:62
+#: merge-recursive.c:2006
+msgid "Merging:"
+msgstr "Fusionant:"
+
+#: merge-recursive.c:2019
#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "Canviaria la font de '%s' a '%s' de '%s'\n"
+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ú:"
-#: transport.c:151
+#: merge-recursive.c:2058
+msgid "merge returned no commit"
+msgstr "la fusió no ha retornat cap comissió"
+
+#: merge-recursive.c:2121
#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "transport: opció de profunditat no vàlida '%s'"
+msgid "Could not parse object '%s'"
+msgstr "No s'ha pogut analitzar l'objecte '%s'"
+
+#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
+msgid "Unable to write index."
+msgstr "No s'ha pogut escriure l'índex."
-#: transport.c:771
+#: notes-merge.c:273
#, c-format
msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
+"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 ""
-"Els camins de submòdul següents contenen canvis que no\n"
-"es poden trobar en cap remot:\n"
+"No heu conclòs la vostra fusió de notes prèvia (%s existeix).\n"
+"Si us plau, 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."
-#: transport.c:775
+#: notes-merge.c:280
#, 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"
-"Si us plau, intenteu\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"o canviar de directori al camí i useu\n"
-"\n"
-"\tgit push\n"
-"\n"
-"per a pujar-los a un remot.\n"
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "No heu conclòs la vostra fusió de notes (%s existeix)."
-#: transport.c:783
-msgid "Aborting."
-msgstr "S'està avortant."
+#: notes-utils.c:41
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr "No es pot cometre un arbre de notes no inicialitzat / no referenciat"
-#: transport-helper.c:1041
+#: notes-utils.c:100
#, c-format
-msgid "Could not read ref %s"
-msgstr "No s'ha pogut llegir la referència %s"
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "Valor de notes.rewriteMode dolent: '%s'"
-#: unpack-trees.c:64
+#: notes-utils.c:110
#, 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 vostres canvis locals als fitxers següents se sobreescriurien per "
-"agafar:\n"
-"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de "
-"canviar de branca."
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "S'està refusant reescriure les notes en %s (fora de refs/notes/)"
-#: unpack-trees.c:66
+#. TRANSLATORS: The first %s is the name of the
+#. environment variable, the second %s is its value
+#: notes-utils.c:137
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
-msgstr ""
-"Els vostres canvis locals als fitxers següents se sobreescriurien per "
-"agafar:\n"
-"%%s"
+msgid "Bad %s value: '%s'"
+msgstr "Valor dolent de %s: '%s'"
-#: unpack-trees.c:69
+#: object.c:242
#, 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 vostres canvis locals als fitxers següents se sobreescriurien per "
-"fusionar:\n"
-"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de "
-"fusionar."
+msgid "unable to parse object: %s"
+msgstr "no s'ha pogut analitzar l'objecte: %s"
-#: unpack-trees.c:71
+#: parse-options.c:572
+msgid "..."
+msgstr "..."
+
+#: parse-options.c:590
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-"Els vostres canvis locals als fitxers següents se sobreescriurien per "
-"fusionar:\n"
-"%%s"
+msgid "usage: %s"
+msgstr "ús: %s"
-#: unpack-trees.c:74
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation
+#: parse-options.c:594
#, 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"
-"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de %s."
+msgid " or: %s"
+msgstr " o: %s"
-#: unpack-trees.c:76
+#: parse-options.c:597
#, 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"
+msgid " %s"
+msgstr " %s"
-#: unpack-trees.c:81
+#: parse-options.c:631
+msgid "-NUM"
+msgstr "-NUM"
+
+#: parse-options-cb.c:108
#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in it:\n"
-"%s"
-msgstr ""
-"Actualitzar els directoris següents perdria fitxers no seguits en el:\n"
-"%s"
+msgid "malformed object name '%s'"
+msgstr "nom d'objecte mal format '%s'"
-#: unpack-trees.c:85
+#: path.c:826
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%sPlease move or remove them before you switch branches."
+msgid "Could not make %s writable by group"
+msgstr "No s'ha pogut fer %s escrivible pel grup"
+
+#: pathspec.c:133
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
-"agafar:\n"
-"%%sSi us plau, moveu-los o elimineu-los abans de canviar de branca."
+"els ajusts d'especificació de camí 'glob' i 'noglob' globals són "
+"incompatibles"
-#: unpack-trees.c:87
-#, c-format
+#: pathspec.c:143
msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
-"agafar:\n"
-"%%s"
+"l'ajust d'especificació de camí 'literal' global és incompatible amb tots "
+"els altres ajusts d'especificació de camí globals"
-#: unpack-trees.c:90
+#: pathspec.c:177
+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:183
#, 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 per "
-"fusionar:\n"
-"%%sSi us plau, moveu-los o elimineu-los abans de fusionar."
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "Màgia d'especificació de camí no vàlida '%.*s' en '%s'"
-#: unpack-trees.c:92
+#: pathspec.c:187
#, 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 per "
-"fusionar:\n"
-"%%s"
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "')' mancant al final de la màgia d'especificació de camí en '%s'"
-#: unpack-trees.c:95
+#: pathspec.c:205
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "Màgia d'especificació de camí no implementada '%c' en '%s'"
+
+#: pathspec.c:230
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s: 'literal' i 'glob' són incompatibles"
+
+#: pathspec.c:241
+#, c-format
+msgid "%s: '%s' is outside repository"
+msgstr "%s: '%s' és fora del dipòsit"
+
+#: pathspec.c:291
#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "L'especificació '%s' és en el submòdul '%.*s'"
+
+#: pathspec.c:353
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr ""
+"%s: aquesta ordre no és compatible amb la màgia d'especificació de camí: %s"
+
+#: pathspec.c:408
msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you %s."
+"empty strings as pathspecs will be made invalid in upcoming releases. please "
+"use . instead if you meant to match all paths"
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
-"%%sSi us plau, moveu-los o elimineu-los abans de %s."
+"es faran no vàlides les cadenes buides com especificacions de camí en "
+"versions futures. si us plau, useu . en lloc d'això si volíeu coincidir amb "
+"tots els camins"
-#: unpack-trees.c:97
+#: pathspec.c:440
#, 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:449
msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
+"There is nothing to exclude from by :(exclude) patterns.\n"
+"Perhaps you forgot to add either ':/' or '.' ?"
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
-"%%s"
+"No hi ha res a excloure per patrons :(exclusió).\n"
+"Potser heu oblidat afegir o ':/' o '.' ?"
-#: unpack-trees.c:102
+#: pretty.c:971
+msgid "unable to parse --pretty format"
+msgstr "no s'ha pogut analitzar el format --pretty"
+
+#: read-cache.c:1315
#, c-format
msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%sPlease move or remove them before you switch branches."
+"index.version set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
-"agafar:\n"
-"%%sSi us plau, moveu-los o elimineu-los abans de canviar de branca."
+"index.version està establerta, però el valor no és vàlid.\n"
+"S'està usant la versió %i"
-#: unpack-trees.c:104
+#: read-cache.c:1325
#, c-format
msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%s"
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
-"agafar:\n"
-"%%s"
+"GIT_INDEX_VERSION està establerta, però el valor no és vàlid.\n"
+"S'està usant la versió %i"
-#: unpack-trees.c:107
+#: refs.c:576 builtin/merge.c:840
#, 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 "
-"fusionar:\n"
-"%%sSi us plau, moveu-los o elimineu-los abans de fusionar."
+msgid "Could not open '%s' for writing"
+msgstr "No s'ha pogut obrir '%s' per a escriptura"
-#: unpack-trees.c:109
+#: refs/files-backend.c:2481
#, 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 "
-"fusionar:\n"
-"%%s"
+msgid "could not delete reference %s: %s"
+msgstr "no s'ha pogut suprimir la referència %s: %s"
-#: unpack-trees.c:112
+#: refs/files-backend.c:2484
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you %s."
+msgid "could not delete references: %s"
+msgstr "no s'ha pogut suprimir les referències: %s"
+
+#: refs/files-backend.c:2493
+#, c-format
+msgid "could not remove reference %s"
+msgstr "no s'ha pogut eliminar la referència %s"
+
+#: ref-filter.c:55
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "format esperat: %%(color:<color>)"
+
+#: ref-filter.c:57
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr "color no reconegut: %%(color:%s)"
+
+#: ref-filter.c:71
+#, c-format
+msgid "unrecognized format: %%(%s)"
+msgstr "format no reconegut: %%(%s)"
+
+#: ref-filter.c:77
+#, c-format
+msgid "%%(body) does not take arguments"
+msgstr "%%(body) no accepta paràmetres"
+
+#: ref-filter.c:84
+#, c-format
+msgid "%%(subject) does not take arguments"
+msgstr "%%(subject) no accepta paràmetres"
+
+#: ref-filter.c:101
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "valor positiu esperat contents:lines=%s"
+
+#: ref-filter.c:103
+#, c-format
+msgid "unrecognized %%(contents) argument: %s"
+msgstr "paràmetre %%(contents) no reconegut: %s"
+
+#: ref-filter.c:113
+#, c-format
+msgid "unrecognized %%(objectname) argument: %s"
+msgstr "paràmetre %%(objectname) no reconegut: %s"
+
+#: ref-filter.c:135
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "format esperat: %%(align:<amplada>,<posició>)"
+
+#: ref-filter.c:147
+#, c-format
+msgid "unrecognized position:%s"
+msgstr "posició no reconeguda:%s"
+
+#: ref-filter.c:151
+#, c-format
+msgid "unrecognized width:%s"
+msgstr "amplada no reconeguda:%s"
+
+#: ref-filter.c:157
+#, c-format
+msgid "unrecognized %%(align) argument: %s"
+msgstr "paràmetre %%(align) no reconegut: %s"
+
+#: ref-filter.c:161
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "amplada positiva esperada amb l'àtom %%(align)"
+
+#: ref-filter.c:244
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr "nom de camp mal format: %.*s"
+
+#: ref-filter.c:270
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr "nom de camp desconegut: %.*s"
+
+#: ref-filter.c:372
+#, 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:424
+#, c-format
+msgid "malformed format string %s"
+msgstr "cadena de format mal format %s"
+
+#: ref-filter.c:878
+msgid ":strip= requires a positive integer argument"
+msgstr ":strip= requereix un paràmetre enter positiu"
+
+#: ref-filter.c:883
+#, c-format
+msgid "ref '%s' does not have %ld components to :strip"
+msgstr "la referència '%s' no té %ld components per a :strip"
+
+#: ref-filter.c:1046
+#, c-format
+msgid "unknown %.*s format %s"
+msgstr "format de %.*s desconegut %s"
+
+#: ref-filter.c:1066 ref-filter.c:1097
+#, c-format
+msgid "missing object %s for %s"
+msgstr "manca l'objecte %s per a %s"
+
+#: ref-filter.c:1069 ref-filter.c:1100
+#, 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:1311
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "objecte mal format a '%s'"
+
+#: ref-filter.c:1373
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr "s'està ignorant la referència amb nom trencat %s"
+
+#: ref-filter.c:1378
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "s'està ignorant la referència trencada %s"
+
+#: ref-filter.c:1633
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "format: manca l'àtom %%(end)"
+
+#: ref-filter.c:1687
+#, c-format
+msgid "malformed object name %s"
+msgstr "nom d'objecte %s mal format"
+
+#: remote.c:746
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "No es pot obtenir ambdós %s i %s a %s"
+
+#: remote.c:750
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%s generalment segueix %s, no %s"
+
+#: remote.c:754
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "%s segueix ambdós %s i %s"
+
+#: remote.c:762
+msgid "Internal error"
+msgstr "Error intern"
+
+#: remote.c:1677 remote.c:1720
+msgid "HEAD does not point to a branch"
+msgstr "HEAD no assenyala cap branca"
+
+#: remote.c:1686
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "no hi ha tal branca: '%s'"
+
+#: remote.c:1689
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "cap font configurada per a la branca '%s'"
+
+#: remote.c:1695
+#, 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:1710
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
-"%s:\n"
-"%%sSi us plau, moveu-los o elimineu-los abans de %s."
+"el destí de pujada '%s' en el remot '%s' no té cap branca seguidora local"
-#: unpack-trees.c:114
+#: remote.c:1725
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "la branca '%s' no té cap remot al qual pujar"
+
+#: remote.c:1736
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "les especificacions de referència de '%s' no inclouen '%s'"
+
+#: remote.c:1749
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "push no té destí (push.default és 'nothing')"
+
+#: remote.c:1771
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "no es pot resoldre una pujada 'simple' a un sol destí"
+
+#: remote.c:2073
+#, 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:2077
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr " (useu \"git branch --unset-upstream\" per a arreglar)\n"
+
+#: remote.c:2080
+#, c-format
+msgid "Your branch is up-to-date with '%s'.\n"
+msgstr "La vostra branca està al dia amb '%s'.\n"
+
+#: remote.c:2084
+#, c-format
+msgid "Your branch is ahead of '%s' by %d commit.\n"
+msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
+msgstr[0] "La vostra branca està davant de '%s' per %d comissió.\n"
+msgstr[1] "La vostra branca està davant de '%s' per %d comissions.\n"
+
+#: remote.c:2090
+msgid " (use \"git push\" to publish your local commits)\n"
+msgstr " (useu \"git push\" per a publicar les vostres comissions locals)\n"
+
+#: remote.c:2093
+#, 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à darrere de '%s' per %d comissió, i pot avançar-se "
+"ràpidament.\n"
+msgstr[1] ""
+"La vostra branca està darrere de '%s' per %d comissions, i pot avançar-se "
+"ràpidament.\n"
+
+#: remote.c:2101
+msgid " (use \"git pull\" to update your local branch)\n"
+msgstr " (useu \"git pull\" per a actualitzar la vostra branca local)\n"
+
+#: remote.c:2104
#, 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"
+"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' s'han divergit,\n"
+"i tenen %d i %d comissió distinta cada una, respectivament.\n"
+msgstr[1] ""
+"La vostra branca i '%s' s'han divergit,\n"
+"i tenen %d i %d comissions distintes cada una, respectivament.\n"
-#: unpack-trees.c:121
+#: remote.c:2114
+msgid " (use \"git pull\" to merge the remote branch into yours)\n"
+msgstr " (useu \"git pull\" per a fusionar la branca remota a la vostra)\n"
+
+#: revision.c:2158
+msgid "your current branch appears to be broken"
+msgstr "la vostra branca actual sembla trencada"
+
+#: revision.c:2161
#, c-format
-msgid "Entry '%s' overlaps with '%s'. Cannot bind."
-msgstr "L'entrada '%s' encavalca amb '%s'. No es pot vincular."
+msgid "your current branch '%s' does not have any commits yet"
+msgstr "la vostra branca actual '%s' encara no té cap comissió"
-#: unpack-trees.c:124
+#: revision.c:2355
+msgid "--first-parent is incompatible with --bisect"
+msgstr "--first-parent és incompatible amb --bisect"
+
+#: run-command.c:106
+msgid "open /dev/null failed"
+msgstr "s'ha fallat en obrir /dev/null"
+
+#: run-command.c:108
#, c-format
+msgid "dup2(%d,%d) failed"
+msgstr "dup2(%d,%d) ha fallat"
+
+#: send-pack.c:297
+msgid "failed to sign the push certificate"
+msgstr "s'ha fallat en signar el certificat de pujada"
+
+#: send-pack.c:410
+msgid "the receiving end does not support --signed push"
+msgstr "el destí receptor no admet pujar --signed"
+
+#: send-pack.c:412
msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
-"%s"
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
msgstr ""
-"No es pot actualitzar l'agafament parcial: les entrades següents no estan al "
-"dia:\n"
-"%s"
+"no s'està enviant una certificació de pujada perquè el destí receptor no "
+"admet pujar --signed"
-#: unpack-trees.c:126
-#, c-format
+#: send-pack.c:424
+msgid "the receiving end does not support --atomic push"
+msgstr "el destí receptor no admet pujar --atomic"
+
+#: send-pack.c:429
+msgid "the receiving end does not support push options"
+msgstr "el destí receptor no admet opcions de pujada"
+
+#: sequencer.c:171
+msgid "revert"
+msgstr "revertir"
+
+#: sequencer.c:171
+msgid "cherry-pick"
+msgstr "recollir cireres"
+
+#: sequencer.c:228
msgid ""
-"The following Working tree files would be overwritten by sparse checkout "
-"update:\n"
-"%s"
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
-"Els fitxers següents en l'arbre de treball se sobreescriurien per "
-"actualitzar l'agafament parcial:\n"
-"%s"
+"després de resoldre els conflictes, marqueu els camins\n"
+"corregits amb 'git add <camins>' o 'git rm <camins>'"
-#: unpack-trees.c:128
-#, c-format
+#: sequencer.c:231
msgid ""
-"The following Working tree files would be removed by sparse checkout "
-"update:\n"
-"%s"
+"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 ""
-"Els fitxers següents en l'arbre de treball s'eliminarien per actualitzar "
-"l'agafament parcial:\n"
-"%s"
+"després de resoldre els conflictes, marqueu els camins\n"
+"corregits amb 'git add <camins>' o 'git rm <camins>'\n"
+"i cometeu el resultat amb 'git commit'"
-#: unpack-trees.c:205
+#: sequencer.c:244 sequencer.c:1209
#, c-format
-msgid "Aborting\n"
-msgstr "S'està avortant\n"
+msgid "could not lock '%s'"
+msgstr "no s'ha pogut bloquejar '%s'"
-#: unpack-trees.c:237
-msgid "Checking out files"
-msgstr "S'està agafant fitxers"
+#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214
+#, c-format
+msgid "could not write to '%s'"
+msgstr "no s'ha pogut escriure a '%s'"
-#: urlmatch.c:120
-msgid "invalid URL scheme name or missing '://' suffix"
-msgstr "l'esquema d'URL no és vàlid o li manca el sufix '://'"
+#: sequencer.c:251
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr "no s'ha pogut escriure el terminador de línia a '%s'"
-#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216
#, c-format
-msgid "invalid %XX escape sequence"
-msgstr "seqüència d'escapament %XX no vàlida"
+msgid "failed to finalize '%s'."
+msgstr "s'ha fallat en finalitzar '%s'."
-#: urlmatch.c:172
-msgid "missing host and scheme is not 'file:'"
-msgstr "manca la màquina i l'esquema no és 'file:'"
+#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032
+#, c-format
+msgid "could not read '%s'"
+msgstr "no s'ha pogut llegir '%s'"
-#: urlmatch.c:189
-msgid "a 'file:' URL may not have a port number"
-msgstr "un URL 'file:' no pot tenir número de port"
+#: sequencer.c:305
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr "els vostres canvis locals se sobreescriurien per %s."
-#: urlmatch.c:199
-msgid "invalid characters in host name"
-msgstr "hi ha caràcters no vàlids en el nom de màquina"
+#: sequencer.c:309
+msgid "commit your changes or stash them to proceed."
+msgstr "cometeu els vostres canvis o emmagatzemeu-los per a procedir."
-#: urlmatch.c:244 urlmatch.c:255
-msgid "invalid port number"
-msgstr "número de port no vàlid"
+#: sequencer.c:324
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s: avanç ràpid"
+
+#. TRANSLATORS: %s will be "revert" or "cherry-pick"
+#: sequencer.c:399
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou"
-#: urlmatch.c:322
-msgid "invalid '..' path segment"
-msgstr "segment de camí '..' no vàlid"
+#: sequencer.c:418
+msgid "could not resolve HEAD commit\n"
+msgstr "no s'ha pogut resoldre la comissió HEAD\n"
-#: worktree.c:282
-#, c-format
-msgid "failed to read '%s'"
-msgstr "s'ha fallat en llegir '%s'"
+#: sequencer.c:438
+msgid "unable to update cache tree\n"
+msgstr "no s'ha pogut actualitzar l'arbre cau\n"
-#: wrapper.c:222 wrapper.c:392
+#: sequencer.c:483
#, c-format
-msgid "could not open '%s' for reading and writing"
-msgstr "no s'ha pogut obrir '%s' per a lectura i escriptura"
+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 allistats en el vostre arbre de treball\n"
+"Si aquests canvis són per a aixafar-se 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 cassos, quan hàgiu terminat, continueu amb:\n"
+"\n"
+" git rebase --continue\n"
-#: wrapper.c:224 wrapper.c:394 builtin/am.c:778
+#: sequencer.c:567
#, c-format
-msgid "could not open '%s' for writing"
-msgstr "no s'ha pogut obrir '%s' per a escriptura"
+msgid "could not parse commit %s\n"
+msgstr "no s'ha pogut analitzar la comissió %s\n"
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771
-#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029
-#: builtin/pull.c:407
+#: sequencer.c:572
#, c-format
-msgid "could not open '%s' for reading"
-msgstr "no s'ha pogut obrir '%s' per a lectura"
+msgid "could not parse parent commit %s\n"
+msgstr "no s'ha pogut analitzar la comissió mare %s\n"
-#: wrapper.c:605 wrapper.c:626
+#: sequencer.c:656
+msgid "your index file is unmerged."
+msgstr "el vostre fitxer d'índex està sense fusionar."
+
+#: sequencer.c:675
#, c-format
-msgid "unable to access '%s'"
-msgstr "no s'ha pogut accedir a '%s'"
+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."
-#: wrapper.c:634
-msgid "unable to get current working directory"
-msgstr "no s'ha pogut obtenir el directori de treball actual"
+#: sequencer.c:683
+#, c-format
+msgid "commit %s does not have parent %d"
+msgstr "la comissió %s no té mare %d"
-#: wrapper.c:658
+#: sequencer.c:687
#, c-format
-msgid "could not write to %s"
-msgstr "no s'ha pogut escriure a %s"
+msgid "mainline was specified but commit %s is not a merge."
+msgstr ""
+"s'ha especificat la línia principal però la comissió %s no és una fusió."
-#: wrapper.c:660
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#: sequencer.c:700
#, c-format
-msgid "could not close %s"
-msgstr "no s'ha pogut tancar %s"
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s: no es pot analitzar la comissió mare %s"
-#: wt-status.c:150
-msgid "Unmerged paths:"
-msgstr "Camins sense fusionar:"
+#: sequencer.c:705
+#, c-format
+msgid "cannot get commit message for %s"
+msgstr "no es pot obtenir el missatge de comissió de %s"
-#: wt-status.c:177 wt-status.c:204
+#: sequencer.c:797
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr " (useu \"git reset %s <fitxer>...\" per a desallistar)"
+msgid "could not revert %s... %s"
+msgstr "no s'ha pogut revertir %s... %s"
-#: wt-status.c:179 wt-status.c:206
-msgid " (use \"git rm --cached <file>...\" to unstage)"
-msgstr " (useu \"git rm --cached <fitxer>...\" per a desallistar)"
+#: sequencer.c:798
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "no s'ha pogut aplicar %s... %s"
-#: wt-status.c:183
-msgid " (use \"git add <file>...\" to mark resolution)"
-msgstr " (useu \"git add <fitxer>...\" per a senyalar resolució)"
+#: sequencer.c:833
+msgid "empty commit set passed"
+msgstr "conjunt de comissions buit passat"
-#: wt-status.c:185 wt-status.c:189
-msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
-msgstr ""
-" (useu \"git add/rm <fitxer>...\" segons sigui apropiat per a senyalar "
-"resolució)"
+#: sequencer.c:843
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr "git %s: s'ha fallat en llegir l'índex"
-#: wt-status.c:187
-msgid " (use \"git rm <file>...\" to mark resolution)"
-msgstr " (useu \"git rm <fitxer>...\" per a senyalar resolució)"
+#: sequencer.c:850
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr "git %s: s'ha fallat en actualitzar l'índex"
-#: wt-status.c:198 wt-status.c:882
-msgid "Changes to be committed:"
-msgstr "Canvis a cometre:"
+#: sequencer.c:944
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr "línia no vàlida %d: %.*s"
-#: wt-status.c:216 wt-status.c:891
-msgid "Changes not staged for commit:"
-msgstr "Canvis no allistats per a cometre:"
+#: sequencer.c:950
+msgid "no commits parsed."
+msgstr "no s'ha analitzat cap comissió."
-#: wt-status.c:220
-msgid " (use \"git add <file>...\" to update what will be committed)"
-msgstr " (useu \"git add <fitxer>...\" per a actualitzar què es cometrà)"
+#: sequencer.c:966
+#, c-format
+msgid "could not read '%s'."
+msgstr "no s'ha pogut llegir '%s'."
-#: wt-status.c:222
-msgid " (use \"git add/rm <file>...\" to update what will be committed)"
-msgstr " (useu \"git add/rm <fitxer>...\" per a actualitzar què es cometrà)"
+#: sequencer.c:972
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr "full d'instruccions inusable: '%s'"
-#: wt-status.c:223
-msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
-msgstr ""
-" (useu \"git checkout -- <fitxer>...\" per a descartar els canvis en el "
-"directori de treball)"
+#: sequencer.c:983
+msgid "cannot cherry-pick during a revert."
+msgstr "no es pot recollir cireres durant una reversió."
-#: wt-status.c:225
-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)"
+#: sequencer.c:985
+msgid "cannot revert during a cherry-pick."
+msgstr "no es pot revertir durant un recull de cireres."
-#: wt-status.c:237
+#: sequencer.c:1028
#, c-format
-msgid " (use \"git %s <file>...\" to include in what will be committed)"
-msgstr " (useu \"git %s <fitxer>...\" per a incloure-ho en què es cometrà)"
-
-#: wt-status.c:252
-msgid "both deleted:"
-msgstr "suprimit per ambdós:"
+msgid "invalid key: %s"
+msgstr "clau no vàlida: %s"
-#: wt-status.c:254
-msgid "added by us:"
-msgstr "afegit per nosaltres:"
-
-#: wt-status.c:256
-msgid "deleted by them:"
-msgstr "suprimit per ells:"
+#: sequencer.c:1031
+#, c-format
+msgid "invalid value for %s: %s"
+msgstr "valor no vàlid per a %s: %s"
-#: wt-status.c:258
-msgid "added by them:"
-msgstr "afegit per ells:"
+#: sequencer.c:1063
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr "full d'opcions mal format: '%s'"
-#: wt-status.c:260
-msgid "deleted by us:"
-msgstr "suprimit per nosaltres:"
+#: sequencer.c:1101
+msgid "a cherry-pick or revert is already in progress"
+msgstr "un recull de cireres o una reversió ja està en curs"
-#: wt-status.c:262
-msgid "both added:"
-msgstr "afegit per ambdós:"
+#: sequencer.c:1102
+msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\""
-#: wt-status.c:264
-msgid "both modified:"
-msgstr "modificat per ambdós:"
+#: sequencer.c:1106
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr "no s'ha pogut crear el directori de seqüenciador '%s'"
-#: wt-status.c:274
-msgid "new file:"
-msgstr "fitxer nou:"
+#: sequencer.c:1120
+msgid "could not lock HEAD"
+msgstr "no s'ha pogut bloquejar HEAD"
-#: wt-status.c:276
-msgid "copied:"
-msgstr "copiat:"
+#: sequencer.c:1151 sequencer.c:1289
+msgid "no cherry-pick or revert in progress"
+msgstr "ni hi ha cap recull de cireres ni cap reversió en curs"
-#: wt-status.c:278
-msgid "deleted:"
-msgstr "suprimit:"
+#: sequencer.c:1153
+msgid "cannot resolve HEAD"
+msgstr "no es pot resoldre HEAD"
-#: wt-status.c:280
-msgid "modified:"
-msgstr "modificat:"
+#: sequencer.c:1155 sequencer.c:1189
+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"
-#: wt-status.c:282
-msgid "renamed:"
-msgstr "canviat de nom:"
+#: sequencer.c:1175 builtin/grep.c:578
+#, c-format
+msgid "cannot open '%s'"
+msgstr "no es pot obrir '%s'"
-#: wt-status.c:284
-msgid "typechange:"
-msgstr "canviat de tipus:"
+#: sequencer.c:1177
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "no es pot llegir '%s': %s"
-#: wt-status.c:286
-msgid "unknown:"
-msgstr "desconegut:"
+#: sequencer.c:1178
+msgid "unexpected end of file"
+msgstr "final de fitxer inesperat"
-#: wt-status.c:288
-msgid "unmerged:"
-msgstr "sense fusionar:"
+#: sequencer.c:1184
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr "el fitxer HEAD emmagatzemat abans del recull de cireres '%s' és malmès"
-#: wt-status.c:370
-msgid "new commits, "
-msgstr "comissions noves, "
+#: sequencer.c:1354
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s: no es pot recollir com a cirera un %s"
-#: wt-status.c:372
-msgid "modified content, "
-msgstr "contingut modificat, "
+#: sequencer.c:1358
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s: revisió dolenta"
-#: wt-status.c:374
-msgid "untracked content, "
-msgstr "contingut no seguit, "
+#: sequencer.c:1391
+msgid "can't revert as initial commit"
+msgstr "no es pot revertir com a comissió inicial"
-#: wt-status.c:756
-msgid "Submodules changed but not updated:"
-msgstr "Submòduls canviats però no actualitzats:"
+#: setup.c:160
+#, 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."
-#: wt-status.c:758
-msgid "Submodule changes to be committed:"
-msgstr "Canvis de submòdul a cometre:"
+#: setup.c:173
+#, 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 ""
+"paràmetre ambigu '%s': revisió no coneguda o camí no en l'arbre de treball.\n"
+"Useu '--' per a separar els camins de les revisions, com això:\n"
+"'git <ordre> [<revisió>...] -- [<fitxer>...]'"
-#: wt-status.c:839
+#: setup.c:223
+#, c-format
msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-"No toqueu la línia de sobre.\n"
-"Tot el que hi ha a sota s'eliminarà."
+"paràmetre ambigu '%s': ambdós una revisió i un nom de fitxer\n"
+"Useu '--' per a separar els camins de les revisions, com això:\n"
+"'git <ordre> [<revisió>...] -- [<fitxer>...]'"
-#: wt-status.c:950
-msgid "You have unmerged paths."
-msgstr "Teniu camins sense fusionar."
+#: setup.c:468
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "S'esperava una versió de dipòsit de git <= %d, s'ha trobat %d"
-#: wt-status.c:953
-msgid " (fix conflicts and run \"git commit\")"
-msgstr " (arregleu els conflictes i executeu \"git commit\")"
+#: setup.c:476
+msgid "unknown repository extensions found:"
+msgstr "s'han trobat extensions de dipòsit desconegudes:"
-#: wt-status.c:955
-msgid " (use \"git merge --abort\" to abort the merge)"
-msgstr " (useu \"git merge --abort\" per a avortar la fusió)"
+#: setup.c:762
+#, c-format
+msgid "Not a git repository (or any of the parent directories): %s"
+msgstr "No és un dipòsit de git (ni cap dels directoris pares): %s"
-#: wt-status.c:960
-msgid "All conflicts fixed but you are still merging."
-msgstr "Tots els conflictes estan arreglats però encara esteu fusionant."
+#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
+msgid "Cannot come back to cwd"
+msgstr "No es pot tornar al directori de treball actual"
-#: wt-status.c:963
-msgid " (use \"git commit\" to conclude merge)"
-msgstr " (useu \"git commit\" per a concloure la fusió)"
+#: setup.c:845
+msgid "Unable to read current working directory"
+msgstr "No s'ha pogut llegir el directori de treball actual"
-#: wt-status.c:973
-msgid "You are in the middle of an am session."
-msgstr "Esteu enmig d'una sessió am."
+#: setup.c:920
+#, 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 un dipòsit de git (ni cap pare fins el punt de muntatge %s)\n"
+"S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
+"no està establert)."
-#: wt-status.c:976
-msgid "The current patch is empty."
-msgstr "El pedaç actual està buit."
+#: setup.c:927
+#, c-format
+msgid "Cannot change to '%s/..'"
+msgstr "No es pot canviar a '%s/..'"
-#: wt-status.c:980
-msgid " (fix conflicts and then run \"git am --continue\")"
-msgstr " (arregleu els conflictes i després executeu \"git am --continue\")"
+#: setup.c:989
+#, 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 permissions de lectura i "
+"escriptura."
-#: wt-status.c:982
-msgid " (use \"git am --skip\" to skip this patch)"
-msgstr " (useu \"git am --skip\" per a ometre aquest pedaç)"
+#: sha1_file.c:473
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "el camí '%s' no existeix"
-#: wt-status.c:984
-msgid " (use \"git am --abort\" to restore the original branch)"
-msgstr " (useu \"git am --abort\" per a restaurar la branca original)"
+#: sha1_file.c:499
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr ""
+"Encara no se suporta el dipòsit de referència '%s' com a agafament enllaçat."
-#: wt-status.c:1109
-msgid "No commands done."
-msgstr "No s'ha fet cap ordre."
+#: sha1_file.c:505
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "el dipòsit de referència '%s' no és un dipòsit local."
-#: wt-status.c:1112
+#: sha1_file.c:511
#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
-msgstr[0] "Última ordre feta (%d ordre feta):"
-msgstr[1] "Últimes ordres fetes (%d ordres fetes):"
+msgid "reference repository '%s' is shallow"
+msgstr "el dipòsit de referència '%s' és superficial"
-#: wt-status.c:1123
+#: sha1_file.c:519
#, c-format
-msgid " (see more in file %s)"
-msgstr " (vegeu més en el fitxer %s)"
+msgid "reference repository '%s' is grafted"
+msgstr "el dipòsit de referència '%s' és empeltat"
-#: wt-status.c:1128
-msgid "No commands remaining."
-msgstr "No manca cap ordre."
+#: sha1_file.c:1159
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)"
-#: wt-status.c:1131
+#: sha1_file.c:2592
#, c-format
-msgid "Next command to do (%d remaining command):"
-msgid_plural "Next commands to do (%d remaining commands):"
-msgstr[0] "Ordre següent a fer (manca %d ordre):"
-msgstr[1] "Ordres següents a fer (manquen %d ordres):"
+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?)"
-#: wt-status.c:1139
-msgid " (use \"git rebase --edit-todo\" to view and edit)"
-msgstr " (useu \"git rebase --edit-todo\" per a veure i editar)"
+#: sha1_file.c:2596
+#, 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?)"
-#: wt-status.c:1152
+#: sha1_name.c:407
#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "Actualment esteu rebasant la branca '%s' en '%s'."
+msgid "short SHA1 %s is ambiguous"
+msgstr "l'SHA1 %s curt és ambigu"
-#: wt-status.c:1157
-msgid "You are currently rebasing."
-msgstr "Actualment esteu rebasant."
+#: sha1_name.c:418
+msgid "The candidates are:"
+msgstr "Els candidats són:"
-#: wt-status.c:1171
-msgid " (fix conflicts and then run \"git rebase --continue\")"
+#: sha1_name.c:578
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+" git checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
msgstr ""
-" (arregleu els conflictes i després executeu \"git rebase --continue\")"
+"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 checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"on \"$br\" és d'alguna manera buida i una referència de 40 caràcters\n"
+"hexadecimals. Si us plau, examineu aquestes referències i potser\n"
+"suprimiu-les. Desactiveu aquest missatge executant\n"
+"\"git config advice.objectNameWarning false\""
-#: wt-status.c:1173
-msgid " (use \"git rebase --skip\" to skip this patch)"
-msgstr " (useu \"git rebase --skip\" per a saltar aquest pedaç)"
+#: submodule.c:64 submodule.c:98
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr ""
+"No es pot canviar un .gitmodules no fusionat, primer resoldreu els "
+"conflictes de fusió"
-#: wt-status.c:1175
-msgid " (use \"git rebase --abort\" to check out the original branch)"
-msgstr " (useu \"git rebase --abort\" per a agafar la branca original)"
+#: submodule.c:68 submodule.c:102
+#, 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"
-#: wt-status.c:1181
-msgid " (all conflicts fixed: run \"git rebase --continue\")"
-msgstr " (tots els conflictes arreglats: executeu \"git rebase --continue\")"
+#: submodule.c:76
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "No s'ha pogut actualitzar l'entrada de .gitmodules %s"
-#: wt-status.c:1185
+#: submodule.c:109
#, c-format
-msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
-msgstr ""
-"Actualment esteu dividint una comissió mentre rebaseu la branca '%s' en '%s'."
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "No s'ha pogut eliminar l'entrada de .gitmodules per a %s"
-#: wt-status.c:1190
-msgid "You are currently splitting a commit during a rebase."
-msgstr "Actualment esteu dividint una comissió durant un rebasament."
+#: submodule.c:120
+msgid "staging updated .gitmodules failed"
+msgstr "l'allistament del .gitmodules actualitzat ha fallat"
-#: wt-status.c:1193
-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\")"
+#: submodule.c:158
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "no es permeten els valors negatius a submodule.fetchJobs"
-#: wt-status.c:1197
+#: submodule-config.c:358
#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
-msgstr ""
-"Actualment esteu editant una comissió mentre rebaseu la branca '%s' en '%s'."
+msgid "invalid value for %s"
+msgstr "valor no vàlid per a %s"
-#: wt-status.c:1202
-msgid "You are currently editing a commit during a rebase."
-msgstr "Actualment esteu editant una comissió durant un rebasament."
+#: trailer.c:238
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "l'execució de l'ordre de remolc '%s' ha fallat"
-#: wt-status.c:1205
-msgid " (use \"git commit --amend\" to amend the current commit)"
-msgstr " (useu \"git commit --amend\" per a esmenar la comissió actual)"
+#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537
+#: trailer.c:541
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr "valor desconegut '%s' per a la clau '%s'"
-#: wt-status.c:1207
-msgid ""
-" (use \"git rebase --continue\" once you are satisfied with your changes)"
-msgstr ""
-" (useu \"git rebase --continue\" una vegada que esteu satisfet amb els "
-"vostres canvis)"
+#: trailer.c:523 trailer.c:528 builtin/remote.c:289
+#, c-format
+msgid "more than one %s"
+msgstr "més d'un %s"
-#: wt-status.c:1217
+#: trailer.c:672
#, c-format
-msgid "You are currently cherry-picking commit %s."
-msgstr "Actualment esteu recollint com a cirera la comissió %s."
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "fitxa de remolc buida en el remolc '%.*s'"
-#: wt-status.c:1222
-msgid " (fix conflicts and run \"git cherry-pick --continue\")"
-msgstr " (arregleu els conflictes i executeu \"git cherry-pick --continue\")"
+#: trailer.c:695
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "no s'ha pogut llegir el fitxer d'entrada '%s'"
-#: wt-status.c:1225
-msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
-msgstr ""
-" (tots els conflictes arreglats: executeu \"git cherry-pick --continue\")"
+#: trailer.c:698
+msgid "could not read from stdin"
+msgstr "no s'ha pogut llegir des d'stdin"
-#: wt-status.c:1227
-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 recull de "
-"cireres)"
+#: trailer.c:929 builtin/am.c:44
+#, c-format
+msgid "could not stat %s"
+msgstr "no s'ha pogut fer stat a %s"
-#: wt-status.c:1236
+#: trailer.c:931
#, c-format
-msgid "You are currently reverting commit %s."
-msgstr "Actualment esteu revertint la comissió %s."
+msgid "file %s is not a regular file"
+msgstr "el fitxer %s no és un fitxer regular"
-#: wt-status.c:1241
-msgid " (fix conflicts and run \"git revert --continue\")"
-msgstr " (arregleu els conflictes i executeu \"git revert --continue\")"
+#: trailer.c:933
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "el fitxer %s no és gravable per l'usuari"
-#: wt-status.c:1244
-msgid " (all conflicts fixed: run \"git revert --continue\")"
-msgstr ""
-" (tots els conflictes estan arreglats: executeu \"git revert --continue\")"
+#: trailer.c:945
+msgid "could not open temporary file"
+msgstr "no s'ha pogut obrir el fitxer temporal"
-#: wt-status.c:1246
-msgid " (use \"git revert --abort\" to cancel the revert operation)"
-msgstr ""
-" (useu \"git revert --abort\" per a cancel·lar l'operació de reversió)"
+#: trailer.c:983
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "no s'ha pogut canviar el nom del fitxer temporal a %s"
-#: wt-status.c:1257
+#: transport.c:62
#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
-msgstr "Actualment esteu bisecant, heu començat des de la branca '%s'."
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Canviaria la font de '%s' a '%s' de '%s'\n"
-#: wt-status.c:1261
-msgid "You are currently bisecting."
-msgstr "Actualment esteu bisecant."
+#: transport.c:151
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport: opció de profunditat no vàlida '%s'"
-#: wt-status.c:1264
-msgid " (use \"git bisect reset\" to get back to the original branch)"
-msgstr " (useu \"git bisect reset\" per a tornar a la branca original)"
+#: transport.c:817
+#, 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"
-#: wt-status.c:1464
-msgid "On branch "
-msgstr "En la branca "
+#: transport.c:821
+#, 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"
+"Si us plau, intenteu\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"o canviar de directori al camí i useu\n"
+"\n"
+"\tgit push\n"
+"\n"
+"per a pujar-los a un remot.\n"
-#: wt-status.c:1470
-msgid "interactive rebase in progress; onto "
-msgstr "rebasament interactiu en progrés; sobre "
+#: transport.c:829
+msgid "Aborting."
+msgstr "S'està avortant."
-#: wt-status.c:1472
-msgid "rebase in progress; onto "
-msgstr "rebasament en progrés; sobre "
+#: transport-helper.c:1075
+#, c-format
+msgid "Could not read ref %s"
+msgstr "No s'ha pogut llegir la referència %s"
-#: wt-status.c:1477
-msgid "HEAD detached at "
-msgstr "HEAD separat a "
+#: tree-walk.c:31
+msgid "too-short tree object"
+msgstr "objecte d'arbre massa curt"
-#: wt-status.c:1479
-msgid "HEAD detached from "
-msgstr "HEAD separat de "
+#: tree-walk.c:37
+msgid "malformed mode in tree entry"
+msgstr "mode mal format en entrada d'arbre"
-#: wt-status.c:1482
-msgid "Not currently on any branch."
-msgstr "Actualment no s'és en cap branca."
+#: tree-walk.c:41
+msgid "empty filename in tree entry"
+msgstr "nom de fitxer buit en entrada de arbre"
-#: wt-status.c:1500
-msgid "Initial commit"
-msgstr "Comissió inicial"
+#: tree-walk.c:113
+msgid "too-short tree file"
+msgstr "fitxer d'arbre massa curt"
-#: wt-status.c:1514
-msgid "Untracked files"
-msgstr "Fitxers no seguits"
+#: unpack-trees.c:64
+#, 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 vostres canvis locals als fitxers següents se sobreescriurien per "
+"agafar:\n"
+"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de "
+"canviar de branca."
-#: wt-status.c:1516
-msgid "Ignored files"
-msgstr "Fitxers ignorats"
+#: unpack-trees.c:66
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"Els vostres canvis locals als fitxers següents se sobreescriurien per "
+"agafar:\n"
+"%%s"
+
+#: unpack-trees.c:69
+#, 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 vostres canvis locals als fitxers següents se sobreescriurien per "
+"fusionar:\n"
+"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de "
+"fusionar."
-#: wt-status.c:1520
+#: unpack-trees.c:71
#, 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')."
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
msgstr ""
-"S'ha trigat %.2f segons a enumerar fitxers no seguits.\n"
-"'status -uno' pot accelerar-ho, però heu d'anar amb compte de no\n"
-"oblidar-vos d'afegir fitxers nous per vós mateix (vegeu\n"
-"'git help status')."
+"Els vostres canvis locals als fitxers següents se sobreescriurien per "
+"fusionar:\n"
+"%%s"
-#: wt-status.c:1526
+#: unpack-trees.c:74
#, c-format
-msgid "Untracked files not listed%s"
-msgstr "Els fitxers no seguits no estan llistats%s"
-
-#: wt-status.c:1528
-msgid " (use -u option to show untracked files)"
-msgstr " (useu l'opció -u per a mostrar els fitxers no seguits)"
-
-#: wt-status.c:1534
-msgid "No changes"
-msgstr "Sense canvis"
+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"
+"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de %s."
-#: wt-status.c:1539
+#: unpack-trees.c:76
#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
msgstr ""
-"no hi ha canvis afegits a cometre (useu \"git add\" o \"git commit -a\")\n"
+"Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
+"%%s"
-#: wt-status.c:1542
+#: unpack-trees.c:81
#, c-format
-msgid "no changes added to commit\n"
-msgstr "no hi ha canvis afegits a cometre\n"
+msgid ""
+"Updating the following directories would lose untracked files in it:\n"
+"%s"
+msgstr ""
+"Actualitzar els directoris següents perdria fitxers no seguits en el:\n"
+"%s"
-#: wt-status.c:1545
+#: unpack-trees.c:85
#, c-format
msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you switch branches."
msgstr ""
-"no hi ha res afegit a cometre però fitxers no seguits estan presents (useu "
-"\"git add\" per a seguir-los)\n"
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
+"agafar:\n"
+"%%sSi us plau, moveu-los o elimineu-los abans de canviar de branca."
-#: wt-status.c:1548
+#: unpack-trees.c:87
#, c-format
-msgid "nothing added to commit but untracked files present\n"
-msgstr "no hi ha res afegit a cometre però fitxers no seguits estan presents\n"
+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 per "
+"agafar:\n"
+"%%s"
-#: wt-status.c:1551
+#: unpack-trees.c:90
#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
msgstr ""
-"no hi ha res a cometre (creeu/copieu fitxers i useu \"git add\" per a seguir-"
-"los)\n"
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
+"fusionar:\n"
+"%%sSi us plau, moveu-los o elimineu-los abans de fusionar."
-#: wt-status.c:1554 wt-status.c:1559
+#: unpack-trees.c:92
#, c-format
-msgid "nothing to commit\n"
-msgstr "no hi ha res a cometre\n"
+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 per "
+"fusionar:\n"
+"%%s"
-#: wt-status.c:1557
+#: unpack-trees.c:95
#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
msgstr ""
-"no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n"
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
+"%%sSi us plau, moveu-los o elimineu-los abans de %s."
-#: wt-status.c:1561
+#: unpack-trees.c:97
#, 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:1668
-msgid "Initial commit on "
-msgstr "Comissió inicial en "
-
-#: wt-status.c:1672
-msgid "HEAD (no branch)"
-msgstr "HEAD (sense branca)"
-
-#: wt-status.c:1701
-msgid "gone"
-msgstr "no hi és"
-
-#: wt-status.c:1703 wt-status.c:1711
-msgid "behind "
-msgstr "darrere "
-
-#: wt-status.c:1706 wt-status.c:1709
-msgid "ahead "
-msgstr "davant per "
+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"
-#: compat/precompose_utf8.c:57 builtin/clone.c:415
+#: unpack-trees.c:102
#, c-format
-msgid "failed to unlink '%s'"
-msgstr "s'ha fallat en desenllaçar '%s'"
-
-#: builtin/add.c:22
-msgid "git add [<options>] [--] <pathspec>..."
-msgstr "git add [<opcions>] [--] <especificació-de-camí>..."
+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 "
+"agafar:\n"
+"%%sSi us plau, moveu-los o elimineu-los abans de canviar de branca."
-#: builtin/add.c:65
+#: unpack-trees.c:104
#, c-format
-msgid "unexpected diff status %c"
-msgstr "estat de diff inesperat %c"
-
-#: builtin/add.c:71 builtin/commit.c:281
-msgid "updating files failed"
-msgstr "s'ha fallat en actualitzar els fitxers"
+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 "
+"agafar:\n"
+"%%s"
-#: builtin/add.c:81
+#: unpack-trees.c:107
#, c-format
-msgid "remove '%s'\n"
-msgstr "elimina '%s'\n"
+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 "
+"fusionar:\n"
+"%%sSi us plau, moveu-los o elimineu-los abans de fusionar."
-#: builtin/add.c:136
-msgid "Unstaged changes after refreshing the index:"
-msgstr "Canvis no allistats després d'actualitzar l'índex:"
+#: unpack-trees.c:109
+#, 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 "
+"fusionar:\n"
+"%%s"
-#: builtin/add.c:196 builtin/rev-parse.c:811
-msgid "Could not read the index"
-msgstr "No s'ha pogut llegir l'índex"
+#: unpack-trees.c:112
+#, 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"
+"%%sSi us plau, moveu-los o elimineu-los abans de %s."
-#: builtin/add.c:207
+#: unpack-trees.c:114
#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "No s'ha pogut obrir '%s' per a escriptura."
+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"
-#: builtin/add.c:211
-msgid "Could not write patch"
-msgstr "No s'ha pogut escriure el pedaç"
+#: unpack-trees.c:121
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgstr "L'entrada '%s' encavalca amb '%s'. No es pot vincular."
-#: builtin/add.c:214
-msgid "editing patch failed"
-msgstr "l'edició del pedaç ha fallat"
+#: unpack-trees.c:124
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
+msgstr ""
+"No es pot actualitzar l'agafament parcial: les entrades següents no estan al "
+"dia:\n"
+"%s"
-#: builtin/add.c:217
+#: unpack-trees.c:126
#, c-format
-msgid "Could not stat '%s'"
-msgstr "No s'ha pogut fer stat a '%s'"
+msgid ""
+"The following working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Els fitxers següents en l'arbre de treball se sobreescriurien per "
+"actualitzar l'agafament parcial:\n"
+"%s"
-#: builtin/add.c:219
-msgid "Empty patch. Aborted."
-msgstr "El pedaç és buit. S'ha avortat."
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"The following working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Els fitxers següents en l'arbre de treball s'eliminarien per actualitzar "
+"l'agafament parcial:\n"
+"%s"
-#: builtin/add.c:224
+#: unpack-trees.c:205
#, c-format
-msgid "Could not apply '%s'"
-msgstr "No s'ha pogut aplicar '%s'"
+msgid "Aborting\n"
+msgstr "S'està avortant\n"
-#: builtin/add.c:234
-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"
+#: unpack-trees.c:237
+msgid "Checking out files"
+msgstr "S'està agafant fitxers"
-#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521
-#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162
-msgid "dry run"
-msgstr "marxa en sec"
+#: urlmatch.c:120
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "l'esquema d'URL no és vàlid o li manca el sufix '://'"
-#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19
-#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593
-#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114
-msgid "be verbose"
-msgstr "sigues detallat"
+#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "seqüència d'escapament %XX no vàlida"
+
+#: urlmatch.c:172
+msgid "missing host and scheme is not 'file:'"
+msgstr "manca la màquina i l'esquema no és 'file:'"
-#: builtin/add.c:256
-msgid "interactive picking"
-msgstr "recull interactiu"
+#: urlmatch.c:189
+msgid "a 'file:' URL may not have a port number"
+msgstr "un URL 'file:' no pot tenir número de port"
-#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286
-msgid "select hunks interactively"
-msgstr "selecciona els trossos interactivament"
+#: urlmatch.c:199
+msgid "invalid characters in host name"
+msgstr "hi ha caràcters no vàlids en el nom de màquina"
-#: builtin/add.c:258
-msgid "edit current diff and apply"
-msgstr "edita la diferència actual i aplica-la"
+#: urlmatch.c:244 urlmatch.c:255
+msgid "invalid port number"
+msgstr "número de port no vàlid"
-#: builtin/add.c:259
-msgid "allow adding otherwise ignored files"
-msgstr "permet afegir fitxers que d'altra manera s'ignoren"
+#: urlmatch.c:322
+msgid "invalid '..' path segment"
+msgstr "segment de camí '..' no vàlid"
-#: builtin/add.c:260
-msgid "update tracked files"
-msgstr "actualitza els fitxers seguits"
+#: worktree.c:282
+#, c-format
+msgid "failed to read '%s'"
+msgstr "s'ha fallat en llegir '%s'"
-#: builtin/add.c:261
-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"
+#: wrapper.c:222 wrapper.c:392
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr "no s'ha pogut obrir '%s' per a lectura i escriptura"
-#: builtin/add.c:262
-msgid "add changes from all tracked and untracked files"
-msgstr "afegeix els canvis de tots els fitxers seguits i no seguits"
+#: wrapper.c:224 wrapper.c:394 builtin/am.c:766
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "no s'ha pogut obrir '%s' per a escriptura"
-#: builtin/add.c:265
-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)"
+#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
+#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029
+#: builtin/pull.c:341
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "no s'ha pogut obrir '%s' per a lectura"
-#: builtin/add.c:267
-msgid "don't add, only refresh the index"
-msgstr "no afegeixis, només actualitza l'índex"
+#: wrapper.c:605 wrapper.c:626
+#, c-format
+msgid "unable to access '%s'"
+msgstr "no s'ha pogut accedir a '%s'"
-#: builtin/add.c:268
-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"
+#: wrapper.c:634
+msgid "unable to get current working directory"
+msgstr "no s'ha pogut obtenir el directori de treball actual"
-#: builtin/add.c:269
-msgid "check if - even missing - files are ignored in dry run"
-msgstr ""
-"comproveu si els fitxers - fins i tot els absents - s'ignoren en marxa en sec"
+#: wrapper.c:658
+#, c-format
+msgid "could not write to %s"
+msgstr "no s'ha pogut escriure a %s"
-#: builtin/add.c:270 builtin/update-index.c:958
-msgid "(+/-)x"
-msgstr "(+/-)x"
+#: wrapper.c:660
+#, c-format
+msgid "could not close %s"
+msgstr "no s'ha pogut tancar %s"
-#: builtin/add.c:270 builtin/update-index.c:959
-msgid "override the executable bit of the listed files"
-msgstr "passa per alt el bit executable dels fitxers llistats"
+#: wt-status.c:151
+msgid "Unmerged paths:"
+msgstr "Camins sense fusionar:"
-#: builtin/add.c:292
+#: wt-status.c:178 wt-status.c:205
#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "Useu -f si realment els voleu afegir.\n"
+msgid " (use \"git reset %s <file>...\" to unstage)"
+msgstr " (useu \"git reset %s <fitxer>...\" per a desallistar)"
-#: builtin/add.c:300
-msgid "adding files failed"
-msgstr "l'afegiment de fitxers ha fallat"
+#: wt-status.c:180 wt-status.c:207
+msgid " (use \"git rm --cached <file>...\" to unstage)"
+msgstr " (useu \"git rm --cached <fitxer>...\" per a desallistar)"
-#: builtin/add.c:336
-msgid "-A and -u are mutually incompatible"
-msgstr "-A i -u són mutualment incompatibles"
+#: wt-status.c:184
+msgid " (use \"git add <file>...\" to mark resolution)"
+msgstr " (useu \"git add <fitxer>...\" per a senyalar resolució)"
-#: builtin/add.c:343
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "L'opció --ignore-missing només es pot usar junt amb --dry-run"
+#: wt-status.c:186 wt-status.c:190
+msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr ""
+" (useu \"git add/rm <fitxer>...\" segons sigui apropiat per a senyalar "
+"resolució)"
-#: builtin/add.c:352
-#, 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"
+#: wt-status.c:188
+msgid " (use \"git rm <file>...\" to mark resolution)"
+msgstr " (useu \"git rm <fitxer>...\" per a senyalar resolució)"
-#: builtin/add.c:367
-#, c-format
-msgid "Nothing specified, nothing added.\n"
-msgstr "No s'ha especificat res, no s'ha afegit res.\n"
+#: wt-status.c:199 wt-status.c:945
+msgid "Changes to be committed:"
+msgstr "Canvis a cometre:"
-#: builtin/add.c:368
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "Potser volíeu dir 'git add .'?\n"
+#: wt-status.c:217 wt-status.c:954
+msgid "Changes not staged for commit:"
+msgstr "Canvis no allistats per a cometre:"
-#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279
-#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340
-#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:240
-msgid "index file corrupt"
-msgstr "fitxer d'índex malmès"
+#: wt-status.c:221
+msgid " (use \"git add <file>...\" to update what will be committed)"
+msgstr " (useu \"git add <fitxer>...\" per a actualitzar què es cometrà)"
-#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431
-msgid "Unable to write new index file"
-msgstr "no s'ha pogut escriure un fitxer d'índex nou"
+#: wt-status.c:223
+msgid " (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr " (useu \"git add/rm <fitxer>...\" per a actualitzar què es cometrà)"
-#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032
-#, c-format
-msgid "could not read '%s'"
-msgstr "no s'ha pogut llegir '%s'"
+#: wt-status.c:224
+msgid ""
+" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+msgstr ""
+" (useu \"git checkout -- <fitxer>...\" per a descartar els canvis en el "
+"directori de treball)"
-#: builtin/am.c:426
-msgid "could not parse author script"
-msgstr "no s'ha pogut analitzar l'script d'autor"
+#: wt-status.c:226
+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)"
-#: builtin/am.c:503
+#: wt-status.c:238
#, c-format
-msgid "'%s' was deleted by the applypatch-msg hook"
-msgstr "s'ha suprimit '%s' pel ganxo applypatch-msg"
+msgid " (use \"git %s <file>...\" to include in what will be committed)"
+msgstr " (useu \"git %s <fitxer>...\" per a incloure-ho en què es cometrà)"
-#: builtin/am.c:544 builtin/notes.c:301
-#, c-format
-msgid "Malformed input line: '%s'."
-msgstr "Línia d'entrada mal formada: '%s'."
+#: wt-status.c:253
+msgid "both deleted:"
+msgstr "suprimit per ambdós:"
-#: builtin/am.c:581 builtin/notes.c:316
-#, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
-msgstr "S'ha fallat en copiar les notes de '%s' a '%s'"
+#: wt-status.c:255
+msgid "added by us:"
+msgstr "afegit per nosaltres:"
-#: builtin/am.c:607
-msgid "fseek failed"
-msgstr "fseek ha fallat"
+#: wt-status.c:257
+msgid "deleted by them:"
+msgstr "suprimit per ells:"
-#: builtin/am.c:787
-#, c-format
-msgid "could not parse patch '%s'"
-msgstr "no s'ha pogut analitzar el pedaç '%s'"
+#: wt-status.c:259
+msgid "added by them:"
+msgstr "afegit per ells:"
-#: builtin/am.c:852
-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"
+#: wt-status.c:261
+msgid "deleted by us:"
+msgstr "suprimit per nosaltres:"
-#: builtin/am.c:899
-msgid "invalid timestamp"
-msgstr "marca de temps no vàlida"
+#: wt-status.c:263
+msgid "both added:"
+msgstr "afegit per ambdós:"
-#: builtin/am.c:902 builtin/am.c:910
-msgid "invalid Date line"
-msgstr "línia Date no vàlida"
+#: wt-status.c:265
+msgid "both modified:"
+msgstr "modificat per ambdós:"
-#: builtin/am.c:907
-msgid "invalid timezone offset"
-msgstr "desplaçament de zona de temps no vàlid"
+#: wt-status.c:275
+msgid "new file:"
+msgstr "fitxer nou:"
-#: builtin/am.c:996
-msgid "Patch format detection failed."
-msgstr "La detecció de format de pedaç ha fallat."
+#: wt-status.c:277
+msgid "copied:"
+msgstr "copiat:"
-#: builtin/am.c:1001 builtin/clone.c:380
-#, c-format
-msgid "failed to create directory '%s'"
-msgstr "s'ha fallat en crear el directori '%s'"
+#: wt-status.c:279
+msgid "deleted:"
+msgstr "suprimit:"
-#: builtin/am.c:1005
-msgid "Failed to split patches."
-msgstr "S'ha fallat en dividir els pedaços."
+#: wt-status.c:281
+msgid "modified:"
+msgstr "modificat:"
-#: builtin/am.c:1137 builtin/commit.c:366
-msgid "unable to write index file"
-msgstr "no s'ha pogut escriure el fitxer d'índex"
+#: wt-status.c:283
+msgid "renamed:"
+msgstr "canviat de nom:"
-#: builtin/am.c:1188
-#, c-format
-msgid "When you have resolved this problem, run \"%s --continue\"."
-msgstr "Quan hàgiu resolt aquest problema, executeu \"%s --continue\"."
+#: wt-status.c:285
+msgid "typechange:"
+msgstr "canviat de tipus:"
-#: builtin/am.c:1189
-#, c-format
-msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
-msgstr ""
-"Si preferiu saltar aquest pedaç, executeu \"%s --skip\" en lloc d'això."
+#: wt-status.c:287
+msgid "unknown:"
+msgstr "desconegut:"
-#: builtin/am.c:1190
-#, 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"
-"\"."
+#: wt-status.c:289
+msgid "unmerged:"
+msgstr "sense fusionar:"
-#: builtin/am.c:1328
-msgid "Patch is empty. Was it split wrong?"
-msgstr "El pedaç és buit. S'ha dividit malament?"
+#: wt-status.c:371
+msgid "new commits, "
+msgstr "comissions noves, "
-#: builtin/am.c:1402 builtin/log.c:1543
-#, c-format
-msgid "invalid ident line: %s"
-msgstr "línia d'identitat no vàlida: %s"
+#: wt-status.c:373
+msgid "modified content, "
+msgstr "contingut modificat, "
-#: builtin/am.c:1429
-#, c-format
-msgid "unable to parse commit %s"
-msgstr "no s'ha pogut analitzar la comissió %s"
+#: wt-status.c:375
+msgid "untracked content, "
+msgstr "contingut no seguit, "
-#: builtin/am.c:1602
-msgid "Repository lacks necessary blobs to fall back on 3-way merge."
-msgstr ""
-"Al dipòsit li manquen els blobs necessaris per a retrocedir a una fusió de 3 "
-"vies."
+#: wt-status.c:818
+msgid "Submodules changed but not updated:"
+msgstr "Submòduls canviats però no actualitzats:"
-#: builtin/am.c:1604
-msgid "Using index info to reconstruct a base tree..."
-msgstr "S'està usant la informació d'índex per a reconstruir un arbre base..."
+#: wt-status.c:820
+msgid "Submodule changes to be committed:"
+msgstr "Canvis de submòdul a cometre:"
-#: builtin/am.c:1623
+#: wt-status.c:901
msgid ""
-"Did you hand edit your patch?\n"
-"It does not apply to blobs recorded in its index."
+"Do not touch the line above.\n"
+"Everything below will be removed."
msgstr ""
-"Heu editat el vostre pedaç a mà?\n"
-"No s'aplica als blobs recordats en el seu índex."
+"No toqueu la línia a dalt.\n"
+"Tot el que hi ha a sota s'eliminarà."
-#: builtin/am.c:1629
-msgid "Falling back to patching base and 3-way merge..."
-msgstr "S'està retrocedint a apedaçar la base i fusionar de 3 vies..."
+#: wt-status.c:1013
+msgid "You have unmerged paths."
+msgstr "Teniu camins sense fusionar."
-#: builtin/am.c:1654
-msgid "Failed to merge in the changes."
-msgstr "S'ha fallat en fusionar els canvis."
+#: wt-status.c:1016
+msgid " (fix conflicts and run \"git commit\")"
+msgstr " (arregleu els conflictes i executeu \"git commit\")"
-#: builtin/am.c:1679 builtin/merge.c:628
-msgid "git write-tree failed to write a tree"
-msgstr "git write-tree ha fallat en escriure un arbre"
+#: wt-status.c:1018
+msgid " (use \"git merge --abort\" to abort the merge)"
+msgstr " (useu \"git merge --abort\" per a avortar la fusió)"
-#: builtin/am.c:1686
-msgid "applying to an empty history"
-msgstr "s'està aplicant a una història buida"
+#: wt-status.c:1023
+msgid "All conflicts fixed but you are still merging."
+msgstr "Tots els conflictes estan arreglats però encara esteu fusionant."
+
+#: wt-status.c:1026
+msgid " (use \"git commit\" to conclude merge)"
+msgstr " (useu \"git commit\" per a concloure la fusió)"
+
+#: wt-status.c:1036
+msgid "You are in the middle of an am session."
+msgstr "Esteu enmig d'una sessió am."
-#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798
-#: builtin/merge.c:823
-msgid "failed to write commit object"
-msgstr "s'ha fallat en escriure l'objecte de comissió"
+#: wt-status.c:1039
+msgid "The current patch is empty."
+msgstr "El pedaç actual està buit."
-#: builtin/am.c:1731 builtin/am.c:1735
-#, c-format
-msgid "cannot resume: %s does not exist."
-msgstr "no es pot reprendre: %s no existeix."
+#: wt-status.c:1043
+msgid " (fix conflicts and then run \"git am --continue\")"
+msgstr " (arregleu els conflictes i després executeu \"git am --continue\")"
-#: builtin/am.c:1751
-msgid "cannot be interactive without stdin connected to a terminal."
-msgstr ""
-"no es pot ser interactiu sense que stdin sigui connectat a un terminal."
+#: wt-status.c:1045
+msgid " (use \"git am --skip\" to skip this patch)"
+msgstr " (useu \"git am --skip\" per a ometre aquest pedaç)"
-#: builtin/am.c:1756
-msgid "Commit Body is:"
-msgstr "El cos de la comissió és:"
+#: wt-status.c:1047
+msgid " (use \"git am --abort\" to restore the original branch)"
+msgstr " (useu \"git am --abort\" per a restaurar la branca original)"
-#. 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:1766
-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: "
+#: wt-status.c:1172
+msgid "No commands done."
+msgstr "No s'ha fet cap ordre."
-#: builtin/am.c:1816
+#: wt-status.c:1175
#, c-format
-msgid "Dirty index: cannot apply patches (dirty: %s)"
-msgstr "Índex brut: no es pot aplicar pedaços (bruts: %s)"
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] "Última ordre feta (%d ordre feta):"
+msgstr[1] "Últimes ordres fetes (%d ordres fetes):"
-#: builtin/am.c:1853 builtin/am.c:1925
+#: wt-status.c:1186
#, c-format
-msgid "Applying: %.*s"
-msgstr "S'està aplicant: %.*s"
+msgid " (see more in file %s)"
+msgstr " (vegeu més en el fitxer %s)"
-#: builtin/am.c:1869
-msgid "No changes -- Patch already applied."
-msgstr "Sense canvis -- El pedaç ja s'ha aplicat."
+#: wt-status.c:1191
+msgid "No commands remaining."
+msgstr "No manca cap ordre."
-#: builtin/am.c:1877
+#: wt-status.c:1194
#, c-format
-msgid "Patch failed at %s %.*s"
-msgstr "El pedaç ha fallat a %s %.*s"
+msgid "Next command to do (%d remaining command):"
+msgid_plural "Next commands to do (%d remaining commands):"
+msgstr[0] "Ordre següent a fer (manca %d ordre):"
+msgstr[1] "Ordres següents a fer (manquen %d ordres):"
+
+#: wt-status.c:1202
+msgid " (use \"git rebase --edit-todo\" to view and edit)"
+msgstr " (useu \"git rebase --edit-todo\" per a veure i editar)"
-#: builtin/am.c:1883
+#: wt-status.c:1215
#, c-format
-msgid "The copy of the patch that failed is found in: %s"
-msgstr "La còpia del pedaç que ha fallat es troba en: %s"
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "Actualment esteu rebasant la branca '%s' en '%s'."
-#: builtin/am.c:1928
-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 ""
-"Cap canvi - heu oblidat d'usar 'git add'?\n"
-"Si no hi ha res a allistar, probablement alguna altra cosa\n"
-"ja ha introduït els mateixos canvis; potser voleu ometre aquest pedaç."
+#: wt-status.c:1220
+msgid "You are currently rebasing."
+msgstr "Actualment esteu rebasant."
-#: builtin/am.c:1935
-msgid ""
-"You still have unmerged paths in your index.\n"
-"Did you forget to use 'git add'?"
+#: wt-status.c:1234
+msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
-"Encara teniu camins sense fusionar en el vostre índex.\n"
-"Heu oblidat d'usar 'git add'?"
+" (arregleu els conflictes i després executeu \"git rebase --continue\")"
-#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308
-#: builtin/reset.c:316
-#, c-format
-msgid "Could not parse object '%s'."
-msgstr "No s'ha pogut analitzar l'objecte '%s'."
+#: wt-status.c:1236
+msgid " (use \"git rebase --skip\" to skip this patch)"
+msgstr " (useu \"git rebase --skip\" per a saltar aquest pedaç)"
-#: builtin/am.c:2095
-msgid "failed to clean index"
-msgstr "s'ha fallat en netejar l'índex"
+#: wt-status.c:1238
+msgid " (use \"git rebase --abort\" to check out the original branch)"
+msgstr " (useu \"git rebase --abort\" per a agafar la branca original)"
-#: builtin/am.c:2129
-msgid ""
-"You seem to have moved HEAD since the last 'am' failure.\n"
-"Not rewinding to ORIG_HEAD"
+#: wt-status.c:1244
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
-"Sembla que heu mogut HEAD després de l'última fallada de 'am'.\n"
-"No rebobinant a ORIG_HEAD"
+" (tots els conflictes estan arreglats: executeu \"git rebase --continue\")"
-#: builtin/am.c:2192
+#: wt-status.c:1248
#, c-format
-msgid "Invalid value for --patch-format: %s"
-msgstr "Valor no vàlid per a --patch-format: %s"
-
-#: builtin/am.c:2225
-msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
-msgstr "git am [<opcions>] [(<bústia>|<directori-de-correu>)...]"
-
-#: builtin/am.c:2226
-msgid "git am [<options>] (--continue | --skip | --abort)"
-msgstr "git am [<opcions>] (--continue | --skip | --abort)"
-
-#: builtin/am.c:2232
-msgid "run interactively"
-msgstr "executa interactivament"
-
-#: builtin/am.c:2234
-msgid "historical option -- no-op"
-msgstr "opció històrica -- no-op"
-
-#: builtin/am.c:2236
-msgid "allow fall back on 3way merging if needed"
-msgstr "permet retrocedir a una fusió de 3 vies si és necessari"
-
-#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57
-#: builtin/repack.c:172
-msgid "be quiet"
-msgstr "calla"
-
-#: builtin/am.c:2239
-msgid "add a Signed-off-by line to the commit message"
-msgstr "afegeix una línia Signed-off-by al missatge de comissió"
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Actualment esteu dividint una comissió mentre rebaseu la branca '%s' en '%s'."
-#: builtin/am.c:2242
-msgid "recode into utf8 (default)"
-msgstr "recodifica en utf8 (per defecte)"
+#: wt-status.c:1253
+msgid "You are currently splitting a commit during a rebase."
+msgstr "Actualment esteu dividint una comissió durant un rebasament."
-#: builtin/am.c:2244
-msgid "pass -k flag to git-mailinfo"
-msgstr "passa la bandera -k al git-mailinfo"
+#: wt-status.c:1256
+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\")"
-#: builtin/am.c:2246
-msgid "pass -b flag to git-mailinfo"
-msgstr "passa la bandera -b al git-mailinfo"
+#: wt-status.c:1260
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Actualment esteu editant una comissió mentre rebaseu la branca '%s' en '%s'."
-#: builtin/am.c:2248
-msgid "pass -m flag to git-mailinfo"
-msgstr "passa la bandera -m al git-mailinfo"
+#: wt-status.c:1265
+msgid "You are currently editing a commit during a rebase."
+msgstr "Actualment esteu editant una comissió durant un rebasament."
-#: builtin/am.c:2250
-msgid "pass --keep-cr flag to git-mailsplit for mbox format"
-msgstr "passa la bandera --keep-cr al git-mailsplit pel format mbox"
+#: wt-status.c:1268
+msgid " (use \"git commit --amend\" to amend the current commit)"
+msgstr " (useu \"git commit --amend\" per a esmenar la comissió actual)"
-#: builtin/am.c:2253
-msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+#: wt-status.c:1270
+msgid ""
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-"no passis la bandera --keep-cr al git-mailsplit independent de am.keepcr"
-
-#: builtin/am.c:2256
-msgid "strip everything before a scissors line"
-msgstr "despulla tot abans d'una línia de tissores"
-
-#: builtin/am.c:2257 builtin/apply.c:4837
-msgid "action"
-msgstr "acció"
+" (useu \"git rebase --continue\" una vegada que estigueu satisfet amb els "
+"vostres canvis)"
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279
-#: builtin/am.c:2285
-msgid "pass it through git-apply"
-msgstr "passa-ho a través del git-apply"
+#: wt-status.c:1280
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "Actualment esteu recollint com a cirera la comissió %s."
-#: builtin/am.c:2266 builtin/apply.c:4861
-msgid "root"
-msgstr "arrel"
+#: wt-status.c:1285
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr " (arregleu els conflictes i executeu \"git cherry-pick --continue\")"
-#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799
-#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96
-#: builtin/pull.c:179 builtin/submodule--helper.c:277
-#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482
-#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823
-#: builtin/submodule--helper.c:826
-msgid "path"
-msgstr "camí"
+#: wt-status.c:1288
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr ""
+" (tots els conflictes estan arreglats: executeu \"git cherry-pick --continue"
+"\")"
-#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134 builtin/pull.c:193
-#: builtin/repack.c:181 builtin/repack.c:185 builtin/show-branch.c:645
-#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
-#: parse-options.h:134 parse-options.h:244
-msgid "n"
-msgstr "n"
+#: wt-status.c:1290
+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 recull de "
+"cireres)"
-#: builtin/am.c:2278 builtin/apply.c:4805
-msgid "num"
-msgstr "número"
+#: wt-status.c:1299
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "Actualment esteu revertint la comissió %s."
-#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438
-#: builtin/tag.c:372
-msgid "format"
-msgstr "format"
+#: wt-status.c:1304
+msgid " (fix conflicts and run \"git revert --continue\")"
+msgstr " (arregleu els conflictes i executeu \"git revert --continue\")"
-#: builtin/am.c:2282
-msgid "format the patch(es) are in"
-msgstr "el format en el qual estan els pedaços"
+#: wt-status.c:1307
+msgid " (all conflicts fixed: run \"git revert --continue\")"
+msgstr ""
+" (tots els conflictes estan arreglats: executeu \"git revert --continue\")"
-#: builtin/am.c:2288
-msgid "override error message when patch failure occurs"
+#: wt-status.c:1309
+msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
-"passa per alt el missatge d'error quan s'ocorre una fallada en apedaçar"
+" (useu \"git revert --abort\" per a cancel·lar l'operació de reversió)"
-#: builtin/am.c:2290
-msgid "continue applying patches after resolving a conflict"
-msgstr "segueix aplicant pedaços després de resoldre un conflicte"
+#: wt-status.c:1320
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "Actualment esteu bisecant, heu començat des de la branca '%s'."
-#: builtin/am.c:2293
-msgid "synonyms for --continue"
-msgstr "sinònims de --continue"
+#: wt-status.c:1324
+msgid "You are currently bisecting."
+msgstr "Actualment esteu bisecant."
-#: builtin/am.c:2296
-msgid "skip the current patch"
-msgstr "salta el pedaç actual"
+#: wt-status.c:1327
+msgid " (use \"git bisect reset\" to get back to the original branch)"
+msgstr " (useu \"git bisect reset\" per a tornar a la branca original)"
-#: builtin/am.c:2299
-msgid "restore the original branch and abort the patching operation."
-msgstr "restaura la branca original i avorta l'operació d'apedaçament."
+#: wt-status.c:1524
+msgid "On branch "
+msgstr "En la branca "
-#: builtin/am.c:2303
-msgid "lie about committer date"
-msgstr "menteix sobre la data del comitent"
+#: wt-status.c:1530
+msgid "interactive rebase in progress; onto "
+msgstr "rebasament interactiu en progrés; sobre "
-#: builtin/am.c:2305
-msgid "use current timestamp for author date"
-msgstr "usa el marc de temps actual per la data d'autor"
+#: wt-status.c:1532
+msgid "rebase in progress; onto "
+msgstr "rebasament en progrés; sobre "
-#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229
-#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
-msgid "key-id"
-msgstr "ID de clau"
+#: wt-status.c:1537
+msgid "HEAD detached at "
+msgstr "HEAD separat a "
-#: builtin/am.c:2308
-msgid "GPG-sign commits"
-msgstr "signa les comissions amb GPG"
+#: wt-status.c:1539
+msgid "HEAD detached from "
+msgstr "HEAD separat de "
-#: builtin/am.c:2311
-msgid "(internal use for git-rebase)"
-msgstr "(ús intern per al git-rebase)"
+#: wt-status.c:1542
+msgid "Not currently on any branch."
+msgstr "Actualment no s'és en cap branca."
-#: builtin/am.c:2326
-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 ""
-"Fa molt que l'opció -b/--binary no ha fet res, i\n"
-"s'eliminarà. Si us plau, no l'useu més."
+#: wt-status.c:1560
+msgid "Initial commit"
+msgstr "Comissió inicial"
-#: builtin/am.c:2333
-msgid "failed to read the index"
-msgstr "s'ha fallat en llegir l'índex"
+#: wt-status.c:1574
+msgid "Untracked files"
+msgstr "Fitxers no seguits"
-#: builtin/am.c:2348
-#, c-format
-msgid "previous rebase directory %s still exists but mbox given."
-msgstr ""
-"un directori de rebasament anterior %s encara existeix però s'ha donat una "
-"bústia."
+#: wt-status.c:1576
+msgid "Ignored files"
+msgstr "Fitxers ignorats"
-#: builtin/am.c:2372
+#: wt-status.c:1580
#, c-format
msgid ""
-"Stray %s directory found.\n"
-"Use \"git am --abort\" to remove it."
+"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 ""
-"Directori %s extraviat trobat.\n"
-"Useu \"git am --abort\" per a eliminar-lo."
+"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 per vós mateix (vegeu\n"
+"'git help status')."
-#: builtin/am.c:2378
-msgid "Resolve operation not in progress, we are not resuming."
-msgstr "Operació de resolució no en curs; no reprenem."
+#: wt-status.c:1586
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "Els fitxers no seguits no estan llistats%s"
-#: builtin/apply.c:122
-msgid "git apply [<options>] [<patch>...]"
-msgstr "git apply [<opcions>] [<pedaç>...]"
+#: wt-status.c:1588
+msgid " (use -u option to show untracked files)"
+msgstr " (useu l'opció -u per a mostrar els fitxers no seguits)"
-#: builtin/apply.c:153
-#, c-format
-msgid "unrecognized whitespace option '%s'"
-msgstr "opció d'espai en blanc '%s' no reconeguda"
+#: wt-status.c:1594
+msgid "No changes"
+msgstr "Sense canvis"
-#: builtin/apply.c:169
+#: wt-status.c:1599
#, c-format
-msgid "unrecognized whitespace ignore option '%s'"
-msgstr "opció d'ignoral d'espai en blanc '%s' no reconeguda"
+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"
-#: builtin/apply.c:854
+#: wt-status.c:1602
#, c-format
-msgid "Cannot prepare timestamp regexp %s"
-msgstr "No es pot preparar l'expressió regular de marca de temps %s"
+msgid "no changes added to commit\n"
+msgstr "no hi ha canvis afegits a cometre\n"
-#: builtin/apply.c:863
+#: wt-status.c:1605
#, c-format
-msgid "regexec returned %d for input: %s"
-msgstr "regexec ha retornat %d per l'entrada: %s"
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr ""
+"no hi ha res afegit a cometre però fitxers no seguits estan presents (useu "
+"\"git add\" per a seguir-los)\n"
-#: builtin/apply.c:947
+#: wt-status.c:1608
#, 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"
+msgid "nothing added to commit but untracked files present\n"
+msgstr "no hi ha res afegit a cometre però fitxers no seguits estan presents\n"
-#: builtin/apply.c:984
+#: wt-status.c:1611
#, c-format
-msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-"git apply: git-diff dolent - /dev/null esperat, %s rebut en la línia %d"
+"no hi ha res a cometre (creeu/copieu fitxers i useu \"git add\" per a seguir-"
+"los)\n"
-#: builtin/apply.c:989
+#: wt-status.c:1614 wt-status.c:1619
#, c-format
-msgid "git apply: bad git-diff - inconsistent new filename on line %d"
-msgstr ""
-"git apply: git-diff dolent - nom de fitxer nou inconsistent en la línia %d"
+msgid "nothing to commit\n"
+msgstr "no hi ha res a cometre\n"
-#: builtin/apply.c:990
+#: wt-status.c:1617
#, c-format
-msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-"git apply: git-diff dolent - nom de fitxer antic inconsistent en la línia %d"
+"no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n"
-#: builtin/apply.c:995
+#: wt-status.c:1621
#, c-format
-msgid "git apply: bad git-diff - expected /dev/null on line %d"
-msgstr "git apply: git-diff dolent - /dev/null esperat en la línia %d"
+msgid "nothing to commit, working tree clean\n"
+msgstr "no hi ha res a cometre, l'arbre de treball està net\n"
-#: builtin/apply.c:1489
-#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr "recompte: línia inesperada: %.*s"
+#: wt-status.c:1728
+msgid "Initial commit on "
+msgstr "Comissió inicial en "
-#: builtin/apply.c:1550
-#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr "fragment de pedaç sense capçalera a la línia %d: %.*s"
+#: wt-status.c:1732
+msgid "HEAD (no branch)"
+msgstr "HEAD (sense branca)"
-#: builtin/apply.c:1567
-#, 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] ""
-"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)"
-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)"
+#: wt-status.c:1761
+msgid "gone"
+msgstr "no hi és"
-#: builtin/apply.c:1743
-msgid "new file depends on old contents"
-msgstr "el fitxer nou depèn dels continguts antics"
+#: wt-status.c:1763 wt-status.c:1771
+msgid "behind "
+msgstr "darrere "
-#: builtin/apply.c:1745
-msgid "deleted file still has contents"
-msgstr "el fitxer suprimit encara té continguts"
+#: wt-status.c:1766 wt-status.c:1769
+msgid "ahead "
+msgstr "davant per "
-#: builtin/apply.c:1774
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2270
#, c-format
-msgid "corrupt patch at line %d"
-msgstr "el pedaç és malmès a la línia %d"
+msgid "cannot %s: You have unstaged changes."
+msgstr "no es pot %s: Teniu canvis no allistats."
-#: builtin/apply.c:1810
-#, c-format
-msgid "new file %s depends on old contents"
-msgstr "el fitxer nou %s depèn dels continguts antics"
+#: wt-status.c:2276
+msgid "additionally, your index contains uncommitted changes."
+msgstr "addicionalment, el vostre índex conté canvis sense cometre."
-#: builtin/apply.c:1812
+#: wt-status.c:2278
#, c-format
-msgid "deleted file %s still has contents"
-msgstr "el fitxer suprimit %s encara té continguts"
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "no es pot %s: El vostre índex conté canvis sense cometre."
-#: builtin/apply.c:1815
+#: compat/precompose_utf8.c:57 builtin/clone.c:414
#, c-format
-msgid "** warning: file %s becomes empty but is not deleted"
-msgstr "** advertència: el fitxer %s queda buit però no se suprimeix"
+msgid "failed to unlink '%s'"
+msgstr "s'ha fallat en desenllaçar '%s'"
-#: builtin/apply.c:1962
-#, c-format
-msgid "corrupt binary patch at line %d: %.*s"
-msgstr "pedaç binari malmès a la línia %d: %.*s"
+#: builtin/add.c:22
+msgid "git add [<options>] [--] <pathspec>..."
+msgstr "git add [<opcions>] [--] <especificació-de-camí>..."
-#: builtin/apply.c:1999
+#: builtin/add.c:80
#, c-format
-msgid "unrecognized binary patch at line %d"
-msgstr "pedaç binari no reconegut a la línia %d"
+msgid "unexpected diff status %c"
+msgstr "estat de diff inesperat %c"
+
+#: builtin/add.c:85 builtin/commit.c:291
+msgid "updating files failed"
+msgstr "s'ha fallat en actualitzar els fitxers"
-#: builtin/apply.c:2154
+#: builtin/add.c:95
#, c-format
-msgid "patch with only garbage at line %d"
-msgstr "pedaç amb només escombraries a la línia %d"
+msgid "remove '%s'\n"
+msgstr "elimina '%s'\n"
+
+#: builtin/add.c:149
+msgid "Unstaged changes after refreshing the index:"
+msgstr "Canvis no allistats després d'actualitzar l'índex:"
-#: builtin/apply.c:2244
+#: builtin/add.c:209 builtin/rev-parse.c:840
+msgid "Could not read the index"
+msgstr "No s'ha pogut llegir l'índex"
+
+#: builtin/add.c:220
#, c-format
-msgid "unable to read symlink %s"
-msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
+msgid "Could not open '%s' for writing."
+msgstr "No s'ha pogut obrir '%s' per a escriptura."
+
+#: builtin/add.c:224
+msgid "Could not write patch"
+msgstr "No s'ha pogut escriure el pedaç"
+
+#: builtin/add.c:227
+msgid "editing patch failed"
+msgstr "l'edició del pedaç ha fallat"
-#: builtin/apply.c:2248
+#: builtin/add.c:230
#, c-format
-msgid "unable to open or read %s"
-msgstr "no s'ha pogut obrir o llegir %s"
+msgid "Could not stat '%s'"
+msgstr "No s'ha pogut fer stat a '%s'"
+
+#: builtin/add.c:232
+msgid "Empty patch. Aborted."
+msgstr "El pedaç és buit. S'ha avortat."
-#: builtin/apply.c:2901
+#: builtin/add.c:237
#, c-format
-msgid "invalid start of line: '%c'"
-msgstr "inici de línia no vàlid: '%c'"
+msgid "Could not apply '%s'"
+msgstr "No s'ha pogut aplicar '%s'"
+
+#: builtin/add.c:247
+msgid "The following paths are ignored by one of your .gitignore files:\n"
+msgstr ""
+"Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n"
+
+#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111
+#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521
+#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162
+msgid "dry run"
+msgstr "marxa en sec"
+
+#: builtin/add.c:269
+msgid "interactive picking"
+msgstr "recull interactiu"
+
+#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286
+msgid "select hunks interactively"
+msgstr "selecciona els trossos interactivament"
+
+#: builtin/add.c:271
+msgid "edit current diff and apply"
+msgstr "edita la diferència actual i aplica-la"
+
+#: builtin/add.c:272
+msgid "allow adding otherwise ignored files"
+msgstr "permet afegir fitxers que d'altra manera s'ignoren"
+
+#: builtin/add.c:273
+msgid "update tracked files"
+msgstr "actualitza els fitxers seguits"
+
+#: builtin/add.c:274
+msgid "record only the fact that the path will be added later"
+msgstr "registra només el fet de que el camí s'afegirà més tard"
+
+#: builtin/add.c:275
+msgid "add changes from all tracked and untracked files"
+msgstr "afegeix els canvis de tots els fitxers seguits i no seguits"
+
+#: builtin/add.c:278
+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:280
+msgid "don't add, only refresh the index"
+msgstr "no afegeixis, només actualitza l'índex"
+
+#: builtin/add.c:281
+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:282
+msgid "check if - even missing - files are ignored in dry run"
+msgstr ""
+"comproveu si els fitxers - fins i tot els absents - s'ignoren en marxa en sec"
+
+#: builtin/add.c:283 builtin/update-index.c:947
+msgid "(+/-)x"
+msgstr "(+/-)x"
+
+#: builtin/add.c:283 builtin/update-index.c:948
+msgid "override the executable bit of the listed files"
+msgstr "passa per alt el bit executable dels fitxers llistats"
-#: builtin/apply.c:3020
+#: builtin/add.c:305
#, c-format
-msgid "Hunk #%d succeeded at %d (offset %d line)."
-msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
-msgstr[0] "El tros #%d ha tingut èxit a %d (desplaçament %d línia)."
-msgstr[1] "El tros #%d ha tingut èxit a %d (desplaçament %d línies)."
+msgid "Use -f if you really want to add them.\n"
+msgstr "Useu -f si realment els voleu afegir.\n"
+
+#: builtin/add.c:312
+msgid "adding files failed"
+msgstr "l'afegiment de fitxers ha fallat"
+
+#: builtin/add.c:348
+msgid "-A and -u are mutually incompatible"
+msgstr "-A i -u són mutualment incompatibles"
+
+#: builtin/add.c:355
+msgid "Option --ignore-missing can only be used together with --dry-run"
+msgstr "L'opció --ignore-missing només es pot usar junt amb --dry-run"
-#: builtin/apply.c:3032
+#: builtin/add.c:359
#, 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"
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr "el paràmetre --chmod '%s' ha de ser o -x o +x"
-#: builtin/apply.c:3038
+#: builtin/add.c:374
#, c-format
-msgid ""
-"while searching for:\n"
-"%.*s"
-msgstr ""
-"tot cercant:\n"
-"%.*s"
+msgid "Nothing specified, nothing added.\n"
+msgstr "No s'ha especificat res, no s'ha afegit res.\n"
-#: builtin/apply.c:3060
+#: builtin/add.c:375
#, c-format
-msgid "missing binary patch data for '%s'"
-msgstr "manquen les dades de pedaç binari de '%s'"
+msgid "Maybe you wanted to say 'git add .'?\n"
+msgstr "Potser volíeu dir 'git add .'?\n"
+
+#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279
+#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350
+#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:244
+msgid "index file corrupt"
+msgstr "fitxer d'índex malmès"
+
+#: builtin/am.c:414
+msgid "could not parse author script"
+msgstr "no s'ha pogut analitzar l'script d'autor"
-#: builtin/apply.c:3163
+#: builtin/am.c:491
#, c-format
-msgid "binary patch does not apply to '%s'"
-msgstr "el pedaç binari no s'aplica a '%s'"
+msgid "'%s' was deleted by the applypatch-msg hook"
+msgstr "s'ha suprimit '%s' pel ganxo applypatch-msg"
-#: builtin/apply.c:3169
+#: builtin/am.c:532
#, c-format
-msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
-msgstr ""
-"el pedaç binari a '%s' crea un resultat incorrecte (esperant %s, %s rebut)"
+msgid "Malformed input line: '%s'."
+msgstr "Línia d'entrada mal formada: '%s'."
-#: builtin/apply.c:3190
+#: builtin/am.c:569
#, c-format
-msgid "patch failed: %s:%ld"
-msgstr "el pedaç ha fallat: %s:%ld"
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr "S'ha fallat en copiar les notes de '%s' a '%s'"
+
+#: builtin/am.c:595
+msgid "fseek failed"
+msgstr "fseek ha fallat"
-#: builtin/apply.c:3314
+#: builtin/am.c:775
#, c-format
-msgid "cannot checkout %s"
-msgstr "no es pot agafar %s"
+msgid "could not parse patch '%s'"
+msgstr "no s'ha pogut analitzar el pedaç '%s'"
+
+#: builtin/am.c:840
+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/apply.c:3370
-#, c-format
-msgid "reading from '%s' beyond a symbolic link"
-msgstr "s'està llegint de '%s' més enllà d'un enllaç simbòlic"
+#: builtin/am.c:887
+msgid "invalid timestamp"
+msgstr "marca de temps no vàlida"
-#: builtin/apply.c:3399 builtin/apply.c:3630
-#, c-format
-msgid "path %s has been renamed/deleted"
-msgstr "el camí %s s'ha canviat de nom / s'ha suprimit"
+#: builtin/am.c:890 builtin/am.c:898
+msgid "invalid Date line"
+msgstr "línia Date no vàlida"
-#: builtin/apply.c:3482 builtin/apply.c:3644
-#, c-format
-msgid "%s: does not exist in index"
-msgstr "%s: no existeix en l'índex"
+#: builtin/am.c:895
+msgid "invalid timezone offset"
+msgstr "desplaçament de zona de temps no vàlid"
-#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658
-#, c-format
-msgid "%s: %s"
-msgstr "%s: %s"
+#: builtin/am.c:984
+msgid "Patch format detection failed."
+msgstr "La detecció de format de pedaç ha fallat."
-#: builtin/apply.c:3491 builtin/apply.c:3652
+#: builtin/am.c:989 builtin/clone.c:379
#, c-format
-msgid "%s: does not match index"
-msgstr "%s: no coincideix amb l'índex"
+msgid "failed to create directory '%s'"
+msgstr "s'ha fallat en crear el directori '%s'"
-#: builtin/apply.c:3597
-msgid "removal patch leaves file contents"
-msgstr "el pedaç d'eliminació deixa els continguts dels fitxers"
+#: builtin/am.c:993
+msgid "Failed to split patches."
+msgstr "S'ha fallat en dividir els pedaços."
-#: builtin/apply.c:3669
-#, c-format
-msgid "%s: wrong type"
-msgstr "%s: tipus erroni"
+#: builtin/am.c:1125 builtin/commit.c:376
+msgid "unable to write index file"
+msgstr "no s'ha pogut escriure el fitxer d'índex"
-#: builtin/apply.c:3671
+#: builtin/am.c:1176
#, c-format
-msgid "%s has type %o, expected %o"
-msgstr "%s és del tipus %o, s'esperava %o"
+msgid "When you have resolved this problem, run \"%s --continue\"."
+msgstr "Quan hàgiu resolt aquest problema, executeu \"%s --continue\"."
-#: builtin/apply.c:3822 builtin/apply.c:3824
+#: builtin/am.c:1177
#, c-format
-msgid "invalid path '%s'"
-msgstr "camí no vàlid: %s"
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+msgstr ""
+"Si preferiu saltar aquest pedaç, executeu \"%s --skip\" en lloc d'això."
-#: builtin/apply.c:3879
+#: builtin/am.c:1178
#, c-format
-msgid "%s: already exists in index"
-msgstr "%s: ja existeix en l'índex"
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgstr ""
+"Per a restaurar la branca original i deixar d'apedaçar, executeu \"%s --abort"
+"\"."
-#: builtin/apply.c:3882
-#, c-format
-msgid "%s: already exists in working directory"
-msgstr "%s: ja existeix en el directori de treball"
+#: builtin/am.c:1316
+msgid "Patch is empty. Was it split wrong?"
+msgstr "El pedaç és buit. S'ha dividit malament?"
-#: builtin/apply.c:3902
+#: builtin/am.c:1390 builtin/log.c:1550
#, 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)"
+msgid "invalid ident line: %s"
+msgstr "línia d'identitat no vàlida: %s"
-#: builtin/apply.c:3907
+#: builtin/am.c:1417
#, 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"
+msgid "unable to parse commit %s"
+msgstr "no s'ha pogut analitzar la comissió %s"
-#: builtin/apply.c:3927
-#, c-format
-msgid "affected file '%s' is beyond a symbolic link"
-msgstr "el fitxer afectat '%s' és més enllà d'un enllaç simbòlic"
+#: builtin/am.c:1610
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+msgstr ""
+"Al dipòsit li manquen els blobs necessaris per a retrocedir a una fusió de 3 "
+"vies."
-#: builtin/apply.c:3931
-#, c-format
-msgid "%s: patch does not apply"
-msgstr "%s: el pedaç no s'aplica"
+#: builtin/am.c:1612
+msgid "Using index info to reconstruct a base tree..."
+msgstr "S'està usant la informació d'índex per a reconstruir un arbre base..."
-#: builtin/apply.c:3945
-#, c-format
-msgid "Checking patch %s..."
-msgstr "S'està comprovant el pedaç %s..."
+#: builtin/am.c:1631
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
+msgstr ""
+"Heu editat el vostre pedaç a mà?\n"
+"No s'aplica als blobs recordats en el seu índex."
-#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "make_cache_entry ha fallat per al camí '%s'"
+#: builtin/am.c:1637
+msgid "Falling back to patching base and 3-way merge..."
+msgstr "S'està retrocedint a apedaçar la base i fusionar de 3 vies..."
-#: builtin/apply.c:4182
-#, c-format
-msgid "unable to remove %s from index"
-msgstr "no s'ha pogut eliminar %s de l'índex"
+#: builtin/am.c:1662
+msgid "Failed to merge in the changes."
+msgstr "S'ha fallat en fusionar els canvis."
-#: builtin/apply.c:4215
-#, c-format
-msgid "corrupt patch for submodule %s"
-msgstr "pedaç malmès per al submòdul %s"
+#: builtin/am.c:1686 builtin/merge.c:628
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree ha fallat en escriure un arbre"
-#: builtin/apply.c:4219
-#, c-format
-msgid "unable to stat newly created file '%s'"
-msgstr "no s'ha pogut fer stat al fitxer novament creat '%s'"
+#: builtin/am.c:1693
+msgid "applying to an empty history"
+msgstr "s'està aplicant a una història buida"
+
+#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798
+#: builtin/merge.c:823
+msgid "failed to write commit object"
+msgstr "s'ha fallat en escriure l'objecte de comissió"
-#: builtin/apply.c:4224
+#: builtin/am.c:1739 builtin/am.c:1743
#, c-format
-msgid "unable to create backing store for newly created file %s"
+msgid "cannot resume: %s does not exist."
+msgstr "no es pot reprendre: %s no existeix."
+
+#: builtin/am.c:1759
+msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
-"no s'ha pogut crear un magatzem de recolzament per al fitxer novament creat "
-"%s"
+"no es pot ser interactiu sense que stdin estigui connectada a un terminal."
-#: builtin/apply.c:4227 builtin/apply.c:4340
-#, c-format
-msgid "unable to add cache entry for %s"
-msgstr "no s'ha pogut afegir una entrada de cau per a %s"
+#: builtin/am.c:1764
+msgid "Commit Body is:"
+msgstr "El cos de la comissió és:"
-#: builtin/apply.c:4260
-#, c-format
-msgid "closing file '%s'"
-msgstr "s'està tancant el fitxer '%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:1774
+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/apply.c:4313
+#: builtin/am.c:1824
#, c-format
-msgid "unable to write file '%s' mode %o"
-msgstr "no s'ha pogut escriure el fitxer '%s' mode %o"
+msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgstr "Índex brut: no es pot aplicar pedaços (bruts: %s)"
-#: builtin/apply.c:4403
+#: builtin/am.c:1861 builtin/am.c:1933
#, c-format
-msgid "Applied patch %s cleanly."
-msgstr "El pedaç %s s'ha aplicat netament."
+msgid "Applying: %.*s"
+msgstr "S'està aplicant: %.*s"
-#: builtin/apply.c:4411
-msgid "internal error"
-msgstr "error intern"
+#: builtin/am.c:1877
+msgid "No changes -- Patch already applied."
+msgstr "Sense canvis -- El pedaç ja s'ha aplicat."
-#: builtin/apply.c:4414
+#: builtin/am.c:1885
#, 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 rebuitjos..."
+msgid "Patch failed at %s %.*s"
+msgstr "El pedaç ha fallat a %s %.*s"
-#: builtin/apply.c:4424
+#: builtin/am.c:1891
#, c-format
-msgid "truncating .rej filename to %.*s.rej"
-msgstr "s'està truncant el nom del fitxer .rej a %.*s.rej"
+msgid "The copy of the patch that failed is found in: %s"
+msgstr "La còpia del pedaç que ha fallat es troba en: %s"
-#: builtin/apply.c:4432
-#, c-format
-msgid "cannot open %s: %s"
-msgstr "no es pot obrir %s: %s"
+#: builtin/am.c:1936
+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 ""
+"Cap canvi - heu oblidat d'usar 'git add'?\n"
+"Si no hi ha res a allistar, probablement alguna altra cosa ja ha\n"
+"introduït els mateixos canvis; potser voleu ometre aquest pedaç."
-#: builtin/apply.c:4445
-#, c-format
-msgid "Hunk #%d applied cleanly."
-msgstr "El tros #%d s'ha aplicat netament."
+#: builtin/am.c:1943
+msgid ""
+"You still have unmerged paths in your index.\n"
+"Did you forget to use 'git add'?"
+msgstr ""
+"Encara teniu camins sense fusionar en el vostre índex.\n"
+"Heu oblidat d'usar 'git add'?"
-#: builtin/apply.c:4448
+#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
+#: builtin/reset.c:316
#, c-format
-msgid "Rejected hunk #%d."
-msgstr "S'ha rebutjat el tros #%d."
+msgid "Could not parse object '%s'."
+msgstr "No s'ha pogut analitzar l'objecte '%s'."
+
+#: builtin/am.c:2103
+msgid "failed to clean index"
+msgstr "s'ha fallat en netejar l'índex"
+
+#: builtin/am.c:2137
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
+msgstr ""
+"Sembla que heu mogut HEAD després de l'última fallada de 'am'.\n"
+"No s'està rebobinant a ORIG_HEAD"
-#: builtin/apply.c:4537
+#: builtin/am.c:2200
#, c-format
-msgid "Skipped patch '%s'."
-msgstr "S'ha saltat el pedaç '%s'."
+msgid "Invalid value for --patch-format: %s"
+msgstr "Valor no vàlid per a --patch-format: %s"
-#: builtin/apply.c:4545
-msgid "unrecognized input"
-msgstr "entrada no reconeguda"
+#: builtin/am.c:2233
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+msgstr "git am [<opcions>] [(<bústia> | <directori-de-correu>)...]"
-#: builtin/apply.c:4556
-msgid "unable to read index file"
-msgstr "no es pot llegir el fitxer d'índex"
+#: builtin/am.c:2234
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<opcions>] (--continue | --skip | --abort)"
-#: builtin/apply.c:4701
-msgid "--3way outside a repository"
-msgstr "--3way fora d'un dipòsit"
+#: builtin/am.c:2240
+msgid "run interactively"
+msgstr "executa interactivament"
-#: builtin/apply.c:4709
-msgid "--index outside a repository"
-msgstr "--index fora d'un dipòsit"
+#: builtin/am.c:2242
+msgid "historical option -- no-op"
+msgstr "opció històrica -- no-op"
-#: builtin/apply.c:4712
-msgid "--cached outside a repository"
-msgstr "--cached fora d'un dipòsit"
+#: builtin/am.c:2244
+msgid "allow fall back on 3way merging if needed"
+msgstr "permet retrocedir a una fusió de 3 vies si és necessari"
-#: builtin/apply.c:4745
-#, c-format
-msgid "can't open patch '%s'"
-msgstr "no es pot obrir el pedaç '%s'"
+#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
+#: builtin/repack.c:172
+msgid "be quiet"
+msgstr "calla"
-#: builtin/apply.c:4760
-#, c-format
-msgid "squelched %d whitespace error"
-msgid_plural "squelched %d whitespace errors"
-msgstr[0] "s'ha omès %d error d'espai en blanc"
-msgstr[1] "s'han omès %d errors d'espai en blanc"
+#: builtin/am.c:2247
+msgid "add a Signed-off-by line to the commit message"
+msgstr "afegeix una línia Signed-off-by al missatge de comissió"
-#: builtin/apply.c:4766 builtin/apply.c:4776
-#, 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."
+#: builtin/am.c:2250
+msgid "recode into utf8 (default)"
+msgstr "recodifica en utf8 (per defecte)"
-#: builtin/apply.c:4800
-msgid "don't apply changes matching the given path"
-msgstr "no apliquis els canvis que coincideixin amb el camí donat"
+#: builtin/am.c:2252
+msgid "pass -k flag to git-mailinfo"
+msgstr "passa la bandera -k al git-mailinfo"
-#: builtin/apply.c:4803
-msgid "apply changes matching the given path"
-msgstr "aplica els canvis que coincideixin amb el camí donat"
+#: builtin/am.c:2254
+msgid "pass -b flag to git-mailinfo"
+msgstr "passa la bandera -b al git-mailinfo"
-#: builtin/apply.c:4806
-msgid "remove <num> leading slashes from traditional diff paths"
-msgstr ""
-"elimina <nombre> barres obliqües inicials dels camins de diferència "
-"tradicionals"
+#: builtin/am.c:2256
+msgid "pass -m flag to git-mailinfo"
+msgstr "passa la bandera -m al git-mailinfo"
-#: builtin/apply.c:4809
-msgid "ignore additions made by the patch"
-msgstr "ignora afegiments fets pel pedaç"
+#: builtin/am.c:2258
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+msgstr "passa la bandera --keep-cr al git-mailsplit per al format mbox"
-#: builtin/apply.c:4811
-msgid "instead of applying the patch, output diffstat for the input"
+#: builtin/am.c:2261
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-"en lloc d'aplicar el pedaç, emet les estadístiques de diferència de l'entrada"
+"no passis la bandera --keep-cr al git-mailsplit independent de am.keepcr"
-#: builtin/apply.c:4815
-msgid "show number of added and deleted lines in decimal notation"
-msgstr "mostra el nombre de línies afegides i suprimides en notació decimal"
+#: builtin/am.c:2264
+msgid "strip everything before a scissors line"
+msgstr "despulla tot abans d'una línia de tissores"
-#: builtin/apply.c:4817
-msgid "instead of applying the patch, output a summary for the input"
-msgstr "en lloc d'aplicar el pedaç, emet un resum de l'entrada"
+#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
+#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
+#: builtin/am.c:2293
+msgid "pass it through git-apply"
+msgstr "passa-ho a través del git-apply"
+
+#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
+#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135 builtin/pull.c:194
+#: builtin/repack.c:181 builtin/repack.c:185 builtin/show-branch.c:644
+#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
+#: parse-options.h:134 parse-options.h:245
+msgid "n"
+msgstr "n"
-#: builtin/apply.c:4819
-msgid "instead of applying the patch, see if the patch is applicable"
-msgstr "en lloc d'aplicar el pedaç, veges si el pedaç és aplicable"
+#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/tag.c:372
+msgid "format"
+msgstr "format"
-#: builtin/apply.c:4821
-msgid "make sure the patch is applicable to the current index"
-msgstr "assegura que el pedaç sigui aplicable a l'índex actual"
+#: builtin/am.c:2290
+msgid "format the patch(es) are in"
+msgstr "el format en el qual estan els pedaços"
-#: builtin/apply.c:4823
-msgid "apply a patch without touching the working tree"
-msgstr "aplica un pedaç sense tocar l'arbre de treball"
+#: builtin/am.c:2296
+msgid "override error message when patch failure occurs"
+msgstr ""
+"passa per alt el missatge d'error quan s'ocorre una fallada en apedaçar"
-#: builtin/apply.c:4825
-msgid "accept a patch that touches outside the working area"
-msgstr "accepta un pedaç que toqui fora de l'àrea de treball"
+#: builtin/am.c:2298
+msgid "continue applying patches after resolving a conflict"
+msgstr "segueix aplicant pedaços després de resoldre un conflicte"
-#: builtin/apply.c:4827
-msgid "also apply the patch (use with --stat/--summary/--check)"
-msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)"
+#: builtin/am.c:2301
+msgid "synonyms for --continue"
+msgstr "sinònims de --continue"
-#: builtin/apply.c:4829
-msgid "attempt three-way merge if a patch does not apply"
-msgstr "intenta una fusió de tres vies si el pedaç no s'aplica"
+#: builtin/am.c:2304
+msgid "skip the current patch"
+msgstr "salta el pedaç actual"
-#: builtin/apply.c:4831
-msgid "build a temporary index based on embedded index information"
-msgstr "construeix un índex temporal basat en la informació d'índex incrustada"
+#: builtin/am.c:2307
+msgid "restore the original branch and abort the patching operation."
+msgstr "restaura la branca original i avorta l'operació d'apedaçament."
-#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426
-msgid "paths are separated with NUL character"
-msgstr "els camins se separen amb el caràcter NUL"
+#: builtin/am.c:2311
+msgid "lie about committer date"
+msgstr "menteix sobre la data del comitent"
-#: builtin/apply.c:4836
-msgid "ensure at least <n> lines of context match"
-msgstr "assegura't que almenys <n> línies de context coincideixin"
+#: builtin/am.c:2313
+msgid "use current timestamp for author date"
+msgstr "usa el marc de temps actual per la data d'autor"
-#: builtin/apply.c:4838
-msgid "detect new or modified lines that have whitespace errors"
-msgstr ""
-"detecta les línies noves o modificades que tinguin errors d'espai en blanc"
+#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229
+#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355
+msgid "key-id"
+msgstr "ID de clau"
-#: builtin/apply.c:4841 builtin/apply.c:4844
-msgid "ignore changes in whitespace when finding context"
-msgstr "ignora els canvis d'espai en blanc en cercar context"
+#: builtin/am.c:2316
+msgid "GPG-sign commits"
+msgstr "signa les comissions amb GPG"
-#: builtin/apply.c:4847
-msgid "apply the patch in reverse"
-msgstr "aplica el pedaç al revés"
+#: builtin/am.c:2319
+msgid "(internal use for git-rebase)"
+msgstr "(ús intern per al git-rebase)"
-#: builtin/apply.c:4849
-msgid "don't expect at least one line of context"
-msgstr "no esperis almenys una línia de context"
+#: builtin/am.c:2334
+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 ""
+"Fa molt que l'opció -b/--binary no ha fet res, i\n"
+"s'eliminarà. Si us plau, no l'useu més."
-#: builtin/apply.c:4851
-msgid "leave the rejected hunks in corresponding *.rej files"
-msgstr "deixa els trossos rebutjats en fitxers *.reg coresspondents"
+#: builtin/am.c:2341
+msgid "failed to read the index"
+msgstr "s'ha fallat en llegir l'índex"
-#: builtin/apply.c:4853
-msgid "allow overlapping hunks"
-msgstr "permet trossos encavalcants"
+#: builtin/am.c:2356
+#, c-format
+msgid "previous rebase directory %s still exists but mbox given."
+msgstr ""
+"un directori de rebasament anterior %s encara existeix però s'ha donat una "
+"bústia."
-#: builtin/apply.c:4856
-msgid "tolerate incorrectly detected missing new-line at the end of file"
-msgstr "tolera una línia nova incorrectament detectada al final del fitxer"
+#: builtin/am.c:2380
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
+msgstr ""
+"S'ha trobat un directori %s extraviat.\n"
+"Useu \"git am --abort\" per a eliminar-lo."
-#: builtin/apply.c:4859
-msgid "do not trust the line counts in the hunk headers"
-msgstr "no confiïs en els recomptes de línia en les capçaleres dels trossos"
+#: builtin/am.c:2386
+msgid "Resolve operation not in progress, we are not resuming."
+msgstr "Una operació de resolució no està en curs; no reprenem."
-#: builtin/apply.c:4862
-msgid "prepend <root> to all filenames"
-msgstr "anteposa <arrel> a tots els noms de fitxer"
+#: builtin/apply.c:8
+msgid "git apply [<options>] [<patch>...]"
+msgstr "git apply [<opcions>] [<pedaç>...]"
#: builtin/archive.c:17
#, c-format
msgid "Blaming lines"
msgstr "S'estan culpant les línies"
-#: builtin/blame.c:2536
+#: builtin/blame.c:2577
msgid "Show blame entries as we find them, incrementally"
msgstr "Mostra les entrades de culpa mentre les trobem, incrementalment"
-#: builtin/blame.c:2537
+#: builtin/blame.c:2578
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
"Mostra un SHA-1 en blanc per les comissions de frontera (Per defecte: "
"desactivat)"
-#: builtin/blame.c:2538
+#: builtin/blame.c:2579
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
"No tractis les comissions d'arrel com a límits (Per defecte: desactivat)"
-#: builtin/blame.c:2539
+#: builtin/blame.c:2580
msgid "Show work cost statistics"
msgstr "Mostra les estadístiques de preu de treball"
-#: builtin/blame.c:2540
+#: builtin/blame.c:2581
msgid "Force progress reporting"
msgstr "Força l'informe de progrés"
-#: builtin/blame.c:2541
+#: builtin/blame.c:2582
msgid "Show output score for blame entries"
msgstr "Mostra la puntuació de sortida de les entrades de culpa"
-#: builtin/blame.c:2542
+#: builtin/blame.c:2583
msgid "Show original filename (Default: auto)"
msgstr "Mostra el nom de fitxer original (Per defecte: automàtic)"
-#: builtin/blame.c:2543
+#: builtin/blame.c:2584
msgid "Show original linenumber (Default: off)"
msgstr "Mostra el número de línia original (Per defecte: desactivat)"
-#: builtin/blame.c:2544
+#: builtin/blame.c:2585
msgid "Show in a format designed for machine consumption"
msgstr "Presenta en un format dissenyat per consumpció per màquina"
-#: builtin/blame.c:2545
+#: builtin/blame.c:2586
msgid "Show porcelain format with per-line commit information"
msgstr "Mostra el format de porcellana amb informació de comissió per línia"
-#: builtin/blame.c:2546
+#: builtin/blame.c:2587
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:2547
+#: builtin/blame.c:2588
msgid "Show raw timestamp (Default: off)"
msgstr "Mostra la marca de temps crua (Per defecte: desactivat)"
-#: builtin/blame.c:2548
+#: builtin/blame.c:2589
msgid "Show long commit SHA1 (Default: off)"
msgstr "Mostra l'SHA1 de comissió llarg (Per defecte: desactivat)"
-#: builtin/blame.c:2549
+#: builtin/blame.c:2590
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:2550
+#: builtin/blame.c:2591
msgid "Show author email instead of name (Default: off)"
msgstr ""
"Mostra l'adreça de correu electrònic de l'autor en lloc del nom (Per "
"defecte: desactivat)"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2592
msgid "Ignore whitespace differences"
msgstr "Ignora les diferències d'espai en blanc"
-#: builtin/blame.c:2552
+#: builtin/blame.c:2599
+msgid "Use an experimental indent-based heuristic to improve diffs"
+msgstr ""
+"Usa un heurístic experimental basat en sagnat per a millorar les diferències"
+
+#: builtin/blame.c:2600
+msgid "Use an experimental blank-line-based heuristic to improve diffs"
+msgstr ""
+"Usa un heurístic experimental basat en línies en blanc per a millorar les "
+"diferències"
+
+#: builtin/blame.c:2602
msgid "Spend extra cycles to find better match"
msgstr "Gasta cicles extres per a trobar una coincidència millor"
-#: builtin/blame.c:2553
+#: builtin/blame.c:2603
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:2554
+#: builtin/blame.c:2604
msgid "Use <file>'s contents as the final image"
msgstr "Usa els continguts de <fitxer> com a la imatge final"
-#: builtin/blame.c:2555 builtin/blame.c:2556
+#: builtin/blame.c:2605 builtin/blame.c:2606
msgid "score"
msgstr "puntuació"
-#: builtin/blame.c:2555
+#: builtin/blame.c:2605
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:2556
+#: builtin/blame.c:2606
msgid "Find line movements within and across files"
msgstr "Troba moviments de línia dins i a través dels fitxers"
-#: builtin/blame.c:2557
+#: builtin/blame.c:2607
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2557
+#: builtin/blame.c:2607
msgid "Process only line range n,m, counting from 1"
msgstr "Processa només el rang de línies n,m, comptant des d'1"
+#: builtin/blame.c:2654
+msgid "--progress can't be used with --incremental or porcelain formats"
+msgstr ""
+"no es pot usar --progress amb els formats --incremental o de porcellana"
+
#. 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:2649
+#: builtin/blame.c:2700
msgid "4 years, 11 months ago"
msgstr "fa 4 anys i 11 mesos"
+#: builtin/blame.c:2780
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents i --reverse no es jutgen bé."
+
+#: builtin/blame.c:2800
+msgid "cannot use --contents with final commit object name"
+msgstr "no es pot usar --contents amb el nom d'objecte de la comissió final"
+
+#: builtin/blame.c:2805
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr ""
+"--reverse i --first-parent-together requereixen una última comissió "
+"especificada"
+
+#: builtin/blame.c:2832
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
+msgstr ""
+"--reverse --first-parent junts requereixen un rang de la cadena de mares "
+"primeres"
+
+#: builtin/blame.c:2843
+#, c-format
+msgid "no such path %s in %s"
+msgstr "no hi ha tal camí %s en %s"
+
+#: builtin/blame.c:2854
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "no es pot llegir el blob %s per al camí %s"
+
+#: builtin/blame.c:2873
+#, 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/branch.c:26
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<opcions>] [-r | -a] [--merged | --no-merged]"
msgid "change the upstream info"
msgstr "canvia la informació de font"
+#: builtin/branch.c:660
+msgid "Unset the upstream info"
+msgstr "Desestableix la informació de font"
+
#: builtin/branch.c:661
msgid "use colored output"
msgstr "usa sortida colorada"
msgid "field name to sort on"
msgstr "nom del camp en el qual ordenar"
-#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402
-#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404
+#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570
#: builtin/tag.c:369
msgid "object"
msgstr "objecte"
msgid "Failed to resolve HEAD as a valid ref."
msgstr "S'ha fallat en resoldre HEAD com a referència vàlida."
-#: builtin/branch.c:709 builtin/clone.c:707
+#: builtin/branch.c:709 builtin/clone.c:706
msgid "HEAD not found below refs/heads!"
msgstr "HEAD no trobat sota refs/heads!"
msgid "Need a repository to unbundle."
msgstr "Cal un dipòsit per a desfer un farcell."
-#: builtin/cat-file.c:443
+#: builtin/cat-file.c:513
msgid ""
-"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
-"<type>|--textconv) <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) <objecte>"
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <tipus> | --textconv | --filters [--path=<camí>]) <objecte>"
-#: builtin/cat-file.c:444
-msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
-msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
+#: builtin/cat-file.c:514
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
+msgstr ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
-#: builtin/cat-file.c:481
+#: builtin/cat-file.c:551
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<tipus> pot ser un de: blob, tree, commit, tag"
-#: builtin/cat-file.c:482
+#: builtin/cat-file.c:552
msgid "show object type"
msgstr "mostra el tipus de l'objecte"
-#: builtin/cat-file.c:483
+#: builtin/cat-file.c:553
msgid "show object size"
msgstr "mostra la mida de l'objecte"
-#: builtin/cat-file.c:485
+#: builtin/cat-file.c:555
msgid "exit with zero when there's no error"
msgstr "surt amb zero quan no hi ha error"
-#: builtin/cat-file.c:486
+#: builtin/cat-file.c:556
msgid "pretty-print object's content"
msgstr "imprimeix bellament el contingut de l'objecte"
-#: builtin/cat-file.c:488
+#: builtin/cat-file.c:558
msgid "for blob objects, run textconv on object's content"
msgstr "en els objectes de blob, executa textconv en el contingut de l'objecte"
-#: builtin/cat-file.c:490
+#: builtin/cat-file.c:560
+msgid "for blob objects, run filters on object's content"
+msgstr ""
+"en els objectes de blob, executa els filtres en el contingut de l'objecte"
+
+#: builtin/cat-file.c:561 git-submodule.sh:923
+msgid "blob"
+msgstr "blob"
+
+#: builtin/cat-file.c:562
+msgid "use a specific path for --textconv/--filters"
+msgstr "usa un camí especìfic per a --textconv/--filters"
+
+#: builtin/cat-file.c:564
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:491
+#: builtin/cat-file.c:565
msgid "buffer --batch output"
msgstr "posa la sortida de --batch en memòria intermèdia"
-#: builtin/cat-file.c:493
+#: builtin/cat-file.c:567
msgid "show info and content of objects fed from the standard input"
msgstr ""
"mostra la informació i contingut dels objectes rebuts de l'entrada estàndard"
-#: builtin/cat-file.c:496
+#: builtin/cat-file.c:570
msgid "show info about objects fed from the standard input"
msgstr "mostra informació sobre els objectes rebuts de l'entrada estàndard"
-#: builtin/cat-file.c:499
+#: builtin/cat-file.c:573
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"segueix els enllaços simbòlics en l'arbre (s'usa amb --batch o --batch-check)"
-#: builtin/cat-file.c:501
+#: builtin/cat-file.c:575
msgid "show all objects with --batch or --batch-check"
msgstr "mostra tots els objectes amb --batch o --batch-check"
msgid "use .gitattributes only from the index"
msgstr "usa .gitattributes només des de l'índex"
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97
+#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
msgid "read file names from stdin"
msgstr "llegeix els noms de fitxer d'stdin"
msgid "terminate input and output records by a NUL character"
msgstr "acaba els registres d'entrada i de sortida amb un caràcter NUL"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "omet el reportatge de progrés"
msgstr "escriu el contingut a fitxers temporals"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491
-#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497
-#: builtin/submodule--helper.c:830 builtin/worktree.c:469
+#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598
+#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951
+#: builtin/worktree.c:469
msgid "string"
msgstr "cadena"
#: builtin/checkout.c:230
#, c-format
msgid "Unable to add merge result for '%s'"
-msgstr "no s'ha pogut afegir el resultat de fusió per a '%s'"
+msgstr "No s'ha pogut afegir el resultat de fusió per a '%s'"
#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
#: builtin/checkout.c:259
msgid "path '%s' is unmerged"
msgstr "el camí '%s' està sense fusionar"
-#: builtin/checkout.c:495
+#: builtin/checkout.c:494
msgid "you need to resolve your current index first"
msgstr "heu de primer resoldre el vostre índex actual"
-#: builtin/checkout.c:625
+#: builtin/checkout.c:624
#, 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:664
+#: builtin/checkout.c:663
msgid "HEAD is now at"
msgstr "HEAD ara és a"
-#: builtin/checkout.c:668 builtin/clone.c:661
+#: builtin/checkout.c:667 builtin/clone.c:660
msgid "unable to update HEAD"
msgstr "no s'ha pogut actualitzar HEAD"
-#: builtin/checkout.c:672
+#: builtin/checkout.c:671
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Restableix la branca '%s'\n"
-#: builtin/checkout.c:675
+#: builtin/checkout.c:674
#, c-format
msgid "Already on '%s'\n"
msgstr "Ja en '%s'\n"
-#: builtin/checkout.c:679
+#: builtin/checkout.c:678
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "S'ha agafat i restablert la branca '%s'\n"
-#: builtin/checkout.c:681 builtin/checkout.c:1070
+#: builtin/checkout.c:680 builtin/checkout.c:1069
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "S'ha agafat la branca nova '%s'\n"
-#: builtin/checkout.c:683
+#: builtin/checkout.c:682
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "S'ha agafat la branca '%s'\n"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:733
#, c-format
msgid " ... and %d more.\n"
msgstr " ... i %d més.\n"
-#: builtin/checkout.c:740
+#: builtin/checkout.c:739
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:759
+#: builtin/checkout.c:758
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
" git branch <nom-de-branca-nova> %s\n"
"\n"
-#: builtin/checkout.c:795
+#: builtin/checkout.c:794
msgid "internal error in revision walk"
msgstr "error intern en el passeig per revisions"
-#: builtin/checkout.c:799
+#: builtin/checkout.c:798
msgid "Previous HEAD position was"
msgstr "La posició de HEAD anterior era"
-#: builtin/checkout.c:826 builtin/checkout.c:1065
+#: builtin/checkout.c:825 builtin/checkout.c:1064
msgid "You are on a branch yet to be born"
msgstr "Sou en una branca que encara ha de nàixer"
-#: builtin/checkout.c:971
+#: builtin/checkout.c:970
#, c-format
msgid "only one reference expected, %d given."
msgstr "s'esperava només una referència, s'han donat %d."
-#: builtin/checkout.c:1011 builtin/worktree.c:214
+#: builtin/checkout.c:1010 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr "referència no vàlida: %s"
-#: builtin/checkout.c:1040
+#: builtin/checkout.c:1039
#, c-format
msgid "reference is not a tree: %s"
msgstr "la referència no és un arbre: %s"
-#: builtin/checkout.c:1079
+#: builtin/checkout.c:1078
msgid "paths cannot be used with switching branches"
msgstr "els camins no es poden usar amb canvi de branca"
-#: builtin/checkout.c:1082 builtin/checkout.c:1086
+#: builtin/checkout.c:1081 builtin/checkout.c:1085
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' no es pot usar amb canvi de branca"
-#: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097
+#: builtin/checkout.c:1100
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' no es pot usar amb '%s'"
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1105
#, 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:1139 builtin/checkout.c:1141 builtin/clone.c:88
+#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93
#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
#: builtin/worktree.c:326
msgid "branch"
msgstr "branca"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1139
msgid "create and checkout a new branch"
msgstr "crea i agafa una branca nova"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1141
msgid "create/reset and checkout a branch"
msgstr "crea/restableix i agafa una branca"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1142
msgid "create reflog for new branch"
msgstr "crea un registre de referència per a la branca nova"
-#: builtin/checkout.c:1144 builtin/worktree.c:328
+#: builtin/checkout.c:1143 builtin/worktree.c:328
msgid "detach HEAD at named commit"
msgstr "separa HEAD a la comissió anomenada"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
msgid "set upstream info for new branch"
msgstr "estableix la informació de font de la branca nova"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1146
msgid "new-branch"
msgstr "branca-nova"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1146
msgid "new unparented branch"
msgstr "branca òrfena nova"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1147
msgid "checkout our version for unmerged files"
msgstr "agafa la versió nostra dels fitxers sense fusionar"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1149
msgid "checkout their version for unmerged files"
msgstr "agafa la versió seva dels fitxers sense fusionar"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1151
msgid "force checkout (throw away local modifications)"
msgstr "agafa a la força (descarta qualsevulla modificació local)"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1152
msgid "perform a 3-way merge with the new branch"
msgstr "realitza una fusió de 3 vies amb la branca nova"
-#: builtin/checkout.c:1154 builtin/merge.c:231
+#: builtin/checkout.c:1153 builtin/merge.c:231
msgid "update ignored files (default)"
msgstr "actualitza els fitxers ignorats (per defecte)"
-#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250
+#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251
msgid "style"
msgstr "estil"
-#: builtin/checkout.c:1156
+#: builtin/checkout.c:1155
msgid "conflict style (merge or diff3)"
msgstr "estil de conflicte (fusió o diff3)"
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1158
msgid "do not limit pathspecs to sparse entries only"
msgstr "no limitis les especificacions de camí només a entrades disperses"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1160
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "dubta 'git checkout <cap-branca-així>'"
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1162
msgid "do not check if another worktree is holding the given ref"
msgstr "no comprovis si altre arbre de treball té la referència donada"
-#: builtin/checkout.c:1164 builtin/clone.c:60 builtin/fetch.c:117
-#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536
+#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119
+#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "força l'informe de progrés"
-#: builtin/checkout.c:1195
+#: builtin/checkout.c:1194
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B i --orphan són mutualment exclusius"
-#: builtin/checkout.c:1212
+#: builtin/checkout.c:1211
msgid "--track needs a branch name"
msgstr "--track necessita un nom de branca"
-#: builtin/checkout.c:1217
+#: builtin/checkout.c:1216
msgid "Missing branch name; try -b"
msgstr "Manca el nom de branca; proveu -b"
-#: builtin/checkout.c:1253
+#: builtin/checkout.c:1252
msgid "invalid path specification"
msgstr "especificació de camí no vàlida"
-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1259
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
"No es poden actualitzar els camins i canviar a la branca '%s' a la vegada.\n"
"Volíeu agafar '%s', la qual no es pot resoldre com a comissió?"
-#: builtin/checkout.c:1265
+#: builtin/checkout.c:1264
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach no accepta un paràmetre de camí '%s'"
-#: builtin/checkout.c:1269
+#: builtin/checkout.c:1268
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgid "remove whole directories"
msgstr "elimina directoris sencers"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
-#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725
+#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182
msgid "pattern"
msgstr "patró"
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<opcions>] [--] <dipòsit> [<directori>]"
-#: builtin/clone.c:62
+#: builtin/clone.c:65
msgid "don't create a checkout"
msgstr "no facis cap agafament"
-#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476
+#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
msgid "create a bare repository"
msgstr "crea un dipòsit nu"
-#: builtin/clone.c:67
+#: builtin/clone.c:70
msgid "create a mirror repository (implies bare)"
msgstr "crea un dipòsit reflectit (implica bare)"
-#: builtin/clone.c:69
+#: builtin/clone.c:72
msgid "to clone from a local repository"
msgstr "per a clonar des d'un dipòsit local"
-#: builtin/clone.c:71
+#: builtin/clone.c:74
msgid "don't use local hardlinks, always copy"
msgstr "no usis enllaços durs locals, sempre copia"
-#: builtin/clone.c:73
+#: builtin/clone.c:76
msgid "setup as shared repository"
msgstr "configura com a dipòsit compartit"
-#: builtin/clone.c:75 builtin/clone.c:77
+#: builtin/clone.c:78 builtin/clone.c:80
msgid "initialize submodules in the clone"
msgstr "inicialitza els submòduls en el clon"
-#: builtin/clone.c:79
+#: builtin/clone.c:82
msgid "number of submodules cloned in parallel"
msgstr "nombre de submòduls clonats en paral·lel"
-#: builtin/clone.c:80 builtin/init-db.c:473
+#: builtin/clone.c:83 builtin/init-db.c:475
msgid "template-directory"
msgstr "directori-de-plantilla"
-#: builtin/clone.c:81 builtin/init-db.c:474
+#: builtin/clone.c:84 builtin/init-db.c:476
msgid "directory from which templates will be used"
msgstr "directori del qual les plantilles s'usaran"
-#: builtin/clone.c:83 builtin/submodule--helper.c:495
-#: builtin/submodule--helper.c:833
+#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602
+#: builtin/submodule--helper.c:954
msgid "reference repository"
msgstr "dipòsit de referència"
-#: builtin/clone.c:85
+#: builtin/clone.c:90
msgid "use --reference only while cloning"
msgstr "usa --reference només en clonar"
-#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr "nom"
-#: builtin/clone.c:87
+#: builtin/clone.c:92
msgid "use <name> instead of 'origin' to track upstream"
msgstr "usa <nom> en lloc de 'origin' per a seguir la font"
-#: builtin/clone.c:89
+#: builtin/clone.c:94
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "agafa <branca> en lloc del HEAD del remot"
-#: builtin/clone.c:91
+#: builtin/clone.c:96
msgid "path to git-upload-pack on the remote"
msgstr "camí a git-upload-pack en el remot"
-#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667 builtin/pull.c:201
+#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668 builtin/pull.c:202
msgid "depth"
msgstr "profunditat"
-#: builtin/clone.c:93
+#: builtin/clone.c:98
msgid "create a shallow clone of that depth"
msgstr "crea un clon superficial de tal profunditat"
-#: builtin/clone.c:95
+#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848
+#: parse-options.h:142
+msgid "time"
+msgstr "hora"
+
+#: builtin/clone.c:100
+msgid "create a shallow clone since a specific time"
+msgstr "crea un clon superficial des d'una hora específica"
+
+#: builtin/clone.c:101 builtin/fetch.c:124
+msgid "revision"
+msgstr "revisió"
+
+#: builtin/clone.c:102 builtin/fetch.c:125
+msgid "deepen history of shallow clone by excluding rev"
+msgstr "aprofundeix la història d'un clon superficial excloent una revisió"
+
+#: builtin/clone.c:104
msgid "clone only one branch, HEAD or --branch"
msgstr "clona només una branca, HEAD o --branch"
-#: builtin/clone.c:97
+#: builtin/clone.c:106
msgid "any cloned submodules will be shallow"
msgstr "qualsevol submòdul clonat serà superficial"
-#: builtin/clone.c:98 builtin/init-db.c:482
+#: builtin/clone.c:107 builtin/init-db.c:484
msgid "gitdir"
msgstr "directori de git"
-#: builtin/clone.c:99 builtin/init-db.c:483
+#: builtin/clone.c:108 builtin/init-db.c:485
msgid "separate git dir from working tree"
msgstr "separa el directori de git de l'arbre de treball"
-#: builtin/clone.c:100
+#: builtin/clone.c:109
msgid "key=value"
msgstr "clau=valor"
-#: builtin/clone.c:101
+#: builtin/clone.c:110
msgid "set config inside the new repository"
msgstr "estableix la configuració dins del dipòsit nou"
-#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547
+#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547
msgid "use IPv4 addresses only"
msgstr "usa només les adreces IPv4"
-#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549
+#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549
msgid "use IPv6 addresses only"
msgstr "usa només les adreces IPv6"
-#: builtin/clone.c:241
+#: builtin/clone.c:250
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"No s'ha pogut endevinar cap nom de directori.\n"
"Si us plau, especifiqueu un directori en la línia d'ordres"
-#: builtin/clone.c:307
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr ""
-"Encara no se suporta el dipòsit de referència '%s' com a agafament enllaçat."
-
-#: builtin/clone.c:309
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "el dipòsit de referència '%s' no és un dipòsit local."
-
-#: builtin/clone.c:314
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "el dipòsit de referència '%s' és superficial"
-
-#: builtin/clone.c:317
+#: builtin/clone.c:303
#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "el dipòsit de referència '%s' és empeltat"
+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:376
+#: builtin/clone.c:375
#, c-format
msgid "failed to open '%s'"
msgstr "s'ha fallat en obrir '%s'"
-#: builtin/clone.c:384
+#: builtin/clone.c:383
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existeix i no és directori"
-#: builtin/clone.c:398
+#: builtin/clone.c:397
#, c-format
msgid "failed to stat %s\n"
msgstr "s'ha fallat en fer stat a '%s'\n"
-#: builtin/clone.c:420
+#: builtin/clone.c:419
#, c-format
msgid "failed to create link '%s'"
msgstr "s'ha fallat en crear l'enllaç '%s'"
-#: builtin/clone.c:424
+#: builtin/clone.c:423
#, c-format
msgid "failed to copy file to '%s'"
msgstr "s'ha fallat en copiar el fitxer a '%s'"
-#: builtin/clone.c:449
+#: builtin/clone.c:448
#, c-format
msgid "done.\n"
msgstr "fet.\n"
-#: builtin/clone.c:461
+#: builtin/clone.c:460
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"'git status' i tornar a intentar l'agafament amb\n"
"'git checkout -f HEAD'\n"
-#: builtin/clone.c:538
+#: builtin/clone.c:537
#, 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:633
+#: builtin/clone.c:632
msgid "remote did not send all necessary objects"
msgstr "el remot no ha enviat tots els objectes necessaris"
-#: builtin/clone.c:649
+#: builtin/clone.c:648
#, c-format
msgid "unable to update %s"
msgstr "no s'ha pogut actualitzar %s"
-#: builtin/clone.c:698
+#: builtin/clone.c:697
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"el HEAD remot es refereix a una referència que no existeix; no s'ha pogut "
"agafar.\n"
-#: builtin/clone.c:729
+#: builtin/clone.c:728
msgid "unable to checkout working tree"
msgstr "no s'ha pogut agafar l'arbre de treball"
-#: builtin/clone.c:766
+#: builtin/clone.c:768
msgid "unable to write parameters to config file"
msgstr "no s'ha pogut escriure els paràmetres al fitxer de configuració"
-#: builtin/clone.c:829
+#: builtin/clone.c:831
msgid "cannot repack to clean up"
msgstr "no es pot reempaquetar per a netejar"
-#: builtin/clone.c:831
+#: builtin/clone.c:833
msgid "cannot unlink temporary alternates file"
msgstr "no es pot desenllaçar el fitxer d'alternatives temporal"
-#: builtin/clone.c:863 builtin/receive-pack.c:1855
+#: builtin/clone.c:866 builtin/receive-pack.c:1895
msgid "Too many arguments."
msgstr "Hi ha massa paràmetres."
-#: builtin/clone.c:867
+#: builtin/clone.c:870
msgid "You must specify a repository to clone."
msgstr "Heu d'especificar un dipòsit per a clonar."
-#: builtin/clone.c:878
+#: builtin/clone.c:883
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "les opcions --bare i --origin %s són incompatibles."
-#: builtin/clone.c:881
+#: builtin/clone.c:886
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare i --separate-git-dir són incompatibles."
-#: builtin/clone.c:894
+#: builtin/clone.c:899
#, c-format
msgid "repository '%s' does not exist"
msgstr "el dipòsit '%s' no existeix"
-#: builtin/clone.c:900 builtin/fetch.c:1293
+#: builtin/clone.c:905 builtin/fetch.c:1338
#, c-format
msgid "depth %s is not a positive number"
msgstr "la profunditat %s no és nombre positiu"
-#: builtin/clone.c:910
+#: builtin/clone.c:915
#, 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:920
+#: builtin/clone.c:925
#, c-format
msgid "working tree '%s' already exists."
msgstr "l'arbre de treball '%s' ja existeix."
-#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544
+#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657
#: builtin/worktree.c:222 builtin/worktree.c:249
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "no s'ha pogut crear els directoris inicials de '%s'"
-#: builtin/clone.c:938
+#: builtin/clone.c:943
#, 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:956
+#: builtin/clone.c:955
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "S'està clonant al dipòsit nu '%s'...\n"
-#: builtin/clone.c:958
+#: builtin/clone.c:957
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "S'està clonant a '%s'...\n"
-#: builtin/clone.c:997
+#: builtin/clone.c:963
+msgid ""
+"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:1019
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:1000
+#: builtin/clone.c:1021
+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:1023
+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:1026
msgid "source repository is shallow, ignoring --local"
msgstr "el dipòsit font és superficial, s'està ignorant --local"
-#: builtin/clone.c:1005
+#: builtin/clone.c:1031
msgid "--local is ignored"
msgstr "--local s'ignora"
-#: builtin/clone.c:1009
+#: builtin/clone.c:1035
#, c-format
msgid "Don't know how to clone %s"
msgstr "No se sap com clonar %s"
-#: builtin/clone.c:1058 builtin/clone.c:1066
+#: builtin/clone.c:1090 builtin/clone.c:1098
#, 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:1069
+#: builtin/clone.c:1101
msgid "You appear to have cloned an empty repository."
msgstr "Sembla que heu clonat un dipòsit buit."
"Llavors \"git cherry-pick --continue\" reprendrà recollint\n"
"com a cireres les comissions restants.\n"
-#: builtin/commit.c:308
+#: builtin/commit.c:318
msgid "failed to unpack HEAD tree object"
msgstr "s'ha fallat en desempaquetar l'objecte d'arbre HEAD"
-#: builtin/commit.c:349
+#: builtin/commit.c:359
msgid "unable to create temporary index"
msgstr "no s'ha pogut crear un índex temporal"
-#: builtin/commit.c:355
+#: builtin/commit.c:365
msgid "interactive add failed"
msgstr "l'afegiment interactiu ha fallat"
-#: builtin/commit.c:368
+#: builtin/commit.c:378
msgid "unable to update temporary index"
msgstr "no s'ha pogut actualitzar l'índex temporal"
-#: builtin/commit.c:370
+#: builtin/commit.c:380
msgid "Failed to update main cache tree"
msgstr "S'ha fallat en actualitzar l'arbre principal de memòria cau"
-#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466
+#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
msgid "unable to write new_index file"
msgstr "no s'ha pogut escriure el fitxer new_index"
-#: builtin/commit.c:448
+#: builtin/commit.c:458
msgid "cannot do a partial commit during a merge."
msgstr "no es pot fer una comissió parcial durant una fusió."
-#: builtin/commit.c:450
+#: builtin/commit.c:460
msgid "cannot do a partial commit during a cherry-pick."
msgstr "no es pot fer una comissió parcial durant un recull de cireres."
-#: builtin/commit.c:459
+#: builtin/commit.c:469
msgid "cannot read the index"
msgstr "no es pot llegir l'índex"
-#: builtin/commit.c:478
+#: builtin/commit.c:488
msgid "unable to write temporary index file"
msgstr "no s'ha pogut escriure un fitxer d'índex temporal"
-#: builtin/commit.c:583
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "a la comissió '%s' li manca la capçalera d'autor"
-#: builtin/commit.c:585
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "la comissió '%s' té una línia d'autor mal formada"
-#: builtin/commit.c:604
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "paràmetre --author mal format"
-#: builtin/commit.c:612
+#: builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "format de data no vàlid: %s"
-#: builtin/commit.c:656
+#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
"no es pot seleccionar un caràcter de comentari que\n"
"no sigui usat en el missatge de comissió actual"
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
#, c-format
msgid "could not lookup commit %s"
msgstr "no s'ha pogut trobar la comissió %s"
-#: builtin/commit.c:705 builtin/shortlog.c:286
+#: builtin/commit.c:704 builtin/shortlog.c:286
#, 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:707
+#: builtin/commit.c:706
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:711
+#: builtin/commit.c:710
#, c-format
msgid "could not read log file '%s'"
msgstr "no s'ha pogut llegir el fitxer de registre '%s'"
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:737 builtin/commit.c:745
msgid "could not read SQUASH_MSG"
msgstr "no s'ha pogut llegir SQUASH_MSG"
-#: builtin/commit.c:743
+#: builtin/commit.c:742
msgid "could not read MERGE_MSG"
msgstr "no s'ha pogut llegir MERGE_MSG"
-#: builtin/commit.c:797
+#: builtin/commit.c:796
msgid "could not write commit template"
msgstr "no s'ha pogut escriure la plantilla de comissió"
-#: builtin/commit.c:815
+#: builtin/commit.c:814
#, c-format
msgid ""
"\n"
"\t%s\n"
"i intenteu-ho de nou.\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
"\t%s\n"
"i intenteu-ho de nou.\n"
-#: builtin/commit.c:833
+#: builtin/commit.c:832
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"S'ignoraran les línies començant amb '%c', i un missatge de\n"
"comissió buit avorta la comissió.\n"
-#: builtin/commit.c:840
+#: builtin/commit.c:839
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"Es retindran les línies començants amb '%c'; podeu eliminar-les per vós\n"
"mateix si voleu. Un missatge buit avorta la comissió.\n"
-#: builtin/commit.c:860
+#: builtin/commit.c:859
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:868
+#: builtin/commit.c:867
#, c-format
msgid "%sDate: %s"
msgstr "%sData: %s"
-#: builtin/commit.c:875
+#: builtin/commit.c:874
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sComitent: %.*s <%.*s>"
-#: builtin/commit.c:893
+#: builtin/commit.c:892
msgid "Cannot read index"
msgstr "No es pot llegir l'índex"
-#: builtin/commit.c:950
+#: builtin/commit.c:954
msgid "Error building trees"
msgstr "Error en construir arbres"
-#: builtin/commit.c:965 builtin/tag.c:266
+#: builtin/commit.c:969 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Si us plau, proveïu el missatge per usar o l'opció -m o l'opció -F.\n"
-#: builtin/commit.c:1067
+#: builtin/commit.c:1071
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' no és 'Nom <adreça-de-correu-electrònic>' i no coincideix amb\n"
"cap autor existent"
-#: builtin/commit.c:1082 builtin/commit.c:1322
+#: builtin/commit.c:1086 builtin/commit.c:1327
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode de fitxers no seguits no vàlid '%s'"
-#: builtin/commit.c:1119
+#: builtin/commit.c:1124
msgid "--long and -z are incompatible"
msgstr "--long i -z són incompatibles"
-#: builtin/commit.c:1149
+#: builtin/commit.c:1154
msgid "Using both --reset-author and --author does not make sense"
msgstr "Usar ambdós --reset-author i --author no té sentit"
-#: builtin/commit.c:1158
+#: builtin/commit.c:1163
msgid "You have nothing to amend."
msgstr "No teniu res a esmenar."
-#: builtin/commit.c:1161
+#: builtin/commit.c:1166
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Esteu enmig d'una fusió -- no es pot esmenar."
-#: builtin/commit.c:1163
+#: builtin/commit.c:1168
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Esteu enmig d'un recull de cireres -- no es pot esmenar."
-#: builtin/commit.c:1166
+#: builtin/commit.c:1171
msgid "Options --squash and --fixup cannot be used together"
msgstr "Les opcions --squash i --fixup no es poden usar juntes"
-#: builtin/commit.c:1176
+#: builtin/commit.c:1181
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Només un de -c/-C/-F/--fixup es pot usar."
-#: builtin/commit.c:1178
+#: builtin/commit.c:1183
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "L'opció -m no es pot combinar amb -c/-C/-F/--fixup."
-#: builtin/commit.c:1186
+#: builtin/commit.c:1191
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:1203
+#: builtin/commit.c:1208
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "Només un de --include/--only/--all/--interactive/--patch es pot usar."
-#: builtin/commit.c:1205
+#: builtin/commit.c:1210
msgid "No paths with --include/--only does not make sense."
msgstr "--include/--only no té sentit sense camí."
-#: builtin/commit.c:1207
+#: builtin/commit.c:1212
msgid "Clever... amending the last one with dirty index."
msgstr "Intel·ligent... s'està esmenant l'últim amb índex brut."
-#: builtin/commit.c:1209
+#: builtin/commit.c:1214
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr ""
"S'han especificat camins explícits sense -i o -o; s'està presumint camins --"
"only..."
-#: builtin/commit.c:1221 builtin/tag.c:474
+#: builtin/commit.c:1226 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Mode de neteja no vàlid %s"
-#: builtin/commit.c:1226
+#: builtin/commit.c:1231
msgid "Paths with -a does not make sense."
msgstr "-a no té sentit amb camins."
-#: builtin/commit.c:1336 builtin/commit.c:1622
+#: builtin/commit.c:1341 builtin/commit.c:1617
msgid "show status concisely"
msgstr "mostra l'estat concisament"
-#: builtin/commit.c:1338 builtin/commit.c:1624
+#: builtin/commit.c:1343 builtin/commit.c:1619
msgid "show branch information"
msgstr "mostra la informació de branca"
-#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522
+#: builtin/commit.c:1345
+msgid "version"
+msgstr "versió"
+
+#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522
#: builtin/worktree.c:440
msgid "machine-readable output"
msgstr "sortida llegible per màquina"
-#: builtin/commit.c:1343 builtin/commit.c:1628
+#: builtin/commit.c:1348 builtin/commit.c:1623
msgid "show status in long format (default)"
msgstr "mostra l'estat en format llarg (per defecte)"
-#: builtin/commit.c:1346 builtin/commit.c:1631
+#: builtin/commit.c:1351 builtin/commit.c:1626
msgid "terminate entries with NUL"
msgstr "acaba les entrades amb NUL"
-#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981
+#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1349 builtin/commit.c:1634
+#: builtin/commit.c:1354 builtin/commit.c:1629
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:1352
+#: builtin/commit.c:1357
msgid "show ignored files"
msgstr "mostra els fitxers ignorats"
-#: builtin/commit.c:1353 parse-options.h:155
+#: builtin/commit.c:1358 parse-options.h:155
msgid "when"
msgstr "quan"
-#: builtin/commit.c:1354
+#: builtin/commit.c:1359
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
"ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per "
"defecte: all)"
-#: builtin/commit.c:1356
+#: builtin/commit.c:1361
msgid "list untracked files in columns"
msgstr "mostra els fitxers no seguits en columnes"
-#: builtin/commit.c:1442
+#: builtin/commit.c:1437
msgid "couldn't look up newly created commit"
msgstr "no s'ha pogut trobar la comissió novament creada"
-#: builtin/commit.c:1444
+#: builtin/commit.c:1439
msgid "could not parse newly created commit"
msgstr "no s'ha pogut analitzar la comissió novament creada"
-#: builtin/commit.c:1489
+#: builtin/commit.c:1484
msgid "detached HEAD"
msgstr "HEAD separat"
-#: builtin/commit.c:1492
+#: builtin/commit.c:1487
msgid " (root-commit)"
msgstr " (comissió d'arrel)"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1587
msgid "suppress summary after successful commit"
msgstr "omet el resum després d'una comissió reeixida"
-#: builtin/commit.c:1593
+#: builtin/commit.c:1588
msgid "show diff in commit message template"
msgstr "mostra la diferència en la plantilla de missatge de comissió"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1590
msgid "Commit message options"
msgstr "Opcions de missatge de comissió"
-#: builtin/commit.c:1596 builtin/tag.c:351
+#: builtin/commit.c:1591 builtin/tag.c:351
msgid "read message from file"
msgstr "llegiu el missatge des d'un fitxer"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1592
msgid "author"
msgstr "autor"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1592
msgid "override author for commit"
msgstr "autor corregit de la comissió"
-#: builtin/commit.c:1598 builtin/gc.c:326
+#: builtin/commit.c:1593 builtin/gc.c:326
msgid "date"
msgstr "data"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1593
msgid "override date for commit"
msgstr "data corregida de la comissió"
-#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396
-#: builtin/notes.c:559 builtin/tag.c:349
+#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398
+#: builtin/notes.c:561 builtin/tag.c:349
msgid "message"
msgstr "missatge"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1594
msgid "commit message"
msgstr "missatge de comissió"
-#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602
-#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
+#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79
msgid "commit"
msgstr "comissió"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1595
msgid "reuse and edit message from specified commit"
msgstr "reusa i edita el missatge de la comissió especificada"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1596
msgid "reuse message from specified commit"
msgstr "reusa el missatge de la comissió especificada"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1597
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"usa el missatge formatat d'aixafada automàtica per a arreglar la comissió "
"especificada"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1598
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"usa el missatge formatat d'aixafada automàtica per a aixafar la comissió "
"especificada"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1599
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "l'autor de la comissió ja sóc jo (s'usa amb -C/-c/--amend)"
-#: builtin/commit.c:1605 builtin/log.c:1409 builtin/revert.c:86
+#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "afegeix Signed-off-by:"
-#: builtin/commit.c:1606
+#: builtin/commit.c:1601
msgid "use specified template file"
msgstr "usa el fitxer de plantilla especificat"
-#: builtin/commit.c:1607
+#: builtin/commit.c:1602
msgid "force edit of commit"
msgstr "força l'edició de la comissió"
-#: builtin/commit.c:1608
+#: builtin/commit.c:1603
msgid "default"
msgstr "per defecte"
-#: builtin/commit.c:1608 builtin/tag.c:354
+#: builtin/commit.c:1603 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "com despullar els espais i #comentaris del missatge"
-#: builtin/commit.c:1609
+#: builtin/commit.c:1604
msgid "include status in commit message template"
msgstr "inclou l'estat en la plantilla de missatge de comissió"
-#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165
+#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "signa la comissió amb GPG"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1609
msgid "Commit contents options"
msgstr "Opcions dels continguts de les comissions"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1610
msgid "commit all changed files"
msgstr "comet tots els fitxers canviats"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1611
msgid "add specified files to index for commit"
msgstr "afegeix els fitxers especificats a l'índex per a cometre"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1612
msgid "interactively add files"
msgstr "afegeix els fitxers interactivament"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1613
msgid "interactively add changes"
msgstr "afegeix els canvis interactivament"
-#: builtin/commit.c:1619
+#: builtin/commit.c:1614
msgid "commit only specified files"
msgstr "comet només els fitxers especificats"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1615
msgid "bypass pre-commit and commit-msg hooks"
msgstr "evita els ganxos de precomissió i missatge de comissió"
-#: builtin/commit.c:1621
+#: builtin/commit.c:1616
msgid "show what would be committed"
msgstr "mostra què es cometria"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1627
msgid "amend previous commit"
msgstr "esmena la comissió anterior"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1628
msgid "bypass post-rewrite hook"
msgstr "evita el ganxo de postreescriure"
-#: builtin/commit.c:1638
+#: builtin/commit.c:1633
msgid "ok to record an empty change"
msgstr "està bé registrar un canvi buit"
-#: builtin/commit.c:1640
+#: builtin/commit.c:1635
msgid "ok to record a change with an empty message"
msgstr "està bé registrar un canvi amb missatge buit"
-#: builtin/commit.c:1669
+#: builtin/commit.c:1664
msgid "could not parse HEAD commit"
msgstr "no s'ha pogut analitzar la comissió HEAD"
-#: builtin/commit.c:1719
+#: builtin/commit.c:1712
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fitxer MERGE_HEAD malmès (%s)"
-#: builtin/commit.c:1726
+#: builtin/commit.c:1719
msgid "could not read MERGE_MODE"
msgstr "no s'ha pogut llegir MERGE_MODE"
-#: builtin/commit.c:1745
+#: builtin/commit.c:1738
#, c-format
msgid "could not read commit message: %s"
msgstr "no s'ha pogut llegir el missatge de comissió: %s"
-#: builtin/commit.c:1756
+#: builtin/commit.c:1749
#, 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:1761
+#: builtin/commit.c:1754
#, 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:1809
+#: builtin/commit.c:1802
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
msgid "cannot create configuration file %s"
msgstr "no es pot crear el fitxer de configuració '%s'"
-#: builtin/count-objects.c:77
+#: builtin/config.c:625
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+" Use a regexp, --add or --replace-all to change %s."
+msgstr ""
+"no es pot sobreescriure múltiples valors amb un sol valor\n"
+" Useu una expresió regular, --add o --replace-all per a canviar %s."
+
+#: builtin/count-objects.c:86
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:96
msgid "print sizes in human readable format"
msgstr "imprimeix les mides en un format llegible pels humans"
#: builtin/describe.c:17
msgid "git describe [<options>] [<commit-ish>...]"
-msgstr "git describe [opcions] [<comissió>...]"
+msgstr "git describe [<opcions>] [<comissió>...]"
#: builtin/describe.c:18
msgid "git describe [<options>] --dirty"
msgid "only consider tags matching <pattern>"
msgstr "només considera les etiquetes que coincideixen amb <patró>"
-#: builtin/describe.c:410 builtin/name-rev.c:321
+#: builtin/describe.c:410 builtin/name-rev.c:320
msgid "show abbreviated commit object as fallback"
msgstr "mostra l'objecte de comissió abreviat com a retrocediment"
msgid "invalid option: %s"
msgstr "opció no vàlida: %s"
-#: builtin/diff.c:360
+#: builtin/diff.c:361
msgid "Not a git repository"
msgstr "No és un dipòsit de git"
-#: builtin/diff.c:403
+#: builtin/diff.c:404
#, c-format
msgid "invalid object '%s' given."
msgstr "s'ha donat un objecte no vàlid '%s'."
-#: builtin/diff.c:412
+#: builtin/diff.c:413
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "s'ha donat més de dos blobs: '%s"
-#: builtin/diff.c:419
+#: builtin/diff.c:420
#, c-format
msgid "unhandled object '%s' given."
msgstr "s'ha donat l'objecte no gestionat '%s'."
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<opcions>]"
-#: builtin/fetch.c:93 builtin/pull.c:174
+#: builtin/fetch.c:95 builtin/pull.c:175
msgid "fetch from all remotes"
msgstr "obtén de tots els remots"
-#: builtin/fetch.c:95 builtin/pull.c:177
+#: builtin/fetch.c:97 builtin/pull.c:178
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "annexa a .git/FETCH_HEAD en lloc de sobreescriure"
-#: builtin/fetch.c:97 builtin/pull.c:180
+#: builtin/fetch.c:99 builtin/pull.c:181
msgid "path to upload pack on remote end"
msgstr "camí al qual pujar el paquet al costat remot"
-#: builtin/fetch.c:98 builtin/pull.c:182
+#: builtin/fetch.c:100 builtin/pull.c:183
msgid "force overwrite of local branch"
msgstr "força la sobreescriptura de la branca local"
-#: builtin/fetch.c:100
+#: builtin/fetch.c:102
msgid "fetch from multiple remotes"
msgstr "obtén de múltiples remots"
-#: builtin/fetch.c:102 builtin/pull.c:184
+#: builtin/fetch.c:104 builtin/pull.c:185
msgid "fetch all tags and associated objects"
msgstr "obtén totes les etiquetes i tots els objectes associats"
-#: builtin/fetch.c:104
+#: builtin/fetch.c:106
msgid "do not fetch all tags (--no-tags)"
msgstr "no obtinguis les etiquetes (--no-tags)"
-#: builtin/fetch.c:106
+#: builtin/fetch.c:108
msgid "number of submodules fetched in parallel"
msgstr "nombre de submòduls obtinguts en paral·lel"
-#: builtin/fetch.c:108 builtin/pull.c:187
+#: builtin/fetch.c:110 builtin/pull.c:188
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:109 builtin/pull.c:190
+#: builtin/fetch.c:111 builtin/pull.c:191
msgid "on-demand"
msgstr "sota demanda"
-#: builtin/fetch.c:110 builtin/pull.c:191
+#: builtin/fetch.c:112 builtin/pull.c:192
msgid "control recursive fetching of submodules"
msgstr "controla l'obtenció recursiva de submòduls"
-#: builtin/fetch.c:114 builtin/pull.c:199
+#: builtin/fetch.c:116 builtin/pull.c:200
msgid "keep downloaded pack"
msgstr "retén el paquet baixat"
-#: builtin/fetch.c:116
+#: builtin/fetch.c:118
msgid "allow updating of HEAD ref"
msgstr "permet l'actualització de la referència HEAD"
-#: builtin/fetch.c:119 builtin/pull.c:202
+#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
msgid "deepen history of shallow clone"
msgstr "aprofundeix la història d'un clon superficial"
-#: builtin/fetch.c:121 builtin/pull.c:205
+#: builtin/fetch.c:123
+msgid "deepen history of shallow repository based on time"
+msgstr "aprofundeix la història d'un clon superficial basat en temps"
+
+#: builtin/fetch.c:129 builtin/pull.c:206
msgid "convert to a complete repository"
msgstr "converteix en un dipòsit complet"
-#: builtin/fetch.c:123 builtin/log.c:1426
+#: builtin/fetch.c:131 builtin/log.c:1433
msgid "dir"
msgstr "directori"
-#: builtin/fetch.c:124
+#: builtin/fetch.c:132
msgid "prepend this to submodule path output"
msgstr "anteposa això a la sortida de camí del submòdul"
-#: builtin/fetch.c:127
+#: builtin/fetch.c:135
msgid "default mode for recursion"
msgstr "mode de recursivitat per defecte"
-#: builtin/fetch.c:129 builtin/pull.c:208
+#: builtin/fetch.c:137 builtin/pull.c:209
msgid "accept refs that update .git/shallow"
msgstr "accepta les referències que actualitzin .git/shallow"
-#: builtin/fetch.c:130 builtin/pull.c:210
+#: builtin/fetch.c:138 builtin/pull.c:211
msgid "refmap"
msgstr "mapa de referències"
-#: builtin/fetch.c:131 builtin/pull.c:211
+#: builtin/fetch.c:139 builtin/pull.c:212
msgid "specify fetch refmap"
msgstr "mostra el mapa de referències d'obtenció"
-#: builtin/fetch.c:387
+#: builtin/fetch.c:398
msgid "Couldn't find remote ref HEAD"
msgstr "No s'ha pogut trobar la referència HEAD remota"
-#: builtin/fetch.c:503
+#: builtin/fetch.c:514
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "la configuració fetch.output conté un valor no vàlid %s"
-#: builtin/fetch.c:592
+#: builtin/fetch.c:607
#, c-format
msgid "object %s not found"
msgstr "objecte %s no trobat"
-#: builtin/fetch.c:596
+#: builtin/fetch.c:611
msgid "[up to date]"
msgstr "[al dia]"
-#: builtin/fetch.c:609 builtin/fetch.c:689
+#: builtin/fetch.c:624 builtin/fetch.c:704
msgid "[rejected]"
msgstr "[rebutjat]"
-#: builtin/fetch.c:610
+#: builtin/fetch.c:625
msgid "can't fetch in current branch"
msgstr "no es pot obtenir en la branca actual"
-#: builtin/fetch.c:619
+#: builtin/fetch.c:634
msgid "[tag update]"
msgstr "[actualització d'etiqueta]"
-#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669
-#: builtin/fetch.c:684
+#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684
+#: builtin/fetch.c:699
msgid "unable to update local ref"
msgstr "no s'ha pogut actualitzar la referència local"
-#: builtin/fetch.c:639
+#: builtin/fetch.c:654
msgid "[new tag]"
msgstr "[etiqueta nova]"
-#: builtin/fetch.c:642
+#: builtin/fetch.c:657
msgid "[new branch]"
msgstr "[branca nova]"
-#: builtin/fetch.c:645
+#: builtin/fetch.c:660
msgid "[new ref]"
msgstr "[referència nova]"
-#: builtin/fetch.c:684
+#: builtin/fetch.c:699
msgid "forced update"
msgstr "actualització forçada"
-#: builtin/fetch.c:689
+#: builtin/fetch.c:704
msgid "non-fast-forward"
msgstr "sense avanç ràpid"
-#: builtin/fetch.c:733
+#: builtin/fetch.c:749
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s no ha enviat tots els objectes necessaris\n"
-#: builtin/fetch.c:753
+#: builtin/fetch.c:769
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"rebutja %s perquè no es permet que les arrels superficials s'actualitzin"
-#: builtin/fetch.c:839 builtin/fetch.c:934
+#: builtin/fetch.c:856 builtin/fetch.c:952
#, c-format
msgid "From %.*s\n"
msgstr "De %.*s\n"
-#: builtin/fetch.c:850
+#: builtin/fetch.c:867
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" intenteu executar 'git remote prune %s' per a eliminar\n"
" qualsevulla branca antiga o conflictiva"
-#: builtin/fetch.c:904
+#: builtin/fetch.c:922
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s es tornarà penjant)"
-#: builtin/fetch.c:905
+#: builtin/fetch.c:923
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s s'ha tornat penjant)"
-#: builtin/fetch.c:937
+#: builtin/fetch.c:955
msgid "[deleted]"
msgstr "[suprimit]"
-#: builtin/fetch.c:938 builtin/remote.c:1020
+#: builtin/fetch.c:956 builtin/remote.c:1020
msgid "(none)"
msgstr "(cap)"
-#: builtin/fetch.c:960
+#: builtin/fetch.c:979
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "S'està refusant obtenir en la branca actual %s d'un dipòsit no nu"
-#: builtin/fetch.c:979
+#: builtin/fetch.c:998
#, 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:982
+#: builtin/fetch.c:1001
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "S'ignora l'opció \"%s\" per a %s\n"
-#: builtin/fetch.c:1039
+#: builtin/fetch.c:1077
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "No se sap com obtenir de %s"
-#: builtin/fetch.c:1199
+#: builtin/fetch.c:1237
#, c-format
msgid "Fetching %s\n"
msgstr "S'està obtenint %s\n"
-#: builtin/fetch.c:1201 builtin/remote.c:96
+#: builtin/fetch.c:1239 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "No s'ha pogut obtenir %s"
-#: builtin/fetch.c:1219
+#: builtin/fetch.c:1257
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
"Cap dipòsit remot especificat. Si us plau, especifiqueu o un URL o\n"
"un nom remot del qual es deuen obtenir les revisions noves."
-#: builtin/fetch.c:1242
+#: builtin/fetch.c:1280
msgid "You need to specify a tag name."
msgstr "Necessiteu especificar un nom d'etiqueta."
-#: builtin/fetch.c:1284
+#: builtin/fetch.c:1322
+msgid "Negative depth in --deepen is not supported"
+msgstr "No s'admet una profunditat negativa en --deepen"
+
+#: builtin/fetch.c:1324
+msgid "--deepen and --depth are mutually exclusive"
+msgstr "--deepen i --depth són mutualment exclusius"
+
+#: builtin/fetch.c:1329
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth i --unshallow no es poden usar junts"
-#: builtin/fetch.c:1286
+#: builtin/fetch.c:1331
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow en un dipòsit complet no té sentit"
-#: builtin/fetch.c:1306
+#: builtin/fetch.c:1353
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all no accepta un paràmetre de dipòsit"
-#: builtin/fetch.c:1308
+#: builtin/fetch.c:1355
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all no té sentit amb especificacions de referència"
-#: builtin/fetch.c:1319
+#: builtin/fetch.c:1366
#, c-format
msgid "No such remote or remote group: %s"
msgstr "No hi ha tal remot ni tal grup remot: %s"
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1374
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Obtenir un grup i especificar referències no té sentit"
msgstr ""
"git fmt-merge-msg [-m <missatge>] [--log[=<n>] | --no-log] [--file <fitxer>]"
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:663
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:670
+#: builtin/fmt-merge-msg.c:666
msgid "alias for --log (deprecated)"
msgstr "àlies per --log (desaprovat)"
-#: builtin/fmt-merge-msg.c:673
+#: builtin/fmt-merge-msg.c:669
msgid "text"
msgstr "text"
-#: builtin/fmt-merge-msg.c:674
+#: builtin/fmt-merge-msg.c:670
msgid "use <text> as start of message"
msgstr "usa <text> com a inici de missatge"
-#: builtin/fmt-merge-msg.c:675
+#: builtin/fmt-merge-msg.c:671
msgid "file to read from"
msgstr "fitxer del qual llegir"
msgid "show verbose names for reachable objects"
msgstr "mostra els noms detallats dels objectes abastables"
-#: builtin/fsck.c:671
+#: builtin/fsck.c:665
msgid "Checking objects"
msgstr "S'estan comprovant els objectes"
msgid "invalid number of threads specified (%d) for %s"
msgstr "s'ha especificat un nombre de fils no vàlid (%d) per a %s"
-#: builtin/grep.c:452 builtin/grep.c:487
+#: builtin/grep.c:453 builtin/grep.c:488
#, c-format
msgid "unable to read tree (%s)"
msgstr "no s'ha pogut llegir l'arbre (%s)"
-#: builtin/grep.c:502
+#: builtin/grep.c:503
#, 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:560
+#: builtin/grep.c:561
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "l'opció `%c' espera un valor numèric"
-#: builtin/grep.c:577
-#, c-format
-msgid "cannot open '%s'"
-msgstr "no es pot obrir '%s'"
-
-#: builtin/grep.c:646
+#: builtin/grep.c:647
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:648
+#: builtin/grep.c:649
msgid "find in contents not managed by git"
msgstr "cerca en continguts no gestionats per git"
-#: builtin/grep.c:650
+#: builtin/grep.c:651
msgid "search in both tracked and untracked files"
msgstr "cerca tant en fitxers seguits com en no seguits"
-#: builtin/grep.c:652
+#: builtin/grep.c:653
msgid "ignore files specified via '.gitignore'"
msgstr "ignora els fitxers especificats mitjançant '.gitignore'"
-#: builtin/grep.c:655
+#: builtin/grep.c:656
msgid "show non-matching lines"
msgstr "mostra les línies no coincidents"
-#: builtin/grep.c:657
+#: builtin/grep.c:658
msgid "case insensitive matching"
msgstr "coincidència insensible a majúscula i minúscula"
-#: builtin/grep.c:659
+#: builtin/grep.c:660
msgid "match patterns only at word boundaries"
msgstr "coincideix amb els patrons només als límits de paraula"
-#: builtin/grep.c:661
+#: builtin/grep.c:662
msgid "process binary files as text"
msgstr "processa els fitxers binaris com a text"
-#: builtin/grep.c:663
+#: builtin/grep.c:664
msgid "don't match patterns in binary files"
msgstr "no coincideixis amb els patrons en els fitxers binaris"
-#: builtin/grep.c:666
+#: builtin/grep.c:667
msgid "process binary files with textconv filters"
msgstr "processa els fitxers binaris amb filtres de textconv"
-#: builtin/grep.c:668
+#: builtin/grep.c:669
msgid "descend at most <depth> levels"
msgstr "descendeix com a màxim <profunditat> nivells"
-#: builtin/grep.c:672
+#: builtin/grep.c:673
msgid "use extended POSIX regular expressions"
msgstr "usa les expressions regulars POSIX esteses"
-#: builtin/grep.c:675
+#: builtin/grep.c:676
msgid "use basic POSIX regular expressions (default)"
msgstr "usa les expressions regulars POSIX bàsiques (per defecte)"
-#: builtin/grep.c:678
+#: builtin/grep.c:679
msgid "interpret patterns as fixed strings"
msgstr "interpreta els patrons com a cadenes fixes"
-#: builtin/grep.c:681
+#: builtin/grep.c:682
msgid "use Perl-compatible regular expressions"
msgstr "usa les expressions regulars compatibles amb Perl"
-#: builtin/grep.c:684
+#: builtin/grep.c:685
msgid "show line numbers"
msgstr "mostra els números de línia"
-#: builtin/grep.c:685
+#: builtin/grep.c:686
msgid "don't show filenames"
msgstr "no mostris els noms de fitxer"
-#: builtin/grep.c:686
+#: builtin/grep.c:687
msgid "show filenames"
msgstr "mostra els noms de fitxer"
-#: builtin/grep.c:688
+#: builtin/grep.c:689
msgid "show filenames relative to top directory"
msgstr "mostra els noms de fitxer relatius al directori superior"
-#: builtin/grep.c:690
+#: builtin/grep.c:691
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:692
+#: builtin/grep.c:693
msgid "synonym for --files-with-matches"
msgstr "sinònim de --files-with-matches"
-#: builtin/grep.c:695
+#: builtin/grep.c:696
msgid "show only the names of files without match"
msgstr "mostra només els noms dels fitxers sense coincidència"
-#: builtin/grep.c:697
+#: builtin/grep.c:698
msgid "print NUL after filenames"
msgstr "imprimeix NUL després dels noms de fitxer"
-#: builtin/grep.c:699
+#: builtin/grep.c:700
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:700
+#: builtin/grep.c:701
msgid "highlight matches"
msgstr "ressalta les coincidències"
-#: builtin/grep.c:702
+#: builtin/grep.c:703
msgid "print empty line between matches from different files"
msgstr "imprimeix una línia buida entre coincidències de fitxers distints"
-#: builtin/grep.c:704
+#: builtin/grep.c:705
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:707
+#: builtin/grep.c:708
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:710
+#: builtin/grep.c:711
msgid "show <n> context lines before matches"
msgstr "mostra <n> línies de context abans d'una coincidència"
-#: builtin/grep.c:712
+#: builtin/grep.c:713
msgid "show <n> context lines after matches"
msgstr "mostra <n> línies de context després d'una coincidència"
-#: builtin/grep.c:714
+#: builtin/grep.c:715
msgid "use <n> worker threads"
msgstr "usa <n> fils obrers"
-#: builtin/grep.c:715
+#: builtin/grep.c:716
msgid "shortcut for -C NUM"
msgstr "drecera per -C NUM"
-#: builtin/grep.c:718
+#: builtin/grep.c:719
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:720
+#: builtin/grep.c:721
msgid "show the surrounding function"
msgstr "mostra la funció circumdant"
-#: builtin/grep.c:723
+#: builtin/grep.c:724
msgid "read patterns from file"
msgstr "llegeix els patrons des d'un fitxer"
-#: builtin/grep.c:725
+#: builtin/grep.c:726
msgid "match <pattern>"
msgstr "coincideix amb <patró>"
-#: builtin/grep.c:727
+#: builtin/grep.c:728
msgid "combine patterns specified with -e"
msgstr "combina els patrons especificats amb -e"
-#: builtin/grep.c:739
+#: builtin/grep.c:740
msgid "indicate hit with exit status without output"
msgstr "indica coincidència amb estat de sortida sense sortida textual"
-#: builtin/grep.c:741
+#: builtin/grep.c:742
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:743
+#: builtin/grep.c:744
msgid "show parse tree for grep expression"
msgstr "mostra l'arbre d'anàlisis de l'expressió de grep"
-#: builtin/grep.c:747
+#: builtin/grep.c:748
msgid "pager"
msgstr "paginador"
-#: builtin/grep.c:747
+#: builtin/grep.c:748
msgid "show matching files in the pager"
msgstr "mostra els fitxers coincidents en el paginador"
-#: builtin/grep.c:750
+#: builtin/grep.c:751
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)"
-#: builtin/grep.c:813
+#: builtin/grep.c:814
msgid "no pattern given."
msgstr "cap patró donat."
-#: builtin/grep.c:845 builtin/index-pack.c:1479
+#: builtin/grep.c:846 builtin/index-pack.c:1480
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "s'ha especificat un nombre de fils no vàlid (%d)"
-#: builtin/grep.c:875
+#: builtin/grep.c:876
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:901
+#: builtin/grep.c:902
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached o --untracked no es pot usar amb --no-index."
-#: builtin/grep.c:906
+#: builtin/grep.c:907
msgid "--no-index or --untracked cannot be used with revs."
msgstr "--no-index o --untracked no es pot usar amb revisions."
-#: builtin/grep.c:909
+#: builtin/grep.c:910
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard no es pot usar per als continguts seguits."
-#: builtin/grep.c:917
+#: builtin/grep.c:918
msgid "both --cached and trees are given."
msgstr "s'han donat ambdós --caches i arbres."
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:93
+#: builtin/hash-object.c:94
msgid "type"
msgstr "tipus"
-#: builtin/hash-object.c:93
+#: builtin/hash-object.c:94
msgid "object type"
msgstr "tipus d'objecte"
-#: builtin/hash-object.c:94
+#: builtin/hash-object.c:95
msgid "write the object into the object database"
msgstr "escriu l'objecte a la base de dades d'objectes"
-#: builtin/hash-object.c:96
+#: builtin/hash-object.c:97
msgid "read the object from stdin"
msgstr "llegeix l'objecte des d'stdin"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
msgid "store file as is without filters"
msgstr "emmagatzema el fitxer tal com és sense filtres"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:100
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
"només suma qualsevulla brossa aleatòria per a crear objectes malmesos per a "
"depurar al Git"
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
msgid "process file as it were from this path"
msgstr "processa el fitxer com si fos d'aquest camí"
-#: builtin/help.c:41
+#: builtin/help.c:42
msgid "print all available commands"
msgstr "imprimeix totes les ordres disponibles"
-#: builtin/help.c:42
+#: builtin/help.c:43
+msgid "exclude guides"
+msgstr "exclou guíes"
+
+#: builtin/help.c:44
msgid "print list of useful guides"
msgstr "imprimeix la llista de guies útils"
-#: builtin/help.c:43
+#: builtin/help.c:45
msgid "show man page"
msgstr "mostra la pàgina de manual"
-#: builtin/help.c:44
+#: builtin/help.c:46
msgid "show manual in web browser"
msgstr "mostra la pàgina de manual en el navegador web"
-#: builtin/help.c:46
+#: builtin/help.c:48
msgid "show info page"
msgstr "mostra la pàgina d'informació"
-#: builtin/help.c:52
+#: builtin/help.c:54
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr "git help [--all] [--guides] [--man | --web | --info] [<ordre>]"
-#: builtin/help.c:64
+#: builtin/help.c:66
#, c-format
msgid "unrecognized help format '%s'"
msgstr "format d'ajuda no reconegut '%s'"
-#: builtin/help.c:91
+#: builtin/help.c:93
msgid "Failed to start emacsclient."
msgstr "S'ha fallat en iniciar emacsclient."
-#: builtin/help.c:104
+#: builtin/help.c:106
msgid "Failed to parse emacsclient version."
msgstr "S'ha fallat en analitzar la versió d'emacsclient."
-#: builtin/help.c:112
+#: builtin/help.c:114
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "la versió d'emacsclient '%d' és massa vella (< 22)."
-#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
+#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
#, c-format
msgid "failed to exec '%s'"
msgstr "s'ha fallat en executar '%s'"
-#: builtin/help.c:205
+#: builtin/help.c:207
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"'%s': camí a un visualitzador de manuals no compatible.\n"
"Si us plau, considereu usar 'man.<eina>.cmd' en lloc d'això."
-#: builtin/help.c:217
+#: builtin/help.c:219
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"'%s': ordre per a un visualitzador de manuals compatible.\n"
"Si us plau, considereu usar 'man.<eina>.path' en lloc d'això."
-#: builtin/help.c:334
+#: builtin/help.c:336
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s': visualitzador de manuals desconegut."
-#: builtin/help.c:351
+#: builtin/help.c:353
msgid "no man viewer handled the request"
msgstr "cap visualitzador de manuals ha gestionat la sol·licitud"
-#: builtin/help.c:359
+#: builtin/help.c:361
msgid "no info viewer handled the request"
msgstr "cap visualitzador d'informació ha gestionat la sol·licitud"
-#: builtin/help.c:401
+#: builtin/help.c:403
msgid "Defining attributes per path"
msgstr "La definició d'atributs per camí"
-#: builtin/help.c:402
+#: builtin/help.c:404
msgid "Everyday Git With 20 Commands Or So"
msgstr "Git quotidià amb més o menys 20 ordres"
-#: builtin/help.c:403
+#: builtin/help.c:405
msgid "A Git glossary"
msgstr "Un glossari de Git"
-#: builtin/help.c:404
+#: builtin/help.c:406
msgid "Specifies intentionally untracked files to ignore"
msgstr "Especifica els fitxers intencionalment no seguits a ignorar"
-#: builtin/help.c:405
+#: builtin/help.c:407
msgid "Defining submodule properties"
msgstr "La definició de les propietats de submòduls"
-#: builtin/help.c:406
+#: builtin/help.c:408
msgid "Specifying revisions and ranges for Git"
msgstr "L'especificació de revisions i rangs per al Git"
-#: builtin/help.c:407
+#: builtin/help.c:409
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "Una introducció tutorial al Git (per a la versió 1.5.1 o més nou)"
-#: builtin/help.c:408
+#: builtin/help.c:410
msgid "An overview of recommended workflows with Git"
msgstr "Una visió de conjunt de fluxos de treball recomanats amb Git"
-#: builtin/help.c:420
+#: builtin/help.c:422
msgid "The common Git guides are:\n"
msgstr "Les guies de Git comunes són:\n"
-#: builtin/help.c:441 builtin/help.c:458
-#, c-format
-msgid "usage: %s%s"
-msgstr "ús: %s%s"
-
-#: builtin/help.c:474
+#: builtin/help.c:440
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "`git %s' és un àlies de `%s'"
-#: builtin/index-pack.c:153
+#: builtin/help.c:462 builtin/help.c:479
+#, c-format
+msgid "usage: %s%s"
+msgstr "ús: %s%s"
+
+#: builtin/index-pack.c:154
#, c-format
msgid "unable to open %s"
msgstr "no s'ha pogut obrir %s"
-#: builtin/index-pack.c:203
+#: builtin/index-pack.c:204
#, c-format
msgid "object type mismatch at %s"
msgstr "hi ha una discordança de tipus d'objecte a %s"
-#: builtin/index-pack.c:223
+#: builtin/index-pack.c:224
#, c-format
msgid "did not receive expected object %s"
msgstr "no s'ha rebut l'objecte esperat %s"
-#: builtin/index-pack.c:226
+#: builtin/index-pack.c:227
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objecte %s: tipus %s esperat, %s trobat"
-#: builtin/index-pack.c:268
+#: builtin/index-pack.c:269
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "no es pot omplir %d octet"
msgstr[1] "no es pot omplir %d octets"
-#: builtin/index-pack.c:278
+#: builtin/index-pack.c:279
msgid "early EOF"
msgstr "EOF prematur"
-#: builtin/index-pack.c:279
+#: builtin/index-pack.c:280
msgid "read error on input"
msgstr "error de lectura d'entrada"
-#: builtin/index-pack.c:291
+#: builtin/index-pack.c:292
msgid "used more bytes than were available"
msgstr "s'han usat més octets que hi havia disponibles"
-#: builtin/index-pack.c:298
+#: builtin/index-pack.c:299
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:314
+#: builtin/index-pack.c:302 builtin/unpack-objects.c:92
+msgid "pack exceeds maximum allowed size"
+msgstr "el paquet supera la mida màxima permesa"
+
+#: builtin/index-pack.c:317
#, c-format
msgid "unable to create '%s'"
-msgstr "no es pot crear '%s'"
+msgstr "no s'ha pogut crear '%s'"
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:322
#, c-format
msgid "cannot open packfile '%s'"
msgstr "no es pot obrir el fitxer de paquet '%s'"
-#: builtin/index-pack.c:333
+#: builtin/index-pack.c:336
msgid "pack signature mismatch"
msgstr "hi ha una discordança de signatura de paquet"
-#: builtin/index-pack.c:335
+#: builtin/index-pack.c:338
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "la versió de paquet %<PRIu32> no és compatible"
-#: builtin/index-pack.c:353
+#: builtin/index-pack.c:356
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "el paquet té un objecte dolent a la posició %<PRIuMAX>: %s"
-#: builtin/index-pack.c:475
+#: builtin/index-pack.c:478
#, c-format
msgid "inflate returned %d"
msgstr "la inflació ha retornat %d"
-#: builtin/index-pack.c:524
+#: builtin/index-pack.c:527
msgid "offset value overflow for delta base object"
msgstr "desbordament de valor de desplaçament per a l'objecte base de delta"
-#: builtin/index-pack.c:532
+#: builtin/index-pack.c:535
msgid "delta base offset is out of bound"
msgstr "el desplaçament de base de delta està fora de límits"
-#: builtin/index-pack.c:540
+#: builtin/index-pack.c:543
#, c-format
msgid "unknown object type %d"
msgstr "tipus d'objecte desconegut %d"
-#: builtin/index-pack.c:571
+#: builtin/index-pack.c:574
msgid "cannot pread pack file"
msgstr "no es pot fer pread en el fitxer de paquet"
-#: builtin/index-pack.c:573
+#: builtin/index-pack.c:576
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[1] ""
"el final del fitxer de paquet és prematur, manquen %<PRIuMAX> octets"
-#: builtin/index-pack.c:599
+#: builtin/index-pack.c:602
msgid "serious inflate inconsistency"
msgstr "hi ha una inconsistència seriosa d'inflació"
-#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774
-#: builtin/index-pack.c:808 builtin/index-pack.c:817
+#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
+#: builtin/index-pack.c:811 builtin/index-pack.c:820
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !"
-#: builtin/index-pack.c:748 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:256
+#: builtin/index-pack.c:751 builtin/pack-objects.c:166
+#: builtin/pack-objects.c:258
#, c-format
msgid "unable to read %s"
msgstr "no s'ha pogut llegir %s"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:817
#, c-format
msgid "cannot read existing object %s"
msgstr "no es pot llegir l'objecte existent %s"
-#: builtin/index-pack.c:828
+#: builtin/index-pack.c:831
#, c-format
msgid "invalid blob object %s"
msgstr "objecte de blob no vàlid %s"
-#: builtin/index-pack.c:842
+#: builtin/index-pack.c:845
#, c-format
msgid "invalid %s"
msgstr "%s no vàlid"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:848
msgid "Error in object"
msgstr "Error en objecte"
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:850
#, 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:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:922 builtin/index-pack.c:953
msgid "failed to apply delta"
msgstr "s'ha fallat en aplicar la delta"
-#: builtin/index-pack.c:1120
+#: builtin/index-pack.c:1123
msgid "Receiving objects"
msgstr "S'estan rebent objectes"
-#: builtin/index-pack.c:1120
+#: builtin/index-pack.c:1123
msgid "Indexing objects"
msgstr "S'estan indexant objectes"
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1155
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "el paquet és malmès (discordança SHA1)"
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
msgid "cannot fstat packfile"
msgstr "no es pot fer fstat en el fitxer de paquet"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1163
msgid "pack has junk at the end"
msgstr "el paquet té brossa al seu final"
-#: builtin/index-pack.c:1171
+#: builtin/index-pack.c:1174
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "confusió més enllà de la bogeria en parse_pack_objects()"
-#: builtin/index-pack.c:1196
+#: builtin/index-pack.c:1197
msgid "Resolving deltas"
msgstr "S'estan resolent les deltes"
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
#, c-format
msgid "unable to create thread: %s"
msgstr "no s'ha pogut crear fil: %s"
-#: builtin/index-pack.c:1249
+#: builtin/index-pack.c:1250
msgid "confusion beyond insanity"
msgstr "confusió més enllà de la bogeria"
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1256
#, 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:1267
+#: builtin/index-pack.c:1268
#, 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:1271
+#: builtin/index-pack.c:1272
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "El paquet té %d delta no resolta"
msgstr[1] "El paquet té %d deltes no resoltes"
-#: builtin/index-pack.c:1295
+#: builtin/index-pack.c:1296
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "no s'ha pogut desinflar l'objecte annexat (%d)"
-#: builtin/index-pack.c:1371
+#: builtin/index-pack.c:1372
#, c-format
msgid "local object %s is corrupt"
msgstr "l'objecte local %s és malmès"
-#: builtin/index-pack.c:1395
+#: builtin/index-pack.c:1396
msgid "error while closing pack file"
msgstr "error en tancar el fitxer de paquet"
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
#, c-format
msgid "cannot write keep file '%s'"
msgstr "no es pot escriure el fitxer a retenir '%s'"
-#: builtin/index-pack.c:1416
+#: builtin/index-pack.c:1417
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "no es pot tancar el fitxer escrit a retenir '%s'"
-#: builtin/index-pack.c:1429
+#: builtin/index-pack.c:1430
msgid "cannot store pack file"
msgstr "no es pot emmagatzemar el fitxer de paquet"
-#: builtin/index-pack.c:1440
+#: builtin/index-pack.c:1441
msgid "cannot store index file"
msgstr "no es pot emmagatzemar el fitxer d'índex"
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1474
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "pack.indexversion=%<PRIu32> dolent"
-#: builtin/index-pack.c:1483 builtin/index-pack.c:1681
+#: builtin/index-pack.c:1484 builtin/index-pack.c:1681
#, c-format
msgid "no threads support, ignoring %s"
msgstr "no hi ha suport de fils, s'està ignorant %s"
msgid "bad %s"
msgstr "%s dolent"
-#: builtin/index-pack.c:1730
+#: builtin/index-pack.c:1732
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin no es pot usar sense --stdin"
-#: builtin/index-pack.c:1738
+#: builtin/index-pack.c:1740
msgid "--verify with no packfile name given"
msgstr "s'ha donat --verify sense nom de fitxer de paquet"
-#: builtin/init-db.c:55
+#: builtin/init-db.c:54
#, c-format
msgid "cannot stat '%s'"
msgstr "no es pot fer stat en '%s'"
-#: builtin/init-db.c:61
+#: builtin/init-db.c:60
#, c-format
msgid "cannot stat template '%s'"
msgstr "no es pot fer stat en la plantilla '%s'"
-#: builtin/init-db.c:66
+#: builtin/init-db.c:65
#, c-format
msgid "cannot opendir '%s'"
msgstr "no es pot fer opendir en el directori '%s'"
-#: builtin/init-db.c:77
+#: builtin/init-db.c:76
#, c-format
msgid "cannot readlink '%s'"
msgstr "no es pot fer readlink en '%s'"
-#: builtin/init-db.c:79
+#: builtin/init-db.c:78
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "no es pot fer symlink en '%s' '%s'"
-#: builtin/init-db.c:85
+#: builtin/init-db.c:84
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "no es pot copiar '%s' a '%s'"
-#: builtin/init-db.c:89
+#: builtin/init-db.c:88
#, c-format
msgid "ignoring template %s"
msgstr "s'està ignorant la plantilla %s"
-#: builtin/init-db.c:120
+#: builtin/init-db.c:119
#, c-format
msgid "templates not found %s"
msgstr "no s'han trobat les plantilles %s"
-#: builtin/init-db.c:135
+#: builtin/init-db.c:134
#, c-format
msgid "not copying templates from '%s': %s"
msgstr "no s'està copiant plantilles de '%s': %s"
-#: builtin/init-db.c:312 builtin/init-db.c:315
-#, c-format
-msgid "%s already exists"
-msgstr "%s ja existeix"
-
-#: builtin/init-db.c:344
+#: builtin/init-db.c:327
#, c-format
msgid "unable to handle file type %d"
msgstr "no s'ha pogut gestionar el tipus de fitxer %d"
-#: builtin/init-db.c:347
+#: builtin/init-db.c:330
#, c-format
msgid "unable to move %s to %s"
msgstr "no s'ha pogut moure %s a %s"
-#: builtin/init-db.c:402
+#: builtin/init-db.c:347 builtin/init-db.c:350
+#, c-format
+msgid "%s already exists"
+msgstr "%s ja existeix"
+
+#: builtin/init-db.c:403
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr "S'ha reinicialitzat el dipòsit compartit existent del Git en %s%s\n"
-#: builtin/init-db.c:403
+#: builtin/init-db.c:404
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "S'ha reinicialitzat el dipòsit existent del Git en %s%s\n"
-#: builtin/init-db.c:407
+#: builtin/init-db.c:408
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr "S'ha inicialitzat un dipòsit compartit buit del Git en %s%s\n"
-#: builtin/init-db.c:408
+#: builtin/init-db.c:409
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "S'ha inicialitzat un dipòsit buit del Git en %s%s\n"
-#: builtin/init-db.c:455
+#: builtin/init-db.c:457
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
"git init [-q | --quiet] [--bare] [--template=<directori-de-plantilla>] [--"
"shared[=<permisos>]] [<directori>]"
-#: builtin/init-db.c:478
+#: builtin/init-db.c:480
msgid "permissions"
msgstr "permisos"
-#: builtin/init-db.c:479
+#: builtin/init-db.c:481
msgid "specify that the git repository is to be shared amongst several users"
msgstr "especifica que el dipòsit de git es compartirà entre diversos usuaris"
-#: builtin/init-db.c:513 builtin/init-db.c:518
+#: builtin/init-db.c:515 builtin/init-db.c:520
#, c-format
msgid "cannot mkdir %s"
msgstr "no es pot mkdir %s"
-#: builtin/init-db.c:522
+#: builtin/init-db.c:524
#, c-format
msgid "cannot chdir to %s"
msgstr "no es pot canviar de directori a %s"
-#: builtin/init-db.c:543
+#: builtin/init-db.c:545
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"no es permet %s (o --work-tree=<directori>) sense especificar %s (o --git-"
"dir=<directori>)"
-#: builtin/init-db.c:571
+#: builtin/init-db.c:573
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "No es pot accedir a l'arbre de treball '%s'"
msgid "Cover letter needs email format"
msgstr "La carta de presentació necessita el format de correu electrònic"
-#: builtin/log.c:1064
+#: builtin/log.c:1063
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to boig: %s"
-#: builtin/log.c:1092
+#: builtin/log.c:1091
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opcions>] [<des-de> | <rang-de-revisions>]"
-#: builtin/log.c:1137
+#: builtin/log.c:1141
msgid "Two output directories?"
msgstr "Hi ha dos directoris de sortida?"
-#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897
+#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
#, c-format
msgid "Unknown commit %s"
msgstr "Comissió desconeguda %s"
-#: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305
-#: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425
-#: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594
-#: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455
+#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "S'ha fallat en resoldre '%s' com a referència vàlida."
-#: builtin/log.c:1259
+#: builtin/log.c:1263
msgid "Could not find exact merge base."
msgstr "No s'ha pogut trobar la base exacta de fusió."
-#: builtin/log.c:1263
+#: builtin/log.c:1267
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"
"seguir una branca remot. O podeu especificar la comissió base manualment\n"
"amb --base=<id-de-comissió-base>."
-#: builtin/log.c:1283
+#: builtin/log.c:1287
msgid "Failed to find exact merge base"
msgstr "S'ha fallat en trobar la base exacta de fusió."
-#: builtin/log.c:1294
+#: builtin/log.c:1298
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:1298
+#: builtin/log.c:1302
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:1347
+#: builtin/log.c:1351
msgid "cannot get patch id"
msgstr "no es pot obtenir l'id del pedaç"
-#: builtin/log.c:1404
+#: builtin/log.c:1408
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:1407
+#: builtin/log.c:1411
msgid "use [PATCH] even with multiple patches"
msgstr "usa [PATCH] fins i tot amb múltiples pedaços"
-#: builtin/log.c:1411
+#: builtin/log.c:1415
msgid "print patches to standard out"
msgstr "imprimeix els pedaços a la sortida estàndard"
-#: builtin/log.c:1413
+#: builtin/log.c:1417
msgid "generate a cover letter"
msgstr "genera una carta de presentació"
-#: builtin/log.c:1415
+#: builtin/log.c:1419
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:1416
+#: builtin/log.c:1420
msgid "sfx"
msgstr "sufix"
-#: builtin/log.c:1417
+#: builtin/log.c:1421
msgid "use <sfx> instead of '.patch'"
msgstr "usa <sufix> en lloc de '.patch'"
-#: builtin/log.c:1419
+#: builtin/log.c:1423
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:1421
+#: builtin/log.c:1425
msgid "mark the series as Nth re-roll"
msgstr "marca la sèrie com a l'enèsima llançada"
-#: builtin/log.c:1423
+#: builtin/log.c:1427
+msgid "Use [RFC PATCH] instead of [PATCH]"
+msgstr "Usa [RFC PATCH] en lloc de [PATCH]"
+
+#: builtin/log.c:1430
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Usa [<prefix>] en lloc de [PATCH]"
-#: builtin/log.c:1426
+#: builtin/log.c:1433
msgid "store resulting files in <dir>"
msgstr "emmagatzema els fitxers resultants a <directori>"
-#: builtin/log.c:1429
+#: builtin/log.c:1436
msgid "don't strip/add [PATCH]"
msgstr "no despullis/afegeixis [PATCH]"
-#: builtin/log.c:1432
+#: builtin/log.c:1439
msgid "don't output binary diffs"
msgstr "no emetis diferències binàries"
-#: builtin/log.c:1434
+#: builtin/log.c:1441
msgid "output all-zero hash in From header"
msgstr "emet un hash de tots zeros en la capçalera From"
-#: builtin/log.c:1436
+#: builtin/log.c:1443
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:1438
+#: builtin/log.c:1445
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:1440
+#: builtin/log.c:1447
msgid "Messaging"
msgstr "Missatgeria"
-#: builtin/log.c:1441
+#: builtin/log.c:1448
msgid "header"
msgstr "capçalera"
-#: builtin/log.c:1442
+#: builtin/log.c:1449
msgid "add email header"
msgstr "afegeix una capçalera de correu electrònic"
-#: builtin/log.c:1443 builtin/log.c:1445
+#: builtin/log.c:1450 builtin/log.c:1452
msgid "email"
msgstr "correu electrònic"
-#: builtin/log.c:1443
+#: builtin/log.c:1450
msgid "add To: header"
msgstr "afegeix la capçalera To:"
-#: builtin/log.c:1445
+#: builtin/log.c:1452
msgid "add Cc: header"
msgstr "afegeix la capçalera Cc:"
-#: builtin/log.c:1447
+#: builtin/log.c:1454
msgid "ident"
msgstr "identitat"
-#: builtin/log.c:1448
+#: builtin/log.c:1455
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:1450
+#: builtin/log.c:1457
msgid "message-id"
msgstr "ID de missatge"
-#: builtin/log.c:1451
+#: builtin/log.c:1458
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:1452 builtin/log.c:1455
+#: builtin/log.c:1459 builtin/log.c:1462
msgid "boundary"
msgstr "límit"
-#: builtin/log.c:1453
+#: builtin/log.c:1460
msgid "attach the patch"
msgstr "ajunta el pedaç"
-#: builtin/log.c:1456
+#: builtin/log.c:1463
msgid "inline the patch"
msgstr "posa el pedaç en el cos"
-#: builtin/log.c:1460
+#: builtin/log.c:1467
msgid "enable message threading, styles: shallow, deep"
msgstr "habilita l'enfilada de missatges, estils: shallow, deep"
-#: builtin/log.c:1462
+#: builtin/log.c:1469
msgid "signature"
msgstr "signatura"
-#: builtin/log.c:1463
+#: builtin/log.c:1470
msgid "add a signature"
msgstr "afegeix una signatura"
-#: builtin/log.c:1464
+#: builtin/log.c:1471
msgid "base-commit"
msgstr "comissió base"
-#: builtin/log.c:1465
+#: builtin/log.c:1472
msgid "add prerequisite tree info to the patch series"
msgstr "afegeix la informació d'arbre prerequerida a la sèrie de pedaços"
-#: builtin/log.c:1467
+#: builtin/log.c:1474
msgid "add a signature from a file"
msgstr "afegeix una signatura des d'un fitxer"
-#: builtin/log.c:1468
+#: builtin/log.c:1475
msgid "don't print the patch filenames"
msgstr "no imprimeixis els noms de fitxer del pedaç"
-#: builtin/log.c:1558
+#: builtin/log.c:1565
msgid "-n and -k are mutually exclusive."
msgstr "-n i -k són mutualment exclusius."
-#: builtin/log.c:1560
-msgid "--subject-prefix and -k are mutually exclusive."
-msgstr "--subject-prefix i -k són mutualment exclusius."
+#: builtin/log.c:1567
+msgid "--subject-prefix/--rfc and -k are mutually exclusive."
+msgstr "--subject-prefix/--rfc i -k són mutualment exclusius."
-#: builtin/log.c:1568
+#: builtin/log.c:1575
msgid "--name-only does not make sense"
msgstr "--name-only no té sentit"
-#: builtin/log.c:1570
+#: builtin/log.c:1577
msgid "--name-status does not make sense"
msgstr "--name-status no té sentit"
-#: builtin/log.c:1572
+#: builtin/log.c:1579
msgid "--check does not make sense"
msgstr "--check no té sentit"
-#: builtin/log.c:1602
+#: builtin/log.c:1609
msgid "standard output, or directory, which one?"
msgstr "sortida estàndard o directori, quin dels dos?"
-#: builtin/log.c:1604
+#: builtin/log.c:1611
#, c-format
msgid "Could not create directory '%s'"
msgstr "No s'ha pogut crear el directori '%s'"
-#: builtin/log.c:1698
+#: builtin/log.c:1705
#, c-format
msgid "unable to read signature file '%s'"
msgstr "no s'ha pogut llegir el fitxer de signatura '%s'"
-#: builtin/log.c:1769
+#: builtin/log.c:1777
msgid "Failed to create output files"
msgstr "S'ha fallat en crear els fitxers de sortida"
-#: builtin/log.c:1818
+#: builtin/log.c:1826
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]"
-#: builtin/log.c:1872
+#: builtin/log.c:1880
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
"No s'ha pogut trobar una branca remota seguida. Si us plau, especifiqueu "
"<font> manualment.\n"
-#: builtin/ls-files.c:379
+#: builtin/ls-files.c:458
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<opcions>] [<fitxer>...]"
-#: builtin/ls-files.c:428
+#: builtin/ls-files.c:507
msgid "identify the file status with tags"
msgstr "identifica l'estat de fitxer amb etiquetes"
-#: builtin/ls-files.c:430
+#: builtin/ls-files.c:509
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "usa lletres minúscules per als fitxers 'assume unchanged'"
-#: builtin/ls-files.c:432
+#: builtin/ls-files.c:511
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:434
+#: builtin/ls-files.c:513
msgid "show deleted files in the output"
msgstr "mostra en la sortida els fitxers suprimits"
-#: builtin/ls-files.c:436
+#: builtin/ls-files.c:515
msgid "show modified files in the output"
msgstr "mostra en la sortida els fitxers modificats"
-#: builtin/ls-files.c:438
+#: builtin/ls-files.c:517
msgid "show other files in the output"
msgstr "mostra en la sortida els altres fitxers"
-#: builtin/ls-files.c:440
+#: builtin/ls-files.c:519
msgid "show ignored files in the output"
msgstr "mostra en la sortida els fitxers ignorats"
-#: builtin/ls-files.c:443
+#: builtin/ls-files.c:522
msgid "show staged contents' object name in the output"
msgstr "mostra en la sortida el nom d'objecte dels continguts allistats"
-#: builtin/ls-files.c:445
+#: builtin/ls-files.c:524
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:447
+#: builtin/ls-files.c:526
msgid "show 'other' directories' names only"
msgstr "mostra només els noms dels directoris 'other'"
-#: builtin/ls-files.c:449
+#: builtin/ls-files.c:528
msgid "show line endings of files"
-msgstr "mostra els terminis de línia dels fitxers"
+msgstr "mostra els terminadors de línia dels fitxers"
-#: builtin/ls-files.c:451
+#: builtin/ls-files.c:530
msgid "don't show empty directories"
msgstr "no mostris els directoris buits"
-#: builtin/ls-files.c:454
+#: builtin/ls-files.c:533
msgid "show unmerged files in the output"
msgstr "mostra en la sortida els fitxers sense fusionar"
-#: builtin/ls-files.c:456
+#: builtin/ls-files.c:535
msgid "show resolve-undo information"
msgstr "mostra la informació de resolució de desfet"
-#: builtin/ls-files.c:458
+#: builtin/ls-files.c:537
msgid "skip files matching pattern"
msgstr "salta els fitxers coincidents amb el patró"
-#: builtin/ls-files.c:461
+#: builtin/ls-files.c:540
msgid "exclude patterns are read from <file>"
msgstr "els patrons d'exclusió es llegeixen de <fitxer>"
-#: builtin/ls-files.c:464
+#: builtin/ls-files.c:543
msgid "read additional per-directory exclude patterns in <file>"
msgstr "llegeix els patrons addicionals d'exclusió per directori en <fitxer>"
-#: builtin/ls-files.c:466
+#: builtin/ls-files.c:545
msgid "add the standard git exclusions"
msgstr "afegeix les exclusions estàndards de git"
-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:548
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:472
+#: builtin/ls-files.c:551
+msgid "recurse through submodules"
+msgstr "recursa als submòduls"
+
+#: builtin/ls-files.c:553
msgid "if any <file> is not in the index, treat this as an error"
msgstr "si qualsevol <fitxer> no és en l'índex, tracta això com a error"
-#: builtin/ls-files.c:473
+#: builtin/ls-files.c:554
msgid "tree-ish"
msgstr "arbre"
-#: builtin/ls-files.c:474
+#: builtin/ls-files.c:555
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:476
+#: builtin/ls-files.c:557
msgid "show debugging data"
msgstr "mostra les dades de depuració"
msgid "Available custom strategies are:"
msgstr "Les estratègies personalitzades disponibles són:"
-#: builtin/merge.c:195 builtin/pull.c:126
+#: builtin/merge.c:195 builtin/pull.c:127
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:198 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:130
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:199 builtin/pull.c:132
+#: builtin/merge.c:199 builtin/pull.c:133
msgid "(synonym to --stat)"
msgstr "(sinònim de --stat)"
-#: builtin/merge.c:201 builtin/pull.c:135
+#: builtin/merge.c:201 builtin/pull.c:136
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ó"
-#: builtin/merge.c:204 builtin/pull.c:138
+#: builtin/merge.c:204 builtin/pull.c:139
msgid "create a single commit instead of doing a merge"
msgstr "crea una única comissió en lloc de fusionar"
-#: builtin/merge.c:206 builtin/pull.c:141
+#: builtin/merge.c:206 builtin/pull.c:142
msgid "perform a commit if the merge succeeds (default)"
msgstr "realitza una comissió si la fusió té èxit (per defecte)"
-#: builtin/merge.c:208 builtin/pull.c:144
+#: builtin/merge.c:208 builtin/pull.c:145
msgid "edit message before committing"
msgstr "edita el missatge abans de cometre"
msgid "allow fast-forward (default)"
msgstr "permet l'avanç ràpid (per defecte)"
-#: builtin/merge.c:211 builtin/pull.c:150
+#: builtin/merge.c:211 builtin/pull.c:151
msgid "abort if fast-forward is not possible"
msgstr "avorta si l'avanç ràpid no és possible"
-#: builtin/merge.c:215 builtin/pull.c:153
+#: builtin/merge.c:215 builtin/pull.c:154
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:216 builtin/notes.c:772 builtin/pull.c:157
+#: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158
#: builtin/revert.c:89
msgid "strategy"
msgstr "estratègia"
-#: builtin/merge.c:217 builtin/pull.c:158
+#: builtin/merge.c:217 builtin/pull.c:159
msgid "merge strategy to use"
msgstr "estratègia de fusió a usar"
-#: builtin/merge.c:218 builtin/pull.c:161
+#: builtin/merge.c:218 builtin/pull.c:162
msgid "option=value"
msgstr "opció=valor"
-#: builtin/merge.c:219 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:163
msgid "option for selected merge strategy"
msgstr "opció per a l'estratègia de fusió seleccionada"
msgid "abort the current in-progress merge"
msgstr "avorta la fusió en curs actual"
-#: builtin/merge.c:227 builtin/pull.c:169
+#: builtin/merge.c:227 builtin/pull.c:170
msgid "allow merging unrelated histories"
msgstr "permet fusionar històries no relacionades"
msgid "Already up-to-date."
msgstr "Ja està al dia."
-#: builtin/merge.c:1382
+#: builtin/merge.c:1377
#, c-format
msgid "Updating %s..%s\n"
msgstr "S'estan actualitzant %s..%s\n"
-#: builtin/merge.c:1419
+#: builtin/merge.c:1418
#, 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:1426
+#: builtin/merge.c:1425
#, c-format
msgid "Nope.\n"
msgstr "No.\n"
-#: builtin/merge.c:1451
+#: builtin/merge.c:1450
msgid "Already up-to-date. Yeeah!"
msgstr "Ja està al dia. Estupend!"
-#: builtin/merge.c:1457
+#: builtin/merge.c:1456
msgid "Not possible to fast-forward, aborting."
msgstr "No és possible avançar ràpidament, s'està avortant."
-#: builtin/merge.c:1480 builtin/merge.c:1559
+#: builtin/merge.c:1479 builtin/merge.c:1558
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "S'està rebobinant l'arbre a la pristina...\n"
-#: builtin/merge.c:1484
+#: builtin/merge.c:1483
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "S'està intentant l'estratègia de fusió %s...\n"
-#: builtin/merge.c:1550
+#: builtin/merge.c:1549
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Cap estratègia de fusió ha gestionat la fusió.\n"
-#: builtin/merge.c:1552
+#: builtin/merge.c:1551
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "L'estratègia de fusió %s ha fallat.\n"
-#: builtin/merge.c:1561
+#: builtin/merge.c:1560
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "S'està usant el %s per a preparar la resolució a mà.\n"
-#: builtin/merge.c:1573
+#: builtin/merge.c:1572
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <referència> [<comissió>]"
-#: builtin/merge-base.c:214
+#: builtin/merge-base.c:217
msgid "output all common ancestors"
msgstr "emet tots els avantpassats comuns"
-#: builtin/merge-base.c:216
+#: builtin/merge-base.c:219
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:218
+#: builtin/merge-base.c:221
msgid "list revs not reachable from others"
msgstr "llista les revisions no abastables d'altres"
-#: builtin/merge-base.c:220
+#: builtin/merge-base.c:223
msgid "is the first one ancestor of the other?"
msgstr "és la primera un avantpassat de l'altre?"
-#: builtin/merge-base.c:222
+#: builtin/merge-base.c:225
msgid "find where <commit> forked from reflog of <ref>"
msgstr ""
"troba on <comissió> s'ha bifurcat del registre de referències de <referència>"
msgid "set labels for file1/orig-file/file2"
msgstr "estableix les etiquetes per a fitxer1/fitxer-original/fitxer2"
+#: builtin/merge-recursive.c:45
+#, c-format
+msgid "unknown option %s"
+msgstr "opció desconeguda %s"
+
+#: builtin/merge-recursive.c:51
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "no s'ha pogut analitzar l'objecte '%s'"
+
+#: builtin/merge-recursive.c:55
+#, 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:63
+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:69 builtin/merge-recursive.c:71
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "no s'ha pogut resoldre la referència '%s'"
+
+#: builtin/merge-recursive.c:77
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "S'està fusionant %s amb %s\n"
+
#: builtin/mktree.c:65
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
msgid "renaming '%s' failed"
msgstr "el canvi del nom de '%s' ha fallat"
-#: builtin/name-rev.c:258
+#: builtin/name-rev.c:257
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<opcions>] <comissió>..."
-#: builtin/name-rev.c:259
+#: builtin/name-rev.c:258
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<opcions>] --all"
-#: builtin/name-rev.c:260
+#: builtin/name-rev.c:259
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<opcions>] --stdin"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:311
msgid "print only names (no SHA-1)"
msgstr "imprimeix només els noms (sense SHA-1)"
-#: builtin/name-rev.c:313
+#: builtin/name-rev.c:312
msgid "only use tags to name the commits"
msgstr "només usa les etiquetes per a anomenar les comissions"
-#: builtin/name-rev.c:315
+#: builtin/name-rev.c:314
msgid "only use refs matching <pattern>"
msgstr "només usa les referències que coincideixin amb <patró>"
-#: builtin/name-rev.c:317
+#: builtin/name-rev.c:316
msgid "list all commits reachable from all refs"
msgstr "llista totes les comissions abastables de totes les referències"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:317
msgid "read from stdin"
msgstr "llegeix d'stdin"
-#: builtin/name-rev.c:319
+#: builtin/name-rev.c:318
msgid "allow to print `undefined` names (default)"
msgstr "permet imprimir els noms `undefined` (per defecte)"
-#: builtin/name-rev.c:325
+#: builtin/name-rev.c:324
msgid "dereference tags in the input (internal use)"
msgstr "dereferencia les etiquetes en l'entrada (ús intern)"
msgstr "s'ha fallat en finalitzar 'show' per a l'objecte '%s'"
#: builtin/notes.c:194
-msgid "Please supply the note contents using either -m or -F option"
+msgid "please supply the note contents using either -m or -F option"
msgstr ""
-"Si us plau, proveïu els continguts de la nota fent servir l'opció -m o "
+"si us plau, proveïu els continguts de la nota fent servir l'opció -m o "
"l'opció -F"
#: builtin/notes.c:203
#: builtin/notes.c:205
#, c-format
-msgid "The note contents have been left in %s"
-msgstr "Els continguts de la nota s'han deixat en %s"
+msgid "the note contents have been left in %s"
+msgstr "s'han deixat els continguts de la nota en %s"
#: builtin/notes.c:233 builtin/tag.c:439
#, c-format
msgid "could not open or read '%s'"
msgstr "no s'ha pogut obrir o llegir '%s'"
+#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307
+#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513
+#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659
+#, c-format
+msgid "failed to resolve '%s' as a valid ref."
+msgstr "s'ha fallat en resoldre '%s' com a referència vàlida."
+
#: builtin/notes.c:257
#, c-format
-msgid "Failed to read object '%s'."
-msgstr "S'ha fallat en llegir l'objecte '%s'."
+msgid "failed to read object '%s'."
+msgstr "s'ha fallat en llegir l'objecte '%s'."
#: builtin/notes.c:261
#, c-format
-msgid "Cannot read note data from non-blob object '%s'."
-msgstr "No es pot llegir les dades de node de l'objecte no de blob '%s'."
+msgid "cannot read note data from non-blob object '%s'."
+msgstr "no es pot llegir les dades de node de l'objecte no de blob '%s'."
+
+#: builtin/notes.c:301
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr "línia d'entrada mal formada: '%s'."
+
+#: builtin/notes.c:316
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
+msgstr "s'ha fallat 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:345
+#, 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:363 builtin/notes.c:418 builtin/notes.c:494
-#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650
-#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968
+#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496
+#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652
+#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970
msgid "too many parameters"
msgstr "massa paràmetres"
-#: builtin/notes.c:376 builtin/notes.c:663
+#: builtin/notes.c:378 builtin/notes.c:665
#, c-format
-msgid "No note found for object %s."
-msgstr "No s'ha trobat cap nota per a l'objecte %s."
+msgid "no note found for object %s."
+msgstr "no s'ha trobat cap nota per a l'objecte %s."
-#: builtin/notes.c:397 builtin/notes.c:560
+#: builtin/notes.c:399 builtin/notes.c:562
msgid "note contents as a string"
msgstr "anota els continguts com a cadena"
-#: builtin/notes.c:400 builtin/notes.c:563
+#: builtin/notes.c:402 builtin/notes.c:565
msgid "note contents in a file"
msgstr "anota els continguts en un fitxer"
-#: builtin/notes.c:403 builtin/notes.c:566
+#: builtin/notes.c:405 builtin/notes.c:568
msgid "reuse and edit specified note object"
msgstr "reusa i edita l'objecte de nota especificat"
-#: builtin/notes.c:406 builtin/notes.c:569
+#: builtin/notes.c:408 builtin/notes.c:571
msgid "reuse specified note object"
msgstr "reusa l'objecte de nota especificat"
-#: builtin/notes.c:409 builtin/notes.c:572
+#: builtin/notes.c:411 builtin/notes.c:574
msgid "allow storing empty note"
msgstr "permet l'emmagatzematge d'una nota buida"
-#: builtin/notes.c:410 builtin/notes.c:481
+#: builtin/notes.c:412 builtin/notes.c:483
msgid "replace existing notes"
msgstr "reemplaça les notes existents"
-#: builtin/notes.c:435
+#: builtin/notes.c:437
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"No es pot afegir les notes. S'han trobat notes existents de l'objecte %s. "
"Useu '-f' per a sobreescriure les notes existents."
-#: builtin/notes.c:450 builtin/notes.c:529
+#: builtin/notes.c:452 builtin/notes.c:531
#, 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:461 builtin/notes.c:622 builtin/notes.c:887
+#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889
#, c-format
msgid "Removing note for object %s\n"
msgstr "S'està eliminant la nota de l'objecte %s\n"
-#: builtin/notes.c:482
+#: builtin/notes.c:484
msgid "read objects from stdin"
msgstr "llegeix els objectes des d'stdin"
-#: builtin/notes.c:484
+#: builtin/notes.c:486
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"carrega la configuració de reescriptura per a <ordre> (implica --stdin)"
-#: builtin/notes.c:502
+#: builtin/notes.c:504
msgid "too few parameters"
msgstr "hi ha massa pocs paràmetres"
-#: builtin/notes.c:523
+#: builtin/notes.c:525
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"No es pot copiar les notes. S'han trobat notes existents de l'objecte %s. "
"Useu '-f' per a sobreescriure les notes existents."
-#: builtin/notes.c:535
+#: builtin/notes.c:537
#, c-format
-msgid "Missing notes on source object %s. Cannot copy."
-msgstr "Manquen notes a l'objecte font %s. No es pot copiar."
+msgid "missing notes on source object %s. Cannot copy."
+msgstr "manquen notes a l'objecte font %s. No es pot copiar."
-#: builtin/notes.c:587
+#: builtin/notes.c:589
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"S'han desaprovat les opcions -m/-F/-c/-C en favor de la subordre 'edit'.\n"
"Si us plau, useu 'git notes add -f -m/-F/-c/-C' en lloc d'això.\n"
-#: builtin/notes.c:753
+#: builtin/notes.c:685
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr "s'ha fallat en suprimir la referència NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:687
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr "s'ha fallat en suprimir la referència NOTES_MERGE_REF"
+
+#: builtin/notes.c:689
+msgid "failed to remove 'git notes merge' worktree"
+msgstr "s'ha fallat en eliminar l'arbre de treball de 'git notes merge'"
+
+#: builtin/notes.c:709
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr "s'ha fallat en llegir la referència NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:711
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr "no s'ha pogut trobar cap comissió de NOTES_MERGE_PARTIAL."
+
+#: builtin/notes.c:713
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr "no s'ha pogut analitzar la comissió de NOTES_MERGE_PARTIAL."
+
+#: builtin/notes.c:726
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr "s'ha fallat en resoldre NOTES_MERGE_REF"
+
+#: builtin/notes.c:729
+msgid "failed to finalize notes merge"
+msgstr "s'ha fallat en finalitzar la fusió de notes"
+
+#: builtin/notes.c:755
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "estratègia de fusió de notes desconeguda %s"
-#: builtin/notes.c:769
+#: builtin/notes.c:771
msgid "General options"
msgstr "Opcions generals"
-#: builtin/notes.c:771
+#: builtin/notes.c:773
msgid "Merge options"
msgstr "Opcions de fusió"
-#: builtin/notes.c:773
+#: builtin/notes.c:775
msgid ""
"resolve notes conflicts using the given strategy (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:775
+#: builtin/notes.c:777
msgid "Committing unmerged notes"
msgstr "S'estan cometent les notes sense fusionar"
-#: builtin/notes.c:777
+#: builtin/notes.c:779
msgid "finalize notes merge by committing unmerged notes"
msgstr "finalitza la fusió de notes cometent les notes sense fusionar"
-#: builtin/notes.c:779
+#: builtin/notes.c:781
msgid "Aborting notes merge resolution"
msgstr "S'està avortant la resolució de fusió de notes"
-#: builtin/notes.c:781
+#: builtin/notes.c:783
msgid "abort notes merge"
msgstr "avorta la fusió de notes"
-#: builtin/notes.c:792
+#: builtin/notes.c:794
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "no es pot combinar --commit, --abort i -s/--strategy"
-#: builtin/notes.c:797
-msgid "Must specify a notes ref to merge"
-msgstr "Cal especificar una referència de notes a fusionar"
+#: builtin/notes.c:799
+msgid "must specify a notes ref to merge"
+msgstr "cal especificar una referència de notes a fusionar"
-#: builtin/notes.c:821
+#: builtin/notes.c:823
#, c-format
-msgid "Unknown -s/--strategy: %s"
+msgid "unknown -s/--strategy: %s"
msgstr "-s/--strategy desconeguda: %s"
-#: builtin/notes.c:858
+#: builtin/notes.c:860
#, 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"
+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:861
+#: builtin/notes.c:863
#, c-format
-msgid "Failed to store link to current notes ref (%s)"
+msgid "failed to store link to current notes ref (%s)"
msgstr ""
-"S'ha fallat en emmagatzemar l'enllaç a la referència de notes actual (%s)"
+"s'ha fallat en emmagatzemar l'enllaç a la referència de notes actual (%s)"
-#: builtin/notes.c:863
+#: builtin/notes.c:865
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
"cometeu el resultat amb 'git notes merge --commit', o avorteu la fusió amb "
"'git notes merge --abort'.\n"
-#: builtin/notes.c:885
+#: builtin/notes.c:887
#, c-format
msgid "Object %s has no note\n"
msgstr "L'objecte %s no té cap nota\n"
-#: builtin/notes.c:897
+#: builtin/notes.c:899
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:900
+#: builtin/notes.c:902
msgid "read object names from the standard input"
msgstr "llegeix els noms d'objecte des de l'entrada estàndard"
-#: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127
+#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
msgid "do not remove, show only"
msgstr "no eliminis, només mostra"
-#: builtin/notes.c:939
+#: builtin/notes.c:941
msgid "report pruned notes"
msgstr "informa de notes podades"
-#: builtin/notes.c:981
+#: builtin/notes.c:983
msgid "notes-ref"
msgstr "referència de notes"
-#: builtin/notes.c:982
+#: builtin/notes.c:984
msgid "use notes from <notes-ref>"
msgstr "usa les notes de <referència-de-notes>"
-#: builtin/notes.c:1017 builtin/remote.c:1623
+#: builtin/notes.c:1019
#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "Subordre desconeguda: %s"
+msgid "unknown subcommand: %s"
+msgstr "subordre desconeguda: %s"
-#: builtin/pack-objects.c:28
+#: builtin/pack-objects.c:29
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:29
+#: builtin/pack-objects.c:30
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:177 builtin/pack-objects.c:180
+#: builtin/pack-objects.c:179 builtin/pack-objects.c:182
#, c-format
msgid "deflate error (%d)"
msgstr "error de deflació (%d)"
-#: builtin/pack-objects.c:766
+#: builtin/pack-objects.c:768
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"
-#: builtin/pack-objects.c:779
+#: builtin/pack-objects.c:781
msgid "Writing objects"
msgstr "S'estan escrivint els objectes"
-#: builtin/pack-objects.c:1037
+#: builtin/pack-objects.c:1070
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"
-#: builtin/pack-objects.c:2197
+#: builtin/pack-objects.c:2346
msgid "Compressing objects"
msgstr "S'estan comprimint objectes"
-#: builtin/pack-objects.c:2611
+#: builtin/pack-objects.c:2759
#, c-format
msgid "unsupported index version %s"
msgstr "versió d'índex no compatible %s"
-#: builtin/pack-objects.c:2615
+#: builtin/pack-objects.c:2763
#, c-format
msgid "bad index version '%s'"
msgstr "versió d'índex dolenta '%s'"
-#: builtin/pack-objects.c:2645
+#: builtin/pack-objects.c:2793
msgid "do not show progress meter"
msgstr "no mostris l'indicador de progrés"
-#: builtin/pack-objects.c:2647
+#: builtin/pack-objects.c:2795
msgid "show progress meter"
msgstr "mostra l'indicador de progrés"
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2797
msgid "show progress meter during object writing phase"
msgstr "mostra l'indicador de progrés durant la fase d'escriptura d'objectes"
-#: builtin/pack-objects.c:2652
+#: builtin/pack-objects.c:2800
msgid "similar to --all-progress when progress meter is shown"
msgstr "similar a --all-progress quan l'indicador de progrés es mostra"
-#: builtin/pack-objects.c:2653
+#: builtin/pack-objects.c:2801
msgid "version[,offset]"
msgstr "versió[,desplaçament]"
-#: builtin/pack-objects.c:2654
+#: builtin/pack-objects.c:2802
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:2657
+#: builtin/pack-objects.c:2805
msgid "maximum size of each output pack file"
msgstr "mida màxima de cada fitxer de paquet de sortida"
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2807
msgid "ignore borrowed objects from alternate object store"
msgstr ""
"ignora els objectes prestats d'un emmagatzemament d'objectes alternatiu"
-#: builtin/pack-objects.c:2661
+#: builtin/pack-objects.c:2809
msgid "ignore packed objects"
msgstr "ignora els objectes empaquetats"
-#: builtin/pack-objects.c:2663
+#: builtin/pack-objects.c:2811
msgid "limit pack window by objects"
msgstr "limita la finestra d'empaquetament per objectes"
-#: builtin/pack-objects.c:2665
+#: builtin/pack-objects.c:2813
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:2667
+#: builtin/pack-objects.c:2815
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "longitud màxima de la cadena de deltes permesa en el paquet resultant"
-#: builtin/pack-objects.c:2669
+#: builtin/pack-objects.c:2817
msgid "reuse existing deltas"
msgstr "reusa les deltes existents"
-#: builtin/pack-objects.c:2671
+#: builtin/pack-objects.c:2819
msgid "reuse existing objects"
msgstr "reusa els objectes existents"
-#: builtin/pack-objects.c:2673
+#: builtin/pack-objects.c:2821
msgid "use OFS_DELTA objects"
msgstr "usa objectes OFS_DELTA"
-#: builtin/pack-objects.c:2675
+#: builtin/pack-objects.c:2823
msgid "use threads when searching for best delta matches"
msgstr "usa fils en cercar les millores coincidències de delta"
-#: builtin/pack-objects.c:2677
+#: builtin/pack-objects.c:2825
msgid "do not create an empty pack output"
msgstr "no creïs una emissió de paquet buida"
-#: builtin/pack-objects.c:2679
+#: builtin/pack-objects.c:2827
msgid "read revision arguments from standard input"
msgstr "llegeix els paràmetres de revisió des de l'entrada estàndard"
-#: builtin/pack-objects.c:2681
+#: builtin/pack-objects.c:2829
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:2684
+#: builtin/pack-objects.c:2832
msgid "include objects reachable from any reference"
msgstr "inclou els objectes abastables de qualsevulla referència"
-#: builtin/pack-objects.c:2687
+#: builtin/pack-objects.c:2835
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:2690
+#: builtin/pack-objects.c:2838
msgid "include objects referred to by the index"
msgstr "inclou els objectes als quals faci referència l'índex"
-#: builtin/pack-objects.c:2693
+#: builtin/pack-objects.c:2841
msgid "output pack to stdout"
msgstr "emet el paquet a stdout"
-#: builtin/pack-objects.c:2695
+#: builtin/pack-objects.c:2843
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"
-#: builtin/pack-objects.c:2697
+#: builtin/pack-objects.c:2845
msgid "keep unreachable objects"
msgstr "retén els objectes inabastables"
-#: builtin/pack-objects.c:2699
+#: builtin/pack-objects.c:2847
msgid "pack loose unreachable objects"
msgstr "empaqueta els objectes inabastables solts"
-#: builtin/pack-objects.c:2700 parse-options.h:142
-msgid "time"
-msgstr "hora"
-
-#: builtin/pack-objects.c:2701
+#: builtin/pack-objects.c:2849
msgid "unpack unreachable objects newer than <time>"
msgstr "desempaqueta els objectes inabastables més nous que <hora>"
-#: builtin/pack-objects.c:2704
+#: builtin/pack-objects.c:2852
msgid "create thin packs"
msgstr "crea paquets prims"
-#: builtin/pack-objects.c:2706
+#: builtin/pack-objects.c:2854
msgid "create packs suitable for shallow fetches"
msgstr "crea paquets adequats per a les obtencions superficials"
-#: builtin/pack-objects.c:2708
+#: builtin/pack-objects.c:2856
msgid "ignore packs that have companion .keep file"
msgstr "ignora els paquets que tinguin un fitxer .keep corresponent"
-#: builtin/pack-objects.c:2710
+#: builtin/pack-objects.c:2858
msgid "pack compression level"
msgstr "nivell de compressió de paquet"
-#: builtin/pack-objects.c:2712
+#: builtin/pack-objects.c:2860
msgid "do not hide commits by grafts"
msgstr "no amaguis les comissions per empelt"
-#: builtin/pack-objects.c:2714
+#: builtin/pack-objects.c:2862
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:2716
+#: builtin/pack-objects.c:2864
msgid "write a bitmap index together with the pack index"
msgstr "escriu un índex de mapa de bits junt amb l'índex de paquet"
-#: builtin/pack-objects.c:2829
+#: builtin/pack-objects.c:2993
msgid "Counting objects"
msgstr "S'estan comptant els objectes"
msgid "cannot prune in a precious-objects repo"
msgstr "no es pot podar en un dipòsit d'objectes preciosos"
-#: builtin/pull.c:72
+#: builtin/pull.c:51 builtin/pull.c:53
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr "Valor no vàlid per a %s: %s"
+
+#: builtin/pull.c:73
msgid "git pull [<options>] [<repository> [<refspec>...]]"
-msgstr "git pull [opcions] [<dipòsit> [<especificació-de-referència>...]]"
+msgstr "git pull [<opcions>] [<dipòsit> [<especificació-de-referència>...]]"
-#: builtin/pull.c:120
+#: builtin/pull.c:121
msgid "Options related to merging"
msgstr "Opcions relacionades amb fusionar"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorpora els canvis per rebasar en lloc de fusionar"
-#: builtin/pull.c:147 builtin/revert.c:101
+#: builtin/pull.c:148 builtin/revert.c:101
msgid "allow fast-forward"
msgstr "permet l'avanç ràpid"
-#: builtin/pull.c:156
+#: builtin/pull.c:157
msgid "automatically stash/stash pop before and after rebase"
msgstr "automàticament emmagatzema/desempila abans i després de rebasament"
-#: builtin/pull.c:172
+#: builtin/pull.c:173
msgid "Options related to fetching"
msgstr "Opcions relacionades amb obtenir"
-#: builtin/pull.c:194
+#: builtin/pull.c:195
msgid "number of submodules pulled in parallel"
msgstr "nombre de submòduls baixats en paral·lel"
-#: builtin/pull.c:283
+#: builtin/pull.c:284
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Valor no vàlid per a pull.ff: %s"
-#: builtin/pull.c:379 git-sh-setup.sh:226
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr "No es pot baixar amb rebasament: Teniu canvis no allistats."
-
-#: builtin/pull.c:385 git-sh-setup.sh:252
-msgid "Additionally, your index contains uncommitted changes."
-msgstr "Addicionalment, el vostre índex conté canvis sense cometre."
-
-#: builtin/pull.c:387 git-sh-setup.sh:245
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"No es pot baixar amb rebasament: El vostre índex conté canvis sense cometre."
-
-#: builtin/pull.c:463
+#: builtin/pull.c:397
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
"No hi ha cap candidat sobre el qual rebasar entre les referències que acabeu "
"d'obtenir."
-#: builtin/pull.c:465
+#: builtin/pull.c:399
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."
-#: builtin/pull.c:466
+#: builtin/pull.c:400
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
"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:469
+#: builtin/pull.c:403
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"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:474 git-parse-remote.sh:73
+#: builtin/pull.c:408 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Actualment no sou en cap branca."
-#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
+#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Si us plau, especifiqueu sobre què branca voleu rebasar."
-#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
+#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Si us plau, especifiqueu amb què branca voleu fusionar."
-#: builtin/pull.c:479 builtin/pull.c:494
+#: builtin/pull.c:413 builtin/pull.c:428
msgid "See git-pull(1) for details."
msgstr "Vegeu git-pull(1) per detalls."
-#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr "<remot>"
-#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451
+#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<branca>"
-#: builtin/pull.c:489 git-parse-remote.sh:75
+#: builtin/pull.c:423 git-parse-remote.sh:75
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:498 git-parse-remote.sh:95
+#: builtin/pull.c:432 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho "
"amb:"
-#: builtin/pull.c:503
+#: builtin/pull.c:437
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"La vostra configuració especifica fusionar amb la referència '%s'\n"
"del remot, però no s'ha obtingut tal referència."
-#: builtin/pull.c:820
+#: builtin/pull.c:754
msgid "ignoring --verify-signatures for rebase"
msgstr "s'està ignorant --verify-signatures per a rebasar"
-#: builtin/pull.c:867
+#: builtin/pull.c:801
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "l'opció --[no-]-autostash és vàlid només amb --rebase."
-#: builtin/pull.c:875
+#: builtin/pull.c:809
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:903
+#: builtin/pull.c:812
+msgid "pull with rebase"
+msgstr "baixar amb rebasament"
+
+#: builtin/pull.c:813
+msgid "please commit or stash them."
+msgstr "si us plau, cometeu-los o emmagatzemeu-los."
+
+#: builtin/pull.c:838
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"s'està avançant ràpidament el vostre arbre de treball des de\n"
"la comissió %s."
-#: builtin/pull.c:908
+#: builtin/pull.c:843
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"$ git reset --hard\n"
"per a recuperar."
-#: builtin/pull.c:923
+#: builtin/pull.c:858
msgid "Cannot merge multiple branches into empty head."
msgstr "No es pot fusionar múltiples branques a un cap buit."
-#: builtin/pull.c:927
+#: builtin/pull.c:862
msgid "Cannot rebase onto multiple branches."
msgstr "No es pot rebasar sobre múltiples branques."
msgid "debug unpack-trees"
msgstr "depura unpack-trees"
-#: builtin/receive-pack.c:25
+#: builtin/receive-pack.c:26
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
-#: builtin/receive-pack.c:1843
+#: builtin/receive-pack.c:793
+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 'receive.denyCurrentBranch' configuration variable to\n"
+"'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 ""
+"Per defecte, es denega actualizar la branca actual en un dipòsit no\n"
+"nu, perquè feria l'índex i l'arbre de treball inconsistents amb el\n"
+"que hàgiu pujat, i requerria 'git reset --hard' per a fer que\n"
+"l'arbre de treball coincideixi amb HEAD.\n"
+"\n"
+"Podeu establir la variable de configuració\n"
+"'receive.denyCurrentBranch' a 'ignore' o 'warn' en el dipòsit remot\n"
+"per a permetre pujar a la seva branca actual; no obstant, no es\n"
+"recomana això a menys que hàgiu decidit actualitzar el seu arbre en\n"
+"alguna altra manera per a coincidar amb el que hàgiu pujat.\n"
+"\n"
+"Per a silenciar aquest missatge i encara retenir el comportament\n"
+"predeterminat, establiu la variable de configuració\n"
+"'receive.denyCurrentBranch' a 'refuse'."
+
+#: builtin/receive-pack.c:813
+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 ""
+"Per defecte, es denega suprimir la branca actual, perquè el\n"
+"'git clone' següent no resultarà en cap fitxer agafat, causant\n"
+"confusió.\n"
+"\n"
+"Podeu establir la variable de configuració\n"
+"'receive.denyDeleteCurrent' a 'warn' o 'ignore' en el dipòsit remot\n"
+"per a permetre suprimir la branca actual, amb o sense un missatge\n"
+"d'advertència.\n"
+"\n"
+"Per a silenciar aquest missatge, podeu establir-la a 'refuse'."
+
+#: builtin/receive-pack.c:1883
msgid "quiet"
msgstr "callat"
-#: builtin/receive-pack.c:1857
+#: builtin/receive-pack.c:1897
msgid "You must specify a directory."
msgstr "Heu d'especificar un directori."
msgid " Fetch URL: %s"
msgstr " URL d'obtenció: %s"
-#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296
+#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
msgid "(no URL)"
msgstr "(sense URL)"
msgstr[0] " Branca remota:%s"
msgstr[1] " Branques remotes:%s"
-#: builtin/remote.c:1179 builtin/remote.c:1206
+#: builtin/remote.c:1179 builtin/remote.c:1205
msgid " (status not queried)"
msgstr " (estat no consultat)"
msgid " Local refs will be mirrored by 'git push'"
msgstr " 'git push' reflectirà les referències locals"
-#: builtin/remote.c:1203
+#: builtin/remote.c:1202
#, 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:1224
+#: builtin/remote.c:1223
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "estableix refs/remotes/<name>/HEAD segons el remot"
-#: builtin/remote.c:1226
+#: builtin/remote.c:1225
msgid "delete refs/remotes/<name>/HEAD"
msgstr "suprimeix refs/remotes/<name>/HEAD"
-#: builtin/remote.c:1241
+#: builtin/remote.c:1240
msgid "Cannot determine remote HEAD"
msgstr "No es pot determinar el HEAD remot"
-#: builtin/remote.c:1243
+#: builtin/remote.c:1242
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
"Múltiples branques de HEAD remotes. Si us plau, trieu-ne una explícitament "
"amb:"
-#: builtin/remote.c:1253
+#: builtin/remote.c:1252
#, c-format
msgid "Could not delete %s"
msgstr "No s'ha pogut suprimir %s"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1260
#, c-format
msgid "Not a valid ref: %s"
msgstr "No és una referència vàlida: %s"
-#: builtin/remote.c:1263
+#: builtin/remote.c:1262
#, c-format
msgid "Could not setup %s"
msgstr "No s'ha pogut configurar %s"
-#: builtin/remote.c:1281
+#: builtin/remote.c:1280
#, c-format
msgid " %s will become dangling!"
msgstr " %s es tornarà penjant!"
-#: builtin/remote.c:1282
+#: builtin/remote.c:1281
#, c-format
msgid " %s has become dangling!"
msgstr " %s s'ha tornat penjant!"
-#: builtin/remote.c:1292
+#: builtin/remote.c:1291
#, c-format
msgid "Pruning %s"
msgstr "S'està podant %s"
-#: builtin/remote.c:1293
+#: builtin/remote.c:1292
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1309
+#: builtin/remote.c:1308
#, c-format
msgid " * [would prune] %s"
msgstr " * [podaria] %s"
-#: builtin/remote.c:1312
+#: builtin/remote.c:1311
#, c-format
msgid " * [pruned] %s"
msgstr " * [podat] %s"
-#: builtin/remote.c:1357
+#: builtin/remote.c:1356
msgid "prune remotes after fetching"
msgstr "poda els remots després d'obtenir-los"
-#: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542
+#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
#, c-format
msgid "No such remote '%s'"
msgstr "No hi ha tal remot '%s'"
-#: builtin/remote.c:1436
+#: builtin/remote.c:1435
msgid "add branch"
msgstr "afegeix branca"
-#: builtin/remote.c:1443
+#: builtin/remote.c:1442
msgid "no remote specified"
msgstr "cap remot especificat"
-#: builtin/remote.c:1460
+#: builtin/remote.c:1459
msgid "query push URLs rather than fetch URLs"
-msgstr "consulta els URL de pujada en lloc dels URL d'obteniment"
+msgstr "consulta els URL de pujada en lloc dels URL d'obtenció"
-#: builtin/remote.c:1462
+#: builtin/remote.c:1461
msgid "return all URLs"
msgstr "retorna tots els URL"
-#: builtin/remote.c:1490
+#: builtin/remote.c:1489
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "cap URL configurat per al remot '%s'"
-#: builtin/remote.c:1516
+#: builtin/remote.c:1515
msgid "manipulate push URLs"
msgstr "manipula els URL de pujada"
-#: builtin/remote.c:1518
+#: builtin/remote.c:1517
msgid "add URL"
msgstr "afegeix URL"
-#: builtin/remote.c:1520
+#: builtin/remote.c:1519
msgid "delete URLs"
msgstr "suprimeix URLs"
-#: builtin/remote.c:1527
+#: builtin/remote.c:1526
msgid "--add --delete doesn't make sense"
msgstr "--add --delete no té sentit"
-#: builtin/remote.c:1568
+#: builtin/remote.c:1567
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Patró d'URL antic no vàlid: %s"
-#: builtin/remote.c:1576
+#: builtin/remote.c:1575
#, c-format
msgid "No such URL found: %s"
msgstr "No s'ha trobat tal URL: %s"
-#: builtin/remote.c:1578
+#: builtin/remote.c:1577
msgid "Will not delete all non-push URLs"
msgstr "No se suprimiran tots els URL no de pujada"
-#: builtin/remote.c:1592
+#: builtin/remote.c:1591
msgid "be verbose; must be placed before a subcommand"
msgstr "sigues detallat; s'ha de col·locar abans d'una subordre"
+#: builtin/remote.c:1622
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Subordre desconeguda: %s"
+
#: builtin/repack.c:17
msgid "git repack [<options>]"
msgstr "git repack [<opcions>]"
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<comissió>]"
#: builtin/reset.c:27
-msgid "git reset [-q]
<tree-ish> [--] <paths>..."
-msgstr "git reset [-q] <arbre> [--] <camins>..."
+msgid "git reset [-q]
[<tree-ish>] [--] <paths>..."
+msgstr "git reset [-q] [<arbre>] [--] <camins>..."
#: builtin/reset.c:28
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgid "Could not write new index file."
msgstr "No s'ha pogut escriure el fitxer d'índex nou."
-#: builtin/rev-list.c:362
+#: builtin/rev-list.c:354
msgid "rev-list does not support display of notes"
msgstr "el rev-list no permet mostrar notes"
-#: builtin/rev-parse.c:358
+#: builtin/rev-parse.c:386
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<opcions>] -- [<paràmetres>...]"
-#: builtin/rev-parse.c:363
+#: builtin/rev-parse.c:391
msgid "keep the `--` passed as an arg"
msgstr "retén el `--` passat com a paràmetre"
-#: builtin/rev-parse.c:365
+#: builtin/rev-parse.c:393
msgid "stop parsing after the first non-option argument"
msgstr "deixa d'analitzar després del primer paràmetre no d'opció"
-#: builtin/rev-parse.c:368
+#: builtin/rev-parse.c:396
msgid "output in stuck long form"
msgstr "emet en forma llarga enganxada"
-#: builtin/rev-parse.c:499
+#: builtin/rev-parse.c:527
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
msgid "revert failed"
msgstr "la reversió ha fallat"
-#: builtin/revert.c:207
+#: builtin/revert.c:205
msgid "cherry-pick failed"
msgstr "el recull de cireres ha fallat"
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<referència>]"
-#: builtin/show-branch.c:640
+#: builtin/show-branch.c:375
+#, 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:541
+#, c-format
+msgid "no matching refs with %s"
+msgstr "no hi ha referències coincidents amb %s"
+
+#: builtin/show-branch.c:639
msgid "show remote-tracking and local branches"
msgstr "mostra les branques amb seguiment remot i les locals"
-#: builtin/show-branch.c:642
+#: builtin/show-branch.c:641
msgid "show remote-tracking branches"
msgstr "mostra les branques amb seguiment remot"
-#: builtin/show-branch.c:644
+#: builtin/show-branch.c:643
msgid "color '*!+-' corresponding to the branch"
msgstr "colora '*!+-' corresponent a la branca"
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show <n> more commits after the common ancestor"
msgstr "mostra <n> comissions després de l'avantpassat comú"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "synonym to more=-1"
msgstr "sinònim de more=-1"
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
msgid "suppress naming strings"
msgstr "omet l'anomenament de cadenes"
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
msgid "include the current branch"
msgstr "inclou la branca actual"
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
msgid "name commits with their object names"
msgstr "anomena les comissions amb els seus noms d'objecte"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "show possible merge bases"
msgstr "mostra les bases de fusió possibles"
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "show refs unreachable from any other ref"
msgstr "mostra les referències inabastables de qualsevulla altra referència"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "show commits in topological order"
msgstr "mostra les comissions en ordre topològic"
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
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:664
+#: builtin/show-branch.c:663
msgid "show merges reachable from only one tip"
msgstr "mostra les fusions abastables de només una punta"
-#: builtin/show-branch.c:666
+#: builtin/show-branch.c:665
msgid "topologically sort, maintaining date order where possible"
msgstr "ordena topològicament, mantenint l'ordre de dates on sigui possible"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
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:703
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+msgstr ""
+"--reflog és incompatible amb --all, --remotes, --independent o --merge-base"
+
+#: builtin/show-branch.c:727
+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:730
+msgid "--reflog option needs one branch name"
+msgstr "l'opció --reflog necessita un nom de branca"
+
+#: builtin/show-branch.c:733
+#, 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:737
+#, c-format
+msgid "no such ref %s"
+msgstr "no hi ha tal referència %s"
+
+#: builtin/show-branch.c:829
+#, 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:833
+#, c-format
+msgid "'%s' is not a valid ref."
+msgstr "'%s' no és una referència vàlida."
+
+#: builtin/show-branch.c:836
+#, c-format
+msgid "cannot find commit %s (%s)"
+msgstr "no es pot trobar la comissió %s (%s)"
+
#: builtin/show-ref.c:10
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
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:24 builtin/submodule--helper.c:923
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1046
#, c-format
msgid "No such ref: %s"
msgstr "No hi ha tal referència: %s"
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "S'espera un nom de referència ple, s'ha rebut %s"
msgid "cannot strip one component off url '%s'"
msgstr "no es pot despullar un component de l'url '%s'"
-#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403
-#: builtin/submodule--helper.c:483
+#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408
+#: builtin/submodule--helper.c:590
msgid "alternative anchor for relative paths"
msgstr "àncora alternativa per als camins relatius"
-#: builtin/submodule--helper.c:283
+#: builtin/submodule--helper.c:287
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<camí>] [<camí>...]"
-#: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338
+#: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343
#, 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:364
+#: builtin/submodule--helper.c:369
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "S'ha fallat en registrar l'url per al camí de submòdul '%s'"
-#: builtin/submodule--helper.c:368
+#: builtin/submodule--helper.c:373
#, 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:378
+#: builtin/submodule--helper.c:383
#, 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:385
+#: builtin/submodule--helper.c:390
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"S'ha fallat en registrar el mode d'actualització per al camí de submòdul '%s'"
-#: builtin/submodule--helper.c:404
+#: builtin/submodule--helper.c:409
msgid "Suppress output for initializing a submodule"
msgstr "Omet la sortida d'inicialitzar un submòdul"
-#: builtin/submodule--helper.c:409
+#: builtin/submodule--helper.c:414
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<camí>]"
-#: builtin/submodule--helper.c:430
+#: builtin/submodule--helper.c:435
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <camí>"
-#: builtin/submodule--helper.c:436
+#: builtin/submodule--helper.c:441
#, 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:486
+#: builtin/submodule--helper.c:524 builtin/submodule--helper.c:527
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
+msgstr "el submòdul '%s' no pot afegir un alternatiu: %s"
+
+#: builtin/submodule--helper.c:563
+#, 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:570
+#, 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:593
msgid "where the new submodule will be cloned to"
msgstr "a on es clonarà el submòdul nou"
-#: builtin/submodule--helper.c:489
+#: builtin/submodule--helper.c:596
msgid "name of the new submodule"
msgstr "nom del submòdul nou"
-#: builtin/submodule--helper.c:492
+#: builtin/submodule--helper.c:599
msgid "url where to clone the submodule from"
msgstr "url del qual clonar el submòdul"
-#: builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:605
msgid "depth for shallow clones"
msgstr "profunditat dels clons superficials"
-#: builtin/submodule--helper.c:504
+#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964
+msgid "force cloning progress"
+msgstr "força el progrés del clonatge"
+
+#: builtin/submodule--helper.c:613
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
"git submodule--helper clone [--prefix=<camí>] [--quiet] [--reference "
"<dipòsit>] [--name <nom>] [--depth <profunditat>] --url <url> --path <camí>"
-#: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535
+#: builtin/submodule--helper.c:638 builtin/submodule--helper.c:648
#, c-format
msgid "could not create directory '%s'"
msgstr "no s'ha pogut crear el directori '%s'"
-#: builtin/submodule--helper.c:531
+#: builtin/submodule--helper.c:644
#, 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:547
+#: builtin/submodule--helper.c:660
#, c-format
msgid "cannot open file '%s'"
msgstr "no es pot obrir el fitxer '%s'"
-#: builtin/submodule--helper.c:552
+#: builtin/submodule--helper.c:665
#, c-format
msgid "could not close file %s"
msgstr "no s'ha pogut tancar el fitxer %s"
-#: builtin/submodule--helper.c:559
+#: builtin/submodule--helper.c:672
#, 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:611
+#: builtin/submodule--helper.c:726
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "El camí de submòdul '%s' no està inicialitzat"
-#: builtin/submodule--helper.c:615
+#: builtin/submodule--helper.c:730
msgid "Maybe you want to use 'update --init'?"
msgstr "Potser voleu usar 'update --init'?"
-#: builtin/submodule--helper.c:641
+#: builtin/submodule--helper.c:756
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "S'està saltant el submòdul no fusionat %s"
-#: builtin/submodule--helper.c:662
+#: builtin/submodule--helper.c:777
#, c-format
msgid "Skipping submodule '%s'"
msgstr "S'està saltant el submòdul '%s'"
-#: builtin/submodule--helper.c:792
+#: builtin/submodule--helper.c:913
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "S'ha fallat en clonar '%s'. S'ha programat un reintent"
-#: builtin/submodule--helper.c:803
+#: builtin/submodule--helper.c:924
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "S'ha fallat una segona vegada en clonar '%s', s'està avortant"
-#: builtin/submodule--helper.c:824
+#: builtin/submodule--helper.c:945
msgid "path into the working tree"
msgstr "camí a l'arbre de treball"
-#: builtin/submodule--helper.c:827
+#: builtin/submodule--helper.c:948
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:831
+#: builtin/submodule--helper.c:952
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout o none"
-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:956
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:838
+#: builtin/submodule--helper.c:959
msgid "parallel jobs"
msgstr "tasques paral·leles"
-#: builtin/submodule--helper.c:840
+#: builtin/submodule--helper.c:961
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:841
+#: builtin/submodule--helper.c:962
msgid "don't print cloning progress"
msgstr "no imprimeixis el progrés del clonatge"
-#: builtin/submodule--helper.c:846
+#: builtin/submodule--helper.c:969
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<camí>] [<camí>...]"
-#: builtin/submodule--helper.c:856
+#: builtin/submodule--helper.c:979
msgid "bad value for update parameter"
msgstr "valor dolent per al paràmetre update"
-#: builtin/submodule--helper.c:927
+#: builtin/submodule--helper.c:1050
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"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:977
+#: builtin/submodule--helper.c:1100
msgid "submodule--helper subcommand must be called with a subcommand"
msgstr "s'ha d'executar la subordre submodule--helper amb una subordre"
-#: builtin/submodule--helper.c:984
+#: builtin/submodule--helper.c:1107
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' no és una subordre vàlida de submodule--helper"
msgid "Updated tag '%s' (was %s)\n"
msgstr "Etiqueta '%s' actualitzada (era %s)\n"
-#: builtin/unpack-objects.c:490
+#: builtin/unpack-objects.c:493
msgid "Unpacking objects"
msgstr "S'estan desempaquetant els objectes"
msgid " OK"
msgstr " D'acord"
-#: builtin/update-index.c:575
+#: builtin/update-index.c:564
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<opcions>] [--] [<fitxer>...]"
-#: builtin/update-index.c:930
+#: builtin/update-index.c:919
msgid "continue refresh even when index needs update"
msgstr ""
"continua l'actualització encara que l'índex necessiti una actualització"
-#: builtin/update-index.c:933
+#: builtin/update-index.c:922
msgid "refresh: ignore submodules"
msgstr "actualitza: ignora els submòduls"
-#: builtin/update-index.c:936
+#: builtin/update-index.c:925
msgid "do not ignore new files"
msgstr "no ignoris els fitxers nous"
-#: builtin/update-index.c:938
+#: builtin/update-index.c:927
msgid "let files replace directories and vice-versa"
msgstr "deixa que els fitxers reemplacin els directoris i viceversa"
-#: builtin/update-index.c:940
+#: builtin/update-index.c:929
msgid "notice files missing from worktree"
msgstr "tingues en compte els fitxers absents de l'arbre de treball"
-#: builtin/update-index.c:942
+#: builtin/update-index.c:931
msgid "refresh even if index contains unmerged entries"
msgstr "actualitza encara que l'índex contingui entrades no fusionades"
-#: builtin/update-index.c:945
+#: builtin/update-index.c:934
msgid "refresh stat information"
msgstr "actualitza la informació d'estadístiques"
-#: builtin/update-index.c:949
+#: builtin/update-index.c:938
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "com --refresh, però ignora l'ajust assume-unchanged"
-#: builtin/update-index.c:953
+#: builtin/update-index.c:942
msgid "<mode>,<object>,<path>"
msgstr "<mode>,<objecte>,<camí>"
-#: builtin/update-index.c:954
+#: builtin/update-index.c:943
msgid "add the specified entry to the index"
msgstr "afegeix l'entrada especificada a l'índex"
-#: builtin/update-index.c:963
+#: builtin/update-index.c:952
msgid "mark files as \"not changing\""
msgstr "marca els fitxers com a \"no canviant\""
-#: builtin/update-index.c:966
+#: builtin/update-index.c:955
msgid "clear assumed-unchanged bit"
msgstr "neteja el bit assumed-unchanged"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:958
msgid "mark files as \"index-only\""
msgstr "marca els fitxers com a \"només índex\""
-#: builtin/update-index.c:972
+#: builtin/update-index.c:961
msgid "clear skip-worktree bit"
msgstr "neteja el bit skip-worktree"
-#: builtin/update-index.c:975
+#: builtin/update-index.c:964
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:977
+#: builtin/update-index.c:966
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:979
+#: builtin/update-index.c:968
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:981
+#: builtin/update-index.c:970
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:985
+#: builtin/update-index.c:974
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:989
+#: builtin/update-index.c:978
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "reemplena les etapes #2 i #3 per als camins llistats"
-#: builtin/update-index.c:993
+#: builtin/update-index.c:982
msgid "only update entries that differ from HEAD"
msgstr "només actualitza les entrades que difereixin de HEAD"
-#: builtin/update-index.c:997
+#: builtin/update-index.c:986
msgid "ignore files missing from worktree"
msgstr "ignora els fitxers absents de l'arbre de treball"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:989
msgid "report actions to standard output"
msgstr "informa de les accions en la sortida estàndard"
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:991
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(per a porcellanes) oblida't dels conflictes no resolts ni desats"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:995
msgid "write index in this format"
msgstr "escriu l'índex en aquest format"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:997
msgid "enable or disable split index"
msgstr "habilita o inhabilita l'índex dividit"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:999
msgid "enable/disable untracked cache"
msgstr "habilita/inhabilita la memòria cau no seguida"
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1001
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:1014
+#: builtin/update-index.c:1003
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:1134
+#: builtin/update-index.c:1119
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
+msgstr ""
+"core.untrackedCache està establert a veritable; elimineu-lo o canvieu-lo, si "
+"realment voleu inhabilitar el cau no seguit"
+
+#: builtin/update-index.c:1123
msgid "Untracked cache disabled"
msgstr "La memòria cau no seguida està inhabilitada"
-#: builtin/update-index.c:1146
+#: builtin/update-index.c:1131
+msgid ""
+"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:1135
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "La memòria cau no seguida està habilitada per a '%s'"
msgid "only useful for debugging"
msgstr "només útil per a la depuració"
-#: upload-pack.c:20
+#: upload-pack.c:22
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<opcions>] <directori>"
-#: upload-pack.c:837
+#: upload-pack.c:1028
msgid "quit after a single request/response exchange"
msgstr "surt després d'un sol intercanvi de sol·licitud/resposta"
-#: upload-pack.c:839
+#: upload-pack.c:1030
msgid "exit immediately after initial ref advertisement"
msgstr "surt immediatament després del anunci inicial de referència"
-#: upload-pack.c:841
+#: upload-pack.c:1032
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"
-#: upload-pack.c:843
+#: upload-pack.c:1034
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "interromp la transferència després de <n> segons d'inactivitat"
+#: credential-cache--daemon.c:223
+#, 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 ""
+"Els permisos en el vostre directori de sòcol són massa liberals;\n"
+"potser que altres usuaris poden llegir els vostres credencials.\n"
+"Considereu executar:\n"
+"\n"
+"\tchmod 0700 %s"
+
#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "imprimeix els missatges de depuració a stderr"
"'git help <concepte>' per a llegir sobre una subordre o concepte\n"
"específic."
-#: http.c:323
+#: http.c:342
+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:351
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "No s'admet l'enganx de clau pública amb cURL < 7.44.0"
msgid "no-op (backward compatibility)"
msgstr "operació nul·la (per a compatibilitat amb versions anteriors)"
-#: parse-options.h:237
+#: parse-options.h:238
msgid "be more verbose"
msgstr "sigues més detallat"
-#: parse-options.h:239
+#: parse-options.h:240
msgid "be more quiet"
msgstr "sigues més callat"
-#: parse-options.h:245
+#: parse-options.h:246
msgid "use <n> digits to display SHA-1s"
msgstr "usa <n> xifres per presentar els SHA-1"
msgstr "La fusió automàtica no ha funcionat."
#: git-merge-octopus.sh:62
-msgid "Should not be doing an Octopus."
+msgid "Should not be doing an octopus."
msgstr "No s'ha de fer un pop."
#: git-merge-octopus.sh:73
msgid "Cannot save the current index state"
msgstr "No es pot desar l'estat d'índex actual"
+#: git-stash.sh:103
+msgid "Cannot save the untracked files"
+msgstr "No es pot desar els fitxers no seguits"
+
#: git-stash.sh:123 git-stash.sh:136
msgid "Cannot save the current worktree state"
msgstr "No es pot desar l'estat d'arbre de treball actual"
"error: opció desconeguda de 'stash save': $option\n"
" Per a proveir un missatge, useu git stash save -- '$option'"
+#: git-stash.sh:251
+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."
+
#: git-stash.sh:259
msgid "No local changes to save"
msgstr "No hi ha canvis locals a desar"
msgid "Cannot remove worktree changes"
msgstr "No es pot eliminar els canvis de l'arbre de treball"
-#: git-stash.sh:404
+#: git-stash.sh:403
#, sh-format
msgid "unknown option: $opt"
msgstr "opció desconeguda: $opt"
-#: git-stash.sh:414
+#: git-stash.sh:416
msgid "No stash found."
msgstr "No s'ha trobat cap magatzem."
-#: git-stash.sh:421
+#: git-stash.sh:423
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "S'han especificat massa revisions: $REV"
-#: git-stash.sh:427
+#: git-stash.sh:438
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference no és una referència vàlida"
-#: git-stash.sh:455
+#: git-stash.sh:466
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' no és una comissió de tipus magatzem"
-#: git-stash.sh:466
+#: git-stash.sh:477
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' no és una referència de magatzem"
-#: git-stash.sh:474
+#: git-stash.sh:485
msgid "unable to refresh index"
msgstr "no s'ha pogut actualitzar l'índex"
-#: git-stash.sh:478
+#: git-stash.sh:489
msgid "Cannot apply a stash in the middle of a merge"
msgstr "No es pot aplicar un magatzem enmig d'una fusió"
-#: git-stash.sh:486
+#: git-stash.sh:497
msgid "Conflicts in index. Try without --index."
msgstr "Hi ha conflictes en l'índex. Proveu-ho sense --index."
-#: git-stash.sh:488
+#: git-stash.sh:499
msgid "Could not save index tree"
msgstr "No s'ha pogut desar l'arbre d'índex"
-#: git-stash.sh:522
+#: git-stash.sh:508
+msgid "Could not restore untracked files from stash"
+msgstr "No s'ha pogut restaurar els fitxers no seguits des d'emmagatzematge"
+
+#: git-stash.sh:533
msgid "Cannot unstage modified files"
msgstr "No es pot desallistar fitxers modificats"
-#: git-stash.sh:537
+#: git-stash.sh:548
msgid "Index was not unstashed."
msgstr "L'índex no estava sense emmagatzemar."
-#: git-stash.sh:551
+#: git-stash.sh:562
msgid "The stash is kept in case you need it again."
msgstr "Es conserva el magatzem en cas de que el necessiteu altra vegada."
-#: git-stash.sh:560
+#: git-stash.sh:571
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "${REV} ($s) descartada"
-#: git-stash.sh:561
+#: git-stash.sh:572
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: No s'ha pogut descartar l'entrada de magatzem"
-#: git-stash.sh:569
+#: git-stash.sh:580
msgid "No branch name specified"
msgstr "Cap nom de branca especificat"
-#: git-stash.sh:641
+#: git-stash.sh:652
msgid "(To restore them type \"git stash apply\")"
msgstr "(Per restaurar-les teclegeu \"git stash apply\")"
-#: git-submodule.sh:183
+#: git-submodule.sh:184
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"El camí relatiu només es pot usar des del nivell superior de l'arbre de "
"treball"
-#: git-submodule.sh:193
+#: git-submodule.sh:194
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "URL de dipòsit: '$repo' ha de ser absolut o començar amb ./|../"
-#: git-submodule.sh:210
+#: git-submodule.sh:211
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' ja existeix en l'índex"
-#: git-submodule.sh:214
+#: git-submodule.sh:215
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
"$sm_path\n"
"Useu -f si realment voleu afegir-lo."
-#: git-submodule.sh:232
+#: git-submodule.sh:233
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "S'està afegint el dipòsit existent a '$sm_path' a l'índex"
-#: git-submodule.sh:234
+#: git-submodule.sh:235
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' ja existeix i no és un dipòsit de git vàlid"
-#: git-submodule.sh:242
+#: git-submodule.sh:243
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Es troba un directori de git per a '$sm_name' localment amb els remots:"
-#: git-submodule.sh:244
+#: git-submodule.sh:245
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
"o no esteu segur de què vol dir això, trieu un altre nom amb l'opció '--"
"name'."
-#: git-submodule.sh:250
+#: git-submodule.sh:251
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr ""
"S'està reactivant el directori de git local per al submòdul '$sm_name'."
-#: git-submodule.sh:262
+#: git-submodule.sh:263
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "no s'ha pogut agafar el submòdul '$sm_path'"
-#: git-submodule.sh:267
+#: git-submodule.sh:268
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "S'ha fallat en afegir el submòdul '$sm_path'"
-#: git-submodule.sh:276
+#: git-submodule.sh:277
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "S'ha fallat en registrar el submòdul '$sm_path'"
-#: git-submodule.sh:323
+#: git-submodule.sh:324
#, sh-format
msgid "Entering '$displaypath'"
msgstr "S'està entrant '$displaypath'"
-#: git-submodule.sh:343
+#: git-submodule.sh:344
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr ""
"S'està aturant a '$displaypath'; l'script ha retornat un estat no zero."
-#: git-submodule.sh:414
+#: git-submodule.sh:415
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr "--pathspec i --all són incompatibles"
-#: git-submodule.sh:419
+#: git-submodule.sh:420
#, sh-format
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Useu '--all' si realment voleu desinicialitzar tots els submòduls"
-#: git-submodule.sh:439
+#: git-submodule.sh:440
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains a .git directory\n"
"L'arbre de treball de submòdul '$displaypath' conté un directori .git\n"
"(useu 'rm -rf' si realment voleu eliminar-lo, incloent tota la seva història)"
-#: git-submodule.sh:447
+#: git-submodule.sh:448
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
"L'arbre de treball de submòdul '$displaypath' conté modificacions locals; "
"useu '-f' per a descartar-les"
-#: git-submodule.sh:450
+#: git-submodule.sh:451
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "S'ha netejat el directori '$displaypath'"
-#: git-submodule.sh:451
+#: git-submodule.sh:452
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr "No s'ha pogut eliminar l'arbre de treball de submòdul '$displaypath'"
-#: git-submodule.sh:454
+#: git-submodule.sh:455
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "No s'ha pogut crear el directori de submòdul buit '$displaypath'"
-#: git-submodule.sh:463
+#: git-submodule.sh:464
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr "Submòdul '$name' ($url) no registrat per al camí '$displaypath'"
-#: git-submodule.sh:612
+#: git-submodule.sh:617
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
"No s'ha pogut trobar la revisió actual en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:622
+#: git-submodule.sh:627
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "No s'ha pogut obtenir en el camí de submòdul '$sm_path'"
-#: git-submodule.sh:627
+#: git-submodule.sh:632
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"No s'ha pogut trobar la revisió actual de ${remote_name}/${branch} en el "
"camí de submòdul '$sm_path'"
-#: git-submodule.sh:645
+#: git-submodule.sh:650
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "No s'ha pogut obtenir en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:651
+#: git-submodule.sh:656
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Direct fetching of that commit failed."
msgstr ""
"S'ha obtingut en el camí de submòdul '$displaypath', però no contenia $sha1. "
-"L'obteniment directe d'aquella comissió ha fallat."
+"L'obtenció directa d'aquella comissió ha fallat."
-#: git-submodule.sh:658
+#: git-submodule.sh:663
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "No s'ha pogut agafar '$sha1' en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:659
+#: git-submodule.sh:664
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha agafat '$sha1'"
-#: git-submodule.sh:663
+#: git-submodule.sh:668
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "no s'ha pogut rebasar '$sha1' en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:664
+#: git-submodule.sh:669
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha rebasat en '$sha1'"
-#: git-submodule.sh:669
+#: git-submodule.sh:674
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "No s'ha pogut fusionar '$sha1' en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:670
+#: git-submodule.sh:675
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha fusionat en '$sha1'"
-#: git-submodule.sh:675
+#: git-submodule.sh:680
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"L'execució de '$command $sha1' ha fallat en el camí de submòdul "
"'$displaypath'"
-#: git-submodule.sh:676
+#: git-submodule.sh:681
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Camí de submòdul '$displaypath': '$command $sha1'"
-#: git-submodule.sh:707
+#: git-submodule.sh:712
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "S'ha fallat en recursar al camí de submòdul '$displaypath'"
-#: git-submodule.sh:815
+#: git-submodule.sh:820
msgid "The --cached option cannot be used with the --files option"
msgstr "L'opció --cached no es pot usar amb l'opció --files"
-#: git-submodule.sh:867
+#: git-submodule.sh:872
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "mode inesperat $mod_dst"
-#: git-submodule.sh:887
+#: git-submodule.sh:892
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Avís: $display_name no conté la comissió $sha1_src"
-#: git-submodule.sh:890
+#: git-submodule.sh:895
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Avís: $display_name no conté la comissió $sha1_dst"
-#: git-submodule.sh:893
+#: git-submodule.sh:898
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " Avís: $display_name no conté les comissions $sha1_src i $sha1_dst"
-#: git-submodule.sh:918
-msgid "blob"
-msgstr "blob"
-
-#: git-submodule.sh:1040
+#: git-submodule.sh:1045
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "S'ha fallat en recursar al camí de submòdul '$sm_path'"
-#: git-submodule.sh:1107
+#: git-submodule.sh:1112
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "S'està sincronitzant l'url de submòdul per a '$displaypath'"
msgid "See git-${cmd}(1) for details."
msgstr "Vegeu git-${cmd}(1) per detalls."
-#: git-rebase--interactive.sh:131
+#: git-rebase--interactive.sh:140
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr "S'està rebasant ($new_count/$total)"
-#: git-rebase--interactive.sh:147
+#: git-rebase--interactive.sh:156
msgid ""
"\n"
"Commands:\n"
"\n"
"Es pot canviar l'ordre d'aquestes línies; s'executen de dalt a baix.\n"
-#: git-rebase--interactive.sh:162
+#: git-rebase--interactive.sh:171
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
"No elimineu cap línia. Useu 'drop' explícitament per a eliminar una "
"comissió.\n"
-#: git-rebase--interactive.sh:166
+#: git-rebase--interactive.sh:175
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
"\n"
"Si elimineu una línia aquí, ES PERDRÀ AQUELLA COMISSIÓ.\n"
-#: git-rebase--interactive.sh:202
+#: git-rebase--interactive.sh:211
#, sh-format
msgid ""
"You can amend the commit now, with\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--interactive.sh:227
+#: git-rebase--interactive.sh:236
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr "$sha1: no és una comissió que es pugi escollir"
-#: git-rebase--interactive.sh:266
+#: git-rebase--interactive.sh:275
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr "Nom de comissió no vàlid: $sha1"
-#: git-rebase--interactive.sh:308
+#: git-rebase--interactive.sh:317
msgid "Cannot write current commit's replacement sha1"
msgstr "No es pot escriure el sha1 reemplaçant de la comissió actual"
-#: git-rebase--interactive.sh:360
+#: git-rebase--interactive.sh:369
#, sh-format
msgid "Fast-forward to $sha1"
msgstr "Avanç ràpid a $sha1"
-#: git-rebase--interactive.sh:362
+#: git-rebase--interactive.sh:371
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr "No es pot avançar ràpidament a $sha1"
-#: git-rebase--interactive.sh:371
+#: git-rebase--interactive.sh:380
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr "No es pot moure HEAD a $first_parent"
-#: git-rebase--interactive.sh:376
+#: git-rebase--interactive.sh:385
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr "S'està refusant aixafar una fusió: $sha1"
-#: git-rebase--interactive.sh:390
+#: git-rebase--interactive.sh:399
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Error en refer la fusió $sha1"
-#: git-rebase--interactive.sh:398
+#: git-rebase--interactive.sh:407
#, sh-format
msgid "Could not pick $sha1"
msgstr "No s'ha pogut escollir $sha1"
-#: git-rebase--interactive.sh:407
+#: git-rebase--interactive.sh:416
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Aquest és el missatge de comissió núm. ${n}:"
-#: git-rebase--interactive.sh:412
+#: git-rebase--interactive.sh:421
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "El missatge de comissió núm. ${n} se saltarà:"
-#: git-rebase--interactive.sh:423
+#: git-rebase--interactive.sh:432
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] "Això és una combinació de $count comissió."
msgstr[1] "Això és una combinació de $count comissions."
-#: git-rebase--interactive.sh:431
+#: git-rebase--interactive.sh:440
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "No es pot escriure $fixup_msg"
-#: git-rebase--interactive.sh:434
+#: git-rebase--interactive.sh:443
msgid "This is a combination of 2 commits."
msgstr "Això és una combinació de 2 comissions."
-#: git-rebase--interactive.sh:435
+#: git-rebase--interactive.sh:444
msgid "This is the 1st commit message:"
msgstr "Aquest és el 1er missatge de comissió:"
-#: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518
-#: git-rebase--interactive.sh:521
+#: git-rebase--interactive.sh:484 git-rebase--interactive.sh:527
+#: git-rebase--interactive.sh:530
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "No s'ha pogut aplicar $sha1... $rest"
-#: git-rebase--interactive.sh:549
+#: git-rebase--interactive.sh:558
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
"necessiteu resoldre el problema abans que pugueu canviar el missatge de\n"
"comissió."
-#: git-rebase--interactive.sh:564
+#: git-rebase--interactive.sh:573
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "S'ha aturat a $sha1_abbrev... $rest"
-#: git-rebase--interactive.sh:579
+#: git-rebase--interactive.sh:588
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "No es pot '$squash_style' sense una comissió prèvia"
-#: git-rebase--interactive.sh:621
+#: git-rebase--interactive.sh:630
#, sh-format
msgid "Executing: $rest"
msgstr "S'està executant: $rest"
-#: git-rebase--interactive.sh:629
+#: git-rebase--interactive.sh:638
#, sh-format
msgid "Execution failed: $rest"
msgstr "L'execució ha fallat: $rest"
-#: git-rebase--interactive.sh:631
+#: git-rebase--interactive.sh:640
msgid "and made changes to the index and/or the working tree"
msgstr "i ha fet canvis a l'índex o l'arbre de treball"
-#: git-rebase--interactive.sh:633
+#: git-rebase--interactive.sh:642
msgid ""
"You can fix the problem, and then run\n"
"\n"
"\tgit rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:646
+#: git-rebase--interactive.sh:655
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--interactive.sh:657
+#: git-rebase--interactive.sh:666
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Ordre desconeguda: $command $sha1 $rest"
-#: git-rebase--interactive.sh:658
+#: git-rebase--interactive.sh:667
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "Si us plau, arregleu això usant 'git rebase --edit-todo'."
-#: git-rebase--interactive.sh:693
+#: git-rebase--interactive.sh:702
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "S'ha rebasat i actualitzat $head_name amb èxit."
-#: git-rebase--interactive.sh:740
+#: git-rebase--interactive.sh:749
msgid "Could not skip unnecessary pick commands"
msgstr "No s'ha pogut saltar ordres innecessaris d'elecció"
-#: git-rebase--interactive.sh:898
+#: git-rebase--interactive.sh:907
#, sh-format
msgid ""
"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
"Advertència: manca el SHA-1 o no és una comissió en la línia següent:\n"
" - $line"
-#: git-rebase--interactive.sh:931
+#: git-rebase--interactive.sh:940
#, sh-format
msgid ""
"Warning: the command isn't recognized in the following line:\n"
"Advertència: no es reconeix l'ordre en la línia següent:\n"
" - $line"
-#: git-rebase--interactive.sh:970
+#: git-rebase--interactive.sh:979
msgid "could not detach HEAD"
msgstr "no s'ha pogut separar HEAD"
-#: git-rebase--interactive.sh:1008
+#: git-rebase--interactive.sh:1017
msgid ""
"Warning: some commits may have been dropped accidentally.\n"
"Dropped commits (newer to older):"
"accidentalment.\n"
"Les comissions descartades (més nova a més vella):"
-#: git-rebase--interactive.sh:1016
+#: git-rebase--interactive.sh:1025
msgid ""
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
"\n"
"d'advertències.\n"
"Els comportaments possibles són: ignore, warn, error."
-#: git-rebase--interactive.sh:1027
+#: git-rebase--interactive.sh:1036
#, sh-format
msgid ""
"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
"No s'ha reconegut l'ajust $check_level per a l'opció rebase."
"missingCommitsCheck. S'està ignorant."
-#: git-rebase--interactive.sh:1044
-msgid "You can fix this with 'git rebase --edit-todo'."
-msgstr "Podeu arreglar això amb 'git rebase --edit-todo'."
+#: git-rebase--interactive.sh:1053
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'."
+msgstr ""
+"Podeu arreglar això amb 'git rebase --edit-todo' i desprès 'git rebase --"
+"continue'."
-#: git-rebase--interactive.sh:1045
+#: git-rebase--interactive.sh:1054
msgid "Or you can abort the rebase with 'git rebase --abort'."
msgstr "O podeu avortar el rebasament amb 'git rebase --abort'."
-#: git-rebase--interactive.sh:1069
+#: git-rebase--interactive.sh:1078
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD"
-#: git-rebase--interactive.sh:1074
+#: git-rebase--interactive.sh:1083
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
"\n"
" git commit $gpg_sign_opt_quoted\n"
"\n"
-"In both case, once you're done, continue with:\n"
+"In both cases, once you're done, continue with:\n"
"\n"
" git rebase --continue\n"
msgstr ""
"\n"
" git rebase --continue\n"
-#: git-rebase--interactive.sh:1091
+#: git-rebase--interactive.sh:1100
msgid "Error trying to find the author identity to amend commit"
msgstr ""
"Ha hagut un error en intentar trobar la identitat d'autor per a esmenar la "
"comissió"
-#: git-rebase--interactive.sh:1096
+#: git-rebase--interactive.sh:1105
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
"Teniu canvis no comessos en el vostre arbre de treball. Si us plau,\n"
"primer cometeu-los i després executeu 'git rebase --continue' de nou."
-#: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:1110 git-rebase--interactive.sh:1114
msgid "Could not commit staged changes."
msgstr "No s'ha pogut cometre els canvis emmagatzemats."
-#: git-rebase--interactive.sh:1129
+#: git-rebase--interactive.sh:1138
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
"\n"
msgstr ""
"\n"
-"Esteu editant el fitxer de cosses a fer d'un rebasament interactiu en "
-"marxa.\n"
+"Esteu editant el fitxer de coses a fer d'un rebasament interactiu en marxa.\n"
"Per a continuar el rebasament després d'editar, executeu:\n"
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1298
+#: git-rebase--interactive.sh:1146 git-rebase--interactive.sh:1304
msgid "Could not execute editor"
msgstr "No s'ha pogut executar l'editor"
-#: git-rebase--interactive.sh:1145
-msgid "You need to set your committer info first"
-msgstr "Heu de primer establir la vostra informació de cometent"
-
-#: git-rebase--interactive.sh:1153
+#: git-rebase--interactive.sh:1159
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "No s'ha pogut agafar $switch_to"
-#: git-rebase--interactive.sh:1158
+#: git-rebase--interactive.sh:1164
msgid "No HEAD?"
msgstr "No hi ha cap HEAD?"
-#: git-rebase--interactive.sh:1159
+#: git-rebase--interactive.sh:1165
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "No s'ha pogut crear el $state_dir temporal"
-#: git-rebase--interactive.sh:1161
+#: git-rebase--interactive.sh:1167
msgid "Could not mark as interactive"
msgstr "No s'ha pogut marcar com a interactiu"
-#: git-rebase--interactive.sh:1171 git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:1177 git-rebase--interactive.sh:1182
msgid "Could not init rewritten commits"
msgstr "No s'ha pogut iniciar les comissions reescrites"
-#: git-rebase--interactive.sh:1276
+#: git-rebase--interactive.sh:1282
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "Rebasa $shortrevisions sobre $shortonto ($todocount ordre)"
msgstr[1] "Rebasa $shortrevisions sobre $shortonto ($todocount ordres)"
-#: git-rebase--interactive.sh:1281
+#: git-rebase--interactive.sh:1287
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"No obstant, si elimineu tot, s'avortarà el rebasament.\n"
"\n"
-#: git-rebase--interactive.sh:1288
+#: git-rebase--interactive.sh:1294
msgid "Note that empty commits are commented out"
msgstr "Nota que les comissions buides estan comentades"
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "No es pot reescriure branques: Teniu canvis no allistats."
+#: git-sh-setup.sh:226
+msgid "Cannot pull with rebase: You have unstaged changes."
+msgstr "No es pot baixar amb rebasament: Teniu canvis no allistats."
+
#: git-sh-setup.sh:229
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr "No es pot rebasar: El vostre índex conté canvis sense cometre."
+#: git-sh-setup.sh:245
+msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+msgstr ""
+"No es pot baixar amb rebasament: El vostre índex conté canvis sense cometre."
+
#: git-sh-setup.sh:248
#, 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:252
+msgid "Additionally, your index contains uncommitted changes."
+msgstr "Addicionalment, el vostre índex conté canvis sense cometre."
+
#: git-sh-setup.sh:372
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"
+"Heu d'executar aquesta ordre des del nivell superior de l'arbre de treball."
#: git-sh-setup.sh:377
msgid "Unable to determine absolute path of git directory"
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-08-27 23:21+0800\n"
-"PO-Revision-Date: 2015-01-21 15:01+0800\n"
+"POT-Creation-Date: 2016-11-25 22:50+0800\n"
+"PO-Revision-Date: 2016-11-28 18:10+0100\n"
"Last-Translator: Ralf Thielow <ralf.thielow@gmail.com>\n"
"Language-Team: German <>\n"
"Language: de\n"
#: advice.c:83
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."
+msgstr ""
+"Cherry-Picken ist nicht möglich, weil Sie nicht zusammengeführte Dateien "
+"haben."
#: advice.c:85
msgid "Committing is not possible because you have unmerged files."
-msgstr "Committen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
+msgstr ""
+"Committen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
#: advice.c:87
msgid "Merging is not possible because you have unmerged files."
-msgstr "Mergen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
+msgstr ""
+"Mergen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
#: advice.c:89
msgid "Pulling is not possible because you have unmerged files."
-msgstr "Pullen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
+msgstr ""
+"Pullen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
#: advice.c:91
msgid "Reverting is not possible because you have unmerged files."
-msgstr "Reverten ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
+msgstr ""
+"Reverten ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
#: advice.c:93
#, c-format
"weiteren Checkout durchführen.\n"
"\n"
"Wenn Sie einen neuen Branch erstellen möchten, um Ihre erstellten Commits\n"
-"zu behalten, können Sie das (jetzt oder später) durch einen weiteren Checkout\n"
+"zu behalten, können Sie das (jetzt oder später) durch einen weiteren "
+"Checkout\n"
"mit der Option -b tun. Beispiel:\n"
"\n"
" git checkout -b <neuer-Branchname>\n"
"\n"
-#: archive.c:12
-msgid "git archive [<options>] <tree-ish> [<path>...]"
-msgstr "git archive [<Optionen>] <Commit-Referenz> [<Pfad>...]"
+#: apply.c:57
+#, c-format
+msgid "unrecognized whitespace option '%s'"
+msgstr "nicht erkannte Whitespace-Option: '%s'"
-#: archive.c:13
-msgid "git archive --list"
-msgstr "git archive --list"
+#: apply.c:73
+#, c-format
+msgid "unrecognized whitespace ignore option '%s'"
+msgstr "nicht erkannte Option zum Ignorieren von Whitespace: '%s'"
-#: archive.c:14
-msgid ""
-"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
-msgstr ""
-"git archive --remote <Repository> [--exec <Programm>] [<Optionen>] <Commit-"
-"Referenz> [<Pfad>...]"
+#: apply.c:125
+msgid "--reject and --3way cannot be used together."
+msgstr "--reject und --3way können nicht gemeinsam verwendet werden."
-#: archive.c:15
-msgid "git archive --remote <repo> [--exec <cmd>] --list"
-msgstr "git archive --remote <Repository> [--exec <Programm>] --list"
+#: apply.c:127
+msgid "--cached and --3way cannot be used together."
+msgstr "--cached und --3way können nicht gemeinsam verwendet werden."
-#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327
-#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein"
+#: apply.c:130
+msgid "--3way outside a repository"
+msgstr ""
+"Die Option --3way kann nicht außerhalb eines Repositories verwendet werden."
-#: archive.c:429
-msgid "fmt"
-msgstr "Format"
+#: apply.c:141
+msgid "--index outside a repository"
+msgstr ""
+"Die Option --index kann nicht außerhalb eines Repositories verwendet werden."
-#: archive.c:429
-msgid "archive format"
-msgstr "Archivformat"
+#: apply.c:144
+msgid "--cached outside a repository"
+msgstr ""
+"Die Option --cached kann nicht außerhalb eines Repositories verwendet werden."
-#: archive.c:430 builtin/log.c:1422
-msgid "prefix"
-msgstr "Präfix"
+#: apply.c:845
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr "Kann regulären Ausdruck für Zeitstempel %s nicht verarbeiten"
-#: archive.c:431
-msgid "prepend prefix to each pathname in the archive"
-msgstr "einen Präfix vor jeden Pfadnamen in dem Archiv stellen"
+#: apply.c:854
+#, c-format
+msgid "regexec returned %d for input: %s"
+msgstr "Ausführung des regulären Ausdrucks gab %d zurück. Eingabe: %s"
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553 builtin/blame.c:2554
-#: builtin/config.c:59 builtin/fast-export.c:987 builtin/fast-export.c:989
-#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:460
-#: builtin/ls-files.c:463 builtin/notes.c:399 builtin/notes.c:562
-#: builtin/read-tree.c:109 parse-options.h:153
-msgid "file"
-msgstr "Datei"
+#: apply.c:938
+#, c-format
+msgid "unable to find filename in patch at line %d"
+msgstr "Konnte keinen Dateinamen in Zeile %d des Patches finden."
-#: archive.c:433 builtin/archive.c:89
-msgid "write the archive to this file"
-msgstr "das Archiv in diese Datei schreiben"
+#: apply.c:977
+#, 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"
-#: archive.c:435
-msgid "read .gitattributes in working directory"
-msgstr ".gitattributes aus dem Arbeitsverzeichnis lesen"
+#: apply.c:983
+#, 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"
-#: archive.c:436
-msgid "report archived files on stderr"
-msgstr "archivierte Dateien in der Standard-Fehlerausgabe ausgeben"
+#: apply.c:984
+#, 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"
-#: archive.c:437
-msgid "store only"
-msgstr "nur speichern"
+#: apply.c:990
+#, 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"
-#: archive.c:438
-msgid "compress faster"
-msgstr "schneller komprimieren"
+#: apply.c:1488
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recount: unerwartete Zeile: %.*s"
-#: archive.c:446
-msgid "compress better"
-msgstr "besser komprimieren"
+#: apply.c:1557
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s"
-#: archive.c:449
-msgid "list supported archive formats"
-msgstr "unterstützte Archivformate auflisten"
+#: apply.c:1577
+#, 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] ""
+"Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn "
+"%d vorangestellter Teil des Pfades entfernt wird (Zeile %d)"
+msgstr[1] ""
+"Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn "
+"%d vorangestellte Teile des Pfades entfernt werden (Zeile %d)"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
-#: builtin/submodule--helper.c:832
-msgid "repo"
-msgstr "Repository"
+#: apply.c:1589
+#, c-format
+msgid "git diff header lacks filename information (line %d)"
+msgstr "Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen (Zeile %d)"
-#: archive.c:452 builtin/archive.c:91
-msgid "retrieve the archive from remote repository <repo>"
-msgstr "Archiv vom Remote-Repository <Repository> abrufen"
+#: apply.c:1759
+msgid "new file depends on old contents"
+msgstr "neue Datei hängt von alten Inhalten ab"
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483
-msgid "command"
-msgstr "Programm"
+#: apply.c:1761
+msgid "deleted file still has contents"
+msgstr "entfernte Datei hat noch Inhalte"
-#: archive.c:454 builtin/archive.c:93
-msgid "path to the remote git-upload-archive command"
-msgstr "Pfad zum externen \"git-upload-archive\"-Programm"
+#: apply.c:1795
+#, c-format
+msgid "corrupt patch at line %d"
+msgstr "fehlerhafter Patch bei Zeile %d"
-#: archive.c:461
-msgid "Unexpected option --remote"
-msgstr "Unerwartete Option --remote"
+#: apply.c:1832
+#, c-format
+msgid "new file %s depends on old contents"
+msgstr "neue Datei %s hängt von alten Inhalten ab"
-#: archive.c:463
-msgid "Option --exec can only be used together with --remote"
-msgstr "Die Option --exec kann nur zusammen mit --remote verwendet werden."
+#: apply.c:1834
+#, c-format
+msgid "deleted file %s still has contents"
+msgstr "entfernte Datei %s hat noch Inhalte"
-#: archive.c:465
-msgid "Unexpected option --output"
-msgstr "Unerwartete Option --output"
+#: apply.c:1837
+#, c-format
+msgid "** warning: file %s becomes empty but is not deleted"
+msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt."
-#: archive.c:487
+#: apply.c:1984
#, c-format
-msgid "Unknown archive format '%s'"
-msgstr "Unbekanntes Archivformat '%s'"
+msgid "corrupt binary patch at line %d: %.*s"
+msgstr "fehlerhafter Binär-Patch bei Zeile %d: %.*s"
-#: archive.c:494
+#: apply.c:2021
#, c-format
-msgid "Argument not supported for format '%s': -%d"
-msgstr "Argument für Format '%s' nicht unterstützt: -%d"
+msgid "unrecognized binary patch at line %d"
+msgstr "nicht erkannter Binär-Patch bei Zeile %d"
-#: attr.c:263
-msgid ""
-"Negative patterns are ignored in git attributes\n"
-"Use '\\!' for literal leading exclamation."
-msgstr ""
-"Verneinende Muster werden in Git-Attributen ignoriert.\n"
-"Benutzen Sie '\\!' für führende Ausrufezeichen."
+#: apply.c:2182
+#, c-format
+msgid "patch with only garbage at line %d"
+msgstr "Patch mit nutzlosen Informationen bei Zeile %d"
-#: bisect.c:441
+#: apply.c:2274
#, c-format
-msgid "Could not open file '%s'"
-msgstr "Konnte Datei '%s' nicht öffnen"
+msgid "unable to read symlink %s"
+msgstr "konnte symbolische Verknüpfung %s nicht lesen"
-#: bisect.c:446
+#: apply.c:2278
#, c-format
-msgid "Badly quoted content in file '%s': %s"
-msgstr "Ungültiger Inhalt bzgl. Anführungsstriche in Datei '%s': %s"
+msgid "unable to open or read %s"
+msgstr "konnte %s nicht öffnen oder lesen"
-#: bisect.c:655
+#: apply.c:2931
#, c-format
-msgid "We cannot bisect more!\n"
-msgstr "Keine binäre Suche mehr möglich!\n"
+msgid "invalid start of line: '%c'"
+msgstr "Ungültiger Zeilenanfang: '%c'"
-#: bisect.c:708
+#: apply.c:3050
#, c-format
-msgid "Not a valid commit name %s"
-msgstr "%s ist kein gültiger Commit-Name"
+msgid "Hunk #%d succeeded at %d (offset %d line)."
+msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
+msgstr[0] "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeile versetzt)"
+msgstr[1] ""
+"Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeilen versetzt)"
-#: bisect.c:732
+#: apply.c:3062
#, c-format
-msgid ""
-"The merge base %s is bad.\n"
-"This means the bug has been fixed between %s and [%s].\n"
-msgstr ""
-"Die Merge-Basis %s ist fehlerhaft.\n"
-"Das bedeutet, der Fehler wurde zwischen %s und [%s] behoben.\n"
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
+msgstr "Kontext reduziert zu (%ld/%ld), um Patch-Bereich bei %d anzuwenden"
-#: bisect.c:737
+#: apply.c:3068
#, c-format
msgid ""
-"The merge base %s is new.\n"
-"The property has changed between %s and [%s].\n"
+"while searching for:\n"
+"%.*s"
msgstr ""
-"Die Merge-Basis %s ist neu.\n"
-"Das bedeutet, die Eigenschaft hat sich zwischen %s und [%s] geändert.\n"
+"bei der Suche nach:\n"
+"%.*s"
-#: bisect.c:742
+#: apply.c:3090
#, c-format
-msgid ""
-"The merge base %s is %s.\n"
-"This means the first '%s' commit is between %s and [%s].\n"
-msgstr ""
-"Die Merge-Basis %s ist %s.\n"
-"Das bedeutet, der erste '%s' Commit befindet sich zwischen %s und [%s]\n"
+msgid "missing binary patch data for '%s'"
+msgstr "keine Daten in Binär-Patch für '%s'"
-#: bisect.c:750
+#: apply.c:3098
#, c-format
-msgid ""
-"Some %s revs are not ancestor of the %s rev.\n"
-"git bisect cannot work properly in this case.\n"
-"Maybe you mistook %s and %s revs?\n"
+msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
-"Manche %s Commits sind keine Vorgänger des %s Commits.\n"
-"git bisect kann in diesem Fall nicht richtig arbeiten.\n"
-"Vielleicht verwechselten Sie %s und %s Commits?\n"
+"kann binären Patch nicht in umgekehrter Reihenfolge anwenden ohne einen\n"
+"umgekehrten Patch-Block auf '%s'"
-#: bisect.c:763
+#: apply.c:3144
+#, 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:3154
#, 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."
+"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
-"Die Merge-Basis zwischen %s und [%s] muss ausgelassen werden.\n"
-"Es kann daher nicht sichergestellt werden, dass sich der\n"
-"erste %s Commit zwischen %s und %s befindet.\n"
-"Es wird dennoch fortgesetzt."
+"der Patch wird angewendet auf '%s' (%s), was nicht den aktuellen Inhalten\n"
+"entspricht"
-#: bisect.c:798
+#: apply.c:3162
#, c-format
-msgid "Bisecting: a merge base must be tested\n"
-msgstr "binäre Suche: eine Merge-Basis muss geprüft werden\n"
+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"
-#: bisect.c:849
+#: apply.c:3180
#, c-format
-msgid "a %s revision is needed"
-msgstr "ein %s Commit wird benötigt"
+msgid "the necessary postimage %s for '%s' cannot be read"
+msgstr "das erforderliche Postimage %s für '%s' kann nicht gelesen werden"
-#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
+#: apply.c:3193
#, c-format
-msgid "could not create file '%s'"
-msgstr "konnte Datei '%s' nicht erstellen"
+msgid "binary patch does not apply to '%s'"
+msgstr "Konnte Binär-Patch nicht auf '%s' anwenden"
-#: bisect.c:917
+#: apply.c:3199
#, c-format
-msgid "could not read file '%s'"
-msgstr "Konnte Datei '%s' nicht lesen"
-
-#: bisect.c:947
-msgid "reading bisect refs failed"
-msgstr "Lesen von Referenzen für binäre Suche fehlgeschlagen"
+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)"
-#: bisect.c:967
+#: apply.c:3220
#, c-format
-msgid "%s was both %s and %s\n"
-msgstr "%s war sowohl %s als auch %s\n"
+msgid "patch failed: %s:%ld"
+msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld"
-#: bisect.c:975
+#: apply.c:3342
#, c-format
-msgid ""
-"No testable commit found.\n"
-"Maybe you started with bad path parameters?\n"
-msgstr ""
-"Kein testbarer Commit gefunden.\n"
-"Vielleicht starteten Sie mit falschen Pfad-Parametern?\n"
+msgid "cannot checkout %s"
+msgstr "kann %s nicht auschecken"
-#: bisect.c:994
+#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248
#, c-format
-msgid "(roughly %d step)"
-msgid_plural "(roughly %d steps)"
-msgstr[0] "(ungefähr %d Schritt)"
-msgstr[1] "(ungefähr %d Schritte)"
+msgid "failed to read %s"
+msgstr "Fehler beim Lesen von %s"
-#. TRANSLATORS: the last %s will be replaced with
-#. "(roughly %d steps)" translation
-#: bisect.c:998
+#: apply.c:3398
#, 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"
+msgid "reading from '%s' beyond a symbolic link"
+msgstr "'%s' ist hinter einer symbolischen Verknüpfung"
-#: branch.c:53
+#: apply.c:3427 apply.c:3667
#, 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"
-"Nachdem Sie die Fehlerursache behoben haben, können Sie\n"
-"die Tracking-Informationen mit\n"
-"\"git branch --set-upstream-to=%s%s%s\"\n"
-"erneut setzen."
+msgid "path %s has been renamed/deleted"
+msgstr "Pfad %s wurde umbenannt/gelöscht"
-#: branch.c:67
+#: apply.c:3510 apply.c:3681
#, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "Branch %s kann nicht sein eigener Upstream-Branch sein."
+msgid "%s: does not exist in index"
+msgstr "%s ist nicht im Index"
-#: branch.c:93
+#: apply.c:3519 apply.c:3689
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+msgid "%s: does not match index"
+msgstr "%s entspricht nicht der Version im Index"
+
+#: apply.c:3554
+msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
-"Branch %s konfiguriert zum Folgen von Remote-Branch %s von %s durch Rebase."
+"Dem Repository fehlt der notwendige Blob, um auf einen 3-Wege-Merge\n"
+"zurückzufallen."
-#: branch.c:94
+#: apply.c:3557
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
-msgstr "Branch %s konfiguriert zum Folgen von Remote-Branch %s von %s."
+msgid "Falling back to three-way merge...\n"
+msgstr "Falle zurück auf 3-Wege-Merge ...\n"
-#: branch.c:98
+#: apply.c:3573 apply.c:3577
#, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
-msgstr "Branch %s konfiguriert zum Folgen von lokalem Branch %s durch Rebase."
+msgid "cannot read the current contents of '%s'"
+msgstr "kann aktuelle Inhalte von '%s' nicht lesen"
-#: branch.c:99
+#: apply.c:3589
#, c-format
-msgid "Branch %s set up to track local branch %s."
-msgstr "Branch %s konfiguriert zum Folgen von lokalem Branch %s."
+msgid "Failed to fall back on three-way merge...\n"
+msgstr "Fehler beim Zurückfallen auf 3-Wege-Merge...\n"
-#: branch.c:104
+#: apply.c:3603
#, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
-msgstr "Branch %s konfiguriert zum Folgen von Remote-Referenz %s durch Rebase."
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr "Patch auf '%s' mit Konflikten angewendet.\n"
-#: branch.c:105
+#: apply.c:3608
#, c-format
-msgid "Branch %s set up to track remote ref %s."
-msgstr "Branch %s konfiguriert zum Folgen von Remote-Referenz %s."
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr "Patch auf '%s' sauber angewendet.\n"
-#: branch.c:109
+#: apply.c:3634
+msgid "removal patch leaves file contents"
+msgstr "Lösch-Patch hinterlässt Dateiinhalte"
+
+#: apply.c:3706
#, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
-msgstr ""
-"Branch %s konfiguriert zum Folgen von lokaler Referenz %s durch Rebase."
+msgid "%s: wrong type"
+msgstr "%s: falscher Typ"
-#: branch.c:110
+#: apply.c:3708
#, c-format
-msgid "Branch %s set up to track local ref %s."
-msgstr "Branch %s konfiguriert zum Folgen von lokaler Referenz %s."
+msgid "%s has type %o, expected %o"
+msgstr "%s ist vom Typ %o, erwartete %o"
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "Konnte Konfiguration zu Upstream-Branch nicht schreiben."
+#: apply.c:3859 apply.c:3861
+#, c-format
+msgid "invalid path '%s'"
+msgstr "Ungültiger Pfad '%s'"
-#: branch.c:156
+#: apply.c:3917
#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr ""
-"Konfiguration zum Folgen von Branch nicht eingerichtet. Referenz %s ist "
-"mehrdeutig."
+msgid "%s: already exists in index"
+msgstr "%s ist bereits bereitgestellt"
-#: branch.c:185
+#: apply.c:3920
#, c-format
-msgid "'%s' is not a valid branch name."
-msgstr "'%s' ist kein gültiger Branchname."
+msgid "%s: already exists in working directory"
+msgstr "%s existiert bereits im Arbeitsverzeichnis"
-#: branch.c:190
+#: apply.c:3940
#, c-format
-msgid "A branch named '%s' already exists."
-msgstr "Branch '%s' existiert bereits."
+msgid "new mode (%o) of %s does not match old mode (%o)"
+msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o)"
-#: branch.c:198
-msgid "Cannot force update the current branch."
-msgstr "Kann Aktualisierung des aktuellen Branches nicht erzwingen."
+#: apply.c:3945
+#, 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"
-#: branch.c:218
+#: apply.c:3965
#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
-msgstr ""
-"Kann Tracking-Informationen nicht einrichten; Startpunkt '%s' ist kein "
-"Branch."
+msgid "affected file '%s' is beyond a symbolic link"
+msgstr "betroffene Datei '%s' ist hinter einer symbolischen Verknüpfung"
-#: branch.c:220
+#: apply.c:3969
#, c-format
-msgid "the requested upstream branch '%s' does not exist"
-msgstr "der angeforderte Upstream-Branch '%s' existiert nicht"
+msgid "%s: patch does not apply"
+msgstr "%s: Patch konnte nicht angewendet werden"
-#: branch.c:222
-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"
-"Falls Sie vorhaben, Ihre Arbeit auf einem bereits existierenden\n"
-"Upstream-Branch aufzubauen, sollten Sie \"git fetch\"\n"
-"ausführen, um diesen abzurufen.\n"
-"\n"
-"Falls Sie vorhaben, einen neuen lokalen Branch zu versenden\n"
-"der seinem externen Gegenstück folgen soll, können Sie\n"
-"\"git push -u\" verwenden, um den Upstream-Branch beim \"push\"\n"
-"zu konfigurieren."
+#: apply.c:3984
+#, c-format
+msgid "Checking patch %s..."
+msgstr "Prüfe Patch %s ..."
-#: branch.c:266
+#: apply.c:4075
#, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "Ungültiger Objekt-Name: '%s'"
+msgid "sha1 information is lacking or useless for submodule %s"
+msgstr "SHA-1 Information fehlt oder ist unbrauchbar für Submodul %s"
-#: branch.c:286
+#: apply.c:4082
#, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "mehrdeutiger Objekt-Name: '%s'"
+msgid "mode change for %s, which is not in current HEAD"
+msgstr "Modusänderung für %s, was sich nicht im aktuellen HEAD befindet"
-#: branch.c:291
+#: apply.c:4085
#, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "Ungültiger Branchpunkt: '%s'"
+msgid "sha1 information is lacking or useless (%s)."
+msgstr "SHA-1 Information fehlt oder ist unbrauchbar (%s)."
-#: branch.c:345
+#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
-msgid "'%s' is already checked out at '%s'"
-msgstr "'%s' ist bereits in '%s' ausgecheckt"
+msgid "make_cache_entry failed for path '%s'"
+msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen"
-#: branch.c:364
+#: apply.c:4094
#, c-format
-msgid "HEAD of working tree %s is not updated"
-msgstr "HEAD des Arbeitsverzeichnisses %s ist nicht aktualisiert."
+msgid "could not add %s to temporary index"
+msgstr "konnte %s nicht zum temporären Index hinzufügen"
-#: bundle.c:34
+#: apply.c:4104
#, c-format
-msgid "'%s' does not look like a v2 bundle file"
-msgstr "'%s' sieht nicht wie eine v2 Paketdatei aus"
+msgid "could not write temporary index to %s"
+msgstr "konnte temporären Index nicht nach %s schreiben"
-#: bundle.c:61
+#: apply.c:4242
#, c-format
-msgid "unrecognized header: %s%s (%d)"
-msgstr "nicht erkannter Kopfbereich: %s%s (%d)"
+msgid "unable to remove %s from index"
+msgstr "konnte %s nicht aus dem Index entfernen"
-#: bundle.c:87 builtin/commit.c:778
+#: apply.c:4277
#, c-format
-msgid "could not open '%s'"
-msgstr "Konnte '%s' nicht öffnen"
+msgid "corrupt patch for submodule %s"
+msgstr "fehlerhafter Patch für Submodul %s"
-#: bundle.c:139
-msgid "Repository lacks these prerequisite commits:"
-msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:"
+#: apply.c:4283
+#, c-format
+msgid "unable to stat newly created file '%s'"
+msgstr "konnte neu erstellte Datei '%s' nicht lesen"
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085
-#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348
-#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901
-#: builtin/merge.c:356 builtin/shortlog.c:170
-msgid "revision walk setup failed"
-msgstr "Einrichtung des Revisionsgangs fehlgeschlagen"
+#: apply.c:4291
+#, 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"
-#: bundle.c:185
+#: apply.c:4297 apply.c:4441
#, c-format
-msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %d refs:"
-msgstr[0] "Das Paket enthält diese Referenz:"
-msgstr[1] "Das Paket enthält diese %d Referenzen:"
+msgid "unable to add cache entry for %s"
+msgstr "kann für %s keinen Eintrag in den Zwischenspeicher hinzufügen"
-#: bundle.c:192
-msgid "The bundle records a complete history."
-msgstr "Das Paket speichert eine komplette Historie."
+#: apply.c:4338
+#, c-format
+msgid "failed to write to '%s'"
+msgstr "Fehler beim Schreiben nach '%s'"
-#: bundle.c:194
+#: apply.c:4342
#, c-format
-msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %d refs:"
-msgstr[0] "Das Paket benötigt diese Referenz:"
-msgstr[1] "Das Paket benötigt diese %d Referenzen:"
+msgid "closing file '%s'"
+msgstr "schließe Datei '%s'"
-#: bundle.c:253
-msgid "Could not spawn pack-objects"
-msgstr "Konnte Paketobjekte nicht erstellen"
+#: apply.c:4412
+#, c-format
+msgid "unable to write file '%s' mode %o"
+msgstr "konnte Datei '%s' mit Modus %o nicht schreiben"
-#: bundle.c:264
-msgid "pack-objects died"
-msgstr "Erstellung der Paketobjekte abgebrochen"
+#: apply.c:4510
+#, c-format
+msgid "Applied patch %s cleanly."
+msgstr "Patch %s sauber angewendet"
-#: bundle.c:304
-msgid "rev-list died"
-msgstr "\"rev-list\" abgebrochen"
+#: apply.c:4518
+msgid "internal error"
+msgstr "interner Fehler"
-#: bundle.c:353
+#: apply.c:4521
#, c-format
-msgid "ref '%s' is excluded by the rev-list options"
-msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen"
+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..."
-#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273
+#: apply.c:4532
#, c-format
-msgid "unrecognized argument: %s"
-msgstr "nicht erkanntes Argument: %s"
-
-#: bundle.c:451
-msgid "Refusing to create empty bundle."
-msgstr "Erstellung eines leeren Pakets zurückgewiesen."
+msgid "truncating .rej filename to %.*s.rej"
+msgstr "Verkürze Name von .rej Datei zu %.*s.rej"
-#: bundle.c:463
+#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989
#, c-format
-msgid "cannot create '%s'"
-msgstr "kann '%s' nicht erstellen"
+msgid "cannot open %s"
+msgstr "kann '%s' nicht öffnen"
-#: bundle.c:491
-msgid "index-pack died"
-msgstr "Erstellung der Paketindexdatei abgebrochen"
+#: apply.c:4554
+#, c-format
+msgid "Hunk #%d applied cleanly."
+msgstr "Patch-Bereich #%d sauber angewendet."
-#: color.c:290
+#: apply.c:4558
#, c-format
-msgid "invalid color value: %.*s"
-msgstr "Ungültiger Farbwert: %.*s"
+msgid "Rejected hunk #%d."
+msgstr "Patch-Block #%d zurückgewiesen."
-#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505
-#: builtin/am.c:2119
+#: apply.c:4668
#, c-format
-msgid "could not parse %s"
-msgstr "konnte %s nicht parsen"
-
-#: commit.c:42
-#, c-format
-msgid "%s %s is not a commit!"
-msgstr "%s %s ist kein Commit!"
+msgid "Skipped patch '%s'."
+msgstr "Patch '%s' ausgelassen."
-#: compat/obstack.c:406 compat/obstack.c:408
-msgid "memory exhausted"
-msgstr "Speicher verbraucht"
+#: apply.c:4676
+msgid "unrecognized input"
+msgstr "nicht erkannte Eingabe"
-#: config.c:516
-#, c-format
-msgid "bad config line %d in blob %s"
-msgstr "Ungültige Konfigurationszeile %d in Blob %s"
+#: apply.c:4695
+msgid "unable to read index file"
+msgstr "Konnte Index-Datei nicht lesen"
-#: config.c:520
+#: apply.c:4833
#, c-format
-msgid "bad config line %d in file %s"
-msgstr "Ungültige Konfigurationszeile %d in Datei %s"
+msgid "can't open patch '%s': %s"
+msgstr "kann Patch '%s' nicht öffnen: %s"
-#: config.c:524
+#: apply.c:4858
#, c-format
-msgid "bad config line %d in standard input"
-msgstr "Ungültige Konfigurationszeile %d in Standard-Eingabe"
+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"
-#: config.c:528
+#: apply.c:4864 apply.c:4879
#, c-format
-msgid "bad config line %d in submodule-blob %s"
-msgstr "Ungültige Konfigurationszeile %d in Submodul-Blob %s"
+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."
-#: config.c:532
+#: apply.c:4872
#, c-format
-msgid "bad config line %d in command line %s"
-msgstr "Ungültige Konfigurationszeile %d in Kommandozeile %s"
+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."
-#: config.c:536
-#, c-format
-msgid "bad config line %d in %s"
-msgstr "Ungültige Konfigurationszeile %d in %s"
+#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431
+msgid "Unable to write new index file"
+msgstr "Konnte neue Index-Datei nicht schreiben."
-#: config.c:655
-msgid "out of range"
-msgstr "Außerhalb des Bereichs"
+#: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
+#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592
+#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947
+msgid "path"
+msgstr "Pfad"
-#: config.c:655
-msgid "invalid unit"
-msgstr "Ungültige Einheit"
+#: apply.c:4920
+msgid "don't apply changes matching the given path"
+msgstr "keine Änderungen im angegebenen Pfad anwenden"
-#: config.c:661
-#, c-format
-msgid "bad numeric config value '%s' for '%s': %s"
-msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s': %s"
+#: apply.c:4923
+msgid "apply changes matching the given path"
+msgstr "Änderungen nur im angegebenen Pfad anwenden"
-#: config.c:666
-#, 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"
+#: apply.c:4925 builtin/am.c:2286
+msgid "num"
+msgstr "Anzahl"
-#: config.c:669
-#, 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"
+#: apply.c:4926
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr ""
+"<Anzahl> vorangestellte Schrägstriche von herkömmlichen Differenzpfaden "
+"entfernen"
-#: config.c:672
-#, 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"
+#: apply.c:4929
+msgid "ignore additions made by the patch"
+msgstr "hinzugefügte Zeilen des Patches ignorieren"
-#: config.c:675
-#, 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"
+#: apply.c:4931
+msgid "instead of applying the patch, output diffstat for the input"
+msgstr ""
+"anstatt der Anwendung des Patches, den \"diffstat\" für die Eingabe "
+"ausgegeben"
-#: config.c:678
-#, 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"
+#: apply.c:4935
+msgid "show number of added and deleted lines in decimal notation"
+msgstr ""
+"die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation anzeigen"
-#: config.c:681
-#, 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"
+#: apply.c:4937
+msgid "instead of applying the patch, output a summary for the input"
+msgstr ""
+"anstatt der Anwendung des Patches, eine Zusammenfassung für die Eingabe "
+"ausgeben"
-#: config.c:768
-#, c-format
-msgid "failed to expand user dir in: '%s'"
-msgstr "Fehler beim Erweitern des Nutzerverzeichnisses in: '%s'"
+#: apply.c:4939
+msgid "instead of applying the patch, see if the patch is applicable"
+msgstr ""
+"anstatt der Anwendung des Patches, zeige ob Patch angewendet werden kann"
-#: config.c:849 config.c:860
-#, c-format
-msgid "bad zlib compression level %d"
-msgstr "ungültiger zlib Komprimierungsgrad %d"
+#: apply.c:4941
+msgid "make sure the patch is applicable to the current index"
+msgstr ""
+"sicherstellen, dass der Patch mit dem aktuellen Index angewendet werden kann"
-#: config.c:978
-#, c-format
-msgid "invalid mode for object creation: %s"
-msgstr "Ungültiger Modus für Objekterstellung: %s"
+#: apply.c:4943
+msgid "apply a patch without touching the working tree"
+msgstr "Patch anwenden, ohne Änderungen im Arbeitsverzeichnis vorzunehmen"
-#: config.c:1312
-msgid "unable to parse command-line config"
+#: apply.c:4945
+msgid "accept a patch that touches outside the working area"
msgstr ""
-"Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen."
+"Patch anwenden, der Änderungen außerhalb des Arbeitsverzeichnisses vornimmt"
-#: config.c:1362
-msgid "unknown error occurred while reading the configuration files"
+#: apply.c:4947
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)"
+
+#: apply.c:4949
+msgid "attempt three-way merge if a patch does not apply"
+msgstr "versuche 3-Wege-Merge, wenn der Patch nicht angewendet werden konnte"
+
+#: apply.c:4951
+msgid "build a temporary index based on embedded index information"
msgstr ""
-"Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf."
+"einen temporären Index, basierend auf den integrierten Index-Informationen, "
+"erstellen"
-#: config.c:1716
-#, c-format
-msgid "unable to parse '%s' from command-line config"
+#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505
+msgid "paths are separated with NUL character"
+msgstr "Pfade sind getrennt durch NUL Zeichen"
+
+#: apply.c:4956
+msgid "ensure at least <n> lines of context match"
msgstr ""
-"Konnte Wert '%s' aus der über die Befehlszeile angegebenen Konfiguration\n"
-"nicht parsen."
+"sicher stellen, dass mindestens <n> Zeilen des Kontextes übereinstimmen"
-#: config.c:1718
-#, c-format
-msgid "bad config variable '%s' in file '%s' at line %d"
-msgstr "ungültige Konfigurationsvariable '%s' in Datei '%s' bei Zeile %d"
+#: apply.c:4957 builtin/am.c:2265
+msgid "action"
+msgstr "Aktion"
-#: config.c:1777
-#, c-format
-msgid "%s has multiple values"
-msgstr "%s hat mehrere Werte"
+#: apply.c:4958
+msgid "detect new or modified lines that have whitespace errors"
+msgstr "neue oder geänderte Zeilen, die Whitespace-Fehler haben, ermitteln"
-#: config.c:2311
-#, c-format
-msgid "could not set '%s' to '%s'"
-msgstr "Konnte '%s' nicht zu '%s' setzen."
+#: apply.c:4961 apply.c:4964
+msgid "ignore changes in whitespace when finding context"
+msgstr "Änderungen im Whitespace bei der Suche des Kontextes ignorieren"
-#: config.c:2313
-#, c-format
-msgid "could not unset '%s'"
-msgstr "Konnte '%s' nicht aufheben."
+#: apply.c:4967
+msgid "apply the patch in reverse"
+msgstr "den Patch in umgekehrter Reihenfolge anwenden"
-#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
-msgid "Checking connectivity"
-msgstr "Prüfe Konnektivität"
+#: apply.c:4969
+msgid "don't expect at least one line of context"
+msgstr "keinen Kontext erwarten"
-#: connected.c:74
-msgid "Could not run 'git rev-list'"
-msgstr "Konnte 'git rev-list' nicht ausführen"
+#: apply.c:4971
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr ""
+"zurückgewiesene Patch-Blöcke in entsprechenden *.rej Dateien hinterlassen"
-#: connected.c:94
-msgid "failed write to rev-list"
-msgstr "Fehler beim Schreiben nach rev-list"
+#: apply.c:4973
+msgid "allow overlapping hunks"
+msgstr "sich überlappende Patch-Blöcke erlauben"
-#: connected.c:101
-msgid "failed to close rev-list's stdin"
-msgstr "Fehler beim Schließen von rev-list's Standard-Eingabe"
+#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19
+#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593
+#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114
+msgid "be verbose"
+msgstr "erweiterte Ausgaben"
-#: date.c:97
-msgid "in the future"
-msgstr "in der Zukunft"
+#: apply.c:4976
+msgid "tolerate incorrectly detected missing new-line at the end of file"
+msgstr "fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende tolerieren"
-#: date.c:103
-#, c-format
-msgid "%lu second ago"
-msgid_plural "%lu seconds ago"
-msgstr[0] "vor %lu Sekunde"
-msgstr[1] "vor %lu Sekunden"
+#: apply.c:4979
+msgid "do not trust the line counts in the hunk headers"
+msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen"
-#: date.c:110
-#, c-format
-msgid "%lu minute ago"
-msgid_plural "%lu minutes ago"
-msgstr[0] "vor %lu Minute"
-msgstr[1] "vor %lu Minuten"
+#: apply.c:4981 builtin/am.c:2274
+msgid "root"
+msgstr "Wurzelverzeichnis"
-#: date.c:117
-#, c-format
-msgid "%lu hour ago"
-msgid_plural "%lu hours ago"
-msgstr[0] "vor %lu Stunde"
-msgstr[1] "vor %lu Stunden"
+#: apply.c:4982
+msgid "prepend <root> to all filenames"
+msgstr "<Wurzelverzeichnis> vor alle Dateinamen stellen"
-#: date.c:124
-#, c-format
-msgid "%lu day ago"
-msgid_plural "%lu days ago"
-msgstr[0] "vor %lu Tag"
-msgstr[1] "vor %lu Tagen"
+#: archive.c:12
+msgid "git archive [<options>] <tree-ish> [<path>...]"
+msgstr "git archive [<Optionen>] <Commit-Referenz> [<Pfad>...]"
-#: date.c:130
-#, c-format
-msgid "%lu week ago"
-msgid_plural "%lu weeks ago"
-msgstr[0] "vor %lu Woche"
-msgstr[1] "vor %lu Wochen"
+#: archive.c:13
+msgid "git archive --list"
+msgstr "git archive --list"
-#: date.c:137
-#, c-format
-msgid "%lu month ago"
-msgid_plural "%lu months ago"
-msgstr[0] "vor %lu Monat"
-msgstr[1] "vor %lu Monaten"
+#: archive.c:14
+msgid ""
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
+msgstr ""
+"git archive --remote <Repository> [--exec <Programm>] [<Optionen>] <Commit-"
+"Referenz> [<Pfad>...]"
-#: date.c:148
+#: archive.c:15
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr "git archive --remote <Repository> [--exec <Programm>] --list"
+
+#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327
#, c-format
-msgid "%lu year"
-msgid_plural "%lu years"
-msgstr[0] "vor %lu Jahr"
-msgstr[1] "vor %lu Jahren"
+msgid "pathspec '%s' did not match any files"
+msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein"
-#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:151
-#, c-format
-msgid "%s, %lu month ago"
-msgid_plural "%s, %lu months ago"
-msgstr[0] "%s, und %lu Monat"
-msgstr[1] "%s, und %lu Monaten"
+#: archive.c:429
+msgid "fmt"
+msgstr "Format"
-#: date.c:156 date.c:161
-#, c-format
-msgid "%lu year ago"
-msgid_plural "%lu years ago"
-msgstr[0] "vor %lu Jahr"
-msgstr[1] "vor %lu Jahren"
+#: archive.c:429
+msgid "archive format"
+msgstr "Archivformat"
-#: diffcore-order.c:24
-#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'."
+#: archive.c:430 builtin/log.c:1429
+msgid "prefix"
+msgstr "Präfix"
-#: diffcore-rename.c:540
-msgid "Performing inexact rename detection"
-msgstr "Führe Erkennung für ungenaue Umbenennung aus"
+#: archive.c:431
+msgid "prepend prefix to each pathname in the archive"
+msgstr "einen Präfix vor jeden Pfadnamen in dem Archiv stellen"
-#: diff.c:116
-#, c-format
-msgid " Failed to parse dirstat cut-off percentage '%s'\n"
-msgstr ""
-" Fehler beim Parsen des abgeschnittenen \"dirstat\" Prozentsatzes '%s'\n"
+#: archive.c:432 builtin/blame.c:2603 builtin/blame.c:2604 builtin/config.c:59
+#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:723
+#: builtin/hash-object.c:101 builtin/ls-files.c:539 builtin/ls-files.c:542
+#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109
+#: parse-options.h:153
+msgid "file"
+msgstr "Datei"
-#: diff.c:121
-#, c-format
-msgid " Unknown dirstat parameter '%s'\n"
-msgstr " Unbekannter \"dirstat\" Parameter '%s'\n"
+#: archive.c:433 builtin/archive.c:89
+msgid "write the archive to this file"
+msgstr "das Archiv in diese Datei schreiben"
-#: diff.c:225
-#, c-format
-msgid "Unknown value for 'diff.submodule' config variable: '%s'"
-msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.dirstat': '%s'"
+#: archive.c:435
+msgid "read .gitattributes in working directory"
+msgstr ".gitattributes aus dem Arbeitsverzeichnis lesen"
-#: diff.c:277
-#, c-format
-msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
-msgstr ""
-"Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n"
-"%s"
+#: archive.c:436
+msgid "report archived files on stderr"
+msgstr "archivierte Dateien in der Standard-Fehlerausgabe ausgeben"
-#: diff.c:3017
-#, c-format
-msgid "external diff died, stopping at %s"
-msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s"
+#: archive.c:437
+msgid "store only"
+msgstr "nur speichern"
-#: diff.c:3415
-msgid "--follow requires exactly one pathspec"
-msgstr "--follow erfordert genau eine Pfadspezifikation"
+#: archive.c:438
+msgid "compress faster"
+msgstr "schneller komprimieren"
-#: diff.c:3578
-#, c-format
-msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
-msgstr ""
-"Fehler beim Parsen des --dirstat/-X Optionsparameters:\n"
-"%s"
+#: archive.c:446
+msgid "compress better"
+msgstr "besser komprimieren"
-#: diff.c:3592
-#, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
-msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'"
+#: archive.c:449
+msgid "list supported archive formats"
+msgstr "unterstützte Archivformate auflisten"
-#: dir.c:1823
-msgid "failed to get kernel name and information"
-msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel"
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
+#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953
+msgid "repo"
+msgstr "Repository"
-#: dir.c:1942
-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."
+#: archive.c:452 builtin/archive.c:91
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "Archiv vom Remote-Repository <Repository> abrufen"
-#: gpg-interface.c:178
-msgid "gpg failed to sign the data"
-msgstr "gpg beim Signieren der Daten fehlgeschlagen"
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
+msgid "command"
+msgstr "Programm"
-#: gpg-interface.c:208
-msgid "could not create temporary file"
-msgstr "konnte temporäre Datei nicht erstellen"
+#: archive.c:454 builtin/archive.c:93
+msgid "path to the remote git-upload-archive command"
+msgstr "Pfad zum externen \"git-upload-archive\"-Programm"
-#: gpg-interface.c:210
-#, c-format
-msgid "failed writing detached signature to '%s'"
-msgstr "Fehler beim Schreiben der losgelösten Signatur nach '%s'"
+#: archive.c:461
+msgid "Unexpected option --remote"
+msgstr "Unerwartete Option --remote"
+
+#: archive.c:463
+msgid "Option --exec can only be used together with --remote"
+msgstr "Die Option --exec kann nur zusammen mit --remote verwendet werden."
+
+#: archive.c:465
+msgid "Unexpected option --output"
+msgstr "Unerwartete Option --output"
-#: grep.c:1792
+#: archive.c:487
#, c-format
-msgid "'%s': unable to read %s"
-msgstr "'%s': konnte %s nicht lesen"
+msgid "Unknown archive format '%s'"
+msgstr "Unbekanntes Archivformat '%s'"
-#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
+#: archive.c:494
#, c-format
-msgid "failed to stat '%s'"
-msgstr "Konnte '%s' nicht lesen"
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Argument für Format '%s' nicht unterstützt: -%d"
+
+#: attr.c:263
+msgid ""
+"Negative patterns are ignored in git attributes\n"
+"Use '\\!' for literal leading exclamation."
+msgstr ""
+"Verneinende Muster werden in Git-Attributen ignoriert.\n"
+"Benutzen Sie '\\!' für führende Ausrufezeichen."
-#: grep.c:1820
+#: bisect.c:441
#, c-format
-msgid "'%s': short read"
-msgstr "'%s': read() zu kurz"
+msgid "Could not open file '%s'"
+msgstr "Konnte Datei '%s' nicht öffnen"
-#: help.c:205
+#: bisect.c:446
#, c-format
-msgid "available git commands in '%s'"
-msgstr "Vorhandene Git-Befehle in '%s'"
+msgid "Badly quoted content in file '%s': %s"
+msgstr "Ungültiger Inhalt bzgl. Anführungsstriche in Datei '%s': %s"
-#: help.c:212
-msgid "git commands available from elsewhere on your $PATH"
-msgstr "Vorhandene Git-Befehle anderswo in Ihrem $PATH"
+#: bisect.c:655
+#, c-format
+msgid "We cannot bisect more!\n"
+msgstr "Keine binäre Suche mehr möglich!\n"
-#: help.c:244
-msgid "These are common Git commands used in various situations:"
-msgstr "Allgemeine Git-Befehle, verwendet in verschiedenen Situationen:"
+#: bisect.c:708
+#, c-format
+msgid "Not a valid commit name %s"
+msgstr "%s ist kein gültiger Commit-Name"
-#: help.c:309
+#: bisect.c:732
#, c-format
msgid ""
-"'%s' appears to be a git command, but we were not\n"
-"able to execute it. Maybe git-%s is broken?"
+"The merge base %s is bad.\n"
+"This means the bug has been fixed between %s and [%s].\n"
msgstr ""
-"'%s' scheint ein git-Befehl zu sein, konnte aber\n"
-"nicht ausgeführt werden. Vielleicht ist git-%s fehlerhaft?"
-
-#: help.c:366
-msgid "Uh oh. Your system reports no Git commands at all."
-msgstr "Uh oh. Keine Git-Befehle auf Ihrem System vorhanden."
+"Die Merge-Basis %s ist fehlerhaft.\n"
+"Das bedeutet, der Fehler wurde zwischen %s und [%s] behoben.\n"
-#: help.c:388
+#: bisect.c:737
#, c-format
msgid ""
-"WARNING: You called a Git command named '%s', which does not exist.\n"
-"Continuing under the assumption that you meant '%s'"
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
msgstr ""
-"Warnung: Sie haben den nicht existierenden Git-Befehl '%s' ausgeführt.\n"
-"Setze fort unter der Annahme, dass Sie '%s' gemeint haben."
-
-#: help.c:393
-#, c-format
-msgid "in %0.1f seconds automatically..."
-msgstr "Automatische Ausführung in %0.1f Sekunden ..."
+"Die Merge-Basis %s ist neu.\n"
+"Das bedeutet, die Eigenschaft hat sich zwischen %s und [%s] geändert.\n"
-#: help.c:400
+#: bisect.c:742
#, 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:404 help.c:470
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?"
+"The merge base %s is %s.\n"
+"This means the first '%s' commit is between %s and [%s].\n"
+msgstr ""
+"Die Merge-Basis %s ist %s.\n"
+"Das bedeutet, der erste '%s' Commit befindet sich zwischen %s und [%s]\n"
-#: help.c:466
+#: bisect.c:750
#, c-format
-msgid "%s: %s - %s"
-msgstr "%s: %s - %s"
+msgid ""
+"Some %s revs are not ancestor of the %s rev.\n"
+"git bisect cannot work properly in this case.\n"
+"Maybe you mistook %s and %s revs?\n"
+msgstr ""
+"Manche %s Commits sind keine Vorgänger des %s Commits.\n"
+"git bisect kann in diesem Fall nicht richtig arbeiten.\n"
+"Vielleicht verwechselten Sie %s und %s Commits?\n"
-#: lockfile.c:152
+#: bisect.c:763
#, 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."
+"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 ""
-"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."
+"Die Merge-Basis zwischen %s und [%s] muss ausgelassen werden.\n"
+"Es kann daher nicht sichergestellt werden, dass sich der\n"
+"erste %s Commit zwischen %s und %s befindet.\n"
+"Es wird dennoch fortgesetzt."
-#: lockfile.c:160
+#: bisect.c:798
#, c-format
-msgid "Unable to create '%s.lock': %s"
-msgstr "Konnte '%s.lock' nicht erstellen: %s"
+msgid "Bisecting: a merge base must be tested\n"
+msgstr "binäre Suche: eine Merge-Basis muss geprüft werden\n"
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "Lesen des Zwischenspeichers fehlgeschlagen"
+#: bisect.c:849
+#, c-format
+msgid "a %s revision is needed"
+msgstr "ein %s Commit wird benötigt"
-#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375
-#: builtin/checkout.c:589 builtin/clone.c:732
-msgid "unable to write new index file"
-msgstr "Konnte neue Index-Datei nicht schreiben."
-
-#: merge-recursive.c:209
-msgid "(bad commit)\n"
-msgstr "(ungültiger Commit)\n"
+#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
+#, c-format
+msgid "could not create file '%s'"
+msgstr "konnte Datei '%s' nicht erstellen"
-#: merge-recursive.c:231
+#: bisect.c:917
#, c-format
-msgid "addinfo_cache failed for path '%s'"
-msgstr "addinfo_cache für Pfad '%s' fehlgeschlagen"
+msgid "could not read file '%s'"
+msgstr "Konnte Datei '%s' nicht lesen"
-#: merge-recursive.c:301
-msgid "error building trees"
-msgstr "Fehler beim Erstellen der \"Tree\"-Objekte"
+#: bisect.c:947
+msgid "reading bisect refs failed"
+msgstr "Lesen von Referenzen für binäre Suche fehlgeschlagen"
-#: merge-recursive.c:720
+#: bisect.c:967
#, c-format
-msgid "failed to create path '%s'%s"
-msgstr "Fehler beim Erstellen des Pfades '%s'%s"
+msgid "%s was both %s and %s\n"
+msgstr "%s war sowohl %s als auch %s\n"
-#: merge-recursive.c:731
+#: bisect.c:975
#, c-format
-msgid "Removing %s to make room for subdirectory\n"
-msgstr "Entferne %s, um Platz für Unterverzeichnis zu schaffen\n"
+msgid ""
+"No testable commit found.\n"
+"Maybe you started with bad path parameters?\n"
+msgstr ""
+"Kein testbarer Commit gefunden.\n"
+"Vielleicht starteten Sie mit falschen Pfad-Parametern?\n"
-#: merge-recursive.c:745 merge-recursive.c:764
-msgid ": perhaps a D/F conflict?"
-msgstr ": vielleicht ein Verzeichnis/Datei-Konflikt?"
+#: bisect.c:994
+#, c-format
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] "(ungefähr %d Schritt)"
+msgstr[1] "(ungefähr %d Schritte)"
-#: merge-recursive.c:754
+#. TRANSLATORS: the last %s will be replaced with
+#. "(roughly %d steps)" translation
+#: bisect.c:998
#, c-format
-msgid "refusing to lose untracked file at '%s'"
-msgstr "verweigere, da unversionierte Dateien in '%s' verloren gehen würden"
+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"
-#: merge-recursive.c:796
+#: branch.c:53
#, c-format
-msgid "cannot read object %s '%s'"
-msgstr "kann Objekt %s '%s' nicht lesen"
+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"
+"Nachdem Sie die Fehlerursache behoben haben, können Sie\n"
+"die Tracking-Informationen mit\n"
+"\"git branch --set-upstream-to=%s%s%s\"\n"
+"erneut setzen."
-#: merge-recursive.c:798
+#: branch.c:67
#, c-format
-msgid "blob expected for %s '%s'"
-msgstr "Blob erwartet für %s '%s'"
+msgid "Not setting branch %s as its own upstream."
+msgstr "Branch %s kann nicht sein eigener Upstream-Branch sein."
-#: merge-recursive.c:822
+#: branch.c:93
#, c-format
-msgid "failed to open '%s': %s"
-msgstr "Fehler beim Öffnen von '%s': %s"
+msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+msgstr ""
+"Branch %s konfiguriert zum Folgen von Remote-Branch %s von %s durch Rebase."
-#: merge-recursive.c:833
+#: branch.c:94
#, c-format
-msgid "failed to symlink '%s': %s"
-msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s': %s"
+msgid "Branch %s set up to track remote branch %s from %s."
+msgstr "Branch %s konfiguriert zum Folgen von Remote-Branch %s von %s."
-#: merge-recursive.c:838
+#: branch.c:98
#, c-format
-msgid "do not know what to do with %06o %s '%s'"
-msgstr "weiß nicht was mit %06o %s '%s' zu machen ist"
+msgid "Branch %s set up to track local branch %s by rebasing."
+msgstr "Branch %s konfiguriert zum Folgen von lokalem Branch %s durch Rebase."
-#: merge-recursive.c:978
-msgid "Failed to execute internal merge"
-msgstr "Fehler bei Ausführung des internen Merges"
+#: branch.c:99
+#, c-format
+msgid "Branch %s set up to track local branch %s."
+msgstr "Branch %s konfiguriert zum Folgen von lokalem Branch %s."
-#: merge-recursive.c:982
+#: branch.c:104
#, c-format
-msgid "Unable to add %s to database"
-msgstr "Konnte %s nicht zur Datenbank hinzufügen"
+msgid "Branch %s set up to track remote ref %s by rebasing."
+msgstr "Branch %s konfiguriert zum Folgen von Remote-Referenz %s durch Rebase."
-#: merge-recursive.c:1081 merge-recursive.c:1095
+#: branch.c:105
#, 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."
+msgid "Branch %s set up to track remote ref %s."
+msgstr "Branch %s konfiguriert zum Folgen von Remote-Referenz %s."
-#: merge-recursive.c:1087 merge-recursive.c:1100
+#: branch.c:109
#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree at %s."
+msgid "Branch %s set up to track local ref %s by rebasing."
msgstr ""
-"KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
-"im Arbeitsbereich bei %s gelassen."
+"Branch %s konfiguriert zum Folgen von lokaler Referenz %s durch Rebase."
-#: merge-recursive.c:1143
-msgid "rename"
-msgstr "umbenennen"
+#: branch.c:110
+#, c-format
+msgid "Branch %s set up to track local ref %s."
+msgstr "Branch %s konfiguriert zum Folgen von lokaler Referenz %s."
-#: merge-recursive.c:1143
-msgid "renamed"
-msgstr "umbenannt"
+#: branch.c:119
+msgid "Unable to write upstream branch configuration"
+msgstr "Konnte Konfiguration zu Upstream-Branch nicht schreiben."
-#: merge-recursive.c:1200
+#: branch.c:156
#, 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"
+msgid "Not tracking: ambiguous information for ref %s"
+msgstr ""
+"Konfiguration zum Folgen von Branch nicht eingerichtet. Referenz %s ist "
+"mehrdeutig."
-#: merge-recursive.c:1225
+#: branch.c:185
#, 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 "'%s' is not a valid branch name."
+msgstr "'%s' ist kein gültiger Branchname."
-#: merge-recursive.c:1230
-msgid " (left unresolved)"
-msgstr " (bleibt unaufgelöst)"
+#: branch.c:190
+#, c-format
+msgid "A branch named '%s' already exists."
+msgstr "Branch '%s' existiert bereits."
-#: merge-recursive.c:1292
+#: branch.c:198
+msgid "Cannot force update the current branch."
+msgstr "Kann Aktualisierung des aktuellen Branches nicht erzwingen."
+
+#: branch.c:218
#, c-format
-msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
+msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
-"KONFLIKT (umbenennen/umbenennen): Benenne um %s->%s in %s. Benenne um %s->%s "
-"in %s"
+"Kann Tracking-Informationen nicht einrichten; Startpunkt '%s' ist kein "
+"Branch."
-#: merge-recursive.c:1325
+#: branch.c:220
#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
-msgstr "Benenne stattdessen %s nach %s und %s nach %s um"
+msgid "the requested upstream branch '%s' does not exist"
+msgstr "der angeforderte Upstream-Branch '%s' existiert nicht"
-#: merge-recursive.c:1531
-#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
+#: branch.c:222
+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 ""
-"KONFLIKT (umbenennen/hinzufügen): Benenne um %s->%s in %s. %s hinzugefügt in "
-"%s"
+"\n"
+"Falls Sie vorhaben, Ihre Arbeit auf einem bereits existierenden\n"
+"Upstream-Branch aufzubauen, sollten Sie \"git fetch\"\n"
+"ausführen, um diesen abzurufen.\n"
+"\n"
+"Falls Sie vorhaben, einen neuen lokalen Branch zu versenden\n"
+"der seinem externen Gegenstück folgen soll, können Sie\n"
+"\"git push -u\" verwenden, um den Upstream-Branch beim \"push\"\n"
+"zu konfigurieren."
-#: merge-recursive.c:1546
+#: branch.c:265
#, c-format
-msgid "Adding merged %s"
-msgstr "Füge zusammengeführte Datei %s hinzu"
+msgid "Not a valid object name: '%s'."
+msgstr "Ungültiger Objekt-Name: '%s'"
-#: merge-recursive.c:1553 merge-recursive.c:1766
+#: branch.c:285
#, c-format
-msgid "Adding as %s instead"
-msgstr "Füge stattdessen als %s hinzu"
+msgid "Ambiguous object name: '%s'."
+msgstr "mehrdeutiger Objekt-Name: '%s'"
-#: merge-recursive.c:1610
+#: branch.c:290
#, c-format
-msgid "cannot read object %s"
-msgstr "kann Objekt %s nicht lesen"
+msgid "Not a valid branch point: '%s'."
+msgstr "Ungültiger Branchpunkt: '%s'"
-#: merge-recursive.c:1613
+#: branch.c:344
#, c-format
-msgid "object %s is not a blob"
-msgstr "Objekt %s ist kein Blob"
-
-#: merge-recursive.c:1666
-msgid "modify"
-msgstr "ändern"
-
-#: merge-recursive.c:1666
-msgid "modified"
-msgstr "geändert"
+msgid "'%s' is already checked out at '%s'"
+msgstr "'%s' ist bereits in '%s' ausgecheckt"
-#: merge-recursive.c:1676
-msgid "content"
-msgstr "Inhalt"
+#: branch.c:363
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "HEAD des Arbeitsverzeichnisses %s ist nicht aktualisiert."
-#: merge-recursive.c:1683
-msgid "add/add"
-msgstr "hinzufügen/hinzufügen"
+#: bundle.c:34
+#, c-format
+msgid "'%s' does not look like a v2 bundle file"
+msgstr "'%s' sieht nicht wie eine v2 Paketdatei aus"
-#: merge-recursive.c:1718
+#: bundle.c:61
#, c-format
-msgid "Skipped %s (merged same as existing)"
-msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)"
+msgid "unrecognized header: %s%s (%d)"
+msgstr "nicht erkannter Kopfbereich: %s%s (%d)"
-#: merge-recursive.c:1732
+#: bundle.c:87 sequencer.c:963 builtin/commit.c:777
#, c-format
-msgid "Auto-merging %s"
-msgstr "automatischer Merge von %s"
+msgid "could not open '%s'"
+msgstr "Konnte '%s' nicht öffnen"
-#: merge-recursive.c:1736 git-submodule.sh:919
-msgid "submodule"
-msgstr "Submodul"
+#: bundle.c:139
+msgid "Repository lacks these prerequisite commits:"
+msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:"
-#: merge-recursive.c:1737
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374
+#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348
+#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
+#: builtin/merge.c:356 builtin/shortlog.c:170
+msgid "revision walk setup failed"
+msgstr "Einrichtung des Revisionsgangs fehlgeschlagen"
+
+#: bundle.c:185
#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "KONFLIKT (%s): Merge-Konflikt in %s"
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %d refs:"
+msgstr[0] "Das Paket enthält diese Referenz:"
+msgstr[1] "Das Paket enthält diese %d Referenzen:"
-#: merge-recursive.c:1831
+#: bundle.c:192
+msgid "The bundle records a complete history."
+msgstr "Das Paket speichert eine komplette Historie."
+
+#: bundle.c:194
#, c-format
-msgid "Removing %s"
-msgstr "Entferne %s"
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %d refs:"
+msgstr[0] "Das Paket benötigt diese Referenz:"
+msgstr[1] "Das Paket benötigt diese %d Referenzen:"
-#: merge-recursive.c:1857
-msgid "file/directory"
-msgstr "Datei/Verzeichnis"
+#: bundle.c:253
+msgid "Could not spawn pack-objects"
+msgstr "Konnte Paketobjekte nicht erstellen"
-#: merge-recursive.c:1863
-msgid "directory/file"
-msgstr "Verzeichnis/Datei"
+#: bundle.c:264
+msgid "pack-objects died"
+msgstr "Erstellung der Paketobjekte abgebrochen"
-#: merge-recursive.c:1868
+#: bundle.c:304
+msgid "rev-list died"
+msgstr "\"rev-list\" abgebrochen"
+
+#: bundle.c:353
#, 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."
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen"
-#: merge-recursive.c:1877
+#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273
#, c-format
-msgid "Adding %s"
-msgstr "Füge %s hinzu"
+msgid "unrecognized argument: %s"
+msgstr "nicht erkanntes Argument: %s"
-#: merge-recursive.c:1914
-msgid "Already up-to-date!"
-msgstr "Bereits aktuell!"
+#: bundle.c:451
+msgid "Refusing to create empty bundle."
+msgstr "Erstellung eines leeren Pakets zurückgewiesen."
-#: merge-recursive.c:1923
+#: bundle.c:463
#, c-format
-msgid "merging of trees %s and %s failed"
-msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen"
+msgid "cannot create '%s'"
+msgstr "kann '%s' nicht erstellen"
-#: merge-recursive.c:2006
-msgid "Merging:"
-msgstr "Merge:"
+#: bundle.c:491
+msgid "index-pack died"
+msgstr "Erstellung der Paketindexdatei abgebrochen"
-#: merge-recursive.c:2019
+#: color.c:290
#, 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:2058
-msgid "merge returned no commit"
-msgstr "Merge hat keinen Commit zurückgegeben"
+msgid "invalid color value: %.*s"
+msgstr "Ungültiger Farbwert: %.*s"
-#: merge-recursive.c:2121
+#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493
+#: builtin/am.c:2127
#, c-format
-msgid "Could not parse object '%s'"
-msgstr "Konnte Objekt '%s' nicht parsen."
+msgid "could not parse %s"
+msgstr "konnte %s nicht parsen"
-#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
-msgid "Unable to write index."
-msgstr "Konnte Index nicht schreiben."
+#: commit.c:42
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s ist kein Commit!"
-#: notes-utils.c:41
-msgid "Cannot commit uninitialized/unreferenced notes tree"
+#: commit.c:1514
+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 ""
-"Kann uninitialisiertes/unreferenzierte Notiz-Verzeichnis nicht committen."
+"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"
-#: notes-utils.c:100
-#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "Ungültiger notes.rewriteMode Wert: '%s'"
+#: compat/obstack.c:406 compat/obstack.c:408
+msgid "memory exhausted"
+msgstr "Speicher verbraucht"
-#: notes-utils.c:110
+#: config.c:516
#, 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/)"
+msgid "bad config line %d in blob %s"
+msgstr "Ungültige Konfigurationszeile %d in Blob %s"
-#. TRANSLATORS: The first %s is the name of the
-#. environment variable, the second %s is its value
-#: notes-utils.c:137
+#: config.c:520
#, c-format
-msgid "Bad %s value: '%s'"
-msgstr "Ungültiger %s Wert: '%s'"
+msgid "bad config line %d in file %s"
+msgstr "Ungültige Konfigurationszeile %d in Datei %s"
-#: object.c:242
+#: config.c:524
#, c-format
-msgid "unable to parse object: %s"
-msgstr "Konnte Objekt '%s' nicht parsen."
-
-#: parse-options.c:572
-msgid "..."
-msgstr "..."
+msgid "bad config line %d in standard input"
+msgstr "Ungültige Konfigurationszeile %d in Standard-Eingabe"
-#: parse-options.c:590
+#: config.c:528
#, c-format
-msgid "usage: %s"
-msgstr "Verwendung: %s"
+msgid "bad config line %d in submodule-blob %s"
+msgstr "Ungültige Konfigurationszeile %d in Submodul-Blob %s"
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation
-#: parse-options.c:594
+#: config.c:532
#, c-format
-msgid " or: %s"
-msgstr " oder: %s"
+msgid "bad config line %d in command line %s"
+msgstr "Ungültige Konfigurationszeile %d in Kommandozeile %s"
-#: parse-options.c:597
+#: config.c:536
#, c-format
-msgid " %s"
-msgstr " %s"
+msgid "bad config line %d in %s"
+msgstr "Ungültige Konfigurationszeile %d in %s"
-#: parse-options.c:631
-msgid "-NUM"
-msgstr "-NUM"
+#: config.c:655
+msgid "out of range"
+msgstr "Außerhalb des Bereichs"
-#: parse-options-cb.c:108
+#: config.c:655
+msgid "invalid unit"
+msgstr "Ungültige Einheit"
+
+#: config.c:661
#, c-format
-msgid "malformed object name '%s'"
-msgstr "fehlerhafter Objekt-Name '%s'"
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s': %s"
-#: path.c:798
+#: config.c:666
#, c-format
-msgid "Could not make %s writable by group"
-msgstr "Konnte Gruppenschreibrecht für %s nicht setzen."
+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"
-#: pathspec.c:133
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+#: config.c:669
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
-"Globale Einstellungen zur Pfadspezifikation 'glob' und 'noglob' sind "
-"inkompatibel."
+"Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Datei %s: %s"
-#: pathspec.c:143
-msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
+#: config.c:672
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
-"Globale Einstellung zur Pfadspezifikation 'literal' ist inkompatibel\n"
-"mit allen anderen Optionen."
-
-#: pathspec.c:177
-msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr "ungültiger Parameter für Pfadspezifikationsangabe 'prefix'"
+"Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Standard-Eingabe: "
+"%s"
-#: pathspec.c:183
+#: config.c:675
#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
-msgstr "ungültige Pfadspezifikationsangabe '%.*s' in '%s'"
+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"
-#: pathspec.c:187
+#: config.c:678
#, c-format
-msgid "Missing ')' at the end of pathspec magic in '%s'"
-msgstr "Fehlendes ')' am Ende der Pfadspezifikationsangabe in '%s'"
+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"
-#: pathspec.c:205
+#: config.c:681
#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "nicht unterstützte Pfadspezifikationsangabe '%c' in '%s'"
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in %s: %s"
-#: pathspec.c:230
+#: config.c:768
#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
-msgstr "%s: 'literal' und 'glob' sind inkompatibel"
+msgid "failed to expand user dir in: '%s'"
+msgstr "Fehler beim Erweitern des Nutzerverzeichnisses in: '%s'"
-#: pathspec.c:241
+#: config.c:852 config.c:863
#, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s: '%s' liegt außerhalb des Repositories"
+msgid "bad zlib compression level %d"
+msgstr "ungültiger zlib Komprimierungsgrad %d"
-#: pathspec.c:291
+#: config.c:978
#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "Pfadspezifikation '%s' befindet sich in Submodul '%.*s'"
+msgid "invalid mode for object creation: %s"
+msgstr "Ungültiger Modus für Objekterstellung: %s"
-#: pathspec.c:353
-#, c-format
-msgid "%s: pathspec magic not supported by this command: %s"
+#: config.c:1312
+msgid "unable to parse command-line config"
msgstr ""
-"%s: Pfadspezifikationsangabe wird von diesem Befehl nicht unterstützt: %s"
-
-#: pathspec.c:433
-#, c-format
-msgid "pathspec '%s' is beyond a symbolic link"
-msgstr "Pfadspezifikation '%s' ist hinter einer symbolischen Verknüpfung"
+"Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen."
-#: pathspec.c:442
-msgid ""
-"There is nothing to exclude from by :(exclude) patterns.\n"
-"Perhaps you forgot to add either ':/' or '.' ?"
+#: config.c:1362
+msgid "unknown error occurred while reading the configuration files"
msgstr ""
-":(exclude) Muster, aber keine anderen Pfadspezifikationen angegeben.\n"
-"Vielleicht haben Sie vergessen entweder ':/' oder '.' hinzuzufügen?"
+"Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf."
-#: pretty.c:973
-msgid "unable to parse --pretty format"
-msgstr "Konnte --pretty Format nicht parsen."
+#: config.c:1716
+#, 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."
-#: progress.c:235
-msgid "done"
-msgstr "Fertig"
+#: config.c:1718
+#, c-format
+msgid "bad config variable '%s' in file '%s' at line %d"
+msgstr "ungültige Konfigurationsvariable '%s' in Datei '%s' bei Zeile %d"
-#: read-cache.c:1281
+#: config.c:1777
+#, c-format
+msgid "%s has multiple values"
+msgstr "%s hat mehrere Werte"
+
+#: config.c:2311
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "Konnte '%s' nicht zu '%s' setzen."
+
+#: config.c:2313
#, c-format
+msgid "could not unset '%s'"
+msgstr "Konnte '%s' nicht aufheben."
+
+#: connect.c:49
+msgid "The remote end hung up upon initial contact"
+msgstr "Die Gegenseite hat sich nach dem erstmaligen Kontakt aufgehangen."
+
+#: connect.c:51
msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
msgstr ""
-"index.version gesetzt, aber Wert ungültig.\n"
-"Verwende Version %i"
+"Konnte nicht vom Remote-Repository lesen.\n"
+"\n"
+"Bitte stellen Sie sicher, dass die korrekten Zugriffsberechtigungen bestehen\n"
+"und das Repository existiert."
+
+#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
+msgid "Checking connectivity"
+msgstr "Prüfe Konnektivität"
+
+#: connected.c:75
+msgid "Could not run 'git rev-list'"
+msgstr "Konnte 'git rev-list' nicht ausführen"
+
+#: connected.c:95
+msgid "failed write to rev-list"
+msgstr "Fehler beim Schreiben nach rev-list"
+
+#: connected.c:102
+msgid "failed to close rev-list's stdin"
+msgstr "Fehler beim Schließen von rev-list's Standard-Eingabe"
-#: read-cache.c:1291
+#: convert.c:201
#, c-format
msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
+"CRLF will be replaced by LF in %s.\n"
+"The file will have its original line endings in your working directory."
msgstr ""
-"GIT_INDEX_VERSION gesetzt, aber Wert ungültig.\n"
-"Verwende Version %i"
+"CRLF wird in %s durch LF ersetzt.\n"
+"Die Datei wird ihre ursprünglichen Zeilenenden im Arbeitsverzeichnis behalten."
-#: refs.c:551 builtin/merge.c:840
+#: convert.c:205
#, c-format
-msgid "Could not open '%s' for writing"
-msgstr "Konnte '%s' nicht zum Schreiben öffnen."
+msgid "CRLF would be replaced by LF in %s."
+msgstr "CRLF würde in %s durch LF ersetzt werden."
-#: refs/files-backend.c:2534
+#: convert.c:211
#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "Konnte Referenz %s nicht entfernen: %s"
+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."
-#: refs/files-backend.c:2537
+#: convert.c:215
#, c-format
-msgid "could not delete references: %s"
-msgstr "Konnte Referenzen nicht entfernen: %s"
+msgid "LF would be replaced by CRLF in %s"
+msgstr "LF würde in %s durch CRLF ersetzt werden."
+
+#: date.c:97
+msgid "in the future"
+msgstr "in der Zukunft"
-#: refs/files-backend.c:2546
+#: date.c:103
#, c-format
-msgid "could not remove reference %s"
-msgstr "Konnte Referenz %s nicht löschen"
+msgid "%lu second ago"
+msgid_plural "%lu seconds ago"
+msgstr[0] "vor %lu Sekunde"
+msgstr[1] "vor %lu Sekunden"
-#: ref-filter.c:55
+#: date.c:110
#, c-format
-msgid "expected format: %%(color:<color>)"
-msgstr "Erwartetes Format: %%(color:<Farbe>)"
+msgid "%lu minute ago"
+msgid_plural "%lu minutes ago"
+msgstr[0] "vor %lu Minute"
+msgstr[1] "vor %lu Minuten"
-#: ref-filter.c:57
+#: date.c:117
#, c-format
-msgid "unrecognized color: %%(color:%s)"
-msgstr "nicht erkannte Farbe: %%(color:%s)"
+msgid "%lu hour ago"
+msgid_plural "%lu hours ago"
+msgstr[0] "vor %lu Stunde"
+msgstr[1] "vor %lu Stunden"
-#: ref-filter.c:71
+#: date.c:124
#, c-format
-msgid "unrecognized format: %%(%s)"
-msgstr "nicht erkanntes Format: %%(%s)"
+msgid "%lu day ago"
+msgid_plural "%lu days ago"
+msgstr[0] "vor %lu Tag"
+msgstr[1] "vor %lu Tagen"
-#: ref-filter.c:77
+#: date.c:130
#, c-format
-msgid "%%(body) does not take arguments"
-msgstr "%%(body) akzeptiert keine Argumente"
+msgid "%lu week ago"
+msgid_plural "%lu weeks ago"
+msgstr[0] "vor %lu Woche"
+msgstr[1] "vor %lu Wochen"
-#: ref-filter.c:84
+#: date.c:137
#, c-format
-msgid "%%(subject) does not take arguments"
-msgstr "%%(subject) akzeptiert keine Argumente"
+msgid "%lu month ago"
+msgid_plural "%lu months ago"
+msgstr[0] "vor %lu Monat"
+msgstr[1] "vor %lu Monaten"
-#: ref-filter.c:101
+#: date.c:148
#, c-format
-msgid "positive value expected contents:lines=%s"
-msgstr "Positiver Wert erwartet contents:lines=%s"
+msgid "%lu year"
+msgid_plural "%lu years"
+msgstr[0] "vor %lu Jahr"
+msgstr[1] "vor %lu Jahren"
-#: ref-filter.c:103
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c:151
#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "nicht erkanntes %%(contents) Argument: %s"
+msgid "%s, %lu month ago"
+msgid_plural "%s, %lu months ago"
+msgstr[0] "%s, und %lu Monat"
+msgstr[1] "%s, und %lu Monaten"
-#: ref-filter.c:113
+#: date.c:156 date.c:161
#, c-format
-msgid "unrecognized %%(objectname) argument: %s"
-msgstr "nicht erkanntes %%(objectname) Argument: %s"
+msgid "%lu year ago"
+msgid_plural "%lu years ago"
+msgstr[0] "vor %lu Jahr"
+msgstr[1] "vor %lu Jahren"
-#: ref-filter.c:135
+#: diffcore-order.c:24
#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
-msgstr "Erwartetes Format: %%(align:<Breite>,<Position>)"
+msgid "failed to read orderfile '%s'"
+msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'."
-#: ref-filter.c:147
+#: diffcore-rename.c:536
+msgid "Performing inexact rename detection"
+msgstr "Führe Erkennung für ungenaue Umbenennung aus"
+
+#: diff.c:62
#, c-format
-msgid "unrecognized position:%s"
-msgstr "nicht erkannte Position:%s"
+msgid "option '%s' requires a value"
+msgstr "Option '%s' erfordert einen Wert."
-#: ref-filter.c:151
+#: diff.c:124
#, c-format
-msgid "unrecognized width:%s"
-msgstr "nicht erkannte Breite:%s"
+msgid " Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr ""
+" Fehler beim Parsen des abgeschnittenen \"dirstat\" Prozentsatzes '%s'\n"
-#: ref-filter.c:157
+#: diff.c:129
#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "nicht erkanntes %%(align) Argument: %s"
+msgid " Unknown dirstat parameter '%s'\n"
+msgstr " Unbekannter \"dirstat\" Parameter '%s'\n"
-#: ref-filter.c:161
+#: diff.c:283
#, c-format
-msgid "positive width expected with the %%(align) atom"
-msgstr "Positive Breitenangabe für %%(align) erwartet"
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.dirstat': '%s'"
-#: ref-filter.c:244
+#: diff.c:346
#, c-format
-msgid "malformed field name: %.*s"
-msgstr "Fehlerhafter Feldname: %.*s"
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+"Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n"
+"%s"
-#: ref-filter.c:270
+#: diff.c:3087
#, c-format
-msgid "unknown field name: %.*s"
-msgstr "Unbekannter Feldname: %.*s"
+msgid "external diff died, stopping at %s"
+msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s"
-#: ref-filter.c:372
+#: diff.c:3412
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+msgstr "--name-only, --name-status, --check und -s schließen sich gegenseitig aus"
+
+#: diff.c:3502
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow erfordert genau eine Pfadspezifikation"
+
+#: diff.c:3665
#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
-msgstr "Format: %%(end) Atom ohne zugehöriges Atom verwendet"
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+"Fehler beim Parsen des --dirstat/-X Optionsparameters:\n"
+"%s"
-#: ref-filter.c:424
+#: diff.c:3679
#, c-format
-msgid "malformed format string %s"
-msgstr "Fehlerhafter Formatierungsstring %s"
+msgid "Failed to parse --submodule option parameter: '%s'"
+msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'"
-#: ref-filter.c:878
-msgid ":strip= requires a positive integer argument"
-msgstr ":strip= erfordert eine positive Ganzzahl als Argument"
+#: diff.c:4700
+msgid "inexact rename detection was skipped due to too many files."
+msgstr ""
+"Ungenaue Erkennung für Umbenennungen wurde aufgrund zu vieler Dateien\n"
+"übersprungen."
-#: ref-filter.c:883
+#: diff.c:4703
+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:4706
#, c-format
-msgid "ref '%s' does not have %ld components to :strip"
-msgstr "Referenz '%s' hat keine %ld Komponenten für :strip"
+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."
-#: ref-filter.c:1046
+#: dir.c:1866
+msgid "failed to get kernel name and information"
+msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel"
+
+#: dir.c:1985
+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."
+
+#: fetch-pack.c:213
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack: erwartete shallow-Liste"
+
+#: fetch-pack.c:225
+msgid "git fetch-pack: expected ACK/NAK, got EOF"
+msgstr "git fetch-pack: ACK/NAK erwartet, EOF bekommen"
+
+#: fetch-pack.c:243
#, c-format
-msgid "unknown %.*s format %s"
-msgstr "Unbekanntes %.*s Format %s"
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack: ACK/NAK erwartet, '%s' bekommen"
-#: ref-filter.c:1066 ref-filter.c:1097
+#: fetch-pack.c:295
+msgid "--stateless-rpc requires multi_ack_detailed"
+msgstr "--stateless-rpc benötigt multi_ack_detailed"
+
+#: fetch-pack.c:381
#, c-format
-msgid "missing object %s for %s"
-msgstr "Objekt %s fehlt für %s"
+msgid "invalid shallow line: %s"
+msgstr "Ungültige shallow-Zeile: %s"
-#: ref-filter.c:1069 ref-filter.c:1100
+#: fetch-pack.c:387
#, c-format
-msgid "parse_object_buffer failed on %s for %s"
-msgstr "parse_object_buffer bei %s für %s fehlgeschlagen"
+msgid "invalid unshallow line: %s"
+msgstr "Ungültige unshallow-Zeile: %s"
-#: ref-filter.c:1311
+#: fetch-pack.c:389
#, c-format
-msgid "malformed object at '%s'"
-msgstr "fehlerhaftes Objekt bei '%s'"
+msgid "object not found: %s"
+msgstr "Objekt nicht gefunden: %s"
-#: ref-filter.c:1373
+#: fetch-pack.c:392
#, c-format
-msgid "ignoring ref with broken name %s"
-msgstr "Ignoriere Referenz mit fehlerhaftem Namen %s"
+msgid "error in object: %s"
+msgstr "Fehler in Objekt: %s"
-#: ref-filter.c:1378
+#: fetch-pack.c:394
#, c-format
-msgid "ignoring broken ref %s"
-msgstr "Ignoriere fehlerhafte Referenz %s"
+msgid "no shallow found: %s"
+msgstr "Kein shallow-Objekt gefunden: %s"
-#: ref-filter.c:1651
+#: fetch-pack.c:397
#, c-format
-msgid "format: %%(end) atom missing"
-msgstr "Format: %%(end) Atom fehlt"
+msgid "expected shallow/unshallow, got %s"
+msgstr "shallow/unshallow erwartet, %s bekommen"
-#: ref-filter.c:1705
+#: fetch-pack.c:436
#, c-format
-msgid "malformed object name %s"
-msgstr "Missgebildeter Objektname %s"
+msgid "got %s %d %s"
+msgstr "%s %d %s bekommen"
-#: remote.c:746
+#: fetch-pack.c:450
#, 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."
+msgid "invalid commit %s"
+msgstr "Ungültiger Commit %s"
-#: remote.c:750
+#: fetch-pack.c:483
+msgid "giving up"
+msgstr "Gebe auf"
+
+#: fetch-pack.c:493 progress.c:235
+msgid "done"
+msgstr "Fertig"
+
+#: fetch-pack.c:505
#, c-format
-msgid "%s usually tracks %s, not %s"
-msgstr "%s folgt üblicherweise %s, nicht %s"
+msgid "got %s (%d) %s"
+msgstr "%s (%d) %s bekommen"
-#: remote.c:754
+#: fetch-pack.c:551
#, c-format
-msgid "%s tracks both %s and %s"
-msgstr "%s folgt sowohl %s als auch %s"
+msgid "Marking %s as complete"
+msgstr "Markiere %s als vollständig"
-#: remote.c:762
-msgid "Internal error"
-msgstr "Interner Fehler"
+#: fetch-pack.c:697
+#, c-format
+msgid "already have %s (%s)"
+msgstr "habe %s (%s) bereits"
-#: remote.c:1677 remote.c:1720
-msgid "HEAD does not point to a branch"
-msgstr "HEAD zeigt auf keinen Branch"
+#: fetch-pack.c:735
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack: Fehler beim Starten des sideband demultiplexer"
-#: remote.c:1686
-#, c-format
-msgid "no such branch: '%s'"
-msgstr "Kein solcher Branch: '%s'"
+#: fetch-pack.c:743
+msgid "protocol error: bad pack header"
+msgstr "Protokollfehler: ungültiger Pack-Header"
-#: remote.c:1689
+#: fetch-pack.c:799
#, c-format
-msgid "no upstream configured for branch '%s'"
-msgstr "Kein Upstream-Branch für Branch '%s' konfiguriert."
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack: konnte %s nicht starten"
-#: remote.c:1695
+#: fetch-pack.c:815
#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
-msgstr "Upstream-Branch '%s' nicht als Remote-Tracking-Branch gespeichert"
+msgid "%s failed"
+msgstr "%s fehlgeschlagen"
-#: remote.c:1710
-#, 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"
+#: fetch-pack.c:817
+msgid "error in sideband demultiplexer"
+msgstr "Fehler in sideband demultiplexer"
-#: remote.c:1725
-#, c-format
-msgid "branch '%s' has no remote for pushing"
-msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
+#: fetch-pack.c:844
+msgid "Server does not support shallow clients"
+msgstr "Server unterstützt keine shallow-Clients"
-#: remote.c:1736
-#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
-msgstr "Push-Refspecs für '%s' beinhalten nicht '%s'"
+#: fetch-pack.c:848
+msgid "Server supports multi_ack_detailed"
+msgstr "Server unterstützt multi_ack_detailed"
-#: remote.c:1749
-msgid "push has no destination (push.default is 'nothing')"
-msgstr "kein Ziel für \"push\" (push.default ist 'nothing')"
+#: fetch-pack.c:851
+msgid "Server supports no-done"
+msgstr "Server unterstützt no-done"
-#: remote.c:1771
-msgid "cannot resolve 'simple' push to a single destination"
-msgstr "kann einzelnes Ziel für \"push\" im Modus 'simple' nicht auflösen"
+#: fetch-pack.c:857
+msgid "Server supports multi_ack"
+msgstr "Server unterstützt multi_ack"
-#: remote.c:2073
-#, 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"
+#: fetch-pack.c:861
+msgid "Server supports side-band-64k"
+msgstr "Server unterstützt side-band-64k"
-#: remote.c:2077
-msgid " (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr " (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n"
+#: fetch-pack.c:865
+msgid "Server supports side-band"
+msgstr "Server unterstützt side-band"
-#: remote.c:2080
-#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
-msgstr "Ihr Branch ist auf dem selben Stand wie '%s'.\n"
+#: fetch-pack.c:869
+msgid "Server supports allow-tip-sha1-in-want"
+msgstr "Server unterstützt allow-tip-sha1-in-want"
-#: remote.c:2084
-#, c-format
-msgid "Your branch is ahead of '%s' by %d commit.\n"
-msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
-msgstr[0] "Ihr Branch ist vor '%s' um %d Commit.\n"
-msgstr[1] "Ihr Branch ist vor '%s' um %d Commits.\n"
+#: fetch-pack.c:873
+msgid "Server supports allow-reachable-sha1-in-want"
+msgstr "Server unterstützt allow-reachable-sha1-in-want"
-#: remote.c:2090
-msgid " (use \"git push\" to publish your local commits)\n"
-msgstr " (benutzen Sie \"git push\", um lokale Commits zu publizieren)\n"
+#: fetch-pack.c:883
+msgid "Server supports ofs-delta"
+msgstr "Server unterstützt ofs-delta"
-#: remote.c:2093
+#: fetch-pack.c:890
#, 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 zu '%s' um %d Commit hinterher, und kann vorgespult werden.\n"
-msgstr[1] ""
-"Ihr Branch ist zu '%s' um %d Commits hinterher, und kann vorgespult werden.\n"
+msgid "Server version is %.*s"
+msgstr "Server-Version ist %.*s"
-#: remote.c:2101
-msgid " (use \"git pull\" to update your local branch)\n"
-msgstr ""
-" (benutzen Sie \"git pull\", um Ihren lokalen Branch zu aktualisieren)\n"
+#: fetch-pack.c:896
+msgid "Server does not support --shallow-since"
+msgstr "Server unterstützt kein --shallow-since"
-#: remote.c:2104
-#, 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"
+#: fetch-pack.c:900
+msgid "Server does not support --shallow-exclude"
+msgstr "Server unterstützt kein --shallow-exclude"
-#: remote.c:2114
-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"
+#: fetch-pack.c:902
+msgid "Server does not support --deepen"
+msgstr "Server unterstützt kein --deepen"
-#: revision.c:2132
-msgid "your current branch appears to be broken"
-msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein."
+#: fetch-pack.c:913
+msgid "no common commits"
+msgstr "keine gemeinsamen Commits"
-#: revision.c:2135
-#, c-format
-msgid "your current branch '%s' does not have any commits yet"
-msgstr "Ihr aktueller Branch '%s' hat noch keine Commits."
+#: fetch-pack.c:925
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack: Abholen fehlgeschlagen."
-#: revision.c:2329
-msgid "--first-parent is incompatible with --bisect"
-msgstr "Die Optionen --first-parent und --bisect sind inkompatibel."
+#: fetch-pack.c:1087
+msgid "no matching remote head"
+msgstr "kein übereinstimmender Remote-Branch"
-#: run-command.c:92
-msgid "open /dev/null failed"
-msgstr "Öffnen von /dev/null fehlgeschlagen"
+#: gpg-interface.c:185
+msgid "gpg failed to sign the data"
+msgstr "gpg beim Signieren der Daten fehlgeschlagen"
+
+#: gpg-interface.c:215
+msgid "could not create temporary file"
+msgstr "konnte temporäre Datei nicht erstellen"
-#: run-command.c:94
+#: gpg-interface.c:217
#, c-format
-msgid "dup2(%d,%d) failed"
-msgstr "dup2(%d,%d) fehlgeschlagen"
+msgid "failed writing detached signature to '%s'"
+msgstr "Fehler beim Schreiben der losgelösten Signatur nach '%s'"
-#: send-pack.c:298
-msgid "failed to sign the push certificate"
-msgstr "Fehler beim Signieren des \"push\"-Zertifikates"
+#: grep.c:1782
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr "'%s': konnte %s nicht lesen"
-#: send-pack.c:411
-msgid "the receiving end does not support --signed push"
-msgstr ""
-"die Gegenseite unterstützt keinen signierten Versand (\"--signed push\")"
+#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155
+#, c-format
+msgid "failed to stat '%s'"
+msgstr "Konnte '%s' nicht lesen"
-#: send-pack.c:413
-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"
+#: grep.c:1810
+#, c-format
+msgid "'%s': short read"
+msgstr "'%s': read() zu kurz"
-#: send-pack.c:425
-msgid "the receiving end does not support --atomic push"
-msgstr "die Gegenseite unterstützt keinen atomaren Versand (\"--atomic push\")"
+#: help.c:203
+#, c-format
+msgid "available git commands in '%s'"
+msgstr "Vorhandene Git-Befehle in '%s'"
-#: send-pack.c:430
-msgid "the receiving end does not support push options"
-msgstr "die Gegenseite unterstützt keine Push-Optionen"
+#: help.c:210
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "Vorhandene Git-Befehle anderswo in Ihrem $PATH"
+
+#: help.c:241
+msgid "These are common Git commands used in various situations:"
+msgstr "Allgemeine Git-Befehle, verwendet in verschiedenen Situationen:"
-#: sequencer.c:174
+#: help.c:306
+#, c-format
msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
msgstr ""
-"nach Auflösung der Konflikte, markieren Sie die korrigierten Pfade\n"
-"mit 'git add <Pfade>' oder 'git rm <Pfade>'"
+"'%s' scheint ein git-Befehl zu sein, konnte aber\n"
+"nicht ausgeführt werden. Vielleicht ist git-%s fehlerhaft?"
+
+#: help.c:361
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "Uh oh. Keine Git-Befehle auf Ihrem System vorhanden."
-#: sequencer.c:177
+#: help.c:383
+#, c-format
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'"
+"WARNING: You called a Git command named '%s', which does not exist.\n"
+"Continuing under the assumption that you meant '%s'"
msgstr ""
-"nach Auflösung der Konflikte, markieren Sie die korrigierten Pfade\n"
-"mit 'git add <Pfade>' oder 'git rm <Pfade>'und tragen Sie das Ergebnis mit\n"
-"'git commit' ein"
+"Warnung: Sie haben den nicht existierenden Git-Befehl '%s' ausgeführt.\n"
+"Setze fort unter der Annahme, dass Sie '%s' gemeint haben."
-#: sequencer.c:190 sequencer.c:841 sequencer.c:924
+#: help.c:388
#, c-format
-msgid "Could not write to %s"
-msgstr "Konnte nicht nach %s schreiben"
+msgid "in %0.1f seconds automatically..."
+msgstr "Automatische Ausführung in %0.1f Sekunden ..."
-#: sequencer.c:193 sequencer.c:843 sequencer.c:928
+#: help.c:395
#, c-format
-msgid "Error wrapping up %s."
-msgstr "Fehler beim Einpacken von %s."
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git: '%s' ist kein Git-Befehl. Siehe 'git --help'."
-#: sequencer.c:208
-msgid "Your local changes would be overwritten by cherry-pick."
-msgstr ""
-"Ihre lokalen Änderungen würden durch den Cherry-Pick überschrieben werden."
+#: help.c:399 help.c:465
+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?"
-#: sequencer.c:210
-msgid "Your local changes would be overwritten by revert."
-msgstr "Ihre lokalen Änderungen würden durch den Revert überschrieben werden."
+#: help.c:461
+#, c-format
+msgid "%s: %s - %s"
+msgstr "%s: %s - %s"
-#: sequencer.c:213
-msgid "Commit your changes or stash them to proceed."
+#: ident.c:334
+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 ""
-"Committen Sie Ihre Änderungen oder benutzen Sie \"stash\", um fortzufahren."
+"\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"
-#: sequencer.c:228
+#: lockfile.c:152
#, c-format
-msgid "%s: fast-forward"
-msgstr "%s: Vorspulen"
+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."
-#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:303
+#: lockfile.c:160
#, c-format
-msgid "%s: Unable to write new index file"
-msgstr "%s: Konnte neue Index-Datei nicht schreiben"
+msgid "Unable to create '%s.lock': %s"
+msgstr "Konnte '%s.lock' nicht erstellen: %s"
-#: sequencer.c:321
-msgid "Could not resolve HEAD commit\n"
-msgstr "Konnte Commit von HEAD nicht auflösen\n"
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "Lesen des Zwischenspeichers fehlgeschlagen"
-#: sequencer.c:341
-msgid "Unable to update cache tree\n"
-msgstr "Konnte Cache-Verzeichnis nicht aktualisieren\n"
+#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374
+#: builtin/checkout.c:588 builtin/clone.c:731
+msgid "unable to write new index file"
+msgstr "Konnte neue Index-Datei nicht schreiben."
-#: sequencer.c:393
-#, c-format
-msgid "Could not parse commit %s\n"
-msgstr "Konnte Commit %s nicht parsen\n"
+#: merge-recursive.c:209
+msgid "(bad commit)\n"
+msgstr "(ungültiger Commit)\n"
-#: sequencer.c:398
+#: merge-recursive.c:231
#, c-format
-msgid "Could not parse parent commit %s\n"
-msgstr "Konnte Eltern-Commit %s nicht parsen\n"
+msgid "addinfo_cache failed for path '%s'"
+msgstr "addinfo_cache für Pfad '%s' fehlgeschlagen"
-#: sequencer.c:463
-msgid "Your index file is unmerged."
-msgstr "Ihre Index-Datei ist nicht zusammengeführt."
+#: merge-recursive.c:301
+msgid "error building trees"
+msgstr "Fehler beim Erstellen der \"Tree\"-Objekte"
-#: sequencer.c:482
+#: merge-recursive.c:720
#, 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."
+msgid "failed to create path '%s'%s"
+msgstr "Fehler beim Erstellen des Pfades '%s'%s"
-#: sequencer.c:490
+#: merge-recursive.c:731
#, c-format
-msgid "Commit %s does not have parent %d"
-msgstr "Commit %s hat keinen Elternteil %d"
+msgid "Removing %s to make room for subdirectory\n"
+msgstr "Entferne %s, um Platz für Unterverzeichnis zu schaffen\n"
-#: sequencer.c:494
-#, c-format
-msgid "Mainline was specified but commit %s is not a merge."
-msgstr "Hauptlinie wurde spezifiziert, aber Commit %s ist kein Merge."
+#: merge-recursive.c:745 merge-recursive.c:764
+msgid ": perhaps a D/F conflict?"
+msgstr ": vielleicht ein Verzeichnis/Datei-Konflikt?"
-#. TRANSLATORS: The first %s will be "revert" or
-#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:507
+#: merge-recursive.c:754
#, c-format
-msgid "%s: cannot parse parent commit %s"
-msgstr "%s: kann Eltern-Commit %s nicht parsen"
+msgid "refusing to lose untracked file at '%s'"
+msgstr "verweigere, da unversionierte Dateien in '%s' verloren gehen würden"
-#: sequencer.c:511
+#: merge-recursive.c:796 builtin/cat-file.c:34
#, c-format
-msgid "Cannot get commit message for %s"
-msgstr "Kann keine Commit-Beschreibung für %s bekommen"
-
-#: sequencer.c:597
-#, c-format
-msgid "could not revert %s... %s"
-msgstr "Konnte \"revert\" nicht auf %s... (%s) ausführen"
+msgid "cannot read object %s '%s'"
+msgstr "kann Objekt %s '%s' nicht lesen"
-#: sequencer.c:598
+#: merge-recursive.c:798
#, c-format
-msgid "could not apply %s... %s"
-msgstr "Konnte %s... (%s) nicht anwenden"
-
-#: sequencer.c:633
-msgid "empty commit set passed"
-msgstr "leere Menge von Commits übergeben"
+msgid "blob expected for %s '%s'"
+msgstr "Blob erwartet für %s '%s'"
-#: sequencer.c:641
+#: merge-recursive.c:822
#, c-format
-msgid "git %s: failed to read the index"
-msgstr "git %s: Fehler beim Lesen des Index"
+msgid "failed to open '%s': %s"
+msgstr "Fehler beim Öffnen von '%s': %s"
-#: sequencer.c:645
+#: merge-recursive.c:833
#, c-format
-msgid "git %s: failed to refresh the index"
-msgstr "git %s: Fehler beim Aktualisieren des Index"
+msgid "failed to symlink '%s': %s"
+msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s': %s"
-#: sequencer.c:705
-msgid "Cannot revert during another revert."
-msgstr "Kann Revert nicht während eines anderen Reverts ausführen."
+#: merge-recursive.c:838
+#, c-format
+msgid "do not know what to do with %06o %s '%s'"
+msgstr "weiß nicht was mit %06o %s '%s' zu machen ist"
-#: sequencer.c:706
-msgid "Cannot revert during a cherry-pick."
-msgstr "Kann Revert nicht während eines Cherry-Picks ausführen."
+#: merge-recursive.c:978
+msgid "Failed to execute internal merge"
+msgstr "Fehler bei Ausführung des internen Merges"
-#: sequencer.c:709
-msgid "Cannot cherry-pick during a revert."
-msgstr "Kann Cherry-Pick nicht während eines Reverts ausführen."
+#: merge-recursive.c:982
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "Konnte %s nicht zur Datenbank hinzufügen"
-#: sequencer.c:710
-msgid "Cannot cherry-pick during another cherry-pick."
-msgstr "Kann Cherry-Pick nicht während eines anderen Cherry-Picks ausführen."
+#: merge-recursive.c:1081 merge-recursive.c:1095
+#, 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."
-#: sequencer.c:732
+#: merge-recursive.c:1087 merge-recursive.c:1100
#, c-format
-msgid "Could not parse line %d."
-msgstr "Konnte Zeile %d nicht parsen."
+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."
-#: sequencer.c:737
-msgid "No commits parsed."
-msgstr "Keine Commits geparst."
+#: merge-recursive.c:1143
+msgid "rename"
+msgstr "umbenennen"
-#: sequencer.c:749
+#: merge-recursive.c:1143
+msgid "renamed"
+msgstr "umbenannt"
+
+#: merge-recursive.c:1200
#, c-format
-msgid "Could not open %s"
-msgstr "Konnte %s nicht öffnen"
+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"
-#: sequencer.c:753
+#: merge-recursive.c:1225
#, c-format
-msgid "Could not read %s."
-msgstr "Konnte %s nicht lesen."
+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:1230
+msgid " (left unresolved)"
+msgstr " (bleibt unaufgelöst)"
-#: sequencer.c:760
+#: merge-recursive.c:1292
#, c-format
-msgid "Unusable instruction sheet: %s"
-msgstr "Unbenutzbares Instruktionsblatt: %s"
+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"
-#: sequencer.c:790
+#: merge-recursive.c:1325
#, c-format
-msgid "Invalid key: %s"
-msgstr "Ungültiger Schlüssel: %s"
+msgid "Renaming %s to %s and %s to %s instead"
+msgstr "Benenne stattdessen %s nach %s und %s nach %s um"
-#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52
+#: merge-recursive.c:1531
#, c-format
-msgid "Invalid value for %s: %s"
-msgstr "Ungültiger Wert für %s: %s"
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
+msgstr ""
+"KONFLIKT (umbenennen/hinzufügen): Benenne um %s->%s in %s. %s hinzugefügt in "
+"%s"
-#: sequencer.c:803
+#: merge-recursive.c:1546
#, c-format
-msgid "Malformed options sheet: %s"
-msgstr "Fehlerhaftes Optionsblatt: %s"
+msgid "Adding merged %s"
+msgstr "Füge zusammengeführte Datei %s hinzu"
-#: sequencer.c:822
-msgid "a cherry-pick or revert is already in progress"
-msgstr "\"cherry-pick\" oder \"revert\" ist bereits im Gang"
+#: merge-recursive.c:1553 merge-recursive.c:1766
+#, c-format
+msgid "Adding as %s instead"
+msgstr "Füge stattdessen als %s hinzu"
-#: sequencer.c:823
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
-msgstr "versuchen Sie \"git cherry-pick (--continue | --quit | --abort)\""
+#: merge-recursive.c:1610
+#, c-format
+msgid "cannot read object %s"
+msgstr "kann Objekt %s nicht lesen"
-#: sequencer.c:827
+#: merge-recursive.c:1613
#, c-format
-msgid "Could not create sequencer directory %s"
-msgstr "Konnte \"sequencer\"-Verzeichnis %s nicht erstellen"
+msgid "object %s is not a blob"
+msgstr "Objekt %s ist kein Blob"
-#: sequencer.c:862 sequencer.c:998
-msgid "no cherry-pick or revert in progress"
-msgstr "kein \"cherry-pick\" oder \"revert\" im Gang"
+#: merge-recursive.c:1666
+msgid "modify"
+msgstr "ändern"
-#: sequencer.c:864
-msgid "cannot resolve HEAD"
-msgstr "kann HEAD nicht auflösen"
+#: merge-recursive.c:1666
+msgid "modified"
+msgstr "geändert"
-#: sequencer.c:866 sequencer.c:900
-msgid "cannot abort from a branch yet to be born"
-msgstr "kann nicht abbrechen: bin auf einem Branch, der noch geboren wird"
+#: merge-recursive.c:1676
+msgid "content"
+msgstr "Inhalt"
-#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970
-#, c-format
-msgid "cannot open %s"
-msgstr "kann '%s' nicht öffnen"
+#: merge-recursive.c:1683
+msgid "add/add"
+msgstr "hinzufügen/hinzufügen"
-#: sequencer.c:888
+#: merge-recursive.c:1718
#, c-format
-msgid "cannot read %s: %s"
-msgstr "Kann %s nicht lesen: %s"
-
-#: sequencer.c:889
-msgid "unexpected end of file"
-msgstr "Unerwartetes Dateiende"
+msgid "Skipped %s (merged same as existing)"
+msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)"
-#: sequencer.c:895
+#: merge-recursive.c:1732
#, c-format
-msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
-msgstr "gespeicherte \"pre-cherry-pick\" HEAD Datei '%s' ist beschädigt"
+msgid "Auto-merging %s"
+msgstr "automatischer Merge von %s"
-#: sequencer.c:921
-#, c-format
-msgid "Could not format %s."
-msgstr "Konnte %s nicht formatieren."
+#: merge-recursive.c:1736 git-submodule.sh:924
+msgid "submodule"
+msgstr "Submodul"
-#: sequencer.c:1066
+#: merge-recursive.c:1737
#, c-format
-msgid "%s: can't cherry-pick a %s"
-msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden"
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "KONFLIKT (%s): Merge-Konflikt in %s"
-#: sequencer.c:1069
+#: merge-recursive.c:1831
#, c-format
-msgid "%s: bad revision"
-msgstr "%s: ungültiger Commit"
+msgid "Removing %s"
+msgstr "Entferne %s"
-#: sequencer.c:1102
-msgid "Can't revert as initial commit"
-msgstr "Kann nicht als allerersten Commit einen Revert ausführen."
+#: merge-recursive.c:1857
+msgid "file/directory"
+msgstr "Datei/Verzeichnis"
-#: setup.c:160
-#, 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: kein solcher Pfad im Arbeitsverzeichnis.\n"
-"Benutzen Sie 'git <Befehl> -- <Pfad>...' zur Angabe von Pfaden, die lokal\n"
-"nicht existieren."
+#: merge-recursive.c:1863
+msgid "directory/file"
+msgstr "Verzeichnis/Datei"
-#: setup.c:173
+#: merge-recursive.c:1868
#, 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>...]'"
+msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
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>...]'"
+"KONFLIKT (%s): Es existiert bereits ein Verzeichnis %s in %s. Füge %s als %s "
+"hinzu."
-#: setup.c:223
+#: merge-recursive.c:1877
#, 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 "Adding %s"
+msgstr "Füge %s hinzu"
-#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419
-#, c-format
-msgid "failed to read %s"
-msgstr "Fehler beim Lesen von %s"
+#: merge-recursive.c:1914
+msgid "Already up-to-date!"
+msgstr "Bereits aktuell!"
-#: setup.c:468
+#: merge-recursive.c:1923
#, c-format
-msgid "Expected git repo version <= %d, found %d"
-msgstr "Erwartete Git-Repository-Version <= %d, %d gefunden"
+msgid "merging of trees %s and %s failed"
+msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen"
-#: setup.c:476
-msgid "unknown repository extensions found:"
-msgstr "Unbekannte Repository-Erweiterungen gefunden:"
+#: merge-recursive.c:2006
+msgid "Merging:"
+msgstr "Merge:"
-#: setup.c:762
+#: merge-recursive.c:2019
#, c-format
-msgid "Not a git repository (or any of the parent directories): %s"
-msgstr "Kein Git-Repository (oder irgendein Elternverzeichnis): %s"
+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"
-#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
-msgid "Cannot come back to cwd"
-msgstr "Kann nicht zurück zu Arbeitsverzeichnis wechseln"
+#: merge-recursive.c:2058
+msgid "merge returned no commit"
+msgstr "Merge hat keinen Commit zurückgegeben"
-#: setup.c:845
-msgid "Unable to read current working directory"
-msgstr "Konnte aktuelles Arbeitsverzeichnis nicht lesen."
+#: merge-recursive.c:2121
+#, c-format
+msgid "Could not parse object '%s'"
+msgstr "Konnte Objekt '%s' nicht parsen."
-#: setup.c:920
+#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
+msgid "Unable to write index."
+msgstr "Konnte Index nicht schreiben."
+
+#: notes-merge.c:273
#, 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)."
+"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 ""
-"Kein Git-Repository (oder irgendein Elternverzeichnis bis zum Einhängepunkt %s)\n"
-"Stoppe bei Dateisystemgrenze (GIT_DISCOVERY_ACROSS_FILESYSTEM nicht gesetzt)."
+"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."
-#: setup.c:927
+#: notes-merge.c:280
#, c-format
-msgid "Cannot change to '%s/..'"
-msgstr "Kann nicht in Verzeichnis '%s/..' wechseln"
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "Sie haben Ihren Merge von Notizen nicht abgeschlossen (%s existiert)."
-#: setup.c:989
-#, c-format
-msgid ""
-"Problem with core.sharedRepository filemode value (0%.3o).\n"
-"The owner of files must always have read and write permissions."
+#: notes-utils.c:41
+msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
-"Problem mit Wert für Dateimodus (0%.3o) von core.sharedRepository.\n"
-"Der Besitzer der Dateien muss immer Lese- und Schreibrechte haben."
+"Kann uninitialisiertes/unreferenzierte Notiz-Verzeichnis nicht committen."
-#: sha1_file.c:1046
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)"
-
-#: sha1_file.c:2434
+#: notes-utils.c:100
#, 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?)"
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "Ungültiger notes.rewriteMode Wert: '%s'"
-#: sha1_file.c:2438
+#: notes-utils.c:110
#, 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?)"
-
-#: sha1_name.c:462
-msgid ""
-"Git normally never creates a ref that ends with 40 hex characters\n"
-"because it will be ignored when you just specify 40-hex. These refs\n"
-"may be created by mistake. For example,\n"
-"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
-"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
-msgstr ""
-"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 checkout -b $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."
-
-#: submodule.c:64 submodule.c:98
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr ""
-"Kann nicht zusammengeführte .gitmodules-Datei nicht ändern, lösen\n"
-"Sie zuerst die Konflikte auf"
-
-#: submodule.c:68 submodule.c:102
-#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
-msgstr "Konnte keine Sektion in .gitmodules mit Pfad \"%s\" finden"
+"Umschreiben der Notizen in %s zurückgewiesen (außerhalb von refs/notes/)"
-#: submodule.c:76
+#. TRANSLATORS: The first %s is the name of the
+#. environment variable, the second %s is its value
+#: notes-utils.c:137
#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "Konnte Eintrag '%s' in .gitmodules nicht aktualisieren"
+msgid "Bad %s value: '%s'"
+msgstr "Ungültiger %s Wert: '%s'"
-#: submodule.c:109
+#: object.c:242
#, c-format
-msgid "Could not remove .gitmodules entry for %s"
-msgstr "Konnte Eintrag '%s' nicht aus .gitmodules entfernen"
-
-#: submodule.c:120
-msgid "staging updated .gitmodules failed"
-msgstr "Konnte aktualisierte .gitmodules-Datei nicht zum Commit vormerken"
+msgid "unable to parse object: %s"
+msgstr "Konnte Objekt '%s' nicht parsen."
-#: submodule.c:177
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "Negative Werte für submodule.fetchJobs nicht erlaubt"
+#: parse-options.c:572
+msgid "..."
+msgstr "..."
-#: submodule-config.c:358
+#: parse-options.c:590
#, c-format
-msgid "invalid value for %s"
-msgstr "Ungültiger Wert für %s"
+msgid "usage: %s"
+msgstr "Verwendung: %s"
-#: trailer.c:237
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation
+#: parse-options.c:594
#, c-format
-msgid "running trailer command '%s' failed"
-msgstr "Ausführen des Anhang-Befehls '%s' fehlgeschlagen"
+msgid " or: %s"
+msgstr " oder: %s"
-#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558
-#: trailer.c:562
+#: parse-options.c:597
#, c-format
-msgid "unknown value '%s' for key '%s'"
-msgstr "unbekannter Wert '%s' für Schlüssel %s"
+msgid " %s"
+msgstr " %s"
-#: trailer.c:544 trailer.c:549 builtin/remote.c:289
-#, c-format
-msgid "more than one %s"
-msgstr "mehr als ein %s"
+#: parse-options.c:631
+msgid "-NUM"
+msgstr "-NUM"
-#: trailer.c:582
+#: parse-options-cb.c:108
#, c-format
-msgid "empty trailer token in trailer '%.*s'"
-msgstr "leerer Anhang-Token in Anhang '%.*s'"
+msgid "malformed object name '%s'"
+msgstr "fehlerhafter Objekt-Name '%s'"
-#: trailer.c:702
+#: path.c:826
#, c-format
-msgid "could not read input file '%s'"
-msgstr "Konnte Eingabe-Datei '%s' nicht lesen"
+msgid "Could not make %s writable by group"
+msgstr "Konnte Gruppenschreibrecht für %s nicht setzen."
-#: trailer.c:705
-msgid "could not read from stdin"
-msgstr "konnte nicht von der Standard-Eingabe lesen"
+#: pathspec.c:133
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr ""
+"Globale Einstellungen zur Pfadspezifikation 'glob' und 'noglob' sind "
+"inkompatibel."
-#: trailer.c:857 builtin/am.c:42
-#, c-format
-msgid "could not stat %s"
-msgstr "Konnte '%s' nicht lesen"
+#: pathspec.c:143
+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:177
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "ungültiger Parameter für Pfadspezifikationsangabe 'prefix'"
-#: trailer.c:859
+#: pathspec.c:183
#, c-format
-msgid "file %s is not a regular file"
-msgstr "Datei '%s' ist keine reguläre Datei"
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "ungültige Pfadspezifikationsangabe '%.*s' in '%s'"
-#: trailer.c:861
+#: pathspec.c:187
#, c-format
-msgid "file %s is not writable by user"
-msgstr "Datei %s ist vom Benutzer nicht beschreibbar."
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "Fehlendes ')' am Ende der Pfadspezifikationsangabe in '%s'"
-#: trailer.c:873
-msgid "could not open temporary file"
-msgstr "konnte temporäre Datei '%s' nicht öffnen"
+#: pathspec.c:205
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "nicht unterstützte Pfadspezifikationsangabe '%c' in '%s'"
-#: trailer.c:912
+#: pathspec.c:230
#, c-format
-msgid "could not rename temporary file to %s"
-msgstr "konnte temporäre Datei nicht zu %s umbenennen"
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s: 'literal' und 'glob' sind inkompatibel"
-#: transport.c:62
+#: pathspec.c:241
#, 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"
+msgid "%s: '%s' is outside repository"
+msgstr "%s: '%s' liegt außerhalb des Repositories"
-#: transport.c:151
+#: pathspec.c:291
#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "transport: ungültige --depth Option '%s'"
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "Pfadspezifikation '%s' befindet sich in Submodul '%.*s'"
-#: transport.c:771
+#: pathspec.c:353
#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
+msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
-"Die folgenden Submodul-Pfade enthalten Änderungen, die in keinem\n"
-"Remote-Repository gefunden wurden:\n"
+"%s: Pfadspezifikationsangabe wird von diesem Befehl nicht unterstützt: %s"
-#: transport.c:775
-#, c-format
+#: pathspec.c:408
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"
+"empty strings as pathspecs will be made invalid in upcoming releases. please "
+"use . instead if you meant to match all paths"
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:783
-msgid "Aborting."
-msgstr "Abbruch."
+"Leere Strings als Pfadspezifikationen werden in kommenden Releases ungültig.\n"
+"Bitte benutzen Sie stattdessen . wenn Sie alle Pfade meinen."
-#: transport-helper.c:1041
+#: pathspec.c:440
#, c-format
-msgid "Could not read ref %s"
-msgstr "Konnte Referenz %s nicht lesen."
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "Pfadspezifikation '%s' ist hinter einer symbolischen Verknüpfung"
-#: unpack-trees.c:64
-#, c-format
+#: pathspec.c:449
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."
+"There is nothing to exclude from by :(exclude) patterns.\n"
+"Perhaps you forgot to add either ':/' or '.' ?"
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."
+":(exclude) Muster, aber keine anderen Pfadspezifikationen angegeben.\n"
+"Vielleicht haben Sie vergessen entweder ':/' oder '.' hinzuzufügen?"
-#: unpack-trees.c:66
-#, 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"
+#: pretty.c:971
+msgid "unable to parse --pretty format"
+msgstr "Konnte --pretty Format nicht parsen."
-#: unpack-trees.c:69
+#: read-cache.c:1315
#, 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."
+"index.version set, but the value is invalid.\n"
+"Using version %i"
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."
+"index.version gesetzt, aber Wert ungültig.\n"
+"Verwende Version %i"
-#: unpack-trees.c:71
+#: read-cache.c:1325
#, c-format
msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-"Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge\n"
-"überschrieben werden:\n"
-"%%s"
+"GIT_INDEX_VERSION gesetzt, aber Wert ungültig.\n"
+"Verwende Version %i"
-#: unpack-trees.c:74
+#: refs.c:576 builtin/merge.c:840
#, 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."
+msgid "Could not open '%s' for writing"
+msgstr "Konnte '%s' nicht zum Schreiben öffnen."
-#: unpack-trees.c:76
+#: refs/files-backend.c:2481
#, 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"
+msgid "could not delete reference %s: %s"
+msgstr "Konnte Referenz %s nicht entfernen: %s"
-#: unpack-trees.c:81
+#: refs/files-backend.c:2484
#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in it:\n"
-"%s"
-msgstr ""
-"Durch die Aktualisierung der folgenden Verzeichnisse würden unversionierte\n"
-"Dateien in diesen Verzeichnissen verloren gehen:\n"
-"%s"
+msgid "could not delete references: %s"
+msgstr "Konnte Referenzen nicht entfernen: %s"
-#: unpack-trees.c:85
+#: refs/files-backend.c:2493
#, 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."
+msgid "could not remove reference %s"
+msgstr "Konnte Referenz %s nicht löschen"
-#: unpack-trees.c:87
+#: ref-filter.c:55
#, 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"
+msgid "expected format: %%(color:<color>)"
+msgstr "Erwartetes Format: %%(color:<Farbe>)"
-#: unpack-trees.c:90
+#: ref-filter.c:57
#, 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."
+msgid "unrecognized color: %%(color:%s)"
+msgstr "nicht erkannte Farbe: %%(color:%s)"
-#: unpack-trees.c:92
+#: ref-filter.c:71
#, 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"
+msgid "unrecognized format: %%(%s)"
+msgstr "nicht erkanntes Format: %%(%s)"
-#: unpack-trees.c:95
+#: ref-filter.c:77
#, 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."
+msgid "%%(body) does not take arguments"
+msgstr "%%(body) akzeptiert keine Argumente"
-#: unpack-trees.c:97
+#: ref-filter.c:84
#, 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"
+msgid "%%(subject) does not take arguments"
+msgstr "%%(subject) akzeptiert keine Argumente"
-#: unpack-trees.c:102
+#: ref-filter.c:101
#, 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."
+msgid "positive value expected contents:lines=%s"
+msgstr "Positiver Wert erwartet contents:lines=%s"
-#: unpack-trees.c:104
+#: ref-filter.c:103
#, 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"
+msgid "unrecognized %%(contents) argument: %s"
+msgstr "nicht erkanntes %%(contents) Argument: %s"
-#: unpack-trees.c:107
+#: ref-filter.c:113
#, 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."
+msgid "unrecognized %%(objectname) argument: %s"
+msgstr "nicht erkanntes %%(objectname) Argument: %s"
-#: unpack-trees.c:109
+#: ref-filter.c:135
#, 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"
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "Erwartetes Format: %%(align:<Breite>,<Position>)"
-#: unpack-trees.c:112
+#: ref-filter.c:147
#, 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."
+msgid "unrecognized position:%s"
+msgstr "nicht erkannte Position:%s"
-#: unpack-trees.c:114
+#: ref-filter.c:151
#, 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"
+msgid "unrecognized width:%s"
+msgstr "nicht erkannte Breite:%s"
-#: unpack-trees.c:121
+#: ref-filter.c:157
#, c-format
-msgid "Entry '%s' overlaps with '%s'. Cannot bind."
-msgstr "Eintrag '%s' überschneidet sich mit '%s'. Kann nicht verbinden."
+msgid "unrecognized %%(align) argument: %s"
+msgstr "nicht erkanntes %%(align) Argument: %s"
-#: unpack-trees.c:124
+#: ref-filter.c:161
#, c-format
-msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
-"%s"
-msgstr ""
-"Kann partiellen Checkout nicht aktualisieren: die folgenden Einträge sind "
-"nicht\n"
-"aktuell:\n"
-"%s"
+msgid "positive width expected with the %%(align) atom"
+msgstr "Positive Breitenangabe für %%(align) erwartet"
-#: unpack-trees.c:126
+#: ref-filter.c:244
#, c-format
-msgid ""
-"The following Working tree files would be overwritten by sparse checkout "
-"update:\n"
-"%s"
-msgstr ""
-"Die folgenden Dateien im Arbeitsbereich würden durch die Aktualisierung\n"
-"des partiellen Checkouts überschrieben werden:\n"
-"%s"
+msgid "malformed field name: %.*s"
+msgstr "Fehlerhafter Feldname: %.*s"
-#: unpack-trees.c:128
+#: ref-filter.c:270
#, c-format
-msgid ""
-"The following Working tree files would be removed by sparse checkout "
-"update:\n"
-"%s"
-msgstr ""
-"Die folgenden Dateien im Arbeitsbereich würden durch die Aktualisierung\n"
-"des partiellen Checkouts entfernt werden:\n"
-"%s"
+msgid "unknown field name: %.*s"
+msgstr "Unbekannter Feldname: %.*s"
-#: unpack-trees.c:205
+#: ref-filter.c:372
#, c-format
-msgid "Aborting\n"
-msgstr "Abbruch\n"
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "Format: %%(end) Atom ohne zugehöriges Atom verwendet"
-#: unpack-trees.c:237
-msgid "Checking out files"
-msgstr "Checke Dateien aus"
+#: ref-filter.c:424
+#, c-format
+msgid "malformed format string %s"
+msgstr "Fehlerhafter Formatierungsstring %s"
-#: urlmatch.c:120
-msgid "invalid URL scheme name or missing '://' suffix"
-msgstr "Ungültiges URL-Schema oder Suffix '://' fehlt"
+#: ref-filter.c:878
+msgid ":strip= requires a positive integer argument"
+msgstr ":strip= erfordert eine positive Ganzzahl als Argument"
-#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#: ref-filter.c:883
#, c-format
-msgid "invalid %XX escape sequence"
-msgstr "ungültige Escape-Sequenz %XX"
-
-#: urlmatch.c:172
-msgid "missing host and scheme is not 'file:'"
-msgstr "fehlender Host und Schema ist nicht 'file:'"
+msgid "ref '%s' does not have %ld components to :strip"
+msgstr "Referenz '%s' hat keine %ld Komponenten für :strip"
-#: urlmatch.c:189
-msgid "a 'file:' URL may not have a port number"
-msgstr "eine 'file:' URL darf keine Portnummer enthalten"
+#: ref-filter.c:1046
+#, c-format
+msgid "unknown %.*s format %s"
+msgstr "Unbekanntes %.*s Format %s"
-#: urlmatch.c:199
-msgid "invalid characters in host name"
-msgstr "Hostname enthält ungültige Zeichen"
+#: ref-filter.c:1066 ref-filter.c:1097
+#, c-format
+msgid "missing object %s for %s"
+msgstr "Objekt %s fehlt für %s"
-#: urlmatch.c:244 urlmatch.c:255
-msgid "invalid port number"
-msgstr "ungültige Portnummer"
+#: ref-filter.c:1069 ref-filter.c:1100
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
+msgstr "parse_object_buffer bei %s für %s fehlgeschlagen"
-#: urlmatch.c:322
-msgid "invalid '..' path segment"
-msgstr "ungültiges '..' Pfadsegment"
+#: ref-filter.c:1311
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "fehlerhaftes Objekt bei '%s'"
-#: worktree.c:282
+#: ref-filter.c:1373
#, c-format
-msgid "failed to read '%s'"
-msgstr "Fehler beim Lesen von '%s'"
+msgid "ignoring ref with broken name %s"
+msgstr "Ignoriere Referenz mit fehlerhaftem Namen %s"
-#: wrapper.c:222 wrapper.c:392
+#: ref-filter.c:1378
#, c-format
-msgid "could not open '%s' for reading and writing"
-msgstr "Konnte '%s' nicht zum Lesen und Schreiben öffnen."
+msgid "ignoring broken ref %s"
+msgstr "Ignoriere fehlerhafte Referenz %s"
-#: wrapper.c:224 wrapper.c:394 builtin/am.c:778
+#: ref-filter.c:1633
#, c-format
-msgid "could not open '%s' for writing"
-msgstr "Konnte '%s' nicht zum Schreiben öffnen."
+msgid "format: %%(end) atom missing"
+msgstr "Format: %%(end) Atom fehlt"
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771
-#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029
-#: builtin/pull.c:407
+#: ref-filter.c:1687
#, c-format
-msgid "could not open '%s' for reading"
-msgstr "Konnte '%s' nicht zum Lesen öffnen."
+msgid "malformed object name %s"
+msgstr "Missgebildeter Objektname %s"
-#: wrapper.c:605 wrapper.c:626
+#: remote.c:746
#, c-format
-msgid "unable to access '%s'"
-msgstr "konnte nicht auf '%s' zugreifen"
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "Kann 'fetch' nicht für sowohl %s als auch %s nach %s ausführen."
-#: wrapper.c:634
-msgid "unable to get current working directory"
-msgstr "Konnte aktuelles Arbeitsverzeichnis nicht bekommen."
+#: remote.c:750
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%s folgt üblicherweise %s, nicht %s"
-#: wrapper.c:658
+#: remote.c:754
#, c-format
-msgid "could not write to %s"
-msgstr "Konnte nicht nach '%s' schreiben."
+msgid "%s tracks both %s and %s"
+msgstr "%s folgt sowohl %s als auch %s"
-#: wrapper.c:660
+#: remote.c:762
+msgid "Internal error"
+msgstr "Interner Fehler"
+
+#: remote.c:1677 remote.c:1720
+msgid "HEAD does not point to a branch"
+msgstr "HEAD zeigt auf keinen Branch"
+
+#: remote.c:1686
#, c-format
-msgid "could not close %s"
-msgstr "Konnte '%s' nicht schließen."
+msgid "no such branch: '%s'"
+msgstr "Kein solcher Branch: '%s'"
-#: wt-status.c:150
-msgid "Unmerged paths:"
-msgstr "Nicht zusammengeführte Pfade:"
+#: remote.c:1689
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "Kein Upstream-Branch für Branch '%s' konfiguriert."
-#: wt-status.c:177 wt-status.c:204
+#: remote.c:1695
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr ""
-" (benutzen Sie \"git reset %s <Datei>...\" zum Entfernen aus der Staging-"
-"Area)"
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr "Upstream-Branch '%s' nicht als Remote-Tracking-Branch gespeichert"
-#: wt-status.c:179 wt-status.c:206
-msgid " (use \"git rm --cached <file>...\" to unstage)"
+#: remote.c:1710
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
-" (benutzen Sie \"git rm --cached <Datei>...\" zum Entfernen aus der Staging-"
-"Area)"
+"Ziel für \"push\" '%s' auf Remote-Repository '%s' hat keinen lokal gefolgten "
+"Branch"
-#: wt-status.c:183
-msgid " (use \"git add <file>...\" to mark resolution)"
-msgstr ""
-" (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)"
+#: remote.c:1725
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
-#: wt-status.c:185 wt-status.c:189
-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)"
+#: remote.c:1736
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "Push-Refspecs für '%s' beinhalten nicht '%s'"
-#: wt-status.c:187
-msgid " (use \"git rm <file>...\" to mark resolution)"
+#: remote.c:1749
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "kein Ziel für \"push\" (push.default ist 'nothing')"
+
+#: remote.c:1771
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "kann einzelnes Ziel für \"push\" im Modus 'simple' nicht auflösen"
+
+#: remote.c:2073
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
-" (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)"
+"Ihr Branch basiert auf '%s', aber der Upstream-Branch wurde entfernt.\n"
-#: wt-status.c:198 wt-status.c:882
-msgid "Changes to be committed:"
-msgstr "zum Commit vorgemerkte Änderungen:"
+#: remote.c:2077
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr " (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n"
-#: wt-status.c:216 wt-status.c:891
-msgid "Changes not staged for commit:"
-msgstr "Änderungen, die nicht zum Commit vorgemerkt sind:"
+#: remote.c:2080
+#, c-format
+msgid "Your branch is up-to-date with '%s'.\n"
+msgstr "Ihr Branch ist auf dem selben Stand wie '%s'.\n"
-#: wt-status.c:220
-msgid " (use \"git add <file>...\" to update what will be committed)"
-msgstr ""
-" (benutzen Sie \"git add <Datei>...\", um die Änderungen zum Commit "
-"vorzumerken)"
+#: remote.c:2084
+#, c-format
+msgid "Your branch is ahead of '%s' by %d commit.\n"
+msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
+msgstr[0] "Ihr Branch ist vor '%s' um %d Commit.\n"
+msgstr[1] "Ihr Branch ist vor '%s' um %d Commits.\n"
-#: wt-status.c:222
-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)"
+#: remote.c:2090
+msgid " (use \"git push\" to publish your local commits)\n"
+msgstr " (benutzen Sie \"git push\", um lokale Commits zu publizieren)\n"
-#: wt-status.c:223
-msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
-msgstr ""
-" (benutzen Sie \"git checkout -- <Datei>...\", um die Änderungen im "
-"Arbeitsverzeichnis zu verwerfen)"
+#: remote.c:2093
+#, 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 zu '%s' um %d Commit hinterher, und kann vorgespult werden.\n"
+msgstr[1] ""
+"Ihr Branch ist zu '%s' um %d Commits hinterher, und kann vorgespult werden.\n"
-#: wt-status.c:225
-msgid " (commit or discard the untracked or modified content in submodules)"
+#: remote.c:2101
+msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
-" (committen oder verwerfen Sie den unversionierten oder geänderten Inhalt "
-"in den Submodulen)"
+" (benutzen Sie \"git pull\", um Ihren lokalen Branch zu aktualisieren)\n"
-#: wt-status.c:237
+#: remote.c:2104
#, c-format
-msgid " (use \"git %s <file>...\" to include in what will be committed)"
+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:2114
+msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-" (benutzen Sie \"git %s <Datei>...\", um die Änderungen zum Commit "
-"vorzumerken)"
+" (benutzen Sie \"git pull\", um Ihren Branch mit dem Remote-Branch "
+"zusammenzuführen)\n"
-#: wt-status.c:252
-msgid "both deleted:"
-msgstr "beide gelöscht:"
+#: revision.c:2158
+msgid "your current branch appears to be broken"
+msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein."
-#: wt-status.c:254
-msgid "added by us:"
-msgstr "von uns hinzugefügt:"
+#: revision.c:2161
+#, c-format
+msgid "your current branch '%s' does not have any commits yet"
+msgstr "Ihr aktueller Branch '%s' hat noch keine Commits."
-#: wt-status.c:256
-msgid "deleted by them:"
-msgstr "von denen gelöscht:"
+#: revision.c:2355
+msgid "--first-parent is incompatible with --bisect"
+msgstr "Die Optionen --first-parent und --bisect sind inkompatibel."
-#: wt-status.c:258
-msgid "added by them:"
-msgstr "von denen hinzugefügt:"
+#: run-command.c:106
+msgid "open /dev/null failed"
+msgstr "Öffnen von /dev/null fehlgeschlagen"
-#: wt-status.c:260
-msgid "deleted by us:"
-msgstr "von uns gelöscht:"
+#: run-command.c:108
+#, c-format
+msgid "dup2(%d,%d) failed"
+msgstr "dup2(%d,%d) fehlgeschlagen"
-#: wt-status.c:262
-msgid "both added:"
-msgstr "von beiden hinzugefügt:"
+#: send-pack.c:297
+msgid "failed to sign the push certificate"
+msgstr "Fehler beim Signieren des \"push\"-Zertifikates"
-#: wt-status.c:264
-msgid "both modified:"
-msgstr "von beiden geändert:"
+#: send-pack.c:410
+msgid "the receiving end does not support --signed push"
+msgstr ""
+"die Gegenseite unterstützt keinen signierten Versand (\"--signed push\")"
-#: wt-status.c:274
-msgid "new file:"
-msgstr "neue Datei:"
+#: send-pack.c:412
+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"
-#: wt-status.c:276
-msgid "copied:"
-msgstr "kopiert:"
+#: send-pack.c:424
+msgid "the receiving end does not support --atomic push"
+msgstr "die Gegenseite unterstützt keinen atomaren Versand (\"--atomic push\")"
-#: wt-status.c:278
-msgid "deleted:"
-msgstr "gelöscht:"
+#: send-pack.c:429
+msgid "the receiving end does not support push options"
+msgstr "die Gegenseite unterstützt keine Push-Optionen"
-#: wt-status.c:280
-msgid "modified:"
-msgstr "geändert:"
+#: sequencer.c:171
+msgid "revert"
+msgstr "Revert"
-#: wt-status.c:282
-msgid "renamed:"
-msgstr "umbenannt:"
+#: sequencer.c:171
+msgid "cherry-pick"
+msgstr "Cherry-Pick"
-#: wt-status.c:284
-msgid "typechange:"
-msgstr "Typänderung:"
+#: sequencer.c:228
+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>'"
-#: wt-status.c:286
-msgid "unknown:"
-msgstr "unbekannt:"
+#: sequencer.c:231
+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 ""
+"nach Auflösung der Konflikte, markieren Sie die korrigierten Pfade\n"
+"mit 'git add <Pfade>' oder 'git rm <Pfade>'und tragen Sie das Ergebnis mit\n"
+"'git commit' ein"
-#: wt-status.c:288
-msgid "unmerged:"
-msgstr "nicht gemerged:"
+#: sequencer.c:244 sequencer.c:1209
+#, c-format
+msgid "could not lock '%s'"
+msgstr "Konnte '%s' nicht sperren"
-#: wt-status.c:370
-msgid "new commits, "
-msgstr "neue Commits, "
+#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214
+#, c-format
+msgid "could not write to '%s'"
+msgstr "Konnte nicht nach '%s' schreiben."
-#: wt-status.c:372
-msgid "modified content, "
-msgstr "geänderter Inhalt, "
+#: sequencer.c:251
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr "Konnte EOL nicht nach '%s' schreiben."
-#: wt-status.c:374
-msgid "untracked content, "
-msgstr "unversionierter Inhalt, "
+#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216
+#, c-format
+msgid "failed to finalize '%s'."
+msgstr "Fehler beim Fertigstellen von '%s'."
-#: wt-status.c:756
-msgid "Submodules changed but not updated:"
-msgstr "Submodule geändert, aber nicht aktualisiert:"
+#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032
+#, c-format
+msgid "could not read '%s'"
+msgstr "Konnte '%s' nicht lesen"
-#: wt-status.c:758
-msgid "Submodule changes to be committed:"
-msgstr "Änderungen in Submodul zum Committen:"
+#: sequencer.c:305
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr "Ihre lokalen Änderungen würden durch den %s überschrieben werden."
-#: wt-status.c:839
-msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+#: sequencer.c:309
+msgid "commit your changes or stash them to proceed."
msgstr ""
-"Ändern Sie nicht die obige Zeile.\n"
-"Alles unterhalb von ihr wird entfernt."
+"Committen Sie Ihre Änderungen oder benutzen Sie \"stash\", um fortzufahren."
-#: wt-status.c:950
-msgid "You have unmerged paths."
-msgstr "Sie haben nicht zusammengeführte Pfade."
-
-#: wt-status.c:953
-msgid " (fix conflicts and run \"git commit\")"
-msgstr " (beheben Sie die Konflikte und führen Sie \"git commit\" aus)"
-
-#: wt-status.c:955
-msgid " (use \"git merge --abort\" to abort the merge)"
-msgstr " (benutzen Sie \"git merge --abort\", um den Merge abzubrechen)"
-
-#: wt-status.c:960
-msgid "All conflicts fixed but you are still merging."
-msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge."
+#: sequencer.c:324
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s: Vorspulen"
-#: wt-status.c:963
-msgid " (use \"git commit\" to conclude merge)"
-msgstr " (benutzen Sie \"git commit\", um den Merge abzuschließen)"
+#. TRANSLATORS: %s will be "revert" or "cherry-pick"
+#: sequencer.c:399
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr "%s: Konnte neue Index-Datei nicht schreiben"
-#: wt-status.c:973
-msgid "You are in the middle of an am session."
-msgstr "Eine \"am\"-Sitzung ist im Gange."
+#: sequencer.c:418
+msgid "could not resolve HEAD commit\n"
+msgstr "Konnte HEAD-Commit nicht auflösen\n"
-#: wt-status.c:976
-msgid "The current patch is empty."
-msgstr "Der aktuelle Patch ist leer."
+#: sequencer.c:438
+msgid "unable to update cache tree\n"
+msgstr "Konnte Cache-Verzeichnis nicht aktualisieren\n"
-#: wt-status.c:980
-msgid " (fix conflicts and then run \"git am --continue\")"
+#: sequencer.c:483
+#, 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 ""
-" (beheben Sie die Konflikte und führen Sie dann \"git am --continue\" aus)"
+"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"
-#: wt-status.c:982
-msgid " (use \"git am --skip\" to skip this patch)"
-msgstr " (benutzen Sie \"git am --skip\", um diesen Patch auszulassen)"
+#: sequencer.c:567
+#, c-format
+msgid "could not parse commit %s\n"
+msgstr "Konnte Commit %s nicht parsen\n"
-#: wt-status.c:984
-msgid " (use \"git am --abort\" to restore the original branch)"
-msgstr ""
-" (benutzen Sie \"git am --abort\", um den ursprünglichen Branch "
-"wiederherzustellen)"
+#: sequencer.c:572
+#, c-format
+msgid "could not parse parent commit %s\n"
+msgstr "Konnte Eltern-Commit %s nicht parsen\n"
-#: wt-status.c:1109
-msgid "No commands done."
-msgstr "Keine Befehle ausgeführt."
+#: sequencer.c:656
+msgid "your index file is unmerged."
+msgstr "Ihre Index-Datei ist nicht zusammengeführt."
-#: wt-status.c:1112
+#: sequencer.c:675
#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
-msgstr[0] "Zuletzt ausgeführter Befehl (%d Befehl ausgeführt):"
-msgstr[1] "Zuletzt ausgeführte Befehle (%d Befehle ausgeführt):"
+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."
-#: wt-status.c:1123
+#: sequencer.c:683
#, c-format
-msgid " (see more in file %s)"
-msgstr " (mehr Informationen in Datei %s)"
-
-#: wt-status.c:1128
-msgid "No commands remaining."
-msgstr "Keine Befehle verbleibend."
+msgid "commit %s does not have parent %d"
+msgstr "Commit %s hat keinen Eltern-Commit %d"
-#: wt-status.c:1131
+#: sequencer.c:687
#, c-format
-msgid "Next command to do (%d remaining command):"
-msgid_plural "Next commands to do (%d remaining commands):"
-msgstr[0] "Nächster auszuführender Befehl (%d Befehle verbleibend):"
-msgstr[1] "Nächste auszuführende Befehle (%d Befehle verbleibend):"
+msgid "mainline was specified but commit %s is not a merge."
+msgstr "Hauptlinie wurde spezifiziert, aber Commit %s ist kein Merge."
-#: wt-status.c:1139
-msgid " (use \"git rebase --edit-todo\" to view and edit)"
-msgstr " (benutzen Sie \"git rebase --edit-todo\" zum Ansehen und Bearbeiten)"
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#: sequencer.c:700
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s: kann Eltern-Commit %s nicht parsen"
-#: wt-status.c:1152
+#: sequencer.c:705
#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "Sie sind gerade beim Rebase von Branch '%s' auf '%s'."
+msgid "cannot get commit message for %s"
+msgstr "Kann keine Commit-Beschreibung für %s bekommen."
-#: wt-status.c:1157
-msgid "You are currently rebasing."
-msgstr "Sie sind gerade beim Rebase."
+#: sequencer.c:797
+#, c-format
+msgid "could not revert %s... %s"
+msgstr "Konnte \"revert\" nicht auf %s... (%s) ausführen"
-#: wt-status.c:1171
-msgid " (fix conflicts and then run \"git rebase --continue\")"
-msgstr ""
-" (beheben Sie die Konflikte und führen Sie dann \"git rebase --continue\" "
-"aus)"
+#: sequencer.c:798
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "Konnte %s... (%s) nicht anwenden"
-#: wt-status.c:1173
-msgid " (use \"git rebase --skip\" to skip this patch)"
-msgstr " (benutzen Sie \"git rebase --skip\", um diesen Patch auszulassen)"
+#: sequencer.c:833
+msgid "empty commit set passed"
+msgstr "leere Menge von Commits übergeben"
-#: wt-status.c:1175
-msgid " (use \"git rebase --abort\" to check out the original branch)"
-msgstr ""
-" (benutzen Sie \"git rebase --abort\", um den ursprünglichen Branch "
-"auszuchecken)"
+#: sequencer.c:843
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr "git %s: Fehler beim Lesen des Index"
-#: wt-status.c:1181
-msgid " (all conflicts fixed: run \"git rebase --continue\")"
-msgstr " (alle Konflikte behoben: führen Sie \"git rebase --continue\" aus)"
+#: sequencer.c:850
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr "git %s: Fehler beim Aktualisieren des Index"
-#: wt-status.c:1185
+#: sequencer.c:944
#, 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 "invalid line %d: %.*s"
+msgstr "Ungültige Zeile %d: %.*s"
-#: wt-status.c:1190
-msgid "You are currently splitting a commit during a rebase."
-msgstr "Sie teilen gerade einen Commit während eines Rebase auf."
+#: sequencer.c:950
+msgid "no commits parsed."
+msgstr "Keine Commits geparst."
-#: wt-status.c:1193
-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)"
+#: sequencer.c:966
+#, c-format
+msgid "could not read '%s'."
+msgstr "Konnte '%s' nicht lesen."
-#: wt-status.c:1197
+#: sequencer.c:972
#, 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 "unusable instruction sheet: '%s'"
+msgstr "Unbenutzbares Instruktionsblatt: '%s'"
-#: wt-status.c:1202
-msgid "You are currently editing a commit during a rebase."
-msgstr "Sie editieren gerade einen Commit während eines Rebase."
+#: sequencer.c:983
+msgid "cannot cherry-pick during a revert."
+msgstr "Kann Cherry-Pick nicht während eines Reverts ausführen."
-#: wt-status.c:1205
-msgid " (use \"git commit --amend\" to amend the current commit)"
-msgstr ""
-" (benutzen Sie \"git commit --amend\", um den aktuellen Commit "
-"nachzubessern)"
+#: sequencer.c:985
+msgid "cannot revert during a cherry-pick."
+msgstr "Kann Revert nicht während eines Cherry-Picks ausführen."
-#: wt-status.c:1207
-msgid ""
-" (use \"git rebase --continue\" once you are satisfied with your changes)"
-msgstr ""
-" (benutzen Sie \"git rebase --continue\" sobald Ihre Änderungen "
-"abgeschlossen sind)"
+#: sequencer.c:1028
+#, c-format
+msgid "invalid key: %s"
+msgstr "Ungültiger Schlüssel: %s"
-#: wt-status.c:1217
+#: sequencer.c:1031
#, c-format
-msgid "You are currently cherry-picking commit %s."
-msgstr "Sie führen gerade \"cherry-pick\" von Commit %s aus."
+msgid "invalid value for %s: %s"
+msgstr "Ungültiger Wert für %s: %s"
-#: wt-status.c:1222
-msgid " (fix conflicts and run \"git cherry-pick --continue\")"
-msgstr ""
-" (beheben Sie die Konflikte und führen Sie dann \"git cherry-pick --continue"
-"\" aus)"
+#: sequencer.c:1063
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr "Fehlerhaftes Optionsblatt: '%s'"
-#: wt-status.c:1225
-msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
-msgstr ""
-" (alle Konflikte behoben: führen Sie \"git cherry-pick --continue\" aus)"
+#: sequencer.c:1101
+msgid "a cherry-pick or revert is already in progress"
+msgstr "\"cherry-pick\" oder \"revert\" ist bereits im Gang"
-#: wt-status.c:1227
-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)"
+#: sequencer.c:1102
+msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+msgstr "versuchen Sie \"git cherry-pick (--continue | --quit | --abort)\""
-#: wt-status.c:1236
+#: sequencer.c:1106
#, c-format
-msgid "You are currently reverting commit %s."
-msgstr "Sie sind gerade an einem Revert von Commit '%s'."
+msgid "could not create sequencer directory '%s'"
+msgstr "Konnte \"sequencer\"-Verzeichnis '%s' nicht erstellen."
-#: wt-status.c:1241
-msgid " (fix conflicts and run \"git revert --continue\")"
-msgstr ""
-" (beheben Sie die Konflikte und führen Sie dann \"git revert --continue\" "
-"aus)"
+#: sequencer.c:1120
+msgid "could not lock HEAD"
+msgstr "Konnte HEAD nicht sperren"
-#: wt-status.c:1244
-msgid " (all conflicts fixed: run \"git revert --continue\")"
-msgstr " (alle Konflikte behoben: führen Sie \"git revert --continue\" aus)"
+#: sequencer.c:1151 sequencer.c:1289
+msgid "no cherry-pick or revert in progress"
+msgstr "kein \"cherry-pick\" oder \"revert\" im Gang"
-#: wt-status.c:1246
-msgid " (use \"git revert --abort\" to cancel the revert operation)"
-msgstr ""
-" (benutzen Sie \"git revert --abort\", um die Revert-Operation abzubrechen)"
+#: sequencer.c:1153
+msgid "cannot resolve HEAD"
+msgstr "kann HEAD nicht auflösen"
-#: wt-status.c:1257
+#: sequencer.c:1155 sequencer.c:1189
+msgid "cannot abort from a branch yet to be born"
+msgstr "kann nicht abbrechen: bin auf einem Branch, der noch geboren wird"
+
+#: sequencer.c:1175 builtin/grep.c:578
#, 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 "cannot open '%s'"
+msgstr "kann '%s' nicht öffnen"
-#: wt-status.c:1261
-msgid "You are currently bisecting."
-msgstr "Sie sind gerade bei einer binären Suche."
+#: sequencer.c:1177
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "Kann '%s' nicht lesen: %s"
-#: wt-status.c:1264
-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)"
+#: sequencer.c:1178
+msgid "unexpected end of file"
+msgstr "Unerwartetes Dateiende"
-#: wt-status.c:1464
-msgid "On branch "
-msgstr "Auf Branch "
+#: sequencer.c:1184
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr "gespeicherte \"pre-cherry-pick\" HEAD Datei '%s' ist beschädigt"
-#: wt-status.c:1470
-msgid "interactive rebase in progress; onto "
-msgstr "interaktives Rebase im Gange; auf "
+#: sequencer.c:1354
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden"
-#: wt-status.c:1472
-msgid "rebase in progress; onto "
-msgstr "Rebase im Gange; auf "
+#: sequencer.c:1358
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s: ungültiger Commit"
-#: wt-status.c:1477
-msgid "HEAD detached at "
-msgstr "HEAD losgelöst bei "
+#: sequencer.c:1391
+msgid "can't revert as initial commit"
+msgstr "Kann nicht als allerersten Commit einen Revert ausführen."
-#: wt-status.c:1479
-msgid "HEAD detached from "
-msgstr "HEAD losgelöst von "
+#: setup.c:160
+#, 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: kein solcher Pfad im Arbeitsverzeichnis.\n"
+"Benutzen Sie 'git <Befehl> -- <Pfad>...' zur Angabe von Pfaden, die lokal\n"
+"nicht existieren."
-#: wt-status.c:1482
-msgid "Not currently on any branch."
-msgstr "Im Moment auf keinem Branch."
+#: setup.c:173
+#, 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>...]'"
-#: wt-status.c:1500
-msgid "Initial commit"
-msgstr "Initialer Commit"
+#: setup.c:223
+#, 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>...]'"
-#: wt-status.c:1514
-msgid "Untracked files"
-msgstr "Unversionierte Dateien"
+#: setup.c:468
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Erwartete Git-Repository-Version <= %d, %d gefunden"
-#: wt-status.c:1516
-msgid "Ignored files"
-msgstr "Ignorierte Dateien"
+#: setup.c:476
+msgid "unknown repository extensions found:"
+msgstr "Unbekannte Repository-Erweiterungen gefunden:"
+
+#: setup.c:762
+#, c-format
+msgid "Not a git repository (or any of the parent directories): %s"
+msgstr "Kein Git-Repository (oder irgendein Elternverzeichnis): %s"
+
+#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
+msgid "Cannot come back to cwd"
+msgstr "Kann nicht zurück zu Arbeitsverzeichnis wechseln"
+
+#: setup.c:845
+msgid "Unable to read current working directory"
+msgstr "Konnte aktuelles Arbeitsverzeichnis nicht lesen."
+
+#: setup.c:920
+#, 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:927
+#, c-format
+msgid "Cannot change to '%s/..'"
+msgstr "Kann nicht in Verzeichnis '%s/..' wechseln"
+
+#: setup.c:989
+#, 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."
+
+#: sha1_file.c:473
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "Pfad '%s' existiert nicht"
+
+#: sha1_file.c:499
+#, 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."
+
+#: sha1_file.c:505
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "Referenziertes Repository '%s' ist kein lokales Repository."
+
+#: sha1_file.c:511
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr ""
+"Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)."
+
+#: sha1_file.c:519
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr ""
+"Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") "
+"eingehängt."
+
+#: sha1_file.c:1159
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)"
+
+#: sha1_file.c:2592
+#, 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?)"
+
+#: sha1_file.c:2596
+#, 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?)"
+
+#: sha1_name.c:407
+#, c-format
+msgid "short SHA1 %s is ambiguous"
+msgstr "Kurzer SHA-1 %s ist mehrdeutig."
+
+#: sha1_name.c:418
+msgid "The candidates are:"
+msgstr "Die Kandidaten sind:"
+
+#: sha1_name.c:578
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+" git checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
+msgstr ""
+"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 checkout -b $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."
+
+#: submodule.c:64 submodule.c:98
+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:68 submodule.c:102
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "Konnte keine Sektion in .gitmodules mit Pfad \"%s\" finden"
+
+#: submodule.c:76
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "Konnte Eintrag '%s' in .gitmodules nicht aktualisieren"
+
+#: submodule.c:109
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "Konnte Eintrag '%s' nicht aus .gitmodules entfernen"
+
+#: submodule.c:120
+msgid "staging updated .gitmodules failed"
+msgstr "Konnte aktualisierte .gitmodules-Datei nicht zum Commit vormerken"
+
+#: submodule.c:158
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "Negative Werte für submodule.fetchJobs nicht erlaubt"
+
+#: submodule-config.c:358
+#, c-format
+msgid "invalid value for %s"
+msgstr "Ungültiger Wert für %s"
+
+#: trailer.c:238
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "Ausführen des Anhang-Befehls '%s' fehlgeschlagen"
+
+#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537
+#: trailer.c:541
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr "unbekannter Wert '%s' für Schlüssel %s"
+
+#: trailer.c:523 trailer.c:528 builtin/remote.c:289
+#, c-format
+msgid "more than one %s"
+msgstr "mehr als ein %s"
+
+#: trailer.c:672
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "leerer Anhang-Token in Anhang '%.*s'"
+
+#: trailer.c:695
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "Konnte Eingabe-Datei '%s' nicht lesen"
+
+#: trailer.c:698
+msgid "could not read from stdin"
+msgstr "konnte nicht von der Standard-Eingabe lesen"
+
+#: trailer.c:929 builtin/am.c:44
+#, c-format
+msgid "could not stat %s"
+msgstr "Konnte '%s' nicht lesen"
+
+#: trailer.c:931
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "Datei '%s' ist keine reguläre Datei"
+
+#: trailer.c:933
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "Datei %s ist vom Benutzer nicht beschreibbar."
+
+#: trailer.c:945
+msgid "could not open temporary file"
+msgstr "konnte temporäre Datei '%s' nicht öffnen"
+
+#: trailer.c:983
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "konnte temporäre Datei nicht zu %s umbenennen"
+
+#: transport.c:62
+#, 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:151
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport: ungültige --depth Option '%s'"
+
+#: transport.c:817
+#, 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:821
+#, 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:829
+msgid "Aborting."
+msgstr "Abbruch."
+
+#: transport-helper.c:1075
+#, c-format
+msgid "Could not read ref %s"
+msgstr "Konnte Referenz %s nicht lesen."
+
+#: tree-walk.c:31
+msgid "too-short tree object"
+msgstr "zu kurzes Tree-Objekt"
+
+#: tree-walk.c:37
+msgid "malformed mode in tree entry"
+msgstr "fehlerhafter Modus in Tree-Eintrag"
+
+#: tree-walk.c:41
+msgid "empty filename in tree entry"
+msgstr "leerer Dateiname in Tree-Eintrag"
+
+#: tree-walk.c:113
+msgid "too-short tree file"
+msgstr "zu kurze Tree-Datei"
+
+#: unpack-trees.c:64
+#, 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:66
+#, 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:69
+#, 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:71
+#, 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:74
+#, 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:76
+#, 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:81
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in it:\n"
+"%s"
+msgstr ""
+"Durch die Aktualisierung der folgenden Verzeichnisse würden unversionierte\n"
+"Dateien in diesen Verzeichnissen verloren gehen:\n"
+"%s"
+
+#: unpack-trees.c:85
+#, 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:87
+#, 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:90
+#, 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:92
+#, 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:95
+#, 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:97
+#, 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:102
+#, 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:104
+#, 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:107
+#, 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."
-#: wt-status.c:1520
+#: unpack-trees.c:109
#, 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')."
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
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')."
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
+"den Merge überschrieben werden:\n"
+"%%s"
-#: wt-status.c:1526
+#: unpack-trees.c:112
#, c-format
-msgid "Untracked files not listed%s"
-msgstr "Unversionierte Dateien nicht aufgelistet%s"
-
-#: wt-status.c:1528
-msgid " (use -u option to show untracked files)"
-msgstr " (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)"
-
-#: wt-status.c:1534
-msgid "No changes"
-msgstr "Keine Änderungen"
+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."
-#: wt-status.c:1539
+#: unpack-trees.c:114
#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
msgstr ""
-"keine Änderungen zum Commit vorgemerkt (benutzen Sie \"git add\" und/oder "
-"\"git commit -a\")\n"
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch "
+"den\n"
+"%s überschrieben werden:\n"
+"%%s"
-#: wt-status.c:1542
+#: unpack-trees.c:121
#, c-format
-msgid "no changes added to commit\n"
-msgstr "keine Änderungen zum Commit vorgemerkt\n"
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgstr "Eintrag '%s' überschneidet sich mit '%s'. Kann nicht verbinden."
-#: wt-status.c:1545
+#: unpack-trees.c:124
#, c-format
msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
msgstr ""
-"nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien (benutzen "
-"Sie \"git add\" zum Versionieren)\n"
+"Kann partiellen Checkout nicht aktualisieren: die folgenden Einträge sind "
+"nicht\n"
+"aktuell:\n"
+"%s"
-#: wt-status.c:1548
+#: unpack-trees.c:126
#, c-format
-msgid "nothing added to commit but untracked files present\n"
-msgstr "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n"
+msgid ""
+"The following working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Die folgenden Dateien im Arbeitsverzeichnis würden durch die Aktualisierung\n"
+"über einen partiellen Checkout überschrieben werden:\n"
+"%s"
-#: wt-status.c:1551
+#: unpack-trees.c:128
#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgid ""
+"The following working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
msgstr ""
-"nichts zu committen (Erstellen/Kopieren Sie Dateien und benutzen Sie \"git "
-"add\" zum Versionieren)\n"
+"Die folgenden Dateien im Arbeitsverzeichnis würden durch die Aktualisierung\n"
+"über einen partiellen Checkout entfernt werden:\n"
+"%s"
-#: wt-status.c:1554 wt-status.c:1559
+#: unpack-trees.c:205
#, c-format
-msgid "nothing to commit\n"
-msgstr "nichts zu committen\n"
+msgid "Aborting\n"
+msgstr "Abbruch\n"
-#: wt-status.c:1557
-#, 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"
+#: unpack-trees.c:237
+msgid "Checking out files"
+msgstr "Checke Dateien aus"
+
+#: urlmatch.c:120
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "Ungültiges URL-Schema oder Suffix '://' fehlt"
-#: wt-status.c:1561
+#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
#, c-format
-msgid "nothing to commit, working tree clean\n"
-msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n"
+msgid "invalid %XX escape sequence"
+msgstr "ungültige Escape-Sequenz %XX"
-#: wt-status.c:1668
-msgid "Initial commit on "
-msgstr "Initialer Commit auf "
+#: urlmatch.c:172
+msgid "missing host and scheme is not 'file:'"
+msgstr "fehlender Host und Schema ist nicht 'file:'"
-#: wt-status.c:1672
-msgid "HEAD (no branch)"
-msgstr "HEAD (kein Branch)"
+#: urlmatch.c:189
+msgid "a 'file:' URL may not have a port number"
+msgstr "eine 'file:' URL darf keine Portnummer enthalten"
-#: wt-status.c:1701
-msgid "gone"
-msgstr "entfernt"
+#: urlmatch.c:199
+msgid "invalid characters in host name"
+msgstr "Hostname enthält ungültige Zeichen"
-#: wt-status.c:1703 wt-status.c:1711
-msgid "behind "
-msgstr "hinterher "
+#: urlmatch.c:244 urlmatch.c:255
+msgid "invalid port number"
+msgstr "ungültige Portnummer"
-#: wt-status.c:1706 wt-status.c:1709
-msgid "ahead "
-msgstr "voraus "
+#: urlmatch.c:322
+msgid "invalid '..' path segment"
+msgstr "ungültiges '..' Pfadsegment"
-#: compat/precompose_utf8.c:57 builtin/clone.c:415
+#: worktree.c:282
#, c-format
-msgid "failed to unlink '%s'"
-msgstr "Konnte '%s' nicht entfernen."
-
-#: builtin/add.c:22
-msgid "git add [<options>] [--] <pathspec>..."
-msgstr "git add [<Optionen>] [--] <Pfadspezifikation>..."
+msgid "failed to read '%s'"
+msgstr "Fehler beim Lesen von '%s'"
-#: builtin/add.c:65
+#: wrapper.c:222 wrapper.c:392
#, c-format
-msgid "unexpected diff status %c"
-msgstr "unerwarteter Differenz-Status %c"
-
-#: builtin/add.c:71 builtin/commit.c:281
-msgid "updating files failed"
-msgstr "Aktualisierung der Dateien fehlgeschlagen"
+msgid "could not open '%s' for reading and writing"
+msgstr "Konnte '%s' nicht zum Lesen und Schreiben öffnen."
-#: builtin/add.c:81
+#: wrapper.c:224 wrapper.c:394 builtin/am.c:766
#, c-format
-msgid "remove '%s'\n"
-msgstr "lösche '%s'\n"
-
-#: builtin/add.c:136
-msgid "Unstaged changes after refreshing the index:"
-msgstr ""
-"Nicht zum Commit vorgemerkte Änderungen nach Aktualisierung der Staging-Area:"
+msgid "could not open '%s' for writing"
+msgstr "Konnte '%s' nicht zum Schreiben öffnen."
-#: builtin/add.c:196 builtin/rev-parse.c:811
-msgid "Could not read the index"
-msgstr "Konnte den Index nicht lesen"
+#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
+#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029
+#: builtin/pull.c:341
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "Konnte '%s' nicht zum Lesen öffnen."
-#: builtin/add.c:207
+#: wrapper.c:605 wrapper.c:626
#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Konnte '%s' nicht zum Schreiben öffnen."
+msgid "unable to access '%s'"
+msgstr "konnte nicht auf '%s' zugreifen"
-#: builtin/add.c:211
-msgid "Could not write patch"
-msgstr "Konnte Patch nicht schreiben"
+#: wrapper.c:634
+msgid "unable to get current working directory"
+msgstr "Konnte aktuelles Arbeitsverzeichnis nicht bekommen."
-#: builtin/add.c:214
-msgid "editing patch failed"
-msgstr "Bearbeitung des Patches fehlgeschlagen"
+#: wrapper.c:658
+#, c-format
+msgid "could not write to %s"
+msgstr "Konnte nicht nach '%s' schreiben."
-#: builtin/add.c:217
+#: wrapper.c:660
#, c-format
-msgid "Could not stat '%s'"
-msgstr "Konnte Verzeichnis '%s' nicht lesen"
+msgid "could not close %s"
+msgstr "Konnte '%s' nicht schließen."
-#: builtin/add.c:219
-msgid "Empty patch. Aborted."
-msgstr "Leerer Patch. Abgebrochen."
+#: wt-status.c:151
+msgid "Unmerged paths:"
+msgstr "Nicht zusammengeführte Pfade:"
-#: builtin/add.c:224
+#: wt-status.c:178 wt-status.c:205
#, c-format
-msgid "Could not apply '%s'"
-msgstr "Konnte '%s' nicht anwenden."
+msgid " (use \"git reset %s <file>...\" to unstage)"
+msgstr ""
+" (benutzen Sie \"git reset %s <Datei>...\" zum Entfernen aus der Staging-"
+"Area)"
-#: builtin/add.c:234
-msgid "The following paths are ignored by one of your .gitignore files:\n"
+#: wt-status.c:180 wt-status.c:207
+msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
-"Die folgenden Pfade werden durch eine Ihrer \".gitignore\" Dateien "
-"ignoriert:\n"
+" (benutzen Sie \"git rm --cached <Datei>...\" zum Entfernen aus der Staging-"
+"Area)"
-#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521
-#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162
-msgid "dry run"
-msgstr "Probelauf"
+#: wt-status.c:184
+msgid " (use \"git add <file>...\" to mark resolution)"
+msgstr ""
+" (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)"
-#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19
-#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593
-#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114
-msgid "be verbose"
-msgstr "erweiterte Ausgaben"
+#: wt-status.c:186 wt-status.c:190
+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)"
-#: builtin/add.c:256
-msgid "interactive picking"
-msgstr "interaktives Auswählen"
+#: wt-status.c:188
+msgid " (use \"git rm <file>...\" to mark resolution)"
+msgstr ""
+" (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)"
-#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286
-msgid "select hunks interactively"
-msgstr "Blöcke interaktiv auswählen"
+#: wt-status.c:199 wt-status.c:945
+msgid "Changes to be committed:"
+msgstr "zum Commit vorgemerkte Änderungen:"
-#: builtin/add.c:258
-msgid "edit current diff and apply"
-msgstr "aktuelle Unterschiede editieren und anwenden"
+#: wt-status.c:217 wt-status.c:954
+msgid "Changes not staged for commit:"
+msgstr "Änderungen, die nicht zum Commit vorgemerkt sind:"
-#: builtin/add.c:259
-msgid "allow adding otherwise ignored files"
-msgstr "das Hinzufügen andernfalls ignorierter Dateien erlauben"
+#: wt-status.c:221
+msgid " (use \"git add <file>...\" to update what will be committed)"
+msgstr ""
+" (benutzen Sie \"git add <Datei>...\", um die Änderungen zum Commit "
+"vorzumerken)"
-#: builtin/add.c:260
-msgid "update tracked files"
-msgstr "versionierte Dateien aktualisieren"
+#: wt-status.c:223
+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)"
-#: builtin/add.c:261
-msgid "record only the fact that the path will be added later"
-msgstr "nur speichern, dass der Pfad später hinzugefügt werden soll"
+#: wt-status.c:224
+msgid ""
+" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+msgstr ""
+" (benutzen Sie \"git checkout -- <Datei>...\", um die Änderungen im "
+"Arbeitsverzeichnis zu verwerfen)"
-#: builtin/add.c:262
-msgid "add changes from all tracked and untracked files"
+#: wt-status.c:226
+msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-"Änderungen von allen versionierten und unversionierten Dateien hinzufügen"
+" (committen oder verwerfen Sie den unversionierten oder geänderten Inhalt "
+"in den Submodulen)"
-#: builtin/add.c:265
-msgid "ignore paths removed in the working tree (same as --no-all)"
-msgstr "gelöschte Pfade im Arbeitsverzeichnis ignorieren (genau wie --no-all)"
+#: wt-status.c:238
+#, 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)"
-#: builtin/add.c:267
-msgid "don't add, only refresh the index"
-msgstr "nichts hinzufügen, nur den Index aktualisieren"
+#: wt-status.c:253
+msgid "both deleted:"
+msgstr "beide gelöscht:"
+
+#: wt-status.c:255
+msgid "added by us:"
+msgstr "von uns hinzugefügt:"
-#: builtin/add.c:268
-msgid "just skip files which cannot be added because of errors"
-msgstr ""
-"Dateien überspringen, die aufgrund von Fehlern nicht hinzugefügt werden "
-"konnten"
+#: wt-status.c:257
+msgid "deleted by them:"
+msgstr "von denen gelöscht:"
-#: builtin/add.c:269
-msgid "check if - even missing - files are ignored in dry run"
-msgstr "prüfen ob - auch fehlende - Dateien im Probelauf ignoriert werden"
+#: wt-status.c:259
+msgid "added by them:"
+msgstr "von denen hinzugefügt:"
-#: builtin/add.c:270 builtin/update-index.c:958
-msgid "(+/-)x"
-msgstr "(+/-)x"
+#: wt-status.c:261
+msgid "deleted by us:"
+msgstr "von uns gelöscht:"
-#: builtin/add.c:270 builtin/update-index.c:959
-msgid "override the executable bit of the listed files"
-msgstr "das \"ausführbar\"-Bit der aufgelisteten Dateien überschreiben"
+#: wt-status.c:263
+msgid "both added:"
+msgstr "von beiden hinzugefügt:"
-#: builtin/add.c:292
-#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "Verwenden Sie -f wenn Sie diese wirklich hinzufügen möchten.\n"
+#: wt-status.c:265
+msgid "both modified:"
+msgstr "von beiden geändert:"
-#: builtin/add.c:300
-msgid "adding files failed"
-msgstr "Hinzufügen von Dateien fehlgeschlagen"
+#: wt-status.c:275
+msgid "new file:"
+msgstr "neue Datei:"
-#: builtin/add.c:336
-msgid "-A and -u are mutually incompatible"
-msgstr "Die Optionen -A und -u sind zueinander inkompatibel."
+#: wt-status.c:277
+msgid "copied:"
+msgstr "kopiert:"
-#: builtin/add.c:343
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr ""
-"Die Option --ignore-missing kann nur zusammen mit --dry-run verwendet werden."
+#: wt-status.c:279
+msgid "deleted:"
+msgstr "gelöscht:"
-#: builtin/add.c:352
-#, c-format
-msgid "--chmod param '%s' must be either -x or +x"
-msgstr "--chmod Parameter '%s' muss entweder -x oder +x sein"
+#: wt-status.c:281
+msgid "modified:"
+msgstr "geändert:"
-#: builtin/add.c:367
-#, c-format
-msgid "Nothing specified, nothing added.\n"
-msgstr "Nichts spezifiziert, nichts hinzugefügt.\n"
+#: wt-status.c:283
+msgid "renamed:"
+msgstr "umbenannt:"
-#: builtin/add.c:368
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "Meinten Sie vielleicht 'git add .'?\n"
+#: wt-status.c:285
+msgid "typechange:"
+msgstr "Typänderung:"
-#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279
-#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340
-#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:240
-msgid "index file corrupt"
-msgstr "Index-Datei beschädigt"
+#: wt-status.c:287
+msgid "unknown:"
+msgstr "unbekannt:"
-#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431
-msgid "Unable to write new index file"
-msgstr "Konnte neue Index-Datei nicht schreiben."
+#: wt-status.c:289
+msgid "unmerged:"
+msgstr "nicht gemerged:"
-#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032
-#, c-format
-msgid "could not read '%s'"
-msgstr "Konnte '%s' nicht lesen"
+#: wt-status.c:371
+msgid "new commits, "
+msgstr "neue Commits, "
-#: builtin/am.c:426
-msgid "could not parse author script"
-msgstr "konnte Autor-Skript nicht parsen"
+#: wt-status.c:373
+msgid "modified content, "
+msgstr "geänderter Inhalt, "
-#: builtin/am.c:503
-#, c-format
-msgid "'%s' was deleted by the applypatch-msg hook"
-msgstr "'%s' wurde durch den applypatch-msg Hook entfernt"
+#: wt-status.c:375
+msgid "untracked content, "
+msgstr "unversionierter Inhalt, "
-#: builtin/am.c:544 builtin/notes.c:301
-#, c-format
-msgid "Malformed input line: '%s'."
-msgstr "Fehlerhafte Eingabezeile: '%s'."
+#: wt-status.c:818
+msgid "Submodules changed but not updated:"
+msgstr "Submodule geändert, aber nicht aktualisiert:"
-#: builtin/am.c:581 builtin/notes.c:316
-#, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
-msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'"
+#: wt-status.c:820
+msgid "Submodule changes to be committed:"
+msgstr "Änderungen in Submodul zum Committen:"
-#: builtin/am.c:607
-msgid "fseek failed"
-msgstr "\"fseek\" fehlgeschlagen"
+#: wt-status.c:901
+msgid ""
+"Do not touch the line above.\n"
+"Everything below will be removed."
+msgstr ""
+"Ändern Sie nicht die obige Zeile.\n"
+"Alles unterhalb von ihr wird entfernt."
-#: builtin/am.c:787
-#, c-format
-msgid "could not parse patch '%s'"
-msgstr "konnte Patch '%s' nicht parsen"
+#: wt-status.c:1013
+msgid "You have unmerged paths."
+msgstr "Sie haben nicht zusammengeführte Pfade."
-#: builtin/am.c:852
-msgid "Only one StGIT patch series can be applied at once"
-msgstr "Es kann nur eine StGIT Patch-Serie auf einmal angewendet werden."
+#: wt-status.c:1016
+msgid " (fix conflicts and run \"git commit\")"
+msgstr " (beheben Sie die Konflikte und führen Sie \"git commit\" aus)"
-#: builtin/am.c:899
-msgid "invalid timestamp"
-msgstr "ungültiger Zeitstempel"
+#: wt-status.c:1018
+msgid " (use \"git merge --abort\" to abort the merge)"
+msgstr " (benutzen Sie \"git merge --abort\", um den Merge abzubrechen)"
-#: builtin/am.c:902 builtin/am.c:910
-msgid "invalid Date line"
-msgstr "Ungültige \"Date\"-Zeile"
+#: wt-status.c:1023
+msgid "All conflicts fixed but you are still merging."
+msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge."
-#: builtin/am.c:907
-msgid "invalid timezone offset"
-msgstr "Ungültiger Offset in der Zeitzone"
+#: wt-status.c:1026
+msgid " (use \"git commit\" to conclude merge)"
+msgstr " (benutzen Sie \"git commit\", um den Merge abzuschließen)"
-#: builtin/am.c:996
-msgid "Patch format detection failed."
-msgstr "Patch-Formaterkennung fehlgeschlagen."
+#: wt-status.c:1036
+msgid "You are in the middle of an am session."
+msgstr "Eine \"am\"-Sitzung ist im Gange."
-#: builtin/am.c:1001 builtin/clone.c:380
-#, c-format
-msgid "failed to create directory '%s'"
-msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
+#: wt-status.c:1039
+msgid "The current patch is empty."
+msgstr "Der aktuelle Patch ist leer."
-#: builtin/am.c:1005
-msgid "Failed to split patches."
-msgstr "Fehler beim Aufteilen der Patches."
+#: wt-status.c:1043
+msgid " (fix conflicts and then run \"git am --continue\")"
+msgstr ""
+" (beheben Sie die Konflikte und führen Sie dann \"git am --continue\" aus)"
-#: builtin/am.c:1137 builtin/commit.c:366
-msgid "unable to write index file"
-msgstr "Konnte Index-Datei nicht schreiben."
+#: wt-status.c:1045
+msgid " (use \"git am --skip\" to skip this patch)"
+msgstr " (benutzen Sie \"git am --skip\", um diesen Patch auszulassen)"
-#: builtin/am.c:1188
-#, c-format
-msgid "When you have resolved this problem, run \"%s --continue\"."
+#: wt-status.c:1047
+msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
-"Wenn Sie das Problem aufgelöst haben, führen Sie \"%s --continue\" aus."
+" (benutzen Sie \"git am --abort\", um den ursprünglichen Branch "
+"wiederherzustellen)"
+
+#: wt-status.c:1172
+msgid "No commands done."
+msgstr "Keine Befehle ausgeführt."
-#: builtin/am.c:1189
+#: wt-status.c:1175
#, 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."
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] "Zuletzt ausgeführter Befehl (%d Befehl ausgeführt):"
+msgstr[1] "Zuletzt ausgeführte Befehle (%d Befehle ausgeführt):"
-#: builtin/am.c:1190
+#: wt-status.c:1186
#, 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."
+msgid " (see more in file %s)"
+msgstr " (mehr Informationen in Datei %s)"
-#: builtin/am.c:1328
-msgid "Patch is empty. Was it split wrong?"
-msgstr "Patch ist leer. War dessen Aufteilung falsch?"
+#: wt-status.c:1191
+msgid "No commands remaining."
+msgstr "Keine Befehle verbleibend."
-#: builtin/am.c:1402 builtin/log.c:1543
+#: wt-status.c:1194
#, c-format
-msgid "invalid ident line: %s"
-msgstr "Ungültige Identifikationszeile: %s"
+msgid "Next command to do (%d remaining command):"
+msgid_plural "Next commands to do (%d remaining commands):"
+msgstr[0] "Nächster auszuführender Befehl (%d Befehle verbleibend):"
+msgstr[1] "Nächste auszuführende Befehle (%d Befehle verbleibend):"
+
+#: wt-status.c:1202
+msgid " (use \"git rebase --edit-todo\" to view and edit)"
+msgstr " (benutzen Sie \"git rebase --edit-todo\" zum Ansehen und Bearbeiten)"
-#: builtin/am.c:1429
+#: wt-status.c:1215
#, c-format
-msgid "unable to parse commit %s"
-msgstr "Konnte Commit '%s' nicht parsen."
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "Sie sind gerade beim Rebase von Branch '%s' auf '%s'."
-#: builtin/am.c:1602
-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."
+#: wt-status.c:1220
+msgid "You are currently rebasing."
+msgstr "Sie sind gerade beim Rebase."
-#: builtin/am.c:1604
-msgid "Using index info to reconstruct a base tree..."
+#: wt-status.c:1234
+msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
-"Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis "
-"nachzustellen ..."
+" (beheben Sie die Konflikte und führen Sie dann \"git rebase --continue\" "
+"aus)"
-#: builtin/am.c:1623
-msgid ""
-"Did you hand edit your patch?\n"
-"It does not apply to blobs recorded in its index."
-msgstr ""
-"Haben Sie den Patch per Hand editiert?\n"
-"Er kann nicht auf die Blobs in seiner 'index' Zeile angewendet werden."
+#: wt-status.c:1236
+msgid " (use \"git rebase --skip\" to skip this patch)"
+msgstr " (benutzen Sie \"git rebase --skip\", um diesen Patch auszulassen)"
-#: builtin/am.c:1629
-msgid "Falling back to patching base and 3-way merge..."
-msgstr "Falle zurück zum Patchen der Basis und zum 3-Wege-Merge ..."
+#: wt-status.c:1238
+msgid " (use \"git rebase --abort\" to check out the original branch)"
+msgstr ""
+" (benutzen Sie \"git rebase --abort\", um den ursprünglichen Branch "
+"auszuchecken)"
-#: builtin/am.c:1654
-msgid "Failed to merge in the changes."
-msgstr "Merge der Änderungen fehlgeschlagen."
+#: wt-status.c:1244
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
+msgstr " (alle Konflikte behoben: führen Sie \"git rebase --continue\" aus)"
-#: builtin/am.c:1679 builtin/merge.c:628
-msgid "git write-tree failed to write a tree"
-msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl"
+#: wt-status.c:1248
+#, 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."
-#: builtin/am.c:1686
-msgid "applying to an empty history"
-msgstr "auf leere Historie anwenden"
+#: wt-status.c:1253
+msgid "You are currently splitting a commit during a rebase."
+msgstr "Sie teilen gerade einen Commit während eines Rebase auf."
-#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798
-#: builtin/merge.c:823
-msgid "failed to write commit object"
-msgstr "Fehler beim Schreiben des Commit-Objektes."
+#: wt-status.c:1256
+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)"
-#: builtin/am.c:1731 builtin/am.c:1735
+#: wt-status.c:1260
#, c-format
-msgid "cannot resume: %s does not exist."
-msgstr "Kann nicht fortsetzen: %s existiert nicht"
-
-#: builtin/am.c:1751
-msgid "cannot be interactive without stdin connected to a terminal."
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
-"Kann nicht interaktiv sein, ohne dass die Standard-Eingabe mit einem "
-"Terminal verbunden ist."
+"Sie editieren gerade einen Commit während eines Rebase von Branch '%s' auf "
+"'%s'."
-#: builtin/am.c:1756
-msgid "Commit Body is:"
-msgstr "Commit-Beschreibung ist:"
+#: wt-status.c:1265
+msgid "You are currently editing a commit during a rebase."
+msgstr "Sie editieren gerade einen Commit während eines Rebase."
-#. 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:1766
-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: "
+#: wt-status.c:1268
+msgid " (use \"git commit --amend\" to amend the current commit)"
+msgstr ""
+" (benutzen Sie \"git commit --amend\", um den aktuellen Commit "
+"nachzubessern)"
-#: builtin/am.c:1816
-#, c-format
-msgid "Dirty index: cannot apply patches (dirty: %s)"
-msgstr "Geänderter Index: kann Patches nicht anwenden (geändert: %s)"
+#: wt-status.c:1270
+msgid ""
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr ""
+" (benutzen Sie \"git rebase --continue\" sobald Ihre Änderungen "
+"abgeschlossen sind)"
-#: builtin/am.c:1853 builtin/am.c:1925
+#: wt-status.c:1280
#, c-format
-msgid "Applying: %.*s"
-msgstr "Wende an: %.*s"
+msgid "You are currently cherry-picking commit %s."
+msgstr "Sie führen gerade \"cherry-pick\" von Commit %s aus."
-#: builtin/am.c:1869
-msgid "No changes -- Patch already applied."
-msgstr "Keine Änderungen -- Patches bereits angewendet."
+#: wt-status.c:1285
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr ""
+" (beheben Sie die Konflikte und führen Sie dann \"git cherry-pick --continue"
+"\" aus)"
-#: builtin/am.c:1877
-#, c-format
-msgid "Patch failed at %s %.*s"
-msgstr "Anwendung des Patches fehlgeschlagen bei %s %.*s"
+#: wt-status.c:1288
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr ""
+" (alle Konflikte behoben: führen Sie \"git cherry-pick --continue\" aus)"
+
+#: wt-status.c:1290
+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)"
-#: builtin/am.c:1883
+#: wt-status.c:1299
#, c-format
-msgid "The copy of the patch that failed is found in: %s"
-msgstr "Die Kopie des fehlgeschlagenen Patches befindet sich in: %s"
+msgid "You are currently reverting commit %s."
+msgstr "Sie sind gerade an einem Revert von Commit '%s'."
-#: builtin/am.c:1928
-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."
+#: wt-status.c:1304
+msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
-"Keine Änderungen - haben Sie vergessen 'git add' zu benutzen?\n"
-"Wenn keine Änderungen mehr zum Commit vorzumerken sind, könnten\n"
-"diese bereits anderweitig eingefügt worden sein; Sie könnten diesen Patch\n"
-"auslassen."
+" (beheben Sie die Konflikte und führen Sie dann \"git revert --continue\" "
+"aus)"
-#: builtin/am.c:1935
-msgid ""
-"You still have unmerged paths in your index.\n"
-"Did you forget to use 'git add'?"
+#: wt-status.c:1307
+msgid " (all conflicts fixed: run \"git revert --continue\")"
+msgstr " (alle Konflikte behoben: führen Sie \"git revert --continue\" aus)"
+
+#: wt-status.c:1309
+msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
-"Sie haben immer noch nicht zusammengeführte Pfade im Index.\n"
-"Haben Sie vergessen 'git add' zu benutzen?"
+" (benutzen Sie \"git revert --abort\", um die Revert-Operation abzubrechen)"
-#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308
-#: builtin/reset.c:316
+#: wt-status.c:1320
#, c-format
-msgid "Could not parse object '%s'."
-msgstr "Konnte Objekt '%s' nicht parsen."
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "Sie sind gerade bei einer binären Suche, gestartet von Branch '%s'."
-#: builtin/am.c:2095
-msgid "failed to clean index"
-msgstr "Fehler beim Bereinigen des Index"
+#: wt-status.c:1324
+msgid "You are currently bisecting."
+msgstr "Sie sind gerade bei einer binären Suche."
-#: builtin/am.c:2129
-msgid ""
-"You seem to have moved HEAD since the last 'am' failure.\n"
-"Not rewinding to ORIG_HEAD"
+#: wt-status.c:1327
+msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-"Sie scheinen seit dem letzten gescheiterten 'am' HEAD geändert zu haben.\n"
-"Keine Zurücksetzung zu ORIG_HEAD."
+" (benutzen Sie \"git bisect reset\", um zum ursprünglichen Branch "
+"zurückzukehren)"
-#: builtin/am.c:2192
-#, c-format
-msgid "Invalid value for --patch-format: %s"
-msgstr "Ungültiger Wert für --patch-format: %s"
+#: wt-status.c:1524
+msgid "On branch "
+msgstr "Auf Branch "
-#: builtin/am.c:2225
-msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
-msgstr "git am [<Optionen>] [(<mbox>|<E-Mail-Verzeichnis>)...]"
+#: wt-status.c:1530
+msgid "interactive rebase in progress; onto "
+msgstr "interaktives Rebase im Gange; auf "
-#: builtin/am.c:2226
-msgid "git am [<options>] (--continue | --skip | --abort)"
-msgstr "git am [<Optionen>] (--continue | --skip | --abort)"
+#: wt-status.c:1532
+msgid "rebase in progress; onto "
+msgstr "Rebase im Gange; auf "
-#: builtin/am.c:2232
-msgid "run interactively"
-msgstr "interaktiv ausführen"
+#: wt-status.c:1537
+msgid "HEAD detached at "
+msgstr "HEAD losgelöst bei "
-#: builtin/am.c:2234
-msgid "historical option -- no-op"
-msgstr "historische Option -- kein Effekt"
+#: wt-status.c:1539
+msgid "HEAD detached from "
+msgstr "HEAD losgelöst von "
-#: builtin/am.c:2236
-msgid "allow fall back on 3way merging if needed"
-msgstr "erlaube, falls notwendig, das Zurückfallen auf einen 3-Wege-Merge"
+#: wt-status.c:1542
+msgid "Not currently on any branch."
+msgstr "Im Moment auf keinem Branch."
-#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57
-#: builtin/repack.c:172
-msgid "be quiet"
-msgstr "weniger Ausgaben"
+#: wt-status.c:1560
+msgid "Initial commit"
+msgstr "Initialer Commit"
-#: builtin/am.c:2239
-msgid "add a Signed-off-by line to the commit message"
-msgstr "der Commit-Beschreibung eine Signed-off-by Zeile hinzufügen"
+#: wt-status.c:1574
+msgid "Untracked files"
+msgstr "Unversionierte Dateien"
-#: builtin/am.c:2242
-msgid "recode into utf8 (default)"
-msgstr "nach UTF-8 umkodieren (Standard)"
+#: wt-status.c:1576
+msgid "Ignored files"
+msgstr "Ignorierte Dateien"
-#: builtin/am.c:2244
-msgid "pass -k flag to git-mailinfo"
-msgstr "-k an git-mailinfo übergeben"
+#: wt-status.c:1580
+#, 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')."
-#: builtin/am.c:2246
-msgid "pass -b flag to git-mailinfo"
-msgstr "-b an git-mailinfo übergeben"
+#: wt-status.c:1586
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "Unversionierte Dateien nicht aufgelistet%s"
-#: builtin/am.c:2248
-msgid "pass -m flag to git-mailinfo"
-msgstr "-m an git-mailinfo übergeben"
+#: wt-status.c:1588
+msgid " (use -u option to show untracked files)"
+msgstr " (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)"
-#: builtin/am.c:2250
-msgid "pass --keep-cr flag to git-mailsplit for mbox format"
-msgstr "--keep-cr an git-mailsplit für mbox-Format übergeben"
+#: wt-status.c:1594
+msgid "No changes"
+msgstr "Keine Änderungen"
-#: builtin/am.c:2253
-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"
+#: wt-status.c:1599
+#, 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"
-#: builtin/am.c:2256
-msgid "strip everything before a scissors line"
-msgstr "alles vor einer Scheren-Zeile entfernen"
+#: wt-status.c:1602
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "keine Änderungen zum Commit vorgemerkt\n"
-#: builtin/am.c:2257 builtin/apply.c:4837
-msgid "action"
-msgstr "Aktion"
+#: wt-status.c:1605
+#, 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 (benutzen "
+"Sie \"git add\" zum Versionieren)\n"
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279
-#: builtin/am.c:2285
-msgid "pass it through git-apply"
-msgstr "an git-apply übergeben"
+#: wt-status.c:1608
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
+msgstr "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n"
-#: builtin/am.c:2266 builtin/apply.c:4861
-msgid "root"
-msgstr "Wurzelverzeichnis"
+#: wt-status.c:1611
+#, 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 Sie \"git "
+"add\" zum Versionieren)\n"
-#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799
-#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96
-#: builtin/pull.c:179 builtin/submodule--helper.c:277
-#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482
-#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823
-#: builtin/submodule--helper.c:826
-msgid "path"
-msgstr "Pfad"
+#: wt-status.c:1614 wt-status.c:1619
+#, c-format
+msgid "nothing to commit\n"
+msgstr "nichts zu committen\n"
-#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134 builtin/pull.c:193
-#: builtin/repack.c:181 builtin/repack.c:185 builtin/show-branch.c:645
-#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
-#: parse-options.h:134 parse-options.h:244
-msgid "n"
-msgstr "Anzahl"
+#: wt-status.c:1617
+#, 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"
-#: builtin/am.c:2278 builtin/apply.c:4805
-msgid "num"
-msgstr "Anzahl"
+#: wt-status.c:1621
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n"
-#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438
-#: builtin/tag.c:372
-msgid "format"
-msgstr "Format"
+#: wt-status.c:1728
+msgid "Initial commit on "
+msgstr "Initialer Commit auf "
-#: builtin/am.c:2282
-msgid "format the patch(es) are in"
-msgstr "Patch-Format"
+#: wt-status.c:1732
+msgid "HEAD (no branch)"
+msgstr "HEAD (kein Branch)"
-#: builtin/am.c:2288
-msgid "override error message when patch failure occurs"
-msgstr "Meldung bei fehlerhafter Patch-Anwendung überschreiben"
+#: wt-status.c:1761
+msgid "gone"
+msgstr "entfernt"
-#: builtin/am.c:2290
-msgid "continue applying patches after resolving a conflict"
-msgstr "Anwendung der Patches nach Auflösung eines Konfliktes fortsetzen"
+#: wt-status.c:1763 wt-status.c:1771
+msgid "behind "
+msgstr "hinterher "
-#: builtin/am.c:2293
-msgid "synonyms for --continue"
-msgstr "Synonyme für --continue"
+#: wt-status.c:1766 wt-status.c:1769
+msgid "ahead "
+msgstr "voraus "
-#: builtin/am.c:2296
-msgid "skip the current patch"
-msgstr "den aktuellen Patch auslassen"
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2270
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "%s nicht möglich: Sie haben Änderungen, die nicht zum Commit vorgemerkt sind."
-#: builtin/am.c:2299
-msgid "restore the original branch and abort the patching operation."
-msgstr ""
-"ursprünglichen Branch wiederherstellen und Anwendung der Patches abbrechen"
+#: wt-status.c:2276
+msgid "additionally, your index contains uncommitted changes."
+msgstr "Zusätzlich enthält die Staging-Area nicht committete Änderungen."
-#: builtin/am.c:2303
-msgid "lie about committer date"
-msgstr "Autor-Datum als Commit-Datum verwenden"
+#: wt-status.c:2278
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "%s nicht möglich: Die Staging-Area enthält nicht committete Änderungen."
-#: builtin/am.c:2305
-msgid "use current timestamp for author date"
-msgstr "aktuellen Zeitstempel als Autor-Datum verwenden"
+#: compat/precompose_utf8.c:57 builtin/clone.c:414
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "Konnte '%s' nicht entfernen."
-#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229
-#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
-msgid "key-id"
-msgstr "GPG-Schlüsselkennung"
+#: builtin/add.c:22
+msgid "git add [<options>] [--] <pathspec>..."
+msgstr "git add [<Optionen>] [--] <Pfadspezifikation>..."
-#: builtin/am.c:2308
-msgid "GPG-sign commits"
-msgstr "Commits mit GPG signieren"
+#: builtin/add.c:80
+#, c-format
+msgid "unexpected diff status %c"
+msgstr "unerwarteter Differenz-Status %c"
-#: builtin/am.c:2311
-msgid "(internal use for git-rebase)"
-msgstr "(intern für git-rebase verwendet)"
+#: builtin/add.c:85 builtin/commit.c:291
+msgid "updating files failed"
+msgstr "Aktualisierung der Dateien fehlgeschlagen"
-#: builtin/am.c:2326
-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."
+#: builtin/add.c:95
+#, c-format
+msgid "remove '%s'\n"
+msgstr "lösche '%s'\n"
+
+#: builtin/add.c:149
+msgid "Unstaged changes after refreshing the index:"
msgstr ""
-"Die -b/--binary Option hat seit Langem keinen Effekt und wird\n"
-"entfernt. Bitte verwenden Sie diese nicht mehr."
+"Nicht zum Commit vorgemerkte Änderungen nach Aktualisierung der Staging-Area:"
+
+#: builtin/add.c:209 builtin/rev-parse.c:840
+msgid "Could not read the index"
+msgstr "Konnte den Index nicht lesen"
+
+#: builtin/add.c:220
+#, c-format
+msgid "Could not open '%s' for writing."
+msgstr "Konnte '%s' nicht zum Schreiben öffnen."
+
+#: builtin/add.c:224
+msgid "Could not write patch"
+msgstr "Konnte Patch nicht schreiben"
-#: builtin/am.c:2333
-msgid "failed to read the index"
-msgstr "Fehler beim Lesen des Index"
+#: builtin/add.c:227
+msgid "editing patch failed"
+msgstr "Bearbeitung des Patches fehlgeschlagen"
-#: builtin/am.c:2348
+#: builtin/add.c:230
#, c-format
-msgid "previous rebase directory %s still exists but mbox given."
-msgstr "Vorheriges Rebase-Verzeichnis %s existiert noch, aber mbox gegeben."
+msgid "Could not stat '%s'"
+msgstr "Konnte Verzeichnis '%s' nicht lesen"
+
+#: builtin/add.c:232
+msgid "Empty patch. Aborted."
+msgstr "Leerer Patch. Abgebrochen."
-#: builtin/am.c:2372
+#: builtin/add.c:237
#, c-format
-msgid ""
-"Stray %s directory found.\n"
-"Use \"git am --abort\" to remove it."
+msgid "Could not apply '%s'"
+msgstr "Konnte '%s' nicht anwenden."
+
+#: builtin/add.c:247
+msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-"Stray %s Verzeichnis gefunden.\n"
-"Benutzen Sie \"git am --abort\", um es zu entfernen."
+"Die folgenden Pfade werden durch eine Ihrer \".gitignore\" Dateien "
+"ignoriert:\n"
-#: builtin/am.c:2378
-msgid "Resolve operation not in progress, we are not resuming."
-msgstr "Es ist keine Auflösung im Gange, es wird nicht fortgesetzt."
+#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111
+#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521
+#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162
+msgid "dry run"
+msgstr "Probelauf"
-#: builtin/apply.c:122
-msgid "git apply [<options>] [<patch>...]"
-msgstr "git apply [<Optionen>] [<Patch>...]"
+#: builtin/add.c:269
+msgid "interactive picking"
+msgstr "interaktives Auswählen"
-#: builtin/apply.c:153
-#, c-format
-msgid "unrecognized whitespace option '%s'"
-msgstr "nicht erkannte Whitespace-Option: '%s'"
+#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286
+msgid "select hunks interactively"
+msgstr "Blöcke interaktiv auswählen"
-#: builtin/apply.c:169
-#, c-format
-msgid "unrecognized whitespace ignore option '%s'"
-msgstr "nicht erkannte Option zum Ignorieren von Whitespace: '%s'"
+#: builtin/add.c:271
+msgid "edit current diff and apply"
+msgstr "aktuelle Unterschiede editieren und anwenden"
-#: builtin/apply.c:854
-#, c-format
-msgid "Cannot prepare timestamp regexp %s"
-msgstr "Kann regulären Ausdruck für Zeitstempel %s nicht verarbeiten"
+#: builtin/add.c:272
+msgid "allow adding otherwise ignored files"
+msgstr "das Hinzufügen andernfalls ignorierter Dateien erlauben"
-#: builtin/apply.c:863
-#, c-format
-msgid "regexec returned %d for input: %s"
-msgstr "Ausführung des regulären Ausdrucks gab %d zurück. Eingabe: %s"
+#: builtin/add.c:273
+msgid "update tracked files"
+msgstr "versionierte Dateien aktualisieren"
-#: builtin/apply.c:947
-#, c-format
-msgid "unable to find filename in patch at line %d"
-msgstr "Konnte keinen Dateinamen in Zeile %d des Patches finden."
+#: builtin/add.c:274
+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/apply.c:984
-#, c-format
-msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
+#: builtin/add.c:275
+msgid "add changes from all tracked and untracked files"
msgstr ""
-"git apply: ungültiges 'git-diff' - erwartete /dev/null, erhielt %s in Zeile "
-"%d"
+"Änderungen von allen versionierten und unversionierten Dateien hinzufügen"
-#: builtin/apply.c:989
-#, c-format
-msgid "git apply: bad git-diff - inconsistent new filename on line %d"
-msgstr ""
-"git apply: ungültiges 'git-diff' - Inkonsistenter neuer Dateiname in Zeile %d"
+#: builtin/add.c:278
+msgid "ignore paths removed in the working tree (same as --no-all)"
+msgstr "gelöschte Pfade im Arbeitsverzeichnis ignorieren (genau wie --no-all)"
-#: builtin/apply.c:990
-#, c-format
-msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+#: builtin/add.c:280
+msgid "don't add, only refresh the index"
+msgstr "nichts hinzufügen, nur den Index aktualisieren"
+
+#: builtin/add.c:281
+msgid "just skip files which cannot be added because of errors"
msgstr ""
-"git apply: ungültiges 'git-diff' - Inkonsistenter alter Dateiname in Zeile %d"
+"Dateien überspringen, die aufgrund von Fehlern nicht hinzugefügt werden "
+"konnten"
-#: builtin/apply.c:995
-#, c-format
-msgid "git apply: bad git-diff - expected /dev/null on line %d"
-msgstr "git apply: ungültiges 'git-diff' - erwartete /dev/null in Zeile %d"
+#: builtin/add.c:282
+msgid "check if - even missing - files are ignored in dry run"
+msgstr "prüfen ob - auch fehlende - Dateien im Probelauf ignoriert werden"
-#: builtin/apply.c:1489
-#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr "recount: unerwartete Zeile: %.*s"
+#: builtin/add.c:283 builtin/update-index.c:947
+msgid "(+/-)x"
+msgstr "(+/-)x"
-#: builtin/apply.c:1550
-#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s"
+#: builtin/add.c:283 builtin/update-index.c:948
+msgid "override the executable bit of the listed files"
+msgstr "das \"ausführbar\"-Bit der aufgelisteten Dateien überschreiben"
-#: builtin/apply.c:1567
+#: builtin/add.c:305
#, 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] ""
-"Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn "
-"%d vorangestellter Teil des Pfades entfernt wird (Zeile %d)"
-msgstr[1] ""
-"Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn "
-"%d vorangestellte Teile des Pfades entfernt werden (Zeile %d)"
-
-#: builtin/apply.c:1743
-msgid "new file depends on old contents"
-msgstr "neue Datei hängt von alten Inhalten ab"
+msgid "Use -f if you really want to add them.\n"
+msgstr "Verwenden Sie -f wenn Sie diese wirklich hinzufügen möchten.\n"
-#: builtin/apply.c:1745
-msgid "deleted file still has contents"
-msgstr "entfernte Datei hat noch Inhalte"
+#: builtin/add.c:312
+msgid "adding files failed"
+msgstr "Hinzufügen von Dateien fehlgeschlagen"
-#: builtin/apply.c:1774
-#, c-format
-msgid "corrupt patch at line %d"
-msgstr "fehlerhafter Patch bei Zeile %d"
+#: builtin/add.c:348
+msgid "-A and -u are mutually incompatible"
+msgstr "Die Optionen -A und -u sind zueinander inkompatibel."
-#: builtin/apply.c:1810
-#, c-format
-msgid "new file %s depends on old contents"
-msgstr "neue Datei %s hängt von alten Inhalten ab"
+#: builtin/add.c:355
+msgid "Option --ignore-missing can only be used together with --dry-run"
+msgstr ""
+"Die Option --ignore-missing kann nur zusammen mit --dry-run verwendet werden."
-#: builtin/apply.c:1812
+#: builtin/add.c:359
#, c-format
-msgid "deleted file %s still has contents"
-msgstr "entfernte Datei %s hat noch Inhalte"
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr "--chmod Parameter '%s' muss entweder -x oder +x sein"
-#: builtin/apply.c:1815
+#: builtin/add.c:374
#, c-format
-msgid "** warning: file %s becomes empty but is not deleted"
-msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt."
+msgid "Nothing specified, nothing added.\n"
+msgstr "Nichts spezifiziert, nichts hinzugefügt.\n"
-#: builtin/apply.c:1962
+#: builtin/add.c:375
#, c-format
-msgid "corrupt binary patch at line %d: %.*s"
-msgstr "fehlerhafter Binär-Patch bei Zeile %d: %.*s"
+msgid "Maybe you wanted to say 'git add .'?\n"
+msgstr "Meinten Sie vielleicht 'git add .'?\n"
-#: builtin/apply.c:1999
-#, c-format
-msgid "unrecognized binary patch at line %d"
-msgstr "nicht erkannter Binär-Patch bei Zeile %d"
+#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279
+#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350
+#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:244
+msgid "index file corrupt"
+msgstr "Index-Datei beschädigt"
-#: builtin/apply.c:2154
-#, c-format
-msgid "patch with only garbage at line %d"
-msgstr "Patch mit nutzlosen Informationen bei Zeile %d"
+#: builtin/am.c:414
+msgid "could not parse author script"
+msgstr "konnte Autor-Skript nicht parsen"
-#: builtin/apply.c:2244
+#: builtin/am.c:491
#, c-format
-msgid "unable to read symlink %s"
-msgstr "konnte symbolische Verknüpfung %s nicht lesen"
+msgid "'%s' was deleted by the applypatch-msg hook"
+msgstr "'%s' wurde durch den applypatch-msg Hook entfernt"
-#: builtin/apply.c:2248
+#: builtin/am.c:532
#, c-format
-msgid "unable to open or read %s"
-msgstr "konnte %s nicht öffnen oder lesen"
+msgid "Malformed input line: '%s'."
+msgstr "Fehlerhafte Eingabezeile: '%s'."
-#: builtin/apply.c:2901
+#: builtin/am.c:569
#, c-format
-msgid "invalid start of line: '%c'"
-msgstr "Ungültiger Zeilenanfang: '%c'"
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'"
-#: builtin/apply.c:3020
-#, c-format
-msgid "Hunk #%d succeeded at %d (offset %d line)."
-msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
-msgstr[0] "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeile versetzt)"
-msgstr[1] ""
-"Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeilen versetzt)"
+#: builtin/am.c:595
+msgid "fseek failed"
+msgstr "\"fseek\" fehlgeschlagen"
-#: builtin/apply.c:3032
+#: builtin/am.c:775
#, 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"
+msgid "could not parse patch '%s'"
+msgstr "konnte Patch '%s' nicht parsen"
-#: builtin/apply.c:3038
-#, c-format
-msgid ""
-"while searching for:\n"
-"%.*s"
-msgstr ""
-"bei der Suche nach:\n"
-"%.*s"
+#: builtin/am.c:840
+msgid "Only one StGIT patch series can be applied at once"
+msgstr "Es kann nur eine StGIT Patch-Serie auf einmal angewendet werden."
-#: builtin/apply.c:3060
-#, c-format
-msgid "missing binary patch data for '%s'"
-msgstr "keine Daten in Binär-Patch für '%s'"
+#: builtin/am.c:887
+msgid "invalid timestamp"
+msgstr "ungültiger Zeitstempel"
-#: builtin/apply.c:3163
-#, c-format
-msgid "binary patch does not apply to '%s'"
-msgstr "Konnte Binär-Patch nicht auf '%s' anwenden"
+#: builtin/am.c:890 builtin/am.c:898
+msgid "invalid Date line"
+msgstr "Ungültige \"Date\"-Zeile"
-#: builtin/apply.c:3169
-#, c-format
-msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
-msgstr ""
-"Binär-Patch für '%s' erzeugt falsches Ergebnis (erwartete %s, bekam %s)"
+#: builtin/am.c:895
+msgid "invalid timezone offset"
+msgstr "Ungültiger Offset in der Zeitzone"
-#: builtin/apply.c:3190
-#, c-format
-msgid "patch failed: %s:%ld"
-msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld"
+#: builtin/am.c:984
+msgid "Patch format detection failed."
+msgstr "Patch-Formaterkennung fehlgeschlagen."
-#: builtin/apply.c:3314
+#: builtin/am.c:989 builtin/clone.c:379
#, c-format
-msgid "cannot checkout %s"
-msgstr "kann %s nicht auschecken"
+msgid "failed to create directory '%s'"
+msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
-#: builtin/apply.c:3370
-#, c-format
-msgid "reading from '%s' beyond a symbolic link"
-msgstr "'%s' ist hinter einer symbolischen Verknüpfung"
+#: builtin/am.c:993
+msgid "Failed to split patches."
+msgstr "Fehler beim Aufteilen der Patches."
-#: builtin/apply.c:3399 builtin/apply.c:3630
-#, c-format
-msgid "path %s has been renamed/deleted"
-msgstr "Pfad %s wurde umbenannt/gelöscht"
+#: builtin/am.c:1125 builtin/commit.c:376
+msgid "unable to write index file"
+msgstr "Konnte Index-Datei nicht schreiben."
-#: builtin/apply.c:3482 builtin/apply.c:3644
+#: builtin/am.c:1176
#, c-format
-msgid "%s: does not exist in index"
-msgstr "%s ist nicht im Index"
+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/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658
+#: builtin/am.c:1177
#, c-format
-msgid "%s: %s"
-msgstr "%s: %s"
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+msgstr ""
+"Falls Sie diesen Patch auslassen möchten, führen Sie stattdessen \"%s --skip"
+"\" aus."
-#: builtin/apply.c:3491 builtin/apply.c:3652
+#: builtin/am.c:1178
#, c-format
-msgid "%s: does not match index"
-msgstr "%s entspricht nicht der Version im Index"
+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/apply.c:3597
-msgid "removal patch leaves file contents"
-msgstr "Lösch-Patch hinterlässt Dateiinhalte"
+#: builtin/am.c:1316
+msgid "Patch is empty. Was it split wrong?"
+msgstr "Patch ist leer. War dessen Aufteilung falsch?"
-#: builtin/apply.c:3669
+#: builtin/am.c:1390 builtin/log.c:1550
#, c-format
-msgid "%s: wrong type"
-msgstr "%s: falscher Typ"
+msgid "invalid ident line: %s"
+msgstr "Ungültige Identifikationszeile: %s"
-#: builtin/apply.c:3671
+#: builtin/am.c:1417
#, c-format
-msgid "%s has type %o, expected %o"
-msgstr "%s ist vom Typ %o, erwartete %o"
+msgid "unable to parse commit %s"
+msgstr "Konnte Commit '%s' nicht parsen."
-#: builtin/apply.c:3822 builtin/apply.c:3824
-#, c-format
-msgid "invalid path '%s'"
-msgstr "Ungültiger Pfad '%s'"
+#: builtin/am.c:1610
+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/apply.c:3879
-#, c-format
-msgid "%s: already exists in index"
-msgstr "%s ist bereits bereitgestellt"
+#: builtin/am.c:1612
+msgid "Using index info to reconstruct a base tree..."
+msgstr ""
+"Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis "
+"nachzustellen ..."
-#: builtin/apply.c:3882
-#, c-format
-msgid "%s: already exists in working directory"
-msgstr "%s existiert bereits im Arbeitsverzeichnis"
+#: builtin/am.c:1631
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
+msgstr ""
+"Haben Sie den Patch per Hand editiert?\n"
+"Er kann nicht auf die Blobs in seiner 'index' Zeile angewendet werden."
-#: builtin/apply.c:3902
-#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o)"
-msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o)"
+#: builtin/am.c:1637
+msgid "Falling back to patching base and 3-way merge..."
+msgstr "Falle zurück zum Patchen der Basis und zum 3-Wege-Merge ..."
-#: builtin/apply.c:3907
-#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o) of %s"
-msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o) von %s"
+#: builtin/am.c:1662
+msgid "Failed to merge in the changes."
+msgstr "Merge der Änderungen fehlgeschlagen."
-#: builtin/apply.c:3927
-#, c-format
-msgid "affected file '%s' is beyond a symbolic link"
-msgstr "betroffene Datei '%s' ist hinter einer symbolischen Verknüpfung"
+#: builtin/am.c:1686 builtin/merge.c:628
+msgid "git write-tree failed to write a tree"
+msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl"
-#: builtin/apply.c:3931
-#, c-format
-msgid "%s: patch does not apply"
-msgstr "%s: Patch konnte nicht angewendet werden"
+#: builtin/am.c:1693
+msgid "applying to an empty history"
+msgstr "auf leere Historie anwenden"
-#: builtin/apply.c:3945
-#, c-format
-msgid "Checking patch %s..."
-msgstr "Prüfe Patch %s ..."
+#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798
+#: builtin/merge.c:823
+msgid "failed to write commit object"
+msgstr "Fehler beim Schreiben des Commit-Objektes."
-#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/am.c:1739 builtin/am.c:1743
#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen"
+msgid "cannot resume: %s does not exist."
+msgstr "Kann nicht fortsetzen: %s existiert nicht"
-#: builtin/apply.c:4182
-#, c-format
-msgid "unable to remove %s from index"
-msgstr "konnte %s nicht aus dem Index entfernen"
+#: builtin/am.c:1759
+msgid "cannot be interactive without stdin connected to a terminal."
+msgstr ""
+"Kann nicht interaktiv sein, ohne dass die Standard-Eingabe mit einem "
+"Terminal verbunden ist."
-#: builtin/apply.c:4215
-#, c-format
-msgid "corrupt patch for submodule %s"
-msgstr "fehlerhafter Patch für Submodul %s"
+#: builtin/am.c:1764
+msgid "Commit Body is:"
+msgstr "Commit-Beschreibung ist:"
-#: builtin/apply.c:4219
-#, c-format
-msgid "unable to stat newly created file '%s'"
-msgstr "konnte neu erstellte Datei '%s' nicht lesen"
+#. 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:1774
+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/apply.c:4224
+#: builtin/am.c:1824
#, 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"
+msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgstr "Geänderter Index: kann Patches nicht anwenden (geändert: %s)"
-#: builtin/apply.c:4227 builtin/apply.c:4340
+#: builtin/am.c:1861 builtin/am.c:1933
#, c-format
-msgid "unable to add cache entry for %s"
-msgstr "kann für %s keinen Eintrag in den Zwischenspeicher hinzufügen"
+msgid "Applying: %.*s"
+msgstr "Wende an: %.*s"
-#: builtin/apply.c:4260
-#, c-format
-msgid "closing file '%s'"
-msgstr "schließe Datei '%s'"
+#: builtin/am.c:1877
+msgid "No changes -- Patch already applied."
+msgstr "Keine Änderungen -- Patches bereits angewendet."
-#: builtin/apply.c:4313
+#: builtin/am.c:1885
#, c-format
-msgid "unable to write file '%s' mode %o"
-msgstr "konnte Datei '%s' mit Modus %o nicht schreiben"
+msgid "Patch failed at %s %.*s"
+msgstr "Anwendung des Patches fehlgeschlagen bei %s %.*s"
-#: builtin/apply.c:4403
+#: builtin/am.c:1891
#, c-format
-msgid "Applied patch %s cleanly."
-msgstr "Patch %s sauber angewendet"
+msgid "The copy of the patch that failed is found in: %s"
+msgstr "Die Kopie des fehlgeschlagenen Patches befindet sich in: %s"
-#: builtin/apply.c:4411
-msgid "internal error"
-msgstr "interner Fehler"
+#: builtin/am.c:1936
+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 ""
+"Keine Änderungen - haben Sie vergessen 'git add' zu benutzen?\n"
+"Wenn keine Änderungen mehr zum Commit vorzumerken sind, könnten\n"
+"diese bereits anderweitig eingefügt worden sein; Sie könnten diesen Patch\n"
+"auslassen."
-#: builtin/apply.c:4414
-#, c-format
-msgid "Applying patch %%s with %d reject..."
-msgid_plural "Applying patch %%s with %d rejects..."
-msgstr[0] "Wende Patch %%s mit %d Zurückweisung an..."
-msgstr[1] "Wende Patch %%s mit %d Zurückweisungen an..."
+#: builtin/am.c:1943
+msgid ""
+"You still have unmerged paths in your index.\n"
+"Did you forget to use 'git add'?"
+msgstr ""
+"Sie haben immer noch nicht zusammengeführte Pfade im Index.\n"
+"Haben Sie vergessen 'git add' zu benutzen?"
-#: builtin/apply.c:4424
+#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
+#: builtin/reset.c:316
#, c-format
-msgid "truncating .rej filename to %.*s.rej"
-msgstr "Verkürze Name von .rej Datei zu %.*s.rej"
+msgid "Could not parse object '%s'."
+msgstr "Konnte Objekt '%s' nicht parsen."
-#: builtin/apply.c:4432
-#, c-format
-msgid "cannot open %s: %s"
-msgstr "Kann %s nicht öffnen: %s"
+#: builtin/am.c:2103
+msgid "failed to clean index"
+msgstr "Fehler beim Bereinigen des Index"
-#: builtin/apply.c:4445
-#, c-format
-msgid "Hunk #%d applied cleanly."
-msgstr "Patch-Bereich #%d sauber angewendet."
+#: builtin/am.c:2137
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
+msgstr ""
+"Sie scheinen seit dem letzten gescheiterten 'am' HEAD geändert zu haben.\n"
+"Keine Zurücksetzung zu ORIG_HEAD."
-#: builtin/apply.c:4448
+#: builtin/am.c:2200
#, c-format
-msgid "Rejected hunk #%d."
-msgstr "Patch-Block #%d zurückgewiesen."
+msgid "Invalid value for --patch-format: %s"
+msgstr "Ungültiger Wert für --patch-format: %s"
-#: builtin/apply.c:4537
-#, c-format
-msgid "Skipped patch '%s'."
-msgstr "Patch '%s' ausgelassen."
+#: builtin/am.c:2233
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+msgstr "git am [<Optionen>] [(<mbox> | <E-Mail-Verzeichnis>)...]"
-#: builtin/apply.c:4545
-msgid "unrecognized input"
-msgstr "nicht erkannte Eingabe"
+#: builtin/am.c:2234
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<Optionen>] (--continue | --skip | --abort)"
-#: builtin/apply.c:4556
-msgid "unable to read index file"
-msgstr "Konnte Index-Datei nicht lesen"
+#: builtin/am.c:2240
+msgid "run interactively"
+msgstr "interaktiv ausführen"
-#: builtin/apply.c:4701
-msgid "--3way outside a repository"
-msgstr ""
-"Die Option --3way kann nicht außerhalb eines Repositories verwendet werden."
+#: builtin/am.c:2242
+msgid "historical option -- no-op"
+msgstr "historische Option -- kein Effekt"
-#: builtin/apply.c:4709
-msgid "--index outside a repository"
-msgstr ""
-"Die Option --index kann nicht außerhalb eines Repositories verwendet werden."
+#: builtin/am.c:2244
+msgid "allow fall back on 3way merging if needed"
+msgstr "erlaube, falls notwendig, das Zurückfallen auf einen 3-Wege-Merge"
-#: builtin/apply.c:4712
-msgid "--cached outside a repository"
-msgstr ""
-"Die Option --cached kann nicht außerhalb eines Repositories verwendet werden."
+#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
+#: builtin/repack.c:172
+msgid "be quiet"
+msgstr "weniger Ausgaben"
-#: builtin/apply.c:4745
-#, c-format
-msgid "can't open patch '%s'"
-msgstr "kann Patch '%s' nicht öffnen"
+#: builtin/am.c:2247
+msgid "add a Signed-off-by line to the commit message"
+msgstr "der Commit-Beschreibung eine Signed-off-by Zeile hinzufügen"
-#: builtin/apply.c:4760
-#, c-format
-msgid "squelched %d whitespace error"
-msgid_plural "squelched %d whitespace errors"
-msgstr[0] "unterdrückte %d Whitespace-Fehler"
-msgstr[1] "unterdrückte %d Whitespace-Fehler"
+#: builtin/am.c:2250
+msgid "recode into utf8 (default)"
+msgstr "nach UTF-8 umkodieren (Standard)"
-#: builtin/apply.c:4766 builtin/apply.c:4776
-#, 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."
+#: builtin/am.c:2252
+msgid "pass -k flag to git-mailinfo"
+msgstr "-k an git-mailinfo übergeben"
-#: builtin/apply.c:4800
-msgid "don't apply changes matching the given path"
-msgstr "keine Änderungen im angegebenen Pfad anwenden"
+#: builtin/am.c:2254
+msgid "pass -b flag to git-mailinfo"
+msgstr "-b an git-mailinfo übergeben"
-#: builtin/apply.c:4803
-msgid "apply changes matching the given path"
-msgstr "Änderungen nur im angegebenen Pfad anwenden"
+#: builtin/am.c:2256
+msgid "pass -m flag to git-mailinfo"
+msgstr "-m an git-mailinfo übergeben"
-#: builtin/apply.c:4806
-msgid "remove <num> leading slashes from traditional diff paths"
-msgstr ""
-"<Anzahl> vorangestellte Schrägstriche von herkömmlichen Differenzpfaden "
-"entfernen"
+#: builtin/am.c:2258
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+msgstr "--keep-cr an git-mailsplit für mbox-Format übergeben"
-#: builtin/apply.c:4809
-msgid "ignore additions made by the patch"
-msgstr "hinzugefügte Zeilen des Patches ignorieren"
+#: builtin/am.c:2261
+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/apply.c:4811
-msgid "instead of applying the patch, output diffstat for the input"
-msgstr ""
-"anstatt der Anwendung des Patches, den \"diffstat\" für die Eingabe "
-"ausgegeben"
+#: builtin/am.c:2264
+msgid "strip everything before a scissors line"
+msgstr "alles vor einer Scheren-Zeile entfernen"
-#: builtin/apply.c:4815
-msgid "show number of added and deleted lines in decimal notation"
-msgstr ""
-"die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation anzeigen"
+#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
+#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
+#: builtin/am.c:2293
+msgid "pass it through git-apply"
+msgstr "an git-apply übergeben"
-#: builtin/apply.c:4817
-msgid "instead of applying the patch, output a summary for the input"
-msgstr ""
-"anstatt der Anwendung des Patches, eine Zusammenfassung für die Eingabe "
-"ausgeben"
+#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
+#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135 builtin/pull.c:194
+#: builtin/repack.c:181 builtin/repack.c:185 builtin/show-branch.c:644
+#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
+#: parse-options.h:134 parse-options.h:245
+msgid "n"
+msgstr "Anzahl"
-#: builtin/apply.c:4819
-msgid "instead of applying the patch, see if the patch is applicable"
-msgstr ""
-"anstatt der Anwendung des Patches, zeige ob Patch angewendet werden kann"
+#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/tag.c:372
+msgid "format"
+msgstr "Format"
-#: builtin/apply.c:4821
-msgid "make sure the patch is applicable to the current index"
-msgstr ""
-"sicherstellen, dass der Patch mit dem aktuellen Index angewendet werden kann"
+#: builtin/am.c:2290
+msgid "format the patch(es) are in"
+msgstr "Patch-Format"
-#: builtin/apply.c:4823
-msgid "apply a patch without touching the working tree"
-msgstr "Patch anwenden, ohne Änderungen im Arbeitsverzeichnis vorzunehmen"
+#: builtin/am.c:2296
+msgid "override error message when patch failure occurs"
+msgstr "Meldung bei fehlerhafter Patch-Anwendung überschreiben"
-#: builtin/apply.c:4825
-msgid "accept a patch that touches outside the working area"
-msgstr ""
-"Patch anwenden, der Änderungen außerhalb des Arbeitsverzeichnisses vornimmt"
+#: builtin/am.c:2298
+msgid "continue applying patches after resolving a conflict"
+msgstr "Anwendung der Patches nach Auflösung eines Konfliktes fortsetzen"
-#: builtin/apply.c:4827
-msgid "also apply the patch (use with --stat/--summary/--check)"
-msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)"
+#: builtin/am.c:2301
+msgid "synonyms for --continue"
+msgstr "Synonyme für --continue"
-#: builtin/apply.c:4829
-msgid "attempt three-way merge if a patch does not apply"
-msgstr "versuche 3-Wege-Merge, wenn der Patch nicht angewendet werden konnte"
+#: builtin/am.c:2304
+msgid "skip the current patch"
+msgstr "den aktuellen Patch auslassen"
-#: builtin/apply.c:4831
-msgid "build a temporary index based on embedded index information"
+#: builtin/am.c:2307
+msgid "restore the original branch and abort the patching operation."
msgstr ""
-"einen temporären Index, basierend auf den integrierten Index-Informationen, "
-"erstellen"
-
-#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426
-msgid "paths are separated with NUL character"
-msgstr "Pfade sind getrennt durch NUL Zeichen"
+"ursprünglichen Branch wiederherstellen und Anwendung der Patches abbrechen"
-#: builtin/apply.c:4836
-msgid "ensure at least <n> lines of context match"
-msgstr ""
-"sicher stellen, dass mindestens <n> Zeilen des Kontextes übereinstimmen"
+#: builtin/am.c:2311
+msgid "lie about committer date"
+msgstr "Autor-Datum als Commit-Datum verwenden"
-#: builtin/apply.c:4838
-msgid "detect new or modified lines that have whitespace errors"
-msgstr "neue oder geänderte Zeilen, die Whitespace-Fehler haben, ermitteln"
+#: builtin/am.c:2313
+msgid "use current timestamp for author date"
+msgstr "aktuellen Zeitstempel als Autor-Datum verwenden"
-#: builtin/apply.c:4841 builtin/apply.c:4844
-msgid "ignore changes in whitespace when finding context"
-msgstr "Änderungen im Whitespace bei der Suche des Kontextes ignorieren"
+#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229
+#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355
+msgid "key-id"
+msgstr "GPG-Schlüsselkennung"
-#: builtin/apply.c:4847
-msgid "apply the patch in reverse"
-msgstr "den Patch in umgekehrter Reihenfolge anwenden"
+#: builtin/am.c:2316
+msgid "GPG-sign commits"
+msgstr "Commits mit GPG signieren"
-#: builtin/apply.c:4849
-msgid "don't expect at least one line of context"
-msgstr "keinen Kontext erwarten"
+#: builtin/am.c:2319
+msgid "(internal use for git-rebase)"
+msgstr "(intern für git-rebase verwendet)"
-#: builtin/apply.c:4851
-msgid "leave the rejected hunks in corresponding *.rej files"
+#: builtin/am.c:2334
+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 ""
-"zurückgewiesene Patch-Blöcke in entsprechenden *.rej Dateien hinterlassen"
+"Die -b/--binary Option hat seit Langem keinen Effekt und wird\n"
+"entfernt. Bitte verwenden Sie diese nicht mehr."
-#: builtin/apply.c:4853
-msgid "allow overlapping hunks"
-msgstr "sich überlappende Patch-Blöcke erlauben"
+#: builtin/am.c:2341
+msgid "failed to read the index"
+msgstr "Fehler beim Lesen des Index"
-#: builtin/apply.c:4856
-msgid "tolerate incorrectly detected missing new-line at the end of file"
-msgstr "fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende tolerieren"
+#: builtin/am.c:2356
+#, c-format
+msgid "previous rebase directory %s still exists but mbox given."
+msgstr "Vorheriges Rebase-Verzeichnis %s existiert noch, aber mbox gegeben."
-#: builtin/apply.c:4859
-msgid "do not trust the line counts in the hunk headers"
-msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen"
+#: builtin/am.c:2380
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
+msgstr ""
+"Stray %s Verzeichnis gefunden.\n"
+"Benutzen Sie \"git am --abort\", um es zu entfernen."
-#: builtin/apply.c:4862
-msgid "prepend <root> to all filenames"
-msgstr "<Wurzelverzeichnis> vor alle Dateinamen stellen"
+#: builtin/am.c:2386
+msgid "Resolve operation not in progress, we are not resuming."
+msgstr "Es ist keine Auflösung im Gange, es wird nicht fortgesetzt."
+
+#: builtin/apply.c:8
+msgid "git apply [<options>] [<patch>...]"
+msgstr "git apply [<Optionen>] [<Patch>...]"
#: builtin/archive.c:17
#, c-format
msgid "Blaming lines"
msgstr "Verarbeite Zeilen"
-#: builtin/blame.c:2536
+#: builtin/blame.c:2577
msgid "Show blame entries as we find them, incrementally"
msgstr "\"blame\"-Einträge schrittweise anzeigen, während wir sie generieren"
-#: builtin/blame.c:2537
+#: builtin/blame.c:2578
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "leere SHA-1 für Grenz-Commits anzeigen (Standard: aus)"
-#: builtin/blame.c:2538
+#: builtin/blame.c:2579
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Ursprungs-Commit nicht als Grenzen behandeln (Standard: aus)"
-#: builtin/blame.c:2539
+#: builtin/blame.c:2580
msgid "Show work cost statistics"
msgstr "Statistiken zum Arbeitsaufwand anzeigen"
-#: builtin/blame.c:2540
+#: builtin/blame.c:2581
msgid "Force progress reporting"
msgstr "Fortschrittsanzeige erzwingen"
-#: builtin/blame.c:2541
+#: builtin/blame.c:2582
msgid "Show output score for blame entries"
msgstr "Ausgabebewertung für \"blame\"-Einträge anzeigen"
-#: builtin/blame.c:2542
+#: builtin/blame.c:2583
msgid "Show original filename (Default: auto)"
msgstr "ursprünglichen Dateinamen anzeigen (Standard: auto)"
-#: builtin/blame.c:2543
+#: builtin/blame.c:2584
msgid "Show original linenumber (Default: off)"
msgstr "ursprüngliche Zeilennummer anzeigen (Standard: aus)"
-#: builtin/blame.c:2544
+#: builtin/blame.c:2585
msgid "Show in a format designed for machine consumption"
msgstr "Anzeige in einem Format für maschinelle Auswertung"
-#: builtin/blame.c:2545
+#: builtin/blame.c:2586
msgid "Show porcelain format with per-line commit information"
msgstr ""
"Anzeige in Format für Fremdprogramme mit Commit-Informationen pro Zeile"
-#: builtin/blame.c:2546
+#: builtin/blame.c:2587
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
"Den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)"
-#: builtin/blame.c:2547
+#: builtin/blame.c:2588
msgid "Show raw timestamp (Default: off)"
msgstr "Unbearbeiteten Zeitstempel anzeigen (Standard: aus)"
-#: builtin/blame.c:2548
+#: builtin/blame.c:2589
msgid "Show long commit SHA1 (Default: off)"
msgstr "Langen Commit-SHA1 anzeigen (Standard: aus)"
-#: builtin/blame.c:2549
+#: builtin/blame.c:2590
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Den Namen des Autors und den Zeitstempel unterdrücken (Standard: aus)"
-#: builtin/blame.c:2550
+#: builtin/blame.c:2591
msgid "Show author email instead of name (Default: off)"
msgstr ""
"Anstatt des Namens die E-Mail-Adresse des Autors anzeigen (Standard: aus)"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2592
msgid "Ignore whitespace differences"
msgstr "Unterschiede im Whitespace ignorieren"
-#: builtin/blame.c:2552
+#: builtin/blame.c:2599
+msgid "Use an experimental indent-based heuristic to improve diffs"
+msgstr ""
+"eine experimentelle, auf Einrückungen basierende Heuristik zur Verbesserung\n"
+"der Darstellung von Unterschieden verwenden"
+
+#: builtin/blame.c:2600
+msgid "Use an experimental blank-line-based heuristic to improve diffs"
+msgstr ""
+"eine experimentelle, auf Leerzeilen basierende Heuristik zur Verbesserung\n"
+"der Darstellung von Unterschieden verwenden"
+
+#: builtin/blame.c:2602
msgid "Spend extra cycles to find better match"
msgstr "Länger arbeiten, um bessere Übereinstimmungen zu finden"
-#: builtin/blame.c:2553
+#: builtin/blame.c:2603
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Commits von <Datei> benutzen, anstatt \"git-rev-list\" aufzurufen"
-#: builtin/blame.c:2554
+#: builtin/blame.c:2604
msgid "Use <file>'s contents as the final image"
msgstr "Inhalte der <Datei>en als endgültiges Abbild benutzen"
-#: builtin/blame.c:2555 builtin/blame.c:2556
+#: builtin/blame.c:2605 builtin/blame.c:2606
msgid "score"
msgstr "Bewertung"
-#: builtin/blame.c:2555
+#: builtin/blame.c:2605
msgid "Find line copies within and across files"
msgstr "kopierte Zeilen innerhalb oder zwischen Dateien finden"
-#: builtin/blame.c:2556
+#: builtin/blame.c:2606
msgid "Find line movements within and across files"
msgstr "verschobene Zeilen innerhalb oder zwischen Dateien finden"
-#: builtin/blame.c:2557
+#: builtin/blame.c:2607
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2557
+#: builtin/blame.c:2607
msgid "Process only line range n,m, counting from 1"
msgstr "nur Zeilen im Bereich n,m verarbeiten, gezählt von 1"
+#: builtin/blame.c:2654
+msgid "--progress can't be used with --incremental or porcelain formats"
+msgstr ""
+"--progress kann nicht mit --incremental oder Formaten für Fremdprogramme\n"
+"verwendet werden"
+
#. 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:2649
+#: builtin/blame.c:2700
msgid "4 years, 11 months ago"
msgstr "vor 4 Jahren, und 11 Monaten"
+#: builtin/blame.c:2780
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents und --reverse funktionieren gemeinsam nicht."
+
+#: builtin/blame.c:2800
+msgid "cannot use --contents with final commit object name"
+msgstr "kann --contents nicht mit endgültigem Namen des Commit-Objektes benutzen"
+
+#: builtin/blame.c:2805
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr ""
+"--reverse und --first-parent zusammen erfordern die Angabe eines endgültigen\n"
+"Commits"
+
+#: builtin/blame.c:2832
+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"
+
+#: builtin/blame.c:2843
+#, c-format
+msgid "no such path %s in %s"
+msgstr "Pfad %s nicht in %s"
+
+#: builtin/blame.c:2854
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "kann Blob %s für Pfad '%s' nicht lesen"
+
+#: builtin/blame.c:2873
+#, 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/branch.c:26
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<Optionen>] [-r | -a] [--merged | --no-merged]"
msgid "change the upstream info"
msgstr "Informationen zum Upstream-Branch ändern"
+#: builtin/branch.c:660
+msgid "Unset the upstream info"
+msgstr "Informationen zum Upstream-Branch entfernen"
+
#: builtin/branch.c:661
msgid "use colored output"
msgstr "farbige Ausgaben verwenden"
msgid "field name to sort on"
msgstr "sortiere nach diesem Feld"
-#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402
-#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404
+#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570
#: builtin/tag.c:369
msgid "object"
msgstr "Objekt"
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Konnte HEAD nicht als gültige Referenz auflösen."
-#: builtin/branch.c:709 builtin/clone.c:707
+#: builtin/branch.c:709 builtin/clone.c:706
msgid "HEAD not found below refs/heads!"
msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!"
msgid "Need a repository to unbundle."
msgstr "Zum Entpacken wird ein Repository benötigt."
-#: builtin/cat-file.c:443
+#: builtin/cat-file.c:513
msgid ""
-"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
-"<type>|--textconv) <object>"
-msgstr ""
-"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
-"<Art>|--textconv) <Objekt>"
+"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 | <Art> | --textconv | --filters) [--path=<Pfad>] <Objekt>"
-#: builtin/cat-file.c:444
-msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
-msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
+#: builtin/cat-file.c:514
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
+msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]"
-#: builtin/cat-file.c:481
+#: builtin/cat-file.c:551
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<Art> kann sein: blob, tree, commit, tag"
-#: builtin/cat-file.c:482
+#: builtin/cat-file.c:552
msgid "show object type"
msgstr "Objektart anzeigen"
-#: builtin/cat-file.c:483
+#: builtin/cat-file.c:553
msgid "show object size"
msgstr "Objektgröße anzeigen"
-#: builtin/cat-file.c:485
+#: builtin/cat-file.c:555
msgid "exit with zero when there's no error"
msgstr "mit Rückgabewert 0 beenden, wenn kein Fehler aufgetreten ist"
-#: builtin/cat-file.c:486
+#: builtin/cat-file.c:556
msgid "pretty-print object's content"
msgstr "ansprechende Anzeige des Objektinhaltes"
-#: builtin/cat-file.c:488
+#: builtin/cat-file.c:558
msgid "for blob objects, run textconv on object's content"
msgstr "eine Textkonvertierung auf den Inhalt von Blob-Objekten ausführen"
-#: builtin/cat-file.c:490
+#: builtin/cat-file.c:560
+msgid "for blob objects, run filters on object's content"
+msgstr "für Blob-Objekte, Filter auf Objekt-Inhalte ausführen"
+
+#: builtin/cat-file.c:561 git-submodule.sh:923
+msgid "blob"
+msgstr "Blob"
+
+#: builtin/cat-file.c:562
+msgid "use a specific path for --textconv/--filters"
+msgstr "einen bestimmten Pfad für --textconv/--filters verwenden"
+
+#: builtin/cat-file.c:564
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "-s und -t mit beschädigten Objekten erlauben"
-#: builtin/cat-file.c:491
+#: builtin/cat-file.c:565
msgid "buffer --batch output"
msgstr "Ausgabe von --batch puffern"
-#: builtin/cat-file.c:493
+#: builtin/cat-file.c:567
msgid "show info and content of objects fed from the standard input"
msgstr ""
"Anzeige von Informationen und Inhalt von Objekten, gelesen von der Standard-"
"Eingabe"
-#: builtin/cat-file.c:496
+#: builtin/cat-file.c:570
msgid "show info about objects fed from the standard input"
msgstr ""
"Anzeige von Informationen über Objekte, gelesen von der Standard-Eingabe"
-#: builtin/cat-file.c:499
+#: builtin/cat-file.c:573
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"symbolischen Verknüpfungen innerhalb des Repositories folgen (verwendet mit "
"--batch oder --batch-check)"
-#: builtin/cat-file.c:501
+#: builtin/cat-file.c:575
msgid "show all objects with --batch or --batch-check"
msgstr "alle Objekte mit --batch oder --batch-check anzeigen"
msgid "use .gitattributes only from the index"
msgstr "nur .gitattributes vom Index verwenden"
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97
+#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
msgid "read file names from stdin"
msgstr "Dateinamen von der Standard-Eingabe lesen"
msgid "terminate input and output records by a NUL character"
msgstr "Einträge von Ein- und Ausgabe mit NUL-Zeichen abschließen"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "Fortschrittsanzeige unterdrücken"
msgstr "den Inhalt in temporäre Dateien schreiben"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491
-#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497
-#: builtin/submodule--helper.c:830 builtin/worktree.c:469
+#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598
+#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951
+#: builtin/worktree.c:469
msgid "string"
msgstr "Zeichenkette"
msgid "path '%s' is unmerged"
msgstr "Pfad '%s' ist nicht zusammengeführt."
-#: builtin/checkout.c:495
+#: builtin/checkout.c:494
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:625
+#: builtin/checkout.c:624
#, 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:664
+#: builtin/checkout.c:663
msgid "HEAD is now at"
msgstr "HEAD ist jetzt bei"
-#: builtin/checkout.c:668 builtin/clone.c:661
+#: builtin/checkout.c:667 builtin/clone.c:660
msgid "unable to update HEAD"
msgstr "Konnte HEAD nicht aktualisieren."
-#: builtin/checkout.c:672
+#: builtin/checkout.c:671
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Setze Branch '%s' neu\n"
-#: builtin/checkout.c:675
+#: builtin/checkout.c:674
#, c-format
msgid "Already on '%s'\n"
msgstr "Bereits auf '%s'\n"
-#: builtin/checkout.c:679
+#: builtin/checkout.c:678
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Zu umgesetztem Branch '%s' gewechselt\n"
-#: builtin/checkout.c:681 builtin/checkout.c:1070
+#: builtin/checkout.c:680 builtin/checkout.c:1069
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Zu neuem Branch '%s' gewechselt\n"
-#: builtin/checkout.c:683
+#: builtin/checkout.c:682
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Zu Branch '%s' gewechselt\n"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:733
#, c-format
msgid " ... and %d more.\n"
msgstr " ... und %d weitere.\n"
-#: builtin/checkout.c:740
+#: builtin/checkout.c:739
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:759
+#: builtin/checkout.c:758
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
" git branch <neuer-Branchname> %s\n"
"\n"
-#: builtin/checkout.c:795
+#: builtin/checkout.c:794
msgid "internal error in revision walk"
msgstr "interner Fehler im Revisionsgang"
-#: builtin/checkout.c:799
+#: builtin/checkout.c:798
msgid "Previous HEAD position was"
msgstr "Vorherige Position von HEAD war"
-#: builtin/checkout.c:826 builtin/checkout.c:1065
+#: builtin/checkout.c:825 builtin/checkout.c:1064
msgid "You are on a branch yet to be born"
msgstr "Sie sind auf einem Branch, der noch geboren wird"
-#: builtin/checkout.c:971
+#: builtin/checkout.c:970
#, c-format
msgid "only one reference expected, %d given."
msgstr "nur eine Referenz erwartet, %d gegeben."
-#: builtin/checkout.c:1011 builtin/worktree.c:214
+#: builtin/checkout.c:1010 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr "Ungültige Referenz: %s"
-#: builtin/checkout.c:1040
+#: builtin/checkout.c:1039
#, c-format
msgid "reference is not a tree: %s"
msgstr "Referenz ist kein \"Tree\"-Objekt: %s"
-#: builtin/checkout.c:1079
+#: builtin/checkout.c:1078
msgid "paths cannot be used with switching branches"
msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden"
-#: builtin/checkout.c:1082 builtin/checkout.c:1086
+#: builtin/checkout.c:1081 builtin/checkout.c:1085
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden"
-#: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097
+#: builtin/checkout.c:1100
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' kann nicht mit '%s' verwendet werden"
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1105
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln"
-#: builtin/checkout.c:1139 builtin/checkout.c:1141 builtin/clone.c:88
+#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93
#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
#: builtin/worktree.c:326
msgid "branch"
msgstr "Branch"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1139
msgid "create and checkout a new branch"
msgstr "einen neuen Branch erzeugen und auschecken"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1141
msgid "create/reset and checkout a branch"
msgstr "einen Branch erstellen/umsetzen und auschecken"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1142
msgid "create reflog for new branch"
msgstr "das Reflog für den neuen Branch erzeugen"
-#: builtin/checkout.c:1144 builtin/worktree.c:328
+#: builtin/checkout.c:1143 builtin/worktree.c:328
msgid "detach HEAD at named commit"
msgstr "HEAD bei benanntem Commit loslösen"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
msgid "set upstream info for new branch"
msgstr "Informationen zum Upstream-Branch für den neuen Branch setzen"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1146
msgid "new-branch"
msgstr "neuer Branch"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1146
msgid "new unparented branch"
msgstr "neuer Branch ohne Eltern-Commit"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1147
msgid "checkout our version for unmerged files"
msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1149
msgid "checkout their version for unmerged files"
msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1151
msgid "force checkout (throw away local modifications)"
msgstr "Auschecken erzwingen (verwirft lokale Änderungen)"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1152
msgid "perform a 3-way merge with the new branch"
msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen"
-#: builtin/checkout.c:1154 builtin/merge.c:231
+#: builtin/checkout.c:1153 builtin/merge.c:231
msgid "update ignored files (default)"
msgstr "ignorierte Dateien aktualisieren (Standard)"
-#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250
+#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251
msgid "style"
msgstr "Stil"
-#: builtin/checkout.c:1156
+#: builtin/checkout.c:1155
msgid "conflict style (merge or diff3)"
msgstr "Konfliktstil (merge oder diff3)"
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1158
msgid "do not limit pathspecs to sparse entries only"
msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1160
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "second guess 'git checkout <no-such-branch>'"
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1162
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:1164 builtin/clone.c:60 builtin/fetch.c:117
-#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536
+#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119
+#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "Fortschrittsanzeige erzwingen"
-#: builtin/checkout.c:1195
+#: builtin/checkout.c:1194
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "Die Optionen -b, -B und --orphan schließen sich gegenseitig aus."
-#: builtin/checkout.c:1212
+#: builtin/checkout.c:1211
msgid "--track needs a branch name"
msgstr "Bei der Option --track muss ein Branchname angegeben werden."
-#: builtin/checkout.c:1217
+#: builtin/checkout.c:1216
msgid "Missing branch name; try -b"
msgstr "Vermisse Branchnamen; versuchen Sie -b"
-#: builtin/checkout.c:1253
+#: builtin/checkout.c:1252
msgid "invalid path specification"
msgstr "ungültige Pfadspezifikation"
-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1259
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
"Haben Sie beabsichtigt '%s' auszuchecken, welcher nicht als Commit aufgelöst "
"werden kann?"
-#: builtin/checkout.c:1265
+#: builtin/checkout.c:1264
#, 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:1269
+#: builtin/checkout.c:1268
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgid "remove whole directories"
msgstr "ganze Verzeichnisse löschen"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
-#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725
+#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182
msgid "pattern"
msgstr "Muster"
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<Optionen>] [--] <Repository> [<Verzeichnis>]"
-#: builtin/clone.c:62
+#: builtin/clone.c:65
msgid "don't create a checkout"
msgstr "kein Auschecken"
-#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476
+#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
msgid "create a bare repository"
msgstr "ein Bare-Repository erstellen"
-#: builtin/clone.c:67
+#: builtin/clone.c:70
msgid "create a mirror repository (implies bare)"
msgstr "ein Spiegelarchiv erstellen (impliziert --bare)"
-#: builtin/clone.c:69
+#: builtin/clone.c:72
msgid "to clone from a local repository"
msgstr "von einem lokalen Repository klonen"
-#: builtin/clone.c:71
+#: builtin/clone.c:74
msgid "don't use local hardlinks, always copy"
msgstr "lokal keine harten Verweise verwenden, immer Kopien"
-#: builtin/clone.c:73
+#: builtin/clone.c:76
msgid "setup as shared repository"
msgstr "als verteiltes Repository einrichten"
-#: builtin/clone.c:75 builtin/clone.c:77
+#: builtin/clone.c:78 builtin/clone.c:80
msgid "initialize submodules in the clone"
msgstr "Submodule im Klon initialisieren"
-#: builtin/clone.c:79
+#: builtin/clone.c:82
msgid "number of submodules cloned in parallel"
msgstr "Anzahl der parallel zu klonenden Submodule"
-#: builtin/clone.c:80 builtin/init-db.c:473
+#: builtin/clone.c:83 builtin/init-db.c:475
msgid "template-directory"
msgstr "Vorlagenverzeichnis"
-#: builtin/clone.c:81 builtin/init-db.c:474
+#: builtin/clone.c:84 builtin/init-db.c:476
msgid "directory from which templates will be used"
msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden"
-#: builtin/clone.c:83 builtin/submodule--helper.c:495
-#: builtin/submodule--helper.c:833
+#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602
+#: builtin/submodule--helper.c:954
msgid "reference repository"
msgstr "Repository referenzieren"
-#: builtin/clone.c:85
+#: builtin/clone.c:90
msgid "use --reference only while cloning"
msgstr "--reference nur während des Klonens benutzen"
-#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr "Name"
-#: builtin/clone.c:87
+#: builtin/clone.c:92
msgid "use <name> instead of 'origin' to track upstream"
msgstr "<Name> statt 'origin' für Upstream-Repository verwenden"
-#: builtin/clone.c:89
+#: builtin/clone.c:94
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "<Branch> auschecken, anstatt HEAD des Remote-Repositories"
-#: builtin/clone.c:91
+#: builtin/clone.c:96
msgid "path to git-upload-pack on the remote"
msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite"
-#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667 builtin/pull.c:201
+#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668 builtin/pull.c:202
msgid "depth"
msgstr "Tiefe"
-#: builtin/clone.c:93
+#: builtin/clone.c:98
msgid "create a shallow clone of that depth"
msgstr ""
"einen Klon mit unvollständiger Historie (shallow) in dieser Tiefe erstellen"
-#: builtin/clone.c:95
+#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848
+#: parse-options.h:142
+msgid "time"
+msgstr "Zeit"
+
+#: builtin/clone.c:100
+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:101 builtin/fetch.c:124
+msgid "revision"
+msgstr "Commit"
+
+#: builtin/clone.c:102 builtin/fetch.c:125
+msgid "deepen history of shallow clone by excluding rev"
+msgstr ""
+"die Historie eines Klons mit unvollständiger Historie (shallow) mittels\n"
+"Ausschluss eines Commits vertiefen"
+
+#: builtin/clone.c:104
msgid "clone only one branch, HEAD or --branch"
msgstr "nur einen Branch klonen, HEAD oder --branch"
-#: builtin/clone.c:97
+#: builtin/clone.c:106
msgid "any cloned submodules will be shallow"
msgstr "jedes geklonte Submodul mit unvollständiger Historie (shallow)"
-#: builtin/clone.c:98 builtin/init-db.c:482
+#: builtin/clone.c:107 builtin/init-db.c:484
msgid "gitdir"
msgstr ".git-Verzeichnis"
-#: builtin/clone.c:99 builtin/init-db.c:483
+#: builtin/clone.c:108 builtin/init-db.c:485
msgid "separate git dir from working tree"
msgstr "Git-Verzeichnis vom Arbeitsverzeichnis separieren"
-#: builtin/clone.c:100
+#: builtin/clone.c:109
msgid "key=value"
msgstr "Schlüssel=Wert"
-#: builtin/clone.c:101
+#: builtin/clone.c:110
msgid "set config inside the new repository"
msgstr "Konfiguration innerhalb des neuen Repositories setzen"
-#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547
+#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547
msgid "use IPv4 addresses only"
msgstr "nur IPv4-Adressen benutzen"
-#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549
+#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549
msgid "use IPv6 addresses only"
msgstr "nur IPv6-Adressen benutzen"
-#: builtin/clone.c:241
+#: builtin/clone.c:250
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"Konnte keinen Verzeichnisnamen erraten.\n"
"Bitte geben Sie ein Verzeichnis auf der Befehlszeile an."
-#: builtin/clone.c:307
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr ""
-"Referenziertes Repository '%s' wird noch nicht als verknüpftes\n"
-"Arbeitsverzeichnis unterstützt."
-
-#: builtin/clone.c:309
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "Referenziertes Repository '%s' ist kein lokales Repository."
-
-#: builtin/clone.c:314
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr ""
-"Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)."
-
-#: builtin/clone.c:317
+#: builtin/clone.c:303
#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr ""
-"Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") "
-"eingehängt."
+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:376
+#: builtin/clone.c:375
#, c-format
msgid "failed to open '%s'"
msgstr "Fehler beim Öffnen von '%s'"
-#: builtin/clone.c:384
+#: builtin/clone.c:383
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existiert und ist kein Verzeichnis"
-#: builtin/clone.c:398
+#: builtin/clone.c:397
#, c-format
msgid "failed to stat %s\n"
msgstr "Konnte %s nicht lesen\n"
-#: builtin/clone.c:420
+#: builtin/clone.c:419
#, c-format
msgid "failed to create link '%s'"
msgstr "Konnte Verweis '%s' nicht erstellen"
-#: builtin/clone.c:424
+#: builtin/clone.c:423
#, c-format
msgid "failed to copy file to '%s'"
msgstr "Konnte Datei nicht nach '%s' kopieren"
-#: builtin/clone.c:449
+#: builtin/clone.c:448
#, c-format
msgid "done.\n"
msgstr "Fertig.\n"
-#: builtin/clone.c:461
+#: builtin/clone.c:460
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"Sie können mit 'git status' prüfen, was ausgecheckt worden ist\n"
"und das Auschecken mit 'git checkout -f HEAD' erneut versuchen.\n"
-#: builtin/clone.c:538
+#: builtin/clone.c:537
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Konnte zu klonenden Remote-Branch %s nicht finden."
-#: builtin/clone.c:633
+#: builtin/clone.c:632
msgid "remote did not send all necessary objects"
msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet."
-#: builtin/clone.c:649
+#: builtin/clone.c:648
#, c-format
msgid "unable to update %s"
msgstr "kann %s nicht aktualisieren"
-#: builtin/clone.c:698
+#: builtin/clone.c:697
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:729
+#: builtin/clone.c:728
msgid "unable to checkout working tree"
msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden"
-#: builtin/clone.c:766
+#: builtin/clone.c:768
msgid "unable to write parameters to config file"
msgstr "konnte Parameter nicht in Konfigurationsdatei schreiben"
-#: builtin/clone.c:829
+#: builtin/clone.c:831
msgid "cannot repack to clean up"
msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen"
-#: builtin/clone.c:831
+#: builtin/clone.c:833
msgid "cannot unlink temporary alternates file"
msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen"
-#: builtin/clone.c:863 builtin/receive-pack.c:1855
+#: builtin/clone.c:866 builtin/receive-pack.c:1895
msgid "Too many arguments."
msgstr "Zu viele Argumente."
-#: builtin/clone.c:867
+#: builtin/clone.c:870
msgid "You must specify a repository to clone."
msgstr "Sie müssen ein Repository zum Klonen angeben."
-#: builtin/clone.c:878
+#: builtin/clone.c:883
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "Die Optionen --bare und --origin %s sind inkompatibel."
-#: builtin/clone.c:881
+#: builtin/clone.c:886
msgid "--bare and --separate-git-dir are incompatible."
msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel."
-#: builtin/clone.c:894
+#: builtin/clone.c:899
#, c-format
msgid "repository '%s' does not exist"
msgstr "Repository '%s' existiert nicht."
-#: builtin/clone.c:900 builtin/fetch.c:1293
+#: builtin/clone.c:905 builtin/fetch.c:1338
#, c-format
msgid "depth %s is not a positive number"
msgstr "Tiefe %s ist keine positive Zahl"
-#: builtin/clone.c:910
+#: builtin/clone.c:915
#, 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:920
+#: builtin/clone.c:925
#, c-format
msgid "working tree '%s' already exists."
msgstr "Arbeitsverzeichnis '%s' existiert bereits."
-#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544
+#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657
#: builtin/worktree.c:222 builtin/worktree.c:249
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen."
-#: builtin/clone.c:938
+#: builtin/clone.c:943
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen"
-#: builtin/clone.c:956
+#: builtin/clone.c:955
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klone in Bare-Repository '%s' ...\n"
-#: builtin/clone.c:958
+#: builtin/clone.c:957
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klone nach '%s' ...\n"
-#: builtin/clone.c:997
+#: builtin/clone.c:963
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
+msgstr "'clone --recursive' ist nicht kompatibel mit --reference und --reference-if-able"
+
+#: builtin/clone.c:1019
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
"Die Option --depth wird in lokalen Klonen ignoriert; benutzen Sie "
"stattdessen file://"
-#: builtin/clone.c:1000
+#: builtin/clone.c:1021
+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:1023
+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:1026
msgid "source repository is shallow, ignoring --local"
msgstr ""
"Quelle ist ein Repository mit unvollständiger Historie (shallow),ignoriere --"
"local"
-#: builtin/clone.c:1005
+#: builtin/clone.c:1031
msgid "--local is ignored"
msgstr "--local wird ignoriert"
-#: builtin/clone.c:1009
+#: builtin/clone.c:1035
#, c-format
msgid "Don't know how to clone %s"
msgstr "Weiß nicht wie %s zu klonen ist."
-#: builtin/clone.c:1058 builtin/clone.c:1066
+#: builtin/clone.c:1090 builtin/clone.c:1098
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden"
-#: builtin/clone.c:1069
+#: builtin/clone.c:1101
msgid "You appear to have cloned an empty repository."
msgstr "Sie scheinen ein leeres Repository geklont zu haben."
"Benutzen Sie anschließend \"git cherry-pick --continue\", um die\n"
"Cherry-Pick-Operation mit den verbleibenden Commits fortzusetzen.\n"
-#: builtin/commit.c:308
+#: builtin/commit.c:318
msgid "failed to unpack HEAD tree object"
msgstr "Fehler beim Entpacken des \"Tree\"-Objektes von HEAD."
-#: builtin/commit.c:349
+#: builtin/commit.c:359
msgid "unable to create temporary index"
msgstr "Konnte temporären Index nicht erstellen."
-#: builtin/commit.c:355
+#: builtin/commit.c:365
msgid "interactive add failed"
msgstr "interaktives Hinzufügen fehlgeschlagen"
-#: builtin/commit.c:368
+#: builtin/commit.c:378
msgid "unable to update temporary index"
msgstr "Konnte temporären Index nicht aktualisieren."
-#: builtin/commit.c:370
+#: builtin/commit.c:380
msgid "Failed to update main cache tree"
msgstr "Konnte Haupt-Cache-Verzeichnis nicht aktualisieren"
-#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466
+#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
msgid "unable to write new_index file"
msgstr "Konnte new_index Datei nicht schreiben"
-#: builtin/commit.c:448
+#: builtin/commit.c:458
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:450
+#: builtin/commit.c:460
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:459
+#: builtin/commit.c:469
msgid "cannot read the index"
msgstr "Kann Index nicht lesen"
-#: builtin/commit.c:478
+#: builtin/commit.c:488
msgid "unable to write temporary index file"
msgstr "Konnte temporäre Index-Datei nicht schreiben."
-#: builtin/commit.c:583
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "Commit '%s' fehlt Autor-Kopfbereich"
-#: builtin/commit.c:585
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "Commit '%s' hat fehlerhafte Autor-Zeile"
-#: builtin/commit.c:604
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "Fehlerhafter --author Parameter"
-#: builtin/commit.c:612
+#: builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "Ungültiges Datumsformat: %s"
-#: builtin/commit.c:656
+#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
"Konnte kein Kommentar-Zeichen auswählen, das nicht in\n"
"der aktuellen Commit-Beschreibung verwendet wird."
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
#, c-format
msgid "could not lookup commit %s"
msgstr "Konnte Commit %s nicht nachschlagen"
-#: builtin/commit.c:705 builtin/shortlog.c:286
+#: builtin/commit.c:704 builtin/shortlog.c:286
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(lese Log-Nachricht von Standard-Eingabe)\n"
-#: builtin/commit.c:707
+#: builtin/commit.c:706
msgid "could not read log from standard input"
msgstr "Konnte Log nicht von Standard-Eingabe lesen."
-#: builtin/commit.c:711
+#: builtin/commit.c:710
#, c-format
msgid "could not read log file '%s'"
msgstr "Konnte Log-Datei '%s' nicht lesen"
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:737 builtin/commit.c:745
msgid "could not read SQUASH_MSG"
msgstr "Konnte SQUASH_MSG nicht lesen"
-#: builtin/commit.c:743
+#: builtin/commit.c:742
msgid "could not read MERGE_MSG"
msgstr "Konnte MERGE_MSG nicht lesen"
-#: builtin/commit.c:797
+#: builtin/commit.c:796
msgid "could not write commit template"
msgstr "Konnte Commit-Vorlage nicht schreiben"
-#: builtin/commit.c:815
+#: builtin/commit.c:814
#, c-format
msgid ""
"\n"
"\t%s\n"
"und versuchen Sie es erneut.\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
"\t%s\n"
"und versuchen Sie es erneut.\n"
-#: builtin/commit.c:833
+#: builtin/commit.c:832
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"die mit '%c' beginnen, werden ignoriert, und eine leere Beschreibung\n"
"bricht den Commit ab.\n"
-#: builtin/commit.c:840
+#: builtin/commit.c:839
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"entfernen.\n"
"Eine leere Beschreibung bricht den Commit ab.\n"
-#: builtin/commit.c:860
+#: builtin/commit.c:859
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:868
+#: builtin/commit.c:867
#, c-format
msgid "%sDate: %s"
msgstr "%sDatum: %s"
-#: builtin/commit.c:875
+#: builtin/commit.c:874
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sCommit-Ersteller: %.*s <%.*s>"
-#: builtin/commit.c:893
+#: builtin/commit.c:892
msgid "Cannot read index"
msgstr "Kann Index nicht lesen"
-#: builtin/commit.c:950
+#: builtin/commit.c:954
msgid "Error building trees"
msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte"
-#: builtin/commit.c:965 builtin/tag.c:266
+#: builtin/commit.c:969 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
"Bitte liefern Sie eine Beschreibung entweder mit der Option -m oder -F.\n"
-#: builtin/commit.c:1067
+#: builtin/commit.c:1071
#, 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:1082 builtin/commit.c:1322
+#: builtin/commit.c:1086 builtin/commit.c:1327
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ungültiger Modus '%s' für unversionierte Dateien"
-#: builtin/commit.c:1119
+#: builtin/commit.c:1124
msgid "--long and -z are incompatible"
msgstr "Die Optionen --long und -z sind inkompatibel."
-#: builtin/commit.c:1149
+#: builtin/commit.c:1154
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
"Die Optionen --reset-author und --author können nicht gemeinsam verwendet "
"werden."
-#: builtin/commit.c:1158
+#: builtin/commit.c:1163
msgid "You have nothing to amend."
msgstr "Sie haben nichts für \"--amend\"."
-#: builtin/commit.c:1161
+#: builtin/commit.c:1166
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Ein Merge ist im Gange -- kann \"--amend\" nicht ausführen."
-#: builtin/commit.c:1163
+#: builtin/commit.c:1168
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "\"cherry-pick\" ist im Gange -- kann \"--amend\" nicht ausführen."
-#: builtin/commit.c:1166
+#: builtin/commit.c:1171
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
"Die Optionen --squash und --fixup können nicht gemeinsam verwendet werden."
-#: builtin/commit.c:1176
+#: builtin/commit.c:1181
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Es kann nur eine Option von -c/-C/-F/--fixup verwendet werden."
-#: builtin/commit.c:1178
+#: builtin/commit.c:1183
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "Die Option -m kann nicht mit -c/-C/-F/--fixup kombiniert werden."
-#: builtin/commit.c:1186
+#: builtin/commit.c:1191
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
"Die Option --reset--author kann nur mit -C, -c oder --amend verwendet werden."
-#: builtin/commit.c:1203
+#: builtin/commit.c:1208
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Es kann nur eine Option von --include/--only/--all/--interactive/--patch "
"verwendet werden."
-#: builtin/commit.c:1205
+#: builtin/commit.c:1210
msgid "No paths with --include/--only does not make sense."
msgstr ""
"Die Optionen --include und --only können nur mit der Angabe von Pfaden "
"verwendet werden."
-#: builtin/commit.c:1207
+#: builtin/commit.c:1212
msgid "Clever... amending the last one with dirty index."
msgstr "Klug ... den letzten Commit mit einem geänderten Index nachbessern."
-#: builtin/commit.c:1209
+#: builtin/commit.c:1214
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "Explizite Pfade ohne -i oder -o angegeben; nehme --only an"
-#: builtin/commit.c:1221 builtin/tag.c:474
+#: builtin/commit.c:1226 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Ungültiger \"cleanup\" Modus %s"
-#: builtin/commit.c:1226
+#: builtin/commit.c:1231
msgid "Paths with -a does not make sense."
msgstr "Die Option -a kann nicht mit der Angabe von Pfaden verwendet werden."
-#: builtin/commit.c:1336 builtin/commit.c:1622
+#: builtin/commit.c:1341 builtin/commit.c:1617
msgid "show status concisely"
msgstr "Status im Kurzformat anzeigen"
-#: builtin/commit.c:1338 builtin/commit.c:1624
+#: builtin/commit.c:1343 builtin/commit.c:1619
msgid "show branch information"
msgstr "Branchinformationen anzeigen"
-#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522
+#: builtin/commit.c:1345
+msgid "version"
+msgstr "Version"
+
+#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522
#: builtin/worktree.c:440
msgid "machine-readable output"
msgstr "maschinenlesbare Ausgabe"
-#: builtin/commit.c:1343 builtin/commit.c:1628
+#: builtin/commit.c:1348 builtin/commit.c:1623
msgid "show status in long format (default)"
msgstr "Status im Langformat anzeigen (Standard)"
-#: builtin/commit.c:1346 builtin/commit.c:1631
+#: builtin/commit.c:1351 builtin/commit.c:1626
msgid "terminate entries with NUL"
msgstr "Einträge mit NUL-Zeichen abschließen"
-#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981
+#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "Modus"
-#: builtin/commit.c:1349 builtin/commit.c:1634
+#: builtin/commit.c:1354 builtin/commit.c:1629
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:1352
+#: builtin/commit.c:1357
msgid "show ignored files"
msgstr "ignorierte Dateien anzeigen"
-#: builtin/commit.c:1353 parse-options.h:155
+#: builtin/commit.c:1358 parse-options.h:155
msgid "when"
msgstr "wann"
-#: builtin/commit.c:1354
+#: builtin/commit.c:1359
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
"Änderungen in Submodulen ignorieren, optional wenn: all, dirty, untracked. "
"(Standard: all)"
-#: builtin/commit.c:1356
+#: builtin/commit.c:1361
msgid "list untracked files in columns"
msgstr "unversionierte Dateien in Spalten auflisten"
-#: builtin/commit.c:1442
+#: builtin/commit.c:1437
msgid "couldn't look up newly created commit"
msgstr "Konnte neu erstellten Commit nicht nachschlagen."
-#: builtin/commit.c:1444
+#: builtin/commit.c:1439
msgid "could not parse newly created commit"
msgstr "Konnte neulich erstellten Commit nicht analysieren."
-#: builtin/commit.c:1489
+#: builtin/commit.c:1484
msgid "detached HEAD"
msgstr "losgelöster HEAD"
-#: builtin/commit.c:1492
+#: builtin/commit.c:1487
msgid " (root-commit)"
msgstr " (Basis-Commit)"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1587
msgid "suppress summary after successful commit"
msgstr "Zusammenfassung nach erfolgreichem Commit unterdrücken"
-#: builtin/commit.c:1593
+#: builtin/commit.c:1588
msgid "show diff in commit message template"
msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1590
msgid "Commit message options"
msgstr "Optionen für Commit-Beschreibung"
-#: builtin/commit.c:1596 builtin/tag.c:351
+#: builtin/commit.c:1591 builtin/tag.c:351
msgid "read message from file"
msgstr "Beschreibung von Datei lesen"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1592
msgid "author"
msgstr "Autor"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1592
msgid "override author for commit"
msgstr "Autor eines Commits überschreiben"
-#: builtin/commit.c:1598 builtin/gc.c:326
+#: builtin/commit.c:1593 builtin/gc.c:326
msgid "date"
msgstr "Datum"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1593
msgid "override date for commit"
msgstr "Datum eines Commits überschreiben"
-#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396
-#: builtin/notes.c:559 builtin/tag.c:349
+#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398
+#: builtin/notes.c:561 builtin/tag.c:349
msgid "message"
msgstr "Beschreibung"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1594
msgid "commit message"
msgstr "Commit-Beschreibung"
-#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602
-#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
+#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79
msgid "commit"
msgstr "Commit"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1595
msgid "reuse and edit message from specified commit"
msgstr "Beschreibung des angegebenen Commits wiederverwenden und editieren"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1596
msgid "reuse message from specified commit"
msgstr "Beschreibung des angegebenen Commits wiederverwenden"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1597
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"eine automatisch zusammengesetzte Beschreibung zum Nachbessern des "
"angegebenen Commits verwenden"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1598
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"eine automatisch zusammengesetzte Beschreibung beim \"squash\" des "
"angegebenen Commits verwenden"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1599
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:1605 builtin/log.c:1409 builtin/revert.c:86
+#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "'Signed-off-by:'-Zeile hinzufügen"
-#: builtin/commit.c:1606
+#: builtin/commit.c:1601
msgid "use specified template file"
msgstr "angegebene Vorlagendatei verwenden"
-#: builtin/commit.c:1607
+#: builtin/commit.c:1602
msgid "force edit of commit"
msgstr "Bearbeitung des Commits erzwingen"
-#: builtin/commit.c:1608
+#: builtin/commit.c:1603
msgid "default"
msgstr "Standard"
-#: builtin/commit.c:1608 builtin/tag.c:354
+#: builtin/commit.c:1603 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr ""
"wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen"
-#: builtin/commit.c:1609
+#: builtin/commit.c:1604
msgid "include status in commit message template"
msgstr "Status in die Commit-Beschreibungsvorlage einfügen"
-#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165
+#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "Commit mit GPG signieren"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1609
msgid "Commit contents options"
msgstr "Optionen für Commit-Inhalt"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1610
msgid "commit all changed files"
msgstr "alle geänderten Dateien committen"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1611
msgid "add specified files to index for commit"
msgstr "die angegebenen Dateien zusätzlich zum Commit vormerken"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1612
msgid "interactively add files"
msgstr "interaktives Hinzufügen von Dateien"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1613
msgid "interactively add changes"
msgstr "interaktives Hinzufügen von Änderungen"
-#: builtin/commit.c:1619
+#: builtin/commit.c:1614
msgid "commit only specified files"
msgstr "nur die angegebenen Dateien committen"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1615
msgid "bypass pre-commit and commit-msg hooks"
msgstr "Hooks pre-commit und commit-msg umgehen"
-#: builtin/commit.c:1621
+#: builtin/commit.c:1616
msgid "show what would be committed"
msgstr "anzeigen, was committet werden würde"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1627
msgid "amend previous commit"
msgstr "vorherigen Commit ändern"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1628
msgid "bypass post-rewrite hook"
msgstr "\"post-rewrite hook\" umgehen"
-#: builtin/commit.c:1638
+#: builtin/commit.c:1633
msgid "ok to record an empty change"
msgstr "Aufzeichnung einer leeren Änderung erlauben"
-#: builtin/commit.c:1640
+#: builtin/commit.c:1635
msgid "ok to record a change with an empty message"
msgstr "Aufzeichnung einer Änderung mit einer leeren Beschreibung erlauben"
-#: builtin/commit.c:1669
+#: builtin/commit.c:1664
msgid "could not parse HEAD commit"
msgstr "Konnte Commit von HEAD nicht analysieren."
-#: builtin/commit.c:1719
+#: builtin/commit.c:1712
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Beschädigte MERGE_HEAD-Datei (%s)"
-#: builtin/commit.c:1726
+#: builtin/commit.c:1719
msgid "could not read MERGE_MODE"
msgstr "Konnte MERGE_MODE nicht lesen"
-#: builtin/commit.c:1745
+#: builtin/commit.c:1738
#, c-format
msgid "could not read commit message: %s"
msgstr "Konnte Commit-Beschreibung nicht lesen: %s"
-#: builtin/commit.c:1756
+#: builtin/commit.c:1749
#, 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:1761
+#: builtin/commit.c:1754
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Commit aufgrund leerer Beschreibung abgebrochen.\n"
-#: builtin/commit.c:1809
+#: builtin/commit.c:1802
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
msgid "cannot create configuration file %s"
msgstr "Konnte Konfigurationsdatei '%s' nicht erstellen."
-#: builtin/count-objects.c:77
+#: builtin/config.c:625
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+" Use a regexp, --add or --replace-all to change %s."
+msgstr ""
+"kann nicht mehrere Werte mit einem einzigen Wert überschreiben\n"
+" Benutzen Sie einen regulären Ausdruck, --add oder --replace, um %s\n"
+" zu ändern."
+
+#: builtin/count-objects.c:86
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:96
msgid "print sizes in human readable format"
msgstr "gibt Größenangaben in menschenlesbaren Format aus"
msgid "only consider tags matching <pattern>"
msgstr "nur Tags, die <Muster> entsprechen, betrachten"
-#: builtin/describe.c:410 builtin/name-rev.c:321
+#: builtin/describe.c:410 builtin/name-rev.c:320
msgid "show abbreviated commit object as fallback"
msgstr "gekürztes Commit-Objekt anzeigen, wenn sonst nichts zutrifft"
msgid "invalid option: %s"
msgstr "Ungültige Option: %s"
-#: builtin/diff.c:360
+#: builtin/diff.c:361
msgid "Not a git repository"
msgstr "Kein Git-Repository"
-#: builtin/diff.c:403
+#: builtin/diff.c:404
#, c-format
msgid "invalid object '%s' given."
msgstr "Objekt '%s' ist ungültig."
-#: builtin/diff.c:412
+#: builtin/diff.c:413
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "Mehr als zwei Blobs angegeben: '%s'"
-#: builtin/diff.c:419
+#: builtin/diff.c:420
#, c-format
msgid "unhandled object '%s' given."
msgstr "unbehandeltes Objekt '%s' angegeben"
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<Optionen>]"
-#: builtin/fetch.c:93 builtin/pull.c:174
+#: builtin/fetch.c:95 builtin/pull.c:175
msgid "fetch from all remotes"
msgstr "fordert von allen Remote-Repositories an"
-#: builtin/fetch.c:95 builtin/pull.c:177
+#: builtin/fetch.c:97 builtin/pull.c:178
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "an .git/FETCH_HEAD anhängen, anstatt zu überschreiben"
-#: builtin/fetch.c:97 builtin/pull.c:180
+#: builtin/fetch.c:99 builtin/pull.c:181
msgid "path to upload pack on remote end"
msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite"
-#: builtin/fetch.c:98 builtin/pull.c:182
+#: builtin/fetch.c:100 builtin/pull.c:183
msgid "force overwrite of local branch"
msgstr "das Überschreiben von lokalen Branches erzwingen"
-#: builtin/fetch.c:100
+#: builtin/fetch.c:102
msgid "fetch from multiple remotes"
msgstr "von mehreren Remote-Repositories anfordern"
-#: builtin/fetch.c:102 builtin/pull.c:184
+#: builtin/fetch.c:104 builtin/pull.c:185
msgid "fetch all tags and associated objects"
msgstr "alle Tags und verbundene Objekte anfordern"
-#: builtin/fetch.c:104
+#: builtin/fetch.c:106
msgid "do not fetch all tags (--no-tags)"
msgstr "nicht alle Tags anfordern (--no-tags)"
-#: builtin/fetch.c:106
+#: builtin/fetch.c:108
msgid "number of submodules fetched in parallel"
msgstr "Anzahl der parallel anzufordernden Submodule"
-#: builtin/fetch.c:108 builtin/pull.c:187
+#: builtin/fetch.c:110 builtin/pull.c:188
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:109 builtin/pull.c:190
+#: builtin/fetch.c:111 builtin/pull.c:191
msgid "on-demand"
msgstr "bei-Bedarf"
-#: builtin/fetch.c:110 builtin/pull.c:191
+#: builtin/fetch.c:112 builtin/pull.c:192
msgid "control recursive fetching of submodules"
msgstr "rekursive Anforderungen von Submodulen kontrollieren"
-#: builtin/fetch.c:114 builtin/pull.c:199
+#: builtin/fetch.c:116 builtin/pull.c:200
msgid "keep downloaded pack"
msgstr "heruntergeladenes Paket behalten"
-#: builtin/fetch.c:116
+#: builtin/fetch.c:118
msgid "allow updating of HEAD ref"
msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben"
-#: builtin/fetch.c:119 builtin/pull.c:202
+#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
msgid "deepen history of shallow clone"
msgstr ""
"die Historie eines Klons mit unvollständiger Historie (shallow) vertiefen"
-#: builtin/fetch.c:121 builtin/pull.c:205
+#: builtin/fetch.c:123
+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:129 builtin/pull.c:206
msgid "convert to a complete repository"
msgstr "zu einem vollständigen Repository konvertieren"
-#: builtin/fetch.c:123 builtin/log.c:1426
+#: builtin/fetch.c:131 builtin/log.c:1433
msgid "dir"
msgstr "Verzeichnis"
-#: builtin/fetch.c:124
+#: builtin/fetch.c:132
msgid "prepend this to submodule path output"
msgstr "dies an die Ausgabe der Submodul-Pfade voranstellen"
-#: builtin/fetch.c:127
+#: builtin/fetch.c:135
msgid "default mode for recursion"
msgstr "Standard-Modus für Rekursion"
-#: builtin/fetch.c:129 builtin/pull.c:208
+#: builtin/fetch.c:137 builtin/pull.c:209
msgid "accept refs that update .git/shallow"
msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren"
-#: builtin/fetch.c:130 builtin/pull.c:210
+#: builtin/fetch.c:138 builtin/pull.c:211
msgid "refmap"
msgstr "Refmap"
-#: builtin/fetch.c:131 builtin/pull.c:211
+#: builtin/fetch.c:139 builtin/pull.c:212
msgid "specify fetch refmap"
msgstr "Refmap für 'fetch' angeben"
-#: builtin/fetch.c:387
+#: builtin/fetch.c:398
msgid "Couldn't find remote ref HEAD"
msgstr "Konnte Remote-Referenz von HEAD nicht finden."
-#: builtin/fetch.c:503
+#: builtin/fetch.c:514
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "Konfiguration fetch.output enthält ungültigen Wert %s"
-#: builtin/fetch.c:592
+#: builtin/fetch.c:607
#, c-format
msgid "object %s not found"
msgstr "Objekt %s nicht gefunden"
-#: builtin/fetch.c:596
+#: builtin/fetch.c:611
msgid "[up to date]"
msgstr "[aktuell]"
-#: builtin/fetch.c:609 builtin/fetch.c:689
+#: builtin/fetch.c:624 builtin/fetch.c:704
msgid "[rejected]"
msgstr "[zurückgewiesen]"
-#: builtin/fetch.c:610
+#: builtin/fetch.c:625
msgid "can't fetch in current branch"
msgstr "kann \"fetch\" im aktuellen Branch nicht ausführen"
-#: builtin/fetch.c:619
+#: builtin/fetch.c:634
msgid "[tag update]"
msgstr "[Tag Aktualisierung]"
-#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669
-#: builtin/fetch.c:684
+#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684
+#: builtin/fetch.c:699
msgid "unable to update local ref"
msgstr "kann lokale Referenz nicht aktualisieren"
-#: builtin/fetch.c:639
+#: builtin/fetch.c:654
msgid "[new tag]"
msgstr "[neues Tag]"
-#: builtin/fetch.c:642
+#: builtin/fetch.c:657
msgid "[new branch]"
msgstr "[neuer Branch]"
-#: builtin/fetch.c:645
+#: builtin/fetch.c:660
msgid "[new ref]"
msgstr "[neue Referenz]"
-#: builtin/fetch.c:684
+#: builtin/fetch.c:699
msgid "forced update"
msgstr "Aktualisierung erzwungen"
-#: builtin/fetch.c:689
+#: builtin/fetch.c:704
msgid "non-fast-forward"
msgstr "kein Vorspulen"
-#: builtin/fetch.c:733
+#: builtin/fetch.c:749
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n"
-#: builtin/fetch.c:753
+#: builtin/fetch.c:769
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"%s wurde zurückgewiesen, da Ursprungs-Commits von Repositoriesmit "
"unvollständiger Historie (shallow) nicht aktualisiert werden dürfen."
-#: builtin/fetch.c:839 builtin/fetch.c:934
+#: builtin/fetch.c:856 builtin/fetch.c:952
#, c-format
msgid "From %.*s\n"
msgstr "Von %.*s\n"
-#: builtin/fetch.c:850
+#: builtin/fetch.c:867
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
"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:904
+#: builtin/fetch.c:922
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s wird unreferenziert)"
-#: builtin/fetch.c:905
+#: builtin/fetch.c:923
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s wurde unreferenziert)"
-#: builtin/fetch.c:937
+#: builtin/fetch.c:955
msgid "[deleted]"
msgstr "[gelöscht]"
-#: builtin/fetch.c:938 builtin/remote.c:1020
+#: builtin/fetch.c:956 builtin/remote.c:1020
msgid "(none)"
msgstr "(nichts)"
-#: builtin/fetch.c:960
+#: builtin/fetch.c:979
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
"Der \"fetch\" in den aktuellen Branch %s von einem nicht-Bare-Repository "
"wurde verweigert."
-#: builtin/fetch.c:979
+#: builtin/fetch.c:998
#, 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:982
+#: builtin/fetch.c:1001
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Option \"%s\" wird ignoriert für %s\n"
-#: builtin/fetch.c:1039
+#: builtin/fetch.c:1077
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Weiß nicht wie von %s angefordert wird."
-#: builtin/fetch.c:1199
+#: builtin/fetch.c:1237
#, c-format
msgid "Fetching %s\n"
msgstr "Fordere an von %s\n"
-#: builtin/fetch.c:1201 builtin/remote.c:96
+#: builtin/fetch.c:1239 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "Konnte nicht von %s anfordern"
-#: builtin/fetch.c:1219
+#: builtin/fetch.c:1257
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
"oder den Namen des Remote-Repositories an, von welchem neue\n"
"Commits angefordert werden sollen."
-#: builtin/fetch.c:1242
+#: builtin/fetch.c:1280
msgid "You need to specify a tag name."
msgstr "Sie müssen den Namen des Tags angeben."
-#: builtin/fetch.c:1284
+#: builtin/fetch.c:1322
+msgid "Negative depth in --deepen is not supported"
+msgstr "Negative Tiefe wird von --deepen nicht unterstützt."
+
+#: builtin/fetch.c:1324
+msgid "--deepen and --depth are mutually exclusive"
+msgstr "--deepen und --depth schließen sich gegenseitig aus"
+
+#: builtin/fetch.c:1329
msgid "--depth and --unshallow cannot be used together"
msgstr ""
"Die Optionen --depth und --unshallow können nicht gemeinsam verwendet werden."
-#: builtin/fetch.c:1286
+#: builtin/fetch.c:1331
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
"Die Option --unshallow kann nicht in einem Repository mit unvollständiger "
"Historie verwendet werden."
-#: builtin/fetch.c:1306
+#: builtin/fetch.c:1353
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all akzeptiert kein Repository als Argument"
-#: builtin/fetch.c:1308
+#: builtin/fetch.c:1355
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kann nicht mit Refspecs verwendet werden."
-#: builtin/fetch.c:1319
+#: builtin/fetch.c:1366
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Kein Remote-Repository (einzeln oder Gruppe): %s"
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1374
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
"Das Abholen einer Gruppe von Remote-Repositories kann nicht mit der Angabe\n"
"git fmt-merge-msg [-m <Beschreibung>] [--log[=<n>] | --no-log] [--file "
"<Datei>]"
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:663
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:670
+#: builtin/fmt-merge-msg.c:666
msgid "alias for --log (deprecated)"
msgstr "Alias für --log (veraltet)"
-#: builtin/fmt-merge-msg.c:673
+#: builtin/fmt-merge-msg.c:669
msgid "text"
msgstr "Text"
-#: builtin/fmt-merge-msg.c:674
+#: builtin/fmt-merge-msg.c:670
msgid "use <text> as start of message"
msgstr "<Text> als Beschreibungsanfang verwenden"
-#: builtin/fmt-merge-msg.c:675
+#: builtin/fmt-merge-msg.c:671
msgid "file to read from"
msgstr "Datei zum Einlesen"
msgid "show verbose names for reachable objects"
msgstr "ausführliche Namen für erreichbare Objekte anzeigen"
-#: builtin/fsck.c:671
+#: builtin/fsck.c:665
msgid "Checking objects"
msgstr "Prüfe Objekte"
msgid "invalid number of threads specified (%d) for %s"
msgstr "ungültige Anzahl von Threads (%d) für %s angegeben"
-#: builtin/grep.c:452 builtin/grep.c:487
+#: builtin/grep.c:453 builtin/grep.c:488
#, c-format
msgid "unable to read tree (%s)"
msgstr "konnte \"Tree\"-Objekt (%s) nicht lesen"
-#: builtin/grep.c:502
+#: builtin/grep.c:503
#, 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:560
+#: builtin/grep.c:561
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "Schalter '%c' erwartet einen numerischen Wert"
-#: builtin/grep.c:577
-#, c-format
-msgid "cannot open '%s'"
-msgstr "kann '%s' nicht öffnen"
-
-#: builtin/grep.c:646
+#: builtin/grep.c:647
msgid "search in index instead of in the work tree"
msgstr "im Index anstatt im Arbeitsverzeichnis suchen"
-#: builtin/grep.c:648
+#: builtin/grep.c:649
msgid "find in contents not managed by git"
msgstr "auch in Inhalten finden, die nicht von Git verwaltet werden"
-#: builtin/grep.c:650
+#: builtin/grep.c:651
msgid "search in both tracked and untracked files"
msgstr "in versionierten und unversionierten Dateien suchen"
-#: builtin/grep.c:652
+#: builtin/grep.c:653
msgid "ignore files specified via '.gitignore'"
msgstr "Dateien, die über '.gitignore' angegeben sind, ignorieren"
-#: builtin/grep.c:655
+#: builtin/grep.c:656
msgid "show non-matching lines"
msgstr "Zeilen ohne Übereinstimmungen anzeigen"
-#: builtin/grep.c:657
+#: builtin/grep.c:658
msgid "case insensitive matching"
msgstr "Übereinstimmungen unabhängig von Groß- und Kleinschreibung finden"
-#: builtin/grep.c:659
+#: builtin/grep.c:660
msgid "match patterns only at word boundaries"
msgstr "nur ganze Wörter suchen"
-#: builtin/grep.c:661
+#: builtin/grep.c:662
msgid "process binary files as text"
msgstr "binäre Dateien als Text verarbeiten"
-#: builtin/grep.c:663
+#: builtin/grep.c:664
msgid "don't match patterns in binary files"
msgstr "keine Muster in Binärdateien finden"
-#: builtin/grep.c:666
+#: builtin/grep.c:667
msgid "process binary files with textconv filters"
msgstr "binäre Dateien mit \"textconv\"-Filtern verarbeiten"
-#: builtin/grep.c:668
+#: builtin/grep.c:669
msgid "descend at most <depth> levels"
msgstr "höchstens <Tiefe> Ebenen durchlaufen"
-#: builtin/grep.c:672
+#: builtin/grep.c:673
msgid "use extended POSIX regular expressions"
msgstr "erweiterte reguläre Ausdrücke aus POSIX verwenden"
-#: builtin/grep.c:675
+#: builtin/grep.c:676
msgid "use basic POSIX regular expressions (default)"
msgstr "grundlegende reguläre Ausdrücke aus POSIX verwenden (Standard)"
-#: builtin/grep.c:678
+#: builtin/grep.c:679
msgid "interpret patterns as fixed strings"
msgstr "Muster als feste Zeichenketten interpretieren"
-#: builtin/grep.c:681
+#: builtin/grep.c:682
msgid "use Perl-compatible regular expressions"
msgstr "Perl-kompatible reguläre Ausdrücke verwenden"
-#: builtin/grep.c:684
+#: builtin/grep.c:685
msgid "show line numbers"
msgstr "Zeilennummern anzeigen"
-#: builtin/grep.c:685
+#: builtin/grep.c:686
msgid "don't show filenames"
msgstr "keine Dateinamen anzeigen"
-#: builtin/grep.c:686
+#: builtin/grep.c:687
msgid "show filenames"
msgstr "Dateinamen anzeigen"
-#: builtin/grep.c:688
+#: builtin/grep.c:689
msgid "show filenames relative to top directory"
msgstr "Dateinamen relativ zum Projektverzeichnis anzeigen"
-#: builtin/grep.c:690
+#: builtin/grep.c:691
msgid "show only filenames instead of matching lines"
msgstr "nur Dateinamen anzeigen anstatt übereinstimmende Zeilen"
-#: builtin/grep.c:692
+#: builtin/grep.c:693
msgid "synonym for --files-with-matches"
msgstr "Synonym für --files-with-matches"
-#: builtin/grep.c:695
+#: builtin/grep.c:696
msgid "show only the names of files without match"
msgstr "nur die Dateinamen ohne Übereinstimmungen anzeigen"
-#: builtin/grep.c:697
+#: builtin/grep.c:698
msgid "print NUL after filenames"
msgstr "NUL-Zeichen nach Dateinamen ausgeben"
-#: builtin/grep.c:699
+#: builtin/grep.c:700
msgid "show the number of matches instead of matching lines"
msgstr "anstatt der Zeilen, die Anzahl der übereinstimmenden Zeilen anzeigen"
-#: builtin/grep.c:700
+#: builtin/grep.c:701
msgid "highlight matches"
msgstr "Übereinstimmungen hervorheben"
-#: builtin/grep.c:702
+#: builtin/grep.c:703
msgid "print empty line between matches from different files"
msgstr ""
"eine Leerzeile zwischen Übereinstimmungen in verschiedenen Dateien ausgeben"
-#: builtin/grep.c:704
+#: builtin/grep.c:705
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:707
+#: builtin/grep.c:708
msgid "show <n> context lines before and after matches"
msgstr "<n> Zeilen vor und nach den Übereinstimmungen anzeigen"
-#: builtin/grep.c:710
+#: builtin/grep.c:711
msgid "show <n> context lines before matches"
msgstr "<n> Zeilen vor den Übereinstimmungen anzeigen"
-#: builtin/grep.c:712
+#: builtin/grep.c:713
msgid "show <n> context lines after matches"
msgstr "<n> Zeilen nach den Übereinstimmungen anzeigen"
-#: builtin/grep.c:714
+#: builtin/grep.c:715
msgid "use <n> worker threads"
msgstr "<n> Threads benutzen"
-#: builtin/grep.c:715
+#: builtin/grep.c:716
msgid "shortcut for -C NUM"
msgstr "Kurzform für -C NUM"
-#: builtin/grep.c:718
+#: builtin/grep.c:719
msgid "show a line with the function name before matches"
msgstr "eine Zeile mit dem Funktionsnamen vor Übereinstimmungen anzeigen"
-#: builtin/grep.c:720
+#: builtin/grep.c:721
msgid "show the surrounding function"
msgstr "die umgebende Funktion anzeigen"
-#: builtin/grep.c:723
+#: builtin/grep.c:724
msgid "read patterns from file"
msgstr "Muster von einer Datei lesen"
-#: builtin/grep.c:725
+#: builtin/grep.c:726
msgid "match <pattern>"
msgstr "<Muster> finden"
-#: builtin/grep.c:727
+#: builtin/grep.c:728
msgid "combine patterns specified with -e"
msgstr "Muster kombinieren, die mit -e angegeben wurden"
-#: builtin/grep.c:739
+#: builtin/grep.c:740
msgid "indicate hit with exit status without output"
msgstr "Übereinstimmungen nur durch Beendigungsstatus anzeigen"
-#: builtin/grep.c:741
+#: builtin/grep.c:742
msgid "show only matches from files that match all patterns"
msgstr ""
"nur Übereinstimmungen von Dateien anzeigen, die allen Mustern entsprechen"
-#: builtin/grep.c:743
+#: builtin/grep.c:744
msgid "show parse tree for grep expression"
msgstr "geparstes Verzeichnis für \"grep\"-Ausdruck anzeigen"
-#: builtin/grep.c:747
+#: builtin/grep.c:748
msgid "pager"
msgstr "Anzeigeprogramm"
-#: builtin/grep.c:747
+#: builtin/grep.c:748
msgid "show matching files in the pager"
msgstr "Dateien mit Übereinstimmungen im Anzeigeprogramm anzeigen"
-#: builtin/grep.c:750
+#: builtin/grep.c:751
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "den Aufruf von grep(1) erlauben (von dieser Programmversion ignoriert)"
-#: builtin/grep.c:813
+#: builtin/grep.c:814
msgid "no pattern given."
msgstr "keine Muster angegeben"
-#: builtin/grep.c:845 builtin/index-pack.c:1479
+#: builtin/grep.c:846 builtin/index-pack.c:1480
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "ungültige Anzahl von Threads angegeben (%d)"
-#: builtin/grep.c:875
+#: builtin/grep.c:876
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
"Die Option --open-files-in-pager kann nur innerhalb des "
"Arbeitsverzeichnisses verwendet werden."
-#: builtin/grep.c:901
+#: builtin/grep.c:902
msgid "--cached or --untracked cannot be used with --no-index."
msgstr ""
"Die Optionen --cached und --untracked können nicht mit --no-index verwendet "
"werden."
-#: builtin/grep.c:906
+#: builtin/grep.c:907
msgid "--no-index or --untracked cannot be used with revs."
msgstr ""
"Die Optionen --no-index und --untracked können nicht mit Commits verwendet "
"werden."
-#: builtin/grep.c:909
+#: builtin/grep.c:910
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
"Die Option --[no-]exclude-standard kann nicht mit versionierten Inhalten "
"verwendet werden."
-#: builtin/grep.c:917
+#: builtin/grep.c:918
msgid "both --cached and trees are given."
msgstr "Die Option --cached kann nicht mit \"Tree\"-Objekten verwendet werden."
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:93
+#: builtin/hash-object.c:94
msgid "type"
msgstr "Art"
-#: builtin/hash-object.c:93
+#: builtin/hash-object.c:94
msgid "object type"
msgstr "Art des Objektes"
-#: builtin/hash-object.c:94
+#: builtin/hash-object.c:95
msgid "write the object into the object database"
msgstr "das Objekt in die Objektdatenbank schreiben"
-#: builtin/hash-object.c:96
+#: builtin/hash-object.c:97
msgid "read the object from stdin"
msgstr "das Objekt von der Standard-Eingabe lesen"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
msgid "store file as is without filters"
msgstr "Datei wie sie ist speichern, ohne Filter"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:100
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:100
+#: builtin/hash-object.c:101
msgid "process file as it were from this path"
msgstr "Datei verarbeiten, als ob sie von diesem Pfad wäre"
-#: builtin/help.c:41
+#: builtin/help.c:42
msgid "print all available commands"
msgstr "alle vorhandenen Befehle anzeigen"
-#: builtin/help.c:42
+#: builtin/help.c:43
+msgid "exclude guides"
+msgstr "Anleitungen ausschließen"
+
+#: builtin/help.c:44
msgid "print list of useful guides"
msgstr "Liste von allgemein verwendeten Anleitungen anzeigen"
-#: builtin/help.c:43
+#: builtin/help.c:45
msgid "show man page"
msgstr "Handbuch anzeigen"
-#: builtin/help.c:44
+#: builtin/help.c:46
msgid "show manual in web browser"
msgstr "Handbuch in einem Webbrowser anzeigen"
-#: builtin/help.c:46
+#: builtin/help.c:48
msgid "show info page"
msgstr "Info-Seite anzeigen"
-#: builtin/help.c:52
+#: builtin/help.c:54
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr "git help [--all] [--guides] [--man | --web | --info] [<Befehl>]"
-#: builtin/help.c:64
+#: builtin/help.c:66
#, c-format
msgid "unrecognized help format '%s'"
msgstr "nicht erkanntes Hilfeformat: %s"
-#: builtin/help.c:91
+#: builtin/help.c:93
msgid "Failed to start emacsclient."
msgstr "Konnte emacsclient nicht starten."
-#: builtin/help.c:104
+#: builtin/help.c:106
msgid "Failed to parse emacsclient version."
msgstr "Konnte Version des emacsclient nicht parsen."
-#: builtin/help.c:112
+#: builtin/help.c:114
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "Version des emacsclient '%d' ist zu alt (< 22)."
-#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
+#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
#, c-format
msgid "failed to exec '%s'"
msgstr "Fehler beim Ausführen von '%s'"
-#: builtin/help.c:205
+#: builtin/help.c:207
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"'%s': Pfad für nicht unterstützten Handbuchbetrachter.\n"
"Sie könnten stattdessen 'man.<Werkzeug>.cmd' benutzen."
-#: builtin/help.c:217
+#: builtin/help.c:219
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"'%s': Programm für unterstützten Handbuchbetrachter.\n"
"Sie könnten stattdessen 'man.<Werkzeug>.path' benutzen."
-#: builtin/help.c:334
+#: builtin/help.c:336
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s': unbekannter Handbuch-Betrachter."
-#: builtin/help.c:351
+#: builtin/help.c:353
msgid "no man viewer handled the request"
msgstr "kein Handbuch-Betrachter konnte mit dieser Anfrage umgehen"
-#: builtin/help.c:359
+#: builtin/help.c:361
msgid "no info viewer handled the request"
msgstr "kein Informations-Betrachter konnte mit dieser Anfrage umgehen"
-#: builtin/help.c:401
+#: builtin/help.c:403
msgid "Defining attributes per path"
msgstr "Definition von Attributen pro Pfad"
-#: builtin/help.c:402
+#: builtin/help.c:404
msgid "Everyday Git With 20 Commands Or So"
msgstr "Tägliche Benutzung von Git mit ungefähr 20 Befehlen"
-#: builtin/help.c:403
+#: builtin/help.c:405
msgid "A Git glossary"
msgstr "Ein Git-Glossar"
-#: builtin/help.c:404
+#: builtin/help.c:406
msgid "Specifies intentionally untracked files to ignore"
msgstr "Spezifikation von bewusst ignorierten, unversionierten Dateien"
-#: builtin/help.c:405
+#: builtin/help.c:407
msgid "Defining submodule properties"
msgstr "Definition von Submodul-Eigenschaften"
-#: builtin/help.c:406
+#: builtin/help.c:408
msgid "Specifying revisions and ranges for Git"
msgstr "Spezifikation von Commits und Bereichen für Git"
-#: builtin/help.c:407
+#: builtin/help.c:409
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "Eine einführende Anleitung zu Git (für Version 1.5.1 oder neuer)"
-#: builtin/help.c:408
+#: builtin/help.c:410
msgid "An overview of recommended workflows with Git"
msgstr "Eine Übersicht über empfohlene Arbeitsabläufe mit Git"
-#: builtin/help.c:420
+#: builtin/help.c:422
msgid "The common Git guides are:\n"
msgstr "Die allgemein verwendeten Git-Anleitungen sind:\n"
-#: builtin/help.c:441 builtin/help.c:458
-#, c-format
-msgid "usage: %s%s"
-msgstr "Verwendung: %s%s"
-
-#: builtin/help.c:474
+#: builtin/help.c:440
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "für `git %s' wurde der Alias `%s' angelegt"
-#: builtin/index-pack.c:153
+#: builtin/help.c:462 builtin/help.c:479
+#, c-format
+msgid "usage: %s%s"
+msgstr "Verwendung: %s%s"
+
+#: builtin/index-pack.c:154
#, c-format
msgid "unable to open %s"
msgstr "kann %s nicht öffnen"
-#: builtin/index-pack.c:203
+#: builtin/index-pack.c:204
#, c-format
msgid "object type mismatch at %s"
msgstr "Objekt-Typen passen bei %s nicht zusammen"
-#: builtin/index-pack.c:223
+#: builtin/index-pack.c:224
#, c-format
msgid "did not receive expected object %s"
msgstr "konnte erwartetes Objekt %s nicht empfangen"
-#: builtin/index-pack.c:226
+#: builtin/index-pack.c:227
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "Objekt %s: erwarteter Typ %s, %s gefunden"
-#: builtin/index-pack.c:268
+#: builtin/index-pack.c:269
#, 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:278
+#: builtin/index-pack.c:279
msgid "early EOF"
msgstr "zu frühes Dateiende"
-#: builtin/index-pack.c:279
+#: builtin/index-pack.c:280
msgid "read error on input"
msgstr "Fehler beim Lesen der Eingabe"
-#: builtin/index-pack.c:291
+#: builtin/index-pack.c:292
msgid "used more bytes than were available"
msgstr "verwendete mehr Bytes als verfügbar waren"
-#: builtin/index-pack.c:298
+#: builtin/index-pack.c:299
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:314
+#: builtin/index-pack.c:302 builtin/unpack-objects.c:92
+msgid "pack exceeds maximum allowed size"
+msgstr "Paket überschreitet die maximal erlaubte Größe"
+
+#: builtin/index-pack.c:317
#, c-format
msgid "unable to create '%s'"
msgstr "konnte '%s' nicht erstellen"
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:322
#, c-format
msgid "cannot open packfile '%s'"
msgstr "Kann Paketdatei '%s' nicht öffnen"
-#: builtin/index-pack.c:333
+#: builtin/index-pack.c:336
msgid "pack signature mismatch"
msgstr "Paketsignatur stimmt nicht überein"
-#: builtin/index-pack.c:335
+#: builtin/index-pack.c:338
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "Paketversion %<PRIu32> nicht unterstützt"
-#: builtin/index-pack.c:353
+#: builtin/index-pack.c:356
#, 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:475
+#: builtin/index-pack.c:478
#, c-format
msgid "inflate returned %d"
msgstr "Dekomprimierung gab %d zurück"
-#: builtin/index-pack.c:524
+#: builtin/index-pack.c:527
msgid "offset value overflow for delta base object"
msgstr "Wert für Versatz bei Differenzobjekt übergelaufen"
-#: builtin/index-pack.c:532
+#: builtin/index-pack.c:535
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:540
+#: builtin/index-pack.c:543
#, c-format
msgid "unknown object type %d"
msgstr "Unbekannter Objekt-Typ %d"
-#: builtin/index-pack.c:571
+#: builtin/index-pack.c:574
msgid "cannot pread pack file"
msgstr "Kann Paketdatei %s nicht lesen"
-#: builtin/index-pack.c:573
+#: builtin/index-pack.c:576
#, 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:599
+#: builtin/index-pack.c:602
msgid "serious inflate inconsistency"
msgstr "ernsthafte Inkonsistenz nach Dekomprimierung"
-#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774
-#: builtin/index-pack.c:808 builtin/index-pack.c:817
+#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
+#: builtin/index-pack.c:811 builtin/index-pack.c:820
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SHA1 KOLLISION MIT %s GEFUNDEN !"
-#: builtin/index-pack.c:748 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:256
+#: builtin/index-pack.c:751 builtin/pack-objects.c:166
+#: builtin/pack-objects.c:258
#, c-format
msgid "unable to read %s"
msgstr "kann %s nicht lesen"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:817
#, c-format
msgid "cannot read existing object %s"
msgstr "Kann existierendes Objekt %s nicht lesen."
-#: builtin/index-pack.c:828
+#: builtin/index-pack.c:831
#, c-format
msgid "invalid blob object %s"
msgstr "ungültiges Blob-Objekt %s"
-#: builtin/index-pack.c:842
+#: builtin/index-pack.c:845
#, c-format
msgid "invalid %s"
msgstr "Ungültiger Objekt-Typ %s"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:848
msgid "Error in object"
msgstr "Fehler in Objekt"
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:850
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Nicht alle Kind-Objekte von %s sind erreichbar"
-#: builtin/index-pack.c:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:922 builtin/index-pack.c:953
msgid "failed to apply delta"
msgstr "Konnte Dateiunterschied nicht anwenden"
-#: builtin/index-pack.c:1120
+#: builtin/index-pack.c:1123
msgid "Receiving objects"
msgstr "Empfange Objekte"
-#: builtin/index-pack.c:1120
+#: builtin/index-pack.c:1123
msgid "Indexing objects"
msgstr "Indiziere Objekte"
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1155
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "Paket ist beschädigt (SHA1 unterschiedlich)"
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
msgid "cannot fstat packfile"
msgstr "kann Paketdatei nicht lesen"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1163
msgid "pack has junk at the end"
msgstr "Paketende enthält nicht verwendbaren Inhalt"
-#: builtin/index-pack.c:1171
+#: builtin/index-pack.c:1174
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "Fehler beim Ausführen von \"parse_pack_objects()\""
-#: builtin/index-pack.c:1196
+#: builtin/index-pack.c:1197
msgid "Resolving deltas"
msgstr "Löse Unterschiede auf"
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
#, c-format
msgid "unable to create thread: %s"
msgstr "kann Thread nicht erzeugen: %s"
-#: builtin/index-pack.c:1249
+#: builtin/index-pack.c:1250
msgid "confusion beyond insanity"
msgstr "Fehler beim Auflösen der Unterschiede"
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1256
#, 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:1267
+#: builtin/index-pack.c:1268
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Unerwartete Prüfsumme für %s (Festplattenfehler?)"
-#: builtin/index-pack.c:1271
+#: builtin/index-pack.c:1272
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "Paket hat %d unaufgelöste Unterschied"
msgstr[1] "Paket hat %d unaufgelöste Unterschiede"
-#: builtin/index-pack.c:1295
+#: builtin/index-pack.c:1296
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren"
-#: builtin/index-pack.c:1371
+#: builtin/index-pack.c:1372
#, c-format
msgid "local object %s is corrupt"
msgstr "lokales Objekt %s ist beschädigt"
-#: builtin/index-pack.c:1395
+#: builtin/index-pack.c:1396
msgid "error while closing pack file"
msgstr "Fehler beim Schließen der Paketdatei"
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
#, c-format
msgid "cannot write keep file '%s'"
msgstr "Kann Paketbeschreibungsdatei '%s' nicht schreiben"
-#: builtin/index-pack.c:1416
+#: builtin/index-pack.c:1417
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "Kann eben erstellte Paketbeschreibungsdatei '%s' nicht schließen"
-#: builtin/index-pack.c:1429
+#: builtin/index-pack.c:1430
msgid "cannot store pack file"
msgstr "Kann Paketdatei nicht speichern"
-#: builtin/index-pack.c:1440
+#: builtin/index-pack.c:1441
msgid "cannot store index file"
msgstr "Kann Indexdatei nicht speichern"
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1474
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig"
-#: builtin/index-pack.c:1483 builtin/index-pack.c:1681
+#: builtin/index-pack.c:1484 builtin/index-pack.c:1681
#, c-format
msgid "no threads support, ignoring %s"
msgstr "keine Unterstützung von Threads, '%s' wird ignoriert"
msgid "bad %s"
msgstr "%s ist ungültig"
-#: builtin/index-pack.c:1730
+#: builtin/index-pack.c:1732
msgid "--fix-thin cannot be used without --stdin"
msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden."
-#: builtin/index-pack.c:1738
+#: builtin/index-pack.c:1740
msgid "--verify with no packfile name given"
msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben."
-#: builtin/init-db.c:55
+#: builtin/init-db.c:54
#, c-format
msgid "cannot stat '%s'"
msgstr "Kann '%s' nicht lesen"
-#: builtin/init-db.c:61
+#: builtin/init-db.c:60
#, c-format
msgid "cannot stat template '%s'"
msgstr "kann Vorlage '%s' nicht lesen"
-#: builtin/init-db.c:66
+#: builtin/init-db.c:65
#, c-format
msgid "cannot opendir '%s'"
msgstr "kann Verzeichnis '%s' nicht öffnen"
-#: builtin/init-db.c:77
+#: builtin/init-db.c:76
#, c-format
msgid "cannot readlink '%s'"
msgstr "kann Verweis '%s' nicht lesen"
-#: builtin/init-db.c:79
+#: builtin/init-db.c:78
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "kann symbolische Verknüpfung '%s' auf '%s' nicht erstellen"
-#: builtin/init-db.c:85
+#: builtin/init-db.c:84
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "kann '%s' nicht nach '%s' kopieren"
-#: builtin/init-db.c:89
+#: builtin/init-db.c:88
#, c-format
msgid "ignoring template %s"
msgstr "ignoriere Vorlage %s"
-#: builtin/init-db.c:120
+#: builtin/init-db.c:119
#, c-format
msgid "templates not found %s"
msgstr "keine Vorlagen in '%s' gefunden"
-#: builtin/init-db.c:135
+#: builtin/init-db.c:134
#, c-format
msgid "not copying templates from '%s': %s"
msgstr "kopiere keine Vorlagen von '%s': %s"
-#: builtin/init-db.c:312 builtin/init-db.c:315
-#, c-format
-msgid "%s already exists"
-msgstr "%s existiert bereits"
-
-#: builtin/init-db.c:344
+#: builtin/init-db.c:327
#, c-format
msgid "unable to handle file type %d"
msgstr "kann nicht mit Dateityp %d umgehen"
-#: builtin/init-db.c:347
+#: builtin/init-db.c:330
#, c-format
msgid "unable to move %s to %s"
msgstr "Konnte %s nicht nach %s verschieben"
-#: builtin/init-db.c:402
+#: builtin/init-db.c:347 builtin/init-db.c:350
+#, c-format
+msgid "%s already exists"
+msgstr "%s existiert bereits"
+
+#: builtin/init-db.c:403
#, 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:403
+#: builtin/init-db.c:404
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "Bestehendes Git-Repository in %s%s neuinitialisiert\n"
-#: builtin/init-db.c:407
+#: builtin/init-db.c:408
#, 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:408
+#: builtin/init-db.c:409
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "Leeres Git-Repository in %s%s initialisiert\n"
-#: builtin/init-db.c:455
+#: builtin/init-db.c:457
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
"git init [-q | --quiet] [--bare] [--template=<Vorlagenverzeichnis>] [--"
"shared[=<Berechtigungen>]] [<Verzeichnis>]"
-#: builtin/init-db.c:478
+#: builtin/init-db.c:480
msgid "permissions"
msgstr "Berechtigungen"
-#: builtin/init-db.c:479
+#: builtin/init-db.c:481
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:513 builtin/init-db.c:518
+#: builtin/init-db.c:515 builtin/init-db.c:520
#, c-format
msgid "cannot mkdir %s"
msgstr "kann Verzeichnis %s nicht erstellen"
-#: builtin/init-db.c:522
+#: builtin/init-db.c:524
#, c-format
msgid "cannot chdir to %s"
msgstr "kann nicht in Verzeichnis %s wechseln"
-#: builtin/init-db.c:543
+#: builtin/init-db.c:545
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"%s (oder --work-tree=<Verzeichnis>) nicht erlaubt ohne Spezifizierung von %s "
"(oder --git-dir=<Verzeichnis>)"
-#: builtin/init-db.c:571
+#: builtin/init-db.c:573
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Kann nicht auf Arbeitsverzeichnis '%s' zugreifen."
msgid "Cover letter needs email format"
msgstr "Anschreiben benötigt E-Mail-Format"
-#: builtin/log.c:1064
+#: builtin/log.c:1063
#, c-format
msgid "insane in-reply-to: %s"
msgstr "ungültiges in-reply-to: %s"
-#: builtin/log.c:1092
+#: builtin/log.c:1091
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<Optionen>] [<seit> | <Commitbereich>]"
-#: builtin/log.c:1137
+#: builtin/log.c:1141
msgid "Two output directories?"
msgstr "Zwei Ausgabeverzeichnisse?"
-#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897
+#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
#, c-format
msgid "Unknown commit %s"
msgstr "Unbekannter Commit %s"
-#: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305
-#: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425
-#: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594
-#: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455
+#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
-#: builtin/log.c:1259
+#: builtin/log.c:1263
msgid "Could not find exact merge base."
msgstr "Konnte keine exakte Merge-Basis finden."
-#: builtin/log.c:1263
+#: builtin/log.c:1267
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"
"'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:1283
+#: builtin/log.c:1287
msgid "Failed to find exact merge base"
msgstr "Fehler beim Finden einer exakten Merge-Basis."
-#: builtin/log.c:1294
+#: builtin/log.c:1298
msgid "base commit should be the ancestor of revision list"
msgstr "Basis-Commit sollte der Vorgänger der Revisionsliste sein."
-#: builtin/log.c:1298
+#: builtin/log.c:1302
msgid "base commit shouldn't be in revision list"
msgstr "Basis-Commit sollte nicht in der Revisionsliste enthalten sein."
-#: builtin/log.c:1347
+#: builtin/log.c:1351
msgid "cannot get patch id"
msgstr "kann Patch-Id nicht lesen"
-#: builtin/log.c:1404
+#: builtin/log.c:1408
msgid "use [PATCH n/m] even with a single patch"
msgstr "[PATCH n/m] auch mit einzelnem Patch verwenden"
-#: builtin/log.c:1407
+#: builtin/log.c:1411
msgid "use [PATCH] even with multiple patches"
msgstr "[PATCH] auch mit mehreren Patches verwenden"
-#: builtin/log.c:1411
+#: builtin/log.c:1415
msgid "print patches to standard out"
msgstr "Ausgabe der Patches in Standard-Ausgabe"
-#: builtin/log.c:1413
+#: builtin/log.c:1417
msgid "generate a cover letter"
msgstr "ein Deckblatt erzeugen"
-#: builtin/log.c:1415
+#: builtin/log.c:1419
msgid "use simple number sequence for output file names"
msgstr "einfache Nummernfolge für die Namen der Ausgabedateien verwenden"
-#: builtin/log.c:1416
+#: builtin/log.c:1420
msgid "sfx"
msgstr "Dateiendung"
-#: builtin/log.c:1417
+#: builtin/log.c:1421
msgid "use <sfx> instead of '.patch'"
msgstr "<Dateiendung> anstatt '.patch' verwenden"
-#: builtin/log.c:1419
+#: builtin/log.c:1423
msgid "start numbering patches at <n> instead of 1"
msgstr "die Nummerierung der Patches bei <n> anstatt bei 1 beginnen"
-#: builtin/log.c:1421
+#: builtin/log.c:1425
msgid "mark the series as Nth re-roll"
msgstr "die Serie als n-te Fassung kennzeichnen"
-#: builtin/log.c:1423
+#: builtin/log.c:1427
+msgid "Use [RFC PATCH] instead of [PATCH]"
+msgstr "[RFC PATCH] anstatt [PATCH] verwenden"
+
+#: builtin/log.c:1430
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "[<Präfix>] anstatt [PATCH] verwenden"
-#: builtin/log.c:1426
+#: builtin/log.c:1433
msgid "store resulting files in <dir>"
msgstr "erzeugte Dateien in <Verzeichnis> speichern"
-#: builtin/log.c:1429
+#: builtin/log.c:1436
msgid "don't strip/add [PATCH]"
msgstr "[PATCH] nicht entfernen/hinzufügen"
-#: builtin/log.c:1432
+#: builtin/log.c:1439
msgid "don't output binary diffs"
msgstr "keine binären Unterschiede ausgeben"
-#: builtin/log.c:1434
+#: builtin/log.c:1441
msgid "output all-zero hash in From header"
msgstr "Hash mit Nullen in \"From\"-Header ausgeben"
-#: builtin/log.c:1436
+#: builtin/log.c:1443
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:1438
+#: builtin/log.c:1445
msgid "show patch format instead of default (patch + stat)"
msgstr "Patchformat anstatt des Standards anzeigen (Patch + Zusammenfassung)"
-#: builtin/log.c:1440
+#: builtin/log.c:1447
msgid "Messaging"
msgstr "E-Mail-Einstellungen"
-#: builtin/log.c:1441
+#: builtin/log.c:1448
msgid "header"
msgstr "Header"
-#: builtin/log.c:1442
+#: builtin/log.c:1449
msgid "add email header"
msgstr "E-Mail-Header hinzufügen"
-#: builtin/log.c:1443 builtin/log.c:1445
+#: builtin/log.c:1450 builtin/log.c:1452
msgid "email"
msgstr "E-Mail"
-#: builtin/log.c:1443
+#: builtin/log.c:1450
msgid "add To: header"
msgstr "\"To:\"-Header hinzufügen"
-#: builtin/log.c:1445
+#: builtin/log.c:1452
msgid "add Cc: header"
msgstr "\"Cc:\"-Header hinzufügen"
-#: builtin/log.c:1447
+#: builtin/log.c:1454
msgid "ident"
msgstr "Ident"
-#: builtin/log.c:1448
+#: builtin/log.c:1455
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:1450
+#: builtin/log.c:1457
msgid "message-id"
msgstr "message-id"
-#: builtin/log.c:1451
+#: builtin/log.c:1458
msgid "make first mail a reply to <message-id>"
msgstr "aus erster E-Mail eine Antwort zu <message-id> machen"
-#: builtin/log.c:1452 builtin/log.c:1455
+#: builtin/log.c:1459 builtin/log.c:1462
msgid "boundary"
msgstr "Grenze"
-#: builtin/log.c:1453
+#: builtin/log.c:1460
msgid "attach the patch"
msgstr "den Patch anhängen"
-#: builtin/log.c:1456
+#: builtin/log.c:1463
msgid "inline the patch"
msgstr "den Patch direkt in die Nachricht einfügen"
-#: builtin/log.c:1460
+#: builtin/log.c:1467
msgid "enable message threading, styles: shallow, deep"
msgstr "Nachrichtenverkettung aktivieren, Stile: shallow, deep"
-#: builtin/log.c:1462
+#: builtin/log.c:1469
msgid "signature"
msgstr "Signatur"
-#: builtin/log.c:1463
+#: builtin/log.c:1470
msgid "add a signature"
msgstr "eine Signatur hinzufügen"
-#: builtin/log.c:1464
+#: builtin/log.c:1471
msgid "base-commit"
msgstr "Basis-Commit"
-#: builtin/log.c:1465
+#: builtin/log.c:1472
msgid "add prerequisite tree info to the patch series"
msgstr "erforderliche Revisions-Informationen der Patch-Serie hinzufügen"
-#: builtin/log.c:1467
+#: builtin/log.c:1474
msgid "add a signature from a file"
msgstr "eine Signatur aus einer Datei hinzufügen"
-#: builtin/log.c:1468
+#: builtin/log.c:1475
msgid "don't print the patch filenames"
msgstr "keine Dateinamen der Patches anzeigen"
-#: builtin/log.c:1558
+#: builtin/log.c:1565
msgid "-n and -k are mutually exclusive."
msgstr "Die Optionen -n und -k schließen sich gegenseitig aus."
-#: builtin/log.c:1560
-msgid "--subject-prefix and -k are mutually exclusive."
-msgstr "Die Optionen --subject-prefix und -k schließen sich gegenseitig aus."
+#: builtin/log.c:1567
+msgid "--subject-prefix/--rfc and -k are mutually exclusive."
+msgstr "--subject-prefix/--rfc und -k schließen sich gegenseitig aus."
-#: builtin/log.c:1568
+#: builtin/log.c:1575
msgid "--name-only does not make sense"
msgstr "Die Option --name-only kann nicht verwendet werden."
-#: builtin/log.c:1570
+#: builtin/log.c:1577
msgid "--name-status does not make sense"
msgstr "Die Option --name-status kann nicht verwendet werden."
-#: builtin/log.c:1572
+#: builtin/log.c:1579
msgid "--check does not make sense"
msgstr "Die Option --check kann nicht verwendet werden."
-#: builtin/log.c:1602
+#: builtin/log.c:1609
msgid "standard output, or directory, which one?"
msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?"
-#: builtin/log.c:1604
+#: builtin/log.c:1611
#, c-format
msgid "Could not create directory '%s'"
msgstr "Konnte Verzeichnis '%s' nicht erstellen."
-#: builtin/log.c:1698
+#: builtin/log.c:1705
#, c-format
msgid "unable to read signature file '%s'"
msgstr "Konnte Signatur-Datei '%s' nicht lesen"
-#: builtin/log.c:1769
+#: builtin/log.c:1777
msgid "Failed to create output files"
msgstr "Fehler beim Erstellen der Ausgabedateien."
-#: builtin/log.c:1818
+#: builtin/log.c:1826
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]"
-#: builtin/log.c:1872
+#: builtin/log.c:1880
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
"Konnte gefolgten Remote-Branch nicht finden, bitte geben Sie <Upstream> "
"manuell an.\n"
-#: builtin/ls-files.c:379
+#: builtin/ls-files.c:458
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<Optionen>] [<Datei>...]"
-#: builtin/ls-files.c:428
+#: builtin/ls-files.c:507
msgid "identify the file status with tags"
msgstr "den Dateistatus mit Tags anzeigen"
-#: builtin/ls-files.c:430
+#: builtin/ls-files.c:509
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
"Kleinbuchstaben für Dateien mit 'assume unchanged' Markierung verwenden"
-#: builtin/ls-files.c:432
+#: builtin/ls-files.c:511
msgid "show cached files in the output (default)"
msgstr "zwischengespeicherte Dateien in der Ausgabe anzeigen (Standard)"
-#: builtin/ls-files.c:434
+#: builtin/ls-files.c:513
msgid "show deleted files in the output"
msgstr "entfernte Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:436
+#: builtin/ls-files.c:515
msgid "show modified files in the output"
msgstr "geänderte Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:438
+#: builtin/ls-files.c:517
msgid "show other files in the output"
msgstr "sonstige Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:440
+#: builtin/ls-files.c:519
msgid "show ignored files in the output"
msgstr "ignorierte Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:443
+#: builtin/ls-files.c:522
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:445
+#: builtin/ls-files.c:524
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:447
+#: builtin/ls-files.c:526
msgid "show 'other' directories' names only"
msgstr "nur Namen von 'sonstigen' Verzeichnissen anzeigen"
-#: builtin/ls-files.c:449
+#: builtin/ls-files.c:528
msgid "show line endings of files"
msgstr "Zeilenenden von Dateien anzeigen"
-#: builtin/ls-files.c:451
+#: builtin/ls-files.c:530
msgid "don't show empty directories"
msgstr "keine leeren Verzeichnisse anzeigen"
-#: builtin/ls-files.c:454
+#: builtin/ls-files.c:533
msgid "show unmerged files in the output"
msgstr "nicht zusammengeführte Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:456
+#: builtin/ls-files.c:535
msgid "show resolve-undo information"
msgstr "'resolve-undo' Informationen anzeigen"
-#: builtin/ls-files.c:458
+#: builtin/ls-files.c:537
msgid "skip files matching pattern"
msgstr "Dateien auslassen, die einem Muster entsprechen"
-#: builtin/ls-files.c:461
+#: builtin/ls-files.c:540
msgid "exclude patterns are read from <file>"
msgstr "Muster, gelesen von <Datei>, ausschließen"
-#: builtin/ls-files.c:464
+#: builtin/ls-files.c:543
msgid "read additional per-directory exclude patterns in <file>"
msgstr "zusätzliche pro-Verzeichnis Auschlussmuster aus <Datei> auslesen"
-#: builtin/ls-files.c:466
+#: builtin/ls-files.c:545
msgid "add the standard git exclusions"
msgstr "die standardmäßigen Git-Ausschlüsse hinzufügen"
-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:548
msgid "make the output relative to the project top directory"
msgstr "Ausgabe relativ zum Projektverzeichnis"
-#: builtin/ls-files.c:472
+#: builtin/ls-files.c:551
+msgid "recurse through submodules"
+msgstr "Rekursion in Submodulen durchführen"
+
+#: builtin/ls-files.c:553
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:473
+#: builtin/ls-files.c:554
msgid "tree-ish"
msgstr "Commit-Referenz"
-#: builtin/ls-files.c:474
+#: builtin/ls-files.c:555
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:476
+#: builtin/ls-files.c:557
msgid "show debugging data"
msgstr "Ausgaben zur Fehlersuche anzeigen"
msgid "Available custom strategies are:"
msgstr "Verfügbare benutzerdefinierte Strategien sind:"
-#: builtin/merge.c:195 builtin/pull.c:126
+#: builtin/merge.c:195 builtin/pull.c:127
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:198 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:130
msgid "show a diffstat at the end of the merge"
msgstr "eine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen"
-#: builtin/merge.c:199 builtin/pull.c:132
+#: builtin/merge.c:199 builtin/pull.c:133
msgid "(synonym to --stat)"
msgstr "(Synonym für --stat)"
-#: builtin/merge.c:201 builtin/pull.c:135
+#: builtin/merge.c:201 builtin/pull.c:136
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:204 builtin/pull.c:138
+#: builtin/merge.c:204 builtin/pull.c:139
msgid "create a single commit instead of doing a merge"
msgstr "einen einzelnen Commit anstatt eines Merges erzeugen"
-#: builtin/merge.c:206 builtin/pull.c:141
+#: builtin/merge.c:206 builtin/pull.c:142
msgid "perform a commit if the merge succeeds (default)"
msgstr "einen Commit durchführen, wenn der Merge erfolgreich war (Standard)"
-#: builtin/merge.c:208 builtin/pull.c:144
+#: builtin/merge.c:208 builtin/pull.c:145
msgid "edit message before committing"
msgstr "Bearbeitung der Beschreibung vor dem Commit"
msgid "allow fast-forward (default)"
msgstr "Vorspulen erlauben (Standard)"
-#: builtin/merge.c:211 builtin/pull.c:150
+#: builtin/merge.c:211 builtin/pull.c:151
msgid "abort if fast-forward is not possible"
msgstr "abbrechen, wenn kein Vorspulen möglich ist"
-#: builtin/merge.c:215 builtin/pull.c:153
+#: builtin/merge.c:215 builtin/pull.c:154
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:216 builtin/notes.c:772 builtin/pull.c:157
+#: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158
#: builtin/revert.c:89
msgid "strategy"
msgstr "Strategie"
-#: builtin/merge.c:217 builtin/pull.c:158
+#: builtin/merge.c:217 builtin/pull.c:159
msgid "merge strategy to use"
msgstr "zu verwendende Merge-Strategie"
-#: builtin/merge.c:218 builtin/pull.c:161
+#: builtin/merge.c:218 builtin/pull.c:162
msgid "option=value"
msgstr "Option=Wert"
-#: builtin/merge.c:219 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:163
msgid "option for selected merge strategy"
msgstr "Option für ausgewählte Merge-Strategie"
msgid "abort the current in-progress merge"
msgstr "den sich im Gange befindlichen Merge abbrechen"
-#: builtin/merge.c:227 builtin/pull.c:169
+#: builtin/merge.c:227 builtin/pull.c:170
msgid "allow merging unrelated histories"
msgstr "erlaube das Zusammenführen von nicht zusammenhängenden Historien"
msgid "Already up-to-date."
msgstr "Bereits aktuell."
-#: builtin/merge.c:1382
+#: builtin/merge.c:1377
#, c-format
msgid "Updating %s..%s\n"
msgstr "Aktualisiere %s..%s\n"
-#: builtin/merge.c:1419
+#: builtin/merge.c:1418
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n"
-#: builtin/merge.c:1426
+#: builtin/merge.c:1425
#, c-format
msgid "Nope.\n"
msgstr "Nein.\n"
-#: builtin/merge.c:1451
+#: builtin/merge.c:1450
msgid "Already up-to-date. Yeeah!"
msgstr "Bereits aktuell."
-#: builtin/merge.c:1457
+#: builtin/merge.c:1456
msgid "Not possible to fast-forward, aborting."
msgstr "Vorspulen nicht möglich, breche ab."
-#: builtin/merge.c:1480 builtin/merge.c:1559
+#: builtin/merge.c:1479 builtin/merge.c:1558
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Rücklauf des Verzeichnisses bis zum Ursprung ...\n"
-#: builtin/merge.c:1484
+#: builtin/merge.c:1483
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Probiere Merge-Strategie %s ...\n"
-#: builtin/merge.c:1550
+#: builtin/merge.c:1549
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Keine Merge-Strategie behandelt diesen Merge.\n"
-#: builtin/merge.c:1552
+#: builtin/merge.c:1551
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Merge mit Strategie %s fehlgeschlagen.\n"
-#: builtin/merge.c:1561
+#: builtin/merge.c:1560
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Benutzen Sie \"%s\", um die Auflösung per Hand vorzubereiten.\n"
-#: builtin/merge.c:1573
+#: builtin/merge.c:1572
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <Referenz> [<Commit>]"
-#: builtin/merge-base.c:214
+#: builtin/merge-base.c:217
msgid "output all common ancestors"
msgstr "Ausgabe aller gemeinsamen Vorgänger-Commits"
-#: builtin/merge-base.c:216
+#: builtin/merge-base.c:219
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:218
+#: builtin/merge-base.c:221
msgid "list revs not reachable from others"
msgstr "Commits auflisten, die nicht durch Andere erreichbar sind"
-#: builtin/merge-base.c:220
+#: builtin/merge-base.c:223
msgid "is the first one ancestor of the other?"
msgstr "ist der Erste ein Vorgänger-Commit von dem Anderen?"
-#: builtin/merge-base.c:222
+#: builtin/merge-base.c:225
msgid "find where <commit> forked from reflog of <ref>"
msgstr "<Commit> finden, von wo Reflog von <Referenz> abgespalten wurde"
msgid "set labels for file1/orig-file/file2"
msgstr "Beschriftung für Datei1/orig-Datei/Datei2 setzen"
+#: builtin/merge-recursive.c:45
+#, c-format
+msgid "unknown option %s"
+msgstr "unbekannte Option: %s"
+
+#: builtin/merge-recursive.c:51
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "Konnte Objekt '%s' nicht parsen."
+
+#: builtin/merge-recursive.c:55
+#, 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:63
+msgid "not handling anything other than two heads merge."
+msgstr "Es wird nur der Merge von zwei Branches behandelt."
+
+#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "Konnte Referenz '%s' nicht auflösen"
+
+#: builtin/merge-recursive.c:77
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "Führe %s mit %s zusammen\n"
+
#: builtin/mktree.c:65
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
msgid "renaming '%s' failed"
msgstr "Umbenennung von '%s' fehlgeschlagen"
-#: builtin/name-rev.c:258
+#: builtin/name-rev.c:257
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<Optionen>] <Commit>..."
-#: builtin/name-rev.c:259
+#: builtin/name-rev.c:258
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<Optionen>] --all"
-#: builtin/name-rev.c:260
+#: builtin/name-rev.c:259
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<Optionen>] --stdin"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:311
msgid "print only names (no SHA-1)"
msgstr "nur Namen anzeigen (keine SHA-1)"
-#: builtin/name-rev.c:313
+#: builtin/name-rev.c:312
msgid "only use tags to name the commits"
msgstr "nur Tags verwenden, um die Commits zu benennen"
-#: builtin/name-rev.c:315
+#: builtin/name-rev.c:314
msgid "only use refs matching <pattern>"
msgstr "nur Referenzen verwenden die <Muster> entsprechen"
-#: builtin/name-rev.c:317
+#: builtin/name-rev.c:316
msgid "list all commits reachable from all refs"
msgstr "alle Commits auflisten, die von allen Referenzen erreichbar sind"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:317
msgid "read from stdin"
msgstr "von der Standard-Eingabe lesen"
-#: builtin/name-rev.c:319
+#: builtin/name-rev.c:318
msgid "allow to print `undefined` names (default)"
msgstr "Ausgabe von `undefinierten` Namen erlauben (Standard)"
-#: builtin/name-rev.c:325
+#: builtin/name-rev.c:324
msgid "dereference tags in the input (internal use)"
msgstr "Tags in der Eingabe dereferenzieren (interne Verwendung)"
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 den Notiz-Inhalt unter Verwendung der Option -m oder -F."
+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"
#: builtin/notes.c:205
#, c-format
-msgid "The note contents have been left in %s"
-msgstr "Die Notiz-Inhalte wurden in %s belassen"
+msgid "the note contents have been left in %s"
+msgstr "Die Notiz-Inhalte wurden in %s belassen."
#: builtin/notes.c:233 builtin/tag.c:439
#, c-format
msgid "could not open or read '%s'"
msgstr "konnte '%s' nicht öffnen oder lesen"
+#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307
+#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513
+#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659
+#, c-format
+msgid "failed to resolve '%s' as a valid ref."
+msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
+
#: builtin/notes.c:257
#, c-format
-msgid "Failed to read object '%s'."
+msgid "failed to read object '%s'."
msgstr "Fehler beim Lesen des Objektes '%s'."
#: builtin/notes.c:261
#, c-format
-msgid "Cannot read note data from non-blob object '%s'."
+msgid "cannot read note data from non-blob object '%s'."
msgstr "Kann Notiz-Daten nicht von Nicht-Blob Objekt '%s' lesen."
-#: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494
-#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650
-#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968
+#: builtin/notes.c:301
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr "Fehlerhafte Eingabezeile: '%s'."
+
+#: builtin/notes.c:316
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
+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:345
+#, 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:365 builtin/notes.c:420 builtin/notes.c:496
+#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652
+#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970
msgid "too many parameters"
msgstr "zu viele Parameter"
-#: builtin/notes.c:376 builtin/notes.c:663
+#: builtin/notes.c:378 builtin/notes.c:665
#, c-format
-msgid "No note found for object %s."
+msgid "no note found for object %s."
msgstr "Keine Notiz für Objekt %s gefunden."
-#: builtin/notes.c:397 builtin/notes.c:560
+#: builtin/notes.c:399 builtin/notes.c:562
msgid "note contents as a string"
msgstr "Notizinhalte als Zeichenkette"
-#: builtin/notes.c:400 builtin/notes.c:563
+#: builtin/notes.c:402 builtin/notes.c:565
msgid "note contents in a file"
msgstr "Notizinhalte in einer Datei"
-#: builtin/notes.c:403 builtin/notes.c:566
+#: builtin/notes.c:405 builtin/notes.c:568
msgid "reuse and edit specified note object"
msgstr "Wiederverwendung und Bearbeitung des angegebenen Notiz-Objektes"
-#: builtin/notes.c:406 builtin/notes.c:569
+#: builtin/notes.c:408 builtin/notes.c:571
msgid "reuse specified note object"
msgstr "Wiederverwendung des angegebenen Notiz-Objektes"
-#: builtin/notes.c:409 builtin/notes.c:572
+#: builtin/notes.c:411 builtin/notes.c:574
msgid "allow storing empty note"
msgstr "Speichern leerer Notiz erlauben"
-#: builtin/notes.c:410 builtin/notes.c:481
+#: builtin/notes.c:412 builtin/notes.c:483
msgid "replace existing notes"
msgstr "existierende Notizen ersetzen"
-#: builtin/notes.c:435
+#: builtin/notes.c:437
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"Konnte Notizen nicht hinzufügen. Existierende Notizen für Objekt %s "
"gefunden. Verwenden Sie '-f', um die existierenden Notizen zu überschreiben."
-#: builtin/notes.c:450 builtin/notes.c:529
+#: builtin/notes.c:452 builtin/notes.c:531
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Überschreibe existierende Notizen für Objekt %s\n"
-#: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887
+#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889
#, c-format
msgid "Removing note for object %s\n"
msgstr "Entferne Notiz für Objekt %s\n"
-#: builtin/notes.c:482
+#: builtin/notes.c:484
msgid "read objects from stdin"
msgstr "Objekte von der Standard-Eingabe lesen"
-#: builtin/notes.c:484
+#: builtin/notes.c:486
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"Konfiguration für <Befehl> zum Umschreiben von Commits laden (impliziert --"
"stdin)"
-#: builtin/notes.c:502
+#: builtin/notes.c:504
msgid "too few parameters"
msgstr "zu wenig Parameter"
-#: builtin/notes.c:523
+#: builtin/notes.c:525
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"Kann Notizen nicht kopieren. Existierende Notizen für Objekt %s gefunden. "
"Verwenden Sie '-f', um die existierenden Notizen zu überschreiben."
-#: builtin/notes.c:535
+#: builtin/notes.c:537
#, c-format
-msgid "Missing notes on source object %s. Cannot copy."
+msgid "missing notes on source object %s. Cannot copy."
msgstr "Keine Notizen für Quell-Objekt %s. Kopie nicht möglich."
-#: builtin/notes.c:587
+#: builtin/notes.c:589
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"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:753
+#: builtin/notes.c:685
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr "Fehler beim Löschen der Referenz NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:687
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr "Fehler beim Löschen der Referenz NOTES_MERGE_REF"
+
+#: builtin/notes.c:689
+msgid "failed to remove 'git notes merge' worktree"
+msgstr "Fehler beim Löschen des Arbeitsverzeichnisses von 'git notes merge'."
+
+#: builtin/notes.c:709
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr "Fehler beim Lesen der Referenz NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:711
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr "Konnte Commit von NOTES_MERGE_PARTIAL nicht finden."
+
+#: builtin/notes.c:713
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr "Konnte Commit von NOTES_MERGE_PARTIAL nicht parsen."
+
+#: builtin/notes.c:726
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr "Fehler beim Auflösen von NOTES_MERGE_REF"
+
+#: builtin/notes.c:729
+msgid "failed to finalize notes merge"
+msgstr "Fehler beim Abschließen der Zusammenführung der Notizen."
+
+#: builtin/notes.c:755
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "unbekannte Merge-Strategie '%s' für Notizen"
-#: builtin/notes.c:769
+#: builtin/notes.c:771
msgid "General options"
msgstr "Allgemeine Optionen"
-#: builtin/notes.c:771
+#: builtin/notes.c:773
msgid "Merge options"
msgstr "Merge-Optionen"
-#: builtin/notes.c:773
+#: builtin/notes.c:775
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
"löst Konflikte bei Notizen mit der angegebenen Strategie auf (manual/ours/"
"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:775
+#: builtin/notes.c:777
msgid "Committing unmerged notes"
msgstr "nicht zusammengeführte Notizen eintragen"
-#: builtin/notes.c:777
+#: builtin/notes.c:779
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:779
+#: builtin/notes.c:781
msgid "Aborting notes merge resolution"
msgstr "Konfliktauflösung beim Merge von Notizen abbrechen"
-#: builtin/notes.c:781
+#: builtin/notes.c:783
msgid "abort notes merge"
msgstr "Merge von Notizen abbrechen"
-#: builtin/notes.c:792
+#: builtin/notes.c:794
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "Kann --commit, --abort oder -s/--strategy nicht kombinieren."
-#: builtin/notes.c:797
-msgid "Must specify a notes ref to merge"
+#: builtin/notes.c:799
+msgid "must specify a notes ref to merge"
msgstr "Sie müssen eine Notiz-Referenz zum Mergen angeben."
-#: builtin/notes.c:821
+#: builtin/notes.c:823
#, c-format
-msgid "Unknown -s/--strategy: %s"
+msgid "unknown -s/--strategy: %s"
msgstr "Unbekannter Wert für -s/--strategy: %s"
-#: builtin/notes.c:858
+#: builtin/notes.c:860
#, c-format
-msgid "A notes merge into %s is already in-progress at %s"
+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:861
+#: builtin/notes.c:863
#, c-format
-msgid "Failed to store link to current notes ref (%s)"
-msgstr "Fehler beim Speichern der Verknüpfung zur aktuellen Notes-Referenz (%s)"
+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:863
+#: builtin/notes.c:865
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
"abort'.\n"
msgstr ""
"Automatisches Zusammenführen der Notizen fehlgeschlagen. Beheben Sie die\n"
-"Konflikte in %s und committen Sie das Ergebnis mit 'git notes merge --commit',\n"
+"Konflikte in %s und committen Sie das Ergebnis mit 'git notes merge --"
+"commit',\n"
"oder brechen Sie den Merge mit 'git notes merge --abort' ab.\n"
-#: builtin/notes.c:885
+#: builtin/notes.c:887
#, c-format
msgid "Object %s has no note\n"
msgstr "Objekt %s hat keine Notiz\n"
-#: builtin/notes.c:897
+#: builtin/notes.c:899
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:900
+#: builtin/notes.c:902
msgid "read object names from the standard input"
msgstr "Objektnamen von der Standard-Eingabe lesen"
-#: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127
+#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
msgid "do not remove, show only"
msgstr "nicht löschen, nur anzeigen"
-#: builtin/notes.c:939
+#: builtin/notes.c:941
msgid "report pruned notes"
msgstr "gelöschte Notizen melden"
-#: builtin/notes.c:981
+#: builtin/notes.c:983
msgid "notes-ref"
msgstr "Notiz-Referenz"
-#: builtin/notes.c:982
+#: builtin/notes.c:984
msgid "use notes from <notes-ref>"
msgstr "Notizen von <Notiz-Referenz> verwenden"
-#: builtin/notes.c:1017 builtin/remote.c:1623
+#: builtin/notes.c:1019
#, c-format
-msgid "Unknown subcommand: %s"
+msgid "unknown subcommand: %s"
msgstr "Unbekannter Unterbefehl: %s"
-#: builtin/pack-objects.c:28
+#: builtin/pack-objects.c:29
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [<Optionen>...] [< <Referenzliste> | < "
"<Objektliste>]"
-#: builtin/pack-objects.c:29
+#: builtin/pack-objects.c:30
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [<Optionen>...] <Basis-Name> [< <Referenzliste> | < "
"<Objektliste>]"
-#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
+#: builtin/pack-objects.c:179 builtin/pack-objects.c:182
#, c-format
msgid "deflate error (%d)"
msgstr "Fehler beim Komprimieren (%d)"
-#: builtin/pack-objects.c:766
+#: builtin/pack-objects.c:768
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:779
+#: builtin/pack-objects.c:781
msgid "Writing objects"
msgstr "Schreibe Objekte"
-#: builtin/pack-objects.c:1037
+#: builtin/pack-objects.c:1070
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:2197
+#: builtin/pack-objects.c:2346
msgid "Compressing objects"
msgstr "Komprimiere Objekte"
-#: builtin/pack-objects.c:2611
+#: builtin/pack-objects.c:2759
#, c-format
msgid "unsupported index version %s"
msgstr "Nicht unterstützte Index-Version %s"
-#: builtin/pack-objects.c:2615
+#: builtin/pack-objects.c:2763
#, c-format
msgid "bad index version '%s'"
msgstr "Ungültige Index-Version '%s'"
-#: builtin/pack-objects.c:2645
+#: builtin/pack-objects.c:2793
msgid "do not show progress meter"
msgstr "keine Fortschrittsanzeige anzeigen"
-#: builtin/pack-objects.c:2647
+#: builtin/pack-objects.c:2795
msgid "show progress meter"
msgstr "Fortschrittsanzeige anzeigen"
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2797
msgid "show progress meter during object writing phase"
msgstr ""
"Forschrittsanzeige während der Phase des Schreibens der Objekte anzeigen"
-#: builtin/pack-objects.c:2652
+#: builtin/pack-objects.c:2800
msgid "similar to --all-progress when progress meter is shown"
msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird"
-#: builtin/pack-objects.c:2653
+#: builtin/pack-objects.c:2801
msgid "version[,offset]"
msgstr "version[,offset]"
-#: builtin/pack-objects.c:2654
+#: builtin/pack-objects.c:2802
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:2657
+#: builtin/pack-objects.c:2805
msgid "maximum size of each output pack file"
msgstr "maximale Größe für jede ausgegebene Paketdatei"
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2807
msgid "ignore borrowed objects from alternate object store"
msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren"
-#: builtin/pack-objects.c:2661
+#: builtin/pack-objects.c:2809
msgid "ignore packed objects"
msgstr "gepackte Objekte ignorieren"
-#: builtin/pack-objects.c:2663
+#: builtin/pack-objects.c:2811
msgid "limit pack window by objects"
msgstr "Paketfenster durch Objekte begrenzen"
-#: builtin/pack-objects.c:2665
+#: builtin/pack-objects.c:2813
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher begrenzen"
-#: builtin/pack-objects.c:2667
+#: builtin/pack-objects.c:2815
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:2669
+#: builtin/pack-objects.c:2817
msgid "reuse existing deltas"
msgstr "existierende Unterschiede wiederverwenden"
-#: builtin/pack-objects.c:2671
+#: builtin/pack-objects.c:2819
msgid "reuse existing objects"
msgstr "existierende Objekte wiederverwenden"
-#: builtin/pack-objects.c:2673
+#: builtin/pack-objects.c:2821
msgid "use OFS_DELTA objects"
msgstr "OFS_DELTA Objekte verwenden"
-#: builtin/pack-objects.c:2675
+#: builtin/pack-objects.c:2823
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:2677
+#: builtin/pack-objects.c:2825
msgid "do not create an empty pack output"
msgstr "keine leeren Pakete erzeugen"
-#: builtin/pack-objects.c:2679
+#: builtin/pack-objects.c:2827
msgid "read revision arguments from standard input"
msgstr "Argumente bezüglich Commits von der Standard-Eingabe lesen"
-#: builtin/pack-objects.c:2681
+#: builtin/pack-objects.c:2829
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:2684
+#: builtin/pack-objects.c:2832
msgid "include objects reachable from any reference"
msgstr "Objekte einschließen, die von jeder Referenz erreichbar sind"
-#: builtin/pack-objects.c:2687
+#: builtin/pack-objects.c:2835
msgid "include objects referred by reflog entries"
msgstr ""
"Objekte einschließen, die von Einträgen des Reflogs referenziert werden"
-#: builtin/pack-objects.c:2690
+#: builtin/pack-objects.c:2838
msgid "include objects referred to by the index"
msgstr "Objekte einschließen, die vom Index referenziert werden"
-#: builtin/pack-objects.c:2693
+#: builtin/pack-objects.c:2841
msgid "output pack to stdout"
msgstr "Paket in die Standard-Ausgabe schreiben"
-#: builtin/pack-objects.c:2695
+#: builtin/pack-objects.c:2843
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:2697
+#: builtin/pack-objects.c:2845
msgid "keep unreachable objects"
msgstr "nicht erreichbare Objekte behalten"
-#: builtin/pack-objects.c:2699
+#: builtin/pack-objects.c:2847
msgid "pack loose unreachable objects"
msgstr "nicht erreichbare lose Objekte packen"
-#: builtin/pack-objects.c:2700 parse-options.h:142
-msgid "time"
-msgstr "Zeit"
-
-#: builtin/pack-objects.c:2701
+#: builtin/pack-objects.c:2849
msgid "unpack unreachable objects newer than <time>"
msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind"
-#: builtin/pack-objects.c:2704
+#: builtin/pack-objects.c:2852
msgid "create thin packs"
msgstr "dünnere Pakete erzeugen"
-#: builtin/pack-objects.c:2706
+#: builtin/pack-objects.c:2854
msgid "create packs suitable for shallow fetches"
msgstr ""
"Pakete geeignet für Abholung mit unvollständiger Historie (shallow) erzeugen"
-#: builtin/pack-objects.c:2708
+#: builtin/pack-objects.c:2856
msgid "ignore packs that have companion .keep file"
msgstr "Pakete ignorieren, die .keep Dateien haben"
-#: builtin/pack-objects.c:2710
+#: builtin/pack-objects.c:2858
msgid "pack compression level"
msgstr "Komprimierungsgrad für Paketierung"
-#: builtin/pack-objects.c:2712
+#: builtin/pack-objects.c:2860
msgid "do not hide commits by grafts"
msgstr "keine künstlichen Vorgänger-Commits (\"grafts\") verbergen"
-#: builtin/pack-objects.c:2714
+#: builtin/pack-objects.c:2862
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:2716
+#: builtin/pack-objects.c:2864
msgid "write a bitmap index together with the pack index"
msgstr "Bitmap-Index zusammen mit Pack-Index schreiben"
-#: builtin/pack-objects.c:2829
+#: builtin/pack-objects.c:2993
msgid "Counting objects"
msgstr "Zähle Objekte"
msgid "cannot prune in a precious-objects repo"
msgstr "kann \"prune\" in precious-objects Repository nicht ausführen"
-#: builtin/pull.c:72
+#: builtin/pull.c:51 builtin/pull.c:53
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr "Ungültiger Wert für %s: %s"
+
+#: builtin/pull.c:73
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<Optionen>] [<Repository> [<Refspec>...]]"
-#: builtin/pull.c:120
+#: builtin/pull.c:121
msgid "Options related to merging"
msgstr "Optionen bezogen auf Merge"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "incorporate changes by rebasing rather than merging"
msgstr "Integration von Änderungen durch Rebase statt Merge"
-#: builtin/pull.c:147 builtin/revert.c:101
+#: builtin/pull.c:148 builtin/revert.c:101
msgid "allow fast-forward"
msgstr "Vorspulen erlauben"
-#: builtin/pull.c:156
+#: builtin/pull.c:157
msgid "automatically stash/stash pop before and after rebase"
msgstr "automatischer Stash/Stash-Pop vor und nach eines Rebase"
-#: builtin/pull.c:172
+#: builtin/pull.c:173
msgid "Options related to fetching"
msgstr "Optionen bezogen auf Fetch"
-#: builtin/pull.c:194
+#: builtin/pull.c:195
msgid "number of submodules pulled in parallel"
msgstr "Anzahl der parallel mit 'pull' zu verarbeitenden Submodule"
-#: builtin/pull.c:283
+#: builtin/pull.c:284
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Ungültiger Wert für pull.ff: %s"
-#: builtin/pull.c:379 git-sh-setup.sh:226
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr ""
-"Kann \"pull\" mit \"rebase\" nicht ausführen: Sie haben Änderungen, die "
-"nicht zum Commit vorgemerkt sind."
-
-#: builtin/pull.c:385 git-sh-setup.sh:252
-msgid "Additionally, your index contains uncommitted changes."
-msgstr "Zusätzlich beinhaltet die Staging-Area nicht committete Änderungen."
-
-#: builtin/pull.c:387 git-sh-setup.sh:245
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"Kann \"pull\" mit \"rebase\" nicht ausführen: Die Staging-Area beinhaltet "
-"nicht committete Änderungen."
-
-#: builtin/pull.c:463
+#: builtin/pull.c:397
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
"Es gibt keinen Kandidaten für Rebase innerhalb der Referenzen, die eben "
"angefordert wurden."
-#: builtin/pull.c:465
+#: builtin/pull.c:399
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:466
+#: builtin/pull.c:400
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
"Im Allgemeinen bedeutet das, dass Sie einen Refspec mit Wildcards angegeben\n"
"haben, der auf der Gegenseite mit keinen Referenzen übereinstimmt."
-#: builtin/pull.c:469
+#: builtin/pull.c:403
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"Repository für den aktuellen Branch ist, müssen Sie einen Branch auf\n"
"der Befehlszeile angeben."
-#: builtin/pull.c:474 git-parse-remote.sh:73
+#: builtin/pull.c:408 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Im Moment auf keinem Branch."
-#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
+#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
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:478 builtin/pull.c:493 git-parse-remote.sh:82
+#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
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:479 builtin/pull.c:494
+#: builtin/pull.c:413 builtin/pull.c:428
msgid "See git-pull(1) for details."
msgstr "Siehe git-pull(1) für weitere Details."
-#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr "<Remote-Repository>"
-#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451
+#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<Branch>"
-#: builtin/pull.c:489 git-parse-remote.sh:75
+#: builtin/pull.c:423 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "Es gibt keine Tracking-Informationen für den aktuellen Branch."
-#: builtin/pull.c:498 git-parse-remote.sh:95
+#: builtin/pull.c:432 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Sie\n"
"dies tun mit:"
-#: builtin/pull.c:503
+#: builtin/pull.c:437
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"des Remote-Repositories durchzuführen, aber diese Referenz\n"
"wurde nicht angefordert."
-#: builtin/pull.c:820
+#: builtin/pull.c:754
msgid "ignoring --verify-signatures for rebase"
msgstr "Ignoriere --verify-signatures für Rebase"
-#: builtin/pull.c:867
+#: builtin/pull.c:801
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "--[no-]autostash ist nur mit --rebase zulässig."
-#: builtin/pull.c:875
+#: builtin/pull.c:809
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:903
+#: builtin/pull.c:812
+msgid "pull with rebase"
+msgstr "Pull mit Rebase"
+
+#: builtin/pull.c:813
+msgid "please commit or stash them."
+msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
+
+#: builtin/pull.c:838
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"\"fetch\" aktualisierte die Spitze des aktuellen Branches.\n"
"Spule Ihr Arbeitsverzeichnis von Commit %s vor."
-#: builtin/pull.c:908
+#: builtin/pull.c:843
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"$ git reset --hard\n"
"zur Wiederherstellung aus."
-#: builtin/pull.c:923
+#: builtin/pull.c:858
msgid "Cannot merge multiple branches into empty head."
msgstr "Kann nicht mehrere Branches in einen leeren Branch zusammenführen."
-#: builtin/pull.c:927
+#: builtin/pull.c:862
msgid "Cannot rebase onto multiple branches."
msgstr "Kann Rebase nicht auf mehrere Branches ausführen."
#: builtin/read-tree.c:139
msgid "debug unpack-trees"
-msgstr "Entpacken der Bäume protokollieren"
+msgstr "unpack-trees protokollieren"
-#: builtin/receive-pack.c:25
+#: builtin/receive-pack.c:26
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <Git-Verzeichnis>"
-#: builtin/receive-pack.c:1843
+#: builtin/receive-pack.c:793
+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 'receive.denyCurrentBranch' configuration variable to\n"
+"'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 ""
+"Standardmäßig wird die Aktualisierung des aktuellen Branches in einem\n"
+"nicht-Bare-Repository zurückgewiesen, da dies den Index und das Arbeits-\n"
+"verzeichnis inkonsistent zu dem machen würde, was Sie gepushed haben, und\n"
+"'git reset --hard' erforderlich wäre, damit das Arbeitsverzeichnis HEAD\n"
+"entspricht.\n"
+"\n"
+"Sie könnten die Konfigurationsvariable 'receive.denyCurrentBranch' im\n"
+"Remote-Repository zu 'ignore' oder 'warn' setzen, um den Push in den\n"
+"aktuellen Branch zu erlauben; dies wird jedoch nicht empfohlen außer\n"
+"Sie stellen durch andere Wege die Aktualität des Arbeitsverzeichnisses\n"
+"gegenüber dem gepushten Stand sicher.\n"
+"\n"
+"Um diese Meldung zu unterdrücken und das Standardverhalten zu behalten,\n"
+"setzen Sie die Konfigurationsvariable 'receive.denyCurrentBranch' auf\n"
+"'refuse'."
+
+#: builtin/receive-pack.c:813
+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 ""
+"Standardmäßig wird das Löschen des aktuellen Branches zurückgewiesen,\n"
+"da beim nächsten 'git clone' keine Dateien ausgecheckt werden würden,\n"
+"was zu Verwunderung führt.\n"
+"\n"
+"Sie können die Konfigurationsvariable 'receive.denyDeleteCurrent' im\n"
+"Remote-Repository auf 'warn' oder 'ignore' setzen, um das Löschen des\n"
+"aktuellen Branch mit oder ohne Warnung zu erlauben.\n"
+"\n"
+"Um diese Meldung zu unterdrücken, setzen Sie die Variable auf 'refuse'."
+
+#: builtin/receive-pack.c:1883
msgid "quiet"
msgstr "weniger Ausgaben"
-#: builtin/receive-pack.c:1857
+#: builtin/receive-pack.c:1897
msgid "You must specify a directory."
msgstr "Sie müssen ein Repository angeben."
msgid " Fetch URL: %s"
msgstr " URL zum Abholen: %s"
-#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296
+#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
msgid "(no URL)"
msgstr "(keine URL)"
msgstr[0] " Remote-Branch:%s"
msgstr[1] " Remote-Branches:%s"
-#: builtin/remote.c:1179 builtin/remote.c:1206
+#: builtin/remote.c:1179 builtin/remote.c:1205
msgid " (status not queried)"
msgstr " (Zustand nicht abgefragt)"
msgid " Local refs will be mirrored by 'git push'"
msgstr " Lokale Referenzen werden von 'git push' gespiegelt"
-#: builtin/remote.c:1203
+#: builtin/remote.c:1202
#, 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:1224
+#: builtin/remote.c:1223
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "setzt refs/remotes/<Name>/HEAD gemäß dem Remote-Repository"
-#: builtin/remote.c:1226
+#: builtin/remote.c:1225
msgid "delete refs/remotes/<name>/HEAD"
msgstr "entfernt refs/remotes/<Name>/HEAD"
-#: builtin/remote.c:1241
+#: builtin/remote.c:1240
msgid "Cannot determine remote HEAD"
msgstr "Kann HEAD des Remote-Repositories nicht bestimmen"
-#: builtin/remote.c:1243
+#: builtin/remote.c:1242
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:1253
+#: builtin/remote.c:1252
#, c-format
msgid "Could not delete %s"
msgstr "Konnte %s nicht entfernen"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1260
#, c-format
msgid "Not a valid ref: %s"
msgstr "keine gültige Referenz: %s"
-#: builtin/remote.c:1263
+#: builtin/remote.c:1262
#, c-format
msgid "Could not setup %s"
msgstr "Konnte %s nicht einrichten"
-#: builtin/remote.c:1281
+#: builtin/remote.c:1280
#, c-format
msgid " %s will become dangling!"
msgstr " %s wird unreferenziert!"
-#: builtin/remote.c:1282
+#: builtin/remote.c:1281
#, c-format
msgid " %s has become dangling!"
msgstr " %s wurde unreferenziert!"
-#: builtin/remote.c:1292
+#: builtin/remote.c:1291
#, c-format
msgid "Pruning %s"
msgstr "entferne veraltete Branches von %s"
-#: builtin/remote.c:1293
+#: builtin/remote.c:1292
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1309
+#: builtin/remote.c:1308
#, c-format
msgid " * [would prune] %s"
msgstr " * [würde veralteten Branch entfernen] %s"
-#: builtin/remote.c:1312
+#: builtin/remote.c:1311
#, c-format
msgid " * [pruned] %s"
msgstr "* [veralteten Branch entfernt] %s"
-#: builtin/remote.c:1357
+#: builtin/remote.c:1356
msgid "prune remotes after fetching"
msgstr "entferne veraltete Branches im Remote-Repository nach \"fetch\""
-#: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542
+#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
#, c-format
msgid "No such remote '%s'"
msgstr "Kein solches Remote-Repository '%s'"
-#: builtin/remote.c:1436
+#: builtin/remote.c:1435
msgid "add branch"
msgstr "Branch hinzufügen"
-#: builtin/remote.c:1443
+#: builtin/remote.c:1442
msgid "no remote specified"
msgstr "kein Remote-Repository angegeben"
-#: builtin/remote.c:1460
+#: builtin/remote.c:1459
msgid "query push URLs rather than fetch URLs"
msgstr "nur URLs für Push ausgeben"
-#: builtin/remote.c:1462
+#: builtin/remote.c:1461
msgid "return all URLs"
msgstr "alle URLs ausgeben"
-#: builtin/remote.c:1490
+#: builtin/remote.c:1489
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "Keine URLs für Remote-Repository '%s' konfiguriert."
-#: builtin/remote.c:1516
+#: builtin/remote.c:1515
msgid "manipulate push URLs"
msgstr "URLs für \"push\" manipulieren"
-#: builtin/remote.c:1518
+#: builtin/remote.c:1517
msgid "add URL"
msgstr "URL hinzufügen"
-#: builtin/remote.c:1520
+#: builtin/remote.c:1519
msgid "delete URLs"
msgstr "URLs löschen"
-#: builtin/remote.c:1527
+#: builtin/remote.c:1526
msgid "--add --delete doesn't make sense"
msgstr ""
"Die Optionen --add und --delete können nicht gemeinsam verwendet werden."
-#: builtin/remote.c:1568
+#: builtin/remote.c:1567
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "ungültiges altes URL Format: %s"
-#: builtin/remote.c:1576
+#: builtin/remote.c:1575
#, c-format
msgid "No such URL found: %s"
msgstr "Keine solche URL gefunden: %s"
-#: builtin/remote.c:1578
+#: builtin/remote.c:1577
msgid "Will not delete all non-push URLs"
msgstr "Werde keine URLs entfernen, die nicht für \"push\" bestimmt sind"
-#: builtin/remote.c:1592
+#: builtin/remote.c:1591
msgid "be verbose; must be placed before a subcommand"
msgstr "erweiterte Ausgaben; muss vor einem Unterbefehl angegeben werden"
+#: builtin/remote.c:1622
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Unbekannter Unterbefehl: %s"
+
#: builtin/repack.c:17
msgid "git repack [<options>]"
msgstr "git repack [<Optionen>]"
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<Commit>]"
#: builtin/reset.c:27
-msgid "git reset [-q]
<tree-ish> [--] <paths>..."
-msgstr "git reset [-q]
<Commit-Referenz> [--] <Pfade>..."
+msgid "git reset [-q]
[<tree-ish>] [--] <paths>..."
+msgstr "git reset [-q]
[<Commit-Referenz>] [--] <Pfade>..."
#: builtin/reset.c:28
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgid "Could not write new index file."
msgstr "Konnte neue Index-Datei nicht schreiben."
-#: builtin/rev-list.c:362
+#: builtin/rev-list.c:354
msgid "rev-list does not support display of notes"
msgstr "rev-list unterstützt keine Anzeige von Notizen"
-#: builtin/rev-parse.c:358
+#: builtin/rev-parse.c:386
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<Optionen>] -- [<Argumente>...]"
-#: builtin/rev-parse.c:363
+#: builtin/rev-parse.c:391
msgid "keep the `--` passed as an arg"
msgstr "`--` als Argument lassen"
-#: builtin/rev-parse.c:365
+#: builtin/rev-parse.c:393
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:368
+#: builtin/rev-parse.c:396
msgid "output in stuck long form"
msgstr ""
"Ausgabe in Langform mit Argumenten an den Optionen (getrennt durch '=')"
-#: builtin/rev-parse.c:499
+#: builtin/rev-parse.c:527
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
msgid "revert failed"
msgstr "\"revert\" fehlgeschlagen"
-#: builtin/revert.c:207
+#: builtin/revert.c:205
msgid "cherry-pick failed"
msgstr "\"cherry-pick\" fehlgeschlagen"
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<Basis>]] [--list] [<Referenz>]"
-#: builtin/show-branch.c:640
+#: builtin/show-branch.c:375
+#, 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:541
+#, c-format
+msgid "no matching refs with %s"
+msgstr "keine übereinstimmenden Referenzen mit %s"
+
+#: builtin/show-branch.c:639
msgid "show remote-tracking and local branches"
msgstr "Remote-Tracking und lokale Branches anzeigen"
-#: builtin/show-branch.c:642
+#: builtin/show-branch.c:641
msgid "show remote-tracking branches"
msgstr "Remote-Tracking-Branches anzeigen"
-#: builtin/show-branch.c:644
+#: builtin/show-branch.c:643
msgid "color '*!+-' corresponding to the branch"
msgstr "'*!+-' entsprechend des Branches einfärben"
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show <n> more commits after the common ancestor"
msgstr "<n> weitere Commits nach dem gemeinsamen Vorgänger-Commit anzeigen"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "synonym to more=-1"
msgstr "Synonym für more=-1"
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
msgid "suppress naming strings"
msgstr "Namen unterdrücken"
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
msgid "include the current branch"
msgstr "den aktuellen Branch einbeziehen"
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
msgid "name commits with their object names"
msgstr "Commits nach ihren Objektnamen benennen"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "show possible merge bases"
msgstr "mögliche Merge-Basen anzeigen"
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "show refs unreachable from any other ref"
msgstr ""
"Referenzen, die unerreichbar von allen anderen Referenzen sind, anzeigen"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "show commits in topological order"
msgstr "Commits in topologischer Ordnung anzeigen"
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
msgid "show only commits not on the first branch"
msgstr "nur Commits anzeigen, die sich nicht im ersten Branch befinden"
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
msgid "show merges reachable from only one tip"
msgstr "Merges anzeigen, die nur von einem Branch aus erreichbar sind"
-#: builtin/show-branch.c:666
+#: builtin/show-branch.c:665
msgid "topologically sort, maintaining date order where possible"
msgstr "topologische Sortierung, Beibehaltung Datumsordnung wo möglich"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
msgid "<n>[,<base>]"
msgstr "<n>[,<Basis>]"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
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:703
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+msgstr "--reflog ist inkompatibel mit --all, --remotes, --independent oder --merge-base"
+
+#: builtin/show-branch.c:727
+msgid "no branches given, and HEAD is not valid"
+msgstr "keine Branches angegeben, und HEAD ist ungültig"
+
+#: builtin/show-branch.c:730
+msgid "--reflog option needs one branch name"
+msgstr "Die Option --reflog benötigt einen Branchnamen."
+
+#: builtin/show-branch.c:733
+#, 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:737
+#, c-format
+msgid "no such ref %s"
+msgstr "Referenz nicht gefunden: %s"
+
+#: builtin/show-branch.c:829
+#, 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:833
+#, c-format
+msgid "'%s' is not a valid ref."
+msgstr "'%s' ist keine gültige Referenz."
+
+#: builtin/show-branch.c:836
+#, c-format
+msgid "cannot find commit %s (%s)"
+msgstr "kann Commit %s (%s) nicht finden"
+
#: builtin/show-ref.c:10
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
msgid "prepend comment character and space to each line"
msgstr "Kommentarzeichen mit Leerzeichen an jede Zeile voranstellen"
-#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:923
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1046
#, c-format
msgid "No such ref: %s"
msgstr "Referenz nicht gefunden: %s"
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Vollständiger Referenzname erwartet, %s erhalten"
msgid "cannot strip one component off url '%s'"
msgstr "Kann eine Komponente von URL '%s' nicht extrahieren"
-#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403
-#: builtin/submodule--helper.c:483
+#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408
+#: builtin/submodule--helper.c:590
msgid "alternative anchor for relative paths"
msgstr "Alternativer Anker für relative Pfade"
-#: builtin/submodule--helper.c:283
+#: builtin/submodule--helper.c:287
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<Pfad>] [<Pfad>...]"
-#: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338
+#: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343
#, 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:364
+#: builtin/submodule--helper.c:369
#, 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:368
+#: builtin/submodule--helper.c:373
#, 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:378
+#: builtin/submodule--helper.c:383
#, 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:385
+#: builtin/submodule--helper.c:390
#, 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:404
+#: builtin/submodule--helper.c:409
msgid "Suppress output for initializing a submodule"
msgstr "Ausgaben bei Initialisierung eines Submoduls unterdrücken"
-#: builtin/submodule--helper.c:409
+#: builtin/submodule--helper.c:414
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<Pfad>]"
-#: builtin/submodule--helper.c:430
+#: builtin/submodule--helper.c:435
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <Pfad>"
-#: builtin/submodule--helper.c:436
+#: builtin/submodule--helper.c:441
#, 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:486
+#: builtin/submodule--helper.c:524 builtin/submodule--helper.c:527
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
+msgstr "Submodul '%s' kann Alternative nicht hinzufügen: %s"
+
+#: builtin/submodule--helper.c:563
+#, 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:570
+#, 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:593
msgid "where the new submodule will be cloned to"
msgstr "Pfad für neues Submodul"
-#: builtin/submodule--helper.c:489
+#: builtin/submodule--helper.c:596
msgid "name of the new submodule"
msgstr "Name des neuen Submoduls"
-#: builtin/submodule--helper.c:492
+#: builtin/submodule--helper.c:599
msgid "url where to clone the submodule from"
msgstr "URL von der das Submodul geklont wird"
-#: builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:605
msgid "depth for shallow clones"
msgstr "Tiefe des Klons mit unvollständiger Historie (shallow)"
-#: builtin/submodule--helper.c:504
+#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964
+msgid "force cloning progress"
+msgstr "Fortschrittsanzeige beim Klonen erzwingen"
+
+#: builtin/submodule--helper.c:613
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
"<Repository>] [--name <Name>] [--url <URL>] [--name <Name>] [--depth "
"<Tiefe>] --url <URL> --path <Pfad>"
-#: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535
+#: builtin/submodule--helper.c:638 builtin/submodule--helper.c:648
#, c-format
msgid "could not create directory '%s'"
msgstr "Konnte Verzeichnis '%s' nicht erstellen."
-#: builtin/submodule--helper.c:531
+#: builtin/submodule--helper.c:644
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen"
-#: builtin/submodule--helper.c:547
+#: builtin/submodule--helper.c:660
#, c-format
msgid "cannot open file '%s'"
msgstr "Kann Datei '%s' nicht öffnen"
-#: builtin/submodule--helper.c:552
+#: builtin/submodule--helper.c:665
#, c-format
msgid "could not close file %s"
msgstr "Konnte Datei '%s' nicht schließen."
-#: builtin/submodule--helper.c:559
+#: builtin/submodule--helper.c:672
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "Konnte Submodul-Verzeichnis '%s' nicht finden."
-#: builtin/submodule--helper.c:611
+#: builtin/submodule--helper.c:726
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Submodul-Pfad '%s' nicht initialisiert"
-#: builtin/submodule--helper.c:615
+#: builtin/submodule--helper.c:730
msgid "Maybe you want to use 'update --init'?"
msgstr "Meinten Sie vielleicht 'update --init'?"
-#: builtin/submodule--helper.c:641
+#: builtin/submodule--helper.c:756
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Überspringe nicht zusammengeführtes Submodul %s"
-#: builtin/submodule--helper.c:662
+#: builtin/submodule--helper.c:777
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Überspringe Submodul '%s'"
-#: builtin/submodule--helper.c:792
+#: builtin/submodule--helper.c:913
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Fehler beim Klonen von '%s'. Weiterer Versuch geplant"
-#: builtin/submodule--helper.c:803
+#: builtin/submodule--helper.c:924
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Zweiter Versuch '%s' zu klonen fehlgeschlagen, breche ab."
-#: builtin/submodule--helper.c:824
+#: builtin/submodule--helper.c:945
msgid "path into the working tree"
msgstr "Pfad zum Arbeitsverzeichnis"
-#: builtin/submodule--helper.c:827
+#: builtin/submodule--helper.c:948
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
"Pfad zum Arbeitsverzeichnis, über verschachtelte Submodul-Grenzen hinweg"
-#: builtin/submodule--helper.c:831
+#: builtin/submodule--helper.c:952
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout oder none"
-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:956
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr ""
"Erstellung eines Klons mit unvollständiger Historie (shallow), abgeschnitten "
"bei\n"
"der angegebenen Anzahl von Commits."
-#: builtin/submodule--helper.c:838
+#: builtin/submodule--helper.c:959
msgid "parallel jobs"
msgstr "Parallele Ausführungen"
-#: builtin/submodule--helper.c:840
+#: builtin/submodule--helper.c:961
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:841
+#: builtin/submodule--helper.c:962
msgid "don't print cloning progress"
msgstr "keine Fortschrittsanzeige beim Klonen"
-#: builtin/submodule--helper.c:846
+#: builtin/submodule--helper.c:969
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<Pfad>] [<Pfad>...]"
-#: builtin/submodule--helper.c:856
+#: builtin/submodule--helper.c:979
msgid "bad value for update parameter"
msgstr "Fehlerhafter Wert für --update Parameter"
-#: builtin/submodule--helper.c:927
+#: builtin/submodule--helper.c:1050
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"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:977
+#: builtin/submodule--helper.c:1100
msgid "submodule--helper subcommand must be called with a subcommand"
msgstr "submodule--helper muss mit einem Unterbefehl aufgerufen werden"
-#: builtin/submodule--helper.c:984
+#: builtin/submodule--helper.c:1107
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' ist kein gültiger Unterbefehl von submodule--helper"
msgid "Updated tag '%s' (was %s)\n"
msgstr "Tag '%s' aktualisiert (war %s)\n"
-#: builtin/unpack-objects.c:490
+#: builtin/unpack-objects.c:493
msgid "Unpacking objects"
msgstr "Entpacke Objekte"
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:575
+#: builtin/update-index.c:564
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<Optionen>] [--] [<Datei>...]"
-#: builtin/update-index.c:930
+#: builtin/update-index.c:919
msgid "continue refresh even when index needs update"
msgstr ""
"Aktualisierung fortsetzen, auch wenn der Index aktualisiert werden muss"
-#: builtin/update-index.c:933
+#: builtin/update-index.c:922
msgid "refresh: ignore submodules"
msgstr "Aktualisierung: ignoriert Submodule"
-#: builtin/update-index.c:936
+#: builtin/update-index.c:925
msgid "do not ignore new files"
msgstr "keine neuen Dateien ignorieren"
-#: builtin/update-index.c:938
+#: builtin/update-index.c:927
msgid "let files replace directories and vice-versa"
msgstr "Dateien Verzeichnisse ersetzen lassen, und umgedreht"
-#: builtin/update-index.c:940
+#: builtin/update-index.c:929
msgid "notice files missing from worktree"
msgstr "fehlende Dateien im Arbeitsverzeichnis beachten"
-#: builtin/update-index.c:942
+#: builtin/update-index.c:931
msgid "refresh even if index contains unmerged entries"
msgstr ""
"aktualisieren, auch wenn der Index nicht zusammengeführte Einträge beinhaltet"
-#: builtin/update-index.c:945
+#: builtin/update-index.c:934
msgid "refresh stat information"
msgstr "Dateiinformationen aktualisieren"
-#: builtin/update-index.c:949
+#: builtin/update-index.c:938
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "wie --refresh, ignoriert aber \"assume-unchanged\" Einstellung"
-#: builtin/update-index.c:953
+#: builtin/update-index.c:942
msgid "<mode>,<object>,<path>"
msgstr "<Modus>,<Objekt>,<Pfad>"
-#: builtin/update-index.c:954
+#: builtin/update-index.c:943
msgid "add the specified entry to the index"
msgstr "den angegebenen Eintrag zum Commit vormerken"
-#: builtin/update-index.c:963
+#: builtin/update-index.c:952
msgid "mark files as \"not changing\""
msgstr "diese Datei immer als unverändert betrachten"
-#: builtin/update-index.c:966
+#: builtin/update-index.c:955
msgid "clear assumed-unchanged bit"
msgstr "\"assumed-unchanged\"-Bit löschen"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:958
msgid "mark files as \"index-only\""
msgstr "Dateien als \"index-only\" markieren"
-#: builtin/update-index.c:972
+#: builtin/update-index.c:961
msgid "clear skip-worktree bit"
msgstr "\"skip-worktree\"-Bit löschen"
-#: builtin/update-index.c:975
+#: builtin/update-index.c:964
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:977
+#: builtin/update-index.c:966
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:979
+#: builtin/update-index.c:968
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "mit --stdin: eingegebene Zeilen sind durch NUL-Bytes abgeschlossen"
-#: builtin/update-index.c:981
+#: builtin/update-index.c:970
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:985
+#: builtin/update-index.c:974
msgid "add entries from standard input to the index"
msgstr "Einträge von der Standard-Eingabe zum Commit vormerken"
-#: builtin/update-index.c:989
+#: builtin/update-index.c:978
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:993
+#: builtin/update-index.c:982
msgid "only update entries that differ from HEAD"
msgstr "nur Einträge aktualisieren, die unterschiedlich zu HEAD sind"
-#: builtin/update-index.c:997
+#: builtin/update-index.c:986
msgid "ignore files missing from worktree"
msgstr "fehlende Dateien im Arbeitsverzeichnis ignorieren"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:989
msgid "report actions to standard output"
msgstr "die Aktionen in der Standard-Ausgabe ausgeben"
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:991
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(für Fremdprogramme) keine gespeicherten, nicht aufgelöste Konflikte"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:995
msgid "write index in this format"
msgstr "Index-Datei in diesem Format schreiben"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:997
msgid "enable or disable split index"
msgstr "Splitting des Index aktivieren oder deaktivieren"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:999
msgid "enable/disable untracked cache"
msgstr "Cache für unversionierte Dateien aktivieren oder deaktivieren"
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1001
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:1014
+#: builtin/update-index.c:1003
msgid "enable untracked cache without testing the filesystem"
msgstr ""
"Cache für unversionierte Dateien ohne Prüfung des Dateisystems aktivieren"
-#: builtin/update-index.c:1134
+#: builtin/update-index.c:1119
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
+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:1123
msgid "Untracked cache disabled"
msgstr "Cache für unversionierte Dateien deaktiviert"
-#: builtin/update-index.c:1146
+#: builtin/update-index.c:1131
+msgid ""
+"core.untrackedCache is set to false; remove or change it, if you really want "
+"to enable the untracked cache"
+msgstr ""
+"core.untrackedCache ist auf 'false' gesetzt. Entfernen oder ändern Sie dies,\n"
+"wenn sie wirklich den Cache für unversionierte Dateien aktivieren möchten."
+
+#: builtin/update-index.c:1135
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Cache für unversionierte Dateien für '%s' aktiviert"
msgid "only useful for debugging"
msgstr "nur nützlich für Fehlersuche"
-#: upload-pack.c:20
+#: upload-pack.c:22
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<Optionen>] <Verzeichnis>"
-#: upload-pack.c:837
+#: upload-pack.c:1028
msgid "quit after a single request/response exchange"
msgstr "nach einem einzigen Request/Response-Austausch beenden"
-#: upload-pack.c:839
+#: upload-pack.c:1030
msgid "exit immediately after initial ref advertisement"
msgstr "direkt nach der initialen Angabe der Commits beenden"
-#: upload-pack.c:841
+#: upload-pack.c:1032
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
-msgstr "kein Versuch in <Verzeichnis>/.git/ wenn <Verzeichnis> kein Git-Verzeichnis ist"
+msgstr ""
+"kein Versuch in <Verzeichnis>/.git/ wenn <Verzeichnis> kein Git-Verzeichnis "
+"ist"
-#: upload-pack.c:843
+#: upload-pack.c:1034
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "Übertragung nach <n> Sekunden Inaktivität unterbrechen"
+#: credential-cache--daemon.c:223
+#, 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 ""
+"Die Berechtigungen auf Ihr Socket-Verzeichnis sind zu schwach; andere\n"
+"Nutzer könnten Ihre zwischengespeicherten Anmeldeinformationen lesen.\n"
+"Ziehen Sie in Betracht\n"
+"\n"
+"\tchmod 0700 %s\n"
+"\n"
+"auszuführen."
+
#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "Meldungen zur Fehlersuche in Standard-Fehlerausgabe ausgeben"
"oder 'git help <Konzept>', um mehr über einen spezifischen Befehl oder\n"
"Konzept zu erfahren."
-#: http.c:323
+#: http.c:342
+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:351
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr ""
"Das Anheften des öffentlichen Schlüssels wird mit cURL < 7.44.0\n"
msgid "no-op (backward compatibility)"
msgstr "Kein Effekt (Rückwärtskompatibilität)"
-#: parse-options.h:237
+#: parse-options.h:238
msgid "be more verbose"
msgstr "erweiterte Ausgaben"
-#: parse-options.h:239
+#: parse-options.h:240
msgid "be more quiet"
msgstr "weniger Ausgaben"
-#: parse-options.h:245
+#: parse-options.h:246
msgid "use <n> digits to display SHA-1s"
msgstr "benutze <n> Ziffern zur Anzeige von SHA-1s"
"Error: Your local changes to the following files would be overwritten by "
"merge"
msgstr ""
-"Fehler Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge\n"
+"Fehler Ihre lokalen Änderungen in den folgenden Dateien würden durch den "
+"Merge\n"
"überschrieben werden"
#: git-merge-octopus.sh:61
msgstr "Automatischer Merge hat nicht funktioniert."
#: git-merge-octopus.sh:62
-msgid "Should not be doing an Octopus."
+msgid "Should not be doing an octopus."
msgstr "Sollte keinen Octopus-Merge ausführen."
#: git-merge-octopus.sh:73
msgid "Cannot save the current index state"
msgstr "Kann den aktuellen Zustand des Index nicht speichern"
+#: git-stash.sh:103
+msgid "Cannot save the untracked files"
+msgstr "Kann die unversionierten Dateien nicht speichern"
+
#: git-stash.sh:123 git-stash.sh:136
msgid "Cannot save the current worktree state"
msgstr "Kann den aktuellen Zustand des Arbeitsverzeichnisses nicht speichern"
" Um eine Beschreibung anzugeben, benutzen Sie \"git stash save -- "
"'$option'\""
+#: git-stash.sh:251
+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"
+
#: git-stash.sh:259
msgid "No local changes to save"
msgstr "Keine lokalen Änderungen zum Speichern"
msgid "Cannot remove worktree changes"
msgstr "Kann Änderungen im Arbeitsverzeichnis nicht löschen"
-#: git-stash.sh:404
+#: git-stash.sh:403
#, sh-format
msgid "unknown option: $opt"
msgstr "unbekannte Option: $opt"
-#: git-stash.sh:414
+#: git-stash.sh:416
msgid "No stash found."
msgstr "Kein Stash-Eintrag gefunden."
-#: git-stash.sh:421
+#: git-stash.sh:423
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Zu viele Commits angegeben: $REV"
-#: git-stash.sh:427
+#: git-stash.sh:438
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference ist keine gültige Referenz"
-#: git-stash.sh:455
+#: git-stash.sh:466
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' ist kein \"stash\"-artiger Commit"
-#: git-stash.sh:466
+#: git-stash.sh:477
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' ist keine \"stash\"-Referenz"
-#: git-stash.sh:474
+#: git-stash.sh:485
msgid "unable to refresh index"
msgstr "Konnte den Index nicht aktualisieren."
-#: git-stash.sh:478
+#: git-stash.sh:489
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Kann \"stash\" nicht anwenden, solang ein Merge im Gange ist"
-#: git-stash.sh:486
+#: git-stash.sh:497
msgid "Conflicts in index. Try without --index."
msgstr "Konflikte im Index. Versuchen Sie es ohne --index."
-#: git-stash.sh:488
+#: git-stash.sh:499
msgid "Could not save index tree"
msgstr "Konnte Index-Verzeichnis nicht speichern"
-#: git-stash.sh:522
+#: git-stash.sh:508
+msgid "Could not restore untracked files from stash"
+msgstr "Konnte unversionierte Dateien vom Stash nicht wiederherstellen"
+
+#: git-stash.sh:533
msgid "Cannot unstage modified files"
msgstr "Kann geänderte Dateien nicht aus dem Index entfernen"
-#: git-stash.sh:537
+#: git-stash.sh:548
msgid "Index was not unstashed."
msgstr "Index wurde nicht aus dem Stash zurückgeladen."
-#: git-stash.sh:551
+#: git-stash.sh:562
msgid "The stash is kept in case you need it again."
msgstr "Der Stash wird behalten, im Falle Sie benötigen diesen nochmal."
-#: git-stash.sh:560
+#: git-stash.sh:571
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Gelöscht ${REV} ($s)"
-#: git-stash.sh:561
+#: git-stash.sh:572
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Konnte \"stash\"-Eintrag nicht löschen"
-#: git-stash.sh:569
+#: git-stash.sh:580
msgid "No branch name specified"
msgstr "Kein Branchname spezifiziert"
-#: git-stash.sh:641
+#: git-stash.sh:652
msgid "(To restore them type \"git stash apply\")"
msgstr "(Zur Wiederherstellung geben Sie \"git stash apply\" ein)"
-#: git-submodule.sh:183
+#: git-submodule.sh:184
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"Relative Pfade können nur von der obersten Ebene des Arbeitsverzeichnisses "
"benutzt werden."
-#: git-submodule.sh:193
+#: git-submodule.sh:194
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "repo URL: '$repo' muss absolut sein oder mit ./|../ beginnen"
-#: git-submodule.sh:210
+#: git-submodule.sh:211
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' ist bereits zum Commit vorgemerkt"
-#: git-submodule.sh:214
+#: git-submodule.sh:215
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
"$sm_path\n"
"Benutzen Sie -f wenn Sie diesen wirklich hinzufügen möchten."
-#: git-submodule.sh:232
+#: git-submodule.sh:233
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Füge existierendes Repository in '$sm_path' dem Index hinzu."
-#: git-submodule.sh:234
+#: git-submodule.sh:235
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' existiert bereits und ist kein gültiges Git-Repository"
-#: git-submodule.sh:242
+#: git-submodule.sh:243
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Ein Git-Verzeichnis für '$sm_name' wurde lokal gefunden mit den Remote-"
"Repositories:"
-#: git-submodule.sh:244
+#: git-submodule.sh:245
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
"or you are unsure what this means choose another name with the '--name' "
"option."
msgstr ""
-"Wenn Sie das lokale Git-Verzeichnis wiederverwenden wollen, anstatt erneut von\n"
+"Wenn Sie das lokale Git-Verzeichnis wiederverwenden wollen, anstatt erneut "
+"von\n"
" $realrepo\n"
-"zu klonen, benutzen Sie die Option '--force'. Wenn das lokale Git-Verzeichnis\n"
+"zu klonen, benutzen Sie die Option '--force'. Wenn das lokale Git-"
+"Verzeichnis\n"
"nicht das korrekte Repository ist oder Sie unsicher sind, was das bedeutet,\n"
"wählen Sie einen anderen Namen mit der Option '--name'."
-#: git-submodule.sh:250
+#: git-submodule.sh:251
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Reaktiviere lokales Git-Verzeichnis für Submodul '$sm_name'."
-#: git-submodule.sh:262
+#: git-submodule.sh:263
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Kann Submodul '$sm_path' nicht auschecken"
-#: git-submodule.sh:267
+#: git-submodule.sh:268
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Hinzufügen von Submodul '$sm_path' fehlgeschlagen"
-#: git-submodule.sh:276
+#: git-submodule.sh:277
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Fehler beim Eintragen von Submodul '$sm_path' in die Konfiguration."
-#: git-submodule.sh:323
+#: git-submodule.sh:324
#, sh-format
msgid "Entering '$displaypath'"
msgstr "Betrete '$displaypath'"
-#: git-submodule.sh:343
+#: git-submodule.sh:344
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr "Stoppe bei '$displaypath'; Skript gab nicht-Null Status zurück."
-#: git-submodule.sh:414
+#: git-submodule.sh:415
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr "Pfadspezifikationen und --all sind inkompatibel."
-#: git-submodule.sh:419
+#: git-submodule.sh:420
#, sh-format
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
"Verwenden Sie '--all', wenn Sie wirklich alle Submodule deinitialisieren\n"
"möchten."
-#: git-submodule.sh:439
+#: git-submodule.sh:440
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains a .git directory\n"
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
-"Arbeitsverzeichnis von Submodul in '$displaypath' enthält ein .git-Verzeichnis\n"
-"(benutzen Sie 'rm -rf' wenn Sie dieses wirklich mitsamt seiner Historie löschen\n"
+"Arbeitsverzeichnis von Submodul in '$displaypath' enthält ein .git-"
+"Verzeichnis\n"
+"(benutzen Sie 'rm -rf' wenn Sie dieses wirklich mitsamt seiner Historie "
+"löschen\n"
"möchten)"
-#: git-submodule.sh:447
+#: git-submodule.sh:448
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
"Arbeitsverzeichnis von Submodul in '$displaypath' enthält lokale Änderungen; "
"verwenden Sie '-f', um diese zu verwerfen"
-#: git-submodule.sh:450
+#: git-submodule.sh:451
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Verzeichnis '$displaypath' bereinigt."
-#: git-submodule.sh:451
+#: git-submodule.sh:452
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr ""
"Konnte Arbeitsverzeichnis des Submoduls in '$displaypath' nicht löschen."
-#: git-submodule.sh:454
+#: git-submodule.sh:455
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr ""
"Konnte kein leeres Verzeichnis für Submodul in '$displaypath' erstellen."
-#: git-submodule.sh:463
+#: git-submodule.sh:464
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
"Submodul '$name' ($url) für Pfad '$displaypath' wurde aus der Konfiguration "
"entfernt."
-#: git-submodule.sh:612
+#: git-submodule.sh:617
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Konnte aktuellen Commit in Submodul-Pfad '$displaypath' nicht finden."
-#: git-submodule.sh:622
+#: git-submodule.sh:627
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Konnte \"fetch\" in Submodul-Pfad '$sm_path' nicht ausführen"
-#: git-submodule.sh:627
+#: git-submodule.sh:632
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"Konnte aktuellen Commit von ${remote_name}/${branch} in Submodul-Pfad\n"
"'$sm_path' nicht finden."
-#: git-submodule.sh:645
+#: git-submodule.sh:650
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Konnte \"fetch\" in Submodul-Pfad '$displaypath' nicht ausführen"
-#: git-submodule.sh:651
+#: git-submodule.sh:656
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"\"fetch\" in Submodul-Pfad '$displaypath' ausgeführt, aber $sha1 nicht\n"
"enthalten. Direktes Anfordern dieses Commits ist fehlgeschlagen."
-#: git-submodule.sh:658
+#: git-submodule.sh:663
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Konnte '$sha1' in Submodul-Pfad '$displaypath' nicht auschecken."
-#: git-submodule.sh:659
+#: git-submodule.sh:664
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Submodul-Pfad: '$displaypath': '$sha1' ausgecheckt"
-#: git-submodule.sh:663
+#: git-submodule.sh:668
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "Rebase auf '$sha1' in Submodul-Pfad '$displaypath' nicht möglich"
-#: git-submodule.sh:664
+#: git-submodule.sh:669
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Submodul-Pfad '$displaypath': Rebase auf '$sha1'"
-#: git-submodule.sh:669
+#: git-submodule.sh:674
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Merge von '$sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen"
-#: git-submodule.sh:670
+#: git-submodule.sh:675
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Submodul-Pfad '$displaypath': zusammengeführt in '$sha1'"
-#: git-submodule.sh:675
+#: git-submodule.sh:680
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"Ausführung von '$command $sha1' in Submodul-Pfad '$displaypath' "
"fehlgeschlagen"
-#: git-submodule.sh:676
+#: git-submodule.sh:681
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Submodul-Pfad '$displaypath': '$command $sha1'"
-#: git-submodule.sh:707
+#: git-submodule.sh:712
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Fehler bei Rekursion in Submodul-Pfad '$displaypath'"
-#: git-submodule.sh:815
+#: git-submodule.sh:820
msgid "The --cached option cannot be used with the --files option"
msgstr ""
"Die Optionen --cached und --files können nicht gemeinsam verwendet werden."
-#: git-submodule.sh:867
+#: git-submodule.sh:872
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "unerwarteter Modus $mod_dst"
-#: git-submodule.sh:887
+#: git-submodule.sh:892
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_src"
-#: git-submodule.sh:890
+#: git-submodule.sh:895
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_dst"
-#: git-submodule.sh:893
+#: git-submodule.sh:898
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" Warnung: $display_name beinhaltet nicht die Commits $sha1_src und $sha1_dst"
-#: git-submodule.sh:918
-msgid "blob"
-msgstr "Blob"
-
-#: git-submodule.sh:1040
+#: git-submodule.sh:1045
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Fehler bei Rekursion in Submodul-Pfad '$sm_path'"
-#: git-submodule.sh:1107
+#: git-submodule.sh:1112
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synchronisiere Submodul-URL für '$displaypath'"
msgid "See git-${cmd}(1) for details."
msgstr "Siehe git-${cmd}(1) für weitere Details."
-#: git-rebase--interactive.sh:131
+#: git-rebase--interactive.sh:140
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr "Führe Rebase aus ($new_count/$total)"
-#: git-rebase--interactive.sh:147
+#: git-rebase--interactive.sh:156
msgid ""
"\n"
"Commands:\n"
"Diese Zeilen können umsortiert werden; Sie werden von oben nach unten\n"
"ausgeführt.\n"
-#: git-rebase--interactive.sh:162
+#: git-rebase--interactive.sh:171
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
"Keine Zeile entfernen. Benutzen Sie 'drop', um explizit einen Commit zu\n"
"entfernen.\n"
-#: git-rebase--interactive.sh:166
+#: git-rebase--interactive.sh:175
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
-msgstr "\nWenn Sie hier eine Zeile entfernen, wird DIESER COMMIT VERLOREN GEHEN.\n"
+msgstr ""
+"\n"
+"Wenn Sie hier eine Zeile entfernen, wird DIESER COMMIT VERLOREN GEHEN.\n"
-#: git-rebase--interactive.sh:202
+#: git-rebase--interactive.sh:211
#, sh-format
msgid ""
"You can amend the commit now, with\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--interactive.sh:227
+#: git-rebase--interactive.sh:236
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr "$sha1: kein Commit der gepickt werden kann"
-#: git-rebase--interactive.sh:266
+#: git-rebase--interactive.sh:275
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr "Ungültiger Commit-Name: $sha1"
-#: git-rebase--interactive.sh:308
+#: git-rebase--interactive.sh:317
msgid "Cannot write current commit's replacement sha1"
msgstr "Kann ersetzenden SHA-1 des aktuellen Commits nicht schreiben"
-#: git-rebase--interactive.sh:360
+#: git-rebase--interactive.sh:369
#, sh-format
msgid "Fast-forward to $sha1"
msgstr "Spule vor zu $sha1"
-#: git-rebase--interactive.sh:362
+#: git-rebase--interactive.sh:371
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr "Kann nicht zu $sha1 vorspulen"
-#: git-rebase--interactive.sh:371
+#: git-rebase--interactive.sh:380
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr "Kann HEAD nicht auf $first_parent setzen"
-#: git-rebase--interactive.sh:376
+#: git-rebase--interactive.sh:385
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr "\"squash\" eines Merges ($sha1) zurückgewiesen."
-#: git-rebase--interactive.sh:390
+#: git-rebase--interactive.sh:399
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Fehler beim Wiederholen des Merges von $sha1"
-#: git-rebase--interactive.sh:398
+#: git-rebase--interactive.sh:407
#, sh-format
msgid "Could not pick $sha1"
msgstr "Konnte $sha1 nicht picken"
-#: git-rebase--interactive.sh:407
+#: git-rebase--interactive.sh:416
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Das ist Commit-Beschreibung #${n}:"
-#: git-rebase--interactive.sh:412
+#: git-rebase--interactive.sh:421
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "Commit-Beschreibung #${n} wird ausgelassen:"
-#: git-rebase--interactive.sh:423
+#: git-rebase--interactive.sh:432
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] "Das ist eine Kombination aus $count Commit."
msgstr[1] "Das ist eine Kombination aus $count Commits."
-#: git-rebase--interactive.sh:431
+#: git-rebase--interactive.sh:440
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "Kann $fixup_msg nicht schreiben"
-#: git-rebase--interactive.sh:434
+#: git-rebase--interactive.sh:443
msgid "This is a combination of 2 commits."
msgstr "Das ist eine Kombination aus 2 Commits."
-#: git-rebase--interactive.sh:435
+#: git-rebase--interactive.sh:444
msgid "This is the 1st commit message:"
msgstr "Das ist die erste Commit-Beschreibung:"
-#: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518
-#: git-rebase--interactive.sh:521
+#: git-rebase--interactive.sh:484 git-rebase--interactive.sh:527
+#: git-rebase--interactive.sh:530
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "Konnte $sha1... ($rest) nicht anwenden"
-#: git-rebase--interactive.sh:549
+#: git-rebase--interactive.sh:558
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
"before\n"
"you are able to reword the commit."
msgstr ""
-"Konnte Commit nicht nachbessern, nachdem dieser verwendet wurde: $sha1... $rest\n"
-"Das passierte sehr wahrscheinlich wegen einer leeren Commit-Beschreibung, oder\n"
+"Konnte Commit nicht nachbessern, nachdem dieser verwendet wurde: $sha1... "
+"$rest\n"
+"Das passierte sehr wahrscheinlich wegen einer leeren Commit-Beschreibung, "
+"oder\n"
"weil der pre-commit Hook fehlschlug. Falls der pre-commit Hook fehlschlug,\n"
-"sollten Sie das Problem beheben, bevor Sie die Commit-Beschreibung ändern können."
+"sollten Sie das Problem beheben, bevor Sie die Commit-Beschreibung ändern "
+"können."
-#: git-rebase--interactive.sh:564
+#: git-rebase--interactive.sh:573
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "Angehalten bei $sha1_abbrev... $rest"
-#: git-rebase--interactive.sh:579
+#: git-rebase--interactive.sh:588
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "Kann nicht '$squash_style' ohne vorherigen Commit"
-#: git-rebase--interactive.sh:621
+#: git-rebase--interactive.sh:630
#, sh-format
msgid "Executing: $rest"
msgstr "Führe aus: $rest"
-#: git-rebase--interactive.sh:629
+#: git-rebase--interactive.sh:638
#, sh-format
msgid "Execution failed: $rest"
msgstr "Ausführung fehlgeschlagen: $rest"
-#: git-rebase--interactive.sh:631
+#: git-rebase--interactive.sh:640
msgid "and made changes to the index and/or the working tree"
msgstr "Der Index und/oder das Arbeitsverzeichnis wurde geändert."
-#: git-rebase--interactive.sh:633
+#: git-rebase--interactive.sh:642
msgid ""
"You can fix the problem, and then run\n"
"\n"
"ausführen."
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:646
+#: git-rebase--interactive.sh:655
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--interactive.sh:657
+#: git-rebase--interactive.sh:666
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Unbekannter Befehl: $command $sha1 $rest"
-#: git-rebase--interactive.sh:658
+#: git-rebase--interactive.sh:667
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "Bitte beheben Sie das, indem Sie 'git rebase --edit-todo' ausführen."
-#: git-rebase--interactive.sh:693
+#: git-rebase--interactive.sh:702
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "Erfolgreich Rebase ausgeführt und $head_name aktualisiert."
-#: git-rebase--interactive.sh:740
+#: git-rebase--interactive.sh:749
msgid "Could not skip unnecessary pick commands"
msgstr "Fehler beim Auslassen von nicht erforderlichen \"pick\"-Befehlen."
-#: git-rebase--interactive.sh:898
+#: git-rebase--interactive.sh:907
#, sh-format
msgid ""
"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
"Warnung: Der SHA-1 in der folgenden Zeile fehlt oder ist kein Commit:\n"
" - $line"
-#: git-rebase--interactive.sh:931
+#: git-rebase--interactive.sh:940
#, sh-format
msgid ""
"Warning: the command isn't recognized in the following line:\n"
"Warnung: Das Kommando in der folgenden Zeile wurde nicht erkannt:\n"
" - $line"
-#: git-rebase--interactive.sh:970
+#: git-rebase--interactive.sh:979
msgid "could not detach HEAD"
msgstr "Konnte HEAD nicht loslösen"
-#: git-rebase--interactive.sh:1008
+#: git-rebase--interactive.sh:1017
msgid ""
"Warning: some commits may have been dropped accidentally.\n"
"Dropped commits (newer to older):"
"Warnung: Einige Commits könnten aus Versehen entfernt worden sein.\n"
"Entfernte Commits (neu zu alt):"
-#: git-rebase--interactive.sh:1016
+#: git-rebase--interactive.sh:1025
msgid ""
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
"\n"
"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 Warnungen\n"
+"Benutzen Sie 'git config rebase.missingCommitsCheck', um die Stufe der "
+"Warnungen\n"
"zu ändern.\n"
"Die möglichen Verhaltensweisen sind: ignore, warn, error."
-#: git-rebase--interactive.sh:1027
+#: git-rebase--interactive.sh:1036
#, sh-format
msgid ""
"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
"Ignoring."
msgstr ""
-"Nicht erkannte Einstellung $check_level für Option rebase.missingCommitsCheck.\n"
+"Nicht erkannte Einstellung $check_level für Option rebase."
+"missingCommitsCheck.\n"
"Ignoriere."
-#: git-rebase--interactive.sh:1044
-msgid "You can fix this with 'git rebase --edit-todo'."
-msgstr "Sie können das mit 'git rebase --edit-todo' beheben."
+#: git-rebase--interactive.sh:1053
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'."
+msgstr ""
+"Sie können das mit 'git rebase --edit-todo' beheben. Führen Sie danach\n"
+"'git rebase --continue' aus."
-#: git-rebase--interactive.sh:1045
+#: git-rebase--interactive.sh:1054
msgid "Or you can abort the rebase with 'git rebase --abort'."
msgstr "Oder Sie können den Rebase mit 'git rebase --abort' abbrechen."
-#: git-rebase--interactive.sh:1069
+#: git-rebase--interactive.sh:1078
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "Konnte CHERRY_PICK_HEAD nicht löschen"
-#: git-rebase--interactive.sh:1074
+#: git-rebase--interactive.sh:1083
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
"\n"
" git commit $gpg_sign_opt_quoted\n"
"\n"
-"In both case, once you're done, continue with:\n"
+"In both cases, once you're done, continue with:\n"
"\n"
" git rebase --continue\n"
msgstr ""
"\n"
" git rebase --continue\n"
-#: git-rebase--interactive.sh:1091
+#: git-rebase--interactive.sh:1100
msgid "Error trying to find the author identity to amend commit"
msgstr ""
"Fehler beim Versuch die Identität des Authors zum Verbessern des Commits zu\n"
"finden"
-#: git-rebase--interactive.sh:1096
+#: git-rebase--interactive.sh:1105
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
"Sie haben nicht committete Änderungen in Ihrem Arbeitsverzeichnis. Bitte\n"
-"committen Sie diese zuerst und führen Sie dann 'git rebase --continue' erneut\n"
+"committen Sie diese zuerst und führen Sie dann 'git rebase --continue' "
+"erneut\n"
"aus."
-#: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:1110 git-rebase--interactive.sh:1114
msgid "Could not commit staged changes."
msgstr "Konnte Änderungen aus der Staging-Area nicht committen."
-#: git-rebase--interactive.sh:1129
+#: git-rebase--interactive.sh:1138
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1298
+#: git-rebase--interactive.sh:1146 git-rebase--interactive.sh:1304
msgid "Could not execute editor"
msgstr "Konnte Editor nicht ausführen."
-#: git-rebase--interactive.sh:1145
-msgid "You need to set your committer info first"
-msgstr "Sie müssen zuerst die Informationen zum Commit-Ersteller setzen."
-
-#: git-rebase--interactive.sh:1153
+#: git-rebase--interactive.sh:1159
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "Konnte $switch_to nicht auschecken."
-#: git-rebase--interactive.sh:1158
+#: git-rebase--interactive.sh:1164
msgid "No HEAD?"
msgstr "Kein HEAD?"
-#: git-rebase--interactive.sh:1159
+#: git-rebase--interactive.sh:1165
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Konnte temporäres Verzeichnis $state_dir nicht erstellen."
-#: git-rebase--interactive.sh:1161
+#: git-rebase--interactive.sh:1167
msgid "Could not mark as interactive"
msgstr "Konnte nicht als interaktiven Rebase markieren."
-#: git-rebase--interactive.sh:1171 git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:1177 git-rebase--interactive.sh:1182
msgid "Could not init rewritten commits"
msgstr "Konnte neu geschriebene Commits nicht initialisieren."
-#: git-rebase--interactive.sh:1276
+#: git-rebase--interactive.sh:1282
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "Rebase von $shortrevisions auf $shortonto ($todocount Kommando)"
msgstr[1] "Rebase von $shortrevisions auf $shortonto ($todocount Kommandos)"
-#: git-rebase--interactive.sh:1281
+#: git-rebase--interactive.sh:1287
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"\n"
-msgstr "\nWenn Sie jedoch alles löschen, wird der Rebase abgebrochen.\n\n"
+msgstr ""
+"\n"
+"Wenn Sie jedoch alles löschen, wird der Rebase abgebrochen.\n"
+"\n"
-#: git-rebase--interactive.sh:1288
+#: git-rebase--interactive.sh:1294
msgid "Note that empty commits are commented out"
msgstr "Leere Commits sind auskommentiert."
#: git-sh-setup.sh:199 git-sh-setup.sh:206
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
-msgstr "fatal: $program_name kann ohne ein Arbeitsverzeichnis nicht verwendet werden."
+msgstr ""
+"fatal: $program_name kann ohne ein Arbeitsverzeichnis nicht verwendet werden."
#: git-sh-setup.sh:220
msgid "Cannot rebase: You have unstaged changes."
-msgstr "Rebase nicht möglich: Sie haben Änderungen, die nicht zum Commit vorgemerkt sind."
+msgstr ""
+"Rebase nicht möglich: Sie haben Änderungen, die nicht zum Commit vorgemerkt "
+"sind."
#: git-sh-setup.sh:223
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
-"Kann Branches nicht neu schreiben: Sie haben Änderungen, die nicht zum Commit\n"
+"Kann Branches nicht neu schreiben: Sie haben Änderungen, die nicht zum "
+"Commit\n"
"vorgemerkt sind."
+#: git-sh-setup.sh:226
+msgid "Cannot pull with rebase: You have unstaged changes."
+msgstr ""
+"Kann \"pull\" mit \"rebase\" nicht ausführen: Sie haben Änderungen, die "
+"nicht zum Commit vorgemerkt sind."
+
#: git-sh-setup.sh:229
#, sh-format
msgid "Cannot $action: You have unstaged changes."
#: git-sh-setup.sh:242
msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr "Rebase nicht möglich: Die Staging-Area beinhaltet nicht committete Änderungen."
+msgstr ""
+"Rebase nicht möglich: Die Staging-Area beinhaltet nicht committete "
+"Änderungen."
+
+#: git-sh-setup.sh:245
+msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+msgstr ""
+"Kann \"pull\" mit \"rebase\" nicht ausführen: Die Staging-Area beinhaltet "
+"nicht committete Änderungen."
#: git-sh-setup.sh:248
#, sh-format
"Kann $action nicht ausführen: Die Staging-Area beinhaltet nicht committete\n"
"Änderungen."
+#: git-sh-setup.sh:252
+msgid "Additionally, your index contains uncommitted changes."
+msgstr "Zusätzlich beinhaltet die Staging-Area nicht committete Änderungen."
+
#: git-sh-setup.sh:372
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."
+msgstr ""
+"Sie müssen den Befehl von der obersten Ebene des Arbeitsverzeichnisses "
+"ausführen."
#: git-sh-setup.sh:377
msgid "Unable to determine absolute path of git directory"
msgstr "Konnte absoluten Pfad des Git-Verzeichnisses nicht bestimmen."
+#~ msgid "Could not write to %s"
+#~ msgstr "Konnte nicht nach %s schreiben"
+
+#~ msgid "Error wrapping up %s."
+#~ msgstr "Fehler beim Einpacken von %s."
+
+#~ msgid "Your local changes would be overwritten by cherry-pick."
+#~ msgstr ""
+#~ "Ihre lokalen Änderungen würden durch den Cherry-Pick überschrieben werden."
+
+#~ msgid "Cannot revert during another revert."
+#~ msgstr "Kann Revert nicht während eines anderen Reverts ausführen."
+
+#~ msgid "Cannot cherry-pick during another cherry-pick."
+#~ msgstr ""
+#~ "Kann Cherry-Pick nicht während eines anderen Cherry-Picks ausführen."
+
+#~ msgid "Could not parse line %d."
+#~ msgstr "Konnte Zeile %d nicht parsen."
+
+#~ msgid "Could not open %s"
+#~ msgstr "Konnte %s nicht öffnen"
+
+#~ msgid "Could not read %s."
+#~ msgstr "Konnte %s nicht lesen."
+
+#~ msgid "Could not format %s."
+#~ msgstr "Konnte %s nicht formatieren."
+
+#~ msgid "%s: %s"
+#~ msgstr "%s: %s"
+
+#~ msgid "cannot open %s: %s"
+#~ msgstr "Kann %s nicht öffnen: %s"
+
+#~ msgid "You need to set your committer info first"
+#~ msgstr "Sie müssen zuerst die Informationen zum Commit-Ersteller setzen."
msgstr ""
"Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-08-27 23:21+0800\n"
-"PO-Revision-Date: 2016-08-28 11:26+0200\n"
+"POT-Creation-Date: 2016-11-25 22:50+0800\n"
+"PO-Revision-Date: 2016-11-25 22:55+0800\n"
"Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language: fr\n"
" git checkout -b <nom-de-la-nouvelle-branche>\n"
"\n"
-#: archive.c:12
-msgid "git archive [<options>] <tree-ish> [<path>...]"
-msgstr "git archive [<options>] <arbre ou apparenté> [<chemin>...]"
+#: apply.c:57
+#, c-format
+msgid "unrecognized whitespace option '%s'"
+msgstr "option d'espace non reconnue '%s'"
-#: archive.c:13
-msgid "git archive --list"
-msgstr "git archive --list"
+#: apply.c:73
+#, c-format
+msgid "unrecognized whitespace ignore option '%s'"
+msgstr "option d'ignorance d'espace non reconnue '%s'"
-#: archive.c:14
-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>...]"
+#: apply.c:125
+msgid "--reject and --3way cannot be used together."
+msgstr "--reject et --3way ne peuvent pas être utilisés ensemble."
-#: archive.c:15
-msgid "git archive --remote <repo> [--exec <cmd>] --list"
-msgstr "git archive --remote <dépôt> [--exec <commande>] --list"
+#: apply.c:127
+msgid "--cached and --3way cannot be used together."
+msgstr "--cached et --3way ne peuvent pas être utilisés ensemble."
-#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327
-#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr "le chemin '%s' ne correspond à aucun fichier"
+#: apply.c:130
+msgid "--3way outside a repository"
+msgstr "--3way hors d'un dépôt"
-#: archive.c:429
-msgid "fmt"
-msgstr "fmt"
+#: apply.c:141
+msgid "--index outside a repository"
+msgstr "--index hors d'un dépôt"
-#: archive.c:429
-msgid "archive format"
-msgstr "format d'archive"
+#: apply.c:144
+msgid "--cached outside a repository"
+msgstr "--cached hors d'un dépôt"
-#: archive.c:430 builtin/log.c:1422
-msgid "prefix"
-msgstr "préfixe"
+#: apply.c:845
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr "Impossible de préparer la regexp d'horodatage %s"
-#: archive.c:431
-msgid "prepend prefix to each pathname in the archive"
-msgstr "préfixer chaque chemin de fichier dans l'archive"
+#: apply.c:854
+#, c-format
+msgid "regexec returned %d for input: %s"
+msgstr "regexec a retourné %d pour l'entrée : %s"
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553 builtin/blame.c:2554
-#: builtin/config.c:59 builtin/fast-export.c:987 builtin/fast-export.c:989
-#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:460
-#: builtin/ls-files.c:463 builtin/notes.c:399 builtin/notes.c:562
-#: builtin/read-tree.c:109 parse-options.h:153
-msgid "file"
-msgstr "fichier"
+#: apply.c:938
+#, c-format
+msgid "unable to find filename in patch at line %d"
+msgstr "nom de fichier du patch introuvable à la ligne %d"
-#: archive.c:433 builtin/archive.c:89
-msgid "write the archive to this file"
-msgstr "écrire l'archive dans ce fichier"
+#: apply.c:977
+#, 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"
-#: archive.c:435
-msgid "read .gitattributes in working directory"
-msgstr "lire .gitattributes dans le répertoire de travail"
+#: apply.c:983
+#, 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"
-#: archive.c:436
-msgid "report archived files on stderr"
-msgstr "afficher les fichiers archivés sur stderr"
+#: apply.c:984
+#, 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"
-#: archive.c:437
-msgid "store only"
-msgstr "stockage seulement"
+#: apply.c:990
+#, 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"
-#: archive.c:438
-msgid "compress faster"
-msgstr "compression rapide"
+#: apply.c:1488
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recomptage : ligne inattendue : %.*s"
-#: archive.c:446
-msgid "compress better"
-msgstr "compression efficace"
+#: apply.c:1557
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "fragment de patch sans en-tête à la ligne %d : %.*s"
-#: archive.c:449
-msgid "list supported archive formats"
-msgstr "afficher les formats d'archive supportés"
+#: apply.c:1577
+#, 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] ""
+"information de nom de fichier manquante dans l'en-tête de git diff lors de "
+"la suppression de %d composant de préfixe de chemin (ligne %d)"
+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)"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
-#: builtin/submodule--helper.c:832
-msgid "repo"
-msgstr "dépôt"
+#: apply.c:1589
+#, 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)"
-#: archive.c:452 builtin/archive.c:91
-msgid "retrieve the archive from remote repository <repo>"
-msgstr "récupérer l'archive depuis le dépôt distant <dépôt>"
+#: apply.c:1759
+msgid "new file depends on old contents"
+msgstr "le nouveau fichier dépend de contenus anciens"
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483
-msgid "command"
-msgstr "commande"
+#: apply.c:1761
+msgid "deleted file still has contents"
+msgstr "le fichier supprimé a encore du contenu"
-#: archive.c:454 builtin/archive.c:93
-msgid "path to the remote git-upload-archive command"
-msgstr "chemin vers la commande distante git-upload-archive"
+#: apply.c:1795
+#, c-format
+msgid "corrupt patch at line %d"
+msgstr "patch corrompu à la ligne %d"
-#: archive.c:461
-msgid "Unexpected option --remote"
-msgstr "Option --remote inattendue"
+#: apply.c:1832
+#, c-format
+msgid "new file %s depends on old contents"
+msgstr "le nouveau fichier %s dépend de contenus anciens"
-#: archive.c:463
-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"
+#: apply.c:1834
+#, c-format
+msgid "deleted file %s still has contents"
+msgstr "le fichier supprimé %s a encore du contenu"
-#: archive.c:465
-msgid "Unexpected option --output"
-msgstr "Option --output inattendue"
+#: 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é"
-#: archive.c:487
+#: apply.c:1984
#, c-format
-msgid "Unknown archive format '%s'"
-msgstr "Format d'archive inconnu '%s'"
+msgid "corrupt binary patch at line %d: %.*s"
+msgstr "patch binaire corrompu à la ligne %d : %.*s"
-#: archive.c:494
+#: apply.c:2021
#, c-format
-msgid "Argument not supported for format '%s': -%d"
-msgstr "Argument non supporté pour le format '%s' : -%d"
+msgid "unrecognized binary patch at line %d"
+msgstr "patch binaire non reconnu à la ligne %d"
-#: attr.c:263
-msgid ""
-"Negative patterns are ignored in git attributes\n"
-"Use '\\!' for literal leading exclamation."
-msgstr ""
-"Les motifs de négation sont ignorés dans les attributs git\n"
-"Utilisez '\\!' pour un point d'exclamation littéral."
+#: apply.c:2182
+#, c-format
+msgid "patch with only garbage at line %d"
+msgstr "patch totalement incompréhensible à la ligne %d"
-#: bisect.c:441
+#: apply.c:2274
#, c-format
-msgid "Could not open file '%s'"
-msgstr "impossible d'ouvrir le fichier '%s'"
+msgid "unable to read symlink %s"
+msgstr "lecture du lien symbolique %s impossible"
-#: bisect.c:446
+#: apply.c:2278
#, c-format
-msgid "Badly quoted content in file '%s': %s"
-msgstr "Contenu mal cité dans le fichier '%s' : %s"
+msgid "unable to open or read %s"
+msgstr "ouverture ou lecture de %s impossible"
-#: bisect.c:655
+#: apply.c:2931
#, c-format
-msgid "We cannot bisect more!\n"
-msgstr "Impossible de pousser la bissection plus loin !\n"
+msgid "invalid start of line: '%c'"
+msgstr "début de ligne invalide : '%c'"
-#: bisect.c:708
+#: apply.c:3050
#, c-format
-msgid "Not a valid commit name %s"
-msgstr "%s n'est pas un nom de commit valide"
+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)."
-#: bisect.c:732
+#: apply.c:3062
#, c-format
-msgid ""
-"The merge base %s is bad.\n"
-"This means the bug has been fixed between %s and [%s].\n"
-msgstr ""
-"La base de fusion %s est mauvaise.\n"
-"Cela signifie que le bogue été corrigé entre %s et [%s].\n"
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
+msgstr "Contexte réduit à (%ld/%ld) pour appliquer le fragment à la ligne %d"
-#: bisect.c:737
+#: apply.c:3068
#, c-format
msgid ""
-"The merge base %s is new.\n"
-"The property has changed between %s and [%s].\n"
+"while searching for:\n"
+"%.*s"
msgstr ""
-"La base de fusion %s est nouvelle.\n"
-"La propriété a changé entre %s et [%s].\n"
+"pendant la recherche de :\n"
+"%.*s"
-#: bisect.c:742
+#: apply.c:3090
#, c-format
-msgid ""
-"The merge base %s is %s.\n"
-"This means the first '%s' commit is between %s and [%s].\n"
+msgid "missing binary patch data for '%s'"
+msgstr "données de patch binaire manquantes pour '%s'"
+
+#: apply.c:3098
+#, c-format
+msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
-"La base de fusion %s est %s.\n"
-"Ceci signifie que le premier commit '%s' est entre %s et [%s].\n"
+"impossible d'appliquer l'inverse d'un patch binaire à '%s' sans la section "
+"inverse"
-#: bisect.c:750
+#: apply.c:3144
#, c-format
-msgid ""
-"Some %s revs are not ancestor of the %s rev.\n"
-"git bisect cannot work properly in this case.\n"
-"Maybe you mistook %s and %s revs?\n"
+msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
-"Certaines révision %s ne sont pas ancêtres de la révision %s.\n"
-"git bisect ne peut pas fonctionner correctement dans ce cas.\n"
-"Peut-être avez-vous inversé les révisions %s et %s ?\n"
+"impossible d'appliquer un patch binaire à '%s' sans la ligne complète d'index"
-#: bisect.c:763
+#: apply.c:3154
#, 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."
+"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
-"La base de fusion entre %s et [%s] doit être évitée.\n"
-"On ne peut donc pas être certain que le premier commit %s se trouve entre %s "
-"et %s.\n"
-"On continue tout de même."
+"le patch s'applique à '%s' (%s), ce qui ne correspond pas au contenu actuel."
-#: bisect.c:798
+#: apply.c:3162
#, c-format
-msgid "Bisecting: a merge base must be tested\n"
-msgstr "Bissection : une base de fusion doit être testée\n"
+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"
-#: bisect.c:849
+#: apply.c:3180
#, c-format
-msgid "a %s revision is needed"
-msgstr "une révision %s est nécessaire"
+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"
-#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
+#: apply.c:3193
#, c-format
-msgid "could not create file '%s'"
-msgstr "impossible de créer le fichier '%s'"
+msgid "binary patch does not apply to '%s'"
+msgstr "le patch binaire ne s'applique par correctement à '%s'"
-#: bisect.c:917
+#: apply.c:3199
#, c-format
-msgid "could not read file '%s'"
-msgstr "impossible de lire le fichier '%s'"
-
-#: bisect.c:947
-msgid "reading bisect refs failed"
-msgstr "impossible de lire les références de bissection"
+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é)"
-#: bisect.c:967
-#, c-format
-msgid "%s was both %s and %s\n"
-msgstr "%s était à la fois %s et %s\n"
-
-#: bisect.c:975
+#: apply.c:3220
#, c-format
-msgid ""
-"No testable commit found.\n"
-"Maybe you started with bad path parameters?\n"
-msgstr ""
-"Aucun commit testable n'a été trouvé\n"
-"Peut-être avez-vous démarré avec un mauvais paramètre de chemin ?\n"
+msgid "patch failed: %s:%ld"
+msgstr "le patch a échoué : %s:%ld"
-#: bisect.c:994
+#: apply.c:3342
#, c-format
-msgid "(roughly %d step)"
-msgid_plural "(roughly %d steps)"
-msgstr[0] "(à peu près %d étape)"
-msgstr[1] "(à peu près %d étapes)"
+msgid "cannot checkout %s"
+msgstr "extraction de %s impossible"
-#. TRANSLATORS: the last %s will be replaced with
-#. "(roughly %d steps)" translation
-#: bisect.c:998
+#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248
#, 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 cette %s\n"
-msgstr[1] "Bissection : %d révisions à tester après cette %s\n"
+msgid "failed to read %s"
+msgstr "échec de la lecture de %s"
-#: branch.c:53
+#: apply.c:3398
#, 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"
-"Après correction de la cause de l'erreur, vous pouvez essayer de corriger\n"
-"l'information de suivi distant en invoquant\n"
-"\"git branch --setup-upstream-to=%s%s%s\"."
+msgid "reading from '%s' beyond a symbolic link"
+msgstr "lecture depuis '%s' au-delà d'un lien symbolique"
-#: branch.c:67
+#: apply.c:3427 apply.c:3667
#, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "La branche %s ne peut pas être sa propre branche amont."
+msgid "path %s has been renamed/deleted"
+msgstr "le chemin %s a été renommé/supprimé"
-#: branch.c:93
+#: apply.c:3510 apply.c:3681
#, 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."
+msgid "%s: does not exist in index"
+msgstr "%s : n'existe pas dans l'index"
-#: branch.c:94
+#: apply.c:3519 apply.c:3689
#, 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."
+msgid "%s: does not match index"
+msgstr "%s : ne correspond pas à l'index"
-#: branch.c:98
-#, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
+#: apply.c:3554
+msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
-"La branche %s est paramétrée pour suivre la branche locale %s en rebasant."
+"le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 "
+"points."
-#: branch.c:99
+#: apply.c:3557
#, 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."
+msgid "Falling back to three-way merge...\n"
+msgstr "Retour à une fusion à 3 points…\n"
-#: branch.c:104
+#: apply.c:3573 apply.c:3577
#, 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."
+msgid "cannot read the current contents of '%s'"
+msgstr "impossible de lire le contenu actuel de '%s'"
-#: branch.c:105
+#: apply.c:3589
#, 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 "Failed to fall back on three-way merge...\n"
+msgstr "Echec du retour à une fusion à 3 points…\n"
-#: branch.c:109
+#: apply.c:3603
#, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
-msgstr ""
-"La branche %s est paramétrée pour suivre la référence locale %s en rebasant."
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr "Patch %s appliqué avec des conflits.\n"
-#: branch.c:110
+#: apply.c:3608
#, c-format
-msgid "Branch %s set up to track local ref %s."
-msgstr "La branche %s est paramétrée pour suivre la référence locale %s."
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr "Patch %s appliqué proprement.\n"
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "Échec de l'écriture de la configuration de branche amont"
+#: apply.c:3634
+msgid "removal patch leaves file contents"
+msgstr "le patch de suppression laisse un contenu dans le fichier"
-#: branch.c:156
+#: apply.c:3706
#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr "Pas de suivi : information ambiguë pour la référence %s"
+msgid "%s: wrong type"
+msgstr "%s : type erroné"
-#: branch.c:185
+#: apply.c:3708
#, c-format
-msgid "'%s' is not a valid branch name."
-msgstr "'%s' n'est pas un nom de branche valide."
+msgid "%s has type %o, expected %o"
+msgstr "%s est de type %o, mais %o attendu"
-#: branch.c:190
+#: apply.c:3859 apply.c:3861
#, c-format
-msgid "A branch named '%s' already exists."
-msgstr "Une branche nommée '%s' existe déjà."
+msgid "invalid path '%s'"
+msgstr "chemin invalide '%s'"
-#: branch.c:198
-msgid "Cannot force update the current branch."
-msgstr "Impossible de forcer la mise à jour de la branche courante."
+#: apply.c:3917
+#, c-format
+msgid "%s: already exists in index"
+msgstr "%s : existe déjà dans l'index"
-#: branch.c:218
+#: apply.c:3920
#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
-msgstr ""
-"Impossible de paramétrer le suivi de branche ; le point de départ '%s' n'est "
-"pas une branche."
+msgid "%s: already exists in working directory"
+msgstr "%s : existe déjà dans la copie de travail"
-#: branch.c:220
+#: apply.c:3940
#, c-format
-msgid "the requested upstream branch '%s' does not exist"
-msgstr "la branche amont demandée '%s' n'existe pas"
+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)"
-#: branch.c:222
-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."
+#: apply.c:3945
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-"\n"
-"Si vous comptez baser votre travail sur une branche\n"
-"amont qui existe déjà sur le serveur distant, vous pouvez\n"
-"lancer \"git fetch\" pour la récupérer.\n"
-"\n"
-"Si vous comptez pousser une nouvelle branche locale qui suivra\n"
-"sa jumelle distante, vous pouvez utiliser \"git push -u\"\n"
-"pour paramétrer le suivi distant en même temps que vous poussez."
+"le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s"
-#: branch.c:266
+#: apply.c:3965
#, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "Nom d'objet invalide : '%s'."
+msgid "affected file '%s' is beyond a symbolic link"
+msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique"
-#: branch.c:286
+#: apply.c:3969
#, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "Nom d'objet ambigu : '%s'."
+msgid "%s: patch does not apply"
+msgstr "%s : le patch ne s'applique pas"
-#: branch.c:291
+#: apply.c:3984
#, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "Point d'embranchement invalide : '%s'."
+msgid "Checking patch %s..."
+msgstr "Vérification du patch %s..."
-#: branch.c:345
+#: apply.c:4075
#, c-format
-msgid "'%s' is already checked out at '%s'"
-msgstr "'%s' est déjà extrait dans '%s'"
+msgid "sha1 information is lacking or useless for submodule %s"
+msgstr ""
+"l'information sha1 est manquante ou inutilisable pour le sous-module %s"
-#: branch.c:364
+#: apply.c:4082
#, 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"
+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"
-#: bundle.c:34
+#: apply.c:4085
#, c-format
-msgid "'%s' does not look like a v2 bundle file"
-msgstr "'%s' ne semble pas être un fichier bundle v2"
+msgid "sha1 information is lacking or useless (%s)."
+msgstr "l'information de sha1 est manquante ou inutilisable (%s)."
-#: bundle.c:61
+#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
-msgid "unrecognized header: %s%s (%d)"
-msgstr "en-tête non reconnu : %s%s (%d)"
+msgid "make_cache_entry failed for path '%s'"
+msgstr "échec de make_cache_entry pour le chemin '%s'"
-#: bundle.c:87 builtin/commit.c:778
+#: apply.c:4094
#, c-format
-msgid "could not open '%s'"
-msgstr "impossible d'ouvrir '%s'"
+msgid "could not add %s to temporary index"
+msgstr "impossible d'ajouter %s à l'index temporaire"
-#: bundle.c:139
-msgid "Repository lacks these prerequisite commits:"
-msgstr "Le dépôt ne dispose pas des commits prérequis suivants :"
+#: apply.c:4104
+#, c-format
+msgid "could not write temporary index to %s"
+msgstr "impossible d'écrire l'index temporaire dans %s"
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085
-#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348
-#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901
-#: builtin/merge.c:356 builtin/shortlog.c:170
-msgid "revision walk setup failed"
-msgstr "échec de la préparation du parcours des révisions"
+#: apply.c:4242
+#, c-format
+msgid "unable to remove %s from index"
+msgstr "suppression de %s dans l'index impossible"
-#: bundle.c:185
+#: apply.c:4277
#, c-format
-msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %d refs:"
-msgstr[0] "Le colis contient cette référence :"
-msgstr[1] "Le colis contient ces %d références :"
+msgid "corrupt patch for submodule %s"
+msgstr "patch corrompu pour le sous-module %s"
-#: bundle.c:192
-msgid "The bundle records a complete history."
-msgstr "Le colis enregistre l'historique complet."
+#: apply.c:4283
+#, c-format
+msgid "unable to stat newly created file '%s'"
+msgstr "stat du fichier nouvellement créé '%s' impossible"
-#: bundle.c:194
+#: apply.c:4291
#, c-format
-msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %d refs:"
-msgstr[0] "Le colis exige cette référence :"
-msgstr[1] "Le colis exige ces %d références :"
+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"
-#: bundle.c:253
-msgid "Could not spawn pack-objects"
-msgstr "Impossible de créer des objets groupés"
+#: apply.c:4297 apply.c:4441
+#, c-format
+msgid "unable to add cache entry for %s"
+msgstr "ajout de l'élément de cache %s impossible"
-#: bundle.c:264
-msgid "pack-objects died"
-msgstr "les objets groupés ont disparu"
+#: apply.c:4338
+#, c-format
+msgid "failed to write to '%s'"
+msgstr "échec de l'écriture dans '%s'"
-#: bundle.c:304
-msgid "rev-list died"
-msgstr "rev-list a disparu"
+#: apply.c:4342
+#, c-format
+msgid "closing file '%s'"
+msgstr "fermeture du fichier '%s'"
-#: bundle.c:353
+#: apply.c:4412
#, 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"
+msgid "unable to write file '%s' mode %o"
+msgstr "écriture du fichier '%s' mode %o impossible"
-#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273
+#: apply.c:4510
#, c-format
-msgid "unrecognized argument: %s"
-msgstr "argument non reconnu : %s"
+msgid "Applied patch %s cleanly."
+msgstr "Patch %s appliqué proprement."
-#: bundle.c:451
-msgid "Refusing to create empty bundle."
-msgstr "Refus de créer un colis vide."
+#: apply.c:4518
+msgid "internal error"
+msgstr "erreur interne"
-#: bundle.c:463
+#: apply.c:4521
#, c-format
-msgid "cannot create '%s'"
-msgstr "impossible de créer '%s'"
+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..."
-#: bundle.c:491
-msgid "index-pack died"
-msgstr "l'index de groupe a disparu"
+#: apply.c:4532
+#, c-format
+msgid "truncating .rej filename to %.*s.rej"
+msgstr "troncature du nom de fichier .rej en %.*s.rej"
-#: color.c:290
+#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989
#, c-format
-msgid "invalid color value: %.*s"
-msgstr "Valeur invalide de couleur : %.*s"
+msgid "cannot open %s"
+msgstr "impossible d'ouvrir %s"
-#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505
-#: builtin/am.c:2119
+#: apply.c:4554
#, c-format
-msgid "could not parse %s"
-msgstr "impossible d'analyser %s"
+msgid "Hunk #%d applied cleanly."
+msgstr "Section n°%d appliquée proprement."
-#: commit.c:42
+#: apply.c:4558
#, c-format
-msgid "%s %s is not a commit!"
-msgstr "%s %s n'est pas un commit !"
-
-#: compat/obstack.c:406 compat/obstack.c:408
-msgid "memory exhausted"
-msgstr "plus de mémoire"
+msgid "Rejected hunk #%d."
+msgstr "Section n°%d rejetée."
-#: config.c:516
+#: apply.c:4668
#, c-format
-msgid "bad config line %d in blob %s"
-msgstr "ligne %d de config incorrecte dans le blob %s"
+msgid "Skipped patch '%s'."
+msgstr "Chemin '%s' non traité."
-#: config.c:520
-#, c-format
-msgid "bad config line %d in file %s"
-msgstr "ligne %d de config incorrecte dans le fichier %s"
+#: apply.c:4676
+msgid "unrecognized input"
+msgstr "entrée non reconnue"
-#: config.c:524
+#: apply.c:4695
+msgid "unable to read index file"
+msgstr "lecture du fichier d'index impossible"
+
+#: apply.c:4833
#, c-format
-msgid "bad config line %d in standard input"
-msgstr "ligne %d de config incorrecte dans l'entrée standard"
+msgid "can't open patch '%s': %s"
+msgstr "ouverture impossible du patch '%s' :%s"
-#: config.c:528
+#: apply.c:4858
#, c-format
-msgid "bad config line %d in submodule-blob %s"
-msgstr "ligne %d de config incorrecte dans le blob de sous-module %s"
+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"
-#: config.c:532
+#: apply.c:4864 apply.c:4879
#, c-format
-msgid "bad config line %d in command line %s"
-msgstr "ligne %d de config incorrecte dans la ligne de commande %s"
+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."
-#: config.c:536
+#: apply.c:4872
#, c-format
-msgid "bad config line %d in %s"
-msgstr "ligne %d de config incorrecte dans %s"
+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."
-#: config.c:655
-msgid "out of range"
-msgstr "hors plage"
+#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431
+msgid "Unable to write new index file"
+msgstr "Impossible d'écrire le nouveau fichier d'index"
-#: config.c:655
-msgid "invalid unit"
-msgstr "unité invalide"
+#: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
+#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592
+#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947
+msgid "path"
+msgstr "chemin"
-#: config.c:661
-#, c-format
-msgid "bad numeric config value '%s' for '%s': %s"
-msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s"
+#: apply.c:4920
+msgid "don't apply changes matching the given path"
+msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"
-#: config.c:666
-#, 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"
+#: apply.c:4923
+msgid "apply changes matching the given path"
+msgstr "appliquer les modifications qui correspondent au chemin donné"
-#: config.c:669
-#, 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"
+#: apply.c:4925 builtin/am.c:2286
+msgid "num"
+msgstr "num"
-#: config.c:672
-#, 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"
+#: apply.c:4926
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr "supprimer <num> barres obliques des chemins traditionnels de diff"
-#: config.c:675
-#, 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"
+#: apply.c:4929
+msgid "ignore additions made by the patch"
+msgstr "ignorer les additions réalisées par le patch"
-#: config.c:678
-#, 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"
+#: apply.c:4931
+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"
-#: config.c:681
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in %s: %s"
+#: apply.c:4935
+msgid "show number of added and deleted lines in decimal notation"
msgstr ""
-"valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s"
+"afficher le nombre de lignes ajoutées et supprimées en notation décimale"
-#: config.c:768
-#, c-format
-msgid "failed to expand user dir in: '%s'"
-msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'"
+#: apply.c:4937
+msgid "instead of applying the patch, output a summary for the input"
+msgstr "au lieu d'appliquer le patch, afficher un résumer de l'entrée"
-#: config.c:849 config.c:860
-#, c-format
-msgid "bad zlib compression level %d"
-msgstr "niveau de compression zlib incorrect %d"
+#: apply.c:4939
+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"
-#: config.c:978
-#, c-format
-msgid "invalid mode for object creation: %s"
-msgstr "mode invalide pour la création d'objet : %s"
+#: apply.c:4941
+msgid "make sure the patch is applicable to the current index"
+msgstr "s'assurer que le patch est applicable sur l'index actuel"
-#: config.c:1312
-msgid "unable to parse command-line config"
-msgstr "lecture de la configuration de ligne de commande impossible"
+#: apply.c:4943
+msgid "apply a patch without touching the working tree"
+msgstr "appliquer les patch sans toucher à la copie de travail"
-#: config.c:1362
-msgid "unknown error occurred while reading the configuration files"
-msgstr "erreur inconnue pendant la lecture des fichiers de configuration"
+#: apply.c:4945
+msgid "accept a patch that touches outside the working area"
+msgstr "accepter un patch qui touche hors de la copie de travail"
-#: config.c:1716
-#, c-format
-msgid "unable to parse '%s' from command-line config"
+#: apply.c:4947
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)"
+
+#: apply.c:4949
+msgid "attempt three-way merge if a patch does not apply"
+msgstr "tenter une fusion à 3 points si le patch ne s'applique pas proprement"
+
+#: apply.c:4951
+msgid "build a temporary index based on embedded index information"
msgstr ""
-"impossible d'analyser '%s' depuis le configuration en ligne de commande"
+"construire un index temporaire fondé sur l'information de l'index embarqué"
-#: config.c:1718
-#, c-format
-msgid "bad config variable '%s' in file '%s' at line %d"
+#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505
+msgid "paths are separated with NUL character"
+msgstr "les chemins sont séparés par un caractère NUL"
+
+#: apply.c:4956
+msgid "ensure at least <n> lines of context match"
+msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
+
+#: apply.c:4957 builtin/am.c:2265
+msgid "action"
+msgstr "action"
+
+#: apply.c:4958
+msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-"variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d"
+"détecter des lignes nouvelles ou modifiées qui contiennent des erreurs "
+"d'espace"
-#: config.c:1777
-#, c-format
-msgid "%s has multiple values"
-msgstr "%s a des valeurs multiples"
+#: apply.c:4961 apply.c:4964
+msgid "ignore changes in whitespace when finding context"
+msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
-#: config.c:2311
-#, c-format
-msgid "could not set '%s' to '%s'"
-msgstr "impossible de régler '%s' à '%s'"
+#: apply.c:4967
+msgid "apply the patch in reverse"
+msgstr "appliquer le patch en sens inverse"
-#: config.c:2313
-#, c-format
-msgid "could not unset '%s'"
-msgstr "impossible de désinitialiser '%s'"
+#: apply.c:4969
+msgid "don't expect at least one line of context"
+msgstr "ne pas s'attendre à au moins une ligne de contexte"
-#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
-msgid "Checking connectivity"
-msgstr "Vérification de la connectivité"
+#: apply.c:4971
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants"
-#: connected.c:74
-msgid "Could not run 'git rev-list'"
-msgstr "Impossible de lancer 'git rev-list'"
+#: apply.c:4973
+msgid "allow overlapping hunks"
+msgstr "accepter les recouvrements de sections"
-#: connected.c:94
-msgid "failed write to rev-list"
-msgstr "impossible d'écrire dans la rev-list"
+#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19
+#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593
+#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114
+msgid "be verbose"
+msgstr "mode verbeux"
-#: connected.c:101
-msgid "failed to close rev-list's stdin"
-msgstr "impossible de fermer l'entrée standard du rev-list"
+#: apply.c:4976
+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"
-#: date.c:97
-msgid "in the future"
-msgstr "dans le futur"
+#: apply.c:4979
+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"
-#: date.c:103
-#, c-format
-msgid "%lu second ago"
-msgid_plural "%lu seconds ago"
-msgstr[0] "il y a %lu seconde"
-msgstr[1] "il y a %lu secondes"
+#: apply.c:4981 builtin/am.c:2274
+msgid "root"
+msgstr "racine"
-#: date.c:110
-#, c-format
-msgid "%lu minute ago"
-msgid_plural "%lu minutes ago"
-msgstr[0] "il y a %lu minute"
-msgstr[1] "il y a %lu minutes"
+#: apply.c:4982
+msgid "prepend <root> to all filenames"
+msgstr "préfixer tous les noms de fichier avec <root>"
-#: date.c:117
-#, c-format
-msgid "%lu hour ago"
-msgid_plural "%lu hours ago"
-msgstr[0] "il y a %lu heure"
-msgstr[1] "il y a %lu heures"
+#: archive.c:12
+msgid "git archive [<options>] <tree-ish> [<path>...]"
+msgstr "git archive [<options>] <arbre ou apparenté> [<chemin>...]"
-#: date.c:124
-#, c-format
-msgid "%lu day ago"
-msgid_plural "%lu days ago"
-msgstr[0] "il y a %lu jour"
-msgstr[1] "il y a %lu jours"
+#: archive.c:13
+msgid "git archive --list"
+msgstr "git archive --list"
-#: date.c:130
-#, c-format
-msgid "%lu week ago"
-msgid_plural "%lu weeks ago"
-msgstr[0] "il y a %lu semaine"
-msgstr[1] "il y a %lu semaines"
+#: archive.c:14
+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>...]"
-#: date.c:137
-#, c-format
-msgid "%lu month ago"
-msgid_plural "%lu months ago"
-msgstr[0] "il y a %lu mois"
-msgstr[1] "il y a %lu mois"
+#: archive.c:15
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr "git archive --remote <dépôt> [--exec <commande>] --list"
-#: date.c:148
+#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327
#, c-format
-msgid "%lu year"
-msgid_plural "%lu years"
-msgstr[0] "%lu an"
-msgstr[1] "%lu ans"
+msgid "pathspec '%s' did not match any files"
+msgstr "le chemin '%s' ne correspond à aucun fichier"
-#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:151
-#, c-format
-msgid "%s, %lu month ago"
-msgid_plural "%s, %lu months ago"
-msgstr[0] "il y a %s et %lu mois"
-msgstr[1] "il y a %s et %lu mois"
+#: archive.c:429
+msgid "fmt"
+msgstr "fmt"
-#: date.c:156 date.c:161
-#, c-format
-msgid "%lu year ago"
-msgid_plural "%lu years ago"
-msgstr[0] "il y a %lu an"
-msgstr[1] "il y a %lu ans"
+#: archive.c:429
+msgid "archive format"
+msgstr "format d'archive"
-#: diffcore-order.c:24
-#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "impossible de lire le fichier de commande '%s'"
+#: archive.c:430 builtin/log.c:1429
+msgid "prefix"
+msgstr "préfixe"
-#: diffcore-rename.c:540
-msgid "Performing inexact rename detection"
-msgstr "Détection de renommage inexact en cours"
+#: archive.c:431
+msgid "prepend prefix to each pathname in the archive"
+msgstr "préfixer chaque chemin de fichier dans l'archive"
-#: diff.c:116
-#, c-format
-msgid " Failed to parse dirstat cut-off percentage '%s'\n"
-msgstr ""
-" Impossible d'analyser le pourcentage de modification de dirstat '%s'\n"
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603
+#: builtin/blame.c:2604 builtin/config.c:59 builtin/fast-export.c:987
+#: builtin/fast-export.c:989 builtin/grep.c:723 builtin/hash-object.c:101
+#: builtin/ls-files.c:539 builtin/ls-files.c:542 builtin/notes.c:401
+#: builtin/notes.c:564 builtin/read-tree.c:109 parse-options.h:153
+msgid "file"
+msgstr "fichier"
-#: diff.c:121
-#, c-format
-msgid " Unknown dirstat parameter '%s'\n"
-msgstr " Paramètre dirstat inconnu '%s'\n"
+#: archive.c:433 builtin/archive.c:89
+msgid "write the archive to this file"
+msgstr "écrire l'archive dans ce fichier"
-#: diff.c:225
-#, c-format
-msgid "Unknown value for 'diff.submodule' config variable: '%s'"
-msgstr ""
-"Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'"
+#: archive.c:435
+msgid "read .gitattributes in working directory"
+msgstr "lire .gitattributes dans le répertoire de travail"
-#: diff.c:277
-#, c-format
-msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
-msgstr ""
-"Erreurs dans la variable de configuration 'diff.dirstat' :\n"
-"%s"
+#: archive.c:436
+msgid "report archived files on stderr"
+msgstr "afficher les fichiers archivés sur stderr"
-#: diff.c:3017
-#, c-format
-msgid "external diff died, stopping at %s"
-msgstr "l'application de diff externe a disparu, arrêt à %s"
+#: archive.c:437
+msgid "store only"
+msgstr "stockage seulement"
-#: diff.c:3415
-msgid "--follow requires exactly one pathspec"
-msgstr "--follow a besoin d'une spécification de chemin unique"
+#: archive.c:438
+msgid "compress faster"
+msgstr "compression rapide"
-#: diff.c:3578
-#, 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"
+#: archive.c:446
+msgid "compress better"
+msgstr "compression efficace"
-#: diff.c:3592
-#, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
-msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'"
+#: archive.c:449
+msgid "list supported archive formats"
+msgstr "afficher les formats d'archive supportés"
-#: dir.c:1823
-msgid "failed to get kernel name and information"
-msgstr "echec de l'obtention d'information de kernel"
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
+#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953
+msgid "repo"
+msgstr "dépôt"
-#: dir.c:1942
-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."
+#: archive.c:452 builtin/archive.c:91
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "récupérer l'archive depuis le dépôt distant <dépôt>"
-#: gpg-interface.c:178
-msgid "gpg failed to sign the data"
-msgstr "gpg n'a pas pu signer les données"
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
+msgid "command"
+msgstr "commande"
-#: gpg-interface.c:208
-msgid "could not create temporary file"
-msgstr "impossible de créer un fichier temporaire"
+#: archive.c:454 builtin/archive.c:93
+msgid "path to the remote git-upload-archive command"
+msgstr "chemin vers la commande distante git-upload-archive"
-#: gpg-interface.c:210
-#, c-format
-msgid "failed writing detached signature to '%s'"
-msgstr "impossible d'écrire la signature détachée dans '%s'"
+#: archive.c:461
+msgid "Unexpected option --remote"
+msgstr "Option --remote inattendue"
+
+#: archive.c:463
+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"
-#: grep.c:1792
+#: archive.c:465
+msgid "Unexpected option --output"
+msgstr "Option --output inattendue"
+
+#: archive.c:487
#, c-format
-msgid "'%s': unable to read %s"
-msgstr "'%s' : lecture de %s impossible"
+msgid "Unknown archive format '%s'"
+msgstr "Format d'archive inconnu '%s'"
-#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
+#: archive.c:494
#, c-format
-msgid "failed to stat '%s'"
-msgstr "échec du stat de '%s'"
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Argument non supporté pour le format '%s' : -%d"
+
+#: attr.c:263
+msgid ""
+"Negative patterns are ignored in git attributes\n"
+"Use '\\!' for literal leading exclamation."
+msgstr ""
+"Les motifs de négation sont ignorés dans les attributs git\n"
+"Utilisez '\\!' pour un point d'exclamation littéral."
-#: grep.c:1820
+#: bisect.c:441
#, c-format
-msgid "'%s': short read"
-msgstr "'%s' : lecture tronquée"
+msgid "Could not open file '%s'"
+msgstr "impossible d'ouvrir le fichier '%s'"
-#: help.c:205
+#: bisect.c:446
#, c-format
-msgid "available git commands in '%s'"
-msgstr "commandes git disponibles dans '%s'"
+msgid "Badly quoted content in file '%s': %s"
+msgstr "Contenu mal cité dans le fichier '%s' : %s"
-#: help.c:212
-msgid "git commands available from elsewhere on your $PATH"
-msgstr "commandes git disponibles depuis un autre endroit de votre $PATH"
+#: bisect.c:655
+#, c-format
+msgid "We cannot bisect more!\n"
+msgstr "Impossible de pousser la bissection plus loin !\n"
-#: help.c:244
-msgid "These are common Git commands used in various situations:"
-msgstr "Ci-dessous les commandes Git habituelles dans diverses situations :"
+#: bisect.c:708
+#, c-format
+msgid "Not a valid commit name %s"
+msgstr "%s n'est pas un nom de commit valide"
-#: help.c:309
+#: bisect.c:732
#, c-format
msgid ""
-"'%s' appears to be a git command, but we were not\n"
-"able to execute it. Maybe git-%s is broken?"
+"The merge base %s is bad.\n"
+"This means the bug has been fixed between %s and [%s].\n"
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:366
-msgid "Uh oh. Your system reports no Git commands at all."
-msgstr "Ahem. Votre système n'indique aucune commande Git."
+"La base de fusion %s est mauvaise.\n"
+"Cela signifie que le bogue été corrigé entre %s et [%s].\n"
-#: help.c:388
+#: bisect.c:737
#, c-format
msgid ""
-"WARNING: You called a Git command named '%s', which does not exist.\n"
-"Continuing under the assumption that you meant '%s'"
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
msgstr ""
-"ATTENTION : vous avez invoqué une commande Git nommée '%s' qui n'existe "
-"pas.\n"
-"Continuons en supposant que vous avez voulu dire '%s'"
-
-#: help.c:393
-#, c-format
-msgid "in %0.1f seconds automatically..."
-msgstr "dans %0.1f secondes automatiquement..."
+"La base de fusion %s est nouvelle.\n"
+"La propriété a changé entre %s et [%s].\n"
-#: help.c:400
+#: bisect.c:742
#, 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:404 help.c:470
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à ?"
+"The merge base %s is %s.\n"
+"This means the first '%s' commit is between %s and [%s].\n"
+msgstr ""
+"La base de fusion %s est %s.\n"
+"Ceci signifie que le premier commit '%s' est entre %s et [%s].\n"
-#: help.c:466
+#: bisect.c:750
#, c-format
-msgid "%s: %s - %s"
-msgstr "%s: %s - %s"
+msgid ""
+"Some %s revs are not ancestor of the %s rev.\n"
+"git bisect cannot work properly in this case.\n"
+"Maybe you mistook %s and %s revs?\n"
+msgstr ""
+"Certaines révision %s ne sont pas ancêtres de la révision %s.\n"
+"git bisect ne peut pas fonctionner correctement dans ce cas.\n"
+"Peut-être avez-vous inversé les révisions %s et %s ?\n"
-#: lockfile.c:152
+#: bisect.c:763
#, 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."
+"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 ""
-"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'echec persiste,\n"
-"un processus git peut avoir planté :\n"
-"supprimez le fichier manuellement pour poursuivre."
+"La base de fusion entre %s et [%s] doit être évitée.\n"
+"On ne peut donc pas être certain que le premier commit %s se trouve entre %s "
+"et %s.\n"
+"On continue tout de même."
-#: lockfile.c:160
+#: bisect.c:798
#, c-format
-msgid "Unable to create '%s.lock': %s"
-msgstr "Impossible de créer '%s.lock' : %s"
-
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "impossible de lire le cache"
+msgid "Bisecting: a merge base must be tested\n"
+msgstr "Bissection : une base de fusion doit être testée\n"
-#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375
-#: builtin/checkout.c:589 builtin/clone.c:732
-msgid "unable to write new index file"
-msgstr "impossible d'écrire le nouveau fichier d'index"
-
-#: merge-recursive.c:209
-msgid "(bad commit)\n"
-msgstr "(mauvais commit)\n"
-
-#: merge-recursive.c:231
+#: bisect.c:849
#, c-format
-msgid "addinfo_cache failed for path '%s'"
-msgstr "échec de addinfo_cache pour le chemin '%s'"
-
-#: merge-recursive.c:301
-msgid "error building trees"
-msgstr "erreur de construction des arbres"
+msgid "a %s revision is needed"
+msgstr "une révision %s est nécessaire"
-#: merge-recursive.c:720
+#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
#, c-format
-msgid "failed to create path '%s'%s"
-msgstr "impossible de créer le chemin '%s' %s"
+msgid "could not create file '%s'"
+msgstr "impossible de créer le fichier '%s'"
-#: merge-recursive.c:731
+#: bisect.c:917
#, 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:745 merge-recursive.c:764
-msgid ": perhaps a D/F conflict?"
-msgstr ": peut-être un conflit D/F ?"
+msgid "could not read file '%s'"
+msgstr "impossible de lire le fichier '%s'"
-#: merge-recursive.c:754
-#, c-format
-msgid "refusing to lose untracked file at '%s'"
-msgstr "refus de perdre le fichier non suivi '%s'"
+#: bisect.c:947
+msgid "reading bisect refs failed"
+msgstr "impossible de lire les références de bissection"
-#: merge-recursive.c:796
+#: bisect.c:967
#, c-format
-msgid "cannot read object %s '%s'"
-msgstr "impossible de lire l'objet %s '%s'"
+msgid "%s was both %s and %s\n"
+msgstr "%s était à la fois %s et %s\n"
-#: merge-recursive.c:798
+#: bisect.c:975
#, c-format
-msgid "blob expected for %s '%s'"
-msgstr "blob attendu pour %s '%s'"
+msgid ""
+"No testable commit found.\n"
+"Maybe you started with bad path parameters?\n"
+msgstr ""
+"Aucun commit testable n'a été trouvé\n"
+"Peut-être avez-vous démarré avec un mauvais paramètre de chemin ?\n"
-#: merge-recursive.c:822
+#: bisect.c:994
#, c-format
-msgid "failed to open '%s': %s"
-msgstr "échec à l'ouverture de '%s' : %s"
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] "(à peu près %d étape)"
+msgstr[1] "(à peu près %d étapes)"
-#: merge-recursive.c:833
+#. TRANSLATORS: the last %s will be replaced with
+#. "(roughly %d steps)" translation
+#: bisect.c:998
#, c-format
-msgid "failed to symlink '%s': %s"
-msgstr "échec à la création du lien symbolique '%s' : %s"
+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 cette %s\n"
+msgstr[1] "Bissection : %d révisions à tester après cette %s\n"
-#: merge-recursive.c:838
+#: branch.c:53
#, c-format
-msgid "do not know what to do with %06o %s '%s'"
-msgstr "ne sait pas traiter %06o %s '%s'"
-
-#: merge-recursive.c:978
-msgid "Failed to execute internal merge"
-msgstr "Échec à l'exécution de la fusion interne"
+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"
+"Après correction de la cause de l'erreur, vous pouvez essayer de corriger\n"
+"l'information de suivi distant en invoquant\n"
+"\"git branch --setup-upstream-to=%s%s%s\"."
-#: merge-recursive.c:982
+#: branch.c:67
#, c-format
-msgid "Unable to add %s to database"
-msgstr "Impossible d'ajouter %s à la base de données"
+msgid "Not setting branch %s as its own upstream."
+msgstr "La branche %s ne peut pas être sa propre branche amont."
-#: merge-recursive.c:1081 merge-recursive.c:1095
+#: branch.c:93
#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree."
+msgid "Branch %s set up to track remote branch %s from %s by rebasing."
msgstr ""
-"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
-"%s laissée dans l'arbre."
+"La branche %s est paramétrée pour suivre la branche distante %s de %s en "
+"rebasant."
-#: merge-recursive.c:1087 merge-recursive.c:1100
+#: branch.c:94
#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree at %s."
+msgid "Branch %s set up to track remote branch %s from %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:1143
-msgid "rename"
-msgstr "renommage"
-
-#: merge-recursive.c:1143
-msgid "renamed"
-msgstr "renommé"
-
-#: merge-recursive.c:1200
-#, 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"
+"La branche %s est paramétrée pour suivre la branche distante %s depuis %s."
-#: merge-recursive.c:1225
+#: branch.c:98
#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
+msgid "Branch %s set up to track local branch %s by rebasing."
msgstr ""
-"CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche "
-"\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s"
+"La branche %s est paramétrée pour suivre la branche locale %s en rebasant."
-#: merge-recursive.c:1230
-msgid " (left unresolved)"
-msgstr " (laissé non résolu)"
+#: branch.c:99
+#, 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."
-#: merge-recursive.c:1292
+#: branch.c:104
#, c-format
-msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
+msgid "Branch %s set up to track remote ref %s by rebasing."
msgstr ""
-"CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'-"
-">'%s' dans %s"
+"La branche %s est paramétrée pour suivre la référence distante %s en "
+"rebasant."
-#: merge-recursive.c:1325
+#: branch.c:105
#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
-msgstr "Renommage de %s en %s et de %s en %s à la place"
+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."
-#: merge-recursive.c:1531
+#: branch.c:109
#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
+msgid "Branch %s set up to track local ref %s by rebasing."
msgstr ""
-"CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s"
+"La branche %s est paramétrée pour suivre la référence locale %s en rebasant."
-#: merge-recursive.c:1546
+#: branch.c:110
#, c-format
-msgid "Adding merged %s"
-msgstr "Ajout de %s fusionné"
+msgid "Branch %s set up to track local ref %s."
+msgstr "La branche %s est paramétrée pour suivre la référence locale %s."
-#: merge-recursive.c:1553 merge-recursive.c:1766
+#: branch.c:119
+msgid "Unable to write upstream branch configuration"
+msgstr "Échec de l'écriture de la configuration de branche amont"
+
+#: branch.c:156
#, c-format
-msgid "Adding as %s instead"
-msgstr "Ajout plutôt comme %s"
+msgid "Not tracking: ambiguous information for ref %s"
+msgstr "Pas de suivi : information ambiguë pour la référence %s"
-#: merge-recursive.c:1610
+#: branch.c:185
#, c-format
-msgid "cannot read object %s"
-msgstr "impossible de lire l'objet %s"
+msgid "'%s' is not a valid branch name."
+msgstr "'%s' n'est pas un nom de branche valide."
-#: merge-recursive.c:1613
+#: branch.c:190
#, c-format
-msgid "object %s is not a blob"
-msgstr "l'objet %s n'est pas un blob"
+msgid "A branch named '%s' already exists."
+msgstr "Une branche nommée '%s' existe déjà."
-#: merge-recursive.c:1666
-msgid "modify"
-msgstr "modification"
+#: branch.c:198
+msgid "Cannot force update the current branch."
+msgstr "Impossible de forcer la mise à jour de la branche courante."
-#: merge-recursive.c:1666
-msgid "modified"
-msgstr "modifié"
+#: branch.c:218
+#, c-format
+msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgstr ""
+"Impossible de paramétrer le suivi de branche ; le point de départ '%s' n'est "
+"pas une branche."
-#: merge-recursive.c:1676
-msgid "content"
-msgstr "contenu"
+#: branch.c:220
+#, c-format
+msgid "the requested upstream branch '%s' does not exist"
+msgstr "la branche amont demandée '%s' n'existe pas"
-#: merge-recursive.c:1683
-msgid "add/add"
-msgstr "ajout/ajout"
+#: branch.c:222
+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"
+"Si vous comptez baser votre travail sur une branche\n"
+"amont qui existe déjà sur le serveur distant, vous pouvez\n"
+"lancer \"git fetch\" pour la récupérer.\n"
+"\n"
+"Si vous comptez pousser une nouvelle branche locale qui suivra\n"
+"sa jumelle distante, vous pouvez utiliser \"git push -u\"\n"
+"pour paramétrer le suivi distant en même temps que vous poussez."
-#: merge-recursive.c:1718
+#: branch.c:265
#, c-format
-msgid "Skipped %s (merged same as existing)"
-msgstr "%s sauté (fusion identique à l'existant)"
+msgid "Not a valid object name: '%s'."
+msgstr "Nom d'objet invalide : '%s'."
-#: merge-recursive.c:1732
+#: branch.c:285
#, c-format
-msgid "Auto-merging %s"
-msgstr "Fusion automatique de %s"
-
-#: merge-recursive.c:1736 git-submodule.sh:919
-msgid "submodule"
-msgstr "sous-module"
+msgid "Ambiguous object name: '%s'."
+msgstr "Nom d'objet ambigu : '%s'."
-#: merge-recursive.c:1737
+#: branch.c:290
#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "CONFLIT (%s) : Conflit de fusion dans %s"
+msgid "Not a valid branch point: '%s'."
+msgstr "Point d'embranchement invalide : '%s'."
-#: merge-recursive.c:1831
+#: branch.c:344
#, c-format
-msgid "Removing %s"
-msgstr "Suppression de %s"
-
-#: merge-recursive.c:1857
-msgid "file/directory"
-msgstr "fichier/répertoire"
-
-#: merge-recursive.c:1863
-msgid "directory/file"
-msgstr "répertoire/fichier"
+msgid "'%s' is already checked out at '%s'"
+msgstr "'%s' est déjà extrait dans '%s'"
-#: merge-recursive.c:1868
+#: branch.c:363
#, 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"
+msgid "HEAD of working tree %s is not updated"
+msgstr "la HEAD de la copie de travail %s n'est pas mise à jour"
-#: merge-recursive.c:1877
+#: bundle.c:34
#, c-format
-msgid "Adding %s"
-msgstr "Ajout de %s"
+msgid "'%s' does not look like a v2 bundle file"
+msgstr "'%s' ne semble pas être un fichier bundle v2"
-#: merge-recursive.c:1914
-msgid "Already up-to-date!"
-msgstr "Déjà à jour !"
+#: bundle.c:61
+#, c-format
+msgid "unrecognized header: %s%s (%d)"
+msgstr "en-tête non reconnu : %s%s (%d)"
-#: merge-recursive.c:1923
+#: bundle.c:87 sequencer.c:963 builtin/commit.c:777
#, c-format
-msgid "merging of trees %s and %s failed"
-msgstr "échec de fusion des arbres %s et %s"
+msgid "could not open '%s'"
+msgstr "impossible d'ouvrir '%s'"
-#: merge-recursive.c:2006
-msgid "Merging:"
-msgstr "Fusion :"
+#: bundle.c:139
+msgid "Repository lacks these prerequisite commits:"
+msgstr "Le dépôt ne dispose pas des commits prérequis suivants :"
-#: merge-recursive.c:2019
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374
+#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348
+#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
+#: builtin/merge.c:356 builtin/shortlog.c:170
+msgid "revision walk setup failed"
+msgstr "échec de la préparation du parcours des révisions"
+
+#: bundle.c:185
#, 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 "The bundle contains this ref:"
+msgid_plural "The bundle contains these %d refs:"
+msgstr[0] "Le colis contient cette référence :"
+msgstr[1] "Le colis contient ces %d références :"
-#: merge-recursive.c:2058
-msgid "merge returned no commit"
-msgstr "la fusion n'a pas retourné de commit"
+#: bundle.c:192
+msgid "The bundle records a complete history."
+msgstr "Le colis enregistre l'historique complet."
-#: merge-recursive.c:2121
+#: bundle.c:194
#, c-format
-msgid "Could not parse object '%s'"
-msgstr "Impossible d'analyser l'objet '%s'"
-
-#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
-msgid "Unable to write index."
-msgstr "Impossible d'écrire l'index."
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %d refs:"
+msgstr[0] "Le colis exige cette référence :"
+msgstr[1] "Le colis exige ces %d références :"
-#: notes-utils.c:41
-msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr "Impossible de valider un arbre de notes non initialisé/référencé"
+#: bundle.c:253
+msgid "Could not spawn pack-objects"
+msgstr "Impossible de créer des objets groupés"
-#: notes-utils.c:100
-#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "Mauvaise valeur de notes.rewriteMode : '%s'"
+#: bundle.c:264
+msgid "pack-objects died"
+msgstr "les objets groupés ont disparu"
-#: notes-utils.c:110
-#, 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/)"
+#: bundle.c:304
+msgid "rev-list died"
+msgstr "rev-list a disparu"
-#. TRANSLATORS: The first %s is the name of the
-#. environment variable, the second %s is its value
-#: notes-utils.c:137
+#: bundle.c:353
#, c-format
-msgid "Bad %s value: '%s'"
-msgstr "Mauvaise valeur de %s : '%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"
-#: object.c:242
+#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273
#, c-format
-msgid "unable to parse object: %s"
-msgstr "impossible d'analyser l'objet : %s"
+msgid "unrecognized argument: %s"
+msgstr "argument non reconnu : %s"
-#: parse-options.c:572
-msgid "..."
-msgstr "..."
+#: bundle.c:451
+msgid "Refusing to create empty bundle."
+msgstr "Refus de créer un colis vide."
-#: parse-options.c:590
+#: bundle.c:463
#, c-format
-msgid "usage: %s"
-msgstr "usage : %s"
+msgid "cannot create '%s'"
+msgstr "impossible de créer '%s'"
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation
-#: parse-options.c:594
-#, c-format
-msgid " or: %s"
-msgstr " ou : %s"
+#: bundle.c:491
+msgid "index-pack died"
+msgstr "l'index de groupe a disparu"
-#: parse-options.c:597
+#: color.c:290
#, c-format
-msgid " %s"
-msgstr " %s"
-
-#: parse-options.c:631
-msgid "-NUM"
-msgstr "-NUM"
+msgid "invalid color value: %.*s"
+msgstr "Valeur invalide de couleur : %.*s"
-#: parse-options-cb.c:108
+#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493
+#: builtin/am.c:2127
#, c-format
-msgid "malformed object name '%s'"
-msgstr "nom d'objet malformé '%s'"
+msgid "could not parse %s"
+msgstr "impossible d'analyser %s"
-#: path.c:798
+#: commit.c:42
#, c-format
-msgid "Could not make %s writable by group"
-msgstr "Impossible de rendre %s inscriptible pour le groupe"
-
-#: pathspec.c:133
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
-msgstr ""
-"les réglages de spécificateurs de chemin généraux 'glob' et 'noglob' sont "
-"incompatibles"
+msgid "%s %s is not a commit!"
+msgstr "%s %s n'est pas un commit !"
-#: pathspec.c:143
+#: commit.c:1514
msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
+"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 ""
-"le réglage global de spécificateur de chemin 'literal' est incompatible avec "
-"tous les autres réglages globaux de spécificateur de chemin"
+"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"
-#: pathspec.c:177
-msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr "paramètre invalide pour le spécificateur magique de chemin 'prefix'"
+#: compat/obstack.c:406 compat/obstack.c:408
+msgid "memory exhausted"
+msgstr "plus de mémoire"
-#: pathspec.c:183
+#: config.c:516
#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
-msgstr "La spécification magique de chemin '%.*s' est invalide dans '%s'"
+msgid "bad config line %d in blob %s"
+msgstr "ligne %d de config incorrecte dans le blob %s"
-#: pathspec.c:187
+#: config.c:520
#, c-format
-msgid "Missing ')' at the end of pathspec magic in '%s'"
-msgstr "')' manquante à la fin du spécificateur magique de chemin dans '%s'"
+msgid "bad config line %d in file %s"
+msgstr "ligne %d de config incorrecte dans le fichier %s"
-#: pathspec.c:205
+#: config.c:524
#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "Spécificateur magique '%c' non implémenté dans '%s'"
+msgid "bad config line %d in standard input"
+msgstr "ligne %d de config incorrecte dans l'entrée standard"
-#: pathspec.c:230
+#: config.c:528
#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
-msgstr "%s : 'literal' et 'glob' sont incompatibles"
+msgid "bad config line %d in submodule-blob %s"
+msgstr "ligne %d de config incorrecte dans le blob de sous-module %s"
-#: pathspec.c:241
+#: config.c:532
#, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s : '%s' est hors du dépôt"
+msgid "bad config line %d in command line %s"
+msgstr "ligne %d de config incorrecte dans la ligne de commande %s"
-#: pathspec.c:291
+#: config.c:536
#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "Le chemin '%s' est dans le sous-module '%.*s'"
+msgid "bad config line %d in %s"
+msgstr "ligne %d de config incorrecte dans %s"
-#: pathspec.c:353
-#, 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"
+#: config.c:655
+msgid "out of range"
+msgstr "hors plage"
+
+#: config.c:655
+msgid "invalid unit"
+msgstr "unité invalide"
-#: pathspec.c:433
+#: config.c:661
#, c-format
-msgid "pathspec '%s' is beyond a symbolic link"
-msgstr "le chemin '%s' est au-delà d'un lien symbolique"
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s"
-#: pathspec.c:442
-msgid ""
-"There is nothing to exclude from by :(exclude) patterns.\n"
-"Perhaps you forgot to add either ':/' or '.' ?"
+#: config.c:666
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
-"Il n'y a rien dont il faut exclure par des motifs :(exclure).\n"
-"Peut-être avez-vous oublié d'ajouter ':/' ou '.' ?"
-
-#: pretty.c:973
-msgid "unable to parse --pretty format"
-msgstr "impossible d'analyser le format --pretty"
-
-#: progress.c:235
-msgid "done"
-msgstr "fait"
+"valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob "
+"%s : %s"
-#: read-cache.c:1281
+#: config.c:669
#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
-"version d'index renseignée, mais la valeur est invalide.\n"
-"Utilisation de la version %i"
+"valeur numérique de configuration incorrecte '%s' pour '%s' dans le fichier "
+"%s : %s"
-#: read-cache.c:1291
+#: config.c:672
#, c-format
-msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
-"GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"
-"Utilisation de la version %i"
+"valeur numérique de configuration incorrecte '%s' pour '%s' dans l'entrée "
+"standard : %s"
-#: refs.c:551 builtin/merge.c:840
+#: config.c:675
#, c-format
-msgid "Could not open '%s' for writing"
-msgstr "Impossible d'ouvrir '%s' en écriture"
-
-#: refs/files-backend.c:2534
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "Impossible de supprimer la référence %s : %s"
+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"
-#: refs/files-backend.c:2537
+#: config.c:678
#, c-format
-msgid "could not delete references: %s"
-msgstr "impossible de supprimer les références : %s"
+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"
-#: refs/files-backend.c:2546
+#: config.c:681
#, c-format
-msgid "could not remove reference %s"
-msgstr "impossible de supprimer la référence %s"
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr ""
+"valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s"
-#: ref-filter.c:55
+#: config.c:768
#, c-format
-msgid "expected format: %%(color:<color>)"
-msgstr "format attendu : %%(color:<couleur>)"
+msgid "failed to expand user dir in: '%s'"
+msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'"
-#: ref-filter.c:57
+#: config.c:852 config.c:863
#, c-format
-msgid "unrecognized color: %%(color:%s)"
-msgstr "couleur non reconnue : %%(color:%s)"
+msgid "bad zlib compression level %d"
+msgstr "niveau de compression zlib incorrect %d"
-#: ref-filter.c:71
+#: config.c:978
#, c-format
-msgid "unrecognized format: %%(%s)"
-msgstr "format non reconnu %%(%s)"
+msgid "invalid mode for object creation: %s"
+msgstr "mode invalide pour la création d'objet : %s"
-#: ref-filter.c:77
-#, c-format
-msgid "%%(body) does not take arguments"
-msgstr "%%(body) n'accepte pas d'argument"
+#: config.c:1312
+msgid "unable to parse command-line config"
+msgstr "lecture de la configuration de ligne de commande impossible"
-#: ref-filter.c:84
-#, c-format
-msgid "%%(subject) does not take arguments"
-msgstr "%%(subject) n'accepte pas d'argument"
+#: config.c:1362
+msgid "unknown error occurred while reading the configuration files"
+msgstr "erreur inconnue pendant la lecture des fichiers de configuration"
-#: ref-filter.c:101
+#: config.c:1716
#, c-format
-msgid "positive value expected contents:lines=%s"
-msgstr "valeur positive attendue contents:lines=%s"
+msgid "unable to parse '%s' from command-line config"
+msgstr ""
+"impossible d'analyser '%s' depuis le configuration en ligne de commande"
-#: ref-filter.c:103
+#: config.c:1718
#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "argument %%(contents) non reconnu : %s"
+msgid "bad config variable '%s' in file '%s' at line %d"
+msgstr ""
+"variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d"
-#: ref-filter.c:113
+#: config.c:1777
#, c-format
-msgid "unrecognized %%(objectname) argument: %s"
-msgstr "argument %%(objectname) non reconnu : %s"
+msgid "%s has multiple values"
+msgstr "%s a des valeurs multiples"
-#: ref-filter.c:135
+#: config.c:2311
#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
-msgstr "format attendu : %%(align:<largeur>,<position>)"
+msgid "could not set '%s' to '%s'"
+msgstr "impossible de régler '%s' à '%s'"
-#: ref-filter.c:147
+#: config.c:2313
#, c-format
-msgid "unrecognized position:%s"
-msgstr "position non reconnue : %s"
+msgid "could not unset '%s'"
+msgstr "impossible de désinitialiser '%s'"
-#: ref-filter.c:151
-#, c-format
-msgid "unrecognized width:%s"
-msgstr "largeur non reconnue : %s"
+#: connect.c:49
+msgid "The remote end hung up upon initial contact"
+msgstr "L'hôte distant a fermé la connexion lors du contact initial"
-#: ref-filter.c:157
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "argument %%(align) non reconnu : %s"
+#: connect.c:51
+msgid ""
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
+msgstr ""
+"Impossilble 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."
-#: ref-filter.c:161
-#, c-format
-msgid "positive width expected with the %%(align) atom"
-msgstr "valeur positive attendue avec l'atome %%(align)"
+#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
+msgid "Checking connectivity"
+msgstr "Vérification de la connectivité"
-#: ref-filter.c:244
-#, c-format
-msgid "malformed field name: %.*s"
-msgstr "nom de champ malformé %.*s"
+#: connected.c:75
+msgid "Could not run 'git rev-list'"
+msgstr "Impossible de lancer 'git rev-list'"
-#: ref-filter.c:270
-#, c-format
-msgid "unknown field name: %.*s"
-msgstr "nom de champ inconnu : %.*s"
+#: connected.c:95
+msgid "failed write to rev-list"
+msgstr "impossible d'écrire dans la rev-list"
-#: ref-filter.c:372
-#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
-msgstr "format : atome %%(end) utilisé sans atome correspondant"
+#: connected.c:102
+msgid "failed to close rev-list's stdin"
+msgstr "impossible de fermer l'entrée standard du rev-list"
-#: ref-filter.c:424
+#: convert.c:201
#, c-format
-msgid "malformed format string %s"
-msgstr "Chaîne de formatage mal formée %s"
-
-#: ref-filter.c:878
-msgid ":strip= requires a positive integer argument"
-msgstr ":strip= requiert un argument entier positif"
+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."
-#: ref-filter.c:883
+#: convert.c:205
#, c-format
-msgid "ref '%s' does not have %ld components to :strip"
-msgstr "la réf '%s' n'a pas %ld composants à :strip"
+msgid "CRLF would be replaced by LF in %s."
+msgstr "Les CRLF seraient remplacés par des LF dans %s."
-#: ref-filter.c:1046
+#: convert.c:211
#, c-format
-msgid "unknown %.*s format %s"
-msgstr "format de %.*s inconnu %s"
+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."
-#: ref-filter.c:1066 ref-filter.c:1097
+#: convert.c:215
#, c-format
-msgid "missing object %s for %s"
-msgstr "objet manquant %s pour %s"
+msgid "LF would be replaced by CRLF in %s"
+msgstr "Les LF seraient remplacés par des CRLF dans %s"
-#: ref-filter.c:1069 ref-filter.c:1100
+#: date.c:97
+msgid "in the future"
+msgstr "dans le futur"
+
+#: date.c:103
#, c-format
-msgid "parse_object_buffer failed on %s for %s"
-msgstr "echec de parse_object_buffer sur %s pour %s"
+msgid "%lu second ago"
+msgid_plural "%lu seconds ago"
+msgstr[0] "il y a %lu seconde"
+msgstr[1] "il y a %lu secondes"
-#: ref-filter.c:1311
+#: date.c:110
#, c-format
-msgid "malformed object at '%s'"
-msgstr "objet malformé à '%s'"
+msgid "%lu minute ago"
+msgid_plural "%lu minutes ago"
+msgstr[0] "il y a %lu minute"
+msgstr[1] "il y a %lu minutes"
-#: ref-filter.c:1373
+#: date.c:117
#, c-format
-msgid "ignoring ref with broken name %s"
-msgstr "réf avec un nom cassé %s ignoré"
+msgid "%lu hour ago"
+msgid_plural "%lu hours ago"
+msgstr[0] "il y a %lu heure"
+msgstr[1] "il y a %lu heures"
-#: ref-filter.c:1378
+#: date.c:124
#, c-format
-msgid "ignoring broken ref %s"
-msgstr "réf cassé %s ignoré"
+msgid "%lu day ago"
+msgid_plural "%lu days ago"
+msgstr[0] "il y a %lu jour"
+msgstr[1] "il y a %lu jours"
-#: ref-filter.c:1651
+#: date.c:130
#, c-format
-msgid "format: %%(end) atom missing"
-msgstr "format: atome %%(end) manquant"
+msgid "%lu week ago"
+msgid_plural "%lu weeks ago"
+msgstr[0] "il y a %lu semaine"
+msgstr[1] "il y a %lu semaines"
-#: ref-filter.c:1705
+#: date.c:137
#, c-format
-msgid "malformed object name %s"
-msgstr "nom d'objet malformé %s"
+msgid "%lu month ago"
+msgid_plural "%lu months ago"
+msgstr[0] "il y a %lu mois"
+msgstr[1] "il y a %lu mois"
-#: remote.c:746
+#: date.c:148
#, c-format
-msgid "Cannot fetch both %s and %s to %s"
-msgstr "Impossible de récupérer à la fois %s et %s pour %s"
+msgid "%lu year"
+msgid_plural "%lu years"
+msgstr[0] "%lu an"
+msgstr[1] "%lu ans"
-#: remote.c:750
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c:151
#, c-format
-msgid "%s usually tracks %s, not %s"
-msgstr "%s suit habituellement %s, pas %s"
+msgid "%s, %lu month ago"
+msgid_plural "%s, %lu months ago"
+msgstr[0] "il y a %s et %lu mois"
+msgstr[1] "il y a %s et %lu mois"
-#: remote.c:754
+#: date.c:156 date.c:161
#, c-format
-msgid "%s tracks both %s and %s"
-msgstr "%s suit à la fois %s et %s"
+msgid "%lu year ago"
+msgid_plural "%lu years ago"
+msgstr[0] "il y a %lu an"
+msgstr[1] "il y a %lu ans"
-#: remote.c:762
-msgid "Internal error"
-msgstr "Erreur interne"
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "impossible de lire le fichier de commande '%s'"
-#: remote.c:1677 remote.c:1720
-msgid "HEAD does not point to a branch"
-msgstr "HEAD ne pointe pas sur une branche"
+#: diffcore-rename.c:536
+msgid "Performing inexact rename detection"
+msgstr "Détection de renommage inexact en cours"
-#: remote.c:1686
+#: diff.c:62
#, c-format
-msgid "no such branch: '%s'"
-msgstr "pas de branche '%s'"
+msgid "option '%s' requires a value"
+msgstr "le commutateur '%s' a besoin d'une valeur"
-#: remote.c:1689
+#: diff.c:124
#, c-format
-msgid "no upstream configured for branch '%s'"
-msgstr "aucune branche amont configurée pour la branche '%s'"
+msgid " Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr ""
+" Impossible d'analyser le pourcentage de modification de dirstat '%s'\n"
-#: remote.c:1695
+#: diff.c:129
#, 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"
+msgid " Unknown dirstat parameter '%s'\n"
+msgstr " Paramètre dirstat inconnu '%s'\n"
-#: remote.c:1710
+#: diff.c:283
#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
-"la destination de poussée '%s' sur le serveur distant '%s' n'a pas de "
-"branche locale de suivi"
+"Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'"
-#: remote.c:1725
+#: diff.c:346
#, c-format
-msgid "branch '%s' has no remote for pushing"
-msgstr "la branche '%s' n'a aucune branche distante de poussée"
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+"Erreurs dans la variable de configuration 'diff.dirstat' :\n"
+"%s"
-#: remote.c:1736
-#, 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:1749
-msgid "push has no destination (push.default is 'nothing')"
-msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')"
-
-#: remote.c:1771
-msgid "cannot resolve 'simple' push to a single destination"
-msgstr ""
-"impossible de résoudre une poussée 'simple' pour une destination unique"
-
-#: remote.c:2073
-#, 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:2077
-msgid " (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n"
-
-#: remote.c:2080
+#: diff.c:3087
#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
-msgstr "Votre branche est à jour avec '%s'.\n"
-
-#: remote.c:2084
-#, 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:2090
-msgid " (use \"git push\" to publish your local commits)\n"
-msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n"
+msgid "external diff died, stopping at %s"
+msgstr "l'application de diff externe a disparu, arrêt à %s"
-#: remote.c:2093
-#, 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"
+#: diff.c:3412
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs"
-#: remote.c:2101
-msgid " (use \"git pull\" to update your local branch)\n"
-msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n"
+#: diff.c:3502
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow a besoin d'une spécification de chemin unique"
-#: remote.c:2104
+#: diff.c:3665
#, 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:2114
-msgid " (use \"git pull\" to merge the remote branch into yours)\n"
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
msgstr ""
-" (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n"
-
-#: revision.c:2132
-msgid "your current branch appears to be broken"
-msgstr "votre branche actuelle semble cassée"
+"Impossible d'analyser le paramètre de l'option --dirstat/-X :\n"
+"%s"
-#: revision.c:2135
+#: diff.c:3679
#, c-format
-msgid "your current branch '%s' does not have any commits yet"
-msgstr "votre branche actuelle '%s' ne contient encore aucun commit"
+msgid "Failed to parse --submodule option parameter: '%s'"
+msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'"
-#: revision.c:2329
-msgid "--first-parent is incompatible with --bisect"
-msgstr "--first-parent est incompatible avec --bisect"
+#: diff.c:4700
+msgid "inexact rename detection was skipped due to too many files."
+msgstr ""
+"détection de renommage inexact annulée à cause d'un trop grand nombre de "
+"fichiers."
-#: run-command.c:92
-msgid "open /dev/null failed"
-msgstr "échec de l'ouverture de /dev/null"
+#: diff.c:4703
+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."
-#: run-command.c:94
+#: diff.c:4706
#, c-format
-msgid "dup2(%d,%d) failed"
-msgstr "échec de dup2(%d,%d)"
-
-#: send-pack.c:298
-msgid "failed to sign the push certificate"
-msgstr "impossible de signer le certificat de poussée"
-
-#: send-pack.c:411
-msgid "the receiving end does not support --signed push"
-msgstr "Le receveur ne gère pas les poussées avec --signed"
-
-#: send-pack.c:413
msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
+"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
-"pas d'envoi de certificat de poussée car le receveur ne gère pas les "
-"poussées avec --signed"
-
-#: send-pack.c:425
-msgid "the receiving end does not support --atomic push"
-msgstr "Le receveur ne gère pas les poussées avec --atomic"
+"vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le "
+"commande."
-#: send-pack.c:430
-msgid "the receiving end does not support push options"
-msgstr "Le receveur ne gère pas les options de poussées"
+#: dir.c:1866
+msgid "failed to get kernel name and information"
+msgstr "echec de l'obtention d'information de kernel"
-#: sequencer.c:174
-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>'"
+#: dir.c:1985
+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."
-#: sequencer.c:177
-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 ""
-"après résolution des conflits, marquez les chemins corrigés\n"
-"avec 'git add <chemins>' ou 'git rm <chemins>'\n"
-"puis validez le résultat avec 'git commit'"
+#: fetch-pack.c:213
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack : list courte attendue"
-#: sequencer.c:190 sequencer.c:841 sequencer.c:924
-#, c-format
-msgid "Could not write to %s"
-msgstr "Impossible d'écrire dans %s"
+#: fetch-pack.c:225
+msgid "git fetch-pack: expected ACK/NAK, got EOF"
+msgstr "git fetch-pack : ACK/NACK attendu, EOF reçu"
-#: sequencer.c:193 sequencer.c:843 sequencer.c:928
+#: fetch-pack.c:243
#, c-format
-msgid "Error wrapping up %s."
-msgstr "Erreur lors de l'emballage de %s."
-
-#: sequencer.c:208
-msgid "Your local changes would be overwritten by cherry-pick."
-msgstr "Vos modifications locales seraient écrasées par cherry-pick."
-
-#: sequencer.c:210
-msgid "Your local changes would be overwritten by revert."
-msgstr "Vos modifications locales seraient écrasées par revert."
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu"
-#: sequencer.c:213
-msgid "Commit your changes or stash them to proceed."
-msgstr "Validez vos modifications ou les remiser pour continuer."
+#: fetch-pack.c:295
+msgid "--stateless-rpc requires multi_ack_detailed"
+msgstr "--stateless-rpc nécessite multi_ack_detailed"
-#: sequencer.c:228
+#: fetch-pack.c:381
#, c-format
-msgid "%s: fast-forward"
-msgstr "%s : avance rapide"
+msgid "invalid shallow line: %s"
+msgstr "ligne de superficiel invalide : %s"
-#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:303
+#: fetch-pack.c:387
#, c-format
-msgid "%s: Unable to write new index file"
-msgstr "%s: Impossible d'écrire le nouveau fichier index"
-
-#: sequencer.c:321
-msgid "Could not resolve HEAD commit\n"
-msgstr "Impossible de résoudre le commit HEAD\n"
-
-#: sequencer.c:341
-msgid "Unable to update cache tree\n"
-msgstr "Impossible de mettre à jour l'arbre de cache\n"
+msgid "invalid unshallow line: %s"
+msgstr "ligne de fin de superficiel invalide : %s"
-#: sequencer.c:393
+#: fetch-pack.c:389
#, c-format
-msgid "Could not parse commit %s\n"
-msgstr "Impossible d'analyser le commit %s\n"
+msgid "object not found: %s"
+msgstr "objet non trouvé : %s"
-#: sequencer.c:398
+#: fetch-pack.c:392
#, c-format
-msgid "Could not parse parent commit %s\n"
-msgstr "Impossible d'analyser le commit parent %s\n"
+msgid "error in object: %s"
+msgstr "Erreur dans l'objet : %s"
-#: sequencer.c:463
-msgid "Your index file is unmerged."
-msgstr "Votre fichier d'index n'est pas fusionné."
-
-#: sequencer.c:482
+#: fetch-pack.c:394
#, 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."
+msgid "no shallow found: %s"
+msgstr "Pas de superficiel trouvé : %s"
-#: sequencer.c:490
+#: fetch-pack.c:397
#, c-format
-msgid "Commit %s does not have parent %d"
-msgstr "Le commit %s n'a pas le parent %d"
+msgid "expected shallow/unshallow, got %s"
+msgstr "superficiel/non superficiel attendu, %s trouvé"
-#: sequencer.c:494
+#: fetch-pack.c:436
#, c-format
-msgid "Mainline was specified but commit %s is not a merge."
-msgstr ""
-"Une branche principale a été spécifiée mais le commit %s n'est pas une "
-"fusion."
+msgid "got %s %d %s"
+msgstr "réponse %s %d %s"
-#. TRANSLATORS: The first %s will be "revert" or
-#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:507
+#: fetch-pack.c:450
#, c-format
-msgid "%s: cannot parse parent commit %s"
-msgstr "%s : impossible d'analyser le commit parent %s"
+msgid "invalid commit %s"
+msgstr "commit invalide %s"
+
+#: fetch-pack.c:483
+msgid "giving up"
+msgstr "abandon"
+
+#: fetch-pack.c:493 progress.c:235
+msgid "done"
+msgstr "fait"
-#: sequencer.c:511
+#: fetch-pack.c:505
#, c-format
-msgid "Cannot get commit message for %s"
-msgstr "Impossible d'obtenir un message de validation pour %s"
+msgid "got %s (%d) %s"
+msgstr "%s trouvé (%d) %s"
-#: sequencer.c:597
+#: fetch-pack.c:551
#, c-format
-msgid "could not revert %s... %s"
-msgstr "impossible d'annuler %s... %s"
+msgid "Marking %s as complete"
+msgstr "Marquage de %s comme terminé"
-#: sequencer.c:598
+#: fetch-pack.c:697
#, c-format
-msgid "could not apply %s... %s"
-msgstr "impossible d'appliquer %s... %s"
+msgid "already have %s (%s)"
+msgstr "%s déjà possédé (%s)"
-#: sequencer.c:633
-msgid "empty commit set passed"
-msgstr "l'ensemble de commits spécifié est vide"
+#: fetch-pack.c:735
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral"
+
+#: fetch-pack.c:743
+msgid "protocol error: bad pack header"
+msgstr "erreur de protocole : mauvais entête de paquet"
-#: sequencer.c:641
+#: fetch-pack.c:799
#, c-format
-msgid "git %s: failed to read the index"
-msgstr "git %s : échec à la lecture de l'index"
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack : impossible de dupliquer %s"
-#: sequencer.c:645
+#: fetch-pack.c:815
#, c-format
-msgid "git %s: failed to refresh the index"
-msgstr "git %s : échec du rafraîchissement de l'index"
+msgid "%s failed"
+msgstr "échec de %s"
-#: sequencer.c:705
-msgid "Cannot revert during another revert."
-msgstr "Impossible d'annuler un commit pendant l'annulation d'un commit."
+#: fetch-pack.c:817
+msgid "error in sideband demultiplexer"
+msgstr "erreur dans le démultiplexer latéral"
-#: sequencer.c:706
-msgid "Cannot revert during a cherry-pick."
-msgstr "Impossible d'annuler un commit pendant un picorage."
+#: fetch-pack.c:844
+msgid "Server does not support shallow clients"
+msgstr "Le serveur ne supporte les clients superficiels"
-#: sequencer.c:709
-msgid "Cannot cherry-pick during a revert."
-msgstr "Impossible de picorer pendant l'annulation d'un commit."
+#: fetch-pack.c:848
+msgid "Server supports multi_ack_detailed"
+msgstr "Le serveur supporte multi_ack_detailed"
-#: sequencer.c:710
-msgid "Cannot cherry-pick during another cherry-pick."
-msgstr "Impossible de picorer pendant un autre picorage."
+#: fetch-pack.c:851
+msgid "Server supports no-done"
+msgstr "Le serveur support no-done"
-#: sequencer.c:732
-#, c-format
-msgid "Could not parse line %d."
-msgstr "Impossible d'analyser la ligne %d."
+#: fetch-pack.c:857
+msgid "Server supports multi_ack"
+msgstr "Le serveur supporte multi_ack"
-#: sequencer.c:737
-msgid "No commits parsed."
-msgstr "Aucun commit analysé."
+#: fetch-pack.c:861
+msgid "Server supports side-band-64k"
+msgstr "Le serveur supporte side-band-64k"
-#: sequencer.c:749
-#, c-format
-msgid "Could not open %s"
-msgstr "Impossible d'ouvrir %s"
+#: fetch-pack.c:865
+msgid "Server supports side-band"
+msgstr "Le serveru supporte side-band"
-#: sequencer.c:753
-#, c-format
-msgid "Could not read %s."
-msgstr "Impossible de lire %s."
+#: fetch-pack.c:869
+msgid "Server supports allow-tip-sha1-in-want"
+msgstr "Le serveur supporte allow-tip-sha1-in-want"
-#: sequencer.c:760
-#, c-format
-msgid "Unusable instruction sheet: %s"
-msgstr "Feuille d'instruction inutilisable : %s"
+#: fetch-pack.c:873
+msgid "Server supports allow-reachable-sha1-in-want"
+msgstr "Le serveur supporte allow-reachable-sha1-in-want"
-#: sequencer.c:790
-#, c-format
-msgid "Invalid key: %s"
-msgstr "Clé invalide: %s"
+#: fetch-pack.c:883
+msgid "Server supports ofs-delta"
+msgstr "Le serveur support ofs-delta"
-#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52
+#: fetch-pack.c:890
#, c-format
-msgid "Invalid value for %s: %s"
-msgstr "Valeur invalide pour %s : %s"
+msgid "Server version is %.*s"
+msgstr "La version du serveur est %.*s"
-#: sequencer.c:803
-#, c-format
-msgid "Malformed options sheet: %s"
-msgstr "Feuille d'options malformée : %s"
+#: fetch-pack.c:896
+msgid "Server does not support --shallow-since"
+msgstr "Le receveur ne gère pas --shallow-since"
-#: sequencer.c:822
-msgid "a cherry-pick or revert is already in progress"
-msgstr "un picorage ou un retour est déjà en cours"
+#: fetch-pack.c:900
+msgid "Server does not support --shallow-exclude"
+msgstr "Le receveur ne gère pas --shallow-exclude"
-#: sequencer.c:823
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
-msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\""
+#: fetch-pack.c:902
+msgid "Server does not support --deepen"
+msgstr "Le receveur ne gère pas --deepen"
-#: sequencer.c:827
-#, c-format
-msgid "Could not create sequencer directory %s"
-msgstr "Impossible de créer le répertoire de séquenceur %s"
+#: fetch-pack.c:913
+msgid "no common commits"
+msgstr "pas de commit commun"
-#: sequencer.c:862 sequencer.c:998
-msgid "no cherry-pick or revert in progress"
-msgstr "aucun picorage ou retour en cours"
+#: fetch-pack.c:925
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack : échec de le récupération."
-#: sequencer.c:864
-msgid "cannot resolve HEAD"
-msgstr "impossible de résoudre HEAD"
+#: fetch-pack.c:1087
+msgid "no matching remote head"
+msgstr "pas de HEAD distante correspondante"
-#: sequencer.c:866 sequencer.c:900
-msgid "cannot abort from a branch yet to be born"
-msgstr "impossible d'abandonner depuis une branche non encore créée"
+#: gpg-interface.c:185
+msgid "gpg failed to sign the data"
+msgstr "gpg n'a pas pu signer les données"
-#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970
-#, c-format
-msgid "cannot open %s"
-msgstr "impossible d'ouvrir %s"
+#: gpg-interface.c:215
+msgid "could not create temporary file"
+msgstr "impossible de créer un fichier temporaire"
-#: sequencer.c:888
+#: gpg-interface.c:217
#, c-format
-msgid "cannot read %s: %s"
-msgstr "impossible de lire %s : %s"
-
-#: sequencer.c:889
-msgid "unexpected end of file"
-msgstr "fin de fichier inattendue"
+msgid "failed writing detached signature to '%s'"
+msgstr "impossible d'écrire la signature détachée dans '%s'"
-#: sequencer.c:895
+#: grep.c:1782
#, 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 "'%s': unable to read %s"
+msgstr "'%s' : lecture de %s impossible"
-#: sequencer.c:921
+#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155
#, c-format
-msgid "Could not format %s."
-msgstr "Impossible de formater %s."
+msgid "failed to stat '%s'"
+msgstr "échec du stat de '%s'"
-#: sequencer.c:1066
+#: grep.c:1810
#, c-format
-msgid "%s: can't cherry-pick a %s"
-msgstr "%s : impossible de picorer un %s"
+msgid "'%s': short read"
+msgstr "'%s' : lecture tronquée"
-#: sequencer.c:1069
+#: help.c:203
#, c-format
-msgid "%s: bad revision"
-msgstr "%s : mauvaise révision"
+msgid "available git commands in '%s'"
+msgstr "commandes git disponibles dans '%s'"
-#: sequencer.c:1102
-msgid "Can't revert as initial commit"
-msgstr "Impossible d'annuler en tant que commit initial"
+#: help.c:210
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "commandes git disponibles depuis un autre endroit de votre $PATH"
-#: setup.c:160
-#, 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."
+#: help.c:241
+msgid "These are common Git commands used in various situations:"
+msgstr "Ci-dessous les commandes Git habituelles dans diverses situations :"
-#: setup.c:173
+#: help.c:306
#, 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>...]'"
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
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>...]'"
+"'%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 ?"
-#: setup.c:223
+#: help.c:361
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "Ahem. Votre système n'indique aucune commande Git."
+
+#: help.c:383
#, c-format
msgid ""
-"ambiguous argument '%s': both revision and filename\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
+"WARNING: You called a Git command named '%s', which does not exist.\n"
+"Continuing under the assumption that you meant '%s'"
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>...]'"
+"ATTENTION : vous avez invoqué une commande Git nommée '%s' qui n'existe "
+"pas.\n"
+"Continuons en supposant que vous avez voulu dire '%s'"
-#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419
+#: help.c:388
#, c-format
-msgid "failed to read %s"
-msgstr "échec de la lecture de %s"
+msgid "in %0.1f seconds automatically..."
+msgstr "dans %0.1f secondes automatiquement..."
-#: setup.c:468
+#: help.c:395
#, c-format
-msgid "Expected git repo version <= %d, found %d"
-msgstr "Version attendue du dépôt git <= %d, %d trouvée"
-
-#: setup.c:476
-msgid "unknown repository extensions found:"
-msgstr "extensions de dépôt inconnues trouvées :"
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git : '%s' n'est pas une commande git. Voir 'git --help'."
-#: setup.c:762
-#, 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:764 setup.c:915 builtin/index-pack.c:1641
-msgid "Cannot come back to cwd"
-msgstr "Impossible de revenir au répertoire de travail courant"
-
-#: setup.c:845
-msgid "Unable to read current working directory"
-msgstr "Impossible d'accéder au répertoire de travail courant"
-
-#: setup.c:920
-#, 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 activé)."
-
-#: setup.c:927
-#, c-format
-msgid "Cannot change to '%s/..'"
-msgstr "Impossible de se déplacer vers le répertoire '%s/..'"
-
-#: setup.c:989
-#, c-format
+#: help.c:399 help.c:465
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."
-
-#: sha1_file.c:1046
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"
-
-#: sha1_file.c:2434
-#, 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 ?)"
+"\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à ?"
-#: sha1_file.c:2438
+#: help.c:461
#, 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é ?)"
+msgid "%s: %s - %s"
+msgstr "%s: %s - %s"
-#: sha1_name.c:462
+#: ident.c:334
msgid ""
-"Git normally never creates a ref that ends with 40 hex characters\n"
-"because it will be ignored when you just specify 40-hex. These refs\n"
-"may be created by mistake. For example,\n"
"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
+"*** Please tell me who you are.\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éé normalement jamais de référence qui se termine par 40 caractères "
-"hexa\n"
-"car elle serait ignorée si vous spécifiiez 40-hexa. Ces références\n"
-"peuvent être créées par erreur. Par exemple,\n"
+"Run\n"
"\n"
-" git checkout -b $br $(git rev-parse ...)\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"
-"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\""
-
-#: submodule.c:64 submodule.c:98
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
-"Modification impossible de .gitmodules non fusionné, résolvez les conflits "
-"d'abord"
+"\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"
-#: submodule.c:68 submodule.c:102
+#: lockfile.c:152
#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
-msgstr "Impossible de trouver une section où path=%s dans .gitmodules"
+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'echec persiste,\n"
+"un processus git peut avoir planté :\n"
+"supprimez le fichier manuellement pour poursuivre."
-#: submodule.c:76
+#: lockfile.c:160
#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "Impossible de mettre à jour l'élément %s de .gitmodules"
+msgid "Unable to create '%s.lock': %s"
+msgstr "Impossible de créer '%s.lock' : %s"
-# ici %s est un chemin
-#: submodule.c:109
-#, c-format
-msgid "Could not remove .gitmodules entry for %s"
-msgstr "Impossible de supprimer l'élément de .gitmodules pour %s"
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "impossible de lire le cache"
-#: submodule.c:120
-msgid "staging updated .gitmodules failed"
-msgstr "échec de la mise en index du .gitmodules mis à jour"
+#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374
+#: builtin/checkout.c:588 builtin/clone.c:731
+msgid "unable to write new index file"
+msgstr "impossible d'écrire le nouveau fichier d'index"
-#: submodule.c:177
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs"
+#: merge-recursive.c:209
+msgid "(bad commit)\n"
+msgstr "(mauvais commit)\n"
-#: submodule-config.c:358
+#: merge-recursive.c:231
#, c-format
-msgid "invalid value for %s"
-msgstr "Valeur invalide pour %s"
+msgid "addinfo_cache failed for path '%s'"
+msgstr "échec de addinfo_cache pour le chemin '%s'"
-#: trailer.c:237
-#, c-format
-msgid "running trailer command '%s' failed"
-msgstr "échec de la commande trailer '%s'"
+#: merge-recursive.c:301
+msgid "error building trees"
+msgstr "erreur de construction des arbres"
-#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558
-#: trailer.c:562
+#: merge-recursive.c:720
#, c-format
-msgid "unknown value '%s' for key '%s'"
-msgstr "valeur inconnue '%s' pour la clé '%s'"
+msgid "failed to create path '%s'%s"
+msgstr "impossible de créer le chemin '%s' %s"
-#: trailer.c:544 trailer.c:549 builtin/remote.c:289
+#: merge-recursive.c:731
#, c-format
-msgid "more than one %s"
-msgstr "plus d'un %s"
+msgid "Removing %s to make room for subdirectory\n"
+msgstr "Suppression de %s pour faire de la place pour le sous-répertoire\n"
-#: trailer.c:582
-#, c-format
-msgid "empty trailer token in trailer '%.*s'"
-msgstr "symbole vide dans la ligne de fin '%.*s'"
+#: merge-recursive.c:745 merge-recursive.c:764
+msgid ": perhaps a D/F conflict?"
+msgstr ": peut-être un conflit D/F ?"
-#: trailer.c:702
+#: merge-recursive.c:754
#, c-format
-msgid "could not read input file '%s'"
-msgstr "impossible de lire le fichier d'entrée '%s'"
-
-#: trailer.c:705
-msgid "could not read from stdin"
-msgstr "Impossible de lire depuis l'entrée standard"
+msgid "refusing to lose untracked file at '%s'"
+msgstr "refus de perdre le fichier non suivi '%s'"
-#: trailer.c:857 builtin/am.c:42
+#: merge-recursive.c:796 builtin/cat-file.c:34
#, c-format
-msgid "could not stat %s"
-msgstr "stat impossible de %s"
+msgid "cannot read object %s '%s'"
+msgstr "impossible de lire l'objet %s '%s'"
-#: trailer.c:859
+#: merge-recursive.c:798
#, c-format
-msgid "file %s is not a regular file"
-msgstr "%s n'est pas un fichier régulier"
+msgid "blob expected for %s '%s'"
+msgstr "blob attendu pour %s '%s'"
-#: trailer.c:861
+#: merge-recursive.c:822
#, c-format
-msgid "file %s is not writable by user"
-msgstr "le fichier %s n'est pas inscriptible par l'utilisateur"
-
-#: trailer.c:873
-msgid "could not open temporary file"
-msgstr "impossible de créer un fichier temporaire"
+msgid "failed to open '%s': %s"
+msgstr "échec à l'ouverture de '%s' : %s"
-#: trailer.c:912
+#: merge-recursive.c:833
#, c-format
-msgid "could not rename temporary file to %s"
-msgstr "impossible de renommer un fichier temporaire en %s"
+msgid "failed to symlink '%s': %s"
+msgstr "échec à la création du lien symbolique '%s' : %s"
-#: transport.c:62
+#: merge-recursive.c:838
#, 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"
+msgid "do not know what to do with %06o %s '%s'"
+msgstr "ne sait pas traiter %06o %s '%s'"
-#: transport.c:151
+#: merge-recursive.c:978
+msgid "Failed to execute internal merge"
+msgstr "Échec à l'exécution de la fusion interne"
+
+#: merge-recursive.c:982
#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "transport : option de profondeur invalide '%s'"
+msgid "Unable to add %s to database"
+msgstr "Impossible d'ajouter %s à la base de données"
-#: transport.c:771
+#: merge-recursive.c:1081 merge-recursive.c:1095
#, c-format
msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
msgstr ""
-"Les chemins suivant de sous-module contiennent des modifications\n"
-"qui ne peuvent être trouvées sur aucun distant :\n"
+"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
+"%s laissée dans l'arbre."
-#: transport.c:775
+#: merge-recursive.c:1087 merge-recursive.c:1100
#, 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"
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
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"
+"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
+"%s laissée dans l'arbre dans le fichier %s."
-#: transport.c:783
-msgid "Aborting."
-msgstr "Abandon."
+#: merge-recursive.c:1143
+msgid "rename"
+msgstr "renommage"
-#: transport-helper.c:1041
-#, c-format
-msgid "Could not read ref %s"
-msgstr "impossible de lire la réf %s"
+#: merge-recursive.c:1143
+msgid "renamed"
+msgstr "renommé"
-#: unpack-trees.c:64
+#: merge-recursive.c:1200
#, 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."
+msgid "%s is a directory in %s adding as %s instead"
+msgstr "%s est un répertoire dans %s ajouté plutôt comme %s"
-#: unpack-trees.c:66
+#: merge-recursive.c:1225
#, c-format
msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
msgstr ""
-"Vos modifications locales aux fichiers suivants seraient écrasées par "
-"l'extraction :\n"
-"%%s"
+"CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche "
+"\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s"
-#: unpack-trees.c:69
-#, 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."
+#: merge-recursive.c:1230
+msgid " (left unresolved)"
+msgstr " (laissé non résolu)"
-#: unpack-trees.c:71
+#: merge-recursive.c:1292
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
+msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-"Vos modifications locales aux fichiers suivants seraient écrasées par la "
-"fusion :\n"
-"%%s"
+"CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'-"
+">'%s' dans %s"
-#: unpack-trees.c:74
+#: merge-recursive.c:1325
#, 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."
+msgid "Renaming %s to %s and %s to %s instead"
+msgstr "Renommage de %s en %s et de %s en %s à la place"
-#: unpack-trees.c:76
+#: merge-recursive.c:1531
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
-"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
-"%%s"
+"CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s"
-#: unpack-trees.c:81
+#: merge-recursive.c:1546
#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in it:\n"
-"%s"
-msgstr ""
-"La mise à jour des répertoires suivants effacerait les fichiers non suivis "
-"contenus :\n"
-"%s"
+msgid "Adding merged %s"
+msgstr "Ajout de %s fusionné"
-#: unpack-trees.c:85
+#: merge-recursive.c:1553 merge-recursive.c:1766
#, 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."
+msgid "Adding as %s instead"
+msgstr "Ajout plutôt comme %s"
-#: unpack-trees.c:87
+#: merge-recursive.c:1610
#, 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"
+msgid "cannot read object %s"
+msgstr "impossible de lire l'objet %s"
-#: unpack-trees.c:90
+#: merge-recursive.c:1613
#, 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."
+msgid "object %s is not a blob"
+msgstr "l'objet %s n'est pas un blob"
-#: unpack-trees.c:92
-#, 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"
+#: merge-recursive.c:1666
+msgid "modify"
+msgstr "modification"
-#: unpack-trees.c:95
+#: merge-recursive.c:1666
+msgid "modified"
+msgstr "modifié"
+
+#: merge-recursive.c:1676
+msgid "content"
+msgstr "contenu"
+
+#: merge-recursive.c:1683
+msgid "add/add"
+msgstr "ajout/ajout"
+
+#: merge-recursive.c:1718
#, 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."
+msgid "Skipped %s (merged same as existing)"
+msgstr "%s sauté (fusion identique à l'existant)"
-#: unpack-trees.c:97
+#: merge-recursive.c:1732
#, 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"
+msgid "Auto-merging %s"
+msgstr "Fusion automatique de %s"
-#: unpack-trees.c:102
+#: merge-recursive.c:1736 git-submodule.sh:924
+msgid "submodule"
+msgstr "sous-module"
+
+#: merge-recursive.c:1737
#, 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."
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "CONFLIT (%s) : Conflit de fusion dans %s"
-#: unpack-trees.c:104
+#: merge-recursive.c:1831
#, 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"
+msgid "Removing %s"
+msgstr "Suppression de %s"
-#: unpack-trees.c:107
+#: merge-recursive.c:1857
+msgid "file/directory"
+msgstr "fichier/répertoire"
+
+#: merge-recursive.c:1863
+msgid "directory/file"
+msgstr "répertoire/fichier"
+
+#: merge-recursive.c:1868
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you merge."
+msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
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."
+"CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s"
-#: unpack-trees.c:109
+#: merge-recursive.c:1877
#, 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"
+msgid "Adding %s"
+msgstr "Ajout de %s"
-#: unpack-trees.c:112
+#: merge-recursive.c:1914
+msgid "Already up-to-date!"
+msgstr "Déjà à jour !"
+
+#: merge-recursive.c:1923
#, 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."
+msgid "merging of trees %s and %s failed"
+msgstr "échec de fusion des arbres %s et %s"
-#: unpack-trees.c:114
+#: merge-recursive.c:2006
+msgid "Merging:"
+msgstr "Fusion :"
+
+#: merge-recursive.c:2019
#, 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"
+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 :"
-#: unpack-trees.c:121
+#: merge-recursive.c:2058
+msgid "merge returned no commit"
+msgstr "la fusion n'a pas retourné de commit"
+
+#: merge-recursive.c:2121
#, c-format
-msgid "Entry '%s' overlaps with '%s'. Cannot bind."
-msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible."
+msgid "Could not parse object '%s'"
+msgstr "Impossible d'analyser l'objet '%s'"
-#: unpack-trees.c:124
+#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
+msgid "Unable to write index."
+msgstr "Impossible d'écrire l'index."
+
+#: notes-merge.c:273
#, c-format
msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
-"%s"
+"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 ""
-"Mise à jour d'extraction creuse impossible : les entrées suivantes ne sont "
-"pas à jour :\n"
-"%s"
+"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."
-#: unpack-trees.c:126
+#: notes-merge.c:280
#, c-format
-msgid ""
-"The following Working tree files would be overwritten by sparse checkout "
-"update:\n"
-"%s"
-msgstr ""
-"Les fichiers suivants de la copie de travail seraient écrasés par la mise à "
-"jour par extraction creuse :\n"
-"%s"
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "Vous n'avez pas terminé votre fusion de notes (%s existe)."
-#: unpack-trees.c:128
-#, c-format
-msgid ""
-"The following Working tree files would be removed by sparse checkout "
-"update:\n"
-"%s"
-msgstr ""
-"Les fichiers suivants de la copie de travail seraient supprimés par la mise "
-"à jour par extraction creuse :\n"
-"%s"
+#: notes-utils.c:41
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr "Impossible de valider un arbre de notes non initialisé/référencé"
-#: unpack-trees.c:205
+#: notes-utils.c:100
#, c-format
-msgid "Aborting\n"
-msgstr "Abandon\n"
-
-#: unpack-trees.c:237
-msgid "Checking out files"
-msgstr "Extraction des fichiers"
-
-#: urlmatch.c:120
-msgid "invalid URL scheme name or missing '://' suffix"
-msgstr "nom de schéma d'URL invalide ou suffixe '://' manquant"
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "Mauvaise valeur de notes.rewriteMode : '%s'"
-#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#: notes-utils.c:110
#, c-format
-msgid "invalid %XX escape sequence"
-msgstr "séquence d'échappement %XX invalide"
-
-#: urlmatch.c:172
-msgid "missing host and scheme is not 'file:'"
-msgstr "hôte manquant et le schéma n'est pas 'file:'"
-
-#: urlmatch.c:189
-msgid "a 'file:' URL may not have a port number"
-msgstr "une URL 'file:' ne peut pas contenir de numéro de port"
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)"
-#: urlmatch.c:199
-msgid "invalid characters in host name"
-msgstr "caractères invalides dans le nom d'hôte"
+#. TRANSLATORS: The first %s is the name of the
+#. environment variable, the second %s is its value
+#: notes-utils.c:137
+#, c-format
+msgid "Bad %s value: '%s'"
+msgstr "Mauvaise valeur de %s : '%s'"
-#: urlmatch.c:244 urlmatch.c:255
-msgid "invalid port number"
-msgstr "numéro de port invalide"
+#: object.c:242
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "impossible d'analyser l'objet : %s"
-#: urlmatch.c:322
-msgid "invalid '..' path segment"
-msgstr "segment de chemin '..' invalide"
+#: parse-options.c:572
+msgid "..."
+msgstr "..."
-#: worktree.c:282
+#: parse-options.c:590
#, c-format
-msgid "failed to read '%s'"
-msgstr "échec de la lecture de '%s'"
+msgid "usage: %s"
+msgstr "usage : %s"
-#: wrapper.c:222 wrapper.c:392
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation
+#: parse-options.c:594
#, c-format
-msgid "could not open '%s' for reading and writing"
-msgstr "impossible d'ouvrir '%s' en lecture/écriture"
+msgid " or: %s"
+msgstr " ou : %s"
-#: wrapper.c:224 wrapper.c:394 builtin/am.c:778
+#: parse-options.c:597
#, c-format
-msgid "could not open '%s' for writing"
-msgstr "impossible d'ouvrir '%s' en écriture"
+msgid " %s"
+msgstr " %s"
+
+#: parse-options.c:631
+msgid "-NUM"
+msgstr "-NUM"
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771
-#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029
-#: builtin/pull.c:407
+#: parse-options-cb.c:108
#, c-format
-msgid "could not open '%s' for reading"
-msgstr "impossible d'ouvrir '%s' en lecture"
+msgid "malformed object name '%s'"
+msgstr "nom d'objet malformé '%s'"
-#: wrapper.c:605 wrapper.c:626
+#: path.c:826
#, c-format
-msgid "unable to access '%s'"
-msgstr "impossible d'accéder à '%s'"
+msgid "Could not make %s writable by group"
+msgstr "Impossible de rendre %s inscriptible pour le groupe"
-#: wrapper.c:634
-msgid "unable to get current working directory"
-msgstr "impossible d'accéder au répertoire de travail courant"
+#: pathspec.c:133
+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"
-#: wrapper.c:658
+#: pathspec.c:143
+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:177
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "paramètre invalide pour le spécificateur magique de chemin 'prefix'"
+
+#: pathspec.c:183
#, c-format
-msgid "could not write to %s"
-msgstr "Impossible d'écrire dans %s"
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "La spécification magique de chemin '%.*s' est invalide dans '%s'"
-#: wrapper.c:660
+#: pathspec.c:187
#, c-format
-msgid "could not close %s"
-msgstr "impossible de fermer %s"
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "')' manquante à la fin du spécificateur magique de chemin dans '%s'"
-#: wt-status.c:150
-msgid "Unmerged paths:"
-msgstr "Chemins non fusionnés :"
+#: pathspec.c:205
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "Spécificateur magique '%c' non implémenté dans '%s'"
-#: wt-status.c:177 wt-status.c:204
+#: pathspec.c:230
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr " (utilisez \"git reset %s <fichier>...\" pour désindexer)"
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s : 'literal' et 'glob' sont incompatibles"
-#: wt-status.c:179 wt-status.c:206
-msgid " (use \"git rm --cached <file>...\" to unstage)"
-msgstr " (utilisez \"git rm --cached <fichier>...\" pour désindexer)"
+#: pathspec.c:241
+#, c-format
+msgid "%s: '%s' is outside repository"
+msgstr "%s : '%s' est hors du dépôt"
-#: wt-status.c:183
-msgid " (use \"git add <file>...\" to mark resolution)"
-msgstr " (utilisez \"git add <fichier>...\" pour marquer comme résolu)"
+#: pathspec.c:291
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "Le chemin '%s' est dans le sous-module '%.*s'"
-#: wt-status.c:185 wt-status.c:189
-msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+#: pathspec.c:353
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
-" (utilisez \"git add/rm <fichier>...\" si nécessaire pour marquer comme "
-"résolu)"
-
-#: wt-status.c:187
-msgid " (use \"git rm <file>...\" to mark resolution)"
-msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)"
+"%s : le spécificateur magique de chemin n'est pas supporté par cette "
+"commande : %s"
-#: wt-status.c:198 wt-status.c:882
-msgid "Changes to be committed:"
-msgstr "Modifications qui seront validées :"
+#: pathspec.c:408
+msgid ""
+"empty strings as pathspecs will be made invalid in upcoming releases. please "
+"use . instead if you meant to match all paths"
+msgstr ""
+"les chaines de caractères vides comme spécificateurs de chemin seront "
+"invalides dans les prochaines versions. Veuillez utiliser . à la place pour "
+"correspondre à tous le chemins"
-#: wt-status.c:216 wt-status.c:891
-msgid "Changes not staged for commit:"
-msgstr "Modifications qui ne seront pas validées :"
+#: pathspec.c:440
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "le chemin '%s' est au-delà d'un lien symbolique"
-#: wt-status.c:220
-msgid " (use \"git add <file>...\" to update what will be committed)"
+#: pathspec.c:449
+msgid ""
+"There is nothing to exclude from by :(exclude) patterns.\n"
+"Perhaps you forgot to add either ':/' or '.' ?"
msgstr ""
-" (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)"
+"Il n'y a rien dont il faut exclure par des motifs :(exclure).\n"
+"Peut-être avez-vous oublié d'ajouter ':/' ou '.' ?"
-#: wt-status.c:222
-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é)"
+#: pretty.c:971
+msgid "unable to parse --pretty format"
+msgstr "impossible d'analyser le format --pretty"
-#: wt-status.c:223
+#: read-cache.c:1315
+#, c-format
msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+"index.version set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-" (utilisez \"git checkout -- <fichier>...\" pour annuler les modifications "
-"dans la copie de travail)"
+"version d'index renseignée, mais la valeur est invalide.\n"
+"Utilisation de la version %i"
-#: wt-status.c:225
-msgid " (commit or discard the untracked or modified content in submodules)"
+#: read-cache.c:1325
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-" (valider ou annuler le contenu non suivi ou modifié dans les sous-modules)"
+"GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"
+"Utilisation de la version %i"
-#: wt-status.c:237
+#: refs.c:576 builtin/merge.c:840
#, 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 "Could not open '%s' for writing"
+msgstr "Impossible d'ouvrir '%s' en écriture"
-#: wt-status.c:252
-msgid "both deleted:"
-msgstr "supprimé des deux côtés :"
+#: refs/files-backend.c:2481
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "Impossible de supprimer la référence %s : %s"
-#: wt-status.c:254
-msgid "added by us:"
-msgstr "ajouté par nous :"
+#: refs/files-backend.c:2484
+#, c-format
+msgid "could not delete references: %s"
+msgstr "impossible de supprimer les références : %s"
-#: wt-status.c:256
-msgid "deleted by them:"
-msgstr "supprimé par eux :"
+#: refs/files-backend.c:2493
+#, c-format
+msgid "could not remove reference %s"
+msgstr "impossible de supprimer la référence %s"
-#: wt-status.c:258
-msgid "added by them:"
-msgstr "ajouté par eux :"
+#: ref-filter.c:55
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "format attendu : %%(color:<couleur>)"
-#: wt-status.c:260
-msgid "deleted by us:"
-msgstr "supprimé par nous :"
+#: ref-filter.c:57
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr "couleur non reconnue : %%(color:%s)"
-#: wt-status.c:262
-msgid "both added:"
-msgstr "ajouté de deux côtés :"
+#: ref-filter.c:71
+#, c-format
+msgid "unrecognized format: %%(%s)"
+msgstr "format non reconnu %%(%s)"
-#: wt-status.c:264
-msgid "both modified:"
-msgstr "modifié des deux côtés :"
+#: ref-filter.c:77
+#, c-format
+msgid "%%(body) does not take arguments"
+msgstr "%%(body) n'accepte pas d'argument"
-#: wt-status.c:274
-msgid "new file:"
-msgstr "nouveau fichier :"
+#: ref-filter.c:84
+#, c-format
+msgid "%%(subject) does not take arguments"
+msgstr "%%(subject) n'accepte pas d'argument"
-#: wt-status.c:276
-msgid "copied:"
-msgstr "copié :"
-
-#: wt-status.c:278
-msgid "deleted:"
-msgstr "supprimé :"
-
-#: wt-status.c:280
-msgid "modified:"
-msgstr "modifié :"
-
-#: wt-status.c:282
-msgid "renamed:"
-msgstr "renommé :"
-
-#: wt-status.c:284
-msgid "typechange:"
-msgstr "modif. type :"
-
-#: wt-status.c:286
-msgid "unknown:"
-msgstr "inconnu :"
-
-#: wt-status.c:288
-msgid "unmerged:"
-msgstr "non fusionné :"
-
-#: wt-status.c:370
-msgid "new commits, "
-msgstr "nouveaux commits, "
+#: ref-filter.c:101
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "valeur positive attendue contents:lines=%s"
-#: wt-status.c:372
-msgid "modified content, "
-msgstr "contenu modifié, "
+#: ref-filter.c:103
+#, c-format
+msgid "unrecognized %%(contents) argument: %s"
+msgstr "argument %%(contents) non reconnu : %s"
-#: wt-status.c:374
-msgid "untracked content, "
-msgstr "contenu non suivi, "
+#: ref-filter.c:113
+#, c-format
+msgid "unrecognized %%(objectname) argument: %s"
+msgstr "argument %%(objectname) non reconnu : %s"
-#: wt-status.c:756
-msgid "Submodules changed but not updated:"
-msgstr "Sous-modules modifiés mais non mis à jour :"
+#: ref-filter.c:135
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "format attendu : %%(align:<largeur>,<position>)"
-#: wt-status.c:758
-msgid "Submodule changes to be committed:"
-msgstr "Changements du sous-module à valider :"
+#: ref-filter.c:147
+#, c-format
+msgid "unrecognized position:%s"
+msgstr "position non reconnue : %s"
-#: wt-status.c:839
-msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
-msgstr ""
-"Ne touchez pas à la ligne ci-dessus\n"
-"Tout ce qui suit sera éliminé."
+#: ref-filter.c:151
+#, c-format
+msgid "unrecognized width:%s"
+msgstr "largeur non reconnue : %s"
-#: wt-status.c:950
-msgid "You have unmerged paths."
-msgstr "Vous avez des chemins non fusionnés."
+#: ref-filter.c:157
+#, c-format
+msgid "unrecognized %%(align) argument: %s"
+msgstr "argument %%(align) non reconnu : %s"
-#: wt-status.c:953
-msgid " (fix conflicts and run \"git commit\")"
-msgstr " (réglez les conflits puis lancez \"git commit\")"
+#: ref-filter.c:161
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "valeur positive attendue avec l'atome %%(align)"
-#: wt-status.c:955
-msgid " (use \"git merge --abort\" to abort the merge)"
-msgstr " (utilisez \"git merge --abort\" pour annuler la fusion)"
+#: ref-filter.c:244
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr "nom de champ malformé %.*s"
-#: wt-status.c:960
-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."
+#: ref-filter.c:270
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr "nom de champ inconnu : %.*s"
-#: wt-status.c:963
-msgid " (use \"git commit\" to conclude merge)"
-msgstr " (utilisez \"git commit\" pour terminer la fusion)"
+#: ref-filter.c:372
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "format : atome %%(end) utilisé sans atome correspondant"
-#: wt-status.c:973
-msgid "You are in the middle of an am session."
-msgstr "Vous êtes au milieu d'une session am."
+#: ref-filter.c:424
+#, c-format
+msgid "malformed format string %s"
+msgstr "Chaîne de formatage mal formée %s"
-#: wt-status.c:976
-msgid "The current patch is empty."
-msgstr "Le patch actuel est vide."
+#: ref-filter.c:878
+msgid ":strip= requires a positive integer argument"
+msgstr ":strip= requiert un argument entier positif"
-#: wt-status.c:980
-msgid " (fix conflicts and then run \"git am --continue\")"
-msgstr " (réglez les conflits puis lancez \"git am --continue\")"
+#: ref-filter.c:883
+#, c-format
+msgid "ref '%s' does not have %ld components to :strip"
+msgstr "la réf '%s' n'a pas %ld composants à :strip"
-#: wt-status.c:982
-msgid " (use \"git am --skip\" to skip this patch)"
-msgstr " (utilisez \"git am --skip\" pour sauter ce patch)"
+#: ref-filter.c:1046
+#, c-format
+msgid "unknown %.*s format %s"
+msgstr "format de %.*s inconnu %s"
-#: wt-status.c:984
-msgid " (use \"git am --abort\" to restore the original branch)"
-msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)"
+#: ref-filter.c:1066 ref-filter.c:1097
+#, c-format
+msgid "missing object %s for %s"
+msgstr "objet manquant %s pour %s"
-#: wt-status.c:1109
-msgid "No commands done."
-msgstr "Aucune commande réalisée."
+#: ref-filter.c:1069 ref-filter.c:1100
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
+msgstr "echec de parse_object_buffer sur %s pour %s"
-#: wt-status.c:1112
+#: ref-filter.c:1311
#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
-msgstr[0] "Dernière commande effectuée (%d commande effectuée) :"
-msgstr[1] "Dernières commandes effectuées (%d commandes effectuées) :"
+msgid "malformed object at '%s'"
+msgstr "objet malformé à '%s'"
-#: wt-status.c:1123
+#: ref-filter.c:1373
#, c-format
-msgid " (see more in file %s)"
-msgstr " (voir plus dans le fichier %s)"
+msgid "ignoring ref with broken name %s"
+msgstr "réf avec un nom cassé %s ignoré"
-#: wt-status.c:1128
-msgid "No commands remaining."
-msgstr "Aucune commande restante."
+#: ref-filter.c:1378
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "réf cassé %s ignoré"
-#: wt-status.c:1131
+#: ref-filter.c:1633
#, c-format
-msgid "Next command to do (%d remaining command):"
-msgid_plural "Next commands to do (%d remaining commands):"
-msgstr[0] "Prochaine commande à effectuer (%d commande restante) :"
-msgstr[1] "Prochaines commandes à effectuer (%d commandes restantes) :"
+msgid "format: %%(end) atom missing"
+msgstr "format: atome %%(end) manquant"
-#: wt-status.c:1139
-msgid " (use \"git rebase --edit-todo\" to view and edit)"
-msgstr " (utilisez \"git rebase --edit-todo\" pour voir et éditer)"
+#: ref-filter.c:1687
+#, c-format
+msgid "malformed object name %s"
+msgstr "nom d'objet malformé %s"
-#: wt-status.c:1152
+#: remote.c:746
#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'."
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "Impossible de récupérer à la fois %s et %s pour %s"
-#: wt-status.c:1157
-msgid "You are currently rebasing."
-msgstr "Vous êtes en train de rebaser."
+#: remote.c:750
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%s suit habituellement %s, pas %s"
-#: wt-status.c:1171
-msgid " (fix conflicts and then run \"git rebase --continue\")"
-msgstr " (réglez les conflits puis lancez \"git rebase --continue\")"
+#: remote.c:754
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "%s suit à la fois %s et %s"
-#: wt-status.c:1173
-msgid " (use \"git rebase --skip\" to skip this patch)"
-msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)"
+#: remote.c:762
+msgid "Internal error"
+msgstr "Erreur interne"
-#: wt-status.c:1175
-msgid " (use \"git rebase --abort\" to check out the original branch)"
-msgstr " (utilisez \"git rebase --abort\" pour extraire la branche d'origine)"
+#: remote.c:1677 remote.c:1720
+msgid "HEAD does not point to a branch"
+msgstr "HEAD ne pointe pas sur une branche"
-#: wt-status.c:1181
-msgid " (all conflicts fixed: run \"git rebase --continue\")"
-msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")"
+#: remote.c:1686
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "pas de branche '%s'"
-#: wt-status.c:1185
+#: remote.c:1689
#, 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 "no upstream configured for branch '%s'"
+msgstr "aucune branche amont configurée pour la branche '%s'"
-#: wt-status.c:1190
-msgid "You are currently splitting a commit during a rebase."
-msgstr ""
-"Vous êtes actuellement en train de fractionner un commit pendant un rebasage."
+#: remote.c:1695
+#, 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"
-#: wt-status.c:1193
-msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+#: remote.c:1710
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
-" (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")"
+"la destination de poussée '%s' sur le serveur distant '%s' n'a pas de "
+"branche locale de suivi"
-#: wt-status.c:1197
+#: remote.c:1725
#, 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 "branch '%s' has no remote for pushing"
+msgstr "la branche '%s' n'a aucune branche distante de poussée"
-#: wt-status.c:1202
-msgid "You are currently editing a commit during a rebase."
-msgstr ""
-"Vous êtes actuellement en train d'éditer un commit pendant un rebasage."
+#: remote.c:1736
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "les références de spec pour '%s' n'incluent pas '%s'"
-#: wt-status.c:1205
-msgid " (use \"git commit --amend\" to amend the current commit)"
-msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)"
+#: remote.c:1749
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')"
-#: wt-status.c:1207
-msgid ""
-" (use \"git rebase --continue\" once you are satisfied with your changes)"
+#: remote.c:1771
+msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
-" (utilisez \"git rebase --continue\" quand vous êtes satisfait de vos "
-"modifications)"
+"impossible de résoudre une poussée 'simple' pour une destination unique"
-#: wt-status.c:1217
+#: remote.c:2073
#, c-format
-msgid "You are currently cherry-picking commit %s."
-msgstr "Vous êtes actuellement en train de picorer le commit %s."
+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"
-#: wt-status.c:1222
-msgid " (fix conflicts and run \"git cherry-pick --continue\")"
-msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")"
+#: remote.c:2077
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n"
-#: wt-status.c:1225
-msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
-msgstr ""
-" (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")"
+#: remote.c:2080
+#, c-format
+msgid "Your branch is up-to-date with '%s'.\n"
+msgstr "Votre branche est à jour avec '%s'.\n"
-#: wt-status.c:1227
-msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
-msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)"
+#: remote.c:2084
+#, 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"
-#: wt-status.c:1236
+#: remote.c:2090
+msgid " (use \"git push\" to publish your local commits)\n"
+msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n"
+
+#: remote.c:2093
#, c-format
-msgid "You are currently reverting commit %s."
-msgstr "Vous êtes actuellement en train de rétablir le commit %s."
+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"
-#: wt-status.c:1241
-msgid " (fix conflicts and run \"git revert --continue\")"
-msgstr " (réglez les conflits puis lancez \"git revert --continue\")"
+#: remote.c:2101
+msgid " (use \"git pull\" to update your local branch)\n"
+msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n"
-#: wt-status.c:1244
-msgid " (all conflicts fixed: run \"git revert --continue\")"
-msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")"
+#: remote.c:2104
+#, 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"
-#: wt-status.c:1246
-msgid " (use \"git revert --abort\" to cancel the revert operation)"
-msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)"
+#: remote.c:2114
+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"
-#: wt-status.c:1257
+#: revision.c:2158
+msgid "your current branch appears to be broken"
+msgstr "votre branche actuelle semble cassée"
+
+#: revision.c:2161
#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
-msgstr "Vous êtes en cours de bissection, depuis la branche '%s'."
+msgid "your current branch '%s' does not have any commits yet"
+msgstr "votre branche actuelle '%s' ne contient encore aucun commit"
-#: wt-status.c:1261
-msgid "You are currently bisecting."
-msgstr "Vous êtes en cours de bissection."
+#: revision.c:2355
+msgid "--first-parent is incompatible with --bisect"
+msgstr "--first-parent est incompatible avec --bisect"
-#: wt-status.c:1264
-msgid " (use \"git bisect reset\" to get back to the original branch)"
-msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)"
+#: run-command.c:106
+msgid "open /dev/null failed"
+msgstr "échec de l'ouverture de /dev/null"
-#: wt-status.c:1464
-msgid "On branch "
-msgstr "Sur la branche "
+#: run-command.c:108
+#, c-format
+msgid "dup2(%d,%d) failed"
+msgstr "échec de dup2(%d,%d)"
-#: wt-status.c:1470
-msgid "interactive rebase in progress; onto "
-msgstr "rebasage interactif en cours ; sur "
+#: send-pack.c:297
+msgid "failed to sign the push certificate"
+msgstr "impossible de signer le certificat de poussée"
-#: wt-status.c:1472
-msgid "rebase in progress; onto "
-msgstr "rebasage en cours ; sur "
+#: send-pack.c:410
+msgid "the receiving end does not support --signed push"
+msgstr "Le receveur ne gère pas les poussées avec --signed"
-#: wt-status.c:1477
-msgid "HEAD detached at "
-msgstr "HEAD détachée sur "
+#: send-pack.c:412
+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"
-#: wt-status.c:1479
-msgid "HEAD detached from "
-msgstr "HEAD détachée depuis "
+#: send-pack.c:424
+msgid "the receiving end does not support --atomic push"
+msgstr "Le receveur ne gère pas les poussées avec --atomic"
-#: wt-status.c:1482
-msgid "Not currently on any branch."
-msgstr "Actuellement sur aucun branche."
+#: send-pack.c:429
+msgid "the receiving end does not support push options"
+msgstr "Le receveur ne gère pas les options de poussées"
-#: wt-status.c:1500
-msgid "Initial commit"
-msgstr "Validation initiale"
+#: sequencer.c:171
+msgid "revert"
+msgstr "revert"
-#: wt-status.c:1514
-msgid "Untracked files"
-msgstr "Fichiers non suivis"
+#: sequencer.c:171
+msgid "cherry-pick"
+msgstr "cherry-pick"
-#: wt-status.c:1516
-msgid "Ignored files"
-msgstr "Fichiers ignorés"
+#: sequencer.c:228
+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>'"
-#: wt-status.c:1520
-#, c-format
+#: sequencer.c:231
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')."
+"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 ""
-"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')."
+"après résolution des conflits, marquez les chemins corrigés\n"
+"avec 'git add <chemins>' ou 'git rm <chemins>'\n"
+"puis validez le résultat avec 'git commit'"
-#: wt-status.c:1526
+#: sequencer.c:244 sequencer.c:1209
#, c-format
-msgid "Untracked files not listed%s"
-msgstr "Fichiers non suivis non affichés%s"
+msgid "could not lock '%s'"
+msgstr "impossible de verrouiller '%s'"
-#: wt-status.c:1528
-msgid " (use -u option to show untracked files)"
-msgstr " (utilisez -u pour afficher les fichiers non suivis)"
+#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214
+#, c-format
+msgid "could not write to '%s'"
+msgstr "impossible d'écrire dans '%s'"
-#: wt-status.c:1534
-msgid "No changes"
-msgstr "Aucune modification"
+#: sequencer.c:251
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr "impossible d'écrire la fin de ligne dans '%s'"
-#: wt-status.c:1539
+#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216
#, 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"
+msgid "failed to finalize '%s'."
+msgstr "échec lors de la finalisation de '%s'."
-#: wt-status.c:1542
+#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032
#, c-format
-msgid "no changes added to commit\n"
-msgstr "aucune modification ajoutée à la validation\n"
+msgid "could not read '%s'"
+msgstr "impossible de lire '%s'"
-#: wt-status.c:1545
+#: sequencer.c:305
#, 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"
+msgid "your local changes would be overwritten by %s."
+msgstr "vos modifications locales seraient écrasées par %s."
+
+#: sequencer.c:309
+msgid "commit your changes or stash them to proceed."
+msgstr "validez vos modifications ou les remiser pour continuer."
-#: wt-status.c:1548
+#: sequencer.c:324
#, 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"
+msgid "%s: fast-forward"
+msgstr "%s : avance rapide"
-#: wt-status.c:1551
+#. TRANSLATORS: %s will be "revert" or "cherry-pick"
+#: sequencer.c:399
#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgid "%s: Unable to write new index file"
+msgstr "%s: Impossible d'écrire le nouveau fichier index"
+
+#: sequencer.c:418
+msgid "could not resolve HEAD commit\n"
+msgstr "impossible de résoudre le commit HEAD\n"
+
+#: sequencer.c:438
+msgid "unable to update cache tree\n"
+msgstr "impossible de mettre à jour l'arbre de cache\n"
+
+#: sequencer.c:483
+#, 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 ""
-"rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les "
-"suivre)\n"
+"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"
-#: wt-status.c:1554 wt-status.c:1559
+#: sequencer.c:567
#, c-format
-msgid "nothing to commit\n"
-msgstr "rien à valider\n"
+msgid "could not parse commit %s\n"
+msgstr "impossible d'analyser le commit %s\n"
-#: wt-status.c:1557
+#: sequencer.c:572
#, 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"
+msgid "could not parse parent commit %s\n"
+msgstr "impossible d'analyser le commit parent %s\n"
+
+#: sequencer.c:656
+msgid "your index file is unmerged."
+msgstr "votre fichier d'index n'est pas fusionné."
-#: wt-status.c:1561
+#: sequencer.c:675
#, c-format
-msgid "nothing to commit, working tree clean\n"
-msgstr "rien à valider, la copie de travail est propre\n"
+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."
-#: wt-status.c:1668
-msgid "Initial commit on "
-msgstr "Validation initiale sur "
+#: sequencer.c:683
+#, c-format
+msgid "commit %s does not have parent %d"
+msgstr "le commit %s n'a pas de parent %d"
-#: wt-status.c:1672
-msgid "HEAD (no branch)"
-msgstr "HEAD (aucune branche)"
+#: sequencer.c:687
+#, c-format
+msgid "mainline was specified but commit %s is not a merge."
+msgstr ""
+"une branche principale a été spécifiée mais le commit %s n'est pas une "
+"fusion."
-# à priori on parle d'une branche ici
-#: wt-status.c:1701
-msgid "gone"
-msgstr "disparue"
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#: sequencer.c:700
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s : impossible d'analyser le commit parent %s"
-#: wt-status.c:1703 wt-status.c:1711
-msgid "behind "
-msgstr "derrière "
+#: sequencer.c:705
+#, c-format
+msgid "cannot get commit message for %s"
+msgstr "impossible d'obtenir un message de validation pour %s"
-#: wt-status.c:1706 wt-status.c:1709
-msgid "ahead "
-msgstr "devant "
+#: sequencer.c:797
+#, c-format
+msgid "could not revert %s... %s"
+msgstr "impossible d'annuler %s... %s"
-#: compat/precompose_utf8.c:57 builtin/clone.c:415
+#: sequencer.c:798
#, c-format
-msgid "failed to unlink '%s'"
-msgstr "échec lors de l'unlink de '%s'"
+msgid "could not apply %s... %s"
+msgstr "impossible d'appliquer %s... %s"
-#: builtin/add.c:22
-msgid "git add [<options>] [--] <pathspec>..."
-msgstr "git add [<options>] [--] <chemin>..."
+#: sequencer.c:833
+msgid "empty commit set passed"
+msgstr "l'ensemble de commits spécifié est vide"
-#: builtin/add.c:65
+#: sequencer.c:843
#, c-format
-msgid "unexpected diff status %c"
-msgstr "status de diff inattendu %c"
+msgid "git %s: failed to read the index"
+msgstr "git %s : échec à la lecture de l'index"
-#: builtin/add.c:71 builtin/commit.c:281
-msgid "updating files failed"
-msgstr "échec de la mise à jour des fichiers"
+#: sequencer.c:850
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr "git %s : échec du rafraîchissement de l'index"
-#: builtin/add.c:81
+#: sequencer.c:944
#, c-format
-msgid "remove '%s'\n"
-msgstr "suppression de '%s'\n"
+msgid "invalid line %d: %.*s"
+msgstr "ligne %d invalide : %.*s"
-#: builtin/add.c:136
-msgid "Unstaged changes after refreshing the index:"
-msgstr "Modifications non indexées après rafraîchissement de l'index :"
+#: sequencer.c:950
+msgid "no commits parsed."
+msgstr "aucun commit analysé."
-#: builtin/add.c:196 builtin/rev-parse.c:811
-msgid "Could not read the index"
-msgstr "Impossible de lire l'index"
+#: sequencer.c:966
+#, c-format
+msgid "could not read '%s'."
+msgstr "impossible de lire '%s'."
-#: builtin/add.c:207
+#: sequencer.c:972
#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Impossible d'ouvrir '%s' en écriture."
+msgid "unusable instruction sheet: '%s'"
+msgstr "feuille d'instruction inutilisable : '%s'"
-#: builtin/add.c:211
-msgid "Could not write patch"
-msgstr "Impossible d'écrire le patch"
+#: sequencer.c:983
+msgid "cannot cherry-pick during a revert."
+msgstr "impossible de picorer pendant l'annulation d'un commit."
-#: builtin/add.c:214
-msgid "editing patch failed"
-msgstr "échec de l'édition du patch"
+#: sequencer.c:985
+msgid "cannot revert during a cherry-pick."
+msgstr "impossible d'annuler un commit pendant un picorage."
-#: builtin/add.c:217
+#: sequencer.c:1028
#, c-format
-msgid "Could not stat '%s'"
-msgstr "Stat de '%s' impossible"
+msgid "invalid key: %s"
+msgstr "clé invalide : %s"
-#: builtin/add.c:219
-msgid "Empty patch. Aborted."
-msgstr "Patch vide. Abandon."
+#: sequencer.c:1031
+#, c-format
+msgid "invalid value for %s: %s"
+msgstr "valeur invalide pour %s : %s"
-#: builtin/add.c:224
+#: sequencer.c:1063
#, c-format
-msgid "Could not apply '%s'"
-msgstr "Impossible d'appliquer '%s'"
+msgid "malformed options sheet: '%s'"
+msgstr "feuille d'options malformée : %s"
-#: builtin/add.c:234
-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"
+#: sequencer.c:1101
+msgid "a cherry-pick or revert is already in progress"
+msgstr "un picorage ou un retour est déjà en cours"
-#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521
-#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162
-msgid "dry run"
-msgstr "simuler l'action"
+#: sequencer.c:1102
+msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\""
+
+#: sequencer.c:1106
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr "impossible de créer le répertoire de séquenceur '%s'"
+
+#: sequencer.c:1120
+msgid "could not lock HEAD"
+msgstr "impossible de verrouiller HEAD"
+
+#: sequencer.c:1151 sequencer.c:1289
+msgid "no cherry-pick or revert in progress"
+msgstr "aucun picorage ou retour en cours"
+
+#: sequencer.c:1153
+msgid "cannot resolve HEAD"
+msgstr "impossible de résoudre HEAD"
+
+#: sequencer.c:1155 sequencer.c:1189
+msgid "cannot abort from a branch yet to be born"
+msgstr "impossible d'abandonner depuis une branche non encore créée"
+
+#: sequencer.c:1175 builtin/grep.c:578
+#, c-format
+msgid "cannot open '%s'"
+msgstr "impossible d'ouvrir '%s'"
+
+#: sequencer.c:1177
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "impossible de lire '%s' : %s"
+
+#: sequencer.c:1178
+msgid "unexpected end of file"
+msgstr "fin de fichier inattendue"
+
+#: sequencer.c:1184
+#, 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:1354
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s : impossible de picorer un %s"
+
+#: sequencer.c:1358
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s : mauvaise révision"
+
+#: sequencer.c:1391
+msgid "can't revert as initial commit"
+msgstr "impossible d'annuler en tant que commit initial"
+
+#: setup.c:160
+#, 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:173
+#, 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:223
+#, 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:468
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Version attendue du dépôt git <= %d, %d trouvée"
+
+#: setup.c:476
+msgid "unknown repository extensions found:"
+msgstr "extensions de dépôt inconnues trouvées :"
+
+#: setup.c:762
+#, 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:764 setup.c:915 builtin/index-pack.c:1641
+msgid "Cannot come back to cwd"
+msgstr "Impossible de revenir au répertoire de travail courant"
+
+#: setup.c:845
+msgid "Unable to read current working directory"
+msgstr "Impossible d'accéder au répertoire de travail courant"
+
+#: setup.c:920
+#, 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 activé)."
+
+#: setup.c:927
+#, c-format
+msgid "Cannot change to '%s/..'"
+msgstr "Impossible de se déplacer vers le répertoire '%s/..'"
+
+#: setup.c:989
+#, 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."
+
+#: sha1_file.c:473
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "le chemin '%s' n'existe pas"
+
+#: sha1_file.c:499
+#, 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é."
+
+#: sha1_file.c:505
+#, 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."
+
+#: sha1_file.c:511
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "le dépôt de référence '%s' est superficiel"
+
+#: sha1_file.c:519
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "le dépôt de référence '%s' est greffé"
+
+#: sha1_file.c:1159
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"
+
+#: sha1_file.c:2592
+#, 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 ?)"
+
+#: sha1_file.c:2596
+#, 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é ?)"
+
+#: sha1_name.c:407
+#, c-format
+msgid "short SHA1 %s is ambiguous"
+msgstr "le SHA1 court %s est ambigu"
+
+#: sha1_name.c:418
+msgid "The candidates are:"
+msgstr "Les candidats sont :"
+
+#: sha1_name.c:578
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+" git checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
+msgstr ""
+"Git ne créé normalement jamais de référence qui se termine par 40 caractères "
+"hexa\n"
+"car elle serait ignorée si vous spécifiiez 40-hexa. Ces références\n"
+"peuvent être créées par erreur. Par exemple,\n"
+"\n"
+" git checkout -b $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\""
+
+#: submodule.c:64 submodule.c:98
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr ""
+"Modification impossible de .gitmodules non fusionné, résolvez les conflits "
+"d'abord"
+
+#: submodule.c:68 submodule.c:102
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "Impossible de trouver une section où path=%s dans .gitmodules"
+
+#: submodule.c:76
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "Impossible de mettre à jour l'élément %s de .gitmodules"
+
+# ici %s est un chemin
+#: submodule.c:109
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "Impossible de supprimer l'élément de .gitmodules pour %s"
+
+#: submodule.c:120
+msgid "staging updated .gitmodules failed"
+msgstr "échec de la mise en index du .gitmodules mis à jour"
+
+#: submodule.c:158
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs"
+
+#: submodule-config.c:358
+#, c-format
+msgid "invalid value for %s"
+msgstr "Valeur invalide pour %s"
+
+#: trailer.c:238
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "échec de la commande trailer '%s'"
+
+#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537
+#: trailer.c:541
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr "valeur inconnue '%s' pour la clé '%s'"
+
+#: trailer.c:523 trailer.c:528 builtin/remote.c:289
+#, c-format
+msgid "more than one %s"
+msgstr "plus d'un %s"
+
+#: trailer.c:672
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "symbole vide dans la ligne de fin '%.*s'"
+
+#: trailer.c:695
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "impossible de lire le fichier d'entrée '%s'"
+
+#: trailer.c:698
+msgid "could not read from stdin"
+msgstr "Impossible de lire depuis l'entrée standard"
+
+#: trailer.c:929 builtin/am.c:44
+#, c-format
+msgid "could not stat %s"
+msgstr "stat impossible de %s"
+
+#: trailer.c:931
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "%s n'est pas un fichier régulier"
+
+#: trailer.c:933
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "le fichier %s n'est pas inscriptible par l'utilisateur"
+
+#: trailer.c:945
+msgid "could not open temporary file"
+msgstr "impossible de créer un fichier temporaire"
+
+#: trailer.c:983
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "impossible de renommer un fichier temporaire en %s"
+
+#: transport.c:62
+#, 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:151
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport : option de profondeur invalide '%s'"
+
+#: transport.c:817
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"Les chemins suivant de sous-module contiennent des modifications\n"
+"qui ne peuvent être trouvées sur aucun distant :\n"
+
+#: transport.c:821
+#, 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:829
+msgid "Aborting."
+msgstr "Abandon."
+
+#: transport-helper.c:1075
+#, c-format
+msgid "Could not read ref %s"
+msgstr "impossible de lire la réf %s"
+
+#: tree-walk.c:31
+msgid "too-short tree object"
+msgstr "objet arbre trop court"
+
+#: tree-walk.c:37
+msgid "malformed mode in tree entry"
+msgstr "mode invalide dans l'entrée d'arbre"
+
+#: tree-walk.c:41
+msgid "empty filename in tree entry"
+msgstr "nom de fichier vide dans une entrée de l'arbre"
+
+#: tree-walk.c:113
+msgid "too-short tree file"
+msgstr "fichier arbre trop court"
+
+#: unpack-trees.c:64
+#, 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:66
+#, 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"
-#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19
-#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593
-#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114
-msgid "be verbose"
-msgstr "mode verbeux"
+#: unpack-trees.c:69
+#, 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."
-#: builtin/add.c:256
-msgid "interactive picking"
-msgstr "sélection interactive"
+#: unpack-trees.c:71
+#, 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"
-#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286
-msgid "select hunks interactively"
-msgstr "sélection interactive des sections"
+#: unpack-trees.c:74
+#, 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."
-#: builtin/add.c:258
-msgid "edit current diff and apply"
-msgstr "édition du diff actuel et application"
+#: unpack-trees.c:76
+#, 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"
-#: builtin/add.c:259
-msgid "allow adding otherwise ignored files"
-msgstr "permettre l'ajout de fichiers ignorés"
+#: unpack-trees.c:81
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in it:\n"
+"%s"
+msgstr ""
+"La mise à jour des répertoires suivants effacerait les fichiers non suivis "
+"contenus :\n"
+"%s"
-#: builtin/add.c:260
-msgid "update tracked files"
-msgstr "mettre à jour les fichiers suivis"
+#: unpack-trees.c:85
+#, 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."
-#: builtin/add.c:261
-msgid "record only the fact that the path will be added later"
-msgstr "enregistrer seulement le fait que le chemin sera ajouté plus tard"
+#: unpack-trees.c:87
+#, 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"
-#: builtin/add.c:262
-msgid "add changes from all tracked and untracked files"
-msgstr "ajouter les modifications de tous les fichiers suivis et non suivis"
+#: unpack-trees.c:90
+#, 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."
-#: builtin/add.c:265
-msgid "ignore paths removed in the working tree (same as --no-all)"
+#: unpack-trees.c:92
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
msgstr ""
-"ignorer les chemins effacés dans la copie de travail (identique à --no-all)"
+"Les fichiers suivants non suivis seraient effacés par la fusion :\n"
+"%%s"
-#: builtin/add.c:267
-msgid "don't add, only refresh the index"
-msgstr "ne pas ajouter, juste rafraîchir l'index"
+#: unpack-trees.c:95
+#, 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."
-#: builtin/add.c:268
-msgid "just skip files which cannot be added because of errors"
+#: unpack-trees.c:97
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
msgstr ""
-"sauter seulement les fichiers qui ne peuvent pas être ajoutés du fait "
-"d'erreurs"
+"Les fichiers suivants non suivis seraient effacés par %s :\n"
+"%%s"
-#: builtin/add.c:269
-msgid "check if - even missing - files are ignored in dry run"
-msgstr "vérifier si des fichiers - même manquants - sont ignorés, à vide"
+#: unpack-trees.c:102
+#, 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."
-#: builtin/add.c:270 builtin/update-index.c:958
-msgid "(+/-)x"
-msgstr "(+/-)x"
+#: unpack-trees.c:104
+#, 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"
-#: builtin/add.c:270 builtin/update-index.c:959
-msgid "override the executable bit of the listed files"
-msgstr "outrepasser le bit exécutable pour les fichiers listés"
+#: unpack-trees.c:107
+#, 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."
-#: builtin/add.c:292
+#: unpack-trees.c:109
#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "Utilisez -f si vous voulez réellement les ajouter.\n"
+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"
-#: builtin/add.c:300
-msgid "adding files failed"
-msgstr "échec de l'ajout de fichiers"
+#: unpack-trees.c:112
+#, 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."
-#: builtin/add.c:336
-msgid "-A and -u are mutually incompatible"
-msgstr "-A et -u sont mutuellement incompatibles"
+#: unpack-trees.c:114
+#, 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"
-#: builtin/add.c:343
-msgid "Option --ignore-missing can only be used together with --dry-run"
+#: unpack-trees.c:121
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible."
+
+#: unpack-trees.c:124
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
msgstr ""
-"L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run"
+"Mise à jour d'extraction creuse impossible : les entrées suivantes ne sont "
+"pas à jour :\n"
+"%s"
+
+#: unpack-trees.c:126
+#, c-format
+msgid ""
+"The following working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Les fichiers suivants de la copie de travail seraient écrasés par la mise à "
+"jour par l'extraction creuse :\n"
+"%s"
+
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"The following working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Les fichiers suivants de la copie de travail seraient supprimés par la mise "
+"à jour par extraction creuse :\n"
+"%s"
+
+#: unpack-trees.c:205
+#, c-format
+msgid "Aborting\n"
+msgstr "Abandon\n"
+
+#: unpack-trees.c:237
+msgid "Checking out files"
+msgstr "Extraction des fichiers"
+
+#: urlmatch.c:120
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "nom de schéma d'URL invalide ou suffixe '://' manquant"
+
+#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "séquence d'échappement %XX invalide"
+
+#: urlmatch.c:172
+msgid "missing host and scheme is not 'file:'"
+msgstr "hôte manquant et le schéma n'est pas 'file:'"
+
+#: urlmatch.c:189
+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:199
+msgid "invalid characters in host name"
+msgstr "caractères invalides dans le nom d'hôte"
+
+#: urlmatch.c:244 urlmatch.c:255
+msgid "invalid port number"
+msgstr "numéro de port invalide"
+
+#: urlmatch.c:322
+msgid "invalid '..' path segment"
+msgstr "segment de chemin '..' invalide"
-#: builtin/add.c:352
+#: worktree.c:282
#, 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"
+msgid "failed to read '%s'"
+msgstr "échec de la lecture de '%s'"
-#: builtin/add.c:367
+#: wrapper.c:222 wrapper.c:392
#, c-format
-msgid "Nothing specified, nothing added.\n"
-msgstr "Rien de spécifié, rien n'a été ajouté.\n"
+msgid "could not open '%s' for reading and writing"
+msgstr "impossible d'ouvrir '%s' en lecture/écriture"
-#: builtin/add.c:368
+#: wrapper.c:224 wrapper.c:394 builtin/am.c:766
#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "Vous vouliez sûrement dire 'git add .' ?\n"
-
-#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279
-#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340
-#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:240
-msgid "index file corrupt"
-msgstr "fichier d'index corrompu"
-
-#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431
-msgid "Unable to write new index file"
-msgstr "Impossible d'écrire le nouveau fichier d'index"
+msgid "could not open '%s' for writing"
+msgstr "impossible d'ouvrir '%s' en écriture"
-#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032
+#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
+#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029
+#: builtin/pull.c:341
#, c-format
-msgid "could not read '%s'"
-msgstr "impossible de lire '%s'"
-
-#: builtin/am.c:426
-msgid "could not parse author script"
-msgstr "impossible d'analyser le script author"
+msgid "could not open '%s' for reading"
+msgstr "impossible d'ouvrir '%s' en lecture"
-#: builtin/am.c:503
+#: wrapper.c:605 wrapper.c:626
#, c-format
-msgid "'%s' was deleted by the applypatch-msg hook"
-msgstr "'%s' a été effacé par le crochet applypatch-msg"
+msgid "unable to access '%s'"
+msgstr "impossible d'accéder à '%s'"
+
+#: wrapper.c:634
+msgid "unable to get current working directory"
+msgstr "impossible d'accéder au répertoire de travail courant"
-#: builtin/am.c:544 builtin/notes.c:301
+#: wrapper.c:658
#, c-format
-msgid "Malformed input line: '%s'."
-msgstr "Ligne en entrée malformée : '%s'."
+msgid "could not write to %s"
+msgstr "Impossible d'écrire dans %s"
-#: builtin/am.c:581 builtin/notes.c:316
+#: wrapper.c:660
#, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
-msgstr "Impossible de copier les notes de '%s' vers '%s'"
+msgid "could not close %s"
+msgstr "impossible de fermer %s"
-#: builtin/am.c:607
-msgid "fseek failed"
-msgstr "échec de fseek"
+#: wt-status.c:151
+msgid "Unmerged paths:"
+msgstr "Chemins non fusionnés :"
-#: builtin/am.c:787
+#: wt-status.c:178 wt-status.c:205
#, c-format
-msgid "could not parse patch '%s'"
-msgstr "impossible d'analyser le patch '%s'"
+msgid " (use \"git reset %s <file>...\" to unstage)"
+msgstr " (utilisez \"git reset %s <fichier>...\" pour désindexer)"
-#: builtin/am.c:852
-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"
+#: wt-status.c:180 wt-status.c:207
+msgid " (use \"git rm --cached <file>...\" to unstage)"
+msgstr " (utilisez \"git rm --cached <fichier>...\" pour désindexer)"
-#: builtin/am.c:899
-msgid "invalid timestamp"
-msgstr "horodatage invalide"
+#: wt-status.c:184
+msgid " (use \"git add <file>...\" to mark resolution)"
+msgstr " (utilisez \"git add <fichier>...\" pour marquer comme résolu)"
-#: builtin/am.c:902 builtin/am.c:910
-msgid "invalid Date line"
-msgstr "ligne de Date invalide"
+#: wt-status.c:186 wt-status.c:190
+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)"
-#: builtin/am.c:907
-msgid "invalid timezone offset"
-msgstr "décalage horaire invalide"
+#: wt-status.c:188
+msgid " (use \"git rm <file>...\" to mark resolution)"
+msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)"
-#: builtin/am.c:996
-msgid "Patch format detection failed."
-msgstr "Échec de détection du format du patch."
+#: wt-status.c:199 wt-status.c:945
+msgid "Changes to be committed:"
+msgstr "Modifications qui seront validées :"
-#: builtin/am.c:1001 builtin/clone.c:380
-#, c-format
-msgid "failed to create directory '%s'"
-msgstr "échec de la création du répertoire '%s'"
+#: wt-status.c:217 wt-status.c:954
+msgid "Changes not staged for commit:"
+msgstr "Modifications qui ne seront pas validées :"
-#: builtin/am.c:1005
-msgid "Failed to split patches."
-msgstr "Échec de découpage des patchs."
+#: wt-status.c:221
+msgid " (use \"git add <file>...\" to update what will be committed)"
+msgstr ""
+" (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)"
-#: builtin/am.c:1137 builtin/commit.c:366
-msgid "unable to write index file"
-msgstr "impossible d'écrire le fichier d'index"
+#: wt-status.c:223
+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é)"
-#: builtin/am.c:1188
-#, c-format
-msgid "When you have resolved this problem, run \"%s --continue\"."
-msgstr "Quand vous avez résolu ce problème, lancez \"%s --continue\"."
+#: wt-status.c:224
+msgid ""
+" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+msgstr ""
+" (utilisez \"git checkout -- <fichier>...\" pour annuler les modifications "
+"dans la copie de travail)"
-#: builtin/am.c:1189
-#, 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\"."
+#: wt-status.c:226
+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)"
-#: builtin/am.c:1190
+#: wt-status.c:238
#, c-format
-msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
-"Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --"
-"abort\"."
+" (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validé)"
-#: builtin/am.c:1328
-msgid "Patch is empty. Was it split wrong?"
-msgstr "Le patch est vide. Le découpage était-il bon ?"
+#: wt-status.c:253
+msgid "both deleted:"
+msgstr "supprimé des deux côtés :"
-#: builtin/am.c:1402 builtin/log.c:1543
-#, c-format
-msgid "invalid ident line: %s"
-msgstr "ligne d'identification invalide : %s"
+#: wt-status.c:255
+msgid "added by us:"
+msgstr "ajouté par nous :"
-#: builtin/am.c:1429
-#, c-format
-msgid "unable to parse commit %s"
-msgstr "impossible d'analyser le commit %s"
+#: wt-status.c:257
+msgid "deleted by them:"
+msgstr "supprimé par eux :"
-#: builtin/am.c:1602
-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."
+#: wt-status.c:259
+msgid "added by them:"
+msgstr "ajouté par eux :"
-#: builtin/am.c:1604
-msgid "Using index info to reconstruct a base tree..."
-msgstr ""
-"Utilisation de l'information de l'index pour reconstruire un arbre de base..."
+#: wt-status.c:261
+msgid "deleted by us:"
+msgstr "supprimé par nous :"
-#: builtin/am.c:1623
-msgid ""
-"Did you hand edit your patch?\n"
-"It does not apply to blobs recorded in its index."
-msgstr ""
-"Avez-vous édité le patch à la main ?\n"
-"Il ne s'applique pas aux blobs enregistrés dans son index."
+#: wt-status.c:263
+msgid "both added:"
+msgstr "ajouté de deux côtés :"
-#: builtin/am.c:1629
-msgid "Falling back to patching base and 3-way merge..."
-msgstr "Retour à un patch de la base et fusion à 3 points..."
+#: wt-status.c:265
+msgid "both modified:"
+msgstr "modifié des deux côtés :"
-#: builtin/am.c:1654
-msgid "Failed to merge in the changes."
-msgstr "Échec d'intégration des modifications."
+#: wt-status.c:275
+msgid "new file:"
+msgstr "nouveau fichier :"
-#: builtin/am.c:1679 builtin/merge.c:628
-msgid "git write-tree failed to write a tree"
-msgstr "git write-tree a échoué à écrire un arbre"
+#: wt-status.c:277
+msgid "copied:"
+msgstr "copié :"
-#: builtin/am.c:1686
-msgid "applying to an empty history"
-msgstr "application à un historique vide"
+#: wt-status.c:279
+msgid "deleted:"
+msgstr "supprimé :"
-#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798
-#: builtin/merge.c:823
-msgid "failed to write commit object"
-msgstr "échec de l'écriture de l'objet commit"
+#: wt-status.c:281
+msgid "modified:"
+msgstr "modifié :"
-#: builtin/am.c:1731 builtin/am.c:1735
-#, c-format
-msgid "cannot resume: %s does not exist."
-msgstr "impossible de continuer : %s n'existe pas."
+#: wt-status.c:283
+msgid "renamed:"
+msgstr "renommé :"
-#: builtin/am.c:1751
-msgid "cannot be interactive without stdin connected to a terminal."
-msgstr ""
-"impossible d'être interactif sans entrée standard connectée à un terminal."
+#: wt-status.c:285
+msgid "typechange:"
+msgstr "modif. type :"
-#: builtin/am.c:1756
-msgid "Commit Body is:"
-msgstr "Le corps de la validation est :"
+#: wt-status.c:287
+msgid "unknown:"
+msgstr "inconnu :"
-#. 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:1766
-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 : "
+#: wt-status.c:289
+msgid "unmerged:"
+msgstr "non fusionné :"
-#: builtin/am.c:1816
-#, c-format
-msgid "Dirty index: cannot apply patches (dirty: %s)"
-msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"
+#: wt-status.c:371
+msgid "new commits, "
+msgstr "nouveaux commits, "
-#: builtin/am.c:1853 builtin/am.c:1925
-#, c-format
-msgid "Applying: %.*s"
-msgstr "Application de %.*s"
+#: wt-status.c:373
+msgid "modified content, "
+msgstr "contenu modifié, "
-#: builtin/am.c:1869
-msgid "No changes -- Patch already applied."
-msgstr "Pas de changement -- Patch déjà appliqué."
+#: wt-status.c:375
+msgid "untracked content, "
+msgstr "contenu non suivi, "
-#: builtin/am.c:1877
-#, c-format
-msgid "Patch failed at %s %.*s"
-msgstr "le patch a échoué à %s %.*s"
+#: wt-status.c:818
+msgid "Submodules changed but not updated:"
+msgstr "Sous-modules modifiés mais non mis à jour :"
-#: builtin/am.c:1883
-#, c-format
-msgid "The copy of the patch that failed is found in: %s"
-msgstr "La copie du patch qui a échoué se trouve dans : %s"
+#: wt-status.c:820
+msgid "Submodule changes to be committed:"
+msgstr "Changements du sous-module à valider :"
-#: builtin/am.c:1928
+#: wt-status.c:901
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."
+"Do not touch the line above.\n"
+"Everything below will be removed."
msgstr ""
-"Aucun changement - avez-vous oublié d'utiliser 'git add' ?\n"
-"S'il n'y a plus rien à indexer, il se peut qu'autre chose ait déjà\n"
-"introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "
-"patch."
+"Ne touchez pas à la ligne ci-dessus\n"
+"Tout ce qui suit sera éliminé."
+
+#: wt-status.c:1013
+msgid "You have unmerged paths."
+msgstr "Vous avez des chemins non fusionnés."
+
+#: wt-status.c:1016
+msgid " (fix conflicts and run \"git commit\")"
+msgstr " (réglez les conflits puis lancez \"git commit\")"
+
+#: wt-status.c:1018
+msgid " (use \"git merge --abort\" to abort the merge)"
+msgstr " (utilisez \"git merge --abort\" pour annuler la fusion)"
+
+#: wt-status.c:1023
+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:1026
+msgid " (use \"git commit\" to conclude merge)"
+msgstr " (utilisez \"git commit\" pour terminer la fusion)"
+
+#: wt-status.c:1036
+msgid "You are in the middle of an am session."
+msgstr "Vous êtes au milieu d'une session am."
+
+#: wt-status.c:1039
+msgid "The current patch is empty."
+msgstr "Le patch actuel est vide."
+
+#: wt-status.c:1043
+msgid " (fix conflicts and then run \"git am --continue\")"
+msgstr " (réglez les conflits puis lancez \"git am --continue\")"
+
+#: wt-status.c:1045
+msgid " (use \"git am --skip\" to skip this patch)"
+msgstr " (utilisez \"git am --skip\" pour sauter ce patch)"
+
+#: wt-status.c:1047
+msgid " (use \"git am --abort\" to restore the original branch)"
+msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)"
-#: builtin/am.c:1935
-msgid ""
-"You still have unmerged paths in your index.\n"
-"Did you forget to use 'git add'?"
-msgstr ""
-"Vous avez toujours des chemins non fusionnés dans votre index\n"
-"Auriez-vous oublié de faire 'git add' ?"
+#: wt-status.c:1172
+msgid "No commands done."
+msgstr "Aucune commande réalisée."
-#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308
-#: builtin/reset.c:316
+#: wt-status.c:1175
#, c-format
-msgid "Could not parse object '%s'."
-msgstr "Impossible d'analyser l'objet '%s'."
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] "Dernière commande effectuée (%d commande effectuée) :"
+msgstr[1] "Dernières commandes effectuées (%d commandes effectuées) :"
-#: builtin/am.c:2095
-msgid "failed to clean index"
-msgstr "échec du nettoyage de l'index"
+#: wt-status.c:1186
+#, c-format
+msgid " (see more in file %s)"
+msgstr " (voir plus dans le fichier %s)"
-#: builtin/am.c:2129
-msgid ""
-"You seem to have moved HEAD since the last 'am' failure.\n"
-"Not rewinding to ORIG_HEAD"
-msgstr ""
-"Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"
-"Pas de retour à ORIG_HEAD"
+#: wt-status.c:1191
+msgid "No commands remaining."
+msgstr "Aucune commande restante."
-#: builtin/am.c:2192
+#: wt-status.c:1194
#, c-format
-msgid "Invalid value for --patch-format: %s"
-msgstr "Valeur invalide pour --patch-format : %s"
-
-#: builtin/am.c:2225
-msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
-msgstr "git am [<options>] [(<mbox>|<Maildir>)...]"
+msgid "Next command to do (%d remaining command):"
+msgid_plural "Next commands to do (%d remaining commands):"
+msgstr[0] "Prochaine commande à effectuer (%d commande restante) :"
+msgstr[1] "Prochaines commandes à effectuer (%d commandes restantes) :"
-#: builtin/am.c:2226
-msgid "git am [<options>] (--continue | --skip | --abort)"
-msgstr "git am [<options>] (--continue | --quit | --abort)"
+#: wt-status.c:1202
+msgid " (use \"git rebase --edit-todo\" to view and edit)"
+msgstr " (utilisez \"git rebase --edit-todo\" pour voir et éditer)"
-#: builtin/am.c:2232
-msgid "run interactively"
-msgstr "exécution interactive"
+#: wt-status.c:1215
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'."
-#: builtin/am.c:2234
-msgid "historical option -- no-op"
-msgstr "option historique -- no-op"
+#: wt-status.c:1220
+msgid "You are currently rebasing."
+msgstr "Vous êtes en train de rebaser."
-#: builtin/am.c:2236
-msgid "allow fall back on 3way merging if needed"
-msgstr "permettre de revenir à une fusion à 3 points si nécessaire"
+#: wt-status.c:1234
+msgid " (fix conflicts and then run \"git rebase --continue\")"
+msgstr " (réglez les conflits puis lancez \"git rebase --continue\")"
-#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57
-#: builtin/repack.c:172
-msgid "be quiet"
-msgstr "être silencieux"
+#: wt-status.c:1236
+msgid " (use \"git rebase --skip\" to skip this patch)"
+msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)"
-#: builtin/am.c:2239
-msgid "add a Signed-off-by line to the commit message"
-msgstr "ajouter une ligne Signed-off-by au message de validation"
+#: wt-status.c:1238
+msgid " (use \"git rebase --abort\" to check out the original branch)"
+msgstr " (utilisez \"git rebase --abort\" pour extraire la branche d'origine)"
-#: builtin/am.c:2242
-msgid "recode into utf8 (default)"
-msgstr "recoder en utf-8 (par défaut)"
+#: wt-status.c:1244
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
+msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")"
-#: builtin/am.c:2244
-msgid "pass -k flag to git-mailinfo"
-msgstr "passer l'option -k à git-mailinfo"
+#: wt-status.c:1248
+#, 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'."
-#: builtin/am.c:2246
-msgid "pass -b flag to git-mailinfo"
-msgstr "passer l'option -b à git-mailinfo"
+#: wt-status.c:1253
+msgid "You are currently splitting a commit during a rebase."
+msgstr ""
+"Vous êtes actuellement en train de fractionner un commit pendant un rebasage."
-#: builtin/am.c:2248
-msgid "pass -m flag to git-mailinfo"
-msgstr "passer l'option -m à git-mailinfo"
+#: wt-status.c:1256
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr ""
+" (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")"
-#: builtin/am.c:2250
-msgid "pass --keep-cr flag to git-mailsplit for mbox format"
-msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox"
+#: wt-status.c:1260
+#, 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'."
-#: builtin/am.c:2253
-msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+#: wt-status.c:1265
+msgid "You are currently editing a commit during a rebase."
msgstr ""
-"ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr"
+"Vous êtes actuellement en train d'éditer un commit pendant un rebasage."
-#: builtin/am.c:2256
-msgid "strip everything before a scissors line"
-msgstr "retirer tout le contenu avant la ligne des ciseaux"
+#: wt-status.c:1268
+msgid " (use \"git commit --amend\" to amend the current commit)"
+msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)"
-#: builtin/am.c:2257 builtin/apply.c:4837
-msgid "action"
-msgstr "action"
+#: wt-status.c:1270
+msgid ""
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr ""
+" (utilisez \"git rebase --continue\" quand vous êtes satisfait de vos "
+"modifications)"
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279
-#: builtin/am.c:2285
-msgid "pass it through git-apply"
-msgstr "le passer jusqu'à git-apply"
+#: wt-status.c:1280
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "Vous êtes actuellement en train de picorer le commit %s."
-#: builtin/am.c:2266 builtin/apply.c:4861
-msgid "root"
-msgstr "racine"
+#: wt-status.c:1285
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")"
-#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799
-#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96
-#: builtin/pull.c:179 builtin/submodule--helper.c:277
-#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482
-#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823
-#: builtin/submodule--helper.c:826
-msgid "path"
-msgstr "chemin"
+#: wt-status.c:1288
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr ""
+" (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")"
-#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134 builtin/pull.c:193
-#: builtin/repack.c:181 builtin/repack.c:185 builtin/show-branch.c:645
-#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
-#: parse-options.h:134 parse-options.h:244
-msgid "n"
-msgstr "n"
+#: wt-status.c:1290
+msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)"
-#: builtin/am.c:2278 builtin/apply.c:4805
-msgid "num"
-msgstr "num"
+#: wt-status.c:1299
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "Vous êtes actuellement en train de rétablir le commit %s."
-#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438
-#: builtin/tag.c:372
-msgid "format"
-msgstr "format"
+#: wt-status.c:1304
+msgid " (fix conflicts and run \"git revert --continue\")"
+msgstr " (réglez les conflits puis lancez \"git revert --continue\")"
-#: builtin/am.c:2282
-msgid "format the patch(es) are in"
-msgstr "format de présentation des patchs"
+#: wt-status.c:1307
+msgid " (all conflicts fixed: run \"git revert --continue\")"
+msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")"
-#: builtin/am.c:2288
-msgid "override error message when patch failure occurs"
-msgstr "surcharger le message d'erreur lors d'un échec d'application de patch"
+#: wt-status.c:1309
+msgid " (use \"git revert --abort\" to cancel the revert operation)"
+msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)"
-#: builtin/am.c:2290
-msgid "continue applying patches after resolving a conflict"
-msgstr "continuer à appliquer les patchs après résolution d'un conflit"
+#: wt-status.c:1320
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "Vous êtes en cours de bissection, depuis la branche '%s'."
-#: builtin/am.c:2293
-msgid "synonyms for --continue"
-msgstr "synonymes de --continue"
+#: wt-status.c:1324
+msgid "You are currently bisecting."
+msgstr "Vous êtes en cours de bissection."
-#: builtin/am.c:2296
-msgid "skip the current patch"
-msgstr "sauter le patch courant"
+#: wt-status.c:1327
+msgid " (use \"git bisect reset\" to get back to the original branch)"
+msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)"
-#: builtin/am.c:2299
-msgid "restore the original branch and abort the patching operation."
-msgstr ""
-"restaurer la branche originale et abandonner les applications de patch."
+#: wt-status.c:1524
+msgid "On branch "
+msgstr "Sur la branche "
-#: builtin/am.c:2303
-msgid "lie about committer date"
-msgstr "mentir sur la date de validation"
+#: wt-status.c:1530
+msgid "interactive rebase in progress; onto "
+msgstr "rebasage interactif en cours ; sur "
-#: builtin/am.c:2305
-msgid "use current timestamp for author date"
-msgstr "utiliser l'horodatage actuel pour la date d'auteur"
+#: wt-status.c:1532
+msgid "rebase in progress; onto "
+msgstr "rebasage en cours ; sur "
-#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229
-#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
-msgid "key-id"
-msgstr "id-clé"
+#: wt-status.c:1537
+msgid "HEAD detached at "
+msgstr "HEAD détachée sur "
-#: builtin/am.c:2308
-msgid "GPG-sign commits"
-msgstr "signer les commits avec GPG"
+#: wt-status.c:1539
+msgid "HEAD detached from "
+msgstr "HEAD détachée depuis "
-#: builtin/am.c:2311
-msgid "(internal use for git-rebase)"
-msgstr "(utilisation interne pour git-rebase)"
+#: wt-status.c:1542
+msgid "Not currently on any branch."
+msgstr "Actuellement sur aucun branche."
-#: builtin/am.c:2326
-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 ""
-"L'option -b/--binary ne fait plus rien depuis longtemps,\n"
-"et elle sera supprimée. Veuillez ne plus l'utiliser."
+#: wt-status.c:1560
+msgid "Initial commit"
+msgstr "Validation initiale"
-#: builtin/am.c:2333
-msgid "failed to read the index"
-msgstr "échec à la lecture de l'index"
+#: wt-status.c:1574
+msgid "Untracked files"
+msgstr "Fichiers non suivis"
-#: builtin/am.c:2348
-#, 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."
+#: wt-status.c:1576
+msgid "Ignored files"
+msgstr "Fichiers ignorés"
-#: builtin/am.c:2372
+#: wt-status.c:1580
#, c-format
msgid ""
-"Stray %s directory found.\n"
-"Use \"git am --abort\" to remove it."
-msgstr ""
-"Répertoire abandonné %s trouvé.\n"
-"Utilisez \"git am --abort\" pour le supprimer."
-
-#: builtin/am.c:2378
-msgid "Resolve operation not in progress, we are not resuming."
+"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 ""
-"Pas de résolution de l'opération en cours, nous ne sommes pas dans une "
-"reprise."
-
-#: builtin/apply.c:122
-msgid "git apply [<options>] [<patch>...]"
-msgstr "git apply [<options>] [<patch>...]"
-
-#: builtin/apply.c:153
-#, c-format
-msgid "unrecognized whitespace option '%s'"
-msgstr "option d'espace non reconnue '%s'"
+"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')."
-#: builtin/apply.c:169
+#: wt-status.c:1586
#, c-format
-msgid "unrecognized whitespace ignore option '%s'"
-msgstr "option d'ignorance d'espace non reconnue '%s'"
+msgid "Untracked files not listed%s"
+msgstr "Fichiers non suivis non affichés%s"
-#: builtin/apply.c:854
-#, c-format
-msgid "Cannot prepare timestamp regexp %s"
-msgstr "Impossible de préparer la regexp d'horodatage %s"
+#: wt-status.c:1588
+msgid " (use -u option to show untracked files)"
+msgstr " (utilisez -u pour afficher les fichiers non suivis)"
-#: builtin/apply.c:863
-#, c-format
-msgid "regexec returned %d for input: %s"
-msgstr "regexec a retourné %d pour l'entrée : %s"
+#: wt-status.c:1594
+msgid "No changes"
+msgstr "Aucune modification"
-#: builtin/apply.c:947
+#: wt-status.c:1599
#, c-format
-msgid "unable to find filename in patch at line %d"
-msgstr "nom de fichier du patch introuvable à la ligne %d"
+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"
-#: builtin/apply.c:984
+#: wt-status.c:1602
#, 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"
+msgid "no changes added to commit\n"
+msgstr "aucune modification ajoutée à la validation\n"
-#: builtin/apply.c:989
+#: wt-status.c:1605
#, c-format
-msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
msgstr ""
-"git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant "
-"à la ligne %d"
+"aucune modification ajoutée à la validation mais des fichiers non suivis "
+"sont présents (utilisez \"git add\" pour les suivre)\n"
-#: builtin/apply.c:990
+#: wt-status.c:1608
#, c-format
-msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgid "nothing added to commit but untracked files present\n"
msgstr ""
-"git apply : mauvais format de git-diff - ancien nom de fichier inconsistant "
-"à la ligne %d"
+"aucune modification ajoutée à la validation mais des fichiers non suivis "
+"sont présents\n"
-#: builtin/apply.c:995
+#: wt-status.c:1611
#, c-format
-msgid "git apply: bad git-diff - expected /dev/null on line %d"
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-"git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d"
+"rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les "
+"suivre)\n"
-#: builtin/apply.c:1489
+#: wt-status.c:1614 wt-status.c:1619
#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr "recomptage : ligne inattendue : %.*s"
+msgid "nothing to commit\n"
+msgstr "rien à valider\n"
-#: builtin/apply.c:1550
+#: wt-status.c:1617
#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr "fragment de patch sans en-tête à la ligne %d : %.*s"
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n"
-#: builtin/apply.c:1567
+#: wt-status.c:1621
#, 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] ""
-"information de nom de fichier manquante dans l'en-tête de git diff lors de "
-"la suppression de %d composant de préfixe de chemin (ligne %d)"
-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)"
+msgid "nothing to commit, working tree clean\n"
+msgstr "rien à valider, la copie de travail est propre\n"
-#: builtin/apply.c:1743
-msgid "new file depends on old contents"
-msgstr "le nouveau fichier dépend de contenus anciens"
+#: wt-status.c:1728
+msgid "Initial commit on "
+msgstr "Validation initiale sur "
-#: builtin/apply.c:1745
-msgid "deleted file still has contents"
-msgstr "le fichier supprimé a encore du contenu"
+#: wt-status.c:1732
+msgid "HEAD (no branch)"
+msgstr "HEAD (aucune branche)"
-#: builtin/apply.c:1774
-#, c-format
-msgid "corrupt patch at line %d"
-msgstr "patch corrompu à la ligne %d"
+# à priori on parle d'une branche ici
+#: wt-status.c:1761
+msgid "gone"
+msgstr "disparue"
-#: builtin/apply.c:1810
-#, c-format
-msgid "new file %s depends on old contents"
-msgstr "le nouveau fichier %s dépend de contenus anciens"
+#: wt-status.c:1763 wt-status.c:1771
+msgid "behind "
+msgstr "derrière "
-#: builtin/apply.c:1812
-#, c-format
-msgid "deleted file %s still has contents"
-msgstr "le fichier supprimé %s a encore du contenu"
+#: wt-status.c:1766 wt-status.c:1769
+msgid "ahead "
+msgstr "devant "
-#: builtin/apply.c:1815
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2270
#, c-format
-msgid "** warning: file %s becomes empty but is not deleted"
-msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé"
+msgid "cannot %s: You have unstaged changes."
+msgstr "Impossible de %s : vous avez des modifications non indexées."
-#: builtin/apply.c:1962
-#, c-format
-msgid "corrupt binary patch at line %d: %.*s"
-msgstr "patch binaire corrompu à la ligne %d : %.*s"
+#: wt-status.c:2276
+msgid "additionally, your index contains uncommitted changes."
+msgstr "de plus, votre index contient des modifications non validées."
-#: builtin/apply.c:1999
+#: wt-status.c:2278
#, c-format
-msgid "unrecognized binary patch at line %d"
-msgstr "patch binaire non reconnu à la ligne %d"
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "%s impossible : votre index contient des modifications non validées."
-#: builtin/apply.c:2154
+#: compat/precompose_utf8.c:57 builtin/clone.c:414
#, c-format
-msgid "patch with only garbage at line %d"
-msgstr "patch totalement incompréhensible à la ligne %d"
+msgid "failed to unlink '%s'"
+msgstr "échec lors de l'unlink de '%s'"
-#: builtin/apply.c:2244
-#, c-format
-msgid "unable to read symlink %s"
-msgstr "lecture du lien symbolique %s impossible"
+#: builtin/add.c:22
+msgid "git add [<options>] [--] <pathspec>..."
+msgstr "git add [<options>] [--] <chemin>..."
-#: builtin/apply.c:2248
+#: builtin/add.c:80
#, c-format
-msgid "unable to open or read %s"
-msgstr "ouverture ou lecture de %s impossible"
+msgid "unexpected diff status %c"
+msgstr "status de diff inattendu %c"
+
+#: builtin/add.c:85 builtin/commit.c:291
+msgid "updating files failed"
+msgstr "échec de la mise à jour des fichiers"
-#: builtin/apply.c:2901
+#: builtin/add.c:95
#, c-format
-msgid "invalid start of line: '%c'"
-msgstr "début de ligne invalide : '%c'"
+msgid "remove '%s'\n"
+msgstr "suppression de '%s'\n"
+
+#: builtin/add.c:149
+msgid "Unstaged changes after refreshing the index:"
+msgstr "Modifications non indexées après rafraîchissement de l'index :"
+
+#: builtin/add.c:209 builtin/rev-parse.c:840
+msgid "Could not read the index"
+msgstr "Impossible de lire l'index"
-#: builtin/apply.c:3020
+#: builtin/add.c:220
#, 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)."
+msgid "Could not open '%s' for writing."
+msgstr "Impossible d'ouvrir '%s' en écriture."
-#: builtin/apply.c:3032
+#: builtin/add.c:224
+msgid "Could not write patch"
+msgstr "Impossible d'écrire le patch"
+
+#: builtin/add.c:227
+msgid "editing patch failed"
+msgstr "échec de l'édition du patch"
+
+#: builtin/add.c:230
#, 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"
+msgid "Could not stat '%s'"
+msgstr "Stat de '%s' impossible"
+
+#: builtin/add.c:232
+msgid "Empty patch. Aborted."
+msgstr "Patch vide. Abandon."
-#: builtin/apply.c:3038
+#: builtin/add.c:237
#, c-format
-msgid ""
-"while searching for:\n"
-"%.*s"
+msgid "Could not apply '%s'"
+msgstr "Impossible d'appliquer '%s'"
+
+#: builtin/add.c:247
+msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-"pendant la recherche de :\n"
-"%.*s"
+"Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n"
-#: builtin/apply.c:3060
-#, c-format
-msgid "missing binary patch data for '%s'"
-msgstr "données de patch binaire manquantes pour '%s'"
+#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111
+#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521
+#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162
+msgid "dry run"
+msgstr "simuler l'action"
-#: builtin/apply.c:3163
-#, c-format
-msgid "binary patch does not apply to '%s'"
-msgstr "le patch binaire ne s'applique par correctement à '%s'"
+#: builtin/add.c:269
+msgid "interactive picking"
+msgstr "sélection interactive"
+
+#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286
+msgid "select hunks interactively"
+msgstr "sélection interactive des sections"
+
+#: builtin/add.c:271
+msgid "edit current diff and apply"
+msgstr "édition du diff actuel et application"
+
+#: builtin/add.c:272
+msgid "allow adding otherwise ignored files"
+msgstr "permettre l'ajout de fichiers ignorés"
+
+#: builtin/add.c:273
+msgid "update tracked files"
+msgstr "mettre à jour les fichiers suivis"
+
+#: builtin/add.c:274
+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:275
+msgid "add changes from all tracked and untracked files"
+msgstr "ajouter les modifications de tous les fichiers suivis et non suivis"
+
+#: builtin/add.c:278
+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:280
+msgid "don't add, only refresh the index"
+msgstr "ne pas ajouter, juste rafraîchir l'index"
+
+#: builtin/add.c:281
+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:282
+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:283 builtin/update-index.c:947
+msgid "(+/-)x"
+msgstr "(+/-)x"
+
+#: builtin/add.c:283 builtin/update-index.c:948
+msgid "override the executable bit of the listed files"
+msgstr "outrepasser le bit exécutable pour les fichiers listés"
-#: builtin/apply.c:3169
+#: builtin/add.c:305
#, c-format
-msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
+msgid "Use -f if you really want to add them.\n"
+msgstr "Utilisez -f si vous voulez réellement les ajouter.\n"
+
+#: builtin/add.c:312
+msgid "adding files failed"
+msgstr "échec de l'ajout de fichiers"
+
+#: builtin/add.c:348
+msgid "-A and -u are mutually incompatible"
+msgstr "-A et -u sont mutuellement incompatibles"
+
+#: builtin/add.c:355
+msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
-"le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s "
-"trouvé)"
+"L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run"
-#: builtin/apply.c:3190
+#: builtin/add.c:359
#, c-format
-msgid "patch failed: %s:%ld"
-msgstr "le patch a échoué : %s:%ld"
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr "Le paramètre '%s' de --chmod doit être soit -x soit +x"
-#: builtin/apply.c:3314
+#: builtin/add.c:374
#, c-format
-msgid "cannot checkout %s"
-msgstr "extraction de %s impossible"
+msgid "Nothing specified, nothing added.\n"
+msgstr "Rien de spécifié, rien n'a été ajouté.\n"
-#: builtin/apply.c:3370
+#: builtin/add.c:375
#, c-format
-msgid "reading from '%s' beyond a symbolic link"
-msgstr "lecture depuis '%s' au-delà d'un lien symbolique"
+msgid "Maybe you wanted to say 'git add .'?\n"
+msgstr "Vous vouliez sûrement dire 'git add .' ?\n"
+
+#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279
+#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350
+#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:244
+msgid "index file corrupt"
+msgstr "fichier d'index corrompu"
-#: builtin/apply.c:3399 builtin/apply.c:3630
+#: builtin/am.c:414
+msgid "could not parse author script"
+msgstr "impossible d'analyser le script author"
+
+#: builtin/am.c:491
#, c-format
-msgid "path %s has been renamed/deleted"
-msgstr "le chemin %s a été renommé/supprimé"
+msgid "'%s' was deleted by the applypatch-msg hook"
+msgstr "'%s' a été effacé par le crochet applypatch-msg"
-#: builtin/apply.c:3482 builtin/apply.c:3644
+#: builtin/am.c:532
#, c-format
-msgid "%s: does not exist in index"
-msgstr "%s : n'existe pas dans l'index"
+msgid "Malformed input line: '%s'."
+msgstr "Ligne en entrée malformée : '%s'."
-#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658
+#: builtin/am.c:569
#, c-format
-msgid "%s: %s"
-msgstr "%s : %s"
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr "Impossible de copier les notes de '%s' vers '%s'"
+
+#: builtin/am.c:595
+msgid "fseek failed"
+msgstr "échec de fseek"
-#: builtin/apply.c:3491 builtin/apply.c:3652
+#: builtin/am.c:775
#, c-format
-msgid "%s: does not match index"
-msgstr "%s : ne correspond pas à l'index"
+msgid "could not parse patch '%s'"
+msgstr "impossible d'analyser le patch '%s'"
+
+#: builtin/am.c:840
+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:887
+msgid "invalid timestamp"
+msgstr "horodatage invalide"
+
+#: builtin/am.c:890 builtin/am.c:898
+msgid "invalid Date line"
+msgstr "ligne de Date invalide"
+
+#: builtin/am.c:895
+msgid "invalid timezone offset"
+msgstr "décalage horaire invalide"
+
+#: builtin/am.c:984
+msgid "Patch format detection failed."
+msgstr "Échec de détection du format du patch."
+
+#: builtin/am.c:989 builtin/clone.c:379
+#, c-format
+msgid "failed to create directory '%s'"
+msgstr "échec de la création du répertoire '%s'"
+
+#: builtin/am.c:993
+msgid "Failed to split patches."
+msgstr "Échec de découpage des patchs."
-#: builtin/apply.c:3597
-msgid "removal patch leaves file contents"
-msgstr "le patch de suppression laisse un contenu dans le fichier"
+#: builtin/am.c:1125 builtin/commit.c:376
+msgid "unable to write index file"
+msgstr "impossible d'écrire le fichier d'index"
-#: builtin/apply.c:3669
+#: builtin/am.c:1176
#, c-format
-msgid "%s: wrong type"
-msgstr "%s : type erroné"
+msgid "When you have resolved this problem, run \"%s --continue\"."
+msgstr "Quand vous avez résolu ce problème, lancez \"%s --continue\"."
-#: builtin/apply.c:3671
+#: builtin/am.c:1177
#, c-format
-msgid "%s has type %o, expected %o"
-msgstr "%s est de type %o, mais %o attendu"
+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/apply.c:3822 builtin/apply.c:3824
+#: builtin/am.c:1178
#, c-format
-msgid "invalid path '%s'"
-msgstr "chemin invalide '%s'"
+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/apply.c:3879
-#, c-format
-msgid "%s: already exists in index"
-msgstr "%s : existe déjà dans l'index"
+#: builtin/am.c:1316
+msgid "Patch is empty. Was it split wrong?"
+msgstr "Le patch est vide. Le découpage était-il bon ?"
-#: builtin/apply.c:3882
+#: builtin/am.c:1390 builtin/log.c:1550
#, c-format
-msgid "%s: already exists in working directory"
-msgstr "%s : existe déjà dans la copie de travail"
+msgid "invalid ident line: %s"
+msgstr "ligne d'identification invalide : %s"
-#: builtin/apply.c:3902
+#: builtin/am.c:1417
#, 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)"
+msgid "unable to parse commit %s"
+msgstr "impossible d'analyser le commit %s"
-#: builtin/apply.c:3907
-#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o) of %s"
+#: builtin/am.c:1610
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-"le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s"
+"Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 "
+"points."
-#: builtin/apply.c:3927
-#, c-format
-msgid "affected file '%s' is beyond a symbolic link"
-msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique"
+#: builtin/am.c:1612
+msgid "Using index info to reconstruct a base tree..."
+msgstr ""
+"Utilisation de l'information de l'index pour reconstruire un arbre de base..."
-#: builtin/apply.c:3931
-#, c-format
-msgid "%s: patch does not apply"
-msgstr "%s : le patch ne s'applique pas"
+#: builtin/am.c:1631
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
+msgstr ""
+"Avez-vous édité le patch à la main ?\n"
+"Il ne s'applique pas aux blobs enregistrés dans son index."
-#: builtin/apply.c:3945
-#, c-format
-msgid "Checking patch %s..."
-msgstr "Vérification du patch %s..."
+#: builtin/am.c:1637
+msgid "Falling back to patching base and 3-way merge..."
+msgstr "Retour à un patch de la base et fusion à 3 points..."
-#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "échec de make_cache_entry pour le chemin '%s'"
+#: builtin/am.c:1662
+msgid "Failed to merge in the changes."
+msgstr "Échec d'intégration des modifications."
-#: builtin/apply.c:4182
-#, c-format
-msgid "unable to remove %s from index"
-msgstr "suppression de %s dans l'index impossible"
+#: builtin/am.c:1686 builtin/merge.c:628
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree a échoué à écrire un arbre"
-#: builtin/apply.c:4215
-#, c-format
-msgid "corrupt patch for submodule %s"
-msgstr "patch corrompu pour le sous-module %s"
+#: builtin/am.c:1693
+msgid "applying to an empty history"
+msgstr "application à un historique vide"
-#: builtin/apply.c:4219
-#, c-format
-msgid "unable to stat newly created file '%s'"
-msgstr "stat du fichier nouvellement créé '%s' impossible"
+#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798
+#: builtin/merge.c:823
+msgid "failed to write commit object"
+msgstr "échec de l'écriture de l'objet commit"
-#: builtin/apply.c:4224
+#: builtin/am.c:1739 builtin/am.c:1743
#, c-format
-msgid "unable to create backing store for newly created file %s"
+msgid "cannot resume: %s does not exist."
+msgstr "impossible de continuer : %s n'existe pas."
+
+#: builtin/am.c:1759
+msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
-"création du magasin de stockage pour le fichier nouvellement créé %s "
-"impossible"
+"impossible d'être interactif sans entrée standard connectée à un terminal."
-#: builtin/apply.c:4227 builtin/apply.c:4340
-#, c-format
-msgid "unable to add cache entry for %s"
-msgstr "ajout de l'élément de cache %s impossible"
+#: builtin/am.c:1764
+msgid "Commit Body is:"
+msgstr "Le corps de la validation est :"
-#: builtin/apply.c:4260
-#, c-format
-msgid "closing file '%s'"
-msgstr "fermeture du fichier '%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:1774
+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/apply.c:4313
+#: builtin/am.c:1824
#, c-format
-msgid "unable to write file '%s' mode %o"
-msgstr "écriture du fichier '%s' mode %o impossible"
+msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"
-#: builtin/apply.c:4403
+#: builtin/am.c:1861 builtin/am.c:1933
#, c-format
-msgid "Applied patch %s cleanly."
-msgstr "Patch %s appliqué proprement."
+msgid "Applying: %.*s"
+msgstr "Application de %.*s"
-#: builtin/apply.c:4411
-msgid "internal error"
-msgstr "erreur interne"
+#: builtin/am.c:1877
+msgid "No changes -- Patch already applied."
+msgstr "Pas de changement -- Patch déjà appliqué."
-#: builtin/apply.c:4414
+#: builtin/am.c:1885
#, 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..."
+msgid "Patch failed at %s %.*s"
+msgstr "le patch a échoué à %s %.*s"
-#: builtin/apply.c:4424
+#: builtin/am.c:1891
#, c-format
-msgid "truncating .rej filename to %.*s.rej"
-msgstr "troncature du nom de fichier .rej en %.*s.rej"
+msgid "The copy of the patch that failed is found in: %s"
+msgstr "La copie du patch qui a échoué se trouve dans : %s"
-#: builtin/apply.c:4432
-#, c-format
-msgid "cannot open %s: %s"
-msgstr "impossible d'ouvrir %s : %s"
+#: builtin/am.c:1936
+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 ""
+"Aucun changement - avez-vous oublié d'utiliser 'git add' ?\n"
+"S'il n'y a plus rien à indexer, il se peut qu'autre chose ait déjà\n"
+"introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "
+"patch."
-#: builtin/apply.c:4445
-#, c-format
-msgid "Hunk #%d applied cleanly."
-msgstr "Section n°%d appliquée proprement."
+#: builtin/am.c:1943
+msgid ""
+"You still have unmerged paths in your index.\n"
+"Did you forget to use 'git add'?"
+msgstr ""
+"Vous avez toujours des chemins non fusionnés dans votre index\n"
+"Auriez-vous oublié de faire 'git add' ?"
-#: builtin/apply.c:4448
+#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
+#: builtin/reset.c:316
#, c-format
-msgid "Rejected hunk #%d."
-msgstr "Section n°%d rejetée."
+msgid "Could not parse object '%s'."
+msgstr "Impossible d'analyser l'objet '%s'."
-#: builtin/apply.c:4537
-#, c-format
-msgid "Skipped patch '%s'."
-msgstr "Chemin '%s' non traité."
+#: builtin/am.c:2103
+msgid "failed to clean index"
+msgstr "échec du nettoyage de l'index"
-#: builtin/apply.c:4545
-msgid "unrecognized input"
-msgstr "entrée non reconnue"
+#: builtin/am.c:2137
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
+msgstr ""
+"Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"
+"Pas de retour à ORIG_HEAD"
-#: builtin/apply.c:4556
-msgid "unable to read index file"
-msgstr "lecture du fichier d'index impossible"
+#: builtin/am.c:2200
+#, c-format
+msgid "Invalid value for --patch-format: %s"
+msgstr "Valeur invalide pour --patch-format : %s"
-#: builtin/apply.c:4701
-msgid "--3way outside a repository"
-msgstr "--3way hors d'un dépôt"
+#: builtin/am.c:2233
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+msgstr "git am [<options>] [(<mbox> | <Maildir>)...]"
-#: builtin/apply.c:4709
-msgid "--index outside a repository"
-msgstr "--index hors d'un dépôt"
+#: builtin/am.c:2234
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<options>] (--continue | --quit | --abort)"
-#: builtin/apply.c:4712
-msgid "--cached outside a repository"
-msgstr "--cached hors d'un dépôt"
+#: builtin/am.c:2240
+msgid "run interactively"
+msgstr "exécution interactive"
-#: builtin/apply.c:4745
-#, c-format
-msgid "can't open patch '%s'"
-msgstr "ouverture impossible du patch '%s'"
+#: builtin/am.c:2242
+msgid "historical option -- no-op"
+msgstr "option historique -- no-op"
-#: builtin/apply.c:4760
-#, c-format
-msgid "squelched %d whitespace error"
-msgid_plural "squelched %d whitespace errors"
-msgstr[0] "%d erreur d'espace ignorée"
-msgstr[1] "%d erreurs d'espace ignorées"
+#: builtin/am.c:2244
+msgid "allow fall back on 3way merging if needed"
+msgstr "permettre de revenir à une fusion à 3 points si nécessaire"
-#: builtin/apply.c:4766 builtin/apply.c:4776
-#, 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."
+#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
+#: builtin/repack.c:172
+msgid "be quiet"
+msgstr "être silencieux"
-#: builtin/apply.c:4800
-msgid "don't apply changes matching the given path"
-msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"
+#: builtin/am.c:2247
+msgid "add a Signed-off-by line to the commit message"
+msgstr "ajouter une ligne Signed-off-by au message de validation"
-#: builtin/apply.c:4803
-msgid "apply changes matching the given path"
-msgstr "appliquer les modifications qui correspondent au chemin donné"
+#: builtin/am.c:2250
+msgid "recode into utf8 (default)"
+msgstr "recoder en utf-8 (par défaut)"
-#: builtin/apply.c:4806
-msgid "remove <num> leading slashes from traditional diff paths"
-msgstr "supprimer <num> barres obliques des chemins traditionnels de diff"
+#: builtin/am.c:2252
+msgid "pass -k flag to git-mailinfo"
+msgstr "passer l'option -k à git-mailinfo"
-#: builtin/apply.c:4809
-msgid "ignore additions made by the patch"
-msgstr "ignorer les additions réalisées par le patch"
+#: builtin/am.c:2254
+msgid "pass -b flag to git-mailinfo"
+msgstr "passer l'option -b à git-mailinfo"
-#: builtin/apply.c:4811
-msgid "instead of applying the patch, output diffstat for the input"
-msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrée"
+#: builtin/am.c:2256
+msgid "pass -m flag to git-mailinfo"
+msgstr "passer l'option -m à git-mailinfo"
-#: builtin/apply.c:4815
-msgid "show number of added and deleted lines in decimal notation"
+#: builtin/am.c:2258
+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:2261
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-"afficher le nombre de lignes ajoutées et supprimées en notation décimale"
+"ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr"
-#: builtin/apply.c:4817
-msgid "instead of applying the patch, output a summary for the input"
-msgstr "au lieu d'appliquer le patch, afficher un résumer de l'entrée"
+#: builtin/am.c:2264
+msgid "strip everything before a scissors line"
+msgstr "retirer tout le contenu avant la ligne des ciseaux"
-#: builtin/apply.c:4819
-msgid "instead of applying the patch, see if the patch is applicable"
-msgstr "au lieu d'appliquer le patch, voir si le patch est applicable"
+#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
+#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
+#: builtin/am.c:2293
+msgid "pass it through git-apply"
+msgstr "le passer jusqu'à git-apply"
-#: builtin/apply.c:4821
-msgid "make sure the patch is applicable to the current index"
-msgstr "s'assurer que le patch est applicable sur l'index actuel"
+#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
+#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135
+#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185
+#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
+msgid "n"
+msgstr "n"
-#: builtin/apply.c:4823
-msgid "apply a patch without touching the working tree"
-msgstr "appliquer les patch sans toucher à la copie de travail"
+#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/tag.c:372
+msgid "format"
+msgstr "format"
-#: builtin/apply.c:4825
-msgid "accept a patch that touches outside the working area"
-msgstr "accepter un patch qui touche hors de la copie de travail"
+#: builtin/am.c:2290
+msgid "format the patch(es) are in"
+msgstr "format de présentation des patchs"
+
+#: builtin/am.c:2296
+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:2298
+msgid "continue applying patches after resolving a conflict"
+msgstr "continuer à appliquer les patchs après résolution d'un conflit"
-#: builtin/apply.c:4827
-msgid "also apply the patch (use with --stat/--summary/--check)"
-msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)"
+#: builtin/am.c:2301
+msgid "synonyms for --continue"
+msgstr "synonymes de --continue"
-#: builtin/apply.c:4829
-msgid "attempt three-way merge if a patch does not apply"
-msgstr "tenter une fusion à 3 points si le patch ne s'applique pas proprement"
+#: builtin/am.c:2304
+msgid "skip the current patch"
+msgstr "sauter le patch courant"
-#: builtin/apply.c:4831
-msgid "build a temporary index based on embedded index information"
+#: builtin/am.c:2307
+msgid "restore the original branch and abort the patching operation."
msgstr ""
-"construire un index temporaire fondé sur l'information de l'index embarqué"
+"restaurer la branche originale et abandonner les applications de patch."
-#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426
-msgid "paths are separated with NUL character"
-msgstr "les chemins sont séparés par un caractère NUL"
+#: builtin/am.c:2311
+msgid "lie about committer date"
+msgstr "mentir sur la date de validation"
-#: builtin/apply.c:4836
-msgid "ensure at least <n> lines of context match"
-msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
+#: builtin/am.c:2313
+msgid "use current timestamp for author date"
+msgstr "utiliser l'horodatage actuel pour la date d'auteur"
-#: builtin/apply.c:4838
-msgid "detect new or modified lines that have whitespace errors"
-msgstr ""
-"détecter des lignes nouvelles ou modifiées qui contiennent des erreurs "
-"d'espace"
+#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229
+#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355
+msgid "key-id"
+msgstr "id-clé"
-#: builtin/apply.c:4841 builtin/apply.c:4844
-msgid "ignore changes in whitespace when finding context"
-msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
+#: builtin/am.c:2316
+msgid "GPG-sign commits"
+msgstr "signer les commits avec GPG"
-#: builtin/apply.c:4847
-msgid "apply the patch in reverse"
-msgstr "appliquer le patch en sens inverse"
+#: builtin/am.c:2319
+msgid "(internal use for git-rebase)"
+msgstr "(utilisation interne pour git-rebase)"
-#: builtin/apply.c:4849
-msgid "don't expect at least one line of context"
-msgstr "ne pas s'attendre à au moins une ligne de contexte"
+#: builtin/am.c:2334
+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 ""
+"L'option -b/--binary ne fait plus rien depuis longtemps,\n"
+"et elle sera supprimée. Veuillez ne plus l'utiliser."
-#: builtin/apply.c:4851
-msgid "leave the rejected hunks in corresponding *.rej files"
-msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants"
+#: builtin/am.c:2341
+msgid "failed to read the index"
+msgstr "échec à la lecture de l'index"
-#: builtin/apply.c:4853
-msgid "allow overlapping hunks"
-msgstr "accepter les recouvrements de sections"
+#: builtin/am.c:2356
+#, 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/apply.c:4856
-msgid "tolerate incorrectly detected missing new-line at the end of file"
+#: builtin/am.c:2380
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
msgstr ""
-"tolérer des erreurs de détection de retours chariot manquants en fin de "
-"fichier"
+"Répertoire abandonné %s trouvé.\n"
+"Utilisez \"git am --abort\" pour le supprimer."
-#: builtin/apply.c:4859
-msgid "do not trust the line counts in the hunk headers"
-msgstr "ne pas se fier au compte de lignes dans les en-têtes de section"
+#: builtin/am.c:2386
+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/apply.c:4862
-msgid "prepend <root> to all filenames"
-msgstr "préfixer tous les noms de fichier avec <root>"
+#: builtin/apply.c:8
+msgid "git apply [<options>] [<patch>...]"
+msgstr "git apply [<options>] [<patch>...]"
#: builtin/archive.c:17
#, c-format
msgid "Blaming lines"
msgstr "Assignation de blâme au lignes"
-#: builtin/blame.c:2536
+#: builtin/blame.c:2577
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:2537
+#: builtin/blame.c:2578
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "Montrer un SHA-1 blanc pour les commits de limite (Défaut : désactivé)"
-#: builtin/blame.c:2538
+#: builtin/blame.c:2579
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:2539
+#: builtin/blame.c:2580
msgid "Show work cost statistics"
msgstr "Montrer les statistiques de coût d'activité"
-#: builtin/blame.c:2540
+#: builtin/blame.c:2581
msgid "Force progress reporting"
msgstr "Forcer l'affichage de l'état d'avancement"
-#: builtin/blame.c:2541
+#: builtin/blame.c:2582
msgid "Show output score for blame entries"
msgstr "Montrer le score de sortie pour les éléments de blâme"
-#: builtin/blame.c:2542
+#: builtin/blame.c:2583
msgid "Show original filename (Default: auto)"
msgstr "Montrer les noms de fichier originaux (Défaut : auto)"
-#: builtin/blame.c:2543
+#: builtin/blame.c:2584
msgid "Show original linenumber (Default: off)"
msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)"
-#: builtin/blame.c:2544
+#: builtin/blame.c:2585
msgid "Show in a format designed for machine consumption"
msgstr "Afficher dans un format propice à la consommation par machine"
-#: builtin/blame.c:2545
+#: builtin/blame.c:2586
msgid "Show porcelain format with per-line commit information"
msgstr "Afficher en format porcelaine avec l'information de commit par ligne"
-#: builtin/blame.c:2546
+#: builtin/blame.c:2587
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:2547
+#: builtin/blame.c:2588
msgid "Show raw timestamp (Default: off)"
msgstr "Afficher les horodatages bruts (Défaut : désactivé)"
-#: builtin/blame.c:2548
+#: builtin/blame.c:2589
msgid "Show long commit SHA1 (Default: off)"
msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)"
-#: builtin/blame.c:2549
+#: builtin/blame.c:2590
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:2550
+#: builtin/blame.c:2591
msgid "Show author email instead of name (Default: off)"
msgstr "Afficher l'e-mail de l'auteur au lieu du nom (Défaut : désactivé)"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2592
msgid "Ignore whitespace differences"
msgstr "Ignorer les différences d'espace"
-#: builtin/blame.c:2552
+#: builtin/blame.c:2599
+msgid "Use an experimental indent-based heuristic to improve diffs"
+msgstr ""
+"Utiliser une heuristique expérimentale reposant sur l'indentation pour "
+"améliorer les diffs"
+
+#: builtin/blame.c:2600
+msgid "Use an experimental blank-line-based heuristic to improve diffs"
+msgstr ""
+"Utiliser une heuristique expérimentale reposant sur les lignes vides pour "
+"améliorer le diffs"
+
+#: builtin/blame.c:2602
msgid "Spend extra cycles to find better match"
msgstr ""
"Dépenser des cycles supplémentaires pour trouver une meilleure correspondance"
-#: builtin/blame.c:2553
+#: builtin/blame.c:2603
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:2554
+#: builtin/blame.c:2604
msgid "Use <file>'s contents as the final image"
msgstr "Utiliser le contenu de <fichier> comme image finale"
-#: builtin/blame.c:2555 builtin/blame.c:2556
+#: builtin/blame.c:2605 builtin/blame.c:2606
msgid "score"
msgstr "score"
-#: builtin/blame.c:2555
+#: builtin/blame.c:2605
msgid "Find line copies within and across files"
msgstr "Trouver les copies de ligne dans et entre les fichiers"
-#: builtin/blame.c:2556
+#: builtin/blame.c:2606
msgid "Find line movements within and across files"
msgstr "Trouver les mouvements de ligne dans et entre les fichiers"
-#: builtin/blame.c:2557
+#: builtin/blame.c:2607
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2557
+#: builtin/blame.c:2607
msgid "Process only line range n,m, counting from 1"
msgstr ""
"Traiter seulement l'intervalle de ligne n,m en commençant le compte à 1"
+#: builtin/blame.c:2654
+msgid "--progress can't be used with --incremental or porcelain formats"
+msgstr ""
+"--progress ne peut pas être utilisé avec --incremental ou les formats "
+"porcelaine"
+
#. 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:2649
+#: builtin/blame.c:2700
msgid "4 years, 11 months ago"
msgstr "il y a 10 ans et 11 mois"
+#: builtin/blame.c:2780
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents et --reverse ne font pas bon ménage."
+
+#: builtin/blame.c:2800
+msgid "cannot use --contents with final commit object name"
+msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final"
+
+#: builtin/blame.c:2805
+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"
+
+#: builtin/blame.c:2832
+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"
+
+#: builtin/blame.c:2843
+#, c-format
+msgid "no such path %s in %s"
+msgstr "pas de chemin %s dans %s"
+
+#: builtin/blame.c:2854
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "impossible de lire le blob %s pour le chemin %s"
+
+#: builtin/blame.c:2873
+#, 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/branch.c:26
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgid "change the upstream info"
msgstr "modifier l'information amont"
+#: builtin/branch.c:660
+msgid "Unset the upstream info"
+msgstr "Désactiver l'information amont"
+
#: builtin/branch.c:661
msgid "use colored output"
msgstr "utiliser la coloration dans la sortie"
msgid "field name to sort on"
msgstr "nom du champ servant à trier"
-#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402
-#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404
+#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570
#: builtin/tag.c:369
msgid "object"
msgstr "objet"
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Échec de résolution de HEAD comme référence valide."
-#: builtin/branch.c:709 builtin/clone.c:707
+#: builtin/branch.c:709 builtin/clone.c:706
msgid "HEAD not found below refs/heads!"
msgstr "HEAD non trouvée sous refs/heads !"
msgid "Need a repository to unbundle."
msgstr "Le dépaquetage d'un colis requiert un dépôt."
-#: builtin/cat-file.c:443
+#: builtin/cat-file.c:513
msgid ""
-"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
-"<type>|--textconv) <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-unknow-type] | -s [--allow-unknow-type] | -e | -p "
-"| <type> | --textconv) <objet>"
+"| <type> | --textconv | --filters) [--path=<chemin>] <objet>"
-#: builtin/cat-file.c:444
-msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
-msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
+#: builtin/cat-file.c:514
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
+msgstr ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
-#: builtin/cat-file.c:481
+#: builtin/cat-file.c:551
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<type> peut être : blob, tree, commit ou tag"
-#: builtin/cat-file.c:482
+#: builtin/cat-file.c:552
msgid "show object type"
msgstr "afficher le type de l'objet"
-#: builtin/cat-file.c:483
+#: builtin/cat-file.c:553
msgid "show object size"
msgstr "afficher la taille de l'objet"
-#: builtin/cat-file.c:485
+#: builtin/cat-file.c:555
msgid "exit with zero when there's no error"
msgstr "sortir avec un code d'erreur nul quand il n'y a aucune erreur"
-#: builtin/cat-file.c:486
+#: builtin/cat-file.c:556
msgid "pretty-print object's content"
msgstr "afficher avec mise en forme le contenu de l'objet"
-#: builtin/cat-file.c:488
+#: builtin/cat-file.c:558
msgid "for blob objects, run textconv on object's content"
msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet"
-#: builtin/cat-file.c:490
+#: builtin/cat-file.c:560
+msgid "for blob objects, run filters on object's content"
+msgstr "pour les objets blob, lancer les filtres sur le contenu de l'objet"
+
+#: builtin/cat-file.c:561 git-submodule.sh:923
+msgid "blob"
+msgstr "blob"
+
+#: builtin/cat-file.c:562
+msgid "use a specific path for --textconv/--filters"
+msgstr "utiliser un chemin spécifique pour --textconv/--filters"
+
+#: builtin/cat-file.c:564
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:491
+#: builtin/cat-file.c:565
msgid "buffer --batch output"
msgstr "bufferiser la sortie de --batch"
-#: builtin/cat-file.c:493
+#: builtin/cat-file.c:567
msgid "show info and content of objects fed from the standard input"
msgstr ""
"afficher l'information et le contenu des objets passés en entrée standard"
-#: builtin/cat-file.c:496
+#: builtin/cat-file.c:570
msgid "show info about objects fed from the standard input"
msgstr "afficher l'information des objets passés en entrée standard"
-#: builtin/cat-file.c:499
+#: builtin/cat-file.c:573
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"suivre les liens symbolique internes à la copie de travail (utilisé avec --"
"batch ou --batch-check)"
-#: builtin/cat-file.c:501
+#: builtin/cat-file.c:575
msgid "show all objects with --batch or --batch-check"
msgstr "montrer tous les objets avec --batch ou --batch-check"
msgid "use .gitattributes only from the index"
msgstr "utiliser .gitattributes seulement depuis l'index"
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97
+#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
msgid "read file names from stdin"
msgstr "lire les noms de fichier depuis l'entrée standard"
msgstr ""
"terminer les enregistrements en entrée et en sortie par un caractère NUL"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "supprimer l'état d'avancement"
msgstr "écrire le contenu dans des fichiers temporaires"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491
-#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497
-#: builtin/submodule--helper.c:830 builtin/worktree.c:469
+#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598
+#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951
+#: builtin/worktree.c:469
msgid "string"
msgstr "chaîne"
msgid "path '%s' is unmerged"
msgstr "le chemin '%s' n'est pas fusionné"
-#: builtin/checkout.c:495
+#: builtin/checkout.c:494
msgid "you need to resolve your current index first"
msgstr "vous devez d'abord résoudre votre index courant"
-#: builtin/checkout.c:625
+#: builtin/checkout.c:624
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Impossible de faire un reflog pour '%s' : %s\n"
-#: builtin/checkout.c:664
+#: builtin/checkout.c:663
msgid "HEAD is now at"
msgstr "HEAD est maintenant sur"
-#: builtin/checkout.c:668 builtin/clone.c:661
+#: builtin/checkout.c:667 builtin/clone.c:660
msgid "unable to update HEAD"
msgstr "impossible de mettre à jour HEAD"
-#: builtin/checkout.c:672
+#: builtin/checkout.c:671
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:675
+#: builtin/checkout.c:674
#, c-format
msgid "Already on '%s'\n"
msgstr "Déjà sur '%s'\n"
-#: builtin/checkout.c:679
+#: builtin/checkout.c:678
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Basculement et remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:681 builtin/checkout.c:1070
+#: builtin/checkout.c:680 builtin/checkout.c:1069
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Basculement sur la nouvelle branche '%s'\n"
-#: builtin/checkout.c:683
+#: builtin/checkout.c:682
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Basculement sur la branche '%s'\n"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:733
#, c-format
msgid " ... and %d more.\n"
msgstr " ... et %d en plus.\n"
-#: builtin/checkout.c:740
+#: builtin/checkout.c:739
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:759
+#: builtin/checkout.c:758
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
"git branch <nouvelle-branche> %s\n"
"\n"
-#: builtin/checkout.c:795
+#: builtin/checkout.c:794
msgid "internal error in revision walk"
msgstr "erreur interne lors du parcours des révisions"
-#: builtin/checkout.c:799
+#: builtin/checkout.c:798
msgid "Previous HEAD position was"
msgstr "La position précédente de HEAD était sur"
-#: builtin/checkout.c:826 builtin/checkout.c:1065
+#: builtin/checkout.c:825 builtin/checkout.c:1064
msgid "You are on a branch yet to be born"
msgstr "Vous êtes sur une branche qui doit encore naître"
-#: builtin/checkout.c:971
+#: builtin/checkout.c:970
#, c-format
msgid "only one reference expected, %d given."
msgstr "une seule référence attendue, %d fournies."
-#: builtin/checkout.c:1011 builtin/worktree.c:214
+#: builtin/checkout.c:1010 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr "référence invalide : %s"
-#: builtin/checkout.c:1040
+#: builtin/checkout.c:1039
#, c-format
msgid "reference is not a tree: %s"
msgstr "la référence n'est pas un arbre : %s"
-#: builtin/checkout.c:1079
+#: builtin/checkout.c:1078
msgid "paths cannot be used with switching branches"
msgstr "impossible d'utiliser des chemins avec un basculement de branches"
-#: builtin/checkout.c:1082 builtin/checkout.c:1086
+#: builtin/checkout.c:1081 builtin/checkout.c:1085
#, 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:1090 builtin/checkout.c:1093 builtin/checkout.c:1098
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097
+#: builtin/checkout.c:1100
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' ne peut pas être utilisé avec '%s'"
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1105
#, 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:1139 builtin/checkout.c:1141 builtin/clone.c:88
+#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93
#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
#: builtin/worktree.c:326
msgid "branch"
msgstr "branche"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1139
msgid "create and checkout a new branch"
msgstr "créer et extraire une nouvelle branche"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1141
msgid "create/reset and checkout a branch"
msgstr "créer/réinitialiser et extraire une branche"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1142
msgid "create reflog for new branch"
msgstr "créer un reflog pour une nouvelle branche"
-#: builtin/checkout.c:1144 builtin/worktree.c:328
+#: builtin/checkout.c:1143 builtin/worktree.c:328
msgid "detach HEAD at named commit"
msgstr "détacher la HEAD au commit nommé"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
msgid "set upstream info for new branch"
msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1146
msgid "new-branch"
msgstr "nouvelle branche"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1146
msgid "new unparented branch"
msgstr "nouvelle branche sans parent"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1147
msgid "checkout our version for unmerged files"
msgstr "extraire notre version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1149
msgid "checkout their version for unmerged files"
msgstr "extraire leur version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1151
msgid "force checkout (throw away local modifications)"
msgstr "forcer l'extraction (laisser tomber les modifications locales)"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1152
msgid "perform a 3-way merge with the new branch"
msgstr "effectuer une fusion à 3 points avec la nouvelle branche"
-#: builtin/checkout.c:1154 builtin/merge.c:231
+#: builtin/checkout.c:1153 builtin/merge.c:231
msgid "update ignored files (default)"
msgstr "mettre à jour les fichiers ignorés (par défaut)"
-#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250
+#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251
msgid "style"
msgstr "style"
-#: builtin/checkout.c:1156
+#: builtin/checkout.c:1155
msgid "conflict style (merge or diff3)"
msgstr "style de conflit (merge (fusion) ou diff3)"
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1158
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:1161
+#: builtin/checkout.c:1160
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'"
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1162
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:1164 builtin/clone.c:60 builtin/fetch.c:117
-#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536
+#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119
+#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "forcer l'affichage de l'état d'avancement"
-#: builtin/checkout.c:1195
+#: builtin/checkout.c:1194
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B et --orphan sont mutuellement exclusifs"
-#: builtin/checkout.c:1212
+#: builtin/checkout.c:1211
msgid "--track needs a branch name"
msgstr "--track requiert un nom de branche"
-#: builtin/checkout.c:1217
+#: builtin/checkout.c:1216
msgid "Missing branch name; try -b"
msgstr "Nom de branche manquant ; essayez -b"
-#: builtin/checkout.c:1253
+#: builtin/checkout.c:1252
msgid "invalid path specification"
msgstr "spécification de chemin invalide"
-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1259
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
"en même temps.\n"
"Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?"
-#: builtin/checkout.c:1265
+#: builtin/checkout.c:1264
#, 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:1269
+#: builtin/checkout.c:1268
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgid "remove whole directories"
msgstr "supprimer les répertoires entiers"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
-#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725
+#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182
msgid "pattern"
msgstr "motif"
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]"
-#: builtin/clone.c:62
+#: builtin/clone.c:65
msgid "don't create a checkout"
msgstr "ne pas créer d'extraction"
-#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476
+#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
msgid "create a bare repository"
msgstr "créer un dépôt nu"
-#: builtin/clone.c:67
+#: builtin/clone.c:70
msgid "create a mirror repository (implies bare)"
msgstr "créer un dépôt miroir (implique dépôt nu)"
-#: builtin/clone.c:69
+#: builtin/clone.c:72
msgid "to clone from a local repository"
msgstr "pour cloner depuis un dépôt local"
-#: builtin/clone.c:71
+#: builtin/clone.c:74
msgid "don't use local hardlinks, always copy"
msgstr "ne pas utiliser de liens durs locaux, toujours copier"
-#: builtin/clone.c:73
+#: builtin/clone.c:76
msgid "setup as shared repository"
msgstr "régler comme dépôt partagé"
-#: builtin/clone.c:75 builtin/clone.c:77
+#: builtin/clone.c:78 builtin/clone.c:80
msgid "initialize submodules in the clone"
msgstr "initialiser les sous-modules dans le clone"
-#: builtin/clone.c:79
+#: builtin/clone.c:82
msgid "number of submodules cloned in parallel"
msgstr "nombre de sous-modules clonés en parallèle"
-#: builtin/clone.c:80 builtin/init-db.c:473
+#: builtin/clone.c:83 builtin/init-db.c:475
msgid "template-directory"
msgstr "répertoire-modèle"
-#: builtin/clone.c:81 builtin/init-db.c:474
+#: builtin/clone.c:84 builtin/init-db.c:476
msgid "directory from which templates will be used"
msgstr "répertoire depuis lequel les modèles vont être utilisés"
-#: builtin/clone.c:83 builtin/submodule--helper.c:495
-#: builtin/submodule--helper.c:833
+#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602
+#: builtin/submodule--helper.c:954
msgid "reference repository"
msgstr "dépôt de référence"
-#: builtin/clone.c:85
+#: builtin/clone.c:90
msgid "use --reference only while cloning"
msgstr "utiliser seulement --reference pour cloner"
-#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr "nom"
-#: builtin/clone.c:87
+#: builtin/clone.c:92
msgid "use <name> instead of 'origin' to track upstream"
msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont"
-#: builtin/clone.c:89
+#: builtin/clone.c:94
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"
-#: builtin/clone.c:91
+#: builtin/clone.c:96
msgid "path to git-upload-pack on the remote"
msgstr "chemin vers git-upload-pack sur le serveur distant"
-#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667 builtin/pull.c:201
+#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668
+#: builtin/pull.c:202
msgid "depth"
msgstr "profondeur"
-#: builtin/clone.c:93
+#: builtin/clone.c:98
msgid "create a shallow clone of that depth"
msgstr "créer un clone superficiel de cette profondeur"
-#: builtin/clone.c:95
+#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848
+#: parse-options.h:142
+msgid "time"
+msgstr "heure"
+
+#: builtin/clone.c:100
+msgid "create a shallow clone since a specific time"
+msgstr "créer un clone superficiel depuis une date spécifique"
+
+#: builtin/clone.c:101 builtin/fetch.c:124
+msgid "revision"
+msgstr "révision"
+
+#: builtin/clone.c:102 builtin/fetch.c:125
+msgid "deepen history of shallow clone by excluding rev"
+msgstr ""
+"approfondir l'historique d'un clone superficiel en excluant une révision"
+
+#: builtin/clone.c:104
msgid "clone only one branch, HEAD or --branch"
msgstr "cloner seulement une branche, HEAD ou --branch"
-#: builtin/clone.c:97
+#: builtin/clone.c:106
msgid "any cloned submodules will be shallow"
msgstr "tous les sous-modules clonés seront superficiels"
-#: builtin/clone.c:98 builtin/init-db.c:482
+#: builtin/clone.c:107 builtin/init-db.c:484
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:99 builtin/init-db.c:483
+#: builtin/clone.c:108 builtin/init-db.c:485
msgid "separate git dir from working tree"
msgstr "séparer le répertoire git de la copie de travail"
-#: builtin/clone.c:100
+#: builtin/clone.c:109
msgid "key=value"
msgstr "clé=valeur"
-#: builtin/clone.c:101
+#: builtin/clone.c:110
msgid "set config inside the new repository"
msgstr "régler la configuration dans le nouveau dépôt"
-#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547
+#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547
msgid "use IPv4 addresses only"
msgstr "n'utiliser que des adresses IPv4"
-#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549
+#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549
msgid "use IPv6 addresses only"
msgstr "n'utiliser que des adresses IPv6"
-#: builtin/clone.c:241
+#: builtin/clone.c:250
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"Aucun nom de répertoire n'a pu être deviné\n"
"Veuillez spécifier un répertoire dans la ligne de commande"
-#: builtin/clone.c:307
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr ""
-"extraire le dépôt de référence '%s' comme une extraction liée n'est pas "
-"encore supporté."
-
-#: builtin/clone.c:309
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "le dépôt de référence '%s' n'est pas un dépôt local."
-
-#: builtin/clone.c:314
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "le dépôt de référence '%s' est superficiel"
-
-#: builtin/clone.c:317
+#: builtin/clone.c:303
#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "le dépôt de référence '%s' est greffé"
+msgid "info: Could not add alternate for '%s': %s\n"
+msgstr "info : impossible d'ajouter une alternative pour '%s' : %s\n"
-#: builtin/clone.c:376
+#: builtin/clone.c:375
#, c-format
msgid "failed to open '%s'"
msgstr "échec à l'ouverture de '%s'"
-#: builtin/clone.c:384
+#: builtin/clone.c:383
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existe et n'est pas un répertoire"
-#: builtin/clone.c:398
+#: builtin/clone.c:397
#, c-format
msgid "failed to stat %s\n"
msgstr "échec du stat de %s\n"
-#: builtin/clone.c:420
+#: builtin/clone.c:419
#, c-format
msgid "failed to create link '%s'"
msgstr "échec de la création du lien '%s'"
-#: builtin/clone.c:424
+#: builtin/clone.c:423
#, c-format
msgid "failed to copy file to '%s'"
msgstr "échec de la copie vers '%s'"
-#: builtin/clone.c:449
+#: builtin/clone.c:448
#, c-format
msgid "done.\n"
msgstr "fait.\n"
-#: builtin/clone.c:461
+#: builtin/clone.c:460
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"Vous pouvez inspecter ce qui a été extrait avec 'git status'\n"
"et réessayer l'extraction avec 'git checkout -f HEAD'\n"
-#: builtin/clone.c:538
+#: builtin/clone.c:537
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Impossible de trouver la branche distante '%s' à cloner."
-#: builtin/clone.c:633
+#: builtin/clone.c:632
msgid "remote did not send all necessary objects"
msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"
-#: builtin/clone.c:649
+#: builtin/clone.c:648
#, c-format
msgid "unable to update %s"
msgstr "impossible de mettre à jour %s"
-#: builtin/clone.c:698
+#: builtin/clone.c:697
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:729
+#: builtin/clone.c:728
msgid "unable to checkout working tree"
msgstr "impossible d'extraire la copie de travail"
-#: builtin/clone.c:766
+#: builtin/clone.c:768
msgid "unable to write parameters to config file"
msgstr "impossible d'écrire les paramètres dans le fichier de configuration"
-#: builtin/clone.c:829
+#: builtin/clone.c:831
msgid "cannot repack to clean up"
msgstr "impossible de remballer pour nettoyer"
-#: builtin/clone.c:831
+#: builtin/clone.c:833
msgid "cannot unlink temporary alternates file"
msgstr "impossible de unlinker le fichier temporaire alternates"
-#: builtin/clone.c:863 builtin/receive-pack.c:1855
+#: builtin/clone.c:866 builtin/receive-pack.c:1895
msgid "Too many arguments."
msgstr "Trop d'arguments."
-#: builtin/clone.c:867
+#: builtin/clone.c:870
msgid "You must specify a repository to clone."
msgstr "Vous devez spécifier un dépôt à cloner."
-#: builtin/clone.c:878
+#: builtin/clone.c:883
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "les options --bare et --origin %s sont incompatibles."
-#: builtin/clone.c:881
+#: builtin/clone.c:886
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare et --separate-git-dir sont incompatibles."
-#: builtin/clone.c:894
+#: builtin/clone.c:899
#, c-format
msgid "repository '%s' does not exist"
msgstr "le dépôt '%s' n'existe pas"
-#: builtin/clone.c:900 builtin/fetch.c:1293
+#: builtin/clone.c:905 builtin/fetch.c:1338
#, c-format
msgid "depth %s is not a positive number"
msgstr "la profondeur %s n'est pas un entier positif"
-#: builtin/clone.c:910
+#: builtin/clone.c:915
#, 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:920
+#: builtin/clone.c:925
#, c-format
msgid "working tree '%s' already exists."
msgstr "la copie de travail '%s' existe déjà."
-#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544
+#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657
#: builtin/worktree.c:222 builtin/worktree.c:249
#, 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:938
+#: builtin/clone.c:943
#, 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:956
+#: builtin/clone.c:955
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Clonage dans le dépôt nu '%s'\n"
-#: builtin/clone.c:958
+#: builtin/clone.c:957
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clonage dans '%s'...\n"
-#: builtin/clone.c:997
+#: builtin/clone.c:963
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
+msgstr ""
+"clone --recursive n'est pas compatible avec à la fois --reference et --"
+"reference-if-able"
+
+#: builtin/clone.c:1019
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:1000
+#: builtin/clone.c:1021
+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:1023
+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:1026
msgid "source repository is shallow, ignoring --local"
msgstr "le dépôt source est superficiel, option --local ignorée"
-#: builtin/clone.c:1005
+#: builtin/clone.c:1031
msgid "--local is ignored"
msgstr "--local est ignoré"
-#: builtin/clone.c:1009
+#: builtin/clone.c:1035
#, c-format
msgid "Don't know how to clone %s"
msgstr "Je ne sais pas cloner %s"
-#: builtin/clone.c:1058 builtin/clone.c:1066
+#: builtin/clone.c:1090 builtin/clone.c:1098
#, 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:1069
+#: builtin/clone.c:1101
msgid "You appear to have cloned an empty repository."
msgstr "Vous semblez avoir cloné un dépôt vide."
"Puis \"git cherry-pick --continue\" continuera le picorage \n"
"des commits restants.\n"
-#: builtin/commit.c:308
+#: builtin/commit.c:318
msgid "failed to unpack HEAD tree object"
msgstr "échec du dépaquetage de l'objet arbre HEAD"
-#: builtin/commit.c:349
+#: builtin/commit.c:359
msgid "unable to create temporary index"
msgstr "impossible de créer l'index temporaire"
-#: builtin/commit.c:355
+#: builtin/commit.c:365
msgid "interactive add failed"
msgstr "échec de l'ajout interactif"
-#: builtin/commit.c:368
+#: builtin/commit.c:378
msgid "unable to update temporary index"
msgstr "impossible de mettre à jour l'index temporaire"
-#: builtin/commit.c:370
+#: builtin/commit.c:380
msgid "Failed to update main cache tree"
msgstr "Impossible de mettre à jour l'arbre de cache principal"
-#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466
+#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
msgid "unable to write new_index file"
msgstr "impossible d'écrire le fichier new_index"
-#: builtin/commit.c:448
+#: builtin/commit.c:458
msgid "cannot do a partial commit during a merge."
msgstr "impossible de faire une validation partielle pendant une fusion."
-#: builtin/commit.c:450
+#: builtin/commit.c:460
msgid "cannot do a partial commit during a cherry-pick."
msgstr "impossible de faire une validation partielle pendant un picorage."
-#: builtin/commit.c:459
+#: builtin/commit.c:469
msgid "cannot read the index"
msgstr "impossible de lire l'index"
-#: builtin/commit.c:478
+#: builtin/commit.c:488
msgid "unable to write temporary index file"
msgstr "impossible d'écrire le fichier d'index temporaire"
-#: builtin/commit.c:583
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "entête d'auteur manquant dans le commit '%s'"
-#: builtin/commit.c:585
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "le commit '%s' a une ligne d'auteur malformée"
-#: builtin/commit.c:604
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "paramètre --author mal formé"
-#: builtin/commit.c:612
+#: builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "format de date invalide : %s"
-#: builtin/commit.c:656
+#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
"impossible de sélectionner un caractère de commentaire\n"
"qui n'est pas utilisé dans le message de validation actuel"
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
#, c-format
msgid "could not lookup commit %s"
msgstr "impossible de rechercher le commit %s"
-#: builtin/commit.c:705 builtin/shortlog.c:286
+#: builtin/commit.c:704 builtin/shortlog.c:286
#, 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:707
+#: builtin/commit.c:706
msgid "could not read log from standard input"
msgstr "impossible de lire le journal depuis l'entrée standard"
-#: builtin/commit.c:711
+#: builtin/commit.c:710
#, c-format
msgid "could not read log file '%s'"
msgstr "impossible de lire le fichier de journal '%s'"
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:737 builtin/commit.c:745
msgid "could not read SQUASH_MSG"
msgstr "impossible de lire SQUASH_MSG"
-#: builtin/commit.c:743
+#: builtin/commit.c:742
msgid "could not read MERGE_MSG"
msgstr "impossible de lire MERGE_MSG"
-#: builtin/commit.c:797
+#: builtin/commit.c:796
msgid "could not write commit template"
msgstr "impossible d'écrire le modèle de commit"
-#: builtin/commit.c:815
+#: builtin/commit.c:814
#, c-format
msgid ""
"\n"
"\t%s\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
"\t%s\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:833
+#: builtin/commit.c:832
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"commençant par '%c' seront ignorées, et un message vide abandonne la "
"validation.\n"
-#: builtin/commit.c:840
+#: builtin/commit.c:839
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"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:860
+#: builtin/commit.c:859
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAuteur : %.*s <%.*s>"
-#: builtin/commit.c:868
+#: builtin/commit.c:867
#, c-format
msgid "%sDate: %s"
msgstr "%sDate : %s"
-#: builtin/commit.c:875
+#: builtin/commit.c:874
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sValidateur : %.*s <%.*s>"
-#: builtin/commit.c:893
+#: builtin/commit.c:892
msgid "Cannot read index"
msgstr "Impossible de lire l'index"
-#: builtin/commit.c:950
+#: builtin/commit.c:954
msgid "Error building trees"
msgstr "Erreur lors de la construction des arbres"
-#: builtin/commit.c:965 builtin/tag.c:266
+#: builtin/commit.c:969 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n"
-#: builtin/commit.c:1067
+#: builtin/commit.c:1071
#, 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:1082 builtin/commit.c:1322
+#: builtin/commit.c:1086 builtin/commit.c:1327
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode de fichier non suivi invalide '%s'"
-#: builtin/commit.c:1119
+#: builtin/commit.c:1124
msgid "--long and -z are incompatible"
msgstr "--long et -z sont incompatibles"
-#: builtin/commit.c:1149
+#: builtin/commit.c:1154
msgid "Using both --reset-author and --author does not make sense"
msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens"
-#: builtin/commit.c:1158
+#: builtin/commit.c:1163
msgid "You have nothing to amend."
msgstr "Il n'y a rien à corriger."
-#: builtin/commit.c:1161
+#: builtin/commit.c:1166
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."
-#: builtin/commit.c:1163
+#: builtin/commit.c:1168
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:1166
+#: builtin/commit.c:1171
msgid "Options --squash and --fixup cannot be used together"
msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble"
-#: builtin/commit.c:1176
+#: builtin/commit.c:1181
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée."
-#: builtin/commit.c:1178
+#: builtin/commit.c:1183
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F/--fixup."
-#: builtin/commit.c:1186
+#: builtin/commit.c:1191
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:1203
+#: builtin/commit.c:1208
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Une seule option parmi --include/--only/--all/--interactive/--patch peut "
"être utilisée."
-#: builtin/commit.c:1205
+#: builtin/commit.c:1210
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:1207
+#: builtin/commit.c:1212
msgid "Clever... amending the last one with dirty index."
msgstr "Malin... correction du dernier avec un index sale."
-#: builtin/commit.c:1209
+#: builtin/commit.c:1214
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..."
-#: builtin/commit.c:1221 builtin/tag.c:474
+#: builtin/commit.c:1226 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Mode de nettoyage invalide %s"
-#: builtin/commit.c:1226
+#: builtin/commit.c:1231
msgid "Paths with -a does not make sense."
msgstr "Spécifier des chemins avec l'option -a n'a pas de sens."
-#: builtin/commit.c:1336 builtin/commit.c:1622
+#: builtin/commit.c:1341 builtin/commit.c:1617
msgid "show status concisely"
msgstr "afficher le statut avec concision"
-#: builtin/commit.c:1338 builtin/commit.c:1624
+#: builtin/commit.c:1343 builtin/commit.c:1619
msgid "show branch information"
msgstr "afficher l'information de branche"
-#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522
+#: builtin/commit.c:1345
+msgid "version"
+msgstr "version"
+
+#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522
#: builtin/worktree.c:440
msgid "machine-readable output"
msgstr "sortie pour traitement automatique"
-#: builtin/commit.c:1343 builtin/commit.c:1628
+#: builtin/commit.c:1348 builtin/commit.c:1623
msgid "show status in long format (default)"
msgstr "afficher le statut en format long (par défaut)"
-#: builtin/commit.c:1346 builtin/commit.c:1631
+#: builtin/commit.c:1351 builtin/commit.c:1626
msgid "terminate entries with NUL"
msgstr "terminer les éléments par NUL"
-#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981
+#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1349 builtin/commit.c:1634
+#: builtin/commit.c:1354 builtin/commit.c:1629
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:1352
+#: builtin/commit.c:1357
msgid "show ignored files"
msgstr "afficher les fichiers ignorés"
-#: builtin/commit.c:1353 parse-options.h:155
+#: builtin/commit.c:1358 parse-options.h:155
msgid "when"
msgstr "quand"
-#: builtin/commit.c:1354
+#: builtin/commit.c:1359
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
"ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "
"(tous), dirty (sale), untracked (non suivi). (Défaut : all)"
-#: builtin/commit.c:1356
+#: builtin/commit.c:1361
msgid "list untracked files in columns"
msgstr "afficher les fichiers non suivis en colonnes"
-#: builtin/commit.c:1442
+#: builtin/commit.c:1437
msgid "couldn't look up newly created commit"
msgstr "impossible de retrouver le commit nouvellement créé"
-#: builtin/commit.c:1444
+#: builtin/commit.c:1439
msgid "could not parse newly created commit"
msgstr "impossible d'analyser le commit nouvellement créé"
-#: builtin/commit.c:1489
+#: builtin/commit.c:1484
msgid "detached HEAD"
msgstr "HEAD détachée"
-#: builtin/commit.c:1492
+#: builtin/commit.c:1487
msgid " (root-commit)"
msgstr " (commit racine)"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1587
msgid "suppress summary after successful commit"
msgstr "supprimer le résumé après une validation réussie"
-#: builtin/commit.c:1593
+#: builtin/commit.c:1588
msgid "show diff in commit message template"
msgstr "afficher les diff dans le modèle de message de validation"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1590
msgid "Commit message options"
msgstr "Options du message de validation"
-#: builtin/commit.c:1596 builtin/tag.c:351
+#: builtin/commit.c:1591 builtin/tag.c:351
msgid "read message from file"
msgstr "lire le message depuis un fichier"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1592
msgid "author"
msgstr "auteur"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1592
msgid "override author for commit"
msgstr "remplacer l'auteur pour la validation"
-#: builtin/commit.c:1598 builtin/gc.c:326
+#: builtin/commit.c:1593 builtin/gc.c:326
msgid "date"
msgstr "date"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1593
msgid "override date for commit"
msgstr "remplacer la date pour la validation"
-#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396
-#: builtin/notes.c:559 builtin/tag.c:349
+#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398
+#: builtin/notes.c:561 builtin/tag.c:349
msgid "message"
msgstr "message"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1594
msgid "commit message"
msgstr "message de validation"
-#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602
-#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
+#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79
msgid "commit"
msgstr "commit"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1595
msgid "reuse and edit message from specified commit"
msgstr "réutiliser et éditer le message du commit spécifié"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1596
msgid "reuse message from specified commit"
msgstr "réutiliser le message du commit spécifié"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1597
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"utiliser un message au format autosquash pour corriger le commit spécifié"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1598
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:1604
+#: builtin/commit.c:1599
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:1605 builtin/log.c:1409 builtin/revert.c:86
+#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "ajouter une entrée Signed-off-by :"
-#: builtin/commit.c:1606
+#: builtin/commit.c:1601
msgid "use specified template file"
msgstr "utiliser le fichier de modèle spécifié"
-#: builtin/commit.c:1607
+#: builtin/commit.c:1602
msgid "force edit of commit"
msgstr "forcer l'édition du commit"
-#: builtin/commit.c:1608
+#: builtin/commit.c:1603
msgid "default"
msgstr "défaut"
-#: builtin/commit.c:1608 builtin/tag.c:354
+#: builtin/commit.c:1603 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "comment éliminer les espaces et les commentaires # du message"
-#: builtin/commit.c:1609
+#: builtin/commit.c:1604
msgid "include status in commit message template"
msgstr "inclure le statut dans le modèle de message de validation"
-#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165
+#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "signer la validation avec GPG"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1609
msgid "Commit contents options"
msgstr "Valider les options des contenus"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1610
msgid "commit all changed files"
msgstr "valider tous les fichiers modifiés"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1611
msgid "add specified files to index for commit"
msgstr "ajouter les fichiers spécifiés à l'index pour la validation"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1612
msgid "interactively add files"
msgstr "ajouter des fichiers en mode interactif"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1613
msgid "interactively add changes"
msgstr "ajouter les modifications en mode interactif"
-#: builtin/commit.c:1619
+#: builtin/commit.c:1614
msgid "commit only specified files"
msgstr "valider seulement les fichiers spécifiés"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1615
msgid "bypass pre-commit and commit-msg hooks"
msgstr "éviter d'utiliser les crochets pre-commit et commit-msg"
-#: builtin/commit.c:1621
+#: builtin/commit.c:1616
msgid "show what would be committed"
msgstr "afficher ce qui serait validé"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1627
msgid "amend previous commit"
msgstr "corriger la validation précédente"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1628
msgid "bypass post-rewrite hook"
msgstr "éviter d'utiliser le crochet post-rewrite"
-#: builtin/commit.c:1638
+#: builtin/commit.c:1633
msgid "ok to record an empty change"
msgstr "accepter d'enregistrer une modification vide"
-#: builtin/commit.c:1640
+#: builtin/commit.c:1635
msgid "ok to record a change with an empty message"
msgstr "accepter d'enregistrer une modification avec un message vide"
-#: builtin/commit.c:1669
+#: builtin/commit.c:1664
msgid "could not parse HEAD commit"
msgstr "impossible d'analyser le commit HEAD"
-#: builtin/commit.c:1719
+#: builtin/commit.c:1712
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fichier MERGE_HEAD corrompu (%s)"
-#: builtin/commit.c:1726
+#: builtin/commit.c:1719
msgid "could not read MERGE_MODE"
msgstr "impossible de lire MERGE_MODE"
-#: builtin/commit.c:1745
+#: builtin/commit.c:1738
#, c-format
msgid "could not read commit message: %s"
msgstr "impossible de lire le message de validation : %s"
-#: builtin/commit.c:1756
+#: builtin/commit.c:1749
#, 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:1761
-#, c-format
+#: builtin/commit.c:1754
+#, fuzzy, c-format
msgid "Aborting commit due to empty commit message.\n"
-msgstr "Abandon de la validation du à un message de validation vide\n"
+msgstr "Abandon de la validation dû à un message de validation vide\n"
-#: builtin/commit.c:1809
+#: builtin/commit.c:1802
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
msgid "cannot create configuration file %s"
msgstr "création impossible du fichier de configuration '%s'"
-#: builtin/count-objects.c:77
+#: builtin/config.c:625
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+" Use a regexp, --add or --replace-all to change %s."
+msgstr ""
+"impossible de surcharger des valeurs multiples avec une seule valeur\n"
+" Utilisez une regexp, --add ou --replace-all pour modifier %s."
+
+#: builtin/count-objects.c:86
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:96
msgid "print sizes in human readable format"
msgstr "affiche les tailles dans un format humainement lisible"
msgid "only consider tags matching <pattern>"
msgstr "ne considérer que les étiquettes correspondant à <motif>"
-#: builtin/describe.c:410 builtin/name-rev.c:321
+#: builtin/describe.c:410 builtin/name-rev.c:320
msgid "show abbreviated commit object as fallback"
msgstr "afficher les objets commits abrégés en dernier recours"
msgid "invalid option: %s"
msgstr "option invalide : %s"
-#: builtin/diff.c:360
+#: builtin/diff.c:361
msgid "Not a git repository"
msgstr "Ce n'est pas un dépôt git !"
-#: builtin/diff.c:403
+#: builtin/diff.c:404
#, c-format
msgid "invalid object '%s' given."
msgstr "objet spécifié '%s' invalide."
-#: builtin/diff.c:412
+#: builtin/diff.c:413
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "plus de deux blobs spécifiés : '%s'"
-#: builtin/diff.c:419
+#: builtin/diff.c:420
#, c-format
msgid "unhandled object '%s' given."
msgstr "objet non géré '%s' spécifié."
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<options>]"
-#: builtin/fetch.c:93 builtin/pull.c:174
+#: builtin/fetch.c:95 builtin/pull.c:175
msgid "fetch from all remotes"
msgstr "récupérer depuis tous les dépôts distants"
-#: builtin/fetch.c:95 builtin/pull.c:177
+#: builtin/fetch.c:97 builtin/pull.c:178
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser"
-#: builtin/fetch.c:97 builtin/pull.c:180
+#: builtin/fetch.c:99 builtin/pull.c:181
msgid "path to upload pack on remote end"
msgstr "chemin vers lequel télécharger le paquet sur le poste distant"
-#: builtin/fetch.c:98 builtin/pull.c:182
+#: builtin/fetch.c:100 builtin/pull.c:183
msgid "force overwrite of local branch"
msgstr "forcer l'écrasement de la branche locale"
-#: builtin/fetch.c:100
+#: builtin/fetch.c:102
msgid "fetch from multiple remotes"
msgstr "récupérer depuis plusieurs dépôts distants"
-#: builtin/fetch.c:102 builtin/pull.c:184
+#: builtin/fetch.c:104 builtin/pull.c:185
msgid "fetch all tags and associated objects"
msgstr "récupérer toutes les étiquettes et leurs objets associés"
-#: builtin/fetch.c:104
+#: builtin/fetch.c:106
msgid "do not fetch all tags (--no-tags)"
msgstr "ne pas récupérer toutes les étiquettes (--no-tags)"
-#: builtin/fetch.c:106
+#: builtin/fetch.c:108
msgid "number of submodules fetched in parallel"
msgstr "nombre de sous-modules récupérés en parallèle"
-#: builtin/fetch.c:108 builtin/pull.c:187
+#: builtin/fetch.c:110 builtin/pull.c:188
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:109 builtin/pull.c:190
+#: builtin/fetch.c:111 builtin/pull.c:191
msgid "on-demand"
msgstr "à la demande"
-#: builtin/fetch.c:110 builtin/pull.c:191
+#: builtin/fetch.c:112 builtin/pull.c:192
msgid "control recursive fetching of submodules"
msgstr "contrôler la récupération récursive dans les sous-modules"
-#: builtin/fetch.c:114 builtin/pull.c:199
+#: builtin/fetch.c:116 builtin/pull.c:200
msgid "keep downloaded pack"
msgstr "conserver le paquet téléchargé"
-#: builtin/fetch.c:116
+#: builtin/fetch.c:118
msgid "allow updating of HEAD ref"
msgstr "permettre la mise à jour de la référence HEAD"
-#: builtin/fetch.c:119 builtin/pull.c:202
+#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
msgid "deepen history of shallow clone"
msgstr "approfondir l'historique d'un clone superficiel"
-#: builtin/fetch.c:121 builtin/pull.c:205
+#: builtin/fetch.c:123
+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:129 builtin/pull.c:206
msgid "convert to a complete repository"
msgstr "convertir en un dépôt complet"
-#: builtin/fetch.c:123 builtin/log.c:1426
+#: builtin/fetch.c:131 builtin/log.c:1433
msgid "dir"
msgstr "répertoire"
-#: builtin/fetch.c:124
+#: builtin/fetch.c:132
msgid "prepend this to submodule path output"
msgstr "préfixer ceci à la sortie du chemin du sous-module"
-#: builtin/fetch.c:127
+#: builtin/fetch.c:135
msgid "default mode for recursion"
msgstr "mode par défaut pour la récursion"
-#: builtin/fetch.c:129 builtin/pull.c:208
+#: builtin/fetch.c:137 builtin/pull.c:209
msgid "accept refs that update .git/shallow"
msgstr "accepter les références qui mettent à jour .git/shallow"
-#: builtin/fetch.c:130 builtin/pull.c:210
+#: builtin/fetch.c:138 builtin/pull.c:211
msgid "refmap"
msgstr "correspondance de référence"
-#: builtin/fetch.c:131 builtin/pull.c:211
+#: builtin/fetch.c:139 builtin/pull.c:212
msgid "specify fetch refmap"
msgstr "spécifier une correspondance de référence pour la récupération"
-#: builtin/fetch.c:387
+#: builtin/fetch.c:398
msgid "Couldn't find remote ref HEAD"
msgstr "impossible de trouver la référence HEAD distante"
-#: builtin/fetch.c:503
+#: builtin/fetch.c:514
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr ""
"le paramètre de configuration fetch.output contient une valeur invalide %s"
-#: builtin/fetch.c:592
+#: builtin/fetch.c:607
#, c-format
msgid "object %s not found"
msgstr "objet %s non trouvé"
-#: builtin/fetch.c:596
+#: builtin/fetch.c:611
msgid "[up to date]"
msgstr "[à jour]"
-#: builtin/fetch.c:609 builtin/fetch.c:689
+#: builtin/fetch.c:624 builtin/fetch.c:704
msgid "[rejected]"
msgstr "[rejeté]"
-#: builtin/fetch.c:610
+#: builtin/fetch.c:625
msgid "can't fetch in current branch"
msgstr "impossible de récupérer dans la branche actuelle"
-#: builtin/fetch.c:619
+#: builtin/fetch.c:634
msgid "[tag update]"
msgstr "[mise à jour de l'étiquette]"
-#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669
-#: builtin/fetch.c:684
+#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684
+#: builtin/fetch.c:699
msgid "unable to update local ref"
msgstr "impossible de mettre à jour la référence locale"
-#: builtin/fetch.c:639
+#: builtin/fetch.c:654
msgid "[new tag]"
msgstr "[nouvelle étiquette]"
-#: builtin/fetch.c:642
+#: builtin/fetch.c:657
msgid "[new branch]"
msgstr "[nouvelle branche]"
-#: builtin/fetch.c:645
+#: builtin/fetch.c:660
msgid "[new ref]"
msgstr "[nouvelle référence]"
-#: builtin/fetch.c:684
+#: builtin/fetch.c:699
msgid "forced update"
msgstr "mise à jour forcée"
-#: builtin/fetch.c:689
+#: builtin/fetch.c:704
msgid "non-fast-forward"
msgstr "pas en avance rapide"
-#: builtin/fetch.c:733
+#: builtin/fetch.c:749
#, 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:753
+#: builtin/fetch.c:769
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"%s rejeté parce que les racines superficielles ne sont pas mises à jour"
-#: builtin/fetch.c:839 builtin/fetch.c:934
+#: builtin/fetch.c:856 builtin/fetch.c:952
#, c-format
msgid "From %.*s\n"
msgstr "Depuis %.*s\n"
-#: builtin/fetch.c:850
+#: builtin/fetch.c:867
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
"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:904
+#: builtin/fetch.c:922
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s sera en suspens)"
-#: builtin/fetch.c:905
+#: builtin/fetch.c:923
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s est devenu en suspens)"
-#: builtin/fetch.c:937
+#: builtin/fetch.c:955
msgid "[deleted]"
msgstr "[supprimé]"
-#: builtin/fetch.c:938 builtin/remote.c:1020
+#: builtin/fetch.c:956 builtin/remote.c:1020
msgid "(none)"
msgstr "(aucun(e))"
-#: builtin/fetch.c:960
+#: builtin/fetch.c:979
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu"
-#: builtin/fetch.c:979
+#: builtin/fetch.c:998
#, 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:982
+#: builtin/fetch.c:1001
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "L'option \"%s\" est ignorée pour %s\n"
-#: builtin/fetch.c:1039
+#: builtin/fetch.c:1077
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Je ne sais pas récupérer depuis %s"
-#: builtin/fetch.c:1199
+#: builtin/fetch.c:1237
#, c-format
msgid "Fetching %s\n"
msgstr "Récupération de %s\n"
-#: builtin/fetch.c:1201 builtin/remote.c:96
+#: builtin/fetch.c:1239 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "Impossible de récupérer %s"
-#: builtin/fetch.c:1219
+#: builtin/fetch.c:1257
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
"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:1242
+#: builtin/fetch.c:1280
msgid "You need to specify a tag name."
msgstr "Vous devez spécifier un nom d'étiquette."
-#: builtin/fetch.c:1284
+#: builtin/fetch.c:1322
+msgid "Negative depth in --deepen is not supported"
+msgstr "Une profondeur négative dans --deepen n'est pas supportée"
+
+#: builtin/fetch.c:1324
+msgid "--deepen and --depth are mutually exclusive"
+msgstr "--deepen et --depth sont mutuellement exclusifs"
+
+#: builtin/fetch.c:1329
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"
-#: builtin/fetch.c:1286
+#: builtin/fetch.c:1331
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:1306
+#: builtin/fetch.c:1353
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all n'accepte pas d'argument de dépôt"
-#: builtin/fetch.c:1308
+#: builtin/fetch.c:1355
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:1319
+#: builtin/fetch.c:1366
#, c-format
msgid "No such remote or remote group: %s"
msgstr "distant ou groupe distant inexistant : %s"
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1374
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
"La récupération d'un groupe et les spécifications de référence n'ont pas de "
msgstr ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]"
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:663
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:670
+#: builtin/fmt-merge-msg.c:666
msgid "alias for --log (deprecated)"
msgstr "alias pour --log (obsolète)"
-#: builtin/fmt-merge-msg.c:673
+#: builtin/fmt-merge-msg.c:669
msgid "text"
msgstr "texte"
-#: builtin/fmt-merge-msg.c:674
+#: builtin/fmt-merge-msg.c:670
msgid "use <text> as start of message"
msgstr "utiliser <texte> comme début de message"
-#: builtin/fmt-merge-msg.c:675
+#: builtin/fmt-merge-msg.c:671
msgid "file to read from"
msgstr "fichier d'où lire"
msgid "show verbose names for reachable objects"
msgstr "afficher les noms étendus pour les objets inaccessibles"
-#: builtin/fsck.c:671
+#: builtin/fsck.c:665
msgid "Checking objects"
msgstr "Vérification des objets"
msgid "invalid number of threads specified (%d) for %s"
msgstr "nombre de fils spécifié invalide (%d) pour %s"
-#: builtin/grep.c:452 builtin/grep.c:487
+#: builtin/grep.c:453 builtin/grep.c:488
#, c-format
msgid "unable to read tree (%s)"
msgstr "impossible de lire l'arbre (%s)"
-#: builtin/grep.c:502
+#: builtin/grep.c:503
#, 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:560
+#: builtin/grep.c:561
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "l'option '%c' attend un valeur numérique"
-#: builtin/grep.c:577
-#, c-format
-msgid "cannot open '%s'"
-msgstr "impossible d'ouvrir '%s'"
-
-#: builtin/grep.c:646
+#: builtin/grep.c:647
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:648
+#: builtin/grep.c:649
msgid "find in contents not managed by git"
msgstr "rechercher dans les contenus non gérés par git"
-#: builtin/grep.c:650
+#: builtin/grep.c:651
msgid "search in both tracked and untracked files"
msgstr "rechercher dans les fichiers suivis et non-suivis"
-#: builtin/grep.c:652
+#: builtin/grep.c:653
msgid "ignore files specified via '.gitignore'"
msgstr "ignorer les fichiers spécifiés via '.gitignore'"
-#: builtin/grep.c:655
+#: builtin/grep.c:656
msgid "show non-matching lines"
msgstr "afficher les lignes qui ne correspondent pas"
-#: builtin/grep.c:657
+#: builtin/grep.c:658
msgid "case insensitive matching"
msgstr "correspondance insensible à la casse"
-#: builtin/grep.c:659
+#: builtin/grep.c:660
msgid "match patterns only at word boundaries"
msgstr "rechercher les motifs aux séparateurs de mots"
-#: builtin/grep.c:661
+#: builtin/grep.c:662
msgid "process binary files as text"
msgstr "traiter les fichiers binaires comme texte"
-#: builtin/grep.c:663
+#: builtin/grep.c:664
msgid "don't match patterns in binary files"
msgstr "ne pas chercher les motifs dans les fichiers binaires"
-#: builtin/grep.c:666
+#: builtin/grep.c:667
msgid "process binary files with textconv filters"
msgstr "traiter les fichiers binaires avec les filtres textconv"
-#: builtin/grep.c:668
+#: builtin/grep.c:669
msgid "descend at most <depth> levels"
msgstr "descendre au plus de <profondeur> dans l'arborescence"
-#: builtin/grep.c:672
+#: builtin/grep.c:673
msgid "use extended POSIX regular expressions"
msgstr "utiliser des expressions régulières étendues POSIX"
-#: builtin/grep.c:675
+#: builtin/grep.c:676
msgid "use basic POSIX regular expressions (default)"
msgstr "utiliser des expressions régulières basiques POSIX (par défaut)"
-#: builtin/grep.c:678
+#: builtin/grep.c:679
msgid "interpret patterns as fixed strings"
msgstr "interpréter les motifs comme de chaînes fixes"
-#: builtin/grep.c:681
+#: builtin/grep.c:682
msgid "use Perl-compatible regular expressions"
msgstr "utiliser des expressions régulières compatibles avec Perl"
-#: builtin/grep.c:684
+#: builtin/grep.c:685
msgid "show line numbers"
msgstr "afficher les numéros de ligne"
-#: builtin/grep.c:685
+#: builtin/grep.c:686
msgid "don't show filenames"
msgstr "ne pas pas afficher les noms de fichier"
-#: builtin/grep.c:686
+#: builtin/grep.c:687
msgid "show filenames"
msgstr "afficher les noms de fichier"
-#: builtin/grep.c:688
+#: builtin/grep.c:689
msgid "show filenames relative to top directory"
msgstr "afficher les noms de fichiers relativement au répertoire de base"
-#: builtin/grep.c:690
+#: builtin/grep.c:691
msgid "show only filenames instead of matching lines"
msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant"
-#: builtin/grep.c:692
+#: builtin/grep.c:693
msgid "synonym for --files-with-matches"
msgstr "synonyme pour --files-with-matches"
-#: builtin/grep.c:695
+#: builtin/grep.c:696
msgid "show only the names of files without match"
msgstr "n'afficher que les noms des fichiers sans correspondance"
-#: builtin/grep.c:697
+#: builtin/grep.c:698
msgid "print NUL after filenames"
msgstr "imprimer une caractère NUL après le noms de fichier"
-#: builtin/grep.c:699
+#: builtin/grep.c:700
msgid "show the number of matches instead of matching lines"
msgstr "afficher le nombre de correspondances au lieu des lignes correspondant"
-#: builtin/grep.c:700
+#: builtin/grep.c:701
msgid "highlight matches"
msgstr "mettre en évidence les correspondances"
-#: builtin/grep.c:702
+#: builtin/grep.c:703
msgid "print empty line between matches from different files"
msgstr ""
"imprimer une ligne vide entre les correspondances de fichiers différents"
-#: builtin/grep.c:704
+#: builtin/grep.c:705
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:707
+#: builtin/grep.c:708
msgid "show <n> context lines before and after matches"
msgstr "afficher <n> lignes de contexte avant et après les correspondances"
-#: builtin/grep.c:710
+#: builtin/grep.c:711
msgid "show <n> context lines before matches"
msgstr "afficher <n> lignes de contexte avant les correspondances"
-#: builtin/grep.c:712
+#: builtin/grep.c:713
msgid "show <n> context lines after matches"
msgstr "afficher <n> lignes de contexte après les correspondances"
-#: builtin/grep.c:714
+#: builtin/grep.c:715
msgid "use <n> worker threads"
msgstr "utiliser <n> fils de travail"
-#: builtin/grep.c:715
+#: builtin/grep.c:716
msgid "shortcut for -C NUM"
msgstr "raccourci pour -C NUM"
-#: builtin/grep.c:718
+#: builtin/grep.c:719
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:720
+#: builtin/grep.c:721
msgid "show the surrounding function"
msgstr "afficher la fonction contenante"
-#: builtin/grep.c:723
+#: builtin/grep.c:724
msgid "read patterns from file"
msgstr "lire les motifs depuis fichier"
-#: builtin/grep.c:725
+#: builtin/grep.c:726
msgid "match <pattern>"
msgstr "rechercher <motif>"
-#: builtin/grep.c:727
+#: builtin/grep.c:728
msgid "combine patterns specified with -e"
msgstr "combiner les motifs spécifiés par -e"
-#: builtin/grep.c:739
+#: builtin/grep.c:740
msgid "indicate hit with exit status without output"
msgstr ""
"indiquer des correspondances avec le code de sortie mais sans rien afficher"
-#: builtin/grep.c:741
+#: builtin/grep.c:742
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:743
+#: builtin/grep.c:744
msgid "show parse tree for grep expression"
msgstr "afficher l'arbre d'analyse pour le motif grep"
-#: builtin/grep.c:747
+#: builtin/grep.c:748
msgid "pager"
msgstr "pagineur"
-#: builtin/grep.c:747
+#: builtin/grep.c:748
msgid "show matching files in the pager"
msgstr "afficher les fichiers correspondant dans le pagineur"
-#: builtin/grep.c:750
+#: builtin/grep.c:751
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permettre l'appel de grep(1) (ignoré par ce build)"
-#: builtin/grep.c:813
+#: builtin/grep.c:814
msgid "no pattern given."
msgstr "aucun motif fourni."
-#: builtin/grep.c:845 builtin/index-pack.c:1479
+#: builtin/grep.c:846 builtin/index-pack.c:1480
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "nombre de fils spécifié invalide (%d)"
-#: builtin/grep.c:875
+#: builtin/grep.c:876
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:901
+#: builtin/grep.c:902
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached ou --untracked ne peuvent pas être utilisés avec --no-index."
-#: builtin/grep.c:906
+#: builtin/grep.c:907
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:909
+#: builtin/grep.c:910
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:917
+#: builtin/grep.c:918
msgid "both --cached and trees are given."
msgstr "--cached et des arbres sont fournis en même temps."
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:93
+#: builtin/hash-object.c:94
msgid "type"
msgstr "type"
-#: builtin/hash-object.c:93
+#: builtin/hash-object.c:94
msgid "object type"
msgstr "type d'objet"
-#: builtin/hash-object.c:94
+#: builtin/hash-object.c:95
msgid "write the object into the object database"
msgstr "écrire l'objet dans la base de donnée d'objets"
-#: builtin/hash-object.c:96
+#: builtin/hash-object.c:97
msgid "read the object from stdin"
msgstr "lire l'objet depuis l'entrée standard"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
msgid "store file as is without filters"
msgstr "stocker le fichier tel quel sans filtrage"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:100
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:100
+#: builtin/hash-object.c:101
msgid "process file as it were from this path"
msgstr "traiter le fichier comme s'il venait de ce chemin"
-#: builtin/help.c:41
+#: builtin/help.c:42
msgid "print all available commands"
msgstr "afficher toutes les commandes disponibles"
-#: builtin/help.c:42
+#: builtin/help.c:43
+msgid "exclude guides"
+msgstr "exclure les guides"
+
+#: builtin/help.c:44
msgid "print list of useful guides"
msgstr "afficher une liste de guides utiles"
-#: builtin/help.c:43
+#: builtin/help.c:45
msgid "show man page"
msgstr "afficher la page de manuel"
-#: builtin/help.c:44
+#: builtin/help.c:46
msgid "show manual in web browser"
msgstr "afficher le manuel dans un navigateur web"
-#: builtin/help.c:46
+#: builtin/help.c:48
msgid "show info page"
msgstr "afficher la page info"
-#: builtin/help.c:52
+#: builtin/help.c:54
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr "git help [--all] [--guides] [--man | --web | --info] [<commande>]"
-#: builtin/help.c:64
+#: builtin/help.c:66
#, c-format
msgid "unrecognized help format '%s'"
msgstr "format d'aide non reconnu '%s'"
-#: builtin/help.c:91
+#: builtin/help.c:93
msgid "Failed to start emacsclient."
msgstr "échec de démarrage d'emacsclient."
-#: builtin/help.c:104
+#: builtin/help.c:106
msgid "Failed to parse emacsclient version."
msgstr "échec d'analyse de la version d'emacsclient."
-#: builtin/help.c:112
+#: builtin/help.c:114
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "la version d'emacsclient '%d' est trop ancienne (<22)."
-#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
+#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
#, c-format
msgid "failed to exec '%s'"
msgstr "échec de l'exécution de '%s'"
-#: builtin/help.c:205
+#: builtin/help.c:207
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"'%s' : chemin pour l'utilitaire de visualisation de manuel non supporté.\n"
"Veuillez utiliser plutôt 'man.<outil>.cmd'."
-#: builtin/help.c:217
+#: builtin/help.c:219
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"'%s' : chemin pour l'utilitaire de visualisation de manuel supporté.\n"
"Veuillez utiliser plutôt 'man.<outil>.cmd'."
-#: builtin/help.c:334
+#: builtin/help.c:336
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s' : visualiseur de manuel inconnu."
-#: builtin/help.c:351
+#: builtin/help.c:353
msgid "no man viewer handled the request"
msgstr "aucun visualiseur de manuel n'a pris en charge la demande"
-#: builtin/help.c:359
+#: builtin/help.c:361
msgid "no info viewer handled the request"
msgstr "aucun visualiseur de 'info' n'a pris en charge la demande"
-#: builtin/help.c:401
+#: builtin/help.c:403
msgid "Defining attributes per path"
msgstr "Définition des attributs par chemin"
-#: builtin/help.c:402
+#: builtin/help.c:404
msgid "Everyday Git With 20 Commands Or So"
msgstr "Git de tous les jours avec à peu près 20 commandes"
-#: builtin/help.c:403
+#: builtin/help.c:405
msgid "A Git glossary"
msgstr "Un glossaire Git"
-#: builtin/help.c:404
+#: builtin/help.c:406
msgid "Specifies intentionally untracked files to ignore"
msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement"
-#: builtin/help.c:405
+#: builtin/help.c:407
msgid "Defining submodule properties"
msgstr "Définition des propriétés de sous-module"
-#: builtin/help.c:406
+#: builtin/help.c:408
msgid "Specifying revisions and ranges for Git"
msgstr "Spécification des révisions et portées pour Git"
-#: builtin/help.c:407
+#: builtin/help.c:409
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr ""
"Une introduction pratique à Git (pour les versions 1.5.1 et supérieures)"
-#: builtin/help.c:408
+#: builtin/help.c:410
msgid "An overview of recommended workflows with Git"
msgstr "Un aperçu des flux de travail recommandés avec Git"
-#: builtin/help.c:420
+#: builtin/help.c:422
msgid "The common Git guides are:\n"
msgstr "Les guides Git populaires sont : \n"
-#: builtin/help.c:441 builtin/help.c:458
-#, c-format
-msgid "usage: %s%s"
-msgstr "usage : %s%s"
-
-#: builtin/help.c:474
+#: builtin/help.c:440
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "`git %s\" est un alias de `%s'"
-#: builtin/index-pack.c:153
+#: builtin/help.c:462 builtin/help.c:479
+#, c-format
+msgid "usage: %s%s"
+msgstr "usage : %s%s"
+
+#: builtin/index-pack.c:154
#, c-format
msgid "unable to open %s"
msgstr "impossible d'ouvrir %s"
-#: builtin/index-pack.c:203
+#: builtin/index-pack.c:204
#, c-format
msgid "object type mismatch at %s"
msgstr "type d'objet non correspondant à %s"
-#: builtin/index-pack.c:223
+#: builtin/index-pack.c:224
#, c-format
msgid "did not receive expected object %s"
msgstr "objet attendu non reçu %s"
-#: builtin/index-pack.c:226
+#: builtin/index-pack.c:227
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objet %s : type attendu %s, reçu %s"
-#: builtin/index-pack.c:268
+#: builtin/index-pack.c:269
#, 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:278
+#: builtin/index-pack.c:279
msgid "early EOF"
msgstr "fin de fichier prématurée"
-#: builtin/index-pack.c:279
+#: builtin/index-pack.c:280
msgid "read error on input"
msgstr "erreur de lecture sur l'entrée"
-#: builtin/index-pack.c:291
+#: builtin/index-pack.c:292
msgid "used more bytes than were available"
msgstr "plus d'octets utilisés que disponibles"
-#: builtin/index-pack.c:298
+#: builtin/index-pack.c:299
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:314
+#: builtin/index-pack.c:302 builtin/unpack-objects.c:92
+msgid "pack exceeds maximum allowed size"
+msgstr "le paquet dépasse la taille maximale permise"
+
+#: builtin/index-pack.c:317
#, c-format
msgid "unable to create '%s'"
msgstr "impossible de créer '%s'"
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:322
#, c-format
msgid "cannot open packfile '%s'"
msgstr "impossible d'ouvrir le fichier paquet '%s'"
-#: builtin/index-pack.c:333
+#: builtin/index-pack.c:336
msgid "pack signature mismatch"
msgstr "la signature du paquet ne correspond pas"
-#: builtin/index-pack.c:335
+#: builtin/index-pack.c:338
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "la version de paquet %<PRIu32> non supportée"
-#: builtin/index-pack.c:353
+#: builtin/index-pack.c:356
#, 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:475
+#: builtin/index-pack.c:478
#, c-format
msgid "inflate returned %d"
msgstr "la décompression (inflate) a retourné %d"
-#: builtin/index-pack.c:524
+#: builtin/index-pack.c:527
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:532
+#: builtin/index-pack.c:535
msgid "delta base offset is out of bound"
msgstr "l'objet delta de base est hors limite"
-#: builtin/index-pack.c:540
+#: builtin/index-pack.c:543
#, c-format
msgid "unknown object type %d"
msgstr "type d'objet inconnu %d"
-#: builtin/index-pack.c:571
+#: builtin/index-pack.c:574
msgid "cannot pread pack file"
msgstr "impossible de lire (pread) le fichier paquet"
-#: builtin/index-pack.c:573
+#: builtin/index-pack.c:576
#, 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:599
+#: builtin/index-pack.c:602
msgid "serious inflate inconsistency"
msgstr "grave incohérence dans la décompression (inflate)"
-#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774
-#: builtin/index-pack.c:808 builtin/index-pack.c:817
+#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
+#: builtin/index-pack.c:811 builtin/index-pack.c:820
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "COLLISION SHA1 TROUVÉE AVEC %s !"
-#: builtin/index-pack.c:748 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:256
+#: builtin/index-pack.c:751 builtin/pack-objects.c:166
+#: builtin/pack-objects.c:258
#, c-format
msgid "unable to read %s"
msgstr "impossible de lire %s"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:817
#, c-format
msgid "cannot read existing object %s"
msgstr "impossible de lire l'objet existant %s"
-#: builtin/index-pack.c:828
+#: builtin/index-pack.c:831
#, c-format
msgid "invalid blob object %s"
msgstr "objet blob invalide %s"
-#: builtin/index-pack.c:842
+#: builtin/index-pack.c:845
#, c-format
msgid "invalid %s"
msgstr "%s invalide"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:848
msgid "Error in object"
msgstr "Erreur dans l'objet"
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:850
#, 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:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:922 builtin/index-pack.c:953
msgid "failed to apply delta"
msgstr "échec d'application du delta"
-#: builtin/index-pack.c:1120
+#: builtin/index-pack.c:1123
msgid "Receiving objects"
msgstr "Réception d'objets"
-#: builtin/index-pack.c:1120
+#: builtin/index-pack.c:1123
msgid "Indexing objects"
msgstr "Indexation d'objets"
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1155
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "le paquet est corrompu (SHA1 ne correspond pas)"
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
msgid "cannot fstat packfile"
msgstr "impossible d'obtenir le statut (fstat) du fichier paquet"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1163
msgid "pack has junk at the end"
msgstr "le paquet est invalide à la fin"
-#: builtin/index-pack.c:1171
+#: builtin/index-pack.c:1174
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "confusion extrême dans parse_pack_objects()"
-#: builtin/index-pack.c:1196
+#: builtin/index-pack.c:1197
msgid "Resolving deltas"
msgstr "Résolution des deltas"
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
#, c-format
msgid "unable to create thread: %s"
msgstr "impossible de créer le fil : %s"
-#: builtin/index-pack.c:1249
+#: builtin/index-pack.c:1250
msgid "confusion beyond insanity"
msgstr "confusion extrême"
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1256
#, 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:1267
+#: builtin/index-pack.c:1268
#, 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:1271
+#: builtin/index-pack.c:1272
#, 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:1295
+#: builtin/index-pack.c:1296
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "impossible de compresser l'objet ajouté (%d)"
-#: builtin/index-pack.c:1371
+#: builtin/index-pack.c:1372
#, c-format
msgid "local object %s is corrupt"
msgstr "l'objet local %s est corrompu"
-#: builtin/index-pack.c:1395
+#: builtin/index-pack.c:1396
msgid "error while closing pack file"
msgstr "erreur en fermeture du fichier paquet"
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
#, c-format
msgid "cannot write keep file '%s'"
msgstr "impossible d'écrire le fichier \"keep\" '%s'"
-#: builtin/index-pack.c:1416
+#: builtin/index-pack.c:1417
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "impossible de fermer le fichier \"keep\" '%s'"
-#: builtin/index-pack.c:1429
+#: builtin/index-pack.c:1430
msgid "cannot store pack file"
msgstr "impossible de stocker le fichier paquet"
-#: builtin/index-pack.c:1440
+#: builtin/index-pack.c:1441
msgid "cannot store index file"
msgstr "impossible de stocker le fichier d'index"
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1474
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "mauvais pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1483 builtin/index-pack.c:1681
+#: builtin/index-pack.c:1484 builtin/index-pack.c:1681
#, c-format
msgid "no threads support, ignoring %s"
msgstr "pas de support des fils, ignore %s"
msgid "bad %s"
msgstr "mauvais %s"
-#: builtin/index-pack.c:1730
+#: builtin/index-pack.c:1732
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin ne peut pas être utilisé sans --stdin"
-#: builtin/index-pack.c:1738
+#: builtin/index-pack.c:1740
msgid "--verify with no packfile name given"
msgstr "--verify sans nom de fichier paquet donné"
-#: builtin/init-db.c:55
+#: builtin/init-db.c:54
#, c-format
msgid "cannot stat '%s'"
msgstr "impossible de faire un stat de '%s'"
-#: builtin/init-db.c:61
+#: builtin/init-db.c:60
#, c-format
msgid "cannot stat template '%s'"
msgstr "impossible de faire un stat du modèle '%s'"
-#: builtin/init-db.c:66
+#: builtin/init-db.c:65
#, c-format
msgid "cannot opendir '%s'"
msgstr "impossible d'ouvrir (opendir) '%s'"
-#: builtin/init-db.c:77
+#: builtin/init-db.c:76
#, c-format
msgid "cannot readlink '%s'"
msgstr "impossible de readlink '%s'"
-#: builtin/init-db.c:79
+#: builtin/init-db.c:78
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "impossible de créer un lien symbolique de '%s' '%s'"
-#: builtin/init-db.c:85
+#: builtin/init-db.c:84
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "impossible de copier '%s' vers '%s'"
-#: builtin/init-db.c:89
+#: builtin/init-db.c:88
#, c-format
msgid "ignoring template %s"
msgstr "modèle %s ignoré"
-#: builtin/init-db.c:120
+#: builtin/init-db.c:119
#, c-format
msgid "templates not found %s"
msgstr "modèles non trouvés %s"
-#: builtin/init-db.c:135
+#: builtin/init-db.c:134
#, c-format
msgid "not copying templates from '%s': %s"
msgstr "pas de copie des modèles depuis '%s' : %s"
-#: builtin/init-db.c:312 builtin/init-db.c:315
-#, c-format
-msgid "%s already exists"
-msgstr "%s existe déjà"
-
-#: builtin/init-db.c:344
+#: builtin/init-db.c:327
#, c-format
msgid "unable to handle file type %d"
msgstr "impossible de traiter le fichier de type %d"
-#: builtin/init-db.c:347
+#: builtin/init-db.c:330
#, c-format
msgid "unable to move %s to %s"
msgstr "impossible de déplacer %s vers %s"
-#: builtin/init-db.c:402
+#: builtin/init-db.c:347 builtin/init-db.c:350
+#, c-format
+msgid "%s already exists"
+msgstr "%s existe déjà"
+
+#: builtin/init-db.c:403
#, 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:403
+#: builtin/init-db.c:404
#, 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:407
+#: builtin/init-db.c:408
#, 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:408
+#: builtin/init-db.c:409
#, 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:455
+#: builtin/init-db.c:457
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
"git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--"
"shared[=<permissions>]] [<répertoire>]"
-#: builtin/init-db.c:478
+#: builtin/init-db.c:480
msgid "permissions"
msgstr "permissions"
-#: builtin/init-db.c:479
+#: builtin/init-db.c:481
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:513 builtin/init-db.c:518
+#: builtin/init-db.c:515 builtin/init-db.c:520
#, c-format
msgid "cannot mkdir %s"
msgstr "impossible de créer le répertoire (mkdir) %s"
-#: builtin/init-db.c:522
+#: builtin/init-db.c:524
#, c-format
msgid "cannot chdir to %s"
msgstr "impossible de se déplacer vers le répertoire (chdir) %s"
-#: builtin/init-db.c:543
+#: builtin/init-db.c:545
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"%s (ou --work-tree=<répertoire>) n'est pas autorisé sans spécifier %s (ou --"
"git-dir=<répertoire>)"
-#: builtin/init-db.c:571
+#: builtin/init-db.c:573
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Impossible d'accéder à l'arbre de travail '%s'"
msgid "Cover letter needs email format"
msgstr "La lettre de motivation doit être au format e-mail"
-#: builtin/log.c:1064
+#: builtin/log.c:1063
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to aberrant : %s"
-#: builtin/log.c:1092
+#: builtin/log.c:1091
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]"
-#: builtin/log.c:1137
+#: builtin/log.c:1141
msgid "Two output directories?"
msgstr "Deux répertoires de sortie ?"
-#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897
+#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
#, c-format
msgid "Unknown commit %s"
msgstr "Commit inconnu %s"
-#: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305
-#: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425
-#: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594
-#: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455
+#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Impossible de résoudre '%s' comme une référence valide."
-#: builtin/log.c:1259
+#: builtin/log.c:1263
msgid "Could not find exact merge base."
msgstr "Impossible de trouver la base de fusion exacte."
-#: builtin/log.c:1263
+#: builtin/log.c:1267
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"
"ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> "
"manuellement."
-#: builtin/log.c:1283
+#: builtin/log.c:1287
msgid "Failed to find exact merge base"
msgstr "Impossible de trouver la base de fusion exacte"
-#: builtin/log.c:1294
+#: builtin/log.c:1298
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:1298
+#: builtin/log.c:1302
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:1347
+#: builtin/log.c:1351
msgid "cannot get patch id"
msgstr "impossible d'obtenir l'id du patch"
-#: builtin/log.c:1404
+#: builtin/log.c:1408
msgid "use [PATCH n/m] even with a single patch"
msgstr "utiliser [PATCH n/m] même avec un patch unique"
-#: builtin/log.c:1407
+#: builtin/log.c:1411
msgid "use [PATCH] even with multiple patches"
msgstr "utiliser [PATCH] même avec des patchs multiples"
-#: builtin/log.c:1411
+#: builtin/log.c:1415
msgid "print patches to standard out"
msgstr "afficher les patchs sur la sortie standard"
-#: builtin/log.c:1413
+#: builtin/log.c:1417
msgid "generate a cover letter"
msgstr "générer une lettre de motivation"
-#: builtin/log.c:1415
+#: builtin/log.c:1419
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:1416
+#: builtin/log.c:1420
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1417
+#: builtin/log.c:1421
msgid "use <sfx> instead of '.patch'"
msgstr "utiliser <sfx> au lieu de '.patch'"
-#: builtin/log.c:1419
+#: builtin/log.c:1423
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:1421
+#: builtin/log.c:1425
msgid "mark the series as Nth re-roll"
msgstr "marquer la série comme une Nième réédition"
-#: builtin/log.c:1423
+#: builtin/log.c:1427
+msgid "Use [RFC PATCH] instead of [PATCH]"
+msgstr "utiliser [RFC PATCH] au lieu de [PATCH]"
+
+#: builtin/log.c:1430
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "utiliser [<préfixe>] au lieu de [PATCH]"
-#: builtin/log.c:1426
+#: builtin/log.c:1433
msgid "store resulting files in <dir>"
msgstr "stocker les fichiers résultats dans <répertoire>"
-#: builtin/log.c:1429
+#: builtin/log.c:1436
msgid "don't strip/add [PATCH]"
msgstr "ne pas retirer/ajouter [PATCH]"
-#: builtin/log.c:1432
+#: builtin/log.c:1439
msgid "don't output binary diffs"
msgstr "ne pas imprimer les diffs binaires"
-#: builtin/log.c:1434
+#: builtin/log.c:1441
msgid "output all-zero hash in From header"
msgstr "écrire une empreinte à zéro dans l'entête From"
-#: builtin/log.c:1436
+#: builtin/log.c:1443
msgid "don't include a patch matching a commit upstream"
msgstr "ne pas inclure un patch correspondant à un commit amont"
-#: builtin/log.c:1438
+#: builtin/log.c:1445
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:1440
+#: builtin/log.c:1447
msgid "Messaging"
msgstr "Communication"
-#: builtin/log.c:1441
+#: builtin/log.c:1448
msgid "header"
msgstr "en-tête"
-#: builtin/log.c:1442
+#: builtin/log.c:1449
msgid "add email header"
msgstr "ajouter l'en-tête d'e-mail"
-#: builtin/log.c:1443 builtin/log.c:1445
+#: builtin/log.c:1450 builtin/log.c:1452
msgid "email"
msgstr "e-mail"
-#: builtin/log.c:1443
+#: builtin/log.c:1450
msgid "add To: header"
msgstr "ajouter l'en-tête \"To:\""
-#: builtin/log.c:1445
+#: builtin/log.c:1452
msgid "add Cc: header"
msgstr "ajouter l'en-tête \"Cc:\""
-#: builtin/log.c:1447
+#: builtin/log.c:1454
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1448
+#: builtin/log.c:1455
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:1450
+#: builtin/log.c:1457
msgid "message-id"
msgstr "id-message"
-#: builtin/log.c:1451
+#: builtin/log.c:1458
msgid "make first mail a reply to <message-id>"
msgstr "répondre dans le premier message à <id-message>"
-#: builtin/log.c:1452 builtin/log.c:1455
+#: builtin/log.c:1459 builtin/log.c:1462
msgid "boundary"
msgstr "limite"
-#: builtin/log.c:1453
+#: builtin/log.c:1460
msgid "attach the patch"
msgstr "attacher le patch"
-#: builtin/log.c:1456
+#: builtin/log.c:1463
msgid "inline the patch"
msgstr "patch à l'intérieur"
-#: builtin/log.c:1460
+#: builtin/log.c:1467
msgid "enable message threading, styles: shallow, deep"
msgstr ""
"activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"
-#: builtin/log.c:1462
+#: builtin/log.c:1469
msgid "signature"
msgstr "signature"
-#: builtin/log.c:1463
+#: builtin/log.c:1470
msgid "add a signature"
msgstr "ajouter une signature"
-#: builtin/log.c:1464
+#: builtin/log.c:1471
msgid "base-commit"
msgstr "commit-de-base"
-#: builtin/log.c:1465
+#: builtin/log.c:1472
msgid "add prerequisite tree info to the patch series"
msgstr "Ajouter un arbre prérequis à la série de patchs"
-#: builtin/log.c:1467
+#: builtin/log.c:1474
msgid "add a signature from a file"
msgstr "ajouter une signature depuis un fichier"
-#: builtin/log.c:1468
+#: builtin/log.c:1475
msgid "don't print the patch filenames"
msgstr "ne pas afficher les noms de fichiers des patchs"
-#: builtin/log.c:1558
+#: builtin/log.c:1565
msgid "-n and -k are mutually exclusive."
msgstr "-n et -k sont mutuellement exclusifs."
-#: builtin/log.c:1560
-msgid "--subject-prefix and -k are mutually exclusive."
-msgstr "--subject-prefix et -k sont mutuellement exclusifs."
+#: builtin/log.c:1567
+msgid "--subject-prefix/--rfc and -k are mutually exclusive."
+msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs."
-#: builtin/log.c:1568
+#: builtin/log.c:1575
msgid "--name-only does not make sense"
msgstr "--name-only n'a pas de sens"
-#: builtin/log.c:1570
+#: builtin/log.c:1577
msgid "--name-status does not make sense"
msgstr "--name-status n'a pas de sens"
-#: builtin/log.c:1572
+#: builtin/log.c:1579
msgid "--check does not make sense"
msgstr "--check n'a pas de sens"
-#: builtin/log.c:1602
+#: builtin/log.c:1609
msgid "standard output, or directory, which one?"
msgstr "sortie standard, ou répertoire, lequel ?"
-#: builtin/log.c:1604
+#: builtin/log.c:1611
#, c-format
msgid "Could not create directory '%s'"
msgstr "Impossible de créer le répertoire '%s'"
-#: builtin/log.c:1698
+#: builtin/log.c:1705
#, c-format
msgid "unable to read signature file '%s'"
msgstr "lecture du fichier de signature '%s' impossible"
-#: builtin/log.c:1769
+#: builtin/log.c:1777
msgid "Failed to create output files"
msgstr "Échec de création des fichiers en sortie"
-#: builtin/log.c:1818
+#: builtin/log.c:1826
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]"
-#: builtin/log.c:1872
+#: builtin/log.c:1880
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
"Impossible de trouver une branche distante suivie, merci de spécifier "
"<branche_amont> manuellement.\n"
-#: builtin/ls-files.c:379
+#: builtin/ls-files.c:458
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<options>] [<fichier>...]"
-#: builtin/ls-files.c:428
+#: builtin/ls-files.c:507
msgid "identify the file status with tags"
msgstr "identifier le statut de fichier avec les étiquettes"
-#: builtin/ls-files.c:430
+#: builtin/ls-files.c:509
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "utiliser des minuscules pour les fichier 'assumés inchangés'"
-#: builtin/ls-files.c:432
+#: builtin/ls-files.c:511
msgid "show cached files in the output (default)"
msgstr "afficher les fichiers mis en cache dans la sortie (défaut)"
-#: builtin/ls-files.c:434
+#: builtin/ls-files.c:513
msgid "show deleted files in the output"
msgstr "afficher les fichiers supprimés dans la sortie"
-#: builtin/ls-files.c:436
+#: builtin/ls-files.c:515
msgid "show modified files in the output"
msgstr "afficher les fichiers modifiés dans la sortie"
-#: builtin/ls-files.c:438
+#: builtin/ls-files.c:517
msgid "show other files in the output"
msgstr "afficher les autres fichiers dans la sortie"
-#: builtin/ls-files.c:440
+#: builtin/ls-files.c:519
msgid "show ignored files in the output"
msgstr "afficher les fichiers ignorés dans la sortie"
-#: builtin/ls-files.c:443
+#: builtin/ls-files.c:522
msgid "show staged contents' object name in the output"
msgstr "afficher les nom des objets indexés dans la sortie"
-#: builtin/ls-files.c:445
+#: builtin/ls-files.c:524
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:447
+#: builtin/ls-files.c:526
msgid "show 'other' directories' names only"
msgstr "afficher seulement les noms des répertoires 'other'"
-#: builtin/ls-files.c:449
+#: builtin/ls-files.c:528
msgid "show line endings of files"
msgstr "afficher les fins de lignes des fichiers"
-#: builtin/ls-files.c:451
+#: builtin/ls-files.c:530
msgid "don't show empty directories"
msgstr "ne pas afficher les répertoires vides"
-#: builtin/ls-files.c:454
+#: builtin/ls-files.c:533
msgid "show unmerged files in the output"
msgstr "afficher les fichiers non fusionnés dans la sortie"
-#: builtin/ls-files.c:456
+#: builtin/ls-files.c:535
msgid "show resolve-undo information"
msgstr "afficher l'information resolv-undo"
-#: builtin/ls-files.c:458
+#: builtin/ls-files.c:537
msgid "skip files matching pattern"
msgstr "sauter les fichiers correspondant au motif"
-#: builtin/ls-files.c:461
+#: builtin/ls-files.c:540
msgid "exclude patterns are read from <file>"
msgstr "les motifs d'exclusion sont lus depuis <fichier>"
-#: builtin/ls-files.c:464
+#: builtin/ls-files.c:543
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:466
+#: builtin/ls-files.c:545
msgid "add the standard git exclusions"
msgstr "ajouter les exclusions git standard"
-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:548
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:472
+#: builtin/ls-files.c:551
+msgid "recurse through submodules"
+msgstr "parcourir récursivement les sous-modules"
+
+#: builtin/ls-files.c:553
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:473
+#: builtin/ls-files.c:554
msgid "tree-ish"
msgstr "arbre ou apparenté"
-#: builtin/ls-files.c:474
+#: builtin/ls-files.c:555
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:476
+#: builtin/ls-files.c:557
msgid "show debugging data"
msgstr "afficher les données de débogage"
msgid "Available custom strategies are:"
msgstr "Les stratégies personnalisées sont :"
-#: builtin/merge.c:195 builtin/pull.c:126
+#: builtin/merge.c:195 builtin/pull.c:127
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:198 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:130
msgid "show a diffstat at the end of the merge"
msgstr "afficher un diffstat à la fin de la fusion"
-#: builtin/merge.c:199 builtin/pull.c:132
+#: builtin/merge.c:199 builtin/pull.c:133
msgid "(synonym to --stat)"
msgstr "(synonyme de --stat)"
-#: builtin/merge.c:201 builtin/pull.c:135
+#: builtin/merge.c:201 builtin/pull.c:136
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:204 builtin/pull.c:138
+#: builtin/merge.c:204 builtin/pull.c:139
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:206 builtin/pull.c:141
+#: builtin/merge.c:206 builtin/pull.c:142
msgid "perform a commit if the merge succeeds (default)"
msgstr "effectuer une validation si la fusion réussit (défaut)"
-#: builtin/merge.c:208 builtin/pull.c:144
+#: builtin/merge.c:208 builtin/pull.c:145
msgid "edit message before committing"
msgstr "éditer le message avant la validation"
msgid "allow fast-forward (default)"
msgstr "autoriser l'avance rapide (défaut)"
-#: builtin/merge.c:211 builtin/pull.c:150
+#: builtin/merge.c:211 builtin/pull.c:151
msgid "abort if fast-forward is not possible"
msgstr "abandonner si l'avance rapide n'est pas possible"
-#: builtin/merge.c:215 builtin/pull.c:153
+#: builtin/merge.c:215 builtin/pull.c:154
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:216 builtin/notes.c:772 builtin/pull.c:157
+#: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158
#: builtin/revert.c:89
msgid "strategy"
msgstr "stratégie"
-#: builtin/merge.c:217 builtin/pull.c:158
+#: builtin/merge.c:217 builtin/pull.c:159
msgid "merge strategy to use"
msgstr "stratégie de fusion à utiliser"
-#: builtin/merge.c:218 builtin/pull.c:161
+#: builtin/merge.c:218 builtin/pull.c:162
msgid "option=value"
msgstr "option=valeur"
-#: builtin/merge.c:219 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:163
msgid "option for selected merge strategy"
msgstr "option pour la stratégie de fusion sélectionnée"
msgid "abort the current in-progress merge"
msgstr "abandonner la fusion en cours"
-#: builtin/merge.c:227 builtin/pull.c:169
+#: builtin/merge.c:227 builtin/pull.c:170
msgid "allow merging unrelated histories"
msgstr "permettre la fusion d'historiques sans rapport"
msgid "Already up-to-date."
msgstr "Déjà à jour."
-#: builtin/merge.c:1382
+#: builtin/merge.c:1377
#, c-format
msgid "Updating %s..%s\n"
msgstr "Mise à jour %s..%s\n"
-#: builtin/merge.c:1419
+#: builtin/merge.c:1418
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Essai de fusion vraiment triviale dans l'index...\n"
-#: builtin/merge.c:1426
+#: builtin/merge.c:1425
#, c-format
msgid "Nope.\n"
msgstr "Non.\n"
-#: builtin/merge.c:1451
+#: builtin/merge.c:1450
msgid "Already up-to-date. Yeeah!"
msgstr "Déjà à jour. Ouais !"
-#: builtin/merge.c:1457
+#: builtin/merge.c:1456
msgid "Not possible to fast-forward, aborting."
msgstr "Pas possible d'avancer rapidement, abandon."
-#: builtin/merge.c:1480 builtin/merge.c:1559
+#: builtin/merge.c:1479 builtin/merge.c:1558
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Retour de l'arbre à l'original...\n"
-#: builtin/merge.c:1484
+#: builtin/merge.c:1483
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Essai de la stratégie de fusion %s...\n"
-#: builtin/merge.c:1550
+#: builtin/merge.c:1549
#, 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:1552
+#: builtin/merge.c:1551
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "La fusion avec la stratégie %s a échoué.\n"
-#: builtin/merge.c:1561
+#: builtin/merge.c:1560
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Utilisation de %s pour préparer la résolution à la main.\n"
-#: builtin/merge.c:1573
+#: builtin/merge.c:1572
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <référence> [<validation>]"
-#: builtin/merge-base.c:214
+#: builtin/merge-base.c:217
msgid "output all common ancestors"
msgstr "afficher tous les ancêtres communs"
-#: builtin/merge-base.c:216
+#: builtin/merge-base.c:219
msgid "find ancestors for a single n-way merge"
msgstr "trouver les ancêtres pour une fusion simple à n points"
-#: builtin/merge-base.c:218
+#: builtin/merge-base.c:221
msgid "list revs not reachable from others"
msgstr "afficher les révisions inaccessibles depuis les autres"
-#: builtin/merge-base.c:220
+#: builtin/merge-base.c:223
msgid "is the first one ancestor of the other?"
msgstr "est le premier ancêtre de l'autre ?"
-#: builtin/merge-base.c:222
+#: builtin/merge-base.c:225
msgid "find where <commit> forked from reflog of <ref>"
msgstr "trouver où <validation> a divergé du reflog de <référence>"
msgid "set labels for file1/orig-file/file2"
msgstr "définir les labels pour fichier1/fichier-orig/fichier2"
+#: builtin/merge-recursive.c:45
+#, c-format
+msgid "unknown option %s"
+msgstr "option inconnue %s"
+
+#: builtin/merge-recursive.c:51
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "Impossible d'analyser l'objet '%s'"
+
+#: builtin/merge-recursive.c:55
+#, 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:63
+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:69 builtin/merge-recursive.c:71
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "impossible de résoudre la référence '%s'"
+
+#: builtin/merge-recursive.c:77
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "Fusion de %s avec %s\n"
+
#: builtin/mktree.c:65
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
msgid "renaming '%s' failed"
msgstr "le renommage de '%s' a échoué"
-#: builtin/name-rev.c:258
+#: builtin/name-rev.c:257
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<options>] <validation>..."
-#: builtin/name-rev.c:259
+#: builtin/name-rev.c:258
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<options>] --all"
-#: builtin/name-rev.c:260
+#: builtin/name-rev.c:259
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<options>] --stdin"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:311
msgid "print only names (no SHA-1)"
msgstr "afficher seulement les noms (pas de SHA-1)"
-#: builtin/name-rev.c:313
+#: builtin/name-rev.c:312
msgid "only use tags to name the commits"
msgstr "utiliser seulement les étiquettes pour nommer les validations"
-#: builtin/name-rev.c:315
+#: builtin/name-rev.c:314
msgid "only use refs matching <pattern>"
msgstr "utiliser seulement les références correspondant à <motif>"
-#: builtin/name-rev.c:317
+#: builtin/name-rev.c:316
msgid "list all commits reachable from all refs"
msgstr ""
"afficher toutes les validations accessibles depuis toutes les références"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:317
msgid "read from stdin"
msgstr "lire depuis l'entrée standard"
-#: builtin/name-rev.c:319
+#: builtin/name-rev.c:318
msgid "allow to print `undefined` names (default)"
msgstr "autoriser l'affichage des noms `non définis` (par défaut)"
-#: builtin/name-rev.c:325
+#: builtin/name-rev.c:324
msgid "dereference tags in the input (internal use)"
msgstr "déréférencer les étiquettes en entrée (usage interne)"
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"
+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"
#: builtin/notes.c:205
#, c-format
-msgid "The note contents have been left in %s"
-msgstr "Le contenu de la note a été laissé dans %s"
+msgid "the note contents have been left in %s"
+msgstr "le contenu de la note a été laissé dans %s"
#: builtin/notes.c:233 builtin/tag.c:439
#, c-format
msgid "could not open or read '%s'"
msgstr "impossible d'ouvrir ou lire '%s'"
+#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307
+#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513
+#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659
+#, 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:257
#, c-format
-msgid "Failed to read object '%s'."
-msgstr "Impossible de lire l'objet '%s'."
+msgid "failed to read object '%s'."
+msgstr "impossible de lire l'objet '%s'."
#: builtin/notes.c:261
#, 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'."
+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:301
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr "ligne en entrée malformée : '%s'."
-#: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494
-#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650
-#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968
+#: builtin/notes.c:316
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
+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:345
+#, 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:365 builtin/notes.c:420 builtin/notes.c:496
+#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652
+#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970
msgid "too many parameters"
msgstr "trop de paramètres"
-#: builtin/notes.c:376 builtin/notes.c:663
+#: builtin/notes.c:378 builtin/notes.c:665
#, c-format
-msgid "No note found for object %s."
-msgstr "Pas de note trouvée pour l'objet %s."
+msgid "no note found for object %s."
+msgstr "pas de note trouvée pour l'objet %s."
-#: builtin/notes.c:397 builtin/notes.c:560
+#: builtin/notes.c:399 builtin/notes.c:562
msgid "note contents as a string"
msgstr "contenu de la note sous forme de chaîne"
-#: builtin/notes.c:400 builtin/notes.c:563
+#: builtin/notes.c:402 builtin/notes.c:565
msgid "note contents in a file"
msgstr "contenu de la note dans un fichier"
-#: builtin/notes.c:403 builtin/notes.c:566
+#: builtin/notes.c:405 builtin/notes.c:568
msgid "reuse and edit specified note object"
msgstr "réutiliser et éditer l'objet de note spécifié"
-#: builtin/notes.c:406 builtin/notes.c:569
+#: builtin/notes.c:408 builtin/notes.c:571
msgid "reuse specified note object"
msgstr "réutiliser l'objet de note spécifié"
-#: builtin/notes.c:409 builtin/notes.c:572
+#: builtin/notes.c:411 builtin/notes.c:574
msgid "allow storing empty note"
msgstr "permettre de stocker une note vide"
-#: builtin/notes.c:410 builtin/notes.c:481
+#: builtin/notes.c:412 builtin/notes.c:483
msgid "replace existing notes"
msgstr "remplacer les notes existantes"
-#: builtin/notes.c:435
+#: builtin/notes.c:437
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"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:450 builtin/notes.c:529
+#: builtin/notes.c:452 builtin/notes.c:531
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Écrasement des notes existantes pour l'objet %s\n"
-#: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887
+#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889
#, c-format
msgid "Removing note for object %s\n"
msgstr "Suppression de la note pour l'objet %s\n"
-#: builtin/notes.c:482
+#: builtin/notes.c:484
msgid "read objects from stdin"
msgstr "lire les objets depuis l'entrée standard"
-#: builtin/notes.c:484
+#: builtin/notes.c:486
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"charger la configuration de réécriture pour <commande> (implique --stdin)"
-#: builtin/notes.c:502
+#: builtin/notes.c:504
msgid "too few parameters"
msgstr "pas assez de paramètres"
-#: builtin/notes.c:523
+#: builtin/notes.c:525
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"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:535
+#: builtin/notes.c:537
#, c-format
-msgid "Missing notes on source object %s. Cannot copy."
-msgstr "Notes manquantes sur l'objet source %s. Impossible de copier."
+msgid "missing notes on source object %s. Cannot copy."
+msgstr "notes manquantes sur l'objet source %s. Impossible de copier."
-#: builtin/notes.c:587
+#: builtin/notes.c:589
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"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:753
+#: builtin/notes.c:685
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr "échec de la suppression de la référence NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:687
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr "échec de la suppression de la référence NOTES_MERGE_REF"
+
+#: builtin/notes.c:689
+msgid "failed to remove 'git notes merge' worktree"
+msgstr "échec de la suppression de la copie de travail 'git notes merge'"
+
+#: builtin/notes.c:709
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr "échec de la lecture de la référence NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:711
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr "impossible de trouver le commit de NOTES_MERGE_PARTIAL."
+
+#: builtin/notes.c:713
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr "impossible d'analyser le commit de NOTES_MERGE_PARTIAL."
+
+#: builtin/notes.c:726
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr "échec de la résolution de NOTES_MERGE_REF"
+
+#: builtin/notes.c:729
+msgid "failed to finalize notes merge"
+msgstr "impossible de finaliser la fusion de notes"
+
+#: builtin/notes.c:755
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "stratégie de fusion de notes inconnue %s"
-#: builtin/notes.c:769
+#: builtin/notes.c:771
msgid "General options"
msgstr "Options générales"
-#: builtin/notes.c:771
+#: builtin/notes.c:773
msgid "Merge options"
msgstr "Options de fusion"
-#: builtin/notes.c:773
+#: builtin/notes.c:775
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
"résoudre les conflits de notes en utilisant la stratégie donnée (manual/ours/"
"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:775
+#: builtin/notes.c:777
msgid "Committing unmerged notes"
msgstr "Validation des notes non fusionnées"
-#: builtin/notes.c:777
+#: builtin/notes.c:779
msgid "finalize notes merge by committing unmerged notes"
msgstr "finaliser la fusion de notes en validant les notes non fusionnées"
-#: builtin/notes.c:779
+#: builtin/notes.c:781
msgid "Aborting notes merge resolution"
msgstr "Abandon de la résolution de fusion des notes"
-#: builtin/notes.c:781
+#: builtin/notes.c:783
msgid "abort notes merge"
msgstr "abandonner la fusion de notes"
-#: builtin/notes.c:792
+#: builtin/notes.c:794
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "--commit, --abort et -s/--strategy sont mutuellement incompatibles"
-#: builtin/notes.c:797
-msgid "Must specify a notes ref to merge"
-msgstr "Vous devez spécifier une référence de notes à fusionner"
+#: builtin/notes.c:799
+msgid "must specify a notes ref to merge"
+msgstr "vous devez spécifier une référence de notes à fusionner"
-#: builtin/notes.c:821
+#: builtin/notes.c:823
#, c-format
-msgid "Unknown -s/--strategy: %s"
+msgid "unknown -s/--strategy: %s"
msgstr "-s/--strategy inconnu : %s"
-#: builtin/notes.c:858
+#: builtin/notes.c:860
#, 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"
+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:861
+#: builtin/notes.c:863
#, c-format
-msgid "Failed to store link to current notes ref (%s)"
+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)"
+"impossible de stocker le lien vers la référence actuelle aux notes (%s)"
-#: builtin/notes.c:863
+#: builtin/notes.c:865
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
"valide le résultat avec 'git notes merges --commit', ou abandonnez la fusion "
"avec 'git notes merge --abort'.\n"
-#: builtin/notes.c:885
+#: builtin/notes.c:887
#, c-format
msgid "Object %s has no note\n"
msgstr "L'objet %s n'a pas de note\n"
-#: builtin/notes.c:897
+#: builtin/notes.c:899
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:900
+#: builtin/notes.c:902
msgid "read object names from the standard input"
msgstr "lire les noms d'objet depuis l'entrée standard"
-#: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127
+#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
msgid "do not remove, show only"
msgstr "ne pas supprimer, afficher seulement"
-#: builtin/notes.c:939
+#: builtin/notes.c:941
msgid "report pruned notes"
msgstr "afficher les notes éliminées"
-#: builtin/notes.c:981
+#: builtin/notes.c:983
msgid "notes-ref"
msgstr "références-notes"
-#: builtin/notes.c:982
+#: builtin/notes.c:984
msgid "use notes from <notes-ref>"
msgstr "utiliser les notes depuis <références-notes>"
-#: builtin/notes.c:1017 builtin/remote.c:1623
+#: builtin/notes.c:1019
#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "Sous-commande inconnue : %s"
+msgid "unknown subcommand: %s"
+msgstr "sous-commande inconnue : %s"
-#: builtin/pack-objects.c:28
+#: builtin/pack-objects.c:29
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:29
+#: builtin/pack-objects.c:30
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:177 builtin/pack-objects.c:180
+#: builtin/pack-objects.c:179 builtin/pack-objects.c:182
#, c-format
msgid "deflate error (%d)"
msgstr "erreur de compression (%d)"
-#: builtin/pack-objects.c:766
+#: builtin/pack-objects.c:768
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:779
+#: builtin/pack-objects.c:781
msgid "Writing objects"
msgstr "Écriture des objets"
-#: builtin/pack-objects.c:1037
+#: builtin/pack-objects.c:1070
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:2197
+#: builtin/pack-objects.c:2346
msgid "Compressing objects"
msgstr "Compression des objets"
-#: builtin/pack-objects.c:2611
+#: builtin/pack-objects.c:2759
#, c-format
msgid "unsupported index version %s"
msgstr "version d'index non supportée %s"
-#: builtin/pack-objects.c:2615
+#: builtin/pack-objects.c:2763
#, c-format
msgid "bad index version '%s'"
msgstr "mauvaise version d'index '%s'"
-#: builtin/pack-objects.c:2645
+#: builtin/pack-objects.c:2793
msgid "do not show progress meter"
msgstr "ne pas afficher la barre de progression"
-#: builtin/pack-objects.c:2647
+#: builtin/pack-objects.c:2795
msgid "show progress meter"
msgstr "afficher la barre de progression"
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2797
msgid "show progress meter during object writing phase"
msgstr "afficher la barre de progression durant la phase d'écrite des objets"
-#: builtin/pack-objects.c:2652
+#: builtin/pack-objects.c:2800
msgid "similar to --all-progress when progress meter is shown"
msgstr "similaire à --all-progress quand la barre de progression est affichée"
-#: builtin/pack-objects.c:2653
+#: builtin/pack-objects.c:2801
msgid "version[,offset]"
msgstr "version[,offset]"
-#: builtin/pack-objects.c:2654
+#: builtin/pack-objects.c:2802
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:2657
+#: builtin/pack-objects.c:2805
msgid "maximum size of each output pack file"
msgstr "taille maximum de chaque fichier paquet en sortie"
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2807
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorer les objets empruntés à un autre magasin d'objets"
-#: builtin/pack-objects.c:2661
+#: builtin/pack-objects.c:2809
msgid "ignore packed objects"
msgstr "ignorer les objets empaquetés"
-#: builtin/pack-objects.c:2663
+#: builtin/pack-objects.c:2811
msgid "limit pack window by objects"
msgstr "limiter la fenêtre d'empaquetage par objets"
-#: builtin/pack-objects.c:2665
+#: builtin/pack-objects.c:2813
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:2667
+#: builtin/pack-objects.c:2815
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:2669
+#: builtin/pack-objects.c:2817
msgid "reuse existing deltas"
msgstr "réutiliser les deltas existants"
-#: builtin/pack-objects.c:2671
+#: builtin/pack-objects.c:2819
msgid "reuse existing objects"
msgstr "réutiliser les objets existants"
-#: builtin/pack-objects.c:2673
+#: builtin/pack-objects.c:2821
msgid "use OFS_DELTA objects"
msgstr "utiliser les objets OFS_DELTA"
-#: builtin/pack-objects.c:2675
+#: builtin/pack-objects.c:2823
msgid "use threads when searching for best delta matches"
msgstr ""
"utiliser des fils lors de la recherche pour une meilleurs correspondance des "
"deltas"
-#: builtin/pack-objects.c:2677
+#: builtin/pack-objects.c:2825
msgid "do not create an empty pack output"
msgstr "ne pas créer un paquet vide"
-#: builtin/pack-objects.c:2679
+#: builtin/pack-objects.c:2827
msgid "read revision arguments from standard input"
msgstr "lire les paramètres de révision depuis l'entrée standard"
-#: builtin/pack-objects.c:2681
+#: builtin/pack-objects.c:2829
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:2684
+#: builtin/pack-objects.c:2832
msgid "include objects reachable from any reference"
msgstr "inclure les objets accessibles depuis toute référence"
-#: builtin/pack-objects.c:2687
+#: builtin/pack-objects.c:2835
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:2690
+#: builtin/pack-objects.c:2838
msgid "include objects referred to by the index"
msgstr "inclure les objets référencés par l'index"
-#: builtin/pack-objects.c:2693
+#: builtin/pack-objects.c:2841
msgid "output pack to stdout"
msgstr "afficher l'empaquetage sur la sortie standard"
-#: builtin/pack-objects.c:2695
+#: builtin/pack-objects.c:2843
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:2697
+#: builtin/pack-objects.c:2845
msgid "keep unreachable objects"
msgstr "garder les objets inaccessibles"
-#: builtin/pack-objects.c:2699
+#: builtin/pack-objects.c:2847
msgid "pack loose unreachable objects"
msgstr "empaqueter les objets inaccessibles détachés"
-#: builtin/pack-objects.c:2700 parse-options.h:142
-msgid "time"
-msgstr "heure"
-
-#: builtin/pack-objects.c:2701
+#: builtin/pack-objects.c:2849
msgid "unpack unreachable objects newer than <time>"
msgstr "dépaqueter les objets inaccessibles plus récents que <heure>"
-#: builtin/pack-objects.c:2704
+#: builtin/pack-objects.c:2852
msgid "create thin packs"
msgstr "créer des paquets légers"
-#: builtin/pack-objects.c:2706
+#: builtin/pack-objects.c:2854
msgid "create packs suitable for shallow fetches"
msgstr "créer des paquets permettant des récupérations superficielles"
-#: builtin/pack-objects.c:2708
+#: builtin/pack-objects.c:2856
msgid "ignore packs that have companion .keep file"
msgstr "ignorer les paquets qui ont un fichier .keep"
-#: builtin/pack-objects.c:2710
+#: builtin/pack-objects.c:2858
msgid "pack compression level"
msgstr "niveau de compression du paquet"
-#: builtin/pack-objects.c:2712
+#: builtin/pack-objects.c:2860
msgid "do not hide commits by grafts"
msgstr "ne pas cacher les validations par greffes"
-#: builtin/pack-objects.c:2714
+#: builtin/pack-objects.c:2862
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:2716
+#: builtin/pack-objects.c:2864
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:2829
+#: builtin/pack-objects.c:2993
msgid "Counting objects"
msgstr "Décompte des objets"
msgid "cannot prune in a precious-objects repo"
msgstr "impossible de nettoyer dans un dépôt d'objets précieux"
-#: builtin/pull.c:72
+#: builtin/pull.c:51 builtin/pull.c:53
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr "Valeur invalide pour %s : %s"
+
+#: builtin/pull.c:73
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<options>] [<dépôt> [<spécification-de-référence>...]]"
-#: builtin/pull.c:120
+#: builtin/pull.c:121
msgid "Options related to merging"
msgstr "Options relatives à la fusion"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant"
-#: builtin/pull.c:147 builtin/revert.c:101
+#: builtin/pull.c:148 builtin/revert.c:101
msgid "allow fast-forward"
msgstr "autoriser l'avance rapide"
-#: builtin/pull.c:156
+#: builtin/pull.c:157
msgid "automatically stash/stash pop before and after rebase"
msgstr "remiser avant et réappliquer après le rebasage automatiquement"
-#: builtin/pull.c:172
+#: builtin/pull.c:173
msgid "Options related to fetching"
msgstr "Options relatives au rapatriement"
-#: builtin/pull.c:194
+#: builtin/pull.c:195
msgid "number of submodules pulled in parallel"
msgstr "nombre de sous-modules tirés en parallèle"
-#: builtin/pull.c:283
+#: builtin/pull.c:284
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Valeur invalide pour pull.ff : %s"
-#: builtin/pull.c:379 git-sh-setup.sh:226
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr ""
-"impossible de tirer avec rebasage. Vous avez des modifications non indexées."
-
-#: builtin/pull.c:385 git-sh-setup.sh:252
-msgid "Additionally, your index contains uncommitted changes."
-msgstr "De plus, votre index contient des modifications non validées."
-
-#: builtin/pull.c:387 git-sh-setup.sh:245
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"impossible de tirer avec rebasage : votre index contient des modifications "
-"non validées."
-
-#: builtin/pull.c:463
+#: builtin/pull.c:397
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
"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:465
+#: builtin/pull.c:399
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:466
+#: builtin/pull.c:400
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
"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:469
+#: builtin/pull.c:403
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"configuration\n"
"pour la branche actuelle, vous devez spécifier la branche avec la commande."
-#: builtin/pull.c:474 git-parse-remote.sh:73
+#: builtin/pull.c:408 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Vous n'êtes actuellement sur aucune branche."
-#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
+#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Veuillez spécifier sur quelle branche vous souhaiter rebaser."
-#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
+#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Veuillez spécifier une branche avec laquelle fusionner."
-#: builtin/pull.c:479 builtin/pull.c:494
+#: builtin/pull.c:413 builtin/pull.c:428
msgid "See git-pull(1) for details."
msgstr "Référez-vous à git-pull(1) pour de plus amples détails."
-#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr "<distant>"
-#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451
+#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<branche>"
-#: builtin/pull.c:489 git-parse-remote.sh:75
+#: builtin/pull.c:423 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "Pas d'information de suivi distant pour la branche actuelle."
-#: builtin/pull.c:498 git-parse-remote.sh:95
+#: builtin/pull.c:432 git-parse-remote.sh:95
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:503
+#: builtin/pull.c:437
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"'%s'\n"
"du serveur distant, mais cette référence n'a pas été récupérée."
-#: builtin/pull.c:820
+#: builtin/pull.c:754
msgid "ignoring --verify-signatures for rebase"
msgstr "--verify-signatures est ignoré pour un rebasage"
-#: builtin/pull.c:867
+#: builtin/pull.c:801
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "l'option --[no-]autostash n'est valide qu'avec --rebase."
-#: builtin/pull.c:875
+#: builtin/pull.c:809
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:903
+#: builtin/pull.c:812
+msgid "pull with rebase"
+msgstr "tirer avec un rebasage"
+
+#: builtin/pull.c:813
+msgid "please commit or stash them."
+msgstr "veuillez les valider ou les remiser."
+
+#: builtin/pull.c:838
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"avance rapide de votre copie de travail\n"
"depuis le commit %s."
-#: builtin/pull.c:908
+#: builtin/pull.c:843
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"$ git reset --hard\n"
"pour régénérer."
-#: builtin/pull.c:923
+#: builtin/pull.c:858
msgid "Cannot merge multiple branches into empty head."
msgstr "Impossible de fusionner de multiples branches sur une tête vide."
-#: builtin/pull.c:927
+#: builtin/pull.c:862
msgid "Cannot rebase onto multiple branches."
msgstr "Impossible de rebaser sur de multiples branches."
msgid "debug unpack-trees"
msgstr "déboguer unpack-trees"
-#: builtin/receive-pack.c:25
+#: builtin/receive-pack.c:26
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <répertoire-git>"
-#: builtin/receive-pack.c:1843
+#: builtin/receive-pack.c:793
+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 'receive.denyCurrentBranch' configuration variable to\n"
+"'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 ""
+"Par défaut, mettre à jour la branche actuelle dans un dépôt non-nu\n"
+"est réfusé parce que cela rendrait l'index et la copie de travail\n"
+"inconsistants avec ce que vous avez poussé et nécessiterait\n"
+"'git reset --hard' pour réaligner la copie de travail avec HEAD.\n"
+"\n"
+"Vous pouvez régler « receive.denyCurrentBranch » à 'ignore' ou\n"
+"'warn' dans le dépôt distant pour permettre la poussée dans la\n"
+"branche actuelle ; cependant, ce n'est pas recommandé à moins que\n"
+"vous ayez déjà mis à jour sa copie de travail par une moyen détourné\n"
+"pour correspondre à ce que vous avez poussé.\n"
+"\n"
+"Pour éliminer ce message et conserver le comportement par défaut,\n"
+"réglez « receive.denyCurrentBranch » à 'refuse'."
+
+#: builtin/receive-pack.c:813
+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 ""
+"Par défaut, supprimer la branche actuelle est refusé parce que le\n"
+"prochain 'git clone' n'extraira aucun fichier et causer de la confusion.\n"
+"\n"
+"Vous pouvez régler « receive.denyDeleteCurrent » à 'warn' ou 'ignore'\n"
+"dans le dépôt distant pour permettre la suppression la branche actuelle\n"
+"avec ou sans message d'avertissement.\n"
+"\n"
+"Pour éliminer ce message, réglez-le à 'refuse'."
+
+#: builtin/receive-pack.c:1883
msgid "quiet"
msgstr "quiet"
-#: builtin/receive-pack.c:1857
+#: builtin/receive-pack.c:1897
msgid "You must specify a directory."
msgstr "Vous devez spécifier un répertoire."
msgid " Fetch URL: %s"
msgstr " URL de rapatriement : %s"
-#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296
+#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
msgid "(no URL)"
msgstr "(pas d'URL)"
msgstr[0] " Branche distante :%s"
msgstr[1] " Branches distantes :%s"
-#: builtin/remote.c:1179 builtin/remote.c:1206
+#: builtin/remote.c:1179 builtin/remote.c:1205
msgid " (status not queried)"
msgstr " (statut non demandé)"
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:1203
+#: builtin/remote.c:1202
#, 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:1224
+#: builtin/remote.c:1223
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "définir refs/remotes/<nom>/HEAD selon la distante"
-#: builtin/remote.c:1226
+#: builtin/remote.c:1225
msgid "delete refs/remotes/<name>/HEAD"
msgstr "supprimer refs/remotes/<nom>/HEAD"
-#: builtin/remote.c:1241
+#: builtin/remote.c:1240
msgid "Cannot determine remote HEAD"
msgstr "Impossible de déterminer la HEAD distante"
-#: builtin/remote.c:1243
+#: builtin/remote.c:1242
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:1253
+#: builtin/remote.c:1252
#, c-format
msgid "Could not delete %s"
msgstr "Impossible de supprimer %s"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1260
#, c-format
msgid "Not a valid ref: %s"
msgstr "Référence non valide : %s"
-#: builtin/remote.c:1263
+#: builtin/remote.c:1262
#, c-format
msgid "Could not setup %s"
msgstr "Impossible de paramétrer %s"
-#: builtin/remote.c:1281
+#: builtin/remote.c:1280
#, c-format
msgid " %s will become dangling!"
msgstr " %s se retrouvera en suspens !"
-#: builtin/remote.c:1282
+#: builtin/remote.c:1281
#, c-format
msgid " %s has become dangling!"
msgstr " %s se retrouve en suspens !"
-#: builtin/remote.c:1292
+#: builtin/remote.c:1291
#, c-format
msgid "Pruning %s"
msgstr "Élimination de %s"
-#: builtin/remote.c:1293
+#: builtin/remote.c:1292
#, c-format
msgid "URL: %s"
msgstr "URL : %s"
-#: builtin/remote.c:1309
+#: builtin/remote.c:1308
#, c-format
msgid " * [would prune] %s"
msgstr " * [serait éliminé] %s"
-#: builtin/remote.c:1312
+#: builtin/remote.c:1311
#, c-format
msgid " * [pruned] %s"
msgstr " * [éliminé] %s"
-#: builtin/remote.c:1357
+#: builtin/remote.c:1356
msgid "prune remotes after fetching"
msgstr "éliminer les distants après le rapatriement"
-#: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542
+#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
#, c-format
msgid "No such remote '%s'"
msgstr "Pas de serveur remote '%s'"
-#: builtin/remote.c:1436
+#: builtin/remote.c:1435
msgid "add branch"
msgstr "ajouter une branche"
-#: builtin/remote.c:1443
+#: builtin/remote.c:1442
msgid "no remote specified"
msgstr "pas de serveur distant spécifié"
-#: builtin/remote.c:1460
+#: builtin/remote.c:1459
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:1462
+#: builtin/remote.c:1461
msgid "return all URLs"
msgstr "retourner toutes les URLs"
-#: builtin/remote.c:1490
+#: builtin/remote.c:1489
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "aucune URL configurée pour le dépôt distant '%s'"
-#: builtin/remote.c:1516
+#: builtin/remote.c:1515
msgid "manipulate push URLs"
msgstr "manipuler les URLs push"
-#: builtin/remote.c:1518
+#: builtin/remote.c:1517
msgid "add URL"
msgstr "ajouter une URL"
-#: builtin/remote.c:1520
+#: builtin/remote.c:1519
msgid "delete URLs"
msgstr "supprimer des URLs"
-#: builtin/remote.c:1527
+#: builtin/remote.c:1526
msgid "--add --delete doesn't make sense"
msgstr "--add --delete n'a aucun sens"
-#: builtin/remote.c:1568
+#: builtin/remote.c:1567
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Motif d'URL ancien invalide : %s"
-#: builtin/remote.c:1576
+#: builtin/remote.c:1575
#, c-format
msgid "No such URL found: %s"
msgstr "Pas d'URL trouvée : %s"
-#: builtin/remote.c:1578
+#: builtin/remote.c:1577
msgid "Will not delete all non-push URLs"
msgstr "Pas de suppression de toutes les URLs non-push"
-#: builtin/remote.c:1592
+#: builtin/remote.c:1591
msgid "be verbose; must be placed before a subcommand"
msgstr "être verbeux : doit être placé avant une sous-commande"
+#: builtin/remote.c:1622
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Sous-commande inconnue : %s"
+
#: builtin/repack.c:17
msgid "git repack [<options>]"
msgstr "git repack [<options>]"
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
#: builtin/reset.c:27
-msgid "git reset [-q]
<tree-ish> [--] <paths>..."
-msgstr "git reset [-q] <arbre ou apparenté> [--] <chemins>..."
+msgid "git reset [-q]
[<tree-ish>] [--] <paths>..."
+msgstr "git reset [-q] [<arbre ou apparenté>] [--] <chemins>..."
#: builtin/reset.c:28
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgid "Could not write new index file."
msgstr "Impossible d'écrire le nouveau fichier d'index."
-#: builtin/rev-list.c:362
+#: builtin/rev-list.c:354
msgid "rev-list does not support display of notes"
msgstr "rev-list ne supporte l'affichage des notes"
-#: builtin/rev-parse.c:358
+#: builtin/rev-parse.c:386
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<options>] -- [<arguments>...]"
-#: builtin/rev-parse.c:363
+#: builtin/rev-parse.c:391
msgid "keep the `--` passed as an arg"
msgstr "garder le `--` passé en argument"
-#: builtin/rev-parse.c:365
+#: builtin/rev-parse.c:393
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:368
+#: builtin/rev-parse.c:396
msgid "output in stuck long form"
msgstr "sortie en forme longue fixée"
-#: builtin/rev-parse.c:499
+#: builtin/rev-parse.c:527
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
msgid "revert failed"
msgstr "revert a échoué"
-#: builtin/revert.c:207
+#: builtin/revert.c:205
msgid "cherry-pick failed"
msgstr "le picorage a échoué"
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:640
+#: builtin/show-branch.c:375
+#, 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:541
+#, c-format
+msgid "no matching refs with %s"
+msgstr "aucune référence correspond à %s"
+
+#: builtin/show-branch.c:639
msgid "show remote-tracking and local branches"
msgstr "afficher les branches de suivi distantes et les branches locales"
-#: builtin/show-branch.c:642
+#: builtin/show-branch.c:641
msgid "show remote-tracking branches"
msgstr "afficher les branches de suivi distantes"
-#: builtin/show-branch.c:644
+#: builtin/show-branch.c:643
msgid "color '*!+-' corresponding to the branch"
msgstr "couleur '*!+-' correspondant à la branche"
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
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:648
+#: builtin/show-branch.c:647
msgid "synonym to more=-1"
msgstr "synonyme de more=-1"
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
msgid "suppress naming strings"
msgstr "supprimer les chaînes de nommage"
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
msgid "include the current branch"
msgstr "inclure la branche courante"
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
msgid "name commits with their object names"
msgstr "nommer les validations avec leurs noms d'objet"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "show possible merge bases"
msgstr "afficher les bases possibles de fusion"
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
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:659
+#: builtin/show-branch.c:658
msgid "show commits in topological order"
msgstr "afficher les validations dans l'ordre topologique"
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
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:664
+#: builtin/show-branch.c:663
msgid "show merges reachable from only one tip"
msgstr "afficher les fusions accessibles depuis une seule pointe"
-#: builtin/show-branch.c:666
+#: builtin/show-branch.c:665
msgid "topologically sort, maintaining date order where possible"
msgstr "tri topologique, maintenant l'ordre par date si possible"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
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:703
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+msgstr ""
+"--reflog est incompatible avec --all, --remotes, --independant et --merge-"
+"base"
+
+#: builtin/show-branch.c:727
+msgid "no branches given, and HEAD is not valid"
+msgstr "aucune branche spécifiée, et HEAD est invalide"
+
+#: builtin/show-branch.c:730
+msgid "--reflog option needs one branch name"
+msgstr "--reflog requiert un nom de branche"
+
+#: builtin/show-branch.c:733
+#, 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:737
+#, c-format
+msgid "no such ref %s"
+msgstr "référence inexistante %s"
+
+#: builtin/show-branch.c:829
+#, 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:833
+#, c-format
+msgid "'%s' is not a valid ref."
+msgstr "'%s' n'est pas une référence valide."
+
+#: builtin/show-branch.c:836
+#, c-format
+msgid "cannot find commit %s (%s)"
+msgstr "impossible de trouver le commit %s (%s)"
+
#: builtin/show-ref.c:10
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
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:24 builtin/submodule--helper.c:923
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1046
#, c-format
msgid "No such ref: %s"
msgstr "Référence inexistante : %s"
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Nom de référence complet attendu, %s obtenu"
msgid "cannot strip one component off url '%s'"
msgstr "impossible de supprimer un composant de l'URL '%s'"
-#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403
-#: builtin/submodule--helper.c:483
+#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408
+#: builtin/submodule--helper.c:590
msgid "alternative anchor for relative paths"
msgstr "ancre alternative pour les chemins relatifs"
-#: builtin/submodule--helper.c:283
+#: builtin/submodule--helper.c:287
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]"
-#: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338
+#: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343
#, 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:364
+#: builtin/submodule--helper.c:369
#, 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:368
+#: builtin/submodule--helper.c:373
#, 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:378
+#: builtin/submodule--helper.c:383
#, 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:385
+#: builtin/submodule--helper.c:390
#, 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:404
+#: builtin/submodule--helper.c:409
msgid "Suppress output for initializing a submodule"
msgstr "Supprimer la sortie lors de l'initialisation d'un sous-module"
-#: builtin/submodule--helper.c:409
+#: builtin/submodule--helper.c:414
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<chemin>]"
-#: builtin/submodule--helper.c:430
+#: builtin/submodule--helper.c:435
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper <nom> <chemin>"
-#: builtin/submodule--helper.c:436
+#: builtin/submodule--helper.c:441
#, 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:486
+#: builtin/submodule--helper.c:524 builtin/submodule--helper.c:527
+#, 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:563
+#, 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:570
+#, 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:593
msgid "where the new submodule will be cloned to"
msgstr "emplacement où le sous-module sera cloné"
-#: builtin/submodule--helper.c:489
+#: builtin/submodule--helper.c:596
msgid "name of the new submodule"
msgstr "nom du nouveau sous-module"
-#: builtin/submodule--helper.c:492
+#: builtin/submodule--helper.c:599
msgid "url where to clone the submodule from"
msgstr "URL depuis laquelle cloner le sous-module"
-#: builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:605
msgid "depth for shallow clones"
msgstr "profondeur de l'historique des clones superficiels"
-#: builtin/submodule--helper.c:504
+#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964
+msgid "force cloning progress"
+msgstr "forcer l'affichage de la progression du clonage"
+
+#: builtin/submodule--helper.c:613
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
"git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference "
"<dépôt>] [--name <nom>] [--depth <profondeur>] --url <url> --path <chemin>"
-#: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535
+#: builtin/submodule--helper.c:638 builtin/submodule--helper.c:648
#, c-format
msgid "could not create directory '%s'"
msgstr "impossible de créer le répertoire '%s'"
-#: builtin/submodule--helper.c:531
+#: builtin/submodule--helper.c:644
#, 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:547
+#: builtin/submodule--helper.c:660
#, c-format
msgid "cannot open file '%s'"
msgstr "impossible d'ouvrir le fichier '%s'"
-#: builtin/submodule--helper.c:552
+#: builtin/submodule--helper.c:665
#, c-format
msgid "could not close file %s"
msgstr "impossible de fermer le fichier %s"
-#: builtin/submodule--helper.c:559
+#: builtin/submodule--helper.c:672
#, 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:611
+#: builtin/submodule--helper.c:726
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Le chemin de sous-module '%s' n'est pas initialisé"
-#: builtin/submodule--helper.c:615
+#: builtin/submodule--helper.c:730
msgid "Maybe you want to use 'update --init'?"
msgstr "Vous voudriez sûrement utiliser 'update --init' ?"
-#: builtin/submodule--helper.c:641
+#: builtin/submodule--helper.c:756
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Sous-module non fusionné %s non traité"
-#: builtin/submodule--helper.c:662
+#: builtin/submodule--helper.c:777
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Sous-module '%s' non traité"
-#: builtin/submodule--helper.c:792
+#: builtin/submodule--helper.c:913
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Impossible de cloner '%s'. Réessai prévu"
-#: builtin/submodule--helper.c:803
+#: builtin/submodule--helper.c:924
#, 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:824
+#: builtin/submodule--helper.c:945
msgid "path into the working tree"
msgstr "chemin dans la copie de travail"
-#: builtin/submodule--helper.c:827
+#: builtin/submodule--helper.c:948
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:831
+#: builtin/submodule--helper.c:952
msgid "rebase, merge, checkout or none"
msgstr "valeurs possibles : rebase, merge, checkout ou none"
-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:956
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:838
+#: builtin/submodule--helper.c:959
msgid "parallel jobs"
msgstr "jobs parallèles"
-#: builtin/submodule--helper.c:840
+#: builtin/submodule--helper.c:961
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:841
+#: builtin/submodule--helper.c:962
msgid "don't print cloning progress"
msgstr "ne pas afficher la progression du clonage"
-#: builtin/submodule--helper.c:846
+#: builtin/submodule--helper.c:969
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<chemin>] [<chemin>...]"
-#: builtin/submodule--helper.c:856
+#: builtin/submodule--helper.c:979
msgid "bad value for update parameter"
msgstr "valeur invalide pour la mise à jour du paramètre"
-#: builtin/submodule--helper.c:927
+#: builtin/submodule--helper.c:1050
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"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:977
+#: builtin/submodule--helper.c:1100
msgid "submodule--helper subcommand must be called with a subcommand"
msgstr ""
"la sous-commande submodule--helper doit être appelée avec une sous-commande"
-#: builtin/submodule--helper.c:984
+#: builtin/submodule--helper.c:1107
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' n'est pas une sous-commande valide de submodule--helper"
msgid "Updated tag '%s' (was %s)\n"
msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n"
-#: builtin/unpack-objects.c:490
+#: builtin/unpack-objects.c:493
msgid "Unpacking objects"
msgstr "Dépaquetage des objets"
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:575
+#: builtin/update-index.c:564
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<options>] [--] [<fichier>...]"
-#: builtin/update-index.c:930
+#: builtin/update-index.c:919
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:933
+#: builtin/update-index.c:922
msgid "refresh: ignore submodules"
msgstr "rafraîchir : ignorer les sous-modules"
-#: builtin/update-index.c:936
+#: builtin/update-index.c:925
msgid "do not ignore new files"
msgstr "ne pas ignorer les nouveaux fichiers"
-#: builtin/update-index.c:938
+#: builtin/update-index.c:927
msgid "let files replace directories and vice-versa"
msgstr "laisser les fichiers remplacer des répertoires et vice-versa"
-#: builtin/update-index.c:940
+#: builtin/update-index.c:929
msgid "notice files missing from worktree"
msgstr "aviser des fichiers manquants dans la copie de travail"
-#: builtin/update-index.c:942
+#: builtin/update-index.c:931
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:945
+#: builtin/update-index.c:934
msgid "refresh stat information"
msgstr "rafraîchir l'information de stat"
-#: builtin/update-index.c:949
+#: builtin/update-index.c:938
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "comme --refresh, mais en ignorant l'option assume-unchanged"
-#: builtin/update-index.c:953
+#: builtin/update-index.c:942
msgid "<mode>,<object>,<path>"
msgstr "<mode>, <objet>, <chemin>"
-#: builtin/update-index.c:954
+#: builtin/update-index.c:943
msgid "add the specified entry to the index"
msgstr "ajouter l'élément spécifié dans l'index"
-#: builtin/update-index.c:963
+#: builtin/update-index.c:952
msgid "mark files as \"not changing\""
msgstr "marquer les fichiers comme \"non changeants\""
-#: builtin/update-index.c:966
+#: builtin/update-index.c:955
msgid "clear assumed-unchanged bit"
msgstr "mettre à zéro le bit supposé-non-modifié"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:958
msgid "mark files as \"index-only\""
msgstr "marquer les fichiers comme \"index seulement\""
-#: builtin/update-index.c:972
+#: builtin/update-index.c:961
msgid "clear skip-worktree bit"
msgstr "mettre à zéro le bit sauter-la-copie-de travail"
-#: builtin/update-index.c:975
+#: builtin/update-index.c:964
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:977
+#: builtin/update-index.c:966
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:979
+#: builtin/update-index.c:968
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:981
+#: builtin/update-index.c:970
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:985
+#: builtin/update-index.c:974
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:989
+#: builtin/update-index.c:978
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:993
+#: builtin/update-index.c:982
msgid "only update entries that differ from HEAD"
msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD"
-#: builtin/update-index.c:997
+#: builtin/update-index.c:986
msgid "ignore files missing from worktree"
msgstr "ignorer les fichiers manquants dans la copie de travail"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:989
msgid "report actions to standard output"
msgstr "afficher les actions sur la sortie standard"
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:991
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:995
msgid "write index in this format"
msgstr "écrire l'index dans ce format"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:997
msgid "enable or disable split index"
msgstr "activer ou désactiver l'index divisé"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:999
msgid "enable/disable untracked cache"
msgstr "activer ou désactiver le cache de non-suivis"
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1001
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:1014
+#: builtin/update-index.c:1003
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:1134
+#: builtin/update-index.c:1119
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
+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:1123
msgid "Untracked cache disabled"
msgstr "Le cache non suivi est désactivé"
-#: builtin/update-index.c:1146
+#: builtin/update-index.c:1131
+msgid ""
+"core.untrackedCache is set to false; remove or change it, if you really want "
+"to enable the untracked cache"
+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:1135
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Le cache non suivi est activé pour '%s'"
msgid "only useful for debugging"
msgstr "seulement utile pour le débogage"
-#: upload-pack.c:20
+#: upload-pack.c:22
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<options>] <répertoire>"
-#: upload-pack.c:837
+#: upload-pack.c:1028
msgid "quit after a single request/response exchange"
msgstr "quitter après un unique échange requête/réponse"
-#: upload-pack.c:839
+#: upload-pack.c:1030
msgid "exit immediately after initial ref advertisement"
msgstr "Sortir immédiatement après l'annonce initiale des références"
-#: upload-pack.c:841
+#: upload-pack.c:1032
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr ""
"nes pas essayer <répertoire>/.git/ si <répertoire> n'est pas un répertoire "
"Git"
-#: upload-pack.c:843
+#: upload-pack.c:1034
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "interrompre le transfer après <n> secondes d'inactivité"
+#: credential-cache--daemon.c:223
+#, 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 ""
+"Les permissions de votre répertoire de socket sont trop permissives ;\n"
+"les autres utilisateurs pourraient lire vos identifiants secrets. Lancez :\n"
+"\n"
+" chmod 0700 %s"
+
#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "afficher les messages de debug sur stderr"
"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."
-#: http.c:323
+#: http.c:342
+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:351
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "L'épinglage de clé publique n'est pas supporté avec cuRL < 7.44.0"
msgid "no-op (backward compatibility)"
msgstr "sans action (rétrocompatibilité)"
-#: parse-options.h:237
+#: parse-options.h:238
msgid "be more verbose"
msgstr "être plus verbeux"
-#: parse-options.h:239
+#: parse-options.h:240
msgid "be more quiet"
msgstr "être plus silencieux"
-#: parse-options.h:245
+#: parse-options.h:246
msgid "use <n> digits to display SHA-1s"
msgstr "utiliser <n> chiffres pour afficher les SHA-1s"
msgstr "La fusion automatique a échoué."
#: git-merge-octopus.sh:62
-msgid "Should not be doing an Octopus."
+msgid "Should not be doing an octopus."
msgstr "L'Octopus ne devrait pas arriver."
#: git-merge-octopus.sh:73
msgid "Cannot save the current index state"
msgstr "Impossible de sauver l'état courant de l'index"
+#: git-stash.sh:103
+msgid "Cannot save the untracked files"
+msgstr "Impossible de sauver les fichiers non-suivis"
+
#: git-stash.sh:123 git-stash.sh:136
msgid "Cannot save the current worktree state"
msgstr "Impossible de sauver l'état courant de la copie de travail"
"erreur: option inconnue pour 'stash save': $option\n"
" Pour fournir un message, utilisez git stash save -- '$option'"
+#: git-stash.sh:251
+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"
+
#: git-stash.sh:259
msgid "No local changes to save"
msgstr "Pas de modifications locales à sauver"
msgid "Cannot remove worktree changes"
msgstr "Impossible de supprimer les changements de la copie de travail"
-#: git-stash.sh:404
+#: git-stash.sh:403
#, sh-format
msgid "unknown option: $opt"
msgstr "option inconnue : $opt"
-#: git-stash.sh:414
+#: git-stash.sh:416
msgid "No stash found."
msgstr "Pas de remisage trouvé."
-#: git-stash.sh:421
+#: git-stash.sh:423
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Trop de révisions spécifiées : $REV"
-#: git-stash.sh:427
+#: git-stash.sh:438
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference n'est pas une référence valide"
-#: git-stash.sh:455
+#: git-stash.sh:466
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' n'est pas une validation de type remisage"
-#: git-stash.sh:466
+#: git-stash.sh:477
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' n'est pas une référence de remisage"
-#: git-stash.sh:474
+#: git-stash.sh:485
msgid "unable to refresh index"
msgstr "impossible de rafraîchir l'index"
-#: git-stash.sh:478
+#: git-stash.sh:489
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Impossible d'appliquer un remisage en cours de fusion"
-#: git-stash.sh:486
+#: git-stash.sh:497
msgid "Conflicts in index. Try without --index."
msgstr "Conflits dans l'index. Essayez sans --index."
-#: git-stash.sh:488
+#: git-stash.sh:499
msgid "Could not save index tree"
msgstr "Impossible de sauvegarder l'arbre d'index"
-#: git-stash.sh:522
+#: git-stash.sh:508
+msgid "Could not restore untracked files from stash"
+msgstr "Impossible de restaurer les fichiers non-suivis depuis le remisage"
+
+#: git-stash.sh:533
msgid "Cannot unstage modified files"
msgstr "Impossible de désindexer les fichiers modifiés"
-#: git-stash.sh:537
+#: git-stash.sh:548
msgid "Index was not unstashed."
msgstr "L'index n'a pas été sorti de remise."
-#: git-stash.sh:551
+#: git-stash.sh:562
msgid "The stash is kept in case you need it again."
msgstr "Le remisage est conservé au cas où vous en auriez encore besoin."
-#: git-stash.sh:560
+#: git-stash.sh:571
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "${REV} supprimé ($s)"
-#: git-stash.sh:561
+#: git-stash.sh:572
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Impossible de supprimer l'élément de stash"
-#: git-stash.sh:569
+#: git-stash.sh:580
msgid "No branch name specified"
msgstr "Aucune branche spécifiée"
-#: git-stash.sh:641
+#: git-stash.sh:652
msgid "(To restore them type \"git stash apply\")"
msgstr "(Pour les restaurer tapez \"git stash apply\")"
-#: git-submodule.sh:183
+#: git-submodule.sh:184
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"Un chemin relatif ne peut être utilisé que depuis la racine de la copie de "
"travail"
-#: git-submodule.sh:193
+#: git-submodule.sh:194
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "L'URL de dépôt '$repo' doit être absolu ou commencer par ./|../"
-#: git-submodule.sh:210
+#: git-submodule.sh:211
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' existe déjà dans l'index"
-#: git-submodule.sh:214
+#: git-submodule.sh:215
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
"$sm_path\n"
"Utilisez -f si vous voulez vraiment l'ajouter."
-#: git-submodule.sh:232
+#: git-submodule.sh:233
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Ajout du dépôt existant à '$sm_path' dans l'index"
-#: git-submodule.sh:234
+#: git-submodule.sh:235
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' existe déjà et n'est pas un dépôt git valide"
-#: git-submodule.sh:242
+#: git-submodule.sh:243
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Un répertoire git pour '$sm_name' est trouvé en local avec le(s) serveur(s) "
"distant(s) :"
-#: git-submodule.sh:244
+#: git-submodule.sh:245
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
"correct\n"
"ou si ceci n'est pas clair, choisissez un autre nom avec l'option '--name'."
-#: git-submodule.sh:250
+#: git-submodule.sh:251
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Réactivation du répertoire git local pour le sous-module '$sm_name'."
-#: git-submodule.sh:262
+#: git-submodule.sh:263
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Impossible d'extraire le sous-module '$sm_path'"
-#: git-submodule.sh:267
+#: git-submodule.sh:268
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Échec d'ajout du sous-module '$sm_path'"
-#: git-submodule.sh:276
+#: git-submodule.sh:277
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Échec d'enregistrement du sous-module '$sm_path'"
-#: git-submodule.sh:323
+#: git-submodule.sh:324
#, sh-format
msgid "Entering '$displaypath'"
msgstr "Entrée dans '$displaypath'"
-#: git-submodule.sh:343
+#: git-submodule.sh:344
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr "Arrêt sur '$displaypath' ; le script a retourné un statut non nul."
-#: git-submodule.sh:414
+#: git-submodule.sh:415
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr "un spécificateur de chemin et --all sont incompatibles"
-#: git-submodule.sh:419
+#: git-submodule.sh:420
#, sh-format
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
"Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules"
-#: git-submodule.sh:439
+#: git-submodule.sh:440
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains a .git directory\n"
"(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout son "
"historique)"
-#: git-submodule.sh:447
+#: git-submodule.sh:448
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
"La copie de travail du sous-module '$displaypath' contient des modifications "
"locales ; utilisez '-f' pour les annuler"
-#: git-submodule.sh:450
+#: git-submodule.sh:451
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Répertoire '$displaypath' nettoyé"
-#: git-submodule.sh:451
+#: git-submodule.sh:452
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr ""
"Impossible de supprimer la copie de travail du sous-module '$displaypath'"
-#: git-submodule.sh:454
+#: git-submodule.sh:455
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "Impossible de créer le répertoire vide du sous-module '$displaypath'"
-#: git-submodule.sh:463
+#: git-submodule.sh:464
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
"Le sous-module '$name' ($url) n'est pas enregistré pour le chemin "
"'$displaypath'"
-#: git-submodule.sh:612
+#: git-submodule.sh:617
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
"Impossible de trouver la révision courante dans le chemin de sous-module "
"'$displaypath'"
-#: git-submodule.sh:622
+#: git-submodule.sh:627
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Impossible de rapatrier dans le chemin de sous-module '$sm_path'"
-#: git-submodule.sh:627
+#: git-submodule.sh:632
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"Impossible de trouver la révision courante ${remote_name}/${branch} dans le "
"chemin de sous-module '$sm_path'"
-#: git-submodule.sh:645
+#: git-submodule.sh:650
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Impossible de rapatrier dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:651
+#: git-submodule.sh:656
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Chemin de sous-module '$displaypath' récupéré, mais il ne contenait pas "
"$sha1. La récupération directe de ce commit a échoué."
-#: git-submodule.sh:658
+#: git-submodule.sh:663
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
"Impossible d'extraire '$sha1' dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:659
+#: git-submodule.sh:664
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait"
-#: git-submodule.sh:663
+#: git-submodule.sh:668
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
"Impossible de rebaser '$sha1' dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:664
+#: git-submodule.sh:669
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'"
-#: git-submodule.sh:669
+#: git-submodule.sh:674
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
"Impossible de fusionner '$sha1' dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:670
+#: git-submodule.sh:675
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'"
-#: git-submodule.sh:675
+#: git-submodule.sh:680
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"L'exécution de '$command $sha1' a échoué dans le chemin de sous-module "
"'$displaypath'"
-#: git-submodule.sh:676
+#: git-submodule.sh:681
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'"
-#: git-submodule.sh:707
+#: git-submodule.sh:712
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'"
-#: git-submodule.sh:815
+#: git-submodule.sh:820
msgid "The --cached option cannot be used with the --files option"
msgstr "L'option --cached ne peut pas être utilisée avec l'option --files"
-#: git-submodule.sh:867
+#: git-submodule.sh:872
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "mode $mod_dst inattendu"
-#: git-submodule.sh:887
+#: git-submodule.sh:892
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Attention : $display_name ne contient pas la validation $sha1_src"
-#: git-submodule.sh:890
+#: git-submodule.sh:895
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Attention : $display_name ne contient pas la validation $sha1_dst"
-#: git-submodule.sh:893
+#: git-submodule.sh:898
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" Attention : $display_name ne contient pas les validations $sha1_src et "
"$sha1_dst"
-#: git-submodule.sh:918
-msgid "blob"
-msgstr "blob"
-
-#: git-submodule.sh:1040
+#: git-submodule.sh:1045
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'"
-#: git-submodule.sh:1107
+#: git-submodule.sh:1112
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synchronisation de l'URL sous-module pour '$displaypath'"
msgstr ""
"Impossible de corriger le commit après avoir réussi à picorer $sha1... "
"$rest\n"
-"C'est probablement du à un message de validation vide ou le crochet pre-"
+"C'est probablement dû à un message de validation vide ou le crochet pre-"
"commit\n"
"a échoué. Si le crochet pre-commit a échoué, vous devez peut-être résoudre "
"le\n"
"Ignoré."
#: git-rebase--interactive.sh:1044
-msgid "You can fix this with 'git rebase --edit-todo'."
-msgstr "Vous pouvez corriger ceci avec 'git rebase --edit-todo'."
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'."
+msgstr ""
+"Vous pouvez corriger ceci avec 'git rebase --edit-todo' puis lancez 'git "
+"rebase --continue'."
#: git-rebase--interactive.sh:1045
msgid "Or you can abort the rebase with 'git rebase --abort'."
"\n"
" git commit $gpg_sign_opt_quoted\n"
"\n"
-"In both case, once you're done, continue with:\n"
+"In both cases, once you're done, continue with:\n"
"\n"
" git rebase --continue\n"
msgstr ""
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1298
+#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1295
msgid "Could not execute editor"
msgstr "Impossible de lancer l'éditeur"
-#: git-rebase--interactive.sh:1145
-msgid "You need to set your committer info first"
-msgstr "Vous devez d'abord définir vos informations de validateur"
-
-#: git-rebase--interactive.sh:1153
+#: git-rebase--interactive.sh:1150
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "Impossible d'extraire $switch_to"
-#: git-rebase--interactive.sh:1158
+#: git-rebase--interactive.sh:1155
msgid "No HEAD?"
msgstr "Pas de HEAD ?"
-#: git-rebase--interactive.sh:1159
+#: git-rebase--interactive.sh:1156
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Impossible de créer un répertoire temporaire $state_dir"
-#: git-rebase--interactive.sh:1161
+#: git-rebase--interactive.sh:1158
msgid "Could not mark as interactive"
msgstr "Impossible de marquer comme interactif"
-#: git-rebase--interactive.sh:1171 git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:1168 git-rebase--interactive.sh:1173
msgid "Could not init rewritten commits"
msgstr "Impossible d'initialiser les commits réécrits"
-#: git-rebase--interactive.sh:1276
+#: git-rebase--interactive.sh:1273
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "Rebasage de $shortrevisions sur $shortonto ($todocount commande)"
msgstr[1] "Rebasage de $shortrevisions sur $shortonto ($todocount commandes)"
-#: git-rebase--interactive.sh:1281
+#: git-rebase--interactive.sh:1278
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"Cependant, si vous effacez tout, le rebasage sera annulé.\n"
"\n"
-#: git-rebase--interactive.sh:1288
+#: git-rebase--interactive.sh:1285
msgid "Note that empty commits are commented out"
msgstr "Veuillez noter que les commits vides sont en commentaire"
"Impossible de réécrire les branches : vous avez des modifications non "
"indexées."
+#: git-sh-setup.sh:226
+msgid "Cannot pull with rebase: You have unstaged changes."
+msgstr ""
+"impossible de tirer avec rebasage. Vous avez des modifications non indexées."
+
#: git-sh-setup.sh:229
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr ""
"Impossible de rebaser : votre index contient des modifications non validées."
+#: git-sh-setup.sh:245
+msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+msgstr ""
+"impossible de tirer avec rebasage : votre index contient des modifications "
+"non validées."
+
#: git-sh-setup.sh:248
#, 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:252
+msgid "Additionally, your index contains uncommitted changes."
+msgstr "De plus, votre index contient des modifications non validées."
+
#: git-sh-setup.sh:372
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
msgid "Unable to determine absolute path of git directory"
msgstr "Impossible de déterminer le chemin absolu du répertoire git"
+#~ msgid "Could not write to %s"
+#~ msgstr "Impossible d'écrire dans %s"
+
+#~ msgid "Error wrapping up %s."
+#~ msgstr "Erreur lors de l'emballage de %s."
+
+#~ msgid "Your local changes would be overwritten by cherry-pick."
+#~ msgstr "Vos modifications locales seraient écrasées par cherry-pick."
+
+#~ msgid "Cannot revert during another revert."
+#~ msgstr "Impossible d'annuler un commit pendant l'annulation d'un commit."
+
+#~ msgid "Cannot cherry-pick during another cherry-pick."
+#~ msgstr "Impossible de picorer pendant un autre picorage."
+
+#~ msgid "Could not parse line %d."
+#~ msgstr "Impossible d'analyser la ligne %d."
+
+#~ msgid "Could not open %s"
+#~ msgstr "Impossible d'ouvrir %s"
+
+#~ msgid "Could not read %s."
+#~ msgstr "Impossible de lire %s."
+
+#~ msgid "Could not format %s."
+#~ msgstr "Impossible de formater %s."
+
+#~ msgid "%s: %s"
+#~ msgstr "%s : %s"
+
+#~ msgid "cannot open %s: %s"
+#~ msgstr "impossible d'ouvrir %s : %s"
+
+#~ msgid "You need to set your committer info first"
+#~ msgstr "Vous devez d'abord définir vos informations de validateur"
+
#~ msgid "This is the 2nd commit message:"
#~ msgstr "Ceci est le deuxième message de validation :"
#~ msgid "Verify that the named commit has a valid GPG signature"
#~ msgstr "Vérifier que la validation a une signature GPG valide"
-#~ msgid "Could not write to '%s'"
-#~ msgstr "Impossible d'écrire dans '%s'"
-
#~ msgid "Writing SQUASH_MSG"
#~ msgstr "Écriture de SQUASH_MSG"
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-08-27 23:21+0800\n"
+"POT-Creation-Date: 2016-11-25 22:50+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"\n"
msgstr ""
-#: archive.c:12
-msgid "git archive [<options>] <tree-ish> [<path>...]"
+#: apply.c:57
+#, c-format
+msgid "unrecognized whitespace option '%s'"
msgstr ""
-#: archive.c:13
-msgid "git archive --list"
+#: apply.c:73
+#, c-format
+msgid "unrecognized whitespace ignore option '%s'"
msgstr ""
-#: archive.c:14
-msgid ""
-"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
+#: apply.c:125
+msgid "--reject and --3way cannot be used together."
msgstr ""
-#: archive.c:15
-msgid "git archive --remote <repo> [--exec <cmd>] --list"
+#: apply.c:127
+msgid "--cached and --3way cannot be used together."
msgstr ""
-#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327
-#, c-format
-msgid "pathspec '%s' did not match any files"
+#: apply.c:130
+msgid "--3way outside a repository"
msgstr ""
-#: archive.c:429
-msgid "fmt"
+#: apply.c:141
+msgid "--index outside a repository"
msgstr ""
-#: archive.c:429
-msgid "archive format"
+#: apply.c:144
+msgid "--cached outside a repository"
msgstr ""
-#: archive.c:430 builtin/log.c:1422
-msgid "prefix"
+#: apply.c:845
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
msgstr ""
-#: archive.c:431
-msgid "prepend prefix to each pathname in the archive"
+#: apply.c:854
+#, c-format
+msgid "regexec returned %d for input: %s"
msgstr ""
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553
-#: builtin/blame.c:2554 builtin/config.c:59 builtin/fast-export.c:987
-#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100
-#: builtin/ls-files.c:460 builtin/ls-files.c:463 builtin/notes.c:399
-#: builtin/notes.c:562 builtin/read-tree.c:109 parse-options.h:153
-msgid "file"
+#: apply.c:938
+#, c-format
+msgid "unable to find filename in patch at line %d"
msgstr ""
-#: archive.c:433 builtin/archive.c:89
-msgid "write the archive to this file"
+#: apply.c:977
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
-#: archive.c:435
-msgid "read .gitattributes in working directory"
+#: apply.c:983
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
-#: archive.c:436
-msgid "report archived files on stderr"
+#: apply.c:984
+#, c-format
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
-#: archive.c:437
-msgid "store only"
+#: apply.c:990
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
-#: archive.c:438
-msgid "compress faster"
+#: apply.c:1488
+#, c-format
+msgid "recount: unexpected line: %.*s"
msgstr ""
-#: archive.c:446
-msgid "compress better"
+#: apply.c:1557
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
msgstr ""
-#: archive.c:449
-msgid "list supported archive formats"
-msgstr ""
+#: apply.c:1577
+#, 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] ""
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
-#: builtin/submodule--helper.c:832
-msgid "repo"
+#: apply.c:1589
+#, c-format
+msgid "git diff header lacks filename information (line %d)"
msgstr ""
-#: archive.c:452 builtin/archive.c:91
-msgid "retrieve the archive from remote repository <repo>"
+#: apply.c:1759
+msgid "new file depends on old contents"
msgstr ""
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483
-msgid "command"
+#: apply.c:1761
+msgid "deleted file still has contents"
msgstr ""
-#: archive.c:454 builtin/archive.c:93
-msgid "path to the remote git-upload-archive command"
+#: apply.c:1795
+#, c-format
+msgid "corrupt patch at line %d"
msgstr ""
-#: archive.c:461
-msgid "Unexpected option --remote"
+#: apply.c:1832
+#, c-format
+msgid "new file %s depends on old contents"
msgstr ""
-#: archive.c:463
-msgid "Option --exec can only be used together with --remote"
+#: apply.c:1834
+#, c-format
+msgid "deleted file %s still has contents"
msgstr ""
-#: archive.c:465
-msgid "Unexpected option --output"
+#: apply.c:1837
+#, c-format
+msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
-#: archive.c:487
+#: apply.c:1984
#, c-format
-msgid "Unknown archive format '%s'"
+msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
-#: archive.c:494
+#: apply.c:2021
#, c-format
-msgid "Argument not supported for format '%s': -%d"
+msgid "unrecognized binary patch at line %d"
msgstr ""
-#: attr.c:263
-msgid ""
-"Negative patterns are ignored in git attributes\n"
-"Use '\\!' for literal leading exclamation."
+#: apply.c:2182
+#, c-format
+msgid "patch with only garbage at line %d"
msgstr ""
-#: bisect.c:441
+#: apply.c:2274
#, c-format
-msgid "Could not open file '%s'"
+msgid "unable to read symlink %s"
msgstr ""
-#: bisect.c:446
+#: apply.c:2278
#, c-format
-msgid "Badly quoted content in file '%s': %s"
+msgid "unable to open or read %s"
msgstr ""
-#: bisect.c:655
+#: apply.c:2931
#, c-format
-msgid "We cannot bisect more!\n"
+msgid "invalid start of line: '%c'"
msgstr ""
-#: bisect.c:708
+#: apply.c:3050
#, c-format
-msgid "Not a valid commit name %s"
+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:3062
+#, c-format
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
-#: bisect.c:732
+#: apply.c:3068
#, c-format
msgid ""
-"The merge base %s is bad.\n"
-"This means the bug has been fixed between %s and [%s].\n"
+"while searching for:\n"
+"%.*s"
msgstr ""
-#: bisect.c:737
+#: apply.c:3090
#, c-format
-msgid ""
-"The merge base %s is new.\n"
-"The property has changed between %s and [%s].\n"
+msgid "missing binary patch data for '%s'"
msgstr ""
-#: bisect.c:742
+#: apply.c:3098
#, c-format
-msgid ""
-"The merge base %s is %s.\n"
-"This means the first '%s' commit is between %s and [%s].\n"
+msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
-#: bisect.c:750
+#: apply.c:3144
#, c-format
-msgid ""
-"Some %s revs are not ancestor of the %s rev.\n"
-"git bisect cannot work properly in this case.\n"
-"Maybe you mistook %s and %s revs?\n"
+msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
-#: bisect.c:763
+#: apply.c:3154
#, 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."
+"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
-#: bisect.c:798
+#: apply.c:3162
#, c-format
-msgid "Bisecting: a merge base must be tested\n"
+msgid "the patch applies to an empty '%s' but it is not empty"
msgstr ""
-#: bisect.c:849
+#: apply.c:3180
#, c-format
-msgid "a %s revision is needed"
+msgid "the necessary postimage %s for '%s' cannot be read"
msgstr ""
-#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
+#: apply.c:3193
#, c-format
-msgid "could not create file '%s'"
+msgid "binary patch does not apply to '%s'"
msgstr ""
-#: bisect.c:917
+#: apply.c:3199
#, c-format
-msgid "could not read file '%s'"
+msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
-#: bisect.c:947
-msgid "reading bisect refs failed"
+#: apply.c:3220
+#, c-format
+msgid "patch failed: %s:%ld"
msgstr ""
-#: bisect.c:967
+#: apply.c:3342
#, c-format
-msgid "%s was both %s and %s\n"
+msgid "cannot checkout %s"
msgstr ""
-#: bisect.c:975
+#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248
#, c-format
-msgid ""
-"No testable commit found.\n"
-"Maybe you started with bad path parameters?\n"
+msgid "failed to read %s"
msgstr ""
-#: bisect.c:994
+#: apply.c:3398
#, c-format
-msgid "(roughly %d step)"
-msgid_plural "(roughly %d steps)"
-msgstr[0] ""
-msgstr[1] ""
+msgid "reading from '%s' beyond a symbolic link"
+msgstr ""
-#. TRANSLATORS: the last %s will be replaced with
-#. "(roughly %d steps)" translation
-#: bisect.c:998
+#: apply.c:3427 apply.c:3667
#, 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] ""
+msgid "path %s has been renamed/deleted"
+msgstr ""
-#: branch.c:53
+#: apply.c:3510 apply.c:3681
#, 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\"."
+msgid "%s: does not exist in index"
msgstr ""
-#: branch.c:67
+#: apply.c:3519 apply.c:3689
#, c-format
-msgid "Not setting branch %s as its own upstream."
+msgid "%s: does not match index"
msgstr ""
-#: branch.c:93
-#, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+#: apply.c:3554
+msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
-#: branch.c:94
+#: apply.c:3557
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
+msgid "Falling back to three-way merge...\n"
msgstr ""
-#: branch.c:98
+#: apply.c:3573 apply.c:3577
#, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
+msgid "cannot read the current contents of '%s'"
msgstr ""
-#: branch.c:99
+#: apply.c:3589
#, c-format
-msgid "Branch %s set up to track local branch %s."
+msgid "Failed to fall back on three-way merge...\n"
msgstr ""
-#: branch.c:104
+#: apply.c:3603
#, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
+msgid "Applied patch to '%s' with conflicts.\n"
msgstr ""
-#: branch.c:105
+#: apply.c:3608
#, c-format
-msgid "Branch %s set up to track remote ref %s."
+msgid "Applied patch to '%s' cleanly.\n"
msgstr ""
-#: branch.c:109
-#, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
+#: apply.c:3634
+msgid "removal patch leaves file contents"
msgstr ""
-#: branch.c:110
+#: apply.c:3706
#, c-format
-msgid "Branch %s set up to track local ref %s."
+msgid "%s: wrong type"
msgstr ""
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
+#: apply.c:3708
+#, c-format
+msgid "%s has type %o, expected %o"
msgstr ""
-#: branch.c:156
+#: apply.c:3859 apply.c:3861
#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
+msgid "invalid path '%s'"
msgstr ""
-#: branch.c:185
+#: apply.c:3917
#, c-format
-msgid "'%s' is not a valid branch name."
+msgid "%s: already exists in index"
msgstr ""
-#: branch.c:190
+#: apply.c:3920
#, c-format
-msgid "A branch named '%s' already exists."
+msgid "%s: already exists in working directory"
msgstr ""
-#: branch.c:198
-msgid "Cannot force update the current branch."
+#: apply.c:3940
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
-#: branch.c:218
+#: apply.c:3945
#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-#: branch.c:220
+#: apply.c:3965
#, c-format
-msgid "the requested upstream branch '%s' does not exist"
+msgid "affected file '%s' is beyond a symbolic link"
msgstr ""
-#: branch.c:222
-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."
+#: apply.c:3969
+#, c-format
+msgid "%s: patch does not apply"
msgstr ""
-#: branch.c:266
+#: apply.c:3984
#, c-format
-msgid "Not a valid object name: '%s'."
+msgid "Checking patch %s..."
msgstr ""
-#: branch.c:286
+#: apply.c:4075
#, c-format
-msgid "Ambiguous object name: '%s'."
+msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
-#: branch.c:291
+#: apply.c:4082
#, c-format
-msgid "Not a valid branch point: '%s'."
+msgid "mode change for %s, which is not in current HEAD"
msgstr ""
-#: branch.c:345
+#: apply.c:4085
#, c-format
-msgid "'%s' is already checked out at '%s'"
+msgid "sha1 information is lacking or useless (%s)."
msgstr ""
-#: branch.c:364
+#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
-msgid "HEAD of working tree %s is not updated"
+msgid "make_cache_entry failed for path '%s'"
msgstr ""
-#: bundle.c:34
+#: apply.c:4094
#, c-format
-msgid "'%s' does not look like a v2 bundle file"
+msgid "could not add %s to temporary index"
+msgstr ""
+
+#: apply.c:4104
+#, c-format
+msgid "could not write temporary index to %s"
+msgstr ""
+
+#: apply.c:4242
+#, c-format
+msgid "unable to remove %s from index"
+msgstr ""
+
+#: apply.c:4277
+#, c-format
+msgid "corrupt patch for submodule %s"
+msgstr ""
+
+#: apply.c:4283
+#, c-format
+msgid "unable to stat newly created file '%s'"
+msgstr ""
+
+#: apply.c:4291
+#, c-format
+msgid "unable to create backing store for newly created file %s"
+msgstr ""
+
+#: apply.c:4297 apply.c:4441
+#, c-format
+msgid "unable to add cache entry for %s"
+msgstr ""
+
+#: apply.c:4338
+#, c-format
+msgid "failed to write to '%s'"
+msgstr ""
+
+#: apply.c:4342
+#, c-format
+msgid "closing file '%s'"
+msgstr ""
+
+#: apply.c:4412
+#, c-format
+msgid "unable to write file '%s' mode %o"
+msgstr ""
+
+#: apply.c:4510
+#, c-format
+msgid "Applied patch %s cleanly."
+msgstr ""
+
+#: apply.c:4518
+msgid "internal error"
+msgstr ""
+
+#: apply.c:4521
+#, c-format
+msgid "Applying patch %%s with %d reject..."
+msgid_plural "Applying patch %%s with %d rejects..."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apply.c:4532
+#, c-format
+msgid "truncating .rej filename to %.*s.rej"
+msgstr ""
+
+#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989
+#, c-format
+msgid "cannot open %s"
+msgstr ""
+
+#: apply.c:4554
+#, c-format
+msgid "Hunk #%d applied cleanly."
+msgstr ""
+
+#: apply.c:4558
+#, c-format
+msgid "Rejected hunk #%d."
+msgstr ""
+
+#: apply.c:4668
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr ""
+
+#: apply.c:4676
+msgid "unrecognized input"
+msgstr ""
+
+#: apply.c:4695
+msgid "unable to read index file"
+msgstr ""
+
+#: apply.c:4833
+#, c-format
+msgid "can't open patch '%s': %s"
+msgstr ""
+
+#: apply.c:4858
+#, c-format
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apply.c:4864 apply.c:4879
+#, c-format
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apply.c:4872
+#, 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:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431
+msgid "Unable to write new index file"
+msgstr ""
+
+#: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
+#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592
+#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947
+msgid "path"
+msgstr ""
+
+#: apply.c:4920
+msgid "don't apply changes matching the given path"
+msgstr ""
+
+#: apply.c:4923
+msgid "apply changes matching the given path"
+msgstr ""
+
+#: apply.c:4925 builtin/am.c:2286
+msgid "num"
+msgstr ""
+
+#: apply.c:4926
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr ""
+
+#: apply.c:4929
+msgid "ignore additions made by the patch"
+msgstr ""
+
+#: apply.c:4931
+msgid "instead of applying the patch, output diffstat for the input"
+msgstr ""
+
+#: apply.c:4935
+msgid "show number of added and deleted lines in decimal notation"
+msgstr ""
+
+#: apply.c:4937
+msgid "instead of applying the patch, output a summary for the input"
+msgstr ""
+
+#: apply.c:4939
+msgid "instead of applying the patch, see if the patch is applicable"
+msgstr ""
+
+#: apply.c:4941
+msgid "make sure the patch is applicable to the current index"
+msgstr ""
+
+#: apply.c:4943
+msgid "apply a patch without touching the working tree"
+msgstr ""
+
+#: apply.c:4945
+msgid "accept a patch that touches outside the working area"
+msgstr ""
+
+#: apply.c:4947
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr ""
+
+#: apply.c:4949
+msgid "attempt three-way merge if a patch does not apply"
+msgstr ""
+
+#: apply.c:4951
+msgid "build a temporary index based on embedded index information"
+msgstr ""
+
+#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505
+msgid "paths are separated with NUL character"
+msgstr ""
+
+#: apply.c:4956
+msgid "ensure at least <n> lines of context match"
+msgstr ""
+
+#: apply.c:4957 builtin/am.c:2265
+msgid "action"
+msgstr ""
+
+#: apply.c:4958
+msgid "detect new or modified lines that have whitespace errors"
+msgstr ""
+
+#: apply.c:4961 apply.c:4964
+msgid "ignore changes in whitespace when finding context"
+msgstr ""
+
+#: apply.c:4967
+msgid "apply the patch in reverse"
+msgstr ""
+
+#: apply.c:4969
+msgid "don't expect at least one line of context"
+msgstr ""
+
+#: apply.c:4971
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr ""
+
+#: apply.c:4973
+msgid "allow overlapping hunks"
+msgstr ""
+
+#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19
+#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593
+#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114
+msgid "be verbose"
+msgstr ""
+
+#: apply.c:4976
+msgid "tolerate incorrectly detected missing new-line at the end of file"
+msgstr ""
+
+#: apply.c:4979
+msgid "do not trust the line counts in the hunk headers"
+msgstr ""
+
+#: apply.c:4981 builtin/am.c:2274
+msgid "root"
+msgstr ""
+
+#: apply.c:4982
+msgid "prepend <root> to all filenames"
+msgstr ""
+
+#: archive.c:12
+msgid "git archive [<options>] <tree-ish> [<path>...]"
+msgstr ""
+
+#: archive.c:13
+msgid "git archive --list"
+msgstr ""
+
+#: archive.c:14
+msgid ""
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
+msgstr ""
+
+#: archive.c:15
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr ""
+
+#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327
+#, c-format
+msgid "pathspec '%s' did not match any files"
+msgstr ""
+
+#: archive.c:429
+msgid "fmt"
+msgstr ""
+
+#: archive.c:429
+msgid "archive format"
+msgstr ""
+
+#: archive.c:430 builtin/log.c:1429
+msgid "prefix"
+msgstr ""
+
+#: archive.c:431
+msgid "prepend prefix to each pathname in the archive"
+msgstr ""
+
+#: archive.c:432 builtin/blame.c:2603 builtin/blame.c:2604 builtin/config.c:59
+#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:723
+#: builtin/hash-object.c:101 builtin/ls-files.c:539 builtin/ls-files.c:542
+#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109
+#: parse-options.h:153
+msgid "file"
+msgstr ""
+
+#: archive.c:433 builtin/archive.c:89
+msgid "write the archive to this file"
+msgstr ""
+
+#: archive.c:435
+msgid "read .gitattributes in working directory"
+msgstr ""
+
+#: archive.c:436
+msgid "report archived files on stderr"
+msgstr ""
+
+#: archive.c:437
+msgid "store only"
+msgstr ""
+
+#: archive.c:438
+msgid "compress faster"
+msgstr ""
+
+#: archive.c:446
+msgid "compress better"
+msgstr ""
+
+#: archive.c:449
+msgid "list supported archive formats"
+msgstr ""
+
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
+#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953
+msgid "repo"
+msgstr ""
+
+#: archive.c:452 builtin/archive.c:91
+msgid "retrieve the archive from remote repository <repo>"
+msgstr ""
+
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
+msgid "command"
+msgstr ""
+
+#: archive.c:454 builtin/archive.c:93
+msgid "path to the remote git-upload-archive command"
+msgstr ""
+
+#: archive.c:461
+msgid "Unexpected option --remote"
+msgstr ""
+
+#: archive.c:463
+msgid "Option --exec can only be used together with --remote"
+msgstr ""
+
+#: archive.c:465
+msgid "Unexpected option --output"
+msgstr ""
+
+#: archive.c:487
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr ""
+
+#: archive.c:494
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr ""
+
+#: attr.c:263
+msgid ""
+"Negative patterns are ignored in git attributes\n"
+"Use '\\!' for literal leading exclamation."
+msgstr ""
+
+#: bisect.c:441
+#, c-format
+msgid "Could not open file '%s'"
+msgstr ""
+
+#: bisect.c:446
+#, c-format
+msgid "Badly quoted content in file '%s': %s"
+msgstr ""
+
+#: bisect.c:655
+#, c-format
+msgid "We cannot bisect more!\n"
+msgstr ""
+
+#: bisect.c:708
+#, c-format
+msgid "Not a valid commit name %s"
+msgstr ""
+
+#: bisect.c:732
+#, 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:737
+#, c-format
+msgid ""
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
+msgstr ""
+
+#: bisect.c:742
+#, 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:750
+#, c-format
+msgid ""
+"Some %s revs are not ancestor 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:763
+#, 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:798
+#, c-format
+msgid "Bisecting: a merge base must be tested\n"
+msgstr ""
+
+#: bisect.c:849
+#, c-format
+msgid "a %s revision is needed"
+msgstr ""
+
+#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
+#, c-format
+msgid "could not create file '%s'"
+msgstr ""
+
+#: bisect.c:917
+#, c-format
+msgid "could not read file '%s'"
+msgstr ""
+
+#: bisect.c:947
+msgid "reading bisect refs failed"
+msgstr ""
+
+#: bisect.c:967
+#, c-format
+msgid "%s was both %s and %s\n"
+msgstr ""
+
+#: bisect.c:975
+#, c-format
+msgid ""
+"No testable commit found.\n"
+"Maybe you started with bad path parameters?\n"
+msgstr ""
+
+#: bisect.c:994
+#, 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:998
+#, 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] ""
+
+#: 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 ""
+
+#: branch.c:67
+#, c-format
+msgid "Not setting branch %s as its own upstream."
+msgstr ""
+
+#: branch.c:93
+#, c-format
+msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+msgstr ""
+
+#: branch.c:94
+#, c-format
+msgid "Branch %s set up to track remote branch %s from %s."
+msgstr ""
+
+#: branch.c:98
+#, c-format
+msgid "Branch %s set up to track local branch %s by rebasing."
+msgstr ""
+
+#: branch.c:99
+#, c-format
+msgid "Branch %s set up to track local branch %s."
+msgstr ""
+
+#: branch.c:104
+#, c-format
+msgid "Branch %s set up to track remote ref %s by rebasing."
+msgstr ""
+
+#: branch.c:105
+#, c-format
+msgid "Branch %s set up to track remote ref %s."
+msgstr ""
+
+#: branch.c:109
+#, c-format
+msgid "Branch %s set up to track local ref %s by rebasing."
+msgstr ""
+
+#: branch.c:110
+#, c-format
+msgid "Branch %s set up to track local ref %s."
+msgstr ""
+
+#: 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 ""
+
+#: branch.c:185
+#, c-format
+msgid "'%s' is not a valid branch name."
+msgstr ""
+
+#: branch.c:190
+#, c-format
+msgid "A branch named '%s' already exists."
+msgstr ""
+
+#: branch.c:198
+msgid "Cannot force update the current branch."
+msgstr ""
+
+#: branch.c:218
+#, c-format
+msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgstr ""
+
+#: branch.c:220
+#, c-format
+msgid "the requested upstream branch '%s' does not exist"
+msgstr ""
+
+#: branch.c:222
+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:265
+#, c-format
+msgid "Not a valid object name: '%s'."
+msgstr ""
+
+#: branch.c:285
+#, c-format
+msgid "Ambiguous object name: '%s'."
+msgstr ""
+
+#: branch.c:290
+#, c-format
+msgid "Not a valid branch point: '%s'."
+msgstr ""
+
+#: branch.c:344
+#, c-format
+msgid "'%s' is already checked out at '%s'"
+msgstr ""
+
+#: branch.c:363
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr ""
+
+#: bundle.c:34
+#, c-format
+msgid "'%s' does not look like a v2 bundle file"
msgstr ""
#: bundle.c:61
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:87 builtin/commit.c:778
+#: bundle.c:87 sequencer.c:963 builtin/commit.c:777
#, c-format
msgid "could not open '%s'"
msgstr ""
msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085
-#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348
-#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374
+#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348
+#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
#: builtin/merge.c:356 builtin/shortlog.c:170
msgid "revision walk setup failed"
msgstr ""
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
-#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
msgid "invalid color value: %.*s"
msgstr ""
-#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505
-#: builtin/am.c:2119
+#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493
+#: builtin/am.c:2127
#, c-format
msgid "could not parse %s"
msgstr ""
msgid "%s %s is not a commit!"
msgstr ""
+#: commit.c:1514
+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 ""
msgid "failed to expand user dir in: '%s'"
msgstr ""
-#: config.c:849 config.c:860
+#: config.c:852 config.c:863
#, c-format
msgid "bad zlib compression level %d"
msgstr ""
msgid "could not unset '%s'"
msgstr ""
+#: connect.c:49
+msgid "The remote end hung up upon initial contact"
+msgstr ""
+
+#: connect.c:51
+msgid ""
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
+msgstr ""
+
#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
msgid "Checking connectivity"
msgstr ""
-#: connected.c:74
+#: connected.c:75
msgid "Could not run 'git rev-list'"
msgstr ""
-#: connected.c:94
+#: connected.c:95
msgid "failed write to rev-list"
msgstr ""
-#: connected.c:101
+#: connected.c:102
msgid "failed to close rev-list's stdin"
msgstr ""
+#: convert.c:201
+#, 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:205
+#, c-format
+msgid "CRLF would be replaced by LF in %s."
+msgstr ""
+
+#: convert.c:211
+#, 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:215
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr ""
+
#: date.c:97
msgid "in the future"
msgstr ""
msgstr[0] ""
msgstr[1] ""
-#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:151
-#, c-format
-msgid "%s, %lu month ago"
-msgid_plural "%s, %lu months ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: date.c:156 date.c:161
-#, c-format
-msgid "%lu year ago"
-msgid_plural "%lu years ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: diffcore-order.c:24
-#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr ""
-
-#: diffcore-rename.c:540
-msgid "Performing inexact rename detection"
-msgstr ""
-
-#: diff.c:116
-#, c-format
-msgid " Failed to parse dirstat cut-off percentage '%s'\n"
-msgstr ""
-
-#: diff.c:121
-#, c-format
-msgid " Unknown dirstat parameter '%s'\n"
-msgstr ""
-
-#: diff.c:225
-#, c-format
-msgid "Unknown value for 'diff.submodule' config variable: '%s'"
-msgstr ""
-
-#: diff.c:277
-#, c-format
-msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
-msgstr ""
-
-#: diff.c:3017
-#, c-format
-msgid "external diff died, stopping at %s"
-msgstr ""
-
-#: diff.c:3415
-msgid "--follow requires exactly one pathspec"
-msgstr ""
-
-#: diff.c:3578
-#, c-format
-msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
-msgstr ""
-
-#: diff.c:3592
-#, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
-msgstr ""
-
-#: dir.c:1823
-msgid "failed to get kernel name and information"
-msgstr ""
-
-#: dir.c:1942
-msgid "Untracked cache is disabled on this system or location."
-msgstr ""
-
-#: gpg-interface.c:178
-msgid "gpg failed to sign the data"
-msgstr ""
-
-#: gpg-interface.c:208
-msgid "could not create temporary file"
-msgstr ""
-
-#: gpg-interface.c:210
-#, c-format
-msgid "failed writing detached signature to '%s'"
-msgstr ""
-
-#: grep.c:1792
-#, c-format
-msgid "'%s': unable to read %s"
-msgstr ""
-
-#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
-#, c-format
-msgid "failed to stat '%s'"
-msgstr ""
-
-#: grep.c:1820
-#, c-format
-msgid "'%s': short read"
-msgstr ""
-
-#: help.c:205
-#, c-format
-msgid "available git commands in '%s'"
-msgstr ""
-
-#: help.c:212
-msgid "git commands available from elsewhere on your $PATH"
-msgstr ""
-
-#: help.c:244
-msgid "These are common Git commands used in various situations:"
-msgstr ""
-
-#: help.c:309
-#, 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:366
-msgid "Uh oh. Your system reports no Git commands at all."
-msgstr ""
-
-#: help.c:388
-#, c-format
-msgid ""
-"WARNING: You called a Git command named '%s', which does not exist.\n"
-"Continuing under the assumption that you meant '%s'"
-msgstr ""
-
-#: help.c:393
-#, c-format
-msgid "in %0.1f seconds automatically..."
-msgstr ""
-
-#: help.c:400
-#, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
-msgstr ""
-
-#: help.c:404 help.c:470
-msgid ""
-"\n"
-"Did you mean this?"
-msgid_plural ""
-"\n"
-"Did you mean one of these?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: help.c:466
-#, c-format
-msgid "%s: %s - %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
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c:151
#, c-format
-msgid "Unable to create '%s.lock': %s"
-msgstr ""
+msgid "%s, %lu month ago"
+msgid_plural "%s, %lu months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr ""
+#: date.c:156 date.c:161
+#, c-format
+msgid "%lu year ago"
+msgid_plural "%lu years ago"
+msgstr[0] ""
+msgstr[1] ""
-#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375
-#: builtin/checkout.c:589 builtin/clone.c:732
-msgid "unable to write new index file"
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
msgstr ""
-#: merge-recursive.c:209
-msgid "(bad commit)\n"
+#: diffcore-rename.c:536
+msgid "Performing inexact rename detection"
msgstr ""
-#: merge-recursive.c:231
+#: diff.c:62
#, c-format
-msgid "addinfo_cache failed for path '%s'"
-msgstr ""
-
-#: merge-recursive.c:301
-msgid "error building trees"
+msgid "option '%s' requires a value"
msgstr ""
-#: merge-recursive.c:720
+#: diff.c:124
#, c-format
-msgid "failed to create path '%s'%s"
+msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
-#: merge-recursive.c:731
+#: diff.c:129
#, c-format
-msgid "Removing %s to make room for subdirectory\n"
+msgid " Unknown dirstat parameter '%s'\n"
msgstr ""
-#: merge-recursive.c:745 merge-recursive.c:764
-msgid ": perhaps a D/F conflict?"
+#: diff.c:283
+#, c-format
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
-#: merge-recursive.c:754
+#: diff.c:346
#, c-format
-msgid "refusing to lose untracked file at '%s'"
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
msgstr ""
-#: merge-recursive.c:796
+#: diff.c:3087
#, c-format
-msgid "cannot read object %s '%s'"
+msgid "external diff died, stopping at %s"
msgstr ""
-#: merge-recursive.c:798
-#, c-format
-msgid "blob expected for %s '%s'"
+#: diff.c:3412
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
-#: merge-recursive.c:822
-#, c-format
-msgid "failed to open '%s': %s"
+#: diff.c:3502
+msgid "--follow requires exactly one pathspec"
msgstr ""
-#: merge-recursive.c:833
+#: diff.c:3665
#, c-format
-msgid "failed to symlink '%s': %s"
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
msgstr ""
-#: merge-recursive.c:838
+#: diff.c:3679
#, c-format
-msgid "do not know what to do with %06o %s '%s'"
+msgid "Failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: merge-recursive.c:978
-msgid "Failed to execute internal merge"
+#: diff.c:4700
+msgid "inexact rename detection was skipped due to too many files."
msgstr ""
-#: merge-recursive.c:982
-#, c-format
-msgid "Unable to add %s to database"
+#: diff.c:4703
+msgid "only found copies from modified paths due to too many files."
msgstr ""
-#: merge-recursive.c:1081 merge-recursive.c:1095
+#: diff.c:4706
#, c-format
msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree."
+"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
-#: merge-recursive.c:1087 merge-recursive.c:1100
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree at %s."
+#: dir.c:1866
+msgid "failed to get kernel name and information"
msgstr ""
-#: merge-recursive.c:1143
-msgid "rename"
+#: dir.c:1985
+msgid "Untracked cache is disabled on this system or location."
msgstr ""
-#: merge-recursive.c:1143
-msgid "renamed"
+#: fetch-pack.c:213
+msgid "git fetch-pack: expected shallow list"
msgstr ""
-#: merge-recursive.c:1200
-#, c-format
-msgid "%s is a directory in %s adding as %s instead"
+#: fetch-pack.c:225
+msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr ""
-#: merge-recursive.c:1225
+#: fetch-pack.c:243
#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr ""
-#: merge-recursive.c:1230
-msgid " (left unresolved)"
+#: fetch-pack.c:295
+msgid "--stateless-rpc requires multi_ack_detailed"
msgstr ""
-#: merge-recursive.c:1292
+#: fetch-pack.c:381
#, c-format
-msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
+msgid "invalid shallow line: %s"
msgstr ""
-#: merge-recursive.c:1325
+#: fetch-pack.c:387
#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
+msgid "invalid unshallow line: %s"
msgstr ""
-#: merge-recursive.c:1531
+#: fetch-pack.c:389
#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
+msgid "object not found: %s"
msgstr ""
-#: merge-recursive.c:1546
+#: fetch-pack.c:392
#, c-format
-msgid "Adding merged %s"
+msgid "error in object: %s"
msgstr ""
-#: merge-recursive.c:1553 merge-recursive.c:1766
+#: fetch-pack.c:394
#, c-format
-msgid "Adding as %s instead"
+msgid "no shallow found: %s"
msgstr ""
-#: merge-recursive.c:1610
+#: fetch-pack.c:397
#, c-format
-msgid "cannot read object %s"
+msgid "expected shallow/unshallow, got %s"
msgstr ""
-#: merge-recursive.c:1613
+#: fetch-pack.c:436
#, c-format
-msgid "object %s is not a blob"
+msgid "got %s %d %s"
msgstr ""
-#: merge-recursive.c:1666
-msgid "modify"
+#: fetch-pack.c:450
+#, c-format
+msgid "invalid commit %s"
msgstr ""
-#: merge-recursive.c:1666
-msgid "modified"
+#: fetch-pack.c:483
+msgid "giving up"
msgstr ""
-#: merge-recursive.c:1676
-msgid "content"
+#: fetch-pack.c:493 progress.c:235
+msgid "done"
msgstr ""
-#: merge-recursive.c:1683
-msgid "add/add"
+#: fetch-pack.c:505
+#, c-format
+msgid "got %s (%d) %s"
msgstr ""
-#: merge-recursive.c:1718
+#: fetch-pack.c:551
#, c-format
-msgid "Skipped %s (merged same as existing)"
+msgid "Marking %s as complete"
msgstr ""
-#: merge-recursive.c:1732
+#: fetch-pack.c:697
#, c-format
-msgid "Auto-merging %s"
+msgid "already have %s (%s)"
msgstr ""
-#: merge-recursive.c:1736 git-submodule.sh:919
-msgid "submodule"
+#: fetch-pack.c:735
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr ""
-#: merge-recursive.c:1737
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
+#: fetch-pack.c:743
+msgid "protocol error: bad pack header"
msgstr ""
-#: merge-recursive.c:1831
+#: fetch-pack.c:799
#, c-format
-msgid "Removing %s"
+msgid "fetch-pack: unable to fork off %s"
msgstr ""
-#: merge-recursive.c:1857
-msgid "file/directory"
+#: fetch-pack.c:815
+#, c-format
+msgid "%s failed"
msgstr ""
-#: merge-recursive.c:1863
-msgid "directory/file"
+#: fetch-pack.c:817
+msgid "error in sideband demultiplexer"
msgstr ""
-#: merge-recursive.c:1868
-#, c-format
-msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
+#: fetch-pack.c:844
+msgid "Server does not support shallow clients"
msgstr ""
-#: merge-recursive.c:1877
-#, c-format
-msgid "Adding %s"
+#: fetch-pack.c:848
+msgid "Server supports multi_ack_detailed"
msgstr ""
-#: merge-recursive.c:1914
-msgid "Already up-to-date!"
+#: fetch-pack.c:851
+msgid "Server supports no-done"
msgstr ""
-#: merge-recursive.c:1923
-#, c-format
-msgid "merging of trees %s and %s failed"
+#: fetch-pack.c:857
+msgid "Server supports multi_ack"
msgstr ""
-#: merge-recursive.c:2006
-msgid "Merging:"
+#: fetch-pack.c:861
+msgid "Server supports side-band-64k"
msgstr ""
-#: merge-recursive.c:2019
-#, c-format
-msgid "found %u common ancestor:"
-msgid_plural "found %u common ancestors:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: merge-recursive.c:2058
-msgid "merge returned no commit"
+#: fetch-pack.c:865
+msgid "Server supports side-band"
msgstr ""
-#: merge-recursive.c:2121
-#, c-format
-msgid "Could not parse object '%s'"
+#: fetch-pack.c:869
+msgid "Server supports allow-tip-sha1-in-want"
msgstr ""
-#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
-msgid "Unable to write index."
+#: fetch-pack.c:873
+msgid "Server supports allow-reachable-sha1-in-want"
msgstr ""
-#: notes-utils.c:41
-msgid "Cannot commit uninitialized/unreferenced notes tree"
+#: fetch-pack.c:883
+msgid "Server supports ofs-delta"
msgstr ""
-#: notes-utils.c:100
+#: fetch-pack.c:890
#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
+msgid "Server version is %.*s"
msgstr ""
-#: notes-utils.c:110
-#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+#: fetch-pack.c:896
+msgid "Server does not support --shallow-since"
msgstr ""
-#. TRANSLATORS: The first %s is the name of the
-#. environment variable, the second %s is its value
-#: notes-utils.c:137
-#, c-format
-msgid "Bad %s value: '%s'"
+#: fetch-pack.c:900
+msgid "Server does not support --shallow-exclude"
msgstr ""
-#: object.c:242
-#, c-format
-msgid "unable to parse object: %s"
+#: fetch-pack.c:902
+msgid "Server does not support --deepen"
msgstr ""
-#: parse-options.c:572
-msgid "..."
+#: fetch-pack.c:913
+msgid "no common commits"
msgstr ""
-#: parse-options.c:590
-#, c-format
-msgid "usage: %s"
+#: fetch-pack.c:925
+msgid "git fetch-pack: fetch failed."
msgstr ""
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation
-#: parse-options.c:594
-#, c-format
-msgid " or: %s"
+#: fetch-pack.c:1087
+msgid "no matching remote head"
msgstr ""
-#: parse-options.c:597
-#, c-format
-msgid " %s"
+#: gpg-interface.c:185
+msgid "gpg failed to sign the data"
msgstr ""
-#: parse-options.c:631
-msgid "-NUM"
+#: gpg-interface.c:215
+msgid "could not create temporary file"
msgstr ""
-#: parse-options-cb.c:108
+#: gpg-interface.c:217
#, c-format
-msgid "malformed object name '%s'"
+msgid "failed writing detached signature to '%s'"
msgstr ""
-#: path.c:798
+#: grep.c:1782
#, c-format
-msgid "Could not make %s writable by group"
-msgstr ""
-
-#: pathspec.c:133
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgid "'%s': unable to read %s"
msgstr ""
-#: pathspec.c:143
-msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
+#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155
+#, c-format
+msgid "failed to stat '%s'"
msgstr ""
-#: pathspec.c:177
-msgid "invalid parameter for pathspec magic 'prefix'"
+#: grep.c:1810
+#, c-format
+msgid "'%s': short read"
msgstr ""
-#: pathspec.c:183
+#: help.c:203
#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgid "available git commands in '%s'"
msgstr ""
-#: pathspec.c:187
-#, c-format
-msgid "Missing ')' at the end of pathspec magic in '%s'"
+#: help.c:210
+msgid "git commands available from elsewhere on your $PATH"
msgstr ""
-#: pathspec.c:205
-#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
+#: help.c:241
+msgid "These are common Git commands used in various situations:"
msgstr ""
-#: pathspec.c:230
+#: help.c:306
#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
+msgid ""
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
msgstr ""
-#: pathspec.c:241
-#, c-format
-msgid "%s: '%s' is outside repository"
+#: help.c:361
+msgid "Uh oh. Your system reports no Git commands at all."
msgstr ""
-#: pathspec.c:291
+#: help.c:383
#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
+msgid ""
+"WARNING: You called a Git command named '%s', which does not exist.\n"
+"Continuing under the assumption that you meant '%s'"
msgstr ""
-#: pathspec.c:353
+#: help.c:388
#, c-format
-msgid "%s: pathspec magic not supported by this command: %s"
+msgid "in %0.1f seconds automatically..."
msgstr ""
-#: pathspec.c:433
+#: help.c:395
#, c-format
-msgid "pathspec '%s' is beyond a symbolic link"
+msgid "git: '%s' is not a git command. See 'git --help'."
msgstr ""
-#: pathspec.c:442
+#: help.c:399 help.c:465
msgid ""
-"There is nothing to exclude from by :(exclude) patterns.\n"
-"Perhaps you forgot to add either ':/' or '.' ?"
-msgstr ""
-
-#: pretty.c:973
-msgid "unable to parse --pretty format"
-msgstr ""
-
-#: progress.c:235
-msgid "done"
-msgstr ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+msgstr[1] ""
-#: read-cache.c:1281
+#: help.c:461
#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
+msgid "%s: %s - %s"
msgstr ""
-#: read-cache.c:1291
-#, c-format
+#: ident.c:334
msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
+"\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 ""
-#: refs.c:551 builtin/merge.c:840
+#: lockfile.c:152
#, c-format
-msgid "Could not open '%s' for writing"
+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 ""
-#: refs/files-backend.c:2534
+#: lockfile.c:160
#, c-format
-msgid "could not delete reference %s: %s"
+msgid "Unable to create '%s.lock': %s"
msgstr ""
-#: refs/files-backend.c:2537
-#, c-format
-msgid "could not delete references: %s"
+#: merge.c:41
+msgid "failed to read the cache"
msgstr ""
-#: refs/files-backend.c:2546
-#, c-format
-msgid "could not remove reference %s"
+#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374
+#: builtin/checkout.c:588 builtin/clone.c:731
+msgid "unable to write new index file"
msgstr ""
-#: ref-filter.c:55
-#, c-format
-msgid "expected format: %%(color:<color>)"
+#: merge-recursive.c:209
+msgid "(bad commit)\n"
msgstr ""
-#: ref-filter.c:57
+#: merge-recursive.c:231
#, c-format
-msgid "unrecognized color: %%(color:%s)"
+msgid "addinfo_cache failed for path '%s'"
msgstr ""
-#: ref-filter.c:71
-#, c-format
-msgid "unrecognized format: %%(%s)"
+#: merge-recursive.c:301
+msgid "error building trees"
msgstr ""
-#: ref-filter.c:77
+#: merge-recursive.c:720
#, c-format
-msgid "%%(body) does not take arguments"
+msgid "failed to create path '%s'%s"
msgstr ""
-#: ref-filter.c:84
+#: merge-recursive.c:731
#, c-format
-msgid "%%(subject) does not take arguments"
+msgid "Removing %s to make room for subdirectory\n"
msgstr ""
-#: ref-filter.c:101
-#, c-format
-msgid "positive value expected contents:lines=%s"
+#: merge-recursive.c:745 merge-recursive.c:764
+msgid ": perhaps a D/F conflict?"
msgstr ""
-#: ref-filter.c:103
+#: merge-recursive.c:754
#, c-format
-msgid "unrecognized %%(contents) argument: %s"
+msgid "refusing to lose untracked file at '%s'"
msgstr ""
-#: ref-filter.c:113
+#: merge-recursive.c:796 builtin/cat-file.c:34
#, c-format
-msgid "unrecognized %%(objectname) argument: %s"
+msgid "cannot read object %s '%s'"
msgstr ""
-#: ref-filter.c:135
+#: merge-recursive.c:798
#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
+msgid "blob expected for %s '%s'"
msgstr ""
-#: ref-filter.c:147
+#: merge-recursive.c:822
#, c-format
-msgid "unrecognized position:%s"
+msgid "failed to open '%s': %s"
msgstr ""
-#: ref-filter.c:151
+#: merge-recursive.c:833
#, c-format
-msgid "unrecognized width:%s"
+msgid "failed to symlink '%s': %s"
msgstr ""
-#: ref-filter.c:157
+#: merge-recursive.c:838
#, c-format
-msgid "unrecognized %%(align) argument: %s"
+msgid "do not know what to do with %06o %s '%s'"
msgstr ""
-#: ref-filter.c:161
-#, c-format
-msgid "positive width expected with the %%(align) atom"
+#: merge-recursive.c:978
+msgid "Failed to execute internal merge"
msgstr ""
-#: ref-filter.c:244
+#: merge-recursive.c:982
#, c-format
-msgid "malformed field name: %.*s"
+msgid "Unable to add %s to database"
msgstr ""
-#: ref-filter.c:270
+#: merge-recursive.c:1081 merge-recursive.c:1095
#, c-format
-msgid "unknown field name: %.*s"
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
msgstr ""
-#: ref-filter.c:372
+#: merge-recursive.c:1087 merge-recursive.c:1100
#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
msgstr ""
-#: ref-filter.c:424
-#, c-format
-msgid "malformed format string %s"
+#: merge-recursive.c:1143
+msgid "rename"
msgstr ""
-#: ref-filter.c:878
-msgid ":strip= requires a positive integer argument"
+#: merge-recursive.c:1143
+msgid "renamed"
msgstr ""
-#: ref-filter.c:883
+#: merge-recursive.c:1200
#, c-format
-msgid "ref '%s' does not have %ld components to :strip"
+msgid "%s is a directory in %s adding as %s instead"
msgstr ""
-#: ref-filter.c:1046
+#: merge-recursive.c:1225
#, c-format
-msgid "unknown %.*s format %s"
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
msgstr ""
-#: ref-filter.c:1066 ref-filter.c:1097
-#, c-format
-msgid "missing object %s for %s"
+#: merge-recursive.c:1230
+msgid " (left unresolved)"
msgstr ""
-#: ref-filter.c:1069 ref-filter.c:1100
+#: merge-recursive.c:1292
#, c-format
-msgid "parse_object_buffer failed on %s for %s"
+msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-#: ref-filter.c:1311
+#: merge-recursive.c:1325
#, c-format
-msgid "malformed object at '%s'"
+msgid "Renaming %s to %s and %s to %s instead"
msgstr ""
-#: ref-filter.c:1373
+#: merge-recursive.c:1531
#, c-format
-msgid "ignoring ref with broken name %s"
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
-#: ref-filter.c:1378
+#: merge-recursive.c:1546
#, c-format
-msgid "ignoring broken ref %s"
+msgid "Adding merged %s"
msgstr ""
-#: ref-filter.c:1651
+#: merge-recursive.c:1553 merge-recursive.c:1766
#, c-format
-msgid "format: %%(end) atom missing"
+msgid "Adding as %s instead"
msgstr ""
-#: ref-filter.c:1705
+#: merge-recursive.c:1610
#, c-format
-msgid "malformed object name %s"
+msgid "cannot read object %s"
msgstr ""
-#: remote.c:746
+#: merge-recursive.c:1613
#, c-format
-msgid "Cannot fetch both %s and %s to %s"
+msgid "object %s is not a blob"
msgstr ""
-#: remote.c:750
-#, c-format
-msgid "%s usually tracks %s, not %s"
+#: merge-recursive.c:1666
+msgid "modify"
msgstr ""
-#: remote.c:754
-#, c-format
-msgid "%s tracks both %s and %s"
+#: merge-recursive.c:1666
+msgid "modified"
msgstr ""
-#: remote.c:762
-msgid "Internal error"
+#: merge-recursive.c:1676
+msgid "content"
msgstr ""
-#: remote.c:1677 remote.c:1720
-msgid "HEAD does not point to a branch"
+#: merge-recursive.c:1683
+msgid "add/add"
msgstr ""
-#: remote.c:1686
+#: merge-recursive.c:1718
#, c-format
-msgid "no such branch: '%s'"
+msgid "Skipped %s (merged same as existing)"
msgstr ""
-#: remote.c:1689
+#: merge-recursive.c:1732
#, c-format
-msgid "no upstream configured for branch '%s'"
+msgid "Auto-merging %s"
msgstr ""
-#: remote.c:1695
-#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
+#: merge-recursive.c:1736 git-submodule.sh:924
+msgid "submodule"
msgstr ""
-#: remote.c:1710
+#: merge-recursive.c:1737
#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: remote.c:1725
+#: merge-recursive.c:1831
#, c-format
-msgid "branch '%s' has no remote for pushing"
+msgid "Removing %s"
msgstr ""
-#: remote.c:1736
-#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
+#: merge-recursive.c:1857
+msgid "file/directory"
msgstr ""
-#: remote.c:1749
-msgid "push has no destination (push.default is 'nothing')"
+#: merge-recursive.c:1863
+msgid "directory/file"
msgstr ""
-#: remote.c:1771
-msgid "cannot resolve 'simple' push to a single destination"
+#: merge-recursive.c:1868
+#, c-format
+msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
-#: remote.c:2073
+#: merge-recursive.c:1877
#, c-format
-msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgid "Adding %s"
msgstr ""
-#: remote.c:2077
-msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+#: merge-recursive.c:1914
+msgid "Already up-to-date!"
msgstr ""
-#: remote.c:2080
+#: merge-recursive.c:1923
#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
+msgid "merging of trees %s and %s failed"
msgstr ""
-#: remote.c:2084
-#, 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:2090
-msgid " (use \"git push\" to publish your local commits)\n"
+#: merge-recursive.c:2006
+msgid "Merging:"
msgstr ""
-#: remote.c:2093
+#: merge-recursive.c:2019
#, 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"
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2101
-msgid " (use \"git pull\" to update your local branch)\n"
+#: merge-recursive.c:2058
+msgid "merge returned no commit"
msgstr ""
-#: remote.c:2104
+#: merge-recursive.c:2121
#, 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] ""
+msgid "Could not parse object '%s'"
+msgstr ""
-#: remote.c:2114
-msgid " (use \"git pull\" to merge the remote branch into yours)\n"
+#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
+msgid "Unable to write index."
msgstr ""
-#: revision.c:2132
-msgid "your current branch appears to be broken"
+#: notes-merge.c:273
+#, 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 ""
-#: revision.c:2135
+#: notes-merge.c:280
#, c-format
-msgid "your current branch '%s' does not have any commits yet"
+msgid "You have not concluded your notes merge (%s exists)."
msgstr ""
-#: revision.c:2329
-msgid "--first-parent is incompatible with --bisect"
+#: notes-utils.c:41
+msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
-#: run-command.c:92
-msgid "open /dev/null failed"
+#: notes-utils.c:100
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
msgstr ""
-#: run-command.c:94
+#: notes-utils.c:110
#, c-format
-msgid "dup2(%d,%d) failed"
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr ""
-#: send-pack.c:298
-msgid "failed to sign the push certificate"
+#. TRANSLATORS: The first %s is the name of the
+#. environment variable, the second %s is its value
+#: notes-utils.c:137
+#, c-format
+msgid "Bad %s value: '%s'"
msgstr ""
-#: send-pack.c:411
-msgid "the receiving end does not support --signed push"
+#: object.c:242
+#, c-format
+msgid "unable to parse object: %s"
msgstr ""
-#: send-pack.c:413
-msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
+#: parse-options.c:572
+msgid "..."
msgstr ""
-#: send-pack.c:425
-msgid "the receiving end does not support --atomic push"
+#: parse-options.c:590
+#, c-format
+msgid "usage: %s"
msgstr ""
-#: send-pack.c:430
-msgid "the receiving end does not support push options"
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation
+#: parse-options.c:594
+#, c-format
+msgid " or: %s"
msgstr ""
-#: sequencer.c:174
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
+#: parse-options.c:597
+#, c-format
+msgid " %s"
msgstr ""
-#: sequencer.c:177
-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'"
+#: parse-options.c:631
+msgid "-NUM"
msgstr ""
-#: sequencer.c:190 sequencer.c:841 sequencer.c:924
+#: parse-options-cb.c:108
#, c-format
-msgid "Could not write to %s"
+msgid "malformed object name '%s'"
msgstr ""
-#: sequencer.c:193 sequencer.c:843 sequencer.c:928
+#: path.c:826
#, c-format
-msgid "Error wrapping up %s."
+msgid "Could not make %s writable by group"
msgstr ""
-#: sequencer.c:208
-msgid "Your local changes would be overwritten by cherry-pick."
+#: pathspec.c:133
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
-#: sequencer.c:210
-msgid "Your local changes would be overwritten by revert."
+#: pathspec.c:143
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
msgstr ""
-#: sequencer.c:213
-msgid "Commit your changes or stash them to proceed."
+#: pathspec.c:177
+msgid "invalid parameter for pathspec magic 'prefix'"
msgstr ""
-#: sequencer.c:228
+#: pathspec.c:183
#, c-format
-msgid "%s: fast-forward"
+msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr ""
-#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:303
+#: pathspec.c:187
#, c-format
-msgid "%s: Unable to write new index file"
+msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr ""
-#: sequencer.c:321
-msgid "Could not resolve HEAD commit\n"
+#: pathspec.c:205
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr ""
-#: sequencer.c:341
-msgid "Unable to update cache tree\n"
+#: pathspec.c:230
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
msgstr ""
-#: sequencer.c:393
+#: pathspec.c:241
#, c-format
-msgid "Could not parse commit %s\n"
+msgid "%s: '%s' is outside repository"
msgstr ""
-#: sequencer.c:398
+#: pathspec.c:291
#, c-format
-msgid "Could not parse parent commit %s\n"
+msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr ""
-#: sequencer.c:463
-msgid "Your index file is unmerged."
+#: pathspec.c:353
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
-#: sequencer.c:482
-#, c-format
-msgid "Commit %s is a merge but no -m option was given."
+#: pathspec.c:408
+msgid ""
+"empty strings as pathspecs will be made invalid in upcoming releases. please "
+"use . instead if you meant to match all paths"
msgstr ""
-#: sequencer.c:490
+#: pathspec.c:440
#, c-format
-msgid "Commit %s does not have parent %d"
+msgid "pathspec '%s' is beyond a symbolic link"
msgstr ""
-#: sequencer.c:494
-#, c-format
-msgid "Mainline was specified but commit %s is not a merge."
+#: pathspec.c:449
+msgid ""
+"There is nothing to exclude from by :(exclude) patterns.\n"
+"Perhaps you forgot to add either ':/' or '.' ?"
msgstr ""
-#. TRANSLATORS: The first %s will be "revert" or
-#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:507
-#, c-format
-msgid "%s: cannot parse parent commit %s"
+#: pretty.c:971
+msgid "unable to parse --pretty format"
msgstr ""
-#: sequencer.c:511
+#: read-cache.c:1315
#, c-format
-msgid "Cannot get commit message for %s"
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-#: sequencer.c:597
+#: read-cache.c:1325
#, c-format
-msgid "could not revert %s... %s"
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-#: sequencer.c:598
+#: refs.c:576 builtin/merge.c:840
#, c-format
-msgid "could not apply %s... %s"
+msgid "Could not open '%s' for writing"
msgstr ""
-#: sequencer.c:633
-msgid "empty commit set passed"
+#: refs/files-backend.c:2481
+#, c-format
+msgid "could not delete reference %s: %s"
msgstr ""
-#: sequencer.c:641
+#: refs/files-backend.c:2484
#, c-format
-msgid "git %s: failed to read the index"
+msgid "could not delete references: %s"
msgstr ""
-#: sequencer.c:645
+#: refs/files-backend.c:2493
#, c-format
-msgid "git %s: failed to refresh the index"
+msgid "could not remove reference %s"
msgstr ""
-#: sequencer.c:705
-msgid "Cannot revert during another revert."
+#: ref-filter.c:55
+#, c-format
+msgid "expected format: %%(color:<color>)"
msgstr ""
-#: sequencer.c:706
-msgid "Cannot revert during a cherry-pick."
+#: ref-filter.c:57
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
msgstr ""
-#: sequencer.c:709
-msgid "Cannot cherry-pick during a revert."
+#: ref-filter.c:71
+#, c-format
+msgid "unrecognized format: %%(%s)"
msgstr ""
-#: sequencer.c:710
-msgid "Cannot cherry-pick during another cherry-pick."
+#: ref-filter.c:77
+#, c-format
+msgid "%%(body) does not take arguments"
msgstr ""
-#: sequencer.c:732
+#: ref-filter.c:84
#, c-format
-msgid "Could not parse line %d."
+msgid "%%(subject) does not take arguments"
msgstr ""
-#: sequencer.c:737
-msgid "No commits parsed."
+#: ref-filter.c:101
+#, c-format
+msgid "positive value expected contents:lines=%s"
msgstr ""
-#: sequencer.c:749
+#: ref-filter.c:103
#, c-format
-msgid "Could not open %s"
+msgid "unrecognized %%(contents) argument: %s"
msgstr ""
-#: sequencer.c:753
+#: ref-filter.c:113
#, c-format
-msgid "Could not read %s."
+msgid "unrecognized %%(objectname) argument: %s"
msgstr ""
-#: sequencer.c:760
+#: ref-filter.c:135
#, c-format
-msgid "Unusable instruction sheet: %s"
+msgid "expected format: %%(align:<width>,<position>)"
msgstr ""
-#: sequencer.c:790
+#: ref-filter.c:147
#, c-format
-msgid "Invalid key: %s"
+msgid "unrecognized position:%s"
msgstr ""
-#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52
+#: ref-filter.c:151
#, c-format
-msgid "Invalid value for %s: %s"
+msgid "unrecognized width:%s"
msgstr ""
-#: sequencer.c:803
+#: ref-filter.c:157
#, c-format
-msgid "Malformed options sheet: %s"
+msgid "unrecognized %%(align) argument: %s"
msgstr ""
-#: sequencer.c:822
-msgid "a cherry-pick or revert is already in progress"
+#: ref-filter.c:161
+#, c-format
+msgid "positive width expected with the %%(align) atom"
msgstr ""
-#: sequencer.c:823
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+#: ref-filter.c:244
+#, c-format
+msgid "malformed field name: %.*s"
msgstr ""
-#: sequencer.c:827
+#: ref-filter.c:270
#, c-format
-msgid "Could not create sequencer directory %s"
+msgid "unknown field name: %.*s"
msgstr ""
-#: sequencer.c:862 sequencer.c:998
-msgid "no cherry-pick or revert in progress"
+#: ref-filter.c:372
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
msgstr ""
-#: sequencer.c:864
-msgid "cannot resolve HEAD"
+#: ref-filter.c:424
+#, c-format
+msgid "malformed format string %s"
msgstr ""
-#: sequencer.c:866 sequencer.c:900
-msgid "cannot abort from a branch yet to be born"
+#: ref-filter.c:878
+msgid ":strip= requires a positive integer argument"
msgstr ""
-#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970
+#: ref-filter.c:883
#, c-format
-msgid "cannot open %s"
+msgid "ref '%s' does not have %ld components to :strip"
msgstr ""
-#: sequencer.c:888
+#: ref-filter.c:1046
#, c-format
-msgid "cannot read %s: %s"
+msgid "unknown %.*s format %s"
msgstr ""
-#: sequencer.c:889
-msgid "unexpected end of file"
+#: ref-filter.c:1066 ref-filter.c:1097
+#, c-format
+msgid "missing object %s for %s"
msgstr ""
-#: sequencer.c:895
+#: ref-filter.c:1069 ref-filter.c:1100
#, c-format
-msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgid "parse_object_buffer failed on %s for %s"
msgstr ""
-#: sequencer.c:921
+#: ref-filter.c:1311
#, c-format
-msgid "Could not format %s."
+msgid "malformed object at '%s'"
msgstr ""
-#: sequencer.c:1066
+#: ref-filter.c:1373
#, c-format
-msgid "%s: can't cherry-pick a %s"
+msgid "ignoring ref with broken name %s"
msgstr ""
-#: sequencer.c:1069
+#: ref-filter.c:1378
#, c-format
-msgid "%s: bad revision"
+msgid "ignoring broken ref %s"
msgstr ""
-#: sequencer.c:1102
-msgid "Can't revert as initial commit"
+#: ref-filter.c:1633
+#, c-format
+msgid "format: %%(end) atom missing"
msgstr ""
-#: setup.c:160
+#: ref-filter.c:1687
#, c-format
-msgid ""
-"%s: no such path in the working tree.\n"
-"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+msgid "malformed object name %s"
msgstr ""
-#: setup.c:173
+#: remote.c:746
#, 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>...]'"
+msgid "Cannot fetch both %s and %s to %s"
msgstr ""
-#: setup.c:223
+#: remote.c:750
#, c-format
-msgid ""
-"ambiguous argument '%s': both revision and filename\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
+msgid "%s usually tracks %s, not %s"
msgstr ""
-#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419
+#: remote.c:754
#, c-format
-msgid "failed to read %s"
+msgid "%s tracks both %s and %s"
msgstr ""
-#: setup.c:468
-#, c-format
-msgid "Expected git repo version <= %d, found %d"
+#: remote.c:762
+msgid "Internal error"
msgstr ""
-#: setup.c:476
-msgid "unknown repository extensions found:"
+#: remote.c:1677 remote.c:1720
+msgid "HEAD does not point to a branch"
msgstr ""
-#: setup.c:762
+#: remote.c:1686
#, c-format
-msgid "Not a git repository (or any of the parent directories): %s"
+msgid "no such branch: '%s'"
msgstr ""
-#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
-msgid "Cannot come back to cwd"
+#: remote.c:1689
+#, c-format
+msgid "no upstream configured for branch '%s'"
msgstr ""
-#: setup.c:845
-msgid "Unable to read current working directory"
+#: remote.c:1695
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
-#: setup.c:920
+#: remote.c:1710
#, 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)."
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
-#: setup.c:927
+#: remote.c:1725
#, c-format
-msgid "Cannot change to '%s/..'"
+msgid "branch '%s' has no remote for pushing"
msgstr ""
-#: setup.c:989
+#: remote.c:1736
#, c-format
-msgid ""
-"Problem with core.sharedRepository filemode value (0%.3o).\n"
-"The owner of files must always have read and write permissions."
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr ""
+
+#: remote.c:1749
+msgid "push has no destination (push.default is 'nothing')"
+msgstr ""
+
+#: remote.c:1771
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr ""
+
+#: remote.c:2073
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
-#: sha1_file.c:1046
-msgid "offset before end of packfile (broken .idx?)"
+#: remote.c:2077
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr ""
-#: sha1_file.c:2434
+#: remote.c:2080
#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
+msgid "Your branch is up-to-date with '%s'.\n"
msgstr ""
-#: sha1_file.c:2438
+#: remote.c:2084
#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr ""
+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] ""
-#: sha1_name.c:462
-msgid ""
-"Git normally never creates a ref that ends with 40 hex characters\n"
-"because it will be ignored when you just specify 40-hex. These refs\n"
-"may be created by mistake. For example,\n"
-"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
-"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
+#: remote.c:2090
+msgid " (use \"git push\" to publish your local commits)\n"
msgstr ""
-#: submodule.c:64 submodule.c:98
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+#: remote.c:2093
+#, 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:2101
+msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
-#: submodule.c:68 submodule.c:102
+#: remote.c:2104
#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
+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:2114
+msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-#: submodule.c:76
-#, c-format
-msgid "Could not update .gitmodules entry %s"
+#: revision.c:2158
+msgid "your current branch appears to be broken"
msgstr ""
-#: submodule.c:109
+#: revision.c:2161
#, c-format
-msgid "Could not remove .gitmodules entry for %s"
+msgid "your current branch '%s' does not have any commits yet"
msgstr ""
-#: submodule.c:120
-msgid "staging updated .gitmodules failed"
+#: revision.c:2355
+msgid "--first-parent is incompatible with --bisect"
msgstr ""
-#: submodule.c:177
-msgid "negative values not allowed for submodule.fetchJobs"
+#: run-command.c:106
+msgid "open /dev/null failed"
msgstr ""
-#: submodule-config.c:358
+#: run-command.c:108
#, c-format
-msgid "invalid value for %s"
+msgid "dup2(%d,%d) failed"
msgstr ""
-#: trailer.c:237
-#, c-format
-msgid "running trailer command '%s' failed"
+#: send-pack.c:297
+msgid "failed to sign the push certificate"
msgstr ""
-#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558
-#: trailer.c:562
-#, c-format
-msgid "unknown value '%s' for key '%s'"
+#: send-pack.c:410
+msgid "the receiving end does not support --signed push"
msgstr ""
-#: trailer.c:544 trailer.c:549 builtin/remote.c:289
-#, c-format
-msgid "more than one %s"
+#: send-pack.c:412
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
msgstr ""
-#: trailer.c:582
-#, c-format
-msgid "empty trailer token in trailer '%.*s'"
+#: send-pack.c:424
+msgid "the receiving end does not support --atomic push"
msgstr ""
-#: trailer.c:702
-#, c-format
-msgid "could not read input file '%s'"
+#: send-pack.c:429
+msgid "the receiving end does not support push options"
msgstr ""
-#: trailer.c:705
-msgid "could not read from stdin"
+#: sequencer.c:171
+msgid "revert"
msgstr ""
-#: trailer.c:857 builtin/am.c:42
-#, c-format
-msgid "could not stat %s"
+#: sequencer.c:171
+msgid "cherry-pick"
msgstr ""
-#: trailer.c:859
-#, c-format
-msgid "file %s is not a regular file"
+#: sequencer.c:228
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
-#: trailer.c:861
-#, c-format
-msgid "file %s is not writable by user"
+#: sequencer.c:231
+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 ""
-#: trailer.c:873
-msgid "could not open temporary file"
+#: sequencer.c:244 sequencer.c:1209
+#, c-format
+msgid "could not lock '%s'"
msgstr ""
-#: trailer.c:912
+#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214
#, c-format
-msgid "could not rename temporary file to %s"
+msgid "could not write to '%s'"
msgstr ""
-#: transport.c:62
+#: sequencer.c:251
#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgid "could not write eol to '%s'"
msgstr ""
-#: transport.c:151
+#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216
#, c-format
-msgid "transport: invalid depth option '%s'"
+msgid "failed to finalize '%s'."
msgstr ""
-#: transport.c:771
+#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032
#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
+msgid "could not read '%s'"
msgstr ""
-#: transport.c:775
+#: sequencer.c:305
#, 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"
+msgid "your local changes would be overwritten by %s."
msgstr ""
-#: transport.c:783
-msgid "Aborting."
+#: sequencer.c:309
+msgid "commit your changes or stash them to proceed."
msgstr ""
-#: transport-helper.c:1041
+#: sequencer.c:324
#, c-format
-msgid "Could not read ref %s"
+msgid "%s: fast-forward"
msgstr ""
-#: unpack-trees.c:64
+#. TRANSLATORS: %s will be "revert" or "cherry-pick"
+#: sequencer.c:399
#, 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."
+msgid "%s: Unable to write new index file"
msgstr ""
-#: unpack-trees.c:66
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
+#: sequencer.c:418
+msgid "could not resolve HEAD commit\n"
msgstr ""
-#: unpack-trees.c:69
-#, 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."
+#: sequencer.c:438
+msgid "unable to update cache tree\n"
msgstr ""
-#: unpack-trees.c:71
+#: sequencer.c:483
#, c-format
msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
+"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 ""
-#: unpack-trees.c:74
+#: sequencer.c:567
#, 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."
+msgid "could not parse commit %s\n"
msgstr ""
-#: unpack-trees.c:76
+#: sequencer.c:572
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
+msgid "could not parse parent commit %s\n"
msgstr ""
-#: unpack-trees.c:81
-#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in it:\n"
-"%s"
+#: sequencer.c:656
+msgid "your index file is unmerged."
msgstr ""
-#: unpack-trees.c:85
+#: sequencer.c:675
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%sPlease move or remove them before you switch branches."
+msgid "commit %s is a merge but no -m option was given."
msgstr ""
-#: unpack-trees.c:87
+#: sequencer.c:683
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
+msgid "commit %s does not have parent %d"
msgstr ""
-#: unpack-trees.c:90
+#: sequencer.c:687
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you merge."
+msgid "mainline was specified but commit %s is not a merge."
msgstr ""
-#: unpack-trees.c:92
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#: sequencer.c:700
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
+msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: unpack-trees.c:95
+#: sequencer.c:705
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you %s."
+msgid "cannot get commit message for %s"
msgstr ""
-#: unpack-trees.c:97
+#: sequencer.c:797
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
+msgid "could not revert %s... %s"
msgstr ""
-#: unpack-trees.c:102
+#: sequencer.c:798
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%sPlease move or remove them before you switch branches."
+msgid "could not apply %s... %s"
msgstr ""
-#: unpack-trees.c:104
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%s"
+#: sequencer.c:833
+msgid "empty commit set passed"
msgstr ""
-#: unpack-trees.c:107
+#: sequencer.c:843
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you merge."
+msgid "git %s: failed to read the index"
msgstr ""
-#: unpack-trees.c:109
+#: sequencer.c:850
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
+msgid "git %s: failed to refresh the index"
msgstr ""
-#: unpack-trees.c:112
+#: sequencer.c:944
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you %s."
+msgid "invalid line %d: %.*s"
msgstr ""
-#: unpack-trees.c:114
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%s"
+#: sequencer.c:950
+msgid "no commits parsed."
msgstr ""
-#: unpack-trees.c:121
+#: sequencer.c:966
#, c-format
-msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgid "could not read '%s'."
msgstr ""
-#: unpack-trees.c:124
+#: sequencer.c:972
#, c-format
-msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
-"%s"
+msgid "unusable instruction sheet: '%s'"
msgstr ""
-#: unpack-trees.c:126
-#, c-format
-msgid ""
-"The following Working tree files would be overwritten by sparse checkout "
-"update:\n"
-"%s"
+#: sequencer.c:983
+msgid "cannot cherry-pick during a revert."
msgstr ""
-#: unpack-trees.c:128
-#, c-format
-msgid ""
-"The following Working tree files would be removed by sparse checkout "
-"update:\n"
-"%s"
+#: sequencer.c:985
+msgid "cannot revert during a cherry-pick."
msgstr ""
-#: unpack-trees.c:205
+#: sequencer.c:1028
#, c-format
-msgid "Aborting\n"
-msgstr ""
-
-#: unpack-trees.c:237
-msgid "Checking out files"
+msgid "invalid key: %s"
msgstr ""
-#: urlmatch.c:120
-msgid "invalid URL scheme name or missing '://' suffix"
+#: sequencer.c:1031
+#, c-format
+msgid "invalid value for %s: %s"
msgstr ""
-#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#: sequencer.c:1063
#, c-format
-msgid "invalid %XX escape sequence"
+msgid "malformed options sheet: '%s'"
msgstr ""
-#: urlmatch.c:172
-msgid "missing host and scheme is not 'file:'"
+#: sequencer.c:1101
+msgid "a cherry-pick or revert is already in progress"
msgstr ""
-#: urlmatch.c:189
-msgid "a 'file:' URL may not have a port number"
+#: sequencer.c:1102
+msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr ""
-#: urlmatch.c:199
-msgid "invalid characters in host name"
+#: sequencer.c:1106
+#, c-format
+msgid "could not create sequencer directory '%s'"
msgstr ""
-#: urlmatch.c:244 urlmatch.c:255
-msgid "invalid port number"
+#: sequencer.c:1120
+msgid "could not lock HEAD"
msgstr ""
-#: urlmatch.c:322
-msgid "invalid '..' path segment"
+#: sequencer.c:1151 sequencer.c:1289
+msgid "no cherry-pick or revert in progress"
msgstr ""
-#: worktree.c:282
-#, c-format
-msgid "failed to read '%s'"
+#: sequencer.c:1153
+msgid "cannot resolve HEAD"
msgstr ""
-#: wrapper.c:222 wrapper.c:392
-#, c-format
-msgid "could not open '%s' for reading and writing"
+#: sequencer.c:1155 sequencer.c:1189
+msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: wrapper.c:224 wrapper.c:394 builtin/am.c:778
+#: sequencer.c:1175 builtin/grep.c:578
#, c-format
-msgid "could not open '%s' for writing"
+msgid "cannot open '%s'"
msgstr ""
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771
-#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029
-#: builtin/pull.c:407
+#: sequencer.c:1177
#, c-format
-msgid "could not open '%s' for reading"
+msgid "cannot read '%s': %s"
msgstr ""
-#: wrapper.c:605 wrapper.c:626
-#, c-format
-msgid "unable to access '%s'"
+#: sequencer.c:1178
+msgid "unexpected end of file"
msgstr ""
-#: wrapper.c:634
-msgid "unable to get current working directory"
+#: sequencer.c:1184
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: wrapper.c:658
+#: sequencer.c:1354
#, c-format
-msgid "could not write to %s"
+msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: wrapper.c:660
+#: sequencer.c:1358
#, c-format
-msgid "could not close %s"
+msgid "%s: bad revision"
msgstr ""
-#: wt-status.c:150
-msgid "Unmerged paths:"
+#: sequencer.c:1391
+msgid "can't revert as initial commit"
msgstr ""
-#: wt-status.c:177 wt-status.c:204
+#: setup.c:160
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr ""
-
-#: wt-status.c:179 wt-status.c:206
-msgid " (use \"git rm --cached <file>...\" to unstage)"
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
msgstr ""
-#: wt-status.c:183
-msgid " (use \"git add <file>...\" to mark resolution)"
+#: setup.c:173
+#, 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 ""
-#: wt-status.c:185 wt-status.c:189
-msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+#: setup.c:223
+#, 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 ""
-#: wt-status.c:187
-msgid " (use \"git rm <file>...\" to mark resolution)"
+#: setup.c:468
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
msgstr ""
-#: wt-status.c:198 wt-status.c:882
-msgid "Changes to be committed:"
+#: setup.c:476
+msgid "unknown repository extensions found:"
msgstr ""
-#: wt-status.c:216 wt-status.c:891
-msgid "Changes not staged for commit:"
+#: setup.c:762
+#, c-format
+msgid "Not a git repository (or any of the parent directories): %s"
msgstr ""
-#: wt-status.c:220
-msgid " (use \"git add <file>...\" to update what will be committed)"
+#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
+msgid "Cannot come back to cwd"
msgstr ""
-#: wt-status.c:222
-msgid " (use \"git add/rm <file>...\" to update what will be committed)"
+#: setup.c:845
+msgid "Unable to read current working directory"
msgstr ""
-#: wt-status.c:223
+#: setup.c:920
+#, c-format
msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
-msgstr ""
-
-#: wt-status.c:225
-msgid " (commit or discard the untracked or modified content in submodules)"
+"Not a git repository (or any parent up to mount point %s)\n"
+"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
msgstr ""
-#: wt-status.c:237
+#: setup.c:927
#, c-format
-msgid " (use \"git %s <file>...\" to include in what will be committed)"
+msgid "Cannot change to '%s/..'"
msgstr ""
-#: wt-status.c:252
-msgid "both deleted:"
+#: setup.c:989
+#, c-format
+msgid ""
+"Problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
msgstr ""
-#: wt-status.c:254
-msgid "added by us:"
+#: sha1_file.c:473
+#, c-format
+msgid "path '%s' does not exist"
msgstr ""
-#: wt-status.c:256
-msgid "deleted by them:"
+#: sha1_file.c:499
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
-#: wt-status.c:258
-msgid "added by them:"
+#: sha1_file.c:505
+#, c-format
+msgid "reference repository '%s' is not a local repository."
msgstr ""
-#: wt-status.c:260
-msgid "deleted by us:"
+#: sha1_file.c:511
+#, c-format
+msgid "reference repository '%s' is shallow"
msgstr ""
-#: wt-status.c:262
-msgid "both added:"
+#: sha1_file.c:519
+#, c-format
+msgid "reference repository '%s' is grafted"
msgstr ""
-#: wt-status.c:264
-msgid "both modified:"
+#: sha1_file.c:1159
+msgid "offset before end of packfile (broken .idx?)"
msgstr ""
-#: wt-status.c:274
-msgid "new file:"
+#: sha1_file.c:2592
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
-#: wt-status.c:276
-msgid "copied:"
+#: sha1_file.c:2596
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
-#: wt-status.c:278
-msgid "deleted:"
+#: sha1_name.c:407
+#, c-format
+msgid "short SHA1 %s is ambiguous"
msgstr ""
-#: wt-status.c:280
-msgid "modified:"
+#: sha1_name.c:418
+msgid "The candidates are:"
msgstr ""
-#: wt-status.c:282
-msgid "renamed:"
+#: sha1_name.c:578
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+" git checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
msgstr ""
-#: wt-status.c:284
-msgid "typechange:"
+#: submodule.c:64 submodule.c:98
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
-#: wt-status.c:286
-msgid "unknown:"
+#: submodule.c:68 submodule.c:102
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
msgstr ""
-#: wt-status.c:288
-msgid "unmerged:"
+#: submodule.c:76
+#, c-format
+msgid "Could not update .gitmodules entry %s"
msgstr ""
-#: wt-status.c:370
-msgid "new commits, "
+#: submodule.c:109
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
msgstr ""
-#: wt-status.c:372
-msgid "modified content, "
+#: submodule.c:120
+msgid "staging updated .gitmodules failed"
msgstr ""
-#: wt-status.c:374
-msgid "untracked content, "
+#: submodule.c:158
+msgid "negative values not allowed for submodule.fetchJobs"
msgstr ""
-#: wt-status.c:756
-msgid "Submodules changed but not updated:"
+#: submodule-config.c:358
+#, c-format
+msgid "invalid value for %s"
msgstr ""
-#: wt-status.c:758
-msgid "Submodule changes to be committed:"
+#: trailer.c:238
+#, c-format
+msgid "running trailer command '%s' failed"
msgstr ""
-#: wt-status.c:839
-msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537
+#: trailer.c:541
+#, c-format
+msgid "unknown value '%s' for key '%s'"
msgstr ""
-#: wt-status.c:950
-msgid "You have unmerged paths."
+#: trailer.c:523 trailer.c:528 builtin/remote.c:289
+#, c-format
+msgid "more than one %s"
msgstr ""
-#: wt-status.c:953
-msgid " (fix conflicts and run \"git commit\")"
+#: trailer.c:672
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
msgstr ""
-#: wt-status.c:955
-msgid " (use \"git merge --abort\" to abort the merge)"
+#: trailer.c:695
+#, c-format
+msgid "could not read input file '%s'"
msgstr ""
-#: wt-status.c:960
-msgid "All conflicts fixed but you are still merging."
+#: trailer.c:698
+msgid "could not read from stdin"
msgstr ""
-#: wt-status.c:963
-msgid " (use \"git commit\" to conclude merge)"
+#: trailer.c:929 builtin/am.c:44
+#, c-format
+msgid "could not stat %s"
msgstr ""
-#: wt-status.c:973
-msgid "You are in the middle of an am session."
+#: trailer.c:931
+#, c-format
+msgid "file %s is not a regular file"
msgstr ""
-#: wt-status.c:976
-msgid "The current patch is empty."
+#: trailer.c:933
+#, c-format
+msgid "file %s is not writable by user"
msgstr ""
-#: wt-status.c:980
-msgid " (fix conflicts and then run \"git am --continue\")"
+#: trailer.c:945
+msgid "could not open temporary file"
msgstr ""
-#: wt-status.c:982
-msgid " (use \"git am --skip\" to skip this patch)"
+#: trailer.c:983
+#, c-format
+msgid "could not rename temporary file to %s"
msgstr ""
-#: wt-status.c:984
-msgid " (use \"git am --abort\" to restore the original branch)"
+#: transport.c:62
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr ""
-#: wt-status.c:1109
-msgid "No commands done."
+#: transport.c:151
+#, c-format
+msgid "transport: invalid depth option '%s'"
msgstr ""
-#: wt-status.c:1112
+#: transport.c:817
#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
-msgstr[0] ""
-msgstr[1] ""
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
-#: wt-status.c:1123
+#: transport.c:821
#, c-format
-msgid " (see more in file %s)"
+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 ""
-#: wt-status.c:1128
-msgid "No commands remaining."
+#: transport.c:829
+msgid "Aborting."
msgstr ""
-#: wt-status.c:1131
+#: transport-helper.c:1075
#, c-format
-msgid "Next command to do (%d remaining command):"
-msgid_plural "Next commands to do (%d remaining commands):"
-msgstr[0] ""
-msgstr[1] ""
-
-#: wt-status.c:1139
-msgid " (use \"git rebase --edit-todo\" to view and edit)"
+msgid "Could not read ref %s"
msgstr ""
-#: wt-status.c:1152
-#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
+#: tree-walk.c:31
+msgid "too-short tree object"
msgstr ""
-#: wt-status.c:1157
-msgid "You are currently rebasing."
+#: tree-walk.c:37
+msgid "malformed mode in tree entry"
msgstr ""
-#: wt-status.c:1171
-msgid " (fix conflicts and then run \"git rebase --continue\")"
+#: tree-walk.c:41
+msgid "empty filename in tree entry"
msgstr ""
-#: wt-status.c:1173
-msgid " (use \"git rebase --skip\" to skip this patch)"
+#: tree-walk.c:113
+msgid "too-short tree file"
msgstr ""
-#: wt-status.c:1175
-msgid " (use \"git rebase --abort\" to check out the original branch)"
+#: unpack-trees.c:64
+#, 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 ""
-#: wt-status.c:1181
-msgid " (all conflicts fixed: run \"git rebase --continue\")"
+#: unpack-trees.c:66
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
msgstr ""
-#: wt-status.c:1185
+#: unpack-trees.c:69
#, c-format
msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you merge."
msgstr ""
-#: wt-status.c:1190
-msgid "You are currently splitting a commit during a rebase."
+#: unpack-trees.c:71
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
msgstr ""
-#: wt-status.c:1193
-msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+#: unpack-trees.c:74
+#, 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 ""
-#: wt-status.c:1197
+#: unpack-trees.c:76
#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
-msgstr ""
-
-#: wt-status.c:1202
-msgid "You are currently editing a commit during a rebase."
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
msgstr ""
-#: wt-status.c:1205
-msgid " (use \"git commit --amend\" to amend the current commit)"
+#: unpack-trees.c:81
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in it:\n"
+"%s"
msgstr ""
-#: wt-status.c:1207
+#: unpack-trees.c:85
+#, c-format
msgid ""
-" (use \"git rebase --continue\" once you are satisfied with your changes)"
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you switch branches."
msgstr ""
-#: wt-status.c:1217
+#: unpack-trees.c:87
#, c-format
-msgid "You are currently cherry-picking commit %s."
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
msgstr ""
-#: wt-status.c:1222
-msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+#: unpack-trees.c:90
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
msgstr ""
-#: wt-status.c:1225
-msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+#: unpack-trees.c:92
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
msgstr ""
-#: wt-status.c:1227
-msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+#: unpack-trees.c:95
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
msgstr ""
-#: wt-status.c:1236
+#: unpack-trees.c:97
#, c-format
-msgid "You are currently reverting commit %s."
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
msgstr ""
-#: wt-status.c:1241
-msgid " (fix conflicts and run \"git revert --continue\")"
+#: unpack-trees.c:102
+#, 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 ""
-#: wt-status.c:1244
-msgid " (all conflicts fixed: run \"git revert --continue\")"
+#: unpack-trees.c:104
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
msgstr ""
-#: wt-status.c:1246
-msgid " (use \"git revert --abort\" to cancel the revert operation)"
+#: unpack-trees.c:107
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
msgstr ""
-#: wt-status.c:1257
+#: unpack-trees.c:109
#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
msgstr ""
-#: wt-status.c:1261
-msgid "You are currently bisecting."
+#: unpack-trees.c:112
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
msgstr ""
-#: wt-status.c:1264
-msgid " (use \"git bisect reset\" to get back to the original branch)"
+#: unpack-trees.c:114
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
msgstr ""
-#: wt-status.c:1464
-msgid "On branch "
+#: unpack-trees.c:121
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr ""
-#: wt-status.c:1470
-msgid "interactive rebase in progress; onto "
+#: unpack-trees.c:124
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
msgstr ""
-#: wt-status.c:1472
-msgid "rebase in progress; onto "
+#: unpack-trees.c:126
+#, c-format
+msgid ""
+"The following working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
msgstr ""
-#: wt-status.c:1477
-msgid "HEAD detached at "
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"The following working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
msgstr ""
-#: wt-status.c:1479
-msgid "HEAD detached from "
+#: unpack-trees.c:205
+#, c-format
+msgid "Aborting\n"
msgstr ""
-#: wt-status.c:1482
-msgid "Not currently on any branch."
+#: unpack-trees.c:237
+msgid "Checking out files"
msgstr ""
-#: wt-status.c:1500
-msgid "Initial commit"
+#: urlmatch.c:120
+msgid "invalid URL scheme name or missing '://' suffix"
msgstr ""
-#: wt-status.c:1514
-msgid "Untracked files"
+#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#, c-format
+msgid "invalid %XX escape sequence"
msgstr ""
-#: wt-status.c:1516
-msgid "Ignored files"
+#: urlmatch.c:172
+msgid "missing host and scheme is not 'file:'"
msgstr ""
-#: wt-status.c:1520
-#, 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')."
+#: urlmatch.c:189
+msgid "a 'file:' URL may not have a port number"
msgstr ""
-#: wt-status.c:1526
-#, c-format
-msgid "Untracked files not listed%s"
+#: urlmatch.c:199
+msgid "invalid characters in host name"
msgstr ""
-#: wt-status.c:1528
-msgid " (use -u option to show untracked files)"
+#: urlmatch.c:244 urlmatch.c:255
+msgid "invalid port number"
msgstr ""
-#: wt-status.c:1534
-msgid "No changes"
+#: urlmatch.c:322
+msgid "invalid '..' path segment"
msgstr ""
-#: wt-status.c:1539
+#: worktree.c:282
#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgid "failed to read '%s'"
msgstr ""
-#: wt-status.c:1542
+#: wrapper.c:222 wrapper.c:392
#, c-format
-msgid "no changes added to commit\n"
+msgid "could not open '%s' for reading and writing"
msgstr ""
-#: wt-status.c:1545
+#: wrapper.c:224 wrapper.c:394 builtin/am.c:766
#, c-format
-msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
+msgid "could not open '%s' for writing"
msgstr ""
-#: wt-status.c:1548
+#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
+#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029
+#: builtin/pull.c:341
#, c-format
-msgid "nothing added to commit but untracked files present\n"
+msgid "could not open '%s' for reading"
msgstr ""
-#: wt-status.c:1551
+#: wrapper.c:605 wrapper.c:626
#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgid "unable to access '%s'"
msgstr ""
-#: wt-status.c:1554 wt-status.c:1559
-#, c-format
-msgid "nothing to commit\n"
+#: wrapper.c:634
+msgid "unable to get current working directory"
msgstr ""
-#: wt-status.c:1557
+#: wrapper.c:658
#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
+msgid "could not write to %s"
msgstr ""
-#: wt-status.c:1561
+#: wrapper.c:660
#, c-format
-msgid "nothing to commit, working tree clean\n"
+msgid "could not close %s"
msgstr ""
-#: wt-status.c:1668
-msgid "Initial commit on "
+#: wt-status.c:151
+msgid "Unmerged paths:"
msgstr ""
-#: wt-status.c:1672
-msgid "HEAD (no branch)"
+#: wt-status.c:178 wt-status.c:205
+#, c-format
+msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr ""
-#: wt-status.c:1701
-msgid "gone"
+#: wt-status.c:180 wt-status.c:207
+msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
-#: wt-status.c:1703 wt-status.c:1711
-msgid "behind "
+#: wt-status.c:184
+msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:1706 wt-status.c:1709
-msgid "ahead "
+#: wt-status.c:186 wt-status.c:190
+msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
-#: compat/precompose_utf8.c:57 builtin/clone.c:415
-#, c-format
-msgid "failed to unlink '%s'"
+#: wt-status.c:188
+msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
-#: builtin/add.c:22
-msgid "git add [<options>] [--] <pathspec>..."
+#: wt-status.c:199 wt-status.c:945
+msgid "Changes to be committed:"
msgstr ""
-#: builtin/add.c:65
-#, c-format
-msgid "unexpected diff status %c"
+#: wt-status.c:217 wt-status.c:954
+msgid "Changes not staged for commit:"
msgstr ""
-#: builtin/add.c:71 builtin/commit.c:281
-msgid "updating files failed"
+#: wt-status.c:221
+msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
-#: builtin/add.c:81
-#, c-format
-msgid "remove '%s'\n"
+#: wt-status.c:223
+msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
-#: builtin/add.c:136
-msgid "Unstaged changes after refreshing the index:"
+#: wt-status.c:224
+msgid ""
+" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
-#: builtin/add.c:196 builtin/rev-parse.c:811
-msgid "Could not read the index"
+#: wt-status.c:226
+msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-#: builtin/add.c:207
+#: wt-status.c:238
#, c-format
-msgid "Could not open '%s' for writing."
-msgstr ""
-
-#: builtin/add.c:211
-msgid "Could not write patch"
+msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
-#: builtin/add.c:214
-msgid "editing patch failed"
+#: wt-status.c:253
+msgid "both deleted:"
msgstr ""
-#: builtin/add.c:217
-#, c-format
-msgid "Could not stat '%s'"
+#: wt-status.c:255
+msgid "added by us:"
msgstr ""
-#: builtin/add.c:219
-msgid "Empty patch. Aborted."
+#: wt-status.c:257
+msgid "deleted by them:"
msgstr ""
-#: builtin/add.c:224
-#, c-format
-msgid "Could not apply '%s'"
+#: wt-status.c:259
+msgid "added by them:"
msgstr ""
-#: builtin/add.c:234
-msgid "The following paths are ignored by one of your .gitignore files:\n"
+#: wt-status.c:261
+msgid "deleted by us:"
msgstr ""
-#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521
-#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162
-msgid "dry run"
+#: wt-status.c:263
+msgid "both added:"
msgstr ""
-#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19
-#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593
-#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114
-msgid "be verbose"
+#: wt-status.c:265
+msgid "both modified:"
msgstr ""
-#: builtin/add.c:256
-msgid "interactive picking"
+#: wt-status.c:275
+msgid "new file:"
msgstr ""
-#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286
-msgid "select hunks interactively"
+#: wt-status.c:277
+msgid "copied:"
msgstr ""
-#: builtin/add.c:258
-msgid "edit current diff and apply"
+#: wt-status.c:279
+msgid "deleted:"
msgstr ""
-#: builtin/add.c:259
-msgid "allow adding otherwise ignored files"
+#: wt-status.c:281
+msgid "modified:"
msgstr ""
-#: builtin/add.c:260
-msgid "update tracked files"
+#: wt-status.c:283
+msgid "renamed:"
msgstr ""
-#: builtin/add.c:261
-msgid "record only the fact that the path will be added later"
+#: wt-status.c:285
+msgid "typechange:"
msgstr ""
-#: builtin/add.c:262
-msgid "add changes from all tracked and untracked files"
+#: wt-status.c:287
+msgid "unknown:"
msgstr ""
-#: builtin/add.c:265
-msgid "ignore paths removed in the working tree (same as --no-all)"
+#: wt-status.c:289
+msgid "unmerged:"
msgstr ""
-#: builtin/add.c:267
-msgid "don't add, only refresh the index"
+#: wt-status.c:371
+msgid "new commits, "
msgstr ""
-#: builtin/add.c:268
-msgid "just skip files which cannot be added because of errors"
+#: wt-status.c:373
+msgid "modified content, "
msgstr ""
-#: builtin/add.c:269
-msgid "check if - even missing - files are ignored in dry run"
+#: wt-status.c:375
+msgid "untracked content, "
msgstr ""
-#: builtin/add.c:270 builtin/update-index.c:958
-msgid "(+/-)x"
+#: wt-status.c:818
+msgid "Submodules changed but not updated:"
msgstr ""
-#: builtin/add.c:270 builtin/update-index.c:959
-msgid "override the executable bit of the listed files"
+#: wt-status.c:820
+msgid "Submodule changes to be committed:"
msgstr ""
-#: builtin/add.c:292
-#, c-format
-msgid "Use -f if you really want to add them.\n"
+#: wt-status.c:901
+msgid ""
+"Do not touch the line above.\n"
+"Everything below will be removed."
msgstr ""
-#: builtin/add.c:300
-msgid "adding files failed"
+#: wt-status.c:1013
+msgid "You have unmerged paths."
msgstr ""
-#: builtin/add.c:336
-msgid "-A and -u are mutually incompatible"
+#: wt-status.c:1016
+msgid " (fix conflicts and run \"git commit\")"
msgstr ""
-#: builtin/add.c:343
-msgid "Option --ignore-missing can only be used together with --dry-run"
+#: wt-status.c:1018
+msgid " (use \"git merge --abort\" to abort the merge)"
msgstr ""
-#: builtin/add.c:352
-#, c-format
-msgid "--chmod param '%s' must be either -x or +x"
+#: wt-status.c:1023
+msgid "All conflicts fixed but you are still merging."
msgstr ""
-#: builtin/add.c:367
-#, c-format
-msgid "Nothing specified, nothing added.\n"
+#: wt-status.c:1026
+msgid " (use \"git commit\" to conclude merge)"
msgstr ""
-#: builtin/add.c:368
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
+#: wt-status.c:1036
+msgid "You are in the middle of an am session."
msgstr ""
-#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279
-#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340
-#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:240
-msgid "index file corrupt"
+#: wt-status.c:1039
+msgid "The current patch is empty."
msgstr ""
-#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431
-msgid "Unable to write new index file"
+#: wt-status.c:1043
+msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
-#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032
-#, c-format
-msgid "could not read '%s'"
+#: wt-status.c:1045
+msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
-#: builtin/am.c:426
-msgid "could not parse author script"
+#: wt-status.c:1047
+msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
-#: builtin/am.c:503
-#, c-format
-msgid "'%s' was deleted by the applypatch-msg hook"
+#: wt-status.c:1172
+msgid "No commands done."
msgstr ""
-#: builtin/am.c:544 builtin/notes.c:301
+#: wt-status.c:1175
#, c-format
-msgid "Malformed input line: '%s'."
-msgstr ""
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/am.c:581 builtin/notes.c:316
+#: wt-status.c:1186
#, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
+msgid " (see more in file %s)"
msgstr ""
-#: builtin/am.c:607
-msgid "fseek failed"
+#: wt-status.c:1191
+msgid "No commands remaining."
msgstr ""
-#: builtin/am.c:787
+#: wt-status.c:1194
#, c-format
-msgid "could not parse patch '%s'"
-msgstr ""
+msgid "Next command to do (%d remaining command):"
+msgid_plural "Next commands to do (%d remaining commands):"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/am.c:852
-msgid "Only one StGIT patch series can be applied at once"
+#: wt-status.c:1202
+msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr ""
-#: builtin/am.c:899
-msgid "invalid timestamp"
+#: wt-status.c:1215
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/am.c:902 builtin/am.c:910
-msgid "invalid Date line"
+#: wt-status.c:1220
+msgid "You are currently rebasing."
msgstr ""
-#: builtin/am.c:907
-msgid "invalid timezone offset"
+#: wt-status.c:1234
+msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
-#: builtin/am.c:996
-msgid "Patch format detection failed."
+#: wt-status.c:1236
+msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
-#: builtin/am.c:1001 builtin/clone.c:380
-#, c-format
-msgid "failed to create directory '%s'"
+#: wt-status.c:1238
+msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
-#: builtin/am.c:1005
-msgid "Failed to split patches."
+#: wt-status.c:1244
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
-#: builtin/am.c:1137 builtin/commit.c:366
-msgid "unable to write index file"
+#: wt-status.c:1248
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/am.c:1188
-#, c-format
-msgid "When you have resolved this problem, run \"%s --continue\"."
+#: wt-status.c:1253
+msgid "You are currently splitting a commit during a rebase."
msgstr ""
-#: builtin/am.c:1189
-#, c-format
-msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+#: wt-status.c:1256
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
-#: builtin/am.c:1190
+#: wt-status.c:1260
#, c-format
-msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/am.c:1328
-msgid "Patch is empty. Was it split wrong?"
+#: wt-status.c:1265
+msgid "You are currently editing a commit during a rebase."
msgstr ""
-#: builtin/am.c:1402 builtin/log.c:1543
-#, c-format
-msgid "invalid ident line: %s"
+#: wt-status.c:1268
+msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
-#: builtin/am.c:1429
-#, c-format
-msgid "unable to parse commit %s"
+#: wt-status.c:1270
+msgid ""
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-#: builtin/am.c:1602
-msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+#: wt-status.c:1280
+#, c-format
+msgid "You are currently cherry-picking commit %s."
msgstr ""
-#: builtin/am.c:1604
-msgid "Using index info to reconstruct a base tree..."
+#: wt-status.c:1285
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
-#: builtin/am.c:1623
-msgid ""
-"Did you hand edit your patch?\n"
-"It does not apply to blobs recorded in its index."
+#: wt-status.c:1288
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
-#: builtin/am.c:1629
-msgid "Falling back to patching base and 3-way merge..."
+#: wt-status.c:1290
+msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-#: builtin/am.c:1654
-msgid "Failed to merge in the changes."
+#: wt-status.c:1299
+#, c-format
+msgid "You are currently reverting commit %s."
msgstr ""
-#: builtin/am.c:1679 builtin/merge.c:628
-msgid "git write-tree failed to write a tree"
+#: wt-status.c:1304
+msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
-#: builtin/am.c:1686
-msgid "applying to an empty history"
+#: wt-status.c:1307
+msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
-#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798
-#: builtin/merge.c:823
-msgid "failed to write commit object"
+#: wt-status.c:1309
+msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
-#: builtin/am.c:1731 builtin/am.c:1735
+#: wt-status.c:1320
#, c-format
-msgid "cannot resume: %s does not exist."
-msgstr ""
-
-#: builtin/am.c:1751
-msgid "cannot be interactive without stdin connected to a terminal."
+msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
-#: builtin/am.c:1756
-msgid "Commit Body is:"
+#: wt-status.c:1324
+msgid "You are currently bisecting."
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:1766
-msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+#: wt-status.c:1327
+msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: builtin/am.c:1816
-#, c-format
-msgid "Dirty index: cannot apply patches (dirty: %s)"
+#: wt-status.c:1524
+msgid "On branch "
msgstr ""
-#: builtin/am.c:1853 builtin/am.c:1925
-#, c-format
-msgid "Applying: %.*s"
+#: wt-status.c:1530
+msgid "interactive rebase in progress; onto "
msgstr ""
-#: builtin/am.c:1869
-msgid "No changes -- Patch already applied."
+#: wt-status.c:1532
+msgid "rebase in progress; onto "
msgstr ""
-#: builtin/am.c:1877
-#, c-format
-msgid "Patch failed at %s %.*s"
+#: wt-status.c:1537
+msgid "HEAD detached at "
msgstr ""
-#: builtin/am.c:1883
-#, c-format
-msgid "The copy of the patch that failed is found in: %s"
+#: wt-status.c:1539
+msgid "HEAD detached from "
msgstr ""
-#: builtin/am.c:1928
-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."
+#: wt-status.c:1542
+msgid "Not currently on any branch."
msgstr ""
-#: builtin/am.c:1935
-msgid ""
-"You still have unmerged paths in your index.\n"
-"Did you forget to use 'git add'?"
+#: wt-status.c:1560
+msgid "Initial commit"
msgstr ""
-#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308
-#: builtin/reset.c:316
-#, c-format
-msgid "Could not parse object '%s'."
+#: wt-status.c:1574
+msgid "Untracked files"
msgstr ""
-#: builtin/am.c:2095
-msgid "failed to clean index"
+#: wt-status.c:1576
+msgid "Ignored files"
msgstr ""
-#: builtin/am.c:2129
+#: wt-status.c:1580
+#, c-format
msgid ""
-"You seem to have moved HEAD since the last 'am' failure.\n"
-"Not rewinding to ORIG_HEAD"
+"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 ""
-#: builtin/am.c:2192
+#: wt-status.c:1586
#, c-format
-msgid "Invalid value for --patch-format: %s"
-msgstr ""
-
-#: builtin/am.c:2225
-msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
-msgstr ""
-
-#: builtin/am.c:2226
-msgid "git am [<options>] (--continue | --skip | --abort)"
+msgid "Untracked files not listed%s"
msgstr ""
-#: builtin/am.c:2232
-msgid "run interactively"
+#: wt-status.c:1588
+msgid " (use -u option to show untracked files)"
msgstr ""
-#: builtin/am.c:2234
-msgid "historical option -- no-op"
+#: wt-status.c:1594
+msgid "No changes"
msgstr ""
-#: builtin/am.c:2236
-msgid "allow fall back on 3way merging if needed"
+#: wt-status.c:1599
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57
-#: builtin/repack.c:172
-msgid "be quiet"
+#: wt-status.c:1602
+#, c-format
+msgid "no changes added to commit\n"
msgstr ""
-#: builtin/am.c:2239
-msgid "add a Signed-off-by line to the commit message"
+#: wt-status.c:1605
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
msgstr ""
-#: builtin/am.c:2242
-msgid "recode into utf8 (default)"
+#: wt-status.c:1608
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: builtin/am.c:2244
-msgid "pass -k flag to git-mailinfo"
+#: wt-status.c:1611
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: builtin/am.c:2246
-msgid "pass -b flag to git-mailinfo"
+#: wt-status.c:1614 wt-status.c:1619
+#, c-format
+msgid "nothing to commit\n"
msgstr ""
-#: builtin/am.c:2248
-msgid "pass -m flag to git-mailinfo"
+#: wt-status.c:1617
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: builtin/am.c:2250
-msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+#: wt-status.c:1621
+#, c-format
+msgid "nothing to commit, working tree clean\n"
msgstr ""
-#: builtin/am.c:2253
-msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+#: wt-status.c:1728
+msgid "Initial commit on "
msgstr ""
-#: builtin/am.c:2256
-msgid "strip everything before a scissors line"
+#: wt-status.c:1732
+msgid "HEAD (no branch)"
msgstr ""
-#: builtin/am.c:2257 builtin/apply.c:4837
-msgid "action"
+#: wt-status.c:1761
+msgid "gone"
msgstr ""
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279
-#: builtin/am.c:2285
-msgid "pass it through git-apply"
+#: wt-status.c:1763 wt-status.c:1771
+msgid "behind "
msgstr ""
-#: builtin/am.c:2266 builtin/apply.c:4861
-msgid "root"
+#: wt-status.c:1766 wt-status.c:1769
+msgid "ahead "
msgstr ""
-#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799
-#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96
-#: builtin/pull.c:179 builtin/submodule--helper.c:277
-#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482
-#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823
-#: builtin/submodule--helper.c:826
-msgid "path"
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2270
+#, c-format
+msgid "cannot %s: You have unstaged changes."
msgstr ""
-#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134
-#: builtin/pull.c:193 builtin/repack.c:181 builtin/repack.c:185
-#: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
-#: parse-options.h:132 parse-options.h:134 parse-options.h:244
-msgid "n"
+#: wt-status.c:2276
+msgid "additionally, your index contains uncommitted changes."
msgstr ""
-#: builtin/am.c:2278 builtin/apply.c:4805
-msgid "num"
+#: wt-status.c:2278
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
-#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438
-#: builtin/tag.c:372
-msgid "format"
+#: compat/precompose_utf8.c:57 builtin/clone.c:414
+#, c-format
+msgid "failed to unlink '%s'"
msgstr ""
-#: builtin/am.c:2282
-msgid "format the patch(es) are in"
+#: builtin/add.c:22
+msgid "git add [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/am.c:2288
-msgid "override error message when patch failure occurs"
+#: builtin/add.c:80
+#, c-format
+msgid "unexpected diff status %c"
msgstr ""
-#: builtin/am.c:2290
-msgid "continue applying patches after resolving a conflict"
+#: builtin/add.c:85 builtin/commit.c:291
+msgid "updating files failed"
msgstr ""
-#: builtin/am.c:2293
-msgid "synonyms for --continue"
+#: builtin/add.c:95
+#, c-format
+msgid "remove '%s'\n"
msgstr ""
-#: builtin/am.c:2296
-msgid "skip the current patch"
+#: builtin/add.c:149
+msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/am.c:2299
-msgid "restore the original branch and abort the patching operation."
+#: builtin/add.c:209 builtin/rev-parse.c:840
+msgid "Could not read the index"
msgstr ""
-#: builtin/am.c:2303
-msgid "lie about committer date"
+#: builtin/add.c:220
+#, c-format
+msgid "Could not open '%s' for writing."
msgstr ""
-#: builtin/am.c:2305
-msgid "use current timestamp for author date"
+#: builtin/add.c:224
+msgid "Could not write patch"
msgstr ""
-#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229
-#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
-msgid "key-id"
+#: builtin/add.c:227
+msgid "editing patch failed"
msgstr ""
-#: builtin/am.c:2308
-msgid "GPG-sign commits"
+#: builtin/add.c:230
+#, c-format
+msgid "Could not stat '%s'"
msgstr ""
-#: builtin/am.c:2311
-msgid "(internal use for git-rebase)"
+#: builtin/add.c:232
+msgid "Empty patch. Aborted."
msgstr ""
-#: builtin/am.c:2326
-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."
+#: builtin/add.c:237
+#, c-format
+msgid "Could not apply '%s'"
msgstr ""
-#: builtin/am.c:2333
-msgid "failed to read the index"
+#: builtin/add.c:247
+msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/am.c:2348
-#, c-format
-msgid "previous rebase directory %s still exists but mbox given."
+#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111
+#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521
+#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162
+msgid "dry run"
msgstr ""
-#: builtin/am.c:2372
-#, c-format
-msgid ""
-"Stray %s directory found.\n"
-"Use \"git am --abort\" to remove it."
+#: builtin/add.c:269
+msgid "interactive picking"
msgstr ""
-#: builtin/am.c:2378
-msgid "Resolve operation not in progress, we are not resuming."
+#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286
+msgid "select hunks interactively"
msgstr ""
-#: builtin/apply.c:122
-msgid "git apply [<options>] [<patch>...]"
+#: builtin/add.c:271
+msgid "edit current diff and apply"
msgstr ""
-#: builtin/apply.c:153
-#, c-format
-msgid "unrecognized whitespace option '%s'"
+#: builtin/add.c:272
+msgid "allow adding otherwise ignored files"
msgstr ""
-#: builtin/apply.c:169
-#, c-format
-msgid "unrecognized whitespace ignore option '%s'"
+#: builtin/add.c:273
+msgid "update tracked files"
msgstr ""
-#: builtin/apply.c:854
-#, c-format
-msgid "Cannot prepare timestamp regexp %s"
+#: builtin/add.c:274
+msgid "record only the fact that the path will be added later"
msgstr ""
-#: builtin/apply.c:863
-#, c-format
-msgid "regexec returned %d for input: %s"
+#: builtin/add.c:275
+msgid "add changes from all tracked and untracked files"
msgstr ""
-#: builtin/apply.c:947
-#, c-format
-msgid "unable to find filename in patch at line %d"
+#: builtin/add.c:278
+msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
-#: builtin/apply.c:984
-#, c-format
-msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
+#: builtin/add.c:280
+msgid "don't add, only refresh the index"
msgstr ""
-#: builtin/apply.c:989
-#, c-format
-msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+#: builtin/add.c:281
+msgid "just skip files which cannot be added because of errors"
msgstr ""
-#: builtin/apply.c:990
-#, c-format
-msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+#: builtin/add.c:282
+msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-#: builtin/apply.c:995
-#, c-format
-msgid "git apply: bad git-diff - expected /dev/null on line %d"
+#: builtin/add.c:283 builtin/update-index.c:947
+msgid "(+/-)x"
msgstr ""
-#: builtin/apply.c:1489
-#, c-format
-msgid "recount: unexpected line: %.*s"
+#: builtin/add.c:283 builtin/update-index.c:948
+msgid "override the executable bit of the listed files"
msgstr ""
-#: builtin/apply.c:1550
+#: builtin/add.c:305
#, c-format
-msgid "patch fragment without header at line %d: %.*s"
+msgid "Use -f if you really want to add them.\n"
msgstr ""
-#: builtin/apply.c:1567
-#, 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] ""
-
-#: builtin/apply.c:1743
-msgid "new file depends on old contents"
+#: builtin/add.c:312
+msgid "adding files failed"
msgstr ""
-#: builtin/apply.c:1745
-msgid "deleted file still has contents"
+#: builtin/add.c:348
+msgid "-A and -u are mutually incompatible"
msgstr ""
-#: builtin/apply.c:1774
-#, c-format
-msgid "corrupt patch at line %d"
+#: builtin/add.c:355
+msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
-#: builtin/apply.c:1810
+#: builtin/add.c:359
#, c-format
-msgid "new file %s depends on old contents"
+msgid "--chmod param '%s' must be either -x or +x"
msgstr ""
-#: builtin/apply.c:1812
+#: builtin/add.c:374
#, c-format
-msgid "deleted file %s still has contents"
+msgid "Nothing specified, nothing added.\n"
msgstr ""
-#: builtin/apply.c:1815
+#: builtin/add.c:375
#, c-format
-msgid "** warning: file %s becomes empty but is not deleted"
+msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
-#: builtin/apply.c:1962
-#, c-format
-msgid "corrupt binary patch at line %d: %.*s"
+#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279
+#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350
+#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:244
+msgid "index file corrupt"
msgstr ""
-#: builtin/apply.c:1999
-#, c-format
-msgid "unrecognized binary patch at line %d"
+#: builtin/am.c:414
+msgid "could not parse author script"
msgstr ""
-#: builtin/apply.c:2154
+#: builtin/am.c:491
#, c-format
-msgid "patch with only garbage at line %d"
+msgid "'%s' was deleted by the applypatch-msg hook"
msgstr ""
-#: builtin/apply.c:2244
+#: builtin/am.c:532
#, c-format
-msgid "unable to read symlink %s"
+msgid "Malformed input line: '%s'."
msgstr ""
-#: builtin/apply.c:2248
+#: builtin/am.c:569
#, c-format
-msgid "unable to open or read %s"
+msgid "Failed to copy notes from '%s' to '%s'"
msgstr ""
-#: builtin/apply.c:2901
-#, c-format
-msgid "invalid start of line: '%c'"
+#: builtin/am.c:595
+msgid "fseek failed"
msgstr ""
-#: builtin/apply.c:3020
-#, c-format
-msgid "Hunk #%d succeeded at %d (offset %d line)."
-msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/apply.c:3032
+#: builtin/am.c:775
#, c-format
-msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
+msgid "could not parse patch '%s'"
msgstr ""
-#: builtin/apply.c:3038
-#, c-format
-msgid ""
-"while searching for:\n"
-"%.*s"
+#: builtin/am.c:840
+msgid "Only one StGIT patch series can be applied at once"
msgstr ""
-#: builtin/apply.c:3060
-#, c-format
-msgid "missing binary patch data for '%s'"
+#: builtin/am.c:887
+msgid "invalid timestamp"
msgstr ""
-#: builtin/apply.c:3163
-#, c-format
-msgid "binary patch does not apply to '%s'"
+#: builtin/am.c:890 builtin/am.c:898
+msgid "invalid Date line"
msgstr ""
-#: builtin/apply.c:3169
-#, c-format
-msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
+#: builtin/am.c:895
+msgid "invalid timezone offset"
msgstr ""
-#: builtin/apply.c:3190
-#, c-format
-msgid "patch failed: %s:%ld"
+#: builtin/am.c:984
+msgid "Patch format detection failed."
msgstr ""
-#: builtin/apply.c:3314
+#: builtin/am.c:989 builtin/clone.c:379
#, c-format
-msgid "cannot checkout %s"
+msgid "failed to create directory '%s'"
msgstr ""
-#: builtin/apply.c:3370
-#, c-format
-msgid "reading from '%s' beyond a symbolic link"
+#: builtin/am.c:993
+msgid "Failed to split patches."
msgstr ""
-#: builtin/apply.c:3399 builtin/apply.c:3630
-#, c-format
-msgid "path %s has been renamed/deleted"
+#: builtin/am.c:1125 builtin/commit.c:376
+msgid "unable to write index file"
msgstr ""
-#: builtin/apply.c:3482 builtin/apply.c:3644
+#: builtin/am.c:1176
#, c-format
-msgid "%s: does not exist in index"
+msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr ""
-#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658
+#: builtin/am.c:1177
#, c-format
-msgid "%s: %s"
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
-#: builtin/apply.c:3491 builtin/apply.c:3652
+#: builtin/am.c:1178
#, c-format
-msgid "%s: does not match index"
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-#: builtin/apply.c:3597
-msgid "removal patch leaves file contents"
+#: builtin/am.c:1316
+msgid "Patch is empty. Was it split wrong?"
msgstr ""
-#: builtin/apply.c:3669
+#: builtin/am.c:1390 builtin/log.c:1550
#, c-format
-msgid "%s: wrong type"
+msgid "invalid ident line: %s"
msgstr ""
-#: builtin/apply.c:3671
+#: builtin/am.c:1417
#, c-format
-msgid "%s has type %o, expected %o"
+msgid "unable to parse commit %s"
msgstr ""
-#: builtin/apply.c:3822 builtin/apply.c:3824
-#, c-format
-msgid "invalid path '%s'"
+#: builtin/am.c:1610
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-#: builtin/apply.c:3879
-#, c-format
-msgid "%s: already exists in index"
+#: builtin/am.c:1612
+msgid "Using index info to reconstruct a base tree..."
msgstr ""
-#: builtin/apply.c:3882
-#, c-format
-msgid "%s: already exists in working directory"
+#: builtin/am.c:1631
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
msgstr ""
-#: builtin/apply.c:3902
-#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o)"
+#: builtin/am.c:1637
+msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: builtin/apply.c:3907
-#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o) of %s"
+#: builtin/am.c:1662
+msgid "Failed to merge in the changes."
msgstr ""
-#: builtin/apply.c:3927
-#, c-format
-msgid "affected file '%s' is beyond a symbolic link"
+#: builtin/am.c:1686 builtin/merge.c:628
+msgid "git write-tree failed to write a tree"
msgstr ""
-#: builtin/apply.c:3931
-#, c-format
-msgid "%s: patch does not apply"
+#: builtin/am.c:1693
+msgid "applying to an empty history"
msgstr ""
-#: builtin/apply.c:3945
-#, c-format
-msgid "Checking patch %s..."
+#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798
+#: builtin/merge.c:823
+msgid "failed to write commit object"
msgstr ""
-#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/am.c:1739 builtin/am.c:1743
#, c-format
-msgid "make_cache_entry failed for path '%s'"
+msgid "cannot resume: %s does not exist."
msgstr ""
-#: builtin/apply.c:4182
-#, c-format
-msgid "unable to remove %s from index"
+#: builtin/am.c:1759
+msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
-#: builtin/apply.c:4215
-#, c-format
-msgid "corrupt patch for submodule %s"
+#: builtin/am.c:1764
+msgid "Commit Body is:"
msgstr ""
-#: builtin/apply.c:4219
-#, c-format
-msgid "unable to stat newly created file '%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:1774
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
-#: builtin/apply.c:4224
+#: builtin/am.c:1824
#, c-format
-msgid "unable to create backing store for newly created file %s"
+msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
-#: builtin/apply.c:4227 builtin/apply.c:4340
+#: builtin/am.c:1861 builtin/am.c:1933
#, c-format
-msgid "unable to add cache entry for %s"
+msgid "Applying: %.*s"
msgstr ""
-#: builtin/apply.c:4260
-#, c-format
-msgid "closing file '%s'"
+#: builtin/am.c:1877
+msgid "No changes -- Patch already applied."
msgstr ""
-#: builtin/apply.c:4313
+#: builtin/am.c:1885
#, c-format
-msgid "unable to write file '%s' mode %o"
+msgid "Patch failed at %s %.*s"
msgstr ""
-#: builtin/apply.c:4403
+#: builtin/am.c:1891
#, c-format
-msgid "Applied patch %s cleanly."
+msgid "The copy of the patch that failed is found in: %s"
msgstr ""
-#: builtin/apply.c:4411
-msgid "internal error"
+#: builtin/am.c:1936
+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/apply.c:4414
-#, c-format
-msgid "Applying patch %%s with %d reject..."
-msgid_plural "Applying patch %%s with %d rejects..."
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/am.c:1943
+msgid ""
+"You still have unmerged paths in your index.\n"
+"Did you forget to use 'git add'?"
+msgstr ""
-#: builtin/apply.c:4424
+#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
+#: builtin/reset.c:316
#, c-format
-msgid "truncating .rej filename to %.*s.rej"
+msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/apply.c:4432
-#, c-format
-msgid "cannot open %s: %s"
+#: builtin/am.c:2103
+msgid "failed to clean index"
msgstr ""
-#: builtin/apply.c:4445
-#, c-format
-msgid "Hunk #%d applied cleanly."
+#: builtin/am.c:2137
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
msgstr ""
-#: builtin/apply.c:4448
+#: builtin/am.c:2200
#, c-format
-msgid "Rejected hunk #%d."
+msgid "Invalid value for --patch-format: %s"
msgstr ""
-#: builtin/apply.c:4537
-#, c-format
-msgid "Skipped patch '%s'."
+#: builtin/am.c:2233
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr ""
-#: builtin/apply.c:4545
-msgid "unrecognized input"
+#: builtin/am.c:2234
+msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr ""
-#: builtin/apply.c:4556
-msgid "unable to read index file"
+#: builtin/am.c:2240
+msgid "run interactively"
msgstr ""
-#: builtin/apply.c:4701
-msgid "--3way outside a repository"
+#: builtin/am.c:2242
+msgid "historical option -- no-op"
msgstr ""
-#: builtin/apply.c:4709
-msgid "--index outside a repository"
+#: builtin/am.c:2244
+msgid "allow fall back on 3way merging if needed"
msgstr ""
-#: builtin/apply.c:4712
-msgid "--cached outside a repository"
+#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
+#: builtin/repack.c:172
+msgid "be quiet"
msgstr ""
-#: builtin/apply.c:4745
-#, c-format
-msgid "can't open patch '%s'"
+#: builtin/am.c:2247
+msgid "add a Signed-off-by line to the commit message"
msgstr ""
-#: builtin/apply.c:4760
-#, c-format
-msgid "squelched %d whitespace error"
-msgid_plural "squelched %d whitespace errors"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/am.c:2250
+msgid "recode into utf8 (default)"
+msgstr ""
-#: builtin/apply.c:4766 builtin/apply.c:4776
-#, c-format
-msgid "%d line adds whitespace errors."
-msgid_plural "%d lines add whitespace errors."
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/am.c:2252
+msgid "pass -k flag to git-mailinfo"
+msgstr ""
-#: builtin/apply.c:4800
-msgid "don't apply changes matching the given path"
+#: builtin/am.c:2254
+msgid "pass -b flag to git-mailinfo"
msgstr ""
-#: builtin/apply.c:4803
-msgid "apply changes matching the given path"
+#: builtin/am.c:2256
+msgid "pass -m flag to git-mailinfo"
msgstr ""
-#: builtin/apply.c:4806
-msgid "remove <num> leading slashes from traditional diff paths"
+#: builtin/am.c:2258
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
-#: builtin/apply.c:4809
-msgid "ignore additions made by the patch"
+#: builtin/am.c:2261
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-#: builtin/apply.c:4811
-msgid "instead of applying the patch, output diffstat for the input"
+#: builtin/am.c:2264
+msgid "strip everything before a scissors line"
msgstr ""
-#: builtin/apply.c:4815
-msgid "show number of added and deleted lines in decimal notation"
+#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
+#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
+#: builtin/am.c:2293
+msgid "pass it through git-apply"
msgstr ""
-#: builtin/apply.c:4817
-msgid "instead of applying the patch, output a summary for the input"
+#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
+#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135
+#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185
+#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
+msgid "n"
msgstr ""
-#: builtin/apply.c:4819
-msgid "instead of applying the patch, see if the patch is applicable"
+#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/tag.c:372
+msgid "format"
msgstr ""
-#: builtin/apply.c:4821
-msgid "make sure the patch is applicable to the current index"
+#: builtin/am.c:2290
+msgid "format the patch(es) are in"
msgstr ""
-#: builtin/apply.c:4823
-msgid "apply a patch without touching the working tree"
+#: builtin/am.c:2296
+msgid "override error message when patch failure occurs"
msgstr ""
-#: builtin/apply.c:4825
-msgid "accept a patch that touches outside the working area"
+#: builtin/am.c:2298
+msgid "continue applying patches after resolving a conflict"
msgstr ""
-#: builtin/apply.c:4827
-msgid "also apply the patch (use with --stat/--summary/--check)"
+#: builtin/am.c:2301
+msgid "synonyms for --continue"
msgstr ""
-#: builtin/apply.c:4829
-msgid "attempt three-way merge if a patch does not apply"
+#: builtin/am.c:2304
+msgid "skip the current patch"
msgstr ""
-#: builtin/apply.c:4831
-msgid "build a temporary index based on embedded index information"
+#: builtin/am.c:2307
+msgid "restore the original branch and abort the patching operation."
msgstr ""
-#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426
-msgid "paths are separated with NUL character"
+#: builtin/am.c:2311
+msgid "lie about committer date"
msgstr ""
-#: builtin/apply.c:4836
-msgid "ensure at least <n> lines of context match"
+#: builtin/am.c:2313
+msgid "use current timestamp for author date"
msgstr ""
-#: builtin/apply.c:4838
-msgid "detect new or modified lines that have whitespace errors"
+#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229
+#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355
+msgid "key-id"
msgstr ""
-#: builtin/apply.c:4841 builtin/apply.c:4844
-msgid "ignore changes in whitespace when finding context"
+#: builtin/am.c:2316
+msgid "GPG-sign commits"
msgstr ""
-#: builtin/apply.c:4847
-msgid "apply the patch in reverse"
+#: builtin/am.c:2319
+msgid "(internal use for git-rebase)"
msgstr ""
-#: builtin/apply.c:4849
-msgid "don't expect at least one line of context"
+#: builtin/am.c:2334
+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/apply.c:4851
-msgid "leave the rejected hunks in corresponding *.rej files"
+#: builtin/am.c:2341
+msgid "failed to read the index"
msgstr ""
-#: builtin/apply.c:4853
-msgid "allow overlapping hunks"
+#: builtin/am.c:2356
+#, c-format
+msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
-#: builtin/apply.c:4856
-msgid "tolerate incorrectly detected missing new-line at the end of file"
+#: builtin/am.c:2380
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
msgstr ""
-#: builtin/apply.c:4859
-msgid "do not trust the line counts in the hunk headers"
+#: builtin/am.c:2386
+msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
-#: builtin/apply.c:4862
-msgid "prepend <root> to all filenames"
+#: builtin/apply.c:8
+msgid "git apply [<options>] [<patch>...]"
msgstr ""
#: builtin/archive.c:17
msgid "Blaming lines"
msgstr ""
-#: builtin/blame.c:2536
+#: builtin/blame.c:2577
msgid "Show blame entries as we find them, incrementally"
msgstr ""
-#: builtin/blame.c:2537
+#: builtin/blame.c:2578
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
-#: builtin/blame.c:2538
+#: builtin/blame.c:2579
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
-#: builtin/blame.c:2539
+#: builtin/blame.c:2580
msgid "Show work cost statistics"
msgstr ""
-#: builtin/blame.c:2540
+#: builtin/blame.c:2581
msgid "Force progress reporting"
msgstr ""
-#: builtin/blame.c:2541
+#: builtin/blame.c:2582
msgid "Show output score for blame entries"
msgstr ""
-#: builtin/blame.c:2542
+#: builtin/blame.c:2583
msgid "Show original filename (Default: auto)"
msgstr ""
-#: builtin/blame.c:2543
+#: builtin/blame.c:2584
msgid "Show original linenumber (Default: off)"
msgstr ""
-#: builtin/blame.c:2544
+#: builtin/blame.c:2585
msgid "Show in a format designed for machine consumption"
msgstr ""
-#: builtin/blame.c:2545
+#: builtin/blame.c:2586
msgid "Show porcelain format with per-line commit information"
msgstr ""
-#: builtin/blame.c:2546
+#: builtin/blame.c:2587
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
-#: builtin/blame.c:2547
+#: builtin/blame.c:2588
msgid "Show raw timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:2548
+#: builtin/blame.c:2589
msgid "Show long commit SHA1 (Default: off)"
msgstr ""
-#: builtin/blame.c:2549
+#: builtin/blame.c:2590
msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:2550
+#: builtin/blame.c:2591
msgid "Show author email instead of name (Default: off)"
msgstr ""
-#: builtin/blame.c:2551
+#: builtin/blame.c:2592
msgid "Ignore whitespace differences"
msgstr ""
-#: builtin/blame.c:2552
+#: builtin/blame.c:2599
+msgid "Use an experimental indent-based heuristic to improve diffs"
+msgstr ""
+
+#: builtin/blame.c:2600
+msgid "Use an experimental blank-line-based heuristic to improve diffs"
+msgstr ""
+
+#: builtin/blame.c:2602
msgid "Spend extra cycles to find better match"
msgstr ""
-#: builtin/blame.c:2553
+#: builtin/blame.c:2603
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
-#: builtin/blame.c:2554
+#: builtin/blame.c:2604
msgid "Use <file>'s contents as the final image"
msgstr ""
-#: builtin/blame.c:2555 builtin/blame.c:2556
+#: builtin/blame.c:2605 builtin/blame.c:2606
msgid "score"
msgstr ""
-#: builtin/blame.c:2555
+#: builtin/blame.c:2605
msgid "Find line copies within and across files"
msgstr ""
-#: builtin/blame.c:2556
+#: builtin/blame.c:2606
msgid "Find line movements within and across files"
msgstr ""
-#: builtin/blame.c:2557
+#: builtin/blame.c:2607
msgid "n,m"
msgstr ""
-#: builtin/blame.c:2557
+#: builtin/blame.c:2607
msgid "Process only line range n,m, counting from 1"
msgstr ""
+#: builtin/blame.c:2654
+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:2649
+#: builtin/blame.c:2700
msgid "4 years, 11 months ago"
msgstr ""
+#: builtin/blame.c:2780
+msgid "--contents and --reverse do not blend well."
+msgstr ""
+
+#: builtin/blame.c:2800
+msgid "cannot use --contents with final commit object name"
+msgstr ""
+
+#: builtin/blame.c:2805
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr ""
+
+#: builtin/blame.c:2832
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
+msgstr ""
+
+#: builtin/blame.c:2843
+#, c-format
+msgid "no such path %s in %s"
+msgstr ""
+
+#: builtin/blame.c:2854
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr ""
+
+#: builtin/blame.c:2873
+#, c-format
+msgid "file %s has only %lu line"
+msgid_plural "file %s has only %lu lines"
+msgstr[0] ""
+msgstr[1] ""
+
#: builtin/branch.c:26
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr ""
msgid "change the upstream info"
msgstr ""
+#: builtin/branch.c:660
+msgid "Unset the upstream info"
+msgstr ""
+
#: builtin/branch.c:661
msgid "use colored output"
msgstr ""
msgid "field name to sort on"
msgstr ""
-#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402
-#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404
+#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570
#: builtin/tag.c:369
msgid "object"
msgstr ""
msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: builtin/branch.c:709 builtin/clone.c:707
+#: builtin/branch.c:709 builtin/clone.c:706
msgid "HEAD not found below refs/heads!"
msgstr ""
msgid "Need a repository to unbundle."
msgstr ""
-#: builtin/cat-file.c:443
+#: builtin/cat-file.c:513
msgid ""
-"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
-"<type>|--textconv) <object>"
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <type> | --textconv | --filters) [--path=<path>] <object>"
msgstr ""
-#: builtin/cat-file.c:444
-msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
+#: builtin/cat-file.c:514
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
msgstr ""
-#: builtin/cat-file.c:481
+#: builtin/cat-file.c:551
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
-#: builtin/cat-file.c:482
+#: builtin/cat-file.c:552
msgid "show object type"
msgstr ""
-#: builtin/cat-file.c:483
+#: builtin/cat-file.c:553
msgid "show object size"
msgstr ""
-#: builtin/cat-file.c:485
+#: builtin/cat-file.c:555
msgid "exit with zero when there's no error"
msgstr ""
-#: builtin/cat-file.c:486
+#: builtin/cat-file.c:556
msgid "pretty-print object's content"
msgstr ""
-#: builtin/cat-file.c:488
+#: builtin/cat-file.c:558
msgid "for blob objects, run textconv on object's content"
msgstr ""
-#: builtin/cat-file.c:490
+#: builtin/cat-file.c:560
+msgid "for blob objects, run filters on object's content"
+msgstr ""
+
+#: builtin/cat-file.c:561 git-submodule.sh:923
+msgid "blob"
+msgstr ""
+
+#: builtin/cat-file.c:562
+msgid "use a specific path for --textconv/--filters"
+msgstr ""
+
+#: builtin/cat-file.c:564
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr ""
-#: builtin/cat-file.c:491
+#: builtin/cat-file.c:565
msgid "buffer --batch output"
msgstr ""
-#: builtin/cat-file.c:493
+#: builtin/cat-file.c:567
msgid "show info and content of objects fed from the standard input"
msgstr ""
-#: builtin/cat-file.c:496
+#: builtin/cat-file.c:570
msgid "show info about objects fed from the standard input"
msgstr ""
-#: builtin/cat-file.c:499
+#: builtin/cat-file.c:573
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
-#: builtin/cat-file.c:501
+#: builtin/cat-file.c:575
msgid "show all objects with --batch or --batch-check"
msgstr ""
msgid "use .gitattributes only from the index"
msgstr ""
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97
+#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
msgid "read file names from stdin"
msgstr ""
msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr ""
msgstr ""
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491
-#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497
-#: builtin/submodule--helper.c:830 builtin/worktree.c:469
+#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598
+#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951
+#: builtin/worktree.c:469
msgid "string"
msgstr ""
msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/checkout.c:495
+#: builtin/checkout.c:494
msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/checkout.c:625
+#: builtin/checkout.c:624
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr ""
-#: builtin/checkout.c:664
+#: builtin/checkout.c:663
msgid "HEAD is now at"
msgstr ""
-#: builtin/checkout.c:668 builtin/clone.c:661
+#: builtin/checkout.c:667 builtin/clone.c:660
msgid "unable to update HEAD"
msgstr ""
-#: builtin/checkout.c:672
+#: builtin/checkout.c:671
#, c-format
msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:675
+#: builtin/checkout.c:674
#, c-format
msgid "Already on '%s'\n"
msgstr ""
-#: builtin/checkout.c:679
+#: builtin/checkout.c:678
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:681 builtin/checkout.c:1070
+#: builtin/checkout.c:680 builtin/checkout.c:1069
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:683
+#: builtin/checkout.c:682
#, c-format
msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:734
+#: builtin/checkout.c:733
#, c-format
msgid " ... and %d more.\n"
msgstr ""
-#: builtin/checkout.c:740
+#: builtin/checkout.c:739
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:759
+#: builtin/checkout.c:758
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:795
+#: builtin/checkout.c:794
msgid "internal error in revision walk"
msgstr ""
-#: builtin/checkout.c:799
+#: builtin/checkout.c:798
msgid "Previous HEAD position was"
msgstr ""
-#: builtin/checkout.c:826 builtin/checkout.c:1065
+#: builtin/checkout.c:825 builtin/checkout.c:1064
msgid "You are on a branch yet to be born"
msgstr ""
-#: builtin/checkout.c:971
+#: builtin/checkout.c:970
#, c-format
msgid "only one reference expected, %d given."
msgstr ""
-#: builtin/checkout.c:1011 builtin/worktree.c:214
+#: builtin/checkout.c:1010 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr ""
-#: builtin/checkout.c:1040
+#: builtin/checkout.c:1039
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/checkout.c:1079
+#: builtin/checkout.c:1078
msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1082 builtin/checkout.c:1086
+#: builtin/checkout.c:1081 builtin/checkout.c:1085
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097
+#: builtin/checkout.c:1100
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1105
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/checkout.c:1139 builtin/checkout.c:1141 builtin/clone.c:88
+#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93
#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
#: builtin/worktree.c:326
msgid "branch"
msgstr ""
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1139
msgid "create and checkout a new branch"
msgstr ""
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1141
msgid "create/reset and checkout a branch"
msgstr ""
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1142
msgid "create reflog for new branch"
msgstr ""
-#: builtin/checkout.c:1144 builtin/worktree.c:328
+#: builtin/checkout.c:1143 builtin/worktree.c:328
msgid "detach HEAD at named commit"
msgstr ""
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
msgid "set upstream info for new branch"
msgstr ""
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1146
msgid "new-branch"
msgstr ""
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1146
msgid "new unparented branch"
msgstr ""
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1147
msgid "checkout our version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1149
msgid "checkout their version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1151
msgid "force checkout (throw away local modifications)"
msgstr ""
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1152
msgid "perform a 3-way merge with the new branch"
msgstr ""
-#: builtin/checkout.c:1154 builtin/merge.c:231
+#: builtin/checkout.c:1153 builtin/merge.c:231
msgid "update ignored files (default)"
msgstr ""
-#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250
+#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251
msgid "style"
msgstr ""
-#: builtin/checkout.c:1156
+#: builtin/checkout.c:1155
msgid "conflict style (merge or diff3)"
msgstr ""
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1158
msgid "do not limit pathspecs to sparse entries only"
msgstr ""
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1160
msgid "second guess 'git checkout <no-such-branch>'"
msgstr ""
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1162
msgid "do not check if another worktree is holding the given ref"
msgstr ""
-#: builtin/checkout.c:1164 builtin/clone.c:60 builtin/fetch.c:117
-#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536
+#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119
+#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr ""
-#: builtin/checkout.c:1195
+#: builtin/checkout.c:1194
msgid "-b, -B and --orphan are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1212
+#: builtin/checkout.c:1211
msgid "--track needs a branch name"
msgstr ""
-#: builtin/checkout.c:1217
+#: builtin/checkout.c:1216
msgid "Missing branch name; try -b"
msgstr ""
-#: builtin/checkout.c:1253
+#: builtin/checkout.c:1252
msgid "invalid path specification"
msgstr ""
-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1259
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
"Did you intend to checkout '%s' which can not be resolved as commit?"
msgstr ""
-#: builtin/checkout.c:1265
+#: builtin/checkout.c:1264
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/checkout.c:1269
+#: builtin/checkout.c:1268
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgid "remove whole directories"
msgstr ""
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
-#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725
+#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182
msgid "pattern"
msgstr ""
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr ""
-#: builtin/clone.c:62
+#: builtin/clone.c:65
msgid "don't create a checkout"
msgstr ""
-#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476
+#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
msgid "create a bare repository"
msgstr ""
-#: builtin/clone.c:67
+#: builtin/clone.c:70
msgid "create a mirror repository (implies bare)"
msgstr ""
-#: builtin/clone.c:69
+#: builtin/clone.c:72
msgid "to clone from a local repository"
msgstr ""
-#: builtin/clone.c:71
+#: builtin/clone.c:74
msgid "don't use local hardlinks, always copy"
msgstr ""
-#: builtin/clone.c:73
+#: builtin/clone.c:76
msgid "setup as shared repository"
msgstr ""
-#: builtin/clone.c:75 builtin/clone.c:77
+#: builtin/clone.c:78 builtin/clone.c:80
msgid "initialize submodules in the clone"
msgstr ""
-#: builtin/clone.c:79
+#: builtin/clone.c:82
msgid "number of submodules cloned in parallel"
msgstr ""
-#: builtin/clone.c:80 builtin/init-db.c:473
+#: builtin/clone.c:83 builtin/init-db.c:475
msgid "template-directory"
msgstr ""
-#: builtin/clone.c:81 builtin/init-db.c:474
+#: builtin/clone.c:84 builtin/init-db.c:476
msgid "directory from which templates will be used"
msgstr ""
-#: builtin/clone.c:83 builtin/submodule--helper.c:495
-#: builtin/submodule--helper.c:833
+#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602
+#: builtin/submodule--helper.c:954
msgid "reference repository"
msgstr ""
-#: builtin/clone.c:85
+#: builtin/clone.c:90
msgid "use --reference only while cloning"
msgstr ""
-#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr ""
-#: builtin/clone.c:87
+#: builtin/clone.c:92
msgid "use <name> instead of 'origin' to track upstream"
msgstr ""
-#: builtin/clone.c:89
+#: builtin/clone.c:94
msgid "checkout <branch> instead of the remote's HEAD"
msgstr ""
-#: builtin/clone.c:91
+#: builtin/clone.c:96
msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667
-#: builtin/pull.c:201
+#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668
+#: builtin/pull.c:202
msgid "depth"
msgstr ""
-#: builtin/clone.c:93
+#: builtin/clone.c:98
msgid "create a shallow clone of that depth"
msgstr ""
-#: builtin/clone.c:95
+#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848
+#: parse-options.h:142
+msgid "time"
+msgstr ""
+
+#: builtin/clone.c:100
+msgid "create a shallow clone since a specific time"
+msgstr ""
+
+#: builtin/clone.c:101 builtin/fetch.c:124
+msgid "revision"
+msgstr ""
+
+#: builtin/clone.c:102 builtin/fetch.c:125
+msgid "deepen history of shallow clone by excluding rev"
+msgstr ""
+
+#: builtin/clone.c:104
msgid "clone only one branch, HEAD or --branch"
msgstr ""
-#: builtin/clone.c:97
+#: builtin/clone.c:106
msgid "any cloned submodules will be shallow"
msgstr ""
-#: builtin/clone.c:98 builtin/init-db.c:482
+#: builtin/clone.c:107 builtin/init-db.c:484
msgid "gitdir"
msgstr ""
-#: builtin/clone.c:99 builtin/init-db.c:483
+#: builtin/clone.c:108 builtin/init-db.c:485
msgid "separate git dir from working tree"
msgstr ""
-#: builtin/clone.c:100
+#: builtin/clone.c:109
msgid "key=value"
msgstr ""
-#: builtin/clone.c:101
+#: builtin/clone.c:110
msgid "set config inside the new repository"
msgstr ""
-#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547
+#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547
msgid "use IPv4 addresses only"
msgstr ""
-#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549
+#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549
msgid "use IPv6 addresses only"
msgstr ""
-#: builtin/clone.c:241
+#: builtin/clone.c:250
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
msgstr ""
-#: builtin/clone.c:307
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr ""
-
-#: builtin/clone.c:309
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr ""
-
-#: builtin/clone.c:314
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr ""
-
-#: builtin/clone.c:317
+#: builtin/clone.c:303
#, c-format
-msgid "reference repository '%s' is grafted"
+msgid "info: Could not add alternate for '%s': %s\n"
msgstr ""
-#: builtin/clone.c:376
+#: builtin/clone.c:375
#, c-format
msgid "failed to open '%s'"
msgstr ""
-#: builtin/clone.c:384
+#: builtin/clone.c:383
#, c-format
msgid "%s exists and is not a directory"
msgstr ""
-#: builtin/clone.c:398
+#: builtin/clone.c:397
#, c-format
msgid "failed to stat %s\n"
msgstr ""
-#: builtin/clone.c:420
+#: builtin/clone.c:419
#, c-format
msgid "failed to create link '%s'"
msgstr ""
-#: builtin/clone.c:424
+#: builtin/clone.c:423
#, c-format
msgid "failed to copy file to '%s'"
msgstr ""
-#: builtin/clone.c:449
+#: builtin/clone.c:448
#, c-format
msgid "done.\n"
msgstr ""
-#: builtin/clone.c:461
+#: builtin/clone.c:460
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"and retry the checkout with 'git checkout -f HEAD'\n"
msgstr ""
-#: builtin/clone.c:538
+#: builtin/clone.c:537
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
-#: builtin/clone.c:633
+#: builtin/clone.c:632
msgid "remote did not send all necessary objects"
msgstr ""
-#: builtin/clone.c:649
+#: builtin/clone.c:648
#, c-format
msgid "unable to update %s"
msgstr ""
-#: builtin/clone.c:698
+#: builtin/clone.c:697
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-#: builtin/clone.c:729
+#: builtin/clone.c:728
msgid "unable to checkout working tree"
msgstr ""
-#: builtin/clone.c:766
+#: builtin/clone.c:768
msgid "unable to write parameters to config file"
msgstr ""
-#: builtin/clone.c:829
+#: builtin/clone.c:831
msgid "cannot repack to clean up"
msgstr ""
-#: builtin/clone.c:831
+#: builtin/clone.c:833
msgid "cannot unlink temporary alternates file"
msgstr ""
-#: builtin/clone.c:863 builtin/receive-pack.c:1855
+#: builtin/clone.c:866 builtin/receive-pack.c:1895
msgid "Too many arguments."
msgstr ""
-#: builtin/clone.c:867
+#: builtin/clone.c:870
msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/clone.c:878
+#: builtin/clone.c:883
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/clone.c:881
+#: builtin/clone.c:886
msgid "--bare and --separate-git-dir are incompatible."
msgstr ""
-#: builtin/clone.c:894
+#: builtin/clone.c:899
#, c-format
msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/clone.c:900 builtin/fetch.c:1293
+#: builtin/clone.c:905 builtin/fetch.c:1338
#, c-format
msgid "depth %s is not a positive number"
msgstr ""
-#: builtin/clone.c:910
+#: builtin/clone.c:915
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/clone.c:920
+#: builtin/clone.c:925
#, c-format
msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544
+#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657
#: builtin/worktree.c:222 builtin/worktree.c:249
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/clone.c:938
+#: builtin/clone.c:943
#, c-format
msgid "could not create work tree dir '%s'"
msgstr ""
-#: builtin/clone.c:956
+#: builtin/clone.c:955
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/clone.c:958
+#: builtin/clone.c:957
#, c-format
msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/clone.c:997
+#: builtin/clone.c:963
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
+msgstr ""
+
+#: builtin/clone.c:1019
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1000
+#: builtin/clone.c:1021
+msgid "--shallow-since is ignored in local clones; use file:// instead."
+msgstr ""
+
+#: builtin/clone.c:1023
+msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+msgstr ""
+
+#: builtin/clone.c:1026
msgid "source repository is shallow, ignoring --local"
msgstr ""
-#: builtin/clone.c:1005
+#: builtin/clone.c:1031
msgid "--local is ignored"
msgstr ""
-#: builtin/clone.c:1009
+#: builtin/clone.c:1035
#, c-format
msgid "Don't know how to clone %s"
msgstr ""
-#: builtin/clone.c:1058 builtin/clone.c:1066
+#: builtin/clone.c:1090 builtin/clone.c:1098
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/clone.c:1069
+#: builtin/clone.c:1101
msgid "You appear to have cloned an empty repository."
msgstr ""
"the remaining commits.\n"
msgstr ""
-#: builtin/commit.c:308
+#: builtin/commit.c:318
msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/commit.c:349
+#: builtin/commit.c:359
msgid "unable to create temporary index"
msgstr ""
-#: builtin/commit.c:355
+#: builtin/commit.c:365
msgid "interactive add failed"
msgstr ""
-#: builtin/commit.c:368
+#: builtin/commit.c:378
msgid "unable to update temporary index"
msgstr ""
-#: builtin/commit.c:370
+#: builtin/commit.c:380
msgid "Failed to update main cache tree"
msgstr ""
-#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466
+#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
msgid "unable to write new_index file"
msgstr ""
-#: builtin/commit.c:448
+#: builtin/commit.c:458
msgid "cannot do a partial commit during a merge."
msgstr ""
-#: builtin/commit.c:450
+#: builtin/commit.c:460
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
-#: builtin/commit.c:459
+#: builtin/commit.c:469
msgid "cannot read the index"
msgstr ""
-#: builtin/commit.c:478
+#: builtin/commit.c:488
msgid "unable to write temporary index file"
msgstr ""
-#: builtin/commit.c:583
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr ""
-#: builtin/commit.c:585
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr ""
-#: builtin/commit.c:604
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr ""
-#: builtin/commit.c:612
+#: builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr ""
-#: builtin/commit.c:656
+#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr ""
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
#, c-format
msgid "could not lookup commit %s"
msgstr ""
-#: builtin/commit.c:705 builtin/shortlog.c:286
+#: builtin/commit.c:704 builtin/shortlog.c:286
#, c-format
msgid "(reading log message from standard input)\n"
msgstr ""
-#: builtin/commit.c:707
+#: builtin/commit.c:706
msgid "could not read log from standard input"
msgstr ""
-#: builtin/commit.c:711
+#: builtin/commit.c:710
#, c-format
msgid "could not read log file '%s'"
msgstr ""
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:737 builtin/commit.c:745
msgid "could not read SQUASH_MSG"
msgstr ""
-#: builtin/commit.c:743
+#: builtin/commit.c:742
msgid "could not read MERGE_MSG"
msgstr ""
-#: builtin/commit.c:797
+#: builtin/commit.c:796
msgid "could not write commit template"
msgstr ""
-#: builtin/commit.c:815
+#: builtin/commit.c:814
#, c-format
msgid ""
"\n"
"and try again.\n"
msgstr ""
-#: builtin/commit.c:820
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
"and try again.\n"
msgstr ""
-#: builtin/commit.c:833
+#: builtin/commit.c:832
#, 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:840
+#: builtin/commit.c:839
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"An empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:860
+#: builtin/commit.c:859
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:868
+#: builtin/commit.c:867
#, c-format
msgid "%sDate: %s"
msgstr ""
-#: builtin/commit.c:875
+#: builtin/commit.c:874
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:893
+#: builtin/commit.c:892
msgid "Cannot read index"
msgstr ""
-#: builtin/commit.c:950
+#: builtin/commit.c:954
msgid "Error building trees"
msgstr ""
-#: builtin/commit.c:965 builtin/tag.c:266
+#: builtin/commit.c:969 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
-#: builtin/commit.c:1067
+#: builtin/commit.c:1071
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
-#: builtin/commit.c:1082 builtin/commit.c:1322
+#: builtin/commit.c:1086 builtin/commit.c:1327
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/commit.c:1119
+#: builtin/commit.c:1124
msgid "--long and -z are incompatible"
msgstr ""
-#: builtin/commit.c:1149
+#: builtin/commit.c:1154
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/commit.c:1158
+#: builtin/commit.c:1163
msgid "You have nothing to amend."
msgstr ""
-#: builtin/commit.c:1161
+#: builtin/commit.c:1166
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/commit.c:1163
+#: builtin/commit.c:1168
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/commit.c:1166
+#: builtin/commit.c:1171
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/commit.c:1176
+#: builtin/commit.c:1181
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/commit.c:1178
+#: builtin/commit.c:1183
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr ""
-#: builtin/commit.c:1186
+#: builtin/commit.c:1191
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/commit.c:1203
+#: builtin/commit.c:1208
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/commit.c:1205
+#: builtin/commit.c:1210
msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/commit.c:1207
+#: builtin/commit.c:1212
msgid "Clever... amending the last one with dirty index."
msgstr ""
-#: builtin/commit.c:1209
+#: builtin/commit.c:1214
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr ""
-#: builtin/commit.c:1221 builtin/tag.c:474
+#: builtin/commit.c:1226 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
-#: builtin/commit.c:1226
+#: builtin/commit.c:1231
msgid "Paths with -a does not make sense."
msgstr ""
-#: builtin/commit.c:1336 builtin/commit.c:1622
+#: builtin/commit.c:1341 builtin/commit.c:1617
msgid "show status concisely"
msgstr ""
-#: builtin/commit.c:1338 builtin/commit.c:1624
+#: builtin/commit.c:1343 builtin/commit.c:1619
msgid "show branch information"
msgstr ""
-#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522
+#: builtin/commit.c:1345
+msgid "version"
+msgstr ""
+
+#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522
#: builtin/worktree.c:440
msgid "machine-readable output"
msgstr ""
-#: builtin/commit.c:1343 builtin/commit.c:1628
+#: builtin/commit.c:1348 builtin/commit.c:1623
msgid "show status in long format (default)"
msgstr ""
-#: builtin/commit.c:1346 builtin/commit.c:1631
+#: builtin/commit.c:1351 builtin/commit.c:1626
msgid "terminate entries with NUL"
msgstr ""
-#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981
+#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr ""
-#: builtin/commit.c:1349 builtin/commit.c:1634
+#: builtin/commit.c:1354 builtin/commit.c:1629
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#: builtin/commit.c:1352
+#: builtin/commit.c:1357
msgid "show ignored files"
msgstr ""
-#: builtin/commit.c:1353 parse-options.h:155
+#: builtin/commit.c:1358 parse-options.h:155
msgid "when"
msgstr ""
-#: builtin/commit.c:1354
+#: builtin/commit.c:1359
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
-#: builtin/commit.c:1356
+#: builtin/commit.c:1361
msgid "list untracked files in columns"
msgstr ""
-#: builtin/commit.c:1442
+#: builtin/commit.c:1437
msgid "couldn't look up newly created commit"
msgstr ""
-#: builtin/commit.c:1444
+#: builtin/commit.c:1439
msgid "could not parse newly created commit"
msgstr ""
-#: builtin/commit.c:1489
+#: builtin/commit.c:1484
msgid "detached HEAD"
msgstr ""
-#: builtin/commit.c:1492
+#: builtin/commit.c:1487
msgid " (root-commit)"
msgstr ""
-#: builtin/commit.c:1592
+#: builtin/commit.c:1587
msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/commit.c:1593
+#: builtin/commit.c:1588
msgid "show diff in commit message template"
msgstr ""
-#: builtin/commit.c:1595
+#: builtin/commit.c:1590
msgid "Commit message options"
msgstr ""
-#: builtin/commit.c:1596 builtin/tag.c:351
+#: builtin/commit.c:1591 builtin/tag.c:351
msgid "read message from file"
msgstr ""
-#: builtin/commit.c:1597
+#: builtin/commit.c:1592
msgid "author"
msgstr ""
-#: builtin/commit.c:1597
+#: builtin/commit.c:1592
msgid "override author for commit"
msgstr ""
-#: builtin/commit.c:1598 builtin/gc.c:326
+#: builtin/commit.c:1593 builtin/gc.c:326
msgid "date"
msgstr ""
-#: builtin/commit.c:1598
+#: builtin/commit.c:1593
msgid "override date for commit"
msgstr ""
-#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396
-#: builtin/notes.c:559 builtin/tag.c:349
+#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398
+#: builtin/notes.c:561 builtin/tag.c:349
msgid "message"
msgstr ""
-#: builtin/commit.c:1599
+#: builtin/commit.c:1594
msgid "commit message"
msgstr ""
-#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602
-#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
+#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79
msgid "commit"
msgstr ""
-#: builtin/commit.c:1600
+#: builtin/commit.c:1595
msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/commit.c:1601
+#: builtin/commit.c:1596
msgid "reuse message from specified commit"
msgstr ""
-#: builtin/commit.c:1602
+#: builtin/commit.c:1597
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
-#: builtin/commit.c:1603
+#: builtin/commit.c:1598
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/commit.c:1604
+#: builtin/commit.c:1599
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/commit.c:1605 builtin/log.c:1409 builtin/revert.c:86
+#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr ""
-#: builtin/commit.c:1606
+#: builtin/commit.c:1601
msgid "use specified template file"
msgstr ""
-#: builtin/commit.c:1607
+#: builtin/commit.c:1602
msgid "force edit of commit"
msgstr ""
-#: builtin/commit.c:1608
+#: builtin/commit.c:1603
msgid "default"
msgstr ""
-#: builtin/commit.c:1608 builtin/tag.c:354
+#: builtin/commit.c:1603 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr ""
-#: builtin/commit.c:1609
+#: builtin/commit.c:1604
msgid "include status in commit message template"
msgstr ""
-#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165
+#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr ""
-#: builtin/commit.c:1614
+#: builtin/commit.c:1609
msgid "Commit contents options"
msgstr ""
-#: builtin/commit.c:1615
+#: builtin/commit.c:1610
msgid "commit all changed files"
msgstr ""
-#: builtin/commit.c:1616
+#: builtin/commit.c:1611
msgid "add specified files to index for commit"
msgstr ""
-#: builtin/commit.c:1617
+#: builtin/commit.c:1612
msgid "interactively add files"
msgstr ""
-#: builtin/commit.c:1618
+#: builtin/commit.c:1613
msgid "interactively add changes"
msgstr ""
-#: builtin/commit.c:1619
+#: builtin/commit.c:1614
msgid "commit only specified files"
msgstr ""
-#: builtin/commit.c:1620
+#: builtin/commit.c:1615
msgid "bypass pre-commit and commit-msg hooks"
msgstr ""
-#: builtin/commit.c:1621
+#: builtin/commit.c:1616
msgid "show what would be committed"
msgstr ""
-#: builtin/commit.c:1632
+#: builtin/commit.c:1627
msgid "amend previous commit"
msgstr ""
-#: builtin/commit.c:1633
+#: builtin/commit.c:1628
msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/commit.c:1638
+#: builtin/commit.c:1633
msgid "ok to record an empty change"
msgstr ""
-#: builtin/commit.c:1640
+#: builtin/commit.c:1635
msgid "ok to record a change with an empty message"
msgstr ""
-#: builtin/commit.c:1669
+#: builtin/commit.c:1664
msgid "could not parse HEAD commit"
msgstr ""
-#: builtin/commit.c:1719
+#: builtin/commit.c:1712
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/commit.c:1726
+#: builtin/commit.c:1719
msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/commit.c:1745
+#: builtin/commit.c:1738
#, c-format
msgid "could not read commit message: %s"
msgstr ""
-#: builtin/commit.c:1756
+#: builtin/commit.c:1749
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/commit.c:1761
+#: builtin/commit.c:1754
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/commit.c:1809
+#: builtin/commit.c:1802
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
msgid "cannot create configuration file %s"
msgstr ""
-#: builtin/count-objects.c:77
+#: builtin/config.c:625
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+" Use a regexp, --add or --replace-all to change %s."
+msgstr ""
+
+#: builtin/count-objects.c:86
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr ""
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:96
msgid "print sizes in human readable format"
msgstr ""
msgid "only consider tags matching <pattern>"
msgstr ""
-#: builtin/describe.c:410 builtin/name-rev.c:321
+#: builtin/describe.c:410 builtin/name-rev.c:320
msgid "show abbreviated commit object as fallback"
msgstr ""
msgid "invalid option: %s"
msgstr ""
-#: builtin/diff.c:360
+#: builtin/diff.c:361
msgid "Not a git repository"
msgstr ""
-#: builtin/diff.c:403
+#: builtin/diff.c:404
#, c-format
msgid "invalid object '%s' given."
msgstr ""
-#: builtin/diff.c:412
+#: builtin/diff.c:413
#, c-format
msgid "more than two blobs given: '%s'"
msgstr ""
-#: builtin/diff.c:419
+#: builtin/diff.c:420
#, c-format
msgid "unhandled object '%s' given."
msgstr ""
msgid "git fetch --all [<options>]"
msgstr ""
-#: builtin/fetch.c:93 builtin/pull.c:174
+#: builtin/fetch.c:95 builtin/pull.c:175
msgid "fetch from all remotes"
msgstr ""
-#: builtin/fetch.c:95 builtin/pull.c:177
+#: builtin/fetch.c:97 builtin/pull.c:178
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ""
-#: builtin/fetch.c:97 builtin/pull.c:180
+#: builtin/fetch.c:99 builtin/pull.c:181
msgid "path to upload pack on remote end"
msgstr ""
-#: builtin/fetch.c:98 builtin/pull.c:182
+#: builtin/fetch.c:100 builtin/pull.c:183
msgid "force overwrite of local branch"
msgstr ""
-#: builtin/fetch.c:100
+#: builtin/fetch.c:102
msgid "fetch from multiple remotes"
msgstr ""
-#: builtin/fetch.c:102 builtin/pull.c:184
+#: builtin/fetch.c:104 builtin/pull.c:185
msgid "fetch all tags and associated objects"
msgstr ""
-#: builtin/fetch.c:104
+#: builtin/fetch.c:106
msgid "do not fetch all tags (--no-tags)"
msgstr ""
-#: builtin/fetch.c:106
+#: builtin/fetch.c:108
msgid "number of submodules fetched in parallel"
msgstr ""
-#: builtin/fetch.c:108 builtin/pull.c:187
+#: builtin/fetch.c:110 builtin/pull.c:188
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
-#: builtin/fetch.c:109 builtin/pull.c:190
+#: builtin/fetch.c:111 builtin/pull.c:191
msgid "on-demand"
msgstr ""
-#: builtin/fetch.c:110 builtin/pull.c:191
+#: builtin/fetch.c:112 builtin/pull.c:192
msgid "control recursive fetching of submodules"
msgstr ""
-#: builtin/fetch.c:114 builtin/pull.c:199
+#: builtin/fetch.c:116 builtin/pull.c:200
msgid "keep downloaded pack"
msgstr ""
-#: builtin/fetch.c:116
+#: builtin/fetch.c:118
msgid "allow updating of HEAD ref"
msgstr ""
-#: builtin/fetch.c:119 builtin/pull.c:202
+#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
msgid "deepen history of shallow clone"
msgstr ""
-#: builtin/fetch.c:121 builtin/pull.c:205
+#: builtin/fetch.c:123
+msgid "deepen history of shallow repository based on time"
+msgstr ""
+
+#: builtin/fetch.c:129 builtin/pull.c:206
msgid "convert to a complete repository"
msgstr ""
-#: builtin/fetch.c:123 builtin/log.c:1426
+#: builtin/fetch.c:131 builtin/log.c:1433
msgid "dir"
msgstr ""
-#: builtin/fetch.c:124
+#: builtin/fetch.c:132
msgid "prepend this to submodule path output"
msgstr ""
-#: builtin/fetch.c:127
+#: builtin/fetch.c:135
msgid "default mode for recursion"
msgstr ""
-#: builtin/fetch.c:129 builtin/pull.c:208
+#: builtin/fetch.c:137 builtin/pull.c:209
msgid "accept refs that update .git/shallow"
msgstr ""
-#: builtin/fetch.c:130 builtin/pull.c:210
+#: builtin/fetch.c:138 builtin/pull.c:211
msgid "refmap"
msgstr ""
-#: builtin/fetch.c:131 builtin/pull.c:211
+#: builtin/fetch.c:139 builtin/pull.c:212
msgid "specify fetch refmap"
msgstr ""
-#: builtin/fetch.c:387
+#: builtin/fetch.c:398
msgid "Couldn't find remote ref HEAD"
msgstr ""
-#: builtin/fetch.c:503
+#: builtin/fetch.c:514
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr ""
-#: builtin/fetch.c:592
+#: builtin/fetch.c:607
#, c-format
msgid "object %s not found"
msgstr ""
-#: builtin/fetch.c:596
+#: builtin/fetch.c:611
msgid "[up to date]"
msgstr ""
-#: builtin/fetch.c:609 builtin/fetch.c:689
+#: builtin/fetch.c:624 builtin/fetch.c:704
msgid "[rejected]"
msgstr ""
-#: builtin/fetch.c:610
+#: builtin/fetch.c:625
msgid "can't fetch in current branch"
msgstr ""
-#: builtin/fetch.c:619
+#: builtin/fetch.c:634
msgid "[tag update]"
msgstr ""
-#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669
-#: builtin/fetch.c:684
+#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684
+#: builtin/fetch.c:699
msgid "unable to update local ref"
msgstr ""
-#: builtin/fetch.c:639
+#: builtin/fetch.c:654
msgid "[new tag]"
msgstr ""
-#: builtin/fetch.c:642
+#: builtin/fetch.c:657
msgid "[new branch]"
msgstr ""
-#: builtin/fetch.c:645
+#: builtin/fetch.c:660
msgid "[new ref]"
msgstr ""
-#: builtin/fetch.c:684
+#: builtin/fetch.c:699
msgid "forced update"
msgstr ""
-#: builtin/fetch.c:689
+#: builtin/fetch.c:704
msgid "non-fast-forward"
msgstr ""
-#: builtin/fetch.c:733
+#: builtin/fetch.c:749
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/fetch.c:753
+#: builtin/fetch.c:769
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
-#: builtin/fetch.c:839 builtin/fetch.c:934
+#: builtin/fetch.c:856 builtin/fetch.c:952
#, c-format
msgid "From %.*s\n"
msgstr ""
-#: builtin/fetch.c:850
+#: builtin/fetch.c:867
#, 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:904
+#: builtin/fetch.c:922
#, c-format
msgid " (%s will become dangling)"
msgstr ""
-#: builtin/fetch.c:905
+#: builtin/fetch.c:923
#, c-format
msgid " (%s has become dangling)"
msgstr ""
-#: builtin/fetch.c:937
+#: builtin/fetch.c:955
msgid "[deleted]"
msgstr ""
-#: builtin/fetch.c:938 builtin/remote.c:1020
+#: builtin/fetch.c:956 builtin/remote.c:1020
msgid "(none)"
msgstr ""
-#: builtin/fetch.c:960
+#: builtin/fetch.c:979
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/fetch.c:979
+#: builtin/fetch.c:998
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/fetch.c:982
+#: builtin/fetch.c:1001
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/fetch.c:1039
+#: builtin/fetch.c:1077
#, c-format
msgid "Don't know how to fetch from %s"
msgstr ""
-#: builtin/fetch.c:1199
+#: builtin/fetch.c:1237
#, c-format
msgid "Fetching %s\n"
msgstr ""
-#: builtin/fetch.c:1201 builtin/remote.c:96
+#: builtin/fetch.c:1239 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr ""
-#: builtin/fetch.c:1219
+#: builtin/fetch.c:1257
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:1242
+#: builtin/fetch.c:1280
msgid "You need to specify a tag name."
msgstr ""
-#: builtin/fetch.c:1284
+#: builtin/fetch.c:1322
+msgid "Negative depth in --deepen is not supported"
+msgstr ""
+
+#: builtin/fetch.c:1324
+msgid "--deepen and --depth are mutually exclusive"
+msgstr ""
+
+#: builtin/fetch.c:1329
msgid "--depth and --unshallow cannot be used together"
msgstr ""
-#: builtin/fetch.c:1286
+#: builtin/fetch.c:1331
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/fetch.c:1306
+#: builtin/fetch.c:1353
msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/fetch.c:1308
+#: builtin/fetch.c:1355
msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/fetch.c:1319
+#: builtin/fetch.c:1366
#, c-format
msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1374
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:663
msgid "populate log with at most <n> entries from shortlog"
msgstr ""
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:666
msgid "alias for --log (deprecated)"
msgstr ""
-#: builtin/fmt-merge-msg.c:673
+#: builtin/fmt-merge-msg.c:669
msgid "text"
msgstr ""
-#: builtin/fmt-merge-msg.c:674
+#: builtin/fmt-merge-msg.c:670
msgid "use <text> as start of message"
msgstr ""
-#: builtin/fmt-merge-msg.c:675
+#: builtin/fmt-merge-msg.c:671
msgid "file to read from"
msgstr ""
msgid "show verbose names for reachable objects"
msgstr ""
-#: builtin/fsck.c:671
+#: builtin/fsck.c:665
msgid "Checking objects"
msgstr ""
msgid "invalid number of threads specified (%d) for %s"
msgstr ""
-#: builtin/grep.c:452 builtin/grep.c:487
+#: builtin/grep.c:453 builtin/grep.c:488
#, c-format
msgid "unable to read tree (%s)"
msgstr ""
-#: builtin/grep.c:502
+#: builtin/grep.c:503
#, c-format
msgid "unable to grep from object of type %s"
msgstr ""
-#: builtin/grep.c:560
+#: builtin/grep.c:561
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr ""
-#: builtin/grep.c:577
-#, c-format
-msgid "cannot open '%s'"
-msgstr ""
-
-#: builtin/grep.c:646
+#: builtin/grep.c:647
msgid "search in index instead of in the work tree"
msgstr ""
-#: builtin/grep.c:648
+#: builtin/grep.c:649
msgid "find in contents not managed by git"
msgstr ""
-#: builtin/grep.c:650
+#: builtin/grep.c:651
msgid "search in both tracked and untracked files"
msgstr ""
-#: builtin/grep.c:652
+#: builtin/grep.c:653
msgid "ignore files specified via '.gitignore'"
msgstr ""
-#: builtin/grep.c:655
+#: builtin/grep.c:656
msgid "show non-matching lines"
msgstr ""
-#: builtin/grep.c:657
+#: builtin/grep.c:658
msgid "case insensitive matching"
msgstr ""
-#: builtin/grep.c:659
+#: builtin/grep.c:660
msgid "match patterns only at word boundaries"
msgstr ""
-#: builtin/grep.c:661
+#: builtin/grep.c:662
msgid "process binary files as text"
msgstr ""
-#: builtin/grep.c:663
+#: builtin/grep.c:664
msgid "don't match patterns in binary files"
msgstr ""
-#: builtin/grep.c:666
+#: builtin/grep.c:667
msgid "process binary files with textconv filters"
msgstr ""
-#: builtin/grep.c:668
+#: builtin/grep.c:669
msgid "descend at most <depth> levels"
msgstr ""
-#: builtin/grep.c:672
+#: builtin/grep.c:673
msgid "use extended POSIX regular expressions"
msgstr ""
-#: builtin/grep.c:675
+#: builtin/grep.c:676
msgid "use basic POSIX regular expressions (default)"
msgstr ""
-#: builtin/grep.c:678
+#: builtin/grep.c:679
msgid "interpret patterns as fixed strings"
msgstr ""
-#: builtin/grep.c:681
+#: builtin/grep.c:682
msgid "use Perl-compatible regular expressions"
msgstr ""
-#: builtin/grep.c:684
+#: builtin/grep.c:685
msgid "show line numbers"
msgstr ""
-#: builtin/grep.c:685
+#: builtin/grep.c:686
msgid "don't show filenames"
msgstr ""
-#: builtin/grep.c:686
+#: builtin/grep.c:687
msgid "show filenames"
msgstr ""
-#: builtin/grep.c:688
+#: builtin/grep.c:689
msgid "show filenames relative to top directory"
msgstr ""
-#: builtin/grep.c:690
+#: builtin/grep.c:691
msgid "show only filenames instead of matching lines"
msgstr ""
-#: builtin/grep.c:692
+#: builtin/grep.c:693
msgid "synonym for --files-with-matches"
msgstr ""
-#: builtin/grep.c:695
+#: builtin/grep.c:696
msgid "show only the names of files without match"
msgstr ""
-#: builtin/grep.c:697
+#: builtin/grep.c:698
msgid "print NUL after filenames"
msgstr ""
-#: builtin/grep.c:699
+#: builtin/grep.c:700
msgid "show the number of matches instead of matching lines"
msgstr ""
-#: builtin/grep.c:700
+#: builtin/grep.c:701
msgid "highlight matches"
msgstr ""
-#: builtin/grep.c:702
+#: builtin/grep.c:703
msgid "print empty line between matches from different files"
msgstr ""
-#: builtin/grep.c:704
+#: builtin/grep.c:705
msgid "show filename only once above matches from same file"
msgstr ""
-#: builtin/grep.c:707
+#: builtin/grep.c:708
msgid "show <n> context lines before and after matches"
msgstr ""
-#: builtin/grep.c:710
+#: builtin/grep.c:711
msgid "show <n> context lines before matches"
msgstr ""
-#: builtin/grep.c:712
+#: builtin/grep.c:713
msgid "show <n> context lines after matches"
msgstr ""
-#: builtin/grep.c:714
+#: builtin/grep.c:715
msgid "use <n> worker threads"
msgstr ""
-#: builtin/grep.c:715
+#: builtin/grep.c:716
msgid "shortcut for -C NUM"
msgstr ""
-#: builtin/grep.c:718
+#: builtin/grep.c:719
msgid "show a line with the function name before matches"
msgstr ""
-#: builtin/grep.c:720
+#: builtin/grep.c:721
msgid "show the surrounding function"
msgstr ""
-#: builtin/grep.c:723
+#: builtin/grep.c:724
msgid "read patterns from file"
msgstr ""
-#: builtin/grep.c:725
+#: builtin/grep.c:726
msgid "match <pattern>"
msgstr ""
-#: builtin/grep.c:727
+#: builtin/grep.c:728
msgid "combine patterns specified with -e"
msgstr ""
-#: builtin/grep.c:739
+#: builtin/grep.c:740
msgid "indicate hit with exit status without output"
msgstr ""
-#: builtin/grep.c:741
+#: builtin/grep.c:742
msgid "show only matches from files that match all patterns"
msgstr ""
-#: builtin/grep.c:743
+#: builtin/grep.c:744
msgid "show parse tree for grep expression"
msgstr ""
-#: builtin/grep.c:747
+#: builtin/grep.c:748
msgid "pager"
msgstr ""
-#: builtin/grep.c:747
+#: builtin/grep.c:748
msgid "show matching files in the pager"
msgstr ""
-#: builtin/grep.c:750
+#: builtin/grep.c:751
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
-#: builtin/grep.c:813
+#: builtin/grep.c:814
msgid "no pattern given."
msgstr ""
-#: builtin/grep.c:845 builtin/index-pack.c:1479
+#: builtin/grep.c:846 builtin/index-pack.c:1480
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr ""
-#: builtin/grep.c:875
+#: builtin/grep.c:876
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-#: builtin/grep.c:901
+#: builtin/grep.c:902
msgid "--cached or --untracked cannot be used with --no-index."
msgstr ""
-#: builtin/grep.c:906
+#: builtin/grep.c:907
msgid "--no-index or --untracked cannot be used with revs."
msgstr ""
-#: builtin/grep.c:909
+#: builtin/grep.c:910
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
-#: builtin/grep.c:917
+#: builtin/grep.c:918
msgid "both --cached and trees are given."
msgstr ""
msgid "git hash-object --stdin-paths"
msgstr ""
-#: builtin/hash-object.c:93
+#: builtin/hash-object.c:94
msgid "type"
msgstr ""
-#: builtin/hash-object.c:93
+#: builtin/hash-object.c:94
msgid "object type"
msgstr ""
-#: builtin/hash-object.c:94
+#: builtin/hash-object.c:95
msgid "write the object into the object database"
msgstr ""
-#: builtin/hash-object.c:96
+#: builtin/hash-object.c:97
msgid "read the object from stdin"
msgstr ""
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
msgid "store file as is without filters"
msgstr ""
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:100
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
msgid "process file as it were from this path"
msgstr ""
-#: builtin/help.c:41
+#: builtin/help.c:42
msgid "print all available commands"
msgstr ""
-#: builtin/help.c:42
+#: builtin/help.c:43
+msgid "exclude guides"
+msgstr ""
+
+#: builtin/help.c:44
msgid "print list of useful guides"
msgstr ""
-#: builtin/help.c:43
+#: builtin/help.c:45
msgid "show man page"
msgstr ""
-#: builtin/help.c:44
+#: builtin/help.c:46
msgid "show manual in web browser"
msgstr ""
-#: builtin/help.c:46
+#: builtin/help.c:48
msgid "show info page"
msgstr ""
-#: builtin/help.c:52
+#: builtin/help.c:54
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr ""
-#: builtin/help.c:64
+#: builtin/help.c:66
#, c-format
msgid "unrecognized help format '%s'"
msgstr ""
-#: builtin/help.c:91
+#: builtin/help.c:93
msgid "Failed to start emacsclient."
msgstr ""
-#: builtin/help.c:104
+#: builtin/help.c:106
msgid "Failed to parse emacsclient version."
msgstr ""
-#: builtin/help.c:112
+#: builtin/help.c:114
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr ""
-#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
+#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
#, c-format
msgid "failed to exec '%s'"
msgstr ""
-#: builtin/help.c:205
+#: builtin/help.c:207
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
-#: builtin/help.c:217
+#: builtin/help.c:219
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"Please consider using 'man.<tool>.path' instead."
msgstr ""
-#: builtin/help.c:334
+#: builtin/help.c:336
#, c-format
msgid "'%s': unknown man viewer."
msgstr ""
-#: builtin/help.c:351
+#: builtin/help.c:353
msgid "no man viewer handled the request"
msgstr ""
-#: builtin/help.c:359
+#: builtin/help.c:361
msgid "no info viewer handled the request"
msgstr ""
-#: builtin/help.c:401
+#: builtin/help.c:403
msgid "Defining attributes per path"
msgstr ""
-#: builtin/help.c:402
+#: builtin/help.c:404
msgid "Everyday Git With 20 Commands Or So"
msgstr ""
-#: builtin/help.c:403
+#: builtin/help.c:405
msgid "A Git glossary"
msgstr ""
-#: builtin/help.c:404
+#: builtin/help.c:406
msgid "Specifies intentionally untracked files to ignore"
msgstr ""
-#: builtin/help.c:405
+#: builtin/help.c:407
msgid "Defining submodule properties"
msgstr ""
-#: builtin/help.c:406
+#: builtin/help.c:408
msgid "Specifying revisions and ranges for Git"
msgstr ""
-#: builtin/help.c:407
+#: builtin/help.c:409
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr ""
-#: builtin/help.c:408
+#: builtin/help.c:410
msgid "An overview of recommended workflows with Git"
msgstr ""
-#: builtin/help.c:420
+#: builtin/help.c:422
msgid "The common Git guides are:\n"
msgstr ""
-#: builtin/help.c:441 builtin/help.c:458
+#: builtin/help.c:440
#, c-format
-msgid "usage: %s%s"
+msgid "`git %s' is aliased to `%s'"
msgstr ""
-#: builtin/help.c:474
+#: builtin/help.c:462 builtin/help.c:479
#, c-format
-msgid "`git %s' is aliased to `%s'"
+msgid "usage: %s%s"
msgstr ""
-#: builtin/index-pack.c:153
+#: builtin/index-pack.c:154
#, c-format
msgid "unable to open %s"
msgstr ""
-#: builtin/index-pack.c:203
+#: builtin/index-pack.c:204
#, c-format
msgid "object type mismatch at %s"
msgstr ""
-#: builtin/index-pack.c:223
+#: builtin/index-pack.c:224
#, c-format
msgid "did not receive expected object %s"
msgstr ""
-#: builtin/index-pack.c:226
+#: builtin/index-pack.c:227
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr ""
-#: builtin/index-pack.c:268
+#: builtin/index-pack.c:269
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:278
+#: builtin/index-pack.c:279
msgid "early EOF"
msgstr ""
-#: builtin/index-pack.c:279
+#: builtin/index-pack.c:280
msgid "read error on input"
msgstr ""
-#: builtin/index-pack.c:291
+#: builtin/index-pack.c:292
msgid "used more bytes than were available"
msgstr ""
-#: builtin/index-pack.c:298
+#: builtin/index-pack.c:299
msgid "pack too large for current definition of off_t"
msgstr ""
-#: builtin/index-pack.c:314
+#: builtin/index-pack.c:302 builtin/unpack-objects.c:92
+msgid "pack exceeds maximum allowed size"
+msgstr ""
+
+#: builtin/index-pack.c:317
#, c-format
msgid "unable to create '%s'"
msgstr ""
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:322
#, c-format
msgid "cannot open packfile '%s'"
msgstr ""
-#: builtin/index-pack.c:333
+#: builtin/index-pack.c:336
msgid "pack signature mismatch"
msgstr ""
-#: builtin/index-pack.c:335
+#: builtin/index-pack.c:338
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr ""
-#: builtin/index-pack.c:353
+#: builtin/index-pack.c:356
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr ""
-#: builtin/index-pack.c:475
+#: builtin/index-pack.c:478
#, c-format
msgid "inflate returned %d"
msgstr ""
-#: builtin/index-pack.c:524
+#: builtin/index-pack.c:527
msgid "offset value overflow for delta base object"
msgstr ""
-#: builtin/index-pack.c:532
+#: builtin/index-pack.c:535
msgid "delta base offset is out of bound"
msgstr ""
-#: builtin/index-pack.c:540
+#: builtin/index-pack.c:543
#, c-format
msgid "unknown object type %d"
msgstr ""
-#: builtin/index-pack.c:571
+#: builtin/index-pack.c:574
msgid "cannot pread pack file"
msgstr ""
-#: builtin/index-pack.c:573
+#: builtin/index-pack.c:576
#, 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:599
+#: builtin/index-pack.c:602
msgid "serious inflate inconsistency"
msgstr ""
-#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774
-#: builtin/index-pack.c:808 builtin/index-pack.c:817
+#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
+#: builtin/index-pack.c:811 builtin/index-pack.c:820
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
-#: builtin/index-pack.c:748 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:256
+#: builtin/index-pack.c:751 builtin/pack-objects.c:166
+#: builtin/pack-objects.c:258
#, c-format
msgid "unable to read %s"
msgstr ""
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:817
#, c-format
msgid "cannot read existing object %s"
msgstr ""
-#: builtin/index-pack.c:828
+#: builtin/index-pack.c:831
#, c-format
msgid "invalid blob object %s"
msgstr ""
-#: builtin/index-pack.c:842
+#: builtin/index-pack.c:845
#, c-format
msgid "invalid %s"
msgstr ""
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:848
msgid "Error in object"
msgstr ""
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:850
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr ""
-#: builtin/index-pack.c:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:922 builtin/index-pack.c:953
msgid "failed to apply delta"
msgstr ""
-#: builtin/index-pack.c:1120
+#: builtin/index-pack.c:1123
msgid "Receiving objects"
msgstr ""
-#: builtin/index-pack.c:1120
+#: builtin/index-pack.c:1123
msgid "Indexing objects"
msgstr ""
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1155
msgid "pack is corrupted (SHA1 mismatch)"
msgstr ""
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
msgid "cannot fstat packfile"
msgstr ""
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1163
msgid "pack has junk at the end"
msgstr ""
-#: builtin/index-pack.c:1171
+#: builtin/index-pack.c:1174
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
-#: builtin/index-pack.c:1196
+#: builtin/index-pack.c:1197
msgid "Resolving deltas"
msgstr ""
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
#, c-format
msgid "unable to create thread: %s"
msgstr ""
-#: builtin/index-pack.c:1249
+#: builtin/index-pack.c:1250
msgid "confusion beyond insanity"
msgstr ""
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1256
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1268
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
-#: builtin/index-pack.c:1271
+#: builtin/index-pack.c:1272
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1295
+#: builtin/index-pack.c:1296
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr ""
-#: builtin/index-pack.c:1371
+#: builtin/index-pack.c:1372
#, c-format
msgid "local object %s is corrupt"
msgstr ""
-#: builtin/index-pack.c:1395
+#: builtin/index-pack.c:1396
msgid "error while closing pack file"
msgstr ""
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
#, c-format
msgid "cannot write keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:1416
+#: builtin/index-pack.c:1417
#, c-format
msgid "cannot close written keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:1429
+#: builtin/index-pack.c:1430
msgid "cannot store pack file"
msgstr ""
-#: builtin/index-pack.c:1440
+#: builtin/index-pack.c:1441
msgid "cannot store index file"
msgstr ""
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1474
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr ""
-#: builtin/index-pack.c:1483 builtin/index-pack.c:1681
+#: builtin/index-pack.c:1484 builtin/index-pack.c:1681
#, c-format
msgid "no threads support, ignoring %s"
msgstr ""
msgid "bad %s"
msgstr ""
-#: builtin/index-pack.c:1730
+#: builtin/index-pack.c:1732
msgid "--fix-thin cannot be used without --stdin"
msgstr ""
-#: builtin/index-pack.c:1738
+#: builtin/index-pack.c:1740
msgid "--verify with no packfile name given"
msgstr ""
-#: builtin/init-db.c:55
+#: builtin/init-db.c:54
#, c-format
msgid "cannot stat '%s'"
msgstr ""
-#: builtin/init-db.c:61
+#: builtin/init-db.c:60
#, c-format
msgid "cannot stat template '%s'"
msgstr ""
-#: builtin/init-db.c:66
+#: builtin/init-db.c:65
#, c-format
msgid "cannot opendir '%s'"
msgstr ""
-#: builtin/init-db.c:77
+#: builtin/init-db.c:76
#, c-format
msgid "cannot readlink '%s'"
msgstr ""
-#: builtin/init-db.c:79
+#: builtin/init-db.c:78
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr ""
-#: builtin/init-db.c:85
+#: builtin/init-db.c:84
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr ""
-#: builtin/init-db.c:89
+#: builtin/init-db.c:88
#, c-format
msgid "ignoring template %s"
msgstr ""
-#: builtin/init-db.c:120
+#: builtin/init-db.c:119
#, c-format
msgid "templates not found %s"
msgstr ""
-#: builtin/init-db.c:135
+#: builtin/init-db.c:134
#, c-format
msgid "not copying templates from '%s': %s"
msgstr ""
-#: builtin/init-db.c:312 builtin/init-db.c:315
+#: builtin/init-db.c:327
#, c-format
-msgid "%s already exists"
+msgid "unable to handle file type %d"
msgstr ""
-#: builtin/init-db.c:344
+#: builtin/init-db.c:330
#, c-format
-msgid "unable to handle file type %d"
+msgid "unable to move %s to %s"
msgstr ""
-#: builtin/init-db.c:347
+#: builtin/init-db.c:347 builtin/init-db.c:350
#, c-format
-msgid "unable to move %s to %s"
+msgid "%s already exists"
msgstr ""
-#: builtin/init-db.c:402
+#: builtin/init-db.c:403
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:403
+#: builtin/init-db.c:404
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:407
+#: builtin/init-db.c:408
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:408
+#: builtin/init-db.c:409
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:455
+#: builtin/init-db.c:457
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
msgstr ""
-#: builtin/init-db.c:478
+#: builtin/init-db.c:480
msgid "permissions"
msgstr ""
-#: builtin/init-db.c:479
+#: builtin/init-db.c:481
msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
-#: builtin/init-db.c:513 builtin/init-db.c:518
+#: builtin/init-db.c:515 builtin/init-db.c:520
#, c-format
msgid "cannot mkdir %s"
msgstr ""
-#: builtin/init-db.c:522
+#: builtin/init-db.c:524
#, c-format
msgid "cannot chdir to %s"
msgstr ""
-#: builtin/init-db.c:543
+#: builtin/init-db.c:545
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr ""
-#: builtin/init-db.c:571
+#: builtin/init-db.c:573
#, c-format
msgid "Cannot access work tree '%s'"
msgstr ""
msgid "Cover letter needs email format"
msgstr ""
-#: builtin/log.c:1064
+#: builtin/log.c:1063
#, c-format
msgid "insane in-reply-to: %s"
msgstr ""
-#: builtin/log.c:1092
+#: builtin/log.c:1091
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr ""
-#: builtin/log.c:1137
+#: builtin/log.c:1141
msgid "Two output directories?"
msgstr ""
-#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897
+#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
#, c-format
msgid "Unknown commit %s"
msgstr ""
-#: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305
-#: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425
-#: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594
-#: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455
+#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
-#: builtin/log.c:1259
+#: builtin/log.c:1263
msgid "Could not find exact merge base."
msgstr ""
-#: builtin/log.c:1263
+#: builtin/log.c:1267
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:1283
+#: builtin/log.c:1287
msgid "Failed to find exact merge base"
msgstr ""
-#: builtin/log.c:1294
+#: builtin/log.c:1298
msgid "base commit should be the ancestor of revision list"
msgstr ""
-#: builtin/log.c:1298
+#: builtin/log.c:1302
msgid "base commit shouldn't be in revision list"
msgstr ""
-#: builtin/log.c:1347
+#: builtin/log.c:1351
msgid "cannot get patch id"
msgstr ""
-#: builtin/log.c:1404
+#: builtin/log.c:1408
msgid "use [PATCH n/m] even with a single patch"
msgstr ""
-#: builtin/log.c:1407
+#: builtin/log.c:1411
msgid "use [PATCH] even with multiple patches"
msgstr ""
-#: builtin/log.c:1411
+#: builtin/log.c:1415
msgid "print patches to standard out"
msgstr ""
-#: builtin/log.c:1413
+#: builtin/log.c:1417
msgid "generate a cover letter"
msgstr ""
-#: builtin/log.c:1415
+#: builtin/log.c:1419
msgid "use simple number sequence for output file names"
msgstr ""
-#: builtin/log.c:1416
+#: builtin/log.c:1420
msgid "sfx"
msgstr ""
-#: builtin/log.c:1417
+#: builtin/log.c:1421
msgid "use <sfx> instead of '.patch'"
msgstr ""
-#: builtin/log.c:1419
+#: builtin/log.c:1423
msgid "start numbering patches at <n> instead of 1"
msgstr ""
-#: builtin/log.c:1421
+#: builtin/log.c:1425
msgid "mark the series as Nth re-roll"
msgstr ""
-#: builtin/log.c:1423
+#: builtin/log.c:1427
+msgid "Use [RFC PATCH] instead of [PATCH]"
+msgstr ""
+
+#: builtin/log.c:1430
msgid "Use [<prefix>] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1426
+#: builtin/log.c:1433
msgid "store resulting files in <dir>"
msgstr ""
-#: builtin/log.c:1429
+#: builtin/log.c:1436
msgid "don't strip/add [PATCH]"
msgstr ""
-#: builtin/log.c:1432
+#: builtin/log.c:1439
msgid "don't output binary diffs"
msgstr ""
-#: builtin/log.c:1434
+#: builtin/log.c:1441
msgid "output all-zero hash in From header"
msgstr ""
-#: builtin/log.c:1436
+#: builtin/log.c:1443
msgid "don't include a patch matching a commit upstream"
msgstr ""
-#: builtin/log.c:1438
+#: builtin/log.c:1445
msgid "show patch format instead of default (patch + stat)"
msgstr ""
-#: builtin/log.c:1440
+#: builtin/log.c:1447
msgid "Messaging"
msgstr ""
-#: builtin/log.c:1441
+#: builtin/log.c:1448
msgid "header"
msgstr ""
-#: builtin/log.c:1442
+#: builtin/log.c:1449
msgid "add email header"
msgstr ""
-#: builtin/log.c:1443 builtin/log.c:1445
+#: builtin/log.c:1450 builtin/log.c:1452
msgid "email"
msgstr ""
-#: builtin/log.c:1443
+#: builtin/log.c:1450
msgid "add To: header"
msgstr ""
-#: builtin/log.c:1445
+#: builtin/log.c:1452
msgid "add Cc: header"
msgstr ""
-#: builtin/log.c:1447
+#: builtin/log.c:1454
msgid "ident"
msgstr ""
-#: builtin/log.c:1448
+#: builtin/log.c:1455
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-#: builtin/log.c:1450
+#: builtin/log.c:1457
msgid "message-id"
msgstr ""
-#: builtin/log.c:1451
+#: builtin/log.c:1458
msgid "make first mail a reply to <message-id>"
msgstr ""
-#: builtin/log.c:1452 builtin/log.c:1455
+#: builtin/log.c:1459 builtin/log.c:1462
msgid "boundary"
msgstr ""
-#: builtin/log.c:1453
+#: builtin/log.c:1460
msgid "attach the patch"
msgstr ""
-#: builtin/log.c:1456
+#: builtin/log.c:1463
msgid "inline the patch"
msgstr ""
-#: builtin/log.c:1460
+#: builtin/log.c:1467
msgid "enable message threading, styles: shallow, deep"
msgstr ""
-#: builtin/log.c:1462
+#: builtin/log.c:1469
msgid "signature"
msgstr ""
-#: builtin/log.c:1463
+#: builtin/log.c:1470
msgid "add a signature"
msgstr ""
-#: builtin/log.c:1464
+#: builtin/log.c:1471
msgid "base-commit"
msgstr ""
-#: builtin/log.c:1465
+#: builtin/log.c:1472
msgid "add prerequisite tree info to the patch series"
msgstr ""
-#: builtin/log.c:1467
+#: builtin/log.c:1474
msgid "add a signature from a file"
msgstr ""
-#: builtin/log.c:1468
+#: builtin/log.c:1475
msgid "don't print the patch filenames"
msgstr ""
-#: builtin/log.c:1558
+#: builtin/log.c:1565
msgid "-n and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:1560
-msgid "--subject-prefix and -k are mutually exclusive."
+#: builtin/log.c:1567
+msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:1568
+#: builtin/log.c:1575
msgid "--name-only does not make sense"
msgstr ""
-#: builtin/log.c:1570
+#: builtin/log.c:1577
msgid "--name-status does not make sense"
msgstr ""
-#: builtin/log.c:1572
+#: builtin/log.c:1579
msgid "--check does not make sense"
msgstr ""
-#: builtin/log.c:1602
+#: builtin/log.c:1609
msgid "standard output, or directory, which one?"
msgstr ""
-#: builtin/log.c:1604
+#: builtin/log.c:1611
#, c-format
msgid "Could not create directory '%s'"
msgstr ""
-#: builtin/log.c:1698
+#: builtin/log.c:1705
#, c-format
msgid "unable to read signature file '%s'"
msgstr ""
-#: builtin/log.c:1769
+#: builtin/log.c:1777
msgid "Failed to create output files"
msgstr ""
-#: builtin/log.c:1818
+#: builtin/log.c:1826
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
-#: builtin/log.c:1872
+#: builtin/log.c:1880
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/ls-files.c:379
+#: builtin/ls-files.c:458
msgid "git ls-files [<options>] [<file>...]"
msgstr ""
-#: builtin/ls-files.c:428
+#: builtin/ls-files.c:507
msgid "identify the file status with tags"
msgstr ""
-#: builtin/ls-files.c:430
+#: builtin/ls-files.c:509
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
-#: builtin/ls-files.c:432
+#: builtin/ls-files.c:511
msgid "show cached files in the output (default)"
msgstr ""
-#: builtin/ls-files.c:434
+#: builtin/ls-files.c:513
msgid "show deleted files in the output"
msgstr ""
-#: builtin/ls-files.c:436
+#: builtin/ls-files.c:515
msgid "show modified files in the output"
msgstr ""
-#: builtin/ls-files.c:438
+#: builtin/ls-files.c:517
msgid "show other files in the output"
msgstr ""
-#: builtin/ls-files.c:440
+#: builtin/ls-files.c:519
msgid "show ignored files in the output"
msgstr ""
-#: builtin/ls-files.c:443
+#: builtin/ls-files.c:522
msgid "show staged contents' object name in the output"
msgstr ""
-#: builtin/ls-files.c:445
+#: builtin/ls-files.c:524
msgid "show files on the filesystem that need to be removed"
msgstr ""
-#: builtin/ls-files.c:447
+#: builtin/ls-files.c:526
msgid "show 'other' directories' names only"
msgstr ""
-#: builtin/ls-files.c:449
+#: builtin/ls-files.c:528
msgid "show line endings of files"
msgstr ""
-#: builtin/ls-files.c:451
+#: builtin/ls-files.c:530
msgid "don't show empty directories"
msgstr ""
-#: builtin/ls-files.c:454
+#: builtin/ls-files.c:533
msgid "show unmerged files in the output"
msgstr ""
-#: builtin/ls-files.c:456
+#: builtin/ls-files.c:535
msgid "show resolve-undo information"
msgstr ""
-#: builtin/ls-files.c:458
+#: builtin/ls-files.c:537
msgid "skip files matching pattern"
msgstr ""
-#: builtin/ls-files.c:461
+#: builtin/ls-files.c:540
msgid "exclude patterns are read from <file>"
msgstr ""
-#: builtin/ls-files.c:464
+#: builtin/ls-files.c:543
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
-#: builtin/ls-files.c:466
+#: builtin/ls-files.c:545
msgid "add the standard git exclusions"
msgstr ""
-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:548
msgid "make the output relative to the project top directory"
msgstr ""
-#: builtin/ls-files.c:472
+#: builtin/ls-files.c:551
+msgid "recurse through submodules"
+msgstr ""
+
+#: builtin/ls-files.c:553
msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
-#: builtin/ls-files.c:473
+#: builtin/ls-files.c:554
msgid "tree-ish"
msgstr ""
-#: builtin/ls-files.c:474
+#: builtin/ls-files.c:555
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
-#: builtin/ls-files.c:476
+#: builtin/ls-files.c:557
msgid "show debugging data"
msgstr ""
msgid "Available custom strategies are:"
msgstr ""
-#: builtin/merge.c:195 builtin/pull.c:126
+#: builtin/merge.c:195 builtin/pull.c:127
msgid "do not show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:198 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:130
msgid "show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:199 builtin/pull.c:132
+#: builtin/merge.c:199 builtin/pull.c:133
msgid "(synonym to --stat)"
msgstr ""
-#: builtin/merge.c:201 builtin/pull.c:135
+#: builtin/merge.c:201 builtin/pull.c:136
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
-#: builtin/merge.c:204 builtin/pull.c:138
+#: builtin/merge.c:204 builtin/pull.c:139
msgid "create a single commit instead of doing a merge"
msgstr ""
-#: builtin/merge.c:206 builtin/pull.c:141
+#: builtin/merge.c:206 builtin/pull.c:142
msgid "perform a commit if the merge succeeds (default)"
msgstr ""
-#: builtin/merge.c:208 builtin/pull.c:144
+#: builtin/merge.c:208 builtin/pull.c:145
msgid "edit message before committing"
msgstr ""
msgid "allow fast-forward (default)"
msgstr ""
-#: builtin/merge.c:211 builtin/pull.c:150
+#: builtin/merge.c:211 builtin/pull.c:151
msgid "abort if fast-forward is not possible"
msgstr ""
-#: builtin/merge.c:215 builtin/pull.c:153
+#: builtin/merge.c:215 builtin/pull.c:154
msgid "verify that the named commit has a valid GPG signature"
msgstr ""
-#: builtin/merge.c:216 builtin/notes.c:772 builtin/pull.c:157
+#: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158
#: builtin/revert.c:89
msgid "strategy"
msgstr ""
-#: builtin/merge.c:217 builtin/pull.c:158
+#: builtin/merge.c:217 builtin/pull.c:159
msgid "merge strategy to use"
msgstr ""
-#: builtin/merge.c:218 builtin/pull.c:161
+#: builtin/merge.c:218 builtin/pull.c:162
msgid "option=value"
msgstr ""
-#: builtin/merge.c:219 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:163
msgid "option for selected merge strategy"
msgstr ""
msgid "abort the current in-progress merge"
msgstr ""
-#: builtin/merge.c:227 builtin/pull.c:169
+#: builtin/merge.c:227 builtin/pull.c:170
msgid "allow merging unrelated histories"
msgstr ""
msgid "Already up-to-date."
msgstr ""
-#: builtin/merge.c:1382
+#: builtin/merge.c:1377
#, c-format
msgid "Updating %s..%s\n"
msgstr ""
-#: builtin/merge.c:1419
+#: builtin/merge.c:1418
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr ""
-#: builtin/merge.c:1426
+#: builtin/merge.c:1425
#, c-format
msgid "Nope.\n"
msgstr ""
-#: builtin/merge.c:1451
+#: builtin/merge.c:1450
msgid "Already up-to-date. Yeeah!"
msgstr ""
-#: builtin/merge.c:1457
+#: builtin/merge.c:1456
msgid "Not possible to fast-forward, aborting."
msgstr ""
-#: builtin/merge.c:1480 builtin/merge.c:1559
+#: builtin/merge.c:1479 builtin/merge.c:1558
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr ""
-#: builtin/merge.c:1484
+#: builtin/merge.c:1483
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr ""
-#: builtin/merge.c:1550
+#: builtin/merge.c:1549
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr ""
-#: builtin/merge.c:1552
+#: builtin/merge.c:1551
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr ""
-#: builtin/merge.c:1561
+#: builtin/merge.c:1560
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
-#: builtin/merge.c:1573
+#: builtin/merge.c:1572
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr ""
-#: builtin/merge-base.c:214
+#: builtin/merge-base.c:217
msgid "output all common ancestors"
msgstr ""
-#: builtin/merge-base.c:216
+#: builtin/merge-base.c:219
msgid "find ancestors for a single n-way merge"
msgstr ""
-#: builtin/merge-base.c:218
+#: builtin/merge-base.c:221
msgid "list revs not reachable from others"
msgstr ""
-#: builtin/merge-base.c:220
+#: builtin/merge-base.c:223
msgid "is the first one ancestor of the other?"
msgstr ""
-#: builtin/merge-base.c:222
+#: builtin/merge-base.c:225
msgid "find where <commit> forked from reflog of <ref>"
msgstr ""
msgid "set labels for file1/orig-file/file2"
msgstr ""
+#: builtin/merge-recursive.c:45
+#, c-format
+msgid "unknown option %s"
+msgstr ""
+
+#: builtin/merge-recursive.c:51
+#, c-format
+msgid "could not parse object '%s'"
+msgstr ""
+
+#: builtin/merge-recursive.c:55
+#, 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:63
+msgid "not handling anything other than two heads merge."
+msgstr ""
+
+#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr ""
+
+#: builtin/merge-recursive.c:77
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr ""
+
#: builtin/mktree.c:65
msgid "git mktree [-z] [--missing] [--batch]"
msgstr ""
msgid "renaming '%s' failed"
msgstr ""
-#: builtin/name-rev.c:258
+#: builtin/name-rev.c:257
msgid "git name-rev [<options>] <commit>..."
msgstr ""
-#: builtin/name-rev.c:259
+#: builtin/name-rev.c:258
msgid "git name-rev [<options>] --all"
msgstr ""
-#: builtin/name-rev.c:260
+#: builtin/name-rev.c:259
msgid "git name-rev [<options>] --stdin"
msgstr ""
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:311
msgid "print only names (no SHA-1)"
msgstr ""
-#: builtin/name-rev.c:313
+#: builtin/name-rev.c:312
msgid "only use tags to name the commits"
msgstr ""
-#: builtin/name-rev.c:315
+#: builtin/name-rev.c:314
msgid "only use refs matching <pattern>"
msgstr ""
-#: builtin/name-rev.c:317
+#: builtin/name-rev.c:316
msgid "list all commits reachable from all refs"
msgstr ""
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:317
msgid "read from stdin"
msgstr ""
-#: builtin/name-rev.c:319
+#: builtin/name-rev.c:318
msgid "allow to print `undefined` names (default)"
msgstr ""
-#: builtin/name-rev.c:325
+#: builtin/name-rev.c:324
msgid "dereference tags in the input (internal use)"
msgstr ""
msgstr ""
#: builtin/notes.c:194
-msgid "Please supply the note contents using either -m or -F option"
+msgid "please supply the note contents using either -m or -F option"
msgstr ""
#: builtin/notes.c:203
#: builtin/notes.c:205
#, c-format
-msgid "The note contents have been left in %s"
+msgid "the note contents have been left in %s"
msgstr ""
#: builtin/notes.c:233 builtin/tag.c:439
msgid "could not open or read '%s'"
msgstr ""
+#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307
+#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513
+#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659
+#, c-format
+msgid "failed to resolve '%s' as a valid ref."
+msgstr ""
+
#: builtin/notes.c:257
#, c-format
-msgid "Failed to read object '%s'."
+msgid "failed to read object '%s'."
msgstr ""
#: builtin/notes.c:261
#, c-format
-msgid "Cannot read note data from non-blob object '%s'."
+msgid "cannot read note data from non-blob object '%s'."
+msgstr ""
+
+#: builtin/notes.c:301
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr ""
+
+#: builtin/notes.c:316
+#, 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:345
+#, c-format
+msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr ""
-#: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494
-#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650
-#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968
+#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496
+#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652
+#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970
msgid "too many parameters"
msgstr ""
-#: builtin/notes.c:376 builtin/notes.c:663
+#: builtin/notes.c:378 builtin/notes.c:665
#, c-format
-msgid "No note found for object %s."
+msgid "no note found for object %s."
msgstr ""
-#: builtin/notes.c:397 builtin/notes.c:560
+#: builtin/notes.c:399 builtin/notes.c:562
msgid "note contents as a string"
msgstr ""
-#: builtin/notes.c:400 builtin/notes.c:563
+#: builtin/notes.c:402 builtin/notes.c:565
msgid "note contents in a file"
msgstr ""
-#: builtin/notes.c:403 builtin/notes.c:566
+#: builtin/notes.c:405 builtin/notes.c:568
msgid "reuse and edit specified note object"
msgstr ""
-#: builtin/notes.c:406 builtin/notes.c:569
+#: builtin/notes.c:408 builtin/notes.c:571
msgid "reuse specified note object"
msgstr ""
-#: builtin/notes.c:409 builtin/notes.c:572
+#: builtin/notes.c:411 builtin/notes.c:574
msgid "allow storing empty note"
msgstr ""
-#: builtin/notes.c:410 builtin/notes.c:481
+#: builtin/notes.c:412 builtin/notes.c:483
msgid "replace existing notes"
msgstr ""
-#: builtin/notes.c:435
+#: builtin/notes.c:437
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
-#: builtin/notes.c:450 builtin/notes.c:529
+#: builtin/notes.c:452 builtin/notes.c:531
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr ""
-#: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887
+#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889
#, c-format
msgid "Removing note for object %s\n"
msgstr ""
-#: builtin/notes.c:482
+#: builtin/notes.c:484
msgid "read objects from stdin"
msgstr ""
-#: builtin/notes.c:484
+#: builtin/notes.c:486
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
-#: builtin/notes.c:502
+#: builtin/notes.c:504
msgid "too few parameters"
msgstr ""
-#: builtin/notes.c:523
+#: builtin/notes.c:525
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
-#: builtin/notes.c:535
+#: builtin/notes.c:537
#, c-format
-msgid "Missing notes on source object %s. Cannot copy."
+msgid "missing notes on source object %s. Cannot copy."
msgstr ""
-#: builtin/notes.c:587
+#: builtin/notes.c:589
#, 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:753
+#: builtin/notes.c:685
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr ""
+
+#: builtin/notes.c:687
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr ""
+
+#: builtin/notes.c:689
+msgid "failed to remove 'git notes merge' worktree"
+msgstr ""
+
+#: builtin/notes.c:709
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr ""
+
+#: builtin/notes.c:711
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr ""
+
+#: builtin/notes.c:713
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr ""
+
+#: builtin/notes.c:726
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr ""
+
+#: builtin/notes.c:729
+msgid "failed to finalize notes merge"
+msgstr ""
+
+#: builtin/notes.c:755
#, c-format
msgid "unknown notes merge strategy %s"
msgstr ""
-#: builtin/notes.c:769
+#: builtin/notes.c:771
msgid "General options"
msgstr ""
-#: builtin/notes.c:771
+#: builtin/notes.c:773
msgid "Merge options"
msgstr ""
-#: builtin/notes.c:773
+#: builtin/notes.c:775
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
msgstr ""
-#: builtin/notes.c:775
+#: builtin/notes.c:777
msgid "Committing unmerged notes"
msgstr ""
-#: builtin/notes.c:777
+#: builtin/notes.c:779
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
-#: builtin/notes.c:779
+#: builtin/notes.c:781
msgid "Aborting notes merge resolution"
msgstr ""
-#: builtin/notes.c:781
+#: builtin/notes.c:783
msgid "abort notes merge"
msgstr ""
-#: builtin/notes.c:792
+#: builtin/notes.c:794
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr ""
-#: builtin/notes.c:797
-msgid "Must specify a notes ref to merge"
+#: builtin/notes.c:799
+msgid "must specify a notes ref to merge"
msgstr ""
-#: builtin/notes.c:821
+#: builtin/notes.c:823
#, c-format
-msgid "Unknown -s/--strategy: %s"
+msgid "unknown -s/--strategy: %s"
msgstr ""
-#: builtin/notes.c:858
+#: builtin/notes.c:860
#, c-format
-msgid "A notes merge into %s is already in-progress at %s"
+msgid "a notes merge into %s is already in-progress at %s"
msgstr ""
-#: builtin/notes.c:861
+#: builtin/notes.c:863
#, c-format
-msgid "Failed to store link to current notes ref (%s)"
+msgid "failed to store link to current notes ref (%s)"
msgstr ""
-#: builtin/notes.c:863
+#: builtin/notes.c:865
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
"abort'.\n"
msgstr ""
-#: builtin/notes.c:885
+#: builtin/notes.c:887
#, c-format
msgid "Object %s has no note\n"
msgstr ""
-#: builtin/notes.c:897
+#: builtin/notes.c:899
msgid "attempt to remove non-existent note is not an error"
msgstr ""
-#: builtin/notes.c:900
+#: builtin/notes.c:902
msgid "read object names from the standard input"
msgstr ""
-#: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127
+#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
msgid "do not remove, show only"
msgstr ""
-#: builtin/notes.c:939
+#: builtin/notes.c:941
msgid "report pruned notes"
msgstr ""
-#: builtin/notes.c:981
+#: builtin/notes.c:983
msgid "notes-ref"
msgstr ""
-#: builtin/notes.c:982
+#: builtin/notes.c:984
msgid "use notes from <notes-ref>"
msgstr ""
-#: builtin/notes.c:1017 builtin/remote.c:1623
+#: builtin/notes.c:1019
#, c-format
-msgid "Unknown subcommand: %s"
+msgid "unknown subcommand: %s"
msgstr ""
-#: builtin/pack-objects.c:28
+#: builtin/pack-objects.c:29
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
-#: builtin/pack-objects.c:29
+#: builtin/pack-objects.c:30
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
-#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
+#: builtin/pack-objects.c:179 builtin/pack-objects.c:182
#, c-format
msgid "deflate error (%d)"
msgstr ""
-#: builtin/pack-objects.c:766
+#: builtin/pack-objects.c:768
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
-#: builtin/pack-objects.c:779
+#: builtin/pack-objects.c:781
msgid "Writing objects"
msgstr ""
-#: builtin/pack-objects.c:1037
+#: builtin/pack-objects.c:1070
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
-#: builtin/pack-objects.c:2197
+#: builtin/pack-objects.c:2346
msgid "Compressing objects"
msgstr ""
-#: builtin/pack-objects.c:2611
+#: builtin/pack-objects.c:2759
#, c-format
msgid "unsupported index version %s"
msgstr ""
-#: builtin/pack-objects.c:2615
+#: builtin/pack-objects.c:2763
#, c-format
msgid "bad index version '%s'"
msgstr ""
-#: builtin/pack-objects.c:2645
+#: builtin/pack-objects.c:2793
msgid "do not show progress meter"
msgstr ""
-#: builtin/pack-objects.c:2647
+#: builtin/pack-objects.c:2795
msgid "show progress meter"
msgstr ""
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2797
msgid "show progress meter during object writing phase"
msgstr ""
-#: builtin/pack-objects.c:2652
+#: builtin/pack-objects.c:2800
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
-#: builtin/pack-objects.c:2653
+#: builtin/pack-objects.c:2801
msgid "version[,offset]"
msgstr ""
-#: builtin/pack-objects.c:2654
+#: builtin/pack-objects.c:2802
msgid "write the pack index file in the specified idx format version"
msgstr ""
-#: builtin/pack-objects.c:2657
+#: builtin/pack-objects.c:2805
msgid "maximum size of each output pack file"
msgstr ""
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2807
msgid "ignore borrowed objects from alternate object store"
msgstr ""
-#: builtin/pack-objects.c:2661
+#: builtin/pack-objects.c:2809
msgid "ignore packed objects"
msgstr ""
-#: builtin/pack-objects.c:2663
+#: builtin/pack-objects.c:2811
msgid "limit pack window by objects"
msgstr ""
-#: builtin/pack-objects.c:2665
+#: builtin/pack-objects.c:2813
msgid "limit pack window by memory in addition to object limit"
msgstr ""
-#: builtin/pack-objects.c:2667
+#: builtin/pack-objects.c:2815
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
-#: builtin/pack-objects.c:2669
+#: builtin/pack-objects.c:2817
msgid "reuse existing deltas"
msgstr ""
-#: builtin/pack-objects.c:2671
+#: builtin/pack-objects.c:2819
msgid "reuse existing objects"
msgstr ""
-#: builtin/pack-objects.c:2673
+#: builtin/pack-objects.c:2821
msgid "use OFS_DELTA objects"
msgstr ""
-#: builtin/pack-objects.c:2675
+#: builtin/pack-objects.c:2823
msgid "use threads when searching for best delta matches"
msgstr ""
-#: builtin/pack-objects.c:2677
+#: builtin/pack-objects.c:2825
msgid "do not create an empty pack output"
msgstr ""
-#: builtin/pack-objects.c:2679
+#: builtin/pack-objects.c:2827
msgid "read revision arguments from standard input"
msgstr ""
-#: builtin/pack-objects.c:2681
+#: builtin/pack-objects.c:2829
msgid "limit the objects to those that are not yet packed"
msgstr ""
-#: builtin/pack-objects.c:2684
+#: builtin/pack-objects.c:2832
msgid "include objects reachable from any reference"
msgstr ""
-#: builtin/pack-objects.c:2687
+#: builtin/pack-objects.c:2835
msgid "include objects referred by reflog entries"
msgstr ""
-#: builtin/pack-objects.c:2690
+#: builtin/pack-objects.c:2838
msgid "include objects referred to by the index"
msgstr ""
-#: builtin/pack-objects.c:2693
+#: builtin/pack-objects.c:2841
msgid "output pack to stdout"
msgstr ""
-#: builtin/pack-objects.c:2695
+#: builtin/pack-objects.c:2843
msgid "include tag objects that refer to objects to be packed"
msgstr ""
-#: builtin/pack-objects.c:2697
+#: builtin/pack-objects.c:2845
msgid "keep unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:2699
+#: builtin/pack-objects.c:2847
msgid "pack loose unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:2700 parse-options.h:142
-msgid "time"
-msgstr ""
-
-#: builtin/pack-objects.c:2701
+#: builtin/pack-objects.c:2849
msgid "unpack unreachable objects newer than <time>"
msgstr ""
-#: builtin/pack-objects.c:2704
+#: builtin/pack-objects.c:2852
msgid "create thin packs"
msgstr ""
-#: builtin/pack-objects.c:2706
+#: builtin/pack-objects.c:2854
msgid "create packs suitable for shallow fetches"
msgstr ""
-#: builtin/pack-objects.c:2708
+#: builtin/pack-objects.c:2856
msgid "ignore packs that have companion .keep file"
msgstr ""
-#: builtin/pack-objects.c:2710
+#: builtin/pack-objects.c:2858
msgid "pack compression level"
msgstr ""
-#: builtin/pack-objects.c:2712
+#: builtin/pack-objects.c:2860
msgid "do not hide commits by grafts"
msgstr ""
-#: builtin/pack-objects.c:2714
+#: builtin/pack-objects.c:2862
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
-#: builtin/pack-objects.c:2716
+#: builtin/pack-objects.c:2864
msgid "write a bitmap index together with the pack index"
msgstr ""
-#: builtin/pack-objects.c:2829
+#: builtin/pack-objects.c:2993
msgid "Counting objects"
msgstr ""
msgid "cannot prune in a precious-objects repo"
msgstr ""
-#: builtin/pull.c:72
+#: builtin/pull.c:51 builtin/pull.c:53
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr ""
+
+#: builtin/pull.c:73
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/pull.c:120
+#: builtin/pull.c:121
msgid "Options related to merging"
msgstr ""
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "incorporate changes by rebasing rather than merging"
msgstr ""
-#: builtin/pull.c:147 builtin/revert.c:101
+#: builtin/pull.c:148 builtin/revert.c:101
msgid "allow fast-forward"
msgstr ""
-#: builtin/pull.c:156
+#: builtin/pull.c:157
msgid "automatically stash/stash pop before and after rebase"
msgstr ""
-#: builtin/pull.c:172
+#: builtin/pull.c:173
msgid "Options related to fetching"
msgstr ""
-#: builtin/pull.c:194
+#: builtin/pull.c:195
msgid "number of submodules pulled in parallel"
msgstr ""
-#: builtin/pull.c:283
+#: builtin/pull.c:284
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr ""
-#: builtin/pull.c:379 git-sh-setup.sh:226
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr ""
-
-#: builtin/pull.c:385 git-sh-setup.sh:252
-msgid "Additionally, your index contains uncommitted changes."
-msgstr ""
-
-#: builtin/pull.c:387 git-sh-setup.sh:245
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-
-#: builtin/pull.c:463
+#: builtin/pull.c:397
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr ""
-#: builtin/pull.c:465
+#: builtin/pull.c:399
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
-#: builtin/pull.c:466
+#: builtin/pull.c:400
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr ""
-#: builtin/pull.c:469
+#: builtin/pull.c:403
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"for your current branch, you must specify a branch on the command line."
msgstr ""
-#: builtin/pull.c:474 git-parse-remote.sh:73
+#: builtin/pull.c:408 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr ""
-#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
+#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr ""
-#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
+#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr ""
-#: builtin/pull.c:479 builtin/pull.c:494
+#: builtin/pull.c:413 builtin/pull.c:428
msgid "See git-pull(1) for details."
msgstr ""
-#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr ""
-#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451
+#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr ""
-#: builtin/pull.c:489 git-parse-remote.sh:75
+#: builtin/pull.c:423 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr ""
-#: builtin/pull.c:498 git-parse-remote.sh:95
+#: builtin/pull.c:432 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
-#: builtin/pull.c:503
+#: builtin/pull.c:437
#, 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:820
+#: builtin/pull.c:754
msgid "ignoring --verify-signatures for rebase"
msgstr ""
-#: builtin/pull.c:867
+#: builtin/pull.c:801
msgid "--[no-]autostash option is only valid with --rebase."
msgstr ""
-#: builtin/pull.c:875
+#: builtin/pull.c:809
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
-#: builtin/pull.c:903
+#: builtin/pull.c:812
+msgid "pull with rebase"
+msgstr ""
+
+#: builtin/pull.c:813
+msgid "please commit or stash them."
+msgstr ""
+
+#: builtin/pull.c:838
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"commit %s."
msgstr ""
-#: builtin/pull.c:908
+#: builtin/pull.c:843
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"to recover."
msgstr ""
-#: builtin/pull.c:923
+#: builtin/pull.c:858
msgid "Cannot merge multiple branches into empty head."
msgstr ""
-#: builtin/pull.c:927
+#: builtin/pull.c:862
msgid "Cannot rebase onto multiple branches."
msgstr ""
msgid "debug unpack-trees"
msgstr ""
-#: builtin/receive-pack.c:25
+#: builtin/receive-pack.c:26
msgid "git receive-pack <git-dir>"
msgstr ""
-#: builtin/receive-pack.c:1843
+#: builtin/receive-pack.c:793
+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 'receive.denyCurrentBranch' configuration variable to\n"
+"'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:813
+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:1883
msgid "quiet"
msgstr ""
-#: builtin/receive-pack.c:1857
+#: builtin/receive-pack.c:1897
msgid "You must specify a directory."
msgstr ""
msgid " Fetch URL: %s"
msgstr ""
-#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296
+#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
msgid "(no URL)"
msgstr ""
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1179 builtin/remote.c:1206
+#: builtin/remote.c:1179 builtin/remote.c:1205
msgid " (status not queried)"
msgstr ""
msgid " Local refs will be mirrored by 'git push'"
msgstr ""
-#: builtin/remote.c:1203
+#: builtin/remote.c:1202
#, 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:1224
+#: builtin/remote.c:1223
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr ""
-#: builtin/remote.c:1226
+#: builtin/remote.c:1225
msgid "delete refs/remotes/<name>/HEAD"
msgstr ""
-#: builtin/remote.c:1241
+#: builtin/remote.c:1240
msgid "Cannot determine remote HEAD"
msgstr ""
-#: builtin/remote.c:1243
+#: builtin/remote.c:1242
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
-#: builtin/remote.c:1253
+#: builtin/remote.c:1252
#, c-format
msgid "Could not delete %s"
msgstr ""
-#: builtin/remote.c:1261
+#: builtin/remote.c:1260
#, c-format
msgid "Not a valid ref: %s"
msgstr ""
-#: builtin/remote.c:1263
+#: builtin/remote.c:1262
#, c-format
msgid "Could not setup %s"
msgstr ""
-#: builtin/remote.c:1281
+#: builtin/remote.c:1280
#, c-format
msgid " %s will become dangling!"
msgstr ""
-#: builtin/remote.c:1282
+#: builtin/remote.c:1281
#, c-format
msgid " %s has become dangling!"
msgstr ""
-#: builtin/remote.c:1292
+#: builtin/remote.c:1291
#, c-format
msgid "Pruning %s"
msgstr ""
-#: builtin/remote.c:1293
+#: builtin/remote.c:1292
#, c-format
msgid "URL: %s"
msgstr ""
-#: builtin/remote.c:1309
+#: builtin/remote.c:1308
#, c-format
msgid " * [would prune] %s"
msgstr ""
-#: builtin/remote.c:1312
+#: builtin/remote.c:1311
#, c-format
msgid " * [pruned] %s"
msgstr ""
-#: builtin/remote.c:1357
+#: builtin/remote.c:1356
msgid "prune remotes after fetching"
msgstr ""
-#: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542
+#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
#, c-format
msgid "No such remote '%s'"
msgstr ""
-#: builtin/remote.c:1436
+#: builtin/remote.c:1435
msgid "add branch"
msgstr ""
-#: builtin/remote.c:1443
+#: builtin/remote.c:1442
msgid "no remote specified"
msgstr ""
-#: builtin/remote.c:1460
+#: builtin/remote.c:1459
msgid "query push URLs rather than fetch URLs"
msgstr ""
-#: builtin/remote.c:1462
+#: builtin/remote.c:1461
msgid "return all URLs"
msgstr ""
-#: builtin/remote.c:1490
+#: builtin/remote.c:1489
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr ""
-#: builtin/remote.c:1516
+#: builtin/remote.c:1515
msgid "manipulate push URLs"
msgstr ""
-#: builtin/remote.c:1518
+#: builtin/remote.c:1517
msgid "add URL"
msgstr ""
-#: builtin/remote.c:1520
+#: builtin/remote.c:1519
msgid "delete URLs"
msgstr ""
-#: builtin/remote.c:1527
+#: builtin/remote.c:1526
msgid "--add --delete doesn't make sense"
msgstr ""
-#: builtin/remote.c:1568
+#: builtin/remote.c:1567
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr ""
-#: builtin/remote.c:1576
+#: builtin/remote.c:1575
#, c-format
msgid "No such URL found: %s"
msgstr ""
-#: builtin/remote.c:1578
+#: builtin/remote.c:1577
msgid "Will not delete all non-push URLs"
msgstr ""
-#: builtin/remote.c:1592
+#: builtin/remote.c:1591
msgid "be verbose; must be placed before a subcommand"
msgstr ""
+#: builtin/remote.c:1622
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr ""
+
#: builtin/repack.c:17
msgid "git repack [<options>]"
msgstr ""
msgstr ""
#: builtin/reset.c:27
-msgid "git reset [-q]
<tree-ish> [--] <paths>..."
+msgid "git reset [-q]
[<tree-ish>] [--] <paths>..."
msgstr ""
#: builtin/reset.c:28
msgid "Could not write new index file."
msgstr ""
-#: builtin/rev-list.c:362
+#: builtin/rev-list.c:354
msgid "rev-list does not support display of notes"
msgstr ""
-#: builtin/rev-parse.c:358
+#: builtin/rev-parse.c:386
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr ""
-#: builtin/rev-parse.c:363
+#: builtin/rev-parse.c:391
msgid "keep the `--` passed as an arg"
msgstr ""
-#: builtin/rev-parse.c:365
+#: builtin/rev-parse.c:393
msgid "stop parsing after the first non-option argument"
msgstr ""
-#: builtin/rev-parse.c:368
+#: builtin/rev-parse.c:396
msgid "output in stuck long form"
msgstr ""
-#: builtin/rev-parse.c:499
+#: builtin/rev-parse.c:527
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
msgid "revert failed"
msgstr ""
-#: builtin/revert.c:207
+#: builtin/revert.c:205
msgid "cherry-pick failed"
msgstr ""
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr ""
-#: builtin/show-branch.c:640
+#: builtin/show-branch.c:375
+#, 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:541
+#, c-format
+msgid "no matching refs with %s"
+msgstr ""
+
+#: builtin/show-branch.c:639
msgid "show remote-tracking and local branches"
msgstr ""
-#: builtin/show-branch.c:642
+#: builtin/show-branch.c:641
msgid "show remote-tracking branches"
msgstr ""
-#: builtin/show-branch.c:644
+#: builtin/show-branch.c:643
msgid "color '*!+-' corresponding to the branch"
msgstr ""
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show <n> more commits after the common ancestor"
msgstr ""
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "synonym to more=-1"
msgstr ""
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
msgid "suppress naming strings"
msgstr ""
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
msgid "include the current branch"
msgstr ""
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
msgid "name commits with their object names"
msgstr ""
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "show possible merge bases"
msgstr ""
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "show refs unreachable from any other ref"
msgstr ""
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "show commits in topological order"
msgstr ""
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
msgid "show only commits not on the first branch"
msgstr ""
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
msgid "show merges reachable from only one tip"
msgstr ""
-#: builtin/show-branch.c:666
+#: builtin/show-branch.c:665
msgid "topologically sort, maintaining date order where possible"
msgstr ""
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
msgid "<n>[,<base>]"
msgstr ""
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
msgid "show <n> most recent ref-log entries starting at base"
msgstr ""
+#: builtin/show-branch.c:703
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+msgstr ""
+
+#: builtin/show-branch.c:727
+msgid "no branches given, and HEAD is not valid"
+msgstr ""
+
+#: builtin/show-branch.c:730
+msgid "--reflog option needs one branch name"
+msgstr ""
+
+#: builtin/show-branch.c:733
+#, 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:737
+#, c-format
+msgid "no such ref %s"
+msgstr ""
+
+#: builtin/show-branch.c:829
+#, 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:833
+#, c-format
+msgid "'%s' is not a valid ref."
+msgstr ""
+
+#: builtin/show-branch.c:836
+#, c-format
+msgid "cannot find commit %s (%s)"
+msgstr ""
+
#: builtin/show-ref.c:10
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
msgid "prepend comment character and space to each line"
msgstr ""
-#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:923
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1046
#, c-format
msgid "No such ref: %s"
msgstr ""
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr ""
msgid "cannot strip one component off url '%s'"
msgstr ""
-#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403
-#: builtin/submodule--helper.c:483
+#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408
+#: builtin/submodule--helper.c:590
msgid "alternative anchor for relative paths"
msgstr ""
-#: builtin/submodule--helper.c:283
+#: builtin/submodule--helper.c:287
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338
+#: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr ""
-#: builtin/submodule--helper.c:364
+#: builtin/submodule--helper.c:369
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:368
+#: builtin/submodule--helper.c:373
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:378
+#: builtin/submodule--helper.c:383
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:385
+#: builtin/submodule--helper.c:390
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:404
+#: builtin/submodule--helper.c:409
msgid "Suppress output for initializing a submodule"
msgstr ""
-#: builtin/submodule--helper.c:409
+#: builtin/submodule--helper.c:414
msgid "git submodule--helper init [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:430
+#: builtin/submodule--helper.c:435
msgid "git submodule--helper name <path>"
msgstr ""
-#: builtin/submodule--helper.c:436
+#: builtin/submodule--helper.c:441
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:486
+#: builtin/submodule--helper.c:524 builtin/submodule--helper.c:527
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:563
+#, c-format
+msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+msgstr ""
+
+#: builtin/submodule--helper.c:570
+#, c-format
+msgid "Value '%s' for submodule.alternateLocation is not recognized"
+msgstr ""
+
+#: builtin/submodule--helper.c:593
msgid "where the new submodule will be cloned to"
msgstr ""
-#: builtin/submodule--helper.c:489
+#: builtin/submodule--helper.c:596
msgid "name of the new submodule"
msgstr ""
-#: builtin/submodule--helper.c:492
+#: builtin/submodule--helper.c:599
msgid "url where to clone the submodule from"
msgstr ""
-#: builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:605
msgid "depth for shallow clones"
msgstr ""
-#: builtin/submodule--helper.c:504
+#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964
+msgid "force cloning progress"
+msgstr ""
+
+#: builtin/submodule--helper.c:613
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
msgstr ""
-#: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535
+#: builtin/submodule--helper.c:638 builtin/submodule--helper.c:648
#, c-format
msgid "could not create directory '%s'"
msgstr ""
-#: builtin/submodule--helper.c:531
+#: builtin/submodule--helper.c:644
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr ""
-#: builtin/submodule--helper.c:547
+#: builtin/submodule--helper.c:660
#, c-format
msgid "cannot open file '%s'"
msgstr ""
-#: builtin/submodule--helper.c:552
+#: builtin/submodule--helper.c:665
#, c-format
msgid "could not close file %s"
msgstr ""
-#: builtin/submodule--helper.c:559
+#: builtin/submodule--helper.c:672
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr ""
-#: builtin/submodule--helper.c:611
+#: builtin/submodule--helper.c:726
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr ""
-#: builtin/submodule--helper.c:615
+#: builtin/submodule--helper.c:730
msgid "Maybe you want to use 'update --init'?"
msgstr ""
-#: builtin/submodule--helper.c:641
+#: builtin/submodule--helper.c:756
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr ""
-#: builtin/submodule--helper.c:662
+#: builtin/submodule--helper.c:777
#, c-format
msgid "Skipping submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:792
+#: builtin/submodule--helper.c:913
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr ""
-#: builtin/submodule--helper.c:803
+#: builtin/submodule--helper.c:924
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr ""
-#: builtin/submodule--helper.c:824
+#: builtin/submodule--helper.c:945
msgid "path into the working tree"
msgstr ""
-#: builtin/submodule--helper.c:827
+#: builtin/submodule--helper.c:948
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
-#: builtin/submodule--helper.c:831
+#: builtin/submodule--helper.c:952
msgid "rebase, merge, checkout or none"
msgstr ""
-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:956
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr ""
-#: builtin/submodule--helper.c:838
+#: builtin/submodule--helper.c:959
msgid "parallel jobs"
msgstr ""
-#: builtin/submodule--helper.c:840
+#: builtin/submodule--helper.c:961
msgid "whether the initial clone should follow the shallow recommendation"
msgstr ""
-#: builtin/submodule--helper.c:841
+#: builtin/submodule--helper.c:962
msgid "don't print cloning progress"
msgstr ""
-#: builtin/submodule--helper.c:846
+#: builtin/submodule--helper.c:969
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:856
+#: builtin/submodule--helper.c:979
msgid "bad value for update parameter"
msgstr ""
-#: builtin/submodule--helper.c:927
+#: builtin/submodule--helper.c:1050
#, 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:977
+#: builtin/submodule--helper.c:1100
msgid "submodule--helper subcommand must be called with a subcommand"
msgstr ""
-#: builtin/submodule--helper.c:984
+#: builtin/submodule--helper.c:1107
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr ""
msgid "Updated tag '%s' (was %s)\n"
msgstr ""
-#: builtin/unpack-objects.c:490
+#: builtin/unpack-objects.c:493
msgid "Unpacking objects"
msgstr ""
msgid " OK"
msgstr ""
-#: builtin/update-index.c:575
+#: builtin/update-index.c:564
msgid "git update-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/update-index.c:930
+#: builtin/update-index.c:919
msgid "continue refresh even when index needs update"
msgstr ""
-#: builtin/update-index.c:933
+#: builtin/update-index.c:922
msgid "refresh: ignore submodules"
msgstr ""
-#: builtin/update-index.c:936
+#: builtin/update-index.c:925
msgid "do not ignore new files"
msgstr ""
-#: builtin/update-index.c:938
+#: builtin/update-index.c:927
msgid "let files replace directories and vice-versa"
msgstr ""
-#: builtin/update-index.c:940
+#: builtin/update-index.c:929
msgid "notice files missing from worktree"
msgstr ""
-#: builtin/update-index.c:942
+#: builtin/update-index.c:931
msgid "refresh even if index contains unmerged entries"
msgstr ""
-#: builtin/update-index.c:945
+#: builtin/update-index.c:934
msgid "refresh stat information"
msgstr ""
-#: builtin/update-index.c:949
+#: builtin/update-index.c:938
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
-#: builtin/update-index.c:953
+#: builtin/update-index.c:942
msgid "<mode>,<object>,<path>"
msgstr ""
-#: builtin/update-index.c:954
+#: builtin/update-index.c:943
msgid "add the specified entry to the index"
msgstr ""
-#: builtin/update-index.c:963
+#: builtin/update-index.c:952
msgid "mark files as \"not changing\""
msgstr ""
-#: builtin/update-index.c:966
+#: builtin/update-index.c:955
msgid "clear assumed-unchanged bit"
msgstr ""
-#: builtin/update-index.c:969
+#: builtin/update-index.c:958
msgid "mark files as \"index-only\""
msgstr ""
-#: builtin/update-index.c:972
+#: builtin/update-index.c:961
msgid "clear skip-worktree bit"
msgstr ""
-#: builtin/update-index.c:975
+#: builtin/update-index.c:964
msgid "add to index only; do not add content to object database"
msgstr ""
-#: builtin/update-index.c:977
+#: builtin/update-index.c:966
msgid "remove named paths even if present in worktree"
msgstr ""
-#: builtin/update-index.c:979
+#: builtin/update-index.c:968
msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
-#: builtin/update-index.c:981
+#: builtin/update-index.c:970
msgid "read list of paths to be updated from standard input"
msgstr ""
-#: builtin/update-index.c:985
+#: builtin/update-index.c:974
msgid "add entries from standard input to the index"
msgstr ""
-#: builtin/update-index.c:989
+#: builtin/update-index.c:978
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
-#: builtin/update-index.c:993
+#: builtin/update-index.c:982
msgid "only update entries that differ from HEAD"
msgstr ""
-#: builtin/update-index.c:997
+#: builtin/update-index.c:986
msgid "ignore files missing from worktree"
msgstr ""
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:989
msgid "report actions to standard output"
msgstr ""
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:991
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:995
msgid "write index in this format"
msgstr ""
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:997
msgid "enable or disable split index"
msgstr ""
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:999
msgid "enable/disable untracked cache"
msgstr ""
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1001
msgid "test if the filesystem supports untracked cache"
msgstr ""
-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1003
msgid "enable untracked cache without testing the filesystem"
msgstr ""
-#: builtin/update-index.c:1134
+#: builtin/update-index.c:1119
+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:1123
msgid "Untracked cache disabled"
msgstr ""
-#: builtin/update-index.c:1146
+#: builtin/update-index.c:1131
+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:1135
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr ""
msgid "only useful for debugging"
msgstr ""
-#: upload-pack.c:20
+#: upload-pack.c:22
msgid "git upload-pack [<options>] <dir>"
msgstr ""
-#: upload-pack.c:837
+#: upload-pack.c:1028
msgid "quit after a single request/response exchange"
msgstr ""
-#: upload-pack.c:839
+#: upload-pack.c:1030
msgid "exit immediately after initial ref advertisement"
msgstr ""
-#: upload-pack.c:841
+#: upload-pack.c:1032
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr ""
-#: upload-pack.c:843
+#: upload-pack.c:1034
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr ""
+#: credential-cache--daemon.c:223
+#, 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 ""
+
#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr ""
"to read about a specific subcommand or concept."
msgstr ""
-#: http.c:323
+#: http.c:342
+msgid "Delegation control is not supported with cURL < 7.22.0"
+msgstr ""
+
+#: http.c:351
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr ""
msgid "no-op (backward compatibility)"
msgstr ""
-#: parse-options.h:237
+#: parse-options.h:238
msgid "be more verbose"
msgstr ""
-#: parse-options.h:239
+#: parse-options.h:240
msgid "be more quiet"
msgstr ""
-#: parse-options.h:245
+#: parse-options.h:246
msgid "use <n> digits to display SHA-1s"
msgstr ""
msgstr ""
#: git-merge-octopus.sh:62
-msgid "Should not be doing an Octopus."
+msgid "Should not be doing an octopus."
msgstr ""
#: git-merge-octopus.sh:73
msgid "Cannot save the current index state"
msgstr ""
+#: git-stash.sh:103
+msgid "Cannot save the untracked files"
+msgstr ""
+
#: git-stash.sh:123 git-stash.sh:136
msgid "Cannot save the current worktree state"
msgstr ""
" To provide a message, use git stash save -- '$option'"
msgstr ""
+#: git-stash.sh:251
+msgid "Can't use --patch and --include-untracked or --all at the same time"
+msgstr ""
+
#: git-stash.sh:259
msgid "No local changes to save"
msgstr ""
msgid "Cannot remove worktree changes"
msgstr ""
-#: git-stash.sh:404
+#: git-stash.sh:403
#, sh-format
msgid "unknown option: $opt"
msgstr ""
-#: git-stash.sh:414
+#: git-stash.sh:416
msgid "No stash found."
msgstr ""
-#: git-stash.sh:421
+#: git-stash.sh:423
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr ""
-#: git-stash.sh:427
+#: git-stash.sh:438
#, sh-format
msgid "$reference is not a valid reference"
msgstr ""
-#: git-stash.sh:455
+#: git-stash.sh:466
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr ""
-#: git-stash.sh:466
+#: git-stash.sh:477
#, sh-format
msgid "'$args' is not a stash reference"
msgstr ""
-#: git-stash.sh:474
+#: git-stash.sh:485
msgid "unable to refresh index"
msgstr ""
-#: git-stash.sh:478
+#: git-stash.sh:489
msgid "Cannot apply a stash in the middle of a merge"
msgstr ""
-#: git-stash.sh:486
+#: git-stash.sh:497
msgid "Conflicts in index. Try without --index."
msgstr ""
-#: git-stash.sh:488
+#: git-stash.sh:499
msgid "Could not save index tree"
msgstr ""
-#: git-stash.sh:522
+#: git-stash.sh:508
+msgid "Could not restore untracked files from stash"
+msgstr ""
+
+#: git-stash.sh:533
msgid "Cannot unstage modified files"
msgstr ""
-#: git-stash.sh:537
+#: git-stash.sh:548
msgid "Index was not unstashed."
msgstr ""
-#: git-stash.sh:551
+#: git-stash.sh:562
msgid "The stash is kept in case you need it again."
msgstr ""
-#: git-stash.sh:560
+#: git-stash.sh:571
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr ""
-#: git-stash.sh:561
+#: git-stash.sh:572
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr ""
-#: git-stash.sh:569
+#: git-stash.sh:580
msgid "No branch name specified"
msgstr ""
-#: git-stash.sh:641
+#: git-stash.sh:652
msgid "(To restore them type \"git stash apply\")"
msgstr ""
-#: git-submodule.sh:183
+#: git-submodule.sh:184
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
-#: git-submodule.sh:193
+#: git-submodule.sh:194
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
-#: git-submodule.sh:210
+#: git-submodule.sh:211
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr ""
-#: git-submodule.sh:214
+#: git-submodule.sh:215
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
"Use -f if you really want to add it."
msgstr ""
-#: git-submodule.sh:232
+#: git-submodule.sh:233
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr ""
-#: git-submodule.sh:234
+#: git-submodule.sh:235
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr ""
-#: git-submodule.sh:242
+#: git-submodule.sh:243
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
-#: git-submodule.sh:244
+#: git-submodule.sh:245
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
"option."
msgstr ""
-#: git-submodule.sh:250
+#: git-submodule.sh:251
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr ""
-#: git-submodule.sh:262
+#: git-submodule.sh:263
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:267
+#: git-submodule.sh:268
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:276
+#: git-submodule.sh:277
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:323
+#: git-submodule.sh:324
#, sh-format
msgid "Entering '$displaypath'"
msgstr ""
-#: git-submodule.sh:343
+#: git-submodule.sh:344
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr ""
-#: git-submodule.sh:414
+#: git-submodule.sh:415
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr ""
-#: git-submodule.sh:419
+#: git-submodule.sh:420
#, sh-format
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
-#: git-submodule.sh:439
+#: git-submodule.sh:440
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains a .git directory\n"
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
-#: git-submodule.sh:447
+#: git-submodule.sh:448
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
"discard them"
msgstr ""
-#: git-submodule.sh:450
+#: git-submodule.sh:451
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr ""
-#: git-submodule.sh:451
+#: git-submodule.sh:452
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr ""
-#: git-submodule.sh:454
+#: git-submodule.sh:455
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr ""
-#: git-submodule.sh:463
+#: git-submodule.sh:464
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
-#: git-submodule.sh:612
+#: git-submodule.sh:617
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:622
+#: git-submodule.sh:627
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:627
+#: git-submodule.sh:632
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr ""
-#: git-submodule.sh:645
+#: git-submodule.sh:650
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:651
+#: git-submodule.sh:656
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Direct fetching of that commit failed."
msgstr ""
-#: git-submodule.sh:658
+#: git-submodule.sh:663
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:659
+#: git-submodule.sh:664
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr ""
-#: git-submodule.sh:663
+#: git-submodule.sh:668
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:664
+#: git-submodule.sh:669
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr ""
-#: git-submodule.sh:669
+#: git-submodule.sh:674
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:670
+#: git-submodule.sh:675
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr ""
-#: git-submodule.sh:675
+#: git-submodule.sh:680
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:676
+#: git-submodule.sh:681
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr ""
-#: git-submodule.sh:707
+#: git-submodule.sh:712
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:815
+#: git-submodule.sh:820
msgid "The --cached option cannot be used with the --files option"
msgstr ""
-#: git-submodule.sh:867
+#: git-submodule.sh:872
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
-#: git-submodule.sh:887
+#: git-submodule.sh:892
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
-#: git-submodule.sh:890
+#: git-submodule.sh:895
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
-#: git-submodule.sh:893
+#: git-submodule.sh:898
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
-#: git-submodule.sh:918
-msgid "blob"
-msgstr ""
-
-#: git-submodule.sh:1040
+#: git-submodule.sh:1045
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:1107
+#: git-submodule.sh:1112
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr ""
msgid "See git-${cmd}(1) for details."
msgstr ""
-#: git-rebase--interactive.sh:131
+#: git-rebase--interactive.sh:140
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr ""
-#: git-rebase--interactive.sh:147
+#: git-rebase--interactive.sh:156
msgid ""
"\n"
"Commands:\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
-#: git-rebase--interactive.sh:162
+#: git-rebase--interactive.sh:171
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
msgstr ""
-#: git-rebase--interactive.sh:166
+#: git-rebase--interactive.sh:175
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
msgstr ""
-#: git-rebase--interactive.sh:202
+#: git-rebase--interactive.sh:211
#, sh-format
msgid ""
"You can amend the commit now, with\n"
"\tgit rebase --continue"
msgstr ""
-#: git-rebase--interactive.sh:227
+#: git-rebase--interactive.sh:236
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr ""
-#: git-rebase--interactive.sh:266
+#: git-rebase--interactive.sh:275
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr ""
-#: git-rebase--interactive.sh:308
+#: git-rebase--interactive.sh:317
msgid "Cannot write current commit's replacement sha1"
msgstr ""
-#: git-rebase--interactive.sh:360
+#: git-rebase--interactive.sh:369
#, sh-format
msgid "Fast-forward to $sha1"
msgstr ""
-#: git-rebase--interactive.sh:362
+#: git-rebase--interactive.sh:371
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr ""
-#: git-rebase--interactive.sh:371
+#: git-rebase--interactive.sh:380
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr ""
-#: git-rebase--interactive.sh:376
+#: git-rebase--interactive.sh:385
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr ""
-#: git-rebase--interactive.sh:390
+#: git-rebase--interactive.sh:399
#, sh-format
msgid "Error redoing merge $sha1"
msgstr ""
-#: git-rebase--interactive.sh:398
+#: git-rebase--interactive.sh:407
#, sh-format
msgid "Could not pick $sha1"
msgstr ""
-#: git-rebase--interactive.sh:407
+#: git-rebase--interactive.sh:416
#, sh-format
msgid "This is the commit message #${n}:"
msgstr ""
-#: git-rebase--interactive.sh:412
+#: git-rebase--interactive.sh:421
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr ""
-#: git-rebase--interactive.sh:423
+#: git-rebase--interactive.sh:432
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] ""
msgstr[1] ""
-#: git-rebase--interactive.sh:431
+#: git-rebase--interactive.sh:440
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr ""
-#: git-rebase--interactive.sh:434
+#: git-rebase--interactive.sh:443
msgid "This is a combination of 2 commits."
msgstr ""
-#: git-rebase--interactive.sh:435
+#: git-rebase--interactive.sh:444
msgid "This is the 1st commit message:"
msgstr ""
-#: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518
-#: git-rebase--interactive.sh:521
+#: git-rebase--interactive.sh:484 git-rebase--interactive.sh:527
+#: git-rebase--interactive.sh:530
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr ""
-#: git-rebase--interactive.sh:549
+#: git-rebase--interactive.sh:558
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
"you are able to reword the commit."
msgstr ""
-#: git-rebase--interactive.sh:564
+#: git-rebase--interactive.sh:573
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr ""
-#: git-rebase--interactive.sh:579
+#: git-rebase--interactive.sh:588
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr ""
-#: git-rebase--interactive.sh:621
+#: git-rebase--interactive.sh:630
#, sh-format
msgid "Executing: $rest"
msgstr ""
-#: git-rebase--interactive.sh:629
+#: git-rebase--interactive.sh:638
#, sh-format
msgid "Execution failed: $rest"
msgstr ""
-#: git-rebase--interactive.sh:631
+#: git-rebase--interactive.sh:640
msgid "and made changes to the index and/or the working tree"
msgstr ""
-#: git-rebase--interactive.sh:633
+#: git-rebase--interactive.sh:642
msgid ""
"You can fix the problem, and then run\n"
"\n"
msgstr ""
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:646
+#: git-rebase--interactive.sh:655
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"\tgit rebase --continue"
msgstr ""
-#: git-rebase--interactive.sh:657
+#: git-rebase--interactive.sh:666
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr ""
-#: git-rebase--interactive.sh:658
+#: git-rebase--interactive.sh:667
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: git-rebase--interactive.sh:693
+#: git-rebase--interactive.sh:702
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr ""
-#: git-rebase--interactive.sh:740
+#: git-rebase--interactive.sh:749
msgid "Could not skip unnecessary pick commands"
msgstr ""
-#: git-rebase--interactive.sh:898
+#: git-rebase--interactive.sh:907
#, sh-format
msgid ""
"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
" - $line"
msgstr ""
-#: git-rebase--interactive.sh:931
+#: git-rebase--interactive.sh:940
#, sh-format
msgid ""
"Warning: the command isn't recognized in the following line:\n"
" - $line"
msgstr ""
-#: git-rebase--interactive.sh:970
+#: git-rebase--interactive.sh:979
msgid "could not detach HEAD"
msgstr ""
-#: git-rebase--interactive.sh:1008
+#: git-rebase--interactive.sh:1017
msgid ""
"Warning: some commits may have been dropped accidentally.\n"
"Dropped commits (newer to older):"
msgstr ""
-#: git-rebase--interactive.sh:1016
+#: git-rebase--interactive.sh:1025
msgid ""
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
"\n"
"The possible behaviours are: ignore, warn, error."
msgstr ""
-#: git-rebase--interactive.sh:1027
+#: git-rebase--interactive.sh:1036
#, sh-format
msgid ""
"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
"Ignoring."
msgstr ""
-#: git-rebase--interactive.sh:1044
-msgid "You can fix this with 'git rebase --edit-todo'."
+#: git-rebase--interactive.sh:1053
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'."
msgstr ""
-#: git-rebase--interactive.sh:1045
+#: git-rebase--interactive.sh:1054
msgid "Or you can abort the rebase with 'git rebase --abort'."
msgstr ""
-#: git-rebase--interactive.sh:1069
+#: git-rebase--interactive.sh:1078
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: git-rebase--interactive.sh:1074
+#: git-rebase--interactive.sh:1083
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
"\n"
" git commit $gpg_sign_opt_quoted\n"
"\n"
-"In both case, once you're done, continue with:\n"
+"In both cases, once you're done, continue with:\n"
"\n"
" git rebase --continue\n"
msgstr ""
-#: git-rebase--interactive.sh:1091
+#: git-rebase--interactive.sh:1100
msgid "Error trying to find the author identity to amend commit"
msgstr ""
-#: git-rebase--interactive.sh:1096
+#: git-rebase--interactive.sh:1105
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
-#: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:1110 git-rebase--interactive.sh:1114
msgid "Could not commit staged changes."
msgstr ""
-#: git-rebase--interactive.sh:1129
+#: git-rebase--interactive.sh:1138
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
"\n"
msgstr ""
-#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1298
+#: git-rebase--interactive.sh:1146 git-rebase--interactive.sh:1304
msgid "Could not execute editor"
msgstr ""
-#: git-rebase--interactive.sh:1145
-msgid "You need to set your committer info first"
-msgstr ""
-
-#: git-rebase--interactive.sh:1153
+#: git-rebase--interactive.sh:1159
#, sh-format
msgid "Could not checkout $switch_to"
msgstr ""
-#: git-rebase--interactive.sh:1158
+#: git-rebase--interactive.sh:1164
msgid "No HEAD?"
msgstr ""
-#: git-rebase--interactive.sh:1159
+#: git-rebase--interactive.sh:1165
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr ""
-#: git-rebase--interactive.sh:1161
+#: git-rebase--interactive.sh:1167
msgid "Could not mark as interactive"
msgstr ""
-#: git-rebase--interactive.sh:1171 git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:1177 git-rebase--interactive.sh:1182
msgid "Could not init rewritten commits"
msgstr ""
-#: git-rebase--interactive.sh:1276
+#: git-rebase--interactive.sh:1282
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] ""
msgstr[1] ""
-#: git-rebase--interactive.sh:1281
+#: git-rebase--interactive.sh:1287
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"\n"
msgstr ""
-#: git-rebase--interactive.sh:1288
+#: git-rebase--interactive.sh:1294
msgid "Note that empty commits are commented out"
msgstr ""
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
+#: git-sh-setup.sh:226
+msgid "Cannot pull with rebase: You have unstaged changes."
+msgstr ""
+
#: git-sh-setup.sh:229
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr ""
+#: git-sh-setup.sh:245
+msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+msgstr ""
+
#: git-sh-setup.sh:248
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
+#: git-sh-setup.sh:252
+msgid "Additionally, your index contains uncommitted changes."
+msgstr ""
+
#: git-sh-setup.sh:372
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
msgstr ""
"Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-08-15 22:43+0800\n"
-"PO-Revision-Date: 2016-08-21 22:41+0900\n"
+"POT-Creation-Date: 2016-11-25 22:50+0800\n"
+"PO-Revision-Date: 2016-11-25 22:56+0800\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Git Korean translation <http://github.com/changwoo/git-l10n-"
"ko>\n"
" git checkout -b <새-브랜치-이름>\n"
"\n"
-#: archive.c:12
-msgid "git archive [<options>] <tree-ish> [<path>...]"
-msgstr "git archive [<옵션>] <트리-따위> [<경로>...]"
+#: apply.c:57
+#, c-format
+msgid "unrecognized whitespace option '%s'"
+msgstr "알 수 없는 공백 옵션 '%s'"
-#: archive.c:13
-msgid "git archive --list"
-msgstr "git archive --list"
+#: apply.c:73
+#, c-format
+msgid "unrecognized whitespace ignore option '%s'"
+msgstr "알 수 없는 공백 무시 옵션 '%s'"
-#: archive.c:14
-msgid ""
-"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
-msgstr ""
-"git archive --remote <저장소> [--exec <명령>] [<옵션>] <트리-따위> [<경로"
-">...]"
+#: apply.c:125
+msgid "--reject and --3way cannot be used together."
+msgstr "--reject 및 --3way 옵션은 같이 쓸 수 없습니다."
-#: archive.c:15
-msgid "git archive --remote <repo> [--exec <cmd>] --list"
-msgstr "git archive --remote <저장소> [--exec <명령>] --list"
+#: apply.c:127
+msgid "--cached and --3way cannot be used together."
+msgstr "--cached 및 --3way 옵션은 같이 쓸 수 없습니다."
-#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327
-#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr "'%s' 경로명세가 어떤 파일과도 일치하지 않습니다"
+#: apply.c:130
+msgid "--3way outside a repository"
+msgstr "저장소 밖에서 --3way 옵션 사용"
-#: archive.c:429
-msgid "fmt"
-msgstr "형식"
+#: apply.c:141
+msgid "--index outside a repository"
+msgstr "저장소 밖에서 --index 옵션 사용"
-#: archive.c:429
-msgid "archive format"
-msgstr "ì\95\95ì¶\95 í\98\95ì\8b\9d"
+#: apply.c:144
+msgid "--cached outside a repository"
+msgstr "ì \80ì\9e¥ì\86\8c ë°\96ì\97\90ì\84\9c --cached ì\98µì\85\98 ì\82¬ì\9a©"
-#: archive.c:430 builtin/log.c:1422
-msgid "prefix"
-msgstr "접두어"
+#: apply.c:845
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr "타임스탬프 정규식을 준비할 수 없습니다 (%s)"
-#: archive.c:431
-msgid "prepend prefix to each pathname in the archive"
-msgstr "아카이브의 각 경로 이름의 앞에 지정한 경로를 붙입니다"
+#: apply.c:854
+#, c-format
+msgid "regexec returned %d for input: %s"
+msgstr "regexec()에서 다음 입력에 대해 %d번을 리턴했습니다: %s"
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553 builtin/blame.c:2554
-#: builtin/config.c:59 builtin/fast-export.c:987 builtin/fast-export.c:989
-#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:460
-#: builtin/ls-files.c:463 builtin/notes.c:399 builtin/notes.c:562
-#: builtin/read-tree.c:109 parse-options.h:153
-msgid "file"
-msgstr "파일"
+#: apply.c:938
+#, c-format
+msgid "unable to find filename in patch at line %d"
+msgstr "패치의 %d번 줄에 파일 이름을 찾을 수 없습니다"
-#: archive.c:433 builtin/archive.c:89
-msgid "write the archive to this file"
-msgstr "아카이브를 이 파일에 씁니다"
+#: apply.c:977
+#, 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'이"
+"(가) 왔습니다"
-#: archive.c:435
-msgid "read .gitattributes in working directory"
-msgstr "작업 폴더의 .gitattributes를 읽습니다"
+#: apply.c:983
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgstr ""
+"git apply: 잘못된 git-diff - %d번 줄에 새 파일 이름이 올바르지 않습니다"
-#: archive.c:436
-msgid "report archived files on stderr"
-msgstr "아카이브에 포함된 파일을 표준오류로 표시합니다"
+#: apply.c:984
+#, c-format
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgstr ""
+"git apply: 잘못된 git-diff - %d번 줄에 예전 파일 이름이 올바르지 않습니다"
-#: archive.c:437
-msgid "store only"
-msgstr "저장만 하기"
+#: apply.c:990
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null on line %d"
+msgstr "git apply: 잘못된 git-diff - %d번 줄에서 /dev/null을 기대했습니다"
-#: archive.c:438
-msgid "compress faster"
-msgstr "더 빠르게 압축"
+#: apply.c:1488
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recount: 예상치 못한 줄: %.*s"
-#: archive.c:446
-msgid "compress better"
-msgstr "더 작게 압축"
+#: apply.c:1557
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "%d번 줄에 헤더 없는 패치 부분: %.*s"
-#: archive.c:449
-msgid "list supported archive formats"
-msgstr "지원하는 압축 형식의 목록을 표시합니다"
+#: apply.c:1577
+#, c-format
+msgid ""
+"git diff header lacks filename information when removing %d leading pathname "
+"component (line %d)"
+msgid_plural ""
+"git diff header lacks filename information when removing %d leading pathname "
+"components (line %d)"
+msgstr[0] ""
+"경로 이름 부분에서 %d개를 제거라 때 git diff 헤더에 파일 이름 정보가 없습니"
+"다. (%d번 줄)"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
-#: builtin/submodule--helper.c:832
-msgid "repo"
-msgstr "저장소"
+#: apply.c:1589
+#, c-format
+msgid "git diff header lacks filename information (line %d)"
+msgstr "git diff 헤더에 파일 이름 정보가 없습니다 (%d번 줄)"
-#: archive.c:452 builtin/archive.c:91
-msgid "retrieve the archive from remote repository <repo>"
-msgstr "ì\9b\90격 ì \80ì\9e¥ì\86\8c <ì \80ì\9e¥ì\86\8c>ì\97\90ì\84\9c ì\95\84ì¹´ì\9d´ë¸\8c를 ê°\80ì ¸ì\98µ니다"
+#: apply.c:1759
+msgid "new file depends on old contents"
+msgstr "ì\83\88 í\8c\8cì\9d¼ì\9d´ ì\98\88ì \84 ë\82´ì\9a©ì\97\90 ì\9d\98ì¡´í\95©니다"
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483
-msgid "command"
-msgstr "명령"
+#: apply.c:1761
+msgid "deleted file still has contents"
+msgstr "삭제한 파일에 아직 내용이 들어 있습니다"
-#: archive.c:454 builtin/archive.c:93
-msgid "path to the remote git-upload-archive command"
-msgstr "원격 git-upload-archive 명령의 경로"
+#: apply.c:1795
+#, c-format
+msgid "corrupt patch at line %d"
+msgstr "패치가 %d번 줄에서 망가졌습니다"
-#: archive.c:461
-msgid "Unexpected option --remote"
-msgstr "예상치 못한 옵션 --remote"
+#: apply.c:1832
+#, c-format
+msgid "new file %s depends on old contents"
+msgstr "새 파일 %s이(가) 예전 내용에 의존합니다"
-#: archive.c:463
-msgid "Option --exec can only be used together with --remote"
-msgstr "--exec 옵션은 --remote 옵션과 같이 사용할 경우에만 쓸 수 있습니다."
+#: apply.c:1834
+#, c-format
+msgid "deleted file %s still has contents"
+msgstr "삭제한 파일 %s이(가) 아직 내용이 들어 있습니다"
-#: archive.c:465
-msgid "Unexpected option --output"
-msgstr "예상치 못한 옵션 --output"
+#: apply.c:1837
+#, c-format
+msgid "** warning: file %s becomes empty but is not deleted"
+msgstr "** 경고: %s 파일의 내용이 비어 있지만 삭제되지 않았습니다"
-#: archive.c:487
+#: apply.c:1984
#, c-format
-msgid "Unknown archive format '%s'"
-msgstr "알 수 없는 아카이브 형식 '%s'"
+msgid "corrupt binary patch at line %d: %.*s"
+msgstr "%d번 줄에 바이너리 패치가 손상되었습니다: %.*s"
-#: archive.c:494
+#: apply.c:2021
#, c-format
-msgid "Argument not supported for format '%s': -%d"
-msgstr "'%s' 형식에서는 지원하지 않는 인자: -%d"
+msgid "unrecognized binary patch at line %d"
+msgstr "%d번 줄에 바이너리 패치가 이해할 수 없습니다"
-#: attr.c:263
-msgid ""
-"Negative patterns are ignored in git attributes\n"
-"Use '\\!' for literal leading exclamation."
-msgstr ""
-"git attributes에서 반대 패턴은 무시됩니다.\n"
-"앞에 느낌표를 쓰려면 '\\!'를 사용하십시오."
+#: apply.c:2182
+#, c-format
+msgid "patch with only garbage at line %d"
+msgstr "%d번 줄에 쓰레기 데이터만 있는 패치"
-#: bisect.c:441
+#: apply.c:2274
#, c-format
-msgid "Could not open file '%s'"
-msgstr "'%s' 파일을 열 수 없습니다"
+msgid "unable to read symlink %s"
+msgstr "%s 심볼릭 링크를 읽을 수 없습니다"
-#: bisect.c:446
+#: apply.c:2278
#, c-format
-msgid "Badly quoted content in file '%s': %s"
-msgstr "'%s' 파일 안에 잘못된 따옴표가 붙은 내용: %s"
+msgid "unable to open or read %s"
+msgstr "%s을(를) 열거나 읽을 수 없습니다"
-#: bisect.c:655
+#: apply.c:2931
#, c-format
-msgid "We cannot bisect more!\n"
-msgstr "더 이상 이등분할 수 없습니다!\n"
+msgid "invalid start of line: '%c'"
+msgstr "줄 시작이 잘못됨: '%c'"
-#: bisect.c:708
+#: apply.c:3050
#, c-format
-msgid "Not a valid commit name %s"
-msgstr "올바른 커밋 이름이 아닙니다 (%s)"
+msgid "Hunk #%d succeeded at %d (offset %d line)."
+msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
+msgstr[0] "패치 %d번 부분 %d번 줄에서 성공 (오프셋 %d번 줄)"
-#: bisect.c:732
+#: apply.c:3062
#, 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"
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
+msgstr "컨텍스트가 (%ld/%ld)로 줄어듭니다. (%d번 줄에서 적용)"
-#: bisect.c:737
+#: apply.c:3068
#, c-format
msgid ""
-"The merge base %s is new.\n"
-"The property has changed between %s and [%s].\n"
+"while searching for:\n"
+"%.*s"
msgstr ""
-"%s 병합 베이스가 새롭습니다.\n"
-"속성이 %s 및 [%s] 사이에서 변경되었습니다.\n"
+"다음을 검색하던 중:\n"
+"%.*s"
-#: bisect.c:742
+#: apply.c:3090
#, c-format
-msgid ""
-"The merge base %s is %s.\n"
-"This means the first '%s' commit is between %s and [%s].\n"
+msgid "missing binary patch data for '%s'"
+msgstr "'%s'에 대한 바이너리 패치 데이터가 없습니다"
+
+#: apply.c:3098
+#, c-format
+msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
-"%s 병합 베이스가 %s입니다.\n"
-"처음 '%s' 커밋이 %s 및 [%s] 사이라는 뜻입니다.\n"
+"반대 헝크가 없으면 '%s'에 대한 바이너리 패치를 반대로 적용할 수 없습니다"
-#: bisect.c:750
+#: apply.c:3144
#, c-format
-msgid ""
-"Some %s revs are not ancestor of the %s rev.\n"
-"git bisect cannot work properly in this case.\n"
-"Maybe you mistook %s and %s revs?\n"
+msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
-"일부 %s 리비전이 %s 리비전의 과거 항목이 아닙니다.\n"
-"git bisect 명령은 이 경우에는 올바르게 동작하지 않습니다.\n"
-"%s 및 %s 리비전을 잘못 쓴 것 아닙니까?\n"
+"전체 인덱스 라인이 없으면 '%s'에 대한 바이너리 패치를 적용할 수 없습니다"
-#: bisect.c:763
+#: apply.c:3154
#, 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"
-"어쨌든 계속합니다."
+"the patch applies to '%s' (%s), which does not match the current contents."
+msgstr "패치가 '%s'(%s)에 적용되지만, 현재 내용과 일치하지 않습니다."
-#: bisect.c:798
+#: apply.c:3162
#, c-format
-msgid "Bisecting: a merge base must be tested\n"
-msgstr "이등분: 병합 베이스를 시험해야 합니다\n"
+msgid "the patch applies to an empty '%s' but it is not empty"
+msgstr "패치는 빈 '%s'에 적용되지만, 현재 비어 있지 않습니다"
-#: bisect.c:849
+#: apply.c:3180
#, c-format
-msgid "a %s revision is needed"
-msgstr "하나의 %s 리비전이 필요합니다"
+msgid "the necessary postimage %s for '%s' cannot be read"
+msgstr "'%2$s'에 대한 필요한 %1$s 포스트이미지를 읽을 수 없습니다"
-#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
+#: apply.c:3193
#, c-format
-msgid "could not create file '%s'"
-msgstr "'%s' 파일을 만들 수 없습니다"
+msgid "binary patch does not apply to '%s'"
+msgstr "바이너리 패치를 '%s'에 적용할 수 없습니다"
-#: bisect.c:917
+#: apply.c:3199
#, c-format
-msgid "could not read file '%s'"
-msgstr "'%s' 파일을 읽을 수 없습니다"
+msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
+msgstr ""
+"'%s'에 대한 바이너리 패치가 올바르지 않은 결과를 만듭니다. (기대한 값 %s, 실"
+"제 %s)"
-#: bisect.c:947
-msgid "reading bisect refs failed"
-msgstr "이등분 레퍼런스 읽기에 실패했습니다"
+#: apply.c:3220
+#, c-format
+msgid "patch failed: %s:%ld"
+msgstr "패치 실패: %s:%ld"
-#: bisect.c:967
+#: apply.c:3342
#, c-format
-msgid "%s was both %s and %s\n"
-msgstr "%sì\9d\80(ë\8a\94) %s ë°\8f %s 모ë\91\90ì\97\90 í\95´ë\8b¹ë\90©ë\8b\88ë\8b¤\n"
+msgid "cannot checkout %s"
+msgstr "%sì\9d\84(를) ê°\80ì ¸ì\98¬ ì\88\98 ì\97\86ì\8aµë\8b\88ë\8b¤"
-#: bisect.c:975
+#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248
#, c-format
-msgid ""
-"No testable commit found.\n"
-"Maybe you started with bad path parameters?\n"
-msgstr ""
-"시험 가능한 커밋이 없습니다.\n"
-"잘못도니 경로 파라미터로 시작하지 않았습니까?\n"
+msgid "failed to read %s"
+msgstr "%s을(를) 읽는데 실패했습니다"
-#: bisect.c:994
+#: apply.c:3398
#, c-format
-msgid "(roughly %d step)"
-msgid_plural "(roughly %d steps)"
-msgstr[0] "(대략 %d 단계)"
+msgid "reading from '%s' beyond a symbolic link"
+msgstr "심볼릭 링크 뒤에 있는 '%s' 읽기"
-#. TRANSLATORS: the last %s will be replaced with
-#. "(roughly %d steps)" translation
-#: bisect.c:998
+#: apply.c:3427 apply.c:3667
#, 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] "이등분: %2$s 뒤에 시험할 리비전이 %1$d개 남았습니다\n"
+msgid "path %s has been renamed/deleted"
+msgstr "%s 경로가 이름이 바뀌었거나 삭제되었습니다"
-#: branch.c:53
+#: apply.c:3510 apply.c:3681
#, 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"
-"\"git branch --set-upstream-to=%s%s%s\" 명령을\n"
-"실행해 수정할 수 있습니다."
+msgid "%s: does not exist in index"
+msgstr "%s: 인덱스에 없습니다"
-#: branch.c:67
+#: apply.c:3519 apply.c:3689
#, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "%s 브랜치를 자신의 업스트림으로 지정하지 않음."
+msgid "%s: does not match index"
+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에서) 따라가도록 설정되었"
-"습니다."
+#: apply.c:3554
+msgid "repository lacks the necessary blob to fall back on 3-way merge."
+msgstr "저장소에 3-방향 병합으로 대신할 때 필요한 블롭이 없습니다."
-#: branch.c:94
+#: apply.c:3557
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
-msgstr "%s 브랜치가 리모트의 %s 브랜치를 (%s에서) 따라가도록 설정되었습니다."
+msgid "Falling back to three-way merge...\n"
+msgstr "3-방향 병합으로 대신합니다...\n"
-#: branch.c:98
+#: apply.c:3573 apply.c:3577
#, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
-msgstr ""
-"%s 브랜치가 리베이스를 통해 리모트의 %s 브랜치를 따라가도록 설정되었습니다."
+msgid "cannot read the current contents of '%s'"
+msgstr "'%s'의 현재 내용을 읽을 수 없습니다"
-#: branch.c:99
+#: apply.c:3589
#, c-format
-msgid "Branch %s set up to track local branch %s."
-msgstr "%s 브랜치가 %s 브랜치를 따라가도록 설정되었습니다."
+msgid "Failed to fall back on three-way merge...\n"
+msgstr "3-방향 병합으로 대신하는데 실패했습니다...\n"
-#: branch.c:104
+#: apply.c:3603
#, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
-msgstr ""
-"%s 브랜치가 리베이스를 통해 리모트의 %s 레퍼런스를 따라가도록 설정되었습니다."
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr "패치를 '%s'에 충돌이 있는 상태로 적용.\n"
-#: branch.c:105
+#: apply.c:3608
#, c-format
-msgid "Branch %s set up to track remote ref %s."
-msgstr "%s 브랜치가 리모트의 %s 레퍼런스를 따라가도록 설정되었습니다."
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr "패치를 '%s'에 패치 문제 없이 적용.\n"
-#: branch.c:109
+#: apply.c:3634
+msgid "removal patch leaves file contents"
+msgstr "제거하는 패치 다음에 파일 내용이 남았습니다"
+
+#: apply.c:3706
#, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
-msgstr ""
-"%s 브랜치가 리베이스를 통해 로컬의 %s 레퍼런스를 따라가도록 설정되었습니다."
+msgid "%s: wrong type"
+msgstr "%s: 잘못된 종류"
-#: branch.c:110
+#: apply.c:3708
#, c-format
-msgid "Branch %s set up to track local ref %s."
-msgstr "%s 브랜치가 로컬의 %s 레퍼런스를 따라가도록 설정되었습니다."
+msgid "%s has type %o, expected %o"
+msgstr "%s의 종류가 %o이지만 %o이(가) 되어야 합니다"
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "업스트림 브랜치 설정을 쓸 수 없습니다"
+#: apply.c:3859 apply.c:3861
+#, c-format
+msgid "invalid path '%s'"
+msgstr "잘못된 경로 '%s'"
-#: branch.c:156
+#: apply.c:3917
#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr "따라가지 않음: %s 레퍼런스에 대해 애매한 정보"
+msgid "%s: already exists in index"
+msgstr "%s: 이미 인덱스에 있습니다"
-#: branch.c:185
+#: apply.c:3920
#, c-format
-msgid "'%s' is not a valid branch name."
-msgstr "'%s'은(는) 올바른 브랜치 이름이 아닙니다."
+msgid "%s: already exists in working directory"
+msgstr "%s: 이미 작업 디렉터리에 있습니다"
-#: branch.c:190
+#: apply.c:3940
#, c-format
-msgid "A branch named '%s' already exists."
-msgstr "이름이 '%s'인 브랜치가 이미 있습니다."
+msgid "new mode (%o) of %s does not match old mode (%o)"
+msgstr "%2$s의 새 모드(%1$o)가 예전 모드(%3$o)와 다릅니다"
-#: branch.c:198
-msgid "Cannot force update the current branch."
-msgstr "현재 브랜치를 강제로 업데이트할 수 없습니다."
+#: apply.c:3945
+#, 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)와 다릅니다"
-#: branch.c:218
+#: apply.c:3965
#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
-msgstr ""
-"따라가기 정보를 설정할 수 없습니다. 시작 위치 '%s'이(가) 브랜치가 아닙니다."
+msgid "affected file '%s' is beyond a symbolic link"
+msgstr "영향 받는 '%s' 파일이 심볼릭 링크 뒤에 있습니다"
-#: branch.c:220
+#: apply.c:3969
#, c-format
-msgid "the requested upstream branch '%s' does not exist"
-msgstr "요청한 업스트림 '%s' 브랜치가 없습니다"
+msgid "%s: patch does not apply"
+msgstr "%s: 패치를 적용하지 않습니다"
-#: branch.c:222
-msgid ""
-"\n"
-"If you are planning on basing your work on an upstream\n"
-"branch that already exists at the remote, you may need to\n"
-"run \"git fetch\" to retrieve it.\n"
-"\n"
-"If you are planning to push out a new local branch that\n"
-"will track its remote counterpart, you may want to use\n"
-"\"git push -u\" to set the upstream config as you push."
-msgstr ""
-"\n"
-"리모트에 이미 있는 업스트림 브랜치를 기반으로 작업하려면,\n"
-"먼저 \"git fetch\"로 가져 리모트 브랜치를 가져옵니다.\n"
-"\n"
-"새 로컬 브랜치를 거기에 해당하는 리모트 브랜치로 push하려면,\n"
-"\"git push -u\"로 push하는 업스트림을 설정할 수 있습니다."
+#: apply.c:3984
+#, c-format
+msgid "Checking patch %s..."
+msgstr "%s 패치를 확인하는 중입니다..."
-#: branch.c:266
+#: apply.c:4075
#, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "올바른 오브젝트 이름이 아닙니다: '%s'."
+msgid "sha1 information is lacking or useless for submodule %s"
+msgstr "sha1 정보가 없거나 %s 하위 모듈에서 쓸 수 없습니다"
-#: branch.c:286
+#: apply.c:4082
#, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "애매한 오브젝트 이름: '%s'."
+msgid "mode change for %s, which is not in current HEAD"
+msgstr "%s에 대한 모드 변경이지만, 현재 HEAD에 없습니다"
-#: branch.c:291
+#: apply.c:4085
#, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "올바른 브랜치 위치가 아닙니다: '%s'."
+msgid "sha1 information is lacking or useless (%s)."
+msgstr "sha1 정보가 없거나 쓸 수 없습니다 (%s)."
-#: branch.c:345
+#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
-msgid "'%s' is already checked out at '%s'"
-msgstr "'%s'은(는) 이미 '%s' 위치에 받아져 있습니다"
+msgid "make_cache_entry failed for path '%s'"
+msgstr "경로 '%s'에 대해 make_cache_entry 실패"
-#: branch.c:364
+#: apply.c:4094
#, c-format
-msgid "HEAD of working tree %s is not updated"
-msgstr "ì\9e\91ì\97\85 í\8f´ë\8d\94 %sì\9d\98 í\97¤ë\93\9cê°\80 ì\97\85ë\8d°ì\9d´í\8a¸ë\90\98ì§\80 ì\95\8aì\95\98습니다"
+msgid "could not add %s to temporary index"
+msgstr "ì\9e\84ì\8b\9c ì\9d¸ë\8d±ì\8a¤ì\97\90 %s í\95목ì\9d\84 ì¶\94ê°\80í\95 ì\88\98 ì\97\86습니다"
-#: bundle.c:34
+#: apply.c:4104
#, c-format
-msgid "'%s' does not look like a v2 bundle file"
-msgstr "'%s' 파일이 버전2 번들 파일로 보이지 않습니다"
+msgid "could not write temporary index to %s"
+msgstr "임시 인덱스를 %s에 쓸 수 없습니다"
-#: bundle.c:61
+#: apply.c:4242
#, c-format
-msgid "unrecognized header: %s%s (%d)"
-msgstr "인식할 수 없는 헤더: %s%s (%d)"
+msgid "unable to remove %s from index"
+msgstr "인덱스에서 %s을(를) 제거할 수 없습니다"
-#: bundle.c:87 builtin/commit.c:778
+#: apply.c:4277
#, c-format
-msgid "could not open '%s'"
-msgstr "'%s'을(를) 열 수 없습니다"
+msgid "corrupt patch for submodule %s"
+msgstr "하위 모듈 %s에 대해 손상된 패치"
-#: bundle.c:139
-msgid "Repository lacks these prerequisite commits:"
-msgstr "저장소에 필수적인 다음 커밋이 없습니다:"
+#: apply.c:4283
+#, c-format
+msgid "unable to stat newly created file '%s'"
+msgstr "새로 만든 파일 '%s'에 대해 stat()할 수 없습니다"
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085
-#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348
-#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901
-#: builtin/merge.c:356 builtin/shortlog.c:170
-msgid "revision walk setup failed"
-msgstr "리비전 walk 준비가 실패했습니다"
+#: apply.c:4291
+#, c-format
+msgid "unable to create backing store for newly created file %s"
+msgstr "새로 만든 파일 '%s'에 대해 예비 저장소를 만들 수 없습니다"
-#: bundle.c:185
+#: apply.c:4297 apply.c:4441
#, c-format
-msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %d refs:"
-msgstr[0] "번들에 다음 레퍼런스 %d개가 있습니다:"
+msgid "unable to add cache entry for %s"
+msgstr "%s에 대해 캐시 항목을 추가할 수 없습니다"
-#: bundle.c:192
-msgid "The bundle records a complete history."
-msgstr "번들은 전체 커밋 내역을 기록합니다."
+#: apply.c:4338
+#, c-format
+msgid "failed to write to '%s'"
+msgstr "'%s'에 쓰는데 실패했습니다"
-#: bundle.c:194
+#: apply.c:4342
#, c-format
-msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %d refs:"
-msgstr[0] "번들에 다음 레퍼런스 %d개가 필요합니다:"
+msgid "closing file '%s'"
+msgstr "'%s' 파일을 닫는 중입니다"
-#: bundle.c:253
-msgid "Could not spawn pack-objects"
-msgstr "pack-objects 명령을 실행할 수 없습니다"
+#: apply.c:4412
+#, c-format
+msgid "unable to write file '%s' mode %o"
+msgstr "'%s' 파일에 쓸 수 없습니다 ('%o' 모드)"
-#: bundle.c:264
-msgid "pack-objects died"
-msgstr "pack-objects 명령이 죽었습니다"
+#: apply.c:4510
+#, c-format
+msgid "Applied patch %s cleanly."
+msgstr "%s 패치 깔끔하게 적용."
-#: bundle.c:304
-msgid "rev-list died"
-msgstr "rev-list 명령이 죽었습니다"
+#: apply.c:4518
+msgid "internal error"
+msgstr "내부 오류"
-#: bundle.c:353
+#: apply.c:4521
#, c-format
-msgid "ref '%s' is excluded by the rev-list options"
-msgstr "rev-list 옵션에서 '%s' 레퍼런스가 제외되었습니다"
+msgid "Applying patch %%s with %d reject..."
+msgid_plural "Applying patch %%s with %d rejects..."
+msgstr[0] "%%s 패치를 (%d개 거부) 적용..."
-#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273
+#: apply.c:4532
#, c-format
-msgid "unrecognized argument: %s"
-msgstr "알 수 없는 인자: %s"
-
-#: bundle.c:451
-msgid "Refusing to create empty bundle."
-msgstr "빈 번들은 만들지 않습니다."
+msgid "truncating .rej filename to %.*s.rej"
+msgstr "truncating .rej 파일 이름을 '%.*s.rej'(으)로 자름"
-#: bundle.c:463
+#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989
#, c-format
-msgid "cannot create '%s'"
-msgstr "'%s'을(를) 만들 수 없습니다"
-
-#: bundle.c:491
-msgid "index-pack died"
-msgstr "index-pack 명령이 죽었습니다"
+msgid "cannot open %s"
+msgstr "%s을(를) 열 수 없습니다"
-#: color.c:290
+#: apply.c:4554
#, c-format
-msgid "invalid color value: %.*s"
-msgstr "잘못된 색 값: %.*s"
+msgid "Hunk #%d applied cleanly."
+msgstr "패치 부위 #%d 깔끔하게 적용."
-#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505
-#: builtin/am.c:2119
+#: apply.c:4558
#, c-format
-msgid "could not parse %s"
-msgstr "parse %s을(를) 파싱할 수 없습니다"
+msgid "Rejected hunk #%d."
+msgstr "패치 부위 #%d 거부됨."
-#: commit.c:42
+#: apply.c:4668
#, c-format
-msgid "%s %s is not a commit!"
-msgstr "%s %s, 커밋이 아닙니다"
+msgid "Skipped patch '%s'."
+msgstr "패치 '%s' 건너뜀."
-#: compat/obstack.c:406 compat/obstack.c:408
-msgid "memory exhausted"
-msgstr "메모리 바닥남"
+#: apply.c:4676
+msgid "unrecognized input"
+msgstr "인식할 수 없는 입력"
-#: config.c:516
-#, c-format
-msgid "bad config line %d in blob %s"
-msgstr "블롭 %2$s 안에 %1$d번 줄에 잘못된 설정"
+#: apply.c:4695
+msgid "unable to read index file"
+msgstr "인덱스 파일을 읽을 수 없습니다"
-#: config.c:520
+#: apply.c:4833
#, c-format
-msgid "bad config line %d in file %s"
-msgstr "파일 %2$s 안에 %1$d번 줄에 잘못된 설정"
+msgid "can't open patch '%s': %s"
+msgstr "'%s' 패치를 열 수 없습니다: %s"
-#: config.c:524
+#: apply.c:4858
#, c-format
-msgid "bad config line %d in standard input"
-msgstr "표준 입력 안에 %d번 줄에 잘못된 설정"
-
-#: config.c:528
-#, c-format
-msgid "bad config line %d in submodule-blob %s"
-msgstr "하위 모듈 블롭 %2$s 안에 %1$d번 줄에 잘못된 설정"
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] "공백 오류 %d개를 넘어갑니다"
-#: config.c:532
+#: apply.c:4864 apply.c:4879
#, c-format
-msgid "bad config line %d in command line %s"
-msgstr "명령행 %2$s 안에 %1$d번 줄에 잘못된 설정"
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] "%d번 줄에서 공백 오류를 추가합니다."
-#: config.c:536
+#: apply.c:4872
#, c-format
-msgid "bad config line %d in %s"
-msgstr "%2$s 안에 %1$d번 줄에 잘못된 설정"
+msgid "%d line applied after fixing whitespace errors."
+msgid_plural "%d lines applied after fixing whitespace errors."
+msgstr[0] "공백 오류를 바로잡은 뒤에 %d번 줄 적용."
-#: config.c:660
-#, c-format
-msgid "bad numeric config value '%s' for '%s': out of range"
-msgstr "잘못된 수치 설정 값 '%s' (키 '%s'): 범위 벗어남"
+#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431
+msgid "Unable to write new index file"
+msgstr "새 인덱스 파일에 쓸 수 없습니다"
-#: config.c:661
-#, c-format
-msgid "bad numeric config value '%s' for '%s': invalid unit"
-msgstr "잘못된 수치 설정 값 '%s' (키 '%s'): 단위 잘못됨"
+#: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
+#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592
+#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947
+msgid "path"
+msgstr "경로"
-#: config.c:667
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in blob %s: out of range"
-msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 블롭 %s): 범위 벗어남"
+#: apply.c:4920
+msgid "don't apply changes matching the given path"
+msgstr "주어진 경로에 해당하는 변경 사항을 적용하지 않습니다"
-#: config.c:668
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in blob %s: invalid unit"
-msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 블롭 %s): 단위 잘못됨"
+#: apply.c:4923
+msgid "apply changes matching the given path"
+msgstr "주어진 경로에 해당하는 변경 사항을 적용합니다"
-#: config.c:672
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in file %s: out of range"
-msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 파일 %s): 범위 벗어남"
+#: apply.c:4925 builtin/am.c:2286
+msgid "num"
+msgstr "개수"
-#: config.c:673
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in file %s: invalid unit"
-msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 파일 %s): 단위 잘못됨"
+#: apply.c:4926
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr "전통적인 diff 경로 앞의 <개수>개의 앞 슬래시(/)를 제거합니다"
-#: config.c:677
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in standard input: out of range"
-msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 표준입력): 범위 벗어남"
+#: apply.c:4929
+msgid "ignore additions made by the patch"
+msgstr "패치에서 추가하는 파일을 무시합니다"
-#: config.c:678
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in standard input: invalid unit"
-msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 표준입력): 단위 잘못됨"
+#: apply.c:4931
+msgid "instead of applying the patch, output diffstat for the input"
+msgstr "패치를 적용하는 대신, 입력에 대한 diffstat을 출력합니다"
-#: config.c:682
-#, c-format
-msgid ""
-"bad numeric config value '%s' for '%s' in submodule-blob %s: out of range"
-msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 하위 모듈 블롭 %s): 범위 벗어남"
+#: apply.c:4935
+msgid "show number of added and deleted lines in decimal notation"
+msgstr "십진수로 추가 및 삭제한 줄 수를 표시합니다"
-#: config.c:683
-#, c-format
-msgid ""
-"bad numeric config value '%s' for '%s' in submodule-blob %s: invalid unit"
-msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 하위 모듈 블롭 %s): 단위 잘못됨"
+#: apply.c:4937
+msgid "instead of applying the patch, output a summary for the input"
+msgstr "패치를 적용하는 대신, 입력에 대한 요약을 출력합니다"
-#: config.c:687
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in command line %s: out of range"
-msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 명령행 %s): 범위 벗어남"
+#: apply.c:4939
+msgid "instead of applying the patch, see if the patch is applicable"
+msgstr "패치를 적용하는 대신, 패치를 적용 가능한지 확인합니다"
-#: config.c:688
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in command line %s: invalid unit"
-msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 명령행 %s): 단위 잘못됨"
+#: apply.c:4941
+msgid "make sure the patch is applicable to the current index"
+msgstr "현재 인덱스에서 패치가 적용 가능한지 확인합니다"
-#: config.c:692
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in %s: out of range"
-msgstr "잘못된 수치 설정 값 '%s' (키 '%s', %s 안에): 범위 벗어남"
+#: apply.c:4943
+msgid "apply a patch without touching the working tree"
+msgstr "작업 폴더를 바꾸지 않고 패치를 적용합니다"
-#: config.c:693
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in %s: invalid unit"
-msgstr "잘못된 수치 설정 값 '%s' (키 '%s', %s 안에): 단위 잘못됨"
+#: apply.c:4945
+msgid "accept a patch that touches outside the working area"
+msgstr "작업 영역 밖의 파일을 바꾸는 패치를 허용합니다"
-#: config.c:780
-#, c-format
-msgid "failed to expand user dir in: '%s'"
-msgstr "다음에 사용자 디렉터리 확장에 실패: '%s'"
+#: apply.c:4947
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr "그리고 패치도 적용합니다 (--stat/--summary/--check 옵션과 같이 사용)"
-#: config.c:861 config.c:872
-#, c-format
-msgid "bad zlib compression level %d"
-msgstr "%d번은 올바른 zlib 압축 단계가 아닙니다"
+#: apply.c:4949
+msgid "attempt three-way merge if a patch does not apply"
+msgstr "패치를 적용하지 않으면 3-방향 병합을 시도합니다"
-#: config.c:990
-#, c-format
-msgid "invalid mode for object creation: %s"
-msgstr "오브젝트 생성 모드가 올바르지 않습니다: %s"
+#: apply.c:4951
+msgid "build a temporary index based on embedded index information"
+msgstr "내장 인덱스 정보를 사용해 임시 인덱스를 만듭니다"
-#: config.c:1324
-msgid "unable to parse command-line config"
-msgstr "명령행 설정을 파싱할 수 없습니다"
+#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505
+msgid "paths are separated with NUL character"
+msgstr "경로를 NUL 문자로 구분합니다"
-#: config.c:1374
-msgid "unknown error occurred while reading the configuration files"
-msgstr "ì\84¤ì \95 í\8c\8cì\9d¼ì\9d\84 ì\9d½ë\8a\94 ì¤\91 ì\95\8c ì\88\98 ì\97\86ë\8a\94 ì\98¤ë¥\98ê°\80 ì\83\9dê²¼ì\8aµ니다"
+#: apply.c:4956
+msgid "ensure at least <n> lines of context match"
+msgstr "ìµ\9cì\86\8cí\95\9c <n>ì¤\84ì\9d´ 컨í\85\8dì\8a¤í\8a¸ì\99\80 ì\9d¼ì¹\98í\95\98ë\8a\94ì§\80 í\99\95ì\9d¸í\95©니다"
-#: config.c:1728
-#, c-format
-msgid "unable to parse '%s' from command-line config"
-msgstr "명령행 설정에서 '%s'을(를) 설정할 수 없습니다"
+#: apply.c:4957 builtin/am.c:2265
+msgid "action"
+msgstr "동작"
-#: config.c:1730
-#, c-format
-msgid "bad config variable '%s' in file '%s' at line %d"
-msgstr "'%2$s' 파일의 %3$d번 줄 '%1$s' 설정 변수가 잘못되었습니다"
+#: apply.c:4958
+msgid "detect new or modified lines that have whitespace errors"
+msgstr "공백 오류가 있는 추가됐거나 수정된 줄을 찾습니다"
-#: config.c:1789
-#, c-format
-msgid "%s has multiple values"
-msgstr "%s은(는) 여러 개 값이 있습니다"
+#: apply.c:4961 apply.c:4964
+msgid "ignore changes in whitespace when finding context"
+msgstr "컨텍스트를 찾을 때 공백 변경 사항을 무시합니다"
-#: config.c:2323
-#, c-format
-msgid "could not set '%s' to '%s'"
-msgstr "'%s'을(를) '%s'(으)로 설정할 수 없습니다"
+#: apply.c:4967
+msgid "apply the patch in reverse"
+msgstr "패치를 반대 순서로 적용합니다"
-#: config.c:2325
-#, c-format
-msgid "could not unset '%s'"
-msgstr "'%s' 설정을 지울 수 없습니다"
+#: apply.c:4969
+msgid "don't expect at least one line of context"
+msgstr "최소한의 컨텍스트 한 줄도 없이 적용합니다"
-#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
-msgid "Checking connectivity"
-msgstr "연결을 확인하는 중입니다"
+#: apply.c:4971
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr "거부된 패치 부분을 대응되는 *.rej 파일에 남겨둡니다"
-#: connected.c:74
-msgid "Could not run 'git rev-list'"
-msgstr "'git rev-list'를 실행할 수 없습니다"
+#: apply.c:4973
+msgid "allow overlapping hunks"
+msgstr "패치 부분이 겹쳐도 허용합니다"
-#: connected.c:94
-msgid "failed write to rev-list"
-msgstr "rev-list 쓰기에 실패했습니다"
+#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19
+#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593
+#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114
+msgid "be verbose"
+msgstr "자세히 표시"
-#: connected.c:101
-msgid "failed to close rev-list's stdin"
-msgstr "rev-list의 표준입력을 닫는데 실패했습니다"
+#: apply.c:4976
+msgid "tolerate incorrectly detected missing new-line at the end of file"
+msgstr "파일 끝에 줄바꿈이 빠졌음을 잘못 검색한 경우에 무시합니다"
-#: date.c:97
-msgid "in the future"
-msgstr "미래에"
+#: apply.c:4979
+msgid "do not trust the line counts in the hunk headers"
+msgstr "패치 부분의 헤더의 줄 수를 신용하지 않습니다"
-#: date.c:103
-#, c-format
-msgid "%lu second ago"
-msgid_plural "%lu seconds ago"
-msgstr[0] "%lu초 전"
+#: apply.c:4981 builtin/am.c:2274
+msgid "root"
+msgstr "최상위"
-#: date.c:110
-#, c-format
-msgid "%lu minute ago"
-msgid_plural "%lu minutes ago"
-msgstr[0] "%lu분 전"
+#: apply.c:4982
+msgid "prepend <root> to all filenames"
+msgstr "모든 파일 이름에 <최상위>를 앞에 붙입니다"
-#: date.c:117
-#, c-format
-msgid "%lu hour ago"
-msgid_plural "%lu hours ago"
-msgstr[0] "%lu시간 전"
+#: archive.c:12
+msgid "git archive [<options>] <tree-ish> [<path>...]"
+msgstr "git archive [<옵션>] <트리-따위> [<경로>...]"
-#: date.c:124
-#, c-format
-msgid "%lu day ago"
-msgid_plural "%lu days ago"
-msgstr[0] "%lu일 전"
+#: archive.c:13
+msgid "git archive --list"
+msgstr "git archive --list"
-#: date.c:130
-#, c-format
-msgid "%lu week ago"
-msgid_plural "%lu weeks ago"
-msgstr[0] "%lu주 전"
+#: archive.c:14
+msgid ""
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
+msgstr ""
+"git archive --remote <저장소> [--exec <명령>] [<옵션>] <트리-따위> [<경로"
+">...]"
-#: date.c:137
-#, c-format
-msgid "%lu month ago"
-msgid_plural "%lu months ago"
-msgstr[0] "%lu달 전"
+#: archive.c:15
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr "git archive --remote <저장소> [--exec <명령>] --list"
-#: date.c:148
+#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327
#, c-format
-msgid "%lu year"
-msgid_plural "%lu years"
-msgstr[0] "%lu년"
+msgid "pathspec '%s' did not match any files"
+msgstr "'%s' 경로명세가 어떤 파일과도 일치하지 않습니다"
-#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:151
-#, c-format
-msgid "%s, %lu month ago"
-msgid_plural "%s, %lu months ago"
-msgstr[0] "%s %lu달 전"
+#: archive.c:429
+msgid "fmt"
+msgstr "형식"
-#: date.c:156 date.c:161
-#, c-format
-msgid "%lu year ago"
-msgid_plural "%lu years ago"
-msgstr[0] "%lu년 전"
+#: archive.c:429
+msgid "archive format"
+msgstr "압축 형식"
-#: diffcore-order.c:24
-#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "'%s' 순서 파일을 읽는데 실패했습니다"
+#: archive.c:430 builtin/log.c:1429
+msgid "prefix"
+msgstr "접두어"
-#: diffcore-rename.c:540
-msgid "Performing inexact rename detection"
-msgstr "부정확한 이름 바꾸기 탐색을 수행하는 중"
+#: archive.c:431
+msgid "prepend prefix to each pathname in the archive"
+msgstr "아카이브의 각 경로 이름의 앞에 지정한 경로를 붙입니다"
-#: diff.c:116
-#, c-format
-msgid " Failed to parse dirstat cut-off percentage '%s'\n"
-msgstr " dirstat 자름 퍼센트 값 '%s' 파싱에 실패했습니다\n"
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603
+#: builtin/blame.c:2604 builtin/config.c:59 builtin/fast-export.c:987
+#: builtin/fast-export.c:989 builtin/grep.c:723 builtin/hash-object.c:101
+#: builtin/ls-files.c:539 builtin/ls-files.c:542 builtin/notes.c:401
+#: builtin/notes.c:564 builtin/read-tree.c:109 parse-options.h:153
+msgid "file"
+msgstr "파일"
-#: diff.c:121
-#, c-format
-msgid " Unknown dirstat parameter '%s'\n"
-msgstr " 알 수 없는 dirstat 파라미터 '%s'\n"
+#: archive.c:433 builtin/archive.c:89
+msgid "write the archive to this file"
+msgstr "아카이브를 이 파일에 씁니다"
-#: diff.c:225
-#, c-format
-msgid "Unknown value for 'diff.submodule' config variable: '%s'"
-msgstr "'diff.submodule' 설정 변수에 알 수 없는 값: '%s'"
+#: archive.c:435
+msgid "read .gitattributes in working directory"
+msgstr "작업 폴더의 .gitattributes를 읽습니다"
-#: diff.c:277
-#, c-format
-msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
-msgstr ""
-"'diff.submodule' 설정 변수에 오류:\n"
-"%s'"
+#: archive.c:436
+msgid "report archived files on stderr"
+msgstr "아카이브에 포함된 파일을 표준오류로 표시합니다"
-#: diff.c:3017
-#, c-format
-msgid "external diff died, stopping at %s"
-msgstr "외부 diff 프로그램이 죽음, %s 위치에서 멈춤"
+#: archive.c:437
+msgid "store only"
+msgstr "저장만 하기"
-#: diff.c:3415
-msgid "--follow requires exactly one pathspec"
-msgstr "--follow 옵션에는 정확히 하나의 경로명세가 필요합니다"
+#: archive.c:438
+msgid "compress faster"
+msgstr "더 빠르게 압축"
-#: diff.c:3578
-#, c-format
-msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
-msgstr ""
-"--dirstat/-X 옵션 파라미터를 파싱하는데 실패했습니다:\n"
-"%s"
+#: archive.c:446
+msgid "compress better"
+msgstr "더 작게 압축"
-#: diff.c:3592
-#, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
-msgstr "--submodule 옵션 파라미터 파싱에 실패했습니다: '%s'"
+#: archive.c:449
+msgid "list supported archive formats"
+msgstr "지원하는 압축 형식의 목록을 표시합니다"
-#: dir.c:1823
-msgid "failed to get kernel name and information"
-msgstr "커널 이름과 정보를 가져오는데 실패했습니다"
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
+#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953
+msgid "repo"
+msgstr "저장소"
-#: dir.c:1942
-msgid "Untracked cache is disabled on this system or location."
-msgstr "ì\9d´ ì\8b\9cì\8a¤í\85\9c ë\98\90ë\8a\94 ì\9c\84ì¹\98ì\97\90ì\84\9cë\8a\94 ì¶\94ì \81ë\90\98ì§\80 ì\95\8aë\8a\94 ìº\90ì\8b\9c를 ì\82¬ì\9a©í\95\98ì§\80 ì\95\8aì\8aµë\8b\88ë\8b¤."
+#: archive.c:452 builtin/archive.c:91
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "ì\9b\90격 ì \80ì\9e¥ì\86\8c <ì \80ì\9e¥ì\86\8c>ì\97\90ì\84\9c ì\95\84ì¹´ì\9d´ë¸\8c를 ê°\80ì ¸ì\98µë\8b\88ë\8b¤"
-#: gpg-interface.c:178
-msgid "gpg failed to sign the data"
-msgstr "gpg에서 데이터를 서명하는데 실패했습니다."
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
+msgid "command"
+msgstr "명령"
-#: gpg-interface.c:208
-msgid "could not create temporary file"
-msgstr "ì\9e\84ì\8b\9c í\8c\8cì\9d¼ì\9d\84 ë§\8cë\93¤ ì\88\98 ì\97\86ì\8aµë\8b\88ë\8b¤"
+#: archive.c:454 builtin/archive.c:93
+msgid "path to the remote git-upload-archive command"
+msgstr "ì\9b\90격 git-upload-archive ëª\85ë ¹ì\9d\98 ê²½ë¡\9c"
-#: gpg-interface.c:210
-#, c-format
-msgid "failed writing detached signature to '%s'"
-msgstr "분리된 서명을 '%s'에 쓰는데 실패했습니다"
+#: archive.c:461
+msgid "Unexpected option --remote"
+msgstr "예상치 못한 옵션 --remote"
+
+#: archive.c:463
+msgid "Option --exec can only be used together with --remote"
+msgstr "--exec 옵션은 --remote 옵션과 같이 사용할 경우에만 쓸 수 있습니다."
+
+#: archive.c:465
+msgid "Unexpected option --output"
+msgstr "예상치 못한 옵션 --output"
-#: grep.c:1792
+#: archive.c:487
#, c-format
-msgid "'%s': unable to read %s"
-msgstr "'%s': %s을(를) 읽을 수 없습니다"
+msgid "Unknown archive format '%s'"
+msgstr "알 수 없는 아카이브 형식 '%s'"
-#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
+#: archive.c:494
#, c-format
-msgid "failed to stat '%s'"
-msgstr "'%s'에 대해 stat()이 실패했습니다"
+msgid "Argument not supported for format '%s': -%d"
+msgstr "'%s' 형식에서는 지원하지 않는 인자: -%d"
+
+#: attr.c:263
+msgid ""
+"Negative patterns are ignored in git attributes\n"
+"Use '\\!' for literal leading exclamation."
+msgstr ""
+"git attributes에서 반대 패턴은 무시됩니다.\n"
+"앞에 느낌표를 쓰려면 '\\!'를 사용하십시오."
-#: grep.c:1820
+#: bisect.c:441
#, c-format
-msgid "'%s': short read"
-msgstr "'%s': 읽다가 잘림"
+msgid "Could not open file '%s'"
+msgstr "'%s' 파일을 열 수 없습니다"
-#: help.c:205
+#: bisect.c:446
#, c-format
-msgid "available git commands in '%s'"
-msgstr "'%s'에 있는 깃 명령"
+msgid "Badly quoted content in file '%s': %s"
+msgstr "'%s' 파일 안에 잘못된 따옴표가 붙은 내용: %s"
-#: help.c:212
-msgid "git commands available from elsewhere on your $PATH"
-msgstr "다른 $PATH에 있는 깃 명령"
+#: bisect.c:655
+#, c-format
+msgid "We cannot bisect more!\n"
+msgstr "더 이상 이등분할 수 없습니다!\n"
-#: help.c:244
-msgid "These are common Git commands used in various situations:"
-msgstr "다음은 여러가지 상황에서 자주 사용하는 깃 명령입니다:"
+#: bisect.c:708
+#, c-format
+msgid "Not a valid commit name %s"
+msgstr "올바른 커밋 이름이 아닙니다 (%s)"
-#: help.c:309
+#: bisect.c:732
#, c-format
msgid ""
-"'%s' appears to be a git command, but we were not\n"
-"able to execute it. Maybe git-%s is broken?"
+"The merge base %s is bad.\n"
+"This means the bug has been fixed between %s and [%s].\n"
msgstr ""
-"'%s'은(는) 깃 명령으로 보이지만, 실행할 수\n"
-"없습니다. 아마도 git-%s 망가진 것 같습니다."
-
-#: help.c:366
-msgid "Uh oh. Your system reports no Git commands at all."
-msgstr "어라라. 시스템에 깃 명령이 하나도 없다고 나옵니다."
+"%s 병합 베이스가 비정상입니다.\n"
+"버그가 %s 및 [%s] 사이에서 고쳐졌다는 뜻입니다.\n"
-#: help.c:388
+#: bisect.c:737
#, c-format
msgid ""
-"WARNING: You called a Git command named '%s', which does not exist.\n"
-"Continuing under the assumption that you meant '%s'"
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
msgstr ""
-"경고: 이름이 '%s'인 깃 명령을 실행했지만, 그 명령이 없습니다.\n"
-"자동으로 '%s' 명령이라고 가정하고 계속합니다"
-
-#: help.c:393
-#, c-format
-msgid "in %0.1f seconds automatically..."
-msgstr "(%0.1f초 뒤에)..."
+"%s 병합 베이스가 새롭습니다.\n"
+"속성이 %s 및 [%s] 사이에서 변경되었습니다.\n"
-#: help.c:400
+#: bisect.c:742
#, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
-msgstr "git: '%s'은(는) 깃 명령이 아닙니다. 'git --help'를 참고하십시오."
-
-#: help.c:404 help.c:470
msgid ""
-"\n"
-"Did you mean this?"
-msgid_plural ""
-"\n"
-"Did you mean one of these?"
-msgstr[0] ""
-"\n"
-"다음을 의도하신 것 아니었나요?"
+"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"
-#: help.c:466
+#: bisect.c:750
#, c-format
-msgid "%s: %s - %s"
-msgstr "%s: %s - %s"
+msgid ""
+"Some %s revs are not ancestor 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"
-#: lockfile.c:152
+#: bisect.c:763
#, 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."
+"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.lock' 파일을 만들 수 없습니다: %s.\n"
-"\n"
-"이 저장소에서 다른 깃 프로세스가 실행 중인 것으로 보입니다. (예를\n"
-"들어 'git commit' 명령으로 편집기가 열려 있다든지.) 모든 프로세스를\n"
-"끝냈는지 확인하시고 다시 시도해 보십시오. 그래도 계속 실패하면, 이\n"
-"저장소에서 깃 프로세스가 전에 이상 종료했을 수도 있습니다:\n"
-"수동으로 해당 파일을 제거하고 계속하십시오."
+"%s 및 %s 사이의 머지 베이스를 건너뜁니다.\n"
+"그러므로 처음 %s 커밋이 %s 및 %s 사이에 있는지 확신할 수 없습니다.\n"
+"어쨌든 계속합니다."
-#: lockfile.c:160
+#: bisect.c:798
#, c-format
-msgid "Unable to create '%s.lock': %s"
-msgstr "'%s.lock'을 만들 수 없습니다: %s"
-
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "캐시를 읽는데 실패했습니다"
+msgid "Bisecting: a merge base must be tested\n"
+msgstr "이등분: 병합 베이스를 시험해야 합니다\n"
-#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375
-#: builtin/checkout.c:589 builtin/clone.c:732
-msgid "unable to write new index file"
-msgstr "새 인덱스 파일을 쓸 수 없습니다"
+#: bisect.c:849
+#, c-format
+msgid "a %s revision is needed"
+msgstr "하나의 %s 리비전이 필요합니다"
-#: merge-recursive.c:212
-msgid "(bad commit)\n"
-msgstr "(잘못된 커밋)\n"
+#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
+#, c-format
+msgid "could not create file '%s'"
+msgstr "'%s' 파일을 만들 수 없습니다"
-#: merge-recursive.c:234
+#: bisect.c:917
#, c-format
-msgid "addinfo_cache failed for path '%s'"
-msgstr "'%s' 경로에 대해 addinfo_cache가 실패했습니다"
+msgid "could not read file '%s'"
+msgstr "'%s' 파일을 읽을 수 없습니다"
-#: merge-recursive.c:304
-msgid "error building trees"
-msgstr "트리 빌드에 오류"
+#: bisect.c:947
+msgid "reading bisect refs failed"
+msgstr "이등분 레퍼런스 읽기에 실패했습니다"
-#: merge-recursive.c:723
+#: bisect.c:967
#, c-format
-msgid "failed to create path '%s'%s"
-msgstr "'%s' 경로 만들기에 실패했습니다%s"
+msgid "%s was both %s and %s\n"
+msgstr "%s은(는) %s 및 %s 모두에 해당됩니다\n"
-#: merge-recursive.c:734
+#: bisect.c:975
#, c-format
-msgid "Removing %s to make room for subdirectory\n"
-msgstr "하위 디렉터리에 공간을 만드려고 %s을(를) 제거합니다\n"
+msgid ""
+"No testable commit found.\n"
+"Maybe you started with bad path parameters?\n"
+msgstr ""
+"시험 가능한 커밋이 없습니다.\n"
+"잘못도니 경로 파라미터로 시작하지 않았습니까?\n"
-#: merge-recursive.c:748 merge-recursive.c:767
-msgid ": perhaps a D/F conflict?"
-msgstr ": 아마도 D/F 충돌?"
+#: bisect.c:994
+#, c-format
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] "(대략 %d 단계)"
-#: merge-recursive.c:757
+#. TRANSLATORS: the last %s will be replaced with
+#. "(roughly %d steps)" translation
+#: bisect.c:998
#, c-format
-msgid "refusing to lose untracked file at '%s'"
-msgstr "'%s' 위치의 추적되지 않는 파일을 잃기를 거부합니다"
+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] "이등분: %2$s 뒤에 시험할 리비전이 %1$d개 남았습니다\n"
-#: merge-recursive.c:799
+#: branch.c:53
#, c-format
-msgid "cannot read object %s '%s'"
-msgstr "%s '%s' 오브젝트를 읽을 수 없음"
+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"
+"\"git branch --set-upstream-to=%s%s%s\" 명령을\n"
+"실행해 수정할 수 있습니다."
-#: merge-recursive.c:801
+#: branch.c:67
#, c-format
-msgid "blob expected for %s '%s'"
-msgstr "%s '%s'에 대해 블롭을 예상"
+msgid "Not setting branch %s as its own upstream."
+msgstr "%s 브랜치를 자신의 업스트림으로 지정하지 않음."
-#: merge-recursive.c:825
+#: branch.c:93
#, c-format
-msgid "failed to open '%s': %s"
-msgstr "'%s'을(를) 여는데 실패: %s"
+msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+msgstr ""
+"%s 브랜치가 리베이스를 통해 리모트의 %s 브랜치를 (%s에서) 따라가도록 설정되었"
+"습니다."
-#: merge-recursive.c:836
+#: branch.c:94
#, c-format
-msgid "failed to symlink '%s': %s"
-msgstr "'%s' 심볼릭 링크에 실패: %s"
+msgid "Branch %s set up to track remote branch %s from %s."
+msgstr "%s 브랜치가 리모트의 %s 브랜치를 (%s에서) 따라가도록 설정되었습니다."
-#: merge-recursive.c:841
+#: branch.c:98
#, c-format
-msgid "do not know what to do with %06o %s '%s'"
-msgstr "다음을 어떻게 할지 알 수 없습니다: %06o %s '%s'"
-
-#: merge-recursive.c:981
-msgid "Failed to execute internal merge"
-msgstr "내부 병합 실행에 실패"
+msgid "Branch %s set up to track local branch %s by rebasing."
+msgstr ""
+"%s 브랜치가 리베이스를 통해 리모트의 %s 브랜치를 따라가도록 설정되었습니다."
-#: merge-recursive.c:985
+#: branch.c:99
#, c-format
-msgid "Unable to add %s to database"
-msgstr "%s을(를) 데이터베이스에 추가할 수 없습니다"
+msgid "Branch %s set up to track local branch %s."
+msgstr "%s 브랜치가 %s 브랜치를 따라가도록 설정되었습니다."
-#: merge-recursive.c:1084 merge-recursive.c:1098
+#: branch.c:104
#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree."
+msgid "Branch %s set up to track remote ref %s by rebasing."
msgstr ""
-"충돌! (%s/삭제): %s (위치 %s) 및 %s (%s에서) 삭제. %s 버전의 %s 트리에 남음."
+"%s 브랜치가 리베이스를 통해 리모트의 %s 레퍼런스를 따라가도록 설정되었습니다."
-#: merge-recursive.c:1090 merge-recursive.c:1103
+#: branch.c:105
#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree at %s."
+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 (위치 %s) 및 %s (위치 %s) 삭제. %s 버전의 %s 트리에 "
-"%s(으)로 남음."
+"%s 브랜치가 리베이스를 통해 로컬의 %s 레퍼런스를 따라가도록 설정되었습니다."
-#: merge-recursive.c:1146
-msgid "rename"
-msgstr "이름바꾸기"
+#: branch.c:110
+#, c-format
+msgid "Branch %s set up to track local ref %s."
+msgstr "%s 브랜치가 로컬의 %s 레퍼런스를 따라가도록 설정되었습니다."
-#: merge-recursive.c:1146
-msgid "renamed"
-msgstr "ì\9d´ë¦\84ë°\94ê¿\88"
+#: branch.c:119
+msgid "Unable to write upstream branch configuration"
+msgstr "ì\97\85ì\8a¤í\8a¸ë¦¼ ë¸\8cë\9e\9cì¹\98 ì\84¤ì \95ì\9d\84 ì\93¸ ì\88\98 ì\97\86ì\8aµë\8b\88ë\8b¤"
-#: merge-recursive.c:1203
+#: branch.c:156
#, c-format
-msgid "%s is a directory in %s adding as %s instead"
-msgstr "%s은(는) %s에 있는 디렉터리로 %s(으)로 이름을 바꿉니다"
+msgid "Not tracking: ambiguous information for ref %s"
+msgstr "따라가지 않음: %s 레퍼런스에 대해 애매한 정보"
-#: merge-recursive.c:1228
+#: branch.c:185
#, 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"
+msgid "'%s' is not a valid branch name."
+msgstr "'%s'은(는) 올바른 브랜치 이름이 아닙니다."
-#: merge-recursive.c:1233
-msgid " (left unresolved)"
-msgstr " (해결되지 않음)"
+#: branch.c:190
+#, c-format
+msgid "A branch named '%s' already exists."
+msgstr "이름이 '%s'인 브랜치가 이미 있습니다."
-#: merge-recursive.c:1295
+#: branch.c:198
+msgid "Cannot force update the current branch."
+msgstr "현재 브랜치를 강제로 업데이트할 수 없습니다."
+
+#: branch.c:218
#, c-format
-msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
+msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
-"충돌! (rename/rename): 이름 바꾸기 %s->%s (위치 %s). 이름 바꾸기 %s->%s (위"
-"치 %s)"
+"따라가기 정보를 설정할 수 없습니다. 시작 위치 '%s'이(가) 브랜치가 아닙니다."
-#: merge-recursive.c:1328
+#: branch.c:220
#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
-msgstr "대신 이름을 %s에서 %s(으)로 바꾸고 %s에서 %s(으)로 바꿉니다"
+msgid "the requested upstream branch '%s' does not exist"
+msgstr "요청한 업스트림 '%s' 브랜치가 없습니다"
+
+#: branch.c:222
+msgid ""
+"\n"
+"If you are planning on basing your work on an upstream\n"
+"branch that already exists at the remote, you may need to\n"
+"run \"git fetch\" to retrieve it.\n"
+"\n"
+"If you are planning to push out a new local branch that\n"
+"will track its remote counterpart, you may want to use\n"
+"\"git push -u\" to set the upstream config as you push."
+msgstr ""
+"\n"
+"리모트에 이미 있는 업스트림 브랜치를 기반으로 작업하려면,\n"
+"먼저 \"git fetch\"로 가져 리모트 브랜치를 가져옵니다.\n"
+"\n"
+"새 로컬 브랜치를 거기에 해당하는 리모트 브랜치로 push하려면,\n"
+"\"git push -u\"로 push하는 업스트림을 설정할 수 있습니다."
-#: merge-recursive.c:1534
+#: branch.c:265
#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
-msgstr "충ë\8f\8c! (rename/add): ì\9d´ë¦\84 ë°\94꾸기 %s->%s (ì\9c\84ì¹\98 %s). %s ì¶\94ê°\80 (ì\9c\84ì¹\98 %s)"
+msgid "Not a valid object name: '%s'."
+msgstr "ì\98¬ë°\94른 ì\98¤ë¸\8cì \9dí\8a¸ ì\9d´ë¦\84ì\9d´ ì\95\84ë\8b\99ë\8b\88ë\8b¤: '%s'."
-#: merge-recursive.c:1549
+#: branch.c:285
#, c-format
-msgid "Adding merged %s"
-msgstr "병합된 %s을(를) 추가합니다"
+msgid "Ambiguous object name: '%s'."
+msgstr "애매한 오브젝트 이름: '%s'."
-#: merge-recursive.c:1556 merge-recursive.c:1769
+#: branch.c:290
#, c-format
-msgid "Adding as %s instead"
-msgstr "대신 %s(으)로 추가합니다"
+msgid "Not a valid branch point: '%s'."
+msgstr "올바른 브랜치 위치가 아닙니다: '%s'."
-#: merge-recursive.c:1613
+#: branch.c:344
#, c-format
-msgid "cannot read object %s"
-msgstr "%s 오브젝트를 읽을 수 없습니다"
+msgid "'%s' is already checked out at '%s'"
+msgstr "'%s'은(는) 이미 '%s' 위치에 받아져 있습니다"
-#: merge-recursive.c:1616
+#: branch.c:363
#, c-format
-msgid "object %s is not a blob"
-msgstr "%s 오브젝트는 블롭이 아닙니다"
+msgid "HEAD of working tree %s is not updated"
+msgstr "작업 폴더 %s의 헤드가 업데이트되지 않았습니다"
-#: merge-recursive.c:1669
-msgid "modify"
-msgstr "수정"
+#: bundle.c:34
+#, c-format
+msgid "'%s' does not look like a v2 bundle file"
+msgstr "'%s' 파일이 버전2 번들 파일로 보이지 않습니다"
-#: merge-recursive.c:1669
-msgid "modified"
-msgstr "수정됨"
+#: bundle.c:61
+#, c-format
+msgid "unrecognized header: %s%s (%d)"
+msgstr "인식할 수 없는 헤더: %s%s (%d)"
-#: merge-recursive.c:1679
-msgid "content"
-msgstr "내용"
+#: bundle.c:87 sequencer.c:963 builtin/commit.c:777
+#, c-format
+msgid "could not open '%s'"
+msgstr "'%s'을(를) 열 수 없습니다"
-#: merge-recursive.c:1686
-msgid "add/add"
-msgstr "ì¶\94ê°\80/ì¶\94ê°\80"
+#: bundle.c:139
+msgid "Repository lacks these prerequisite commits:"
+msgstr "ì \80ì\9e¥ì\86\8cì\97\90 í\95\84ì\88\98ì \81ì\9d¸ ë\8b¤ì\9d\8c 커ë°\8bì\9d´ ì\97\86ì\8aµë\8b\88ë\8b¤:"
-#: merge-recursive.c:1721
-#, c-format
-msgid "Skipped %s (merged same as existing)"
-msgstr "건너뛰기: %s (기존과 같게 병합)"
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374
+#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348
+#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
+#: builtin/merge.c:356 builtin/shortlog.c:170
+msgid "revision walk setup failed"
+msgstr "리비전 walk 준비가 실패했습니다"
-#: merge-recursive.c:1735
+#: bundle.c:185
#, c-format
-msgid "Auto-merging %s"
-msgstr "자동 병합: %s"
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %d refs:"
+msgstr[0] "번들에 다음 레퍼런스 %d개가 있습니다:"
-#: merge-recursive.c:1739 git-submodule.sh:919
-msgid "submodule"
-msgstr "하위 모듈"
+#: bundle.c:192
+msgid "The bundle records a complete history."
+msgstr "번들은 전체 커밋 내역을 기록합니다."
-#: merge-recursive.c:1740
+#: bundle.c:194
#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "충돌! (%s): %s에 병합 충돌"
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %d refs:"
+msgstr[0] "번들에 다음 레퍼런스 %d개가 필요합니다:"
-#: merge-recursive.c:1834
-#, c-format
-msgid "Removing %s"
-msgstr "제거: %s"
+#: bundle.c:253
+msgid "Could not spawn pack-objects"
+msgstr "pack-objects 명령을 실행할 수 없습니다"
-#: merge-recursive.c:1860
-msgid "file/directory"
-msgstr "파일/디렉터리"
+#: bundle.c:264
+msgid "pack-objects died"
+msgstr "pack-objects 명령이 죽었습니다"
-#: merge-recursive.c:1866
-msgid "directory/file"
-msgstr "디렉터리/파일"
+#: bundle.c:304
+msgid "rev-list died"
+msgstr "rev-list 명령이 죽었습니다"
-#: merge-recursive.c:1871
+#: bundle.c:353
#, c-format
-msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
-msgstr ""
-"충돌! (%s): 이름이 %s인 디렉터리가 %s에 있습니다. %s을(를) %s(으)로 추가합니"
-"다"
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr "rev-list 옵션에서 '%s' 레퍼런스가 제외되었습니다"
-#: merge-recursive.c:1880
+#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273
#, c-format
-msgid "Adding %s"
-msgstr "ì¶\94ê°\80: %s"
+msgid "unrecognized argument: %s"
+msgstr "ì\95\8c ì\88\98 ì\97\86ë\8a\94 ì\9d¸ì\9e\90: %s"
-#: merge-recursive.c:1917
-msgid "Already up-to-date!"
-msgstr "이미 업데이트 상태입니다!"
+#: bundle.c:451
+msgid "Refusing to create empty bundle."
+msgstr "빈 번들은 만들지 않습니다."
-#: merge-recursive.c:1926
+#: bundle.c:463
#, c-format
-msgid "merging of trees %s and %s failed"
-msgstr "%s 및 %s 트리의 병합이 실패했습니다"
+msgid "cannot create '%s'"
+msgstr "'%s'을(를) 만들 수 없습니다"
-#: merge-recursive.c:2009
-msgid "Merging:"
-msgstr "병합:"
+#: bundle.c:491
+msgid "index-pack died"
+msgstr "index-pack 명령이 죽었습니다"
-#: merge-recursive.c:2022
+#: color.c:290
#, c-format
-msgid "found %u common ancestor:"
-msgid_plural "found %u common ancestors:"
-msgstr[0] "과거의 공통 커밋 %u개 발견:"
+msgid "invalid color value: %.*s"
+msgstr "잘못된 색 값: %.*s"
-#: merge-recursive.c:2061
-msgid "merge returned no commit"
-msgstr "병합 결과에 커밋이 없습니다"
+#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493
+#: builtin/am.c:2127
+#, c-format
+msgid "could not parse %s"
+msgstr "parse %s을(를) 파싱할 수 없습니다"
-#: merge-recursive.c:2124
+#: commit.c:42
#, c-format
-msgid "Could not parse object '%s'"
-msgstr "'%s' 오브젝트를 파싱할 수 없습니다"
+msgid "%s %s is not a commit!"
+msgstr "%s %s, 커밋이 아닙니다"
-#: merge-recursive.c:2138 builtin/merge.c:641 builtin/merge.c:788
-msgid "Unable to write index."
-msgstr "인덱스를 쓸 수 없습니다."
+#: commit.c:1514
+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"
-#: notes-utils.c:41
-msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr "초기화하지 않았거나 레퍼런스하지 않은 notes 트리를 커밋할 수 없습니다"
+#: compat/obstack.c:406 compat/obstack.c:408
+msgid "memory exhausted"
+msgstr "메모리 바닥남"
-#: notes-utils.c:100
+#: config.c:516
#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "잘못된 notes.rewriteMode 값: '%s'"
+msgid "bad config line %d in blob %s"
+msgstr "블롭 %2$s 안에 %1$d번 줄에 잘못된 설정"
-#: notes-utils.c:110
+#: config.c:520
#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
-msgstr "%s에서 노트를 다시 쓰기를 거부합니다 (refs/notes/ 밖임)"
+msgid "bad config line %d in file %s"
+msgstr "파일 %2$s 안에 %1$d번 줄에 잘못된 설정"
-#. TRANSLATORS: The first %s is the name of the
-#. environment variable, the second %s is its value
-#: notes-utils.c:137
+#: config.c:524
#, c-format
-msgid "Bad %s value: '%s'"
-msgstr "잘못된 %s 값: '%s'"
+msgid "bad config line %d in standard input"
+msgstr "표준 입력 안에 %d번 줄에 잘못된 설정"
-#: object.c:242
+#: config.c:528
#, c-format
-msgid "unable to parse object: %s"
-msgstr "오브젝트를 파싱할 수 없습니다: %s"
-
-#: parse-options.c:572
-msgid "..."
-msgstr "..."
+msgid "bad config line %d in submodule-blob %s"
+msgstr "하위 모듈 블롭 %2$s 안에 %1$d번 줄에 잘못된 설정"
-#: parse-options.c:590
+#: config.c:532
#, c-format
-msgid "usage: %s"
-msgstr "사용법: %s"
+msgid "bad config line %d in command line %s"
+msgstr "명령행 %2$s 안에 %1$d번 줄에 잘못된 설정"
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation
-#: parse-options.c:594
+#: config.c:536
#, c-format
-msgid " or: %s"
-msgstr " 또는: %s"
+msgid "bad config line %d in %s"
+msgstr "%2$s 안에 %1$d번 줄에 잘못된 설정"
-#: parse-options.c:597
+#: config.c:655
+msgid "out of range"
+msgstr "범위를 벗어남"
+
+#: config.c:655
+msgid "invalid unit"
+msgstr "단위가 잘못됨"
+
+#: config.c:661
#, c-format
-msgid " %s"
-msgstr " %s"
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "잘못된 수치 설정 값 '%s' (키 '%s'): %s"
-#: parse-options.c:631
-msgid "-NUM"
-msgstr "-NUM"
+#: config.c:666
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 블롭 %s): %s"
-#: parse-options-cb.c:108
+#: config.c:669
#, c-format
-msgid "malformed object name '%s'"
-msgstr "잘못된 형식의 오브젝트 이름 '%s'"
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 파일 %s): %s"
-#: path.c:796
+#: config.c:672
#, c-format
-msgid "Could not make %s writable by group"
-msgstr "%s을(를) 그룹에서 쓰기 가능하도록 만들 수 없습니다"
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 표준입력): %s"
-#: pathspec.c:133
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
-msgstr "'glob' 및 'noglob' 경로명세 전체 설정은 호환되지 않습니다"
+#: config.c:675
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 하위 모듈 블롭 %s): %s"
-#: pathspec.c:143
-msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
-msgstr ""
-"'literal' 경로명세 전체 설정은 다른 경로명세 전체 설정과 호환되지 않습니다"
+#: config.c:678
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 명령행 %s): %s"
-#: pathspec.c:177
-msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr "경로명세 지시어 'prefix'에 잘못된 파라미터"
+#: config.c:681
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr "잘못된 수치 설정 값 '%s' (키 '%s', %s 안에): %s"
-#: pathspec.c:183
+#: config.c:768
#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
-msgstr "잘못된 경로명세 지시어 '%.*s' (위치 '%s')"
+msgid "failed to expand user dir in: '%s'"
+msgstr "다음에 사용자 디렉터리 확장에 실패: '%s'"
-#: pathspec.c:187
+#: config.c:852 config.c:863
#, c-format
-msgid "Missing ')' at the end of pathspec magic in '%s'"
-msgstr "경로 명세 지시어 끝에 ')' 빠짐 (위치 '%s')"
+msgid "bad zlib compression level %d"
+msgstr "%d번은 올바른 zlib 압축 단계가 아닙니다"
-#: pathspec.c:205
+#: config.c:978
#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "구현되지 않은 경로명세 지시어 '%c' (위치 '%s')"
+msgid "invalid mode for object creation: %s"
+msgstr "오브젝트 생성 모드가 올바르지 않습니다: %s"
-#: pathspec.c:230
+#: config.c:1312
+msgid "unable to parse command-line config"
+msgstr "명령행 설정을 파싱할 수 없습니다"
+
+#: config.c:1362
+msgid "unknown error occurred while reading the configuration files"
+msgstr "설정 파일을 읽는 중 알 수 없는 오류가 생겼습니다"
+
+#: config.c:1716
#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
-msgstr "%s: 'literal'과 'glob'은 호환되지 않습니다"
+msgid "unable to parse '%s' from command-line config"
+msgstr "명령행 설정에서 '%s'을(를) 설정할 수 없습니다"
-#: pathspec.c:241
+#: config.c:1718
#, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s: '%s'은(는) 저장소 밖입니다"
+msgid "bad config variable '%s' in file '%s' at line %d"
+msgstr "'%2$s' 파일의 %3$d번 줄 '%1$s' 설정 변수가 잘못되었습니다"
-#: pathspec.c:291
+#: config.c:1777
#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "경로명세 '%s'은(는) ''%.*s' 하위 모듈 안에 있습니다"
+msgid "%s has multiple values"
+msgstr "%s은(는) 여러 개 값이 있습니다"
-#: pathspec.c:353
+#: config.c:2311
#, c-format
-msgid "%s: pathspec magic not supported by this command: %s"
-msgstr "%s: 경로명세 지시어가 이 명령어에서 지원하지 않습니다: %s"
+msgid "could not set '%s' to '%s'"
+msgstr "'%s'을(를) '%s'(으)로 설정할 수 없습니다"
-#: pathspec.c:433
+#: config.c:2313
#, c-format
-msgid "pathspec '%s' is beyond a symbolic link"
-msgstr "'%s' 경로명세는 심볼릭 링크 아래에 있습니다"
+msgid "could not unset '%s'"
+msgstr "'%s' 설정을 지울 수 없습니다"
-#: pathspec.c:442
+#: connect.c:49
+msgid "The remote end hung up upon initial contact"
+msgstr "리모트 측이 최초 연결했을 때 연결을 끊었습니다"
+
+#: connect.c:51
msgid ""
-"There is nothing to exclude from by :(exclude) patterns.\n"
-"Perhaps you forgot to add either ':/' or '.' ?"
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
msgstr ""
-":(exclude) 패턴으로 제외할 사항이 없습니다.\n"
-"':/' 또는 '.' 추가를 잊으신 것 아닙니까?"
+"리모트 저장소에서 읽을 수 없습니다\n"
+"\n"
+"올바른 접근 권한이 있는지, 그리고 저장소가 있는지\n"
+"확인하십시오."
-#: pretty.c:973
-msgid "unable to parse --pretty format"
-msgstr "--pretty 형식을 파싱할 수 없습니다"
+#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
+msgid "Checking connectivity"
+msgstr "연결을 확인하는 중입니다"
-#: progress.c:235
-msgid "done"
-msgstr "완료"
+#: connected.c:75
+msgid "Could not run 'git rev-list'"
+msgstr "'git rev-list'를 실행할 수 없습니다"
-#: read-cache.c:1281
-#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-"index.version이 설정되었지만, 이 값이 잘못되었습니다.\n"
-"%i 버전을 사용합니다"
+#: connected.c:95
+msgid "failed write to rev-list"
+msgstr "rev-list 쓰기에 실패했습니다"
+
+#: connected.c:102
+msgid "failed to close rev-list's stdin"
+msgstr "rev-list의 표준입력을 닫는데 실패했습니다"
-#: read-cache.c:1291
+#: convert.c:201
#, c-format
msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
+"CRLF will be replaced by LF in %s.\n"
+"The file will have its original line endings in your working directory."
msgstr ""
-"GIT_INDEX_VERSION이 설정되었지만, 이 값이 잘못되었습니다.\n"
-"%i 버전을 사용합니다"
+"%s에서 CRLF는 LF로 바뀝니다.\n"
+"작업 디렉터리에서는 원래 줄 바꿈 형식을 유지합니다."
-#: refs.c:551 builtin/merge.c:840
+#: convert.c:205
#, c-format
-msgid "Could not open '%s' for writing"
-msgstr "'%s'을(를) 쓰기용으로 열 수 없습니다"
+msgid "CRLF would be replaced by LF in %s."
+msgstr "%s에서 CRLF는 LF로 바뀝니다."
-#: refs/files-backend.c:2534
+#: convert.c:211
#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "%s 레퍼런스를 삭제할 수 없습니다: %s"
+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"
+"작업 디렉터리에서는 원래 줄 바꿈 형식을 유지합니다."
-#: refs/files-backend.c:2537
+#: convert.c:215
#, c-format
-msgid "could not delete references: %s"
-msgstr "레퍼런스를 삭제할 수 없습니다: %s"
+msgid "LF would be replaced by CRLF in %s"
+msgstr "%s에서 LF는 CRLF로 바뀝니다."
-#: refs/files-backend.c:2546
-#, c-format
-msgid "could not remove reference %s"
-msgstr "%s 레퍼런스를 제거할 수 없습니다"
+#: date.c:97
+msgid "in the future"
+msgstr "미래에"
-#: ref-filter.c:55
+#: date.c:103
#, c-format
-msgid "expected format: %%(color:<color>)"
-msgstr "예상한 형식: %%(color:<색>)"
+msgid "%lu second ago"
+msgid_plural "%lu seconds ago"
+msgstr[0] "%lu초 전"
-#: ref-filter.c:57
+#: date.c:110
#, c-format
-msgid "unrecognized color: %%(color:%s)"
-msgstr "인식할 수 없는 색: %%(color:%s)"
+msgid "%lu minute ago"
+msgid_plural "%lu minutes ago"
+msgstr[0] "%lu분 전"
-#: ref-filter.c:71
+#: date.c:117
#, c-format
-msgid "unrecognized format: %%(%s)"
-msgstr "알 수 없는 형식: %%(%s)"
+msgid "%lu hour ago"
+msgid_plural "%lu hours ago"
+msgstr[0] "%lu시간 전"
-#: ref-filter.c:77
+#: date.c:124
#, c-format
-msgid "%%(body) does not take arguments"
-msgstr "%%(body)에 인자를 받지 않습니다"
+msgid "%lu day ago"
+msgid_plural "%lu days ago"
+msgstr[0] "%lu일 전"
-#: ref-filter.c:84
+#: date.c:130
#, c-format
-msgid "%%(subject) does not take arguments"
-msgstr "%%(subject)에 인자를 받지 않습니다"
+msgid "%lu week ago"
+msgid_plural "%lu weeks ago"
+msgstr[0] "%lu주 전"
-#: ref-filter.c:101
+#: date.c:137
#, c-format
-msgid "positive value expected contents:lines=%s"
-msgstr "'contents:lines=%s'에서 0보다 큰 값이 와야 합니다"
+msgid "%lu month ago"
+msgid_plural "%lu months ago"
+msgstr[0] "%lu달 전"
-#: ref-filter.c:103
+#: date.c:148
#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "알 수 없는 %%(contents) 인자: %s"
+msgid "%lu year"
+msgid_plural "%lu years"
+msgstr[0] "%lu년"
-#: ref-filter.c:113
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c:151
#, c-format
-msgid "unrecognized %%(objectname) argument: %s"
-msgstr "알 수 없는 %%(objectname) 인자: %s"
+msgid "%s, %lu month ago"
+msgid_plural "%s, %lu months ago"
+msgstr[0] "%s %lu달 전"
-#: ref-filter.c:135
+#: date.c:156 date.c:161
#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
-msgstr "예상한 형식: %%(align:<너비>,<위치>)"
+msgid "%lu year ago"
+msgid_plural "%lu years ago"
+msgstr[0] "%lu년 전"
-#: ref-filter.c:147
+#: diffcore-order.c:24
#, c-format
-msgid "unrecognized position:%s"
-msgstr "인식할 수 없는 위치:%s"
+msgid "failed to read orderfile '%s'"
+msgstr "'%s' 순서 파일을 읽는데 실패했습니다"
-#: ref-filter.c:151
-#, c-format
-msgid "unrecognized width:%s"
-msgstr "인식할 수 없는 너비:%s"
+#: diffcore-rename.c:536
+msgid "Performing inexact rename detection"
+msgstr "부정확한 이름 바꾸기 탐색을 수행하는 중"
-#: ref-filter.c:157
+#: diff.c:62
#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "인식할 수 없는 %%(align) 인자:%s"
+msgid "option '%s' requires a value"
+msgstr "'%s' 옵션에는 값이 필요합니다"
-#: ref-filter.c:161
+#: diff.c:124
#, c-format
-msgid "positive width expected with the %%(align) atom"
-msgstr "%%(align) 아톰에 너비가 0보다 커야 합니다"
+msgid " Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr " dirstat 자름 퍼센트 값 '%s' 파싱에 실패했습니다\n"
-#: ref-filter.c:244
+#: diff.c:129
#, c-format
-msgid "malformed field name: %.*s"
-msgstr "잘못된 형식의 필드 이름: %.*s"
+msgid " Unknown dirstat parameter '%s'\n"
+msgstr " 알 수 없는 dirstat 파라미터 '%s'\n"
-#: ref-filter.c:270
+#: diff.c:283
#, c-format
-msgid "unknown field name: %.*s"
-msgstr "알 수 없는 필드 이름: %.*s"
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr "'diff.submodule' 설정 변수에 알 수 없는 값: '%s'"
-#: ref-filter.c:372
+#: diff.c:346
#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
-msgstr "형식: %%(end) 아톰이 대응되는 아톰 없이 사용되었습니다"
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+"'diff.submodule' 설정 변수에 오류:\n"
+"%s'"
-#: ref-filter.c:424
+#: diff.c:3087
#, c-format
-msgid "malformed format string %s"
-msgstr "ì\9e\98못ë\90\9c í\98\95ì\8b\9dì\9d\98 문ì\9e\90ì\97´ %s"
+msgid "external diff died, stopping at %s"
+msgstr "ì\99¸ë¶\80 diff í\94\84ë¡\9cê·¸ë\9e¨ì\9d´ 죽ì\9d\8c, %s ì\9c\84ì¹\98ì\97\90ì\84\9c ë©\88춤"
-#: ref-filter.c:878
-msgid ":strip= requires a positive integer argument"
-msgstr ":strip= 명령에는 0보다 큰 정수 인자가 필요합니다"
+#: diff.c:3412
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+msgstr ""
+"\"--name-only, --name-status, --check, -s 옵션 중 하나만 쓸 수 있습니다"
-#: ref-filter.c:883
-#, c-format
-msgid "ref '%s' does not have %ld components to :strip"
-msgstr "'%s' 레퍼런스에 :strip할 구성 요소 %ld개가 없습니다"
-
-#: ref-filter.c:1046
-#, c-format
-msgid "unknown %.*s format %s"
-msgstr "알 수 없는 %.*s 형식 %s"
+#: diff.c:3502
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow 옵션에는 정확히 하나의 경로명세가 필요합니다"
-#: ref-filter.c:1066 ref-filter.c:1097
+#: diff.c:3665
#, c-format
-msgid "missing object %s for %s"
-msgstr "없는 오브젝트 %s, %s에 대해"
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+"--dirstat/-X 옵션 파라미터를 파싱하는데 실패했습니다:\n"
+"%s"
-#: ref-filter.c:1069 ref-filter.c:1100
+#: diff.c:3679
#, c-format
-msgid "parse_object_buffer failed on %s for %s"
-msgstr "%s에 parse_object_buffer 실패 (%s에 대해)"
+msgid "Failed to parse --submodule option parameter: '%s'"
+msgstr "--submodule 옵션 파라미터 파싱에 실패했습니다: '%s'"
-#: ref-filter.c:1311
-#, c-format
-msgid "malformed object at '%s'"
-msgstr "'%s'에 잘못된 형식의 오브젝트"
+#: diff.c:4700
+msgid "inexact rename detection was skipped due to too many files."
+msgstr "파일이 너무 많아서 부정확한 이름 바꾸기 검색 기능을 건너뜁니다."
-#: ref-filter.c:1373
-#, c-format
-msgid "ignoring ref with broken name %s"
-msgstr "망가진 이름 %s에 레퍼런스를 무시합니다"
+#: diff.c:4703
+msgid "only found copies from modified paths due to too many files."
+msgstr "파일이 너무 많아서 수정한 경로의 복사본만 찾았습니다."
-#: ref-filter.c:1378
+#: diff.c:4706
#, c-format
-msgid "ignoring broken ref %s"
-msgstr "망가진 레퍼런스 %s 무시"
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr "%s 변수를 최소한 %d(으)로 설정하고 명령을 다시 시도해 보십시오."
-#: ref-filter.c:1651
-#, c-format
-msgid "format: %%(end) atom missing"
-msgstr "형식: %%(end) 아톰이 없습니다"
+#: dir.c:1866
+msgid "failed to get kernel name and information"
+msgstr "커널 이름과 정보를 가져오는데 실패했습니다"
-#: ref-filter.c:1705
-#, c-format
-msgid "malformed object name %s"
-msgstr "잘못된 형식의 오브젝트 이름 %s"
+#: dir.c:1985
+msgid "Untracked cache is disabled on this system or location."
+msgstr "이 시스템 또는 위치에서는 추적되지 않는 캐시를 사용하지 않습니다."
-#: remote.c:746
-#, c-format
-msgid "Cannot fetch both %s and %s to %s"
-msgstr "%s 및 %s을(를) 모두 %s에 가져올 수 없습니다"
+#: fetch-pack.c:213
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack: 얕은 목록을 예상함"
-#: remote.c:750
-#, c-format
-msgid "%s usually tracks %s, not %s"
-msgstr "%s은(는) 보통 %s을(를) 추적하고, %s을(를) 추적하지 않습니다"
+#: fetch-pack.c:225
+msgid "git fetch-pack: expected ACK/NAK, got EOF"
+msgstr "git fetch-pack: ACK/NAK가 와야 하지만, EOF를 받았습니다"
-#: remote.c:754
+#: fetch-pack.c:243
#, c-format
-msgid "%s tracks both %s and %s"
-msgstr "%s은(는) %s 및 %s 모두 추적합니다"
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack: ACK/NAK가 와야 하지만, '%s'을(를) 받았습니다"
-#: remote.c:762
-msgid "Internal error"
-msgstr "내부 오류"
-
-#: remote.c:1677 remote.c:1720
-msgid "HEAD does not point to a branch"
-msgstr "HEAD가 브랜치를 가리키지 않습니다"
+#: fetch-pack.c:295
+msgid "--stateless-rpc requires multi_ack_detailed"
+msgstr "--stateless-rpc 옵션은 multi_ack_detailed가 필요합니다"
-#: remote.c:1686
+#: fetch-pack.c:381
#, c-format
-msgid "no such branch: '%s'"
-msgstr "그런 브랜치가 없습니다: '%s'"
+msgid "invalid shallow line: %s"
+msgstr "shallow 줄이 잘못됨: %s"
-#: remote.c:1689
+#: fetch-pack.c:387
#, c-format
-msgid "no upstream configured for branch '%s'"
-msgstr "'%s' 브랜치에 대해 업스트림을 설정하지 않았습니다"
+msgid "invalid unshallow line: %s"
+msgstr "unshallow 줄이 잘못됨: %s"
-#: remote.c:1695
+#: fetch-pack.c:389
#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
-msgstr "ì\97\85ì\8a¤í\8a¸ë¦¼ '%s' ë¸\8cë\9e\9cì¹\98ê°\80 리모í\8a¸ ì¶\94ì \81 ë¸\8cë\9e\9cì¹\98ë¡\9c ì \80ì\9e¥ë\90\98ì§\80 ì\95\8aì\95\98ì\8aµë\8b\88ë\8b¤"
+msgid "object not found: %s"
+msgstr "ì\98¤ë¸\8cì \9dí\8a¸ê°\80 ì\97\86ì\8aµë\8b\88ë\8b¤: %s"
-#: remote.c:1710
+#: fetch-pack.c:392
#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
-msgstr "리모트 '%2$s'의 푸시 대상 '%1$s'에 로컬 추적 브랜치가 없습니다"
+msgid "error in object: %s"
+msgstr "오브젝트에 오류: %s"
-#: remote.c:1725
+#: fetch-pack.c:394
#, c-format
-msgid "branch '%s' has no remote for pushing"
-msgstr "'%s' 브랜치에 푸시 리모트가 없습니다"
+msgid "no shallow found: %s"
+msgstr "shallow가 없습니다: %s"
-#: remote.c:1736
+#: fetch-pack.c:397
#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
-msgstr "'%s'에 대한 푸시 레퍼런스명세에 '%s'이(가) 들어 있지 않습니다"
-
-#: remote.c:1749
-msgid "push has no destination (push.default is 'nothing')"
-msgstr "푸시의 대상이 없습니다 (push.default가 'nothing'입니다)"
-
-#: remote.c:1771
-msgid "cannot resolve 'simple' push to a single destination"
-msgstr "하나의 대상에 대해 'simple' 푸시를 처리할 수 없습니다"
+msgid "expected shallow/unshallow, got %s"
+msgstr "shallow/unshallow가 와야 하지만, %s을(를) 받았습니다"
-#: remote.c:2073
+#: fetch-pack.c:436
#, c-format
-msgid "Your branch is based on '%s', but the upstream is gone.\n"
-msgstr "현재 브랜치가 '%s' 기반이지만, 업스트림이 없어졌습니다.\n"
-
-#: remote.c:2077
-msgid " (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr " (바로잡으려면 \"git branch --unset-upstream\"을 사용하십시오)\n"
+msgid "got %s %d %s"
+msgstr "받음: %s %d %s"
-#: remote.c:2080
+#: fetch-pack.c:450
#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
-msgstr "브랜치가 '%s'에 맞게 업데이트된 상태입니다.\n"
+msgid "invalid commit %s"
+msgstr "잘못된 커밋 %s"
-#: remote.c:2084
-#, 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"
+#: fetch-pack.c:483
+msgid "giving up"
+msgstr "포기함"
-#: remote.c:2090
-msgid " (use \"git push\" to publish your local commits)\n"
-msgstr " (로컬에 있는 커밋을 제출하려면 \"git push\"를 사용하십시오)\n"
+#: fetch-pack.c:493 progress.c:235
+msgid "done"
+msgstr "완료"
-#: remote.c:2093
+#: fetch-pack.c:505
#, 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:2101
-msgid " (use \"git pull\" to update your local branch)\n"
-msgstr " (로컬 브랜치를 업데이트하려면 \"git pull\"을 사용하십시오)\n"
+msgid "got %s (%d) %s"
+msgstr "받음: %s (%d) %s"
-#: remote.c:2104
+#: fetch-pack.c:551
#, 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"
+msgid "Marking %s as complete"
+msgstr "%s 항목을 완료로 표시"
-#: remote.c:2114
-msgid " (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr ""
-" (리모트의 브랜치를 현재 브랜치로 병합하려면 \"git pull\"을 사용하십시오)\n"
-
-#: revision.c:2132
-msgid "your current branch appears to be broken"
-msgstr "현재 브랜치가 망가진 것처럼 보입니다"
-
-#: revision.c:2135
+#: fetch-pack.c:697
#, c-format
-msgid "your current branch '%s' does not have any commits yet"
-msgstr "현재 '%s' 브랜치에 아직 아무 커밋도 없습니다"
+msgid "already have %s (%s)"
+msgstr "이미 %s (%s) 있음"
-#: revision.c:2329
-msgid "--first-parent is incompatible with --bisect"
-msgstr "--first-parent 옵션은 --bisect 옵션과 호환되지 않습니다"
+#: fetch-pack.c:735
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack: 사이드밴드 디멀티플렉서를 fork할 수 없습니다"
-#: run-command.c:92
-msgid "open /dev/null failed"
-msgstr "/dev/null 열기 실패"
+#: fetch-pack.c:743
+msgid "protocol error: bad pack header"
+msgstr "프로토콜 오류: 잘못된 묶음 헤더"
-#: run-command.c:94
+#: fetch-pack.c:799
#, c-format
-msgid "dup2(%d,%d) failed"
-msgstr "dup2(%d,%d) 실패"
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack: %s 명령을 fork할 수 없습니다"
-#: send-pack.c:298
-msgid "failed to sign the push certificate"
-msgstr "푸시 인증서 서명에 실패했습니다"
-
-#: send-pack.c:411
-msgid "the receiving end does not support --signed push"
-msgstr "받는 쪽에서 --signed 푸시를 지원하지 않습니다"
-
-#: send-pack.c:413
-msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
-msgstr ""
-"받는 쪽에서 --signed 푸시를 지원하지 않으므로 푸시 인증서를 보내지 않습니다"
+#: fetch-pack.c:815
+#, c-format
+msgid "%s failed"
+msgstr "%s 실패"
-#: send-pack.c:425
-msgid "the receiving end does not support --atomic push"
-msgstr "받는 쪽에서 --atomic 푸시를 지원하지 않습니다"
+#: fetch-pack.c:817
+msgid "error in sideband demultiplexer"
+msgstr "사이드밴드 디멀티플렉서에 오류"
-#: send-pack.c:430
-msgid "the receiving end does not support push options"
-msgstr "받는 쪽에서 푸시 옵션을 지원하지 않습니다"
+#: fetch-pack.c:844
+msgid "Server does not support shallow clients"
+msgstr "서버에서 shallow 클라이언트를 지원하지 않습니다"
-#: sequencer.c:174
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
-msgstr ""
-"이 충돌을 해결한 뒤에, 바로잡은 경로를\n"
-"'git add <경로>' 또는 'git rm <경로>'로 표시하십시오"
+#: fetch-pack.c:848
+msgid "Server supports multi_ack_detailed"
+msgstr "서버에서 multi_ack_detailed를 지원합니다"
-#: sequencer.c:177
-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'으로 커밋하십시오"
+#: fetch-pack.c:851
+msgid "Server supports no-done"
+msgstr "서버에서 no-done을 지원합니다"
-#: sequencer.c:190 sequencer.c:841 sequencer.c:924
-#, c-format
-msgid "Could not write to %s"
-msgstr "%s에 쓸 수 없습니다"
+#: fetch-pack.c:857
+msgid "Server supports multi_ack"
+msgstr "서버에서 multi_ack를 지원합니다"
-#: sequencer.c:193 sequencer.c:843 sequencer.c:928
-#, c-format
-msgid "Error wrapping up %s."
-msgstr "%s 잠그는데 오류."
+#: fetch-pack.c:861
+msgid "Server supports side-band-64k"
+msgstr "서버에서 side-band-64k를 지원합니다"
-#: sequencer.c:208
-msgid "Your local changes would be overwritten by cherry-pick."
-msgstr "로컬 변경 사항을 cherry-pick 때문에 덮어 쓰게 됩니다."
+#: fetch-pack.c:865
+msgid "Server supports side-band"
+msgstr "서버에서 side-band를 지원합니다"
-#: sequencer.c:210
-msgid "Your local changes would be overwritten by revert."
-msgstr "로컬 변경 사항을 revert 때문에 덮어 쓰게 됩니다."
+#: fetch-pack.c:869
+msgid "Server supports allow-tip-sha1-in-want"
+msgstr "서버에서 allow-tip-sha1-in-want를 지원합니다"
-#: sequencer.c:213
-msgid "Commit your changes or stash them to proceed."
-msgstr "변경 사항을 스테이징하거나 스태시한 다음 계속하십시오."
+#: fetch-pack.c:873
+msgid "Server supports allow-reachable-sha1-in-want"
+msgstr "서버에서 allow-reachable-sha1-in-want를 지원합니다"
-#: sequencer.c:228
-#, c-format
-msgid "%s: fast-forward"
-msgstr "%s: 정방향 진행"
+#: fetch-pack.c:883
+msgid "Server supports ofs-delta"
+msgstr "서버에서 ofs-delta를 지원합니다"
-#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:303
+#: fetch-pack.c:890
#, c-format
-msgid "%s: Unable to write new index file"
-msgstr "%s: 새 인덱스 파일을 쓸 수 없습니다"
+msgid "Server version is %.*s"
+msgstr "서버 버전이 %.*s입니다"
-#: sequencer.c:321
-msgid "Could not resolve HEAD commit\n"
-msgstr "HEAD 커밋을 처리할 수 없습니다\n"
-
-#: sequencer.c:341
-msgid "Unable to update cache tree\n"
-msgstr "캐시 트리를 업데이트할 수 없습니다\n"
+#: fetch-pack.c:896
+msgid "Server does not support --shallow-since"
+msgstr "서버에서 --shallow-signed 옵션을 지원하지 않습니다"
-#: sequencer.c:393
-#, c-format
-msgid "Could not parse commit %s\n"
-msgstr "%s 커밋을 파싱할 수 없습니다\n"
+#: fetch-pack.c:900
+msgid "Server does not support --shallow-exclude"
+msgstr "서버에서 --shallow-exclude 옵션을 지원하지 않습니다"
-#: sequencer.c:398
-#, c-format
-msgid "Could not parse parent commit %s\n"
-msgstr "%s 이전 커밋을 파싱할 수 없습니다\n"
+#: fetch-pack.c:902
+msgid "Server does not support --deepen"
+msgstr "서버에서 --deepen 옵션을 지원하지 않습니다"
-#: sequencer.c:463
-msgid "Your index file is unmerged."
-msgstr "인덱스 파일이 병합되지 않았습니다."
+#: fetch-pack.c:913
+msgid "no common commits"
+msgstr "공통 커밋 없음"
-#: sequencer.c:482
-#, c-format
-msgid "Commit %s is a merge but no -m option was given."
-msgstr "%s 커밋은 병합이지만 -m 옵션이 주어지지 않았습니다."
+#: fetch-pack.c:925
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack: 가져오기 실패."
-# FIXME: "parent %d" 번호가 무슨 의미?
-#: sequencer.c:490
-#, c-format
-msgid "Commit %s does not have parent %d"
-msgstr "Commit %s 커밋에 이전 커밋 %d이(가) 없습니다"
+#: fetch-pack.c:1087
+msgid "no matching remote head"
+msgstr "해당하는 리모트 헤드가 없습니다"
-#: sequencer.c:494
-#, c-format
-msgid "Mainline was specified but commit %s is not a merge."
-msgstr "메인라인을 지정했지만 %s 커밋이 병합 커밋이 아닙니다."
+#: gpg-interface.c:185
+msgid "gpg failed to sign the data"
+msgstr "gpg에서 데이터를 서명하는데 실패했습니다."
-#. TRANSLATORS: The first %s will be "revert" or
-#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:507
-#, c-format
-msgid "%s: cannot parse parent commit %s"
-msgstr "%s: %s 이전 커밋을 파싱할 수 없습니다"
+#: gpg-interface.c:215
+msgid "could not create temporary file"
+msgstr "임시 파일을 만들 수 없습니다"
-#: sequencer.c:511
+#: gpg-interface.c:217
#, c-format
-msgid "Cannot get commit message for %s"
-msgstr "%s에 대한 커밋 메시지를 가져올 수 없습니다"
+msgid "failed writing detached signature to '%s'"
+msgstr "분리된 서명을 '%s'에 쓰는데 실패했습니다"
-#: sequencer.c:597
+#: grep.c:1782
#, c-format
-msgid "could not revert %s... %s"
-msgstr "다음을 되돌릴(revert) 수 없습니다: %s... %s"
+msgid "'%s': unable to read %s"
+msgstr "'%s': %s을(를) 읽을 수 없습니다"
-#: sequencer.c:598
+#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155
#, c-format
-msgid "could not apply %s... %s"
-msgstr "다음을 적용할(apply) 수 없습니다: %s... %s"
-
-#: sequencer.c:633
-msgid "empty commit set passed"
-msgstr "빈 커밋 모음을 건너 뜁니다"
+msgid "failed to stat '%s'"
+msgstr "'%s'에 대해 stat()이 실패했습니다"
-#: sequencer.c:641
+#: grep.c:1810
#, c-format
-msgid "git %s: failed to read the index"
-msgstr "git %s: 인덱스 읽기에 실패했습니다"
+msgid "'%s': short read"
+msgstr "'%s': 읽다가 잘림"
-#: sequencer.c:645
+#: help.c:203
#, c-format
-msgid "git %s: failed to refresh the index"
-msgstr "git %s: 인덱스 새로 고침에 실패했습니다"
-
-#: sequencer.c:705
-msgid "Cannot revert during a another revert."
-msgstr "되돌리는(revert) 중에 또 다른 되돌리기를 할 수 없습니다."
-
-#: sequencer.c:706
-msgid "Cannot revert during a cherry-pick."
-msgstr "빼오기(cherry-pick) 중에 되돌리기(revert)를 할 수 없습니다."
+msgid "available git commands in '%s'"
+msgstr "'%s'에 있는 깃 명령"
-#: sequencer.c:709
-msgid "Cannot cherry-pick during a revert."
-msgstr "ë\90\98ë\8f\8c리기(revert) ì¤\91ì\97\90 ë¹¼ì\98¤ê¸°(cherry-pick)를 í\95 ì\88\98 ì\97\86ì\8aµë\8b\88ë\8b¤"
+#: help.c:210
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "ë\8b¤ë¥¸ $PATHì\97\90 ì\9e\88ë\8a\94 ê¹\83 ëª\85ë ¹"
-#: sequencer.c:710
-msgid "Cannot cherry-pick during another cherry-pick."
-msgstr "ë¹¼ì\98¤ê¸°(revert) ì¤\91ì\97\90 ë\98\90 ë\8b¤ë¥¸ ë¹¼ì\98¤ê¸°ë¥¼ í\95 ì\88\98 ì\97\86ì\8aµë\8b\88ë\8b¤"
+#: help.c:241
+msgid "These are common Git commands used in various situations:"
+msgstr "ë\8b¤ì\9d\8cì\9d\80 ì\97¬ë\9f¬ê°\80ì§\80 ì\83\81í\99©ì\97\90ì\84\9c ì\9e\90주 ì\82¬ì\9a©í\95\98ë\8a\94 ê¹\83 ëª\85ë ¹ì\9e\85ë\8b\88ë\8b¤:"
-#: sequencer.c:732
+#: help.c:306
#, c-format
-msgid "Could not parse line %d."
-msgstr "%d번 줄을 파싱할 수 없습니다."
+msgid ""
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
+msgstr ""
+"'%s'은(는) 깃 명령으로 보이지만, 실행할 수\n"
+"없습니다. 아마도 git-%s 망가진 것 같습니다."
-#: sequencer.c:737
-msgid "No commits parsed."
-msgstr "í\8c\8cì\8b±í\95\9c 커ë°\8bì\9d´ ì\97\86ì\8aµë\8b\88ë\8b¤."
+#: help.c:361
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "ì\96´ë\9d¼ë\9d¼. ì\8b\9cì\8a¤í\85\9cì\97\90 ê¹\83 ëª\85ë ¹ì\9d´ í\95\98ë\82\98ë\8f\84 ì\97\86ë\8b¤ê³ ë\82\98ì\98µë\8b\88ë\8b¤."
-#: sequencer.c:749
+#: help.c:383
#, c-format
-msgid "Could not open %s"
-msgstr "%s을(를) 열 수 없습니다"
+msgid ""
+"WARNING: You called a Git command named '%s', which does not exist.\n"
+"Continuing under the assumption that you meant '%s'"
+msgstr ""
+"경고: 이름이 '%s'인 깃 명령을 실행했지만, 그 명령이 없습니다.\n"
+"자동으로 '%s' 명령이라고 가정하고 계속합니다"
-#: sequencer.c:753
+#: help.c:388
#, c-format
-msgid "Could not read %s."
-msgstr "%s을(를) 읽을 수 없습니다."
+msgid "in %0.1f seconds automatically..."
+msgstr "(%0.1f초 뒤에)..."
-#: sequencer.c:760
+#: help.c:395
#, c-format
-msgid "Unusable instruction sheet: %s"
-msgstr "사용 불가능 인스트럭션 파일: %s"
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git: '%s'은(는) 깃 명령이 아닙니다. 'git --help'를 참고하십시오."
-#: sequencer.c:790
-#, c-format
-msgid "Invalid key: %s"
-msgstr "잘못된 키: %s"
-
-#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52
-#, c-format
-msgid "Invalid value for %s: %s"
-msgstr "%s의 값이 올바르지 않습니다: %s"
+#: help.c:399 help.c:465
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+"\n"
+"다음을 의도하신 것 아니었나요?"
-#: sequencer.c:803
+#: help.c:461
#, c-format
-msgid "Malformed options sheet: %s"
-msgstr "형식이 잘못된 옵션 파일: %s"
-
-#: sequencer.c:822
-msgid "a cherry-pick or revert is already in progress"
-msgstr "이미 커밋 빼오기(cherry-pick) 또는 되돌리기(revert)가 진행 중입니다"
+msgid "%s: %s - %s"
+msgstr "%s: %s - %s"
-#: sequencer.c:823
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
-msgstr "\"git cherry-pick (--continue | --quit | --abort)\" 명령을 해 보십시오"
+#: ident.c:334
+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"
-#: sequencer.c:827
+#: lockfile.c:152
#, c-format
-msgid "Could not create sequencer directory %s"
-msgstr "%s 시퀀서 디렉터리를 만들 수 없습니다"
+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"
+"이 저장소에서 다른 깃 프로세스가 실행 중인 것으로 보입니다. (예를\n"
+"들어 'git commit' 명령으로 편집기가 열려 있다든지.) 모든 프로세스를\n"
+"끝냈는지 확인하시고 다시 시도해 보십시오. 그래도 계속 실패하면, 이\n"
+"저장소에서 깃 프로세스가 전에 이상 종료했을 수도 있습니다:\n"
+"수동으로 해당 파일을 제거하고 계속하십시오."
-#: sequencer.c:862 sequencer.c:998
-msgid "no cherry-pick or revert in progress"
-msgstr "빼오기(cherry-pick) 또는 되돌리기(revert)가 진행 중이지 않습니다"
+#: lockfile.c:160
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "'%s.lock'을 만들 수 없습니다: %s"
-#: sequencer.c:864
-msgid "cannot resolve HEAD"
-msgstr "HEAD를 구해 올 수 없습니다"
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "캐시를 읽는데 실패했습니다"
-#: sequencer.c:866 sequencer.c:900
-msgid "cannot abort from a branch yet to be born"
-msgstr "새로 만들고 있는 브랜치에서 중지할 수 없습니다"
+#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374
+#: builtin/checkout.c:588 builtin/clone.c:731
+msgid "unable to write new index file"
+msgstr "새 인덱스 파일을 쓸 수 없습니다"
-#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970
-#, c-format
-msgid "cannot open %s"
-msgstr "%s을(를) 열 수 없습니다"
+#: merge-recursive.c:209
+msgid "(bad commit)\n"
+msgstr "(잘못된 커밋)\n"
-#: sequencer.c:888
+#: merge-recursive.c:231
#, c-format
-msgid "cannot read %s: %s"
-msgstr "%s을(를) 읽을 수 없습니다: %s"
+msgid "addinfo_cache failed for path '%s'"
+msgstr "'%s' 경로에 대해 addinfo_cache가 실패했습니다"
-#: sequencer.c:889
-msgid "unexpected end of file"
-msgstr "예상치 못하게 파일이 끝났습니다"
+#: merge-recursive.c:301
+msgid "error building trees"
+msgstr "트리 빌드에 오류"
-#: sequencer.c:895
+#: merge-recursive.c:720
#, c-format
-msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
-msgstr "빼오기 전에 저장한 HEAD 파일이('%s') 손상되었습니다"
+msgid "failed to create path '%s'%s"
+msgstr "'%s' 경로 만들기에 실패했습니다%s"
-#: sequencer.c:921
+#: merge-recursive.c:731
#, c-format
-msgid "Could not format %s."
-msgstr "%s에 포매팅할 수 없습니다."
+msgid "Removing %s to make room for subdirectory\n"
+msgstr "하위 디렉터리에 공간을 만드려고 %s을(를) 제거합니다\n"
-#: sequencer.c:1066
-#, c-format
-msgid "%s: can't cherry-pick a %s"
-msgstr "%s: %s 커밋을 빼올 수 없습니다"
+#: merge-recursive.c:745 merge-recursive.c:764
+msgid ": perhaps a D/F conflict?"
+msgstr ": 아마도 D/F 충돌?"
-#: sequencer.c:1069
+#: merge-recursive.c:754
#, c-format
-msgid "%s: bad revision"
-msgstr "%s: 잘못된 리비전"
-
-#: sequencer.c:1102
-msgid "Can't revert as initial commit"
-msgstr "최초의 커밋을 되돌릴 수 없습니다"
+msgid "refusing to lose untracked file at '%s'"
+msgstr "'%s' 위치의 추적되지 않는 파일을 잃기를 거부합니다"
-#: setup.c:160
+#: merge-recursive.c:796 builtin/cat-file.c:34
#, 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 <명령> -- <경로>...' 식으로 사용하십시오."
+msgid "cannot read object %s '%s'"
+msgstr "%s '%s' 오브젝트를 읽을 수 없음"
-#: setup.c:173
+#: merge-recursive.c:798
#, 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 <명령> [<리비전>...] -- [<파일>...]'"
+msgid "blob expected for %s '%s'"
+msgstr "%s '%s'에 대해 블롭을 예상"
-#: setup.c:223
+#: merge-recursive.c:822
#, 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 "failed to open '%s': %s"
+msgstr "'%s'을(를) 여는데 실패: %s"
-#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419
+#: merge-recursive.c:833
#, c-format
-msgid "failed to read %s"
-msgstr "%s을(를) 읽는데 실패했습니다"
+msgid "failed to symlink '%s': %s"
+msgstr "'%s' 심볼릭 링크에 실패: %s"
-#: setup.c:468
+#: merge-recursive.c:838
#, c-format
-msgid "Expected git repo version <= %d, found %d"
-msgstr "깃 저장소 버전 <= %d 버전을 기대하지만, %d 버전이 발견되었습니다"
+msgid "do not know what to do with %06o %s '%s'"
+msgstr "다음을 어떻게 할지 알 수 없습니다: %06o %s '%s'"
-#: setup.c:476
-msgid "unknown repository extensions found:"
-msgstr "알 수 없는 저장소 확장이 있습니다:"
+#: merge-recursive.c:978
+msgid "Failed to execute internal merge"
+msgstr "내부 병합 실행에 실패"
-#: setup.c:762
+#: merge-recursive.c:982
#, c-format
-msgid "Not a git repository (or any of the parent directories): %s"
-msgstr "(현재 폴더 또는 상위 폴더가) 깃 저장소가 아닙니다: %s"
-
-#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
-msgid "Cannot come back to cwd"
-msgstr "현재 디렉터리로 돌아올 수 없습니다"
-
-#: setup.c:845
-msgid "Unable to read current working directory"
-msgstr "현재 작업 디렉터리를 읽을 수 없습니다"
+msgid "Unable to add %s to database"
+msgstr "%s을(를) 데이터베이스에 추가할 수 없습니다"
-#: setup.c:920
+#: merge-recursive.c:1081 merge-recursive.c:1095
#, 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)."
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
msgstr ""
-"(현재 폴더 또는 마운트 위치 %s까지 상위 폴더가) 깃 저장소가 아닙니다\n"
-"파일 시스템 경계에서 중지합니다. (GIT_DISCOVERY_ACROSS_FILESYSTEM 설정되지 않음)"
-
-#: setup.c:927
-#, c-format
-msgid "Cannot change to '%s/..'"
-msgstr "'%s/..' 위치로 이동할 수 없습니다"
+"충돌! (%s/삭제): %s (위치 %s) 및 %s (%s에서) 삭제. %s 버전의 %s 트리에 남음."
-#: setup.c:989
+#: merge-recursive.c:1087 merge-recursive.c:1100
#, c-format
msgid ""
-"Problem with core.sharedRepository filemode value (0%.3o).\n"
-"The owner of files must always have read and write permissions."
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
msgstr ""
-"core.sharedRepository 파일모드 값에 (0%.3o) 문제가 있습니다.\n"
-"파일의 소유자에 읽기와 쓰기 권한이 있어야 합니다."
+"충돌! (%s/삭제): %s (위치 %s) 및 %s (위치 %s) 삭제. %s 버전의 %s 트리에 "
+"%s(으)로 남음."
-#: sha1_file.c:1046
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "ì\98¤í\94\84ì\85\8bì\9d´ 묶ì\9d\8c í\8c\8cì\9d¼ ì\95\9eì\9e\85ë\8b\88ë\8b¤ (ë§\9dê°\80ì§\84 .idx?)"
+#: merge-recursive.c:1143
+msgid "rename"
+msgstr "ì\9d´ë¦\84ë°\94꾸기"
-#: sha1_file.c:2434
-#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
-msgstr "오프셋이 %s의 묶음 인덱스 시작보다 앞입니다 (망가진 인덱스?)"
+#: merge-recursive.c:1143
+msgid "renamed"
+msgstr "이름바꿈"
-#: sha1_file.c:2438
+#: merge-recursive.c:1200
#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr "오프셋이 %s의 묶음 인덱스 끝보다 뒤입니다 (망가진 인덱스?)"
+msgid "%s is a directory in %s adding as %s instead"
+msgstr "%s은(는) %s에 있는 디렉터리로 %s(으)로 이름을 바꿉니다"
-#: sha1_name.c:462
+#: merge-recursive.c:1225
+#, c-format
msgid ""
-"Git normally never creates a ref that ends with 40 hex characters\n"
-"because it will be ignored when you just specify 40-hex. These refs\n"
-"may be created by mistake. For example,\n"
-"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
-"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
msgstr ""
-"깃에서는 보통 40개의 16진수 문자로 끝나는 레퍼런스를 만들지 않습니다.\n"
-"16진수 문자 40자를 지정했을 때 이 레퍼런스가 무시되기 때문입니다. 이\n"
-"레퍼런스는 실수로 만들어졌을 수도 있습니다. 예를 들어,\n"
-"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
-"\n"
-"여기서 \"$br\"은 비어 있으므로 40자 레퍼런스가 만들어집니다. 이 레퍼런스를\n"
-"확인해 보시고 잘못 만들어진 것이면 지우십시오. 이 메시지를 보고 싶지\n"
-"않으면 \"git config advice.objectNameWarning false\" 명령을 사용하십시오."
+"충돌! (이름바꾸기/이름바꾸기): \"%3$s\" 브랜치에서 이름바꾸기 \"%1$s\"->"
+"\"%2$s\" \"%6$s\" 브랜치에서 이름 바꾸기 \"%4$s\"->\"%5$s\"%7$s"
-#: submodule.c:64 submodule.c:98
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
-msgstr ""
-"병합하지 않은 .gitmodules를 바꿀 수 없습니다. 병합 충돌을 먼저 해결하십시오"
+#: merge-recursive.c:1230
+msgid " (left unresolved)"
+msgstr " (해결되지 않음)"
-#: submodule.c:68 submodule.c:102
+#: merge-recursive.c:1292
#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
-msgstr "경로가 %s일 때 .gitmodules의 섹션을 찾을 수 없습니다"
+msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
+msgstr ""
+"충돌! (rename/rename): 이름 바꾸기 %s->%s (위치 %s). 이름 바꾸기 %s->%s (위"
+"치 %s)"
-#: submodule.c:76
+#: merge-recursive.c:1325
#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr ".gitmodules 항목 %s을(를) 업데이트할 수 없습니다"
+msgid "Renaming %s to %s and %s to %s instead"
+msgstr "대신 이름을 %s에서 %s(으)로 바꾸고 %s에서 %s(으)로 바꿉니다"
-#: submodule.c:109
+#: merge-recursive.c:1531
#, c-format
-msgid "Could not remove .gitmodules entry for %s"
-msgstr "%s에 대한 .gitmodules 항목을 제거할 수 없습니다"
-
-#: submodule.c:120
-msgid "staging updated .gitmodules failed"
-msgstr "업데이트한 .gitmodules를 커밋할 사항으로 표시하는데 실패"
-
-#: submodule.c:177
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "submodule.fetchJobs 값에 음수를 쓸 수 없습니다"
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
+msgstr "충돌! (rename/add): 이름 바꾸기 %s->%s (위치 %s). %s 추가 (위치 %s)"
-#: submodule-config.c:358
+#: merge-recursive.c:1546
#, c-format
-msgid "invalid value for %s"
-msgstr "%s의 값이 올바르지 않습니다"
+msgid "Adding merged %s"
+msgstr "병합된 %s을(를) 추가합니다"
-#: trailer.c:237
+#: merge-recursive.c:1553 merge-recursive.c:1766
#, c-format
-msgid "running trailer command '%s' failed"
-msgstr "트레일러 명령 '%s' 실행 실패"
+msgid "Adding as %s instead"
+msgstr "대신 %s(으)로 추가합니다"
-#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558
-#: trailer.c:562
+#: merge-recursive.c:1610
#, c-format
-msgid "unknown value '%s' for key '%s'"
-msgstr "알 수 없는 값 '%s', 키 '%s'"
+msgid "cannot read object %s"
+msgstr "%s 오브젝트를 읽을 수 없습니다"
-#: trailer.c:544 trailer.c:549 builtin/remote.c:289
+#: merge-recursive.c:1613
#, c-format
-msgid "more than one %s"
-msgstr "%s이(가) 여러개입니다"
-
-#: trailer.c:582
-#, c-format
-msgid "empty trailer token in trailer '%.*s'"
-msgstr "트레일러 '%.*s'에서 빈 트레일러 토큰"
+msgid "object %s is not a blob"
+msgstr "%s 오브젝트는 블롭이 아닙니다"
-#: trailer.c:702
-#, c-format
-msgid "could not read input file '%s'"
-msgstr "'%s' 입력 파일을 읽을 수 없습니다"
+#: merge-recursive.c:1666
+msgid "modify"
+msgstr "수정"
-#: trailer.c:705
-msgid "could not read from stdin"
-msgstr "표준 입력에서 읽을 수 없습니다"
+#: merge-recursive.c:1666
+msgid "modified"
+msgstr "수정됨"
-#: trailer.c:857 builtin/am.c:42
-#, c-format
-msgid "could not stat %s"
-msgstr "%s에 대해 stat()할 수 없습니다"
+#: merge-recursive.c:1676
+msgid "content"
+msgstr "내용"
+
+#: merge-recursive.c:1683
+msgid "add/add"
+msgstr "추가/추가"
-#: trailer.c:859
+#: merge-recursive.c:1718
#, c-format
-msgid "file %s is not a regular file"
-msgstr "'%s' 파일이 일반 파일이 아닙니다"
+msgid "Skipped %s (merged same as existing)"
+msgstr "건너뛰기: %s (기존과 같게 병합)"
-#: trailer.c:861
+#: merge-recursive.c:1732
#, c-format
-msgid "file %s is not writable by user"
-msgstr "ì\82¬ì\9a©ì\9e\90ê°\80 %s í\8c\8cì\9d¼ì\97\90 ì\93¸ ì\88\98 ì\97\86ì\8aµë\8b\88ë\8b¤"
+msgid "Auto-merging %s"
+msgstr "ì\9e\90ë\8f\99 ë³\91í\95©: %s"
-#: trailer.c:873
-msgid "could not open temporary file"
-msgstr "임시 파일을 열 수 없습니다: %s"
+#: merge-recursive.c:1736 git-submodule.sh:924
+msgid "submodule"
+msgstr "하위 모듈"
-#: trailer.c:912
+#: merge-recursive.c:1737
#, c-format
-msgid "could not rename temporary file to %s"
-msgstr "ì\9e\84ì\8b\9c í\8c\8cì\9d¼ ì\9d´ë¦\84ì\9d\84 '%s'(ì\9c¼)ë¡\9c ë°\94ê¿\80 ì\88\98 ì\97\86ì\8aµë\8b\88ë\8b¤"
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "충ë\8f\8c! (%s): %sì\97\90 ë³\91í\95© 충ë\8f\8c"
-#: transport.c:62
+#: merge-recursive.c:1831
#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "'%1$s'의 업스트림을 '%3$s'의 '%2$s'(으)로 설정할 것입니다\n"
+msgid "Removing %s"
+msgstr "제거: %s"
-#: transport.c:151
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "transport: 잘못된 깊이 옵션: %s"
+#: merge-recursive.c:1857
+msgid "file/directory"
+msgstr "파일/디렉터리"
+
+#: merge-recursive.c:1863
+msgid "directory/file"
+msgstr "디렉터리/파일"
-#: transport.c:771
+#: merge-recursive.c:1868
#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
+msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
-"다음 하위 모듈 경로에 리모트 어디에도 없는\n"
-"ë³\80ê²½ ì\82¬í\95ì\9d´ ì\9e\88ì\8aµë\8b\88ë\8b¤:\n"
+"충돌! (%s): 이름이 %s인 디렉터리가 %s에 있습니다. %s을(를) %s(으)로 추가합니"
+"ë\8b¤"
-#: transport.c:775
+#: merge-recursive.c:1877
#, 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"
-"\n"
+msgid "Adding %s"
+msgstr "추가: %s"
-#: transport.c:783
-msgid "Aborting."
-msgstr "ì¤\91ì§\80í\95¨."
+#: merge-recursive.c:1914
+msgid "Already up-to-date!"
+msgstr "ì\9d´ë¯¸ ì\97\85ë\8d°ì\9d´í\8a¸ ì\83\81í\83\9cì\9e\85ë\8b\88ë\8b¤!"
-#: transport-helper.c:1041
+#: merge-recursive.c:1923
#, c-format
-msgid "Could not read ref %s"
-msgstr "%s ë \88í\8d¼ë\9f°ì\8a¤ë¥¼ ì\9d½ì\9d\84 ì\88\98 ì\97\86습니다"
+msgid "merging of trees %s and %s failed"
+msgstr "%s ë°\8f %s í\8a¸ë¦¬ì\9d\98 ë³\91í\95©ì\9d´ ì\8b¤í\8c¨í\96\88습니다"
-#: unpack-trees.c:64
+#: merge-recursive.c:2006
+msgid "Merging:"
+msgstr "병합:"
+
+#: merge-recursive.c:2019
#, 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브랜치를 전환하기 전에 변경 사항을 커밋하거나 스태시하십시오."
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] "과거의 공통 커밋 %u개 발견:"
-#: unpack-trees.c:66
+#: merge-recursive.c:2058
+msgid "merge returned no commit"
+msgstr "병합 결과에 커밋이 없습니다"
+
+#: merge-recursive.c:2121
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
-msgstr ""
-"다음 파일의 로컬 변경 사항을 체크아웃 때문에 덮어 쓰게 됩니다:\n"
-"%%s"
+msgid "Could not parse object '%s'"
+msgstr "'%s' 오브젝트를 파싱할 수 없습니다"
-#: unpack-trees.c:69
+#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
+msgid "Unable to write index."
+msgstr "인덱스를 쓸 수 없습니다."
+
+#: notes-merge.c:273
#, 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."
+"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 ""
-"다음 파일의 로컬 변경 사항을 병합 때문에 덮어 쓰게 됩니다:\n"
-"%%s병합하기 전에 변경 사항을 커밋하거나 스태시하십시오."
+"이전의 노트 병합을 다 마치지 않았습니다 (%s 있음).\n"
+"새로 노트 병합을 시작하기 전에 'git notes merge --commit'\n"
+"또는 'git notes merge --abort'로 이전 병합을 커밋/중지하십시오."
-#: unpack-trees.c:71
+#: notes-merge.c:280
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
-msgstr "다음 파일의 로컬 변경 사항을 병합 때문에 덮어 쓰게 됩니다."
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "노트 병합 작업을 다 마치지 않았습니다. (%s 있음)"
-#: unpack-trees.c:74
-#, 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 전에 변경 사항을 커밋하거나 스태시하십시오."
+#: notes-utils.c:41
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr "초기화하지 않았거나 레퍼런스하지 않은 notes 트리를 커밋할 수 없습니다"
-#: unpack-trees.c:76
+#: notes-utils.c:100
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-"다음 파일의 로컬 변경 사항을 %s 때문에 덮어 쓰게 됩니다:\n"
-"%%s"
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "잘못된 notes.rewriteMode 값: '%s'"
-#: unpack-trees.c:81
+#: notes-utils.c:110
#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in it:\n"
-"%s"
-msgstr ""
-"다음 디렉터리를 업데이트하면 그 안의 추적하지 않는 파일을 잃어버립니다:\n"
-"%s"
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "%s에서 노트를 다시 쓰기를 거부합니다 (refs/notes/ 밖임)"
-#: unpack-trees.c:85
+#. TRANSLATORS: The first %s is the name of the
+#. environment variable, the second %s is its value
+#: notes-utils.c:137
#, 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브랜치를 전환하기 전에 이 파일을 옮기거나 제거하십시오."
+msgid "Bad %s value: '%s'"
+msgstr "잘못된 %s 값: '%s'"
-#: unpack-trees.c:87
+#: object.c:242
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
-msgstr ""
-"체크아웃 때문에 추적하지 않는 다음 작업 폴더 파일이 제거됩니다:\n"
-"%%s"
+msgid "unable to parse object: %s"
+msgstr "오브젝트를 파싱할 수 없습니다: %s"
-#: unpack-trees.c:90
+#: parse-options.c:572
+msgid "..."
+msgstr "..."
+
+#: parse-options.c:590
#, 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병합하기 전에 이 파일을 옮기거나 제거하십시오."
+msgid "usage: %s"
+msgstr "사용법: %s"
-#: unpack-trees.c:92
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation
+#: parse-options.c:594
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
-msgstr ""
-"병합 때문에 추적하지 않는 다음 작업 폴더 파일이 제거됩니다:\n"
-"%%s"
+msgid " or: %s"
+msgstr " 또는: %s"
-#: unpack-trees.c:95
+#: parse-options.c:597
#, 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 하기 전에 이 파일을 옮기거나 제거하십시오."
+msgid " %s"
+msgstr " %s"
-#: unpack-trees.c:97
+#: parse-options.c:631
+msgid "-NUM"
+msgstr "-NUM"
+
+#: parse-options-cb.c:108
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
-msgstr ""
-"%s 때문에 추적하지 않는 다음 작업 폴더 파일이 제거됩니다:\n"
-"%%s"
+msgid "malformed object name '%s'"
+msgstr "잘못된 형식의 오브젝트 이름 '%s'"
-#: unpack-trees.c:102
+#: path.c:826
#, c-format
+msgid "Could not make %s writable by group"
+msgstr "%s을(를) 그룹에서 쓰기 가능하도록 만들 수 없습니다"
+
+#: pathspec.c:133
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr "'glob' 및 'noglob' 경로명세 전체 설정은 호환되지 않습니다"
+
+#: pathspec.c:143
msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%sPlease move or remove them before you switch branches."
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
msgstr ""
-"체크아웃 때문에 추적하지 않는 다음 작업 폴더의 파일을 덮어씁니다:\n"
-"%%s브랜치를 전환하기 전에 이 파일을 옮기거나 제거하십시오."
+"'literal' 경로명세 전체 설정은 다른 경로명세 전체 설정과 호환되지 않습니다"
-#: unpack-trees.c:104
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%s"
-msgstr ""
-"체크아웃 때문에 추적하지 않는 다음 작업 폴더 파일을 덮어씁니다:\n"
-"%%s"
+#: pathspec.c:177
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "경로명세 지시어 'prefix'에 잘못된 파라미터"
-#: unpack-trees.c:107
+#: pathspec.c:183
#, 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병합하기 전에 이 파일을 옮기거나 제거하십시오."
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "잘못된 경로명세 지시어 '%.*s' (위치 '%s')"
-#: unpack-trees.c:109
+#: pathspec.c:187
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-"병합 때문에 추적하지 않는 다음 작업 폴더 파일을 덮어씁니다:\n"
-"%%s"
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "경로 명세 지시어 끝에 ')' 빠짐 (위치 '%s')"
-#: unpack-trees.c:112
+#: pathspec.c:205
#, 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 하기 전에 이 파일을 옮기거나 제거하십시오."
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "구현되지 않은 경로명세 지시어 '%c' (위치 '%s')"
-#: unpack-trees.c:114
+#: pathspec.c:230
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s: 'literal'과 'glob'은 호환되지 않습니다"
+
+#: pathspec.c:241
+#, c-format
+msgid "%s: '%s' is outside repository"
+msgstr "%s: '%s'은(는) 저장소 밖입니다"
+
+#: pathspec.c:291
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "경로명세 '%s'은(는) ''%.*s' 하위 모듈 안에 있습니다"
+
+#: pathspec.c:353
#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr "%s: 경로명세 지시어가 이 명령어에서 지원하지 않습니다: %s"
+
+#: pathspec.c:408
msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%s"
+"empty strings as pathspecs will be made invalid in upcoming releases. please "
+"use . instead if you meant to match all paths"
msgstr ""
-"%s 때문에 추적하지 않는 다음 작업 폴더 파일을 덮어씁니다:\n"
-"%%s"
+"경로명세로 빈 문자열을 넣는 일은 다음 릴리스에서 오류로 취급할 예정입니다. 모"
+"든 경로를 지정하려면 점(.)을 사용하십시오."
-#: unpack-trees.c:121
+#: pathspec.c:440
#, c-format
-msgid "Entry '%s' overlaps with '%s'. Cannot bind."
-msgstr "'%s' 항목이 '%s'와(과) 겹칩니다. 묶을 수 없습니다."
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "'%s' 경로명세는 심볼릭 링크 아래에 있습니다"
-#: unpack-trees.c:124
-#, c-format
+#: pathspec.c:449
msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
-"%s"
+"There is nothing to exclude from by :(exclude) patterns.\n"
+"Perhaps you forgot to add either ':/' or '.' ?"
msgstr ""
-"드문 체크아웃을 업데이트할 수 없습니다. 다음 항목이 최신으로 업데이트되지 않았습니다:\n"
-"%s"
+":(exclude) 패턴으로 제외할 사항이 없습니다.\n"
+"':/' 또는 '.' 추가를 잊으신 것 아닙니까?"
-#: unpack-trees.c:126
+#: pretty.c:971
+msgid "unable to parse --pretty format"
+msgstr "--pretty 형식을 파싱할 수 없습니다"
+
+#: read-cache.c:1315
#, c-format
msgid ""
-"The following Working tree files would be overwritten by sparse checkout "
-"update:\n"
-"%s"
+"index.version set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-"드문 체크아웃 업데이트 때문에 추적하지 않는 다음 작업 폴더 파일을 덮어씁니"
-"다:\n"
-"%s"
+"index.version이 설정되었지만, 이 값이 잘못되었습니다.\n"
+"%i 버전을 사용합니다"
-#: unpack-trees.c:128
+#: read-cache.c:1325
#, c-format
msgid ""
-"The following Working tree files would be removed by sparse checkout "
-"update:\n"
-"%s"
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-"드문 체크아웃 업데이트 때문에 추적하지 않는 다음 작업 폴더 파일을 제거합니"
-"다:\n"
-"%s"
+"GIT_INDEX_VERSION이 설정되었지만, 이 값이 잘못되었습니다.\n"
+"%i 버전을 사용합니다"
-#: unpack-trees.c:205
+#: refs.c:576 builtin/merge.c:840
#, c-format
-msgid "Aborting\n"
-msgstr "중지함\n"
+msgid "Could not open '%s' for writing"
+msgstr "'%s'을(를) 쓰기용으로 열 수 없습니다"
-#: unpack-trees.c:237
-msgid "Checking out files"
-msgstr "파일을 가져옵니다"
+#: refs/files-backend.c:2481
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "%s 레퍼런스를 삭제할 수 없습니다: %s"
-#: urlmatch.c:120
-msgid "invalid URL scheme name or missing '://' suffix"
-msgstr "URL 스킴 이름이 잘못되었거나 '://'가 뒤에 붙지 않았습니다"
+#: refs/files-backend.c:2484
+#, c-format
+msgid "could not delete references: %s"
+msgstr "레퍼런스를 삭제할 수 없습니다: %s"
-#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#: refs/files-backend.c:2493
#, c-format
-msgid "invalid %XX escape sequence"
-msgstr "ì\9e\98못ë\90\9c %XX ì\9d´ì\8a¤ì¼\80ì\9d´í\94\84 ì\8b\9cí\80\80ì\8a¤"
+msgid "could not remove reference %s"
+msgstr "%s ë \88í\8d¼ë\9f°ì\8a¤ë¥¼ ì \9cê±°í\95 ì\88\98 ì\97\86ì\8aµë\8b\88ë\8b¤"
-#: urlmatch.c:172
-msgid "missing host and scheme is not 'file:'"
-msgstr "호스트가 없고 스킴이 'file:'이 아닙니다"
+#: ref-filter.c:55
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "예상한 형식: %%(color:<색>)"
-#: urlmatch.c:189
-msgid "a 'file:' URL may not have a port number"
-msgstr "'file:' URL에는 포트 번호를 쓸 수 없습니다"
+#: ref-filter.c:57
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr "인식할 수 없는 색: %%(color:%s)"
-#: urlmatch.c:199
-msgid "invalid characters in host name"
-msgstr "호스트 이름에 잘못된 문자"
+#: ref-filter.c:71
+#, c-format
+msgid "unrecognized format: %%(%s)"
+msgstr "알 수 없는 형식: %%(%s)"
-#: urlmatch.c:244 urlmatch.c:255
-msgid "invalid port number"
-msgstr "잘못된 포트 번호"
+#: ref-filter.c:77
+#, c-format
+msgid "%%(body) does not take arguments"
+msgstr "%%(body)에 인자를 받지 않습니다"
-#: urlmatch.c:322
-msgid "invalid '..' path segment"
-msgstr "경로에서 잘못된 '..' 부분"
+#: ref-filter.c:84
+#, c-format
+msgid "%%(subject) does not take arguments"
+msgstr "%%(subject)에 인자를 받지 않습니다"
-#: worktree.c:282
+#: ref-filter.c:101
#, c-format
-msgid "failed to read '%s'"
-msgstr "'%s'을(를) 읽는데 실패했습니다"
+msgid "positive value expected contents:lines=%s"
+msgstr "'contents:lines=%s'에서 0보다 큰 값이 와야 합니다"
-#: wrapper.c:222 wrapper.c:392
+#: ref-filter.c:103
#, c-format
-msgid "could not open '%s' for reading and writing"
-msgstr "ì\9d½ê¸°ì\99\80 ì\93°ê¸°ì\9a©ì\9c¼ë¡\9c '%s'ì\9d\84(를) ì\97´ ì\88\98 ì\97\86ì\8aµë\8b\88ë\8b¤"
+msgid "unrecognized %%(contents) argument: %s"
+msgstr "ì\95\8c ì\88\98 ì\97\86ë\8a\94 %%(contents) ì\9d¸ì\9e\90: %s"
-#: wrapper.c:224 wrapper.c:394 builtin/am.c:778
+#: ref-filter.c:113
#, c-format
-msgid "could not open '%s' for writing"
-msgstr "'%s'을(를) 쓰기용으로 열 수 없습니다"
+msgid "unrecognized %%(objectname) argument: %s"
+msgstr "알 수 없는 %%(objectname) 인자: %s"
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771
-#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029
-#: builtin/pull.c:407
+#: ref-filter.c:135
#, c-format
-msgid "could not open '%s' for reading"
-msgstr "'%s'을(를) 읽기용으로 열 수 없습니다"
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "예상한 형식: %%(align:<너비>,<위치>)"
-#: wrapper.c:605 wrapper.c:626
+#: ref-filter.c:147
#, c-format
-msgid "unable to access '%s'"
-msgstr "'%s'에 접근할 수 없습니다"
+msgid "unrecognized position:%s"
+msgstr "인식할 수 없는 위치:%s"
-#: wrapper.c:634
-msgid "unable to get current working directory"
-msgstr "현재 작업 디렉터리를 가져올 수 없습니다"
+#: ref-filter.c:151
+#, c-format
+msgid "unrecognized width:%s"
+msgstr "인식할 수 없는 너비:%s"
-#: wrapper.c:658
+#: ref-filter.c:157
#, c-format
-msgid "could not write to %s"
-msgstr "%s에 쓸 수 없습니다"
+msgid "unrecognized %%(align) argument: %s"
+msgstr "인식할 수 없는 %%(align) 인자:%s"
-#: wrapper.c:660
+#: ref-filter.c:161
#, c-format
-msgid "could not close %s"
-msgstr "%s을(를) 닫을 수 없습니다"
+msgid "positive width expected with the %%(align) atom"
+msgstr "%%(align) 아톰에 너비가 0보다 커야 합니다"
-#: wt-status.c:150
-msgid "Unmerged paths:"
-msgstr "병합하지 않은 경로:"
+#: ref-filter.c:244
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr "잘못된 형식의 필드 이름: %.*s"
-#: wt-status.c:177 wt-status.c:204
+#: ref-filter.c:270
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr " (스테이지 해제하려면 \"git reset %s <파일>...\"을 사용하십시오)"
+msgid "unknown field name: %.*s"
+msgstr "알 수 없는 필드 이름: %.*s"
-#: wt-status.c:179 wt-status.c:206
-msgid " (use \"git rm --cached <file>...\" to unstage)"
-msgstr " (스테이지 해제하려면 \"git rm --cached <파일>...\"을 사용하십시오)"
+#: ref-filter.c:372
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "형식: %%(end) 아톰이 대응되는 아톰 없이 사용되었습니다"
-#: wt-status.c:183
-msgid " (use \"git add <file>...\" to mark resolution)"
-msgstr " (해결했다고 표시하려면 \"git add <파일>...\"을 사용하십시오)"
+#: ref-filter.c:424
+#, c-format
+msgid "malformed format string %s"
+msgstr "잘못된 형식의 문자열 %s"
-#: wt-status.c:185 wt-status.c:189
-msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
-msgstr ""
-" (해결했다고 표시하려면 알맞게 \"git add/rm <파일>...\"을 사용하십시오)"
+#: ref-filter.c:878
+msgid ":strip= requires a positive integer argument"
+msgstr ":strip= 명령에는 0보다 큰 정수 인자가 필요합니다"
-#: wt-status.c:187
-msgid " (use \"git rm <file>...\" to mark resolution)"
-msgstr " (해결했다고 표시하려면 \"git rm <파일>...\"을 사용하십시오)"
+#: ref-filter.c:883
+#, c-format
+msgid "ref '%s' does not have %ld components to :strip"
+msgstr "'%s' 레퍼런스에 :strip할 구성 요소 %ld개가 없습니다"
-#: wt-status.c:198 wt-status.c:882
-msgid "Changes to be committed:"
-msgstr "커밋할 변경 사항:"
+#: ref-filter.c:1046
+#, c-format
+msgid "unknown %.*s format %s"
+msgstr "알 수 없는 %.*s 형식 %s"
-#: wt-status.c:216 wt-status.c:891
-msgid "Changes not staged for commit:"
-msgstr "커밋하도록 정하지 않은 변경 사항:"
+#: ref-filter.c:1066 ref-filter.c:1097
+#, c-format
+msgid "missing object %s for %s"
+msgstr "없는 오브젝트 %s, %s에 대해"
-#: wt-status.c:220
-msgid " (use \"git add <file>...\" to update what will be committed)"
-msgstr " (무엇을 커밋할지 바꾸려면 \"git add <파일>...\"을 사용하십시오)"
+#: ref-filter.c:1069 ref-filter.c:1100
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
+msgstr "%s에 parse_object_buffer 실패 (%s에 대해)"
-#: wt-status.c:222
-msgid " (use \"git add/rm <file>...\" to update what will be committed)"
-msgstr " (무엇을 커밋할지 바꾸려면 \"git add/rm <파일>...\"을 사용하십시오)"
+#: ref-filter.c:1311
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "'%s'에 잘못된 형식의 오브젝트"
-#: wt-status.c:223
-msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
-msgstr ""
-" (작업 폴더의 변경 사항을 버리려면 \"git checkout -- <파일>...\"을 사용하십"
-"시오)"
+#: ref-filter.c:1373
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr "망가진 이름 %s에 레퍼런스를 무시합니다"
-#: wt-status.c:225
-msgid " (commit or discard the untracked or modified content in submodules)"
-msgstr ""
-" (하위 모듈의 추적되지 않는 파일이나 수정된 내용을 커밋하거나 버리십시오)"
+#: ref-filter.c:1378
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "망가진 레퍼런스 %s 무시"
-#: wt-status.c:237
+#: ref-filter.c:1633
#, c-format
-msgid " (use \"git %s <file>...\" to include in what will be committed)"
-msgstr " (커밋할 사항에 포함하려면 \"git %s <파일>...\"을 사용하십시오)"
+msgid "format: %%(end) atom missing"
+msgstr "형식: %%(end) 아톰이 없습니다"
-#: wt-status.c:252
-msgid "both deleted:"
-msgstr "양쪽에서 삭제:"
+#: ref-filter.c:1687
+#, c-format
+msgid "malformed object name %s"
+msgstr "잘못된 형식의 오브젝트 이름 %s"
-#: wt-status.c:254
-msgid "added by us:"
-msgstr "이 쪽에서 추가:"
+#: remote.c:746
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "%s 및 %s을(를) 모두 %s에 가져올 수 없습니다"
-#: wt-status.c:256
-msgid "deleted by them:"
-msgstr "저 쪽에서 삭제:"
+#: remote.c:750
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%s은(는) 보통 %s을(를) 추적하고, %s을(를) 추적하지 않습니다"
-#: wt-status.c:258
-msgid "added by them:"
-msgstr "저 쪽에서 추가:"
+#: remote.c:754
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "%s은(는) %s 및 %s 모두 추적합니다"
-#: wt-status.c:260
-msgid "deleted by us:"
-msgstr "이 쪽에서 삭제:"
+#: remote.c:762
+msgid "Internal error"
+msgstr "내부 오류"
-#: wt-status.c:262
-msgid "both added:"
-msgstr "양쪽에서 추가:"
+#: remote.c:1677 remote.c:1720
+msgid "HEAD does not point to a branch"
+msgstr "HEAD가 브랜치를 가리키지 않습니다"
-#: wt-status.c:264
-msgid "both modified:"
-msgstr "양쪽에서 수정:"
+#: remote.c:1686
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "그런 브랜치가 없습니다: '%s'"
-#: wt-status.c:274
-msgid "new file:"
-msgstr "새 파일:"
+#: remote.c:1689
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "'%s' 브랜치에 대해 업스트림을 설정하지 않았습니다"
-#: wt-status.c:276
-msgid "copied:"
-msgstr "복사함:"
+#: remote.c:1695
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr "업스트림 '%s' 브랜치가 리모트 추적 브랜치로 저장되지 않았습니다"
-#: wt-status.c:278
-msgid "deleted:"
-msgstr "삭제함:"
+#: remote.c:1710
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr "리모트 '%2$s'의 푸시 대상 '%1$s'에 로컬 추적 브랜치가 없습니다"
-#: wt-status.c:280
-msgid "modified:"
-msgstr "수정함:"
+#: remote.c:1725
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "'%s' 브랜치에 푸시 리모트가 없습니다"
-#: wt-status.c:282
-msgid "renamed:"
-msgstr "이름 바꿈:"
+#: remote.c:1736
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "'%s'에 대한 푸시 레퍼런스명세에 '%s'이(가) 들어 있지 않습니다"
-#: wt-status.c:284
-msgid "typechange:"
-msgstr "종류 바뀜:"
+#: remote.c:1749
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "푸시의 대상이 없습니다 (push.default가 'nothing'입니다)"
-#: wt-status.c:286
-msgid "unknown:"
-msgstr "알 수 없음:"
+#: remote.c:1771
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "하나의 대상에 대해 'simple' 푸시를 처리할 수 없습니다"
-#: wt-status.c:288
-msgid "unmerged:"
-msgstr "병합하지 않음:"
+#: remote.c:2073
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr "현재 브랜치가 '%s' 기반이지만, 업스트림이 없어졌습니다.\n"
-#: wt-status.c:370
-msgid "new commits, "
-msgstr "새 커밋, "
+#: remote.c:2077
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr " (바로잡으려면 \"git branch --unset-upstream\"을 사용하십시오)\n"
-#: wt-status.c:372
-msgid "modified content, "
-msgstr "수정한 내용, "
+#: remote.c:2080
+#, c-format
+msgid "Your branch is up-to-date with '%s'.\n"
+msgstr "브랜치가 '%s'에 맞게 업데이트된 상태입니다.\n"
-#: wt-status.c:374
-msgid "untracked content, "
-msgstr "추적하지 않은 내용, "
+#: remote.c:2084
+#, 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"
-#: wt-status.c:756
-msgid "Submodules changed but not updated:"
-msgstr "변경되었지만 업데이트하지 않은 하위 모듈:"
+#: remote.c:2090
+msgid " (use \"git push\" to publish your local commits)\n"
+msgstr " (로컬에 있는 커밋을 제출하려면 \"git push\"를 사용하십시오)\n"
-#: wt-status.c:758
-msgid "Submodule changes to be committed:"
-msgstr "커밋할 하위 모듈의 변경 사항:"
+#: remote.c:2093
+#, 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:2101
+msgid " (use \"git pull\" to update your local branch)\n"
+msgstr " (로컬 브랜치를 업데이트하려면 \"git pull\"을 사용하십시오)\n"
-#: wt-status.c:839
+#: remote.c:2104
+#, c-format
msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+"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:2114
+msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-"위의 줄을 바꾸지 마십시오.\n"
-"아래 있는 내용은 모두 제거됩니다."
+" (리모트의 브랜치를 현재 브랜치로 병합하려면 \"git pull\"을 사용하십시오)\n"
-#: wt-status.c:950
-msgid "You have unmerged paths."
-msgstr "병합하지 않은 경로가 있습니다."
+#: revision.c:2158
+msgid "your current branch appears to be broken"
+msgstr "현재 브랜치가 망가진 것처럼 보입니다"
-#: wt-status.c:953
-msgid " (fix conflicts and run \"git commit\")"
-msgstr " (충돌을 바로잡고 \"git commit\"을 실행하십시오)"
+#: revision.c:2161
+#, c-format
+msgid "your current branch '%s' does not have any commits yet"
+msgstr "현재 '%s' 브랜치에 아직 아무 커밋도 없습니다"
-#: wt-status.c:955
-msgid " (use \"git merge --abort\" to abort the merge)"
-msgstr " (병합을 중단하려면 \"git merge --abort\"를 사용하십시오)"
+#: revision.c:2355
+msgid "--first-parent is incompatible with --bisect"
+msgstr "--first-parent 옵션은 --bisect 옵션과 호환되지 않습니다"
-#: wt-status.c:960
-msgid "All conflicts fixed but you are still merging."
-msgstr "모든 충돌을 바로잡았지만 아직 병합하는 중입니다."
+#: run-command.c:106
+msgid "open /dev/null failed"
+msgstr "/dev/null 열기 실패"
-#: wt-status.c:963
-msgid " (use \"git commit\" to conclude merge)"
-msgstr " (병합을 마무리하려면 \"git commit\"을 사용하십시오)"
+#: run-command.c:108
+#, c-format
+msgid "dup2(%d,%d) failed"
+msgstr "dup2(%d,%d) 실패"
-#: wt-status.c:973
-msgid "You are in the middle of an am session."
-msgstr "am 세션 중간에 있습니다."
+#: send-pack.c:297
+msgid "failed to sign the push certificate"
+msgstr "푸시 인증서 서명에 실패했습니다"
-#: wt-status.c:976
-msgid "The current patch is empty."
-msgstr "현재 패치가 비어 있습니다."
+#: send-pack.c:410
+msgid "the receiving end does not support --signed push"
+msgstr "받는 쪽에서 --signed 푸시를 지원하지 않습니다"
-#: wt-status.c:980
-msgid " (fix conflicts and then run \"git am --continue\")"
-msgstr " (충돌을 바로잡은 다음 \"git am --continue\"를 사용하십시오)"
+#: send-pack.c:412
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr ""
+"받는 쪽에서 --signed 푸시를 지원하지 않으므로 푸시 인증서를 보내지 않습니다"
-#: wt-status.c:982
-msgid " (use \"git am --skip\" to skip this patch)"
-msgstr " (이 패치를 건너 뛰려면 \"git am --skip\"을 사용하십시오)"
+#: send-pack.c:424
+msgid "the receiving end does not support --atomic push"
+msgstr "받는 쪽에서 --atomic 푸시를 지원하지 않습니다"
-#: wt-status.c:984
-msgid " (use \"git am --abort\" to restore the original branch)"
-msgstr " (원본 브랜치를 복구하려면 \"git am --abort\"를 사용하십시오)"
+#: send-pack.c:429
+msgid "the receiving end does not support push options"
+msgstr "받는 쪽에서 푸시 옵션을 지원하지 않습니다"
-#: wt-status.c:1109
-msgid "No commands done."
-msgstr "완료한 명령 없음."
+#: sequencer.c:171
+msgid "revert"
+msgstr "되돌리기"
+
+#: sequencer.c:171
+msgid "cherry-pick"
+msgstr "빼오기"
+
+#: sequencer.c:228
+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:231
+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'으로 커밋하십시오"
-#: wt-status.c:1112
+#: sequencer.c:244 sequencer.c:1209
#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
-msgstr[0] "최근 완료한 명령 (%d개 명령 완료):"
+msgid "could not lock '%s'"
+msgstr "'%s'을(를) 잠글 수 없습니다"
-#: wt-status.c:1123
+#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214
#, c-format
-msgid " (see more in file %s)"
-msgstr " (자세한 정보는 %s 파일 참고)"
+msgid "could not write to '%s'"
+msgstr "'%s'에 쓸 수 없습니다"
-#: wt-status.c:1128
-msgid "No commands remaining."
-msgstr "명령이 남아있지 않음."
+#: sequencer.c:251
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr "'%s'에 줄바꿈을 쓸 수 없습니다"
-#: wt-status.c:1131
+#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216
#, c-format
-msgid "Next command to do (%d remaining command):"
-msgid_plural "Next commands to do (%d remaining commands):"
-msgstr[0] "다음에 할 명령 (%d개 명령 남음):"
+msgid "failed to finalize '%s'."
+msgstr "'%s' 마치는데 실패했습니다"
-#: wt-status.c:1139
-msgid " (use \"git rebase --edit-todo\" to view and edit)"
-msgstr " (보고 편집하려면 \"git rebase --edit-todo\"를 사용하십시오)"
+#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032
+#, c-format
+msgid "could not read '%s'"
+msgstr "'%s'에서 읽을 수 없습니다"
-#: wt-status.c:1152
+#: sequencer.c:305
#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "현재 '%s' 브랜치를 '%s' 위로 리베이스하는 중입니다."
+msgid "your local changes would be overwritten by %s."
+msgstr "로컬 변경 사항을 %s 때문에 덮어 쓰게 됩니다."
-#: wt-status.c:1157
-msgid "You are currently rebasing."
-msgstr "í\98\84ì\9e¬ ë¦¬ë² ì\9d´ì\8a¤í\95\98ë\8a\94 ì¤\91ì\9e\85ë\8b\88ë\8b¤."
+#: sequencer.c:309
+msgid "commit your changes or stash them to proceed."
+msgstr "ë³\80ê²½ ì\82¬í\95ì\9d\84 커ë°\8bí\95\98ê±°ë\82\98 ì\8a¤í\83\9cì\8b\9cí\95\9c ë\8b¤ì\9d\8c ê³\84ì\86\8dí\95\98ì\8bì\8b\9cì\98¤."
-#: wt-status.c:1171
-msgid " (fix conflicts and then run \"git rebase --continue\")"
-msgstr " (충돌을 바로잡고 \"git rebase --continue\"를 사용하십시오)"
+#: sequencer.c:324
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s: 정방향 진행"
-#: wt-status.c:1173
-msgid " (use \"git rebase --skip\" to skip this patch)"
-msgstr " (이 패치를 건너뛰려면 \"git rebase --skip\"을 사용하십시오)"
+#. TRANSLATORS: %s will be "revert" or "cherry-pick"
+#: sequencer.c:399
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr "%s: 새 인덱스 파일을 쓸 수 없습니다"
-#: wt-status.c:1175
-msgid " (use \"git rebase --abort\" to check out the original branch)"
-msgstr " (원본 브랜치를 가져오려면 \"git rebase --abort\"를 사용하십시오)"
+#: sequencer.c:418
+msgid "could not resolve HEAD commit\n"
+msgstr "HEAD 커밋을 처리할 수 없습니다\n"
-#: wt-status.c:1181
-msgid " (all conflicts fixed: run \"git rebase --continue\")"
-msgstr ""
-" (모든 충돌을 바로잡았습니다: \"git rebase --continue\"를 실행하십시오)"
+#: sequencer.c:438
+msgid "unable to update cache tree\n"
+msgstr "캐시 트리를 업데이트할 수 없습니다\n"
-#: wt-status.c:1185
+#: sequencer.c:483
#, c-format
msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
-msgstr "현재 '%s' 브랜치를 '%s' 위로 리베이스하는 중 커밋을 분리하는 중입니다."
+"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"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"새 커밋으로 만드려면 다음을 실행하십시오:\n"
+"\n"
+" git commit %s\n"
+"\n"
+"어떤 경우이든, 마친 다음에 다음 명령으로 계속합니다:\n"
+"\n"
+" git rebase --continue\n"
-#: wt-status.c:1190
-msgid "You are currently splitting a commit during a rebase."
-msgstr "현재 리베이스하는 중 커밋을 분리하는 중입니다."
+#: sequencer.c:567
+#, c-format
+msgid "could not parse commit %s\n"
+msgstr "%s 커밋을 파싱할 수 없습니다\n"
-#: wt-status.c:1193
-msgid " (Once your working directory is clean, run \"git rebase --continue\")"
-msgstr " (작업 폴더가 깨끗해지면, \"git rebase --continue\"를 실행하십시오)"
+#: sequencer.c:572
+#, c-format
+msgid "could not parse parent commit %s\n"
+msgstr "%s 이전 커밋을 파싱할 수 없습니다\n"
+
+#: sequencer.c:656
+msgid "your index file is unmerged."
+msgstr "인덱스 파일이 병합되지 않았습니다."
-#: wt-status.c:1197
+#: sequencer.c:675
#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
-msgstr "'%s' 브랜치를 '%s' 위로 리베이스하는 중 커밋을 편집하는 중입니다."
+msgid "commit %s is a merge but no -m option was given."
+msgstr "%s 커밋은 병합이지만 -m 옵션이 주어지지 않았습니다."
-#: wt-status.c:1202
-msgid "You are currently editing a commit during a rebase."
-msgstr "리베이스 중에 커밋을 편집하는 중입니다."
+# FIXME: "parent %d" 번호가 무슨 의미?
+#: sequencer.c:683
+#, c-format
+msgid "commit %s does not have parent %d"
+msgstr "%s 커밋에 이전 커밋 %d이(가) 없습니다"
-#: wt-status.c:1205
-msgid " (use \"git commit --amend\" to amend the current commit)"
-msgstr " (현재 커밋을 수정하려면 \"git commit --amend\"을 사용하십시오)"
+#: sequencer.c:687
+#, c-format
+msgid "mainline was specified but commit %s is not a merge."
+msgstr "메인라인을 지정했지만 %s 커밋이 병합 커밋이 아닙니다."
-#: wt-status.c:1207
-msgid ""
-" (use \"git rebase --continue\" once you are satisfied with your changes)"
-msgstr " (변경 사항에 만족할 때 \"git rebase --continue\"를 사용하십시오)"
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#: sequencer.c:700
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s: %s 이전 커밋을 파싱할 수 없습니다"
-#: wt-status.c:1217
+#: sequencer.c:705
#, c-format
-msgid "You are currently cherry-picking commit %s."
-msgstr "현재 %s 커밋을 뽑아 내고 있습니다."
+msgid "cannot get commit message for %s"
+msgstr "%s에 대한 커밋 메시지를 가져올 수 없습니다"
-#: wt-status.c:1222
-msgid " (fix conflicts and run \"git cherry-pick --continue\")"
-msgstr " (충돌을 바로잡고 \"git cherry-pick --continue\"를 실행하십시오)"
+#: sequencer.c:797
+#, c-format
+msgid "could not revert %s... %s"
+msgstr "다음을 되돌릴(revert) 수 없습니다: %s... %s"
-#: wt-status.c:1225
-msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
-msgstr ""
-" (모든 충돌을 바로잡았습니다: \"git cherry-pick --continue\"를 실행하십시오)"
+#: sequencer.c:798
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "다음을 적용할(apply) 수 없습니다: %s... %s"
-#: wt-status.c:1227
-msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
-msgstr " (뽑기 작업을 취소하려면 \"git cherry-pick --abort\"를 사용하십시오)"
+#: sequencer.c:833
+msgid "empty commit set passed"
+msgstr "빈 커밋 모음을 건너 뜁니다"
-#: wt-status.c:1236
+#: sequencer.c:843
#, c-format
-msgid "You are currently reverting commit %s."
-msgstr "현재 %s 커밋을 되돌리는 중입니다."
+msgid "git %s: failed to read the index"
+msgstr "git %s: 인덱스 읽기에 실패했습니다"
-#: wt-status.c:1241
-msgid " (fix conflicts and run \"git revert --continue\")"
-msgstr " (충돌을 바로잡고 \"git revert --continue\"를 실행하십시오)"
+#: sequencer.c:850
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr "git %s: 인덱스 새로 고침에 실패했습니다"
-#: wt-status.c:1244
-msgid " (all conflicts fixed: run \"git revert --continue\")"
-msgstr ""
-" (모든 충돌을 바로잡았습니다: \"git revert --continue\"를 실행하십시오)"
+#: sequencer.c:944
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr "잘못된 줄 %d: %.*s"
-#: wt-status.c:1246
-msgid " (use \"git revert --abort\" to cancel the revert operation)"
-msgstr " (되돌리기 작업을 취소하려면 \"git revert --abort\"를 사용하십시오)"
+#: sequencer.c:950
+msgid "no commits parsed."
+msgstr "파싱한 커밋이 없습니다."
-#: wt-status.c:1257
+#: sequencer.c:966
#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
-msgstr "'이등분하는 중입니다. '%s' 브랜치부터 시작."
+msgid "could not read '%s'."
+msgstr "'%s'에서 읽을 수 없습니다."
-#: wt-status.c:1261
-msgid "You are currently bisecting."
-msgstr "'이등분하는 중입니다."
+#: sequencer.c:972
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr "사용 불가능 인스트럭션 시트: '%s'"
-#: wt-status.c:1264
-msgid " (use \"git bisect reset\" to get back to the original branch)"
-msgstr " (원래 브랜치로 돌아가려면 \"git bisect reset\"을 사용하십시오)"
+#: sequencer.c:983
+msgid "cannot cherry-pick during a revert."
+msgstr "되돌리기(revert) 중에 빼오기(cherry-pick)를 할 수 없습니다."
-#: wt-status.c:1464
-msgid "On branch "
-msgstr "현재 브랜치 "
+#: sequencer.c:985
+msgid "cannot revert during a cherry-pick."
+msgstr "빼오기(cherry-pick) 중에 되돌리기(revert)를 할 수 없습니다."
-#: wt-status.c:1470
-msgid "interactive rebase in progress; onto "
-msgstr "대화형 리베이스 진행 중. 갈 위치는 "
+#: sequencer.c:1028
+#, c-format
+msgid "invalid key: %s"
+msgstr "잘못된 키: %s"
-#: wt-status.c:1472
-msgid "rebase in progress; onto "
-msgstr "리베이스 진행 중. 갈 위치는 "
+#: sequencer.c:1031
+#, c-format
+msgid "invalid value for %s: %s"
+msgstr "%s의 값이 잘못됨: %s"
-#: wt-status.c:1477
-msgid "HEAD detached at "
-msgstr "HEAD가 다음 위치에서 분리: "
+#: sequencer.c:1063
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr "형식이 잘못된 옵션 시트: '%s'"
-#: wt-status.c:1479
-msgid "HEAD detached from "
-msgstr "HEAD가 다음으로부터 분리: "
+#: sequencer.c:1101
+msgid "a cherry-pick or revert is already in progress"
+msgstr "이미 커밋 빼오기(cherry-pick) 또는 되돌리기(revert)가 진행 중입니다"
-#: wt-status.c:1482
-msgid "Not currently on any branch."
-msgstr "현재 어떤 브랜치도 사용하지 않음."
+#: sequencer.c:1102
+msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+msgstr "\"git cherry-pick (--continue | --quit | --abort)\" 명령을 해 보십시오"
-#: wt-status.c:1500
-msgid "Initial commit"
-msgstr "최초 커밋"
+#: sequencer.c:1106
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr "'%s' 시퀀서 디렉터리를 만들 수 없습니다"
-#: wt-status.c:1514
-msgid "Untracked files"
-msgstr "추적하지 않는 파일"
+#: sequencer.c:1120
+msgid "could not lock HEAD"
+msgstr "HEAD를 잠글 수 없습니다"
-#: wt-status.c:1516
-msgid "Ignored files"
-msgstr "무시한 파일"
+#: sequencer.c:1151 sequencer.c:1289
+msgid "no cherry-pick or revert in progress"
+msgstr "빼오기(cherry-pick) 또는 되돌리기(revert)가 진행 중이지 않습니다"
+
+#: sequencer.c:1153
+msgid "cannot resolve HEAD"
+msgstr "HEAD를 구해 올 수 없습니다"
-#: wt-status.c:1520
+#: sequencer.c:1155 sequencer.c:1189
+msgid "cannot abort from a branch yet to be born"
+msgstr "새로 만들고 있는 브랜치에서 중지할 수 없습니다"
+
+#: sequencer.c:1175 builtin/grep.c:578
#, c-format
-msgid ""
-"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
-"may speed it up, but you have to be careful not to forget to add\n"
-"new files yourself (see 'git help status')."
-msgstr ""
-"추적하지 않는 파일을 모두 확인하는데 %.2f초가 걸렸습니다.\n"
-"'status -uno' 옵션을 쓰면 빨라질 수도 있지만, 새 파일을\n"
-"직접 찾아서 추가해야 합니다. ('git help status' 참고)"
+msgid "cannot open '%s'"
+msgstr "'%s'을(를) 열 수 없습니다"
-#: wt-status.c:1526
+#: sequencer.c:1177
#, c-format
-msgid "Untracked files not listed%s"
-msgstr "추적하지 않는 파일을 보지 않습니다%s"
+msgid "cannot read '%s': %s"
+msgstr "'%s'을(를) 읽을 수 없습니다: %s"
-#: wt-status.c:1528
-msgid " (use -u option to show untracked files)"
-msgstr " (추적하지 않는 파일을 보려면 -u 옵션을 사용하십시오)"
+#: sequencer.c:1178
+msgid "unexpected end of file"
+msgstr "예상치 못하게 파일이 끝났습니다"
-#: wt-status.c:1534
-msgid "No changes"
-msgstr "변경 사항 없음"
+#: sequencer.c:1184
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr "빼오기 전에 저장한 HEAD 파일이('%s') 손상되었습니다"
-#: wt-status.c:1539
+#: sequencer.c:1354
#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
-msgstr ""
-"커밋할 변경 사항을 추가하지 않았습니다 (\"git add\" 및/또는 \"git commit -a"
-"\"를\n"
-"사용하십시오)\n"
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s: %s 커밋을 빼올 수 없습니다"
-#: wt-status.c:1542
+#: sequencer.c:1358
#, c-format
-msgid "no changes added to commit\n"
-msgstr "커밋할 변경 사항을 추가하지 않았습니다\n"
+msgid "%s: bad revision"
+msgstr "%s: 잘못된 리비전"
+
+#: sequencer.c:1391
+msgid "can't revert as initial commit"
+msgstr "최초의 커밋으로 되돌릴 수 없습니다"
-#: wt-status.c:1545
+#: setup.c:160
#, c-format
msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
msgstr ""
-"커밋할 사항을 추가하지 않았지만 추적하지 않는 파일이 있습니다 (추적하려면 "
-"\"git\n"
-"add\"를 사용하십시오)\n"
+"%s: 작업 폴더에 그런 경로가 없습니다.\n"
+"로컬에 없는 경로를 지정하려면 'git <명령> -- <경로>...' 식으로 사용하십시오."
-#: wt-status.c:1548
+#: setup.c:173
#, c-format
-msgid "nothing added to commit but untracked files present\n"
-msgstr "커밋할 사항을 추가하지 않았지만 추적하지 않는 파일이 있습니다\n"
+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 <명령> [<리비전>...] -- [<파일>...]'"
-#: wt-status.c:1551
+#: setup.c:223
#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-"커밋할 사항 없음 (파일을 만들거나 복사하고 \"git add\"를 사용하면 추적합니"
-"다)\n"
+"애매한 인자 '%s': 알 수 없는 리비전 및 파일 이름\n"
+"경로와 리비전을 구분하려면 다음과 같이 '--'를 사용하십시오:\n"
+"'git <명령> [<리비전>...] -- [<파일>...]'"
-#: wt-status.c:1554 wt-status.c:1559
+#: setup.c:468
#, c-format
-msgid "nothing to commit\n"
-msgstr "커밋할 사항 없음\n"
+msgid "Expected git repo version <= %d, found %d"
+msgstr "깃 저장소 버전 <= %d 버전을 기대하지만, %d 버전이 발견되었습니다"
-#: wt-status.c:1557
-#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
-msgstr ""
-"커밋할 사항 없음 (추적하지 않는 파일을 보려면 -u 옵션을 사용하십시오)\n"
+#: setup.c:476
+msgid "unknown repository extensions found:"
+msgstr "알 수 없는 저장소 확장이 있습니다:"
-#: wt-status.c:1561
+#: setup.c:762
#, c-format
-msgid "nothing to commit, working tree clean\n"
-msgstr "커밋할 사항 없음, 작업 폴더 깨끗함\n"
-
-#: wt-status.c:1668
-msgid "Initial commit on "
-msgstr "최초 커밋, 브랜치: "
+msgid "Not a git repository (or any of the parent directories): %s"
+msgstr "(현재 폴더 또는 상위 폴더가) 깃 저장소가 아닙니다: %s"
-#: wt-status.c:1672
-msgid "HEAD (no branch)"
-msgstr "HEAD (브랜치 없음)"
+#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
+msgid "Cannot come back to cwd"
+msgstr "현재 디렉터리로 돌아올 수 없습니다"
-#: wt-status.c:1701
-msgid "gone"
-msgstr "없음"
+#: setup.c:845
+msgid "Unable to read current working directory"
+msgstr "현재 작업 디렉터리를 읽을 수 없습니다"
-#: wt-status.c:1703 wt-status.c:1711
-msgid "behind "
-msgstr "다음 뒤에: "
+#: setup.c:920
+#, 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까지 상위 폴더가) 깃 저장소가 아닙니다\n"
+"파일 시스템 경계에서 중지합니다. (GIT_DISCOVERY_ACROSS_FILESYSTEM 설정되지 않"
+"음)"
-#: wt-status.c:1706 wt-status.c:1709
-msgid "ahead "
-msgstr "다음 앞에: "
+#: setup.c:927
+#, c-format
+msgid "Cannot change to '%s/..'"
+msgstr "'%s/..' 위치로 이동할 수 없습니다"
-#: compat/precompose_utf8.c:57 builtin/clone.c:415
+#: setup.c:989
#, c-format
-msgid "failed to unlink '%s'"
-msgstr "'%s' 파일 삭제에 실패했습니다"
+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"
+"파일의 소유자에 읽기와 쓰기 권한이 있어야 합니다."
-#: builtin/add.c:22
-msgid "git add [<options>] [--] <pathspec>..."
-msgstr "git add [<옵션>] [--] <경로명세>..."
+#: sha1_file.c:473
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "'%s' 경로가 없습니다"
-#: builtin/add.c:65
+#: sha1_file.c:499
#, c-format
-msgid "unexpected diff status %c"
-msgstr "예상치 못한 diff 상태 %c"
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr ""
+"레퍼런스 '%s' 저장소를 연결된 체크아웃으로 쓰기는 아직 지원하지 않습니다."
-#: builtin/add.c:71 builtin/commit.c:281
-msgid "updating files failed"
-msgstr "파일 업데이트가 실패했습니다"
+#: sha1_file.c:505
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "레퍼런스 '%s' 저장소가 로컬 저장소가 아닙니다."
-#: builtin/add.c:81
+#: sha1_file.c:511
#, c-format
-msgid "remove '%s'\n"
-msgstr "'%s' 제거\n"
+msgid "reference repository '%s' is shallow"
+msgstr "레퍼런스 '%s' 저장소가 얕은 저장소입니다"
-#: builtin/add.c:136
-msgid "Unstaged changes after refreshing the index:"
-msgstr "인덱스를 새로 고친 다음 커밋 표시하지 않은 변경 사항:"
+#: sha1_file.c:519
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "레퍼런스 '%s' 저장소가 붙어 있는 저장소입니다"
-#: builtin/add.c:196 builtin/rev-parse.c:811
-msgid "Could not read the index"
-msgstr "ì\9d¸ë\8d±ì\8a¤ë¥¼ ì\9d½ì\9d\84 ì\88\98 ì\97\86ì\8aµë\8b\88ë\8b¤"
+#: sha1_file.c:1159
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "ì\98¤í\94\84ì\85\8bì\9d´ 묶ì\9d\8c í\8c\8cì\9d¼ ì\95\9eì\9e\85ë\8b\88ë\8b¤ (ë§\9dê°\80ì§\84 .idx?)"
-#: builtin/add.c:207
+#: sha1_file.c:2592
#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "'%s' 파일을 쓰기용으로 열 수 없습니다."
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr "오프셋이 %s의 묶음 인덱스 시작보다 앞입니다 (망가진 인덱스?)"
-#: builtin/add.c:211
-msgid "Could not write patch"
-msgstr "패치를 쓸 수 없습니다"
+#: sha1_file.c:2596
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr "오프셋이 %s의 묶음 인덱스 끝보다 뒤입니다 (망가진 인덱스?)"
-#: builtin/add.c:214
-msgid "editing patch failed"
-msgstr "패치 편집에 실패했습니다"
+#: sha1_name.c:407
+#, c-format
+msgid "short SHA1 %s is ambiguous"
+msgstr "짧은 SHA1 %s은(는) 여럿에 대응됩니다"
+
+#: sha1_name.c:418
+msgid "The candidates are:"
+msgstr "후보는 다음과 같습니다:"
-#: builtin/add.c:217
+#: sha1_name.c:578
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+" git checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
+msgstr ""
+"깃에서는 보통 40개의 16진수 문자로 끝나는 레퍼런스를 만들지 않습니다.\n"
+"16진수 문자 40자를 지정했을 때 이 레퍼런스가 무시되기 때문입니다. 이\n"
+"레퍼런스는 실수로 만들어졌을 수도 있습니다. 예를 들어,\n"
+"\n"
+" git checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"여기서 \"$br\"은 비어 있으므로 40자 레퍼런스가 만들어집니다. 이 레퍼런스를\n"
+"확인해 보시고 잘못 만들어진 것이면 지우십시오. 이 메시지를 보고 싶지\n"
+"않으면 \"git config advice.objectNameWarning false\" 명령을 사용하십시오."
+
+#: submodule.c:64 submodule.c:98
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr ""
+"병합하지 않은 .gitmodules를 바꿀 수 없습니다. 병합 충돌을 먼저 해결하십시오"
+
+#: submodule.c:68 submodule.c:102
#, c-format
-msgid "Could not stat '%s'"
-msgstr "'%s'을(를) stat()할 수 없습니다"
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "경로가 %s일 때 .gitmodules의 섹션을 찾을 수 없습니다"
-#: builtin/add.c:219
-msgid "Empty patch. Aborted."
-msgstr "빈 패치. 중지."
+#: submodule.c:76
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr ".gitmodules 항목 %s을(를) 업데이트할 수 없습니다"
-#: builtin/add.c:224
+#: submodule.c:109
#, c-format
-msgid "Could not apply '%s'"
-msgstr "'%s'을(를) 적용할 수 없습니다"
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "%s에 대한 .gitmodules 항목을 제거할 수 없습니다"
-#: builtin/add.c:234
-msgid "The following paths are ignored by one of your .gitignore files:\n"
-msgstr "다음 경로는 .gitignore 파일 중 하나 때문에 무시합니다:\n"
+#: submodule.c:120
+msgid "staging updated .gitmodules failed"
+msgstr "업데이트한 .gitmodules를 커밋할 사항으로 표시하는데 실패"
-#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521
-#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162
-msgid "dry run"
-msgstr "가짜로 실행"
+#: submodule.c:158
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "submodule.fetchJobs 값에 음수를 쓸 수 없습니다"
-#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19
-#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593
-#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114
-msgid "be verbose"
-msgstr "자세히 표시"
+#: submodule-config.c:358
+#, c-format
+msgid "invalid value for %s"
+msgstr "%s의 값이 올바르지 않습니다"
-#: builtin/add.c:256
-msgid "interactive picking"
-msgstr "대화식으로 고릅니다"
+#: trailer.c:238
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "트레일러 명령 '%s' 실행 실패"
-#: builtin/add.c:257 builtin/checkout.c:1156 builtin/reset.c:286
-msgid "select hunks interactively"
-msgstr "대화식으로 변경된 부분을 선택합니다"
+#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537
+#: trailer.c:541
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr "알 수 없는 값 '%s', 키 '%s'"
-#: builtin/add.c:258
-msgid "edit current diff and apply"
-msgstr "현재 diff를 편집하고 적용합니다"
+#: trailer.c:523 trailer.c:528 builtin/remote.c:289
+#, c-format
+msgid "more than one %s"
+msgstr "%s이(가) 여러개입니다"
-#: builtin/add.c:259
-msgid "allow adding otherwise ignored files"
-msgstr "무시하는 파일의 추가를 허용합니다"
+#: trailer.c:672
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "트레일러 '%.*s'에서 빈 트레일러 토큰"
-#: builtin/add.c:260
-msgid "update tracked files"
-msgstr "추적되는 파일을 업데이트합니다"
+#: trailer.c:695
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "'%s' 입력 파일을 읽을 수 없습니다"
-#: builtin/add.c:261
-msgid "record only the fact that the path will be added later"
-msgstr "나중에 추가할 것이라는 사실만 기록합니다"
+#: trailer.c:698
+msgid "could not read from stdin"
+msgstr "표준 입력에서 읽을 수 없습니다"
-#: builtin/add.c:262
-msgid "add changes from all tracked and untracked files"
-msgstr "추적되고 추적되지 않는 모든 파일의 변경 사항을 추가합니다"
+#: trailer.c:929 builtin/am.c:44
+#, c-format
+msgid "could not stat %s"
+msgstr "%s에 대해 stat()할 수 없습니다"
-#: builtin/add.c:265
-msgid "ignore paths removed in the working tree (same as --no-all)"
-msgstr "작업 폴더에서 제거한 경로를 무시합니다 (--no-all과 동일)"
+#: trailer.c:931
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "'%s' 파일이 일반 파일이 아닙니다"
-#: builtin/add.c:267
-msgid "don't add, only refresh the index"
-msgstr "추가하지 않고 인덱스만 새로 고칩니다"
+#: trailer.c:933
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "사용자가 %s 파일에 쓸 수 없습니다"
-#: builtin/add.c:268
-msgid "just skip files which cannot be added because of errors"
-msgstr "ì\98¤ë¥\98 ë\95\8c문ì\97\90 ì¶\94ê°\80í\95 ì\88\98 ì\97\86ë\8a\94 í\8c\8cì\9d¼ì\9d\84 ê±´ë\84\88ë\9c\81ë\8b\88ë\8b¤"
+#: trailer.c:945
+msgid "could not open temporary file"
+msgstr "ì\9e\84ì\8b\9c í\8c\8cì\9d¼ì\9d\84 ì\97´ ì\88\98 ì\97\86ì\8aµë\8b\88ë\8b¤: %s"
-#: builtin/add.c:269
-msgid "check if - even missing - files are ignored in dry run"
-msgstr "가짜로 실행했을 때 파일을 무시하는지 확인합니다"
+#: trailer.c:983
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "임시 파일 이름을 '%s'(으)로 바꿀 수 없습니다"
-#: builtin/add.c:270 builtin/update-index.c:958
-msgid "(+/-)x"
-msgstr "(+/-)x"
+#: transport.c:62
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "'%1$s'의 업스트림을 '%3$s'의 '%2$s'(으)로 설정할 것입니다\n"
-#: builtin/add.c:270 builtin/update-index.c:959
-msgid "override the executable bit of the listed files"
-msgstr "목록의 파일에서 실행 가능 비트를 바꿉니다"
+#: transport.c:151
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport: 잘못된 깊이 옵션: %s"
+
+#: transport.c:817
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"다음 하위 모듈 경로에 리모트 어디에도 없는\n"
+"변경 사항이 있습니다:\n"
+
+#: transport.c:821
+#, 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"
+"\n"
+
+#: transport.c:829
+msgid "Aborting."
+msgstr "중지함."
+
+#: transport-helper.c:1075
+#, c-format
+msgid "Could not read ref %s"
+msgstr "%s 레퍼런스를 읽을 수 없습니다"
+
+#: tree-walk.c:31
+msgid "too-short tree object"
+msgstr "너무 짧은 트리 오브젝트"
+
+#: tree-walk.c:37
+msgid "malformed mode in tree entry"
+msgstr "트리 엔트리에 잘못된 형식의 모드"
+
+#: tree-walk.c:41
+msgid "empty filename in tree entry"
+msgstr "트리 엔트리에 빈 파일 이름"
+
+#: tree-walk.c:113
+msgid "too-short tree file"
+msgstr "너무 짧은 트리 파일"
+
+#: unpack-trees.c:64
+#, 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:66
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"다음 파일의 로컬 변경 사항을 체크아웃 때문에 덮어 쓰게 됩니다:\n"
+"%%s"
+
+#: unpack-trees.c:69
+#, 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:71
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr "다음 파일의 로컬 변경 사항을 병합 때문에 덮어 쓰게 됩니다."
+
+#: unpack-trees.c:74
+#, 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:76
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"다음 파일의 로컬 변경 사항을 %s 때문에 덮어 쓰게 됩니다:\n"
+"%%s"
+
+#: unpack-trees.c:81
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in it:\n"
+"%s"
+msgstr ""
+"다음 디렉터리를 업데이트하면 그 안의 추적하지 않는 파일을 잃어버립니다:\n"
+"%s"
+
+#: unpack-trees.c:85
+#, 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:87
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"체크아웃 때문에 추적하지 않는 다음 작업 폴더 파일이 제거됩니다:\n"
+"%%s"
+
+#: unpack-trees.c:90
+#, 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:92
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"병합 때문에 추적하지 않는 다음 작업 폴더 파일이 제거됩니다:\n"
+"%%s"
+
+#: unpack-trees.c:95
+#, 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:97
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"%s 때문에 추적하지 않는 다음 작업 폴더 파일이 제거됩니다:\n"
+"%%s"
+
+#: unpack-trees.c:102
+#, 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:104
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"체크아웃 때문에 추적하지 않는 다음 작업 폴더 파일을 덮어씁니다:\n"
+"%%s"
+
+#: unpack-trees.c:107
+#, 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:109
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"병합 때문에 추적하지 않는 다음 작업 폴더 파일을 덮어씁니다:\n"
+"%%s"
+
+#: unpack-trees.c:112
+#, 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:114
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"%s 때문에 추적하지 않는 다음 작업 폴더 파일을 덮어씁니다:\n"
+"%%s"
+
+#: unpack-trees.c:121
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgstr "'%s' 항목이 '%s'와(과) 겹칩니다. 묶을 수 없습니다."
+
+#: unpack-trees.c:124
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
+msgstr ""
+"드문 체크아웃을 업데이트할 수 없습니다. 다음 항목이 최신으로 업데이트되지 않"
+"았습니다:\n"
+"%s"
+
+#: unpack-trees.c:126
+#, c-format
+msgid ""
+"The following working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"드문 체크아웃 업데이트 때문에 추적하지 않는 다음 작업 폴더 파일을 덮어씁니"
+"다:\n"
+"%s"
+
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"The following working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"드문 체크아웃 업데이트 때문에 추적하지 않는 다음 작업 폴더 파일을 제거합니"
+"다:\n"
+"%s"
+
+#: unpack-trees.c:205
+#, c-format
+msgid "Aborting\n"
+msgstr "중지함\n"
+
+#: unpack-trees.c:237
+msgid "Checking out files"
+msgstr "파일을 가져옵니다"
+
+#: urlmatch.c:120
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "URL 스킴 이름이 잘못되었거나 '://'가 뒤에 붙지 않았습니다"
+
+#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "잘못된 %XX 이스케이프 시퀀스"
+
+#: urlmatch.c:172
+msgid "missing host and scheme is not 'file:'"
+msgstr "호스트가 없고 스킴이 'file:'이 아닙니다"
-#: builtin/add.c:292
-#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "정말로 추가하려면 -f 옵션을 사용하십시오.\n"
+#: urlmatch.c:189
+msgid "a 'file:' URL may not have a port number"
+msgstr "'file:' URL에는 포트 번호를 쓸 수 없습니다"
-#: builtin/add.c:300
-msgid "adding files failed"
-msgstr "í\8c\8cì\9d¼ ì¶\94ê°\80ê°\80 ì\8b¤í\8c¨í\96\88ì\8aµë\8b\88ë\8b¤"
+#: urlmatch.c:199
+msgid "invalid characters in host name"
+msgstr "í\98¸ì\8a¤í\8a¸ ì\9d´ë¦\84ì\97\90 ì\9e\98못ë\90\9c 문ì\9e\90"
-#: builtin/add.c:336
-msgid "-A and -u are mutually incompatible"
-msgstr "-A 및 -u 옵션은 서로 호환되지 않습니다"
+#: urlmatch.c:244 urlmatch.c:255
+msgid "invalid port number"
+msgstr "잘못된 포트 번호"
-#: builtin/add.c:343
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr ""
-"--ignore-missing 옵션은 --dry-run 옵션과 같이 사용할 경우에만 쓸 수 있습니다."
+#: urlmatch.c:322
+msgid "invalid '..' path segment"
+msgstr "경로에서 잘못된 '..' 부분"
-#: builtin/add.c:352
+#: worktree.c:282
#, c-format
-msgid "--chmod param '%s' must be either -x or +x"
-msgstr "--chmod 파라미터 '%s'은(는) -x 또는 +x 형식이어야 합니다"
+msgid "failed to read '%s'"
+msgstr "'%s'을(를) 읽는데 실패했습니다"
-#: builtin/add.c:367
+#: wrapper.c:222 wrapper.c:392
#, c-format
-msgid "Nothing specified, nothing added.\n"
-msgstr "ì\95\84무 ê²\83ë\8f\84 ì§\80ì \95í\95\98ì§\80 ì\95\8aì\95\98ì\9c¼ë¯\80ë¡\9c ì\95\84무 ê²\83ë\8f\84 ì¶\94ê°\80í\95\98ì§\80 ì\95\8aì\8aµë\8b\88ë\8b¤.\n"
+msgid "could not open '%s' for reading and writing"
+msgstr "ì\9d½ê¸°ì\99\80 ì\93°ê¸°ì\9a©ì\9c¼ë¡\9c '%s'ì\9d\84(를) ì\97´ ì\88\98 ì\97\86ì\8aµë\8b\88ë\8b¤"
-#: builtin/add.c:368
+#: wrapper.c:224 wrapper.c:394 builtin/am.c:766
#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "'git add .' 명령을 실행하려고 한 것 아니었습니까?\n"
-
-#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279
-#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340
-#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:240
-msgid "index file corrupt"
-msgstr "인덱스 파일이 손상되었습니다"
+msgid "could not open '%s' for writing"
+msgstr "'%s'을(를) 쓰기용으로 열 수 없습니다"
-#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431
-msgid "Unable to write new index file"
-msgstr "새 인덱스 파일에 쓸 수 없습니다"
+#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
+#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029
+#: builtin/pull.c:341
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "'%s'을(를) 읽기용으로 열 수 없습니다"
-#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032
+#: wrapper.c:605 wrapper.c:626
#, c-format
-msgid "could not read '%s'"
-msgstr "'%s'에서 읽을 수 없습니다"
+msgid "unable to access '%s'"
+msgstr "'%s'에 접근할 수 없습니다"
-#: builtin/am.c:426
-msgid "could not parse author script"
-msgstr "작성자 스크립트를 파싱할 수 없습니다"
+#: wrapper.c:634
+msgid "unable to get current working directory"
+msgstr "현재 작업 디렉터리를 가져올 수 없습니다"
-#: builtin/am.c:503
+#: wrapper.c:658
#, c-format
-msgid "'%s' was deleted by the applypatch-msg hook"
-msgstr "applypatch-msg 훅 때문에 '%s'이(가) 삭제되었습니다."
+msgid "could not write to %s"
+msgstr "%s에 쓸 수 없습니다"
-#: builtin/am.c:544 builtin/notes.c:301
+#: wrapper.c:660
#, c-format
-msgid "Malformed input line: '%s'."
-msgstr "잘못된 형식의 입력 줄: '%s'."
+msgid "could not close %s"
+msgstr "%s을(를) 닫을 수 없습니다"
+
+#: wt-status.c:151
+msgid "Unmerged paths:"
+msgstr "병합하지 않은 경로:"
-#: builtin/am.c:581 builtin/notes.c:316
+#: wt-status.c:178 wt-status.c:205
#, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
-msgstr "'%s'에서 '%s'(으)로 노트를 복사하는데 실패했습니다"
+msgid " (use \"git reset %s <file>...\" to unstage)"
+msgstr " (스테이지 해제하려면 \"git reset %s <파일>...\"을 사용하십시오)"
-#: builtin/am.c:607
-msgid "fseek failed"
-msgstr "fseek 실패"
+#: wt-status.c:180 wt-status.c:207
+msgid " (use \"git rm --cached <file>...\" to unstage)"
+msgstr " (스테이지 해제하려면 \"git rm --cached <파일>...\"을 사용하십시오)"
-#: builtin/am.c:787
-#, c-format
-msgid "could not parse patch '%s'"
-msgstr "'%s' 패치를 파싱할 수 없습니다"
+#: wt-status.c:184
+msgid " (use \"git add <file>...\" to mark resolution)"
+msgstr " (해결했다고 표시하려면 \"git add <파일>...\"을 사용하십시오)"
-#: builtin/am.c:852
-msgid "Only one StGIT patch series can be applied at once"
-msgstr "한번에 하나의 StGIT 패치 시리즈만 적용할 수 있습니다"
+#: wt-status.c:186 wt-status.c:190
+msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr ""
+" (해결했다고 표시하려면 알맞게 \"git add/rm <파일>...\"을 사용하십시오)"
-#: builtin/am.c:899
-msgid "invalid timestamp"
-msgstr "시각이 잘못되었습니다"
+#: wt-status.c:188
+msgid " (use \"git rm <file>...\" to mark resolution)"
+msgstr " (해결했다고 표시하려면 \"git rm <파일>...\"을 사용하십시오)"
-#: builtin/am.c:902 builtin/am.c:910
-msgid "invalid Date line"
-msgstr "Date 줄이 잘못되었습니다"
+#: wt-status.c:199 wt-status.c:945
+msgid "Changes to be committed:"
+msgstr "커밋할 변경 사항:"
-#: builtin/am.c:907
-msgid "invalid timezone offset"
-msgstr "ì\8b\9cê°\84ë\8c\80 ì\98¤í\94\84ì\85\8bì\9d´ ì\9e\98못ë\90\98ì\97\88ì\8aµë\8b\88ë\8b¤"
+#: wt-status.c:217 wt-status.c:954
+msgid "Changes not staged for commit:"
+msgstr "커ë°\8bí\95\98ë\8f\84ë¡\9d ì \95í\95\98ì§\80 ì\95\8aì\9d\80 ë³\80ê²½ ì\82¬í\95:"
-#: builtin/am.c:996
-msgid "Patch format detection failed."
-msgstr "패치 형식 검색이 실패했습니다."
+#: wt-status.c:221
+msgid " (use \"git add <file>...\" to update what will be committed)"
+msgstr " (무엇을 커밋할지 바꾸려면 \"git add <파일>...\"을 사용하십시오)"
-#: builtin/am.c:1001 builtin/clone.c:380
-#, c-format
-msgid "failed to create directory '%s'"
-msgstr "'%s' 디렉터리 만들기가 실패했습니다"
+#: wt-status.c:223
+msgid " (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr " (무엇을 커밋할지 바꾸려면 \"git add/rm <파일>...\"을 사용하십시오)"
-#: builtin/am.c:1005
-msgid "Failed to split patches."
-msgstr "패치를 쪼개는데 실패했습니다."
+#: wt-status.c:224
+msgid ""
+" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+msgstr ""
+" (작업 폴더의 변경 사항을 버리려면 \"git checkout -- <파일>...\"을 사용하십"
+"시오)"
-#: builtin/am.c:1137 builtin/commit.c:366
-msgid "unable to write index file"
-msgstr "인덱스 파일을 쓸 수 없습니다"
+#: wt-status.c:226
+msgid " (commit or discard the untracked or modified content in submodules)"
+msgstr ""
+" (하위 모듈의 추적되지 않는 파일이나 수정된 내용을 커밋하거나 버리십시오)"
-#: builtin/am.c:1188
+#: wt-status.c:238
#, c-format
-msgid "When you have resolved this problem, run \"%s --continue\"."
-msgstr "이 문제를 해결했을 때 \"%s --continue\"를 실행하십시오."
+msgid " (use \"git %s <file>...\" to include in what will be committed)"
+msgstr " (커밋할 사항에 포함하려면 \"git %s <파일>...\"을 사용하십시오)"
-#: builtin/am.c:1189
-#, c-format
-msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
-msgstr "이 패치를 건너뛰려면, 그 대신 \"%s --skip\"을 실행하십시오."
+#: wt-status.c:253
+msgid "both deleted:"
+msgstr "양쪽에서 삭제:"
-#: builtin/am.c:1190
-#, c-format
-msgid "To restore the original branch and stop patching, run \"%s --abort\"."
-msgstr ""
-"원래 브랜치를 복구하고 패치 적용을 중지하려면 \"%s --abort\"를 실행하십시오."
+#: wt-status.c:255
+msgid "added by us:"
+msgstr "이 쪽에서 추가:"
-#: builtin/am.c:1328
-msgid "Patch is empty. Was it split wrong?"
-msgstr "패치가 비어 있습니다. 잘못 쪼개지지 않았나요?"
+#: wt-status.c:257
+msgid "deleted by them:"
+msgstr "저 쪽에서 삭제:"
-#: builtin/am.c:1402 builtin/log.c:1543
-#, c-format
-msgid "invalid ident line: %s"
-msgstr "잘못된 신원 줄: %s"
+#: wt-status.c:259
+msgid "added by them:"
+msgstr "저 쪽에서 추가:"
-#: builtin/am.c:1429
-#, c-format
-msgid "unable to parse commit %s"
-msgstr "%s 커밋을 파싱할 수 없습니다"
+#: wt-status.c:261
+msgid "deleted by us:"
+msgstr "이 쪽에서 삭제:"
-#: builtin/am.c:1602
-msgid "Repository lacks necessary blobs to fall back on 3-way merge."
-msgstr "ì \80ì\9e¥ì\86\8cì\97\90 3-ë°©í\96¥ ë³\91í\95©ì\9c¼ë¡\9c ë\8c\80ì\8b í\95 ë\95\8c í\95\84ì\9a\94í\95\9c ë¸\94ë¡ì\9d´ ì\97\86ì\8aµë\8b\88ë\8b¤."
+#: wt-status.c:263
+msgid "both added:"
+msgstr "ì\96\91쪽ì\97\90ì\84\9c ì¶\94ê°\80:"
-#: builtin/am.c:1604
-msgid "Using index info to reconstruct a base tree..."
-msgstr "ì\9d¸ë\8d±ì\8a¤ ì \95보를 ì\82¬ì\9a©í\95´ 기본 í\8a¸ë¦¬ë¥¼ ë\8b¤ì\8b\9c ë§\8cë\93ë\8b\88ë\8b¤..."
+#: wt-status.c:265
+msgid "both modified:"
+msgstr "ì\96\91쪽ì\97\90ì\84\9c ì\88\98ì \95:"
-#: builtin/am.c:1623
-msgid ""
-"Did you hand edit your patch?\n"
-"It does not apply to blobs recorded in its index."
-msgstr ""
-"패치를 직접 편집하셨습니까?\n"
-"이 패치는 인덱스에 기록된 블롭에는 적용되지 않습니다."
+#: wt-status.c:275
+msgid "new file:"
+msgstr "새 파일:"
-#: builtin/am.c:1629
-msgid "Falling back to patching base and 3-way merge..."
-msgstr "ë² ì\9d´ì\8a¤ í\8c¨ì¹\98 ì \81ì\9a© ë°\8f 3-ë°©í\96¥ ë³\91í\95©ì\9c¼ë¡\9c ë\8c\80ì\8b í\95©ë\8b\88ë\8b¤..."
+#: wt-status.c:277
+msgid "copied:"
+msgstr "ë³µì\82¬í\95¨:"
-#: builtin/am.c:1654
-msgid "Failed to merge in the changes."
-msgstr "변경 사항에서 병합하는데 실패했습니다."
+#: wt-status.c:279
+msgid "deleted:"
+msgstr "삭제함:"
-#: builtin/am.c:1679 builtin/merge.c:628
-msgid "git write-tree failed to write a tree"
-msgstr "git write-tree가 트리를 쓰는데 실패했습니다"
+#: wt-status.c:281
+msgid "modified:"
+msgstr "수정함:"
-#: builtin/am.c:1686
-msgid "applying to an empty history"
-msgstr "빈 커밋 내역에 대해 적용합니다"
+#: wt-status.c:283
+msgid "renamed:"
+msgstr "이름 바꿈:"
-#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798
-#: builtin/merge.c:823
-msgid "failed to write commit object"
-msgstr "커밋 오브젝트를 쓰는데 실패했습니다"
+#: wt-status.c:285
+msgid "typechange:"
+msgstr "종류 바뀜:"
-#: builtin/am.c:1731 builtin/am.c:1735
-#, c-format
-msgid "cannot resume: %s does not exist."
-msgstr "다시 시작할 수 없습니다: %s이(가) 없습니다."
+#: wt-status.c:287
+msgid "unknown:"
+msgstr "알 수 없음:"
-#: builtin/am.c:1751
-msgid "cannot be interactive without stdin connected to a terminal."
+#: wt-status.c:289
+msgid "unmerged:"
+msgstr "병합하지 않음:"
+
+#: wt-status.c:371
+msgid "new commits, "
+msgstr "새 커밋, "
+
+#: wt-status.c:373
+msgid "modified content, "
+msgstr "수정한 내용, "
+
+#: wt-status.c:375
+msgid "untracked content, "
+msgstr "추적하지 않은 내용, "
+
+#: wt-status.c:818
+msgid "Submodules changed but not updated:"
+msgstr "변경되었지만 업데이트하지 않은 하위 모듈:"
+
+#: wt-status.c:820
+msgid "Submodule changes to be committed:"
+msgstr "커밋할 하위 모듈의 변경 사항:"
+
+#: wt-status.c:901
+msgid ""
+"Do not touch the line above.\n"
+"Everything below will be removed."
msgstr ""
-"터미널에 표준 입력이 연결되지 않은 상태에서 대화형으로 실행할 수 없습니다."
+"위의 줄을 바꾸지 마십시오.\n"
+"아래 있는 내용은 모두 제거됩니다."
-#: builtin/am.c:1756
-msgid "Commit Body is:"
-msgstr "커밋 본문은:"
+#: wt-status.c:1013
+msgid "You have unmerged paths."
+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:1766
-msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
-msgstr "적용? 예[y]/아니오[n]/편집[e]/패치 보기[v]/모두 적용[a]: "
+#: wt-status.c:1016
+msgid " (fix conflicts and run \"git commit\")"
+msgstr " (충돌을 바로잡고 \"git commit\"을 실행하십시오)"
-#: builtin/am.c:1816
-#, c-format
-msgid "Dirty index: cannot apply patches (dirty: %s)"
-msgstr "변경된 인덱스: 패치를 적용할 수 없습니다 (dirty: %s)"
+#: wt-status.c:1018
+msgid " (use \"git merge --abort\" to abort the merge)"
+msgstr " (병합을 중단하려면 \"git merge --abort\"를 사용하십시오)"
-#: builtin/am.c:1853 builtin/am.c:1925
-#, c-format
-msgid "Applying: %.*s"
-msgstr "적용하는 중: %.*s"
+#: wt-status.c:1023
+msgid "All conflicts fixed but you are still merging."
+msgstr "모든 충돌을 바로잡았지만 아직 병합하는 중입니다."
-#: builtin/am.c:1869
-msgid "No changes -- Patch already applied."
-msgstr "변경 사항 없음 -- 패치가 이미 적용되었습니다."
+#: wt-status.c:1026
+msgid " (use \"git commit\" to conclude merge)"
+msgstr " (병합을 마무리하려면 \"git commit\"을 사용하십시오)"
-#: builtin/am.c:1877
-#, c-format
-msgid "Patch failed at %s %.*s"
-msgstr "패치가 %s %.*s 위치에서 실패했습니다"
+#: wt-status.c:1036
+msgid "You are in the middle of an am session."
+msgstr "am 세션 중간에 있습니다."
+
+#: wt-status.c:1039
+msgid "The current patch is empty."
+msgstr "현재 패치가 비어 있습니다."
+
+#: wt-status.c:1043
+msgid " (fix conflicts and then run \"git am --continue\")"
+msgstr " (충돌을 바로잡은 다음 \"git am --continue\"를 사용하십시오)"
-#: builtin/am.c:1883
-#, c-format
-msgid "The copy of the patch that failed is found in: %s"
-msgstr "실패한 패치의 복사본이 다음 위치에 있습니다: %s"
+#: wt-status.c:1045
+msgid " (use \"git am --skip\" to skip this patch)"
+msgstr " (이 패치를 건너 뛰려면 \"git am --skip\"을 사용하십시오)"
-#: builtin/am.c:1928
-msgid ""
-"No changes - did you forget to use 'git add'?\n"
-"If there is nothing left to stage, chances are that something else\n"
-"already introduced the same changes; you might want to skip this patch."
-msgstr ""
-"변경 사항이 없습니다 - 'git add' 사용을 잊으셨습니까?\n"
-"커밋으로 표시할 사항이 남아 있지 않으면, 이미 같은 패치에서 적용된\n"
-"경우일 수도 있습니다. 그런 경우에는 이 패치를 건너뛰면 됩니다."
+#: wt-status.c:1047
+msgid " (use \"git am --abort\" to restore the original branch)"
+msgstr " (원본 브랜치를 복구하려면 \"git am --abort\"를 사용하십시오)"
-#: builtin/am.c:1935
-msgid ""
-"You still have unmerged paths in your index.\n"
-"Did you forget to use 'git add'?"
-msgstr ""
-"인덱스에 병합하지 않은 경로가 남아 있습니다.\n"
-"'git add' 사용을 잊지 않으셨습니까?"
+#: wt-status.c:1172
+msgid "No commands done."
+msgstr "완료한 명령 없음."
-#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308
-#: builtin/reset.c:316
+#: wt-status.c:1175
#, c-format
-msgid "Could not parse object '%s'."
-msgstr "'%s' 오브젝트를 파싱할 수 없습니다."
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] "최근 완료한 명령 (%d개 명령 완료):"
-#: builtin/am.c:2095
-msgid "failed to clean index"
-msgstr "인덱스 지우기에 실패했습니다"
+#: wt-status.c:1186
+#, c-format
+msgid " (see more in file %s)"
+msgstr " (자세한 정보는 %s 파일 참고)"
-#: builtin/am.c:2129
-msgid ""
-"You seem to have moved HEAD since the last 'am' failure.\n"
-"Not rewinding to ORIG_HEAD"
-msgstr ""
-"마지막 'am' 실패 이후 HEAD를 옮긴 것 같습니다.\n"
-"ORIG_HEAD로 되돌리지 않습니다."
+#: wt-status.c:1191
+msgid "No commands remaining."
+msgstr "명령이 남아있지 않음."
-#: builtin/am.c:2192
+#: wt-status.c:1194
#, c-format
-msgid "Invalid value for --patch-format: %s"
-msgstr "--patch-format 옵션에 대해 잘못된 값: %s"
-
-#: builtin/am.c:2225
-msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
-msgstr "git am [<옵션>] [(<mbox>|<Maildir>)...]"
+msgid "Next command to do (%d remaining command):"
+msgid_plural "Next commands to do (%d remaining commands):"
+msgstr[0] "다음에 할 명령 (%d개 명령 남음):"
-#: builtin/am.c:2226
-msgid "git am [<options>] (--continue | --skip | --abort)"
-msgstr "git am [<옵션>] (--continue | --skip | --abort)"
+#: wt-status.c:1202
+msgid " (use \"git rebase --edit-todo\" to view and edit)"
+msgstr " (보고 편집하려면 \"git rebase --edit-todo\"를 사용하십시오)"
-#: builtin/am.c:2232
-msgid "run interactively"
-msgstr "대화형으로 실행합니다"
+#: wt-status.c:1215
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "현재 '%s' 브랜치를 '%s' 위로 리베이스하는 중입니다."
-#: builtin/am.c:2234
-msgid "historical option -- no-op"
-msgstr "아무 동작도 하지 않습니다 (과거부터 있었던 옵션)"
+#: wt-status.c:1220
+msgid "You are currently rebasing."
+msgstr "현재 리베이스하는 중입니다."
-#: builtin/am.c:2236
-msgid "allow fall back on 3way merging if needed"
-msgstr "필요하면 3-방향 병합으로 대신하도록 허용합니다"
+#: wt-status.c:1234
+msgid " (fix conflicts and then run \"git rebase --continue\")"
+msgstr " (충돌을 바로잡고 \"git rebase --continue\"를 사용하십시오)"
-#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57
-#: builtin/repack.c:172
-msgid "be quiet"
-msgstr "간략히 표시합니다"
+#: wt-status.c:1236
+msgid " (use \"git rebase --skip\" to skip this patch)"
+msgstr " (이 패치를 건너뛰려면 \"git rebase --skip\"을 사용하십시오)"
-#: builtin/am.c:2239
-msgid "add a Signed-off-by line to the commit message"
-msgstr "커밋 메시지에 Signed-off-by 줄을 남깁니다"
+#: wt-status.c:1238
+msgid " (use \"git rebase --abort\" to check out the original branch)"
+msgstr " (원본 브랜치를 가져오려면 \"git rebase --abort\"를 사용하십시오)"
-#: builtin/am.c:2242
-msgid "recode into utf8 (default)"
-msgstr "UTF-8 인코딩으로 변환합니다 (기본값)"
+#: wt-status.c:1244
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
+msgstr ""
+" (모든 충돌을 바로잡았습니다: \"git rebase --continue\"를 실행하십시오)"
-#: builtin/am.c:2244
-msgid "pass -k flag to git-mailinfo"
-msgstr "git-mailinfo에 -k 옵션을 씁니다"
+#: wt-status.c:1248
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr "현재 '%s' 브랜치를 '%s' 위로 리베이스하는 중 커밋을 분리하는 중입니다."
-#: builtin/am.c:2246
-msgid "pass -b flag to git-mailinfo"
-msgstr "git-mailinfo에 -b 옵션을 씁니다"
+#: wt-status.c:1253
+msgid "You are currently splitting a commit during a rebase."
+msgstr "현재 리베이스하는 중 커밋을 분리하는 중입니다."
-#: builtin/am.c:2248
-msgid "pass -m flag to git-mailinfo"
-msgstr "git-mailinfo에 -m 옵션을 씁니다"
+#: wt-status.c:1256
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr " (작업 폴더가 깨끗해지면, \"git rebase --continue\"를 실행하십시오)"
-#: builtin/am.c:2250
-msgid "pass --keep-cr flag to git-mailsplit for mbox format"
-msgstr "mbox 형식에 대해 git-mailsplit에 --keep-cr 옵션을 사용합니다"
+#: wt-status.c:1260
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr "'%s' 브랜치를 '%s' 위로 리베이스하는 중 커밋을 편집하는 중입니다."
-#: builtin/am.c:2253
-msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
-msgstr ""
-"am.keepcr에 무관하게 git-mailsplit에 --keep-cr 옵션을 사용하지 않습니다."
+#: wt-status.c:1265
+msgid "You are currently editing a commit during a rebase."
+msgstr "리베이스 중에 커밋을 편집하는 중입니다."
-#: builtin/am.c:2256
-msgid "strip everything before a scissors line"
-msgstr "절취선 앞의 모든 사항을 무시합니다"
+#: wt-status.c:1268
+msgid " (use \"git commit --amend\" to amend the current commit)"
+msgstr " (현재 커밋을 수정하려면 \"git commit --amend\"을 사용하십시오)"
-#: builtin/am.c:2257 builtin/apply.c:4837
-msgid "action"
-msgstr "동작"
+#: wt-status.c:1270
+msgid ""
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr " (변경 사항에 만족할 때 \"git rebase --continue\"를 사용하십시오)"
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279
-#: builtin/am.c:2285
-msgid "pass it through git-apply"
-msgstr "git-apply에 넘깁니다"
+#: wt-status.c:1280
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "현재 %s 커밋을 뽑아 내고 있습니다."
-#: builtin/am.c:2266 builtin/apply.c:4861
-msgid "root"
-msgstr "최상위"
+#: wt-status.c:1285
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr " (충돌을 바로잡고 \"git cherry-pick --continue\"를 실행하십시오)"
-#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799
-#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96
-#: builtin/pull.c:179 builtin/submodule--helper.c:277
-#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482
-#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823
-#: builtin/submodule--helper.c:826
-msgid "path"
-msgstr "경로"
+#: wt-status.c:1288
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr ""
+" (모든 충돌을 바로잡았습니다: \"git cherry-pick --continue\"를 실행하십시오)"
-#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134 builtin/pull.c:193
-#: builtin/repack.c:181 builtin/repack.c:185 builtin/show-branch.c:645
-#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
-#: parse-options.h:134 parse-options.h:244
-msgid "n"
-msgstr "n"
+#: wt-status.c:1290
+msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr " (뽑기 작업을 취소하려면 \"git cherry-pick --abort\"를 사용하십시오)"
-#: builtin/am.c:2278 builtin/apply.c:4805
-msgid "num"
-msgstr "개수"
+#: wt-status.c:1299
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "현재 %s 커밋을 되돌리는 중입니다."
-#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438
-#: builtin/tag.c:372
-msgid "format"
-msgstr "형식"
+#: wt-status.c:1304
+msgid " (fix conflicts and run \"git revert --continue\")"
+msgstr " (충돌을 바로잡고 \"git revert --continue\"를 실행하십시오)"
-#: builtin/am.c:2282
-msgid "format the patch(es) are in"
-msgstr "패치의 형식"
+#: wt-status.c:1307
+msgid " (all conflicts fixed: run \"git revert --continue\")"
+msgstr ""
+" (모든 충돌을 바로잡았습니다: \"git revert --continue\"를 실행하십시오)"
-#: builtin/am.c:2288
-msgid "override error message when patch failure occurs"
-msgstr "패치 실패가 발생했을 때 오류 메시지 대신 사용합니다"
+#: wt-status.c:1309
+msgid " (use \"git revert --abort\" to cancel the revert operation)"
+msgstr " (되돌리기 작업을 취소하려면 \"git revert --abort\"를 사용하십시오)"
-#: builtin/am.c:2290
-msgid "continue applying patches after resolving a conflict"
-msgstr "충돌을 해결한 다음 패치 적용을 계속합니다"
+#: wt-status.c:1320
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "'이등분하는 중입니다. '%s' 브랜치부터 시작."
-#: builtin/am.c:2293
-msgid "synonyms for --continue"
-msgstr "--continue 옵션과 동일"
+#: wt-status.c:1324
+msgid "You are currently bisecting."
+msgstr "'이등분하는 중입니다."
-#: builtin/am.c:2296
-msgid "skip the current patch"
-msgstr "현재 패치 건너뛰기"
+#: wt-status.c:1327
+msgid " (use \"git bisect reset\" to get back to the original branch)"
+msgstr " (원래 브랜치로 돌아가려면 \"git bisect reset\"을 사용하십시오)"
-#: builtin/am.c:2299
-msgid "restore the original branch and abort the patching operation."
-msgstr "원래 브랜치를 복구하고 패치 적용 작업을 중지합니다."
+#: wt-status.c:1524
+msgid "On branch "
+msgstr "현재 브랜치 "
-# NOTE: 옵션의 의미는 이게 맞다. 원문에서는 사용자가
-# --committer-date-is-author-date라는 옵션을 보고 의미를 알 수 있다고 가정하고 있다.
-#: builtin/am.c:2303
-msgid "lie about committer date"
-msgstr "커미터 시각을 작성자 시각으로 넣습니다"
+#: wt-status.c:1530
+msgid "interactive rebase in progress; onto "
+msgstr "대화형 리베이스 진행 중. 갈 위치는 "
-#: builtin/am.c:2305
-msgid "use current timestamp for author date"
-msgstr "현재 시각을 작성자 시각으로 사용합니다"
+#: wt-status.c:1532
+msgid "rebase in progress; onto "
+msgstr "리베이스 진행 중. 갈 위치는 "
-#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229
-#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
-msgid "key-id"
-msgstr "키-ID"
+#: wt-status.c:1537
+msgid "HEAD detached at "
+msgstr "HEAD가 다음 위치에서 분리: "
-#: builtin/am.c:2308
-msgid "GPG-sign commits"
-msgstr "GPG 서명 커밋"
+#: wt-status.c:1539
+msgid "HEAD detached from "
+msgstr "HEAD가 다음으로부터 분리: "
-#: builtin/am.c:2311
-msgid "(internal use for git-rebase)"
-msgstr "(git-rebase를 위한 내부 용도)"
+#: wt-status.c:1542
+msgid "Not currently on any branch."
+msgstr "현재 어떤 브랜치도 사용하지 않음."
-#: builtin/am.c:2326
-msgid ""
-"The -b/--binary option has been a no-op for long time, and\n"
-"it will be removed. Please do not use it anymore."
-msgstr ""
-"-b/--binary 옵션은 오랜 시간 동안 아무 동작도 하지 않았으므로, 이\n"
-"옵션은 제거될 예정입니다. 이제 사용하지 마십시오."
+#: wt-status.c:1560
+msgid "Initial commit"
+msgstr "최초 커밋"
-#: builtin/am.c:2333
-msgid "failed to read the index"
-msgstr "ì\9d¸ë\8d±ì\8a¤ ì\9d½ê¸°ì\97\90 ì\8b¤í\8c¨í\96\88ì\8aµë\8b\88ë\8b¤"
+#: wt-status.c:1574
+msgid "Untracked files"
+msgstr "ì¶\94ì \81í\95\98ì§\80 ì\95\8aë\8a\94 í\8c\8cì\9d¼"
-#: builtin/am.c:2348
-#, c-format
-msgid "previous rebase directory %s still exists but mbox given."
-msgstr "이전 리베이스 디렉터리 %s이(가) 아직 있고 mbox를 지정했습니다."
+#: wt-status.c:1576
+msgid "Ignored files"
+msgstr "무시한 파일"
-#: builtin/am.c:2372
+#: wt-status.c:1580
#, c-format
msgid ""
-"Stray %s directory found.\n"
-"Use \"git am --abort\" to remove it."
+"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 디렉터리가 발견되었습니다.\n"
-"제거하려면 \"git am --abort\"를 사용하십시오."
-
-#: builtin/am.c:2378
-msgid "Resolve operation not in progress, we are not resuming."
-msgstr "해소 작업이 진행 중입니다. 다시 시작하지 않습니다."
-
-#: builtin/apply.c:122
-msgid "git apply [<options>] [<patch>...]"
-msgstr "git apply [<옵션>] [<패치>...]"
+"추적하지 않는 파일을 모두 확인하는데 %.2f초가 걸렸습니다.\n"
+"'status -uno' 옵션을 쓰면 빨라질 수도 있지만, 새 파일을\n"
+"직접 찾아서 추가해야 합니다. ('git help status' 참고)"
-#: builtin/apply.c:153
+#: wt-status.c:1586
#, c-format
-msgid "unrecognized whitespace option '%s'"
-msgstr "ì\95\8c ì\88\98 ì\97\86ë\8a\94 공백 ì\98µì\85\98 '%s'"
+msgid "Untracked files not listed%s"
+msgstr "ì¶\94ì \81í\95\98ì§\80 ì\95\8aë\8a\94 í\8c\8cì\9d¼ì\9d\84 ë³´ì§\80 ì\95\8aì\8aµë\8b\88ë\8b¤%s"
-#: builtin/apply.c:169
-#, c-format
-msgid "unrecognized whitespace ignore option '%s'"
-msgstr "알 수 없는 공백 무시 옵션 '%s'"
+#: wt-status.c:1588
+msgid " (use -u option to show untracked files)"
+msgstr " (추적하지 않는 파일을 보려면 -u 옵션을 사용하십시오)"
-#: builtin/apply.c:854
-#, c-format
-msgid "Cannot prepare timestamp regexp %s"
-msgstr "타임스탬프 정규식을 준비할 수 없습니다 (%s)"
+#: wt-status.c:1594
+msgid "No changes"
+msgstr "변경 사항 없음"
-#: builtin/apply.c:863
+#: wt-status.c:1599
#, c-format
-msgid "regexec returned %d for input: %s"
-msgstr "regexec()에서 다음 입력에 대해 %d번을 리턴했습니다: %s"
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr ""
+"커밋할 변경 사항을 추가하지 않았습니다 (\"git add\" 및/또는 \"git commit -a"
+"\"를\n"
+"사용하십시오)\n"
-#: builtin/apply.c:947
+#: wt-status.c:1602
#, c-format
-msgid "unable to find filename in patch at line %d"
-msgstr "패치의 %d번 줄에 파일 이름을 찾을 수 없습니다"
+msgid "no changes added to commit\n"
+msgstr "커밋할 변경 사항을 추가하지 않았습니다\n"
-#: builtin/apply.c:984
+#: wt-status.c:1605
#, c-format
-msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
msgstr ""
-"git apply: 잘못된 git-diff - %2$d번 줄에서 /dev/null을 기대했지만, '%1$s'이"
-"(가) 왔습니다"
+"커밋할 사항을 추가하지 않았지만 추적하지 않는 파일이 있습니다 (추적하려면 "
+"\"git\n"
+"add\"를 사용하십시오)\n"
-#: builtin/apply.c:989
+#: wt-status.c:1608
#, c-format
-msgid "git apply: bad git-diff - inconsistent new filename on line %d"
-msgstr ""
-"git apply: 잘못된 git-diff - %d번 줄에 새 파일 이름이 올바르지 않습니다"
+msgid "nothing added to commit but untracked files present\n"
+msgstr "커밋할 사항을 추가하지 않았지만 추적하지 않는 파일이 있습니다\n"
-#: builtin/apply.c:990
+#: wt-status.c:1611
#, c-format
-msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-"git apply: 잘못된 git-diff - %d번 줄에 예전 파일 이름이 올바르지 않습니다"
+"커밋할 사항 없음 (파일을 만들거나 복사하고 \"git add\"를 사용하면 추적합니"
+"다)\n"
-#: builtin/apply.c:995
+#: wt-status.c:1614 wt-status.c:1619
#, c-format
-msgid "git apply: bad git-diff - expected /dev/null on line %d"
-msgstr "git apply: 잘못된 git-diff - %d번 줄에서 /dev/null을 기대했습니다"
+msgid "nothing to commit\n"
+msgstr "커밋할 사항 없음\n"
-#: builtin/apply.c:1489
+#: wt-status.c:1617
#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr "recount: 예상치 못한 줄: %.*s"
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr ""
+"커밋할 사항 없음 (추적하지 않는 파일을 보려면 -u 옵션을 사용하십시오)\n"
-#: builtin/apply.c:1550
+#: wt-status.c:1621
#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr "%d번 줄에 헤더 없는 패치 부분: %.*s"
+msgid "nothing to commit, working tree clean\n"
+msgstr "커밋할 사항 없음, 작업 폴더 깨끗함\n"
-#: builtin/apply.c:1567
-#, c-format
-msgid ""
-"git diff header lacks filename information when removing %d leading pathname "
-"component (line %d)"
-msgid_plural ""
-"git diff header lacks filename information when removing %d leading pathname "
-"components (line %d)"
-msgstr[0] ""
-"경로 이름 부분에서 %d개를 제거라 때 git diff 헤더에 파일 이름 정보가 없습니"
-"다. (%d번 줄)"
+#: wt-status.c:1728
+msgid "Initial commit on "
+msgstr "최초 커밋, 브랜치: "
-#: builtin/apply.c:1743
-msgid "new file depends on old contents"
-msgstr "새 파일이 예전 내용에 의존합니다"
+#: wt-status.c:1732
+msgid "HEAD (no branch)"
+msgstr "HEAD (브랜치 없음)"
-#: builtin/apply.c:1745
-msgid "deleted file still has contents"
-msgstr "ì\82ì \9cí\95\9c í\8c\8cì\9d¼ì\97\90 ì\95\84ì§\81 ë\82´ì\9a©ì\9d´ ë\93¤ì\96´ ì\9e\88ì\8aµë\8b\88ë\8b¤"
+#: wt-status.c:1761
+msgid "gone"
+msgstr "ì\97\86ì\9d\8c"
-#: builtin/apply.c:1774
-#, c-format
-msgid "corrupt patch at line %d"
-msgstr "패치가 %d번 줄에서 망가졌습니다"
+#: wt-status.c:1763 wt-status.c:1771
+msgid "behind "
+msgstr "다음 뒤에: "
-#: builtin/apply.c:1810
-#, c-format
-msgid "new file %s depends on old contents"
-msgstr "새 파일 %s이(가) 예전 내용에 의존합니다"
+#: wt-status.c:1766 wt-status.c:1769
+msgid "ahead "
+msgstr "다음 앞에: "
-#: builtin/apply.c:1812
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2270
#, c-format
-msgid "deleted file %s still has contents"
-msgstr "삭제한 파일 %s이(가) 아직 내용이 들어 있습니다"
+msgid "cannot %s: You have unstaged changes."
+msgstr "%s 할 수 없습니다: 스테이징하지 않은 변경 사항이 있습니다."
-#: builtin/apply.c:1815
-#, c-format
-msgid "** warning: file %s becomes empty but is not deleted"
-msgstr "** 경고: %s 파일의 내용이 비어 있지만 삭제되지 않았습니다"
+#: wt-status.c:2276
+msgid "additionally, your index contains uncommitted changes."
+msgstr "추가로, 인덱스에 커밋하지 않은 변경 사항이 있습니다."
-#: builtin/apply.c:1962
+#: wt-status.c:2278
#, c-format
-msgid "corrupt binary patch at line %d: %.*s"
-msgstr "%d번 줄에 바이너리 패치가 손상되었습니다: %.*s"
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "%s 할 수 없습니다: 인덱스에 커밋하지 않은 변경 사항이 있습니다."
-#: builtin/apply.c:1999
+#: compat/precompose_utf8.c:57 builtin/clone.c:414
#, c-format
-msgid "unrecognized binary patch at line %d"
-msgstr "%d번 줄에 바이너리 패치가 이해할 수 없습니다"
+msgid "failed to unlink '%s'"
+msgstr "'%s' 파일 삭제에 실패했습니다"
-#: builtin/apply.c:2154
-#, c-format
-msgid "patch with only garbage at line %d"
-msgstr "%d번 줄에 쓰레기 데이터만 있는 패치"
+#: builtin/add.c:22
+msgid "git add [<options>] [--] <pathspec>..."
+msgstr "git add [<옵션>] [--] <경로명세>..."
-#: builtin/apply.c:2244
+#: builtin/add.c:80
#, c-format
-msgid "unable to read symlink %s"
-msgstr "%s 심볼릭 링크를 읽을 수 없습니다"
+msgid "unexpected diff status %c"
+msgstr "예상치 못한 diff 상태 %c"
-#: builtin/apply.c:2248
-#, c-format
-msgid "unable to open or read %s"
-msgstr "%s을(를) 열거나 읽을 수 없습니다"
+#: builtin/add.c:85 builtin/commit.c:291
+msgid "updating files failed"
+msgstr "파일 업데이트가 실패했습니다"
-#: builtin/apply.c:2901
+#: builtin/add.c:95
#, c-format
-msgid "invalid start of line: '%c'"
-msgstr "줄 시작이 잘못됨: '%c'"
+msgid "remove '%s'\n"
+msgstr "'%s' 제거\n"
-#: builtin/apply.c:3020
-#, c-format
-msgid "Hunk #%d succeeded at %d (offset %d line)."
-msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
-msgstr[0] "패치 %d번 부분 %d번 줄에서 성공 (오프셋 %d줄)"
+#: builtin/add.c:149
+msgid "Unstaged changes after refreshing the index:"
+msgstr "인덱스를 새로 고친 다음 커밋 표시하지 않은 변경 사항:"
-#: builtin/apply.c:3032
-#, c-format
-msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
-msgstr "컨텍스트가 (%ld/%ld)로 줄어듭니다. (%d번 줄에서 적용)"
+#: builtin/add.c:209 builtin/rev-parse.c:840
+msgid "Could not read the index"
+msgstr "인덱스를 읽을 수 없습니다"
-#: builtin/apply.c:3038
+#: builtin/add.c:220
#, c-format
-msgid ""
-"while searching for:\n"
-"%.*s"
-msgstr ""
-"다음을 검색하던 중:\n"
-"%.*s"
+msgid "Could not open '%s' for writing."
+msgstr "'%s' 파일을 쓰기용으로 열 수 없습니다."
+
+#: builtin/add.c:224
+msgid "Could not write patch"
+msgstr "패치를 쓸 수 없습니다"
-#: builtin/apply.c:3060
+#: builtin/add.c:227
+msgid "editing patch failed"
+msgstr "패치 편집에 실패했습니다"
+
+#: builtin/add.c:230
#, c-format
-msgid "missing binary patch data for '%s'"
-msgstr "'%s'에 대한 바이너리 패치 데이터가 없습니다"
+msgid "Could not stat '%s'"
+msgstr "'%s'을(를) stat()할 수 없습니다"
+
+#: builtin/add.c:232
+msgid "Empty patch. Aborted."
+msgstr "빈 패치. 중지."
-#: builtin/apply.c:3163
+#: builtin/add.c:237
#, c-format
-msgid "binary patch does not apply to '%s'"
-msgstr "바이너리 패치를 '%s'에 적용할 수 없습니다"
+msgid "Could not apply '%s'"
+msgstr "'%s'을(를) 적용할 수 없습니다"
+
+#: builtin/add.c:247
+msgid "The following paths are ignored by one of your .gitignore files:\n"
+msgstr "다음 경로는 .gitignore 파일 중 하나 때문에 무시합니다:\n"
+
+#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111
+#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521
+#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162
+msgid "dry run"
+msgstr "가짜로 실행"
+
+#: builtin/add.c:269
+msgid "interactive picking"
+msgstr "대화식으로 고릅니다"
+
+#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286
+msgid "select hunks interactively"
+msgstr "대화식으로 변경된 부분을 선택합니다"
+
+#: builtin/add.c:271
+msgid "edit current diff and apply"
+msgstr "현재 diff를 편집하고 적용합니다"
+
+#: builtin/add.c:272
+msgid "allow adding otherwise ignored files"
+msgstr "무시하는 파일의 추가를 허용합니다"
+
+#: builtin/add.c:273
+msgid "update tracked files"
+msgstr "추적되는 파일을 업데이트합니다"
+
+#: builtin/add.c:274
+msgid "record only the fact that the path will be added later"
+msgstr "나중에 추가할 것이라는 사실만 기록합니다"
+
+#: builtin/add.c:275
+msgid "add changes from all tracked and untracked files"
+msgstr "추적되고 추적되지 않는 모든 파일의 변경 사항을 추가합니다"
+
+#: builtin/add.c:278
+msgid "ignore paths removed in the working tree (same as --no-all)"
+msgstr "작업 폴더에서 제거한 경로를 무시합니다 (--no-all과 동일)"
+
+#: builtin/add.c:280
+msgid "don't add, only refresh the index"
+msgstr "추가하지 않고 인덱스만 새로 고칩니다"
+
+#: builtin/add.c:281
+msgid "just skip files which cannot be added because of errors"
+msgstr "오류 때문에 추가할 수 없는 파일을 건너뜁니다"
+
+#: builtin/add.c:282
+msgid "check if - even missing - files are ignored in dry run"
+msgstr "가짜로 실행했을 때 파일을 무시하는지 확인합니다"
+
+#: builtin/add.c:283 builtin/update-index.c:947
+msgid "(+/-)x"
+msgstr "(+/-)x"
+
+#: builtin/add.c:283 builtin/update-index.c:948
+msgid "override the executable bit of the listed files"
+msgstr "목록의 파일에서 실행 가능 비트를 바꿉니다"
-#: builtin/apply.c:3169
+#: builtin/add.c:305
#, c-format
-msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
+msgid "Use -f if you really want to add them.\n"
+msgstr "정말로 추가하려면 -f 옵션을 사용하십시오.\n"
+
+#: builtin/add.c:312
+msgid "adding files failed"
+msgstr "파일 추가가 실패했습니다"
+
+#: builtin/add.c:348
+msgid "-A and -u are mutually incompatible"
+msgstr "-A 및 -u 옵션은 서로 호환되지 않습니다"
+
+#: builtin/add.c:355
+msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
-"'%s'에 대한 바이너리 패치가 올바르지 않은 결과를 만듭니다. (기대한 값 %s, 실"
-"제 %s)"
+"--ignore-missing 옵션은 --dry-run 옵션과 같이 사용할 경우에만 쓸 수 있습니다."
-#: builtin/apply.c:3190
+#: builtin/add.c:359
#, c-format
-msgid "patch failed: %s:%ld"
-msgstr "패치 실패: %s:%ld"
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr "--chmod 파라미터 '%s'은(는) -x 또는 +x 형식이어야 합니다"
-#: builtin/apply.c:3314
+#: builtin/add.c:374
#, c-format
-msgid "cannot checkout %s"
-msgstr "%s을(를) 가져올 수 없습니다"
+msgid "Nothing specified, nothing added.\n"
+msgstr "아무 것도 지정하지 않았으므로 아무 것도 추가하지 않습니다.\n"
-#: builtin/apply.c:3370
+#: builtin/add.c:375
#, c-format
-msgid "reading from '%s' beyond a symbolic link"
-msgstr "심볼릭 링크 뒤에 있는 '%s' 읽기"
+msgid "Maybe you wanted to say 'git add .'?\n"
+msgstr "'git add .' 명령을 실행하려고 한 것 아니었습니까?\n"
+
+#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279
+#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350
+#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:244
+msgid "index file corrupt"
+msgstr "인덱스 파일이 손상되었습니다"
+
+#: builtin/am.c:414
+msgid "could not parse author script"
+msgstr "작성자 스크립트를 파싱할 수 없습니다"
-#: builtin/apply.c:3399 builtin/apply.c:3630
+#: builtin/am.c:491
#, c-format
-msgid "path %s has been renamed/deleted"
-msgstr "%s 경로가 이름이 바뀌었거나 삭제되었습니다"
+msgid "'%s' was deleted by the applypatch-msg hook"
+msgstr "applypatch-msg 훅 때문에 '%s'이(가) 삭제되었습니다."
-#: builtin/apply.c:3482 builtin/apply.c:3644
+#: builtin/am.c:532
#, c-format
-msgid "%s: does not exist in index"
-msgstr "%s: 인덱스에 없습니다"
+msgid "Malformed input line: '%s'."
+msgstr "잘못된 형식의 입력 줄: '%s'."
-#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658
+#: builtin/am.c:569
#, c-format
-msgid "%s: %s"
-msgstr "%s: %s"
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr "'%s'에서 '%s'(으)로 노트를 복사하는데 실패했습니다"
+
+#: builtin/am.c:595
+msgid "fseek failed"
+msgstr "fseek 실패"
-#: builtin/apply.c:3491 builtin/apply.c:3652
+#: builtin/am.c:775
#, c-format
-msgid "%s: does not match index"
-msgstr "%s: 인덱스와 맞지 않습니다"
+msgid "could not parse patch '%s'"
+msgstr "'%s' 패치를 파싱할 수 없습니다"
-#: builtin/apply.c:3597
-msgid "removal patch leaves file contents"
-msgstr "제거하는 패치 다음에 파일 내용이 남았습니다"
+#: builtin/am.c:840
+msgid "Only one StGIT patch series can be applied at once"
+msgstr "한번에 하나의 StGIT 패치 시리즈만 적용할 수 있습니다"
+
+#: builtin/am.c:887
+msgid "invalid timestamp"
+msgstr "시각이 잘못되었습니다"
+
+#: builtin/am.c:890 builtin/am.c:898
+msgid "invalid Date line"
+msgstr "Date 줄이 잘못되었습니다"
-#: builtin/apply.c:3669
+#: builtin/am.c:895
+msgid "invalid timezone offset"
+msgstr "시간대 오프셋이 잘못되었습니다"
+
+#: builtin/am.c:984
+msgid "Patch format detection failed."
+msgstr "패치 형식 검색이 실패했습니다."
+
+#: builtin/am.c:989 builtin/clone.c:379
#, c-format
-msgid "%s: wrong type"
-msgstr "%s: 잘못된 종류"
+msgid "failed to create directory '%s'"
+msgstr "'%s' 디렉터리 만들기가 실패했습니다"
+
+#: builtin/am.c:993
+msgid "Failed to split patches."
+msgstr "패치를 쪼개는데 실패했습니다."
+
+#: builtin/am.c:1125 builtin/commit.c:376
+msgid "unable to write index file"
+msgstr "인덱스 파일을 쓸 수 없습니다"
-#: builtin/apply.c:3671
+#: builtin/am.c:1176
#, c-format
-msgid "%s has type %o, expected %o"
-msgstr "%s의 종류가 %o이지만 %o이(가) 되어야 합니다"
+msgid "When you have resolved this problem, run \"%s --continue\"."
+msgstr "이 문제를 해결했을 때 \"%s --continue\"를 실행하십시오."
-#: builtin/apply.c:3822 builtin/apply.c:3824
+#: builtin/am.c:1177
#, c-format
-msgid "invalid path '%s'"
-msgstr "ì\9e\98못ë\90\9c ê²½ë¡\9c '%s'"
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+msgstr "ì\9d´ í\8c¨ì¹\98를 ê±´ë\84\88ë\9b°ë ¤ë©´, ê·¸ ë\8c\80ì\8b \"%s --skip\"ì\9d\84 ì\8b¤í\96\89í\95\98ì\8bì\8b\9cì\98¤."
-#: builtin/apply.c:3879
+#: builtin/am.c:1178
#, c-format
-msgid "%s: already exists in index"
-msgstr "%s: 이미 인덱스에 있습니다"
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgstr ""
+"원래 브랜치를 복구하고 패치 적용을 중지하려면 \"%s --abort\"를 실행하십시오."
-#: builtin/apply.c:3882
-#, c-format
-msgid "%s: already exists in working directory"
-msgstr "%s: 이미 작업 디렉터리에 있습니다"
+#: builtin/am.c:1316
+msgid "Patch is empty. Was it split wrong?"
+msgstr "패치가 비어 있습니다. 잘못 쪼개지지 않았나요?"
-#: builtin/apply.c:3902
+#: builtin/am.c:1390 builtin/log.c:1550
#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o)"
-msgstr "%2$s의 새 모드(%1$o)가 예전 모드(%3$o)와 다릅니다"
+msgid "invalid ident line: %s"
+msgstr "잘못된 신원 줄: %s"
-#: builtin/apply.c:3907
+#: builtin/am.c:1417
#, 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)와 다릅니다"
+msgid "unable to parse commit %s"
+msgstr "%s 커밋을 파싱할 수 없습니다"
-#: builtin/apply.c:3927
-#, c-format
-msgid "affected file '%s' is beyond a symbolic link"
-msgstr "영향 받는 '%s' 파일이 심볼릭 링크 뒤에 있습니다"
+#: builtin/am.c:1610
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+msgstr "저장소에 3-방향 병합으로 대신할 때 필요한 블롭이 없습니다."
-#: builtin/apply.c:3931
-#, c-format
-msgid "%s: patch does not apply"
-msgstr "%s: 패치를 적용하지 않습니다"
+#: builtin/am.c:1612
+msgid "Using index info to reconstruct a base tree..."
+msgstr "인덱스 정보를 사용해 기본 트리를 다시 만듭니다..."
-#: builtin/apply.c:3945
-#, c-format
-msgid "Checking patch %s..."
-msgstr "%s 패치를 확인하는 중입니다..."
+#: builtin/am.c:1631
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
+msgstr ""
+"패치를 직접 편집하셨습니까?\n"
+"이 패치는 인덱스에 기록된 블롭에는 적용되지 않습니다."
-#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "경로 '%s'에 대해 make_cache_entry 실패"
+#: builtin/am.c:1637
+msgid "Falling back to patching base and 3-way merge..."
+msgstr "베이스 패치 적용 및 3-방향 병합으로 대신합니다..."
-#: builtin/apply.c:4182
-#, c-format
-msgid "unable to remove %s from index"
-msgstr "인덱스에서 %s을(를) 제거할 수 없습니다"
+#: builtin/am.c:1662
+msgid "Failed to merge in the changes."
+msgstr "변경 사항에서 병합하는데 실패했습니다."
-#: builtin/apply.c:4215
-#, c-format
-msgid "corrupt patch for submodule %s"
-msgstr "하위 모듈 %s에 대해 손상된 패치"
+#: builtin/am.c:1686 builtin/merge.c:628
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree가 트리를 쓰는데 실패했습니다"
-#: builtin/apply.c:4219
-#, c-format
-msgid "unable to stat newly created file '%s'"
-msgstr "새로 만든 파일 '%s'에 대해 stat()할 수 없습니다"
+#: builtin/am.c:1693
+msgid "applying to an empty history"
+msgstr "빈 커밋 내역에 대해 적용합니다"
-#: builtin/apply.c:4224
-#, c-format
-msgid "unable to create backing store for newly created file %s"
-msgstr "ì\83\88ë¡\9c ë§\8cë\93 í\8c\8cì\9d¼ '%s'ì\97\90 ë\8c\80í\95´ ì\98\88ë¹\84 ì \80ì\9e¥ì\86\8c를 ë§\8cë\93¤ ì\88\98 ì\97\86습니다"
+#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798
+#: builtin/merge.c:823
+msgid "failed to write commit object"
+msgstr "커ë°\8b ì\98¤ë¸\8cì \9dí\8a¸ë¥¼ ì\93°ë\8a\94ë\8d° ì\8b¤í\8c¨í\96\88습니다"
-#: builtin/apply.c:4227 builtin/apply.c:4340
+#: builtin/am.c:1739 builtin/am.c:1743
#, c-format
-msgid "unable to add cache entry for %s"
-msgstr "%s에 대해 캐시 항목을 추가할 수 없습니다"
+msgid "cannot resume: %s does not exist."
+msgstr "다시 시작할 수 없습니다: %s이(가) 없습니다."
-#: builtin/apply.c:4260
-#, c-format
-msgid "closing file '%s'"
-msgstr "'%s' 파일을 닫는 중입니다"
+#: builtin/am.c:1759
+msgid "cannot be interactive without stdin connected to a terminal."
+msgstr ""
+"터미널에 표준 입력이 연결되지 않은 상태에서 대화형으로 실행할 수 없습니다."
+
+#: builtin/am.c:1764
+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:1774
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+msgstr "적용? 예[y]/아니오[n]/편집[e]/패치 보기[v]/모두 적용[a]: "
-#: builtin/apply.c:4313
+#: builtin/am.c:1824
#, c-format
-msgid "unable to write file '%s' mode %o"
-msgstr "'%s' 파일에 쓸 수 없습니다 ('%o' 모드)"
+msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgstr "변경된 인덱스: 패치를 적용할 수 없습니다 (dirty: %s)"
-#: builtin/apply.c:4403
+#: builtin/am.c:1861 builtin/am.c:1933
#, c-format
-msgid "Applied patch %s cleanly."
-msgstr "%s 패치 깔끔하게 적용."
+msgid "Applying: %.*s"
+msgstr "적용하는 중: %.*s"
-#: builtin/apply.c:4411
-msgid "internal error"
-msgstr "ë\82´ë¶\80 ì\98¤ë¥\98"
+#: builtin/am.c:1877
+msgid "No changes -- Patch already applied."
+msgstr "ë³\80ê²½ ì\82¬í\95 ì\97\86ì\9d\8c -- í\8c¨ì¹\98ê°\80 ì\9d´ë¯¸ ì \81ì\9a©ë\90\98ì\97\88ì\8aµë\8b\88ë\8b¤."
-#: builtin/apply.c:4414
+#: builtin/am.c:1885
#, c-format
-msgid "Applying patch %%s with %d reject..."
-msgid_plural "Applying patch %%s with %d rejects..."
-msgstr[0] "%%s 패치를 (%d개 거부) 적용..."
+msgid "Patch failed at %s %.*s"
+msgstr "패치가 %s %.*s 위치에서 실패했습니다"
-#: builtin/apply.c:4424
+#: builtin/am.c:1891
#, c-format
-msgid "truncating .rej filename to %.*s.rej"
-msgstr "truncating .rej 파일 이름을 '%.*s.rej'(으)로 자름"
+msgid "The copy of the patch that failed is found in: %s"
+msgstr "실패한 패치의 복사본이 다음 위치에 있습니다: %s"
-#: builtin/apply.c:4432
-#, c-format
-msgid "cannot open %s: %s"
-msgstr "%s을(를) 열 수 없습니다: %s"
+#: builtin/am.c:1936
+msgid ""
+"No changes - did you forget to use 'git add'?\n"
+"If there is nothing left to stage, chances are that something else\n"
+"already introduced the same changes; you might want to skip this patch."
+msgstr ""
+"변경 사항이 없습니다 - 'git add' 사용을 잊으셨습니까?\n"
+"커밋으로 표시할 사항이 남아 있지 않으면, 이미 같은 패치에서 적용된\n"
+"경우일 수도 있습니다. 그런 경우에는 이 패치를 건너뛰면 됩니다."
-#: builtin/apply.c:4445
-#, c-format
-msgid "Hunk #%d applied cleanly."
-msgstr "패치 부위 #%d 깔끔하게 적용."
+#: builtin/am.c:1943
+msgid ""
+"You still have unmerged paths in your index.\n"
+"Did you forget to use 'git add'?"
+msgstr ""
+"인덱스에 병합하지 않은 경로가 남아 있습니다.\n"
+"'git add' 사용을 잊지 않으셨습니까?"
-#: builtin/apply.c:4448
+#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
+#: builtin/reset.c:316
#, c-format
-msgid "Rejected hunk #%d."
-msgstr "패치 부위 #%d 거부됨."
+msgid "Could not parse object '%s'."
+msgstr "'%s' 오브젝트를 파싱할 수 없습니다."
+
+#: builtin/am.c:2103
+msgid "failed to clean index"
+msgstr "인덱스 지우기에 실패했습니다"
+
+#: builtin/am.c:2137
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
+msgstr ""
+"마지막 'am' 실패 이후 HEAD를 옮긴 것 같습니다.\n"
+"ORIG_HEAD로 되돌리지 않습니다."
-#: builtin/apply.c:4537
+#: builtin/am.c:2200
#, c-format
-msgid "Skipped patch '%s'."
-msgstr "패치 '%s' 건너뜀."
+msgid "Invalid value for --patch-format: %s"
+msgstr "--patch-format 옵션에 대해 잘못된 값: %s"
-#: builtin/apply.c:4545
-msgid "unrecognized input"
-msgstr "인식할 수 없는 입력"
+#: builtin/am.c:2233
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+msgstr "git am [<옵션>] [(<mbox> | <Maildir>)...]"
-#: builtin/apply.c:4556
-msgid "unable to read index file"
-msgstr "인덱스 파일을 읽을 수 없습니다"
+#: builtin/am.c:2234
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<옵션>] (--continue | --skip | --abort)"
-#: builtin/apply.c:4701
-msgid "--3way outside a repository"
-msgstr "저장소 밖에서 --3way 옵션 사용"
+#: builtin/am.c:2240
+msgid "run interactively"
+msgstr "대화형으로 실행합니다"
-#: builtin/apply.c:4709
-msgid "--index outside a repository"
-msgstr "ì \80ì\9e¥ì\86\8c ë°\96ì\97\90ì\84\9c --index ì\98µì\85\98 ì\82¬ì\9a©"
+#: builtin/am.c:2242
+msgid "historical option -- no-op"
+msgstr "ì\95\84무 ë\8f\99ì\9e\91ë\8f\84 í\95\98ì§\80 ì\95\8aì\8aµë\8b\88ë\8b¤ (과거ë¶\80í\84° ì\9e\88ì\97\88ë\8d\98 ì\98µì\85\98)"
-#: builtin/apply.c:4712
-msgid "--cached outside a repository"
-msgstr "저장소 밖에서 --cached 옵션 사용"
+#: builtin/am.c:2244
+msgid "allow fall back on 3way merging if needed"
+msgstr "필요하면 3-방향 병합으로 대신하도록 허용합니다"
-#: builtin/apply.c:4745
-#, c-format
-msgid "can't open patch '%s'"
-msgstr "'%s' 패치를 열 수 없습니다"
+#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
+#: builtin/repack.c:172
+msgid "be quiet"
+msgstr "간략히 표시합니다"
-#: builtin/apply.c:4760
-#, c-format
-msgid "squelched %d whitespace error"
-msgid_plural "squelched %d whitespace errors"
-msgstr[0] "공백 오류 %d개를 넘어갑니다"
+#: builtin/am.c:2247
+msgid "add a Signed-off-by line to the commit message"
+msgstr "커밋 메시지에 Signed-off-by 줄을 남깁니다"
-#: builtin/apply.c:4766 builtin/apply.c:4776
-#, c-format
-msgid "%d line adds whitespace errors."
-msgid_plural "%d lines add whitespace errors."
-msgstr[0] "%d줄에서 공백 오류를 추가합니다."
+#: builtin/am.c:2250
+msgid "recode into utf8 (default)"
+msgstr "UTF-8 인코딩으로 변환합니다 (기본값)"
-#: builtin/apply.c:4800
-msgid "don't apply changes matching the given path"
-msgstr "주어진 경로에 해당하는 변경 사항을 적용하지 않습니다"
+#: builtin/am.c:2252
+msgid "pass -k flag to git-mailinfo"
+msgstr "git-mailinfo에 -k 옵션을 씁니다"
-#: builtin/apply.c:4803
-msgid "apply changes matching the given path"
-msgstr "주어진 경로에 해당하는 변경 사항을 적용합니다"
+#: builtin/am.c:2254
+msgid "pass -b flag to git-mailinfo"
+msgstr "git-mailinfo에 -b 옵션을 씁니다"
-#: builtin/apply.c:4806
-msgid "remove <num> leading slashes from traditional diff paths"
-msgstr "전통적인 diff 경로 앞의 <개수>개의 앞 슬래시(/)를 제거합니다"
+#: builtin/am.c:2256
+msgid "pass -m flag to git-mailinfo"
+msgstr "git-mailinfo에 -m 옵션을 씁니다"
-#: builtin/apply.c:4809
-msgid "ignore additions made by the patch"
-msgstr "패치에서 추가하는 파일을 무시합니다"
+#: builtin/am.c:2258
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+msgstr "mbox 형식에 대해 git-mailsplit에 --keep-cr 옵션을 사용합니다"
-#: builtin/apply.c:4811
-msgid "instead of applying the patch, output diffstat for the input"
-msgstr "패치를 적용하는 대신, 입력에 대한 diffstat을 출력합니다"
+#: builtin/am.c:2261
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+msgstr ""
+"am.keepcr에 무관하게 git-mailsplit에 --keep-cr 옵션을 사용하지 않습니다."
-#: builtin/apply.c:4815
-msgid "show number of added and deleted lines in decimal notation"
-msgstr "ì\8bì§\84ì\88\98ë¡\9c ì¶\94ê°\80 ë°\8f ì\82ì \9cí\95\9c ì¤\84 ì\88\98를 í\91\9c시합니다"
+#: builtin/am.c:2264
+msgid "strip everything before a scissors line"
+msgstr "ì \88ì·¨ì\84 ì\95\9eì\9d\98 모ë\93 ì\82¬í\95ì\9d\84 무시합니다"
-#: builtin/apply.c:4817
-msgid "instead of applying the patch, output a summary for the input"
-msgstr "패치를 적용하는 대신, 입력에 대한 요약을 출력합니다"
+#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
+#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
+#: builtin/am.c:2293
+msgid "pass it through git-apply"
+msgstr "git-apply에 넘깁니다"
-#: builtin/apply.c:4819
-msgid "instead of applying the patch, see if the patch is applicable"
-msgstr "패치를 적용하는 대신, 패치를 적용 가능한지 확인합니다"
+#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
+#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135
+#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185
+#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
+msgid "n"
+msgstr "n"
-#: builtin/apply.c:4821
-msgid "make sure the patch is applicable to the current index"
-msgstr "현재 인덱스에서 패치가 적용 가능한지 확인합니다"
+#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/tag.c:372
+msgid "format"
+msgstr "형식"
-#: builtin/apply.c:4823
-msgid "apply a patch without touching the working tree"
-msgstr "작업 폴더를 바꾸지 않고 패치를 적용합니다"
+#: builtin/am.c:2290
+msgid "format the patch(es) are in"
+msgstr "패치의 형식"
-#: builtin/apply.c:4825
-msgid "accept a patch that touches outside the working area"
-msgstr "작업 영역 밖의 파일을 바꾸는 패치를 허용합니다"
+#: builtin/am.c:2296
+msgid "override error message when patch failure occurs"
+msgstr "패치 실패가 발생했을 때 오류 메시지 대신 사용합니다"
-#: builtin/apply.c:4827
-msgid "also apply the patch (use with --stat/--summary/--check)"
-msgstr "그리고 패치도 적용합니다 (--stat/--summary/--check 옵션과 같이 사용)"
+#: builtin/am.c:2298
+msgid "continue applying patches after resolving a conflict"
+msgstr "충돌을 해결한 다음 패치 적용을 계속합니다"
-#: builtin/apply.c:4829
-msgid "attempt three-way merge if a patch does not apply"
-msgstr "패치를 적용하지 않으면 3-방향 병합을 시도합니다"
+#: builtin/am.c:2301
+msgid "synonyms for --continue"
+msgstr "--continue 옵션과 동일"
-#: builtin/apply.c:4831
-msgid "build a temporary index based on embedded index information"
-msgstr "내장 인덱스 정보를 사용해 임시 인덱스를 만듭니다"
+#: builtin/am.c:2304
+msgid "skip the current patch"
+msgstr "현재 패치 건너뛰기"
-#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426
-msgid "paths are separated with NUL character"
-msgstr "경로를 NUL 문자로 구분합니다"
+#: builtin/am.c:2307
+msgid "restore the original branch and abort the patching operation."
+msgstr "원래 브랜치를 복구하고 패치 적용 작업을 중지합니다."
+
+# NOTE: 옵션의 의미는 이게 맞다. 원문에서는 사용자가
+# --committer-date-is-author-date라는 옵션을 보고 의미를 알 수 있다고 가정하고 있다.
+#: builtin/am.c:2311
+msgid "lie about committer date"
+msgstr "커미터 시각을 작성자 시각으로 넣습니다"
-#: builtin/apply.c:4836
-msgid "ensure at least <n> lines of context match"
-msgstr "최소한 <n>줄이 컨텍스트와 일치하는지 확인합니다"
+#: builtin/am.c:2313
+msgid "use current timestamp for author date"
+msgstr "현재 시각을 작성자 시각으로 사용합니다"
-#: builtin/apply.c:4838
-msgid "detect new or modified lines that have whitespace errors"
-msgstr "공백 오류가 있는 추가됐거나 수정된 줄을 찾습니다"
+#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229
+#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355
+msgid "key-id"
+msgstr "키-ID"
-#: builtin/apply.c:4841 builtin/apply.c:4844
-msgid "ignore changes in whitespace when finding context"
-msgstr "컨텍스트를 찾을 때 공백 변경 사항을 무시합니다"
+#: builtin/am.c:2316
+msgid "GPG-sign commits"
+msgstr "GPG 서명 커밋"
-#: builtin/apply.c:4847
-msgid "apply the patch in reverse"
-msgstr "패치를 반대 순서로 적용합니다"
+#: builtin/am.c:2319
+msgid "(internal use for git-rebase)"
+msgstr "(git-rebase를 위한 내부 용도)"
-#: builtin/apply.c:4849
-msgid "don't expect at least one line of context"
-msgstr "최소한의 컨텍스트 한 줄도 없이 적용합니다"
+#: builtin/am.c:2334
+msgid ""
+"The -b/--binary option has been a no-op for long time, and\n"
+"it will be removed. Please do not use it anymore."
+msgstr ""
+"-b/--binary 옵션은 오랜 시간 동안 아무 동작도 하지 않았으므로, 이\n"
+"옵션은 제거될 예정입니다. 이제 사용하지 마십시오."
-#: builtin/apply.c:4851
-msgid "leave the rejected hunks in corresponding *.rej files"
-msgstr "거부된 패치 부분을 대응되는 *.rej 파일에 남겨둡니다"
+#: builtin/am.c:2341
+msgid "failed to read the index"
+msgstr "인덱스 읽기에 실패했습니다"
-#: builtin/apply.c:4853
-msgid "allow overlapping hunks"
-msgstr "패치 부분이 겹쳐도 허용합니다"
+#: builtin/am.c:2356
+#, c-format
+msgid "previous rebase directory %s still exists but mbox given."
+msgstr "이전 리베이스 디렉터리 %s이(가) 아직 있고 mbox를 지정했습니다."
-#: builtin/apply.c:4856
-msgid "tolerate incorrectly detected missing new-line at the end of file"
-msgstr "파일 끝에 줄바꿈이 빠졌음을 잘못 검색한 경우에 무시합니다"
+#: builtin/am.c:2380
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
+msgstr ""
+"벗어난 %s 디렉터리가 발견되었습니다.\n"
+"제거하려면 \"git am --abort\"를 사용하십시오."
-#: builtin/apply.c:4859
-msgid "do not trust the line counts in the hunk headers"
-msgstr "í\8c¨ì¹\98 ë¶\80ë¶\84ì\9d\98 í\97¤ë\8d\94ì\9d\98 ì¤\84 ì\88\98를 ì\8b ì\9a©í\95\98ì§\80 ì\95\8aì\8aµë\8b\88ë\8b¤"
+#: builtin/am.c:2386
+msgid "Resolve operation not in progress, we are not resuming."
+msgstr "í\95´ì\86\8c ì\9e\91ì\97\85ì\9d´ ì§\84í\96\89 ì¤\91ì\9e\85ë\8b\88ë\8b¤. ë\8b¤ì\8b\9c ì\8b\9cì\9e\91í\95\98ì§\80 ì\95\8aì\8aµë\8b\88ë\8b¤."
-#: builtin/apply.c:4862
-msgid "prepend <root> to all filenames"
-msgstr "모든 파일 이름에 <최상위>를 앞에 붙입니다"
+#: builtin/apply.c:8
+msgid "git apply [<options>] [<patch>...]"
+msgstr "git apply [<옵션>] [<패치>...]"
#: builtin/archive.c:17
#, c-format
msgid "Blaming lines"
msgstr "블레임 줄"
-#: builtin/blame.c:2536
+#: builtin/blame.c:2577
msgid "Show blame entries as we find them, incrementally"
msgstr "블레임 항목을 찾자마자 점진적으로 표시합니다"
-#: builtin/blame.c:2537
+#: builtin/blame.c:2578
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "가장자리 커밋에 대해 빈 SHA-1을 표시합니다 (기본값: 꺼짐)"
-#: builtin/blame.c:2538
+#: builtin/blame.c:2579
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "최상위 커밋을 가장자리 커밋으로 취급하지 않습니다 (기본값: 꺼짐)"
-#: builtin/blame.c:2539
+#: builtin/blame.c:2580
msgid "Show work cost statistics"
msgstr "작업 비용 통계를 표시합니다"
-#: builtin/blame.c:2540
+#: builtin/blame.c:2581
msgid "Force progress reporting"
msgstr "강제로 진행 상황을 표시합니다"
-#: builtin/blame.c:2541
+#: builtin/blame.c:2582
msgid "Show output score for blame entries"
msgstr "블레임 항목에 대해 출력 점수를 표시합니다"
-#: builtin/blame.c:2542
+#: builtin/blame.c:2583
msgid "Show original filename (Default: auto)"
msgstr "원래 파일 이름 표시 (기본값: 자동)"
-#: builtin/blame.c:2543
+#: builtin/blame.c:2584
msgid "Show original linenumber (Default: off)"
msgstr "원래 줄 번호 표시 (기본값: 하지 않음)"
-#: builtin/blame.c:2544
+#: builtin/blame.c:2585
msgid "Show in a format designed for machine consumption"
msgstr "컴퓨터 처리용으로 설계된 형식으로 표시합니다"
-#: builtin/blame.c:2545
+#: builtin/blame.c:2586
msgid "Show porcelain format with per-line commit information"
msgstr "줄마다 커밋 정보가 표시되는 사용자용 형식으로 표시합니다"
-#: builtin/blame.c:2546
+#: builtin/blame.c:2587
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "git-annotate와 동일한 형식을 사용합니다 (기본값: 꺼짐)"
-#: builtin/blame.c:2547
+#: builtin/blame.c:2588
msgid "Show raw timestamp (Default: off)"
msgstr "내부 형식으로 시각을 표시합니다 (기본값: 꺼짐)"
-#: builtin/blame.c:2548
+#: builtin/blame.c:2589
msgid "Show long commit SHA1 (Default: off)"
msgstr "길게 커밋 SHA1을 표시합니다 (기본값: 꺼짐)"
-#: builtin/blame.c:2549
+#: builtin/blame.c:2590
msgid "Suppress author name and timestamp (Default: off)"
msgstr "작성자 이름과 시각을 표시하지 않습니다 (기본값: 꺼짐)"
-#: builtin/blame.c:2550
+#: builtin/blame.c:2591
msgid "Show author email instead of name (Default: off)"
msgstr "작성자 이름 대신에 전자메일을 표시합니다 (기본값: 꺼짐)"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2592
msgid "Ignore whitespace differences"
msgstr "공백 문자 차이점을 무시합니다"
-#: builtin/blame.c:2552
+#: builtin/blame.c:2599
+msgid "Use an experimental indent-based heuristic to improve diffs"
+msgstr "diff를 향상하는데 실험적인 들여쓰기 기반 휴리스틱을 사용합니다."
+
+#: builtin/blame.c:2600
+msgid "Use an experimental blank-line-based heuristic to improve diffs"
+msgstr "diff를 향상하는데 실험적인 빈 줄 기반 휴리스틱을 사용합니다."
+
+#: builtin/blame.c:2602
msgid "Spend extra cycles to find better match"
msgstr "더 일치하는 항목을 찾는데 더 시간을 소모합니다"
-#: builtin/blame.c:2553
+#: builtin/blame.c:2603
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "git-rev-list를 호출하는 대신 <파일>에서 리비전을 사용합니다"
-#: builtin/blame.c:2554
+#: builtin/blame.c:2604
msgid "Use <file>'s contents as the final image"
msgstr "<파일>의 내용을 최종 이미지로 사용합니다"
-#: builtin/blame.c:2555 builtin/blame.c:2556
+#: builtin/blame.c:2605 builtin/blame.c:2606
msgid "score"
msgstr "점수"
-#: builtin/blame.c:2555
+#: builtin/blame.c:2605
msgid "Find line copies within and across files"
msgstr "파일 내부와 파일 사이의 복사된 줄을 찾습니다"
-#: builtin/blame.c:2556
+#: builtin/blame.c:2606
msgid "Find line movements within and across files"
msgstr "파일 내부와 파일 사이의 옮겨진 줄을 찾습니다"
-#: builtin/blame.c:2557
+#: builtin/blame.c:2607
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2557
+#: builtin/blame.c:2607
msgid "Process only line range n,m, counting from 1"
msgstr "n,m줄 (1번 줄부터 시작) 사이의 범위만 처리"
+#: builtin/blame.c:2654
+msgid "--progress can't be used with --incremental or porcelain formats"
+msgstr ""
+"--progress 옵션은 --incremental 옵션이나 포스레인 형식에서 사용할 수 없습니다"
+
#. 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:2649
+#: builtin/blame.c:2700
msgid "4 years, 11 months ago"
msgstr "4년 11달 전"
+#: builtin/blame.c:2780
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents 및 --reverse 옵션은 호환되지 않습니다."
+
+#: builtin/blame.c:2800
+msgid "cannot use --contents with final commit object name"
+msgstr "--contents 옵션을 마지막 오브젝트 이름에 사용할 수 없습니다"
+
+#: builtin/blame.c:2805
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr ""
+"--reverse 및 --first-parent 옵션을 같이 쓰면 최근 커밋을 지정해야 합니다"
+
+#: builtin/blame.c:2832
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
+msgstr ""
+"--reverse 및 --first-parent 옵션을 같이 쓰면 최초-상위 체인과 범위가 필요합니"
+"다"
+
+#: builtin/blame.c:2843
+#, c-format
+msgid "no such path %s in %s"
+msgstr "%s 경로가 %s 안에 없습니다"
+
+#: builtin/blame.c:2854
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "%s 경로에 대해 %s 블롭을 읽을 수 없음"
+
+#: builtin/blame.c:2873
+#, c-format
+msgid "file %s has only %lu line"
+msgid_plural "file %s has only %lu lines"
+msgstr[0] "%s 파일에는 줄이 %lu개 뿐입니다"
+
#: builtin/branch.c:26
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<옵션>] [-r | -a] [--merged | --no-merged]"
msgid "change the upstream info"
msgstr "업스트림 정보를 바꿉니다"
+#: builtin/branch.c:660
+msgid "Unset the upstream info"
+msgstr "업스트림 정보를 해제합니다"
+
#: builtin/branch.c:661
msgid "use colored output"
msgstr "여러 색으로 출력합니다"
msgid "field name to sort on"
msgstr "정렬한 기준이 되는 필드 이름"
-#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402
-#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404
+#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570
#: builtin/tag.c:369
msgid "object"
msgstr "오브젝트"
msgid "Failed to resolve HEAD as a valid ref."
msgstr "HEAD를 올바른 레퍼런스로 구해내는데 실패했습니다."
-#: builtin/branch.c:709 builtin/clone.c:707
+#: builtin/branch.c:709 builtin/clone.c:706
msgid "HEAD not found below refs/heads!"
msgstr "레퍼런스/헤드 아래에 HEAD가 없습니다!"
msgid "Need a repository to unbundle."
msgstr "번들을 해제하려면 저장소가 필요합니다."
-#: builtin/cat-file.c:443
+#: builtin/cat-file.c:513
msgid ""
-"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
-"<type>|--textconv) <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|<종류"
-">|--textconv) <오브젝트>"
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <종류> | --textconv | --filters) [--path=<경로>] <오브젝트>"
-#: builtin/cat-file.c:444
-msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
-msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
+#: builtin/cat-file.c:514
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
+msgstr ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
-#: builtin/cat-file.c:481
+#: builtin/cat-file.c:551
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<종류>는 다음 중 하나가 될 수 있습니다: blob, tree, commit, tag"
-#: builtin/cat-file.c:482
+#: builtin/cat-file.c:552
msgid "show object type"
msgstr "오브젝트 종류를 봅니다"
-#: builtin/cat-file.c:483
+#: builtin/cat-file.c:553
msgid "show object size"
msgstr "오브젝트 크기를 봅니다"
-#: builtin/cat-file.c:485
+#: builtin/cat-file.c:555
msgid "exit with zero when there's no error"
msgstr "오류가 없을 때 0을 리턴하고 끝냅니다"
-#: builtin/cat-file.c:486
+#: builtin/cat-file.c:556
msgid "pretty-print object's content"
msgstr "오브젝트의 내용을 예쁘게 표시합니다"
-#: builtin/cat-file.c:488
+#: builtin/cat-file.c:558
msgid "for blob objects, run textconv on object's content"
msgstr "블롭 오브젝트에 대해서는, 오브젝트의 내용에 대해 textconv를 실행합니다"
-#: builtin/cat-file.c:490
+#: builtin/cat-file.c:560
+msgid "for blob objects, run filters on object's content"
+msgstr "블롭 오브젝트에 대해서는, 오브젝트의 내용에 대해 필터를 실행합니다"
+
+#: builtin/cat-file.c:561 git-submodule.sh:923
+msgid "blob"
+msgstr "블롭"
+
+#: builtin/cat-file.c:562
+msgid "use a specific path for --textconv/--filters"
+msgstr "--textconv/--filters 옵션에 경로를 지정합니다"
+
+#: builtin/cat-file.c:564
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "-s 및 -t 옵션이 손상된 오브젝트에 대해 동작하도록 허용합니다"
-#: builtin/cat-file.c:491
+#: builtin/cat-file.c:565
msgid "buffer --batch output"
msgstr "--batch 출력에 대해 버퍼링합니다"
-#: builtin/cat-file.c:493
+#: builtin/cat-file.c:567
msgid "show info and content of objects fed from the standard input"
msgstr "표준 입력에서 입력된 오브젝트의 정보와 내용을 표시합니다"
-#: builtin/cat-file.c:496
+#: builtin/cat-file.c:570
msgid "show info about objects fed from the standard input"
msgstr "표준 입력에서 입력된 오브젝트의 정보를 표시합니다"
-#: builtin/cat-file.c:499
+#: builtin/cat-file.c:573
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"트리 내부의 심볼릭 링크를 따라갑니다 (--batch 또는 --batch-check와 같이 사용)"
-#: builtin/cat-file.c:501
+#: builtin/cat-file.c:575
msgid "show all objects with --batch or --batch-check"
msgstr "--batch 또는 --batch-check에서 모든 오브젝트를 표시합니다"
msgid "use .gitattributes only from the index"
msgstr "인덱스에서만 .gitattributes를 사용합니다"
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97
+#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
msgid "read file names from stdin"
msgstr "표준 입력에서 파일 이름을 읽습니다"
msgstr "내용을 임시 파일에 씁니다"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491
-#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497
-#: builtin/submodule--helper.c:830 builtin/worktree.c:469
+#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598
+#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951
+#: builtin/worktree.c:469
msgid "string"
msgstr "문자열"
msgid "path '%s' is unmerged"
msgstr "'%s' 경로를 병합하지 않았습니다"
-#: builtin/checkout.c:495
+#: builtin/checkout.c:494
msgid "you need to resolve your current index first"
msgstr "현재 인덱스를 먼저 해결해야 합니다"
-#: builtin/checkout.c:625
+#: builtin/checkout.c:624
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "'%s'에 대해 reflog할 수 없습니다: %s\n"
msgid "HEAD is now at"
msgstr "HEAD의 현재 위치는"
-#: builtin/checkout.c:667 builtin/clone.c:661
+#: builtin/checkout.c:667 builtin/clone.c:660
msgid "unable to update HEAD"
msgstr "HEAD를 업데이트할 수 없습니다"
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "브랜치를 커밋이 아닌 '%s'(으)로 전환할 수 없습니다"
-#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:88
+#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93
#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
#: builtin/worktree.c:326
msgid "branch"
msgid "update ignored files (default)"
msgstr "무시하는 파일을 업데이트합니다 (기본값)"
-#: builtin/checkout.c:1154 builtin/log.c:1459 parse-options.h:250
+#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251
msgid "style"
msgstr "스타일"
msgid "do not check if another worktree is holding the given ref"
msgstr "다른 작업폴더에 주어진 레퍼런스가 있는지 확인하지 않습니다"
-#: builtin/checkout.c:1163 builtin/clone.c:60 builtin/fetch.c:117
-#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536
+#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119
+#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "강제로 진행 상황을 표시합니다"
msgid "remove whole directories"
msgstr "전체 디렉터리 제거"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
-#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725
+#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182
msgid "pattern"
msgstr "패턴"
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<옵션>] [--] <저장소> [<디렉터리>]"
-#: builtin/clone.c:62
+#: builtin/clone.c:65
msgid "don't create a checkout"
msgstr "체크아웃을 만들지 않습니다"
-#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476
+#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
msgid "create a bare repository"
msgstr "간략한 저장소를 만듭니다"
-#: builtin/clone.c:67
+#: builtin/clone.c:70
msgid "create a mirror repository (implies bare)"
msgstr "미러 저장소를 만듭니다 (간략한 저장소로 취급)"
-#: builtin/clone.c:69
+#: builtin/clone.c:72
msgid "to clone from a local repository"
msgstr "로컬 저장소에서 복제합니다"
-#: builtin/clone.c:71
+#: builtin/clone.c:74
msgid "don't use local hardlinks, always copy"
msgstr "로컬 하드링크를 사용하지 않고, 항상 복사합니다"
-#: builtin/clone.c:73
+#: builtin/clone.c:76
msgid "setup as shared repository"
msgstr "공유 저장소로 설정합니다"
-#: builtin/clone.c:75 builtin/clone.c:77
+#: builtin/clone.c:78 builtin/clone.c:80
msgid "initialize submodules in the clone"
msgstr "복제한 결과물에서 하위 모듈을 초기화합니다"
-#: builtin/clone.c:79
+#: builtin/clone.c:82
msgid "number of submodules cloned in parallel"
msgstr "병렬적으로 복제하는 하위모듈 개수"
-#: builtin/clone.c:80 builtin/init-db.c:473
+#: builtin/clone.c:83 builtin/init-db.c:475
msgid "template-directory"
msgstr "서식-디렉터리"
-#: builtin/clone.c:81 builtin/init-db.c:474
+#: builtin/clone.c:84 builtin/init-db.c:476
msgid "directory from which templates will be used"
msgstr "서식을 사용할 디렉터리 위치"
-#: builtin/clone.c:83 builtin/submodule--helper.c:495
-#: builtin/submodule--helper.c:833
+#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602
+#: builtin/submodule--helper.c:954
msgid "reference repository"
msgstr "레퍼런스 저장소"
-#: builtin/clone.c:85
+#: builtin/clone.c:90
msgid "use --reference only while cloning"
msgstr "복제할 경우에만 --reference를 사용합니다"
-#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr "이름"
-#: builtin/clone.c:87
+#: builtin/clone.c:92
msgid "use <name> instead of 'origin' to track upstream"
msgstr "업스트림 추적에 'origin' 대신 <이름>을 사용합니다"
-#: builtin/clone.c:89
+#: builtin/clone.c:94
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "리모트의 HEAD 대신 <브랜치>를 가져옵니다"
-#: builtin/clone.c:91
+#: builtin/clone.c:96
msgid "path to git-upload-pack on the remote"
msgstr "리모트의 git-upload-pack 경로"
-#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667 builtin/pull.c:201
+#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668
+#: builtin/pull.c:202
msgid "depth"
msgstr "깊이"
-#: builtin/clone.c:93
+#: builtin/clone.c:98
msgid "create a shallow clone of that depth"
msgstr "지정한 깊이의 얕은 복제를 만듭니다"
-#: builtin/clone.c:95
+#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848
+#: parse-options.h:142
+msgid "time"
+msgstr "시각"
+
+#: builtin/clone.c:100
+msgid "create a shallow clone since a specific time"
+msgstr "지정한 시간 이후의 얕은 복제를 만듭니다"
+
+#: builtin/clone.c:101 builtin/fetch.c:124
+msgid "revision"
+msgstr "리비전"
+
+#: builtin/clone.c:102 builtin/fetch.c:125
+msgid "deepen history of shallow clone by excluding rev"
+msgstr "레퍼런스를 제외해 얕은 복제의 커밋 내역을 깊게 만듭니다"
+
+#: builtin/clone.c:104
msgid "clone only one branch, HEAD or --branch"
msgstr "하나의 브랜치만 복제합니다 (HEAD 또는 --branch로 지정)"
-#: builtin/clone.c:97
+#: builtin/clone.c:106
msgid "any cloned submodules will be shallow"
msgstr "모든 복제한 하위 모듈은 얕은 모듈입니다"
-#: builtin/clone.c:98 builtin/init-db.c:482
+#: builtin/clone.c:107 builtin/init-db.c:484
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:99 builtin/init-db.c:483
+#: builtin/clone.c:108 builtin/init-db.c:485
msgid "separate git dir from working tree"
msgstr "깃 디렉터리를 작업 폴더와 별개의 위치에 놓습니다"
-#: builtin/clone.c:100
+#: builtin/clone.c:109
msgid "key=value"
msgstr "키=값"
-#: builtin/clone.c:101
+#: builtin/clone.c:110
msgid "set config inside the new repository"
msgstr "새 저장소 안에서 설정합니다"
-#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547
+#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547
msgid "use IPv4 addresses only"
msgstr "IPv4 주소만 사용합니다"
-#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549
+#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549
msgid "use IPv6 addresses only"
msgstr "IPv6 주소만 사용합니다"
-#: builtin/clone.c:241
+#: builtin/clone.c:250
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"디렉터리 이름을 알아낼 수 없습니다.\n"
"명령행에서 디렉터리를 지정하십시오"
-#: builtin/clone.c:307
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr ""
-"레퍼런스 '%s' 저장소를 연결된 체크아웃으로 쓰기는 아직 지원하지 않습니다."
-
-#: builtin/clone.c:309
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "레퍼런스 '%s' 저장소가 로컬 저장소가 아닙니다."
-
-#: builtin/clone.c:314
+#: builtin/clone.c:303
#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "레퍼런스 '%s' 저장소가 얕은 저장소입니다"
-
-#: builtin/clone.c:317
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "레퍼런스 '%s' 저장소가 붙어 있는 저장소입니다"
+msgid "info: Could not add alternate for '%s': %s\n"
+msgstr "정보: '%s'에 대한 보조 파일을 추가할 수 없습니다: %s\n"
-#: builtin/clone.c:376
+#: builtin/clone.c:375
#, c-format
msgid "failed to open '%s'"
msgstr "'%s'을(를) 여는데 실패"
-#: builtin/clone.c:384
+#: builtin/clone.c:383
#, c-format
msgid "%s exists and is not a directory"
msgstr "'%s'이(가) 있지만 디렉터리가 아닙니다"
-#: builtin/clone.c:398
+#: builtin/clone.c:397
#, c-format
msgid "failed to stat %s\n"
msgstr "'%s'에 대해 stat()이 실패했습니다\n"
-#: builtin/clone.c:420
+#: builtin/clone.c:419
#, c-format
msgid "failed to create link '%s'"
msgstr "'%s' 링크를 만드는데 실패했습니다"
-#: builtin/clone.c:424
+#: builtin/clone.c:423
#, c-format
msgid "failed to copy file to '%s'"
msgstr "파일을 '%s'(으)로 복사하는데 실패했습니다"
-#: builtin/clone.c:449
+#: builtin/clone.c:448
#, c-format
msgid "done.\n"
msgstr "완료.\n"
-#: builtin/clone.c:461
+#: builtin/clone.c:460
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"'git status' 명령으로 무엇을 체크아웃했는지 살펴볼 수 있고\n"
"'git checkout -f HEAD'로 체크아웃을 다시 할 수 있습니다\n"
-#: builtin/clone.c:538
+#: builtin/clone.c:537
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "복제할 리모트의 %s 브랜치를 찾을 수 없습니다."
-#: builtin/clone.c:633
+#: builtin/clone.c:632
msgid "remote did not send all necessary objects"
msgstr "리모트에서 필요한 오브젝트를 모두 보내지 않았습니다"
-#: builtin/clone.c:649
+#: builtin/clone.c:648
#, c-format
msgid "unable to update %s"
msgstr "%s을(를) 업데이트할 수 없습니다"
-#: builtin/clone.c:698
+#: builtin/clone.c:697
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "리모트 HEAD가 없는 레퍼런스를 참고하므로, 체크아웃할 수 없습니다.\n"
-#: builtin/clone.c:729
+#: builtin/clone.c:728
msgid "unable to checkout working tree"
msgstr "작업 폴더를 체크아웃할 수 없습니다"
-#: builtin/clone.c:766
+#: builtin/clone.c:768
msgid "unable to write parameters to config file"
msgstr "파라미터를 설정 파일에 쓸 수 없습니다"
-#: builtin/clone.c:829
+#: builtin/clone.c:831
msgid "cannot repack to clean up"
msgstr "정리용으로 repack할 수 없습니다"
-#: builtin/clone.c:831
+#: builtin/clone.c:833
msgid "cannot unlink temporary alternates file"
msgstr "보조 임시 파일을 삭제할 수 없습니다"
-#: builtin/clone.c:863 builtin/receive-pack.c:1857
+#: builtin/clone.c:866 builtin/receive-pack.c:1895
msgid "Too many arguments."
msgstr "너무 인자가 많습니다."
-#: builtin/clone.c:867
+#: builtin/clone.c:870
msgid "You must specify a repository to clone."
msgstr "복제할 저장소를 지정해야 합니다."
-#: builtin/clone.c:878
+#: builtin/clone.c:883
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare 및 --origin %s 옵션은 호환되지 않습니다."
-#: builtin/clone.c:881
+#: builtin/clone.c:886
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare 및 --separate-git-dir 옵션은 호환되지 않습니다."
-#: builtin/clone.c:894
+#: builtin/clone.c:899
#, c-format
msgid "repository '%s' does not exist"
msgstr "'%s' 저장소가 없습니다"
-#: builtin/clone.c:900 builtin/fetch.c:1293
+#: builtin/clone.c:905 builtin/fetch.c:1338
#, c-format
msgid "depth %s is not a positive number"
msgstr "깊이가(%s) 0보다 큰 수가 아닙니다"
-#: builtin/clone.c:910
+#: builtin/clone.c:915
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "대상 경로가('%s') 이미 있고 빈 디렉터리가 아닙니다."
-#: builtin/clone.c:920
+#: builtin/clone.c:925
#, c-format
msgid "working tree '%s' already exists."
msgstr "작업 폴더가('%s') 이미 있습니다."
-#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544
+#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657
#: builtin/worktree.c:222 builtin/worktree.c:249
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "'%s'의 앞 디렉터리를 만들 수 없습니다"
-#: builtin/clone.c:938
+#: builtin/clone.c:943
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "작업 디렉터리를('%s') 만들 수 없습니다"
-#: builtin/clone.c:956
+#: builtin/clone.c:955
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "간략한 저장소로('%s') 복제합니다...\n"
-#: builtin/clone.c:958
+#: builtin/clone.c:957
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "'%s'에 복제합니다...\n"
-#: builtin/clone.c:997
+#: builtin/clone.c:963
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
+msgstr ""
+"clone --recursive 옵션은 --reference 및 --reference-if-able 옵션을 같이 쓰는 "
+"것과 호환되지 않습니다"
+
+#: builtin/clone.c:1019
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
"--depth 옵션은 로컬 복제에서 무시됩니다. 대신에 'file://'을 사용하십시오."
-#: builtin/clone.c:1000
+#: builtin/clone.c:1021
+msgid "--shallow-since is ignored in local clones; use file:// instead."
+msgstr ""
+"--shallow-since 옵션은 로컬 복제에서 무시됩니다. 대신에 'file://'을 사용하십"
+"시오."
+
+#: builtin/clone.c:1023
+msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+msgstr ""
+"--shallow-exclude 옵션은 로컬 복제에서 무시됩니다. 대신에 'file://'을 사용하"
+"십시오."
+
+#: builtin/clone.c:1026
msgid "source repository is shallow, ignoring --local"
msgstr "원본 저장소가 얕은 저장소이므로, --local 옵션을 무시합니다"
-#: builtin/clone.c:1005
+#: builtin/clone.c:1031
msgid "--local is ignored"
msgstr "--local 옵션은 무시됩니다"
-#: builtin/clone.c:1009
+#: builtin/clone.c:1035
#, c-format
msgid "Don't know how to clone %s"
msgstr "%s의 복제 방법을 알지 못합니다"
-#: builtin/clone.c:1058 builtin/clone.c:1066
+#: builtin/clone.c:1090 builtin/clone.c:1098
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "리모트의 %s 브랜치가 업스트림 %s에 없습니다"
-#: builtin/clone.c:1069
+#: builtin/clone.c:1101
msgid "You appear to have cloned an empty repository."
msgstr "빈 저장소를 복제한 것처럼 보입니다."
"그 다음에 \"git cherry-pick --continue\"를 하면 나머지 커밋에\n"
"대해 커밋 빼오기를 다시 시작합니다.\n"
-#: builtin/commit.c:308
+#: builtin/commit.c:318
msgid "failed to unpack HEAD tree object"
msgstr "HEAD 트리 오브젝트의 묶음을 푸는데 실패했습니다"
-#: builtin/commit.c:349
+#: builtin/commit.c:359
msgid "unable to create temporary index"
msgstr "임시 인덱스를 만들 수 없습니다"
-#: builtin/commit.c:355
+#: builtin/commit.c:365
msgid "interactive add failed"
msgstr "대화형 추가가 실패했습니다"
-#: builtin/commit.c:368
+#: builtin/commit.c:378
msgid "unable to update temporary index"
msgstr "임시 인덱스를 업데이트할 수 없습니다"
-#: builtin/commit.c:370
+#: builtin/commit.c:380
msgid "Failed to update main cache tree"
msgstr "주요 캐시 트리를 업데이트하는데 실패했습니다"
-#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466
+#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
msgid "unable to write new_index file"
msgstr "new_index 파일에 쓸 수 없습니다"
-#: builtin/commit.c:448
+#: builtin/commit.c:458
msgid "cannot do a partial commit during a merge."
msgstr "병합하는 중 부분 커밋을 할 수 없습니다."
-#: builtin/commit.c:450
+#: builtin/commit.c:460
msgid "cannot do a partial commit during a cherry-pick."
msgstr "커밋 빼오기를 하는 중 부분 커밋을 할 수 없습니다."
-#: builtin/commit.c:459
+#: builtin/commit.c:469
msgid "cannot read the index"
msgstr "인덱스를 읽을 수 없습니다"
-#: builtin/commit.c:478
+#: builtin/commit.c:488
msgid "unable to write temporary index file"
msgstr "임시 인덱스 파일을 쓸 수 없습니다"
-#: builtin/commit.c:583
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "'%s' 커밋에 작성자 헤더가 없습니다"
-#: builtin/commit.c:585
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "'%s' 커밋의 작성자 헤더 형식이 잘못되었습니다"
-#: builtin/commit.c:604
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "--author 파라미터 형식이 잘못되었습니다"
-#: builtin/commit.c:612
+#: builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "시각 형식이 잘못되었습니다: %s"
-#: builtin/commit.c:656
+#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
"현재 커밋 메시지에서 사용되지 않는 주석 문자를\n"
"선택할 수 없습니다"
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
#, c-format
msgid "could not lookup commit %s"
msgstr "%s 커밋을 찾아볼 수 없습니다"
-#: builtin/commit.c:705 builtin/shortlog.c:286
+#: builtin/commit.c:704 builtin/shortlog.c:286
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(표준 입력에서 로그 메시지를 읽음)\n"
-#: builtin/commit.c:707
+#: builtin/commit.c:706
msgid "could not read log from standard input"
msgstr "표준 입력에서 로그 메시지를 읽을 수 없습니다"
-#: builtin/commit.c:711
+#: builtin/commit.c:710
#, c-format
msgid "could not read log file '%s'"
msgstr "'%s' 로그 파일을 읽을 수 없습니다"
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:737 builtin/commit.c:745
msgid "could not read SQUASH_MSG"
msgstr "SQUASH_MSG를 읽을 수 없습니다"
-#: builtin/commit.c:743
+#: builtin/commit.c:742
msgid "could not read MERGE_MSG"
msgstr "MERGE_MSG를 읽을 수 없습니다"
-#: builtin/commit.c:797
+#: builtin/commit.c:796
msgid "could not write commit template"
msgstr "커밋 서식을 쓸 수 없습니다"
-#: builtin/commit.c:815
+#: builtin/commit.c:814
#, c-format
msgid ""
"\n"
"\t%s\n"
"다시 시도하십시오.\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
"\t%s\n"
"다시 시도하십시오.\n"
-#: builtin/commit.c:833
+#: builtin/commit.c:832
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"변경 사항에 대한 커밋 메시지를 입력하십시오. '%c' 문자로 시작하는\n"
"줄은 무시되고, 메시지를 입력하지 않으면 커밋이 중지됩니다.\n"
-#: builtin/commit.c:840
+#: builtin/commit.c:839
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"줄은 보존되니, 필요하면 직접 제거하십시오. 메시지를 입력하지\n"
"않으면 커밋이 중지됩니다.\n"
-#: builtin/commit.c:860
+#: builtin/commit.c:859
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%s작성자: %.*s <%.*s>"
-#: builtin/commit.c:868
+#: builtin/commit.c:867
#, c-format
msgid "%sDate: %s"
msgstr "%s시각: %s"
-#: builtin/commit.c:875
+#: builtin/commit.c:874
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%s커미터: %.*s <%.*s>"
-#: builtin/commit.c:893
+#: builtin/commit.c:892
msgid "Cannot read index"
msgstr "인덱스를 읽을 수 없습니다"
-#: builtin/commit.c:950
+#: builtin/commit.c:954
msgid "Error building trees"
msgstr "트리를 만드는데 오류"
-#: builtin/commit.c:965 builtin/tag.c:266
+#: builtin/commit.c:969 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "메시지를 -m 또는 -F 옵션으로 입력하십시오.\n"
-#: builtin/commit.c:1067
+#: builtin/commit.c:1071
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' 옵션이 '이름 <전자메일>' 형식이 아니고 기존 작성자에도 없습니다"
-#: builtin/commit.c:1082 builtin/commit.c:1322
+#: builtin/commit.c:1086 builtin/commit.c:1327
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "추적되지 않는 파일 모드가 ('%s') 잘못되었습니다"
-#: builtin/commit.c:1119
+#: builtin/commit.c:1124
msgid "--long and -z are incompatible"
msgstr "--long 및 -z 옵션은 호환되지 않습니다"
-#: builtin/commit.c:1149
+#: builtin/commit.c:1154
msgid "Using both --reset-author and --author does not make sense"
msgstr "--reset-author 및 --author 옵션을 모두 사용하면 앞뒤가 맞지 않습니다"
-#: builtin/commit.c:1158
+#: builtin/commit.c:1163
msgid "You have nothing to amend."
msgstr "바꿀 사항이 없습니다."
-#: builtin/commit.c:1161
+#: builtin/commit.c:1166
msgid "You are in the middle of a merge -- cannot amend."
msgstr "병합 중에 있습니다 -- 커밋을 바꿀 수 없습니다."
-#: builtin/commit.c:1163
+#: builtin/commit.c:1168
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "커밋 빼오기 중에 있습니다 -- 커밋을 바꿀 수 없습니다."
-#: builtin/commit.c:1166
+#: builtin/commit.c:1171
msgid "Options --squash and --fixup cannot be used together"
msgstr "--squash 및 --fixup 옵션은 같이 쓸 수 없습니다"
-#: builtin/commit.c:1176
+#: builtin/commit.c:1181
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "-c/-C/-F/--fixup 옵션 중에 하나만 사용할 수 있습니다."
-#: builtin/commit.c:1178
+#: builtin/commit.c:1183
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "-m 옵션은 -c/-C/-F/--fixup 옵션과 같이 쓸 수 없습니다."
-#: builtin/commit.c:1186
+#: builtin/commit.c:1191
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author 옵션은 -C, -c 또는 --amend 옵션과 같이 써야 합니다."
-#: builtin/commit.c:1203
+#: builtin/commit.c:1208
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"--include/--only/--all/--interactive/--patch 옵션 중 하나만 사용할 수 있습니"
"다."
-#: builtin/commit.c:1205
+#: builtin/commit.c:1210
msgid "No paths with --include/--only does not make sense."
msgstr "경로가 없이 --include/--only 옵션을 쓰면 앞뒤가 맞지 않습니다."
-#: builtin/commit.c:1207
+#: builtin/commit.c:1212
msgid "Clever... amending the last one with dirty index."
msgstr "기발하네요... 마지막을 변경된 인덱스로 바꿉니다."
-#: builtin/commit.c:1209
+#: builtin/commit.c:1214
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr ""
"-i 또는 -o 없이 명시적인 경로를 지정했습니다. --only 경로를 가정합니다..."
-#: builtin/commit.c:1221 builtin/tag.c:474
+#: builtin/commit.c:1226 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "잘못된 정리 모드 %s"
-#: builtin/commit.c:1226
+#: builtin/commit.c:1231
msgid "Paths with -a does not make sense."
msgstr "-a 옵션과 경로를 같이 사용하면 앞뒤가 맞지 않습니다."
-#: builtin/commit.c:1336 builtin/commit.c:1622
+#: builtin/commit.c:1341 builtin/commit.c:1617
msgid "show status concisely"
msgstr "상태를 간략하게 표시합니다"
-#: builtin/commit.c:1338 builtin/commit.c:1624
+#: builtin/commit.c:1343 builtin/commit.c:1619
msgid "show branch information"
msgstr "브랜치 정보를 표시합니다"
-#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522
+#: builtin/commit.c:1345
+msgid "version"
+msgstr "버전"
+
+#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522
#: builtin/worktree.c:440
msgid "machine-readable output"
msgstr "컴퓨터가 읽을 수 있는 형식"
-#: builtin/commit.c:1343 builtin/commit.c:1628
+#: builtin/commit.c:1348 builtin/commit.c:1623
msgid "show status in long format (default)"
msgstr "긴 형식으로 상태를 표시합니다 (기본값)"
-#: builtin/commit.c:1346 builtin/commit.c:1631
+#: builtin/commit.c:1351 builtin/commit.c:1626
msgid "terminate entries with NUL"
msgstr "NUL 문자로 항목을 끝냅니다"
-#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981
+#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "모드"
-#: builtin/commit.c:1349 builtin/commit.c:1634
+#: builtin/commit.c:1354 builtin/commit.c:1629
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"추적되지 않는 파일을 표시합니다. 추가 옵션: all, normal, no (기본값: all)"
-#: builtin/commit.c:1352
+#: builtin/commit.c:1357
msgid "show ignored files"
msgstr "무시되는 파일을 표시합니다"
-#: builtin/commit.c:1353 parse-options.h:155
+#: builtin/commit.c:1358 parse-options.h:155
msgid "when"
msgstr "언제"
-#: builtin/commit.c:1354
+#: builtin/commit.c:1359
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
"하위 모듈의 변경을 무시합니다. 추가 옵션: all, dirty, untracked. (기본값: "
"all)"
-#: builtin/commit.c:1356
+#: builtin/commit.c:1361
msgid "list untracked files in columns"
msgstr "추적되지 않는 파일의 목록을 여러 열로 표시합니다"
-#: builtin/commit.c:1442
+#: builtin/commit.c:1437
msgid "couldn't look up newly created commit"
msgstr "새로 만든 커밋을 찾아볼 수 없습니다"
-#: builtin/commit.c:1444
+#: builtin/commit.c:1439
msgid "could not parse newly created commit"
msgstr "새로 만든 커밋을 파싱할 수 없습니다"
-#: builtin/commit.c:1489
+#: builtin/commit.c:1484
msgid "detached HEAD"
msgstr "HEAD 분리됨"
-#: builtin/commit.c:1492
+#: builtin/commit.c:1487
msgid " (root-commit)"
msgstr " (최상위-커밋)"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1587
msgid "suppress summary after successful commit"
msgstr "성공적인 커밋 후에 요약을 표시하지 않습니다"
-#: builtin/commit.c:1593
+#: builtin/commit.c:1588
msgid "show diff in commit message template"
msgstr "커밋 메시지 서식에 diff를 표시합니다"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1590
msgid "Commit message options"
msgstr "커밋 메시지 옵션"
-#: builtin/commit.c:1596 builtin/tag.c:351
+#: builtin/commit.c:1591 builtin/tag.c:351
msgid "read message from file"
msgstr "파일에서 메시지를 읽습니다"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1592
msgid "author"
msgstr "작성자"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1592
msgid "override author for commit"
msgstr "커밋의 작성자를 지정합니다"
-#: builtin/commit.c:1598 builtin/gc.c:326
+#: builtin/commit.c:1593 builtin/gc.c:326
msgid "date"
msgstr "시각"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1593
msgid "override date for commit"
msgstr "커밋의 시각을 지정합니다"
-#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396
-#: builtin/notes.c:559 builtin/tag.c:349
+#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398
+#: builtin/notes.c:561 builtin/tag.c:349
msgid "message"
msgstr "메시지"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1594
msgid "commit message"
msgstr "커밋 메시지"
-#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602
-#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
+#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79
msgid "commit"
msgstr "커밋"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1595
msgid "reuse and edit message from specified commit"
msgstr "지정한 커밋의 메시지를 재사용하고 편집합니다"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1596
msgid "reuse message from specified commit"
msgstr "지정한 커밋에서 메시지를 재사용합니다"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1597
msgid "use autosquash formatted message to fixup specified commit"
msgstr "지정한 커밋을 수정하는데 autosquash 형식 메시지를 사용합니다"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1598
msgid "use autosquash formatted message to squash specified commit"
msgstr "지정한 커밋을 합치는데 autosquash 형식 메시지를 사용합니다"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1599
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "커밋을 내가 작성한 것으로 만듭니다 (-C/-c/--amend와 같이 사용)"
-#: builtin/commit.c:1605 builtin/log.c:1409 builtin/revert.c:86
+#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "Signed-off-by: 줄을 추가합니다"
-#: builtin/commit.c:1606
+#: builtin/commit.c:1601
msgid "use specified template file"
msgstr "지정한 서식 파일을 사용합니다"
-#: builtin/commit.c:1607
+#: builtin/commit.c:1602
msgid "force edit of commit"
msgstr "커밋 편집을 강제합니다"
-#: builtin/commit.c:1608
+#: builtin/commit.c:1603
msgid "default"
msgstr "기본값"
-#: builtin/commit.c:1608 builtin/tag.c:354
+#: builtin/commit.c:1603 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "메시지에서 공백과 #주석을 지웁니다"
-#: builtin/commit.c:1609
+#: builtin/commit.c:1604
msgid "include status in commit message template"
msgstr "커밋 메시지 서식에 상태를 포함합니다"
-#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165
+#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "GPG 서명 커밋"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1609
msgid "Commit contents options"
msgstr "커밋 내용 옵션"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1610
msgid "commit all changed files"
msgstr "변경된 파일을 모두 커밋합니다"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1611
msgid "add specified files to index for commit"
msgstr "지정한 파일을 커밋할 인덱스에 추가합니다"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1612
msgid "interactively add files"
msgstr "대화형으로 파일을 추가합니다"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1613
msgid "interactively add changes"
msgstr "대화형으로 변경 사항을 추가합니다"
-#: builtin/commit.c:1619
+#: builtin/commit.c:1614
msgid "commit only specified files"
msgstr "지정한 파일만 커밋합니다"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1615
msgid "bypass pre-commit and commit-msg hooks"
msgstr "커밋 전 후크와 커밋 메시지 후크를 건너뜁니다"
-#: builtin/commit.c:1621
+#: builtin/commit.c:1616
msgid "show what would be committed"
msgstr "무엇을 커밋할지 표시합니다"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1627
msgid "amend previous commit"
msgstr "바로 앞 커밋을 바꿉니다"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1628
msgid "bypass post-rewrite hook"
msgstr "다시쓰기 후 후크를 건너뜁니다"
-#: builtin/commit.c:1638
+#: builtin/commit.c:1633
msgid "ok to record an empty change"
msgstr "빈 변경 사항을 기록하도록 허용합니다"
-#: builtin/commit.c:1640
+#: builtin/commit.c:1635
msgid "ok to record a change with an empty message"
msgstr "빈 메시지와 같이 변경 사항을 기록하도록 허용합니다"
-#: builtin/commit.c:1669
+#: builtin/commit.c:1664
msgid "could not parse HEAD commit"
msgstr "HEAD 커밋을 파싱할 수 없습니다"
-#: builtin/commit.c:1719
+#: builtin/commit.c:1712
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "손상된 MERGE_HEAD 파일 (%s)"
-#: builtin/commit.c:1726
+#: builtin/commit.c:1719
msgid "could not read MERGE_MODE"
msgstr "MERGE_MODE를 읽을 수 없습니다"
-#: builtin/commit.c:1745
+#: builtin/commit.c:1738
#, c-format
msgid "could not read commit message: %s"
msgstr "커밋 메시지를 읽을 수 없습니다: %s"
-#: builtin/commit.c:1756
+#: builtin/commit.c:1749
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "커밋을 중지합니다. 메시지를 편집하지 않았습니다.\n"
-#: builtin/commit.c:1761
+#: builtin/commit.c:1754
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "커밋을 중지합니다. 커밋 메시지가 비어 있습니다.\n"
-#: builtin/commit.c:1809
+#: builtin/commit.c:1802
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
msgid "cannot create configuration file %s"
msgstr "%s 설정 파일을 만들 수 없습니다"
-#: builtin/count-objects.c:77
+#: builtin/config.c:625
+#, 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 또는 --replace-all 옵션을\n"
+"사용하십시오."
+
+#: builtin/count-objects.c:86
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:96
msgid "print sizes in human readable format"
msgstr "사람이 읽기 좋은 형식으로 크기를 표시합니다"
msgid "only consider tags matching <pattern>"
msgstr "<패턴>과 일치하는 태그만 고려합니다"
-#: builtin/describe.c:410 builtin/name-rev.c:321
+#: builtin/describe.c:410 builtin/name-rev.c:320
msgid "show abbreviated commit object as fallback"
msgstr "대안으로 요약한 커밋 오브젝트를 표시합니다"
msgid "invalid option: %s"
msgstr "잘못된 옵션: %s"
-#: builtin/diff.c:360
+#: builtin/diff.c:361
msgid "Not a git repository"
msgstr "깃 저장소가 아닙니다"
-#: builtin/diff.c:403
+#: builtin/diff.c:404
#, c-format
msgid "invalid object '%s' given."
msgstr "잘못된 '%s' 오브젝트가 주어졌습니다."
-#: builtin/diff.c:412
+#: builtin/diff.c:413
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "두 개보다 많은 블롭이 주어졌습니다: '%s'"
-#: builtin/diff.c:419
+#: builtin/diff.c:420
#, c-format
msgid "unhandled object '%s' given."
msgstr "처리하지 않은 '%s' 오브젝트가 주어졌습니다."
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<옵션>]"
-#: builtin/fetch.c:93 builtin/pull.c:174
+#: builtin/fetch.c:95 builtin/pull.c:175
msgid "fetch from all remotes"
msgstr "모든 리모트에서 가져옵니다"
-#: builtin/fetch.c:95 builtin/pull.c:177
+#: builtin/fetch.c:97 builtin/pull.c:178
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "덮어쓰지 말고 .git/FETCH_HEAD에 덧붙입니다"
-#: builtin/fetch.c:97 builtin/pull.c:180
+#: builtin/fetch.c:99 builtin/pull.c:181
msgid "path to upload pack on remote end"
msgstr "리모트 쪽에 묶음을 업로드할 경로"
-#: builtin/fetch.c:98 builtin/pull.c:182
+#: builtin/fetch.c:100 builtin/pull.c:183
msgid "force overwrite of local branch"
msgstr "로컬 브랜치를 강제로 덮어씁니다"
-#: builtin/fetch.c:100
+#: builtin/fetch.c:102
msgid "fetch from multiple remotes"
msgstr "여러 리모트에서 가져옵니다"
-#: builtin/fetch.c:102 builtin/pull.c:184
+#: builtin/fetch.c:104 builtin/pull.c:185
msgid "fetch all tags and associated objects"
msgstr "모든 태그와 관련 오브젝트를 가져옵니다"
-#: builtin/fetch.c:104
+#: builtin/fetch.c:106
msgid "do not fetch all tags (--no-tags)"
msgstr "모든 태그를 가져오지 않습니다 (--no-tags)"
-#: builtin/fetch.c:106
+#: builtin/fetch.c:108
msgid "number of submodules fetched in parallel"
msgstr "병렬적으로 받아오는 하위모듈 개수"
-#: builtin/fetch.c:108 builtin/pull.c:187
+#: builtin/fetch.c:110 builtin/pull.c:188
msgid "prune remote-tracking branches no longer on remote"
msgstr "리모트에 이제 없는 리모트 추적 브랜치를 잘라냅니다"
-#: builtin/fetch.c:109 builtin/pull.c:190
+#: builtin/fetch.c:111 builtin/pull.c:191
msgid "on-demand"
msgstr "주문형"
-#: builtin/fetch.c:110 builtin/pull.c:191
+#: builtin/fetch.c:112 builtin/pull.c:192
msgid "control recursive fetching of submodules"
msgstr "하위 모듈 재귀적으로 가져오기 방식을 설정합니다"
-#: builtin/fetch.c:114 builtin/pull.c:199
+#: builtin/fetch.c:116 builtin/pull.c:200
msgid "keep downloaded pack"
msgstr "다운로드한 묶음을 보존합니다"
-#: builtin/fetch.c:116
+#: builtin/fetch.c:118
msgid "allow updating of HEAD ref"
msgstr "HEAD 레퍼런스 업데이트를 허용합니다"
-#: builtin/fetch.c:119 builtin/pull.c:202
+#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
msgid "deepen history of shallow clone"
msgstr "얕은 복제의 커밋 내역을 깊게 만듭니다"
-#: builtin/fetch.c:121 builtin/pull.c:205
+#: builtin/fetch.c:123
+msgid "deepen history of shallow repository based on time"
+msgstr "얕은 복제의 커밋 내역을 시간을 기준으로 깊게 만듭니다"
+
+#: builtin/fetch.c:129 builtin/pull.c:206
msgid "convert to a complete repository"
msgstr "완전한 저장소로 전환합니다"
-#: builtin/fetch.c:123 builtin/log.c:1426
+#: builtin/fetch.c:131 builtin/log.c:1433
msgid "dir"
msgstr "디렉터리"
-#: builtin/fetch.c:124
+#: builtin/fetch.c:132
msgid "prepend this to submodule path output"
msgstr "하위 모듈 경로 출력의 앞에 이 디렉터리를 붙입니다"
-#: builtin/fetch.c:127
+#: builtin/fetch.c:135
msgid "default mode for recursion"
msgstr "재귀 기본 모드"
-#: builtin/fetch.c:129 builtin/pull.c:208
+#: builtin/fetch.c:137 builtin/pull.c:209
msgid "accept refs that update .git/shallow"
msgstr ".git/shallow를 업데이트하는 레퍼런스를 허용합니다"
-#: builtin/fetch.c:130 builtin/pull.c:210
+#: builtin/fetch.c:138 builtin/pull.c:211
msgid "refmap"
msgstr "레퍼런스맵"
-#: builtin/fetch.c:131 builtin/pull.c:211
+#: builtin/fetch.c:139 builtin/pull.c:212
msgid "specify fetch refmap"
msgstr "레퍼런스맵 가져오기를 지정합니다"
-#: builtin/fetch.c:387
+#: builtin/fetch.c:398
msgid "Couldn't find remote ref HEAD"
msgstr "리모트 레퍼런스 HEAD를 찾을 수 없습니다"
-#: builtin/fetch.c:503
+#: builtin/fetch.c:514
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "fetch.output 설정에 잘못된 값이 있습니다: %s"
-#: builtin/fetch.c:592
+#: builtin/fetch.c:607
#, c-format
msgid "object %s not found"
msgstr "%s 오브젝트가 없습니다"
-#: builtin/fetch.c:596
+#: builtin/fetch.c:611
msgid "[up to date]"
msgstr "[최신 상태]"
-#: builtin/fetch.c:609 builtin/fetch.c:689
+#: builtin/fetch.c:624 builtin/fetch.c:704
msgid "[rejected]"
msgstr "[거부됨]"
-#: builtin/fetch.c:610
+#: builtin/fetch.c:625
msgid "can't fetch in current branch"
msgstr "현재 브랜치에서 가져올 수 없음"
-#: builtin/fetch.c:619
+#: builtin/fetch.c:634
msgid "[tag update]"
msgstr "[태그 업데이트]"
-#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669
-#: builtin/fetch.c:684
+#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684
+#: builtin/fetch.c:699
msgid "unable to update local ref"
msgstr "로컬 레퍼런스를 업데이트할 수 없습니다"
-#: builtin/fetch.c:639
+#: builtin/fetch.c:654
msgid "[new tag]"
msgstr "[새로운 태그]"
-#: builtin/fetch.c:642
+#: builtin/fetch.c:657
msgid "[new branch]"
msgstr "[새로운 브랜치]"
-#: builtin/fetch.c:645
+#: builtin/fetch.c:660
msgid "[new ref]"
msgstr "[새로운 레퍼런스]"
-#: builtin/fetch.c:684
+#: builtin/fetch.c:699
msgid "forced update"
msgstr "강제 업데이트"
-#: builtin/fetch.c:689
+#: builtin/fetch.c:704
msgid "non-fast-forward"
msgstr "정방향 진행이 아님"
-#: builtin/fetch.c:733
+#: builtin/fetch.c:749
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s이(가) 모든 필요한 오브젝트를 보내지 않았습니다\n"
-#: builtin/fetch.c:753
+#: builtin/fetch.c:769
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "얕은 최상위의 업데이트가 허용되지 않으므로 %s을(를) 거부합니다"
-#: builtin/fetch.c:839 builtin/fetch.c:934
+#: builtin/fetch.c:856 builtin/fetch.c:952
#, c-format
msgid "From %.*s\n"
msgstr "%.*s URL에서\n"
-#: builtin/fetch.c:850
+#: builtin/fetch.c:867
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
"업데이트할 수 없는 로컬 레퍼런스가 있습니다. 과거 충돌 브랜치를\n"
" 제거하려면 'git remote prune %s' 명령을 실행해 보십시오"
-#: builtin/fetch.c:904
+#: builtin/fetch.c:922
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s 레퍼런스가 연결이 끊어지게 됩니다)"
-#: builtin/fetch.c:905
+#: builtin/fetch.c:923
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s 레퍼런스가 연결이 끊어졌습니다)"
-#: builtin/fetch.c:937
+#: builtin/fetch.c:955
msgid "[deleted]"
msgstr "[삭제됨]"
-#: builtin/fetch.c:938 builtin/remote.c:1020
+#: builtin/fetch.c:956 builtin/remote.c:1020
msgid "(none)"
msgstr "(없음)"
-#: builtin/fetch.c:960
+#: builtin/fetch.c:979
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "간략한 저장소가 아닌 저장소의 현재 %s 브랜치로 가져오기를 거절합니다"
-#: builtin/fetch.c:979
+#: builtin/fetch.c:998
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "\"%s\" 옵션의 \"%s\" 값은 %s에 대해 올바르지 않습니다"
-#: builtin/fetch.c:982
+#: builtin/fetch.c:1001
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "\"%s\" 옵션은 '%s'에 대해 무시됩니다\n"
-#: builtin/fetch.c:1039
+#: builtin/fetch.c:1077
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "'%s'에서 가져오는 방법을 알 수 없습니다"
-#: builtin/fetch.c:1199
+#: builtin/fetch.c:1237
#, c-format
msgid "Fetching %s\n"
msgstr "%s을(를) 가져오는 중\n"
-#: builtin/fetch.c:1201 builtin/remote.c:96
+#: builtin/fetch.c:1239 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "%s을(를) 가져올 수 없습니다"
-#: builtin/fetch.c:1219
+#: builtin/fetch.c:1257
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
"리모트 저장소를 지정하지 않았습니다. 새 리비전을 가져올 수 있는\n"
"URL이나 리모트 이름을 지정하십시오."
-#: builtin/fetch.c:1242
+#: builtin/fetch.c:1280
msgid "You need to specify a tag name."
msgstr "태그 이름을 지정해야 합니다."
-#: builtin/fetch.c:1284
+#: builtin/fetch.c:1322
+msgid "Negative depth in --deepen is not supported"
+msgstr "--deepen 옵션에 음수 깊이는 지원하지 않습니다"
+
+#: builtin/fetch.c:1324
+msgid "--deepen and --depth are mutually exclusive"
+msgstr "-deepen, --depth 옵션 중 하나만 쓸 수 있습니다"
+
+#: builtin/fetch.c:1329
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth 및 --unshallow 옵션은 같이 쓸 수 없습니다"
-#: builtin/fetch.c:1286
+#: builtin/fetch.c:1331
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
"완전한 저장소에 대해 --unshallow 옵션을 사용하는 건 앞뒤가 맞지 않습니다"
-#: builtin/fetch.c:1306
+#: builtin/fetch.c:1353
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all 명령에 저장소 인자가 없습니다"
-#: builtin/fetch.c:1308
+#: builtin/fetch.c:1355
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all 명령은 레퍼런스명세 인자와 같이 쓰면 앞뒤가 맞지 않습니다"
-#: builtin/fetch.c:1319
+#: builtin/fetch.c:1366
#, c-format
msgid "No such remote or remote group: %s"
msgstr "그런 리모트나 리모트 그룹이 없습니다: %s"
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1374
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "그룹을 가져오고 레퍼런스명세를 지정하면 앞뒤가 맞지 않습니다"
msgstr ""
"git fmt-merge-msg [-m <메시지>] [--log[=<n>] | --no-log] [--file <파일>]"
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:663
msgid "populate log with at most <n> entries from shortlog"
msgstr "shortlog에서 최대 <n>개 로그를 표시합니다"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:666
msgid "alias for --log (deprecated)"
msgstr "--log와 동일 (없어질 예정)"
-#: builtin/fmt-merge-msg.c:673
+#: builtin/fmt-merge-msg.c:669
msgid "text"
msgstr "텍스트"
-#: builtin/fmt-merge-msg.c:674
+#: builtin/fmt-merge-msg.c:670
msgid "use <text> as start of message"
msgstr "<텍스트>를 시작 메시지로 사용합니다"
-#: builtin/fmt-merge-msg.c:675
+#: builtin/fmt-merge-msg.c:671
msgid "file to read from"
msgstr "읽어들일 파일"
msgid "show verbose names for reachable objects"
msgstr "접근할 수 없는 오브젝트의 이름을 자세히 표시합니다"
-#: builtin/fsck.c:671
+#: builtin/fsck.c:665
msgid "Checking objects"
msgstr "오브젝트를 확인합니다"
msgid "invalid number of threads specified (%d) for %s"
msgstr "잘못된 스레드 수를 %2$s에 대해 지정했습니다 (%1$d)"
-#: builtin/grep.c:452 builtin/grep.c:487
+#: builtin/grep.c:453 builtin/grep.c:488
#, c-format
msgid "unable to read tree (%s)"
msgstr "트리를 읽을 수 없습니다 (%s)"
-#: builtin/grep.c:502
+#: builtin/grep.c:503
#, c-format
msgid "unable to grep from object of type %s"
msgstr "종류가 %s인 오브젝트에서 grep을 할 수 없습니다"
-#: builtin/grep.c:560
+#: builtin/grep.c:561
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "`%c' 옵션에는 숫자 값이 와야 합니다"
-#: builtin/grep.c:577
-#, c-format
-msgid "cannot open '%s'"
-msgstr "'%s'을(를) 열 수 없습니다"
-
-#: builtin/grep.c:646
+#: builtin/grep.c:647
msgid "search in index instead of in the work tree"
msgstr "작업 폴더 대신에 인덱스에서 검색합니다"
-#: builtin/grep.c:648
+#: builtin/grep.c:649
msgid "find in contents not managed by git"
msgstr "깃으로 관리하지 않은 내용에서 찾습니다"
-#: builtin/grep.c:650
+#: builtin/grep.c:651
msgid "search in both tracked and untracked files"
msgstr "추적되는 파일과 추적되지 않는 파일 모두에서 검색합니다"
-#: builtin/grep.c:652
+#: builtin/grep.c:653
msgid "ignore files specified via '.gitignore'"
msgstr "'.gitignore'로 지정한 파일을 무시합니다"
-#: builtin/grep.c:655
+#: builtin/grep.c:656
msgid "show non-matching lines"
msgstr "일치하지 않는 줄을 표시합니다"
-#: builtin/grep.c:657
+#: builtin/grep.c:658
msgid "case insensitive matching"
msgstr "대소문자 구별하지 않고 맞춥니다"
-#: builtin/grep.c:659
+#: builtin/grep.c:660
msgid "match patterns only at word boundaries"
msgstr "단어 경계 부분에 대해서만 패턴을 맞춥니다"
-#: builtin/grep.c:661
+#: builtin/grep.c:662
msgid "process binary files as text"
msgstr "바이너리 파일을 텍스트로 처리합니다"
-#: builtin/grep.c:663
+#: builtin/grep.c:664
msgid "don't match patterns in binary files"
msgstr "바이너리 파일에서 패턴을 맞추지 않습니다"
-#: builtin/grep.c:666
+#: builtin/grep.c:667
msgid "process binary files with textconv filters"
msgstr "textconv 필터를 사용해 바이너리 파일을 처리합니다"
-#: builtin/grep.c:668
+#: builtin/grep.c:669
msgid "descend at most <depth> levels"
msgstr "최대 <깊이> 단계만큼 내려갑니다"
-#: builtin/grep.c:672
+#: builtin/grep.c:673
msgid "use extended POSIX regular expressions"
msgstr "POSIX 확장 정규식을 사용합니다"
-#: builtin/grep.c:675
+#: builtin/grep.c:676
msgid "use basic POSIX regular expressions (default)"
msgstr "기본 POSIX 정규식을 사용합니다 (기본값)"
-#: builtin/grep.c:678
+#: builtin/grep.c:679
msgid "interpret patterns as fixed strings"
msgstr "패턴을 고정 문자열로 해석합니다"
-#: builtin/grep.c:681
+#: builtin/grep.c:682
msgid "use Perl-compatible regular expressions"
msgstr "펄과 호환되는 정규식을 사용합니다"
-#: builtin/grep.c:684
+#: builtin/grep.c:685
msgid "show line numbers"
msgstr "줄 번호를 표시합니다"
-#: builtin/grep.c:685
+#: builtin/grep.c:686
msgid "don't show filenames"
msgstr "파일 이름을 표시하지 않습니다"
-#: builtin/grep.c:686
+#: builtin/grep.c:687
msgid "show filenames"
msgstr "파일 이름을 표시합니다"
-#: builtin/grep.c:688
+#: builtin/grep.c:689
msgid "show filenames relative to top directory"
msgstr "파일 이름을 최상위 디렉터리 상대 경로로 표시합니다"
-#: builtin/grep.c:690
+#: builtin/grep.c:691
msgid "show only filenames instead of matching lines"
msgstr "일치하는 줄을 표시하지 않고 파일 이름만 표시합니다"
-#: builtin/grep.c:692
+#: builtin/grep.c:693
msgid "synonym for --files-with-matches"
msgstr "--files-with-matches 옵션과 동일"
-#: builtin/grep.c:695
+#: builtin/grep.c:696
msgid "show only the names of files without match"
msgstr "일치하지 않는 파일의 이름만 표시합니다"
-#: builtin/grep.c:697
+#: builtin/grep.c:698
msgid "print NUL after filenames"
msgstr "파일 이름 다음에 NUL을 출력합니다"
-#: builtin/grep.c:699
+#: builtin/grep.c:700
msgid "show the number of matches instead of matching lines"
msgstr "일치하는 줄을 표시하지 않고 일치하는 수를 표시합니다"
-#: builtin/grep.c:700
+#: builtin/grep.c:701
msgid "highlight matches"
msgstr "일치하는 부분을 강조합니다"
-#: builtin/grep.c:702
+#: builtin/grep.c:703
msgid "print empty line between matches from different files"
msgstr "다른 파일 사이에 일치하는 부분의 사이에 빈 줄을 출력합니다"
-#: builtin/grep.c:704
+#: builtin/grep.c:705
msgid "show filename only once above matches from same file"
msgstr "같은 파일에서 여러 개가 일치하면 파일 이름을 한 번만 표시합니다"
-#: builtin/grep.c:707
+#: builtin/grep.c:708
msgid "show <n> context lines before and after matches"
msgstr "일치하는 부분 앞뒤에 컨텍스트를 <n>줄 표시합니다"
-#: builtin/grep.c:710
+#: builtin/grep.c:711
msgid "show <n> context lines before matches"
msgstr "일치하는 부분 앞에 컨텍스트를 <n>줄 표시합니다"
-#: builtin/grep.c:712
+#: builtin/grep.c:713
msgid "show <n> context lines after matches"
msgstr "일치하는 부분 뒤에 컨텍스트를 <n>줄 표시합니다"
-#: builtin/grep.c:714
+#: builtin/grep.c:715
msgid "use <n> worker threads"
msgstr "<n>개의 작업 스레드를 사용합니다"
-#: builtin/grep.c:715
+#: builtin/grep.c:716
msgid "shortcut for -C NUM"
msgstr "-C NUM 옵션의 줄임"
-#: builtin/grep.c:718
+#: builtin/grep.c:719
msgid "show a line with the function name before matches"
msgstr "일치 항목 앞에 함수 이름 줄을 표시합니다"
-#: builtin/grep.c:720
+#: builtin/grep.c:721
msgid "show the surrounding function"
msgstr "들어 있는 함수를 표시합니다"
-#: builtin/grep.c:723
+#: builtin/grep.c:724
msgid "read patterns from file"
msgstr "파일에서 패턴을 읽습니다"
-#: builtin/grep.c:725
+#: builtin/grep.c:726
msgid "match <pattern>"
msgstr "<패턴>과 일치"
-#: builtin/grep.c:727
+#: builtin/grep.c:728
msgid "combine patterns specified with -e"
msgstr "-e 옵션으로 지정한 패턴을 결합합니다"
-#: builtin/grep.c:739
+#: builtin/grep.c:740
msgid "indicate hit with exit status without output"
msgstr "출력하지 않고 일치하는 항목을 exit() 상태 번호로 리턴합니다"
-#: builtin/grep.c:741
+#: builtin/grep.c:742
msgid "show only matches from files that match all patterns"
msgstr "모든 패턴과 일치하는 파일의 일치하는 부분만 표시합니다"
-#: builtin/grep.c:743
+#: builtin/grep.c:744
msgid "show parse tree for grep expression"
msgstr "grep 표현식에 대한 파싱 트리를 표시합니다"
-#: builtin/grep.c:747
+#: builtin/grep.c:748
msgid "pager"
msgstr "페이저"
-#: builtin/grep.c:747
+#: builtin/grep.c:748
msgid "show matching files in the pager"
msgstr "일치하는 파일을 페이저 프로그램에서 표시합니다"
-#: builtin/grep.c:750
+#: builtin/grep.c:751
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "grep(1) 실행을 허용합니다 (이 빌드에서는 무시)"
-#: builtin/grep.c:813
+#: builtin/grep.c:814
msgid "no pattern given."
msgstr "패턴을 지정하지 않았습니다."
-#: builtin/grep.c:845 builtin/index-pack.c:1479
+#: builtin/grep.c:846 builtin/index-pack.c:1480
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "잘못된 스레드 수를 지정했습니다 (%d)"
-#: builtin/grep.c:875
+#: builtin/grep.c:876
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager 옵션은 작업 폴더에서만 동작합니다"
-#: builtin/grep.c:901
+#: builtin/grep.c:902
msgid "--cached or --untracked cannot be used with --no-index."
msgstr ""
"--cached 또는 --untracked 옵션은 --no-index 옵션과 같이 쓸 수 없습니다."
-#: builtin/grep.c:906
+#: builtin/grep.c:907
msgid "--no-index or --untracked cannot be used with revs."
msgstr "--no-index 또는 --untracked 옵션은 리비전과 같이 쓸 수 없습니다."
-#: builtin/grep.c:909
+#: builtin/grep.c:910
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard 옵션은 추적되는 내용에 대해 쓸 수 없습니다."
-#: builtin/grep.c:917
+#: builtin/grep.c:918
msgid "both --cached and trees are given."
msgstr "--cached 옵션과 트리를 모두 지정했습니다."
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:93
+#: builtin/hash-object.c:94
msgid "type"
msgstr "종류"
-#: builtin/hash-object.c:93
+#: builtin/hash-object.c:94
msgid "object type"
msgstr "오브젝트 종류"
-#: builtin/hash-object.c:94
+#: builtin/hash-object.c:95
msgid "write the object into the object database"
msgstr "오브젝트를 오브젝트 데이터베이스로 씁니다"
-#: builtin/hash-object.c:96
+#: builtin/hash-object.c:97
msgid "read the object from stdin"
msgstr "표준 입력에서 오브젝트를 읽습니다"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
msgid "store file as is without filters"
msgstr "파일을 필터 없이 그대로 저장합니다"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:100
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr "임의의 쓰레기 데이터를 해시해 손상된 오브젝트를 만듭니다 (디버깅용)"
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
msgid "process file as it were from this path"
msgstr "파일이 이 경로에서 온 것처럼 처리합니다"
-#: builtin/help.c:41
+#: builtin/help.c:42
msgid "print all available commands"
msgstr "사용 가능한 모든 명령의 목록을 표시합니다"
-#: builtin/help.c:42
+#: builtin/help.c:43
+msgid "exclude guides"
+msgstr "설명서 제외"
+
+#: builtin/help.c:44
msgid "print list of useful guides"
msgstr "유용한 안내서 목록을 표시합니다"
-#: builtin/help.c:43
+#: builtin/help.c:45
msgid "show man page"
msgstr "맨 페이지를 표시합니다"
-#: builtin/help.c:44
+#: builtin/help.c:46
msgid "show manual in web browser"
msgstr "웹 브라우저에서 설명서를 표시합니다"
-#: builtin/help.c:46
+#: builtin/help.c:48
msgid "show info page"
msgstr "인포 페이지를 표시합니다"
-#: builtin/help.c:52
+#: builtin/help.c:54
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr "git help [--all] [--guides] [--man | --web | --info] [<명령>]"
-#: builtin/help.c:64
+#: builtin/help.c:66
#, c-format
msgid "unrecognized help format '%s'"
msgstr "'%s' 도움말 포맷을 인식할 수 없습니다"
-#: builtin/help.c:91
+#: builtin/help.c:93
msgid "Failed to start emacsclient."
msgstr "emacsclient 시작에 실패했습니다."
-#: builtin/help.c:104
+#: builtin/help.c:106
msgid "Failed to parse emacsclient version."
msgstr "emacsclient 버전 파싱에 실패했습니다."
-#: builtin/help.c:112
+#: builtin/help.c:114
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient '%d' 버전은 너무 과거 (< 22) 버전입니다."
-#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
+#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
#, c-format
msgid "failed to exec '%s'"
msgstr "실행 실패: '%s'"
-#: builtin/help.c:205
+#: builtin/help.c:207
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"'%s': 지원하지 않는 맨 페이지 보기 프로그램 경로.\n"
"대신에 'man.<도구>.cmd' 옵션을 사용해 보십시오."
-#: builtin/help.c:217
+#: builtin/help.c:219
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"'%s': 지원하지 않는 맨 페이지 보기 프로그램 명령.\n"
"대신에 'man.<도구>.path' 옵션을 사용해 보십시오."
-#: builtin/help.c:334
+#: builtin/help.c:336
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s': 알 수 없는 맨 페이지 보기 프로그램."
-#: builtin/help.c:351
+#: builtin/help.c:353
msgid "no man viewer handled the request"
msgstr "요청을 처리한 맨 페이지 보기 프로그램이 없습니다"
-#: builtin/help.c:359
+#: builtin/help.c:361
msgid "no info viewer handled the request"
msgstr "요청을 처리한 인포 페이지 보기 프로그램이 없습니다"
-#: builtin/help.c:408
+#: builtin/help.c:403
msgid "Defining attributes per path"
msgstr "경로마다 속성 정의하기"
-#: builtin/help.c:409
+#: builtin/help.c:404
msgid "Everyday Git With 20 Commands Or So"
msgstr "매일매일 사용하는 20개 내외의 깃 명령"
-#: builtin/help.c:410
+#: builtin/help.c:405
msgid "A Git glossary"
msgstr "깃 용어 사전"
-#: builtin/help.c:411
+#: builtin/help.c:406
msgid "Specifies intentionally untracked files to ignore"
msgstr "의도적으로 추적하지 않는 파일을 무시하게 지정하기"
-#: builtin/help.c:412
+#: builtin/help.c:407
msgid "Defining submodule properties"
msgstr "하위 모듈 속성 정의하기"
-#: builtin/help.c:413
+#: builtin/help.c:408
msgid "Specifying revisions and ranges for Git"
msgstr "깃의 리비전 및 범위를 지정하기"
-#: builtin/help.c:414
+#: builtin/help.c:409
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "깃 따라하기 안내서 (버전 1.5.1 이후)"
-#: builtin/help.c:415
+#: builtin/help.c:410
msgid "An overview of recommended workflows with Git"
msgstr "추천하는 깃 활용 작업 순서의 개요"
-#: builtin/help.c:427
+#: builtin/help.c:422
msgid "The common Git guides are:\n"
msgstr "자주 사용하는 깃 안내서는 다음과 같습니다:\n"
-#: builtin/help.c:448 builtin/help.c:465
-#, c-format
-msgid "usage: %s%s"
-msgstr "사용법: %s%s"
-
-#: builtin/help.c:481
+#: builtin/help.c:440
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "`git %s' 명령은 `%s' 명령의 단축입니다"
-#: builtin/index-pack.c:153
+#: builtin/help.c:462 builtin/help.c:479
+#, c-format
+msgid "usage: %s%s"
+msgstr "사용법: %s%s"
+
+#: builtin/index-pack.c:154
#, c-format
msgid "unable to open %s"
msgstr "%s을(를) 열 수 없습니다"
-#: builtin/index-pack.c:203
+#: builtin/index-pack.c:204
#, c-format
msgid "object type mismatch at %s"
msgstr "오브젝트 종류가 맞지 않습니다 (%s)"
-#: builtin/index-pack.c:223
+#: builtin/index-pack.c:224
#, c-format
msgid "did not receive expected object %s"
msgstr "예상한 %s 오브젝트를 받지 않았습니다"
-#: builtin/index-pack.c:226
+#: builtin/index-pack.c:227
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "%s 오브젝트: 예상한 종류 %s, 실제 %s"
-#: builtin/index-pack.c:268
+#: builtin/index-pack.c:269
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "%d 바이트를 채울 수 없습니다"
-#: builtin/index-pack.c:278
+#: builtin/index-pack.c:279
msgid "early EOF"
msgstr "너무 빨리 파일이 끝남"
-#: builtin/index-pack.c:279
+#: builtin/index-pack.c:280
msgid "read error on input"
msgstr "입력에 읽기 오류"
-#: builtin/index-pack.c:291
+#: builtin/index-pack.c:292
msgid "used more bytes than were available"
msgstr "있는 바이트보다 더 많이 사용합니다"
-#: builtin/index-pack.c:298
+#: builtin/index-pack.c:299
msgid "pack too large for current definition of off_t"
msgstr "현재 정의된 off_t에 비해 묶음이 너무 큽니다"
-#: builtin/index-pack.c:314
+#: builtin/index-pack.c:302 builtin/unpack-objects.c:92
+msgid "pack exceeds maximum allowed size"
+msgstr "묶음 크기가 최대 허용 크기를 넘었습니다"
+
+#: builtin/index-pack.c:317
#, c-format
msgid "unable to create '%s'"
msgstr "'%s'을(를) 만들 수 없습니다"
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:322
#, c-format
msgid "cannot open packfile '%s'"
msgstr "'%s' 묶음 파일을 열 수 없습니다"
-#: builtin/index-pack.c:333
+#: builtin/index-pack.c:336
msgid "pack signature mismatch"
msgstr "묶음 서명이 맞지 않습니다"
-#: builtin/index-pack.c:335
+#: builtin/index-pack.c:338
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "묶음의 %<PRIu32> 버전을 지원하지 않습니다"
-#: builtin/index-pack.c:353
+#: builtin/index-pack.c:356
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "묶음의 %<PRIuMAX> 오프셋에 잘못된 오브젝트가 있습니다: %s"
-#: builtin/index-pack.c:475
+#: builtin/index-pack.c:478
#, c-format
msgid "inflate returned %d"
msgstr "inflate가 %d번을 리턴했습니다"
-#: builtin/index-pack.c:524
+#: builtin/index-pack.c:527
msgid "offset value overflow for delta base object"
msgstr "델타 베이스 오브젝트에 대해 오프셋 값이 오버플로우"
-#: builtin/index-pack.c:532
+#: builtin/index-pack.c:535
msgid "delta base offset is out of bound"
msgstr "델타 베이스 오프셋이 범위를 벗어났습니다"
-#: builtin/index-pack.c:540
+#: builtin/index-pack.c:543
#, c-format
msgid "unknown object type %d"
msgstr "알 수 없는 오브젝트 종류 %d번"
-#: builtin/index-pack.c:571
+#: builtin/index-pack.c:574
msgid "cannot pread pack file"
msgstr "묶음 파일에 대해 pread를 할 수 없습니다"
-#: builtin/index-pack.c:573
+#: builtin/index-pack.c:576
#, 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:599
+#: builtin/index-pack.c:602
msgid "serious inflate inconsistency"
msgstr "심각한 inflate 부조화"
-#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774
-#: builtin/index-pack.c:808 builtin/index-pack.c:817
+#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
+#: builtin/index-pack.c:811 builtin/index-pack.c:820
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SHA1 충돌이 %s에서 발견되었습니다!"
-#: builtin/index-pack.c:748 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:256
+#: builtin/index-pack.c:751 builtin/pack-objects.c:166
+#: builtin/pack-objects.c:258
#, c-format
msgid "unable to read %s"
msgstr "%s을(를) 읽을 수 없습니다"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:817
#, c-format
msgid "cannot read existing object %s"
msgstr "기존 %s 오브젝트를 읽을 수 없습니다"
-#: builtin/index-pack.c:828
+#: builtin/index-pack.c:831
#, c-format
msgid "invalid blob object %s"
msgstr "잘못된 블롭 오브젝트 %s"
-#: builtin/index-pack.c:842
+#: builtin/index-pack.c:845
#, c-format
msgid "invalid %s"
msgstr "잘못된 %s"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:848
msgid "Error in object"
msgstr "오브젝트에 오류"
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:850
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "%s의 모든 하위 오브젝트에 접근할 수 없습니다"
-#: builtin/index-pack.c:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:922 builtin/index-pack.c:953
msgid "failed to apply delta"
msgstr "델타를 적용하는데 실패했습니다"
-#: builtin/index-pack.c:1120
+#: builtin/index-pack.c:1123
msgid "Receiving objects"
msgstr "오브젝트를 받는 중"
-#: builtin/index-pack.c:1120
+#: builtin/index-pack.c:1123
msgid "Indexing objects"
msgstr "오브젝트 인덱스를 만드는 중"
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1155
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "묶음이 손상되었습니다 (SHA1 일치하지 않음)"
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
msgid "cannot fstat packfile"
msgstr "묶음 파일에 대해 fstat()할 수 없습니다"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1163
msgid "pack has junk at the end"
msgstr "묶음의 끝에 쓰레기 데이터가 있습니다"
-#: builtin/index-pack.c:1171
+#: builtin/index-pack.c:1174
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "parse_pack_objects()에서 극심한 혼란"
-#: builtin/index-pack.c:1196
+#: builtin/index-pack.c:1197
msgid "Resolving deltas"
msgstr "델타를 알아내는 중"
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
#, c-format
msgid "unable to create thread: %s"
msgstr "스레드를 만들 수 없습니다: %s"
-#: builtin/index-pack.c:1249
+#: builtin/index-pack.c:1250
msgid "confusion beyond insanity"
msgstr "극심한 혼란"
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1256
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "로컬 오브젝트 %d개 마침"
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1268
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "%s에 대해 예상치 못한 테일 체크섬 (디스크 손상?)"
-#: builtin/index-pack.c:1271
+#: builtin/index-pack.c:1272
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "묶음에 알아내지 못한 델타 %d개가 있습니다"
-#: builtin/index-pack.c:1295
+#: builtin/index-pack.c:1296
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "추가한 오브젝트를 deflate할 수 없습니다 (%d)"
-#: builtin/index-pack.c:1371
+#: builtin/index-pack.c:1372
#, c-format
msgid "local object %s is corrupt"
msgstr "%s 로컬 오브젝트가 손상되었습니다"
-#: builtin/index-pack.c:1395
+#: builtin/index-pack.c:1396
msgid "error while closing pack file"
msgstr "묶음 파일을 닫는데 오류"
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
#, c-format
msgid "cannot write keep file '%s'"
msgstr "'%s' 보존 파일을 쓸 수 없습니다"
-#: builtin/index-pack.c:1416
+#: builtin/index-pack.c:1417
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "쓴 '%s' 보존 파일을 닫지 못했습니다"
-#: builtin/index-pack.c:1429
+#: builtin/index-pack.c:1430
msgid "cannot store pack file"
msgstr "묶음 파일을 저장할 수 없습니다"
-#: builtin/index-pack.c:1440
+#: builtin/index-pack.c:1441
msgid "cannot store index file"
msgstr "인덱스 파일을 저장할 수 없습니다"
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1474
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "잘못된 pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1483 builtin/index-pack.c:1681
+#: builtin/index-pack.c:1484 builtin/index-pack.c:1681
#, c-format
msgid "no threads support, ignoring %s"
msgstr "스레드 기능이 없습니다. %s 무시"
msgid "bad %s"
msgstr "잘못된 %s"
-#: builtin/index-pack.c:1730
+#: builtin/index-pack.c:1732
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin 옵션은 --stdin 옵션과 같이 쓸 수 없습니다"
-#: builtin/index-pack.c:1738
+#: builtin/index-pack.c:1740
msgid "--verify with no packfile name given"
msgstr "--verify 옵션에 묶음파일 이름을 지정하지 않았습니다"
-#: builtin/init-db.c:55
+#: builtin/init-db.c:54
#, c-format
msgid "cannot stat '%s'"
msgstr "'%s'을(를) stat()할 수 없습니다"
-#: builtin/init-db.c:61
+#: builtin/init-db.c:60
#, c-format
msgid "cannot stat template '%s'"
msgstr "'%s' 서식을 stat()할 수 없습니다"
-#: builtin/init-db.c:66
+#: builtin/init-db.c:65
#, c-format
msgid "cannot opendir '%s'"
msgstr "'%s'을(를) opendir()할 수 없습니다"
-#: builtin/init-db.c:77
+#: builtin/init-db.c:76
#, c-format
msgid "cannot readlink '%s'"
msgstr "'%s'을(를) readlink()할 수 없습니다"
-#: builtin/init-db.c:79
+#: builtin/init-db.c:78
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "'%s'을(를) '%s'에 symlink()할 수 없습니다"
-#: builtin/init-db.c:85
+#: builtin/init-db.c:84
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "'%s'을(를) '%s'에 복사할 수 없습니다"
-#: builtin/init-db.c:89
+#: builtin/init-db.c:88
#, c-format
msgid "ignoring template %s"
msgstr "%s 서식을 무시합니다"
-#: builtin/init-db.c:120
+#: builtin/init-db.c:119
#, c-format
msgid "templates not found %s"
msgstr "%s에 서식이 없습니다"
-#: builtin/init-db.c:135
+#: builtin/init-db.c:134
#, c-format
msgid "not copying templates from '%s': %s"
msgstr "'%s'에서 서식을 복사하지 않습니다: %s"
-#: builtin/init-db.c:312 builtin/init-db.c:315
-#, c-format
-msgid "%s already exists"
-msgstr "%s 파일이 이미 있습니다"
-
-#: builtin/init-db.c:344
+#: builtin/init-db.c:327
#, c-format
msgid "unable to handle file type %d"
msgstr "파일 종류 %d번을 처리할 수 없습니다"
-#: builtin/init-db.c:347
+#: builtin/init-db.c:330
#, c-format
msgid "unable to move %s to %s"
msgstr "%s을(를) %s(으)로 옮길 수 없습니다"
-#: builtin/init-db.c:402
+#: builtin/init-db.c:347 builtin/init-db.c:350
+#, c-format
+msgid "%s already exists"
+msgstr "%s 파일이 이미 있습니다"
+
+#: builtin/init-db.c:403
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr "%s%s 안의 기존 공유 깃 저장소를 다시 초기화했습니다\n"
-#: builtin/init-db.c:403
+#: builtin/init-db.c:404
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "%s%s 안의 기존 깃 저장소를 다시 초기화했습니다\n"
-#: builtin/init-db.c:407
+#: builtin/init-db.c:408
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr "%s%s 안의 빈 공유 깃 저장소를 다시 초기화했습니다\n"
-#: builtin/init-db.c:408
+#: builtin/init-db.c:409
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "%s%s 안의 빈 깃 저장소를 다시 초기화했습니다\n"
-#: builtin/init-db.c:455
+#: builtin/init-db.c:457
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
"git init [-q | --quiet] [--bare] [--template=<서식-디렉터리>] [--shared[=<권"
"한>]] [<디렉터리>]"
-#: builtin/init-db.c:478
+#: builtin/init-db.c:480
msgid "permissions"
msgstr "권한"
-#: builtin/init-db.c:479
+#: builtin/init-db.c:481
msgid "specify that the git repository is to be shared amongst several users"
msgstr "깃 저장소를 다른 사용자가 공유할 수 있게 지정"
-#: builtin/init-db.c:513 builtin/init-db.c:518
+#: builtin/init-db.c:515 builtin/init-db.c:520
#, c-format
msgid "cannot mkdir %s"
msgstr "%s에 대해 mkdir를 할 수 없습니다"
-#: builtin/init-db.c:522
+#: builtin/init-db.c:524
#, c-format
msgid "cannot chdir to %s"
msgstr "%s에 대해 chdir를 할 수 없습니다"
-#: builtin/init-db.c:543
+#: builtin/init-db.c:545
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"%s (또는 --work-tree=<디렉터리>) 허용되지 않음. %s (또는 --git-"
"dir=<directory>) 지정이 없으면"
-#: builtin/init-db.c:571
+#: builtin/init-db.c:573
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "작업 폴더 '%s'에 접근할 수 없습니다"
msgid "Cover letter needs email format"
msgstr "커버레터는 전자메일 형식이어야 합니다"
-#: builtin/log.c:1064
+#: builtin/log.c:1063
#, c-format
msgid "insane in-reply-to: %s"
msgstr "정신나간 in-reply-to 헤더: %s"
-#: builtin/log.c:1092
+#: builtin/log.c:1091
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<옵션>] [<시작시각> | <리비전-범위>]"
-#: builtin/log.c:1137
+#: builtin/log.c:1141
msgid "Two output directories?"
msgstr "출력 디렉터리가 두개?"
-#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897
+#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
#, c-format
msgid "Unknown commit %s"
msgstr "알 수 없는 커밋 %s"
-#: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305
-#: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425
-#: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594
-#: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455
+#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "'%s'을(를) 올바른 레퍼런스로 알아내는데 실패했습니다."
-#: builtin/log.c:1259
+#: builtin/log.c:1263
msgid "Could not find exact merge base."
msgstr "정확한 병합 기준점을 찾을 수 없습니다."
-#: builtin/log.c:1263
+#: builtin/log.c:1267
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"
"아니면 직접 '--base=<기준점-커밋-ID>' 옵션으로 기준점 커밋을 지정할\n"
"수도 있습니다."
-#: builtin/log.c:1283
+#: builtin/log.c:1287
msgid "Failed to find exact merge base"
msgstr "정확한 병합 기준점을 찾는데 실패했습니다"
-#: builtin/log.c:1294
+#: builtin/log.c:1298
msgid "base commit should be the ancestor of revision list"
msgstr "기준점 커밋은 리비전 목록의 상위 커밋이어야 합니다"
-#: builtin/log.c:1298
+#: builtin/log.c:1302
msgid "base commit shouldn't be in revision list"
msgstr "기준점 커밋은 리비전 목록에 들어 있으면 안 됩니다"
-#: builtin/log.c:1347
+#: builtin/log.c:1351
msgid "cannot get patch id"
msgstr "패치 ID를 알아낼 수 없습니다"
-#: builtin/log.c:1404
+#: builtin/log.c:1408
msgid "use [PATCH n/m] even with a single patch"
msgstr "하나의 패치에 대해서도 [PATCh n/m]을 붙입니다"
-#: builtin/log.c:1407
+#: builtin/log.c:1411
msgid "use [PATCH] even with multiple patches"
msgstr "여러 개 패치에 대해서도 [PATCH]를 붙입니다"
-#: builtin/log.c:1411
+#: builtin/log.c:1415
msgid "print patches to standard out"
msgstr "패치를 표준 출력으로 표시합니다"
-#: builtin/log.c:1413
+#: builtin/log.c:1417
msgid "generate a cover letter"
msgstr "커버레터를 만듭니다"
-#: builtin/log.c:1415
+#: builtin/log.c:1419
msgid "use simple number sequence for output file names"
msgstr "출력 파일 이름에 간단한 일련 번호를 사용합니다"
-#: builtin/log.c:1416
+#: builtin/log.c:1420
msgid "sfx"
msgstr "확장자"
-#: builtin/log.c:1417
+#: builtin/log.c:1421
msgid "use <sfx> instead of '.patch'"
msgstr "'.patch' 대신 <확장자>를 사용합니다"
-#: builtin/log.c:1419
+#: builtin/log.c:1423
msgid "start numbering patches at <n> instead of 1"
msgstr "패치 번호를 1 대신 <n>에서 시작합니다"
-#: builtin/log.c:1421
+#: builtin/log.c:1425
msgid "mark the series as Nth re-roll"
msgstr "시리즈를 N번째 re-roll로 표시합니다"
-#: builtin/log.c:1423
+#: builtin/log.c:1427
+msgid "Use [RFC PATCH] instead of [PATCH]"
+msgstr "[PATCH] 대신 [RFC PATCH]를 사용합니다"
+
+#: builtin/log.c:1430
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "[PATCH] 대신 [<접두어>]를 사용합니다"
-#: builtin/log.c:1426
+#: builtin/log.c:1433
msgid "store resulting files in <dir>"
msgstr "결과 파일을 <디렉터리>에 저장합니다"
-#: builtin/log.c:1429
+#: builtin/log.c:1436
msgid "don't strip/add [PATCH]"
msgstr "[PATCH]를 자르거나 추가하지 않습니다"
-#: builtin/log.c:1432
+#: builtin/log.c:1439
msgid "don't output binary diffs"
msgstr "바이너리 diff를 만들지 않습니다"
-#: builtin/log.c:1434
+#: builtin/log.c:1441
msgid "output all-zero hash in From header"
msgstr "From 헤더에서 모두 0인 해시를 출력합니다"
-#: builtin/log.c:1436
+#: builtin/log.c:1443
msgid "don't include a patch matching a commit upstream"
msgstr "업스트림에 있는 패치를 포함하지 않습니다"
-#: builtin/log.c:1438
+#: builtin/log.c:1445
msgid "show patch format instead of default (patch + stat)"
msgstr "기본값 (패치 + 통계) 대신 패치 형식을 표시합니다"
-#: builtin/log.c:1440
+#: builtin/log.c:1447
msgid "Messaging"
msgstr "메시징"
-#: builtin/log.c:1441
+#: builtin/log.c:1448
msgid "header"
msgstr "헤더"
-#: builtin/log.c:1442
+#: builtin/log.c:1449
msgid "add email header"
msgstr "전자메일 헤더"
-#: builtin/log.c:1443 builtin/log.c:1445
+#: builtin/log.c:1450 builtin/log.c:1452
msgid "email"
msgstr "전자메일"
-#: builtin/log.c:1443
+#: builtin/log.c:1450
msgid "add To: header"
msgstr "To: 헤더를 추가합니다"
-#: builtin/log.c:1445
+#: builtin/log.c:1452
msgid "add Cc: header"
msgstr "Cc: 헤더를 추가합니다"
-#: builtin/log.c:1447
+#: builtin/log.c:1454
msgid "ident"
msgstr "신원"
-#: builtin/log.c:1448
+#: builtin/log.c:1455
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "<신원>에서 From 주소를 설정합니다 (없으면 커미터 주소 신원 사용)"
-#: builtin/log.c:1450
+#: builtin/log.c:1457
msgid "message-id"
msgstr "메시지-ID"
-#: builtin/log.c:1451
+#: builtin/log.c:1458
msgid "make first mail a reply to <message-id>"
msgstr "첫 메일을 <메시지-ID>에 대한 답장 메일로 만듭니다"
-#: builtin/log.c:1452 builtin/log.c:1455
+#: builtin/log.c:1459 builtin/log.c:1462
msgid "boundary"
msgstr "경계"
-#: builtin/log.c:1453
+#: builtin/log.c:1460
msgid "attach the patch"
msgstr "패치를 첨부합니다"
-#: builtin/log.c:1456
+#: builtin/log.c:1463
msgid "inline the patch"
msgstr "패치를 본문에 포함합니다"
-#: builtin/log.c:1460
+#: builtin/log.c:1467
msgid "enable message threading, styles: shallow, deep"
msgstr "메시지에 스레드를 사용, 스타일: shallow, deep"
-#: builtin/log.c:1462
+#: builtin/log.c:1469
msgid "signature"
msgstr "서명"
-#: builtin/log.c:1463
+#: builtin/log.c:1470
msgid "add a signature"
msgstr "서명을 추가합니다"
-#: builtin/log.c:1464
+#: builtin/log.c:1471
msgid "base-commit"
msgstr "베이스-커밋"
-#: builtin/log.c:1465
+#: builtin/log.c:1472
msgid "add prerequisite tree info to the patch series"
msgstr "전제조건 트리 정보를 패치 시리즈에 추가합니다"
-#: builtin/log.c:1467
+#: builtin/log.c:1474
msgid "add a signature from a file"
msgstr "파일에서 서명을 추가합니다"
-#: builtin/log.c:1468
+#: builtin/log.c:1475
msgid "don't print the patch filenames"
msgstr "패치 파일 이름을 표시하지 않습니다"
-#: builtin/log.c:1558
+#: builtin/log.c:1565
msgid "-n and -k are mutually exclusive."
msgstr "-n 및 -k 옵션은 하나만 써야 합니다."
-#: builtin/log.c:1560
-msgid "--subject-prefix and -k are mutually exclusive."
-msgstr "--subject-prefix 및 -k 옵션은 하나만 써야 합니다."
+#: builtin/log.c:1567
+msgid "--subject-prefix/--rfc and -k are mutually exclusive."
+msgstr "--subject-prefix/--rfc 및 -k 옵션은 하나만 써야 합니다."
-#: builtin/log.c:1568
+#: builtin/log.c:1575
msgid "--name-only does not make sense"
msgstr "--name-only 옵션은 앞뒤가 맞지 않습니다"
-#: builtin/log.c:1570
+#: builtin/log.c:1577
msgid "--name-status does not make sense"
msgstr "--name-status 옵션은 앞뒤가 맞지 않습니다"
-#: builtin/log.c:1572
+#: builtin/log.c:1579
msgid "--check does not make sense"
msgstr "--check 옵션은 앞뒤가 맞지 않습니다"
-#: builtin/log.c:1602
+#: builtin/log.c:1609
msgid "standard output, or directory, which one?"
msgstr "표준 출력이나 디렉터리 중에 하나만 지정해야 합니다."
-#: builtin/log.c:1604
+#: builtin/log.c:1611
#, c-format
msgid "Could not create directory '%s'"
msgstr "'%s' 디렉터리를 만들 수 없습니다"
-#: builtin/log.c:1698
+#: builtin/log.c:1705
#, c-format
msgid "unable to read signature file '%s'"
msgstr "'%s' 서명 파일을 읽을 수 없습니다"
-#: builtin/log.c:1769
+#: builtin/log.c:1777
msgid "Failed to create output files"
msgstr "출력 파일을 만드는데 실패했습니다"
-#: builtin/log.c:1818
+#: builtin/log.c:1826
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<업스트림> [<헤드> [<한계값>]]]"
-#: builtin/log.c:1872
+#: builtin/log.c:1880
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
"추적되는 리모트 브랜치를 찾을 수 없습니다. <업스트림>을 수동으로 지정하십시"
"오.\n"
-#: builtin/ls-files.c:379
+#: builtin/ls-files.c:458
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<옵션>] [<파일>...]"
-#: builtin/ls-files.c:428
+#: builtin/ls-files.c:507
msgid "identify the file status with tags"
msgstr "파일 상태를 태그와 같이 표시합니다"
-#: builtin/ls-files.c:430
+#: builtin/ls-files.c:509
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "'변경되지 않았다고 가정' 파일에 소문자를 사용합니다"
-#: builtin/ls-files.c:432
+#: builtin/ls-files.c:511
msgid "show cached files in the output (default)"
msgstr "출력에 캐시된 파일을 표시합니다 (기본값)"
-#: builtin/ls-files.c:434
+#: builtin/ls-files.c:513
msgid "show deleted files in the output"
msgstr "출력에 삭제된 파일을 표시합니다"
-#: builtin/ls-files.c:436
+#: builtin/ls-files.c:515
msgid "show modified files in the output"
msgstr "출력에 수정된 파일을 표시합니다"
-#: builtin/ls-files.c:438
+#: builtin/ls-files.c:517
msgid "show other files in the output"
msgstr "출력에 기타 파일을 표시합니다"
-#: builtin/ls-files.c:440
+#: builtin/ls-files.c:519
msgid "show ignored files in the output"
msgstr "출력에 무시된 파일을 표시합니다"
-#: builtin/ls-files.c:443
+#: builtin/ls-files.c:522
msgid "show staged contents' object name in the output"
msgstr "출력에 커밋 표시된 내용의 오브젝트 이름을 표시합니다"
-#: builtin/ls-files.c:445
+#: builtin/ls-files.c:524
msgid "show files on the filesystem that need to be removed"
msgstr "파일 시스템에서 제거해야 하는 파일을 표시합니다"
-#: builtin/ls-files.c:447
+#: builtin/ls-files.c:526
msgid "show 'other' directories' names only"
msgstr "기타 디렉터리의 이름만 표시합니다"
-#: builtin/ls-files.c:449
+#: builtin/ls-files.c:528
msgid "show line endings of files"
msgstr "파일의 줄 끝을 표시합니다"
-#: builtin/ls-files.c:451
+#: builtin/ls-files.c:530
msgid "don't show empty directories"
msgstr "빈 디렉터리 표시하지 않기"
-#: builtin/ls-files.c:454
+#: builtin/ls-files.c:533
msgid "show unmerged files in the output"
msgstr "출력에 병합하지 않은 파일을 표시합니다"
-#: builtin/ls-files.c:456
+#: builtin/ls-files.c:535
msgid "show resolve-undo information"
msgstr "resolve-undo 정보를 표시합니다"
-#: builtin/ls-files.c:458
+#: builtin/ls-files.c:537
msgid "skip files matching pattern"
msgstr "패턴에 일치하는 파일을 건너뜁니다"
-#: builtin/ls-files.c:461
+#: builtin/ls-files.c:540
msgid "exclude patterns are read from <file>"
msgstr "제외할 패턴을 <파일>에서 읽습니다"
-#: builtin/ls-files.c:464
+#: builtin/ls-files.c:543
msgid "read additional per-directory exclude patterns in <file>"
msgstr "<파일>에서 추가적인 디렉터리별 제외 패턴을 읽습니다"
-#: builtin/ls-files.c:466
+#: builtin/ls-files.c:545
msgid "add the standard git exclusions"
msgstr "표준 깃 제외 패턴을 추가합니다"
-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:548
msgid "make the output relative to the project top directory"
msgstr "최상위 디렉터리 상대 경로로 출력합니다"
-#: builtin/ls-files.c:472
+#: builtin/ls-files.c:551
+msgid "recurse through submodules"
+msgstr "하위 모듈에 재귀적으로 적용"
+
+#: builtin/ls-files.c:553
msgid "if any <file> is not in the index, treat this as an error"
msgstr "<파일>이 인덱스 안에 없으면 오류로 취급합니다"
-#: builtin/ls-files.c:473
+#: builtin/ls-files.c:554
msgid "tree-ish"
msgstr "트리-따위"
-#: builtin/ls-files.c:474
+#: builtin/ls-files.c:555
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "<트리-따위> 뒤로 제거한 경로가 있다고 가정합니다"
-#: builtin/ls-files.c:476
+#: builtin/ls-files.c:557
msgid "show debugging data"
msgstr "디버깅 데이터를 표시합니다"
msgid "Available custom strategies are:"
msgstr "사용 가능한 사용자 설정 전략은:"
-#: builtin/merge.c:195 builtin/pull.c:126
+#: builtin/merge.c:195 builtin/pull.c:127
msgid "do not show a diffstat at the end of the merge"
msgstr "병합이 끝날 때 diffstat을 표시하지 않습니다"
-#: builtin/merge.c:198 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:130
msgid "show a diffstat at the end of the merge"
msgstr "병합이 끝날 때 diffstat을 표시합니다"
-#: builtin/merge.c:199 builtin/pull.c:132
+#: builtin/merge.c:199 builtin/pull.c:133
msgid "(synonym to --stat)"
msgstr "(--stat 옵션과 동일)"
-#: builtin/merge.c:201 builtin/pull.c:135
+#: builtin/merge.c:201 builtin/pull.c:136
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "병합 커밋의 메시지에 shortlog 항목을 (최대 <n>개) 추가합니다"
-#: builtin/merge.c:204 builtin/pull.c:138
+#: builtin/merge.c:204 builtin/pull.c:139
msgid "create a single commit instead of doing a merge"
msgstr "병합하는 대신 하나의 커밋을 만듭니다"
-#: builtin/merge.c:206 builtin/pull.c:141
+#: builtin/merge.c:206 builtin/pull.c:142
msgid "perform a commit if the merge succeeds (default)"
msgstr "병합이 성공하면 커밋을 합니다 (기본값)"
-#: builtin/merge.c:208 builtin/pull.c:144
+#: builtin/merge.c:208 builtin/pull.c:145
msgid "edit message before committing"
msgstr "커밋 전에 메시지를 편집합니다"
msgid "allow fast-forward (default)"
msgstr "정방향 진행을 허용합니다 (기본값)"
-#: builtin/merge.c:211 builtin/pull.c:150
+#: builtin/merge.c:211 builtin/pull.c:151
msgid "abort if fast-forward is not possible"
msgstr "정방향 진행이 불가능하면 중지합니다"
-#: builtin/merge.c:215 builtin/pull.c:153
+#: builtin/merge.c:215 builtin/pull.c:154
msgid "verify that the named commit has a valid GPG signature"
msgstr "지정한 커밋에 올바른 GPG 서명이 있는지 검증합니다"
-#: builtin/merge.c:216 builtin/notes.c:772 builtin/pull.c:157
+#: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158
#: builtin/revert.c:89
msgid "strategy"
msgstr "전략"
-#: builtin/merge.c:217 builtin/pull.c:158
+#: builtin/merge.c:217 builtin/pull.c:159
msgid "merge strategy to use"
msgstr "사용할 병합 전략"
-#: builtin/merge.c:218 builtin/pull.c:161
+#: builtin/merge.c:218 builtin/pull.c:162
msgid "option=value"
msgstr "옵션=값"
-#: builtin/merge.c:219 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:163
msgid "option for selected merge strategy"
msgstr "선택한 병합 전략에 대한 옵션"
msgid "abort the current in-progress merge"
msgstr "현재 진행 중인 병합을 중지합니다"
-#: builtin/merge.c:227 builtin/pull.c:169
+#: builtin/merge.c:227 builtin/pull.c:170
msgid "allow merging unrelated histories"
msgstr "관계 없는 커밋 내역의 병합을 허용합니다"
msgid "Already up-to-date."
msgstr "이미 업데이트 상태입니다."
-#: builtin/merge.c:1382
+#: builtin/merge.c:1377
#, c-format
msgid "Updating %s..%s\n"
msgstr "업데이트 중 %s..%s\n"
-#: builtin/merge.c:1419
+#: builtin/merge.c:1418
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "아주 간단한 인덱스 내부 병합을 시도합니다...\n"
-#: builtin/merge.c:1426
+#: builtin/merge.c:1425
#, c-format
msgid "Nope.\n"
msgstr "아님.\n"
-#: builtin/merge.c:1451
+#: builtin/merge.c:1450
msgid "Already up-to-date. Yeeah!"
msgstr "이미 업데이트 상태입니다. 야호!"
-#: builtin/merge.c:1457
+#: builtin/merge.c:1456
msgid "Not possible to fast-forward, aborting."
msgstr "정방향이 불가능하므로, 중지합니다."
-#: builtin/merge.c:1480 builtin/merge.c:1559
+#: builtin/merge.c:1479 builtin/merge.c:1558
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "트리를 본래 위치로 되돌립니다...\n"
-#: builtin/merge.c:1484
+#: builtin/merge.c:1483
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "병합 전략 %s 시도...\n"
-#: builtin/merge.c:1550
+#: builtin/merge.c:1549
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "병합을 처리한 전략이 없습니다.\n"
-#: builtin/merge.c:1552
+#: builtin/merge.c:1551
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "전략 %s(으)로 병합이 실패했습니다.\n"
-#: builtin/merge.c:1561
+#: builtin/merge.c:1560
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "수동 해결의 준비를 위해 %s 전략을 사용합니다.\n"
-#: builtin/merge.c:1573
+#: builtin/merge.c:1572
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "자동 병합이 잘 진행되었습니다. 요청한대로 커밋 전에 중지합니다\n"
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <레퍼런스> [<커밋>]"
-#: builtin/merge-base.c:214
+#: builtin/merge-base.c:217
msgid "output all common ancestors"
msgstr "모든 과거 공통 커밋을 출력합니다"
-#: builtin/merge-base.c:216
+#: builtin/merge-base.c:219
msgid "find ancestors for a single n-way merge"
msgstr "하나의 n-방향 병합에 대한 과거 커밋을 찾습니다"
-#: builtin/merge-base.c:218
+#: builtin/merge-base.c:221
msgid "list revs not reachable from others"
msgstr "다른 곳에서 접근 불가능한 리비전 목록을 출력합니다"
-#: builtin/merge-base.c:220
+#: builtin/merge-base.c:223
msgid "is the first one ancestor of the other?"
msgstr "첫번째가 다른 것의 과거 커밋인지 여부?"
-#: builtin/merge-base.c:222
+#: builtin/merge-base.c:225
msgid "find where <commit> forked from reflog of <ref>"
msgstr "<레퍼런스>의 reflog에서 <커밋>이 분리된 위치를 찾습니다"
msgid "set labels for file1/orig-file/file2"
msgstr "<파일1>/<본래-파일>/<파일2>에 대한 레이블을 설정합니다"
+#: builtin/merge-recursive.c:45
+#, c-format
+msgid "unknown option %s"
+msgstr "알 수 없는 옵션: %s"
+
+#: builtin/merge-recursive.c:51
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "'%s' 오브젝트를 파싱할 수 없습니다"
+
+#: builtin/merge-recursive.c:55
+#, 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:63
+msgid "not handling anything other than two heads merge."
+msgstr "두 개의 헤드 병합 외에는 처리하지 않습니다."
+
+#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "'%s' 레퍼런스를 알아낼 수 없습니다"
+
+#: builtin/merge-recursive.c:77
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "%s 병합, %s 항목과\n"
+
#: builtin/mktree.c:65
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
msgid "renaming '%s' failed"
msgstr "'%s'의 이름 바꾸기가 실패했습니다"
-#: builtin/name-rev.c:258
+#: builtin/name-rev.c:257
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<옵션>] <커밋>..."
-#: builtin/name-rev.c:259
+#: builtin/name-rev.c:258
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<옵션>] --all"
-#: builtin/name-rev.c:260
+#: builtin/name-rev.c:259
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<옵션>] --stdin"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:311
msgid "print only names (no SHA-1)"
msgstr "이름만 표시 (SHA-1 없이)"
-#: builtin/name-rev.c:313
+#: builtin/name-rev.c:312
msgid "only use tags to name the commits"
msgstr "커밋을 지정할 때 태그만 사용합니다"
-#: builtin/name-rev.c:315
+#: builtin/name-rev.c:314
msgid "only use refs matching <pattern>"
msgstr "<패턴>과 일치하는 레퍼런스만 사용합니다"
-#: builtin/name-rev.c:317
+#: builtin/name-rev.c:316
msgid "list all commits reachable from all refs"
msgstr "모든 레퍼런스에서 접근 가능한 모든 커밋 목록을 표시합니다"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:317
msgid "read from stdin"
msgstr "표준입력에서 읽습니다"
-#: builtin/name-rev.c:319
+#: builtin/name-rev.c:318
msgid "allow to print `undefined` names (default)"
msgstr "`정의되지 않은' 이름 표시를 허용합니다 (기본값)"
-#: builtin/name-rev.c:325
+#: builtin/name-rev.c:324
msgid "dereference tags in the input (internal use)"
msgstr "입력의 태그 레퍼런스를 따라갑니다 (내부 사용)"
msgstr "오브젝트 '%s'에 대해 'show'를 마치는데 실패했습니다"
#: builtin/notes.c:194
-msgid "Please supply the note contents using either -m or -F option"
+msgid "please supply the note contents using either -m or -F option"
msgstr "노트 내용을 -m 또는 -F 옵션으로 입력하십시오"
#: builtin/notes.c:203
#: builtin/notes.c:205
#, c-format
-msgid "The note contents have been left in %s"
+msgid "the note contents have been left in %s"
msgstr "노트 내용은 %s에 남습니다"
#: builtin/notes.c:233 builtin/tag.c:439
msgid "could not open or read '%s'"
msgstr "'%s'을(를) 열거나 읽을 수 없습니다"
+#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307
+#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513
+#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659
+#, c-format
+msgid "failed to resolve '%s' as a valid ref."
+msgstr "'%s'을(를) 올바른 레퍼런스로 알아내는데 실패했습니다."
+
#: builtin/notes.c:257
#, c-format
-msgid "Failed to read object '%s'."
+msgid "failed to read object '%s'."
msgstr "'%s' 오브젝트 읽기에 실패했습니다."
#: builtin/notes.c:261
#, c-format
-msgid "Cannot read note data from non-blob object '%s'."
+msgid "cannot read note data from non-blob object '%s'."
msgstr "블롭이 아닌 '%s' 오브젝트에 대해 노트 데이터를 읽을 수 없습니다."
-#: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494
-#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650
-#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968
+#: builtin/notes.c:301
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr "잘못된 형식의 입력 줄: '%s'."
+
+#: builtin/notes.c:316
+#, 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:345
+#, c-format
+msgid "refusing to %s notes in %s (outside of refs/notes/)"
+msgstr "%s에서 노트를 %s 하기를 거부합니다 (refs/notes/ 밖임)"
+
+#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496
+#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652
+#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970
msgid "too many parameters"
msgstr "파라미터가 너무 많습니다"
-#: builtin/notes.c:376 builtin/notes.c:663
+#: builtin/notes.c:378 builtin/notes.c:665
#, c-format
-msgid "No note found for object %s."
+msgid "no note found for object %s."
msgstr "%s 오브젝트에 대해 노트가 없습니다."
-#: builtin/notes.c:397 builtin/notes.c:560
+#: builtin/notes.c:399 builtin/notes.c:562
msgid "note contents as a string"
msgstr "문자열로 노트 내용"
-#: builtin/notes.c:400 builtin/notes.c:563
+#: builtin/notes.c:402 builtin/notes.c:565
msgid "note contents in a file"
msgstr "파일 안에 노트 내용"
-#: builtin/notes.c:403 builtin/notes.c:566
+#: builtin/notes.c:405 builtin/notes.c:568
msgid "reuse and edit specified note object"
msgstr "지정한 노트 오브젝트를 재사용하고 편집합니다"
-#: builtin/notes.c:406 builtin/notes.c:569
+#: builtin/notes.c:408 builtin/notes.c:571
msgid "reuse specified note object"
msgstr "지정한 노트 오브젝트를 재사용합니다"
-#: builtin/notes.c:409 builtin/notes.c:572
+#: builtin/notes.c:411 builtin/notes.c:574
msgid "allow storing empty note"
msgstr "빈 노트 저장을 허용합니다"
-#: builtin/notes.c:410 builtin/notes.c:481
+#: builtin/notes.c:412 builtin/notes.c:483
msgid "replace existing notes"
msgstr "기존 노트를 바꿉니다"
-#: builtin/notes.c:435
+#: builtin/notes.c:437
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"노트를 추가할 수 없습니다. %s 오브젝트에 대한 기존 노트가 있습니다. 기존 노트"
"를 덮어쓰려면 '-f' 옵션을 사용하십시오"
-#: builtin/notes.c:450 builtin/notes.c:529
+#: builtin/notes.c:452 builtin/notes.c:531
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "%s 오브젝트에 대한 기존 노트를 덮어씁니다\n"
-#: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887
+#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889
#, c-format
msgid "Removing note for object %s\n"
msgstr "%s 오브젝트에 대한 노트를 제거합니다\n"
-#: builtin/notes.c:482
+#: builtin/notes.c:484
msgid "read objects from stdin"
msgstr "표준 입력에서 오브젝트를 읽습니다"
-#: builtin/notes.c:484
+#: builtin/notes.c:486
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "<명령>에 대한 다시쓰기 설정을 읽어들입니다 (--stdin 옵션 포함)"
-#: builtin/notes.c:502
+#: builtin/notes.c:504
msgid "too few parameters"
msgstr "파라미터가 너무 적습니다"
-#: builtin/notes.c:523
+#: builtin/notes.c:525
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"노트를 복사할 수 없습니다. %s 오브젝트에 대한 기존 노트가 있습니다. 기존 노트"
"를 덮어쓰려면 '-f' 옵션을 사용하십시오"
-#: builtin/notes.c:535
+#: builtin/notes.c:537
#, c-format
-msgid "Missing notes on source object %s. Cannot copy."
+msgid "missing notes on source object %s. Cannot copy."
msgstr "원본 %s 오브젝트에 대한 노트가 없습니다. 복사할 수 없습니다."
-#: builtin/notes.c:587
+#: builtin/notes.c:589
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"-m/-F/-c/-C 옵션은 'edit' 하위 명령에 대해 사용을 권하지 않습니다.\n"
"대신에 'git notes add -f -m/-F/-c/-C' 명령을 사용하십시오.\n"
-#: builtin/notes.c:753
+#: builtin/notes.c:685
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr "NOTES_MERGE_PARTIAL 레퍼런스 삭제에 실패했습니다"
+
+#: builtin/notes.c:687
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr "NOTES_MERGE_REF 레퍼런스 삭제에 실패했습니다"
+
+#: builtin/notes.c:689
+msgid "failed to remove 'git notes merge' worktree"
+msgstr "'git notes merge' 작업트리 제거에 실패했습니다"
+
+#: builtin/notes.c:709
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr "NOTES_MERGE_PARTIAL 레퍼런스 읽기에 실패했습니다"
+
+#: builtin/notes.c:711
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr "NOTES_MERGE_PARTIAL에서 커밋을 찾을 수 없습니다."
+
+#: builtin/notes.c:713
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr "NOTES_MERGE_PARTIAL에서 커밋을 파싱할 수 없습니다."
+
+#: builtin/notes.c:726
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr "NOTES_MERGE_REF 알아내기에 실패했습니다"
+
+#: builtin/notes.c:729
+msgid "failed to finalize notes merge"
+msgstr "노트 병합을 마치는데 실패했습니다"
+
+#: builtin/notes.c:755
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "알 수 없는 노트 병합 전략 %s"
-#: builtin/notes.c:769
+#: builtin/notes.c:771
msgid "General options"
msgstr "일반 옵션"
-#: builtin/notes.c:771
+#: builtin/notes.c:773
msgid "Merge options"
msgstr "병합 옵션"
-#: builtin/notes.c:773
+#: builtin/notes.c:775
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
"주어진 전략을 사용해 노트 충돌을 해결합니다 (manual/ours/theirs/union/"
"cat_sort_uniq)"
-#: builtin/notes.c:775
+#: builtin/notes.c:777
msgid "Committing unmerged notes"
msgstr "병합하지 않은 노트 커밋"
-#: builtin/notes.c:777
+#: builtin/notes.c:779
msgid "finalize notes merge by committing unmerged notes"
msgstr "병합하지 않은 노트를 커밋해 노트 병합을 마칩니다"
-#: builtin/notes.c:779
+#: builtin/notes.c:781
msgid "Aborting notes merge resolution"
msgstr "노트 병합 해결 중지"
-#: builtin/notes.c:781
+#: builtin/notes.c:783
msgid "abort notes merge"
msgstr "노트 병합을 중지합니다"
-#: builtin/notes.c:792
+#: builtin/notes.c:794
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "--commit, --abort, -s/--strategy 옵션을 섞어 쓸 수 없습니다"
-#: builtin/notes.c:797
-msgid "Must specify a notes ref to merge"
+#: builtin/notes.c:799
+msgid "must specify a notes ref to merge"
msgstr "병합할 노트 레퍼런스를 지정해야 합니다"
-#: builtin/notes.c:821
+#: builtin/notes.c:823
#, c-format
-msgid "Unknown -s/--strategy: %s"
+msgid "unknown -s/--strategy: %s"
msgstr "알 수 없는 전략(-s/--strategy): %s"
-#: builtin/notes.c:858
+#: builtin/notes.c:860
#, c-format
-msgid "A notes merge into %s is already in-progress at %s"
+msgid "a notes merge into %s is already in-progress at %s"
msgstr "%s 위치로 노트 병합이 이미 %s에서 진행중입니다"
-#: builtin/notes.c:861
+#: builtin/notes.c:863
#, c-format
-msgid "Failed to store link to current notes ref (%s)"
+msgid "failed to store link to current notes ref (%s)"
msgstr "현재 노트 레퍼런스의 (%s) 링크를 저장하는데 실패했습니다."
-#: builtin/notes.c:863
+#: builtin/notes.c:865
#, 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"
+msgstr ""
+"자동 노트 병합이 실패했습니다. %s 안의 충돌을 바로잡고 결과를 'git notes "
+"merge --commit' 명령으로 커밋하십시오. 또는 'git notes merge --abort' 명령으"
+"로 병합을 중지하십시오.\n"
-#: builtin/notes.c:885
+#: builtin/notes.c:887
#, c-format
msgid "Object %s has no note\n"
msgstr "%s 오브젝트에 노트가 없습니다\n"
-#: builtin/notes.c:897
+#: builtin/notes.c:899
msgid "attempt to remove non-existent note is not an error"
msgstr "없는 노트를 제거하려는 시도를 오류가 아닌 것으로 취급합니다"
-#: builtin/notes.c:900
+#: builtin/notes.c:902
msgid "read object names from the standard input"
msgstr "표준 입력에서 오브젝트 이름을 읽습니다"
-#: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127
+#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
msgid "do not remove, show only"
msgstr "제거하지 않고, 보여주기만 합니다"
-#: builtin/notes.c:939
+#: builtin/notes.c:941
msgid "report pruned notes"
msgstr "잘라낸 노트를 알립니다"
-#: builtin/notes.c:981
+#: builtin/notes.c:983
msgid "notes-ref"
msgstr "노트-레퍼런스"
-#: builtin/notes.c:982
+#: builtin/notes.c:984
msgid "use notes from <notes-ref>"
msgstr "<노트-레퍼런스>에서 노트를 사용합니다"
-#: builtin/notes.c:1017 builtin/remote.c:1623
+#: builtin/notes.c:1019
#, c-format
-msgid "Unknown subcommand: %s"
+msgid "unknown subcommand: %s"
msgstr "알 수 없는 하위 명령: %s"
-#: builtin/pack-objects.c:28
+#: builtin/pack-objects.c:29
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [<옵션>...] [< <레퍼런스목록> | < <오브젝트목록>]"
-#: builtin/pack-objects.c:29
+#: builtin/pack-objects.c:30
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [<옵션>...] <베이스이름> [< <레퍼런스목록> | < <오브젝트목록"
">]"
-#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
+#: builtin/pack-objects.c:179 builtin/pack-objects.c:182
#, c-format
msgid "deflate error (%d)"
msgstr "deflate 오류 (%d)"
-#: builtin/pack-objects.c:766
+#: builtin/pack-objects.c:768
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"배트맵 쓰기를 하지 않습니다. 묶음은 pack.packSizeLimit 값에 따라 쪼개집니다"
-#: builtin/pack-objects.c:779
+#: builtin/pack-objects.c:781
msgid "Writing objects"
msgstr "오브젝트 쓰는 중"
-#: builtin/pack-objects.c:1037
+#: builtin/pack-objects.c:1070
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "묶음에 들어있지 않은 오브젝트가 있으므로, 비트맵 쓰기를 하지 않습니다"
-#: builtin/pack-objects.c:2197
+#: builtin/pack-objects.c:2346
msgid "Compressing objects"
msgstr "오브젝트 압축하는 중"
-#: builtin/pack-objects.c:2611
+#: builtin/pack-objects.c:2759
#, c-format
msgid "unsupported index version %s"
msgstr "지원하지 않는 인덱스 버전 %s"
-#: builtin/pack-objects.c:2615
+#: builtin/pack-objects.c:2763
#, c-format
msgid "bad index version '%s'"
msgstr "잘못된 인덱스 버전 '%s'"
-#: builtin/pack-objects.c:2645
+#: builtin/pack-objects.c:2793
msgid "do not show progress meter"
msgstr "진행률을 표시하지 않습니다"
-#: builtin/pack-objects.c:2647
+#: builtin/pack-objects.c:2795
msgid "show progress meter"
msgstr "진행률을 표시합니다"
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2797
msgid "show progress meter during object writing phase"
msgstr "오브젝트 쓰기 단계에서 진행률을 표시합니다"
-#: builtin/pack-objects.c:2652
+#: builtin/pack-objects.c:2800
msgid "similar to --all-progress when progress meter is shown"
msgstr "진행률이 표시될 때 --all-progress와 비슷합니다"
-#: builtin/pack-objects.c:2653
+#: builtin/pack-objects.c:2801
msgid "version[,offset]"
msgstr "버전[,오프셋]"
-#: builtin/pack-objects.c:2654
+#: builtin/pack-objects.c:2802
msgid "write the pack index file in the specified idx format version"
msgstr "지정한 버전의 인덱스 형식에 따라 묶음 인덱스 파일을 씁니다"
-#: builtin/pack-objects.c:2657
+#: builtin/pack-objects.c:2805
msgid "maximum size of each output pack file"
msgstr "출력 묶음 파일의 최대 크기"
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2807
msgid "ignore borrowed objects from alternate object store"
msgstr "보조 오브젝트 저장소에서 빌려온 오브젝트를 무시합니다"
-#: builtin/pack-objects.c:2661
+#: builtin/pack-objects.c:2809
msgid "ignore packed objects"
msgstr "묶음 오브젝트를 무시합니다"
-#: builtin/pack-objects.c:2663
+#: builtin/pack-objects.c:2811
msgid "limit pack window by objects"
msgstr "묶음 윈도우를 오브젝트 단위로 제한합니다"
-#: builtin/pack-objects.c:2665
+#: builtin/pack-objects.c:2813
msgid "limit pack window by memory in addition to object limit"
msgstr "묶음 윈도우를 오브젝트 단위에 추가로 메모리 단위로 제한합니다"
-#: builtin/pack-objects.c:2667
+#: builtin/pack-objects.c:2815
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "결과물 묶음에서 허용되는 최대 길이의 델타 체인"
-#: builtin/pack-objects.c:2669
+#: builtin/pack-objects.c:2817
msgid "reuse existing deltas"
msgstr "기존 델타를 재사용합니다"
-#: builtin/pack-objects.c:2671
+#: builtin/pack-objects.c:2819
msgid "reuse existing objects"
msgstr "기존 오브젝트를 재사용합니다"
-#: builtin/pack-objects.c:2673
+#: builtin/pack-objects.c:2821
msgid "use OFS_DELTA objects"
msgstr "OFS_DELTA 오브젝트를 사용합니다"
-#: builtin/pack-objects.c:2675
+#: builtin/pack-objects.c:2823
msgid "use threads when searching for best delta matches"
msgstr "최상의 델타 일치를 검색하는데 스레드를 사용합니다"
-#: builtin/pack-objects.c:2677
+#: builtin/pack-objects.c:2825
msgid "do not create an empty pack output"
msgstr "빈 묶음 출력을 만들지 않습니다"
-#: builtin/pack-objects.c:2679
+#: builtin/pack-objects.c:2827
msgid "read revision arguments from standard input"
msgstr "표준 입력에서 리비전 인자를 읽습니다"
-#: builtin/pack-objects.c:2681
+#: builtin/pack-objects.c:2829
msgid "limit the objects to those that are not yet packed"
msgstr "묶지 않는 오브젝트 수를 제한합니다"
-#: builtin/pack-objects.c:2684
+#: builtin/pack-objects.c:2832
msgid "include objects reachable from any reference"
msgstr "모든 레퍼런스에서 접근 가능한 오브젝트를 포함합니다"
-#: builtin/pack-objects.c:2687
+#: builtin/pack-objects.c:2835
msgid "include objects referred by reflog entries"
msgstr "reflog 항목에서 레퍼런스할 수 있는 오브젝트를 포함합니다"
-#: builtin/pack-objects.c:2690
+#: builtin/pack-objects.c:2838
msgid "include objects referred to by the index"
msgstr "인덱스에서< 레퍼런스하는 오브젝트를 포함합니다"
-#: builtin/pack-objects.c:2693
+#: builtin/pack-objects.c:2841
msgid "output pack to stdout"
msgstr "묶음을 표준 출력으로 출력합니다"
-#: builtin/pack-objects.c:2695
+#: builtin/pack-objects.c:2843
msgid "include tag objects that refer to objects to be packed"
msgstr "묶음에 들어갈 오브젝트를 레퍼런스하는 태그 오브젝트를 포함합니다"
-#: builtin/pack-objects.c:2697
+#: builtin/pack-objects.c:2845
msgid "keep unreachable objects"
msgstr "접근 불가능 오브젝트를 보존합니다"
-#: builtin/pack-objects.c:2699
+#: builtin/pack-objects.c:2847
msgid "pack loose unreachable objects"
msgstr "느슨한 접근 불가능 오브젝트를 묶습니다"
-#: builtin/pack-objects.c:2700 parse-options.h:142
-msgid "time"
-msgstr "시각"
-
-#: builtin/pack-objects.c:2701
+#: builtin/pack-objects.c:2849
msgid "unpack unreachable objects newer than <time>"
msgstr "<시각>보다 새로운 접근 불가능 오브젝트의 묶음을 풉니다"
-#: builtin/pack-objects.c:2704
+#: builtin/pack-objects.c:2852
msgid "create thin packs"
msgstr "얇은 묶음을 만듭니다"
-#: builtin/pack-objects.c:2706
+#: builtin/pack-objects.c:2854
msgid "create packs suitable for shallow fetches"
msgstr "얕은 가져오기에 적합한 묶음을 만듭니다"
-#: builtin/pack-objects.c:2708
+#: builtin/pack-objects.c:2856
msgid "ignore packs that have companion .keep file"
msgstr "해당하는 .keep 파일이 있는 묶음을 무시합니다"
-#: builtin/pack-objects.c:2710
+#: builtin/pack-objects.c:2858
msgid "pack compression level"
msgstr "묶음 압축 단계"
# FIXME: graft?
-#: builtin/pack-objects.c:2712
+#: builtin/pack-objects.c:2860
msgid "do not hide commits by grafts"
msgstr "붙어 있는 커밋을 숨기지 않습니다"
-#: builtin/pack-objects.c:2714
+#: builtin/pack-objects.c:2862
msgid "use a bitmap index if available to speed up counting objects"
msgstr "가능하면 비트맵 인덱스를 사용해 오브젝트 세기 속도를 높입니다"
-#: builtin/pack-objects.c:2716
+#: builtin/pack-objects.c:2864
msgid "write a bitmap index together with the pack index"
msgstr "묶음 인덱스와 같이 비트맵 인덱스를 씁니다"
-#: builtin/pack-objects.c:2829
+#: builtin/pack-objects.c:2993
msgid "Counting objects"
msgstr "오브젝트 개수 세는 중"
msgid "cannot prune in a precious-objects repo"
msgstr "precious-objects 저장소에서 잘라낼 수 없습니다"
-#: builtin/pull.c:72
+#: builtin/pull.c:51 builtin/pull.c:53
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr "%s의 값이 올바르지 않습니다: %s"
+
+#: builtin/pull.c:73
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<옵션>] [<저장소> [<레퍼런스명세>...]]"
-#: builtin/pull.c:120
+#: builtin/pull.c:121
msgid "Options related to merging"
msgstr "병합 관련 옵션"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "incorporate changes by rebasing rather than merging"
msgstr "변경 사항을 적용할 때 병합하는 대신 리베이스합니다"
-#: builtin/pull.c:147 builtin/revert.c:101
+#: builtin/pull.c:148 builtin/revert.c:101
msgid "allow fast-forward"
msgstr "정방향 진행을 허용합니다"
-#: builtin/pull.c:156
+#: builtin/pull.c:157
msgid "automatically stash/stash pop before and after rebase"
msgstr "리베이스 전과 후에 stash 및 stash pop을 자동으로 합니다"
-#: builtin/pull.c:172
+#: builtin/pull.c:173
msgid "Options related to fetching"
msgstr "가져오기 관련 옵션"
-#: builtin/pull.c:194
+#: builtin/pull.c:195
msgid "number of submodules pulled in parallel"
msgstr "병렬적으로 풀을 실행할 하위모듈 개수"
-#: builtin/pull.c:283
+#: builtin/pull.c:284
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "pull.ff에 대해 잘못된 값: %s"
-#: builtin/pull.c:379 git-sh-setup.sh:226
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr ""
-"리베이스로 풀을 할 수 없습니다: 스테이징하지 않은 변경 사항이 있습니다."
-
-#: builtin/pull.c:385 git-sh-setup.sh:252
-msgid "Additionally, your index contains uncommitted changes."
-msgstr "추가로, 인덱스에 커밋하지 않은 변경 사항이 있습니다."
-
-#: builtin/pull.c:387 git-sh-setup.sh:245
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"리베이스로 풀을 할 수 없습니다: 인덱스에 커밋하지 않은 변경 사항이 있습니다."
-
-#: builtin/pull.c:463
+#: builtin/pull.c:397
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr "가져온 레퍼런스 중에 리베이스할 대상 후보가 없습니다."
-#: builtin/pull.c:465
+#: builtin/pull.c:399
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr "가져온 레퍼런스 중에 병합할 대상 후보가 없습니다."
-#: builtin/pull.c:466
+#: builtin/pull.c:400
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
"보통 이런 경우는 리모트 쪽에는 없는 와일드카드 레퍼런스명세가\n"
"주어졌을 때 일어납니다."
-#: builtin/pull.c:469
+#: builtin/pull.c:403
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"이 리모트는 현재 브랜치에 대해 기본으로 설정된 리모트가\n"
"아니기 때문에, 명령행에서 브랜치를 지정해야 합니다."
-#: builtin/pull.c:474 git-parse-remote.sh:73
+#: builtin/pull.c:408 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "현재 어떤 브랜치 위에도 있지 않습니다."
-#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
+#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "어떤 브랜치를 대상으로 리베이스할지 지정하십시오."
-#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
+#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "어떤 브랜치를 대상으로 병합할지 지정하십시오."
-#: builtin/pull.c:479 builtin/pull.c:494
+#: builtin/pull.c:413 builtin/pull.c:428
msgid "See git-pull(1) for details."
msgstr "자세한 정보는 git-pull(1) 페이지를 참고하십시오."
-#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr "<리모트>"
-#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451
+#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<브랜치>"
-#: builtin/pull.c:489 git-parse-remote.sh:75
+#: builtin/pull.c:423 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "현재 브랜치에 추적 정보가 없습니다."
-#: builtin/pull.c:498 git-parse-remote.sh:95
+#: builtin/pull.c:432 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr "이 브랜치에 대한 추적 정보를 설정하려면 다음과 같이 할 수 있습니다:"
-#: builtin/pull.c:503
+#: builtin/pull.c:437
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"설정에서 리모트의 '%s' 레퍼런스와 병합하도록 지정했지만,\n"
"그런 레퍼런스를 가져오지 않았습니다."
-#: builtin/pull.c:820
+#: builtin/pull.c:754
msgid "ignoring --verify-signatures for rebase"
msgstr "리베이스에 대해 --verify-signatures 옵션을 무시합니다"
-#: builtin/pull.c:867
+#: builtin/pull.c:801
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "--[no-]autostash 옵션은 --rebase 옵션과 같이 써야 합니다."
-#: builtin/pull.c:875
+#: builtin/pull.c:809
msgid "Updating an unborn branch with changes added to the index."
msgstr "만들어지지 않은 브랜치를 인덱스에 추가된 변경 사항으로 업데이트합니다."
-#: builtin/pull.c:903
+#: builtin/pull.c:812
+msgid "pull with rebase"
+msgstr "리베이스로 풀하기"
+
+#: builtin/pull.c:813
+msgid "please commit or stash them."
+msgstr "커밋하거나 스태시에 넣으십시오."
+
+#: builtin/pull.c:838
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"작업 폴더를 %s 커밋에서 정방향\n"
"진행합니다."
-#: builtin/pull.c:908
+#: builtin/pull.c:843
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"$ git reset --hard\n"
"복구됩니다."
-#: builtin/pull.c:923
+#: builtin/pull.c:858
msgid "Cannot merge multiple branches into empty head."
msgstr "여러 브랜치를 빈 헤드로 병합할 수 없습니다."
-#: builtin/pull.c:927
+#: builtin/pull.c:862
msgid "Cannot rebase onto multiple branches."
msgstr "여러 브랜치로 리베이스할 수 없습니다."
msgid "debug unpack-trees"
msgstr "unpack-trees 디버깅"
-#: builtin/receive-pack.c:25
+#: builtin/receive-pack.c:26
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
-#: builtin/receive-pack.c:1845
+#: builtin/receive-pack.c:793
+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 'receive.denyCurrentBranch' configuration variable to\n"
+"'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 ""
+"기본값으로 간략한 저장소가 아닌 현재 브랜치의 업데이트는 거부됩니다.\n"
+"업데이트하면 인덱스와 작업 트리가 푸시한 내용과 일치하지 않게 되므로,\n"
+"'git reset --hard'로 작업 트리를 HEAD에 맞춰야 합니다.\n"
+"\n"
+"리모트 저장소에서 'receive.denyCurrentBranch' 설정 변수를 'ignore'나\n"
+"'warn'으로 설정하면 현재 브랜치로 푸시할 수 있습니다. 하지만 작업\n"
+"트리의 내용을 푸시할 내용에 맞추는 게 아니라면 추천하지 않습니다.\n"
+"\n"
+"이 메시지를 보지 않고 기본 동작을 계속 하려면,\n"
+"'receive.denyCurrentBranch' 설정 변수를 'refuse'로 설정하십시오."
+
+#: builtin/receive-pack.c:813
+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 ""
+"기본값으로, 현재 브랜치의 삭제는 거부됩니다. 다음에 'git clone'할 때\n"
+"아무 파일도 체크아웃하지 않게 되므로 혼동을 일으키기 때문입니다.\n"
+"\n"
+"'receive.denyDeleteCurrent' 설정 변수를 'ignore'나 'warn'으로 설정하면\n"
+"(경고 메시지를 포함하거나 포함하지 않고) 현재 브랜치를 삭제할 수\n"
+"있습니다.\n"
+"\n"
+"이 메시지를 보지 않으려면, 이 설정 변수를 'refuse'로 설정하십시오."
+
+#: builtin/receive-pack.c:1883
msgid "quiet"
msgstr "출력 않기"
-#: builtin/receive-pack.c:1859
+#: builtin/receive-pack.c:1897
msgid "You must specify a directory."
msgstr "디렉터리를 지정해야 합니다."
msgid " Fetch URL: %s"
msgstr " 가져오기 URL: %s"
-#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296
+#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
msgid "(no URL)"
msgstr "(URL 없음)"
msgid_plural " Remote branches:%s"
msgstr[0] " 리모트 브랜치:%s"
-#: builtin/remote.c:1179 builtin/remote.c:1206
+#: builtin/remote.c:1179 builtin/remote.c:1205
msgid " (status not queried)"
msgstr " (상태를 질의하지 않음)"
msgid " Local refs will be mirrored by 'git push'"
msgstr " 로컬 레퍼런스를 'git push'로 미러링할 예정"
-#: builtin/remote.c:1203
+#: builtin/remote.c:1202
#, 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:1224
+#: builtin/remote.c:1223
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "레퍼런스/리모트/<이름>/HEAD 값을 리모트에 맞게 설정합니다"
-#: builtin/remote.c:1226
+#: builtin/remote.c:1225
msgid "delete refs/remotes/<name>/HEAD"
msgstr "레퍼런스/리모트/<이름>/HEAD 값을 삭제합니다"
-#: builtin/remote.c:1241
+#: builtin/remote.c:1240
msgid "Cannot determine remote HEAD"
msgstr "리모트 HEAD를 결정할 수 없습니다"
-#: builtin/remote.c:1243
+#: builtin/remote.c:1242
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
"리모트 HEAD 브랜치가 여러개입니다. 다음 중 하나를 명시적으로 지정하십시오:"
-#: builtin/remote.c:1253
+#: builtin/remote.c:1252
#, c-format
msgid "Could not delete %s"
msgstr "%s을(를) 삭제할 수 없습니다"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1260
#, c-format
msgid "Not a valid ref: %s"
msgstr "올바른 레퍼런스가 아닙니다: %s"
-#: builtin/remote.c:1263
+#: builtin/remote.c:1262
#, c-format
msgid "Could not setup %s"
msgstr "%s을(를) 설정할 수 없습니다"
-#: builtin/remote.c:1281
+#: builtin/remote.c:1280
#, c-format
msgid " %s will become dangling!"
msgstr " %s의 연결이 끊어집니다!"
-#: builtin/remote.c:1282
+#: builtin/remote.c:1281
#, c-format
msgid " %s has become dangling!"
msgstr " %s의 연결이 끊어졌습니다!"
-#: builtin/remote.c:1292
+#: builtin/remote.c:1291
#, c-format
msgid "Pruning %s"
msgstr "잘라냄: %s"
-#: builtin/remote.c:1293
+#: builtin/remote.c:1292
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1309
+#: builtin/remote.c:1308
#, c-format
msgid " * [would prune] %s"
msgstr " * [잘라낼 예정] %s"
-#: builtin/remote.c:1312
+#: builtin/remote.c:1311
#, c-format
msgid " * [pruned] %s"
msgstr " * [잘라냄] %s"
-#: builtin/remote.c:1357
+#: builtin/remote.c:1356
msgid "prune remotes after fetching"
msgstr "가져온 후에 리모트를 잘라냅니다"
-#: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542
+#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
#, c-format
msgid "No such remote '%s'"
msgstr "그런 리모트가 없습니다 ('%s')"
-#: builtin/remote.c:1436
+#: builtin/remote.c:1435
msgid "add branch"
msgstr "브랜치를 추가합니다"
-#: builtin/remote.c:1443
+#: builtin/remote.c:1442
msgid "no remote specified"
msgstr "리모트를 지정하지 않았습니다"
-#: builtin/remote.c:1460
+#: builtin/remote.c:1459
msgid "query push URLs rather than fetch URLs"
msgstr "가져오기 URL이 아니라 푸시 URL을 질의합니다"
-#: builtin/remote.c:1462
+#: builtin/remote.c:1461
msgid "return all URLs"
msgstr "모든 URL을 리턴합니다"
-#: builtin/remote.c:1490
+#: builtin/remote.c:1489
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "'%s' 리모트에 대한 URL을 설정하지 않았습니다"
-#: builtin/remote.c:1516
+#: builtin/remote.c:1515
msgid "manipulate push URLs"
msgstr "푸시 URL을 지정합니다"
-#: builtin/remote.c:1518
+#: builtin/remote.c:1517
msgid "add URL"
msgstr "URL을 추가합니다"
-#: builtin/remote.c:1520
+#: builtin/remote.c:1519
msgid "delete URLs"
msgstr "URL을 삭제합니다"
-#: builtin/remote.c:1527
+#: builtin/remote.c:1526
msgid "--add --delete doesn't make sense"
msgstr "--add --delete 옵션을 둘다 쓰면 안 됩니다"
-#: builtin/remote.c:1568
+#: builtin/remote.c:1567
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "잘못된 오래전 URL 패턴: %s"
-#: builtin/remote.c:1576
+#: builtin/remote.c:1575
#, c-format
msgid "No such URL found: %s"
msgstr "그런 URL이 없습니다: %s"
-#: builtin/remote.c:1578
+#: builtin/remote.c:1577
msgid "Will not delete all non-push URLs"
msgstr "푸시용이 아닌 모든 URL을 삭제하지 않습니다"
-#: builtin/remote.c:1592
+#: builtin/remote.c:1591
msgid "be verbose; must be placed before a subcommand"
msgstr "자세히 표시합니다 (하위 명령 앞에 와야 합니다)"
+#: builtin/remote.c:1622
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "알 수 없는 하위 명령: %s"
+
#: builtin/repack.c:17
msgid "git repack [<options>]"
msgstr "git repack [<옵션>]"
msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<커밋>]"
#: builtin/reset.c:27
-msgid "git reset [-q]
<tree-ish> [--] <paths>..."
-msgstr "git reset [-q] <트리-따위> [--] <경로>..."
+msgid "git reset [-q]
[<tree-ish>] [--] <paths>..."
+msgstr "git reset [-q] [<트리-따위>] [--] <경로>..."
#: builtin/reset.c:28
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgid "Could not write new index file."
msgstr "새 인덱스 파일을 쓸 수 없습니다."
-#: builtin/rev-list.c:362
+#: builtin/rev-list.c:354
msgid "rev-list does not support display of notes"
msgstr "rev-list는 노트 표시를 지원하지 않습니다"
-#: builtin/rev-parse.c:358
+#: builtin/rev-parse.c:386
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<옵션>] -- [<인자>...]"
-#: builtin/rev-parse.c:363
+#: builtin/rev-parse.c:391
msgid "keep the `--` passed as an arg"
msgstr "인자로 넘긴 `--`를 유지합니다"
-#: builtin/rev-parse.c:365
+#: builtin/rev-parse.c:393
msgid "stop parsing after the first non-option argument"
msgstr "첫번째 옵션이 아닌 인자 뒤에 파싱을 중지합니다"
-#: builtin/rev-parse.c:368
+#: builtin/rev-parse.c:396
msgid "output in stuck long form"
msgstr "stuck long 형식으로 출력합니다"
-#: builtin/rev-parse.c:499
+#: builtin/rev-parse.c:527
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
msgid "revert failed"
msgstr "되돌리기 실패"
-#: builtin/revert.c:207
+#: builtin/revert.c:205
msgid "cherry-pick failed"
msgstr "cherry-pick 실패"
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<베이스>]] [--list] [<레퍼런스>]"
-#: builtin/show-branch.c:640
+#: builtin/show-branch.c:375
+#, 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:541
+#, c-format
+msgid "no matching refs with %s"
+msgstr "%s와(과) 일치하는 레퍼런스가 없습니다"
+
+#: builtin/show-branch.c:639
msgid "show remote-tracking and local branches"
msgstr "리모트 추적 및 로컬 브랜치를 표시합니다"
-#: builtin/show-branch.c:642
+#: builtin/show-branch.c:641
msgid "show remote-tracking branches"
msgstr "리모트 추적 브랜치를 표시합니다"
-#: builtin/show-branch.c:644
+#: builtin/show-branch.c:643
msgid "color '*!+-' corresponding to the branch"
msgstr "브랜치에 따른 '*!+-' 표시에 색을 입힙니다"
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show <n> more commits after the common ancestor"
msgstr "공통 이전 커밋 뒤의 <n>개의 커밋을 표시합니다"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "synonym to more=-1"
msgstr "--more=-1 옵션과 동일"
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
msgid "suppress naming strings"
msgstr "이름 문자열을 표시하지 않습니다"
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
msgid "include the current branch"
msgstr "현재 브랜치를 포함"
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
msgid "name commits with their object names"
msgstr "커밋의 이름을 그 오브젝트 이름으로 붙입니다"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "show possible merge bases"
msgstr "가능한 병합 기준점을 표시합니다"
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "show refs unreachable from any other ref"
msgstr "다른 어떤 레퍼런스에서도 접근 불가능한 레퍼런스를 표시합니다"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "show commits in topological order"
msgstr "위상 순서에 따라 커밋을 표시합니다"
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
msgid "show only commits not on the first branch"
msgstr "첫 브랜치에 없는 커밋만 표시합니다"
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
msgid "show merges reachable from only one tip"
msgstr "하나의 끝에서만 접근 가능한 병합을 표시합니다"
-#: builtin/show-branch.c:666
+#: builtin/show-branch.c:665
msgid "topologically sort, maintaining date order where possible"
msgstr "가능하면 시간 순서를 유지하면서 위상 순서로 정렬"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
msgid "<n>[,<base>]"
msgstr "<n>[,<베이스>]"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
msgid "show <n> most recent ref-log entries starting at base"
msgstr "기준부터 시작해 최대 <n>개의 최근 ref-log 항목을 표시합니다"
+#: builtin/show-branch.c:703
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+msgstr ""
+"--reflog 옵션은 --all, --remotes, --independent, --merge-base 옵션과 호환되"
+"지 않습니다"
+
+#: builtin/show-branch.c:727
+msgid "no branches given, and HEAD is not valid"
+msgstr "브랜치를 지정하지 않았고, HEAD가 올바르지 않습니다"
+
+#: builtin/show-branch.c:730
+msgid "--reflog option needs one branch name"
+msgstr "--reflog 옵션은 브랜치 이름이 필요합니다"
+
+#: builtin/show-branch.c:733
+#, 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:737
+#, c-format
+msgid "no such ref %s"
+msgstr "그런 레퍼런스가 없습니다: %s"
+
+#: builtin/show-branch.c:829
+#, c-format
+msgid "cannot handle more than %d rev."
+msgid_plural "cannot handle more than %d revs."
+msgstr[0] "레퍼런스를 %d개보다 많이 처리할 수 없습니다."
+
+#: builtin/show-branch.c:833
+#, c-format
+msgid "'%s' is not a valid ref."
+msgstr "'%s'은(는) 올바른 레퍼런스가 아닙니다."
+
+#: builtin/show-branch.c:836
+#, c-format
+msgid "cannot find commit %s (%s)"
+msgstr "%s 커밋을 찾을 수 없음 (%s)"
+
#: builtin/show-ref.c:10
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
msgid "prepend comment character and space to each line"
msgstr "각 줄의 앞에 주석 문자와 공백을 붙입니다"
-#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:923
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1046
#, c-format
msgid "No such ref: %s"
msgstr "그런 레퍼런스가 없습니다: %s"
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "전체 레퍼런스 이름이 필요하지만, 입력은 %s"
msgid "cannot strip one component off url '%s'"
msgstr "'%s' URL 하나의 단계를 잘라낼 수 없습니다"
-#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403
-#: builtin/submodule--helper.c:483
+#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408
+#: builtin/submodule--helper.c:590
msgid "alternative anchor for relative paths"
msgstr "상대 경로에 사용할 또다른 기준"
-#: builtin/submodule--helper.c:283
+#: builtin/submodule--helper.c:287
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<경로>] [<경로>...]"
-#: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338
+#: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr ".gitmodules에서 하위 모듈 경로 '%s'에 대한 URL이 없습니다"
-#: builtin/submodule--helper.c:364
+#: builtin/submodule--helper.c:369
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "하위 모듈 경로 '%s'에 대한 URL을 등록하는데 실패했습니다"
-#: builtin/submodule--helper.c:368
+#: builtin/submodule--helper.c:373
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "'%3$s' 경로에 대해 '%1$s' (%2$s) 하위 모듈 등록\n"
-#: builtin/submodule--helper.c:378
+#: builtin/submodule--helper.c:383
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "경고: '%s' 하위 모듈에 대해 커맨드 업데이트 모드가 제안되었습니다\n"
-#: builtin/submodule--helper.c:385
+#: builtin/submodule--helper.c:390
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "'%s' 하위 모듈에 대해 업데이트 모드 등록이 실패했습니다"
-#: builtin/submodule--helper.c:404
+#: builtin/submodule--helper.c:409
msgid "Suppress output for initializing a submodule"
msgstr "하위 모듈 초기화에 출력을 하지 않습니다"
-#: builtin/submodule--helper.c:409
+#: builtin/submodule--helper.c:414
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<경로>]"
-#: builtin/submodule--helper.c:430
+#: builtin/submodule--helper.c:435
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <경로>"
-#: builtin/submodule--helper.c:436
+#: builtin/submodule--helper.c:441
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "경로 '%s'에 대해 .gitmodules에 있는 하위모듈 매핑이 없습니다"
-#: builtin/submodule--helper.c:486
+#: builtin/submodule--helper.c:524 builtin/submodule--helper.c:527
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
+msgstr "'%s' 하위 모듈에 보조 오브젝트를 추가할 수 없습니다: %s"
+
+#: builtin/submodule--helper.c:563
+#, c-format
+msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+msgstr "submodule.alternateErrorStrategy에 대한 값이('%s') 알 수 없는 값입니다"
+
+#: builtin/submodule--helper.c:570
+#, c-format
+msgid "Value '%s' for submodule.alternateLocation is not recognized"
+msgstr "submodule.alternateLocation에 대한 값이('%s') 알 수 없는 값입니다"
+
+#: builtin/submodule--helper.c:593
msgid "where the new submodule will be cloned to"
msgstr "새 하위 모듈을 복제할 대상 위치"
-#: builtin/submodule--helper.c:489
+#: builtin/submodule--helper.c:596
msgid "name of the new submodule"
msgstr "새 하위 모듈 이름"
-#: builtin/submodule--helper.c:492
+#: builtin/submodule--helper.c:599
msgid "url where to clone the submodule from"
msgstr "하위 모듈을 복제해 올 URL"
-#: builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:605
msgid "depth for shallow clones"
msgstr "얕은 복제에 사용할 깊이"
-#: builtin/submodule--helper.c:504
+#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964
+msgid "force cloning progress"
+msgstr "복제 진행 상황을 항상 표시합니다"
+
+#: builtin/submodule--helper.c:613
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
"git submodule--helper clone [--prefix=<경로>] [--quiet] [--reference <저장소"
">] [--name <이름>] [--depth <깊이>] --url <url> --path <경로>"
-#: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535
+#: builtin/submodule--helper.c:638 builtin/submodule--helper.c:648
#, c-format
msgid "could not create directory '%s'"
msgstr "'%s' 디렉터리를 만들 수 없습니다"
-#: builtin/submodule--helper.c:531
+#: builtin/submodule--helper.c:644
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "'%s'에서 하위 모듈 경로 '%s'에 복제하는데 실패했습니다"
-#: builtin/submodule--helper.c:547
+#: builtin/submodule--helper.c:660
#, c-format
msgid "cannot open file '%s'"
msgstr "'%s' 파일을 열 수 없습니다"
-#: builtin/submodule--helper.c:552
+#: builtin/submodule--helper.c:665
#, c-format
msgid "could not close file %s"
msgstr "%s 파일을 닫을 수 없습니다"
-#: builtin/submodule--helper.c:559
+#: builtin/submodule--helper.c:672
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "'%s'에 대한 하위 모듈 디렉터리를 가져올 수 없습니다"
-#: builtin/submodule--helper.c:611
+#: builtin/submodule--helper.c:726
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "'%s' 하위 모듈 경로가 초기화되지 않았습니다"
-#: builtin/submodule--helper.c:615
+#: builtin/submodule--helper.c:730
msgid "Maybe you want to use 'update --init'?"
msgstr "'update --init'을 하려고 한 것 아니었습니까?"
-#: builtin/submodule--helper.c:641
+#: builtin/submodule--helper.c:756
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "병합하지 하위 모듈 %s 건너뜀"
-#: builtin/submodule--helper.c:662
+#: builtin/submodule--helper.c:777
#, c-format
msgid "Skipping submodule '%s'"
msgstr "하위 모듈 '%s' 건너뜀"
-#: builtin/submodule--helper.c:792
+#: builtin/submodule--helper.c:913
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "'%s' 복제하는데 실패했습니다. 재시도 예정"
-#: builtin/submodule--helper.c:803
+#: builtin/submodule--helper.c:924
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "두번째 '%s' 복제하는데 실패했습니다. 중지합니다"
-#: builtin/submodule--helper.c:824
+#: builtin/submodule--helper.c:945
msgid "path into the working tree"
msgstr "작업 폴더로 가는 경로"
-#: builtin/submodule--helper.c:827
+#: builtin/submodule--helper.c:948
msgid "path into the working tree, across nested submodule boundaries"
msgstr "작업 폴더로 가는 경로, 내장된 하위 모듈의 경계 통과"
-#: builtin/submodule--helper.c:831
+#: builtin/submodule--helper.c:952
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout 또는 none"
-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:956
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "지정한 개수의 리비전에서 잘린 얕은 복제를 만듭니다"
-#: builtin/submodule--helper.c:838
+#: builtin/submodule--helper.c:959
msgid "parallel jobs"
msgstr "병렬 작업 개수"
-#: builtin/submodule--helper.c:840
+#: builtin/submodule--helper.c:961
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "최초 복제가 얕은 복제 추천을 따를지 여부"
-#: builtin/submodule--helper.c:841
+#: builtin/submodule--helper.c:962
msgid "don't print cloning progress"
msgstr "복제 과정을 표시하지 않습니다"
-#: builtin/submodule--helper.c:846
+#: builtin/submodule--helper.c:969
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<경로>] [<경로>...]"
-#: builtin/submodule--helper.c:856
+#: builtin/submodule--helper.c:979
msgid "bad value for update parameter"
msgstr "파라미터 업데이트에 값이 잘못되었습니다"
-#: builtin/submodule--helper.c:927
+#: builtin/submodule--helper.c:1050
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
-msgstr "하위 모듈 (%s) 브랜치가 상위 프로젝트 브랜치를 이어받도록 설정되었지만, 상위 프로젝트에 브랜치가 없습니다"
+msgstr ""
+"하위 모듈 (%s) 브랜치가 상위 프로젝트 브랜치를 이어받도록 설정되었지만, 상위 "
+"프로젝트에 브랜치가 없습니다"
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:1100
msgid "submodule--helper subcommand must be called with a subcommand"
msgstr "submodule--helper 하위 명령은 하위 명령으로 호출해야 합니다"
-#: builtin/submodule--helper.c:984
+#: builtin/submodule--helper.c:1107
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s'은(는) 올바른 submodule--helper 하위 명령이 아닙니다"
#: builtin/tag.c:458
#, c-format
msgid "'%s' is not a valid tag name."
-msgstr "'%s'은9는) 올바른 태그 이름이 아닙니다."
+msgstr "'%s'은(는) 올바른 태그 이름이 아닙니다."
#: builtin/tag.c:463
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "태그 '%s' 업데이트 (과거 %s)\n"
-#: builtin/unpack-objects.c:490
+#: builtin/unpack-objects.c:493
msgid "Unpacking objects"
msgstr "오브젝트 묶음 푸는 중"
msgid " OK"
msgstr " 오케이"
-#: builtin/update-index.c:575
+#: builtin/update-index.c:564
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<옵션>] [--] [<파일>...]"
-#: builtin/update-index.c:930
+#: builtin/update-index.c:919
msgid "continue refresh even when index needs update"
msgstr "인덱스에 업데이트가 필요하더라도 새로 고침을 계속합니다"
-#: builtin/update-index.c:933
+#: builtin/update-index.c:922
msgid "refresh: ignore submodules"
msgstr "새로 고침: 하위 모듈 무시"
-#: builtin/update-index.c:936
+#: builtin/update-index.c:925
msgid "do not ignore new files"
msgstr "새 파일을 무시할 수 않습니다"
-#: builtin/update-index.c:938
+#: builtin/update-index.c:927
msgid "let files replace directories and vice-versa"
msgstr "디렉터리를 파일로, 또는 그 반대로 바꿀 수 있게 허용합니다"
-#: builtin/update-index.c:940
+#: builtin/update-index.c:929
msgid "notice files missing from worktree"
msgstr "작업폴더에서 알림 파일이 없습니다"
-#: builtin/update-index.c:942
+#: builtin/update-index.c:931
msgid "refresh even if index contains unmerged entries"
msgstr "인덱스에 병합하지 않은 항목이 있어도 새로 고칩니다"
-#: builtin/update-index.c:945
+#: builtin/update-index.c:934
msgid "refresh stat information"
msgstr "파일 정보를 새로 고칩니다"
-#: builtin/update-index.c:949
+#: builtin/update-index.c:938
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "--refresh와 동일하지만, assume-unchanged 설정을 무시합니다"
-#: builtin/update-index.c:953
+#: builtin/update-index.c:942
msgid "<mode>,<object>,<path>"
msgstr "<모드>,<오브젝트>,<경로>"
-#: builtin/update-index.c:954
+#: builtin/update-index.c:943
msgid "add the specified entry to the index"
msgstr "지정한 항목을 인덱스에 추가합니다"
-#: builtin/update-index.c:963
+#: builtin/update-index.c:952
msgid "mark files as \"not changing\""
msgstr "파일을 \"바꾸지 않음\"으로 표시합니다"
-#: builtin/update-index.c:966
+#: builtin/update-index.c:955
msgid "clear assumed-unchanged bit"
msgstr "바꾸지 않음으로 가정 (assumed-unchanged) 비트를 지웁니다"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:958
msgid "mark files as \"index-only\""
msgstr "파일을 인덱스 전용으로 (\"index-only\") 표시합니다"
-#: builtin/update-index.c:972
+#: builtin/update-index.c:961
msgid "clear skip-worktree bit"
msgstr "작업폴더 건너뛰기 (skip-worktree) 비트를 지웁니다"
-#: builtin/update-index.c:975
+#: builtin/update-index.c:964
msgid "add to index only; do not add content to object database"
msgstr ""
"인덱스에만 추가합니다. 내용을 오브젝트 데이터베이스에 추가하지 않습니다"
-#: builtin/update-index.c:977
+#: builtin/update-index.c:966
msgid "remove named paths even if present in worktree"
msgstr "작업 폴더에 있어도 해당 경로를 제거합니다"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:968
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "--stdin과 같이 사용: 입력 줄은 NUL 바이트로 끝납니다"
-#: builtin/update-index.c:981
+#: builtin/update-index.c:970
msgid "read list of paths to be updated from standard input"
msgstr "표준 입력에서 업데이트할 경로의 목록을 읽습니다"
-#: builtin/update-index.c:985
+#: builtin/update-index.c:974
msgid "add entries from standard input to the index"
msgstr "표준 입력에서 읽은 항목을 인덱스에 추가합니다"
-#: builtin/update-index.c:989
+#: builtin/update-index.c:978
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "경로 목록에 대해 #2 및 #3 스테이징을 다시 합니다"
-#: builtin/update-index.c:993
+#: builtin/update-index.c:982
msgid "only update entries that differ from HEAD"
msgstr "HEAD와 다른 항목만 업데이트합니다"
-#: builtin/update-index.c:997
+#: builtin/update-index.c:986
msgid "ignore files missing from worktree"
msgstr "작업 폴더에 없는 파일을 무시합니다"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:989
msgid "report actions to standard output"
msgstr "표준 출력에 동작을 알립니다"
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:991
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "저장한 해결되지 않은 충돌을 무시합니다 (사용자용 명령 용도)"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:995
msgid "write index in this format"
msgstr "인덱스를 이 형식으로 씁니다"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:997
msgid "enable or disable split index"
msgstr "스플릿 인덱스를 켜거나 끕니다"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:999
msgid "enable/disable untracked cache"
msgstr "추적하지 않는 캐시 사용을 켜거나 끕니다"
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1001
msgid "test if the filesystem supports untracked cache"
msgstr "파일 시스템이 추적하지 않는 캐시를 지원하는지 검사합니다"
-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1003
msgid "enable untracked cache without testing the filesystem"
msgstr "파일 시스템 시험 없이 추적하지 않는 캐시를 사용합니다"
-#: builtin/update-index.c:1134
+#: builtin/update-index.c:1119
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
+msgstr ""
+"core.untrackedCache값이 참입니다. 정말로 추적하지 않는 파일 캐시를 사용하지 "
+"않으려면 이 값을 제거하거나 바꾸십시오."
+
+#: builtin/update-index.c:1123
msgid "Untracked cache disabled"
-msgstr "추적되지 않는 캐시를 사용하지 않습니다"
+msgstr "추적되지 않는 파일 캐시를 사용하지 않습니다"
+
+#: builtin/update-index.c:1131
+msgid ""
+"core.untrackedCache is set to false; remove or change it, if you really want "
+"to enable the untracked cache"
+msgstr ""
+"core.untrackedCache값이 거짓입니다. 정말로 추적하지 않는 파일 캐시를 사용하려"
+"면 이 값을 제거하거나 바꾸십시오."
-#: builtin/update-index.c:1146
+#: builtin/update-index.c:1135
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "'%s'에 대해 추적되지 않는 캐시를 사용하지 않습니다"
msgid "only useful for debugging"
msgstr "디버깅 용도로만 사용"
-#: upload-pack.c:20
+#: upload-pack.c:22
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<옵션>] <디렉터리>"
-#: upload-pack.c:837
+#: upload-pack.c:1028
msgid "quit after a single request/response exchange"
msgstr "하나의 요청/응답 교환 뒤에 끝납니다"
-#: upload-pack.c:839
+#: upload-pack.c:1030
msgid "exit immediately after initial ref advertisement"
msgstr "최초 레퍼런스 알림 뒤에 즉시 끝납니다"
-#: upload-pack.c:841
+#: upload-pack.c:1032
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
-msgstr "<디렉터리>가 깃 디렉터리가 아니면 <디렉터리>/.git/ 폴더를 시도하지 않습니다."
+msgstr ""
+"<디렉터리>가 깃 디렉터리가 아니면 <디렉터리>/.git/ 폴더를 시도하지 않습니다."
-#: upload-pack.c:843
+#: upload-pack.c:1034
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "<n>초 동안 반응이 없으면 전송을 중지합니다"
+#: credential-cache--daemon.c:223
+#, 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"
+"\n"
+"\tchmod 0700 %s"
+
#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "디버깅 메시지를 표준오류로 출력합니다"
"목록을 볼 수 있습니다. 특정 하위 명령어나 개념에 대해 읽어 보려면 'git help\n"
"<명령>' 또는 'git help <개념>' 명령을 실행하십시오."
-#: http.c:323
+# HTTP delegation
+#: http.c:342
+msgid "Delegation control is not supported with cURL < 7.22.0"
+msgstr "딜리게이션 컨트롤은 cURL 7.44.0 앞 버전에서는 지원하지 않습니다"
+
+#: http.c:351
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "공개 키 고정은 cURL 7.44.0 앞 버전에서는 지원하지 않습니다"
msgid "no-op (backward compatibility)"
msgstr "아무 동작도 하지 않음 (호환용)"
-#: parse-options.h:237
+#: parse-options.h:238
msgid "be more verbose"
msgstr "더 자세히 표시합니다"
-#: parse-options.h:239
+#: parse-options.h:240
msgid "be more quiet"
msgstr "더 간략히 표시합니다"
-#: parse-options.h:245
+#: parse-options.h:246
msgid "use <n> digits to display SHA-1s"
msgstr "SHA-1 표시에 <n>개의 숫자를 사용합니다"
msgstr "자동 병합이 동작하지 않았습니다."
#: git-merge-octopus.sh:62
-msgid "Should not be doing an Octopus."
+msgid "Should not be doing an octopus."
msgstr "옥토퍼스 전략 병합을 할 수 없습니다."
#: git-merge-octopus.sh:73
msgid "Cannot save the current index state"
msgstr "현재 인덱스 상태를 저장할 수 없습니다"
+#: git-stash.sh:103
+msgid "Cannot save the untracked files"
+msgstr "추적하지 않는 파일을 저장할 수 없습니다"
+
#: git-stash.sh:123 git-stash.sh:136
msgid "Cannot save the current worktree state"
msgstr "현재 작업 폴더 상태를 저장할 수 없습니다"
"오류: 'stash save'에 대해 알 수 없는 옵션: $option\n"
" 메시지를 넘기려면, 다음과 같이 쓰십시오: git stash save -- '$option'"
+#: git-stash.sh:251
+msgid "Can't use --patch and --include-untracked or --all at the same time"
+msgstr ""
+"--patch 옵션과 --include-untracked 또는 --all 옵션을 동시에 쓸 수 없습니다"
+
#: git-stash.sh:259
msgid "No local changes to save"
msgstr "저장할 로컬 변경 사항이 없습니다"
msgid "Cannot remove worktree changes"
msgstr "작업폴더 변경 사항을 제거할 수 없습니다"
-#: git-stash.sh:404
+#: git-stash.sh:403
#, sh-format
msgid "unknown option: $opt"
msgstr "알 수 없는 옵션: $opt"
-#: git-stash.sh:414
+#: git-stash.sh:416
msgid "No stash found."
msgstr "스태시가 없습니다."
-#: git-stash.sh:421
+#: git-stash.sh:423
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "너무 많은 리비전을 지정했습니다: $REV"
-#: git-stash.sh:427
+#: git-stash.sh:438
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference은(는) 올바른 레퍼런스가 아닙니다"
-#: git-stash.sh:455
+#: git-stash.sh:466
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args'은(는) 스태시 커밋이 아닙니다"
-#: git-stash.sh:466
+#: git-stash.sh:477
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args'은(는) 스태시 레퍼런스가 아닙니다"
-#: git-stash.sh:474
+#: git-stash.sh:485
msgid "unable to refresh index"
msgstr "인덱스를 새로 고칠 수 없습니다"
-#: git-stash.sh:478
+#: git-stash.sh:489
msgid "Cannot apply a stash in the middle of a merge"
msgstr "병합 도중에 스태시를 적용할 수 없습니다"
-#: git-stash.sh:486
+#: git-stash.sh:497
msgid "Conflicts in index. Try without --index."
msgstr "인덱스에 충돌. --index 없이 시도해 보십시오."
-#: git-stash.sh:488
+#: git-stash.sh:499
msgid "Could not save index tree"
msgstr "인덱스 트리를 저장할 수 없습니다"
-#: git-stash.sh:522
+#: git-stash.sh:508
+msgid "Could not restore untracked files from stash"
+msgstr "스태시에서 추적하지 않는 파일을 복구할 수 없습니다"
+
+#: git-stash.sh:533
msgid "Cannot unstage modified files"
msgstr "수정한 파일을 스테이지에서 뺄 수 없습니다"
-#: git-stash.sh:537
+#: git-stash.sh:548
msgid "Index was not unstashed."
msgstr "인덱스가 스태시에서 빠졌습니다."
-#: git-stash.sh:551
+#: git-stash.sh:562
msgid "The stash is kept in case you need it again."
msgstr "다시 필요할 때를 대비해 스태시를 보관합니다."
-#: git-stash.sh:560
+#: git-stash.sh:571
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "${REV} 지움 ($s)"
-#: git-stash.sh:561
+#: git-stash.sh:572
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: 스태시 항목을 지울 수 없습니다"
-#: git-stash.sh:569
+#: git-stash.sh:580
msgid "No branch name specified"
msgstr "브랜치 이름을 지정하지 않았습니다"
-#: git-stash.sh:641
+#: git-stash.sh:652
msgid "(To restore them type \"git stash apply\")"
msgstr "(복구하려면 \"git stash apply\"를 실행하십시오)"
-#: git-submodule.sh:183
+#: git-submodule.sh:184
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "상대 경로는 작업 폴더의 최상위에서만 쓸 수 있습니다"
-#: git-submodule.sh:193
+#: git-submodule.sh:194
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "저장소 URL: '$repo' 값은 절대 경로거나 ./ 또는 ../로 시작해야 합니다."
-#: git-submodule.sh:210
+#: git-submodule.sh:211
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path'은(는) 이미 인덱스에 있습니다"
-#: git-submodule.sh:214
+#: git-submodule.sh:215
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
"$sm_path\n"
"정말로 추가하려면 -f 옵션을 사용하십시오."
-#: git-submodule.sh:232
+#: git-submodule.sh:233
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "'$sm_path'의 기존 저장소를 인덱스에 추가합니다"
-#: git-submodule.sh:234
+#: git-submodule.sh:235
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path'이(가) 이미 있고 올바른 git 저장소가 아닙니다"
-#: git-submodule.sh:242
+#: git-submodule.sh:243
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr "'$sm_name'에 대한 깃 디렉터리가 로컬에서 리모트가 있는 채로 있습니다:"
-#: git-submodule.sh:244
+#: git-submodule.sh:245
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
"'--force' 옵션을 사용하십시오. 로컬 깃 디렉터리가 올바른 저장소가 아니거나\n"
"무슨 의미인지 잘 모르겠으면 '--name' 옵션으로 다른 이름을 선택하십시오."
-#: git-submodule.sh:250
+#: git-submodule.sh:251
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "로컬 깃 디렉터리를 '$sm_name' 하위모듈로 다시 활성화합니다."
-#: git-submodule.sh:262
+#: git-submodule.sh:263
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "'$sm_path' 하위 모듈을 체크아웃할 수 없습니다"
-#: git-submodule.sh:267
+#: git-submodule.sh:268
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "'$sm_path' 하위 모듈을 추가하는데 실패했습니다"
-#: git-submodule.sh:276
+#: git-submodule.sh:277
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "'$sm_path' 하위 모듈을 등록하는데 실패했습니다"
-#: git-submodule.sh:323
+#: git-submodule.sh:324
#, sh-format
msgid "Entering '$displaypath'"
msgstr "'$displaypath' 들어감"
-#: git-submodule.sh:343
+#: git-submodule.sh:344
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr "'$displaypath'에서 멈춤. 스크립트가 0이 아닌 상태를 리턴함."
-#: git-submodule.sh:414
+#: git-submodule.sh:415
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr "경로명세 및 --all 옵션은 호환되지 않습니다"
-#: git-submodule.sh:419
+#: git-submodule.sh:420
#, sh-format
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "정말로 모든 하위 모듈 초기화를 해제하려면 '--all'을 사용하십시오"
-#: git-submodule.sh:439
+#: git-submodule.sh:440
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains a .git directory\n"
"하위 모듈 작업 폴더 '$displaypath'에 .git 디렉터리가 들어 있습니다\n"
"(정말로 그 커밋 내역까지 포함해 제거하려면 'rm -rf'를 사용하십시오)"
-#: git-submodule.sh:447
+#: git-submodule.sh:448
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
"하위 모듈 작업 폴더에 ('$displaypath') 로컬 수정 사항이 있습니다. 버리려면 '-"
"f'를 사용하십시오"
-#: git-submodule.sh:450
+#: git-submodule.sh:451
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "'$displaypath' 디렉터리를 지웁니다"
-#: git-submodule.sh:451
+#: git-submodule.sh:452
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr "하위 모듈 디렉터리를 ('$displaypath') 제거할 수 없습니다"
-#: git-submodule.sh:454
+#: git-submodule.sh:455
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "빈 하위 모듈 디렉터리를 ('$displaypath') 만들 수 없습니다"
-#: git-submodule.sh:463
+#: git-submodule.sh:464
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
"'$name' 하위 모듈이 ($url) '$displaypath' 경로에 대해 등록되지 않았습니다"
-#: git-submodule.sh:612
+#: git-submodule.sh:617
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "하위 모듈 경로에서 ('$displaypath') 현재 리비전을 찾을 수 없습니다"
-#: git-submodule.sh:622
+#: git-submodule.sh:627
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "하위 모듈 경로 '$sm_path'에서 가져올 수 없습니다"
-#: git-submodule.sh:627
+#: git-submodule.sh:632
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
-msgstr "하위 모듈 경로 '$sm_path'에서 현재 ${remote_name}/${branch} 리비전을 찾을 수 없습니다"
+msgstr ""
+"하위 모듈 경로 '$sm_path'에서 현재 ${remote_name}/${branch} 리비전을 찾을 수 "
+"없습니다"
-#: git-submodule.sh:645
+#: git-submodule.sh:650
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "하위 모듈 경로 '$displaypath'에서 가져올 수 없습니다"
-#: git-submodule.sh:651
+#: git-submodule.sh:656
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Direct fetching of that commit failed."
-msgstr "'$displaypath' 하위 모듈 경로에서 가져왔지만, $sha1 커밋이 들어있지 않습니다. 이 커밋을 직접 가져오는데 실패했습니다."
+msgstr ""
+"'$displaypath' 하위 모듈 경로에서 가져왔지만, $sha1 커밋이 들어있지 않습니"
+"다. 이 커밋을 직접 가져오는데 실패했습니다."
-#: git-submodule.sh:658
+#: git-submodule.sh:663
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "하위 모듈 경로 '$displaypath'에서 '$sha1'을(를) 체크아웃할 수 없습니다"
-#: git-submodule.sh:659
+#: git-submodule.sh:664
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "하위 모듈 경로 '$displaypath': '$sha1' 체크아웃"
-#: git-submodule.sh:663
+#: git-submodule.sh:668
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "하위 모듈 경로 '$displaypath'에서 '$sha1'을(를) 리베이스할 수 없습니다"
-#: git-submodule.sh:664
+#: git-submodule.sh:669
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "하위 모듈 경로 '$displaypath': '$sha1'(으)로 리베이스"
-#: git-submodule.sh:669
+#: git-submodule.sh:674
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "하위 모듈 경로 '$displaypath'에서 '$sha1' 병합할 수 없습니다"
-#: git-submodule.sh:670
+#: git-submodule.sh:675
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "하위 모듈 경로 '$displaypath': '$sha1'에서 병합"
-#: git-submodule.sh:675
+#: git-submodule.sh:680
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr "'$command $sha1' 실행이 하위 모듈 경로 '$displaypath'에서 실패했습니다"
-#: git-submodule.sh:676
+#: git-submodule.sh:681
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "하위 모듈 경로 '$displaypath': '$command $sha1'"
-#: git-submodule.sh:707
+#: git-submodule.sh:712
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "재귀적으로 하위 모듈 경로 '$displaypath'에 들어가는데 실패했습니다"
-#: git-submodule.sh:815
+#: git-submodule.sh:820
msgid "The --cached option cannot be used with the --files option"
msgstr "--cached 옵션은 --files 옵션과 같이 쓸 수 없습니다"
-#: git-submodule.sh:867
+#: git-submodule.sh:872
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "예상치 못한 모드 $mod_dst"
-#: git-submodule.sh:887
+#: git-submodule.sh:892
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " 경고: '$display_name'에 '$sha1_src' 커밋이 들어있지 않습니다"
-#: git-submodule.sh:890
+#: git-submodule.sh:895
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " 경고: '$display_name'에 '$sha1_dst' 커밋이 들어있지 않습니다"
-#: git-submodule.sh:893
+#: git-submodule.sh:898
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" 경고: '$display_name'에 '$sha1_src' 및 '$sha1_dst' 커밋이 들어있지 않습니다"
-#: git-submodule.sh:918
-msgid "blob"
-msgstr "블롭"
-
-#: git-submodule.sh:1040
+#: git-submodule.sh:1045
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "재귀적으로 하위 모듈 경로 '$sm_path'에 들어가는데 실패했습니다"
-#: git-submodule.sh:1107
+#: git-submodule.sh:1112
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "하위 모듈 URL을 '$displaypath'에 대해 동기화"
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
-msgstr "\n줄을 제거하지 않습니다. 커밋을 제거하려면 명시적으로 'drop'을 사용하십시오.\n"
+msgstr ""
+"\n"
+"줄을 제거하지 않습니다. 커밋을 제거하려면 명시적으로 'drop'을 사용하십시오.\n"
#: git-rebase--interactive.sh:166
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
-msgstr "\n여기 줄을 제거하면 해당 커밋을 잃어버립니다!\n"
+msgstr ""
+"\n"
+"여기 줄을 제거하면 해당 커밋을 잃어버립니다!\n"
#: git-rebase--interactive.sh:202
#, sh-format
msgid "Could not pick $sha1"
msgstr "$sha1을 빼오기 할 수 없습니다"
-#: git-rebase--interactive.sh:408 git-rebase--interactive.sh:474
-msgid "This is the 1st commit message:"
-msgstr "1번째 커밋 메시지입니다:"
-
-#: git-rebase--interactive.sh:409
-msgid "This is the 2nd commit message:"
-msgstr "2번째 커밋 메시지입니다:"
-
-#: git-rebase--interactive.sh:410
-msgid "This is the 3rd commit message:"
-msgstr "3번째 커밋 메시지입니다:"
-
-#: git-rebase--interactive.sh:411
-msgid "This is the 4th commit message:"
-msgstr "4번째 커밋 메시지입니다:"
+#: git-rebase--interactive.sh:407
+#, sh-format
+msgid "This is the commit message #${n}:"
+msgstr "커밋 메시지 #${n}번입니다:"
#: git-rebase--interactive.sh:412
-msgid "This is the 5th commit message:"
-msgstr "5번째 커밋 메시지입니다:"
-
-#: git-rebase--interactive.sh:413
-msgid "This is the 6th commit message:"
-msgstr "6번째 커밋 메시지입니다:"
-
-#: git-rebase--interactive.sh:414
-msgid "This is the 7th commit message:"
-msgstr "7번째 커밋 메시지입니다:"
-
-#: git-rebase--interactive.sh:415
-msgid "This is the 8th commit message:"
-msgstr "8번째 커밋 메시지입니다:"
-
-#: git-rebase--interactive.sh:416
-msgid "This is the 9th commit message:"
-msgstr "9번째 커밋 메시지입니다:"
-
-#: git-rebase--interactive.sh:417
-msgid "This is the 10th commit message:"
-msgstr "10번째 커밋 메시지입니다:"
-
-#. TRANSLATORS: if the language you are translating into
-#. doesn't allow you to compose a sentence in this fashion,
-#. consider translating as if this and the following few strings
-#. were "This is the commit message ${n}:"
-#: git-rebase--interactive.sh:422
#, sh-format
-msgid "This is the ${n}th commit message:"
-msgstr "${n}번째 커밋 메시지입니다:"
+msgid "The commit message #${n} will be skipped:"
+msgstr "#${n}번째 커밋 메시지를 건너뜁니다:"
#: git-rebase--interactive.sh:423
#, sh-format
-msgid "This is the ${n}st commit message:"
-msgstr "${n}번째 커밋 메시지입니다:"
-
-#: git-rebase--interactive.sh:424
-#, sh-format
-msgid "This is the ${n}nd commit message:"
-msgstr "${n}번째 커밋 메시지입니다:"
-
-#: git-rebase--interactive.sh:425
-#, sh-format
-msgid "This is the ${n}rd commit message:"
-msgstr "${n}번째 커밋 메시지입니다:"
-
-#: git-rebase--interactive.sh:426
-#, sh-format
-msgid "This is the commit message ${n}:"
-msgstr "커밋 메시지 ${n}입니다:"
-
-#: git-rebase--interactive.sh:432
-msgid "The 1st commit message will be skipped:"
-msgstr "1번째 커밋 메시지를 건너뜁니다:"
-
-#: git-rebase--interactive.sh:433
-msgid "The 2nd commit message will be skipped:"
-msgstr "2번째 커밋 메시지를 건너뜁니다:"
-
-#: git-rebase--interactive.sh:434
-msgid "The 3rd commit message will be skipped:"
-msgstr "3번째 커밋 메시지를 건너뜁니다:"
-
-#: git-rebase--interactive.sh:435
-msgid "The 4th commit message will be skipped:"
-msgstr "4번째 커밋 메시지를 건너뜁니다:"
-
-#: git-rebase--interactive.sh:436
-msgid "The 5th commit message will be skipped:"
-msgstr "5번째 커밋 메시지를 건너뜁니다:"
-
-#: git-rebase--interactive.sh:437
-msgid "The 6th commit message will be skipped:"
-msgstr "6번째 커밋 메시지를 건너뜁니다:"
-
-#: git-rebase--interactive.sh:438
-msgid "The 7th commit message will be skipped:"
-msgstr "7번째 커밋 메시지를 건너뜁니다:"
-
-#: git-rebase--interactive.sh:439
-msgid "The 8th commit message will be skipped:"
-msgstr "8번째 커밋 메시지를 건너뜁니다:"
-
-#: git-rebase--interactive.sh:440
-msgid "The 9th commit message will be skipped:"
-msgstr "9번째 커밋 메시지를 건너뜁니다:"
-
-#: git-rebase--interactive.sh:441
-msgid "The 10th commit message will be skipped:"
-msgstr "10번째 커밋 메시지를 건너뜁니다:"
-
-#. TRANSLATORS: if the language you are translating into
-#. doesn't allow you to compose a sentence in this fashion,
-#. consider translating as if this and the following few strings
-#. were "The commit message ${n} will be skipped:"
-#: git-rebase--interactive.sh:446
-#, sh-format
-msgid "The ${n}th commit message will be skipped:"
-msgstr "${n}번째 커밋 메시지를 건너뜁니다:"
-
-#: git-rebase--interactive.sh:447
-#, sh-format
-msgid "The ${n}st commit message will be skipped:"
-msgstr "${n}번째 커밋 메시지를 건너뜁니다:"
-
-#: git-rebase--interactive.sh:448
-#, sh-format
-msgid "The ${n}nd commit message will be skipped:"
-msgstr "${n}번째 커밋 메시지를 건너뜁니다:"
-
-#: git-rebase--interactive.sh:449
-#, sh-format
-msgid "The ${n}rd commit message will be skipped:"
-msgstr "${n}번째 커밋 메시지를 건너뜁니다:"
-
-#: git-rebase--interactive.sh:450
-#, sh-format
-msgid "The commit message ${n} will be skipped:"
-msgstr "${n}번째 커밋 메시지를 건너뜁니다:"
-
-#: git-rebase--interactive.sh:462
-#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] "커밋 $count개가 섞인 결과입니다."
-#: git-rebase--interactive.sh:470
+#: git-rebase--interactive.sh:431
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "$fixup_msg를 쓸 수 없습니다"
-#: git-rebase--interactive.sh:473
+#: git-rebase--interactive.sh:434
msgid "This is a combination of 2 commits."
msgstr "커밋 2개가 섞인 결과입니다."
-#: git-rebase--interactive.sh:514 git-rebase--interactive.sh:557
-#: git-rebase--interactive.sh:560
+#: git-rebase--interactive.sh:435
+msgid "This is the 1st commit message:"
+msgstr "1번째 커밋 메시지입니다:"
+
+#: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518
+#: git-rebase--interactive.sh:521
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "다음을 적용할(apply) 수 없습니다: $sha1... $rest"
-#: git-rebase--interactive.sh:588
+#: git-rebase--interactive.sh:549
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
"대부분의 경우 빈 커밋 메시지 때문이거나, 또는 커밋 전 후크가 실패했기\n"
"때문입니다. 커밋 메시지를 수정하기 전에 이 문제를 먼저 해결해야 합니다."
-#: git-rebase--interactive.sh:603
+#: git-rebase--interactive.sh:564
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "다음에서 멈춥니다: $sha1_abbrev... $rest"
-#: git-rebase--interactive.sh:618
+#: git-rebase--interactive.sh:579
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "이전 커밋 없이 '$squash_style' 수행할 수 없습니다"
-#: git-rebase--interactive.sh:660
+#: git-rebase--interactive.sh:621
#, sh-format
msgid "Executing: $rest"
msgstr "실행 중: $rest"
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:629
#, sh-format
msgid "Execution failed: $rest"
msgstr "실행 실패: $rest"
-#: git-rebase--interactive.sh:670
+#: git-rebase--interactive.sh:631
msgid "and made changes to the index and/or the working tree"
msgstr "그리고 인덱스 그리고/또는 작업 폴더에 변경 사항이 있습니다"
-#: git-rebase--interactive.sh:672
+#: git-rebase--interactive.sh:633
msgid ""
"You can fix the problem, and then run\n"
"\n"
"\tgit rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:685
+#: git-rebase--interactive.sh:646
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--interactive.sh:696
+#: git-rebase--interactive.sh:657
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "알 수 없는 명령: $command $sha1 $rest"
-#: git-rebase--interactive.sh:697
+#: git-rebase--interactive.sh:658
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "'git rebase --edit-todo' 명령으로 바로잡으십시오."
-#: git-rebase--interactive.sh:732
+#: git-rebase--interactive.sh:693
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "성공적으로 리베이스했고 $head_name 업데이트했습니다."
-#: git-rebase--interactive.sh:779
+#: git-rebase--interactive.sh:740
msgid "Could not skip unnecessary pick commands"
msgstr "불필요한 빼오기 명령을 건너뛸 수 없습니다"
-#: git-rebase--interactive.sh:937
+#: git-rebase--interactive.sh:898
#, sh-format
msgid ""
"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
"경고: 다음 줄에서 해당 SHA-1이 없거나 커밋이 아닙니다:\n"
" - $line"
-#: git-rebase--interactive.sh:970
+#: git-rebase--interactive.sh:931
#, sh-format
msgid ""
"Warning: the command isn't recognized in the following line:\n"
"경고: 다음 줄에서 명령어가 무엇인지 알 수 없습니다:\n"
" - $line"
-#: git-rebase--interactive.sh:1009
+#: git-rebase--interactive.sh:970
msgid "could not detach HEAD"
msgstr "HEAD는 분리할 수 없습니다"
-#: git-rebase--interactive.sh:1047
+#: git-rebase--interactive.sh:1008
msgid ""
"Warning: some commits may have been dropped accidentally.\n"
"Dropped commits (newer to older):"
"경고: 일부 커밋이 의도치 않게 버려졌을 수도 있습니다.\n"
"버려진 커밋 (최근에서 과거 순서):"
-#: git-rebase--interactive.sh:1055
+#: git-rebase--interactive.sh:1016
msgid ""
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
"\n"
"warnings.\n"
"The possible behaviours are: ignore, warn, error."
msgstr ""
-"이 메시지를 보지 않으려면, \"drop\"을 사용해 명시적으로 커밋을 제거하십시오.\n"
+"이 메시지를 보지 않으려면, \"drop\"을 사용해 명시적으로 커밋을 제거하십시"
+"오.\n"
"\n"
-"'git config rebase.missingCommitsCheck' 명령으로 경고 단계를 바꿀 수 있습니다.\n"
+"'git config rebase.missingCommitsCheck' 명령으로 경고 단계를 바꿀 수 있습니"
+"다.\n"
"가능한 동작은: ignore, warn, error"
-#: git-rebase--interactive.sh:1066
+#: git-rebase--interactive.sh:1027
#, sh-format
msgid ""
"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
"Ignoring."
-msgstr "rebase.missingCommitsCheck 옵션에 대해 인식할 수 없는 $check_level 설정. 무시합니다."
+msgstr ""
+"rebase.missingCommitsCheck 옵션에 대해 인식할 수 없는 $check_level 설정. 무시"
+"합니다."
-#: git-rebase--interactive.sh:1083
-msgid "You can fix this with 'git rebase --edit-todo'."
-msgstr "'git rebase --edit-todo' 명령으로 바로잡을 수 있습니다."
+#: git-rebase--interactive.sh:1044
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'."
+msgstr ""
+"'git rebase --edit-todo' 명령으로 바로잡을 수 있고 'git rebase --continue' 명"
+"령을 실행합니다."
-#: git-rebase--interactive.sh:1084
+#: git-rebase--interactive.sh:1045
msgid "Or you can abort the rebase with 'git rebase --abort'."
msgstr "아니면 'git rebase --abort' 명령으로 리베이스를 중지할 수도 있습니다."
-#: git-rebase--interactive.sh:1108
+#: git-rebase--interactive.sh:1069
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "CHERRY_PICK_HEAD를 제거할 수 없습니다"
-#: git-rebase--interactive.sh:1113
+#: git-rebase--interactive.sh:1074
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
"\n"
" git commit $gpg_sign_opt_quoted\n"
"\n"
-"In both case, once you're done, continue with:\n"
+"In both cases, once you're done, continue with:\n"
"\n"
" git rebase --continue\n"
msgstr ""
"\n"
" git rebase --continue\n"
-#: git-rebase--interactive.sh:1130
+#: git-rebase--interactive.sh:1091
msgid "Error trying to find the author identity to amend commit"
msgstr "커밋을 수정한 작성자 신원을 찾는데 오류"
-#: git-rebase--interactive.sh:1135
+#: git-rebase--interactive.sh:1096
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
"작업 폴더에 커밋하지 않은 변경 사항이 있습니다. 이 사항을 먼저\n"
"커밋하고 'git rebase --continue' 명령을 다시 실행하십시오."
-#: git-rebase--interactive.sh:1140 git-rebase--interactive.sh:1144
+#: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105
msgid "Could not commit staged changes."
msgstr "스테이징한 변경 사항은 커밋할 수 없습니다."
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:1129
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1176 git-rebase--interactive.sh:1337
+#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1295
msgid "Could not execute editor"
msgstr "편집기를 실행할 수 없습니다"
-#: git-rebase--interactive.sh:1184
-msgid "You need to set your committer info first"
-msgstr "먼저 커밋하는 사람 정보를 설정해야 합니다"
-
-#: git-rebase--interactive.sh:1192
+#: git-rebase--interactive.sh:1150
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "$switch_to를 체크아웃할 수 없습니다"
-#: git-rebase--interactive.sh:1197
+#: git-rebase--interactive.sh:1155
msgid "No HEAD?"
msgstr "HEAD가 없습니다?"
-#: git-rebase--interactive.sh:1198
+#: git-rebase--interactive.sh:1156
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "임시로 $state_dir 디렉터리를 만들 수 없습니다"
-#: git-rebase--interactive.sh:1200
+#: git-rebase--interactive.sh:1158
msgid "Could not mark as interactive"
msgstr "대화형으로 표시할 수 없습니다."
-#: git-rebase--interactive.sh:1210 git-rebase--interactive.sh:1215
+#: git-rebase--interactive.sh:1168 git-rebase--interactive.sh:1173
msgid "Could not init rewritten commits"
msgstr "다시 작성된 커밋을 초기화할 수 없습니다"
-#: git-rebase--interactive.sh:1315
+#: git-rebase--interactive.sh:1273
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "리베이스 $shortrevisions, $shortonto 위로 (명령 $todocount개)"
-#: git-rebase--interactive.sh:1320
+#: git-rebase--interactive.sh:1278
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"\n"
-msgstr "\n하지만 모두 제거할 경우, 리베이스를 중지합니다.\n\n"
+msgstr ""
+"\n"
+"하지만 모두 제거할 경우, 리베이스를 중지합니다.\n"
+"\n"
-#: git-rebase--interactive.sh:1327
+#: git-rebase--interactive.sh:1285
msgid "Note that empty commits are commented out"
msgstr "단 빈 커밋은 주석 처리되었습니다."
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "브랜치를 다시 쓸 수 없습니다: 스테이징하지 않은 변경 사항이 있습니다."
+#: git-sh-setup.sh:226
+msgid "Cannot pull with rebase: You have unstaged changes."
+msgstr ""
+"리베이스로 풀을 할 수 없습니다: 스테이징하지 않은 변경 사항이 있습니다."
+
#: git-sh-setup.sh:229
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr "리베이스할 수 없습니다: 인덱스에 커밋하지 않은 변경 사항이 있습니다."
+#: git-sh-setup.sh:245
+msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+msgstr ""
+"리베이스로 풀을 할 수 없습니다: 인덱스에 커밋하지 않은 변경 사항이 있습니다."
+
#: git-sh-setup.sh:248
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr "$action 할 수 없습니다: 인덱스에 커밋하지 않은 변경 사항이 있습니다."
+#: git-sh-setup.sh:252
+msgid "Additionally, your index contains uncommitted changes."
+msgstr "추가로, 인덱스에 커밋하지 않은 변경 사항이 있습니다."
+
#: git-sh-setup.sh:372
msgid "You need to run this command from the toplevel of the working tree."
msgstr "이 명령은 작업 폴더의 최상위에서만 쓸 수 있습니다."
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-08-27 23:21+0800\n"
-"PO-Revision-Date: 2016-09-03 12:00+0000\n"
+"POT-Creation-Date: 2016-11-25 22:50+0800\n"
+"PO-Revision-Date: 2016-11-25 22:58+0800\n"
"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
"Language-Team: Portuguese\n"
"Language: pt\n"
" git checkout -b <novo-nome-ramo>\n"
"\n"
-#: archive.c:12
-msgid "git archive [<options>] <tree-ish> [<path>...]"
-msgstr "git archive [<opções>] <árvore-etc> [<caminho>...]"
+#: apply.c:57
+#, c-format
+msgid "unrecognized whitespace option '%s'"
+msgstr "opção de espaço em branco não reconhecida '%s'"
-#: archive.c:13
-msgid "git archive --list"
-msgstr "git archive --list"
+#: apply.c:73
+#, c-format
+msgid "unrecognized whitespace ignore option '%s'"
+msgstr "opção de ignorar espaço em branco não reconhecida '%s'"
-#: archive.c:14
-msgid ""
-"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
-msgstr ""
-"git archive --remote <repo> [--exec <cmd>] [<opções>] <árvore-etc> "
-"[<caminho>...]"
+#: apply.c:125
+msgid "--reject and --3way cannot be used together."
+msgstr "--reject e --3way não podem ser usados juntos."
-#: archive.c:15
-msgid "git archive --remote <repo> [--exec <cmd>] --list"
-msgstr "git archive --remote <repo> [--exec <cmd>] --list"
+#: apply.c:127
+msgid "--cached and --3way cannot be used together."
+msgstr "--cached e --3way não podem ser usados juntos."
-#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327
-#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr "o especificador de caminho '%s' não corresponde a nenhum ficheiro"
+#: apply.c:130
+msgid "--3way outside a repository"
+msgstr "--3way fora de um repositório"
-#: archive.c:429
-msgid "fmt"
-msgstr "fmt"
+#: apply.c:141
+msgid "--index outside a repository"
+msgstr "--index fora de um repositório"
-#: archive.c:429
-msgid "archive format"
-msgstr "formato do arquivo"
+#: apply.c:144
+msgid "--cached outside a repository"
+msgstr "--cached fora de um repositório"
-#: archive.c:430 builtin/log.c:1422
-msgid "prefix"
-msgstr "prefixo"
+#: apply.c:845
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr "Não é possível preparar a regexp de carimbo de data/hora %s"
-#: archive.c:431
-msgid "prepend prefix to each pathname in the archive"
-msgstr "preceder o prefixo a cada nome de caminho dentro do arquivo"
+#: apply.c:854
+#, c-format
+msgid "regexec returned %d for input: %s"
+msgstr "regexec retornou %d para a entra: %s"
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553 builtin/blame.c:2554
-#: builtin/config.c:59 builtin/fast-export.c:987 builtin/fast-export.c:989
-#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:460
-#: builtin/ls-files.c:463 builtin/notes.c:399 builtin/notes.c:562
-#: builtin/read-tree.c:109 parse-options.h:153
-msgid "file"
-msgstr "ficheiro"
+#: apply.c:938
+#, c-format
+msgid "unable to find filename in patch at line %d"
+msgstr "não foi possível encontrar o nome do ficheiro no patch na linha %d"
-#: archive.c:433 builtin/archive.c:89
-msgid "write the archive to this file"
-msgstr "escrever o arquivo para este ficheiro"
+#: apply.c:977
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
+msgstr ""
+"git apply: git-diff incorreto - esperava-se /dev/null, obteve-se %s na linha "
+"%d"
-#: archive.c:435
-msgid "read .gitattributes in working directory"
-msgstr "ler .gitattributes do diretório de trabalho"
+#: apply.c:983
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgstr ""
+"git apply: git-diff incorreto - o nome do novo ficheiro na linha %d é "
+"inconsistente"
-#: archive.c:436
-msgid "report archived files on stderr"
-msgstr "listar ficheiros arquivados para stderr"
+#: apply.c:984
+#, c-format
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgstr ""
+"git apply: git-diff incorreto - o nome do ficheiro antigo na linha %d é "
+"inconsistente"
-#: archive.c:437
-msgid "store only"
-msgstr "armazenar apenas"
+#: apply.c:990
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null on line %d"
+msgstr "git apply: git-diff incorreto - esperava-se /dev/null na linha %d"
-#: archive.c:438
-msgid "compress faster"
-msgstr "compressão rápida"
+#: apply.c:1488
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recontagem: linha inesperada: %.*s"
-#: archive.c:446
-msgid "compress better"
-msgstr "compressão ótima"
+#: apply.c:1557
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "fragmento de patch sem cabeçalho na linha %d: %.*s"
-#: archive.c:449
-msgid "list supported archive formats"
-msgstr "listar formatos de arquivo suportados"
+#: apply.c:1577
+#, 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] ""
+"o cabeçalho do git diff não revelou o nome do ficheiro depois de se remover "
+"%d componente do caminho (linha %d)"
+msgstr[1] ""
+"o cabeçalho do git diff não revelou o nome do ficheiro depois de se remover "
+"%d componentes de caminho (linha %d)"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
-#: builtin/submodule--helper.c:832
-msgid "repo"
-msgstr "repo"
+#: apply.c:1589
+#, c-format
+msgid "git diff header lacks filename information (line %d)"
+msgstr "o cabeçalho do git diff não revela o nome do ficheiro (linha %d)"
-#: archive.c:452 builtin/archive.c:91
-msgid "retrieve the archive from remote repository <repo>"
-msgstr "obter o arquivo a partir do repositório remoto <repo>"
+#: apply.c:1759
+msgid "new file depends on old contents"
+msgstr "o novo ficheiro depende de conteúdos antigos"
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483
-msgid "command"
-msgstr "comando"
+#: apply.c:1761
+msgid "deleted file still has contents"
+msgstr "o ficheiro eliminado ainda tem conteúdos"
-#: archive.c:454 builtin/archive.c:93
-msgid "path to the remote git-upload-archive command"
-msgstr "caminho para o comando git-upload-archive no remoto"
+#: apply.c:1795
+#, c-format
+msgid "corrupt patch at line %d"
+msgstr "patch corrompido na linha %d"
-#: archive.c:461
-msgid "Unexpected option --remote"
-msgstr "Opção inesperada --remote"
+#: apply.c:1832
+#, c-format
+msgid "new file %s depends on old contents"
+msgstr "o novo ficheiro %s depende de conteúdos antigos"
-#: archive.c:463
-msgid "Option --exec can only be used together with --remote"
-msgstr "A opção --exec só pode ser usada em conjunto com --remote"
+#: apply.c:1834
+#, c-format
+msgid "deleted file %s still has contents"
+msgstr "o ficheiro eliminado %s ainda tem conteúdos"
-#: archive.c:465
-msgid "Unexpected option --output"
-msgstr "Opção inesperada --output"
+#: apply.c:1837
+#, c-format
+msgid "** warning: file %s becomes empty but is not deleted"
+msgstr "** aviso: o ficheiro %s ficará vazio, mas não será eliminado"
-#: archive.c:487
+#: apply.c:1984
#, c-format
-msgid "Unknown archive format '%s'"
-msgstr "Formato de arquivo desconhecido '%s'"
+msgid "corrupt binary patch at line %d: %.*s"
+msgstr "patch binário corrompido na linha %d: %.*s"
-#: archive.c:494
+#: apply.c:2021
#, c-format
-msgid "Argument not supported for format '%s': -%d"
-msgstr "Argumento não suportado para o formato '%s': -%d"
+msgid "unrecognized binary patch at line %d"
+msgstr "patch binário não reconhecido na linha %d"
-#: attr.c:263
-msgid ""
-"Negative patterns are ignored in git attributes\n"
-"Use '\\!' for literal leading exclamation."
-msgstr ""
-"Os padrões negativos são ignorados nos atributos do git\n"
-"Use '\\!' para uma exclamação literal à esquerda."
+#: apply.c:2182
+#, c-format
+msgid "patch with only garbage at line %d"
+msgstr "patch incompreensível na linha %d"
-#: bisect.c:441
+#: apply.c:2274
#, c-format
-msgid "Could not open file '%s'"
-msgstr "Não foi possível abrir o ficheiro '%s'"
+msgid "unable to read symlink %s"
+msgstr "não é possível ler a ligação simbólica %s"
-#: bisect.c:446
+#: apply.c:2278
#, c-format
-msgid "Badly quoted content in file '%s': %s"
-msgstr "Conteúdo incorretamente citado no ficheiro '%s': %s"
+msgid "unable to open or read %s"
+msgstr "não é possível abrir ou ler %s"
-#: bisect.c:655
+#: apply.c:2931
#, c-format
-msgid "We cannot bisect more!\n"
-msgstr "Não se está a bissetar mais!\n"
+msgid "invalid start of line: '%c'"
+msgstr "início de linha inválido: '%c'"
-#: bisect.c:708
+#: apply.c:3050
#, c-format
-msgid "Not a valid commit name %s"
-msgstr "%s não é um nome de commit válido"
+msgid "Hunk #%d succeeded at %d (offset %d line)."
+msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
+msgstr[0] "Excerto nº%d bem sucedido na linha %d (%d linha deslocada)."
+msgstr[1] "Excerto nº%d bem sucedido na linha %d (%d linhas deslocadas)."
-#: bisect.c:732
+#: apply.c:3062
#, c-format
-msgid ""
-"The merge base %s is bad.\n"
-"This means the bug has been fixed between %s and [%s].\n"
-msgstr ""
-"A base de integração %s é má (bad).\n"
-"Significa que o bug foi corrigido entre %s e [%s].\n"
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
+msgstr "Contexto reduzido para (%ld/%ld) para aplicar o fragmento em %d"
-#: bisect.c:737
+#: apply.c:3068
#, c-format
msgid ""
-"The merge base %s is new.\n"
-"The property has changed between %s and [%s].\n"
+"while searching for:\n"
+"%.*s"
msgstr ""
-"A base de integração %s é nova (new).\n"
-"A propriedade foi mudada entre %s e [%s].\n"
+"ao procura por:\n"
+"%.*s"
-#: bisect.c:742
+#: apply.c:3090
#, c-format
-msgid ""
-"The merge base %s is %s.\n"
-"This means the first '%s' commit is between %s and [%s].\n"
+msgid "missing binary patch data for '%s'"
+msgstr "falta de dados do patch binário '%s'"
+
+#: apply.c:3098
+#, c-format
+msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
-"A base de integração %s é %s.\n"
-"Significa que o primeiro commit '%s' está entre %s e [%s].\n"
+"não é possível aplicar o reverso de um patch binário a '%s' sem o excerto "
+"reverso"
-#: bisect.c:750
+#: apply.c:3144
#, c-format
-msgid ""
-"Some %s revs are not ancestor of the %s rev.\n"
-"git bisect cannot work properly in this case.\n"
-"Maybe you mistook %s and %s revs?\n"
+msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
-"Algumas revisões %s não antecedem a revisão %s.\n"
-"git bisect não pode funcionar corretamente nesta situação.\n"
-"Talvez confundiu revisões %s e %s?\n"
+"não é possível aplicar patch binário a '%s' sem linha de índice completa"
-#: bisect.c:763
+#: apply.c:3154
#, 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."
+"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
-"tem-se que saltar a base de integração entre %s e [%s].\n"
-"Portanto não se pode ter a certeza que o primeiro commit %s está entre %s e "
-"%s.\n"
-"Continua-se de qualquer maneira."
+"o patch aplica-se a '%s' (%s), que não corresponde aos conteúdos atuais."
-#: bisect.c:798
+#: apply.c:3162
#, c-format
-msgid "Bisecting: a merge base must be tested\n"
-msgstr "A bissetar: uma base de integração tem de ser testada\n"
+msgid "the patch applies to an empty '%s' but it is not empty"
+msgstr "o patch aplica-se a um '%s' vazio mas não está vazio"
-#: bisect.c:849
+#: apply.c:3180
#, c-format
-msgid "a %s revision is needed"
-msgstr "precisa-se de uma revisão %s"
+msgid "the necessary postimage %s for '%s' cannot be read"
+msgstr "não é possível ler a postimage necessária %s de '%s'"
-#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
+#: apply.c:3193
#, c-format
-msgid "could not create file '%s'"
-msgstr "não foi possível criar o ficheiro '%s'"
+msgid "binary patch does not apply to '%s'"
+msgstr "o patch binário não foi aplicado corretamente a '%s'"
-#: bisect.c:917
+#: apply.c:3199
#, c-format
-msgid "could not read file '%s'"
-msgstr "não foi possível ler o ficheiro '%s'"
-
-#: bisect.c:947
-msgid "reading bisect refs failed"
-msgstr "falha ao ler referências bissetadas"
+msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
+msgstr ""
+"o patch binário aplicado a '%s' gera resultados incorretos (esperava-se %s, "
+"obteve-se %s)"
-#: bisect.c:967
+#: apply.c:3220
#, c-format
-msgid "%s was both %s and %s\n"
-msgstr "%s era %s e %s em simultâneo\n"
+msgid "patch failed: %s:%ld"
+msgstr "falha ao aplicar o patch: %s:%ld"
-#: bisect.c:975
+#: apply.c:3342
#, c-format
-msgid ""
-"No testable commit found.\n"
-"Maybe you started with bad path parameters?\n"
-msgstr ""
-"Nenhum commit testável encontrado.\n"
-"Talvez tenha começado com parâmetros de caminho incorretos?\n"
+msgid "cannot checkout %s"
+msgstr "não é possível extrair %s"
-#: bisect.c:994
+#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248
#, c-format
-msgid "(roughly %d step)"
-msgid_plural "(roughly %d steps)"
-msgstr[0] "(aproximadamente %d passo)"
-msgstr[1] "(aproximadamente %d passos)"
+msgid "failed to read %s"
+msgstr "falha ao ler %s"
-#. TRANSLATORS: the last %s will be replaced with
-#. "(roughly %d steps)" translation
-#: bisect.c:998
+#: apply.c:3398
#, 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] "A bissetar: falta %d revisão para testar depois desta %s\n"
-msgstr[1] "A bissetar: faltam %d revisões para testar depois desta %s\n"
+msgid "reading from '%s' beyond a symbolic link"
+msgstr "a ler '%s' indicado por uma ligação simbólica"
-#: branch.c:53
+#: apply.c:3427 apply.c:3667
#, 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"
-"Após resolver a causa do erro, pode tentar corrigir\n"
-"o ramo remoto que deve ser seguido, invocando\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
+msgid "path %s has been renamed/deleted"
+msgstr "o caminho %s foi eliminado ou mudou de nome"
-#: branch.c:67
+#: apply.c:3510 apply.c:3681
#, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "O ramo %s não foi configurado com ramo a montante dele próprio."
+msgid "%s: does not exist in index"
+msgstr "%s: não existe no índice"
-#: branch.c:93
+#: apply.c:3519 apply.c:3689
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
-msgstr "Ramo %s configurado para seguir o ramo remoto %s de %s por rebase."
+msgid "%s: does not match index"
+msgstr "%s: não tem correspondência no índice"
-#: branch.c:94
+#: apply.c:3554
+msgid "repository lacks the necessary blob to fall back on 3-way merge."
+msgstr ""
+"o repositório não tem o blob necessário para recorrer a integração com 3 "
+"pontos."
+
+#: apply.c:3557
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
-msgstr "Ramo %s configurado para seguir o ramo remoto %s de %s."
+msgid "Falling back to three-way merge...\n"
+msgstr "A recorrer a integração com 3 pontos...\n"
-#: branch.c:98
+#: apply.c:3573 apply.c:3577
#, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
-msgstr "Ramo %s configurado para seguir o ramo local %s por rebase."
+msgid "cannot read the current contents of '%s'"
+msgstr "não é possível ler o conteúdo atual de '%s'"
-#: branch.c:99
+#: apply.c:3589
#, c-format
-msgid "Branch %s set up to track local branch %s."
-msgstr "Ramo %s configurado para seguir o ramo local %s."
+msgid "Failed to fall back on three-way merge...\n"
+msgstr "Falha a recorrer a integração com 3 pontos...\n"
-#: branch.c:104
+#: apply.c:3603
#, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
-msgstr "Ramo %s configurado para seguir a referência remota %s por rebase."
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr "Patch aplicado a '%s' com conflitos.\n"
-#: branch.c:105
+#: apply.c:3608
#, c-format
-msgid "Branch %s set up to track remote ref %s."
-msgstr "Ramo %s configurado para seguir a referência remota %s."
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr "Patch aplicado a '%s' com sucesso.\n"
-#: branch.c:109
+#: apply.c:3634
+msgid "removal patch leaves file contents"
+msgstr "patch de remoção deixa conteúdos no ficheiro"
+
+#: apply.c:3706
#, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
-msgstr "Ramo %s configurado para seguir a referência local %s por rebase."
+msgid "%s: wrong type"
+msgstr "%s: tipo errado"
-#: branch.c:110
+#: apply.c:3708
#, c-format
-msgid "Branch %s set up to track local ref %s."
-msgstr "Ramo %s configurado para seguir a referência local %s."
+msgid "%s has type %o, expected %o"
+msgstr "%s é do tipo %o, esperado %o"
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "Não foi possível escrever a configuração do ramo a montante"
+#: apply.c:3859 apply.c:3861
+#, c-format
+msgid "invalid path '%s'"
+msgstr "caminho inválido '%s'"
-#: branch.c:156
+#: apply.c:3917
#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr "Não seguido: informação da referência %s ambígua"
+msgid "%s: already exists in index"
+msgstr "%s: já existe no índice"
-#: branch.c:185
+#: apply.c:3920
#, c-format
-msgid "'%s' is not a valid branch name."
-msgstr "'%s' não é um nome válido para um ramo."
+msgid "%s: already exists in working directory"
+msgstr "%s: já existe no diretório de trabalho"
-#: branch.c:190
+#: apply.c:3940
#, c-format
-msgid "A branch named '%s' already exists."
-msgstr "Já existe um ramo designado '%s'."
+msgid "new mode (%o) of %s does not match old mode (%o)"
+msgstr "o novo modo (%o) de %s não corresponde ao modo antigo (%o)"
-#: branch.c:198
-msgid "Cannot force update the current branch."
-msgstr "Não é possível forçar a atualização do ramo atual."
+#: apply.c:3945
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o) of %s"
+msgstr "o novo modo (%o) de %s não corresponde ao modo antigo (%o) de %s"
-#: branch.c:218
+#: apply.c:3965
#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
-msgstr ""
-"Não é possível configurar ramo a seguir; o ponto inicial '%s' não é um ramo."
+msgid "affected file '%s' is beyond a symbolic link"
+msgstr "o ficheiro afetado '%s' é indicado por uma ligação simbólica"
-#: branch.c:220
+#: apply.c:3969
#, c-format
-msgid "the requested upstream branch '%s' does not exist"
-msgstr "o ramo a montante solicitado '%s' não existe"
+msgid "%s: patch does not apply"
+msgstr "%s: patch não se aplica com sucesso"
-#: branch.c:222
-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"
-"Se pretende efetuar rebase do seu trabalho sobre um ramo\n"
-"a montante que já existe no remoto, pode ser necessário\n"
-"executar \"git fetch\" para obtê-lo.\n"
-"\n"
-"Se pretende publicar um novo ramo local que irá seguir\n"
-"o seu homólogo remoto, pode usar \"git push -u\" para configurar\n"
-"o respetivo ramo a montante, ao mesmo tempo que publica."
+#: apply.c:3984
+#, c-format
+msgid "Checking patch %s..."
+msgstr "A verificar o patch %s..."
-#: branch.c:266
+#: apply.c:4075
#, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "Nome de objeto inválido: '%s'."
+msgid "sha1 information is lacking or useless for submodule %s"
+msgstr "falta informação de sha1 ou não é útil para o submódulo %s"
-#: branch.c:286
+#: apply.c:4082
#, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "Nome de objeto ambíguo: '%s'."
+msgid "mode change for %s, which is not in current HEAD"
+msgstr "alteração de modo de %s que não está na HEAD atual"
-#: branch.c:291
+#: apply.c:4085
#, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "Ponto no ramo inválido: '%s'."
+msgid "sha1 information is lacking or useless (%s)."
+msgstr "falta informação de sha1 ou não é útil (%s)."
-#: branch.c:345
+#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
-msgid "'%s' is already checked out at '%s'"
-msgstr "'%s' foi já extraído em '%s'"
+msgid "make_cache_entry failed for path '%s'"
+msgstr "falha ao invocar make_cache_entry em '%s'"
-#: branch.c:364
+#: apply.c:4094
#, c-format
-msgid "HEAD of working tree %s is not updated"
-msgstr "HEAD da árvore de trabalho %s não está atualizada"
+msgid "could not add %s to temporary index"
+msgstr "não foi possível adicionar %s ao índice temporário"
-#: bundle.c:34
+#: apply.c:4104
#, c-format
-msgid "'%s' does not look like a v2 bundle file"
-msgstr "'%s' não parece ser um ficheiro bundle v2"
+msgid "could not write temporary index to %s"
+msgstr "não foi possível escrever índice temporário para %s"
-#: bundle.c:61
+#: apply.c:4242
#, c-format
-msgid "unrecognized header: %s%s (%d)"
-msgstr "cabeçalho não reconhecido: %s%s (%d)"
+msgid "unable to remove %s from index"
+msgstr "não é possível remover %s do índice"
-#: bundle.c:87 builtin/commit.c:778
+#: apply.c:4277
#, c-format
-msgid "could not open '%s'"
-msgstr "não foi possível abrir '%s'"
+msgid "corrupt patch for submodule %s"
+msgstr "patch corrompido no submódulo %s"
-#: bundle.c:139
-msgid "Repository lacks these prerequisite commits:"
-msgstr "O repositório não possuí estes commits pré-requisitados:"
+#: apply.c:4283
+#, c-format
+msgid "unable to stat newly created file '%s'"
+msgstr "não é possível obter estado do novo ficheiro criado '%s'"
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085
-#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348
-#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901
-#: builtin/merge.c:356 builtin/shortlog.c:170
-msgid "revision walk setup failed"
-msgstr "falha ao configurar percurso de revisões"
+#: apply.c:4291
+#, c-format
+msgid "unable to create backing store for newly created file %s"
+msgstr ""
+"não é possível criar armazenamento de segurança do ficheiro recém-criado %s"
-#: bundle.c:185
+#: apply.c:4297 apply.c:4441
#, c-format
-msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %d refs:"
-msgstr[0] "O bundle contém esta referência:"
-msgstr[1] "O bundle contém estas %d referências:"
+msgid "unable to add cache entry for %s"
+msgstr "não é possível adicionar %s à cache"
-#: bundle.c:192
-msgid "The bundle records a complete history."
-msgstr "O pacote regista um histórico completo."
+#: apply.c:4338
+#, c-format
+msgid "failed to write to '%s'"
+msgstr "falha ao escrever para '%s'"
-#: bundle.c:194
+#: apply.c:4342
#, c-format
-msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %d refs:"
-msgstr[0] "O bundle requer esta referência:"
-msgstr[1] "O bundle requer estas %d referências:"
+msgid "closing file '%s'"
+msgstr "a fechar o ficheiro '%s'"
-#: bundle.c:253
-msgid "Could not spawn pack-objects"
-msgstr "Não foi possível lançar pack-objects"
+#: apply.c:4412
+#, c-format
+msgid "unable to write file '%s' mode %o"
+msgstr "não é possível escrever o ficheiro '%s' com o modo %o"
-#: bundle.c:264
-msgid "pack-objects died"
-msgstr "pack-objects terminou inesperadamente"
+#: apply.c:4510
+#, c-format
+msgid "Applied patch %s cleanly."
+msgstr "Patch %s aplicado com sucesso."
-#: bundle.c:304
-msgid "rev-list died"
-msgstr "rev-list terminou inesperadamente"
+#: apply.c:4518
+msgid "internal error"
+msgstr "erro interno"
-#: bundle.c:353
+#: apply.c:4521
#, c-format
-msgid "ref '%s' is excluded by the rev-list options"
-msgstr "a referência '%s' é excluída pelas opções de rev-list"
+msgid "Applying patch %%s with %d reject..."
+msgid_plural "Applying patch %%s with %d rejects..."
+msgstr[0] "A aplicar patch %%s com %d rejeição..."
+msgstr[1] "A aplicar patch %%s com %d rejeições..."
-#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273
+#: apply.c:4532
#, c-format
-msgid "unrecognized argument: %s"
-msgstr "argumento não reconhecido: %s"
+msgid "truncating .rej filename to %.*s.rej"
+msgstr "a truncar o nome do ficheiro .rej em %.*s.rej"
-#: bundle.c:451
-msgid "Refusing to create empty bundle."
-msgstr "Criação de bundle vazio recusada."
+#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989
+#, c-format
+msgid "cannot open %s"
+msgstr "não é possível abrir %s"
-#: bundle.c:463
+#: apply.c:4554
#, c-format
-msgid "cannot create '%s'"
-msgstr "não é possível criar '%s'"
+msgid "Hunk #%d applied cleanly."
+msgstr "Excerto nº%d aplicado com sucesso."
-#: bundle.c:491
-msgid "index-pack died"
-msgstr "index-pack terminou inesperadamente"
+#: apply.c:4558
+#, c-format
+msgid "Rejected hunk #%d."
+msgstr "Excerto nº%d rejeitado."
-#: color.c:290
+#: apply.c:4668
#, c-format
-msgid "invalid color value: %.*s"
-msgstr "valor de cor inválido: %.*s"
+msgid "Skipped patch '%s'."
+msgstr "Patch '%s' ignorado."
+
+#: apply.c:4676
+msgid "unrecognized input"
+msgstr "entrada não reconhecida"
+
+#: apply.c:4695
+msgid "unable to read index file"
+msgstr "não foi possível ler o ficheiro de índice"
-#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505
-#: builtin/am.c:2119
+#: apply.c:4833
#, c-format
-msgid "could not parse %s"
-msgstr "não foi possível analisar %s"
+msgid "can't open patch '%s': %s"
+msgstr "não é possível abrir o patch '%s': %s"
-#: commit.c:42
+#: apply.c:4858
#, c-format
-msgid "%s %s is not a commit!"
-msgstr "%s %s não é um commit!"
-
-#: compat/obstack.c:406 compat/obstack.c:408
-msgid "memory exhausted"
-msgstr "memória esgotada"
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] "%d erro de espaço em branco reprimido"
+msgstr[1] "%d erros de espaço em branco reprimidos"
-#: config.c:516
+#: apply.c:4864 apply.c:4879
#, c-format
-msgid "bad config line %d in blob %s"
-msgstr "linha de configuração %d incorreta no blob %s"
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] "%d linha adiciona erros de espaço em branco."
+msgstr[1] "%d linhas adicionam erros de espaço em branco."
-#: config.c:520
+#: apply.c:4872
#, c-format
-msgid "bad config line %d in file %s"
-msgstr "linha de configuração %d incorreta no ficheiro %s"
+msgid "%d line applied after fixing whitespace errors."
+msgid_plural "%d lines applied after fixing whitespace errors."
+msgstr[0] "%d linha aplicada depois de corrigir erros de espaço em branco."
+msgstr[1] "%d linhas aplicadas depois de corrigir erros de espaço em branco."
-#: config.c:524
-#, c-format
-msgid "bad config line %d in standard input"
-msgstr "linha de configuração %d incorreta na entrada padrão"
+#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431
+msgid "Unable to write new index file"
+msgstr "Não foi possível escrever novo ficheiro de índice"
-#: config.c:528
+#: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
+#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592
+#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947
+msgid "path"
+msgstr "caminho"
+
+#: apply.c:4920
+msgid "don't apply changes matching the given path"
+msgstr "não aplicar alterações que correspondam ao caminho fornecido"
+
+#: apply.c:4923
+msgid "apply changes matching the given path"
+msgstr "aplicar alterações que correspondam ao caminho fornecido"
+
+#: apply.c:4925 builtin/am.c:2286
+msgid "num"
+msgstr "num"
+
+#: apply.c:4926
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr "remover <num> barras à esquerda dos caminhos de diff tradicional"
+
+#: apply.c:4929
+msgid "ignore additions made by the patch"
+msgstr "ignorar adições feitas pelo patch"
+
+#: apply.c:4931
+msgid "instead of applying the patch, output diffstat for the input"
+msgstr "em vez de aplicar o patch, mostrar o diffstat da entrada"
+
+#: apply.c:4935
+msgid "show number of added and deleted lines in decimal notation"
+msgstr "mostrar número de linhas adicionadas e removidas em notação decimal"
+
+#: apply.c:4937
+msgid "instead of applying the patch, output a summary for the input"
+msgstr "em vez de aplicar o patch, mostrar um resumo da entrada"
+
+#: apply.c:4939
+msgid "instead of applying the patch, see if the patch is applicable"
+msgstr "em vez de aplicar o patch, verificar se o patch pode ser aplicado"
+
+#: apply.c:4941
+msgid "make sure the patch is applicable to the current index"
+msgstr "garantir que o patch pode ser aplicado ao índice atual"
+
+#: apply.c:4943
+msgid "apply a patch without touching the working tree"
+msgstr "aplicar um patch sem tocar na árvore de trabalho"
+
+#: apply.c:4945
+msgid "accept a patch that touches outside the working area"
+msgstr "aceitar patches que alteram ficheiros fora da área de trabalho"
+
+#: apply.c:4947
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr "aplicar o patch também (use com --stat/--summary/--check)"
+
+#: apply.c:4949
+msgid "attempt three-way merge if a patch does not apply"
+msgstr "tentar integração com três pontos se um patch não se aplica com êxito"
+
+#: apply.c:4951
+msgid "build a temporary index based on embedded index information"
+msgstr ""
+"construir um índice temporário baseado na informação incorporada do índice"
+
+#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505
+msgid "paths are separated with NUL character"
+msgstr "os caminhos estão separados por caracteres NUL"
+
+#: apply.c:4956
+msgid "ensure at least <n> lines of context match"
+msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem"
+
+#: apply.c:4957 builtin/am.c:2265
+msgid "action"
+msgstr "ação"
+
+#: apply.c:4958
+msgid "detect new or modified lines that have whitespace errors"
+msgstr "detetar linhas novas ou modificadas que tenham espaços em branco"
+
+#: apply.c:4961 apply.c:4964
+msgid "ignore changes in whitespace when finding context"
+msgstr "ignorar alterações de espaço em branco ao procurar contexto"
+
+#: apply.c:4967
+msgid "apply the patch in reverse"
+msgstr "aplicar o patch em reverso"
+
+#: apply.c:4969
+msgid "don't expect at least one line of context"
+msgstr "não esperar nenhuma linha de contexto"
+
+#: apply.c:4971
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr "deixar os excertos rejeitados nos respetivos ficheiros *.rej"
+
+#: apply.c:4973
+msgid "allow overlapping hunks"
+msgstr "permitir a sobreposição de excertos"
+
+#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19
+#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593
+#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114
+msgid "be verbose"
+msgstr "ser verboso"
+
+#: apply.c:4976
+msgid "tolerate incorrectly detected missing new-line at the end of file"
+msgstr ""
+"tolerar deteções incorretas de falta de nova linha no final do ficheiro"
+
+#: apply.c:4979
+msgid "do not trust the line counts in the hunk headers"
+msgstr "não confiar na contagem de linhas no cabeçalho dos excertos"
+
+#: apply.c:4981 builtin/am.c:2274
+msgid "root"
+msgstr "raiz"
+
+#: apply.c:4982
+msgid "prepend <root> to all filenames"
+msgstr "preceder <root> a todos os nomes de ficheiro"
+
+#: archive.c:12
+msgid "git archive [<options>] <tree-ish> [<path>...]"
+msgstr "git archive [<opções>] <árvore-etc> [<caminho>...]"
+
+#: archive.c:13
+msgid "git archive --list"
+msgstr "git archive --list"
+
+#: archive.c:14
+msgid ""
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
+msgstr ""
+"git archive --remote <repo> [--exec <cmd>] [<opções>] <árvore-etc> "
+"[<caminho>...]"
+
+#: archive.c:15
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr "git archive --remote <repo> [--exec <cmd>] --list"
+
+#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327
#, c-format
-msgid "bad config line %d in submodule-blob %s"
-msgstr "linha de configuração %d incorreta no submódulo-blob %s"
+msgid "pathspec '%s' did not match any files"
+msgstr "o especificador de caminho '%s' não corresponde a nenhum ficheiro"
-#: config.c:532
+#: archive.c:429
+msgid "fmt"
+msgstr "fmt"
+
+#: archive.c:429
+msgid "archive format"
+msgstr "formato do arquivo"
+
+#: archive.c:430 builtin/log.c:1429
+msgid "prefix"
+msgstr "prefixo"
+
+#: archive.c:431
+msgid "prepend prefix to each pathname in the archive"
+msgstr "preceder o prefixo a cada nome de caminho dentro do arquivo"
+
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603
+#: builtin/blame.c:2604 builtin/config.c:59 builtin/fast-export.c:987
+#: builtin/fast-export.c:989 builtin/grep.c:723 builtin/hash-object.c:101
+#: builtin/ls-files.c:539 builtin/ls-files.c:542 builtin/notes.c:401
+#: builtin/notes.c:564 builtin/read-tree.c:109 parse-options.h:153
+msgid "file"
+msgstr "ficheiro"
+
+#: archive.c:433 builtin/archive.c:89
+msgid "write the archive to this file"
+msgstr "escrever o arquivo para este ficheiro"
+
+#: archive.c:435
+msgid "read .gitattributes in working directory"
+msgstr "ler .gitattributes do diretório de trabalho"
+
+#: archive.c:436
+msgid "report archived files on stderr"
+msgstr "listar ficheiros arquivados para stderr"
+
+#: archive.c:437
+msgid "store only"
+msgstr "armazenar apenas"
+
+#: archive.c:438
+msgid "compress faster"
+msgstr "compressão rápida"
+
+#: archive.c:446
+msgid "compress better"
+msgstr "compressão ótima"
+
+#: archive.c:449
+msgid "list supported archive formats"
+msgstr "listar formatos de arquivo suportados"
+
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
+#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953
+msgid "repo"
+msgstr "repo"
+
+#: archive.c:452 builtin/archive.c:91
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "obter o arquivo a partir do repositório remoto <repo>"
+
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
+msgid "command"
+msgstr "comando"
+
+#: archive.c:454 builtin/archive.c:93
+msgid "path to the remote git-upload-archive command"
+msgstr "caminho para o comando git-upload-archive no remoto"
+
+#: archive.c:461
+msgid "Unexpected option --remote"
+msgstr "Opção inesperada --remote"
+
+#: archive.c:463
+msgid "Option --exec can only be used together with --remote"
+msgstr "A opção --exec só pode ser usada em conjunto com --remote"
+
+#: archive.c:465
+msgid "Unexpected option --output"
+msgstr "Opção inesperada --output"
+
+#: archive.c:487
#, c-format
-msgid "bad config line %d in command line %s"
-msgstr "linha de configuração %d incorreta na linha de comandos %s"
+msgid "Unknown archive format '%s'"
+msgstr "Formato de arquivo desconhecido '%s'"
-#: config.c:536
+#: archive.c:494
#, c-format
-msgid "bad config line %d in %s"
-msgstr "linha de configuração %d incorreta em %s"
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Argumento não suportado para o formato '%s': -%d"
-#: config.c:655
-msgid "out of range"
-msgstr "fora de intervalo"
+#: attr.c:263
+msgid ""
+"Negative patterns are ignored in git attributes\n"
+"Use '\\!' for literal leading exclamation."
+msgstr ""
+"Os padrões negativos são ignorados nos atributos do git\n"
+"Use '\\!' para uma exclamação literal à esquerda."
-#: config.c:655
-msgid "invalid unit"
-msgstr "unidade inválida"
+#: bisect.c:441
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "Não foi possível abrir o ficheiro '%s'"
-#: config.c:661
+#: bisect.c:446
#, c-format
-msgid "bad numeric config value '%s' for '%s': %s"
-msgstr "valor numérico '%s' da configuração '%s' incorreto: %s"
+msgid "Badly quoted content in file '%s': %s"
+msgstr "Conteúdo incorretamente citado no ficheiro '%s': %s"
-#: config.c:666
+#: bisect.c:655
#, c-format
-msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
-msgstr "valor numérico '%s' da configuração '%s' incorreto no blob %s: %s"
+msgid "We cannot bisect more!\n"
+msgstr "Não se está a bissetar mais!\n"
-#: config.c:669
+#: bisect.c:708
#, c-format
-msgid "bad numeric config value '%s' for '%s' in file %s: %s"
-msgstr "valor numérico '%s' da configuração '%s' incorreto no ficheiro %s: %s"
+msgid "Not a valid commit name %s"
+msgstr "%s não é um nome de commit válido"
-#: config.c:672
+#: bisect.c:732
#, c-format
-msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgid ""
+"The merge base %s is bad.\n"
+"This means the bug has been fixed between %s and [%s].\n"
msgstr ""
-"valor numérico '%s' da configuração '%s' incorreto na entrada padrão: %s"
+"A base de integração %s é má (bad).\n"
+"Significa que o bug foi corrigido entre %s e [%s].\n"
-#: config.c:675
+#: bisect.c:737
#, c-format
-msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+msgid ""
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
msgstr ""
-"valor numérico '%s' da configuração '%s' incorreto no submódulo-blob %s: %s"
+"A base de integração %s é nova (new).\n"
+"A propriedade foi mudada entre %s e [%s].\n"
-#: config.c:678
+#: bisect.c:742
#, c-format
-msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgid ""
+"The merge base %s is %s.\n"
+"This means the first '%s' commit is between %s and [%s].\n"
msgstr ""
-"valor numérico '%s' da configuração '%s' incorreto na linha de comandos %s: "
-"%s"
+"A base de integração %s é %s.\n"
+"Significa que o primeiro commit '%s' está entre %s e [%s].\n"
-#: config.c:681
+#: bisect.c:750
#, c-format
-msgid "bad numeric config value '%s' for '%s' in %s: %s"
-msgstr "valor numérico '%s' da configuração '%s' incorreto em %s: %s"
+msgid ""
+"Some %s revs are not ancestor of the %s rev.\n"
+"git bisect cannot work properly in this case.\n"
+"Maybe you mistook %s and %s revs?\n"
+msgstr ""
+"Algumas revisões %s não antecedem a revisão %s.\n"
+"git bisect não pode funcionar corretamente nesta situação.\n"
+"Talvez confundiu revisões %s e %s?\n"
-#: config.c:768
+#: bisect.c:763
#, c-format
-msgid "failed to expand user dir in: '%s'"
-msgstr "falha ao expandir diretório de utilizador em: '%s'"
+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 ""
+"tem-se que saltar a base de integração entre %s e [%s].\n"
+"Portanto não se pode ter a certeza que o primeiro commit %s está entre %s e "
+"%s.\n"
+"Continua-se de qualquer maneira."
-#: config.c:849 config.c:860
+#: bisect.c:798
#, c-format
-msgid "bad zlib compression level %d"
-msgstr "nível de compressão zlib %d incorreto"
+msgid "Bisecting: a merge base must be tested\n"
+msgstr "A bissetar: uma base de integração tem de ser testada\n"
-#: config.c:978
+#: bisect.c:849
#, c-format
-msgid "invalid mode for object creation: %s"
-msgstr "modo inválido para criação de objeto: %s"
+msgid "a %s revision is needed"
+msgstr "precisa-se de uma revisão %s"
-#: config.c:1312
-msgid "unable to parse command-line config"
-msgstr "não é possível analisar configuração de linha de comandos"
+#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
+#, c-format
+msgid "could not create file '%s'"
+msgstr "não foi possível criar o ficheiro '%s'"
-#: config.c:1362
-msgid "unknown error occurred while reading the configuration files"
-msgstr ""
-"ocorreu um erro desconhecido durante a leitura dos ficheiros de configuração"
+#: bisect.c:917
+#, c-format
+msgid "could not read file '%s'"
+msgstr "não foi possível ler o ficheiro '%s'"
-#: config.c:1716
+#: bisect.c:947
+msgid "reading bisect refs failed"
+msgstr "falha ao ler referências bissetadas"
+
+#: bisect.c:967
#, c-format
-msgid "unable to parse '%s' from command-line config"
-msgstr "não é possível analisar '%s' da configuração de linha de comandos"
+msgid "%s was both %s and %s\n"
+msgstr "%s era %s e %s em simultâneo\n"
-#: config.c:1718
+#: bisect.c:975
#, c-format
-msgid "bad config variable '%s' in file '%s' at line %d"
-msgstr "variável de configuração '%s' incorreta no ficheiro '%s' na linha %d"
+msgid ""
+"No testable commit found.\n"
+"Maybe you started with bad path parameters?\n"
+msgstr ""
+"Nenhum commit testável encontrado.\n"
+"Talvez tenha começado com parâmetros de caminho incorretos?\n"
-#: config.c:1777
+#: bisect.c:994
#, c-format
-msgid "%s has multiple values"
-msgstr "%s tem múltiplos valores"
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] "(aproximadamente %d passo)"
+msgstr[1] "(aproximadamente %d passos)"
-#: config.c:2311
+#. TRANSLATORS: the last %s will be replaced with
+#. "(roughly %d steps)" translation
+#: bisect.c:998
#, c-format
-msgid "could not set '%s' to '%s'"
-msgstr "não foi possível definir '%s' como '%s'"
+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] "A bissetar: falta %d revisão para testar depois desta %s\n"
+msgstr[1] "A bissetar: faltam %d revisões para testar depois desta %s\n"
-#: config.c:2313
+#: branch.c:53
#, c-format
-msgid "could not unset '%s'"
-msgstr "não foi possível reiniciar '%s'"
+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"
+"Após resolver a causa do erro, pode tentar corrigir\n"
+"o ramo remoto que deve ser seguido, invocando\n"
+"\"git branch --set-upstream-to=%s%s%s\"."
-#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
-msgid "Checking connectivity"
-msgstr "A verificar conectividade"
+#: branch.c:67
+#, c-format
+msgid "Not setting branch %s as its own upstream."
+msgstr "O ramo %s não foi configurado com ramo a montante dele próprio."
-#: connected.c:74
-msgid "Could not run 'git rev-list'"
-msgstr "Não foi possível executar 'git rev-list'"
+#: branch.c:93
+#, c-format
+msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+msgstr "Ramo %s configurado para seguir o ramo remoto %s de %s por rebase."
-#: connected.c:94
-msgid "failed write to rev-list"
-msgstr "falha ao escrever para rev-list"
+#: branch.c:94
+#, c-format
+msgid "Branch %s set up to track remote branch %s from %s."
+msgstr "Ramo %s configurado para seguir o ramo remoto %s de %s."
-#: connected.c:101
-msgid "failed to close rev-list's stdin"
-msgstr "falha ao fechar entrada padrão de rev-list"
+#: branch.c:98
+#, c-format
+msgid "Branch %s set up to track local branch %s by rebasing."
+msgstr "Ramo %s configurado para seguir o ramo local %s por rebase."
-#: date.c:97
-msgid "in the future"
-msgstr "no futuro"
+#: branch.c:99
+#, c-format
+msgid "Branch %s set up to track local branch %s."
+msgstr "Ramo %s configurado para seguir o ramo local %s."
-#: date.c:103
+#: branch.c:104
#, c-format
-msgid "%lu second ago"
-msgid_plural "%lu seconds ago"
-msgstr[0] "há %lu segundo"
-msgstr[1] "há %lu segundos"
+msgid "Branch %s set up to track remote ref %s by rebasing."
+msgstr "Ramo %s configurado para seguir a referência remota %s por rebase."
-#: date.c:110
+#: branch.c:105
#, c-format
-msgid "%lu minute ago"
-msgid_plural "%lu minutes ago"
-msgstr[0] "há %lu minuto"
-msgstr[1] "há %lu minutos"
+msgid "Branch %s set up to track remote ref %s."
+msgstr "Ramo %s configurado para seguir a referência remota %s."
-#: date.c:117
+#: branch.c:109
#, c-format
-msgid "%lu hour ago"
-msgid_plural "%lu hours ago"
-msgstr[0] "há %lu hora"
-msgstr[1] "há %lu horas"
+msgid "Branch %s set up to track local ref %s by rebasing."
+msgstr "Ramo %s configurado para seguir a referência local %s por rebase."
-#: date.c:124
+#: branch.c:110
#, c-format
-msgid "%lu day ago"
-msgid_plural "%lu days ago"
-msgstr[0] "há %lu dia"
-msgstr[1] "há %lu dias"
+msgid "Branch %s set up to track local ref %s."
+msgstr "Ramo %s configurado para seguir a referência local %s."
+
+#: branch.c:119
+msgid "Unable to write upstream branch configuration"
+msgstr "Não foi possível escrever a configuração do ramo a montante"
-#: date.c:130
+#: branch.c:156
#, c-format
-msgid "%lu week ago"
-msgid_plural "%lu weeks ago"
-msgstr[0] "há %lu semana"
-msgstr[1] "há %lu semanas"
+msgid "Not tracking: ambiguous information for ref %s"
+msgstr "Não seguido: informação da referência %s ambígua"
-#: date.c:137
+#: branch.c:185
#, c-format
-msgid "%lu month ago"
-msgid_plural "%lu months ago"
-msgstr[0] "há %lu mês"
-msgstr[1] "há %lu meses"
+msgid "'%s' is not a valid branch name."
+msgstr "'%s' não é um nome válido para um ramo."
-#: date.c:148
+#: branch.c:190
#, c-format
-msgid "%lu year"
-msgid_plural "%lu years"
-msgstr[0] "%lu ano"
-msgstr[1] "%lu anos"
+msgid "A branch named '%s' already exists."
+msgstr "Já existe um ramo designado '%s'."
-#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:151
-#, c-format
-msgid "%s, %lu month ago"
-msgid_plural "%s, %lu months ago"
-msgstr[0] "há %s e %lu mês"
-msgstr[1] "há %s e %lu meses"
+#: branch.c:198
+msgid "Cannot force update the current branch."
+msgstr "Não é possível forçar a atualização do ramo atual."
-#: date.c:156 date.c:161
+#: branch.c:218
#, c-format
-msgid "%lu year ago"
-msgid_plural "%lu years ago"
-msgstr[0] "há %lu ano"
-msgstr[1] "há %lu anos"
+msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgstr ""
+"Não é possível configurar ramo a seguir; o ponto inicial '%s' não é um ramo."
-#: diffcore-order.c:24
+#: branch.c:220
#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "falha ao ler o ficheiro de comando '%s'"
+msgid "the requested upstream branch '%s' does not exist"
+msgstr "o ramo a montante solicitado '%s' não existe"
-#: diffcore-rename.c:540
-msgid "Performing inexact rename detection"
-msgstr "Deteção de mudança de nome inexata em curso"
+#: branch.c:222
+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"
+"Se pretende efetuar rebase do seu trabalho sobre um ramo\n"
+"a montante que já existe no remoto, pode ser necessário\n"
+"executar \"git fetch\" para obtê-lo.\n"
+"\n"
+"Se pretende publicar um novo ramo local que irá seguir\n"
+"o seu homólogo remoto, pode usar \"git push -u\" para configurar\n"
+"o respetivo ramo a montante, ao mesmo tempo que publica."
-#: diff.c:116
+#: branch.c:265
#, c-format
-msgid " Failed to parse dirstat cut-off percentage '%s'\n"
-msgstr " Falha ao analisar percentagem limite de dirstat '%s'\n"
+msgid "Not a valid object name: '%s'."
+msgstr "Nome de objeto inválido: '%s'."
-#: diff.c:121
+#: branch.c:285
#, c-format
-msgid " Unknown dirstat parameter '%s'\n"
-msgstr " Parâmetro de dirstat desconhecido '%s'\n"
+msgid "Ambiguous object name: '%s'."
+msgstr "Nome de objeto ambíguo: '%s'."
-#: diff.c:225
+#: branch.c:290
#, c-format
-msgid "Unknown value for 'diff.submodule' config variable: '%s'"
-msgstr "Valor desconhecido na variável de configuração 'diff.submodule': '%s'"
+msgid "Not a valid branch point: '%s'."
+msgstr "Ponto no ramo inválido: '%s'."
-#: diff.c:277
+#: branch.c:344
#, c-format
-msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
-msgstr ""
-"Erros encontrados na variável de configuração 'diff.dirstat':\n"
-"%s"
+msgid "'%s' is already checked out at '%s'"
+msgstr "'%s' foi já extraído em '%s'"
-#: diff.c:3017
+#: branch.c:363
#, c-format
-msgid "external diff died, stopping at %s"
-msgstr "o diff externo terminou inesperadamente, interrompido em %s"
+msgid "HEAD of working tree %s is not updated"
+msgstr "HEAD da árvore de trabalho %s não está atualizada"
-#: diff.c:3415
-msgid "--follow requires exactly one pathspec"
-msgstr "--follow requer exatamente um único especificador de caminho"
+#: bundle.c:34
+#, c-format
+msgid "'%s' does not look like a v2 bundle file"
+msgstr "'%s' não parece ser um ficheiro bundle v2"
-#: diff.c:3578
+#: bundle.c:61
#, c-format
-msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
-msgstr ""
-"Falha ao analisar parâmetro da opção --dirstat/-X:\n"
-"%s"
+msgid "unrecognized header: %s%s (%d)"
+msgstr "cabeçalho não reconhecido: %s%s (%d)"
-#: diff.c:3592
+#: bundle.c:87 sequencer.c:963 builtin/commit.c:777
#, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
-msgstr "Falha ao analisar parâmetro da opção --submodule: '%s'"
+msgid "could not open '%s'"
+msgstr "não foi possível abrir '%s'"
-#: dir.c:1823
-msgid "failed to get kernel name and information"
-msgstr "falha ao obter nome e informação do kernel"
+#: bundle.c:139
+msgid "Repository lacks these prerequisite commits:"
+msgstr "O repositório não possuí estes commits pré-requisitados:"
-#: dir.c:1942
-msgid "Untracked cache is disabled on this system or location."
-msgstr "A cache não controlada está desativada neste sistema ou localização."
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374
+#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348
+#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
+#: builtin/merge.c:356 builtin/shortlog.c:170
+msgid "revision walk setup failed"
+msgstr "falha ao configurar percurso de revisões"
-#: gpg-interface.c:178
-msgid "gpg failed to sign the data"
-msgstr "gpg não assinou os dados"
+#: bundle.c:185
+#, c-format
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %d refs:"
+msgstr[0] "O bundle contém esta referência:"
+msgstr[1] "O bundle contém estas %d referências:"
-#: gpg-interface.c:208
-msgid "could not create temporary file"
-msgstr "não foi possível criar ficheiro temporário"
+#: bundle.c:192
+msgid "The bundle records a complete history."
+msgstr "O pacote regista um histórico completo."
-#: gpg-interface.c:210
+#: bundle.c:194
#, c-format
-msgid "failed writing detached signature to '%s'"
-msgstr "falha ao escrever assinatura destacada em '%s'"
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %d refs:"
+msgstr[0] "O bundle requer esta referência:"
+msgstr[1] "O bundle requer estas %d referências:"
-#: grep.c:1792
-#, c-format
-msgid "'%s': unable to read %s"
-msgstr "'%s': não foi possível ler %s"
+#: bundle.c:253
+msgid "Could not spawn pack-objects"
+msgstr "Não foi possível lançar pack-objects"
-#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "falha ao invocar stat de '%s'"
+#: bundle.c:264
+msgid "pack-objects died"
+msgstr "pack-objects terminou inesperadamente"
-#: grep.c:1820
-#, c-format
-msgid "'%s': short read"
-msgstr "'%s': leitura truncada"
+#: bundle.c:304
+msgid "rev-list died"
+msgstr "rev-list terminou inesperadamente"
-#: help.c:205
+#: bundle.c:353
#, c-format
-msgid "available git commands in '%s'"
-msgstr "comandos do git disponível em '%s'"
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr "a referência '%s' é excluída pelas opções de rev-list"
-#: help.c:212
-msgid "git commands available from elsewhere on your $PATH"
-msgstr "comandos do git disponíveis noutras localizações em $PATH"
+#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "argumento não reconhecido: %s"
-#: help.c:244
-msgid "These are common Git commands used in various situations:"
-msgstr "Estes são comandos do Git comuns usados em diversas situações:"
+#: bundle.c:451
+msgid "Refusing to create empty bundle."
+msgstr "Criação de bundle vazio recusada."
-#: help.c:309
+#: bundle.c:463
#, 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 um comando do git, mas não é possível\n"
-"executá-lo. Talvez git-%s esteja danificado?"
+msgid "cannot create '%s'"
+msgstr "não é possível criar '%s'"
-#: help.c:366
-msgid "Uh oh. Your system reports no Git commands at all."
-msgstr "Oh não. Não há nenhum comando do Git disponível no sistema."
+#: bundle.c:491
+msgid "index-pack died"
+msgstr "index-pack terminou inesperadamente"
-#: help.c:388
+#: color.c:290
#, c-format
-msgid ""
-"WARNING: You called a Git command named '%s', which does not exist.\n"
-"Continuing under the assumption that you meant '%s'"
-msgstr ""
-"AVISO: Invocou um comando do Git designado '%s' que não existe.\n"
-"Continuando, assumindo que queria dizer '%s'"
+msgid "invalid color value: %.*s"
+msgstr "valor de cor inválido: %.*s"
-#: help.c:393
+#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493
+#: builtin/am.c:2127
#, c-format
-msgid "in %0.1f seconds automatically..."
-msgstr "automaticamente em %0.1f..."
+msgid "could not parse %s"
+msgstr "não foi possível analisar %s"
-#: help.c:400
+#: commit.c:42
#, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
-msgstr "git: '%s' não é um comando do git. Consulte 'git --help'."
+msgid "%s %s is not a commit!"
+msgstr "%s %s não é um commit!"
-#: help.c:404 help.c:470
+#: commit.c:1514
msgid ""
-"\n"
-"Did you mean this?"
-msgid_plural ""
-"\n"
-"Did you mean one of these?"
-msgstr[0] ""
-"\n"
-"Queria dizer isto?"
-msgstr[1] ""
-"\n"
-"Queria dizer deste?"
+"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 ""
+"aviso: a mensagem de commit não conforma com UTF-8.\n"
+"Pode querer emendá-lo depois de corrigir a mensagem ou definir a\n"
+"variável de configuração i18n.commitencoding com a codificação que\n"
+"o seu projeto utiliza.\n"
+
+#: compat/obstack.c:406 compat/obstack.c:408
+msgid "memory exhausted"
+msgstr "memória esgotada"
-#: help.c:466
+#: config.c:516
#, c-format
-msgid "%s: %s - %s"
-msgstr "%s: %s - %s"
+msgid "bad config line %d in blob %s"
+msgstr "linha de configuração %d incorreta no blob %s"
-#: lockfile.c:152
+#: config.c:520
#, 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 ""
-"Não é possível criar '%s.lock': %s.\n"
-"\n"
-"Outro processo git parece estar a executar neste repositório, e.g.\n"
-"um editor aberto por 'git commit'. Certifique-se que todos os processos\n"
-"terminaram e tente de novo. Se ainda assim falhar, um processo git\n"
-"pode ter falhado anteriormente no repositório:\n"
-"remova o ficheiro manualmente para continuar."
+msgid "bad config line %d in file %s"
+msgstr "linha de configuração %d incorreta no ficheiro %s"
+
+#: config.c:524
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr "linha de configuração %d incorreta na entrada padrão"
-#: lockfile.c:160
+#: config.c:528
#, c-format
-msgid "Unable to create '%s.lock': %s"
-msgstr "Não é foi possível criar '%s.lock': %s"
+msgid "bad config line %d in submodule-blob %s"
+msgstr "linha de configuração %d incorreta no submódulo-blob %s"
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "falha ao ler a cache"
+#: config.c:532
+#, c-format
+msgid "bad config line %d in command line %s"
+msgstr "linha de configuração %d incorreta na linha de comandos %s"
-#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375
-#: builtin/checkout.c:589 builtin/clone.c:732
-msgid "unable to write new index file"
-msgstr "não foi possível escrever novo ficheiro de índice"
+#: config.c:536
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "linha de configuração %d incorreta em %s"
-#: merge-recursive.c:209
-msgid "(bad commit)\n"
-msgstr "(commit incorreto)\n"
+#: config.c:655
+msgid "out of range"
+msgstr "fora de intervalo"
-#: merge-recursive.c:231
+#: config.c:655
+msgid "invalid unit"
+msgstr "unidade inválida"
+
+#: config.c:661
#, c-format
-msgid "addinfo_cache failed for path '%s'"
-msgstr "addinfo_cache falhou no caminho '%s'"
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "valor numérico '%s' da configuração '%s' incorreto: %s"
-#: merge-recursive.c:301
-msgid "error building trees"
-msgstr "erro ao construir árvores"
+#: config.c:666
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgstr "valor numérico '%s' da configuração '%s' incorreto no blob %s: %s"
-#: merge-recursive.c:720
+#: config.c:669
#, c-format
-msgid "failed to create path '%s'%s"
-msgstr "falha ao criar o caminho '%s'%s"
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgstr "valor numérico '%s' da configuração '%s' incorreto no ficheiro %s: %s"
-#: merge-recursive.c:731
+#: config.c:672
#, c-format
-msgid "Removing %s to make room for subdirectory\n"
-msgstr "A remover %s para criar espaço para o subdiretório\n"
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgstr ""
+"valor numérico '%s' da configuração '%s' incorreto na entrada padrão: %s"
-#: merge-recursive.c:745 merge-recursive.c:764
-msgid ": perhaps a D/F conflict?"
-msgstr ": talvez um conflito D/F?"
+#: config.c:675
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+msgstr ""
+"valor numérico '%s' da configuração '%s' incorreto no submódulo-blob %s: %s"
-#: merge-recursive.c:754
+#: config.c:678
#, c-format
-msgid "refusing to lose untracked file at '%s'"
-msgstr "perda de ficheiro não controlado em '%s' recusada"
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgstr ""
+"valor numérico '%s' da configuração '%s' incorreto na linha de comandos %s: "
+"%s"
-#: merge-recursive.c:796
+#: config.c:681
#, c-format
-msgid "cannot read object %s '%s'"
-msgstr "não é possível ler o objeto %s: '%s'"
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr "valor numérico '%s' da configuração '%s' incorreto em %s: %s"
-#: merge-recursive.c:798
+#: config.c:768
#, c-format
-msgid "blob expected for %s '%s'"
-msgstr "blob para %s '%s' esperado"
+msgid "failed to expand user dir in: '%s'"
+msgstr "falha ao expandir diretório de utilizador em: '%s'"
-#: merge-recursive.c:822
+#: config.c:852 config.c:863
#, c-format
-msgid "failed to open '%s': %s"
-msgstr "falha ao abrir '%s': %s"
+msgid "bad zlib compression level %d"
+msgstr "nível de compressão zlib %d incorreto"
-#: merge-recursive.c:833
+#: config.c:978
#, c-format
-msgid "failed to symlink '%s': %s"
-msgstr "falha ao criar a ligação simbólica '%s': %s"
+msgid "invalid mode for object creation: %s"
+msgstr "modo inválido para criação de objeto: %s"
-#: merge-recursive.c:838
+#: config.c:1312
+msgid "unable to parse command-line config"
+msgstr "não é possível analisar configuração de linha de comandos"
+
+#: config.c:1362
+msgid "unknown error occurred while reading the configuration files"
+msgstr ""
+"ocorreu um erro desconhecido durante a leitura dos ficheiros de configuração"
+
+#: config.c:1716
#, c-format
-msgid "do not know what to do with %06o %s '%s'"
-msgstr "não sei o que fazer com %06o %s '%s'"
+msgid "unable to parse '%s' from command-line config"
+msgstr "não é possível analisar '%s' da configuração de linha de comandos"
-#: merge-recursive.c:978
-msgid "Failed to execute internal merge"
-msgstr "Falha ao executar integração interna"
+#: config.c:1718
+#, c-format
+msgid "bad config variable '%s' in file '%s' at line %d"
+msgstr "variável de configuração '%s' incorreta no ficheiro '%s' na linha %d"
-#: merge-recursive.c:982
+#: config.c:1777
#, c-format
-msgid "Unable to add %s to database"
-msgstr "Não é possível adicionar %s à base de dados"
+msgid "%s has multiple values"
+msgstr "%s tem múltiplos valores"
-#: merge-recursive.c:1081 merge-recursive.c:1095
+#: config.c:2311
#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree."
-msgstr ""
-"CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versão de %s de %s "
-"deixada na árvore."
+msgid "could not set '%s' to '%s'"
+msgstr "não foi possível definir '%s' como '%s'"
-#: merge-recursive.c:1087 merge-recursive.c:1100
+#: config.c:2313
#, c-format
+msgid "could not unset '%s'"
+msgstr "não foi possível reiniciar '%s'"
+
+#: connect.c:49
+msgid "The remote end hung up upon initial contact"
+msgstr "O remoto desligou após contacto inicial"
+
+#: connect.c:51
msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree at %s."
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
msgstr ""
-"CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versão de %s de %s "
-"deixada na árvore em %s."
+"Não foi possível ler do repositório remoto.\n"
+"\n"
+"Certifica-se que tem os direitos de acesso corretos\n"
+"e que o repositório existe."
-#: merge-recursive.c:1143
-msgid "rename"
-msgstr "mudar nome"
+#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
+msgid "Checking connectivity"
+msgstr "A verificar conectividade"
-#: merge-recursive.c:1143
-msgid "renamed"
-msgstr "nome mudado"
+#: connected.c:75
+msgid "Could not run 'git rev-list'"
+msgstr "Não foi possível executar 'git rev-list'"
-#: merge-recursive.c:1200
-#, c-format
-msgid "%s is a directory in %s adding as %s instead"
-msgstr "%s é um diretório em %s adicionando %s no seu lugar"
+#: connected.c:95
+msgid "failed write to rev-list"
+msgstr "falha ao escrever para rev-list"
-#: merge-recursive.c:1225
+#: connected.c:102
+msgid "failed to close rev-list's stdin"
+msgstr "falha ao fechar entrada padrão de rev-list"
+
+#: convert.c:201
#, c-format
msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
+"CRLF will be replaced by LF in %s.\n"
+"The file will have its original line endings in your working directory."
msgstr ""
-"CONFLITO (mudar nome/mudar nome): Mudar o nome \"%s\"->\"%s\" no ramo \"%s\" "
-"mudar o nome \"%s\"->\"%s\" em \"%s\"%s"
+"CRLF será substituído por LF em %s.\n"
+"O final de linha original será mantido no ficheiro da sua árvore de trabalho."
-#: merge-recursive.c:1230
-msgid " (left unresolved)"
-msgstr " (por resolver)"
+#: convert.c:205
+#, c-format
+msgid "CRLF would be replaced by LF in %s."
+msgstr "CRLF será substituído por LF em %s."
-#: merge-recursive.c:1292
+#: convert.c:211
#, c-format
-msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
+msgid ""
+"LF will be replaced by CRLF in %s.\n"
+"The file will have its original line endings in your working directory."
msgstr ""
-"CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome "
-"%s->%s em %s"
+"LF será substituído por CRLF em %s.\n"
+"O final de linha original será mantido no ficheiro da sua árvore de trabalho."
-#: merge-recursive.c:1325
+#: convert.c:215
#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
-msgstr "A mudar o nome de %s para %s e de %s para %s, em alternativa"
+msgid "LF would be replaced by CRLF in %s"
+msgstr "LF será substituído por CRLF em %s."
-#: merge-recursive.c:1531
+#: date.c:97
+msgid "in the future"
+msgstr "no futuro"
+
+#: date.c:103
#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
-msgstr ""
-"CONFLITO (mudar nome/adicionar): Mudar o nome %s->%s em %s. %s adicionado em "
-"%s"
+msgid "%lu second ago"
+msgid_plural "%lu seconds ago"
+msgstr[0] "há %lu segundo"
+msgstr[1] "há %lu segundos"
-#: merge-recursive.c:1546
+#: date.c:110
#, c-format
-msgid "Adding merged %s"
-msgstr "A adicionar %s integrado"
+msgid "%lu minute ago"
+msgid_plural "%lu minutes ago"
+msgstr[0] "há %lu minuto"
+msgstr[1] "há %lu minutos"
-#: merge-recursive.c:1553 merge-recursive.c:1766
+#: date.c:117
#, c-format
-msgid "Adding as %s instead"
-msgstr "A adicionar como %s, em alternativa."
+msgid "%lu hour ago"
+msgid_plural "%lu hours ago"
+msgstr[0] "há %lu hora"
+msgstr[1] "há %lu horas"
-#: merge-recursive.c:1610
+#: date.c:124
#, c-format
-msgid "cannot read object %s"
-msgstr "não foi possível ler o objeto %s"
+msgid "%lu day ago"
+msgid_plural "%lu days ago"
+msgstr[0] "há %lu dia"
+msgstr[1] "há %lu dias"
-#: merge-recursive.c:1613
+#: date.c:130
#, c-format
-msgid "object %s is not a blob"
-msgstr "o objeto %s não é um blob"
+msgid "%lu week ago"
+msgid_plural "%lu weeks ago"
+msgstr[0] "há %lu semana"
+msgstr[1] "há %lu semanas"
-#: merge-recursive.c:1666
-msgid "modify"
-msgstr "modificar"
+#: date.c:137
+#, c-format
+msgid "%lu month ago"
+msgid_plural "%lu months ago"
+msgstr[0] "há %lu mês"
+msgstr[1] "há %lu meses"
+
+#: date.c:148
+#, c-format
+msgid "%lu year"
+msgid_plural "%lu years"
+msgstr[0] "%lu ano"
+msgstr[1] "%lu anos"
+
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c:151
+#, c-format
+msgid "%s, %lu month ago"
+msgid_plural "%s, %lu months ago"
+msgstr[0] "há %s e %lu mês"
+msgstr[1] "há %s e %lu meses"
+
+#: date.c:156 date.c:161
+#, c-format
+msgid "%lu year ago"
+msgid_plural "%lu years ago"
+msgstr[0] "há %lu ano"
+msgstr[1] "há %lu anos"
-#: merge-recursive.c:1666
-msgid "modified"
-msgstr "modificado"
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "falha ao ler o ficheiro de comando '%s'"
-#: merge-recursive.c:1676
-msgid "content"
-msgstr "conteúdo"
+#: diffcore-rename.c:536
+msgid "Performing inexact rename detection"
+msgstr "Deteção de mudança de nome inexata em curso"
-#: merge-recursive.c:1683
-msgid "add/add"
-msgstr "adicionar/adicionar"
+#: diff.c:62
+#, c-format
+msgid "option '%s' requires a value"
+msgstr "a opção '%s' requer um valor"
-#: merge-recursive.c:1718
+#: diff.c:124
#, c-format
-msgid "Skipped %s (merged same as existing)"
-msgstr "%s ignorado (integrado é igual ao existente)"
+msgid " Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr " Falha ao analisar percentagem limite de dirstat '%s'\n"
-#: merge-recursive.c:1732
+#: diff.c:129
#, c-format
-msgid "Auto-merging %s"
-msgstr "A integrar automaticamente %s"
+msgid " Unknown dirstat parameter '%s'\n"
+msgstr " Parâmetro de dirstat desconhecido '%s'\n"
-#: merge-recursive.c:1736 git-submodule.sh:919
-msgid "submodule"
-msgstr "submódulo"
+#: diff.c:283
+#, c-format
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr "Valor desconhecido na variável de configuração 'diff.submodule': '%s'"
-#: merge-recursive.c:1737
+#: diff.c:346
#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "CONFLITO (%s): conflito de integração em %s"
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+"Erros encontrados na variável de configuração 'diff.dirstat':\n"
+"%s"
-#: merge-recursive.c:1831
+#: diff.c:3087
#, c-format
-msgid "Removing %s"
-msgstr "A remover %s"
+msgid "external diff died, stopping at %s"
+msgstr "o diff externo terminou inesperadamente, interrompido em %s"
-#: merge-recursive.c:1857
-msgid "file/directory"
-msgstr "ficheiro/diretório"
+#: diff.c:3412
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+msgstr "--name-only, --name-status, --check e -s são mutuamente exclusivos"
-#: merge-recursive.c:1863
-msgid "directory/file"
-msgstr "diretório/ficheiro"
+#: diff.c:3502
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow requer exatamente um único especificador de caminho"
-#: merge-recursive.c:1868
+#: diff.c:3665
#, c-format
-msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
msgstr ""
-"CONFLITO (%s): Há um diretório designado %s em %s. A adicionar %s como %s"
+"Falha ao analisar parâmetro da opção --dirstat/-X:\n"
+"%s"
-#: merge-recursive.c:1877
+#: diff.c:3679
#, c-format
-msgid "Adding %s"
-msgstr "A adicionar %s"
+msgid "Failed to parse --submodule option parameter: '%s'"
+msgstr "Falha ao analisar parâmetro da opção --submodule: '%s'"
-#: merge-recursive.c:1914
-msgid "Already up-to-date!"
-msgstr "Já está atualizado!"
+#: diff.c:4700
+msgid "inexact rename detection was skipped due to too many files."
+msgstr ""
+"a deteção mudança de nome inexata foi omitida devido a demasiados ficheiros."
-#: merge-recursive.c:1923
+#: diff.c:4703
+msgid "only found copies from modified paths due to too many files."
+msgstr ""
+"só foram encontradas cópias de caminhos modificados devido a demasiados "
+"ficheiros."
+
+#: diff.c:4706
#, c-format
-msgid "merging of trees %s and %s failed"
-msgstr "falha ao integrar as árvores %s e %s"
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr ""
+"pode tentar definir a variável %s para, pelo menos, %d e repetir o comando."
-#: merge-recursive.c:2006
-msgid "Merging:"
-msgstr "A integrar:"
+#: dir.c:1866
+msgid "failed to get kernel name and information"
+msgstr "falha ao obter nome e informação do kernel"
-#: merge-recursive.c:2019
-#, c-format
-msgid "found %u common ancestor:"
-msgid_plural "found %u common ancestors:"
-msgstr[0] "%u antecessor comum encontrado:"
-msgstr[1] "%u antecessores comuns encontrados:"
+#: dir.c:1985
+msgid "Untracked cache is disabled on this system or location."
+msgstr "A cache não controlada está desativada neste sistema ou localização."
-#: merge-recursive.c:2058
-msgid "merge returned no commit"
-msgstr "a integração não retornou nenhum commit"
+#: fetch-pack.c:213
+#, fuzzy
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack: esperava-se lista rasa"
-#: merge-recursive.c:2121
+#: fetch-pack.c:225
+msgid "git fetch-pack: expected ACK/NAK, got EOF"
+msgstr "git fetch-pack: esperava-se ACK/NAK, obteve-se EOF"
+
+#: fetch-pack.c:243
#, c-format
-msgid "Could not parse object '%s'"
-msgstr "Não foi possível analisar o objeto '%s'"
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack: esperava-se ACK/NAK, obteve-se '%s'"
-#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
-msgid "Unable to write index."
-msgstr "Não é possível escrever no índice."
+#: fetch-pack.c:295
+msgid "--stateless-rpc requires multi_ack_detailed"
+msgstr "--stateless-rpc requer multi_ack_detailed"
-#: notes-utils.c:41
-msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr ""
-"Não é possível submeter árvore de notas não inicializada ou não referenciada"
+#: fetch-pack.c:381
+#, fuzzy, c-format
+msgid "invalid shallow line: %s"
+msgstr "linha rasa inválida: %s"
-#: notes-utils.c:100
+#: fetch-pack.c:387
+#, fuzzy, c-format
+msgid "invalid unshallow line: %s"
+msgstr "linha para aprofundar inválida: %s"
+
+#: fetch-pack.c:389
#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "Valor de notes.rewriteMode incorreto: '%s'"
+msgid "object not found: %s"
+msgstr "objeto não encontrado: %s"
-#: notes-utils.c:110
+#: fetch-pack.c:392
#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
-msgstr "Reescrita de notas em %s (fora de refs/notes/) recusada"
+msgid "error in object: %s"
+msgstr "erro no objeto: %s"
-#. TRANSLATORS: The first %s is the name of the
-#. environment variable, the second %s is its value
-#: notes-utils.c:137
+#: fetch-pack.c:394
+#, fuzzy, c-format
+msgid "no shallow found: %s"
+msgstr "raso não encontrado: %s"
+
+#: fetch-pack.c:397
+#, fuzzy, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr "esperava-se raso/aprofundar, obteve-se %s"
+
+#: fetch-pack.c:436
#, c-format
-msgid "Bad %s value: '%s'"
-msgstr "Valor incorreto de %s: '%s'"
+msgid "got %s %d %s"
+msgstr "obteve-se %s %d %s"
-#: object.c:242
+#: fetch-pack.c:450
#, c-format
-msgid "unable to parse object: %s"
-msgstr "não foi possível analisar o objeto: %s"
+msgid "invalid commit %s"
+msgstr "commit inválido %s"
-#: parse-options.c:572
-msgid "..."
-msgstr "..."
+#: fetch-pack.c:483
+msgid "giving up"
+msgstr "desistência"
-#: parse-options.c:590
+#: fetch-pack.c:493 progress.c:235
+msgid "done"
+msgstr "concluído"
+
+#: fetch-pack.c:505
#, c-format
-msgid "usage: %s"
-msgstr "utilização: %s"
+msgid "got %s (%d) %s"
+msgstr "obteve-se %s (%d) %s"
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation
-#: parse-options.c:594
+#: fetch-pack.c:551
#, c-format
-msgid " or: %s"
-msgstr " ou: %s"
+msgid "Marking %s as complete"
+msgstr "Marcado %s como completo"
-#: parse-options.c:597
+#: fetch-pack.c:697
#, c-format
-msgid " %s"
-msgstr " %s"
+msgid "already have %s (%s)"
+msgstr "já se tem %s (%s)"
-#: parse-options.c:631
-msgid "-NUM"
-msgstr "-NUM"
+#: fetch-pack.c:735
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr ""
-#: parse-options-cb.c:108
+#: fetch-pack.c:743
+msgid "protocol error: bad pack header"
+msgstr "erro de protocolo: cabeçalho de pacote incorreto"
+
+#: fetch-pack.c:799
#, c-format
-msgid "malformed object name '%s'"
-msgstr "nome do objeto malformado '%s'"
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack: não é possível criar processo filho %s"
-#: path.c:798
+#: fetch-pack.c:815
#, c-format
-msgid "Could not make %s writable by group"
-msgstr "Não foi possível dar permissão de escrita ao grupo a %s"
+msgid "%s failed"
+msgstr "%s falhou"
-#: pathspec.c:133
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+#: fetch-pack.c:817
+msgid "error in sideband demultiplexer"
msgstr ""
-"as definições globais 'glob' e 'noglob' de especificador de caminho "
-"(pathspec) são incompatíveis"
-#: pathspec.c:143
-msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
-msgstr ""
-"a definição global de especificador de caminho 'literal' é incompatível com "
-"todas as outras definições globais de especificador de caminho (pathspec)"
+#: fetch-pack.c:844
+msgid "Server does not support shallow clients"
+msgstr "O servidor não suporta clientes rasos"
-#: pathspec.c:177
-msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr "parâmetro inválido na mágica 'prefix' do especificador de caminho"
+#: fetch-pack.c:848
+msgid "Server supports multi_ack_detailed"
+msgstr "O servidor suporta multi_ack_detailed"
-#: pathspec.c:183
-#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
-msgstr "Mágica do especificador de caminho '%.*s' inválida em '%s'"
+#: fetch-pack.c:851
+msgid "Server supports no-done"
+msgstr "O servidor suporta no-done"
-#: pathspec.c:187
-#, c-format
-msgid "Missing ')' at the end of pathspec magic in '%s'"
-msgstr "Falta um ')' no final da mágica do especificador de caminho em '%s'"
+#: fetch-pack.c:857
+msgid "Server supports multi_ack"
+msgstr "O servidor suporta muilti_ack"
-#: pathspec.c:205
-#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "Mágica de especificador de caminho '%c' em '%s' não implementada"
+#: fetch-pack.c:861
+msgid "Server supports side-band-64k"
+msgstr "O servidor suporta side-band-64k"
-#: pathspec.c:230
-#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
-msgstr "%s: 'literal' e 'glob' são incompatíveis"
+#: fetch-pack.c:865
+msgid "Server supports side-band"
+msgstr "O servidor suporta side-band"
-#: pathspec.c:241
-#, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s: '%s' está fora do repositório"
+#: fetch-pack.c:869
+msgid "Server supports allow-tip-sha1-in-want"
+msgstr "O servidor suporta allow-tip-sha1-in-want"
-#: pathspec.c:291
-#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "O caminho '%s' está dentro do submódulo '%.*s'"
+#: fetch-pack.c:873
+msgid "Server supports allow-reachable-sha1-in-want"
+msgstr "O servidor suporta allow-reachable-sha1-in-want"
-#: pathspec.c:353
-#, c-format
-msgid "%s: pathspec magic not supported by this command: %s"
-msgstr ""
-"%s: mágica de especificador de caminho não suportada por este comando: %s"
+#: fetch-pack.c:883
+msgid "Server supports ofs-delta"
+msgstr "O servidor suporta ofs-delta"
-#: pathspec.c:433
+#: fetch-pack.c:890
#, c-format
-msgid "pathspec '%s' is beyond a symbolic link"
-msgstr "o especificador de caminho '%s' é indicado por uma ligação simbólica"
+msgid "Server version is %.*s"
+msgstr "A versão do servidor é %.*s"
-#: pathspec.c:442
-msgid ""
-"There is nothing to exclude from by :(exclude) patterns.\n"
-"Perhaps you forgot to add either ':/' or '.' ?"
-msgstr ""
-"Não há nada para excluir de acordo com o padrão :(excluir).\n"
-"Talvez se tenha esquecido de acrescentar ':/' ou '.' ?"
+#: fetch-pack.c:896
+msgid "Server does not support --shallow-since"
+msgstr "O servidor não suporta --shallow-since"
-#: pretty.c:973
-msgid "unable to parse --pretty format"
-msgstr "não foi possível analisar o formato de --pretty"
+#: fetch-pack.c:900
+msgid "Server does not support --shallow-exclude"
+msgstr "O servidor não suporta --shallow-exclude"
-#: progress.c:235
-msgid "done"
-msgstr "concluído"
+#: fetch-pack.c:902
+msgid "Server does not support --deepen"
+msgstr "O servidor não suporta --deepen"
-#: read-cache.c:1281
-#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-"index.version definido, mas com valor inválido.\n"
-"A usar a versão %i"
+#: fetch-pack.c:913
+msgid "no common commits"
+msgstr "nenhum commit em comum"
+
+#: fetch-pack.c:925
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack: falha ao obter."
+
+#: fetch-pack.c:1087
+msgid "no matching remote head"
+msgstr "nenhuma cabeça remota correspondente"
+
+#: gpg-interface.c:185
+msgid "gpg failed to sign the data"
+msgstr "gpg não assinou os dados"
-#: read-cache.c:1291
+#: gpg-interface.c:215
+msgid "could not create temporary file"
+msgstr "não foi possível criar ficheiro temporário"
+
+#: gpg-interface.c:217
#, c-format
-msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-"GIT_INDEX_VERSION definido, mas com valor inválido.\n"
-"A usar a versão %i"
+msgid "failed writing detached signature to '%s'"
+msgstr "falha ao escrever assinatura destacada em '%s'"
-#: refs.c:551 builtin/merge.c:840
+#: grep.c:1782
#, c-format
-msgid "Could not open '%s' for writing"
-msgstr "Não foi possível abrir '%s' para escrita"
+msgid "'%s': unable to read %s"
+msgstr "'%s': não foi possível ler %s"
-#: refs/files-backend.c:2534
+#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155
#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "não foi possível eliminar a referência %s: %s"
+msgid "failed to stat '%s'"
+msgstr "falha ao invocar stat de '%s'"
-#: refs/files-backend.c:2537
+#: grep.c:1810
#, c-format
-msgid "could not delete references: %s"
-msgstr "não foi possível eliminar as referências: %s"
+msgid "'%s': short read"
+msgstr "'%s': leitura truncada"
-#: refs/files-backend.c:2546
+#: help.c:203
#, c-format
-msgid "could not remove reference %s"
-msgstr "não foi possível eliminar a referência %s"
+msgid "available git commands in '%s'"
+msgstr "comandos do git disponível em '%s'"
-#: ref-filter.c:55
+#: help.c:210
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "comandos do git disponíveis noutras localizações em $PATH"
+
+#: help.c:241
+msgid "These are common Git commands used in various situations:"
+msgstr "Estes são comandos do Git comuns usados em diversas situações:"
+
+#: help.c:306
#, c-format
-msgid "expected format: %%(color:<color>)"
-msgstr "formato esperado: %%(color:<cor>)"
+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 um comando do git, mas não é possível\n"
+"executá-lo. Talvez git-%s esteja danificado?"
-#: ref-filter.c:57
-#, c-format
-msgid "unrecognized color: %%(color:%s)"
-msgstr "cor não reconhecida: %%(color:%s)"
+#: help.c:361
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "Oh não. Não há nenhum comando do Git disponível no sistema."
-#: ref-filter.c:71
+#: help.c:383
#, c-format
-msgid "unrecognized format: %%(%s)"
-msgstr "formato não reconhecido: %%(%s)"
+msgid ""
+"WARNING: You called a Git command named '%s', which does not exist.\n"
+"Continuing under the assumption that you meant '%s'"
+msgstr ""
+"AVISO: Invocou um comando do Git designado '%s' que não existe.\n"
+"Continuando, assumindo que queria dizer '%s'"
-#: ref-filter.c:77
+#: help.c:388
#, c-format
-msgid "%%(body) does not take arguments"
-msgstr "%%(body) não leva argumentos"
+msgid "in %0.1f seconds automatically..."
+msgstr "automaticamente em %0.1f..."
-#: ref-filter.c:84
+#: help.c:395
#, c-format
-msgid "%%(subject) does not take arguments"
-msgstr "%%(subject) não leva argumentos"
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git: '%s' não é um comando do git. Consulte 'git --help'."
-#: ref-filter.c:101
-#, c-format
-msgid "positive value expected contents:lines=%s"
-msgstr "valor positivo esperado contents:lines=%s"
+#: help.c:399 help.c:465
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+"\n"
+"Queria dizer isto?"
+msgstr[1] ""
+"\n"
+"Queria dizer deste?"
-#: ref-filter.c:103
+#: help.c:461
#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "argumento de %%(contents) não reconhecido: %s"
+msgid "%s: %s - %s"
+msgstr "%s: %s - %s"
-#: ref-filter.c:113
-#, c-format
-msgid "unrecognized %%(objectname) argument: %s"
-msgstr "argumento de %%(objectname) não reconhecido: %s"
+#: ident.c:334
+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 diga que é.\n"
+"\n"
+"Execute\n"
+"\n"
+" git config --global user.email \"eu@exemplo.com\"\n"
+" git config --global user.name \"Meu Nome\"\n"
+"\n"
+"para definir a identidade predefinida da sua conta.\n"
+"Omita --global para definir a identidade apenas neste repositório.\n"
+"\n"
-#: ref-filter.c:135
+#: lockfile.c:152
#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
-msgstr "formato esperado: %%(align:<largura>,<posição>)"
+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 ""
+"Não é possível criar '%s.lock': %s.\n"
+"\n"
+"Outro processo git parece estar a executar neste repositório, e.g.\n"
+"um editor aberto por 'git commit'. Certifique-se que todos os processos\n"
+"terminaram e tente de novo. Se ainda assim falhar, um processo git\n"
+"pode ter falhado anteriormente no repositório:\n"
+"remova o ficheiro manualmente para continuar."
-#: ref-filter.c:147
+#: lockfile.c:160
#, c-format
-msgid "unrecognized position:%s"
-msgstr "posição não reconhecida:%s"
+msgid "Unable to create '%s.lock': %s"
+msgstr "Não é foi possível criar '%s.lock': %s"
-#: ref-filter.c:151
-#, c-format
-msgid "unrecognized width:%s"
-msgstr "largura não reconhecida:%s"
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "falha ao ler a cache"
-#: ref-filter.c:157
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "argumento de %%(align) não reconhecido: %s"
+#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374
+#: builtin/checkout.c:588 builtin/clone.c:731
+msgid "unable to write new index file"
+msgstr "não foi possível escrever novo ficheiro de índice"
-#: ref-filter.c:161
-#, c-format
-msgid "positive width expected with the %%(align) atom"
-msgstr "largura positiva esperada com o átomo %%(algn)"
+#: merge-recursive.c:209
+msgid "(bad commit)\n"
+msgstr "(commit incorreto)\n"
-#: ref-filter.c:244
+#: merge-recursive.c:231
#, c-format
-msgid "malformed field name: %.*s"
-msgstr "nome de ficheiro malformado: %.*s"
+msgid "addinfo_cache failed for path '%s'"
+msgstr "addinfo_cache falhou no caminho '%s'"
-#: ref-filter.c:270
-#, c-format
-msgid "unknown field name: %.*s"
-msgstr "nome do campo desconhecido: %.*s"
+#: merge-recursive.c:301
+msgid "error building trees"
+msgstr "erro ao construir árvores"
-#: ref-filter.c:372
+#: merge-recursive.c:720
#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
-msgstr "formato: átomo %%(end) utilizado sem átomo correspondente"
+msgid "failed to create path '%s'%s"
+msgstr "falha ao criar o caminho '%s'%s"
-#: ref-filter.c:424
+#: merge-recursive.c:731
#, c-format
-msgid "malformed format string %s"
-msgstr "cadeia malformada %s"
+msgid "Removing %s to make room for subdirectory\n"
+msgstr "A remover %s para criar espaço para o subdiretório\n"
-#: ref-filter.c:878
-msgid ":strip= requires a positive integer argument"
-msgstr ":strip= requer um inteiro positivo como argumento"
+#: merge-recursive.c:745 merge-recursive.c:764
+msgid ": perhaps a D/F conflict?"
+msgstr ": talvez um conflito D/F?"
-#: ref-filter.c:883
+#: merge-recursive.c:754
#, c-format
-msgid "ref '%s' does not have %ld components to :strip"
-msgstr "a referência '%s' não tem %ld componentes como se indica em :strip"
+msgid "refusing to lose untracked file at '%s'"
+msgstr "perda de ficheiro não controlado em '%s' recusada"
-#: ref-filter.c:1046
+#: merge-recursive.c:796 builtin/cat-file.c:34
#, c-format
-msgid "unknown %.*s format %s"
-msgstr "formato de %.*s desconhecido %s"
+msgid "cannot read object %s '%s'"
+msgstr "não é possível ler o objeto %s: '%s'"
-#: ref-filter.c:1066 ref-filter.c:1097
+#: merge-recursive.c:798
#, c-format
-msgid "missing object %s for %s"
-msgstr "falta o objeto %s de %s"
+msgid "blob expected for %s '%s'"
+msgstr "blob para %s '%s' esperado"
-#: ref-filter.c:1069 ref-filter.c:1100
+#: merge-recursive.c:822
#, c-format
-msgid "parse_object_buffer failed on %s for %s"
-msgstr "falha ao invocar parse_object_buffer sobre %s de %s"
+msgid "failed to open '%s': %s"
+msgstr "falha ao abrir '%s': %s"
-#: ref-filter.c:1311
+#: merge-recursive.c:833
#, c-format
-msgid "malformed object at '%s'"
-msgstr "objeto malformado em '%s'"
+msgid "failed to symlink '%s': %s"
+msgstr "falha ao criar a ligação simbólica '%s': %s"
-#: ref-filter.c:1373
+#: merge-recursive.c:838
#, c-format
-msgid "ignoring ref with broken name %s"
-msgstr "a referência %s com nome danificado foi ignorada"
+msgid "do not know what to do with %06o %s '%s'"
+msgstr "não sei o que fazer com %06o %s '%s'"
-#: ref-filter.c:1378
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "a referência %s danificada foi ignorada"
+#: merge-recursive.c:978
+msgid "Failed to execute internal merge"
+msgstr "Falha ao executar integração interna"
-#: ref-filter.c:1651
+#: merge-recursive.c:982
#, c-format
-msgid "format: %%(end) atom missing"
-msgstr "formato: falta átomo %%(end)"
+msgid "Unable to add %s to database"
+msgstr "Não é possível adicionar %s à base de dados"
-#: ref-filter.c:1705
+#: merge-recursive.c:1081 merge-recursive.c:1095
#, c-format
-msgid "malformed object name %s"
-msgstr "nome de objeto malformado %s"
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
+msgstr ""
+"CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versão de %s de %s "
+"deixada na árvore."
-#: remote.c:746
+#: merge-recursive.c:1087 merge-recursive.c:1100
#, c-format
-msgid "Cannot fetch both %s and %s to %s"
-msgstr "Não é possível obter %s e %s ao mesmo tempo para %s"
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
+msgstr ""
+"CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versão de %s de %s "
+"deixada na árvore em %s."
-#: remote.c:750
-#, c-format
-msgid "%s usually tracks %s, not %s"
-msgstr "%s geralmente segue %s, não %s"
+#: merge-recursive.c:1143
+msgid "rename"
+msgstr "mudar nome"
-#: remote.c:754
+#: merge-recursive.c:1143
+msgid "renamed"
+msgstr "nome mudado"
+
+#: merge-recursive.c:1200
#, c-format
-msgid "%s tracks both %s and %s"
-msgstr "%s segue %s e %s em simultâneo"
+msgid "%s is a directory in %s adding as %s instead"
+msgstr "%s é um diretório em %s adicionando %s no seu lugar"
-#: remote.c:762
-msgid "Internal error"
-msgstr "Erro interno"
+#: merge-recursive.c:1225
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
+msgstr ""
+"CONFLITO (mudar nome/mudar nome): Mudar o nome \"%s\"->\"%s\" no ramo \"%s\" "
+"mudar o nome \"%s\"->\"%s\" em \"%s\"%s"
-#: remote.c:1677 remote.c:1720
-msgid "HEAD does not point to a branch"
-msgstr "HEAD não aponta para um ramo"
+#: merge-recursive.c:1230
+msgid " (left unresolved)"
+msgstr " (por resolver)"
-#: remote.c:1686
+#: merge-recursive.c:1292
#, c-format
-msgid "no such branch: '%s'"
-msgstr "ramo inexistente: '%s'"
+msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
+msgstr ""
+"CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome "
+"%s->%s em %s"
-#: remote.c:1689
+#: merge-recursive.c:1325
#, c-format
-msgid "no upstream configured for branch '%s'"
-msgstr "nenhum ramo a montante configurado para o ramo '%s'"
+msgid "Renaming %s to %s and %s to %s instead"
+msgstr "A mudar o nome de %s para %s e de %s para %s, em alternativa"
-#: remote.c:1695
+#: merge-recursive.c:1531
#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
-"o ramo a montante '%s' não está guardado como um ramo de monitorização remoto"
+"CONFLITO (mudar nome/adicionar): Mudar o nome %s->%s em %s. %s adicionado em "
+"%s"
-#: remote.c:1710
+#: merge-recursive.c:1546
#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
-msgstr ""
-"o destino de publicação '%s' no remoto '%s' não é seguido por nenhum ramo "
-"local"
+msgid "Adding merged %s"
+msgstr "A adicionar %s integrado"
-#: remote.c:1725
+#: merge-recursive.c:1553 merge-recursive.c:1766
#, c-format
-msgid "branch '%s' has no remote for pushing"
-msgstr "o ramo '%s' não tem nenhum remoto para publicar"
+msgid "Adding as %s instead"
+msgstr "A adicionar como %s, em alternativa."
-#: remote.c:1736
+#: merge-recursive.c:1610
#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
-msgstr ""
-"'%2$s' não faz parte dos especificadores de referência de '%1$s' para "
-"publicação"
+msgid "cannot read object %s"
+msgstr "não foi possível ler o objeto %s"
-#: remote.c:1749
-msgid "push has no destination (push.default is 'nothing')"
-msgstr "publicação sem destino (push.default é 'nothing')"
+#: merge-recursive.c:1613
+#, c-format
+msgid "object %s is not a blob"
+msgstr "o objeto %s não é um blob"
-#: remote.c:1771
-msgid "cannot resolve 'simple' push to a single destination"
-msgstr "não é possível resolver a publicação 'simple' num único destino"
+#: merge-recursive.c:1666
+msgid "modify"
+msgstr "modificar"
-#: remote.c:2073
-#, c-format
-msgid "Your branch is based on '%s', but the upstream is gone.\n"
-msgstr "A base do seu ramo é '%s', mas o ramo a montante desapareceu.\n"
+#: merge-recursive.c:1666
+msgid "modified"
+msgstr "modificado"
-#: remote.c:2077
-msgid " (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr " (use \"git branch --unset-upstream\" para corrigir)\n"
+#: merge-recursive.c:1676
+msgid "content"
+msgstr "conteúdo"
-#: remote.c:2080
+#: merge-recursive.c:1683
+msgid "add/add"
+msgstr "adicionar/adicionar"
+
+#: merge-recursive.c:1718
#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
-msgstr "O seu ramo está atualizado com '%s'.\n"
+msgid "Skipped %s (merged same as existing)"
+msgstr "%s ignorado (integrado é igual ao existente)"
-#: remote.c:2084
+#: merge-recursive.c:1732
#, 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] "O seu ramo está à frente de '%s' por %d commit.\n"
-msgstr[1] "O seu ramo está à frente de '%s' por %d commits.\n"
+msgid "Auto-merging %s"
+msgstr "A integrar automaticamente %s"
-#: remote.c:2090
-msgid " (use \"git push\" to publish your local commits)\n"
-msgstr " (use \"git push\" para publicar os commits locais)\n"
+#: merge-recursive.c:1736 git-submodule.sh:924
+msgid "submodule"
+msgstr "submódulo"
-#: remote.c:2093
+#: merge-recursive.c:1737
#, 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] ""
-"O seu ramo está atrás de '%s' por %d commit, podendo ser atualizado com "
-"avanço rápido.\n"
-msgstr[1] ""
-"O seu ramo está atrás de '%s' por %d commits, podendo ser atualizado com "
-"avanço rápido.\n"
-
-#: remote.c:2101
-msgid " (use \"git pull\" to update your local branch)\n"
-msgstr " (use \"git pull\" para atualizar o seu ramo local)\n"
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "CONFLITO (%s): conflito de integração em %s"
-#: remote.c:2104
+#: merge-recursive.c:1831
#, 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] ""
-"O seu ramo e '%s' divergiram,\n"
-"tendo cada um %d e %d commit diferente, respetivamente.\n"
-msgstr[1] ""
-"O seu ramo e '%s' divergiram,\n"
-"tendo cada um %d e %d commits diferentes, respetivamente.\n"
+msgid "Removing %s"
+msgstr "A remover %s"
-#: remote.c:2114
-msgid " (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr " (use \"git pull\" para integrar o ramo remoto no seu ramo)\n"
+#: merge-recursive.c:1857
+msgid "file/directory"
+msgstr "ficheiro/diretório"
-#: revision.c:2132
-msgid "your current branch appears to be broken"
-msgstr "o ramo atual parece estar danificado"
+#: merge-recursive.c:1863
+msgid "directory/file"
+msgstr "diretório/ficheiro"
-#: revision.c:2135
+#: merge-recursive.c:1868
#, c-format
-msgid "your current branch '%s' does not have any commits yet"
-msgstr "o ramo atual '%s' ainda não contém nenhum commit"
+msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
+msgstr ""
+"CONFLITO (%s): Há um diretório designado %s em %s. A adicionar %s como %s"
-#: revision.c:2329
-msgid "--first-parent is incompatible with --bisect"
-msgstr "--first-parent é incompatível com --bisect"
+#: merge-recursive.c:1877
+#, c-format
+msgid "Adding %s"
+msgstr "A adicionar %s"
-#: run-command.c:92
-msgid "open /dev/null failed"
-msgstr "falha ao abrir /dev/null"
+#: merge-recursive.c:1914
+msgid "Already up-to-date!"
+msgstr "Já está atualizado!"
-#: run-command.c:94
+#: merge-recursive.c:1923
#, c-format
-msgid "dup2(%d,%d) failed"
-msgstr "dup2(%d,%d) falhou"
+msgid "merging of trees %s and %s failed"
+msgstr "falha ao integrar as árvores %s e %s"
-#: send-pack.c:298
-msgid "failed to sign the push certificate"
-msgstr "falha ao assinar o certificado de publicação"
+#: merge-recursive.c:2006
+msgid "Merging:"
+msgstr "A integrar:"
-#: send-pack.c:411
-msgid "the receiving end does not support --signed push"
-msgstr "o recetor não suporta publicação com --signed"
+#: merge-recursive.c:2019
+#, c-format
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] "%u antecessor comum encontrado:"
+msgstr[1] "%u antecessores comuns encontrados:"
-#: send-pack.c:413
-msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
-msgstr ""
-"certificado de publicação não enviado uma vez que o recetor não suporta "
-"publicação com --signed"
+#: merge-recursive.c:2058
+msgid "merge returned no commit"
+msgstr "a integração não retornou nenhum commit"
-#: send-pack.c:425
-msgid "the receiving end does not support --atomic push"
-msgstr "o recetor não suporta publicação com --atomic"
+#: merge-recursive.c:2121
+#, c-format
+msgid "Could not parse object '%s'"
+msgstr "Não foi possível analisar o objeto '%s'"
-#: send-pack.c:430
-msgid "the receiving end does not support push options"
-msgstr "o recetor não suporta opções de publicação"
+#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
+msgid "Unable to write index."
+msgstr "Não é possível escrever no índice."
-#: sequencer.c:174
+#: notes-merge.c:273
+#, c-format
msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
+"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 ""
-"depois de resolver os conflitos, marque os caminhos corrigidos\n"
-"com 'git add <caminhos>' ou 'git rm <caminhos>'"
+"Não concluíu a integração de notas anterior (%s existe).\n"
+"Use 'git notes merge --commit' ou 'git notes merge --abort' para submeter/"
+"abortar a integração anterior antes de começar uma nova integração de notas."
-#: sequencer.c:177
-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'"
+#: notes-merge.c:280
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "Não concluído a integração de integração de notas (%s presente)."
+
+#: notes-utils.c:41
+msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
-"depois de resolver os conflitos, marque os caminhos corrigidos\n"
-"com 'git add <caminhos>' ou 'git rm <caminhos>'\n"
-"e submeta o resultado com 'git commit'"
+"Não é possível submeter árvore de notas não inicializada ou não referenciada"
-#: sequencer.c:190 sequencer.c:841 sequencer.c:924
+#: notes-utils.c:100
#, c-format
-msgid "Could not write to %s"
-msgstr "Não foi possível escrever em %s"
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "Valor de notes.rewriteMode incorreto: '%s'"
-#: sequencer.c:193 sequencer.c:843 sequencer.c:928
+#: notes-utils.c:110
#, c-format
-msgid "Error wrapping up %s."
-msgstr "Erro ao rematar %s."
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "Reescrita de notas em %s (fora de refs/notes/) recusada"
-#: sequencer.c:208
-msgid "Your local changes would be overwritten by cherry-pick."
-msgstr "As suas alterações locais serão substituídas por cherry-pick."
+#. TRANSLATORS: The first %s is the name of the
+#. environment variable, the second %s is its value
+#: notes-utils.c:137
+#, c-format
+msgid "Bad %s value: '%s'"
+msgstr "Valor incorreto de %s: '%s'"
-#: sequencer.c:210
-msgid "Your local changes would be overwritten by revert."
-msgstr "As suas alterações locais serão substituídas por revert."
+#: object.c:242
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "não foi possível analisar o objeto: %s"
-#: sequencer.c:213
-msgid "Commit your changes or stash them to proceed."
-msgstr "Submeta ou esconda as suas alterações para continuar."
+#: parse-options.c:572
+msgid "..."
+msgstr "..."
-#: sequencer.c:228
+#: parse-options.c:590
#, c-format
-msgid "%s: fast-forward"
-msgstr "%s: avanço rápido"
+msgid "usage: %s"
+msgstr "utilização: %s"
-#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:303
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation
+#: parse-options.c:594
#, c-format
-msgid "%s: Unable to write new index file"
-msgstr "%s: Não foi possível escrever novo ficheiro de índice"
+msgid " or: %s"
+msgstr " ou: %s"
-#: sequencer.c:321
-msgid "Could not resolve HEAD commit\n"
-msgstr "Não foi possível resolver o commit HEAD\n"
+#: parse-options.c:597
+#, c-format
+msgid " %s"
+msgstr " %s"
-#: sequencer.c:341
-msgid "Unable to update cache tree\n"
-msgstr "Não foi possível atualizar a árvore de cache\n"
+#: parse-options.c:631
+msgid "-NUM"
+msgstr "-NUM"
-#: sequencer.c:393
+#: parse-options-cb.c:108
#, c-format
-msgid "Could not parse commit %s\n"
-msgstr "Não foi possível analisar o commit %s\n"
+msgid "malformed object name '%s'"
+msgstr "nome do objeto malformado '%s'"
-#: sequencer.c:398
+#: path.c:826
#, c-format
-msgid "Could not parse parent commit %s\n"
-msgstr "Não foi possível analisar o commit pai %s\n"
+msgid "Could not make %s writable by group"
+msgstr "Não foi possível dar permissão de escrita ao grupo a %s"
-#: sequencer.c:463
-msgid "Your index file is unmerged."
-msgstr "Ficheiro de índice não integrado."
+#: pathspec.c:133
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr ""
+"as definições globais 'glob' e 'noglob' de especificador de caminho "
+"(pathspec) são incompatíveis"
-#: sequencer.c:482
-#, c-format
-msgid "Commit %s is a merge but no -m option was given."
-msgstr "O commit %s é uma integração mas não foi fornecida nenhuma opção -m."
+#: pathspec.c:143
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr ""
+"a definição global de especificador de caminho 'literal' é incompatível com "
+"todas as outras definições globais de especificador de caminho (pathspec)"
-#: sequencer.c:490
-#, c-format
-msgid "Commit %s does not have parent %d"
-msgstr "O commit %s não tem o pai %d"
+#: pathspec.c:177
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "parâmetro inválido na mágica 'prefix' do especificador de caminho"
-#: sequencer.c:494
+#: pathspec.c:183
#, c-format
-msgid "Mainline was specified but commit %s is not a merge."
-msgstr ""
-"A linha principal foi especificada mas o commit %s não é uma integração."
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "Mágica do especificador de caminho '%.*s' inválida em '%s'"
-#. TRANSLATORS: The first %s will be "revert" or
-#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:507
+#: pathspec.c:187
#, c-format
-msgid "%s: cannot parse parent commit %s"
-msgstr "%s: não foi possível analisar o commit pai %s"
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "Falta um ')' no final da mágica do especificador de caminho em '%s'"
-#: sequencer.c:511
+#: pathspec.c:205
#, c-format
-msgid "Cannot get commit message for %s"
-msgstr "Não é possível obter a mensagem de commit de %s"
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "Mágica de especificador de caminho '%c' em '%s' não implementada"
-#: sequencer.c:597
+#: pathspec.c:230
#, c-format
-msgid "could not revert %s... %s"
-msgstr "não foi possível reverter %s... %s"
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s: 'literal' e 'glob' são incompatíveis"
-#: sequencer.c:598
+#: pathspec.c:241
#, c-format
-msgid "could not apply %s... %s"
-msgstr "não foi possível aplicar %s... %s"
-
-#: sequencer.c:633
-msgid "empty commit set passed"
-msgstr "o conjunto de commits especificado está vazio"
+msgid "%s: '%s' is outside repository"
+msgstr "%s: '%s' está fora do repositório"
-#: sequencer.c:641
+#: pathspec.c:291
#, c-format
-msgid "git %s: failed to read the index"
-msgstr "git %s: falha ao ler o índice"
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "O caminho '%s' está dentro do submódulo '%.*s'"
-#: sequencer.c:645
+#: pathspec.c:353
#, c-format
-msgid "git %s: failed to refresh the index"
-msgstr "git %s: falha ao atualizar o índice"
-
-#: sequencer.c:705
-msgid "Cannot revert during another revert."
-msgstr "Não é possível reverter durante outra reversão."
-
-#: sequencer.c:706
-msgid "Cannot revert during a cherry-pick."
-msgstr "Não é possível reverter durante um cherry-pick."
-
-#: sequencer.c:709
-msgid "Cannot cherry-pick during a revert."
-msgstr "Não é possível efetuar cherry-pick durante uma reversão."
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr ""
+"%s: mágica de especificador de caminho não suportada por este comando: %s"
-#: sequencer.c:710
-msgid "Cannot cherry-pick during another cherry-pick."
+#: pathspec.c:408
+msgid ""
+"empty strings as pathspecs will be made invalid in upcoming releases. please "
+"use . instead if you meant to match all paths"
msgstr ""
-"Não é possível efetuar cherry-pick durante outro cherry-pick. durante um "
-"cherry-pick."
+"cadeias de caracteres vazias como especificadores de caminho tornar-se-ão "
+"inválidas nas próximas versões. Use . para corresponder a todos os caminhos"
-#: sequencer.c:732
+#: pathspec.c:440
#, c-format
-msgid "Could not parse line %d."
-msgstr "Não foi possível analisar a linha %d."
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "o especificador de caminho '%s' é indicado por uma ligação simbólica"
-#: sequencer.c:737
-msgid "No commits parsed."
-msgstr "Nenhum commit analisado."
+#: pathspec.c:449
+msgid ""
+"There is nothing to exclude from by :(exclude) patterns.\n"
+"Perhaps you forgot to add either ':/' or '.' ?"
+msgstr ""
+"Não há nada para excluir de acordo com o padrão :(excluir).\n"
+"Talvez se tenha esquecido de acrescentar ':/' ou '.' ?"
-#: sequencer.c:749
-#, c-format
-msgid "Could not open %s"
-msgstr "Não foi possível abrir %s"
+#: pretty.c:971
+msgid "unable to parse --pretty format"
+msgstr "não foi possível analisar o formato de --pretty"
-#: sequencer.c:753
+#: read-cache.c:1315
#, c-format
-msgid "Could not read %s."
-msgstr "Não foi possível ler %s."
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"index.version definido, mas com valor inválido.\n"
+"A usar a versão %i"
-#: sequencer.c:760
+#: read-cache.c:1325
#, c-format
-msgid "Unusable instruction sheet: %s"
-msgstr "Folha de instruções inutilizável: %s"
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"GIT_INDEX_VERSION definido, mas com valor inválido.\n"
+"A usar a versão %i"
-#: sequencer.c:790
+#: refs.c:576 builtin/merge.c:840
#, c-format
-msgid "Invalid key: %s"
-msgstr "Chave inválida: %s"
+msgid "Could not open '%s' for writing"
+msgstr "Não foi possível abrir '%s' para escrita"
-#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52
+#: refs/files-backend.c:2481
#, c-format
-msgid "Invalid value for %s: %s"
-msgstr "Valor inválido de %s: %s"
+msgid "could not delete reference %s: %s"
+msgstr "não foi possível eliminar a referência %s: %s"
-#: sequencer.c:803
+#: refs/files-backend.c:2484
#, c-format
-msgid "Malformed options sheet: %s"
-msgstr "Folha de opções malformada: %s"
-
-#: sequencer.c:822
-msgid "a cherry-pick or revert is already in progress"
-msgstr "cherry-pick ou revert em curso"
-
-#: sequencer.c:823
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
-msgstr "tente \"git cherry-pick (--continue | --quit |--abort)\""
+msgid "could not delete references: %s"
+msgstr "não foi possível eliminar as referências: %s"
-#: sequencer.c:827
+#: refs/files-backend.c:2493
#, c-format
-msgid "Could not create sequencer directory %s"
-msgstr "Não foi possível criar o diretório do sequenciador %s"
-
-#: sequencer.c:862 sequencer.c:998
-msgid "no cherry-pick or revert in progress"
-msgstr "nenhum cherry-pick ou revert em curso"
-
-#: sequencer.c:864
-msgid "cannot resolve HEAD"
-msgstr "não é possível resolver HEAD"
-
-#: sequencer.c:866 sequencer.c:900
-msgid "cannot abort from a branch yet to be born"
-msgstr "não é possível abortar um ramo ainda não criado"
+msgid "could not remove reference %s"
+msgstr "não foi possível eliminar a referência %s"
-#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970
+#: ref-filter.c:55
#, c-format
-msgid "cannot open %s"
-msgstr "não é possível abrir %s"
+msgid "expected format: %%(color:<color>)"
+msgstr "formato esperado: %%(color:<cor>)"
-#: sequencer.c:888
+#: ref-filter.c:57
#, c-format
-msgid "cannot read %s: %s"
-msgstr "não é possível ler %s: %s"
-
-#: sequencer.c:889
-msgid "unexpected end of file"
-msgstr "fim de ficheiro inesperado"
+msgid "unrecognized color: %%(color:%s)"
+msgstr "cor não reconhecida: %%(color:%s)"
-#: sequencer.c:895
+#: ref-filter.c:71
#, c-format
-msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
-msgstr "o ficheiro HEAD de pre-cherry-pick '%s' está corrompido"
+msgid "unrecognized format: %%(%s)"
+msgstr "formato não reconhecido: %%(%s)"
-#: sequencer.c:921
+#: ref-filter.c:77
#, c-format
-msgid "Could not format %s."
-msgstr "Não foi possível formatar %s."
+msgid "%%(body) does not take arguments"
+msgstr "%%(body) não leva argumentos"
-#: sequencer.c:1066
+#: ref-filter.c:84
#, c-format
-msgid "%s: can't cherry-pick a %s"
-msgstr "%s: não é possível efetuar cherry-pick de %s"
+msgid "%%(subject) does not take arguments"
+msgstr "%%(subject) não leva argumentos"
-#: sequencer.c:1069
+#: ref-filter.c:101
#, c-format
-msgid "%s: bad revision"
-msgstr "%s: revisão incorreta"
-
-#: sequencer.c:1102
-msgid "Can't revert as initial commit"
-msgstr "Não é possível reverter como commit inicial"
+msgid "positive value expected contents:lines=%s"
+msgstr "valor positivo esperado contents:lines=%s"
-#: setup.c:160
+#: ref-filter.c:103
#, 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ão há tal caminho na árvore de trabalho.\n"
-"Use 'git <comando> -- <caminho>...' para especificar caminhos que não "
-"existem localmente."
+msgid "unrecognized %%(contents) argument: %s"
+msgstr "argumento de %%(contents) não reconhecido: %s"
-#: setup.c:173
+#: ref-filter.c:113
#, 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 ambíguo '%s': revisão ou caminho desconhecidos não encontrado na "
-"árvore de trabalho.\n"
-"Use '--' para separar caminhos de revisões, assim:\n"
-"'git <comando> [<revisão>...] -- [<ficheiro>...]'"
+msgid "unrecognized %%(objectname) argument: %s"
+msgstr "argumento de %%(objectname) não reconhecido: %s"
-#: setup.c:223
+#: ref-filter.c:135
#, 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 ambíguo '%s': revisão e nome de ficheiro\n"
-"Use '--' para separar caminhos de revisões, assim:\n"
-"'git <comando> [<revisão>...] -- [<ficheiro>...]'"
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "formato esperado: %%(align:<largura>,<posição>)"
-#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419
+#: ref-filter.c:147
#, c-format
-msgid "failed to read %s"
-msgstr "falha ao ler %s"
+msgid "unrecognized position:%s"
+msgstr "posição não reconhecida:%s"
-#: setup.c:468
+#: ref-filter.c:151
#, c-format
-msgid "Expected git repo version <= %d, found %d"
-msgstr "Esperava-se versão do repositório git <= %d, obteve-se %d"
-
-#: setup.c:476
-msgid "unknown repository extensions found:"
-msgstr "extensões de repositório desconhecidas encontradas:"
+msgid "unrecognized width:%s"
+msgstr "largura não reconhecida:%s"
-#: setup.c:762
+#: ref-filter.c:157
#, c-format
-msgid "Not a git repository (or any of the parent directories): %s"
-msgstr "Não é um repositório git (ou um dos diretórios pai): %s"
-
-#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
-msgid "Cannot come back to cwd"
-msgstr "Não é possível voltar ao diretório de trabalho atual"
-
-#: setup.c:845
-msgid "Unable to read current working directory"
-msgstr "Não é possível ler o diretório de trabalho atual"
+msgid "unrecognized %%(align) argument: %s"
+msgstr "argumento de %%(align) não reconhecido: %s"
-#: setup.c:920
+#: ref-filter.c:161
#, 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 ""
-"Não é um repositório git (ou um diretório pai até ao ponto de montagem %s)\n"
-"Interrompido no limite do sistema de ficheiros "
-"(GIT_DISCOVERY_ACROSS_FILESYSTEM não definido)."
+msgid "positive width expected with the %%(align) atom"
+msgstr "largura positiva esperada com o átomo %%(algn)"
-#: setup.c:927
+#: ref-filter.c:244
#, c-format
-msgid "Cannot change to '%s/..'"
-msgstr "Não é possível mudar para '%s/..'"
+msgid "malformed field name: %.*s"
+msgstr "nome de ficheiro malformado: %.*s"
-#: setup.c:989
+#: ref-filter.c:270
#, 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 com o valor core.sharedRepository modo de ficheiro (0%.3o).\n"
-"O dono dos ficheiros tem de ter sempre permissões de leitura e escrita."
+msgid "unknown field name: %.*s"
+msgstr "nome do campo desconhecido: %.*s"
-#: sha1_file.c:1046
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "offset antes do fim do ficheiro de pacote (.idx danificado?)"
+#: ref-filter.c:372
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "formato: átomo %%(end) utilizado sem átomo correspondente"
-#: sha1_file.c:2434
+#: ref-filter.c:424
#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
-msgstr "offset antes do início do índice do pacote %s (índice corrompido?)"
+msgid "malformed format string %s"
+msgstr "cadeia malformada %s"
+
+#: ref-filter.c:878
+msgid ":strip= requires a positive integer argument"
+msgstr ":strip= requer um inteiro positivo como argumento"
-#: sha1_file.c:2438
+#: ref-filter.c:883
#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr "offset depois do fim do índice do pacote %s (índice truncado?)"
+msgid "ref '%s' does not have %ld components to :strip"
+msgstr "a referência '%s' não tem %ld componentes como se indica em :strip"
-#: sha1_name.c:462
-msgid ""
-"Git normally never creates a ref that ends with 40 hex characters\n"
-"because it will be ignored when you just specify 40-hex. These refs\n"
-"may be created by mistake. For example,\n"
-"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
-"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
-msgstr ""
-"Normalmente o Git nunca cria referências que terminem em 40 caracteres "
-"hexadecimais,\n"
-"pois uma referência destas seria ignorada se indicasse só 40 caracteres "
-"hexadecimais.\n"
-"Estas referências podem ser criadas por engano. Como no exemplo,\n"
-"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
-"\n"
-"onde \"$br\" está vazio e é criada uma referência de 40 caracteres "
-"hexadecimais.\n"
-"Analise estas referências e elimine-as se desejar. Desative esta\n"
-"mensagem executando \"git config advice.objectNameWarning false\""
+#: ref-filter.c:1046
+#, c-format
+msgid "unknown %.*s format %s"
+msgstr "formato de %.*s desconhecido %s"
-#: submodule.c:64 submodule.c:98
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
-msgstr ""
-"Não é possível alterar .gitmodules não integrado, resolva primeiro os "
-"conflitos de integração"
+#: ref-filter.c:1066 ref-filter.c:1097
+#, c-format
+msgid "missing object %s for %s"
+msgstr "falta o objeto %s de %s"
-#: submodule.c:68 submodule.c:102
+#: ref-filter.c:1069 ref-filter.c:1100
#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
-msgstr "Secção de .gitmodules cujo path=%s não encontrada"
+msgid "parse_object_buffer failed on %s for %s"
+msgstr "falha ao invocar parse_object_buffer sobre %s de %s"
-#: submodule.c:76
+#: ref-filter.c:1311
#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "Não foi possível atualizar o elemento %s de .gitmodules"
+msgid "malformed object at '%s'"
+msgstr "objeto malformado em '%s'"
-#: submodule.c:109
+#: ref-filter.c:1373
#, c-format
-msgid "Could not remove .gitmodules entry for %s"
-msgstr "Não foi possível remover o elemento %s de .gitmodules"
+msgid "ignoring ref with broken name %s"
+msgstr "a referência %s com nome danificado foi ignorada"
-#: submodule.c:120
-msgid "staging updated .gitmodules failed"
-msgstr "falha ao preparar .gitmodules atualizado"
+#: ref-filter.c:1378
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "a referência %s danificada foi ignorada"
-#: submodule.c:177
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "não é permitido valores negativos em submodule.fetchJobs"
+#: ref-filter.c:1633
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "formato: falta átomo %%(end)"
-#: submodule-config.c:358
+#: ref-filter.c:1687
#, c-format
-msgid "invalid value for %s"
-msgstr "valor inválido de %s"
+msgid "malformed object name %s"
+msgstr "nome de objeto malformado %s"
-#: trailer.c:237
+#: remote.c:746
#, c-format
-msgid "running trailer command '%s' failed"
-msgstr "falha ao executar o comando trailer '%s'"
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "Não é possível obter %s e %s ao mesmo tempo para %s"
-#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558
-#: trailer.c:562
+#: remote.c:750
#, c-format
-msgid "unknown value '%s' for key '%s'"
-msgstr "valor desconhecido '%s' da chave '%s'"
+msgid "%s usually tracks %s, not %s"
+msgstr "%s geralmente segue %s, não %s"
-#: trailer.c:544 trailer.c:549 builtin/remote.c:289
+#: remote.c:754
#, c-format
-msgid "more than one %s"
-msgstr "mais do que um %s"
+msgid "%s tracks both %s and %s"
+msgstr "%s segue %s e %s em simultâneo"
+
+#: remote.c:762
+msgid "Internal error"
+msgstr "Erro interno"
+
+#: remote.c:1677 remote.c:1720
+msgid "HEAD does not point to a branch"
+msgstr "HEAD não aponta para um ramo"
-#: trailer.c:582
+#: remote.c:1686
#, c-format
-msgid "empty trailer token in trailer '%.*s'"
-msgstr "token terminador vazio no terminador '%.*s'"
+msgid "no such branch: '%s'"
+msgstr "ramo inexistente: '%s'"
-#: trailer.c:702
+#: remote.c:1689
#, c-format
-msgid "could not read input file '%s'"
-msgstr "não foi possível ler o ficheiro de entrada '%s'"
+msgid "no upstream configured for branch '%s'"
+msgstr "nenhum ramo a montante configurado para o ramo '%s'"
-#: trailer.c:705
-msgid "could not read from stdin"
-msgstr "não foi possível ler da entrada padrão"
+#: remote.c:1695
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr ""
+"o ramo a montante '%s' não está guardado como um ramo de monitorização remoto"
-#: trailer.c:857 builtin/am.c:42
+#: remote.c:1710
#, c-format
-msgid "could not stat %s"
-msgstr "não foi possível obter stat de %s"
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr ""
+"o destino de publicação '%s' no remoto '%s' não é seguido por nenhum ramo "
+"local"
-#: trailer.c:859
+#: remote.c:1725
#, c-format
-msgid "file %s is not a regular file"
-msgstr "o ficheiro %s não é um ficheiro regular"
+msgid "branch '%s' has no remote for pushing"
+msgstr "o ramo '%s' não tem nenhum remoto para publicar"
-#: trailer.c:861
+#: remote.c:1736
#, c-format
-msgid "file %s is not writable by user"
-msgstr "o ficheiro %s não pode ser escrito pelo utilizador"
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr ""
+"'%2$s' não faz parte dos especificadores de referência de '%1$s' para "
+"publicação"
-#: trailer.c:873
-msgid "could not open temporary file"
-msgstr "não foi possível abrir ficheiro temporário"
+#: remote.c:1749
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "publicação sem destino (push.default é 'nothing')"
+
+#: remote.c:1771
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "não é possível resolver a publicação 'simple' num único destino"
-#: trailer.c:912
+#: remote.c:2073
#, c-format
-msgid "could not rename temporary file to %s"
-msgstr "não foi possível mudar o nome do ficheiro temporário para %s"
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr "A base do seu ramo é '%s', mas o ramo a montante desapareceu.\n"
-#: transport.c:62
+#: remote.c:2077
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr " (use \"git branch --unset-upstream\" para corrigir)\n"
+
+#: remote.c:2080
#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "Iria definir o ramo a montante de '%s' como '%s' de '%s'\n"
+msgid "Your branch is up-to-date with '%s'.\n"
+msgstr "O seu ramo está atualizado com '%s'.\n"
-#: transport.c:151
+#: remote.c:2084
#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "transporte: opção de profundidade '%s' inválida"
+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] "O seu ramo está à frente de '%s' por %d commit.\n"
+msgstr[1] "O seu ramo está à frente de '%s' por %d commits.\n"
+
+#: remote.c:2090
+msgid " (use \"git push\" to publish your local commits)\n"
+msgstr " (use \"git push\" para publicar os commits locais)\n"
-#: transport.c:771
+#: remote.c:2093
#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr ""
-"Os seguintes caminhos de submódulo contêm alterações que\n"
-"não puderam ser encontradas a nenhum remoto:\n"
+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] ""
+"O seu ramo está atrás de '%s' por %d commit, podendo ser atualizado com "
+"avanço rápido.\n"
+msgstr[1] ""
+"O seu ramo está atrás de '%s' por %d commits, podendo ser atualizado com "
+"avanço rápido.\n"
+
+#: remote.c:2101
+msgid " (use \"git pull\" to update your local branch)\n"
+msgstr " (use \"git pull\" para atualizar o seu ramo local)\n"
-#: transport.c:775
+#: remote.c:2104
#, 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 tente\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"ou cd para o caminho e use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"para publicá-las no remoto.\n"
-"\n"
+"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] ""
+"O seu ramo e '%s' divergiram,\n"
+"tendo cada um %d e %d commit diferente, respetivamente.\n"
+msgstr[1] ""
+"O seu ramo e '%s' divergiram,\n"
+"tendo cada um %d e %d commits diferentes, respetivamente.\n"
-#: transport.c:783
-msgid "Aborting."
-msgstr "Abortado."
+#: remote.c:2114
+msgid " (use \"git pull\" to merge the remote branch into yours)\n"
+msgstr " (use \"git pull\" para integrar o ramo remoto no seu ramo)\n"
+
+#: revision.c:2158
+msgid "your current branch appears to be broken"
+msgstr "o ramo atual parece estar danificado"
-#: transport-helper.c:1041
+#: revision.c:2161
#, c-format
-msgid "Could not read ref %s"
-msgstr "Não foi possível ler a referência %s"
+msgid "your current branch '%s' does not have any commits yet"
+msgstr "o ramo atual '%s' ainda não contém nenhum commit"
-#: unpack-trees.c:64
+#: revision.c:2355
+msgid "--first-parent is incompatible with --bisect"
+msgstr "--first-parent é incompatível com --bisect"
+
+#: run-command.c:106
+msgid "open /dev/null failed"
+msgstr "falha ao abrir /dev/null"
+
+#: run-command.c:108
#, c-format
+msgid "dup2(%d,%d) failed"
+msgstr "dup2(%d,%d) falhou"
+
+#: send-pack.c:297
+msgid "failed to sign the push certificate"
+msgstr "falha ao assinar o certificado de publicação"
+
+#: send-pack.c:410
+msgid "the receiving end does not support --signed push"
+msgstr "o recetor não suporta publicação com --signed"
+
+#: send-pack.c:412
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."
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
msgstr ""
-"As suas alterações locais nos seguintes ficheiros seriam substituídas ao "
-"extrair:\n"
-"%%sSubmeta as suas alterações ou esconda-as antes de trocar de ramo."
+"certificado de publicação não enviado uma vez que o recetor não suporta "
+"publicação com --signed"
-#: unpack-trees.c:66
-#, c-format
+#: send-pack.c:424
+msgid "the receiving end does not support --atomic push"
+msgstr "o recetor não suporta publicação com --atomic"
+
+#: send-pack.c:429
+msgid "the receiving end does not support push options"
+msgstr "o recetor não suporta opções de publicação"
+
+#: sequencer.c:171
+msgid "revert"
+msgstr "reverter"
+
+#: sequencer.c:171
+msgid "cherry-pick"
+msgstr "cherry-pick"
+
+#: sequencer.c:228
msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
-"As suas alterações locais nos seguintes ficheiros seriam substituídas ao "
-"extrair:\n"
-"%%s"
+"depois de resolver os conflitos, marque os caminhos corrigidos\n"
+"com 'git add <caminhos>' ou 'git rm <caminhos>'"
-#: unpack-trees.c:69
-#, c-format
+#: sequencer.c:231
msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%sPlease commit your changes or stash them before you merge."
+"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 ""
-"As suas alterações locais nos seguintes ficheiros seriam substituídas ao "
-"integrar:\n"
-"%%sSubmeta as suas alterações ou esconda-as antes de integrar."
+"depois de resolver os conflitos, marque os caminhos corrigidos\n"
+"com 'git add <caminhos>' ou 'git rm <caminhos>'\n"
+"e submeta o resultado com 'git commit'"
-#: unpack-trees.c:71
+#: sequencer.c:244 sequencer.c:1209
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-"As suas alterações locais nos seguintes ficheiros seriam substituídas ao "
-"integrar:\n"
-"%%s"
+msgid "could not lock '%s'"
+msgstr "não foi possível bloquear '%s'"
-#: unpack-trees.c:74
+#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214
#, 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 ""
-"As suas alterações locais nos seguintes ficheiros seriam substituídas por "
-"%s:\n"
-"%%sSubmeta as suas alterações ou esconda-as antes de efetuar %s."
+msgid "could not write to '%s'"
+msgstr "não foi possível escrever em '%s'"
-#: unpack-trees.c:76
+#: sequencer.c:251
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-"As suas alterações locais nos seguintes ficheiros seriam substituídas por "
-"%s:\n"
-"%%s"
+msgid "could not write eol to '%s'"
+msgstr "não foi possível escrever fim de linha em '%s'"
-#: unpack-trees.c:81
+#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216
#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in it:\n"
-"%s"
-msgstr ""
-"Perder-se-iam ficheiros não controlados ao atualizar os seguintes "
-"diretórios:\n"
-"%s"
+msgid "failed to finalize '%s'."
+msgstr "falha ao finalizar '%s'."
-#: unpack-trees.c:85
+#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032
#, 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 ""
-"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
-"removidos ao extrair:\n"
-"%%sMova ou remova-os antes de trocar de ramos."
+msgid "could not read '%s'"
+msgstr "não foi possível ler '%s'"
-#: unpack-trees.c:87
+#: sequencer.c:305
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
-msgstr ""
-"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
-"removidos ao extrair:\n"
-"%%s"
+msgid "your local changes would be overwritten by %s."
+msgstr "as suas alterações locais serão substituídas ao %s."
-#: unpack-trees.c:90
+#: sequencer.c:309
+msgid "commit your changes or stash them to proceed."
+msgstr "submeta ou esconda as suas alterações para continuar."
+
+#: sequencer.c:324
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr ""
-"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
-"removidos ao integrar:\n"
-"%%sMova ou remova-os antes de integrar."
+msgid "%s: fast-forward"
+msgstr "%s: avanço rápido"
-#: unpack-trees.c:92
+#. TRANSLATORS: %s will be "revert" or "cherry-pick"
+#: sequencer.c:399
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
-msgstr ""
-"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
-"removidos ao integrar:\n"
-"%%s"
+msgid "%s: Unable to write new index file"
+msgstr "%s: Não foi possível escrever novo ficheiro de índice"
-#: unpack-trees.c:95
+#: sequencer.c:418
+msgid "could not resolve HEAD commit\n"
+msgstr "não foi possível resolver o commit HEAD\n"
+
+#: sequencer.c:438
+msgid "unable to update cache tree\n"
+msgstr "não foi possível atualizar a árvore de cache\n"
+
+#: sequencer.c:483
#, c-format
msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you %s."
+"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 ""
-"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
-"removidos por %s:\n"
-"%%sMova ou remova-os antes de efetuar %s."
+"tem alterações preparadas na árvore de trabalho\n"
+"Se tenciona esmagar estas alterações no commit anterior, execute:\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"Se tenciona pô-las num novo commit, execute:\n"
+"\n"
+" git commit %s\n"
+"\n"
+"Em ambos os casos, quando estiver pronto, continue com:\n"
+"\n"
+" git rebase --continue\n"
-#: unpack-trees.c:97
+#: sequencer.c:567
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
-msgstr ""
-"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
-"removidos por %s:\n"
-"%%s"
+msgid "could not parse commit %s\n"
+msgstr "não foi possível analisar o commit %s\n"
-#: unpack-trees.c:102
+#: sequencer.c:572
#, 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 ""
-"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
-"substituídos ao extrair:\n"
-"%%sMova ou remova-os antes de trocar de ramos."
+msgid "could not parse parent commit %s\n"
+msgstr "não foi possível analisar o commit pai %s\n"
-#: unpack-trees.c:104
+#: sequencer.c:656
+msgid "your index file is unmerged."
+msgstr "ficheiro de índice não integrado."
+
+#: sequencer.c:675
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%s"
-msgstr ""
-"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
-"substituídos ao extrair:\n"
-"%%s"
+msgid "commit %s is a merge but no -m option was given."
+msgstr "o commit %s é uma integração mas não foi fornecida a opção -m."
-#: unpack-trees.c:107
+#: sequencer.c:683
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr ""
-"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
-"substituídos ao integrar:\n"
-"%%sMova ou remova-os antes de integrar."
+msgid "commit %s does not have parent %d"
+msgstr "o commit %s não tem o pai %d"
-#: unpack-trees.c:109
+#: sequencer.c:687
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
+msgid "mainline was specified but commit %s is not a merge."
msgstr ""
-"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
-"substituídos ao integrar:\n"
-"%%s"
+"a linha principal foi especificada mas o commit %s não é uma integração."
-#: unpack-trees.c:112
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#: sequencer.c:700
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you %s."
-msgstr ""
-"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
-"substituídos por %s:\n"
-"%%sMova ou remova-os antes de efetuar %s."
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s: não foi possível analisar o commit pai %s"
-#: unpack-trees.c:114
+#: sequencer.c:705
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
-"substituídos por %s:\n"
-"%%s"
+msgid "cannot get commit message for %s"
+msgstr "não é possível obter a mensagem de commit de %s"
-#: unpack-trees.c:121
+#: sequencer.c:797
#, c-format
-msgid "Entry '%s' overlaps with '%s'. Cannot bind."
-msgstr "A entrada '%s' sobrepõe-se com '%s'. Não é possível vincular."
+msgid "could not revert %s... %s"
+msgstr "não foi possível reverter %s... %s"
-#: unpack-trees.c:124
+#: sequencer.c:798
#, c-format
-msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
-"%s"
-msgstr ""
-"Não é possível extrair esparsamente: as seguintes entradas não estão "
-"atualizadas:\n"
-"%s"
+msgid "could not apply %s... %s"
+msgstr "não foi possível aplicar %s... %s"
-#: unpack-trees.c:126
+#: sequencer.c:833
+msgid "empty commit set passed"
+msgstr "o conjunto de commits especificado está vazio"
+
+#: sequencer.c:843
#, c-format
-msgid ""
-"The following Working tree files would be overwritten by sparse checkout "
-"update:\n"
-"%s"
-msgstr ""
-"Os seguintes ficheiros na árvore de trabalho seriam substituídos ao "
-"atualizar a extração esparsa:\n"
-"%s"
+msgid "git %s: failed to read the index"
+msgstr "git %s: falha ao ler o índice"
-#: unpack-trees.c:128
+#: sequencer.c:850
#, c-format
-msgid ""
-"The following Working tree files would be removed by sparse checkout "
-"update:\n"
-"%s"
-msgstr ""
-"Os seguintes ficheiros na árvore de trabalho seriam removidos ao atualizar a "
-"extração esparsa:\n"
-"%s"
+msgid "git %s: failed to refresh the index"
+msgstr "git %s: falha ao atualizar o índice"
-#: unpack-trees.c:205
+#: sequencer.c:944
#, c-format
-msgid "Aborting\n"
-msgstr "A abortar\n"
+msgid "invalid line %d: %.*s"
+msgstr "linha %d inválida: %.*s"
-#: unpack-trees.c:237
-msgid "Checking out files"
-msgstr "A extrair ficheiros"
+#: sequencer.c:950
+msgid "no commits parsed."
+msgstr "nenhum commit analisado."
-#: urlmatch.c:120
-msgid "invalid URL scheme name or missing '://' suffix"
-msgstr "nome de esquema de URL inválido ou falta do sufixo '://'"
+#: sequencer.c:966
+#, c-format
+msgid "could not read '%s'."
+msgstr "não foi possível ler '%s'."
-#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#: sequencer.c:972
#, c-format
-msgid "invalid %XX escape sequence"
-msgstr "sequencia de escape %XX inválida"
+msgid "unusable instruction sheet: '%s'"
+msgstr "folha de instruções inutilizável: '%s'"
-#: urlmatch.c:172
-msgid "missing host and scheme is not 'file:'"
-msgstr "sistema anfitrião não indicado e o esquema não é do tipo 'file:'"
+#: sequencer.c:983
+msgid "cannot cherry-pick during a revert."
+msgstr "não é possível efetuar cherry-pick durante uma reversão."
-#: urlmatch.c:189
-msgid "a 'file:' URL may not have a port number"
-msgstr "um URL do tipo 'file:' não pode ter um número de porta"
+#: sequencer.c:985
+msgid "cannot revert during a cherry-pick."
+msgstr "não é possível reverter durante um cherry-pick."
-#: urlmatch.c:199
-msgid "invalid characters in host name"
-msgstr "caracteres inválidos no nome do anfitrião"
+#: sequencer.c:1028
+#, c-format
+msgid "invalid key: %s"
+msgstr "chave inválida: %s"
-#: urlmatch.c:244 urlmatch.c:255
-msgid "invalid port number"
-msgstr "número de porta inválido"
+#: sequencer.c:1031
+#, c-format
+msgid "invalid value for %s: %s"
+msgstr "valor inválido de %s: %s"
-#: urlmatch.c:322
-msgid "invalid '..' path segment"
-msgstr "segmento de caminho '..' inválido"
+#: sequencer.c:1063
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr "folha de opções malformada: '%s'"
-#: worktree.c:282
+#: sequencer.c:1101
+msgid "a cherry-pick or revert is already in progress"
+msgstr "cherry-pick ou revert em curso"
+
+#: sequencer.c:1102
+msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+msgstr "tente \"git cherry-pick (--continue | --quit |--abort)\""
+
+#: sequencer.c:1106
#, c-format
-msgid "failed to read '%s'"
-msgstr "falha ao ler '%s'"
+msgid "could not create sequencer directory '%s'"
+msgstr "não foi possível criar o diretório do sequenciador '%s'"
+
+#: sequencer.c:1120
+msgid "could not lock HEAD"
+msgstr "não foi possível bloquear HEAD"
+
+#: sequencer.c:1151 sequencer.c:1289
+msgid "no cherry-pick or revert in progress"
+msgstr "nenhum cherry-pick ou revert em curso"
+
+#: sequencer.c:1153
+msgid "cannot resolve HEAD"
+msgstr "não é possível resolver HEAD"
+
+#: sequencer.c:1155 sequencer.c:1189
+msgid "cannot abort from a branch yet to be born"
+msgstr "não é possível abortar um ramo ainda não criado"
-#: wrapper.c:222 wrapper.c:392
+#: sequencer.c:1175 builtin/grep.c:578
#, c-format
-msgid "could not open '%s' for reading and writing"
-msgstr "não foi possível abrir '%s' para leitura e escrita"
+msgid "cannot open '%s'"
+msgstr "não é possível abrir '%s'"
-#: wrapper.c:224 wrapper.c:394 builtin/am.c:778
+#: sequencer.c:1177
#, c-format
-msgid "could not open '%s' for writing"
-msgstr "não foi possível abrir '%s' para escrita"
+msgid "cannot read '%s': %s"
+msgstr "não é possível ler '%s': %s"
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771
-#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029
-#: builtin/pull.c:407
-#, c-format
-msgid "could not open '%s' for reading"
-msgstr "não foi possível abrir '%s' para leitura"
+#: sequencer.c:1178
+msgid "unexpected end of file"
+msgstr "fim de ficheiro inesperado"
-#: wrapper.c:605 wrapper.c:626
+#: sequencer.c:1184
#, c-format
-msgid "unable to access '%s'"
-msgstr "não é possível aceder a '%s'"
-
-#: wrapper.c:634
-msgid "unable to get current working directory"
-msgstr "não é possível de obter o diretório de trabalho atual"
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr "o ficheiro HEAD de pre-cherry-pick '%s' está corrompido"
-#: wrapper.c:658
+#: sequencer.c:1354
#, c-format
-msgid "could not write to %s"
-msgstr "não foi possível escrever para %s"
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s: não é possível efetuar cherry-pick de %s"
-#: wrapper.c:660
+#: sequencer.c:1358
#, c-format
-msgid "could not close %s"
-msgstr "não foi possível fechar %s"
+msgid "%s: bad revision"
+msgstr "%s: revisão incorreta"
-#: wt-status.c:150
-msgid "Unmerged paths:"
-msgstr "Caminhos não integrados:"
+#: sequencer.c:1391
+msgid "can't revert as initial commit"
+msgstr "não é possível reverter como commit inicial"
-#: wt-status.c:177 wt-status.c:204
+#: setup.c:160
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr " (use \"git reset %s <ficheiro>...\" para despreparar)"
-
-#: wt-status.c:179 wt-status.c:206
-msgid " (use \"git rm --cached <file>...\" to unstage)"
-msgstr " (use \"git rm --cached <ficheiro>...\" para despreparar)"
+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ão há tal caminho na árvore de trabalho.\n"
+"Use 'git <comando> -- <caminho>...' para especificar caminhos que não "
+"existem localmente."
-#: wt-status.c:183
-msgid " (use \"git add <file>...\" to mark resolution)"
-msgstr " (use \"git add <ficheiro>...\" para marcar como resolvido)"
+#: setup.c:173
+#, 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 ambíguo '%s': revisão ou caminho desconhecidos não encontrado na "
+"árvore de trabalho.\n"
+"Use '--' para separar caminhos de revisões, assim:\n"
+"'git <comando> [<revisão>...] -- [<ficheiro>...]'"
-#: wt-status.c:185 wt-status.c:189
-msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+#: setup.c:223
+#, 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 ""
-" (use \"git add/rm <ficheiro>...\" conforme apropriado para marcar como "
-"resolvido)"
+"argumento ambíguo '%s': revisão e nome de ficheiro\n"
+"Use '--' para separar caminhos de revisões, assim:\n"
+"'git <comando> [<revisão>...] -- [<ficheiro>...]'"
-#: wt-status.c:187
-msgid " (use \"git rm <file>...\" to mark resolution)"
-msgstr " (use \"git rm <ficheiro>...\" para marcar como resolvido)"
+#: setup.c:468
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Esperava-se versão do repositório git <= %d, obteve-se %d"
-#: wt-status.c:198 wt-status.c:882
-msgid "Changes to be committed:"
-msgstr "Alterações para serem submetidas:"
+#: setup.c:476
+msgid "unknown repository extensions found:"
+msgstr "extensões de repositório desconhecidas encontradas:"
-#: wt-status.c:216 wt-status.c:891
-msgid "Changes not staged for commit:"
-msgstr "Alterações não preparadas para submeter:"
+#: setup.c:762
+#, c-format
+msgid "Not a git repository (or any of the parent directories): %s"
+msgstr "Não é um repositório git (ou um dos diretórios pai): %s"
-#: wt-status.c:220
-msgid " (use \"git add <file>...\" to update what will be committed)"
-msgstr " (use \"git add <ficheiro>...\" para atualizar o que será submetido)"
+#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
+msgid "Cannot come back to cwd"
+msgstr "Não é possível voltar ao diretório de trabalho atual"
-#: wt-status.c:222
-msgid " (use \"git add/rm <file>...\" to update what will be committed)"
-msgstr ""
-" (use \"git add/rm <ficheiro>...\" para atualizar o que será submetido)"
+#: setup.c:845
+msgid "Unable to read current working directory"
+msgstr "Não é possível ler o diretório de trabalho atual"
-#: wt-status.c:223
+#: setup.c:920
+#, c-format
msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
-msgstr ""
-" (use \"git checkout -- <ficheiro>...\" para descartar alterações no "
-"diretório de trabalho)"
-
-#: wt-status.c:225
-msgid " (commit or discard the untracked or modified content in submodules)"
+"Not a git repository (or any parent up to mount point %s)\n"
+"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
msgstr ""
-" (submeta ou descarte o conteúdo modificado ou não controlado nos "
-"submódulos)"
+"Não é um repositório git (ou um diretório pai até ao ponto de montagem %s)\n"
+"Interrompido no limite do sistema de ficheiros "
+"(GIT_DISCOVERY_ACROSS_FILESYSTEM não definido)."
-#: wt-status.c:237
+#: setup.c:927
#, c-format
-msgid " (use \"git %s <file>...\" to include in what will be committed)"
-msgstr " (use \"git %s <ficheiro>...\" para incluir no que será submetido)"
-
-#: wt-status.c:252
-msgid "both deleted:"
-msgstr "eliminado por ambos:"
-
-#: wt-status.c:254
-msgid "added by us:"
-msgstr "adicionado por nós:"
+msgid "Cannot change to '%s/..'"
+msgstr "Não é possível mudar para '%s/..'"
-#: wt-status.c:256
-msgid "deleted by them:"
-msgstr "eliminado por eles:"
+#: setup.c:989
+#, 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 com o valor core.sharedRepository modo de ficheiro (0%.3o).\n"
+"O dono dos ficheiros tem de ter sempre permissões de leitura e escrita."
-#: wt-status.c:258
-msgid "added by them:"
-msgstr "adicionado por eles:"
+#: sha1_file.c:473
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "o caminho '%s' não existe"
-#: wt-status.c:260
-msgid "deleted by us:"
-msgstr "eliminado por nós:"
+#: sha1_file.c:499
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr ""
+"ainda não é suportada a funcionalidade que permite ter o repositório de "
+"referência '%s' como uma extração ligada."
-#: wt-status.c:262
-msgid "both added:"
-msgstr "adicionado por ambos:"
+#: sha1_file.c:505
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "o repositório de referência '%s' não é um repositório local."
-#: wt-status.c:264
-msgid "both modified:"
-msgstr "modificado por ambos:"
+#: sha1_file.c:511
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "o repositório de referência '%s' é raso"
-#: wt-status.c:274
-msgid "new file:"
-msgstr "novo ficheiro:"
+#: sha1_file.c:519
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "o repositório de referência '%s' está enxertado"
-#: wt-status.c:276
-msgid "copied:"
-msgstr "copiado:"
+#: sha1_file.c:1159
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "offset antes do fim do ficheiro de pacote (.idx danificado?)"
-#: wt-status.c:278
-msgid "deleted:"
-msgstr "eliminado:"
+#: sha1_file.c:2592
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr "offset antes do início do índice do pacote %s (índice corrompido?)"
-#: wt-status.c:280
-msgid "modified:"
-msgstr "modificado:"
+#: sha1_file.c:2596
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr "offset depois do fim do índice do pacote %s (índice truncado?)"
-#: wt-status.c:282
-msgid "renamed:"
-msgstr "nome mudado:"
+#: sha1_name.c:407
+#, c-format
+msgid "short SHA1 %s is ambiguous"
+msgstr "SHA1 curto %s é ambíguo"
-#: wt-status.c:284
-msgid "typechange:"
-msgstr "tipo alterado:"
+#: sha1_name.c:418
+msgid "The candidates are:"
+msgstr "Os candidatos são:"
-#: wt-status.c:286
-msgid "unknown:"
-msgstr "desconhecido:"
+#: sha1_name.c:578
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+" git checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
+msgstr ""
+"Normalmente o Git nunca cria referências que terminem em 40 caracteres "
+"hexadecimais,\n"
+"pois uma referência destas seria ignorada se indicasse só 40 caracteres "
+"hexadecimais.\n"
+"Estas referências podem ser criadas por engano. Como no exemplo,\n"
+"\n"
+" git checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"onde \"$br\" está vazio e é criada uma referência de 40 caracteres "
+"hexadecimais.\n"
+"Analise estas referências e elimine-as se desejar. Desative esta\n"
+"mensagem executando \"git config advice.objectNameWarning false\""
-#: wt-status.c:288
-msgid "unmerged:"
-msgstr "não integrado:"
+#: submodule.c:64 submodule.c:98
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr ""
+"Não é possível alterar .gitmodules não integrado, resolva primeiro os "
+"conflitos de integração"
-#: wt-status.c:370
-msgid "new commits, "
-msgstr "novos commits, "
+#: submodule.c:68 submodule.c:102
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "Secção de .gitmodules cujo path=%s não encontrada"
-#: wt-status.c:372
-msgid "modified content, "
-msgstr "conteúdo modificado, "
+#: submodule.c:76
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "Não foi possível atualizar o elemento %s de .gitmodules"
-#: wt-status.c:374
-msgid "untracked content, "
-msgstr "conteúdo não controlado, "
+#: submodule.c:109
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "Não foi possível remover o elemento %s de .gitmodules"
-#: wt-status.c:756
-msgid "Submodules changed but not updated:"
-msgstr "Submódulos alterados mas não atualizados:"
+#: submodule.c:120
+msgid "staging updated .gitmodules failed"
+msgstr "falha ao preparar .gitmodules atualizado"
-#: wt-status.c:758
-msgid "Submodule changes to be committed:"
-msgstr "Alterações em submódulos para serem submetidas:"
+#: submodule.c:158
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "não é permitido valores negativos em submodule.fetchJobs"
-#: wt-status.c:839
-msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
-msgstr ""
-"Não altere a linha acima.\n"
-"Tudo o que estiver abaixo será removido."
+#: submodule-config.c:358
+#, c-format
+msgid "invalid value for %s"
+msgstr "valor inválido de %s"
-#: wt-status.c:950
-msgid "You have unmerged paths."
-msgstr "Há caminhos não integrados."
+#: trailer.c:238
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "falha ao executar o comando trailer '%s'"
-#: wt-status.c:953
-msgid " (fix conflicts and run \"git commit\")"
-msgstr " (corrija os conflitos e execute \"git commit\")"
+#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537
+#: trailer.c:541
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr "valor desconhecido '%s' da chave '%s'"
-#: wt-status.c:955
-msgid " (use \"git merge --abort\" to abort the merge)"
-msgstr " (use \"git am --abort\" para abortar a integração)"
+#: trailer.c:523 trailer.c:528 builtin/remote.c:289
+#, c-format
+msgid "more than one %s"
+msgstr "mais do que um %s"
-#: wt-status.c:960
-msgid "All conflicts fixed but you are still merging."
-msgstr "Todos os conflitos foram corrigidos mas ainda está a integrar."
+#: trailer.c:672
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "token terminador vazio no terminador '%.*s'"
-#: wt-status.c:963
-msgid " (use \"git commit\" to conclude merge)"
-msgstr " (use \"git commit\" para concluir a integração)"
+#: trailer.c:695
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "não foi possível ler o ficheiro de entrada '%s'"
-#: wt-status.c:973
-msgid "You are in the middle of an am session."
-msgstr "Sessão am em curso."
+#: trailer.c:698
+msgid "could not read from stdin"
+msgstr "não foi possível ler da entrada padrão"
-#: wt-status.c:976
-msgid "The current patch is empty."
-msgstr "O patch atual está vazio."
+#: trailer.c:929 builtin/am.c:44
+#, c-format
+msgid "could not stat %s"
+msgstr "não foi possível obter stat de %s"
-#: wt-status.c:980
-msgid " (fix conflicts and then run \"git am --continue\")"
-msgstr " (corrija os conflitos e execute \"git am --continue\")"
+#: trailer.c:931
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "o ficheiro %s não é um ficheiro regular"
-#: wt-status.c:982
-msgid " (use \"git am --skip\" to skip this patch)"
-msgstr " (use \"git am --skip\" para ignorar este patch)"
+#: trailer.c:933
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "o ficheiro %s não pode ser escrito pelo utilizador"
-#: wt-status.c:984
-msgid " (use \"git am --abort\" to restore the original branch)"
-msgstr " (use \"git am --abort\" para restaurar o ramo original)"
+#: trailer.c:945
+msgid "could not open temporary file"
+msgstr "não foi possível abrir ficheiro temporário"
-#: wt-status.c:1109
-msgid "No commands done."
-msgstr "Nenhum comando concluído."
+#: trailer.c:983
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "não foi possível mudar o nome do ficheiro temporário para %s"
-#: wt-status.c:1112
+#: transport.c:62
#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
-msgstr[0] "Último comando concluído (%d comando concluído):"
-msgstr[1] "Últimos comandos concluídos (%d comandos concluídos):"
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Iria definir o ramo a montante de '%s' como '%s' de '%s'\n"
-#: wt-status.c:1123
+#: transport.c:151
#, c-format
-msgid " (see more in file %s)"
-msgstr " (veja mais no ficheiro %s)"
+msgid "transport: invalid depth option '%s'"
+msgstr "transporte: opção de profundidade '%s' inválida"
-#: wt-status.c:1128
-msgid "No commands remaining."
-msgstr "Nenhum comando por concluir."
+#: transport.c:817
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"Os seguintes caminhos de submódulo contêm alterações que\n"
+"não puderam ser encontradas a nenhum remoto:\n"
-#: wt-status.c:1131
+#: transport.c:821
#, c-format
-msgid "Next command to do (%d remaining command):"
-msgid_plural "Next commands to do (%d remaining commands):"
-msgstr[0] "Próximo comando a executar (%d comando restante):"
-msgstr[1] "Próximos comandos a executar (%d comandos restantes):"
+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 tente\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"ou cd para o caminho e use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"para publicá-las no remoto.\n"
+"\n"
-#: wt-status.c:1139
-msgid " (use \"git rebase --edit-todo\" to view and edit)"
-msgstr " (use \"git rebase --edit-todo\" para visualizar e editar)"
+#: transport.c:829
+msgid "Aborting."
+msgstr "Abortado."
-#: wt-status.c:1152
+#: transport-helper.c:1075
#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "Está a realizar rebase do ramo '%s' sobre '%s'."
+msgid "Could not read ref %s"
+msgstr "Não foi possível ler a referência %s"
-#: wt-status.c:1157
-msgid "You are currently rebasing."
-msgstr "Está a rebasear neste momento."
+#: tree-walk.c:31
+msgid "too-short tree object"
+msgstr "objeto árvore demasiado curto"
-#: wt-status.c:1171
-msgid " (fix conflicts and then run \"git rebase --continue\")"
-msgstr " (corrija os conflitos e execute \"git rebase --continue\")"
+#: tree-walk.c:37
+msgid "malformed mode in tree entry"
+msgstr "modo na entrada de árvore malformado"
-#: wt-status.c:1173
-msgid " (use \"git rebase --skip\" to skip this patch)"
-msgstr " (use \"git rebase --skip\" para ignorar este patch)"
+#: tree-walk.c:41
+msgid "empty filename in tree entry"
+msgstr "nome de ficheiro vazio na entrada de árvore"
-#: wt-status.c:1175
-msgid " (use \"git rebase --abort\" to check out the original branch)"
-msgstr " (use \"git rebase --abort\" para restaurar o ramo original)"
+#: tree-walk.c:113
+msgid "too-short tree file"
+msgstr "ficheiro de árvore demasiado curto"
-#: wt-status.c:1181
-msgid " (all conflicts fixed: run \"git rebase --continue\")"
+#: unpack-trees.c:64
+#, 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 ""
-" (todos os conflitos foram corrigidos: execute \"git rebase --continue\")"
+"As suas alterações locais nos seguintes ficheiros seriam substituídas ao "
+"extrair:\n"
+"%%sSubmeta as suas alterações ou esconda-as antes de trocar de ramo."
-#: wt-status.c:1185
+#: unpack-trees.c:66
#, c-format
msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
msgstr ""
-"Está a dividir um commit ao mesmo tempo que se efetua rebase do ramo '%s' "
-"sobre '%s'."
-
-#: wt-status.c:1190
-msgid "You are currently splitting a commit during a rebase."
-msgstr "Está a dividir um commit durante um rebase."
+"As suas alterações locais nos seguintes ficheiros seriam substituídas ao "
+"extrair:\n"
+"%%s"
-#: wt-status.c:1193
-msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+#: unpack-trees.c:69
+#, 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 ""
-" (Assim que o diretório de trabalho estiver limpo, execute \"git rebase --"
-"continue\")"
+"As suas alterações locais nos seguintes ficheiros seriam substituídas ao "
+"integrar:\n"
+"%%sSubmeta as suas alterações ou esconda-as antes de integrar."
-#: wt-status.c:1197
+#: unpack-trees.c:71
#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
msgstr ""
-"Está a editar um commit ao mesmo tempo que efetua rebase do ramo '%s' sobre "
-"'%s'."
-
-#: wt-status.c:1202
-msgid "You are currently editing a commit during a rebase."
-msgstr "Está a editar um commit durante um rebase."
-
-#: wt-status.c:1205
-msgid " (use \"git commit --amend\" to amend the current commit)"
-msgstr " (use \"git commit --amend\" para emendar o commit atual)"
+"As suas alterações locais nos seguintes ficheiros seriam substituídas ao "
+"integrar:\n"
+"%%s"
-#: wt-status.c:1207
+#: unpack-trees.c:74
+#, c-format
msgid ""
-" (use \"git rebase --continue\" once you are satisfied with your changes)"
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you %s."
msgstr ""
-" (use \"git rebase --continue\" assim que estiver satisfeito com as "
-"alterações)"
+"As suas alterações locais nos seguintes ficheiros seriam substituídas por "
+"%s:\n"
+"%%sSubmeta as suas alterações ou esconda-as antes de efetuar %s."
-#: wt-status.c:1217
+#: unpack-trees.c:76
#, c-format
-msgid "You are currently cherry-picking commit %s."
-msgstr "Está a realizar cherry-pick do commit %s."
-
-#: wt-status.c:1222
-msgid " (fix conflicts and run \"git cherry-pick --continue\")"
-msgstr " (corrija os conflitos e execute \"git cherry-pick --continue\")"
-
-#: wt-status.c:1225
-msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
msgstr ""
-" (todos os conflitos foram corrigidos: execute \"git cherry-pick --continue"
-"\")"
+"As suas alterações locais nos seguintes ficheiros seriam substituídas por "
+"%s:\n"
+"%%s"
-#: wt-status.c:1227
-msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+#: unpack-trees.c:81
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in it:\n"
+"%s"
msgstr ""
-" (use \"git cherry-pick --abort\" para cancelar a operação de cherry-pick)"
+"Perder-se-iam ficheiros não controlados ao atualizar os seguintes "
+"diretórios:\n"
+"%s"
-#: wt-status.c:1236
+#: unpack-trees.c:85
#, c-format
-msgid "You are currently reverting commit %s."
-msgstr "Está a reverter o commit %s neste comento."
-
-#: wt-status.c:1241
-msgid " (fix conflicts and run \"git revert --continue\")"
-msgstr " (corrija dos conflitos e execute \"git revert --continue\")"
-
-#: wt-status.c:1244
-msgid " (all conflicts fixed: run \"git revert --continue\")"
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you switch branches."
msgstr ""
-" (todos os conflitos foram corrigidos: execute \"git revert --continue\")"
-
-#: wt-status.c:1246
-msgid " (use \"git revert --abort\" to cancel the revert operation)"
-msgstr " (use \"git rever --abort\" para cancelar a operação de reversão)"
+"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
+"removidos ao extrair:\n"
+"%%sMova ou remova-os antes de trocar de ramos."
-#: wt-status.c:1257
+#: unpack-trees.c:87
#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
-msgstr "Está a bissetar, iniciado a partir do ramo '%s'."
-
-#: wt-status.c:1261
-msgid "You are currently bisecting."
-msgstr "Está a bissetar neste momento."
-
-#: wt-status.c:1264
-msgid " (use \"git bisect reset\" to get back to the original branch)"
-msgstr " (use \"git bisect reset\" para voltar ao ramo original)"
-
-#: wt-status.c:1464
-msgid "On branch "
-msgstr "No ramo "
-
-#: wt-status.c:1470
-msgid "interactive rebase in progress; onto "
-msgstr "rebase interativo em curso; sobre "
-
-#: wt-status.c:1472
-msgid "rebase in progress; onto "
-msgstr "rebase em curso; sobre "
-
-#: wt-status.c:1477
-msgid "HEAD detached at "
-msgstr "HEAD destacada em "
-
-#: wt-status.c:1479
-msgid "HEAD detached from "
-msgstr "HEAD destacada de "
-
-#: wt-status.c:1482
-msgid "Not currently on any branch."
-msgstr "Não se encontra em nenhum ramo neste momento."
-
-#: wt-status.c:1500
-msgid "Initial commit"
-msgstr "Commit inicial"
-
-#: wt-status.c:1514
-msgid "Untracked files"
-msgstr "Ficheiros não controlados"
-
-#: wt-status.c:1516
-msgid "Ignored files"
-msgstr "Ficheiros ignorados"
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
+"removidos ao extrair:\n"
+"%%s"
-#: wt-status.c:1520
+#: unpack-trees.c:90
#, 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')."
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
msgstr ""
-"A enumeração dos ficheiros não controlados demorou %.2f segundos\n"
-"a concluir. 'status -uno' pode acelerar o processo, mas deve ter\n"
-"cuidado de não se esquecer de adicionar novos ficheiros\n"
-"(consulte 'git help status')."
+"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
+"removidos ao integrar:\n"
+"%%sMova ou remova-os antes de integrar."
-#: wt-status.c:1526
+#: unpack-trees.c:92
#, c-format
-msgid "Untracked files not listed%s"
-msgstr "Ficheiros não controlados não listados%s"
-
-#: wt-status.c:1528
-msgid " (use -u option to show untracked files)"
-msgstr " (use a opção -u para mostrar os ficheiros não controlados)"
-
-#: wt-status.c:1534
-msgid "No changes"
-msgstr "Sem alterações"
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
+"removidos ao integrar:\n"
+"%%s"
-#: wt-status.c:1539
+#: unpack-trees.c:95
#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
msgstr ""
-"nenhuma alteração adicionada para submeter (use \"git add\" e/ou \"git "
-"commit -a\")\n"
+"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
+"removidos por %s:\n"
+"%%sMova ou remova-os antes de efetuar %s."
-#: wt-status.c:1542
+#: unpack-trees.c:97
#, c-format
-msgid "no changes added to commit\n"
-msgstr "nenhuma alteração adicionada para submeter\n"
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
+"removidos por %s:\n"
+"%%s"
-#: wt-status.c:1545
+#: unpack-trees.c:102
#, c-format
msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you switch branches."
msgstr ""
-"não foi adicionado nada para submeter, mas existem ficheiros não controlados "
-"(use \"git add\" para controlá-los)\n"
+"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
+"substituídos ao extrair:\n"
+"%%sMova ou remova-os antes de trocar de ramos."
-#: wt-status.c:1548
+#: unpack-trees.c:104
#, c-format
-msgid "nothing added to commit but untracked files present\n"
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
msgstr ""
-"não foi adicionado nada para submeter, mas existem ficheiros não "
-"controlados\n"
+"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
+"substituídos ao extrair:\n"
+"%%s"
-#: wt-status.c:1551
+#: unpack-trees.c:107
#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
msgstr ""
-"não há nada para submeter (crie/copie ficheiros e use \"git add\" para "
-"controlá-los)\n"
+"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
+"substituídos ao integrar:\n"
+"%%sMova ou remova-os antes de integrar."
-#: wt-status.c:1554 wt-status.c:1559
+#: unpack-trees.c:109
#, c-format
-msgid "nothing to commit\n"
-msgstr "não há nada para submeter\n"
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
+"substituídos ao integrar:\n"
+"%%s"
-#: wt-status.c:1557
+#: unpack-trees.c:112
#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
msgstr ""
-"não há nada para submeter (use -u para mostrar os ficheiros não "
-"controlados)\n"
+"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
+"substituídos por %s:\n"
+"%%sMova ou remova-os antes de efetuar %s."
-#: wt-status.c:1561
+#: unpack-trees.c:114
#, c-format
-msgid "nothing to commit, working tree clean\n"
-msgstr "não há nada para submeter, árvore de trabalho limpa\n"
-
-#: wt-status.c:1668
-msgid "Initial commit on "
-msgstr "Commit inicial em "
-
-#: wt-status.c:1672
-msgid "HEAD (no branch)"
-msgstr "HEAD (nenhum ramo)"
-
-#: wt-status.c:1701
-msgid "gone"
-msgstr "desaparecido"
-
-#: wt-status.c:1703 wt-status.c:1711
-msgid "behind "
-msgstr "atrás "
-
-#: wt-status.c:1706 wt-status.c:1709
-msgid "ahead "
-msgstr "à frente "
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
+"substituídos por %s:\n"
+"%%s"
-#: compat/precompose_utf8.c:57 builtin/clone.c:415
+#: unpack-trees.c:121
#, c-format
-msgid "failed to unlink '%s'"
-msgstr "falha ao invocar unlink de '%s'"
-
-#: builtin/add.c:22
-msgid "git add [<options>] [--] <pathspec>..."
-msgstr "git add [<opções>] [--] <caminho>..."
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgstr "A entrada '%s' sobrepõe-se com '%s'. Não é possível vincular."
-#: builtin/add.c:65
+#: unpack-trees.c:124
#, c-format
-msgid "unexpected diff status %c"
-msgstr "diff status inesperado %c"
-
-#: builtin/add.c:71 builtin/commit.c:281
-msgid "updating files failed"
-msgstr "falha ao atualizar os ficheiros"
+msgid ""
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
+msgstr ""
+"Não é possível extrair esparsamente: as seguintes entradas não estão "
+"atualizadas:\n"
+"%s"
-#: builtin/add.c:81
+#: unpack-trees.c:126
#, c-format
-msgid "remove '%s'\n"
-msgstr "remover '%s'\n"
-
-#: builtin/add.c:136
-msgid "Unstaged changes after refreshing the index:"
-msgstr "Alterações não preparadas depois de atualizar o índice:"
-
-#: builtin/add.c:196 builtin/rev-parse.c:811
-msgid "Could not read the index"
-msgstr "Não foi possível ler o índice"
+msgid ""
+"The following working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Os seguintes ficheiros na árvore de trabalho seriam substituídos ao "
+"atualizar a extração esparsa:\n"
+"%s"
-#: builtin/add.c:207
+#: unpack-trees.c:128
#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Não foi possível abrir '%s' para escrita."
-
-#: builtin/add.c:211
-msgid "Could not write patch"
-msgstr "Não foi possível escrever patch"
-
-#: builtin/add.c:214
-msgid "editing patch failed"
-msgstr "falha ao editar patch"
+msgid ""
+"The following working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Os seguintes ficheiros na árvore de trabalho seriam removidos ao atualizar a "
+"extração esparsa:\n"
+"%s"
-#: builtin/add.c:217
+#: unpack-trees.c:205
#, c-format
-msgid "Could not stat '%s'"
-msgstr "Não foi possível obter stat de '%s'"
-
-#: builtin/add.c:219
-msgid "Empty patch. Aborted."
-msgstr "Patch vazio. Abortado."
+msgid "Aborting\n"
+msgstr "A abortar\n"
-#: builtin/add.c:224
-#, c-format
-msgid "Could not apply '%s'"
-msgstr "Não foi possível aplicar '%s'"
+#: unpack-trees.c:237
+msgid "Checking out files"
+msgstr "A extrair ficheiros"
-#: builtin/add.c:234
-msgid "The following paths are ignored by one of your .gitignore files:\n"
-msgstr "Os seguintes caminhos estão ignorados por algum ficheiro .gitignore:\n"
+#: urlmatch.c:120
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "nome de esquema de URL inválido ou falta do sufixo '://'"
-#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521
-#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162
-msgid "dry run"
-msgstr "simular ação"
+#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "sequencia de escape %XX inválida"
-#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19
-#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593
-#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114
-msgid "be verbose"
-msgstr "ser verboso"
+#: urlmatch.c:172
+msgid "missing host and scheme is not 'file:'"
+msgstr "sistema anfitrião não indicado e o esquema não é do tipo 'file:'"
-#: builtin/add.c:256
-msgid "interactive picking"
-msgstr "seleção interativa"
+#: urlmatch.c:189
+msgid "a 'file:' URL may not have a port number"
+msgstr "um URL do tipo 'file:' não pode ter um número de porta"
-#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286
-msgid "select hunks interactively"
-msgstr "selecionar blocos interativamente"
+#: urlmatch.c:199
+msgid "invalid characters in host name"
+msgstr "caracteres inválidos no nome do anfitrião"
-#: builtin/add.c:258
-msgid "edit current diff and apply"
-msgstr "editar o diff atual e aplicá-lo"
+#: urlmatch.c:244 urlmatch.c:255
+msgid "invalid port number"
+msgstr "número de porta inválido"
-#: builtin/add.c:259
-msgid "allow adding otherwise ignored files"
-msgstr "permitir adicionar ficheiros ignorados"
+#: urlmatch.c:322
+msgid "invalid '..' path segment"
+msgstr "segmento de caminho '..' inválido"
-#: builtin/add.c:260
-msgid "update tracked files"
-msgstr "atualizar ficheiros controlados"
+#: worktree.c:282
+#, c-format
+msgid "failed to read '%s'"
+msgstr "falha ao ler '%s'"
-#: builtin/add.c:261
-msgid "record only the fact that the path will be added later"
-msgstr "registar apenas o facto de que o caminho será adicionado mais tarde"
+#: wrapper.c:222 wrapper.c:392
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr "não foi possível abrir '%s' para leitura e escrita"
-#: builtin/add.c:262
-msgid "add changes from all tracked and untracked files"
-msgstr ""
-"adicionar alterações de todos os ficheiros controlados ou não controlados"
+#: wrapper.c:224 wrapper.c:394 builtin/am.c:766
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "não foi possível abrir '%s' para escrita"
-#: builtin/add.c:265
-msgid "ignore paths removed in the working tree (same as --no-all)"
-msgstr ""
-"ignorar caminhos removidos na árvore de trabalho (o mesmo que --no-all)"
+#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
+#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029
+#: builtin/pull.c:341
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "não foi possível abrir '%s' para leitura"
-#: builtin/add.c:267
-msgid "don't add, only refresh the index"
-msgstr "não adicionar, apenas atualizar o índice"
+#: wrapper.c:605 wrapper.c:626
+#, c-format
+msgid "unable to access '%s'"
+msgstr "não é possível aceder a '%s'"
-#: builtin/add.c:268
-msgid "just skip files which cannot be added because of errors"
-msgstr "ignorar ficheiros que não podem ser adicionados por causa de erros"
+#: wrapper.c:634
+msgid "unable to get current working directory"
+msgstr "não é possível de obter o diretório de trabalho atual"
-#: builtin/add.c:269
-msgid "check if - even missing - files are ignored in dry run"
-msgstr "verificar quais os ficheiros ignorados na simulação"
+#: wrapper.c:658
+#, c-format
+msgid "could not write to %s"
+msgstr "não foi possível escrever para %s"
-#: builtin/add.c:270 builtin/update-index.c:958
-msgid "(+/-)x"
-msgstr "(+/-)x"
+#: wrapper.c:660
+#, c-format
+msgid "could not close %s"
+msgstr "não foi possível fechar %s"
-#: builtin/add.c:270 builtin/update-index.c:959
-msgid "override the executable bit of the listed files"
-msgstr "substituir o bit executável dos ficheiros listados"
+#: wt-status.c:151
+msgid "Unmerged paths:"
+msgstr "Caminhos não integrados:"
-#: builtin/add.c:292
+#: wt-status.c:178 wt-status.c:205
#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "Use -f se deseja mesmo adicioná-los.\n"
+msgid " (use \"git reset %s <file>...\" to unstage)"
+msgstr " (use \"git reset %s <ficheiro>...\" para despreparar)"
-#: builtin/add.c:300
-msgid "adding files failed"
-msgstr "falha ao adicionar ficheiros"
+#: wt-status.c:180 wt-status.c:207
+msgid " (use \"git rm --cached <file>...\" to unstage)"
+msgstr " (use \"git rm --cached <ficheiro>...\" para despreparar)"
-#: builtin/add.c:336
-msgid "-A and -u are mutually incompatible"
-msgstr "-A e -u são mutuamente incompatíveis"
+#: wt-status.c:184
+msgid " (use \"git add <file>...\" to mark resolution)"
+msgstr " (use \"git add <ficheiro>...\" para marcar como resolvido)"
-#: builtin/add.c:343
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "A opção --ignore-missing só pode ser usada em conjunto com --dry-run"
+#: wt-status.c:186 wt-status.c:190
+msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr ""
+" (use \"git add/rm <ficheiro>...\" conforme apropriado para marcar como "
+"resolvido)"
-#: builtin/add.c:352
-#, c-format
-msgid "--chmod param '%s' must be either -x or +x"
-msgstr "o parâmetro '%s' de --chmod tem de ser -x ou +x"
+#: wt-status.c:188
+msgid " (use \"git rm <file>...\" to mark resolution)"
+msgstr " (use \"git rm <ficheiro>...\" para marcar como resolvido)"
-#: builtin/add.c:367
-#, c-format
-msgid "Nothing specified, nothing added.\n"
-msgstr "Não foi especificado nada, nada adicionado.\n"
+#: wt-status.c:199 wt-status.c:945
+msgid "Changes to be committed:"
+msgstr "Alterações para serem submetidas:"
-#: builtin/add.c:368
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "Queria dizer 'git add .'?\n"
+#: wt-status.c:217 wt-status.c:954
+msgid "Changes not staged for commit:"
+msgstr "Alterações não preparadas para submeter:"
-#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279
-#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340
-#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:240
-msgid "index file corrupt"
-msgstr "ficheiro de índice corrompido"
+#: wt-status.c:221
+msgid " (use \"git add <file>...\" to update what will be committed)"
+msgstr " (use \"git add <ficheiro>...\" para atualizar o que será submetido)"
-#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431
-msgid "Unable to write new index file"
-msgstr "Não foi possível escrever novo ficheiro de índice"
+#: wt-status.c:223
+msgid " (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr ""
+" (use \"git add/rm <ficheiro>...\" para atualizar o que será submetido)"
-#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032
-#, c-format
-msgid "could not read '%s'"
-msgstr "não foi possível ler '%s'"
+#: wt-status.c:224
+msgid ""
+" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+msgstr ""
+" (use \"git checkout -- <ficheiro>...\" para descartar alterações no "
+"diretório de trabalho)"
-#: builtin/am.c:426
-msgid "could not parse author script"
-msgstr "não foi possível analisar o autor do script"
+#: wt-status.c:226
+msgid " (commit or discard the untracked or modified content in submodules)"
+msgstr ""
+" (submeta ou descarte o conteúdo modificado ou não controlado nos "
+"submódulos)"
-#: builtin/am.c:503
+#: wt-status.c:238
#, c-format
-msgid "'%s' was deleted by the applypatch-msg hook"
-msgstr "'%s' foi eliminado pelo hook applypatch-msg"
+msgid " (use \"git %s <file>...\" to include in what will be committed)"
+msgstr " (use \"git %s <ficheiro>...\" para incluir no que será submetido)"
-#: builtin/am.c:544 builtin/notes.c:301
-#, c-format
-msgid "Malformed input line: '%s'."
-msgstr "Linha de entrada malformada: '%s'."
+#: wt-status.c:253
+msgid "both deleted:"
+msgstr "eliminado por ambos:"
-#: builtin/am.c:581 builtin/notes.c:316
-#, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
-msgstr "Falha ao copiar notas de '%s' para '%s'"
+#: wt-status.c:255
+msgid "added by us:"
+msgstr "adicionado por nós:"
-#: builtin/am.c:607
-msgid "fseek failed"
-msgstr "falha ao invocar fseek"
+#: wt-status.c:257
+msgid "deleted by them:"
+msgstr "eliminado por eles:"
-#: builtin/am.c:787
-#, c-format
-msgid "could not parse patch '%s'"
-msgstr "não foi possível analisar o patch '%s'"
+#: wt-status.c:259
+msgid "added by them:"
+msgstr "adicionado por eles:"
-#: builtin/am.c:852
-msgid "Only one StGIT patch series can be applied at once"
-msgstr "Só pode ser aplicada uma série de patches StGIT duma só vez"
+#: wt-status.c:261
+msgid "deleted by us:"
+msgstr "eliminado por nós:"
-#: builtin/am.c:899
-msgid "invalid timestamp"
-msgstr "carimbo de data/hora inválido"
+#: wt-status.c:263
+msgid "both added:"
+msgstr "adicionado por ambos:"
-#: builtin/am.c:902 builtin/am.c:910
-msgid "invalid Date line"
-msgstr "linha de Data inválida"
+#: wt-status.c:265
+msgid "both modified:"
+msgstr "modificado por ambos:"
-#: builtin/am.c:907
-msgid "invalid timezone offset"
-msgstr "mudança de fuso horário inválida"
+#: wt-status.c:275
+msgid "new file:"
+msgstr "novo ficheiro:"
-#: builtin/am.c:996
-msgid "Patch format detection failed."
-msgstr "Falha ao detetar o formato do patch."
+#: wt-status.c:277
+msgid "copied:"
+msgstr "copiado:"
-#: builtin/am.c:1001 builtin/clone.c:380
-#, c-format
-msgid "failed to create directory '%s'"
-msgstr "falha ao criar o diretório '%s'"
+#: wt-status.c:279
+msgid "deleted:"
+msgstr "eliminado:"
-#: builtin/am.c:1005
-msgid "Failed to split patches."
-msgstr "Falha ao dividir patches."
+#: wt-status.c:281
+msgid "modified:"
+msgstr "modificado:"
-#: builtin/am.c:1137 builtin/commit.c:366
-msgid "unable to write index file"
-msgstr "não é possível escrever o ficheiro de índice"
+#: wt-status.c:283
+msgid "renamed:"
+msgstr "nome mudado:"
-#: builtin/am.c:1188
-#, c-format
-msgid "When you have resolved this problem, run \"%s --continue\"."
-msgstr "Após resolver este problema, execute \"%s --continue\"."
+#: wt-status.c:285
+msgid "typechange:"
+msgstr "tipo alterado:"
-#: builtin/am.c:1189
-#, c-format
-msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
-msgstr "Se preferir ignorar este patch, execute \"%s --skip\"."
+#: wt-status.c:287
+msgid "unknown:"
+msgstr "desconhecido:"
-#: builtin/am.c:1190
-#, c-format
-msgid "To restore the original branch and stop patching, run \"%s --abort\"."
-msgstr ""
-"Para restaurar o ramo original e interromper a aplicação dos patches, "
-"execute \"%s --abort\"."
+#: wt-status.c:289
+msgid "unmerged:"
+msgstr "não integrado:"
-#: builtin/am.c:1328
-msgid "Patch is empty. Was it split wrong?"
-msgstr "O patch está vazio. Foi dividido incorretamente?"
+#: wt-status.c:371
+msgid "new commits, "
+msgstr "novos commits, "
-#: builtin/am.c:1402 builtin/log.c:1543
-#, c-format
-msgid "invalid ident line: %s"
-msgstr "linha de identidade inválida: %s"
+#: wt-status.c:373
+msgid "modified content, "
+msgstr "conteúdo modificado, "
-#: builtin/am.c:1429
-#, c-format
-msgid "unable to parse commit %s"
-msgstr "não foi possível analisar o commit %s"
+#: wt-status.c:375
+msgid "untracked content, "
+msgstr "conteúdo não controlado, "
-#: builtin/am.c:1602
-msgid "Repository lacks necessary blobs to fall back on 3-way merge."
-msgstr ""
-"O repositório não tem os blobs necessários para recorrer a integração com 3 "
-"pontos."
+#: wt-status.c:818
+msgid "Submodules changed but not updated:"
+msgstr "Submódulos alterados mas não atualizados:"
-#: builtin/am.c:1604
-msgid "Using index info to reconstruct a base tree..."
-msgstr "A usar informação do índice para reconstruir uma árvore de base..."
+#: wt-status.c:820
+msgid "Submodule changes to be committed:"
+msgstr "Alterações em submódulos para serem submetidas:"
-#: builtin/am.c:1623
+#: wt-status.c:901
msgid ""
-"Did you hand edit your patch?\n"
-"It does not apply to blobs recorded in its index."
-msgstr ""
-"Editou o patch manualmente?\n"
-"Não é possível aplicá-lo aos blobs registados no índice."
-
-#: builtin/am.c:1629
-msgid "Falling back to patching base and 3-way merge..."
+"Do not touch the line above.\n"
+"Everything below will be removed."
msgstr ""
-"A recorrer a uma de base para aplicação de patches e integração com 3 "
-"pontos..."
+"Não altere a linha acima.\n"
+"Tudo o que estiver abaixo será removido."
-#: builtin/am.c:1654
-msgid "Failed to merge in the changes."
-msgstr "Falha ao integrar as alterações."
+#: wt-status.c:1013
+msgid "You have unmerged paths."
+msgstr "Há caminhos não integrados."
-#: builtin/am.c:1679 builtin/merge.c:628
-msgid "git write-tree failed to write a tree"
-msgstr "git write-tree falhou ao escrever uma árvore"
+#: wt-status.c:1016
+msgid " (fix conflicts and run \"git commit\")"
+msgstr " (corrija os conflitos e execute \"git commit\")"
-#: builtin/am.c:1686
-msgid "applying to an empty history"
-msgstr "a aplicar a um histórico vazio"
+#: wt-status.c:1018
+msgid " (use \"git merge --abort\" to abort the merge)"
+msgstr " (use \"git am --abort\" para abortar a integração)"
-#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798
-#: builtin/merge.c:823
-msgid "failed to write commit object"
-msgstr "falha ao escrever objeto de commit"
+#: wt-status.c:1023
+msgid "All conflicts fixed but you are still merging."
+msgstr "Todos os conflitos foram corrigidos mas ainda está a integrar."
-#: builtin/am.c:1731 builtin/am.c:1735
-#, c-format
-msgid "cannot resume: %s does not exist."
-msgstr "não é possível continuar: %s não existe."
+#: wt-status.c:1026
+msgid " (use \"git commit\" to conclude merge)"
+msgstr " (use \"git commit\" para concluir a integração)"
-#: builtin/am.c:1751
-msgid "cannot be interactive without stdin connected to a terminal."
-msgstr ""
-"não é possível entrar em modo interativo sem um entrada padrão conectada a "
-"um terminal."
+#: wt-status.c:1036
+msgid "You are in the middle of an am session."
+msgstr "Sessão am em curso."
-#: builtin/am.c:1756
-msgid "Commit Body is:"
-msgstr "Corpo do commit:"
+#: wt-status.c:1039
+msgid "The current patch is empty."
+msgstr "O patch atual está vazio."
-#. 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:1766
-msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
-msgstr "Aplicar? [y]sim/[n]ão/[e]ditar/[v]er patch/[a]ceitar todos: "
+#: wt-status.c:1043
+msgid " (fix conflicts and then run \"git am --continue\")"
+msgstr " (corrija os conflitos e execute \"git am --continue\")"
-#: builtin/am.c:1816
-#, c-format
-msgid "Dirty index: cannot apply patches (dirty: %s)"
-msgstr "Índice modificado: não é possível aplicar patches (modificado: %s)"
+#: wt-status.c:1045
+msgid " (use \"git am --skip\" to skip this patch)"
+msgstr " (use \"git am --skip\" para ignorar este patch)"
-#: builtin/am.c:1853 builtin/am.c:1925
-#, c-format
-msgid "Applying: %.*s"
-msgstr "A aplicar: %.*s"
+#: wt-status.c:1047
+msgid " (use \"git am --abort\" to restore the original branch)"
+msgstr " (use \"git am --abort\" para restaurar o ramo original)"
-#: builtin/am.c:1869
-msgid "No changes -- Patch already applied."
-msgstr "Nenhuma alteração -- Já foi aplicado o patch."
+#: wt-status.c:1172
+msgid "No commands done."
+msgstr "Nenhum comando concluído."
-#: builtin/am.c:1877
+#: wt-status.c:1175
#, c-format
-msgid "Patch failed at %s %.*s"
-msgstr "Falha ao aplicar o patch em %s %.*s"
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] "Último comando concluído (%d comando concluído):"
+msgstr[1] "Últimos comandos concluídos (%d comandos concluídos):"
-#: builtin/am.c:1883
+#: wt-status.c:1186
#, c-format
-msgid "The copy of the patch that failed is found in: %s"
-msgstr "A cópia do patch que falhou encontra-se em: %s"
-
-#: builtin/am.c:1928
-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 ""
-"Sem alterações - esqueceu-se de usar 'git add'?\n"
-"Se não há nada por preparar, provavelmente essas mesmas alterações\n"
-"já foram introduzidas; pode querer ignorar este patch."
+msgid " (see more in file %s)"
+msgstr " (veja mais no ficheiro %s)"
-#: builtin/am.c:1935
-msgid ""
-"You still have unmerged paths in your index.\n"
-"Did you forget to use 'git add'?"
-msgstr ""
-"Ainda há caminhos não integrados no índice.\n"
-"Esqueceu-se de usar 'git add'?"
+#: wt-status.c:1191
+msgid "No commands remaining."
+msgstr "Nenhum comando por concluir."
-#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308
-#: builtin/reset.c:316
+#: wt-status.c:1194
#, c-format
-msgid "Could not parse object '%s'."
-msgstr "Não foi possível analisar o objeto '%s'."
-
-#: builtin/am.c:2095
-msgid "failed to clean index"
-msgstr "falha ao limpar o índice"
+msgid "Next command to do (%d remaining command):"
+msgid_plural "Next commands to do (%d remaining commands):"
+msgstr[0] "Próximo comando a executar (%d comando restante):"
+msgstr[1] "Próximos comandos a executar (%d comandos restantes):"
-#: builtin/am.c:2129
-msgid ""
-"You seem to have moved HEAD since the last 'am' failure.\n"
-"Not rewinding to ORIG_HEAD"
-msgstr ""
-"Parece que a HEAD foi movida desde a última vez que o 'am' falhou.\n"
-"Não recuando a ORIG_HEAD"
+#: wt-status.c:1202
+msgid " (use \"git rebase --edit-todo\" to view and edit)"
+msgstr " (use \"git rebase --edit-todo\" para visualizar e editar)"
-#: builtin/am.c:2192
+#: wt-status.c:1215
#, c-format
-msgid "Invalid value for --patch-format: %s"
-msgstr "Valor inválido de --patch-format: %s"
-
-#: builtin/am.c:2225
-msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
-msgstr "git am [<opções>] [(<mbox>|<Maildir>)...]"
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "Está a realizar rebase do ramo '%s' sobre '%s'."
-#: builtin/am.c:2226
-msgid "git am [<options>] (--continue | --skip | --abort)"
-msgstr "git am [<opções>] (--continue | --skip | --abort)"
+#: wt-status.c:1220
+msgid "You are currently rebasing."
+msgstr "Está a rebasear neste momento."
-#: builtin/am.c:2232
-msgid "run interactively"
-msgstr "executar interativamente"
+#: wt-status.c:1234
+msgid " (fix conflicts and then run \"git rebase --continue\")"
+msgstr " (corrija os conflitos e execute \"git rebase --continue\")"
-#: builtin/am.c:2234
-msgid "historical option -- no-op"
-msgstr "opção histórica -- sem-ação"
+#: wt-status.c:1236
+msgid " (use \"git rebase --skip\" to skip this patch)"
+msgstr " (use \"git rebase --skip\" para ignorar este patch)"
-#: builtin/am.c:2236
-msgid "allow fall back on 3way merging if needed"
-msgstr "permitir recorrer a integração com 3 pontos se necessário"
+#: wt-status.c:1238
+msgid " (use \"git rebase --abort\" to check out the original branch)"
+msgstr " (use \"git rebase --abort\" para restaurar o ramo original)"
-#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57
-#: builtin/repack.c:172
-msgid "be quiet"
-msgstr "silencioso"
+#: wt-status.c:1244
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
+msgstr ""
+" (todos os conflitos foram corrigidos: execute \"git rebase --continue\")"
-#: builtin/am.c:2239
-msgid "add a Signed-off-by line to the commit message"
-msgstr "adicionar uma linha com Signed-of-by no fim da mensagem de commit"
+#: wt-status.c:1248
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Está a dividir um commit ao mesmo tempo que se efetua rebase do ramo '%s' "
+"sobre '%s'."
-#: builtin/am.c:2242
-msgid "recode into utf8 (default)"
-msgstr "recodificar em utf8 (predefinição)"
+#: wt-status.c:1253
+msgid "You are currently splitting a commit during a rebase."
+msgstr "Está a dividir um commit durante um rebase."
-#: builtin/am.c:2244
-msgid "pass -k flag to git-mailinfo"
-msgstr "passar a opção -k ao git-mailinfo"
+#: wt-status.c:1256
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr ""
+" (Assim que o diretório de trabalho estiver limpo, execute \"git rebase --"
+"continue\")"
-#: builtin/am.c:2246
-msgid "pass -b flag to git-mailinfo"
-msgstr "passar a opção -b ao git-mailinfo"
+#: wt-status.c:1260
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Está a editar um commit ao mesmo tempo que efetua rebase do ramo '%s' sobre "
+"'%s'."
-#: builtin/am.c:2248
-msgid "pass -m flag to git-mailinfo"
-msgstr "passar a opção -m ao git-mailinfo"
+#: wt-status.c:1265
+msgid "You are currently editing a commit during a rebase."
+msgstr "Está a editar um commit durante um rebase."
-#: builtin/am.c:2250
-msgid "pass --keep-cr flag to git-mailsplit for mbox format"
-msgstr "passar a opção --keep-cr ao gitmailsplit para formato de mbox"
+#: wt-status.c:1268
+msgid " (use \"git commit --amend\" to amend the current commit)"
+msgstr " (use \"git commit --amend\" para emendar o commit atual)"
-#: builtin/am.c:2253
-msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+#: wt-status.c:1270
+msgid ""
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-"não passar a opção --keep-cr ao git-mailsplit independentemente de am.keepcr"
-
-#: builtin/am.c:2256
-msgid "strip everything before a scissors line"
-msgstr "retirar todo o conteúdo antes da linha de tesoura"
-
-#: builtin/am.c:2257 builtin/apply.c:4837
-msgid "action"
-msgstr "ação"
+" (use \"git rebase --continue\" assim que estiver satisfeito com as "
+"alterações)"
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279
-#: builtin/am.c:2285
-msgid "pass it through git-apply"
-msgstr "transmitir ao git-apply"
+#: wt-status.c:1280
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "Está a realizar cherry-pick do commit %s."
-#: builtin/am.c:2266 builtin/apply.c:4861
-msgid "root"
-msgstr "raiz"
+#: wt-status.c:1285
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr " (corrija os conflitos e execute \"git cherry-pick --continue\")"
-#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799
-#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96
-#: builtin/pull.c:179 builtin/submodule--helper.c:277
-#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482
-#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823
-#: builtin/submodule--helper.c:826
-msgid "path"
-msgstr "caminho"
+#: wt-status.c:1288
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr ""
+" (todos os conflitos foram corrigidos: execute \"git cherry-pick --continue"
+"\")"
-#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134 builtin/pull.c:193
-#: builtin/repack.c:181 builtin/repack.c:185 builtin/show-branch.c:645
-#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
-#: parse-options.h:134 parse-options.h:244
-msgid "n"
-msgstr "n"
+#: wt-status.c:1290
+msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr ""
+" (use \"git cherry-pick --abort\" para cancelar a operação de cherry-pick)"
-#: builtin/am.c:2278 builtin/apply.c:4805
-msgid "num"
-msgstr "num"
+#: wt-status.c:1299
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "Está a reverter o commit %s neste comento."
-#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438
-#: builtin/tag.c:372
-msgid "format"
-msgstr "formato"
+#: wt-status.c:1304
+msgid " (fix conflicts and run \"git revert --continue\")"
+msgstr " (corrija dos conflitos e execute \"git revert --continue\")"
-#: builtin/am.c:2282
-msgid "format the patch(es) are in"
-msgstr "formato de apresentação de patches"
+#: wt-status.c:1307
+msgid " (all conflicts fixed: run \"git revert --continue\")"
+msgstr ""
+" (todos os conflitos foram corrigidos: execute \"git revert --continue\")"
-#: builtin/am.c:2288
-msgid "override error message when patch failure occurs"
-msgstr "substituir a mensagem de erro quando a aplicação do patch falha"
+#: wt-status.c:1309
+msgid " (use \"git revert --abort\" to cancel the revert operation)"
+msgstr " (use \"git rever --abort\" para cancelar a operação de reversão)"
-#: builtin/am.c:2290
-msgid "continue applying patches after resolving a conflict"
-msgstr "continuar a aplicar os patches depois de resolver os conflitos"
+#: wt-status.c:1320
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "Está a bissetar, iniciado a partir do ramo '%s'."
-#: builtin/am.c:2293
-msgid "synonyms for --continue"
-msgstr "sinónimo de --continue"
+#: wt-status.c:1324
+msgid "You are currently bisecting."
+msgstr "Está a bissetar neste momento."
-#: builtin/am.c:2296
-msgid "skip the current patch"
-msgstr "ignorar o patch atual"
+#: wt-status.c:1327
+msgid " (use \"git bisect reset\" to get back to the original branch)"
+msgstr " (use \"git bisect reset\" para voltar ao ramo original)"
-#: builtin/am.c:2299
-msgid "restore the original branch and abort the patching operation."
-msgstr "restaurar o ramo original e abortar a operação de patch."
+#: wt-status.c:1524
+msgid "On branch "
+msgstr "No ramo "
-#: builtin/am.c:2303
-msgid "lie about committer date"
-msgstr "mentir sobre a data de commit"
+#: wt-status.c:1530
+msgid "interactive rebase in progress; onto "
+msgstr "rebase interativo em curso; sobre "
-#: builtin/am.c:2305
-msgid "use current timestamp for author date"
-msgstr "usar a data e hora atual como data de autor"
+#: wt-status.c:1532
+msgid "rebase in progress; onto "
+msgstr "rebase em curso; sobre "
-#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229
-#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
-msgid "key-id"
-msgstr "id-chave"
+#: wt-status.c:1537
+msgid "HEAD detached at "
+msgstr "HEAD destacada em "
-#: builtin/am.c:2308
-msgid "GPG-sign commits"
-msgstr "assinar os commits com GPG"
+#: wt-status.c:1539
+msgid "HEAD detached from "
+msgstr "HEAD destacada de "
-#: builtin/am.c:2311
-msgid "(internal use for git-rebase)"
-msgstr "(uso interno de git-rebase)"
+#: wt-status.c:1542
+msgid "Not currently on any branch."
+msgstr "Não se encontra em nenhum ramo neste momento."
-#: builtin/am.c:2326
-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 ""
-"A opção -b/--binary há muito que é ignorada e será\n"
-"futuramente removida. Por favor não a use."
+#: wt-status.c:1560
+msgid "Initial commit"
+msgstr "Commit inicial"
-#: builtin/am.c:2333
-msgid "failed to read the index"
-msgstr "falha ao ler o índice"
+#: wt-status.c:1574
+msgid "Untracked files"
+msgstr "Ficheiros não controlados"
-#: builtin/am.c:2348
-#, c-format
-msgid "previous rebase directory %s still exists but mbox given."
-msgstr ""
-"o diretório de rebesa anterior %s ainda existe, mas foi fornecida uma mbox."
+#: wt-status.c:1576
+msgid "Ignored files"
+msgstr "Ficheiros ignorados"
-#: builtin/am.c:2372
+#: wt-status.c:1580
#, c-format
msgid ""
-"Stray %s directory found.\n"
-"Use \"git am --abort\" to remove it."
+"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 ""
-"Diretório abandonado %s encontrado.\n"
-"Use \"git am --abort\" para o remover."
-
-#: builtin/am.c:2378
-msgid "Resolve operation not in progress, we are not resuming."
-msgstr "A operação de resolução não está em curso, não retomando."
-
-#: builtin/apply.c:122
-msgid "git apply [<options>] [<patch>...]"
-msgstr "git apply [<opções>] [<patch>...]"
-
-#: builtin/apply.c:153
-#, c-format
-msgid "unrecognized whitespace option '%s'"
-msgstr "opção de espaço em branco não reconhecida '%s'"
+"A enumeração dos ficheiros não controlados demorou %.2f segundos\n"
+"a concluir. 'status -uno' pode acelerar o processo, mas deve ter\n"
+"cuidado de não se esquecer de adicionar novos ficheiros\n"
+"(consulte 'git help status')."
-#: builtin/apply.c:169
+#: wt-status.c:1586
#, c-format
-msgid "unrecognized whitespace ignore option '%s'"
-msgstr "opção de ignorar espaço em branco não reconhecida '%s'"
+msgid "Untracked files not listed%s"
+msgstr "Ficheiros não controlados não listados%s"
-#: builtin/apply.c:854
-#, c-format
-msgid "Cannot prepare timestamp regexp %s"
-msgstr "Não é possível preparar a regexp de carimbo de data/hora %s"
+#: wt-status.c:1588
+msgid " (use -u option to show untracked files)"
+msgstr " (use a opção -u para mostrar os ficheiros não controlados)"
+
+#: wt-status.c:1594
+msgid "No changes"
+msgstr "Sem alterações"
-#: builtin/apply.c:863
+#: wt-status.c:1599
#, c-format
-msgid "regexec returned %d for input: %s"
-msgstr "regexec retornou %d para a entra: %s"
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr ""
+"nenhuma alteração adicionada para submeter (use \"git add\" e/ou \"git "
+"commit -a\")\n"
-#: builtin/apply.c:947
+#: wt-status.c:1602
#, c-format
-msgid "unable to find filename in patch at line %d"
-msgstr "não foi possível encontrar o nome do ficheiro no patch na linha %d"
+msgid "no changes added to commit\n"
+msgstr "nenhuma alteração adicionada para submeter\n"
-#: builtin/apply.c:984
+#: wt-status.c:1605
#, c-format
-msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
msgstr ""
-"git apply: git-diff incorreto - esperava-se /dev/null, obteve-se %s na linha "
-"%d"
+"não foi adicionado nada para submeter, mas existem ficheiros não controlados "
+"(use \"git add\" para controlá-los)\n"
-#: builtin/apply.c:989
+#: wt-status.c:1608
#, c-format
-msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgid "nothing added to commit but untracked files present\n"
msgstr ""
-"git apply: git-diff incorreto - o nome do novo ficheiro na linha %d é "
-"inconsistente"
+"não foi adicionado nada para submeter, mas existem ficheiros não "
+"controlados\n"
-#: builtin/apply.c:990
+#: wt-status.c:1611
#, c-format
-msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-"git apply: git-diff incorreto - o nome do ficheiro antigo na linha %d é "
-"inconsistente"
+"não há nada para submeter (crie/copie ficheiros e use \"git add\" para "
+"controlá-los)\n"
-#: builtin/apply.c:995
+#: wt-status.c:1614 wt-status.c:1619
#, c-format
-msgid "git apply: bad git-diff - expected /dev/null on line %d"
-msgstr "git apply: git-diff incorreto - esperava-se /dev/null na linha %d"
+msgid "nothing to commit\n"
+msgstr "não há nada para submeter\n"
-#: builtin/apply.c:1489
+#: wt-status.c:1617
#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr "recontagem: linha inesperada: %.*s"
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr ""
+"não há nada para submeter (use -u para mostrar os ficheiros não "
+"controlados)\n"
-#: builtin/apply.c:1550
+#: wt-status.c:1621
#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr "fragmento de patch sem cabeçalho na linha %d: %.*s"
+msgid "nothing to commit, working tree clean\n"
+msgstr "não há nada para submeter, árvore de trabalho limpa\n"
-#: builtin/apply.c:1567
-#, 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] ""
-"o cabeçalho do git diff não revelou o nome do ficheiro depois de se remover "
-"%d componente do caminho (linha %d)"
-msgstr[1] ""
-"o cabeçalho do git diff não revelou o nome do ficheiro depois de se remover "
-"%d componentes de caminho (linha %d)"
+#: wt-status.c:1728
+msgid "Initial commit on "
+msgstr "Commit inicial em "
-#: builtin/apply.c:1743
-msgid "new file depends on old contents"
-msgstr "o novo ficheiro depende de conteúdos antigos"
+#: wt-status.c:1732
+msgid "HEAD (no branch)"
+msgstr "HEAD (nenhum ramo)"
-#: builtin/apply.c:1745
-msgid "deleted file still has contents"
-msgstr "o ficheiro eliminado ainda tem conteúdos"
+#: wt-status.c:1761
+msgid "gone"
+msgstr "desaparecido"
-#: builtin/apply.c:1774
-#, c-format
-msgid "corrupt patch at line %d"
-msgstr "patch corrompido na linha %d"
+#: wt-status.c:1763 wt-status.c:1771
+msgid "behind "
+msgstr "atrás "
-#: builtin/apply.c:1810
-#, c-format
-msgid "new file %s depends on old contents"
-msgstr "o novo ficheiro %s depende de conteúdos antigos"
+#: wt-status.c:1766 wt-status.c:1769
+msgid "ahead "
+msgstr "à frente "
-#: builtin/apply.c:1812
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2270
#, c-format
-msgid "deleted file %s still has contents"
-msgstr "o ficheiro eliminado %s ainda tem conteúdos"
+msgid "cannot %s: You have unstaged changes."
+msgstr "não é possível efetuar %s: tem alterações não preparadas."
-#: builtin/apply.c:1815
-#, c-format
-msgid "** warning: file %s becomes empty but is not deleted"
-msgstr "** aviso: o ficheiro %s ficará vazio, mas não será eliminado"
+#: wt-status.c:2276
+msgid "additionally, your index contains uncommitted changes."
+msgstr "além disso, o índice contém alterações não submetidas."
-#: builtin/apply.c:1962
+#: wt-status.c:2278
#, c-format
-msgid "corrupt binary patch at line %d: %.*s"
-msgstr "patch binário corrompido na linha %d: %.*s"
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "não é possível efetuar %s: o índice contém alterações não submetidas."
-#: builtin/apply.c:1999
+#: compat/precompose_utf8.c:57 builtin/clone.c:414
#, c-format
-msgid "unrecognized binary patch at line %d"
-msgstr "patch binário não reconhecido na linha %d"
+msgid "failed to unlink '%s'"
+msgstr "falha ao invocar unlink de '%s'"
-#: builtin/apply.c:2154
-#, c-format
-msgid "patch with only garbage at line %d"
-msgstr "patch incompreensível na linha %d"
+#: builtin/add.c:22
+msgid "git add [<options>] [--] <pathspec>..."
+msgstr "git add [<opções>] [--] <caminho>..."
-#: builtin/apply.c:2244
+#: builtin/add.c:80
#, c-format
-msgid "unable to read symlink %s"
-msgstr "não é possível ler a ligação simbólica %s"
+msgid "unexpected diff status %c"
+msgstr "diff status inesperado %c"
-#: builtin/apply.c:2248
-#, c-format
-msgid "unable to open or read %s"
-msgstr "não é possível abrir ou ler %s"
+#: builtin/add.c:85 builtin/commit.c:291
+msgid "updating files failed"
+msgstr "falha ao atualizar os ficheiros"
-#: builtin/apply.c:2901
+#: builtin/add.c:95
#, c-format
-msgid "invalid start of line: '%c'"
-msgstr "início de linha inválido: '%c'"
+msgid "remove '%s'\n"
+msgstr "remover '%s'\n"
+
+#: builtin/add.c:149
+msgid "Unstaged changes after refreshing the index:"
+msgstr "Alterações não preparadas depois de atualizar o índice:"
+
+#: builtin/add.c:209 builtin/rev-parse.c:840
+msgid "Could not read the index"
+msgstr "Não foi possível ler o índice"
-#: builtin/apply.c:3020
+#: builtin/add.c:220
#, c-format
-msgid "Hunk #%d succeeded at %d (offset %d line)."
-msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
-msgstr[0] "Excerto nº%d bem sucedido na linha %d (%d linha deslocada)."
-msgstr[1] "Excerto nº%d bem sucedido na linha %d (%d linhas deslocadas)."
+msgid "Could not open '%s' for writing."
+msgstr "Não foi possível abrir '%s' para escrita."
+
+#: builtin/add.c:224
+msgid "Could not write patch"
+msgstr "Não foi possível escrever patch"
+
+#: builtin/add.c:227
+msgid "editing patch failed"
+msgstr "falha ao editar patch"
-#: builtin/apply.c:3032
+#: builtin/add.c:230
#, c-format
-msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
-msgstr "Contexto reduzido para (%ld/%ld) para aplicar o fragmento em %d"
+msgid "Could not stat '%s'"
+msgstr "Não foi possível obter stat de '%s'"
+
+#: builtin/add.c:232
+msgid "Empty patch. Aborted."
+msgstr "Patch vazio. Abortado."
-#: builtin/apply.c:3038
+#: builtin/add.c:237
#, c-format
-msgid ""
-"while searching for:\n"
-"%.*s"
+msgid "Could not apply '%s'"
+msgstr "Não foi possível aplicar '%s'"
+
+#: builtin/add.c:247
+msgid "The following paths are ignored by one of your .gitignore files:\n"
+msgstr "Os seguintes caminhos estão ignorados por algum ficheiro .gitignore:\n"
+
+#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111
+#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521
+#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162
+msgid "dry run"
+msgstr "simular ação"
+
+#: builtin/add.c:269
+msgid "interactive picking"
+msgstr "seleção interativa"
+
+#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286
+msgid "select hunks interactively"
+msgstr "selecionar blocos interativamente"
+
+#: builtin/add.c:271
+msgid "edit current diff and apply"
+msgstr "editar o diff atual e aplicá-lo"
+
+#: builtin/add.c:272
+msgid "allow adding otherwise ignored files"
+msgstr "permitir adicionar ficheiros ignorados"
+
+#: builtin/add.c:273
+msgid "update tracked files"
+msgstr "atualizar ficheiros controlados"
+
+#: builtin/add.c:274
+msgid "record only the fact that the path will be added later"
+msgstr "registar apenas o facto de que o caminho será adicionado mais tarde"
+
+#: builtin/add.c:275
+msgid "add changes from all tracked and untracked files"
msgstr ""
-"ao procura por:\n"
-"%.*s"
+"adicionar alterações de todos os ficheiros controlados ou não controlados"
+
+#: builtin/add.c:278
+msgid "ignore paths removed in the working tree (same as --no-all)"
+msgstr ""
+"ignorar caminhos removidos na árvore de trabalho (o mesmo que --no-all)"
-#: builtin/apply.c:3060
+#: builtin/add.c:280
+msgid "don't add, only refresh the index"
+msgstr "não adicionar, apenas atualizar o índice"
+
+#: builtin/add.c:281
+msgid "just skip files which cannot be added because of errors"
+msgstr "ignorar ficheiros que não podem ser adicionados por causa de erros"
+
+#: builtin/add.c:282
+msgid "check if - even missing - files are ignored in dry run"
+msgstr "verificar quais os ficheiros ignorados na simulação"
+
+#: builtin/add.c:283 builtin/update-index.c:947
+msgid "(+/-)x"
+msgstr "(+/-)x"
+
+#: builtin/add.c:283 builtin/update-index.c:948
+msgid "override the executable bit of the listed files"
+msgstr "substituir o bit executável dos ficheiros listados"
+
+#: builtin/add.c:305
#, c-format
-msgid "missing binary patch data for '%s'"
-msgstr "falta de dados do patch binário '%s'"
+msgid "Use -f if you really want to add them.\n"
+msgstr "Use -f se deseja mesmo adicioná-los.\n"
+
+#: builtin/add.c:312
+msgid "adding files failed"
+msgstr "falha ao adicionar ficheiros"
+
+#: builtin/add.c:348
+msgid "-A and -u are mutually incompatible"
+msgstr "-A e -u são mutuamente incompatíveis"
+
+#: builtin/add.c:355
+msgid "Option --ignore-missing can only be used together with --dry-run"
+msgstr "A opção --ignore-missing só pode ser usada em conjunto com --dry-run"
-#: builtin/apply.c:3163
+#: builtin/add.c:359
#, c-format
-msgid "binary patch does not apply to '%s'"
-msgstr "o patch binário não foi aplicado corretamente a '%s'"
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr "o parâmetro '%s' de --chmod tem de ser -x ou +x"
-#: builtin/apply.c:3169
+#: builtin/add.c:374
#, c-format
-msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
-msgstr ""
-"o patch binário aplicado a '%s' gera resultados incorretos (esperava-se %s, "
-"obteve-se %s)"
+msgid "Nothing specified, nothing added.\n"
+msgstr "Não foi especificado nada, nada adicionado.\n"
-#: builtin/apply.c:3190
+#: builtin/add.c:375
#, c-format
-msgid "patch failed: %s:%ld"
-msgstr "falha ao aplicar o patch: %s:%ld"
+msgid "Maybe you wanted to say 'git add .'?\n"
+msgstr "Queria dizer 'git add .'?\n"
+
+#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279
+#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350
+#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:244
+msgid "index file corrupt"
+msgstr "ficheiro de índice corrompido"
+
+#: builtin/am.c:414
+msgid "could not parse author script"
+msgstr "não foi possível analisar o autor do script"
-#: builtin/apply.c:3314
+#: builtin/am.c:491
#, c-format
-msgid "cannot checkout %s"
-msgstr "não é possível extrair %s"
+msgid "'%s' was deleted by the applypatch-msg hook"
+msgstr "'%s' foi eliminado pelo hook applypatch-msg"
-#: builtin/apply.c:3370
+#: builtin/am.c:532
#, c-format
-msgid "reading from '%s' beyond a symbolic link"
-msgstr "a ler '%s' indicado por uma ligação simbólica"
+msgid "Malformed input line: '%s'."
+msgstr "Linha de entrada malformada: '%s'."
-#: builtin/apply.c:3399 builtin/apply.c:3630
+#: builtin/am.c:569
#, c-format
-msgid "path %s has been renamed/deleted"
-msgstr "o caminho %s foi eliminado ou mudou de nome"
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr "Falha ao copiar notas de '%s' para '%s'"
+
+#: builtin/am.c:595
+msgid "fseek failed"
+msgstr "falha ao invocar fseek"
+
+#: builtin/am.c:775
+#, c-format
+msgid "could not parse patch '%s'"
+msgstr "não foi possível analisar o patch '%s'"
+
+#: builtin/am.c:840
+msgid "Only one StGIT patch series can be applied at once"
+msgstr "Só pode ser aplicada uma série de patches StGIT duma só vez"
+
+#: builtin/am.c:887
+msgid "invalid timestamp"
+msgstr "carimbo de data/hora inválido"
+
+#: builtin/am.c:890 builtin/am.c:898
+msgid "invalid Date line"
+msgstr "linha de Data inválida"
+
+#: builtin/am.c:895
+msgid "invalid timezone offset"
+msgstr "mudança de fuso horário inválida"
-#: builtin/apply.c:3482 builtin/apply.c:3644
-#, c-format
-msgid "%s: does not exist in index"
-msgstr "%s: não existe no índice"
+#: builtin/am.c:984
+msgid "Patch format detection failed."
+msgstr "Falha ao detetar o formato do patch."
-#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658
+#: builtin/am.c:989 builtin/clone.c:379
#, c-format
-msgid "%s: %s"
-msgstr "%s: %s"
+msgid "failed to create directory '%s'"
+msgstr "falha ao criar o diretório '%s'"
-#: builtin/apply.c:3491 builtin/apply.c:3652
-#, c-format
-msgid "%s: does not match index"
-msgstr "%s: não tem correspondência no índice"
+#: builtin/am.c:993
+msgid "Failed to split patches."
+msgstr "Falha ao dividir patches."
-#: builtin/apply.c:3597
-msgid "removal patch leaves file contents"
-msgstr "patch de remoção deixa conteúdos no ficheiro"
+#: builtin/am.c:1125 builtin/commit.c:376
+msgid "unable to write index file"
+msgstr "não é possível escrever o ficheiro de índice"
-#: builtin/apply.c:3669
+#: builtin/am.c:1176
#, c-format
-msgid "%s: wrong type"
-msgstr "%s: tipo errado"
+msgid "When you have resolved this problem, run \"%s --continue\"."
+msgstr "Após resolver este problema, execute \"%s --continue\"."
-#: builtin/apply.c:3671
+#: builtin/am.c:1177
#, c-format
-msgid "%s has type %o, expected %o"
-msgstr "%s é do tipo %o, esperado %o"
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+msgstr "Se preferir ignorar este patch, execute \"%s --skip\"."
-#: builtin/apply.c:3822 builtin/apply.c:3824
+#: builtin/am.c:1178
#, c-format
-msgid "invalid path '%s'"
-msgstr "caminho inválido '%s'"
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgstr ""
+"Para restaurar o ramo original e interromper a aplicação dos patches, "
+"execute \"%s --abort\"."
-#: builtin/apply.c:3879
-#, c-format
-msgid "%s: already exists in index"
-msgstr "%s: já existe no índice"
+#: builtin/am.c:1316
+msgid "Patch is empty. Was it split wrong?"
+msgstr "O patch está vazio. Foi dividido incorretamente?"
-#: builtin/apply.c:3882
+#: builtin/am.c:1390 builtin/log.c:1550
#, c-format
-msgid "%s: already exists in working directory"
-msgstr "%s: já existe no diretório de trabalho"
+msgid "invalid ident line: %s"
+msgstr "linha de identidade inválida: %s"
-#: builtin/apply.c:3902
+#: builtin/am.c:1417
#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o)"
-msgstr "o novo modo (%o) de %s não corresponde ao modo antigo (%o)"
+msgid "unable to parse commit %s"
+msgstr "não foi possível analisar o commit %s"
-#: builtin/apply.c:3907
-#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o) of %s"
-msgstr "o novo modo (%o) de %s não corresponde ao modo antigo (%o) de %s"
+#: builtin/am.c:1610
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+msgstr ""
+"O repositório não tem os blobs necessários para recorrer a integração com 3 "
+"pontos."
-#: builtin/apply.c:3927
-#, c-format
-msgid "affected file '%s' is beyond a symbolic link"
-msgstr "o ficheiro afetado '%s' é indicado por uma ligação simbólica"
+#: builtin/am.c:1612
+msgid "Using index info to reconstruct a base tree..."
+msgstr "A usar informação do índice para reconstruir uma árvore de base..."
-#: builtin/apply.c:3931
-#, c-format
-msgid "%s: patch does not apply"
-msgstr "%s: patch não se aplica com sucesso"
+#: builtin/am.c:1631
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
+msgstr ""
+"Editou o patch manualmente?\n"
+"Não é possível aplicá-lo aos blobs registados no índice."
-#: builtin/apply.c:3945
-#, c-format
-msgid "Checking patch %s..."
-msgstr "A verificar o patch %s..."
+#: builtin/am.c:1637
+msgid "Falling back to patching base and 3-way merge..."
+msgstr ""
+"A recorrer a uma de base para aplicação de patches e integração com 3 "
+"pontos..."
-#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "falha ao invocar make_cache_entry em '%s'"
+#: builtin/am.c:1662
+msgid "Failed to merge in the changes."
+msgstr "Falha ao integrar as alterações."
-#: builtin/apply.c:4182
-#, c-format
-msgid "unable to remove %s from index"
-msgstr "não é possível remover %s do índice"
+#: builtin/am.c:1686 builtin/merge.c:628
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree falhou ao escrever uma árvore"
-#: builtin/apply.c:4215
-#, c-format
-msgid "corrupt patch for submodule %s"
-msgstr "patch corrompido no submódulo %s"
+#: builtin/am.c:1693
+msgid "applying to an empty history"
+msgstr "a aplicar a um histórico vazio"
-#: builtin/apply.c:4219
-#, c-format
-msgid "unable to stat newly created file '%s'"
-msgstr "não é possível obter estado do novo ficheiro criado '%s'"
+#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798
+#: builtin/merge.c:823
+msgid "failed to write commit object"
+msgstr "falha ao escrever objeto de commit"
-#: builtin/apply.c:4224
+#: builtin/am.c:1739 builtin/am.c:1743
#, c-format
-msgid "unable to create backing store for newly created file %s"
+msgid "cannot resume: %s does not exist."
+msgstr "não é possível continuar: %s não existe."
+
+#: builtin/am.c:1759
+msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
-"não é possível criar armazenamento de segurança do ficheiro recém-criado %s"
+"não é possível entrar em modo interativo sem um entrada padrão conectada a "
+"um terminal."
-#: builtin/apply.c:4227 builtin/apply.c:4340
-#, c-format
-msgid "unable to add cache entry for %s"
-msgstr "não é possível adicionar %s à cache"
+#: builtin/am.c:1764
+msgid "Commit Body is:"
+msgstr "Corpo do commit:"
-#: builtin/apply.c:4260
-#, c-format
-msgid "closing file '%s'"
-msgstr "a fechar o ficheiro '%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:1774
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+msgstr "Aplicar? [y]sim/[n]ão/[e]ditar/[v]er patch/[a]ceitar todos: "
-#: builtin/apply.c:4313
+#: builtin/am.c:1824
#, c-format
-msgid "unable to write file '%s' mode %o"
-msgstr "não é possível escrever o ficheiro '%s' com o modo %o"
+msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgstr "Índice modificado: não é possível aplicar patches (modificado: %s)"
-#: builtin/apply.c:4403
+#: builtin/am.c:1861 builtin/am.c:1933
#, c-format
-msgid "Applied patch %s cleanly."
-msgstr "Patch %s aplicado com sucesso."
+msgid "Applying: %.*s"
+msgstr "A aplicar: %.*s"
-#: builtin/apply.c:4411
-msgid "internal error"
-msgstr "erro interno"
+#: builtin/am.c:1877
+msgid "No changes -- Patch already applied."
+msgstr "Nenhuma alteração -- Já foi aplicado o patch."
-#: builtin/apply.c:4414
+#: builtin/am.c:1885
#, c-format
-msgid "Applying patch %%s with %d reject..."
-msgid_plural "Applying patch %%s with %d rejects..."
-msgstr[0] "A aplicar patch %%s com %d rejeição..."
-msgstr[1] "A aplicar patch %%s com %d rejeições..."
+msgid "Patch failed at %s %.*s"
+msgstr "Falha ao aplicar o patch em %s %.*s"
-#: builtin/apply.c:4424
+#: builtin/am.c:1891
#, c-format
-msgid "truncating .rej filename to %.*s.rej"
-msgstr "a truncar o nome do ficheiro .rej em %.*s.rej"
+msgid "The copy of the patch that failed is found in: %s"
+msgstr "A cópia do patch que falhou encontra-se em: %s"
-#: builtin/apply.c:4432
-#, c-format
-msgid "cannot open %s: %s"
-msgstr "não é possível abrir %s: %s"
+#: builtin/am.c:1936
+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 ""
+"Sem alterações - esqueceu-se de usar 'git add'?\n"
+"Se não há nada por preparar, provavelmente essas mesmas alterações\n"
+"já foram introduzidas; pode querer ignorar este patch."
-#: builtin/apply.c:4445
-#, c-format
-msgid "Hunk #%d applied cleanly."
-msgstr "Excerto nº%d aplicado com sucesso."
+#: builtin/am.c:1943
+msgid ""
+"You still have unmerged paths in your index.\n"
+"Did you forget to use 'git add'?"
+msgstr ""
+"Ainda há caminhos não integrados no índice.\n"
+"Esqueceu-se de usar 'git add'?"
-#: builtin/apply.c:4448
+#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
+#: builtin/reset.c:316
#, c-format
-msgid "Rejected hunk #%d."
-msgstr "Excerto nº%d rejeitado."
+msgid "Could not parse object '%s'."
+msgstr "Não foi possível analisar o objeto '%s'."
-#: builtin/apply.c:4537
+#: builtin/am.c:2103
+msgid "failed to clean index"
+msgstr "falha ao limpar o índice"
+
+#: builtin/am.c:2137
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
+msgstr ""
+"Parece que a HEAD foi movida desde a última vez que o 'am' falhou.\n"
+"Não recuando a ORIG_HEAD"
+
+#: builtin/am.c:2200
#, c-format
-msgid "Skipped patch '%s'."
-msgstr "Patch '%s' ignorado."
+msgid "Invalid value for --patch-format: %s"
+msgstr "Valor inválido de --patch-format: %s"
-#: builtin/apply.c:4545
-msgid "unrecognized input"
-msgstr "entrada não reconhecida"
+#: builtin/am.c:2233
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+msgstr "git am [<opções>] [(<mbox> | <Maildir>)...]"
-#: builtin/apply.c:4556
-msgid "unable to read index file"
-msgstr "não foi possível ler o ficheiro de índice"
+#: builtin/am.c:2234
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<opções>] (--continue | --skip | --abort)"
-#: builtin/apply.c:4701
-msgid "--3way outside a repository"
-msgstr "--3way fora de um repositório"
+#: builtin/am.c:2240
+msgid "run interactively"
+msgstr "executar interativamente"
-#: builtin/apply.c:4709
-msgid "--index outside a repository"
-msgstr "--index fora de um repositório"
+#: builtin/am.c:2242
+msgid "historical option -- no-op"
+msgstr "opção histórica -- sem-ação"
-#: builtin/apply.c:4712
-msgid "--cached outside a repository"
-msgstr "--cached fora de um repositório"
+#: builtin/am.c:2244
+msgid "allow fall back on 3way merging if needed"
+msgstr "permitir recorrer a integração com 3 pontos se necessário"
-#: builtin/apply.c:4745
-#, c-format
-msgid "can't open patch '%s'"
-msgstr "não é possível abrir o patch '%s'"
+#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
+#: builtin/repack.c:172
+msgid "be quiet"
+msgstr "silencioso"
-#: builtin/apply.c:4760
-#, c-format
-msgid "squelched %d whitespace error"
-msgid_plural "squelched %d whitespace errors"
-msgstr[0] "%d erro de espaço em branco reprimido"
-msgstr[1] "%d erros de espaço em branco reprimidos"
+#: builtin/am.c:2247
+msgid "add a Signed-off-by line to the commit message"
+msgstr "adicionar uma linha com Signed-of-by no fim da mensagem de commit"
-#: builtin/apply.c:4766 builtin/apply.c:4776
-#, c-format
-msgid "%d line adds whitespace errors."
-msgid_plural "%d lines add whitespace errors."
-msgstr[0] "%d linha adiciona erros de espaço em branco."
-msgstr[1] "%d linhas adicionam erros de espaço em branco."
+#: builtin/am.c:2250
+msgid "recode into utf8 (default)"
+msgstr "recodificar em utf8 (predefinição)"
-#: builtin/apply.c:4800
-msgid "don't apply changes matching the given path"
-msgstr "não aplicar alterações que correspondam ao caminho fornecido"
+#: builtin/am.c:2252
+msgid "pass -k flag to git-mailinfo"
+msgstr "passar a opção -k ao git-mailinfo"
-#: builtin/apply.c:4803
-msgid "apply changes matching the given path"
-msgstr "aplicar alterações que correspondam ao caminho fornecido"
+#: builtin/am.c:2254
+msgid "pass -b flag to git-mailinfo"
+msgstr "passar a opção -b ao git-mailinfo"
-#: builtin/apply.c:4806
-msgid "remove <num> leading slashes from traditional diff paths"
-msgstr "remover <num> barras à esquerda dos caminhos de diff tradicional"
+#: builtin/am.c:2256
+msgid "pass -m flag to git-mailinfo"
+msgstr "passar a opção -m ao git-mailinfo"
-#: builtin/apply.c:4809
-msgid "ignore additions made by the patch"
-msgstr "ignorar adições feitas pelo patch"
+#: builtin/am.c:2258
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+msgstr "passar a opção --keep-cr ao gitmailsplit para formato de mbox"
-#: builtin/apply.c:4811
-msgid "instead of applying the patch, output diffstat for the input"
-msgstr "em vez de aplicar o patch, mostrar o diffstat da entrada"
+#: builtin/am.c:2261
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+msgstr ""
+"não passar a opção --keep-cr ao git-mailsplit independentemente de am.keepcr"
-#: builtin/apply.c:4815
-msgid "show number of added and deleted lines in decimal notation"
-msgstr "mostrar número de linhas adicionadas e removidas em notação decimal"
+#: builtin/am.c:2264
+msgid "strip everything before a scissors line"
+msgstr "retirar todo o conteúdo antes da linha de tesoura"
-#: builtin/apply.c:4817
-msgid "instead of applying the patch, output a summary for the input"
-msgstr "em vez de aplicar o patch, mostrar um resumo da entrada"
+#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
+#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
+#: builtin/am.c:2293
+msgid "pass it through git-apply"
+msgstr "transmitir ao git-apply"
-#: builtin/apply.c:4819
-msgid "instead of applying the patch, see if the patch is applicable"
-msgstr "em vez de aplicar o patch, verificar se o patch pode ser aplicado"
+#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
+#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135
+#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185
+#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
+msgid "n"
+msgstr "n"
-#: builtin/apply.c:4821
-msgid "make sure the patch is applicable to the current index"
-msgstr "garantir que o patch pode ser aplicado ao índice atual"
+#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/tag.c:372
+msgid "format"
+msgstr "formato"
+
+#: builtin/am.c:2290
+msgid "format the patch(es) are in"
+msgstr "formato de apresentação de patches"
-#: builtin/apply.c:4823
-msgid "apply a patch without touching the working tree"
-msgstr "aplicar um patch sem tocar na árvore de trabalho"
+#: builtin/am.c:2296
+msgid "override error message when patch failure occurs"
+msgstr "substituir a mensagem de erro quando a aplicação do patch falha"
-#: builtin/apply.c:4825
-msgid "accept a patch that touches outside the working area"
-msgstr "aceitar patches que alteram ficheiros fora da área de trabalho"
+#: builtin/am.c:2298
+msgid "continue applying patches after resolving a conflict"
+msgstr "continuar a aplicar os patches depois de resolver os conflitos"
-#: builtin/apply.c:4827
-msgid "also apply the patch (use with --stat/--summary/--check)"
-msgstr "aplicar o patch também (use com --stat/--summary/--check)"
+#: builtin/am.c:2301
+msgid "synonyms for --continue"
+msgstr "sinónimo de --continue"
-#: builtin/apply.c:4829
-msgid "attempt three-way merge if a patch does not apply"
-msgstr "tentar integração com três pontos se um patch não se aplica com êxito"
+#: builtin/am.c:2304
+msgid "skip the current patch"
+msgstr "ignorar o patch atual"
-#: builtin/apply.c:4831
-msgid "build a temporary index based on embedded index information"
-msgstr ""
-"construir um índice temporário baseado na informação incorporada do índice"
+#: builtin/am.c:2307
+msgid "restore the original branch and abort the patching operation."
+msgstr "restaurar o ramo original e abortar a operação de patch."
-#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426
-msgid "paths are separated with NUL character"
-msgstr "os caminhos estão separados por caracteres NUL"
+#: builtin/am.c:2311
+msgid "lie about committer date"
+msgstr "mentir sobre a data de commit"
-#: builtin/apply.c:4836
-msgid "ensure at least <n> lines of context match"
-msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem"
+#: builtin/am.c:2313
+msgid "use current timestamp for author date"
+msgstr "usar a data e hora atual como data de autor"
-#: builtin/apply.c:4838
-msgid "detect new or modified lines that have whitespace errors"
-msgstr "detetar linhas novas ou modificadas que tenham espaços em branco"
+#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229
+#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355
+msgid "key-id"
+msgstr "id-chave"
-#: builtin/apply.c:4841 builtin/apply.c:4844
-msgid "ignore changes in whitespace when finding context"
-msgstr "ignorar alterações de espaço em branco ao procurar contexto"
+#: builtin/am.c:2316
+msgid "GPG-sign commits"
+msgstr "assinar os commits com GPG"
-#: builtin/apply.c:4847
-msgid "apply the patch in reverse"
-msgstr "aplicar o patch em reverso"
+#: builtin/am.c:2319
+msgid "(internal use for git-rebase)"
+msgstr "(uso interno de git-rebase)"
-#: builtin/apply.c:4849
-msgid "don't expect at least one line of context"
-msgstr "não esperar nenhuma linha de contexto"
+#: builtin/am.c:2334
+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 ""
+"A opção -b/--binary há muito que é ignorada e será\n"
+"futuramente removida. Por favor não a use."
-#: builtin/apply.c:4851
-msgid "leave the rejected hunks in corresponding *.rej files"
-msgstr "deixar os excertos rejeitados nos respetivos ficheiros *.rej"
+#: builtin/am.c:2341
+msgid "failed to read the index"
+msgstr "falha ao ler o índice"
-#: builtin/apply.c:4853
-msgid "allow overlapping hunks"
-msgstr "permitir a sobreposição de excertos"
+#: builtin/am.c:2356
+#, c-format
+msgid "previous rebase directory %s still exists but mbox given."
+msgstr ""
+"o diretório de rebesa anterior %s ainda existe, mas foi fornecida uma mbox."
-#: builtin/apply.c:4856
-msgid "tolerate incorrectly detected missing new-line at the end of file"
+#: builtin/am.c:2380
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
msgstr ""
-"tolerar deteções incorretas de falta de nova linha no final do ficheiro"
+"Diretório abandonado %s encontrado.\n"
+"Use \"git am --abort\" para o remover."
-#: builtin/apply.c:4859
-msgid "do not trust the line counts in the hunk headers"
-msgstr "não confiar na contagem de linhas no cabeçalho dos excertos"
+#: builtin/am.c:2386
+msgid "Resolve operation not in progress, we are not resuming."
+msgstr "A operação de resolução não está em curso, não retomando."
-#: builtin/apply.c:4862
-msgid "prepend <root> to all filenames"
-msgstr "preceder <root> a todos os nomes de ficheiro"
+#: builtin/apply.c:8
+msgid "git apply [<options>] [<patch>...]"
+msgstr "git apply [<opções>] [<patch>...]"
#: builtin/archive.c:17
#, c-format
msgid "Blaming lines"
msgstr "Linhas de culpa"
-#: builtin/blame.c:2536
+#: builtin/blame.c:2577
msgid "Show blame entries as we find them, incrementally"
msgstr ""
"Mostrar entradas de culpa à medida que forem encontradas, incrementalmente"
-#: builtin/blame.c:2537
+#: builtin/blame.c:2578
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "Mostar SHA-1 dos commits limite em branco (Predefinição: desativado)"
-#: builtin/blame.c:2538
+#: builtin/blame.c:2579
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Não tratar os commits raiz como limites (Predefinição: desativado)"
-#: builtin/blame.c:2539
+#: builtin/blame.c:2580
msgid "Show work cost statistics"
msgstr "Mostrar estatísticas de custo de atividade"
-#: builtin/blame.c:2540
+#: builtin/blame.c:2581
msgid "Force progress reporting"
msgstr "Forçar informação de progresso"
-#: builtin/blame.c:2541
+#: builtin/blame.c:2582
msgid "Show output score for blame entries"
msgstr "Mostrar a pontuação das entradas de culpa"
-#: builtin/blame.c:2542
+#: builtin/blame.c:2583
msgid "Show original filename (Default: auto)"
msgstr "Mostrar o nome do ficheiro original (Predefinição: auto)"
-#: builtin/blame.c:2543
+#: builtin/blame.c:2584
msgid "Show original linenumber (Default: off)"
msgstr "Mostrar números de linha originais (Predefinição: desativado)"
-#: builtin/blame.c:2544
+#: builtin/blame.c:2585
msgid "Show in a format designed for machine consumption"
msgstr "Mostrar em formato próprio para ser consumo por uma máquina"
-#: builtin/blame.c:2545
+#: builtin/blame.c:2586
msgid "Show porcelain format with per-line commit information"
msgstr "Mostrar em formato de porcelana com informações de commit por linha"
-#: builtin/blame.c:2546
+#: builtin/blame.c:2587
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "Usar o mesmo modo de saída que git-annotate (Predefinição: desativado)"
-#: builtin/blame.c:2547
+#: builtin/blame.c:2588
msgid "Show raw timestamp (Default: off)"
msgstr "Mostrar carimbo de data/hora em bruto (Predefinição: desativado)"
-#: builtin/blame.c:2548
+#: builtin/blame.c:2589
msgid "Show long commit SHA1 (Default: off)"
msgstr "Mostrar SHA1 longo de commit (Predefinição: desativado)"
-#: builtin/blame.c:2549
+#: builtin/blame.c:2590
msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
"Suprimir nome de autor e carimbo de data/hora (Predefinição: desativado)"
-#: builtin/blame.c:2550
+#: builtin/blame.c:2591
msgid "Show author email instead of name (Default: off)"
msgstr "Mostrar o email do autor em vez do nome (Predefinição: desativado)"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2592
msgid "Ignore whitespace differences"
msgstr "Ignorar as diferenças de espaço em branco"
-#: builtin/blame.c:2552
+#: builtin/blame.c:2599
+msgid "Use an experimental indent-based heuristic to improve diffs"
+msgstr ""
+"Usar um heurística experimental baseada em indentação para melhorar diffs"
+
+#: builtin/blame.c:2600
+msgid "Use an experimental blank-line-based heuristic to improve diffs"
+msgstr ""
+"Usar uma heurística experimental baseada em linhas brancas para melhorar "
+"diffs"
+
+#: builtin/blame.c:2602
msgid "Spend extra cycles to find better match"
msgstr "Despender ciclos extra para encontrar uma melhor correspondência"
-#: builtin/blame.c:2553
+#: builtin/blame.c:2603
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Usar revisões do <ficheiro> em vez de invocar git-rev-list"
-#: builtin/blame.c:2554
+#: builtin/blame.c:2604
msgid "Use <file>'s contents as the final image"
msgstr "Usar o conteúdo do <ficheiro> como imagem final"
-#: builtin/blame.c:2555 builtin/blame.c:2556
+#: builtin/blame.c:2605 builtin/blame.c:2606
msgid "score"
msgstr "pontuação"
-#: builtin/blame.c:2555
+#: builtin/blame.c:2605
msgid "Find line copies within and across files"
msgstr "Localizar linhas copiadas dentro e entre ficheiros"
-#: builtin/blame.c:2556
+#: builtin/blame.c:2606
msgid "Find line movements within and across files"
msgstr "Localizar linhas movidas dentro e entre ficheiros"
-#: builtin/blame.c:2557
+#: builtin/blame.c:2607
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2557
+#: builtin/blame.c:2607
msgid "Process only line range n,m, counting from 1"
msgstr "Processar apenas o intervalo de linhas n,m, a cantar de 1"
+#: builtin/blame.c:2654
+msgid "--progress can't be used with --incremental or porcelain formats"
+msgstr ""
+"--progress não pode ser usado com --incremental ou formatos de porcelana"
+
#. 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:2649
+#: builtin/blame.c:2700
msgid "4 years, 11 months ago"
msgstr "há 4 anos e 11 meses atrás"
+#: builtin/blame.c:2780
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents e --reverse não se misturam bem."
+
+#: builtin/blame.c:2800
+msgid "cannot use --contents with final commit object name"
+msgstr "não é possível usar --contents com nome de objeto commit final"
+
+#: builtin/blame.c:2805
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr ""
+"--reverse e --first-parent juntos requer que se especifique o último commit"
+
+#: builtin/blame.c:2832
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
+msgstr ""
+"--reverse --first-parent juntos requer intervalo ao longo do primeiro-pai"
+
+#: builtin/blame.c:2843
+#, c-format
+msgid "no such path %s in %s"
+msgstr "o caminho %s não existe em %s"
+
+#: builtin/blame.c:2854
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "não é possível ler o blob %s do caminho %s"
+
+#: builtin/blame.c:2873
+#, c-format
+msgid "file %s has only %lu line"
+msgid_plural "file %s has only %lu lines"
+msgstr[0] "o ficheiro %s só tem %lu linha"
+msgstr[1] "o ficheiro %s só tem %lu linhas"
+
#: builtin/branch.c:26
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<opções>] [-r | -a] [--merged | --no-merged]"
msgid "change the upstream info"
msgstr "alterar a informação do ramo a montante"
+#: builtin/branch.c:660
+msgid "Unset the upstream info"
+msgstr "Remover a informação do ramo a montante"
+
#: builtin/branch.c:661
msgid "use colored output"
msgstr "usar saída colorida"
msgid "field name to sort on"
msgstr "nome do campo pelo qual ordernar"
-#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402
-#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404
+#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570
#: builtin/tag.c:369
msgid "object"
msgstr "objeto"
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Falha ao resolver HEAD numa referência válida."
-#: builtin/branch.c:709 builtin/clone.c:707
+#: builtin/branch.c:709 builtin/clone.c:706
msgid "HEAD not found below refs/heads!"
msgstr "HEAD não encontrada em refs/heads!"
msgid "Need a repository to unbundle."
msgstr "É preciso um repositório para desempacotar."
-#: builtin/cat-file.c:443
+#: builtin/cat-file.c:513
msgid ""
-"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
-"<type>|--textconv) <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|"
-"<tipo>|--textconv) <objeto>"
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <tipo> | --textconv | --filters) [--path=<caminho>] <objeto>"
-#: builtin/cat-file.c:444
-msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
-msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
+#: builtin/cat-file.c:514
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
+msgstr ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
-#: builtin/cat-file.c:481
+#: builtin/cat-file.c:551
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<tipo> pode ser um de: blob, tree, commit, tag"
-#: builtin/cat-file.c:482
+#: builtin/cat-file.c:552
msgid "show object type"
msgstr "mostrar tipo do objeto"
-#: builtin/cat-file.c:483
+#: builtin/cat-file.c:553
msgid "show object size"
msgstr "mostrar tamanho do objeto"
-#: builtin/cat-file.c:485
+#: builtin/cat-file.c:555
msgid "exit with zero when there's no error"
msgstr "sair com retorno zero quando não houver erros"
-#: builtin/cat-file.c:486
+#: builtin/cat-file.c:556
msgid "pretty-print object's content"
msgstr "mostrar conteúdo do objeto com impressão bonita"
-#: builtin/cat-file.c:488
+#: builtin/cat-file.c:558
msgid "for blob objects, run textconv on object's content"
msgstr "executar textconv no conteúdo de objetos blob"
-#: builtin/cat-file.c:490
+#: builtin/cat-file.c:560
+msgid "for blob objects, run filters on object's content"
+msgstr "para objetos blob, correr filtros sobre o conteúdo do objeto"
+
+#: builtin/cat-file.c:561 git-submodule.sh:923
+msgid "blob"
+msgstr "blob"
+
+#: builtin/cat-file.c:562
+msgid "use a specific path for --textconv/--filters"
+msgstr "usar um caminho específico para --textconv/--filters"
+
+#: builtin/cat-file.c:564
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "permitir que -s e -t funcionem com objetos danificados/corrompidos"
-#: builtin/cat-file.c:491
+#: builtin/cat-file.c:565
msgid "buffer --batch output"
msgstr "carregar a saída de --batch"
-#: builtin/cat-file.c:493
+#: builtin/cat-file.c:567
msgid "show info and content of objects fed from the standard input"
msgstr "mostrar informação e conteúdo dos objetos fornecidos na entrada padrão"
-#: builtin/cat-file.c:496
+#: builtin/cat-file.c:570
msgid "show info about objects fed from the standard input"
msgstr "mostrar informação sobre os objetos fornecidos na entrada padrão"
-#: builtin/cat-file.c:499
+#: builtin/cat-file.c:573
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"seguir ligações simbólica no interior da árvore (usado com --batch ou --"
"batch-check)"
-#: builtin/cat-file.c:501
+#: builtin/cat-file.c:575
msgid "show all objects with --batch or --batch-check"
msgstr "mostrar todos os objetos com --batch ou --batch-check"
msgid "use .gitattributes only from the index"
msgstr "usar .gitattributes apenas a partir do índice"
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97
+#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
msgid "read file names from stdin"
msgstr "ler os nomes dos ficheiros da entrada padrão"
msgid "terminate input and output records by a NUL character"
msgstr "terminar registos da entrada e da saída com um carácter NUL"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "suprimir informação de progresso"
msgstr "escrever o conteúdo em ficheiros temporários"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491
-#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497
-#: builtin/submodule--helper.c:830 builtin/worktree.c:469
+#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598
+#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951
+#: builtin/worktree.c:469
msgid "string"
msgstr "cadeia"
msgid "path '%s' is unmerged"
msgstr "o caminho '%s' não foi integrado"
-#: builtin/checkout.c:495
+#: builtin/checkout.c:494
msgid "you need to resolve your current index first"
msgstr "primeiro deve resolver o índice atual"
-#: builtin/checkout.c:625
+#: builtin/checkout.c:624
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Não é possível efetuar reflog de '%s': %s\n"
-#: builtin/checkout.c:664
+#: builtin/checkout.c:663
msgid "HEAD is now at"
msgstr "HEAD está agora em"
-#: builtin/checkout.c:668 builtin/clone.c:661
+#: builtin/checkout.c:667 builtin/clone.c:660
msgid "unable to update HEAD"
msgstr "não foi possível atualizar HEAD"
-#: builtin/checkout.c:672
+#: builtin/checkout.c:671
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Repor ramo '%s'\n"
-#: builtin/checkout.c:675
+#: builtin/checkout.c:674
#, c-format
msgid "Already on '%s'\n"
msgstr "Já em '%s'\n"
-#: builtin/checkout.c:679
+#: builtin/checkout.c:678
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Mudou para e repôs o ramo '%s'\n"
-#: builtin/checkout.c:681 builtin/checkout.c:1070
+#: builtin/checkout.c:680 builtin/checkout.c:1069
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Mudou para o novo ramo '%s'\n"
-#: builtin/checkout.c:683
+#: builtin/checkout.c:682
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Mudou para o ramo '%s'\n"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:733
#, c-format
msgid " ... and %d more.\n"
msgstr " ... e mais %d.\n"
-#: builtin/checkout.c:740
+#: builtin/checkout.c:739
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:759
+#: builtin/checkout.c:758
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
" git branch <nome-do-novo-ramo> %s\n"
"\n"
-#: builtin/checkout.c:795
+#: builtin/checkout.c:794
msgid "internal error in revision walk"
msgstr "erro interno durante o curso de revisões"
-#: builtin/checkout.c:799
+#: builtin/checkout.c:798
msgid "Previous HEAD position was"
msgstr "A posição anterior de HEAD era"
-#: builtin/checkout.c:826 builtin/checkout.c:1065
+#: builtin/checkout.c:825 builtin/checkout.c:1064
msgid "You are on a branch yet to be born"
msgstr "Está num ramo ainda não criado"
-#: builtin/checkout.c:971
+#: builtin/checkout.c:970
#, c-format
msgid "only one reference expected, %d given."
msgstr "esperava-se apenas uma referência, %d fornecidas."
-#: builtin/checkout.c:1011 builtin/worktree.c:214
+#: builtin/checkout.c:1010 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr "referência inválida: %s"
-#: builtin/checkout.c:1040
+#: builtin/checkout.c:1039
#, c-format
msgid "reference is not a tree: %s"
msgstr "a referência não é uma árvore: %s"
-#: builtin/checkout.c:1079
+#: builtin/checkout.c:1078
msgid "paths cannot be used with switching branches"
msgstr "não podem ser usados caminhos ao mudar de ramo"
-#: builtin/checkout.c:1082 builtin/checkout.c:1086
+#: builtin/checkout.c:1081 builtin/checkout.c:1085
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' não pode ser usado ao mudar de ramo"
-#: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097
+#: builtin/checkout.c:1100
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' não pode ser usado com '%s'"
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1105
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Não é possível mudar de ramo para '%s', visto que não é um commit"
-#: builtin/checkout.c:1139 builtin/checkout.c:1141 builtin/clone.c:88
+#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93
#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
#: builtin/worktree.c:326
msgid "branch"
msgstr "ramo"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1139
msgid "create and checkout a new branch"
msgstr "criar e extrair um novo ramo"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1141
msgid "create/reset and checkout a branch"
msgstr "criar/repor e extrair um ramo"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1142
msgid "create reflog for new branch"
msgstr "criar reflog do novo ramo"
-#: builtin/checkout.c:1144 builtin/worktree.c:328
+#: builtin/checkout.c:1143 builtin/worktree.c:328
msgid "detach HEAD at named commit"
msgstr "destacar HEAD no commit indicado"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
msgid "set upstream info for new branch"
msgstr "definir a informação do ramo a montante do novo ramo"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1146
msgid "new-branch"
msgstr "novo-ramo"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1146
msgid "new unparented branch"
msgstr "novo ramo sem pai"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1147
msgid "checkout our version for unmerged files"
msgstr "extrair a nossa versão dos ficheiros não integrados"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1149
msgid "checkout their version for unmerged files"
msgstr "extrair a versão deles dos ficheiros não integrados"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1151
msgid "force checkout (throw away local modifications)"
msgstr "forçar extração (descartar modificações locais)"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1152
msgid "perform a 3-way merge with the new branch"
msgstr "realizar uma integração com 3 pontos com o novo ramo"
-#: builtin/checkout.c:1154 builtin/merge.c:231
+#: builtin/checkout.c:1153 builtin/merge.c:231
msgid "update ignored files (default)"
msgstr "atualizar ficheiros ignorados (predefinição)"
-#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250
+#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251
msgid "style"
msgstr "estilo"
-#: builtin/checkout.c:1156
+#: builtin/checkout.c:1155
msgid "conflict style (merge or diff3)"
msgstr "estilo de conflito (merge ou diff3)"
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1158
msgid "do not limit pathspecs to sparse entries only"
msgstr "não restringir especificadores de caminho a entradas esparsas"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1160
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'"
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1162
msgid "do not check if another worktree is holding the given ref"
msgstr ""
"não verificar se outra árvore de trabalho contém a referência fornecida"
-#: builtin/checkout.c:1164 builtin/clone.c:60 builtin/fetch.c:117
-#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536
+#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119
+#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "forçar informação de progresso"
-#: builtin/checkout.c:1195
+#: builtin/checkout.c:1194
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B e --orphan são mutuamente exclusivos"
-#: builtin/checkout.c:1212
+#: builtin/checkout.c:1211
msgid "--track needs a branch name"
msgstr "--track requer um nome dum ramo"
-#: builtin/checkout.c:1217
+#: builtin/checkout.c:1216
msgid "Missing branch name; try -b"
msgstr "Falta um nome dum ramo; tente -b"
-#: builtin/checkout.c:1253
+#: builtin/checkout.c:1252
msgid "invalid path specification"
msgstr "especificação de caminho inválida"
-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1259
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
"tempo.\n"
"Pretendia extrair '%s' o qual não pode ser resolvido como commit?"
-#: builtin/checkout.c:1265
+#: builtin/checkout.c:1264
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach não aceita um caminho como argumento '%s'"
-#: builtin/checkout.c:1269
+#: builtin/checkout.c:1268
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgid "remove whole directories"
msgstr "remover diretórios inteiros"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
-#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725
+#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182
msgid "pattern"
msgstr "padrão"
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<opções>] [--] <repo> [<dir>]"
-#: builtin/clone.c:62
+#: builtin/clone.c:65
msgid "don't create a checkout"
msgstr "não criar uma extração"
-#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476
+#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
msgid "create a bare repository"
msgstr "criar um repositório nu"
-#: builtin/clone.c:67
+#: builtin/clone.c:70
msgid "create a mirror repository (implies bare)"
msgstr "criar um repositório espelhado (implica repositório nu)"
-#: builtin/clone.c:69
+#: builtin/clone.c:72
msgid "to clone from a local repository"
msgstr "para clonar de um repositório local"
-#: builtin/clone.c:71
+#: builtin/clone.c:74
msgid "don't use local hardlinks, always copy"
msgstr "não usar ligações fixas, copiar sempre"
-#: builtin/clone.c:73
+#: builtin/clone.c:76
msgid "setup as shared repository"
msgstr "configurar como repositório partilhado"
-#: builtin/clone.c:75 builtin/clone.c:77
+#: builtin/clone.c:78 builtin/clone.c:80
msgid "initialize submodules in the clone"
msgstr "inicializar submódulos no clone"
-#: builtin/clone.c:79
+#: builtin/clone.c:82
msgid "number of submodules cloned in parallel"
msgstr "número de submódulos clonados em paralelo"
-#: builtin/clone.c:80 builtin/init-db.c:473
+#: builtin/clone.c:83 builtin/init-db.c:475
msgid "template-directory"
msgstr "diretório-modelo"
-#: builtin/clone.c:81 builtin/init-db.c:474
+#: builtin/clone.c:84 builtin/init-db.c:476
msgid "directory from which templates will be used"
msgstr "diretório que contém os modelos usados"
-#: builtin/clone.c:83 builtin/submodule--helper.c:495
-#: builtin/submodule--helper.c:833
+#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602
+#: builtin/submodule--helper.c:954
msgid "reference repository"
msgstr "repositório de referência"
-#: builtin/clone.c:85
+#: builtin/clone.c:90
msgid "use --reference only while cloning"
msgstr "usar --reference apenas para clonar"
-#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr "nome"
-#: builtin/clone.c:87
+#: builtin/clone.c:92
msgid "use <name> instead of 'origin' to track upstream"
msgstr "usar <nome> em vez de 'origin' para seguir o ramo a montante"
-#: builtin/clone.c:89
+#: builtin/clone.c:94
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "extrair <ramo> em vez da HEAD do remoto"
-#: builtin/clone.c:91
+#: builtin/clone.c:96
msgid "path to git-upload-pack on the remote"
msgstr "caminho para git-upload-pack no remoto"
-#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667 builtin/pull.c:201
+#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668
+#: builtin/pull.c:202
msgid "depth"
msgstr "profundidade"
-#: builtin/clone.c:93
+#: builtin/clone.c:98
msgid "create a shallow clone of that depth"
msgstr "criar um clone raso com essa profundidade"
-#: builtin/clone.c:95
+#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848
+#: parse-options.h:142
+msgid "time"
+msgstr "hora"
+
+#: builtin/clone.c:100
+msgid "create a shallow clone since a specific time"
+msgstr "criar um clone raso desde uma data específica"
+
+#: builtin/clone.c:101 builtin/fetch.c:124
+msgid "revision"
+msgstr "revisão"
+
+#: builtin/clone.c:102 builtin/fetch.c:125
+msgid "deepen history of shallow clone by excluding rev"
+msgstr "aprofundar o histórico de um clone raso ao excluir uma revisão"
+
+#: builtin/clone.c:104
msgid "clone only one branch, HEAD or --branch"
msgstr "clonar apenas um ramo, HEAD ou --branch"
-#: builtin/clone.c:97
+#: builtin/clone.c:106
msgid "any cloned submodules will be shallow"
msgstr "qualquer submódulo clonado será raso"
-#: builtin/clone.c:98 builtin/init-db.c:482
+#: builtin/clone.c:107 builtin/init-db.c:484
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:99 builtin/init-db.c:483
+#: builtin/clone.c:108 builtin/init-db.c:485
msgid "separate git dir from working tree"
msgstr "separar o repositório git da árvore de trabalho"
-#: builtin/clone.c:100
+#: builtin/clone.c:109
msgid "key=value"
msgstr "chave=valor"
-#: builtin/clone.c:101
+#: builtin/clone.c:110
msgid "set config inside the new repository"
msgstr "definir configuração dentro do novo repositório"
-#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547
+#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547
msgid "use IPv4 addresses only"
msgstr "usar apenas endereços IPv4"
-#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549
+#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549
msgid "use IPv6 addresses only"
msgstr "usar apenas endereços IPv6"
-#: builtin/clone.c:241
+#: builtin/clone.c:250
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"Não foi possível adivinhar o nome do diretório.\n"
"Especifique um diretório na linha de comandos"
-#: builtin/clone.c:307
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr ""
-"ainda não é suportada a funcionalidade que permite ter o repositório de "
-"referência '%s' como uma extração ligada."
-
-#: builtin/clone.c:309
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "o repositório de referência '%s' não é um repositório local."
-
-#: builtin/clone.c:314
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "o repositório de referência '%s' é raso"
-
-#: builtin/clone.c:317
+#: builtin/clone.c:303
#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "o repositório de referência '%s' está enxertado"
+msgid "info: Could not add alternate for '%s': %s\n"
+msgstr "info: Não foi possível adicionar sobressalente de '%s': %s\n"
-#: builtin/clone.c:376
+#: builtin/clone.c:375
#, c-format
msgid "failed to open '%s'"
msgstr "falha ao abrir '%s'"
-#: builtin/clone.c:384
+#: builtin/clone.c:383
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existe e não é um diretório"
-#: builtin/clone.c:398
+#: builtin/clone.c:397
#, c-format
msgid "failed to stat %s\n"
msgstr "falha ao invocar stat de %s\n"
-#: builtin/clone.c:420
+#: builtin/clone.c:419
#, c-format
msgid "failed to create link '%s'"
msgstr "falha ao criar a ligação '%s'"
-#: builtin/clone.c:424
+#: builtin/clone.c:423
#, c-format
msgid "failed to copy file to '%s'"
msgstr "falha ao copiar o ficheiro para '%s'"
-#: builtin/clone.c:449
+#: builtin/clone.c:448
#, c-format
msgid "done.\n"
msgstr "concluído.\n"
-#: builtin/clone.c:461
+#: builtin/clone.c:460
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"Pode inspecionar o que foi extraído com 'git status'\n"
"e repetir a extração com 'git checkout -f HEAD'\n"
-#: builtin/clone.c:538
+#: builtin/clone.c:537
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Ramo remoto %s não encontrado para clonar."
-#: builtin/clone.c:633
+#: builtin/clone.c:632
msgid "remote did not send all necessary objects"
msgstr "o remoto não enviou todos os objetos necessários"
-#: builtin/clone.c:649
+#: builtin/clone.c:648
#, c-format
msgid "unable to update %s"
msgstr "não foi possível atualizar %s"
-#: builtin/clone.c:698
+#: builtin/clone.c:697
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"a HEAD remota referencia uma referência inexistente, não é possível "
"extrair.\n"
-#: builtin/clone.c:729
+#: builtin/clone.c:728
msgid "unable to checkout working tree"
msgstr "não foi possível extrair a árvore de trabalho"
-#: builtin/clone.c:766
+#: builtin/clone.c:768
msgid "unable to write parameters to config file"
msgstr "não foi possível escrever os parâmetros no ficheiro de configuração"
-#: builtin/clone.c:829
+#: builtin/clone.c:831
msgid "cannot repack to clean up"
msgstr "não é possível reempacotar para limpar"
-#: builtin/clone.c:831
+#: builtin/clone.c:833
msgid "cannot unlink temporary alternates file"
msgstr ""
"não é possível invocar unlink sobre o ficheiro sobressalente temporário"
-#: builtin/clone.c:863 builtin/receive-pack.c:1855
+#: builtin/clone.c:866 builtin/receive-pack.c:1895
msgid "Too many arguments."
msgstr "Demasiados argumentos."
-#: builtin/clone.c:867
+#: builtin/clone.c:870
msgid "You must specify a repository to clone."
msgstr "Deve especificar um repositório para clonar."
-#: builtin/clone.c:878
+#: builtin/clone.c:883
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "as opções --bare e --origin %s são incompatíveis."
-#: builtin/clone.c:881
+#: builtin/clone.c:886
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare e --separate-git-dir são incompatíveis."
-#: builtin/clone.c:894
+#: builtin/clone.c:899
#, c-format
msgid "repository '%s' does not exist"
msgstr "o repositório '%s' não existe"
-#: builtin/clone.c:900 builtin/fetch.c:1293
+#: builtin/clone.c:905 builtin/fetch.c:1338
#, c-format
msgid "depth %s is not a positive number"
msgstr "profundidade %s não é um número positivo"
-#: builtin/clone.c:910
+#: builtin/clone.c:915
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "o caminho de destino '%s' já existe e não é um diretório vazio."
-#: builtin/clone.c:920
+#: builtin/clone.c:925
#, c-format
msgid "working tree '%s' already exists."
msgstr "a árvore de trabalho '%s' já existe."
-#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544
+#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657
#: builtin/worktree.c:222 builtin/worktree.c:249
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "não foi possível criar os diretórios superiores de '%s'"
-#: builtin/clone.c:938
+#: builtin/clone.c:943
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "não foi possível criar o diretório de árvore de trabalho '%s'"
-#: builtin/clone.c:956
+#: builtin/clone.c:955
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "A clonar no repositório nu '%s'...\n"
-#: builtin/clone.c:958
+#: builtin/clone.c:957
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "A clonar em '%s'...\n"
-#: builtin/clone.c:997
+#: builtin/clone.c:963
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
+msgstr ""
+"clone --recursive não é compatível com ambos --reference e --reference-if-"
+"able"
+
+#: builtin/clone.c:1019
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth é ignorado em clones locais; use file:// ."
-#: builtin/clone.c:1000
+#: builtin/clone.c:1021
+msgid "--shallow-since is ignored in local clones; use file:// instead."
+msgstr "--shallow-since é ignorado em clones locais; use file:// ."
+
+#: builtin/clone.c:1023
+msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+msgstr "--shallow-exclude é ignorado em clones locais; use file:// ."
+
+#: builtin/clone.c:1026
msgid "source repository is shallow, ignoring --local"
msgstr "o repositório de origem é raso, --local ignorado"
-#: builtin/clone.c:1005
+#: builtin/clone.c:1031
msgid "--local is ignored"
msgstr "--local ignorado"
-#: builtin/clone.c:1009
+#: builtin/clone.c:1035
#, c-format
msgid "Don't know how to clone %s"
msgstr "Não sei como clonar %s"
-#: builtin/clone.c:1058 builtin/clone.c:1066
+#: builtin/clone.c:1090 builtin/clone.c:1098
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "O ramo remoto %s não foi encontrado no repositório a montante %s"
-#: builtin/clone.c:1069
+#: builtin/clone.c:1101
msgid "You appear to have cloned an empty repository."
msgstr "Parece foi clonado um repositório vazio."
"Depois \"git cherry-pick --continue\" irá retomar o cherry-pick\n"
"dos restantes commits.\n"
-#: builtin/commit.c:308
+#: builtin/commit.c:318
msgid "failed to unpack HEAD tree object"
msgstr "falha ao descompactar o objeto árvore HEAD"
-#: builtin/commit.c:349
+#: builtin/commit.c:359
msgid "unable to create temporary index"
msgstr "não foi possível criar índice temporário"
-#: builtin/commit.c:355
+#: builtin/commit.c:365
msgid "interactive add failed"
msgstr "falha ao adicionar interativamente"
-#: builtin/commit.c:368
+#: builtin/commit.c:378
msgid "unable to update temporary index"
msgstr "não é possível atualizar o índice temporário"
-#: builtin/commit.c:370
+#: builtin/commit.c:380
msgid "Failed to update main cache tree"
msgstr "Falha ao atualizar a árvore de cache principal"
-#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466
+#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
msgid "unable to write new_index file"
msgstr "não é possível escrever o ficheiro new_index"
-#: builtin/commit.c:448
+#: builtin/commit.c:458
msgid "cannot do a partial commit during a merge."
msgstr "não é possível fazer um commit parcial durante uma integração."
-#: builtin/commit.c:450
+#: builtin/commit.c:460
msgid "cannot do a partial commit during a cherry-pick."
msgstr "não é possível fazer um commit parcial durante um cherry-pick."
-#: builtin/commit.c:459
+#: builtin/commit.c:469
msgid "cannot read the index"
msgstr "não é possível ler o índice"
-#: builtin/commit.c:478
+#: builtin/commit.c:488
msgid "unable to write temporary index file"
msgstr "não é possível escrever ficheiro de índice temporário"
-#: builtin/commit.c:583
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "o commit '%s' não tem cabeçalho de autor"
-#: builtin/commit.c:585
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "o commit '%s' tem a linha de autor malformada"
-#: builtin/commit.c:604
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "parâmetro --author malformado"
-#: builtin/commit.c:612
+#: builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "formato de data inválido: %s"
-#: builtin/commit.c:656
+#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
"não foi possível selecionar um carácter de comentário que\n"
"não estivesse já a ser usado na mensagem de commit atual"
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
#, c-format
msgid "could not lookup commit %s"
msgstr "não foi possível consultar o commit %s"
-#: builtin/commit.c:705 builtin/shortlog.c:286
+#: builtin/commit.c:704 builtin/shortlog.c:286
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(a ler mensagem de log da entrada padrão)\n"
-#: builtin/commit.c:707
+#: builtin/commit.c:706
msgid "could not read log from standard input"
msgstr "não foi possível ler o log da entrada padrão"
-#: builtin/commit.c:711
+#: builtin/commit.c:710
#, c-format
msgid "could not read log file '%s'"
msgstr "não é possível ler o ficheiro de log '%s'"
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:737 builtin/commit.c:745
msgid "could not read SQUASH_MSG"
msgstr "não foi possível ler SQUASH_MSG"
-#: builtin/commit.c:743
+#: builtin/commit.c:742
msgid "could not read MERGE_MSG"
msgstr "não foi possível ler MERGE_MSG"
-#: builtin/commit.c:797
+#: builtin/commit.c:796
msgid "could not write commit template"
msgstr "não foi possível escrever o modelo de commit"
-#: builtin/commit.c:815
+#: builtin/commit.c:814
#, c-format
msgid ""
"\n"
"\t%s\n"
"e tente de novo.\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
"\t%s\n"
"e tente outra vez.\n"
-#: builtin/commit.c:833
+#: builtin/commit.c:832
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"Linhas começadas com '%c' serão ignoradas, e uma mensagem vazia\n"
"aborta o commit.\n"
-#: builtin/commit.c:840
+#: builtin/commit.c:839
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"Linhas começadas com '%c' serão mantidas; pode removê-las se o desejar.\n"
"Uma mensagem vazia aborta o commit.\n"
-#: builtin/commit.c:860
+#: builtin/commit.c:859
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:868
+#: builtin/commit.c:867
#, c-format
msgid "%sDate: %s"
msgstr "%sData: %s"
-#: builtin/commit.c:875
+#: builtin/commit.c:874
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sCommitter: %.*s <%.*s>"
-#: builtin/commit.c:893
+#: builtin/commit.c:892
msgid "Cannot read index"
msgstr "Não é possível ler o índice"
-#: builtin/commit.c:950
+#: builtin/commit.c:954
msgid "Error building trees"
msgstr "Erro ao construir árvores"
-#: builtin/commit.c:965 builtin/tag.c:266
+#: builtin/commit.c:969 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Indique a mensagem usando as opções -m ou -F.\n"
-#: builtin/commit.c:1067
+#: builtin/commit.c:1071
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' não é do tipo 'Nome <email>' e não corresponde a um autor "
"existente"
-#: builtin/commit.c:1082 builtin/commit.c:1322
+#: builtin/commit.c:1086 builtin/commit.c:1327
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Modo inválido de ficheiros não controlados '%s'"
-#: builtin/commit.c:1119
+#: builtin/commit.c:1124
msgid "--long and -z are incompatible"
msgstr "--long e -z são incompatíveis"
-#: builtin/commit.c:1149
+#: builtin/commit.c:1154
msgid "Using both --reset-author and --author does not make sense"
msgstr "Não faz sentido usar --reset-author e --author ao mesmo tempo"
-#: builtin/commit.c:1158
+#: builtin/commit.c:1163
msgid "You have nothing to amend."
msgstr "Não há nada para emendar."
-#: builtin/commit.c:1161
+#: builtin/commit.c:1166
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Integração em curso -- não é possível emendar."
-#: builtin/commit.c:1163
+#: builtin/commit.c:1168
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Cherry-pick em curso -- não é possível emendar."
-#: builtin/commit.c:1166
+#: builtin/commit.c:1171
msgid "Options --squash and --fixup cannot be used together"
msgstr "As opções --squash e --fixup não podem ser usadas juntas"
-#: builtin/commit.c:1176
+#: builtin/commit.c:1181
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Apenas um entre -c/-C/-F/--fixup pode ser usado."
-#: builtin/commit.c:1178
+#: builtin/commit.c:1183
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "A opção -m não pode ser combinada com -c/C/-F/--fixup."
-#: builtin/commit.c:1186
+#: builtin/commit.c:1191
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author só pode ser usado com -C, -c ou --amend."
-#: builtin/commit.c:1203
+#: builtin/commit.c:1208
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Apenas um entre --include/--only/--all/--interactive/--patch pode ser usado."
-#: builtin/commit.c:1205
+#: builtin/commit.c:1210
msgid "No paths with --include/--only does not make sense."
msgstr "As opções --include/--only não fazem sentido sem indicar caminhos."
-#: builtin/commit.c:1207
+#: builtin/commit.c:1212
msgid "Clever... amending the last one with dirty index."
msgstr "Inteligente... a emendar o último commit com o índice sujo."
-#: builtin/commit.c:1209
+#: builtin/commit.c:1214
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "Caminhos explícitos especificados sem -i ou -o; assumindo --only..."
-#: builtin/commit.c:1221 builtin/tag.c:474
+#: builtin/commit.c:1226 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Modo de limpeza inválido %s"
-#: builtin/commit.c:1226
+#: builtin/commit.c:1231
msgid "Paths with -a does not make sense."
msgstr "Indicar caminhos com -a não faz sentido."
-#: builtin/commit.c:1336 builtin/commit.c:1622
+#: builtin/commit.c:1341 builtin/commit.c:1617
msgid "show status concisely"
msgstr "mostrar status de forma concisa"
-#: builtin/commit.c:1338 builtin/commit.c:1624
+#: builtin/commit.c:1343 builtin/commit.c:1619
msgid "show branch information"
msgstr "mostrar informação do ramo"
-#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522
+#: builtin/commit.c:1345
+msgid "version"
+msgstr "versão"
+
+#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522
#: builtin/worktree.c:440
msgid "machine-readable output"
msgstr "saída inteligível por máquina"
-#: builtin/commit.c:1343 builtin/commit.c:1628
+#: builtin/commit.c:1348 builtin/commit.c:1623
msgid "show status in long format (default)"
msgstr "apresentar status em formato longo (predefinição)"
-#: builtin/commit.c:1346 builtin/commit.c:1631
+#: builtin/commit.c:1351 builtin/commit.c:1626
msgid "terminate entries with NUL"
msgstr "terminar entradas com NUL"
-#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981
+#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "modo"
-#: builtin/commit.c:1349 builtin/commit.c:1634
+#: builtin/commit.c:1354 builtin/commit.c:1629
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"mostrar ficheiros não controlados, modo é opcional: all, normal, no. "
"(Predefinição: all)"
-#: builtin/commit.c:1352
+#: builtin/commit.c:1357
msgid "show ignored files"
msgstr "mostrar ficheiros ignorados"
-#: builtin/commit.c:1353 parse-options.h:155
+#: builtin/commit.c:1358 parse-options.h:155
msgid "when"
msgstr "quando"
-#: builtin/commit.c:1354
+#: builtin/commit.c:1359
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
"ignorar alterações em submódulos, quando é opcional: all, dirty, untracked. "
"(Predefinição: all)"
-#: builtin/commit.c:1356
+#: builtin/commit.c:1361
msgid "list untracked files in columns"
msgstr "listar ficheiros não controlados em colunas"
-#: builtin/commit.c:1442
+#: builtin/commit.c:1437
msgid "couldn't look up newly created commit"
msgstr "não foi possível consultar o commit recém-criado"
-#: builtin/commit.c:1444
+#: builtin/commit.c:1439
msgid "could not parse newly created commit"
msgstr "não foi possível analisar o commit recém-criado"
-#: builtin/commit.c:1489
+#: builtin/commit.c:1484
msgid "detached HEAD"
msgstr "HEAD destacada"
-#: builtin/commit.c:1492
+#: builtin/commit.c:1487
msgid " (root-commit)"
msgstr " (commit-raiz)"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1587
msgid "suppress summary after successful commit"
msgstr "suprimir o resumo depois de submeter com sucesso"
-#: builtin/commit.c:1593
+#: builtin/commit.c:1588
msgid "show diff in commit message template"
msgstr "mostrar diff no modelo da mensagem de commit"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1590
msgid "Commit message options"
msgstr "Opções de mensagem de commit"
-#: builtin/commit.c:1596 builtin/tag.c:351
+#: builtin/commit.c:1591 builtin/tag.c:351
msgid "read message from file"
msgstr "ler mensagem de um ficheiro"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1592
msgid "author"
msgstr "autor"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1592
msgid "override author for commit"
msgstr "substituir autor do commit"
-#: builtin/commit.c:1598 builtin/gc.c:326
+#: builtin/commit.c:1593 builtin/gc.c:326
msgid "date"
msgstr "data"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1593
msgid "override date for commit"
msgstr "substituir data do commit"
-#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396
-#: builtin/notes.c:559 builtin/tag.c:349
+#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398
+#: builtin/notes.c:561 builtin/tag.c:349
msgid "message"
msgstr "mensagem"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1594
msgid "commit message"
msgstr "mensagem de commit"
-#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602
-#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
+#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79
msgid "commit"
msgstr "commit"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1595
msgid "reuse and edit message from specified commit"
msgstr "reutilizar e editar a mensagem de um commit especificado"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1596
msgid "reuse message from specified commit"
msgstr "reutilizar a mensagem de um commit especificado"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1597
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"usar mensagem com formato autosquash para corrigir o commit especificado"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1598
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"usar mensagem com formato autosquash para esmagar o commit especificado"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1599
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "agora sou eu o autor do commit (usado com C/-c/--amend)"
-#: builtin/commit.c:1605 builtin/log.c:1409 builtin/revert.c:86
+#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "adicionar Signed-off-by:"
-#: builtin/commit.c:1606
+#: builtin/commit.c:1601
msgid "use specified template file"
msgstr "usar ficheiro de modelo especificado"
-#: builtin/commit.c:1607
+#: builtin/commit.c:1602
msgid "force edit of commit"
msgstr "forçar edição do commit"
-#: builtin/commit.c:1608
+#: builtin/commit.c:1603
msgid "default"
msgstr "predefinição"
-#: builtin/commit.c:1608 builtin/tag.c:354
+#: builtin/commit.c:1603 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "como retirar espaços e #comentários da mensagem"
-#: builtin/commit.c:1609
+#: builtin/commit.c:1604
msgid "include status in commit message template"
msgstr "incluir status no modelo da mensagem de commit"
-#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165
+#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "assinar o commit com GPG"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1609
msgid "Commit contents options"
msgstr "Opções de conteúdo do commit"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1610
msgid "commit all changed files"
msgstr "submeter todos os ficheiros alterados"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1611
msgid "add specified files to index for commit"
msgstr "adicionar ficheiros especificados ao índice para submeter"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1612
msgid "interactively add files"
msgstr "adicionar ficheiros interativamente"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1613
msgid "interactively add changes"
msgstr "adicionar alterações interativamente"
-#: builtin/commit.c:1619
+#: builtin/commit.c:1614
msgid "commit only specified files"
msgstr "submeter somente os ficheiros especificados"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1615
msgid "bypass pre-commit and commit-msg hooks"
msgstr "ignorar pre-commit e commit-msg hooks"
-#: builtin/commit.c:1621
+#: builtin/commit.c:1616
msgid "show what would be committed"
msgstr "mostrar o que seria submetido"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1627
msgid "amend previous commit"
msgstr "emendar o commit anterior"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1628
msgid "bypass post-rewrite hook"
msgstr "ignorar post-rewrite hook"
-#: builtin/commit.c:1638
+#: builtin/commit.c:1633
msgid "ok to record an empty change"
msgstr "aceitar o registo duma alteração vazia"
-#: builtin/commit.c:1640
+#: builtin/commit.c:1635
msgid "ok to record a change with an empty message"
msgstr "aceitar o registo duma alteração com uma mensagem vazia"
-#: builtin/commit.c:1669
+#: builtin/commit.c:1664
msgid "could not parse HEAD commit"
msgstr "não foi possível analisar o commit HEAD"
-#: builtin/commit.c:1719
+#: builtin/commit.c:1712
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Ficheiro MERGE_HEAD corrompido (%s)"
-#: builtin/commit.c:1726
+#: builtin/commit.c:1719
msgid "could not read MERGE_MODE"
msgstr "não foi possível ler MERGE_MODE"
-#: builtin/commit.c:1745
+#: builtin/commit.c:1738
#, c-format
msgid "could not read commit message: %s"
msgstr "não foi possível ler a mensagem de commit: %s"
-#: builtin/commit.c:1756
+#: builtin/commit.c:1749
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "A abortar o commit; não editou a mensagem.\n"
-#: builtin/commit.c:1761
+#: builtin/commit.c:1754
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "A abortar o commit uma vez que a mensagem de commit está vazia.\n"
-#: builtin/commit.c:1809
+#: builtin/commit.c:1802
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
msgid "cannot create configuration file %s"
msgstr "não é possível criar o ficheiro de configuração %s"
-#: builtin/count-objects.c:77
+#: builtin/config.c:625
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+" Use a regexp, --add or --replace-all to change %s."
+msgstr ""
+"não é possível substituir múltiplos valores por um único valor\n"
+"\tUse uma regexp, --add ou --replace-all para alterar %s."
+
+#: builtin/count-objects.c:86
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:96
msgid "print sizes in human readable format"
msgstr "imprimir dimensões em formato inteligível por humanos"
msgid "only consider tags matching <pattern>"
msgstr "apenas considerar tags que correspondam ao <padrão>"
-#: builtin/describe.c:410 builtin/name-rev.c:321
+#: builtin/describe.c:410 builtin/name-rev.c:320
msgid "show abbreviated commit object as fallback"
msgstr "mostrar objetos de commit abreviados em recurso"
msgid "invalid option: %s"
msgstr "opção inválida: %s"
-#: builtin/diff.c:360
+#: builtin/diff.c:361
msgid "Not a git repository"
msgstr "Não é um repositório git"
-#: builtin/diff.c:403
+#: builtin/diff.c:404
#, c-format
msgid "invalid object '%s' given."
msgstr "objeto inválido '%s' fornecido."
-#: builtin/diff.c:412
+#: builtin/diff.c:413
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "mais do que dois blobs fornecidos: '%s'"
-#: builtin/diff.c:419
+#: builtin/diff.c:420
#, c-format
msgid "unhandled object '%s' given."
msgstr "objeto sem tratamento '%s' fornecido."
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<opções>]"
-#: builtin/fetch.c:93 builtin/pull.c:174
+#: builtin/fetch.c:95 builtin/pull.c:175
msgid "fetch from all remotes"
msgstr "obter de todos os remotos"
-#: builtin/fetch.c:95 builtin/pull.c:177
+#: builtin/fetch.c:97 builtin/pull.c:178
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "acrescentar a .git/FETCH_HEAD em vez de substituir"
-#: builtin/fetch.c:97 builtin/pull.c:180
+#: builtin/fetch.c:99 builtin/pull.c:181
msgid "path to upload pack on remote end"
msgstr "caminho para o comando upload pack no remoto"
-#: builtin/fetch.c:98 builtin/pull.c:182
+#: builtin/fetch.c:100 builtin/pull.c:183
msgid "force overwrite of local branch"
msgstr "forçar a substituição do ramo local"
-#: builtin/fetch.c:100
+#: builtin/fetch.c:102
msgid "fetch from multiple remotes"
msgstr "obter de múltiplos remotos"
-#: builtin/fetch.c:102 builtin/pull.c:184
+#: builtin/fetch.c:104 builtin/pull.c:185
msgid "fetch all tags and associated objects"
msgstr "obter todas as tags e objetos associados"
-#: builtin/fetch.c:104
+#: builtin/fetch.c:106
msgid "do not fetch all tags (--no-tags)"
msgstr "não obter todas as tags (--no-tags)"
-#: builtin/fetch.c:106
+#: builtin/fetch.c:108
msgid "number of submodules fetched in parallel"
msgstr "número de submódulos obtidos em paralelo"
-#: builtin/fetch.c:108 builtin/pull.c:187
+#: builtin/fetch.c:110 builtin/pull.c:188
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
"eliminar os ramos de monitorização remotos que já não existem no remoto"
-#: builtin/fetch.c:109 builtin/pull.c:190
+#: builtin/fetch.c:111 builtin/pull.c:191
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:110 builtin/pull.c:191
+#: builtin/fetch.c:112 builtin/pull.c:192
msgid "control recursive fetching of submodules"
msgstr "controlar a obtenção recursiva de submódulos"
-#: builtin/fetch.c:114 builtin/pull.c:199
+#: builtin/fetch.c:116 builtin/pull.c:200
msgid "keep downloaded pack"
msgstr "manter o pacote transferido"
-#: builtin/fetch.c:116
+#: builtin/fetch.c:118
msgid "allow updating of HEAD ref"
msgstr "permitir a atualização da referência HEAD"
-#: builtin/fetch.c:119 builtin/pull.c:202
+#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
msgid "deepen history of shallow clone"
msgstr "aprofundar o histórico de um clone raso"
-#: builtin/fetch.c:121 builtin/pull.c:205
+#: builtin/fetch.c:123
+msgid "deepen history of shallow repository based on time"
+msgstr "aprofundar o histórico de repositório raso com base na data"
+
+#: builtin/fetch.c:129 builtin/pull.c:206
msgid "convert to a complete repository"
msgstr "converter num repositório completo"
-#: builtin/fetch.c:123 builtin/log.c:1426
+#: builtin/fetch.c:131 builtin/log.c:1433
msgid "dir"
msgstr "dir"
-#: builtin/fetch.c:124
+#: builtin/fetch.c:132
msgid "prepend this to submodule path output"
msgstr "preceder isto ao caminho do submódulo"
-#: builtin/fetch.c:127
+#: builtin/fetch.c:135
msgid "default mode for recursion"
msgstr "modo recursivo por omissão"
-#: builtin/fetch.c:129 builtin/pull.c:208
+#: builtin/fetch.c:137 builtin/pull.c:209
msgid "accept refs that update .git/shallow"
msgstr "aceitar referência que atualizem .git/shallow"
-#: builtin/fetch.c:130 builtin/pull.c:210
+#: builtin/fetch.c:138 builtin/pull.c:211
msgid "refmap"
msgstr "mapa de referências"
-#: builtin/fetch.c:131 builtin/pull.c:211
+#: builtin/fetch.c:139 builtin/pull.c:212
msgid "specify fetch refmap"
msgstr "especificar mapa de referências"
-#: builtin/fetch.c:387
+#: builtin/fetch.c:398
msgid "Couldn't find remote ref HEAD"
msgstr "Referência remota HEAD não encontrada"
-#: builtin/fetch.c:503
+#: builtin/fetch.c:514
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "a configuração fetch.ouput contém o valor inválido %s"
-#: builtin/fetch.c:592
+#: builtin/fetch.c:607
#, c-format
msgid "object %s not found"
msgstr "objeto %s não encontrado"
-#: builtin/fetch.c:596
+#: builtin/fetch.c:611
msgid "[up to date]"
msgstr "[atualizado]"
-#: builtin/fetch.c:609 builtin/fetch.c:689
+#: builtin/fetch.c:624 builtin/fetch.c:704
msgid "[rejected]"
msgstr "[rejeitado]"
-#: builtin/fetch.c:610
+#: builtin/fetch.c:625
msgid "can't fetch in current branch"
msgstr "não é possível obter no ramo atual"
-#: builtin/fetch.c:619
+#: builtin/fetch.c:634
msgid "[tag update]"
msgstr "[tag atualizada]"
-#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669
-#: builtin/fetch.c:684
+#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684
+#: builtin/fetch.c:699
msgid "unable to update local ref"
msgstr "não é possível atualizar a referência local"
-#: builtin/fetch.c:639
+#: builtin/fetch.c:654
msgid "[new tag]"
msgstr "[nova tag]"
-#: builtin/fetch.c:642
+#: builtin/fetch.c:657
msgid "[new branch]"
msgstr "[novo ramo]"
-#: builtin/fetch.c:645
+#: builtin/fetch.c:660
msgid "[new ref]"
msgstr "[nova referência]"
-#: builtin/fetch.c:684
+#: builtin/fetch.c:699
msgid "forced update"
msgstr "atualização forçada"
-#: builtin/fetch.c:689
+#: builtin/fetch.c:704
msgid "non-fast-forward"
msgstr "sem avanço-rápido"
-#: builtin/fetch.c:733
+#: builtin/fetch.c:749
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s não enviou todos os objetos necessários\n"
-#: builtin/fetch.c:753
+#: builtin/fetch.c:769
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "%s rejeitado, porque as raízes rasas não podem ser atualizadas"
-#: builtin/fetch.c:839 builtin/fetch.c:934
+#: builtin/fetch.c:856 builtin/fetch.c:952
#, c-format
msgid "From %.*s\n"
msgstr "De %.*s\n"
-#: builtin/fetch.c:850
+#: builtin/fetch.c:867
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
"algumas referências locais não puderam ser atualizadas; tente executar\n"
" 'git remote prune %s' para remover algum ramo antigo em conflito"
-#: builtin/fetch.c:904
+#: builtin/fetch.c:922
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s ficará suspenso)"
-#: builtin/fetch.c:905
+#: builtin/fetch.c:923
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s ficou suspenso)"
-#: builtin/fetch.c:937
+#: builtin/fetch.c:955
msgid "[deleted]"
msgstr "[eliminado]"
-#: builtin/fetch.c:938 builtin/remote.c:1020
+#: builtin/fetch.c:956 builtin/remote.c:1020
msgid "(none)"
msgstr "(nenhum)"
-#: builtin/fetch.c:960
+#: builtin/fetch.c:979
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Obtenção de objetos no ramo atual %s de um repositório não nu recusada"
-#: builtin/fetch.c:979
+#: builtin/fetch.c:998
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "O valor \"%2$s\" da opção \"%1$s\" não é válido em %3$s"
-#: builtin/fetch.c:982
+#: builtin/fetch.c:1001
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Opção \"%s\" ignorada em %s\n"
-#: builtin/fetch.c:1039
+#: builtin/fetch.c:1077
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Não sei como obter de %s"
-#: builtin/fetch.c:1199
+#: builtin/fetch.c:1237
#, c-format
msgid "Fetching %s\n"
msgstr "A obter de %s\n"
-#: builtin/fetch.c:1201 builtin/remote.c:96
+#: builtin/fetch.c:1239 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "Não foi possível obter de %s"
-#: builtin/fetch.c:1219
+#: builtin/fetch.c:1257
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
"Nenhum repositório remoto especificado. Especifique um URL ou\n"
"o nome remoto a partir do qual as novas revisões devem ser obtidas."
-#: builtin/fetch.c:1242
+#: builtin/fetch.c:1280
msgid "You need to specify a tag name."
msgstr "Deve especificar um nome para a tag."
-#: builtin/fetch.c:1284
+#: builtin/fetch.c:1322
+msgid "Negative depth in --deepen is not supported"
+msgstr "Não é suportada profundidade negativa em --deepen"
+
+#: builtin/fetch.c:1324
+msgid "--deepen and --depth are mutually exclusive"
+msgstr "--deepen e --depth são mutuamente exclusivos"
+
+#: builtin/fetch.c:1329
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth e --unshallow não podem ser usados juntos"
-#: builtin/fetch.c:1286
+#: builtin/fetch.c:1331
msgid "--unshallow on a complete repository does not make sense"
msgstr "usar --unshallow num repositório completo não faz sentido"
-#: builtin/fetch.c:1306
+#: builtin/fetch.c:1353
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all não leva um repositório como argumento"
-#: builtin/fetch.c:1308
+#: builtin/fetch.c:1355
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all não faz sentido com especificadores de referência"
-#: builtin/fetch.c:1319
+#: builtin/fetch.c:1366
#, c-format
msgid "No such remote or remote group: %s"
msgstr "O remoto ou grupo remoto não existe: %s"
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1374
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Não faz sentido obter um grupo e especificar uma referência"
"git fmt-merge-msg [-m <mensagem>] [--log[=<n>] | --no-log] [--file "
"<ficheiro>]"
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:663
msgid "populate log with at most <n> entries from shortlog"
msgstr "povoar o registo com, no máximo, <n> entradas do shortlog"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:666
msgid "alias for --log (deprecated)"
msgstr "alias de --log (obsoleto)"
-#: builtin/fmt-merge-msg.c:673
+#: builtin/fmt-merge-msg.c:669
msgid "text"
msgstr "texto"
-#: builtin/fmt-merge-msg.c:674
+#: builtin/fmt-merge-msg.c:670
msgid "use <text> as start of message"
msgstr "usar <texto> no início da mensagem"
-#: builtin/fmt-merge-msg.c:675
+#: builtin/fmt-merge-msg.c:671
msgid "file to read from"
msgstr "ficheiro a ler"
msgid "show verbose names for reachable objects"
msgstr "mostrar nomes verbosos de objetos inalcançáveis"
-#: builtin/fsck.c:671
+#: builtin/fsck.c:665
msgid "Checking objects"
msgstr "A verificar objetos"
msgid "invalid number of threads specified (%d) for %s"
msgstr "o número de threads especificado em %2$s é inválido (%1$d)"
-#: builtin/grep.c:452 builtin/grep.c:487
+#: builtin/grep.c:453 builtin/grep.c:488
#, c-format
msgid "unable to read tree (%s)"
msgstr "não foi possível ler a árvore (%s)"
-#: builtin/grep.c:502
+#: builtin/grep.c:503
#, c-format
msgid "unable to grep from object of type %s"
msgstr "não foi possível efetuar grep de objetos do tipo %s"
-#: builtin/grep.c:560
+#: builtin/grep.c:561
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "a opção '%c' espera um valor numérico"
-#: builtin/grep.c:577
-#, c-format
-msgid "cannot open '%s'"
-msgstr "não é possível abrir '%s'"
-
-#: builtin/grep.c:646
+#: builtin/grep.c:647
msgid "search in index instead of in the work tree"
msgstr "procurar no índice em vez de procurar na árvore de trabalho"
-#: builtin/grep.c:648
+#: builtin/grep.c:649
msgid "find in contents not managed by git"
msgstr "procurar em conteúdos não geridos pelo git"
-#: builtin/grep.c:650
+#: builtin/grep.c:651
msgid "search in both tracked and untracked files"
msgstr "procurar em ficheiros controlados e não controlados"
-#: builtin/grep.c:652
+#: builtin/grep.c:653
msgid "ignore files specified via '.gitignore'"
msgstr "ignorar ficheiros especificados via '.gitignore'"
-#: builtin/grep.c:655
+#: builtin/grep.c:656
msgid "show non-matching lines"
msgstr "mostrar linhas não correspondidas"
-#: builtin/grep.c:657
+#: builtin/grep.c:658
msgid "case insensitive matching"
msgstr "não diferenciar maiúsculas de minúsculas"
-#: builtin/grep.c:659
+#: builtin/grep.c:660
msgid "match patterns only at word boundaries"
msgstr "corresponder padrões apenas a palavras"
-#: builtin/grep.c:661
+#: builtin/grep.c:662
msgid "process binary files as text"
msgstr "processar ficheiros binários como texto"
-#: builtin/grep.c:663
+#: builtin/grep.c:664
msgid "don't match patterns in binary files"
msgstr "ignorar ficheiros binários"
-#: builtin/grep.c:666
+#: builtin/grep.c:667
msgid "process binary files with textconv filters"
msgstr "processar ficheiros binários com filtros textconv"
-#: builtin/grep.c:668
+#: builtin/grep.c:669
msgid "descend at most <depth> levels"
msgstr "descer no máximo até <profundidade>"
-#: builtin/grep.c:672
+#: builtin/grep.c:673
msgid "use extended POSIX regular expressions"
msgstr "usar expressões regulares estendidas do POSIX"
-#: builtin/grep.c:675
+#: builtin/grep.c:676
msgid "use basic POSIX regular expressions (default)"
msgstr "usar expressões regulares básicas do POSIX (predefinição)"
-#: builtin/grep.c:678
+#: builtin/grep.c:679
msgid "interpret patterns as fixed strings"
msgstr "interpretar padrões como cadeias de caracteres fixas"
-#: builtin/grep.c:681
+#: builtin/grep.c:682
msgid "use Perl-compatible regular expressions"
msgstr "usar expressões regulares compatíveis com Perl"
-#: builtin/grep.c:684
+#: builtin/grep.c:685
msgid "show line numbers"
msgstr "mostrar números de linha"
-#: builtin/grep.c:685
+#: builtin/grep.c:686
msgid "don't show filenames"
msgstr "não mostrar nomes de ficheiro"
-#: builtin/grep.c:686
+#: builtin/grep.c:687
msgid "show filenames"
msgstr "mostrar nomes de ficheiro"
-#: builtin/grep.c:688
+#: builtin/grep.c:689
msgid "show filenames relative to top directory"
msgstr "mostrar nomes de ficheiro relativamente ao diretório superior"
-#: builtin/grep.c:690
+#: builtin/grep.c:691
msgid "show only filenames instead of matching lines"
msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas"
-#: builtin/grep.c:692
+#: builtin/grep.c:693
msgid "synonym for --files-with-matches"
msgstr "sinónimo de --files-with-matches"
-#: builtin/grep.c:695
+#: builtin/grep.c:696
msgid "show only the names of files without match"
msgstr "mostrar apenas nomes de ficheiro sem correspondência"
-#: builtin/grep.c:697
+#: builtin/grep.c:698
msgid "print NUL after filenames"
msgstr "imprimir NUL depois dos nomes de ficheiro"
-#: builtin/grep.c:699
+#: builtin/grep.c:700
msgid "show the number of matches instead of matching lines"
msgstr "mostrar o número de correspondências em vez das linha correspondidas"
-#: builtin/grep.c:700
+#: builtin/grep.c:701
msgid "highlight matches"
msgstr "realçar correspondências"
-#: builtin/grep.c:702
+#: builtin/grep.c:703
msgid "print empty line between matches from different files"
msgstr ""
"imprimir uma linha em branco entre correspondências de diferentes ficheiros"
-#: builtin/grep.c:704
+#: builtin/grep.c:705
msgid "show filename only once above matches from same file"
msgstr ""
"mostrar só uma vez o nome do ficheiro acima das correspondências dentro do "
"mesmo ficheiro"
-#: builtin/grep.c:707
+#: builtin/grep.c:708
msgid "show <n> context lines before and after matches"
msgstr "mostrar <n> linhas de contexto antes e depois das correspondências"
-#: builtin/grep.c:710
+#: builtin/grep.c:711
msgid "show <n> context lines before matches"
msgstr "mostrar <n> linhas de contexto antes das correspondências"
-#: builtin/grep.c:712
+#: builtin/grep.c:713
msgid "show <n> context lines after matches"
msgstr "mostrar <n> linhas de contexto depois das correspondências"
-#: builtin/grep.c:714
+#: builtin/grep.c:715
msgid "use <n> worker threads"
msgstr "usar <n> threads de trabalho"
-#: builtin/grep.c:715
+#: builtin/grep.c:716
msgid "shortcut for -C NUM"
msgstr "atalho para -C NUM"
-#: builtin/grep.c:718
+#: builtin/grep.c:719
msgid "show a line with the function name before matches"
msgstr "mostrar uma linha com o nome da função antes das correspondências"
-#: builtin/grep.c:720
+#: builtin/grep.c:721
msgid "show the surrounding function"
msgstr "mostrar a função circundante"
-#: builtin/grep.c:723
+#: builtin/grep.c:724
msgid "read patterns from file"
msgstr "ler padrões do ficheiro"
-#: builtin/grep.c:725
+#: builtin/grep.c:726
msgid "match <pattern>"
msgstr "procurar <padrão>"
-#: builtin/grep.c:727
+#: builtin/grep.c:728
msgid "combine patterns specified with -e"
msgstr "combinar padrões especificados com -e"
-#: builtin/grep.c:739
+#: builtin/grep.c:740
msgid "indicate hit with exit status without output"
msgstr "indicar padrão encontrado no valor de saída, mas não imprimir"
-#: builtin/grep.c:741
+#: builtin/grep.c:742
msgid "show only matches from files that match all patterns"
msgstr ""
"mostrar apenas correspondências de ficheiro que tenham todos os padrões"
-#: builtin/grep.c:743
+#: builtin/grep.c:744
msgid "show parse tree for grep expression"
msgstr "mostrar árvore de analise da expressões grep"
-#: builtin/grep.c:747
+#: builtin/grep.c:748
msgid "pager"
msgstr "paginador"
-#: builtin/grep.c:747
+#: builtin/grep.c:748
msgid "show matching files in the pager"
msgstr "mostrar ficheiros com correspondências no paginador"
-#: builtin/grep.c:750
+#: builtin/grep.c:751
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permitir invocar grep(1) (ignorado nesta compilação)"
-#: builtin/grep.c:813
+#: builtin/grep.c:814
msgid "no pattern given."
msgstr "nenhum padrão fornecido."
-#: builtin/grep.c:845 builtin/index-pack.c:1479
+#: builtin/grep.c:846 builtin/index-pack.c:1480
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "número de threads especificado inválido (%d)"
-#: builtin/grep.c:875
+#: builtin/grep.c:876
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager só funciona na árvore de trabalho"
-#: builtin/grep.c:901
+#: builtin/grep.c:902
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached ou --untracked não podem ser usados com --no-index."
-#: builtin/grep.c:906
+#: builtin/grep.c:907
msgid "--no-index or --untracked cannot be used with revs."
msgstr "--no-index ou --untracked não podem ser usados em revisões."
-#: builtin/grep.c:909
+#: builtin/grep.c:910
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
"--[no-]exclude-standard não podem ser usados em conteúdos não controlados."
-#: builtin/grep.c:917
+#: builtin/grep.c:918
msgid "both --cached and trees are given."
msgstr "--cached e árvores foram fornecidos simultaneamente."
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:93
+#: builtin/hash-object.c:94
msgid "type"
msgstr "tipo"
-#: builtin/hash-object.c:93
+#: builtin/hash-object.c:94
msgid "object type"
msgstr "tipo do objeto"
-#: builtin/hash-object.c:94
+#: builtin/hash-object.c:95
msgid "write the object into the object database"
msgstr "escrever o objeto na base de dados de objetos"
-#: builtin/hash-object.c:96
+#: builtin/hash-object.c:97
msgid "read the object from stdin"
msgstr "ler o objeto da entrada padrão"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
msgid "store file as is without filters"
msgstr "guardar o ficheiro tal como está, sem filtros"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:100
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
"obter hash de lixo aleatório para criar objetos corrompidos para depurar o "
"Git"
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
msgid "process file as it were from this path"
msgstr "processar o ficheiro como se este fosse do caminho indicado"
-#: builtin/help.c:41
+#: builtin/help.c:42
msgid "print all available commands"
msgstr "imprimir todos os comandos disponíveis"
-#: builtin/help.c:42
+#: builtin/help.c:43
+msgid "exclude guides"
+msgstr "excluir guias"
+
+#: builtin/help.c:44
msgid "print list of useful guides"
msgstr "imprimir lista de guias úteis"
-#: builtin/help.c:43
+#: builtin/help.c:45
msgid "show man page"
msgstr "mostrar página do manual"
-#: builtin/help.c:44
+#: builtin/help.c:46
msgid "show manual in web browser"
msgstr "mostrar o manual no navegador web"
-#: builtin/help.c:46
+#: builtin/help.c:48
msgid "show info page"
msgstr "mostrar página info"
-#: builtin/help.c:52
+#: builtin/help.c:54
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr "git help [--all] [--guides] [--man | --web | --info] [<comando>]"
-#: builtin/help.c:64
+#: builtin/help.c:66
#, c-format
msgid "unrecognized help format '%s'"
msgstr "formato de ajuda não reconhecido '%s'"
-#: builtin/help.c:91
+#: builtin/help.c:93
msgid "Failed to start emacsclient."
msgstr "Falha ao iniciar emacsclient."
-#: builtin/help.c:104
+#: builtin/help.c:106
msgid "Failed to parse emacsclient version."
msgstr "Falha ao analisar a versão do emacsclient."
-#: builtin/help.c:112
+#: builtin/help.c:114
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "a versão do emacsclient '%d' é demasiado antiga (< 22)."
-#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
+#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
#, c-format
msgid "failed to exec '%s'"
msgstr "falha ao executar '%s'"
-#: builtin/help.c:205
+#: builtin/help.c:207
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"'%s': caminho para visualizador de manual não suportado.\n"
"Considere usar 'man.<ferramenta>.cmd'."
-#: builtin/help.c:217
+#: builtin/help.c:219
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"'%s': comando de visualizador de manual suportado.\n"
"Considere usar 'man.<ferramenta>.path'."
-#: builtin/help.c:334
+#: builtin/help.c:336
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s': visualizador de manual desconhecido."
-#: builtin/help.c:351
+#: builtin/help.c:353
msgid "no man viewer handled the request"
msgstr "nenhum visualizador de manual atendeu o pedido"
-#: builtin/help.c:359
+#: builtin/help.c:361
msgid "no info viewer handled the request"
msgstr "nenhum visualizador de info atendeu o pedido"
-#: builtin/help.c:401
+#: builtin/help.c:403
msgid "Defining attributes per path"
msgstr "Definir atributos por caminho"
-#: builtin/help.c:402
+#: builtin/help.c:404
msgid "Everyday Git With 20 Commands Or So"
msgstr "Diário Git com mais ou menos 20 Comandos"
-#: builtin/help.c:403
+#: builtin/help.c:405
msgid "A Git glossary"
msgstr "Um Glossário do Git"
-#: builtin/help.c:404
+#: builtin/help.c:406
msgid "Specifies intentionally untracked files to ignore"
msgstr ""
"Especificar ficheiros não controlados para serem intencionalmente ignorados"
-#: builtin/help.c:405
+#: builtin/help.c:407
msgid "Defining submodule properties"
msgstr "Definir propriedades de submódulos"
-#: builtin/help.c:406
+#: builtin/help.c:408
msgid "Specifying revisions and ranges for Git"
msgstr "Especificar revisões e intervalos do Git"
-#: builtin/help.c:407
+#: builtin/help.c:409
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "Uma introdução ao Git (versão 1.5.1 ou mais recente)"
-#: builtin/help.c:408
+#: builtin/help.c:410
msgid "An overview of recommended workflows with Git"
msgstr "Uma descrição geral dos fluxos de trabalho recomendados para o Git"
-#: builtin/help.c:420
+#: builtin/help.c:422
msgid "The common Git guides are:\n"
msgstr "Os guias comuns do Git:\n"
-#: builtin/help.c:441 builtin/help.c:458
-#, c-format
-msgid "usage: %s%s"
-msgstr "utilização: %s%s"
-
-#: builtin/help.c:474
+#: builtin/help.c:440
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "'git %s' é um alias de '%s'"
-#: builtin/index-pack.c:153
+#: builtin/help.c:462 builtin/help.c:479
+#, c-format
+msgid "usage: %s%s"
+msgstr "utilização: %s%s"
+
+#: builtin/index-pack.c:154
#, c-format
msgid "unable to open %s"
msgstr "não foi possível abrir %s"
-#: builtin/index-pack.c:203
+#: builtin/index-pack.c:204
#, c-format
msgid "object type mismatch at %s"
msgstr "incompatibilidade de tipo de objeto em %s"
-#: builtin/index-pack.c:223
+#: builtin/index-pack.c:224
#, c-format
msgid "did not receive expected object %s"
msgstr "o objeto esperado %s não foi recebido"
-#: builtin/index-pack.c:226
+#: builtin/index-pack.c:227
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objeto %s: tipo esperado %s, obtido %s"
-#: builtin/index-pack.c:268
+#: builtin/index-pack.c:269
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "não é possível preencher %d byte"
msgstr[1] "não é possível preencher %d bytes"
-#: builtin/index-pack.c:278
+#: builtin/index-pack.c:279
msgid "early EOF"
msgstr "fim de ficheiro (EOF) prematuro"
-#: builtin/index-pack.c:279
+#: builtin/index-pack.c:280
msgid "read error on input"
msgstr "erro de leitura da entrada"
-#: builtin/index-pack.c:291
+#: builtin/index-pack.c:292
msgid "used more bytes than were available"
msgstr "foram usados mais bytes dos que estavam disponíveis"
-#: builtin/index-pack.c:298
+#: builtin/index-pack.c:299
msgid "pack too large for current definition of off_t"
msgstr "pacote demasiado grande para a definição atual de off_t"
-#: builtin/index-pack.c:314
+#: builtin/index-pack.c:302 builtin/unpack-objects.c:92
+msgid "pack exceeds maximum allowed size"
+msgstr "o pacote excede o tamanho máximo permitido"
+
+#: builtin/index-pack.c:317
#, c-format
msgid "unable to create '%s'"
msgstr "não foi possível criar '%s'"
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:322
#, c-format
msgid "cannot open packfile '%s'"
msgstr "não é possível abrir o ficheiro de pacote '%s'"
-#: builtin/index-pack.c:333
+#: builtin/index-pack.c:336
msgid "pack signature mismatch"
msgstr "a assinatura do pacote não corresponde"
-#: builtin/index-pack.c:335
+#: builtin/index-pack.c:338
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "versão de pacote %<PRIu32> não suportada"
-#: builtin/index-pack.c:353
+#: builtin/index-pack.c:356
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "pacote com objeto incorreto no offset %<PRIuMAX>: %s"
-#: builtin/index-pack.c:475
+#: builtin/index-pack.c:478
#, c-format
msgid "inflate returned %d"
msgstr "a descompactação retornou %d"
-#: builtin/index-pack.c:524
+#: builtin/index-pack.c:527
msgid "offset value overflow for delta base object"
msgstr "delta de objeto base com capacidade excedida no valor de offset"
-#: builtin/index-pack.c:532
+#: builtin/index-pack.c:535
msgid "delta base offset is out of bound"
msgstr "offset da base delta está fora do limite"
-#: builtin/index-pack.c:540
+#: builtin/index-pack.c:543
#, c-format
msgid "unknown object type %d"
msgstr "objeto de tipo desconhecido %d"
-#: builtin/index-pack.c:571
+#: builtin/index-pack.c:574
msgid "cannot pread pack file"
msgstr "não é possível invocar pread sobre o ficheiro de pacote"
-#: builtin/index-pack.c:573
+#: builtin/index-pack.c:576
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "fim prematuro de ficheiro de pacote, falta %<PRIuMAX> byte"
msgstr[1] "fim prematuro de ficheiro de pacote, faltam %<PRIuMAX> bytes"
-#: builtin/index-pack.c:599
+#: builtin/index-pack.c:602
msgid "serious inflate inconsistency"
msgstr "inconsistência de descompactação grave"
-#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774
-#: builtin/index-pack.c:808 builtin/index-pack.c:817
+#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
+#: builtin/index-pack.c:811 builtin/index-pack.c:820
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "COLISÃO DE SHA1 COM %s ENCONTRADA!"
-#: builtin/index-pack.c:748 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:256
+#: builtin/index-pack.c:751 builtin/pack-objects.c:166
+#: builtin/pack-objects.c:258
#, c-format
msgid "unable to read %s"
msgstr "não foi possível ler %s"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:817
#, c-format
msgid "cannot read existing object %s"
msgstr "não é possível ler o objeto existente %s"
-#: builtin/index-pack.c:828
+#: builtin/index-pack.c:831
#, c-format
msgid "invalid blob object %s"
msgstr "objeto blob inválido %s"
-#: builtin/index-pack.c:842
+#: builtin/index-pack.c:845
#, c-format
msgid "invalid %s"
msgstr "inválido %s"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:848
msgid "Error in object"
msgstr "Erro no objeto"
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:850
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Nem todos os objetos filhos de %s são alcançáveis"
-#: builtin/index-pack.c:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:922 builtin/index-pack.c:953
msgid "failed to apply delta"
msgstr "falha ao aplicar delta"
-#: builtin/index-pack.c:1120
+#: builtin/index-pack.c:1123
msgid "Receiving objects"
msgstr "A receber objetos"
-#: builtin/index-pack.c:1120
+#: builtin/index-pack.c:1123
msgid "Indexing objects"
msgstr "A indexar objetos"
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1155
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "pacote corrompido (SHA1 não corresponde)"
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
msgid "cannot fstat packfile"
msgstr "não é possível invocar fstat sobre o ficheiro de pacote"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1163
msgid "pack has junk at the end"
msgstr "pacote com lixo no final"
-#: builtin/index-pack.c:1171
+#: builtin/index-pack.c:1174
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "extrema confusão em parse_pack_objects()"
-#: builtin/index-pack.c:1196
+#: builtin/index-pack.c:1197
msgid "Resolving deltas"
msgstr "A resolver deltas"
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
#, c-format
msgid "unable to create thread: %s"
msgstr "não foi possível criar thread: %s"
-#: builtin/index-pack.c:1249
+#: builtin/index-pack.c:1250
msgid "confusion beyond insanity"
msgstr "extrema confusão"
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1256
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "concluído com %d objeto local"
msgstr[1] "concluído com %d objetos locais"
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1268
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Soma de verificação inesperada no final de %s (corrupção no disco?)"
-#: builtin/index-pack.c:1271
+#: builtin/index-pack.c:1272
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "pacote com %d delta não resolvido"
msgstr[1] "pacote com %d deltas não resolvidos"
-#: builtin/index-pack.c:1295
+#: builtin/index-pack.c:1296
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "não é possível compactar objeto acrescentado (%d)"
-#: builtin/index-pack.c:1371
+#: builtin/index-pack.c:1372
#, c-format
msgid "local object %s is corrupt"
msgstr "objeto local %s corrompido"
-#: builtin/index-pack.c:1395
+#: builtin/index-pack.c:1396
msgid "error while closing pack file"
msgstr "erro ao fechar ficheiro de pacote"
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
#, c-format
msgid "cannot write keep file '%s'"
msgstr "não é possível escrever o ficheiro de conservação '%s'"
-#: builtin/index-pack.c:1416
+#: builtin/index-pack.c:1417
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "não é possível fechar o ficheiro de conservação '%s' escrito"
-#: builtin/index-pack.c:1429
+#: builtin/index-pack.c:1430
msgid "cannot store pack file"
msgstr "não é possível guardar ficheiro de pacote"
-#: builtin/index-pack.c:1440
+#: builtin/index-pack.c:1441
msgid "cannot store index file"
msgstr "não é possível guardar o ficheiro índice"
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1474
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "pack.indexversion=%<PRIu32> incorreto"
-#: builtin/index-pack.c:1483 builtin/index-pack.c:1681
+#: builtin/index-pack.c:1484 builtin/index-pack.c:1681
#, c-format
msgid "no threads support, ignoring %s"
msgstr "sem suporte de threads, %s ignorado"
msgid "bad %s"
msgstr "%s incorreto"
-#: builtin/index-pack.c:1730
+#: builtin/index-pack.c:1732
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin não pode ser usado sem --stdin"
-#: builtin/index-pack.c:1738
+#: builtin/index-pack.c:1740
msgid "--verify with no packfile name given"
msgstr "--verify sem nome do ficheiro de pacote indicado"
-#: builtin/init-db.c:55
+#: builtin/init-db.c:54
#, c-format
msgid "cannot stat '%s'"
msgstr "não é possível invocar stat sobre '%s'"
-#: builtin/init-db.c:61
+#: builtin/init-db.c:60
#, c-format
msgid "cannot stat template '%s'"
msgstr "não é possível invocar stat sobre o modelo '%s'"
-#: builtin/init-db.c:66
+#: builtin/init-db.c:65
#, c-format
msgid "cannot opendir '%s'"
msgstr "não é possível abrir (opendir) '%s'"
-#: builtin/init-db.c:77
+#: builtin/init-db.c:76
#, c-format
msgid "cannot readlink '%s'"
msgstr "não é possível ler (readlink) '%s'"
-#: builtin/init-db.c:79
+#: builtin/init-db.c:78
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "não é possível criar a ligação simbólica '%s' '%s'"
-#: builtin/init-db.c:85
+#: builtin/init-db.c:84
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "não é possível copiar '%s' para '%s'"
-#: builtin/init-db.c:89
+#: builtin/init-db.c:88
#, c-format
msgid "ignoring template %s"
msgstr "modelo %s ignorado"
-#: builtin/init-db.c:120
+#: builtin/init-db.c:119
#, c-format
msgid "templates not found %s"
msgstr "modelos não encontrados em %s"
-#: builtin/init-db.c:135
+#: builtin/init-db.c:134
#, c-format
msgid "not copying templates from '%s': %s"
-msgstr "modelos não copiados de '%s': %s"
-
-#: builtin/init-db.c:312 builtin/init-db.c:315
-#, c-format
-msgid "%s already exists"
-msgstr "%s já existe"
+msgstr "modelos não copiados de '%s': %s"
-#: builtin/init-db.c:344
+#: builtin/init-db.c:327
#, c-format
msgid "unable to handle file type %d"
msgstr "não foi possível processar o tipo de ficheiro %d"
-#: builtin/init-db.c:347
+#: builtin/init-db.c:330
#, c-format
msgid "unable to move %s to %s"
msgstr "não foi possível mover %s para %s"
-#: builtin/init-db.c:402
+#: builtin/init-db.c:347 builtin/init-db.c:350
+#, c-format
+msgid "%s already exists"
+msgstr "%s já existe"
+
+#: builtin/init-db.c:403
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr "Repositório Git partilhado e existente reinicializado em %s%s\n"
-#: builtin/init-db.c:403
+#: builtin/init-db.c:404
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "Repositório Git existem reinicializado em %s%s\n"
-#: builtin/init-db.c:407
+#: builtin/init-db.c:408
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr "Repositório Git vazio e partilhado inicializado em %s%s\n"
-#: builtin/init-db.c:408
+#: builtin/init-db.c:409
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "Repositório Git vazio inicializado em %s%s\n"
-#: builtin/init-db.c:455
+#: builtin/init-db.c:457
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
"git init [-q | --quiet] [--bare] [--template=<diretório-modelo>] [--"
"shared[=<permissões>]] [<diretório>]"
-#: builtin/init-db.c:478
+#: builtin/init-db.c:480
msgid "permissions"
msgstr "permissões"
-#: builtin/init-db.c:479
+#: builtin/init-db.c:481
msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
"especificar que o repositório git será partilhado por vários utilizadores"
-#: builtin/init-db.c:513 builtin/init-db.c:518
+#: builtin/init-db.c:515 builtin/init-db.c:520
#, c-format
msgid "cannot mkdir %s"
msgstr "não é possível criar o diretório %s"
-#: builtin/init-db.c:522
+#: builtin/init-db.c:524
#, c-format
msgid "cannot chdir to %s"
msgstr "não é possível mudar para o diretório %s"
-#: builtin/init-db.c:543
+#: builtin/init-db.c:545
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"%s (ou --work-tree=<diretório>) não é permitido sem especificar %s (ou --git-"
"dir=<diretório>)"
-#: builtin/init-db.c:571
+#: builtin/init-db.c:573
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Não é possível aceder à árvore de trabalho '%s'"
msgid "Cover letter needs email format"
msgstr "A carta de apresentação precisa de um formato de e-mail"
-#: builtin/log.c:1064
+#: builtin/log.c:1063
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to incorreto: %s"
-#: builtin/log.c:1092
+#: builtin/log.c:1091
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opções>] [<desde> | <intervalo-de-revisões>]"
-#: builtin/log.c:1137
+#: builtin/log.c:1141
msgid "Two output directories?"
msgstr "Dois diretórios de saída?"
-#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897
+#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
#, c-format
msgid "Unknown commit %s"
msgstr "Commit desconhecido %s"
-#: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305
-#: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425
-#: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594
-#: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455
+#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Falha ao resolver '%s' numa referência válida."
-#: builtin/log.c:1259
+#: builtin/log.c:1263
msgid "Could not find exact merge base."
msgstr "Não foi possível encontrar a base exata de integração."
-#: builtin/log.c:1263
+#: builtin/log.c:1267
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"
"use branch --set-upstream-to para seguir um ramo remoto.\n"
"Ou pode especificar o commit base com --base=<base-commit-id> manualmente."
-#: builtin/log.c:1283
+#: builtin/log.c:1287
msgid "Failed to find exact merge base"
msgstr "Falha ao procurar base exata de integração"
-#: builtin/log.c:1294
+#: builtin/log.c:1298
msgid "base commit should be the ancestor of revision list"
msgstr "o commit base deve ser o antecessor da lista de revisões"
-#: builtin/log.c:1298
+#: builtin/log.c:1302
msgid "base commit shouldn't be in revision list"
msgstr "o commit base não deve fazer parte da lista de revisões"
-#: builtin/log.c:1347
+#: builtin/log.c:1351
msgid "cannot get patch id"
msgstr "não é possível obter o id do patch"
-#: builtin/log.c:1404
+#: builtin/log.c:1408
msgid "use [PATCH n/m] even with a single patch"
msgstr "usar [PATCH n/m] mesmo com um único patch"
-#: builtin/log.c:1407
+#: builtin/log.c:1411
msgid "use [PATCH] even with multiple patches"
msgstr "usar [PATCH] mesmo com múltiplos patches"
-#: builtin/log.c:1411
+#: builtin/log.c:1415
msgid "print patches to standard out"
msgstr "imprimir patches para a saída padrão"
-#: builtin/log.c:1413
+#: builtin/log.c:1417
msgid "generate a cover letter"
msgstr "gerar uma carta de apresentação"
-#: builtin/log.c:1415
+#: builtin/log.c:1419
msgid "use simple number sequence for output file names"
msgstr ""
"usar uma sequência de números simples para denominar os ficheiros gerados"
-#: builtin/log.c:1416
+#: builtin/log.c:1420
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1417
+#: builtin/log.c:1421
msgid "use <sfx> instead of '.patch'"
msgstr "usar <sfx> em vez de '.patch'"
-#: builtin/log.c:1419
+#: builtin/log.c:1423
msgid "start numbering patches at <n> instead of 1"
msgstr "começar a numerar os patches em <n> em vez de 1"
-#: builtin/log.c:1421
+#: builtin/log.c:1425
msgid "mark the series as Nth re-roll"
msgstr "marcar a série como a n-ésima reiteração"
-#: builtin/log.c:1423
+#: builtin/log.c:1427
+msgid "Use [RFC PATCH] instead of [PATCH]"
+msgstr "Usar [RFC PATCH] em vez de [PATCH]"
+
+#: builtin/log.c:1430
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "usar [<prefixo>] em vez de [PATCH]"
-#: builtin/log.c:1426
+#: builtin/log.c:1433
msgid "store resulting files in <dir>"
msgstr "guardar os ficheiros resultantes em <dir>"
-#: builtin/log.c:1429
+#: builtin/log.c:1436
msgid "don't strip/add [PATCH]"
msgstr "não tirar/inserir [PATCH]"
-#: builtin/log.c:1432
+#: builtin/log.c:1439
msgid "don't output binary diffs"
msgstr "não gerar diffs binários"
-#: builtin/log.c:1434
+#: builtin/log.c:1441
msgid "output all-zero hash in From header"
msgstr "preencher o cabeçalho From com hash de zeros"
-#: builtin/log.c:1436
+#: builtin/log.c:1443
msgid "don't include a patch matching a commit upstream"
msgstr "não incluir um patch que coincida com um commit a montante"
-#: builtin/log.c:1438
+#: builtin/log.c:1445
msgid "show patch format instead of default (patch + stat)"
msgstr ""
"mostrar no formato de patch em vez de no formato por omissão (patch + stat)"
-#: builtin/log.c:1440
+#: builtin/log.c:1447
msgid "Messaging"
msgstr "Mensagem"
-#: builtin/log.c:1441
+#: builtin/log.c:1448
msgid "header"
msgstr "cabeçalho"
-#: builtin/log.c:1442
+#: builtin/log.c:1449
msgid "add email header"
msgstr "adicionar cabeçalho de e-mail"
-#: builtin/log.c:1443 builtin/log.c:1445
+#: builtin/log.c:1450 builtin/log.c:1452
msgid "email"
msgstr "e-mail"
-#: builtin/log.c:1443
+#: builtin/log.c:1450
msgid "add To: header"
msgstr "adicionar cabeçalho To:"
-#: builtin/log.c:1445
+#: builtin/log.c:1452
msgid "add Cc: header"
msgstr "adicionar cabeçalho Cc:"
-#: builtin/log.c:1447
+#: builtin/log.c:1454
msgid "ident"
msgstr "identidade"
-#: builtin/log.c:1448
+#: builtin/log.c:1455
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"definir o endereço From como <identidade> (ou como identidade do committer "
"se não indicado)"
-#: builtin/log.c:1450
+#: builtin/log.c:1457
msgid "message-id"
msgstr "id-mensagem"
-#: builtin/log.c:1451
+#: builtin/log.c:1458
msgid "make first mail a reply to <message-id>"
msgstr "usar o primeiro email para responder a <id-mensagem>"
-#: builtin/log.c:1452 builtin/log.c:1455
+#: builtin/log.c:1459 builtin/log.c:1462
msgid "boundary"
msgstr "limite"
-#: builtin/log.c:1453
+#: builtin/log.c:1460
msgid "attach the patch"
msgstr "anexar o patch"
-#: builtin/log.c:1456
+#: builtin/log.c:1463
msgid "inline the patch"
msgstr "incorporar o patch"
-#: builtin/log.c:1460
+#: builtin/log.c:1467
msgid "enable message threading, styles: shallow, deep"
msgstr "ativar mensagens por tópicos, estilos: shallow (raso), deep (profundo)"
-#: builtin/log.c:1462
+#: builtin/log.c:1469
msgid "signature"
msgstr "assinatura"
-#: builtin/log.c:1463
+#: builtin/log.c:1470
msgid "add a signature"
msgstr "adicionar uma assinatura"
-#: builtin/log.c:1464
+#: builtin/log.c:1471
msgid "base-commit"
msgstr "commit-base"
-#: builtin/log.c:1465
+#: builtin/log.c:1472
msgid "add prerequisite tree info to the patch series"
msgstr "adicionar informação pré-requisito da árvore à série de patches"
-#: builtin/log.c:1467
+#: builtin/log.c:1474
msgid "add a signature from a file"
msgstr "adicionar uma assinatura de um ficheiro"
-#: builtin/log.c:1468
+#: builtin/log.c:1475
msgid "don't print the patch filenames"
msgstr "não imprimir os nomes dos ficheiros de patch"
-#: builtin/log.c:1558
+#: builtin/log.c:1565
msgid "-n and -k are mutually exclusive."
msgstr "-n e -k são mutuamente exclusivos."
-#: builtin/log.c:1560
-msgid "--subject-prefix and -k are mutually exclusive."
-msgstr "--subject-prefix e -k são mutuamente exclusivos."
+#: builtin/log.c:1567
+msgid "--subject-prefix/--rfc and -k are mutually exclusive."
+msgstr "--subject-prefix/--rfc e -k são mutuamente exclusivos."
-#: builtin/log.c:1568
+#: builtin/log.c:1575
msgid "--name-only does not make sense"
msgstr "--name-only não faz sentido"
-#: builtin/log.c:1570
+#: builtin/log.c:1577
msgid "--name-status does not make sense"
msgstr "--name-status não faz sentido"
-#: builtin/log.c:1572
+#: builtin/log.c:1579
msgid "--check does not make sense"
msgstr "--check não faz sentido"
-#: builtin/log.c:1602
+#: builtin/log.c:1609
msgid "standard output, or directory, which one?"
msgstr "saída padrão, ou diretório, qual deles?"
-#: builtin/log.c:1604
+#: builtin/log.c:1611
#, c-format
msgid "Could not create directory '%s'"
msgstr "Não foi possível criar o diretório '%s'"
-#: builtin/log.c:1698
+#: builtin/log.c:1705
#, c-format
msgid "unable to read signature file '%s'"
msgstr "não é possível ler o ficheiro de assinatura '%s'"
-#: builtin/log.c:1769
+#: builtin/log.c:1777
msgid "Failed to create output files"
msgstr "Falha ao criar os ficheiros de saída"
-#: builtin/log.c:1818
+#: builtin/log.c:1826
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<ramo-a-montante> [<head> [<limite>]]]"
-#: builtin/log.c:1872
+#: builtin/log.c:1880
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
"O ramo remoto seguido não foi encontrado, especifique <ramo-a-montante> "
"manualmente.\n"
-#: builtin/ls-files.c:379
+#: builtin/ls-files.c:458
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<opções>] [<ficheiro>...]"
-#: builtin/ls-files.c:428
+#: builtin/ls-files.c:507
msgid "identify the file status with tags"
msgstr "identificar o estado do ficheiro com tags"
-#: builtin/ls-files.c:430
+#: builtin/ls-files.c:509
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
"usar letras minúsculas para ficheiros 'assumido não alterado' ('assume "
"unchanged')"
-#: builtin/ls-files.c:432
+#: builtin/ls-files.c:511
msgid "show cached files in the output (default)"
msgstr "mostrar ficheiros em cache na saída (predefinição)"
-#: builtin/ls-files.c:434
+#: builtin/ls-files.c:513
msgid "show deleted files in the output"
msgstr "mostrar ficheiros eliminados na saída"
-#: builtin/ls-files.c:436
+#: builtin/ls-files.c:515
msgid "show modified files in the output"
msgstr "mostrar ficheiros modificados na saída"
-#: builtin/ls-files.c:438
+#: builtin/ls-files.c:517
msgid "show other files in the output"
msgstr "mostrar outros ficheiros na saída"
-#: builtin/ls-files.c:440
+#: builtin/ls-files.c:519
msgid "show ignored files in the output"
msgstr "mostrar ficheiros ignorados na saída"
-#: builtin/ls-files.c:443
+#: builtin/ls-files.c:522
msgid "show staged contents' object name in the output"
msgstr "mostrar nome de objetos com conteúdo preparado, na saída"
-#: builtin/ls-files.c:445
+#: builtin/ls-files.c:524
msgid "show files on the filesystem that need to be removed"
msgstr ""
"mostrar ficheiros no sistema de ficheiros que precisam de ser removidos"
-#: builtin/ls-files.c:447
+#: builtin/ls-files.c:526
msgid "show 'other' directories' names only"
msgstr "mostrar nomes de diretórios 'other' (outro)"
-#: builtin/ls-files.c:449
+#: builtin/ls-files.c:528
msgid "show line endings of files"
msgstr "mostrar finais de linha dos ficheiros"
-#: builtin/ls-files.c:451
+#: builtin/ls-files.c:530
msgid "don't show empty directories"
msgstr "não mostrar diretórios vazios"
-#: builtin/ls-files.c:454
+#: builtin/ls-files.c:533
msgid "show unmerged files in the output"
msgstr "mostrar ficheiros não integrados na saída"
-#: builtin/ls-files.c:456
+#: builtin/ls-files.c:535
msgid "show resolve-undo information"
msgstr "mostrar informação de resolver-desfazer"
-#: builtin/ls-files.c:458
+#: builtin/ls-files.c:537
msgid "skip files matching pattern"
msgstr "ignorar ficheiros que correspondam ao padrão"
-#: builtin/ls-files.c:461
+#: builtin/ls-files.c:540
msgid "exclude patterns are read from <file>"
msgstr "ler padrões de exclusão do <ficheiro>"
-#: builtin/ls-files.c:464
+#: builtin/ls-files.c:543
msgid "read additional per-directory exclude patterns in <file>"
msgstr "ler padrões de exclusão por diretório do <ficheiro>"
-#: builtin/ls-files.c:466
+#: builtin/ls-files.c:545
msgid "add the standard git exclusions"
msgstr "incluir as exclusões standard do git"
-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:548
msgid "make the output relative to the project top directory"
msgstr "mostrar os caminhos relativamente ao diretório superior do projeto"
-#: builtin/ls-files.c:472
+#: builtin/ls-files.c:551
+msgid "recurse through submodules"
+msgstr "percorrer submódulos recursivamente"
+
+#: builtin/ls-files.c:553
msgid "if any <file> is not in the index, treat this as an error"
msgstr "se um <ficheiro> não estiver no índice, tratar como erro"
-#: builtin/ls-files.c:473
+#: builtin/ls-files.c:554
msgid "tree-ish"
msgstr "árvore-etc"
-#: builtin/ls-files.c:474
+#: builtin/ls-files.c:555
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"fingir que os caminhos removidos desde <árvore-etc> ainda estão presentes"
-#: builtin/ls-files.c:476
+#: builtin/ls-files.c:557
msgid "show debugging data"
msgstr "mostrar dados de depuração"
msgid "Available custom strategies are:"
msgstr "Estratégias personalizadas disponíveis:"
-#: builtin/merge.c:195 builtin/pull.c:126
+#: builtin/merge.c:195 builtin/pull.c:127
msgid "do not show a diffstat at the end of the merge"
msgstr "não apresentar um diffstat ao fim da integração"
-#: builtin/merge.c:198 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:130
msgid "show a diffstat at the end of the merge"
msgstr "mostrar um diffstat ao fim da integração"
-#: builtin/merge.c:199 builtin/pull.c:132
+#: builtin/merge.c:199 builtin/pull.c:133
msgid "(synonym to --stat)"
msgstr "(sinónimo de --stat)"
-#: builtin/merge.c:201 builtin/pull.c:135
+#: builtin/merge.c:201 builtin/pull.c:136
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"adicionar (no máximo <n>) entradas do shortlog à mensagem de commit da "
"integração"
-#: builtin/merge.c:204 builtin/pull.c:138
+#: builtin/merge.c:204 builtin/pull.c:139
msgid "create a single commit instead of doing a merge"
msgstr "criar um único commit em vez de realizar uma integração"
-#: builtin/merge.c:206 builtin/pull.c:141
+#: builtin/merge.c:206 builtin/pull.c:142
msgid "perform a commit if the merge succeeds (default)"
msgstr "realizar um commit se a integração for bem sucedida (predefinição)"
-#: builtin/merge.c:208 builtin/pull.c:144
+#: builtin/merge.c:208 builtin/pull.c:145
msgid "edit message before committing"
msgstr "editar a mensagem antes de submeter"
msgid "allow fast-forward (default)"
msgstr "permitir avanço rápido (predefinição)"
-#: builtin/merge.c:211 builtin/pull.c:150
+#: builtin/merge.c:211 builtin/pull.c:151
msgid "abort if fast-forward is not possible"
msgstr "abortar se não é possível efetuar avanço rápido"
-#: builtin/merge.c:215 builtin/pull.c:153
+#: builtin/merge.c:215 builtin/pull.c:154
msgid "verify that the named commit has a valid GPG signature"
msgstr "verificar se o commit tem uma assinatura GPG válida"
-#: builtin/merge.c:216 builtin/notes.c:772 builtin/pull.c:157
+#: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158
#: builtin/revert.c:89
msgid "strategy"
msgstr "estratégia"
-#: builtin/merge.c:217 builtin/pull.c:158
+#: builtin/merge.c:217 builtin/pull.c:159
msgid "merge strategy to use"
msgstr "estratégia de integração a usar"
-#: builtin/merge.c:218 builtin/pull.c:161
+#: builtin/merge.c:218 builtin/pull.c:162
msgid "option=value"
msgstr "opção=valor"
-#: builtin/merge.c:219 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:163
msgid "option for selected merge strategy"
msgstr "opções da estratégia de integração selecionada"
msgid "abort the current in-progress merge"
msgstr "abortar integração em curso"
-#: builtin/merge.c:227 builtin/pull.c:169
+#: builtin/merge.c:227 builtin/pull.c:170
msgid "allow merging unrelated histories"
msgstr "permitir integração de históricos não relacionados"
msgid "Already up-to-date."
msgstr "Já está atualizado."
-#: builtin/merge.c:1382
+#: builtin/merge.c:1377
#, c-format
msgid "Updating %s..%s\n"
msgstr "A atualizar %s..%s\n"
-#: builtin/merge.c:1419
+#: builtin/merge.c:1418
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "A tentar integração mesmo trivial no interior do índice...\n"
-#: builtin/merge.c:1426
+#: builtin/merge.c:1425
#, c-format
msgid "Nope.\n"
msgstr "Não.\n"
-#: builtin/merge.c:1451
+#: builtin/merge.c:1450
msgid "Already up-to-date. Yeeah!"
msgstr "Já está atualizado. Sim!"
-#: builtin/merge.c:1457
+#: builtin/merge.c:1456
msgid "Not possible to fast-forward, aborting."
msgstr "Não é possível avançar rapidamente, a abortar."
-#: builtin/merge.c:1480 builtin/merge.c:1559
+#: builtin/merge.c:1479 builtin/merge.c:1558
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "A recuar a árvore ao seu estado original...\n"
-#: builtin/merge.c:1484
+#: builtin/merge.c:1483
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "A tentar a estratégia de integração %s...\n"
-#: builtin/merge.c:1550
+#: builtin/merge.c:1549
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Nenhuma estratégia de integração conseguiu processar a integração.\n"
-#: builtin/merge.c:1552
+#: builtin/merge.c:1551
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Falha ao integrar com a estratégia %s.\n"
-#: builtin/merge.c:1561
+#: builtin/merge.c:1560
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "A usar %s para preparar resolução manual.\n"
-#: builtin/merge.c:1573
+#: builtin/merge.c:1572
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <referência> [<commit>]"
-#: builtin/merge-base.c:214
+#: builtin/merge-base.c:217
msgid "output all common ancestors"
msgstr "mostrar todos os antecessores"
-#: builtin/merge-base.c:216
+#: builtin/merge-base.c:219
msgid "find ancestors for a single n-way merge"
msgstr "encontrar antecessores de uma única integração com n pontos"
-#: builtin/merge-base.c:218
+#: builtin/merge-base.c:221
msgid "list revs not reachable from others"
msgstr "listar revisões não alcançáveis a partir de outras"
-#: builtin/merge-base.c:220
+#: builtin/merge-base.c:223
msgid "is the first one ancestor of the other?"
msgstr "o primeiro é antecessor do segundo?"
-#: builtin/merge-base.c:222
+#: builtin/merge-base.c:225
msgid "find where <commit> forked from reflog of <ref>"
msgstr ""
"descobrir onde foi que o <commit> divergiu usando o reflog da <referência>"
msgid "set labels for file1/orig-file/file2"
msgstr "definir identificares para ficheiro1/ficheiro-orig/ficheiro2"
+#: builtin/merge-recursive.c:45
+#, c-format
+msgid "unknown option %s"
+msgstr "opção desconhecido %s"
+
+#: builtin/merge-recursive.c:51
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "não foi possível analisar o objeto '%s'"
+
+#: builtin/merge-recursive.c:55
+#, c-format
+msgid "cannot handle more than %d base. Ignoring %s."
+msgid_plural "cannot handle more than %d bases. Ignoring %s."
+msgstr[0] "não é possível processar mais do que %d base. Ignorar %s."
+msgstr[1] "não é possível processar mais do que %d bases. Ignorar %s."
+
+#: builtin/merge-recursive.c:63
+msgid "not handling anything other than two heads merge."
+msgstr "não se pode processar outra coisa senão integração de duas cabeças."
+
+#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "não foi possível resolver a referência %s"
+
+#: builtin/merge-recursive.c:77
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "A integrar %s com %s\n"
+
#: builtin/mktree.c:65
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
msgid "renaming '%s' failed"
msgstr "falha ao mudar o nome de '%s'"
-#: builtin/name-rev.c:258
+#: builtin/name-rev.c:257
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<opções>] <commit>..."
-#: builtin/name-rev.c:259
+#: builtin/name-rev.c:258
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<opções>] --all"
-#: builtin/name-rev.c:260
+#: builtin/name-rev.c:259
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<opções>] --stdin"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:311
msgid "print only names (no SHA-1)"
msgstr "imprimir apenas nomes (sem SHA-1)"
-#: builtin/name-rev.c:313
+#: builtin/name-rev.c:312
msgid "only use tags to name the commits"
msgstr "usar apenas tags para designar commits"
-#: builtin/name-rev.c:315
+#: builtin/name-rev.c:314
msgid "only use refs matching <pattern>"
msgstr "usar apenas referência que correspondam ao <padrão>"
-#: builtin/name-rev.c:317
+#: builtin/name-rev.c:316
msgid "list all commits reachable from all refs"
msgstr "listar todos os commits alcançáveis a partir de todas as referências"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:317
msgid "read from stdin"
msgstr "ler da entrada padrão"
-#: builtin/name-rev.c:319
+#: builtin/name-rev.c:318
msgid "allow to print `undefined` names (default)"
msgstr "permitir imprimir nomes 'indefinidos' (predefinição)"
-#: builtin/name-rev.c:325
+#: builtin/name-rev.c:324
msgid "dereference tags in the input (internal use)"
msgstr "desreferenciar tags na entrada (uso interno)"
msgstr "falha ao concluir o comando 'show' sobre o objeto '%s'"
#: builtin/notes.c:194
-msgid "Please supply the note contents using either -m or -F option"
-msgstr "Forneça o conteúdo da nota usando a opção -m ou -F"
+msgid "please supply the note contents using either -m or -F option"
+msgstr "forneça o conteúdo da nota usando a opção -m ou -F"
#: builtin/notes.c:203
msgid "unable to write note object"
#: builtin/notes.c:205
#, c-format
-msgid "The note contents have been left in %s"
-msgstr "O conteúdo da nota foi guardado em %s"
+msgid "the note contents have been left in %s"
+msgstr "o conteúdo da nota foi colocado em %s"
#: builtin/notes.c:233 builtin/tag.c:439
#, c-format
msgid "could not open or read '%s'"
msgstr "não foi possível abrir ou ler '%s'"
+#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307
+#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513
+#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659
+#, c-format
+msgid "failed to resolve '%s' as a valid ref."
+msgstr "falha ao resolver '%s' como uma referência válida."
+
#: builtin/notes.c:257
#, c-format
-msgid "Failed to read object '%s'."
-msgstr "Falha ao ler o objeto '%s'."
+msgid "failed to read object '%s'."
+msgstr "falha ao ler o objeto '%s'."
#: builtin/notes.c:261
#, c-format
-msgid "Cannot read note data from non-blob object '%s'."
-msgstr "Não é possível ler os dados da nota de um objeto não-blob '%s'."
+msgid "cannot read note data from non-blob object '%s'."
+msgstr "não é possível ler os dados da nota de um objeto não-blob '%s'."
-#: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494
-#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650
-#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968
+#: builtin/notes.c:301
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr "linha de entrada malformada: '%s'."
+
+#: builtin/notes.c:316
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
+msgstr "falha ao copiar notas de '%s' para '%s'"
+
+#. TRANSLATORS: the first %s will be replaced by a
+#. git notes command: 'add', 'merge', 'remove', etc.
+#: builtin/notes.c:345
+#, c-format
+msgid "refusing to %s notes in %s (outside of refs/notes/)"
+msgstr "foi recusado efetuar %s de notas em %s (fora de refs/notes/)"
+
+#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496
+#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652
+#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970
msgid "too many parameters"
msgstr "demasiados parâmetros"
-#: builtin/notes.c:376 builtin/notes.c:663
+#: builtin/notes.c:378 builtin/notes.c:665
#, c-format
-msgid "No note found for object %s."
-msgstr "A nota do objeto %s não foi encontrada."
+msgid "no note found for object %s."
+msgstr "nenhuma nota encontrada para o objeto %s."
-#: builtin/notes.c:397 builtin/notes.c:560
+#: builtin/notes.c:399 builtin/notes.c:562
msgid "note contents as a string"
msgstr "conteúdo da nota sob a forma de cadeia de caracteres"
-#: builtin/notes.c:400 builtin/notes.c:563
+#: builtin/notes.c:402 builtin/notes.c:565
msgid "note contents in a file"
msgstr "conteúdo da nota de um ficheiro"
-#: builtin/notes.c:403 builtin/notes.c:566
+#: builtin/notes.c:405 builtin/notes.c:568
msgid "reuse and edit specified note object"
msgstr "reutilizar e editar o objeto de nota especificado"
-#: builtin/notes.c:406 builtin/notes.c:569
+#: builtin/notes.c:408 builtin/notes.c:571
msgid "reuse specified note object"
msgstr "reutilizar o objeto de nota especificado"
-#: builtin/notes.c:409 builtin/notes.c:572
+#: builtin/notes.c:411 builtin/notes.c:574
msgid "allow storing empty note"
msgstr "permitir guardar uma nota vazia"
-#: builtin/notes.c:410 builtin/notes.c:481
+#: builtin/notes.c:412 builtin/notes.c:483
msgid "replace existing notes"
msgstr "substituir notas existentes"
-#: builtin/notes.c:435
+#: builtin/notes.c:437
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"Não é possível adicionar notas. Notas do objeto %s encontradas. Use '-f' "
"para substituí-las."
-#: builtin/notes.c:450 builtin/notes.c:529
+#: builtin/notes.c:452 builtin/notes.c:531
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "A substituir as notas existentes do objeto %s\n"
-#: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887
+#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889
#, c-format
msgid "Removing note for object %s\n"
msgstr "A remover a nota do objeto %s\n"
-#: builtin/notes.c:482
+#: builtin/notes.c:484
msgid "read objects from stdin"
msgstr "ler objetos da entrada padrão"
-#: builtin/notes.c:484
+#: builtin/notes.c:486
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "carregar configuração de reescrita do <comando> (implica --stdin)"
-#: builtin/notes.c:502
+#: builtin/notes.c:504
msgid "too few parameters"
msgstr "parâmetros insuficientes"
-#: builtin/notes.c:523
+#: builtin/notes.c:525
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"Não é possível copiar notas. Notas do objeto %s encontradas. Use '-f' para "
"substituí-las."
-#: builtin/notes.c:535
+#: builtin/notes.c:537
#, c-format
-msgid "Missing notes on source object %s. Cannot copy."
-msgstr "Não existem notas no objeto de origem %s. Não é possível copiar."
+msgid "missing notes on source object %s. Cannot copy."
+msgstr "faltam notas no objeto de origem %s. Não é possível copiar."
-#: builtin/notes.c:587
+#: builtin/notes.c:589
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"As opções -m/-F/-c/-C são obsoletas no subcomando 'edit'.\n"
"Use 'git notes add -f -m/-F/-c/-C' em seu lugar.\n"
-#: builtin/notes.c:753
+#: builtin/notes.c:685
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr "falha ao eliminar a referência NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:687
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr "falha ao eliminar a referência NOTES_MERGE_REF"
+
+#: builtin/notes.c:689
+msgid "failed to remove 'git notes merge' worktree"
+msgstr "falha ao remover a árvore de trabalho de 'git notes merge'"
+
+#: builtin/notes.c:709
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr "falha ao ler referência NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:711
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr "não foi possível encontrar o commit de NOTES_MERGE_PARTIAL."
+
+#: builtin/notes.c:713
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr "não foi possível analisar o commit de NOTES_MERGE_PARTIAL."
+
+#: builtin/notes.c:726
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr "falha ao resolver NOTES_MERGE_REF"
+
+#: builtin/notes.c:729
+msgid "failed to finalize notes merge"
+msgstr "falha ao finalizar integração de notas"
+
+#: builtin/notes.c:755
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "estratégia de integração de notas %s desconhecida"
-#: builtin/notes.c:769
+#: builtin/notes.c:771
msgid "General options"
msgstr "Opções gerais"
-#: builtin/notes.c:771
+#: builtin/notes.c:773
msgid "Merge options"
msgstr "Opções de integração"
-#: builtin/notes.c:773
+#: builtin/notes.c:775
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
"resolver conflitos nas notas usando a estratégia indicada (manual/ours/"
"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:775
+#: builtin/notes.c:777
msgid "Committing unmerged notes"
msgstr "A submeter notas não integradas"
-#: builtin/notes.c:777
+#: builtin/notes.c:779
msgid "finalize notes merge by committing unmerged notes"
msgstr "concluir integração de notas, submetendo notas não integradas"
-#: builtin/notes.c:779
+#: builtin/notes.c:781
msgid "Aborting notes merge resolution"
msgstr "A abortar resolução de integração das notas"
-#: builtin/notes.c:781
+#: builtin/notes.c:783
msgid "abort notes merge"
msgstr "abortar integração das notas"
-#: builtin/notes.c:792
+#: builtin/notes.c:794
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "não é possível misturar --commit, --abort ou -s/--strategy"
-#: builtin/notes.c:797
-msgid "Must specify a notes ref to merge"
-msgstr "Tem de especificar uma referência de notas para integrar"
+#: builtin/notes.c:799
+msgid "must specify a notes ref to merge"
+msgstr "tem de especificar uma referência de notas para integrar"
-#: builtin/notes.c:821
+#: builtin/notes.c:823
#, c-format
-msgid "Unknown -s/--strategy: %s"
+msgid "unknown -s/--strategy: %s"
msgstr "-s/--strategy desconhecida: %s"
-#: builtin/notes.c:858
+#: builtin/notes.c:860
#, c-format
-msgid "A notes merge into %s is already in-progress at %s"
-msgstr "Uma integração das notas em %s já está em curso em %s"
+msgid "a notes merge into %s is already in-progress at %s"
+msgstr "uma integração das notas em %s já está em curso em %s"
-#: builtin/notes.c:861
+#: builtin/notes.c:863
#, c-format
-msgid "Failed to store link to current notes ref (%s)"
-msgstr "Falha ao guardar ligação à referência de notas atual (%s)"
+msgid "failed to store link to current notes ref (%s)"
+msgstr "falha ao guardar ligação à referência de notas atual (%s)"
-#: builtin/notes.c:863
+#: builtin/notes.c:865
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
"submeta o resultado com 'git notes merge --commit' ou aborte a integração "
"com 'git notes merge --abort'.\n"
-#: builtin/notes.c:885
+#: builtin/notes.c:887
#, c-format
msgid "Object %s has no note\n"
msgstr "O objeto %s não tem nenhuma nota\n"
-#: builtin/notes.c:897
+#: builtin/notes.c:899
msgid "attempt to remove non-existent note is not an error"
msgstr "não considerar como erro a remoção de uma nota não existente"
-#: builtin/notes.c:900
+#: builtin/notes.c:902
msgid "read object names from the standard input"
msgstr "ler nome dos objetos da entrada padrão"
-#: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127
+#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
msgid "do not remove, show only"
msgstr "não remover, mostrar apenas"
-#: builtin/notes.c:939
+#: builtin/notes.c:941
msgid "report pruned notes"
msgstr "reportar notas podadas"
-#: builtin/notes.c:981
+#: builtin/notes.c:983
msgid "notes-ref"
msgstr "notes-ref"
-#: builtin/notes.c:982
+#: builtin/notes.c:984
msgid "use notes from <notes-ref>"
msgstr "usar notas de <notes-ref>"
-#: builtin/notes.c:1017 builtin/remote.c:1623
+#: builtin/notes.c:1019
#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "Subcomando desconhecido: %s"
+msgid "unknown subcommand: %s"
+msgstr "subcomando desconhecido: %s"
-#: builtin/pack-objects.c:28
+#: builtin/pack-objects.c:29
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [<opções>...] [< <lista-referências> | < <lista-"
"objetos>]"
-#: builtin/pack-objects.c:29
+#: builtin/pack-objects.c:30
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [<opções>...] <nome-base> [< <lista-referências> | < <lista-"
"objetos>]"
-#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
+#: builtin/pack-objects.c:179 builtin/pack-objects.c:182
#, c-format
msgid "deflate error (%d)"
msgstr "erro ao compactar (%d)"
-#: builtin/pack-objects.c:766
+#: builtin/pack-objects.c:768
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"a desativar escrita de mapa de bits, os pacotes são divididos devido a pack."
"packSizeLimit"
-#: builtin/pack-objects.c:779
+#: builtin/pack-objects.c:781
msgid "Writing objects"
msgstr "A escrever objetos"
-#: builtin/pack-objects.c:1037
+#: builtin/pack-objects.c:1070
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"a desativar escrita de mapa de bits, visto que alguns objetos não estão a "
"ser compactados"
-#: builtin/pack-objects.c:2197
+#: builtin/pack-objects.c:2346
msgid "Compressing objects"
msgstr "A comprimir objetos"
-#: builtin/pack-objects.c:2611
+#: builtin/pack-objects.c:2759
#, c-format
msgid "unsupported index version %s"
msgstr "versão de índice %s não suportada"
-#: builtin/pack-objects.c:2615
+#: builtin/pack-objects.c:2763
#, c-format
msgid "bad index version '%s'"
msgstr "versão de índice '%s' incorreta"
-#: builtin/pack-objects.c:2645
+#: builtin/pack-objects.c:2793
msgid "do not show progress meter"
msgstr "não mostrar medidor de progresso"
-#: builtin/pack-objects.c:2647
+#: builtin/pack-objects.c:2795
msgid "show progress meter"
msgstr "mostrar medidor de progresso"
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2797
msgid "show progress meter during object writing phase"
msgstr "mostrar medidor de progresso durante a fase de escrita de objetos"
-#: builtin/pack-objects.c:2652
+#: builtin/pack-objects.c:2800
msgid "similar to --all-progress when progress meter is shown"
msgstr "semelhante a --all-progress quando o medidor de progresso é mostrado"
-#: builtin/pack-objects.c:2653
+#: builtin/pack-objects.c:2801
msgid "version[,offset]"
msgstr "versão[,offset]"
-#: builtin/pack-objects.c:2654
+#: builtin/pack-objects.c:2802
msgid "write the pack index file in the specified idx format version"
msgstr ""
"escrever o ficheiro de índice do pacote na versão de formato especificada"
-#: builtin/pack-objects.c:2657
+#: builtin/pack-objects.c:2805
msgid "maximum size of each output pack file"
msgstr "tamanho máximo de cada ficheiro de pacote gerado"
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2807
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorar objetos emprestados do arquivo de objetos sobressalentes"
-#: builtin/pack-objects.c:2661
+#: builtin/pack-objects.c:2809
msgid "ignore packed objects"
msgstr "ignorar objetos compactados"
-#: builtin/pack-objects.c:2663
+#: builtin/pack-objects.c:2811
msgid "limit pack window by objects"
msgstr "limitar a janela de compactação por objetos"
-#: builtin/pack-objects.c:2665
+#: builtin/pack-objects.c:2813
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"limitar a janela de compactação por memória em adição ao limite por objetos"
-#: builtin/pack-objects.c:2667
+#: builtin/pack-objects.c:2815
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "tamanho máximo de cadeias delta permitidas no pacote resultante"
-#: builtin/pack-objects.c:2669
+#: builtin/pack-objects.c:2817
msgid "reuse existing deltas"
msgstr "reutilizar deltas existentes"
-#: builtin/pack-objects.c:2671
+#: builtin/pack-objects.c:2819
msgid "reuse existing objects"
msgstr "reutilizar objetos existentes"
-#: builtin/pack-objects.c:2673
+#: builtin/pack-objects.c:2821
msgid "use OFS_DELTA objects"
msgstr "usar objetos OFS_DELTA"
-#: builtin/pack-objects.c:2675
+#: builtin/pack-objects.c:2823
msgid "use threads when searching for best delta matches"
msgstr "usar threads ao procurar pela melhor correspondência delta"
-#: builtin/pack-objects.c:2677
+#: builtin/pack-objects.c:2825
msgid "do not create an empty pack output"
msgstr "não criar um pacote vazio"
-#: builtin/pack-objects.c:2679
+#: builtin/pack-objects.c:2827
msgid "read revision arguments from standard input"
msgstr "ler argumentos de revisão da entrada padrão"
-#: builtin/pack-objects.c:2681
+#: builtin/pack-objects.c:2829
msgid "limit the objects to those that are not yet packed"
msgstr "restringir-se aos objetos que ainda não foram compactados"
-#: builtin/pack-objects.c:2684
+#: builtin/pack-objects.c:2832
msgid "include objects reachable from any reference"
msgstr "incluir objetos alcançáveis a partir de qualquer referência"
-#: builtin/pack-objects.c:2687
+#: builtin/pack-objects.c:2835
msgid "include objects referred by reflog entries"
msgstr "incluir objetos referenciados por entradas do reflog"
-#: builtin/pack-objects.c:2690
+#: builtin/pack-objects.c:2838
msgid "include objects referred to by the index"
msgstr "incluir objetos referenciados pelo índice"
-#: builtin/pack-objects.c:2693
+#: builtin/pack-objects.c:2841
msgid "output pack to stdout"
msgstr "gerar pacote para a saída padrão"
-#: builtin/pack-objects.c:2695
+#: builtin/pack-objects.c:2843
msgid "include tag objects that refer to objects to be packed"
msgstr "incluir objetos tag que refiram objetos a compactar"
-#: builtin/pack-objects.c:2697
+#: builtin/pack-objects.c:2845
msgid "keep unreachable objects"
msgstr "manter objetos inalcançáveis"
-#: builtin/pack-objects.c:2699
+#: builtin/pack-objects.c:2847
msgid "pack loose unreachable objects"
msgstr "empacotar objetos soltos inalcançáveis"
-#: builtin/pack-objects.c:2700 parse-options.h:142
-msgid "time"
-msgstr "hora"
-
-#: builtin/pack-objects.c:2701
+#: builtin/pack-objects.c:2849
msgid "unpack unreachable objects newer than <time>"
msgstr "descompactar objetos inalcançáveis mais recentes que <hora>"
-#: builtin/pack-objects.c:2704
+#: builtin/pack-objects.c:2852
msgid "create thin packs"
msgstr "criar pacotes finos"
-#: builtin/pack-objects.c:2706
+#: builtin/pack-objects.c:2854
msgid "create packs suitable for shallow fetches"
msgstr "criar pacotes adequados para obter em repositórios pouco profundos"
-#: builtin/pack-objects.c:2708
+#: builtin/pack-objects.c:2856
msgid "ignore packs that have companion .keep file"
msgstr "ignorar pacotes que tenham um ficheiro .keep"
-#: builtin/pack-objects.c:2710
+#: builtin/pack-objects.c:2858
msgid "pack compression level"
msgstr "nível de compactação do pacote"
-#: builtin/pack-objects.c:2712
+#: builtin/pack-objects.c:2860
msgid "do not hide commits by grafts"
msgstr "não esconder commits introduzidos por enxertos"
-#: builtin/pack-objects.c:2714
+#: builtin/pack-objects.c:2862
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"usar um índice de mapa de bits se disponível, para acelerar a contagem de "
"objetos"
-#: builtin/pack-objects.c:2716
+#: builtin/pack-objects.c:2864
msgid "write a bitmap index together with the pack index"
msgstr "escrever um índice de mapa de bits juntamente com o índice do pacote"
-#: builtin/pack-objects.c:2829
+#: builtin/pack-objects.c:2993
msgid "Counting objects"
msgstr "A contar objetos"
msgid "cannot prune in a precious-objects repo"
msgstr "não é possível limpar num repositório de objetos-preciosos"
-#: builtin/pull.c:72
+#: builtin/pull.c:51 builtin/pull.c:53
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr "Valor inválido de %s: %s"
+
+#: builtin/pull.c:73
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<opções>] [<repositório> [<especificador-de-referência>...]]"
-#: builtin/pull.c:120
+#: builtin/pull.c:121
msgid "Options related to merging"
msgstr "Opções relativas a integração"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorporar alterações por rebase em vez de integrar"
-#: builtin/pull.c:147 builtin/revert.c:101
+#: builtin/pull.c:148 builtin/revert.c:101
msgid "allow fast-forward"
msgstr "permitir avanço rápido"
-#: builtin/pull.c:156
+#: builtin/pull.c:157
msgid "automatically stash/stash pop before and after rebase"
msgstr "empilhar/desempilhar automaticamente antes de depois de rebase"
-#: builtin/pull.c:172
+#: builtin/pull.c:173
msgid "Options related to fetching"
msgstr "Opções relacionadas com obtenção de objetos"
-#: builtin/pull.c:194
+#: builtin/pull.c:195
msgid "number of submodules pulled in parallel"
msgstr "número de submódulos puxados em paralelo"
-#: builtin/pull.c:283
+#: builtin/pull.c:284
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Valor inválido de pull.ff: %s"
-#: builtin/pull.c:379 git-sh-setup.sh:226
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr "Não é possível puxar com rebase: tem alterações não preparadas."
-
-#: builtin/pull.c:385 git-sh-setup.sh:252
-msgid "Additionally, your index contains uncommitted changes."
-msgstr "Além disso, o índice contém alterações não submetidas."
-
-#: builtin/pull.c:387 git-sh-setup.sh:245
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"Não é possível puxar com rebase: o índice contém alterações não submetidas."
-
-#: builtin/pull.c:463
+#: builtin/pull.c:397
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
"Não há nenhum candidato com o qual realizar rebase de entre as referências "
"que se acabaram de obter."
-#: builtin/pull.c:465
+#: builtin/pull.c:399
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Não há nenhum candidato com o qual integrar de entre as referências que se "
"acabaram obter."
-#: builtin/pull.c:466
+#: builtin/pull.c:400
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
"Geralmente, significa que forneceu um especificador de referência\n"
"com um carácter universal (wildcard) que não corresponde a nenhum remoto."
-#: builtin/pull.c:469
+#: builtin/pull.c:403
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"Uma vez que este não é o remoto configurado por predefinição\n"
"do ramo atual, deve especificar um ramo na linha de comandos."
-#: builtin/pull.c:474 git-parse-remote.sh:73
+#: builtin/pull.c:408 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Não se encontra em nenhum ramo de momento."
-#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
+#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Especifique o ramo sobre o qual pretende realizar rebase."
-#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
+#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Especifique o ramo com o qual pretende integrar."
-#: builtin/pull.c:479 builtin/pull.c:494
+#: builtin/pull.c:413 builtin/pull.c:428
msgid "See git-pull(1) for details."
msgstr "Consulte git-pull(1) para obter mais detalhes."
-#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr "<remoto>"
-#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451
+#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<ramo>"
-#: builtin/pull.c:489 git-parse-remote.sh:75
+#: builtin/pull.c:423 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "O ramo atual não segue nenhum ramo."
-#: builtin/pull.c:498 git-parse-remote.sh:95
+#: builtin/pull.c:432 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Se deseja definir o ramo que deve ser seguido por este ramo, pode fazê-lo "
"com:"
-#: builtin/pull.c:503
+#: builtin/pull.c:437
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"A configuração indica para integrar com a referência '%s'\n"
"do remoto, mas aquela referência não foi obtida."
-#: builtin/pull.c:820
+#: builtin/pull.c:754
msgid "ignoring --verify-signatures for rebase"
msgstr "ignorado --verify-signatures para rebase"
-#: builtin/pull.c:867
+#: builtin/pull.c:801
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "a opção --[no-]autostash só é válida com --rebase."
-#: builtin/pull.c:875
+#: builtin/pull.c:809
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
"A atualizar um ramo que ainda não foi criado e com alterações adicionadas ao "
"índice."
-#: builtin/pull.c:903
+#: builtin/pull.c:812
+msgid "pull with rebase"
+msgstr "puxar com rebase"
+
+#: builtin/pull.c:813
+msgid "please commit or stash them."
+msgstr "submeta ou esconda-as."
+
+#: builtin/pull.c:838
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"a avançar a árvore de trabalho a partir do\n"
"commit %s."
-#: builtin/pull.c:908
+#: builtin/pull.c:843
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"$ git reset --hard\n"
"para recuperar."
-#: builtin/pull.c:923
+#: builtin/pull.c:858
msgid "Cannot merge multiple branches into empty head."
msgstr "Não é possível integrar múltiplos ramos numa cabeça vazia."
-#: builtin/pull.c:927
+#: builtin/pull.c:862
msgid "Cannot rebase onto multiple branches."
msgstr "Não é possível efetuar rebase sobre múltiplos ramos."
msgid "debug unpack-trees"
msgstr "depurar unpack-trees"
-#: builtin/receive-pack.c:25
+#: builtin/receive-pack.c:26
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
-#: builtin/receive-pack.c:1843
+#: builtin/receive-pack.c:793
+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 'receive.denyCurrentBranch' configuration variable to\n"
+"'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 ""
+"Por predefinição, atualizar o ramo atual num repositório não-nu\n"
+"é proibido, porque tornará o índice e a árvore de trabalho inconsistentes\n"
+"com o que publicou e requererá 'git reset --hard' para igualar a\n"
+"árvore de trabalho à HEAD.\n"
+"\n"
+"Pode definir a variável configuração 'receive.denyCurrentBranch'\n"
+"como 'ignore' ou 'warn' no repositório remoto para permitir publicar\n"
+"para o ramo atual dele; no entanto, não é recomendando a menos que\n"
+"consiga de outra forma atualizar a árvore de trabalho dele para\n"
+"refletir o que publicou.\n"
+"\n"
+"Para suprimir esta mensagem e manter o comportamento predefinido, defina a "
+"variável de configuração 'receive.denyCurrentBranch' como 'refuse'."
+
+#: builtin/receive-pack.c:813
+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 ""
+"Por predefinição, eliminar o ramo atual é proibido, porque o próximo\n"
+"'git clone' não resultará em nenhum ficheiro extraído, causando confusão.\n"
+"\n"
+"Pode definir a variável de configuração 'receive.denyDeleteCurrent' como\n"
+"'warn' ou 'ignore' no repositório remoto para permitir eliminar o\n"
+"ramo atual, com ou sem uma mensagem de aviso.\n"
+"\n"
+"Para suprimir esta mensagem, pode definí-la como 'refuse'."
+
+#: builtin/receive-pack.c:1883
msgid "quiet"
msgstr "silencioso"
-#: builtin/receive-pack.c:1857
+#: builtin/receive-pack.c:1897
msgid "You must specify a directory."
msgstr "Deve especificar um diretório."
msgid " Fetch URL: %s"
msgstr " Obter do URL: %s"
-#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296
+#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
msgid "(no URL)"
msgstr "(nenhum URL)"
msgstr[0] " Ramo remoto:%s"
msgstr[1] " Ramos remotos:%s"
-#: builtin/remote.c:1179 builtin/remote.c:1206
+#: builtin/remote.c:1179 builtin/remote.c:1205
msgid " (status not queried)"
msgstr " (estado não consultado)"
msgid " Local refs will be mirrored by 'git push'"
msgstr " Referências locais serão refletidas (mirror) por 'git push'"
-#: builtin/remote.c:1203
+#: builtin/remote.c:1202
#, 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 para 'git push'%s:"
msgstr[1] " Referências locais configuradas para 'git push'%s:"
-#: builtin/remote.c:1224
+#: builtin/remote.c:1223
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "definir refs/remotes/<nome>/HEAD de acordo com o remoto"
-#: builtin/remote.c:1226
+#: builtin/remote.c:1225
msgid "delete refs/remotes/<name>/HEAD"
msgstr "eliminar refs/remotes/<nome>/HEAD"
-#: builtin/remote.c:1241
+#: builtin/remote.c:1240
msgid "Cannot determine remote HEAD"
msgstr "Não é possível determinar o remoto HEAD"
-#: builtin/remote.c:1243
+#: builtin/remote.c:1242
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Múltiplos ramos HEAD remotos. Escolha um explicitamente com:"
-#: builtin/remote.c:1253
+#: builtin/remote.c:1252
#, c-format
msgid "Could not delete %s"
msgstr "Não foi possível eliminar %s"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1260
#, c-format
msgid "Not a valid ref: %s"
msgstr "Referência inválida: %s"
-#: builtin/remote.c:1263
+#: builtin/remote.c:1262
#, c-format
msgid "Could not setup %s"
msgstr "Não foi possível configurar %s"
-#: builtin/remote.c:1281
+#: builtin/remote.c:1280
#, c-format
msgid " %s will become dangling!"
msgstr " %s ficará suspenso!"
-#: builtin/remote.c:1282
+#: builtin/remote.c:1281
#, c-format
msgid " %s has become dangling!"
msgstr " %s ficou suspenso!"
-#: builtin/remote.c:1292
+#: builtin/remote.c:1291
#, c-format
msgid "Pruning %s"
msgstr "A eliminar %s"
-#: builtin/remote.c:1293
+#: builtin/remote.c:1292
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1309
+#: builtin/remote.c:1308
#, c-format
msgid " * [would prune] %s"
msgstr " * [eliminaria] %s"
-#: builtin/remote.c:1312
+#: builtin/remote.c:1311
#, c-format
msgid " * [pruned] %s"
msgstr " * [eliminado] %s"
-#: builtin/remote.c:1357
+#: builtin/remote.c:1356
msgid "prune remotes after fetching"
msgstr "eliminar remotos depois de obter"
-#: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542
+#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
#, c-format
msgid "No such remote '%s'"
msgstr "Remoto inexistente '%s'"
-#: builtin/remote.c:1436
+#: builtin/remote.c:1435
msgid "add branch"
msgstr "adicionar ramo"
-#: builtin/remote.c:1443
+#: builtin/remote.c:1442
msgid "no remote specified"
msgstr "nenhum remoto especificado"
-#: builtin/remote.c:1460
+#: builtin/remote.c:1459
msgid "query push URLs rather than fetch URLs"
msgstr "consultar URLs de publicação em vez de URLs utilizados para obter"
-#: builtin/remote.c:1462
+#: builtin/remote.c:1461
msgid "return all URLs"
msgstr "retornar todos os URLs"
-#: builtin/remote.c:1490
+#: builtin/remote.c:1489
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "o remoto '%s' não tem nenhum URL configurado"
-#: builtin/remote.c:1516
+#: builtin/remote.c:1515
msgid "manipulate push URLs"
msgstr "manipular URLs de publicação"
-#: builtin/remote.c:1518
+#: builtin/remote.c:1517
msgid "add URL"
msgstr "adicionar URL"
-#: builtin/remote.c:1520
+#: builtin/remote.c:1519
msgid "delete URLs"
msgstr "eliminar URLs"
-#: builtin/remote.c:1527
+#: builtin/remote.c:1526
msgid "--add --delete doesn't make sense"
msgstr "--add --delete não faz sentido"
-#: builtin/remote.c:1568
+#: builtin/remote.c:1567
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Padrão de URL antigo inválido: %s"
-#: builtin/remote.c:1576
+#: builtin/remote.c:1575
#, c-format
msgid "No such URL found: %s"
msgstr "URL não encontrado: %s"
-#: builtin/remote.c:1578
+#: builtin/remote.c:1577
msgid "Will not delete all non-push URLs"
msgstr "Não é possível remover todos os URLs de não publicação"
-#: builtin/remote.c:1592
+#: builtin/remote.c:1591
msgid "be verbose; must be placed before a subcommand"
msgstr "ser verboso; deve ser colocado antes de um subcomando"
+#: builtin/remote.c:1622
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Subcomando desconhecido: %s"
+
#: builtin/repack.c:17
msgid "git repack [<options>]"
msgstr "git repack [<opções>]"
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
#: builtin/reset.c:27
-msgid "git reset [-q]
<tree-ish> [--] <paths>..."
-msgstr "git reset [-q] <árvore-etc> [--] <caminhos>..."
+msgid "git reset [-q]
[<tree-ish>] [--] <paths>..."
+msgstr "git reset [-q] [<árvore-etc>] [--] <caminhos>..."
#: builtin/reset.c:28
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgid "Could not write new index file."
msgstr "Não foi possível escrever novo ficheiro de índice."
-#: builtin/rev-list.c:362
+#: builtin/rev-list.c:354
msgid "rev-list does not support display of notes"
msgstr "rev-list não suporta apresentação de notas"
-#: builtin/rev-parse.c:358
+#: builtin/rev-parse.c:386
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<opções>] -- [<argumentos>...]"
-#: builtin/rev-parse.c:363
+#: builtin/rev-parse.c:391
msgid "keep the `--` passed as an arg"
msgstr "conservar '--' passado como argumento"
-#: builtin/rev-parse.c:365
+#: builtin/rev-parse.c:393
msgid "stop parsing after the first non-option argument"
msgstr "parar de analisar depois do primeiro argumento que não seja uma opção"
-#: builtin/rev-parse.c:368
+#: builtin/rev-parse.c:396
msgid "output in stuck long form"
msgstr "mostrar em formato fixo e longo"
-#: builtin/rev-parse.c:499
+#: builtin/rev-parse.c:527
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
msgid "revert failed"
msgstr "falha ao reverter"
-#: builtin/revert.c:207
+#: builtin/revert.c:205
msgid "cherry-pick failed"
msgstr "falha ao efetuar cherry-pick"
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<referência>]"
-#: builtin/show-branch.c:640
+#: builtin/show-branch.c:375
+#, c-format
+msgid "ignoring %s; cannot handle more than %d ref"
+msgid_plural "ignoring %s; cannot handle more than %d refs"
+msgstr[0] "ignorar %s; não é possível processar mais do que %d referência"
+msgstr[1] "ingorar %s; não é possível processar mais do que %d referências"
+
+#: builtin/show-branch.c:541
+#, c-format
+msgid "no matching refs with %s"
+msgstr "nenhuma referência corresponde com %s"
+
+#: builtin/show-branch.c:639
msgid "show remote-tracking and local branches"
msgstr "mostrar os ramos de monitorização remotos e os ramos locais"
-#: builtin/show-branch.c:642
+#: builtin/show-branch.c:641
msgid "show remote-tracking branches"
msgstr "mostrar os ramos de monitorização remotos"
-#: builtin/show-branch.c:644
+#: builtin/show-branch.c:643
msgid "color '*!+-' corresponding to the branch"
msgstr "colorir '*!+-' correspondendo ao ramo"
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show <n> more commits after the common ancestor"
msgstr "mostrar mais <n> commits depois do antecessor comum"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "synonym to more=-1"
msgstr "sinónimo de more=-1"
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
msgid "suppress naming strings"
msgstr "suprimir a cadeias de caracteres de nomes"
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
msgid "include the current branch"
msgstr "incluir o ramo atual"
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
msgid "name commits with their object names"
msgstr "designar commits pelos seus nomes de objeto"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "show possible merge bases"
msgstr "mostrar possíveis bases de integração"
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "show refs unreachable from any other ref"
msgstr "mostrar referências inalcançáveis a partir de outras referências"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "show commits in topological order"
msgstr "mostrar commits em ordem topológica"
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
msgid "show only commits not on the first branch"
msgstr "mostrar apenas commits não presentes no primeiro ramo"
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
msgid "show merges reachable from only one tip"
msgstr "mostrar integrações alcançáveis a partir duma única ponta"
-#: builtin/show-branch.c:666
+#: builtin/show-branch.c:665
msgid "topologically sort, maintaining date order where possible"
msgstr ""
"ordenar topologicamente, mantendo a ordenação por data sempre que possível"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
msgid "show <n> most recent ref-log entries starting at base"
msgstr "mostrar as <n> entradas de ref-log mais recente a partir da base"
+#: builtin/show-branch.c:703
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+msgstr ""
+"--reflog é incompatível com --all, --remotes, --independent or --merge-base"
+
+#: builtin/show-branch.c:727
+msgid "no branches given, and HEAD is not valid"
+msgstr "nenhum ramo fornecido e HEAD não é válida"
+
+#: builtin/show-branch.c:730
+msgid "--reflog option needs one branch name"
+msgstr "a opção --reflog precisa do nome de um ramo"
+
+#: builtin/show-branch.c:733
+#, 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] "apenas %d entrada podem ser mostradas neste momento."
+msgstr[1] "apenas %d entradas podem ser mostradas neste momento."
+
+#: builtin/show-branch.c:737
+#, c-format
+msgid "no such ref %s"
+msgstr "referência inexistente %s"
+
+#: builtin/show-branch.c:829
+#, c-format
+msgid "cannot handle more than %d rev."
+msgid_plural "cannot handle more than %d revs."
+msgstr[0] "não é possível processar mais do que %d revisão."
+msgstr[1] "não é possível processar mais do que %d revisões."
+
+#: builtin/show-branch.c:833
+#, c-format
+msgid "'%s' is not a valid ref."
+msgstr "'%s' não é uma referência válida."
+
+#: builtin/show-branch.c:836
+#, c-format
+msgid "cannot find commit %s (%s)"
+msgstr "não é possível encontrar o commit %s (%s)"
+
#: builtin/show-ref.c:10
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
msgid "prepend comment character and space to each line"
msgstr "preceder cada linha com um carácter de comentário e um espaço"
-#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:923
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1046
#, c-format
msgid "No such ref: %s"
msgstr "Referência inexistente: %s"
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Esperava-se um nome completo de uma referência, obteve-se %s"
msgid "cannot strip one component off url '%s'"
msgstr "não é possível tirar um componente do URL '%s'"
-#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403
-#: builtin/submodule--helper.c:483
+#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408
+#: builtin/submodule--helper.c:590
msgid "alternative anchor for relative paths"
msgstr "âncora alternativa para caminhos relativos"
-#: builtin/submodule--helper.c:283
+#: builtin/submodule--helper.c:287
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<caminho>] [<caminho>...]"
-#: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338
+#: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Nenhum URL encontrado para o caminho de submódulo '%s' em .gitmodules"
-#: builtin/submodule--helper.c:364
+#: builtin/submodule--helper.c:369
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Falha ao registar o URL do caminho de submódulo '%s'"
-#: builtin/submodule--helper.c:368
+#: builtin/submodule--helper.c:373
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Submódulo '%s' (%s) registado com caminho '%s'\n"
-#: builtin/submodule--helper.c:378
+#: builtin/submodule--helper.c:383
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "aviso: modo de atualização do comando sugerido para o submódulo '%s'\n"
-#: builtin/submodule--helper.c:385
+#: builtin/submodule--helper.c:390
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "Falha ao registar o modo de atualização do caminho de submódulo '%s'"
-#: builtin/submodule--helper.c:404
+#: builtin/submodule--helper.c:409
msgid "Suppress output for initializing a submodule"
msgstr "Suprimir a saída ao inicializar um submódulo"
-#: builtin/submodule--helper.c:409
+#: builtin/submodule--helper.c:414
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<caminho>]"
-#: builtin/submodule--helper.c:430
+#: builtin/submodule--helper.c:435
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <caminho>"
-#: builtin/submodule--helper.c:436
+#: builtin/submodule--helper.c:441
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
"nenhum mapeamento de submódulo do caminho '%s' encontrado em .gitmodules"
-#: builtin/submodule--helper.c:486
+#: builtin/submodule--helper.c:524 builtin/submodule--helper.c:527
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
+msgstr "o submódulo '%s' não pode adicionar sobressalente: %s"
+
+#: builtin/submodule--helper.c:563
+#, c-format
+msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+msgstr "O valor '%s' de submodule.alternateErrorStrategy não é reconhecido"
+
+#: builtin/submodule--helper.c:570
+#, c-format
+msgid "Value '%s' for submodule.alternateLocation is not recognized"
+msgstr "O valor '%s' de submodule.alternateLocation não é reconhecido"
+
+#: builtin/submodule--helper.c:593
msgid "where the new submodule will be cloned to"
msgstr "sítio para aonde o novo submódulo será clonado"
-#: builtin/submodule--helper.c:489
+#: builtin/submodule--helper.c:596
msgid "name of the new submodule"
msgstr "nome do novo submódulo"
-#: builtin/submodule--helper.c:492
+#: builtin/submodule--helper.c:599
msgid "url where to clone the submodule from"
msgstr "url donde clonar o submódulos"
-#: builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:605
msgid "depth for shallow clones"
msgstr "profundidade de clones rasos"
-#: builtin/submodule--helper.c:504
+#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964
+msgid "force cloning progress"
+msgstr "forçar progresso da clonagem"
+
+#: builtin/submodule--helper.c:613
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
"git submodule--helper clone [--prefix=<caminho>] [--quiet] [--reference "
"<repositório>] [--name <nome>] [--depth <depth>] --url <url> --path <caminho>"
-#: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535
+#: builtin/submodule--helper.c:638 builtin/submodule--helper.c:648
#, c-format
msgid "could not create directory '%s'"
msgstr "não foi possível criar o diretório '%s'"
-#: builtin/submodule--helper.c:531
+#: builtin/submodule--helper.c:644
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "falha ao clonar '%s' no caminho de submódulo '%s'"
-#: builtin/submodule--helper.c:547
+#: builtin/submodule--helper.c:660
#, c-format
msgid "cannot open file '%s'"
msgstr "não é possível abrir o ficheiro '%s'"
-#: builtin/submodule--helper.c:552
+#: builtin/submodule--helper.c:665
#, c-format
msgid "could not close file %s"
msgstr "não é possível fechar o ficheiro %s"
-#: builtin/submodule--helper.c:559
+#: builtin/submodule--helper.c:672
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "não foi possível obter o diretório do submódulo de '%s'"
-#: builtin/submodule--helper.c:611
+#: builtin/submodule--helper.c:726
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Caminho de submódulo '%s' não inicializado"
-#: builtin/submodule--helper.c:615
+#: builtin/submodule--helper.c:730
msgid "Maybe you want to use 'update --init'?"
msgstr "Pretendia usar 'update --init'?"
-#: builtin/submodule--helper.c:641
+#: builtin/submodule--helper.c:756
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "A ignorar submódulo %s não integrado"
-#: builtin/submodule--helper.c:662
+#: builtin/submodule--helper.c:777
#, c-format
msgid "Skipping submodule '%s'"
msgstr "A ignorar submódulo '%s'"
-#: builtin/submodule--helper.c:792
+#: builtin/submodule--helper.c:913
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Falha ao clonar '%s'. Nova tentativa agendada"
-#: builtin/submodule--helper.c:803
+#: builtin/submodule--helper.c:924
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Falha ao clonar '%s' pela segunda vez, abortado"
-#: builtin/submodule--helper.c:824
+#: builtin/submodule--helper.c:945
msgid "path into the working tree"
msgstr "caminho para a árvore de trabalho"
-#: builtin/submodule--helper.c:827
+#: builtin/submodule--helper.c:948
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
"caminho para a árvore de trabalho, atravessando limites de submódulos "
"aninhados"
-#: builtin/submodule--helper.c:831
+#: builtin/submodule--helper.c:952
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout ou none"
-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:956
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "criar um clone raso, truncado ao número especificado de revisões"
-#: builtin/submodule--helper.c:838
+#: builtin/submodule--helper.c:959
msgid "parallel jobs"
msgstr "trabalhos em paralelo"
-#: builtin/submodule--helper.c:840
+#: builtin/submodule--helper.c:961
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "se o clone inicial deve seguir a recomendação rasa"
-#: builtin/submodule--helper.c:841
+#: builtin/submodule--helper.c:962
msgid "don't print cloning progress"
msgstr "não imprimir progresso da clonagem"
-#: builtin/submodule--helper.c:846
+#: builtin/submodule--helper.c:969
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<caminho>] [<caminho>...]"
-#: builtin/submodule--helper.c:856
+#: builtin/submodule--helper.c:979
msgid "bad value for update parameter"
msgstr "valor incorreto no parâmetro update"
-#: builtin/submodule--helper.c:927
+#: builtin/submodule--helper.c:1050
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"O ramo do submódulo (%s) foi configurado para herdar o ramo do superprojeto, "
"mas o superprojeto não está em nenhum ramo"
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:1100
msgid "submodule--helper subcommand must be called with a subcommand"
msgstr "o subcomando submodule--helper deve ser invocado com um subcomando"
-#: builtin/submodule--helper.c:984
+#: builtin/submodule--helper.c:1107
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' não é um subcomando válido de submodule--helper"
msgid "Updated tag '%s' (was %s)\n"
msgstr "Tag '%s' atualizada (era %s)\n"
-#: builtin/unpack-objects.c:490
+#: builtin/unpack-objects.c:493
msgid "Unpacking objects"
msgstr "A descompactar objetos"
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:575
+#: builtin/update-index.c:564
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<opções>] [--] [<ficheiro>...]"
-#: builtin/update-index.c:930
+#: builtin/update-index.c:919
msgid "continue refresh even when index needs update"
msgstr "continuar a refrescar mesmo quando o índice precise de ser atualizado"
-#: builtin/update-index.c:933
+#: builtin/update-index.c:922
msgid "refresh: ignore submodules"
msgstr "refrescar: ignorar submódulos"
-#: builtin/update-index.c:936
+#: builtin/update-index.c:925
msgid "do not ignore new files"
msgstr "não ignorar novos ficheiros"
-#: builtin/update-index.c:938
+#: builtin/update-index.c:927
msgid "let files replace directories and vice-versa"
msgstr "deixar que os ficheiros substituam os diretórios e vice-versa"
-#: builtin/update-index.c:940
+#: builtin/update-index.c:929
msgid "notice files missing from worktree"
msgstr "avisar sobre ficheiros que faltem na árvore de trabalho"
-#: builtin/update-index.c:942
+#: builtin/update-index.c:931
msgid "refresh even if index contains unmerged entries"
msgstr "refrescar mesmo que o índice contenha entradas não integradas"
-#: builtin/update-index.c:945
+#: builtin/update-index.c:934
msgid "refresh stat information"
msgstr "refrescar informação de stat"
-#: builtin/update-index.c:949
+#: builtin/update-index.c:938
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "como --refresh, mas ignorar a definição assume-unchanged"
-#: builtin/update-index.c:953
+#: builtin/update-index.c:942
msgid "<mode>,<object>,<path>"
msgstr "<modo>,<objeto>,<caminho>"
-#: builtin/update-index.c:954
+#: builtin/update-index.c:943
msgid "add the specified entry to the index"
msgstr "adicionar o elemento especificado ao índice"
-#: builtin/update-index.c:963
+#: builtin/update-index.c:952
msgid "mark files as \"not changing\""
msgstr "marcar ficheiros como \"não alterados\""
-#: builtin/update-index.c:966
+#: builtin/update-index.c:955
msgid "clear assumed-unchanged bit"
msgstr "limpar o bit assumed-unchanged"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:958
msgid "mark files as \"index-only\""
msgstr "marcar ficheiros como \"únicos do índice\""
-#: builtin/update-index.c:972
+#: builtin/update-index.c:961
msgid "clear skip-worktree bit"
msgstr "limpar o bit ignorar-árvore-de-trabalho"
-#: builtin/update-index.c:975
+#: builtin/update-index.c:964
msgid "add to index only; do not add content to object database"
msgstr ""
"só adicionar ao índice; não adicionar o conteúdo à base de dados de objetos"
-#: builtin/update-index.c:977
+#: builtin/update-index.c:966
msgid "remove named paths even if present in worktree"
msgstr ""
"remover os caminhos mencionado mesmo se estiverem presentes na árvore de "
"trabalho"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:968
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "com --stdin: as linhas da entrada são terminadas com bytes nulos"
-#: builtin/update-index.c:981
+#: builtin/update-index.c:970
msgid "read list of paths to be updated from standard input"
msgstr "ler lista de caminho a atualizar da entrada padrão"
-#: builtin/update-index.c:985
+#: builtin/update-index.c:974
msgid "add entries from standard input to the index"
msgstr "adicionar elementos da entrada padrão ao índice"
-#: builtin/update-index.c:989
+#: builtin/update-index.c:978
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "repovoar as fases nº2 e nº3 dos caminhos listados"
-#: builtin/update-index.c:993
+#: builtin/update-index.c:982
msgid "only update entries that differ from HEAD"
msgstr "atualizar apenas elementos que difiram de HEAD"
-#: builtin/update-index.c:997
+#: builtin/update-index.c:986
msgid "ignore files missing from worktree"
msgstr "ignorar ficheiros não presentes na árvore de trabalho"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:989
msgid "report actions to standard output"
msgstr "mostrar ações na saída padrão"
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:991
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
"(para porcelanas) esquecer conflitos guardados que não foram resolvidos"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:995
msgid "write index in this format"
msgstr "escrever o índice neste formato"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:997
msgid "enable or disable split index"
msgstr "ativar ou desativar a divisão do índice"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:999
msgid "enable/disable untracked cache"
msgstr "ativar ou desativar cache não controlada"
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1001
msgid "test if the filesystem supports untracked cache"
msgstr "testar se o sistema de ficheiros suporta cache não controlada"
-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1003
msgid "enable untracked cache without testing the filesystem"
msgstr "ativar cache não controlada sem testar o sistema de ficheiros"
-#: builtin/update-index.c:1134
+#: builtin/update-index.c:1119
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
+msgstr ""
+"core.untrackedCache está definida como true; remova ou altere-a se pretende "
+"mesmo desativar a cache não controlada"
+
+#: builtin/update-index.c:1123
msgid "Untracked cache disabled"
msgstr "A cache não controlada está desativada"
-#: builtin/update-index.c:1146
+#: builtin/update-index.c:1131
+msgid ""
+"core.untrackedCache is set to false; remove or change it, if you really want "
+"to enable the untracked cache"
+msgstr ""
+"core.untrackedCache está definida como false; remova ou altere-a se pretende "
+"mesmo ativar a cache não controlada"
+
+#: builtin/update-index.c:1135
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "A cache não controlada de '%s' foi ativada."
msgid "only useful for debugging"
msgstr "apenas útil para depuração"
-#: upload-pack.c:20
+#: upload-pack.c:22
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<opções>] <dir>"
-#: upload-pack.c:837
+#: upload-pack.c:1028
msgid "quit after a single request/response exchange"
msgstr "terminar depois de uma única troca de pedido/resposta"
-#: upload-pack.c:839
+#: upload-pack.c:1030
msgid "exit immediately after initial ref advertisement"
msgstr "sair imediatamente depois do anúncio inicial da referência"
-#: upload-pack.c:841
+#: upload-pack.c:1032
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr "não tentar <diretório>/.git/ se o <diretório> não for um diretório Git"
-#: upload-pack.c:843
+#: upload-pack.c:1034
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "interromper transferência depois de <n> segundos de inatividade"
+#: credential-cache--daemon.c:223
+#, 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 ""
+"As permissões do diretório do socket são demasiado fracas; outros\n"
+"utilizadores poderão conseguir as suas credenciais em cache. Considere "
+"executar:\n"
+"\n"
+"\tchmod 0700 %s"
+
#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "imprimir mensagens de depuração no stderr"
"guias de conceitos. Consulte 'git help <comando>' ou 'git help <conceito>'\n"
"para ler sobre um subcomando ou conceito específico."
-#: http.c:323
+#: http.c:342
+msgid "Delegation control is not supported with cURL < 7.22.0"
+msgstr "Não é suportado delegar controlo com cURL < 7.22.0"
+
+#: http.c:351
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "Não é suportado afixar chaves públicas com cURL < 7.44.0"
msgid "no-op (backward compatibility)"
msgstr "sem-ação (retrocompatibilidade)"
-#: parse-options.h:237
+#: parse-options.h:238
msgid "be more verbose"
msgstr "ser mais verboso"
-#: parse-options.h:239
+#: parse-options.h:240
msgid "be more quiet"
msgstr "ser mais silencioso"
-#: parse-options.h:245
+#: parse-options.h:246
msgid "use <n> digits to display SHA-1s"
msgstr "usar <n> dígitos para mostrar SHA-1s"
msgstr "A integração automática não funcionou."
#: git-merge-octopus.sh:62
-msgid "Should not be doing an Octopus."
-msgstr "Não devia estar a fazer um Polvo."
+msgid "Should not be doing an octopus."
+msgstr "Não se deviria estar a fazer um polvo."
#: git-merge-octopus.sh:73
#, sh-format
#: git-rebase.sh:610
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
-"Primeiro, a recuar a cabeça para replicar as suas alterações no topo desta..."
+"Primeiro, a recuar a cabeça para replicar as suas alterações no topo dela..."
#: git-rebase.sh:620
#, sh-format
msgid "Cannot save the current index state"
msgstr "Não é possível guardar o estado atual do índice"
+#: git-stash.sh:103
+msgid "Cannot save the untracked files"
+msgstr "Não é possível guardar os ficheiros não controlados"
+
#: git-stash.sh:123 git-stash.sh:136
msgid "Cannot save the current worktree state"
msgstr "Não é possível guardar o estado atual da árvore de trabalho"
"erro: opção desconhecida de 'stash save': $option\n"
" Para fornecer uma mensagem, use git stash save -- '$option'"
+#: git-stash.sh:251
+msgid "Can't use --patch and --include-untracked or --all at the same time"
+msgstr ""
+"Não é possível usar --patch e --include-untracked ou --all ao mesmo tempo"
+
#: git-stash.sh:259
msgid "No local changes to save"
msgstr "Não há alterações locais para guardar"
msgid "Cannot remove worktree changes"
msgstr "Não é possível remover as alterações da árvore de trabalho"
-#: git-stash.sh:404
+#: git-stash.sh:403
#, sh-format
msgid "unknown option: $opt"
msgstr "opção desconhecido: $opt"
-#: git-stash.sh:414
+#: git-stash.sh:416
msgid "No stash found."
msgstr "Nenhuma pilha encontrada."
-#: git-stash.sh:421
+#: git-stash.sh:423
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Demasiadas revisões especificadas: $REV"
-#: git-stash.sh:427
+#: git-stash.sh:438
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference não é uma referência válida"
-#: git-stash.sh:455
+#: git-stash.sh:466
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' não é um commit semelhante a pilha"
-#: git-stash.sh:466
+#: git-stash.sh:477
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' não é uma referência de pilha"
-#: git-stash.sh:474
+#: git-stash.sh:485
msgid "unable to refresh index"
msgstr "não foi possível refrescar o índice"
-#: git-stash.sh:478
+#: git-stash.sh:489
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Não é possível aplicar uma pilha durante uma integração"
-#: git-stash.sh:486
+#: git-stash.sh:497
msgid "Conflicts in index. Try without --index."
msgstr "Conflitos no índice. Tente sem --index."
-#: git-stash.sh:488
+#: git-stash.sh:499
msgid "Could not save index tree"
msgstr "Não foi possível guardar árvore do índice"
-#: git-stash.sh:522
+#: git-stash.sh:508
+msgid "Could not restore untracked files from stash"
+msgstr "Não foi possível restaurar os ficheiros não controlados da pilha"
+
+#: git-stash.sh:533
msgid "Cannot unstage modified files"
msgstr "Não é possível despreparar os ficheiros modificado"
-#: git-stash.sh:537
+#: git-stash.sh:548
msgid "Index was not unstashed."
msgstr "O índice não foi reposto."
-#: git-stash.sh:551
+#: git-stash.sh:562
msgid "The stash is kept in case you need it again."
msgstr "A pilha é guarda no caso de precisar dela de novo."
-#: git-stash.sh:560
+#: git-stash.sh:571
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "A descartar ${REV} ($s)"
-#: git-stash.sh:561
+#: git-stash.sh:572
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Não foi possível descartar elemento da pilha"
-#: git-stash.sh:569
+#: git-stash.sh:580
msgid "No branch name specified"
msgstr "Nenhum nome de ramo especificado"
-#: git-stash.sh:641
+#: git-stash.sh:652
msgid "(To restore them type \"git stash apply\")"
msgstr "(Para os restaurar execute \"git stash apply\")"
-#: git-submodule.sh:183
+#: git-submodule.sh:184
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"Os caminhos relativos só podem ser usados a partir do topo da árvore de "
"trabalho"
-#: git-submodule.sh:193
+#: git-submodule.sh:194
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "URL do repositório: '$repo' deve ser absoluto ou começar com ./|../"
-#: git-submodule.sh:210
+#: git-submodule.sh:211
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' já existe no índice"
-#: git-submodule.sh:214
+#: git-submodule.sh:215
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
"$sm_path\n"
"Use -f se pretende mesmo adicioná-lo."
-#: git-submodule.sh:232
+#: git-submodule.sh:233
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "A adicionar repositório existente em '$sm_path' ao índice"
-#: git-submodule.sh:234
+#: git-submodule.sh:235
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' já existe e não é uma repositório git válido"
-#: git-submodule.sh:242
+#: git-submodule.sh:243
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Um diretório git de '$sm_name' foi encontrado localmente com os remotos:"
-#: git-submodule.sh:244
+#: git-submodule.sh:245
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
"ou não tem a certeza o que isto significa escolha outro nome com a opção '--"
"name'."
-#: git-submodule.sh:250
+#: git-submodule.sh:251
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "A reativar o diretório git local do submódulo '$sm_name'."
-#: git-submodule.sh:262
+#: git-submodule.sh:263
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Não foi possível extrair o submódulo '$sm_path'"
-#: git-submodule.sh:267
+#: git-submodule.sh:268
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Falha ao adicionar o submódulo '$sm_path'"
-#: git-submodule.sh:276
+#: git-submodule.sh:277
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Falha ao registar o submódulo '$sm_path'"
-#: git-submodule.sh:323
+#: git-submodule.sh:324
#, sh-format
msgid "Entering '$displaypath'"
msgstr "A entrar em '$displaypath'"
-#: git-submodule.sh:343
+#: git-submodule.sh:344
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr ""
"Interrompido em '$displaypath'; o script retornou um valor diferente de zero."
-#: git-submodule.sh:414
+#: git-submodule.sh:415
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr "especificador de caminho e --all são incompatíveis"
-#: git-submodule.sh:419
+#: git-submodule.sh:420
#, sh-format
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
"Use '--all' se pretende mesmo anular a inicialização todos os submódulos"
-#: git-submodule.sh:439
+#: git-submodule.sh:440
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains a .git directory\n"
"A árvore de trabalho do submódulo '$displaypath' contem um diretório .git\n"
"(use 'rm -rf' se pretende mesmo removê-lo, incluindo todo o seu histórico)"
-#: git-submodule.sh:447
+#: git-submodule.sh:448
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
"A árvore de trabalho do submódulo '$displaypath' contém alterações locais; "
"use '-f' para as descartar"
-#: git-submodule.sh:450
+#: git-submodule.sh:451
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Diretório '$displaypath' limpo"
-#: git-submodule.sh:451
+#: git-submodule.sh:452
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr ""
"Não foi possível remover a árvore de trabalho do submódulo '$displaypath'"
-#: git-submodule.sh:454
+#: git-submodule.sh:455
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "Não foi possível criar o diretório vazio do submódulo '$displaypath'"
-#: git-submodule.sh:463
+#: git-submodule.sh:464
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
"O registo do submódulo '$name' ($url) foi removido do caminho '$displaypath'"
-#: git-submodule.sh:612
+#: git-submodule.sh:617
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
"Não foi possível encontrar a revisão atual no caminho de submódulo "
"'$displaypath'"
-#: git-submodule.sh:622
+#: git-submodule.sh:627
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Não foi possível obter no caminho de submódulo '$sm_path'"
-#: git-submodule.sh:627
+#: git-submodule.sh:632
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"Não foi possível encontrar a revisão atual ${remote_name}/${branch} no "
"caminho de submódulo '$sm_path'"
-#: git-submodule.sh:645
+#: git-submodule.sh:650
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Não é possível obter no caminho de submódulo '$displaypath'"
-#: git-submodule.sh:651
+#: git-submodule.sh:656
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Obteve-se no caminho de submódulo '$displaypath', mas não continha $sha1. "
"Falha ao obter aquele commit diretamente."
-#: git-submodule.sh:658
+#: git-submodule.sh:663
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Não é possível extrair '$sha1' no caminho de submódulo '$displaypath'"
-#: git-submodule.sh:659
+#: git-submodule.sh:664
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Caminho de submódulo '$displaypath': '$sha1' extraído"
-#: git-submodule.sh:663
+#: git-submodule.sh:668
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
"Não foi possível efetuar rebase de '$sha1' no caminho de submódulo "
"'$displaypath'"
-#: git-submodule.sh:664
+#: git-submodule.sh:669
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Caminho de submódulo '$displaypath': rebase concluído em '$sha1'"
-#: git-submodule.sh:669
+#: git-submodule.sh:674
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Não é possível integrar '$sha1' no caminho de submódulo '$displaypath'"
-#: git-submodule.sh:670
+#: git-submodule.sh:675
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Caminho de submódulo '$displaypath': integrado em '$sha1'"
-#: git-submodule.sh:675
+#: git-submodule.sh:680
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"Falha ao executar '$command $sha1' no caminho de submódulo '$displaypath'"
-#: git-submodule.sh:676
+#: git-submodule.sh:681
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Caminho de submódulo '$displaypath': '$command $sha1'"
-#: git-submodule.sh:707
+#: git-submodule.sh:712
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Falha ao percorrer o caminho de submódulo '$displaypath'"
-#: git-submodule.sh:815
+#: git-submodule.sh:820
msgid "The --cached option cannot be used with the --files option"
msgstr "A opção --cached não pode ser usada com a opção --files"
-#: git-submodule.sh:867
+#: git-submodule.sh:872
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "modo inesperado $mod_dst"
-#: git-submodule.sh:887
+#: git-submodule.sh:892
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Aviso: $display_name não contém o commit $sha1_src"
-#: git-submodule.sh:890
+#: git-submodule.sh:895
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Warn: $display_name não contém o commit $sha1_dst"
-#: git-submodule.sh:893
+#: git-submodule.sh:898
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " Warn: $display_name contém os commits $sha1_src e $sha1_dst"
-#: git-submodule.sh:918
-msgid "blob"
-msgstr "blob"
-
-#: git-submodule.sh:1040
+#: git-submodule.sh:1045
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Falha ao percorrer recursivamente o caminho de submódulo '$sm_path'"
-#: git-submodule.sh:1107
+#: git-submodule.sh:1112
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "A sincronizar o URL do submódulo '$displaypath'"
"Ignorado."
#: git-rebase--interactive.sh:1044
-msgid "You can fix this with 'git rebase --edit-todo'."
-msgstr "Pode corrí-lo com 'git rebase --edit-todo'."
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'."
+msgstr ""
+"Pode corrí-lo com 'git rebase --edit-todo' e depois executar 'git rebase --"
+"continue'."
#: git-rebase--interactive.sh:1045
msgid "Or you can abort the rebase with 'git rebase --abort'."
"\n"
" git commit $gpg_sign_opt_quoted\n"
"\n"
-"In both case, once you're done, continue with:\n"
+"In both cases, once you're done, continue with:\n"
"\n"
" git rebase --continue\n"
msgstr ""
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1298
+#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1295
msgid "Could not execute editor"
msgstr "Não foi possível executar o editor"
-#: git-rebase--interactive.sh:1145
-msgid "You need to set your committer info first"
-msgstr "Primeiro tem de definir a sua informação de committer"
-
-#: git-rebase--interactive.sh:1153
+#: git-rebase--interactive.sh:1150
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "Não foi possível extrair $switch_to"
-#: git-rebase--interactive.sh:1158
+#: git-rebase--interactive.sh:1155
msgid "No HEAD?"
msgstr "Sem HEAD?"
-#: git-rebase--interactive.sh:1159
+#: git-rebase--interactive.sh:1156
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Não foi possível criar $state_dir temporário"
-#: git-rebase--interactive.sh:1161
+#: git-rebase--interactive.sh:1158
msgid "Could not mark as interactive"
msgstr "Não foi possível marcar como interativo"
-#: git-rebase--interactive.sh:1171 git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:1168 git-rebase--interactive.sh:1173
msgid "Could not init rewritten commits"
msgstr "Não foi possível inicializar commits reescritos"
-#: git-rebase--interactive.sh:1276
+#: git-rebase--interactive.sh:1273
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "Rebase $shortrevisions sobre $shortonto ($todocount comando)"
msgstr[1] "Rebase $shortrevisions sobre $shortonto ($todocount comandos)"
-#: git-rebase--interactive.sh:1281
+#: git-rebase--interactive.sh:1278
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"No entanto, se remover tudo, o rebase será abortado.\n"
"\n"
-#: git-rebase--interactive.sh:1288
+#: git-rebase--interactive.sh:1285
msgid "Note that empty commits are commented out"
msgstr "Note que commits vazios são comentados"
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "Não é possível reescrever ramos: tem alterações não preparadas."
+#: git-sh-setup.sh:226
+msgid "Cannot pull with rebase: You have unstaged changes."
+msgstr "Não é possível puxar com rebase: tem alterações não preparadas."
+
#: git-sh-setup.sh:229
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr "Não é possível rebasear: o índice contém alterações não submetidas."
+#: git-sh-setup.sh:245
+msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+msgstr ""
+"Não é possível puxar com rebase: o índice contém alterações não submetidas."
+
#: git-sh-setup.sh:248
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
"Não é possível efetuar $action: o índice contém alterações não submetidas."
+#: git-sh-setup.sh:252
+msgid "Additionally, your index contains uncommitted changes."
+msgstr "Além disso, o índice contém alterações não submetidas."
+
#: git-sh-setup.sh:372
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
msgid "Unable to determine absolute path of git directory"
msgstr "Não é possível determinar o caminho absoluto do diretório git"
+#~ msgid "Could not write to %s"
+#~ msgstr "Não foi possível escrever em %s"
+
+#~ msgid "Error wrapping up %s."
+#~ msgstr "Erro ao rematar %s."
+
+#~ msgid "Your local changes would be overwritten by cherry-pick."
+#~ msgstr "As suas alterações locais serão substituídas por cherry-pick."
+
+#~ msgid "Cannot revert during another revert."
+#~ msgstr "Não é possível reverter durante outra reversão."
+
+#~ msgid "Cannot cherry-pick during another cherry-pick."
+#~ msgstr ""
+#~ "Não é possível efetuar cherry-pick durante outro cherry-pick. durante um "
+#~ "cherry-pick."
+
+#~ msgid "Could not parse line %d."
+#~ msgstr "Não foi possível analisar a linha %d."
+
+#~ msgid "Could not open %s"
+#~ msgstr "Não foi possível abrir %s"
+
+#~ msgid "Could not read %s."
+#~ msgstr "Não foi possível ler %s."
+
+#~ msgid "Could not format %s."
+#~ msgstr "Não foi possível formatar %s."
+
+#~ msgid "%s: %s"
+#~ msgstr "%s: %s"
+
+#~ msgid "cannot open %s: %s"
+#~ msgstr "não é possível abrir %s: %s"
+
+#~ msgid "You need to set your committer info first"
+#~ msgstr "Primeiro tem de definir a sua informação de committer"
+
#~ msgid "bad numeric config value '%s' for '%s': invalid unit"
#~ msgstr ""
#~ "valor numérico '%s' da configuração '%s' incorreto: unidade inválida"
#~ msgid "Verify that the named commit has a valid GPG signature"
#~ msgstr "verificar se o commit tem uma assinatura GPG válida"
-#~ msgid "Could not write to '%s'"
-#~ msgstr "Não foi possível escrever em '%s'"
-
#~ msgid "Writing SQUASH_MSG"
#~ msgstr "A escrever SQUASH_MSG"
#~ msgid "--"
#~ msgstr "--"
-#~ msgid "cherry-pick"
-#~ msgstr "cherry-pick"
-
#~ msgid "Please enter the commit message for your changes."
#~ msgstr "Por favor insira a mensagem de commit das suas alterações."
msgstr ""
"Project-Id-Version: Git Russian Localization Project\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-05-24 23:42+0800\n"
-"PO-Revision-Date: 2016-06-30 13:28+0000\n"
+"POT-Creation-Date: 2016-11-25 22:50+0800\n"
+"PO-Revision-Date: 2016-11-28 23:58+0000\n"
"Last-Translator: Dimitriy Ryazantcev <DJm00n@mail.ru>\n"
"Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/ru/)\n"
"MIME-Version: 1.0\n"
msgid "hint: %.*s\n"
msgstr "подсказка: %.*s\n"
-#: advice.c:88
+#: advice.c:83
+msgid "Cherry-picking is not possible because you have unmerged files."
+msgstr "Невозможно выполнить копирование коммита в текущую ветку, так как у вас имеются не слитые файлы."
+
+#: advice.c:85
+msgid "Committing is not possible because you have unmerged files."
+msgstr "Невозможно закоммитить, так как у вас имеются не слитые файлы."
+
+#: advice.c:87
+msgid "Merging is not possible because you have unmerged files."
+msgstr "Невозможно выполнить слияние, так как у вас имеются не слитые файлы."
+
+#: advice.c:89
+msgid "Pulling is not possible because you have unmerged files."
+msgstr "Невозможно выполнить получение, так как у вас имеются не слитые файлы."
+
+#: advice.c:91
+msgid "Reverting is not possible because you have unmerged files."
+msgstr "Невозможно обратить изменения, так как у вас имеются не слитые файлы."
+
+#: advice.c:93
+#, c-format
+msgid "It is not possible to %s because you have unmerged files."
+msgstr "Невозможно выполнить %s, так как у вас имеются не слитые файлы."
+
+#: advice.c:101
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
msgstr "Исправьте их в рабочем каталоге, затем запустите «git add/rm <файл>»,\nчтобы пометить исправление и сделайте коммит."
-#: advice.c:101 builtin/merge.c:1238
+#: advice.c:109
+msgid "Exiting because of an unresolved conflict."
+msgstr "Выход из-за неразрешенного конфликта."
+
+#: advice.c:114 builtin/merge.c:1181
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Вы не завершили слияние (присутствует файл MERGE_HEAD)."
-#: advice.c:103
+#: advice.c:116
msgid "Please, commit your changes before merging."
msgstr "Перед слиянием, выполните коммит ваших изменений."
-#: advice.c:104
+#: advice.c:117
msgid "Exiting because of unfinished merge."
msgstr "Выход из-за незавершенного слияния."
-#: archive.c:12
-msgid "git archive [<options>] <tree-ish> [<path>...]"
-msgstr "git archive [<опции>] <указатель-дерева> [<путь>…]"
-
-#: archive.c:13
-msgid "git archive --list"
-msgstr "git archive --list"
-
-#: archive.c:14
+#: advice.c:123
+#, c-format
msgid ""
-"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> "
-"[<path>...]"
-msgstr "git archive --remote <репозиторий> [--exec <команда>] [<опции>] <указатель-дерева> [<путь>…]"
-
-#: archive.c:15
-msgid "git archive --remote <repo> [--exec <cmd>] --list"
-msgstr "git archive --remote <репозиторий> [--exec <команда>] --list"
+"Note: checking out '%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 performing another checkout.\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 -b with the checkout command again. Example:\n"
+"\n"
+" git checkout -b <new-branch-name>\n"
+"\n"
+msgstr "Примечание: переход на «%s».\n\nВы сейчас в состоянии «отделённого HEAD». Вы можете осмотреться, сделать\nэкспериментальные изменения и закоммитить их, также вы можете отменить\nизменения любых коммитов в этом состоянии не затрагивая любые ветки и\nне переходя на них.\n\nЕсли вы хотите создать новую ветку и сохранить свои коммиты, то вы\nможете сделать это (сейчас или позже) вызвав команду checkout снова,\nно с параметром -b. Например:\n\n git checkout -b <имя-новой-ветки>\n\n"
-#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327
+#: apply.c:57
#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr "спецификация пути «%s» не соответствует ни одному файлу"
-
-#: archive.c:429
-msgid "fmt"
-msgstr "формат"
-
-#: archive.c:429
-msgid "archive format"
-msgstr "формат архива"
+msgid "unrecognized whitespace option '%s'"
+msgstr "неопознанная опция для пробелов «%s»"
-#: archive.c:430 builtin/log.c:1395
-msgid "prefix"
-msgstr "префикс"
+#: apply.c:73
+#, c-format
+msgid "unrecognized whitespace ignore option '%s'"
+msgstr "неопознанная опция для игнорирования пробелов «%s»"
-#: archive.c:431
-msgid "prepend prefix to each pathname in the archive"
-msgstr "добавлять префикс перед каждым путем файла в архиве"
+#: apply.c:125
+msgid "--reject and --3way cannot be used together."
+msgstr "--reject и --3way нельзя использовать одновременно."
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548
-#: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987
-#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100
-#: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398
-#: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153
-msgid "file"
-msgstr "файл"
+#: apply.c:127
+msgid "--cached and --3way cannot be used together."
+msgstr "--cached и --3way нельзя использовать одновременно."
-#: archive.c:433 builtin/archive.c:89
-msgid "write the archive to this file"
-msgstr "запись архива в этот файл"
+#: apply.c:130
+msgid "--3way outside a repository"
+msgstr "--3way вне репозитория"
-#: archive.c:435
-msgid "read .gitattributes in working directory"
-msgstr "читать .gitattributes в рабочем каталоге"
+#: apply.c:141
+msgid "--index outside a repository"
+msgstr "--index вне репозитория"
-#: archive.c:436
-msgid "report archived files on stderr"
-msgstr "отчет об архивированных файлах в stderr"
+#: apply.c:144
+msgid "--cached outside a repository"
+msgstr "--cached вне репозитория"
-#: archive.c:437
-msgid "store only"
-msgstr "только хранение"
+#: apply.c:845
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr "Не удалось подготовить регулярное выражение для метки времени %s"
-#: archive.c:438
-msgid "compress faster"
-msgstr "сжимать быстрее"
+#: apply.c:854
+#, c-format
+msgid "regexec returned %d for input: %s"
+msgstr "regexec возвратил %d для ввода: %s"
-#: archive.c:446
-msgid "compress better"
-msgstr "сжимать лучше"
+#: apply.c:938
+#, c-format
+msgid "unable to find filename in patch at line %d"
+msgstr "не удалось найти имя файла в строке патча %d"
-#: archive.c:449
-msgid "list supported archive formats"
-msgstr "перечислить поддерживаемые форматы архивов"
+#: apply.c:977
+#, 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"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
-#: builtin/submodule--helper.c:776
-msgid "repo"
-msgstr "репозиторий"
+#: apply.c:983
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgstr "git apply: плохой git-diff — не согласующееся новое имя файла на строке %d"
-#: archive.c:452 builtin/archive.c:91
-msgid "retrieve the archive from remote repository <repo>"
-msgstr "получить архив из внешнего <репозитория>"
+#: apply.c:984
+#, c-format
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgstr "git apply: плохой git-diff — не согласующееся старое имя файла на строке %d"
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:482
-msgid "command"
-msgstr "команда"
+#: apply.c:990
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null on line %d"
+msgstr "git apply: плохой git-diff — ожидалось /dev/null на строке %d"
-#: archive.c:454 builtin/archive.c:93
-msgid "path to the remote git-upload-archive command"
-msgstr "путь к команде git-upload-archive на машине с внешним репозиторием"
+#: apply.c:1488
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recount: не ожидаемая строка: %.*s"
-#: attr.c:263
-msgid ""
-"Negative patterns are ignored in git attributes\n"
-"Use '\\!' for literal leading exclamation."
-msgstr "Отрицающие шаблоны в атрибутах git игнорируются.\nИспользуйте «\\!» для буквального использования символа в значении «восклицательный знак»."
+#: apply.c:1557
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "фрагмент изменений без заголовка на строке %d: %.*s"
-#: branch.c:53
+#: apply.c:1577
#, 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»."
+"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)"
-#: branch.c:67
+#: apply.c:1589
#, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "Ð\9dе Ñ\83Ñ\81Ñ\82анавливаÑ\8e веÑ\82кÑ\83 %s, Ñ\82ак Ñ\82ак она пÑ\80инадлежиÑ\82 вÑ\8bÑ\88еÑ\81Ñ\82оÑ\8fÑ\89емÑ\83 Ñ\80епозиÑ\82оÑ\80иÑ\8e."
+msgid "git diff header lacks filename information (line %d)"
+msgstr "заголовок git diff не Ñ\81одеÑ\80жиÑ\82 инÑ\84оÑ\80маÑ\86ии об имени Ñ\84айла (Ñ\81Ñ\82Ñ\80ока %d)"
-#: branch.c:93
-#, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
-msgstr "Ветка %s отслеживает внешнюю ветку %s из %s перемещением."
+#: apply.c:1759
+msgid "new file depends on old contents"
+msgstr "новый файл зависит от старого содержимого"
-#: branch.c:94
-#, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
-msgstr "Ветка %s отслеживает внешнюю ветку %s из %s."
+#: apply.c:1761
+msgid "deleted file still has contents"
+msgstr "удаленный файл все еще имеет содержимое"
-#: branch.c:98
+#: apply.c:1795
#, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
-msgstr "Ð\92еÑ\82ка %s оÑ\82Ñ\81леживаеÑ\82 локалÑ\8cнÑ\83Ñ\8e веÑ\82кÑ\83 %s пеÑ\80емеÑ\89ением."
+msgid "corrupt patch at line %d"
+msgstr "паÑ\82Ñ\87 повÑ\80ежден на Ñ\81Ñ\82Ñ\80оке %d"
-#: branch.c:99
+#: apply.c:1832
#, c-format
-msgid "Branch %s set up to track local branch %s."
-msgstr "Ð\92еÑ\82ка %s оÑ\82Ñ\81леживаеÑ\82 локалÑ\8cнÑ\83Ñ\8e веÑ\82кÑ\83 %s."
+msgid "new file %s depends on old contents"
+msgstr "новÑ\8bй Ñ\84айл %s завиÑ\81иÑ\82 оÑ\82 Ñ\81Ñ\82аÑ\80ого Ñ\81одеÑ\80жимого"
-#: branch.c:104
+#: apply.c:1834
#, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
-msgstr "Ветка %s отслеживает внешнюю ссылку %s перемещением."
+msgid "deleted file %s still has contents"
+msgstr "удаленный файл %s все еще имеет содержимое"
-#: branch.c:105
+#: apply.c:1837
#, c-format
-msgid "Branch %s set up to track remote ref %s."
-msgstr "Ветка %s отслеживает внешнюю ссылку %s."
+msgid "** warning: file %s becomes empty but is not deleted"
+msgstr "** предупреждение: файл %s становится пустым, но не удаляется"
-#: branch.c:109
+#: apply.c:1984
#, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
-msgstr "Ð\92еÑ\82ка %s оÑ\82Ñ\81леживаеÑ\82 локалÑ\8cнÑ\83Ñ\8e Ñ\81Ñ\81Ñ\8bлкÑ\83 %s пеÑ\80емеÑ\89ением."
+msgid "corrupt binary patch at line %d: %.*s"
+msgstr "повÑ\80ежденнÑ\8bй двоиÑ\87нÑ\8bй паÑ\82Ñ\87 на Ñ\81Ñ\82Ñ\80оке %d: %.*s"
-#: branch.c:110
+#: apply.c:2021
#, 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 "Не удалось записать настройки вышестоящей ветки"
+msgid "unrecognized binary patch at line %d"
+msgstr "неопознанный двоичный патч на строке %d"
-#: branch.c:156
+#: apply.c:2182
#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr "Ð\9dе оÑ\82Ñ\81леживаеÑ\82Ñ\81Ñ\8f: неоднознаÑ\87наÑ\8f инÑ\84оÑ\80маÑ\86иÑ\8f длÑ\8f Ñ\81Ñ\81Ñ\8bлки %s"
+msgid "patch with only garbage at line %d"
+msgstr "паÑ\82Ñ\87 Ñ\81 мÑ\83Ñ\81оÑ\80ом на Ñ\81Ñ\82Ñ\80оке %d"
-#: branch.c:185
+#: apply.c:2274
#, c-format
-msgid "'%s' is not a valid branch name."
-msgstr "«%s» не является действительным именем ветки."
+msgid "unable to read symlink %s"
+msgstr "не удалось прочитать символьную ссылку %s"
-#: branch.c:190
+#: apply.c:2278
#, c-format
-msgid "A branch named '%s' already exists."
-msgstr "Ð\92еÑ\82ка Ñ\81 именем «%s» Ñ\83же Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83еÑ\82."
+msgid "unable to open or read %s"
+msgstr "не Ñ\83далоÑ\81Ñ\8c оÑ\82кÑ\80Ñ\8bÑ\82Ñ\8c или пÑ\80оÑ\87еÑ\81Ñ\82Ñ\8c %s"
-#: branch.c:198
-msgid "Cannot force update the current branch."
-msgstr "Не удалось принудительно обновить текущую ветку."
+#: apply.c:2931
+#, c-format
+msgid "invalid start of line: '%c'"
+msgstr "неправильное начало строки: «%c»"
-#: branch.c:218
+#: apply.c:3050
#, c-format
-msgid ""
-"Cannot setup tracking information; starting point '%s' is not a branch."
-msgstr "Не удалось настроить информацию отслеживания; стартовая точка «%s» не является веткой."
+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 строки)."
+msgstr[2] "Часть #%d успешно применена на %d (со сдвигом в %d строк)."
+msgstr[3] "Часть #%d успешно применена на %d (со сдвигом в %d строк)."
-#: branch.c:220
+#: apply.c:3062
#, c-format
-msgid "the requested upstream branch '%s' does not exist"
-msgstr "запÑ\80оÑ\88еннаÑ\8f веÑ\82ка вÑ\8bÑ\88еÑ\81Ñ\82оÑ\8fÑ\89его Ñ\80епозиÑ\82оÑ\80иÑ\8f «%s» не Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83еÑ\82"
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
+msgstr "Ð\9aонÑ\82екÑ\81Ñ\82 Ñ\81Ñ\83жен до (%ld/%ld), Ñ\87Ñ\82обÑ\8b пÑ\80имениÑ\82Ñ\8c Ñ\84Ñ\80агменÑ\82 на %d Ñ\81Ñ\82Ñ\80оке"
-#: branch.c:222
+#: apply.c:3068
+#, c-format
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» — чтобы сохранить настройку вышестоящего репозитория для отправки."
+"while searching for:\n"
+"%.*s"
+msgstr "при поиске:\n%.*s"
-#: branch.c:266
+#: apply.c:3090
#, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "Ð\9dедопÑ\83Ñ\81Ñ\82имое имÑ\8f обÑ\8aекÑ\82а: «%s»."
+msgid "missing binary patch data for '%s'"
+msgstr "пÑ\80опÑ\83Ñ\89енÑ\8b даннÑ\8bе двоиÑ\87ного паÑ\82Ñ\87а длÑ\8f «%s»"
-#: branch.c:286
+#: apply.c:3098
#, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "Ð\9dеоднознаÑ\87ное имÑ\8f обÑ\8aекÑ\82а: «%s»."
+msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
+msgstr "невозможно вÑ\8bполниÑ\82Ñ\8c reverse-apply длÑ\8f двоиÑ\87ного паÑ\82Ñ\87а, без обÑ\80аÑ\89ениÑ\8f изменений блока «%s»"
-#: branch.c:291
+#: apply.c:3144
#, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "Ð\9dедопÑ\83Ñ\81Ñ\82имаÑ\8f Ñ\82оÑ\87ка веÑ\82ки: «%s»."
+msgid "cannot apply binary patch to '%s' without full index line"
+msgstr "невозможно пÑ\80имениÑ\82Ñ\8c двоиÑ\87нÑ\8bй паÑ\82Ñ\87 «%s» без Ñ\81Ñ\82Ñ\80оки Ñ\81 Ñ\83казанной полной веÑ\80Ñ\81ией индекÑ\81а"
-#: branch.c:345
+#: apply.c:3154
#, c-format
-msgid "'%s' is already checked out at '%s'"
-msgstr "«%s» уже находится на «%s»"
+msgid ""
+"the patch applies to '%s' (%s), which does not match the current contents."
+msgstr "патч применятся к файлу «%s» (%s), но его текущее содержимое не соотвествует ожидаемому."
-#: branch.c:364
+#: apply.c:3162
#, c-format
-msgid "HEAD of working tree %s is not updated"
-msgstr "HEAD рабочего каталога %s не обновлён"
+msgid "the patch applies to an empty '%s' but it is not empty"
+msgstr "патч применяется к пустому файлу «%s», но файл не пустой"
-#: bundle.c:34
+#: apply.c:3180
#, c-format
-msgid "'%s' does not look like a v2 bundle file"
-msgstr "«%s» не похож на файл пакета версии 2"
+msgid "the necessary postimage %s for '%s' cannot be read"
+msgstr "не удалось прочитать необходимую посылку %s для «%s»"
-#: bundle.c:61
+#: apply.c:3193
#, c-format
-msgid "unrecognized header: %s%s (%d)"
-msgstr "неопознанный заголовок: %s%s (%d)"
+msgid "binary patch does not apply to '%s'"
+msgstr "не удалось применить двоичный патч к «%s»"
-#: bundle.c:87 builtin/commit.c:777
+#: apply.c:3199
#, c-format
-msgid "could not open '%s'"
-msgstr "не удалось открыть «%s»"
-
-#: bundle.c:139
-msgid "Repository lacks these prerequisite commits:"
-msgstr "В репозитории отсутствуют необходимые коммиты:"
-
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073
-#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340
-#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875
-#: builtin/merge.c:361 builtin/shortlog.c:170
-msgid "revision walk setup failed"
-msgstr "сбой инициализации прохода по редакциям"
+msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
+msgstr "после применения двоичного патча для «%s» был получен неправильный результат (ожидалось %s, получено %s)"
-#: bundle.c:185
+#: apply.c:3220
#, 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:192
-msgid "The bundle records a complete history."
-msgstr "Пакет содержит полную историю."
+msgid "patch failed: %s:%ld"
+msgstr "ошибка применения изменений: %s:%ld"
-#: bundle.c:194
+#: apply.c:3342
#, 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 ссылок:"
+msgid "cannot checkout %s"
+msgstr "не удалось переключить состояние на %s"
-#: bundle.c:253
-msgid "Could not spawn pack-objects"
-msgstr "Не удалось создать объекты пакета"
+#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248
+#, c-format
+msgid "failed to read %s"
+msgstr "не удалось прочитать %s"
-#: bundle.c:264
-msgid "pack-objects died"
-msgstr "критическая ошибка pack-objects"
+#: apply.c:3398
+#, c-format
+msgid "reading from '%s' beyond a symbolic link"
+msgstr "чтение из «%s» за символической ссылкой"
-#: bundle.c:304
-msgid "rev-list died"
-msgstr "критическая ошибка rev-list"
+#: apply.c:3427 apply.c:3667
+#, c-format
+msgid "path %s has been renamed/deleted"
+msgstr "путь %s был переименован/удален"
-#: bundle.c:353
+#: apply.c:3510 apply.c:3681
#, c-format
-msgid "ref '%s' is excluded by the rev-list options"
-msgstr "ссылка «%s» исключена в соответствии с опциями rev-list"
+msgid "%s: does not exist in index"
+msgstr "%s: нет в индексе"
-#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273
+#: apply.c:3519 apply.c:3689
#, c-format
-msgid "unrecognized argument: %s"
-msgstr "неопознанный аргумент: %s"
+msgid "%s: does not match index"
+msgstr "%s: не совпадает с индексом"
-#: bundle.c:451
-msgid "Refusing to create empty bundle."
-msgstr "Ð\9eÑ\82клонение Ñ\81озданиÑ\8f пÑ\83Ñ\81Ñ\82ого пакеÑ\82а."
+#: apply.c:3554
+msgid "repository lacks the necessary blob to fall back on 3-way merge."
+msgstr "в Ñ\80епозиÑ\82оÑ\80ии оÑ\82Ñ\81Ñ\83Ñ\82Ñ\81Ñ\82вÑ\83еÑ\82 необÑ\85одимÑ\8bй двоиÑ\87нÑ\8bй обÑ\8aекÑ\82 длÑ\8f оÑ\82каÑ\82а к Ñ\82Ñ\80Ñ\91Ñ\85Ñ\85одовомÑ\83 Ñ\81лиÑ\8fниÑ\8e."
-#: bundle.c:463
+#: apply.c:3557
#, c-format
-msgid "cannot create '%s'"
-msgstr "не Ñ\83далоÑ\81Ñ\8c Ñ\81оздаÑ\82Ñ\8c «%s»"
+msgid "Falling back to three-way merge...\n"
+msgstr "Ð\9eÑ\82каÑ\82 к Ñ\82Ñ\80Ñ\91Ñ\85Ñ\85одовомÑ\83 Ñ\81лиÑ\8fниÑ\8eâ\80¦\n"
-#: bundle.c:491
-msgid "index-pack died"
-msgstr "критическая ошибка index-pack"
+#: apply.c:3573 apply.c:3577
+#, c-format
+msgid "cannot read the current contents of '%s'"
+msgstr "не удалось прочитать текущее содержимое «%s»"
-#: color.c:275
+#: apply.c:3589
#, c-format
-msgid "invalid color value: %.*s"
-msgstr "недопÑ\83Ñ\81Ñ\82имое знаÑ\87ение Ñ\86веÑ\82а: %.*s"
+msgid "Failed to fall back on three-way merge...\n"
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c оÑ\82каÑ\82иÑ\82Ñ\8cÑ\81Ñ\8f к Ñ\82Ñ\80Ñ\91Ñ\85Ñ\85одовомÑ\83 Ñ\81лиÑ\8fниÑ\8eâ\80¦\n"
-#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504
-#: builtin/am.c:2134
+#: apply.c:3603
#, c-format
-msgid "could not parse %s"
-msgstr "не Ñ\83далоÑ\81Ñ\8c Ñ\80азобÑ\80аÑ\82Ñ\8c %s"
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr "Ð\9fаÑ\82Ñ\87 пÑ\80именен к «%s» Ñ\81 конÑ\84ликÑ\82ами.\n"
-#: commit.c:42
+#: apply.c:3608
#, c-format
-msgid "%s %s is not a commit!"
-msgstr "%s %s не является коммитом!"
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr "Патч применен к «%s» без ошибок.\n"
-#: compat/obstack.c:406 compat/obstack.c:408
-msgid "memory exhausted"
-msgstr "память исчерпана"
+#: apply.c:3634
+msgid "removal patch leaves file contents"
+msgstr "патч удаления не удалил содержимое файла"
-#: config.c:475 config.c:477
+#: apply.c:3706
#, c-format
-msgid "bad config line %d in %s %s"
-msgstr "ошибка в %d строке файла конфигурации в %s %s"
+msgid "%s: wrong type"
+msgstr "%s: неправильный тип"
-#: config.c:593
+#: apply.c:3708
#, c-format
-msgid "bad numeric config value '%s' for '%s' in %s %s: %s"
-msgstr "неправильное числовое значение «%s» для «%s» в %s %s: %s"
+msgid "%s has type %o, expected %o"
+msgstr "%s имеет тип %o, а ожидался %o"
-#: config.c:595
+#: apply.c:3859 apply.c:3861
#, c-format
-msgid "bad numeric config value '%s' for '%s': %s"
-msgstr "неправильное числовое значение «%s» для «%s»: %s"
+msgid "invalid path '%s'"
+msgstr "неправильный путь «%s»"
-#: config.c:680
+#: apply.c:3917
#, c-format
-msgid "failed to expand user dir in: '%s'"
-msgstr "сбой разворачивания пути каталога пользователя: «%s»"
+msgid "%s: already exists in index"
+msgstr "%s: уже содержится в индексе"
-#: config.c:761 config.c:772
+#: apply.c:3920
#, c-format
-msgid "bad zlib compression level %d"
-msgstr "неправильный уровень сжатия zlib %d"
+msgid "%s: already exists in working directory"
+msgstr "%s: уже содержится в рабочем каталоге"
-#: config.c:890
+#: apply.c:3940
#, c-format
-msgid "invalid mode for object creation: %s"
-msgstr "недопустимый режим создания объекта: %s"
-
-#: config.c:1228
-msgid "unable to parse command-line config"
-msgstr "не удалось разобрать конфигурацию из командной строки"
-
-#: config.c:1284
-msgid "unknown error occured while reading the configuration files"
-msgstr "произошла неизвестная ошибка при чтении файлов конфигурации"
+msgid "new mode (%o) of %s does not match old mode (%o)"
+msgstr "новый режим доступа (%o) для %s не соответствует старому режиму доступа (%o)"
-#: config.c:1629
+#: apply.c:3945
#, c-format
-msgid "unable to parse '%s' from command-line config"
-msgstr "не Ñ\83далоÑ\81Ñ\8c Ñ\80азобÑ\80аÑ\82Ñ\8c «%s» в конÑ\84игÑ\83Ñ\80аÑ\86ии из командной Ñ\81Ñ\82Ñ\80оки"
+msgid "new mode (%o) of %s does not match old mode (%o) of %s"
+msgstr "новÑ\8bй Ñ\80ежим доÑ\81Ñ\82Ñ\83па (%o) длÑ\8f %s не Ñ\81ооÑ\82веÑ\82Ñ\81Ñ\82вÑ\83еÑ\82 Ñ\81Ñ\82аÑ\80омÑ\83 Ñ\80ежимÑ\83 доÑ\81Ñ\82Ñ\83па (%o) длÑ\8f %s"
-#: config.c:1631
+#: apply.c:3965
#, c-format
-msgid "bad config variable '%s' in file '%s' at line %d"
-msgstr "непÑ\80авилÑ\8cнаÑ\8f пеÑ\80еменнаÑ\8f конÑ\84игÑ\83Ñ\80аÑ\86ии «%s» в Ñ\84айле «%s» на Ñ\81Ñ\82Ñ\80оке %d"
+msgid "affected file '%s' is beyond a symbolic link"
+msgstr "заÑ\82Ñ\80онÑ\83Ñ\82Ñ\8bй Ñ\84айл «%s» наÑ\85одиÑ\82Ñ\81Ñ\8f за Ñ\81имволиÑ\87еÑ\81кой Ñ\81Ñ\81Ñ\8bлкой"
-#: config.c:1690
+#: apply.c:3969
#, c-format
-msgid "%s has multiple values"
-msgstr "%s имеет несколько значений"
+msgid "%s: patch does not apply"
+msgstr "%s: не удалось применить патч"
-#: config.c:2224
+#: apply.c:3984
#, c-format
-msgid "could not set '%s' to '%s'"
-msgstr "не Ñ\83далоÑ\81Ñ\8c Ñ\83Ñ\81Ñ\82ановиÑ\82Ñ\8c «%s» в «%s»"
+msgid "Checking patch %s..."
+msgstr "Ð\9fÑ\80овеÑ\80ка паÑ\82Ñ\87а %sâ\80¦"
-#: config.c:2226
+#: apply.c:4075
#, c-format
-msgid "could not unset '%s'"
-msgstr "не Ñ\83далоÑ\81Ñ\8c Ñ\81бÑ\80оÑ\81иÑ\82Ñ\8c знаÑ\87ение длÑ\8f «%s»"
+msgid "sha1 information is lacking or useless for submodule %s"
+msgstr "инÑ\84оÑ\80маÑ\86иÑ\8f об sha1 оÑ\82Ñ\81Ñ\83Ñ\82Ñ\81Ñ\82вÑ\83еÑ\82 или беÑ\81полезна длÑ\8f подмодÑ\83лÑ\8f %s"
-#: connected.c:69
-msgid "Could not run 'git rev-list'"
-msgstr "Не удалось запустить «git rev-list»"
+#: apply.c:4082
+#, c-format
+msgid "mode change for %s, which is not in current HEAD"
+msgstr "изменен режим для %s, который не находится в текущем HEAD"
-#: connected.c:89
-msgid "failed write to rev-list"
-msgstr "сбой записи в rev-list"
+#: apply.c:4085
+#, c-format
+msgid "sha1 information is lacking or useless (%s)."
+msgstr "информация об sha1 отсутствует или бесполезна (%s)."
-#: connected.c:96
-msgid "failed to close rev-list's stdin"
-msgstr "сбой закрытия стандартного ввода у rev-list"
+#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "сбой make_cache_entry для пути «%s»"
-#: date.c:95
-msgid "in the future"
-msgstr "в будущем"
+#: apply.c:4094
+#, c-format
+msgid "could not add %s to temporary index"
+msgstr "не удалось добавить %s во временный индекс"
-#: date.c:101
+#: apply.c:4104
#, c-format
-msgid "%lu second ago"
-msgid_plural "%lu seconds ago"
-msgstr[0] "%lu секунду назад"
-msgstr[1] "%lu секунды назад"
-msgstr[2] "%lu секунд назад"
-msgstr[3] "%lu секунд назад"
+msgid "could not write temporary index to %s"
+msgstr "не удалось записать временный индкекс в %s"
-#: date.c:108
+#: apply.c:4242
#, c-format
-msgid "%lu minute ago"
-msgid_plural "%lu minutes ago"
-msgstr[0] "%lu минуту назад"
-msgstr[1] "%lu минуты назад"
-msgstr[2] "%lu минут назад"
-msgstr[3] "%lu минут назад"
+msgid "unable to remove %s from index"
+msgstr "не удалось удалить %s из индекса"
-#: date.c:115
+#: apply.c:4277
#, c-format
-msgid "%lu hour ago"
-msgid_plural "%lu hours ago"
-msgstr[0] "%lu час назад"
-msgstr[1] "%lu часа назад"
-msgstr[2] "%lu часов назад"
-msgstr[3] "%lu часов назад"
+msgid "corrupt patch for submodule %s"
+msgstr "поврежденный патч для подмодуля %s"
-#: date.c:122
+#: apply.c:4283
#, c-format
-msgid "%lu day ago"
-msgid_plural "%lu days ago"
-msgstr[0] "%lu день назад"
-msgstr[1] "%lu дня назад"
-msgstr[2] "%lu дней назад"
-msgstr[3] "%lu дней назад"
+msgid "unable to stat newly created file '%s'"
+msgstr "не удалось выполнить stat для созданного файла «%s»"
-#: date.c:128
+#: apply.c:4291
#, c-format
-msgid "%lu week ago"
-msgid_plural "%lu weeks ago"
-msgstr[0] "%lu неделю назад"
-msgstr[1] "%lu недели назад"
-msgstr[2] "%lu недель назад"
-msgstr[3] "%lu недель назад"
+msgid "unable to create backing store for newly created file %s"
+msgstr "не удалось создать вспомогательный файл для созданного файла %s"
-#: date.c:135
+#: apply.c:4297 apply.c:4441
#, c-format
-msgid "%lu month ago"
-msgid_plural "%lu months ago"
-msgstr[0] "%lu месяц назад"
-msgstr[1] "%lu месяца назад"
-msgstr[2] "%lu месяцев назад"
-msgstr[3] "%lu месяцев назад"
+msgid "unable to add cache entry for %s"
+msgstr "не удалось создать запись в кэше для %s"
-#: date.c:146
+#: apply.c:4338
#, c-format
-msgid "%lu year"
-msgid_plural "%lu years"
-msgstr[0] "%lu год"
-msgstr[1] "%lu года"
-msgstr[2] "%lu лет"
-msgstr[3] "%lu лет"
+msgid "failed to write to '%s'"
+msgstr "не удалось записать в «%s»"
-#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:149
+#: apply.c:4342
#, c-format
-msgid "%s, %lu month ago"
-msgid_plural "%s, %lu months ago"
-msgstr[0] "%s и %lu месяц назад"
-msgstr[1] "%s и %lu месяца назад"
-msgstr[2] "%s и %lu месяцев назад"
-msgstr[3] "%s и %lu месяцев назад"
+msgid "closing file '%s'"
+msgstr "закрытие файла «%s»"
-#: date.c:154 date.c:159
+#: apply.c:4412
#, c-format
-msgid "%lu year ago"
-msgid_plural "%lu years ago"
-msgstr[0] "%lu год назад"
-msgstr[1] "%lu года назад"
-msgstr[2] "%lu лет назад"
-msgstr[3] "%lu лет назад"
+msgid "unable to write file '%s' mode %o"
+msgstr "не удалось записать файл «%s» с режимом доступа %o"
-#: diffcore-order.c:24
+#: apply.c:4510
#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "сбой чтения orderfile «%s»"
+msgid "Applied patch %s cleanly."
+msgstr "Патч %s применен без ошибок."
-#: diffcore-rename.c:538
-msgid "Performing inexact rename detection"
-msgstr "Ð\92Ñ\8bполнÑ\8fеÑ\82Ñ\81Ñ\8f неÑ\82оÑ\87ное опÑ\80еделение пеÑ\80еименованиÑ\8f"
+#: apply.c:4518
+msgid "internal error"
+msgstr "внÑ\83Ñ\82Ñ\80еннÑ\8fÑ\8f оÑ\88ибка"
-#: diff.c:116
+#: apply.c:4521
#, c-format
-msgid " Failed to parse dirstat cut-off percentage '%s'\n"
-msgstr " Сбой разбора величины среза (cut-off) у dirstat «%s»\n"
+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 отказами…"
-#: diff.c:121
+#: apply.c:4532
#, c-format
-msgid " Unknown dirstat parameter '%s'\n"
-msgstr "Неизвестный параметр dirstat: «%s»\n"
+msgid "truncating .rej filename to %.*s.rej"
+msgstr "усечение имени .rej файла до %.*s.rej"
-#: diff.c:225
+#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989
#, c-format
-msgid "Unknown value for 'diff.submodule' config variable: '%s'"
-msgstr "Ð\9dеизвеÑ\81Ñ\82ное знаÑ\87ениÑ\8f длÑ\8f пеÑ\80еменной «diff.submodule»: «%s»"
+msgid "cannot open %s"
+msgstr "не Ñ\83далоÑ\81Ñ\8c оÑ\82кÑ\80Ñ\8bÑ\82Ñ\8c %s"
-#: diff.c:277
+#: apply.c:4554
#, c-format
-msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
-msgstr "Найдены ошибки в переменной «diff.dirstat»:\n%s"
+msgid "Hunk #%d applied cleanly."
+msgstr "Блок №%d применен без ошибок."
-#: diff.c:3007
+#: apply.c:4558
#, c-format
-msgid "external diff died, stopping at %s"
-msgstr "критическая ошибка при внешнем сравнении, останов на %s"
-
-#: diff.c:3405
-msgid "--follow requires exactly one pathspec"
-msgstr "--follow требует ровно одной спецификации пути"
+msgid "Rejected hunk #%d."
+msgstr "Блок №%d отклонен."
-#: diff.c:3568
+#: apply.c:4668
#, c-format
-msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
-msgstr "Сбой разбора параметра опции --dirstat/-X :\n%s"
+msgid "Skipped patch '%s'."
+msgstr "Патч «%s» пропущен."
-#: diff.c:3582
-#, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
-msgstr "Сбой разбора параметра опции --submodule: «%s»"
+#: apply.c:4676
+msgid "unrecognized input"
+msgstr "не распознанный ввод"
-#: dir.c:1823
-msgid "failed to get kernel name and information"
-msgstr "не удалось получить имя ядра и информацию"
+#: apply.c:4695
+msgid "unable to read index file"
+msgstr "не удалось прочитать файл индекса"
+
+#: apply.c:4833
+#, c-format
+msgid "can't open patch '%s': %s"
+msgstr "не удалось открыть патч «%s»: %s"
+
+#: apply.c:4858
+#, c-format
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] "пропущена %d ошибка в пробельных символах"
+msgstr[1] "пропущено %d ошибки в пробельных символах"
+msgstr[2] "пропущено %d ошибок в пробельных символах"
+msgstr[3] "пропущено %d ошибок в пробельных символах"
+
+#: apply.c:4864 apply.c:4879
+#, c-format
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] "%d строка добавила ошибки в пробельных символах."
+msgstr[1] "%d строки добавили ошибки в пробельных символах."
+msgstr[2] "%d строк добавили ошибки в пробельных символах."
+msgstr[3] "%d строк добавили ошибки в пробельных символах."
+
+#: apply.c:4872
+#, 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 строки добавлено после исправления ошибок в пробелах."
+msgstr[2] "%d строк добавлено после исправления ошибок в пробелах."
+msgstr[3] "%d строки добавлено после исправления ошибок в пробелах."
+
+#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431
+msgid "Unable to write new index file"
+msgstr "Не удалось записать новый файл индекса"
+
+#: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
+#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592
+#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947
+msgid "path"
+msgstr "путь"
+
+#: apply.c:4920
+msgid "don't apply changes matching the given path"
+msgstr "не применять изменения по указанному пути"
+
+#: apply.c:4923
+msgid "apply changes matching the given path"
+msgstr "применять изменения по указанному пути"
+
+#: apply.c:4925 builtin/am.c:2286
+msgid "num"
+msgstr "количество"
+
+#: apply.c:4926
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr "удалить <количество> ведущих косых черт из традиционных путей списка изменений"
+
+#: apply.c:4929
+msgid "ignore additions made by the patch"
+msgstr "игнорировать добавления, сделанные этим патчем"
+
+#: apply.c:4931
+msgid "instead of applying the patch, output diffstat for the input"
+msgstr "вместо применения патча вывести статистику добавлений и удалений для ввода"
+
+#: apply.c:4935
+msgid "show number of added and deleted lines in decimal notation"
+msgstr "показать количество добавленных и удаленных строк в десятичном представлении"
+
+#: apply.c:4937
+msgid "instead of applying the patch, output a summary for the input"
+msgstr "вместо применения патча вывести статистику изменений для ввода"
+
+#: apply.c:4939
+msgid "instead of applying the patch, see if the patch is applicable"
+msgstr "вместо применения патча проверить подходит ли он"
+
+#: apply.c:4941
+msgid "make sure the patch is applicable to the current index"
+msgstr "проверить, что патч применяется к текущему индексу"
+
+#: apply.c:4943
+msgid "apply a patch without touching the working tree"
+msgstr "применить патч, не изменяя рабочий каталог"
+
+#: apply.c:4945
+msgid "accept a patch that touches outside the working area"
+msgstr "принять патч, который затрагивает файлы за рабочим каталогом"
+
+#: apply.c:4947
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr "а также применить патч (используйте с --stat/--summary/--check)"
+
+#: apply.c:4949
+msgid "attempt three-way merge if a patch does not apply"
+msgstr "попытаться сделать трехходовое слияние, если патч не применяется"
+
+#: apply.c:4951
+msgid "build a temporary index based on embedded index information"
+msgstr "построить временный индекс, основанный на встроенной информации об индексе"
+
+#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505
+msgid "paths are separated with NUL character"
+msgstr "пути, отделённые НУЛЕВЫМ символом"
+
+#: apply.c:4956
+msgid "ensure at least <n> lines of context match"
+msgstr "удостовериться, что по крайней мере <n> строк контекста совпадают"
+
+#: apply.c:4957 builtin/am.c:2265
+msgid "action"
+msgstr "действие"
+
+#: apply.c:4958
+msgid "detect new or modified lines that have whitespace errors"
+msgstr "определять новые или модифицированные строки, у которых есть ошибки в пробельных символах"
+
+#: apply.c:4961 apply.c:4964
+msgid "ignore changes in whitespace when finding context"
+msgstr "игнорировать изменения в пробельных символах при поиске контекста"
+
+#: apply.c:4967
+msgid "apply the patch in reverse"
+msgstr "применить патч с обращением изменений"
+
+#: apply.c:4969
+msgid "don't expect at least one line of context"
+msgstr "не ожидать как минимум одной строки контекста"
+
+#: apply.c:4971
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr "оставить отклоненные блоки изменений в соответствующих *.rej файлах"
+
+#: apply.c:4973
+msgid "allow overlapping hunks"
+msgstr "разрешить перекрывающиеся блоки изменений"
+
+#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19
+#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593
+#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114
+msgid "be verbose"
+msgstr "быть многословнее"
+
+#: apply.c:4976
+msgid "tolerate incorrectly detected missing new-line at the end of file"
+msgstr "разрешить некорректно определенные пропущенные пустые строки в конце файла"
+
+#: apply.c:4979
+msgid "do not trust the line counts in the hunk headers"
+msgstr "не доверять количеству строк из заголовка блока изменений"
+
+#: apply.c:4981 builtin/am.c:2274
+msgid "root"
+msgstr "корень"
+
+#: apply.c:4982
+msgid "prepend <root> to all filenames"
+msgstr "добавить <корень> спереди ко всем именам файлов"
+
+#: archive.c:12
+msgid "git archive [<options>] <tree-ish> [<path>...]"
+msgstr "git archive [<опции>] <указатель-дерева> [<путь>…]"
+
+#: archive.c:13
+msgid "git archive --list"
+msgstr "git archive --list"
+
+#: archive.c:14
+msgid ""
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> "
+"[<path>...]"
+msgstr "git archive --remote <репозиторий> [--exec <команда>] [<опции>] <указатель-дерева> [<путь>…]"
+
+#: archive.c:15
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr "git archive --remote <репозиторий> [--exec <команда>] --list"
+
+#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327
+#, c-format
+msgid "pathspec '%s' did not match any files"
+msgstr "спецификация пути «%s» не соответствует ни одному файлу"
+
+#: archive.c:429
+msgid "fmt"
+msgstr "формат"
+
+#: archive.c:429
+msgid "archive format"
+msgstr "формат архива"
+
+#: archive.c:430 builtin/log.c:1429
+msgid "prefix"
+msgstr "префикс"
+
+#: archive.c:431
+msgid "prepend prefix to each pathname in the archive"
+msgstr "добавлять префикс перед каждым путем файла в архиве"
+
+#: archive.c:432 builtin/blame.c:2603 builtin/blame.c:2604 builtin/config.c:59
+#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:723
+#: builtin/hash-object.c:101 builtin/ls-files.c:539 builtin/ls-files.c:542
+#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109
+#: parse-options.h:153
+msgid "file"
+msgstr "файл"
+
+#: archive.c:433 builtin/archive.c:89
+msgid "write the archive to this file"
+msgstr "запись архива в этот файл"
+
+#: archive.c:435
+msgid "read .gitattributes in working directory"
+msgstr "читать .gitattributes в рабочем каталоге"
+
+#: archive.c:436
+msgid "report archived files on stderr"
+msgstr "отчет об архивированных файлах в stderr"
+
+#: archive.c:437
+msgid "store only"
+msgstr "только хранение"
+
+#: archive.c:438
+msgid "compress faster"
+msgstr "сжимать быстрее"
+
+#: archive.c:446
+msgid "compress better"
+msgstr "сжимать лучше"
+
+#: archive.c:449
+msgid "list supported archive formats"
+msgstr "перечислить поддерживаемые форматы архивов"
+
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
+#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953
+msgid "repo"
+msgstr "репозиторий"
+
+#: archive.c:452 builtin/archive.c:91
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "получить архив из внешнего <репозитория>"
+
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
+msgid "command"
+msgstr "команда"
+
+#: archive.c:454 builtin/archive.c:93
+msgid "path to the remote git-upload-archive command"
+msgstr "путь к команде git-upload-archive на машине с внешним репозиторием"
+
+#: archive.c:461
+msgid "Unexpected option --remote"
+msgstr "Неожиданная опция --remote"
+
+#: archive.c:463
+msgid "Option --exec can only be used together with --remote"
+msgstr "Опция --exec может использоваться только вместе с --remote"
+
+#: archive.c:465
+msgid "Unexpected option --output"
+msgstr "Неожиданная опция --output"
+
+#: archive.c:487
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Неизвестный формат архива «%s»"
+
+#: archive.c:494
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Аргумент не поддерживается для формата «%s»: -%d"
+
+#: attr.c:263
+msgid ""
+"Negative patterns are ignored in git attributes\n"
+"Use '\\!' for literal leading exclamation."
+msgstr "Отрицающие шаблоны в атрибутах git игнорируются.\nИспользуйте «\\!» для буквального использования символа в значении «восклицательный знак»."
+
+#: bisect.c:441
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "Не удалось открыть файл «%s»"
+
+#: bisect.c:446
+#, c-format
+msgid "Badly quoted content in file '%s': %s"
+msgstr "Плохое содержимое файла «%s»: %s"
+
+#: bisect.c:655
+#, c-format
+msgid "We cannot bisect more!\n"
+msgstr "Невозможно продолжить бинарный поиск!\n"
+
+#: bisect.c:708
+#, c-format
+msgid "Not a valid commit name %s"
+msgstr "Недопустимое имя коммита %s"
+
+#: bisect.c:732
+#, 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"
+
+#: bisect.c:737
+#, 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"
+
+#: bisect.c:742
+#, 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"
+
+#: bisect.c:750
+#, c-format
+msgid ""
+"Some %s revs are not ancestor 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"
+
+#: bisect.c:763
+#, 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Но все же продолжаем поиск."
+
+#: bisect.c:798
+#, c-format
+msgid "Bisecting: a merge base must be tested\n"
+msgstr "Бинарный поиск: база слияния должна быть проверена\n"
+
+#: bisect.c:849
+#, c-format
+msgid "a %s revision is needed"
+msgstr "нужно указать %s редакцию"
+
+#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
+#, c-format
+msgid "could not create file '%s'"
+msgstr "не удалось создать файл «%s»"
+
+#: bisect.c:917
+#, c-format
+msgid "could not read file '%s'"
+msgstr "не удалось прочитать файл «%s»"
+
+#: bisect.c:947
+msgid "reading bisect refs failed"
+msgstr "сбой при чтении ссылок двоичного поиска"
+
+#: bisect.c:967
+#, c-format
+msgid "%s was both %s and %s\n"
+msgstr "%s была одновременно и %s и %s\n"
+
+#: bisect.c:975
+#, c-format
+msgid ""
+"No testable commit found.\n"
+"Maybe you started with bad path parameters?\n"
+msgstr "Тестируемый коммит не найден.\nВозможно, вы начали поиск с указанием неправильного параметра пути?\n"
+
+#: bisect.c:994
+#, c-format
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] "(примерно %d шаг)"
+msgstr[1] "(примерно %d шага)"
+msgstr[2] "(примерно %d шагов)"
+msgstr[3] "(примерно %d шагов)"
+
+#. TRANSLATORS: the last %s will be replaced with
+#. "(roughly %d steps)" translation
+#: bisect.c:998
+#, 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"
+msgstr[2] "Бинарный поиск: %d редакций осталось проверить после этой %s\n"
+msgstr[3] "Бинарный поиск: %d редакций осталось проверить после этой %s\n"
+
+#: 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:185
+#, c-format
+msgid "'%s' is not a valid branch name."
+msgstr "«%s» не является действительным именем ветки."
+
+#: branch.c:190
+#, c-format
+msgid "A branch named '%s' already exists."
+msgstr "Ветка с именем «%s» уже существует."
+
+#: branch.c:198
+msgid "Cannot force update the current branch."
+msgstr "Не удалось принудительно обновить текущую ветку."
+
+#: branch.c:218
+#, c-format
+msgid ""
+"Cannot setup tracking information; starting point '%s' is not a branch."
+msgstr "Не удалось настроить информацию отслеживания; стартовая точка «%s» не является веткой."
+
+#: branch.c:220
+#, c-format
+msgid "the requested upstream branch '%s' does not exist"
+msgstr "запрошенная ветка вышестоящего репозитория «%s» не существует"
+
+#: branch.c:222
+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:265
+#, c-format
+msgid "Not a valid object name: '%s'."
+msgstr "Недопустимое имя объекта: «%s»."
+
+#: branch.c:285
+#, c-format
+msgid "Ambiguous object name: '%s'."
+msgstr "Неоднозначное имя объекта: «%s»."
+
+#: branch.c:290
+#, c-format
+msgid "Not a valid branch point: '%s'."
+msgstr "Недопустимая точка ветки: «%s»."
-#: dir.c:1942
-msgid "Untracked cache is disabled on this system or location."
-msgstr "Кэш неотслеживаемых файлов отключен на этой системе или в этом месте."
+#: branch.c:344
+#, c-format
+msgid "'%s' is already checked out at '%s'"
+msgstr "«%s» уже находится на «%s»"
-#: gpg-interface.c:166 gpg-interface.c:235
-msgid "could not run gpg."
-msgstr "не удалось запустить gpg."
+#: branch.c:363
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "HEAD рабочего каталога %s не обновлён"
-#: gpg-interface.c:178
-msgid "gpg did not accept the data"
-msgstr "gpg не принял данные"
+#: bundle.c:34
+#, c-format
+msgid "'%s' does not look like a v2 bundle file"
+msgstr "«%s» не похож на файл пакета версии 2"
-#: gpg-interface.c:189
-msgid "gpg failed to sign the data"
-msgstr "gpg не удалось подписать данные"
+#: bundle.c:61
+#, c-format
+msgid "unrecognized header: %s%s (%d)"
+msgstr "неопознанный заголовок: %s%s (%d)"
-#: gpg-interface.c:222
+#: bundle.c:87 sequencer.c:963 builtin/commit.c:777
#, c-format
-msgid "could not create temporary file '%s'"
-msgstr "не удалось создать временный файл «%s»"
+msgid "could not open '%s'"
+msgstr "не удалось открыть «%s»"
+
+#: bundle.c:139
+msgid "Repository lacks these prerequisite commits:"
+msgstr "В репозитории отсутствуют необходимые коммиты:"
+
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374
+#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348
+#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
+#: builtin/merge.c:356 builtin/shortlog.c:170
+msgid "revision walk setup failed"
+msgstr "сбой инициализации прохода по редакциям"
-#: gpg-interface.c:224
+#: bundle.c:185
#, c-format
-msgid "failed writing detached signature to '%s'"
-msgstr "сбой записи отсоединенной подписи в «%s»"
+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:192
+msgid "The bundle records a complete history."
+msgstr "Пакет содержит полную историю."
-#: grep.c:1718
+#: bundle.c:194
#, c-format
-msgid "'%s': unable to read %s"
-msgstr "«%s»: не удалось прочесть %s"
+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:253
+msgid "Could not spawn pack-objects"
+msgstr "Не удалось создать объекты пакета"
+
+#: bundle.c:264
+msgid "pack-objects died"
+msgstr "критическая ошибка pack-objects"
+
+#: bundle.c:304
+msgid "rev-list died"
+msgstr "критическая ошибка rev-list"
-#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
+#: bundle.c:353
#, c-format
-msgid "failed to stat '%s'"
-msgstr "не удалось выполнить stat «%s»"
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr "ссылка «%s» исключена в соответствии с опциями rev-list"
-#: grep.c:1746
+#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273
#, c-format
-msgid "'%s': short read"
-msgstr "«%s»: слишком мало данных прочитано"
+msgid "unrecognized argument: %s"
+msgstr "неопознанный аргумент: %s"
+
+#: bundle.c:451
+msgid "Refusing to create empty bundle."
+msgstr "Отклонение создания пустого пакета."
-#: help.c:205
+#: bundle.c:463
#, c-format
-msgid "available git commands in '%s'"
-msgstr "доÑ\81Ñ\82Ñ\83пнÑ\8bе командÑ\8b git в «%s»"
+msgid "cannot create '%s'"
+msgstr "не Ñ\83далоÑ\81Ñ\8c Ñ\81оздаÑ\82Ñ\8c «%s»"
-#: help.c:212
-msgid "git commands available from elsewhere on your $PATH"
-msgstr "команды git, доступные в других местах вашего $PATH"
+#: bundle.c:491
+msgid "index-pack died"
+msgstr "критическая ошибка index-pack"
-#: help.c:244
-msgid "These are common Git commands used in various situations:"
-msgstr "Стандартные команды Git используемые в различных ситуациях:"
+#: color.c:290
+#, c-format
+msgid "invalid color value: %.*s"
+msgstr "недопустимое значение цвета: %.*s"
+
+#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493
+#: builtin/am.c:2127
+#, c-format
+msgid "could not parse %s"
+msgstr "не удалось разобрать %s"
-#: help.c:309
+#: commit.c:42
#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s не является коммитом!"
+
+#: commit.c:1514
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 не работает?"
+"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"
-#: help.c:366
-msgid "Uh oh. Your system reports no Git commands at all."
-msgstr "Ð\9eй-Ñ\91й! Ð\92аÑ\88а Ñ\81иÑ\81Ñ\82ема не Ñ\81ообÑ\89аеÑ\82 ни о какиÑ\85 командаÑ\85 Git вообÑ\89е."
+#: compat/obstack.c:406 compat/obstack.c:408
+msgid "memory exhausted"
+msgstr "памÑ\8fÑ\82Ñ\8c иÑ\81Ñ\87еÑ\80пана"
-#: help.c:388
+#: config.c:516
#, c-format
-msgid ""
-"WARNING: You called a Git command named '%s', which does not exist.\n"
-"Continuing under the assumption that you meant '%s'"
-msgstr "ВНИМАНИЕ: Вы вызвали команду Git «%s», но такой не существует.\nПродолжаем с предположением, что вы имели в виду «%s»"
+msgid "bad config line %d in blob %s"
+msgstr "ошибка в %d строке двоичного объекта %s"
-#: help.c:393
+#: config.c:520
#, c-format
-msgid "in %0.1f seconds automatically..."
-msgstr "через %0.1f секунд автоматически…"
+msgid "bad config line %d in file %s"
+msgstr "ошибка в %d строке файла %s"
-#: help.c:400
+#: config.c:524
#, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
-msgstr "git: «%s» не является командой git. Смотрите «git --help»."
+msgid "bad config line %d in standard input"
+msgstr "ошибка в %d строке стандартного ввода"
+
+#: config.c:528
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
+msgstr "ошибка в %d строке двоичного объекта подмодуля %s"
+
+#: config.c:532
+#, c-format
+msgid "bad config line %d in command line %s"
+msgstr "ошибка в %d строке коммандной строки %s"
+
+#: config.c:536
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "ошибка в %d строке в %s"
+
+#: config.c:655
+msgid "out of range"
+msgstr "вне диапазона"
+
+#: config.c:655
+msgid "invalid unit"
+msgstr "неправильное число"
+
+#: config.c:661
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "неправильное числовое значение «%s» для «%s»: %s"
+
+#: config.c:666
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgstr "неправильное числовое значение «%s» для «%s» в двоичном объекте %s: %s"
+
+#: config.c:669
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgstr "неправильное числовое значение «%s» для «%s» в файле %s: %s"
+
+#: config.c:672
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgstr "неправильное числовое значение «%s» для «%s» на стандартном вводе: %s"
+
+#: config.c:675
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+msgstr "неправильное числовое значение «%s» для «%s» в двоичном объекте подмодуля %s: %s"
+
+#: config.c:678
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgstr "неправильное числовое значение «%s» для «%s» на коммандной строке %s: %s"
+
+#: config.c:681
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr "неправильное числовое значение «%s» для «%s» в %s: %s"
+
+#: config.c:768
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr "сбой разворачивания пути каталога пользователя: «%s»"
+
+#: config.c:852 config.c:863
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "неправильный уровень сжатия zlib %d"
+
+#: config.c:978
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "недопустимый режим создания объекта: %s"
+
+#: config.c:1312
+msgid "unable to parse command-line config"
+msgstr "не удалось разобрать конфигурацию из командной строки"
+
+#: config.c:1362
+msgid "unknown error occurred while reading the configuration files"
+msgstr "произошла неизвестная ошибка при чтении файлов конфигурации"
+
+#: config.c:1716
+#, c-format
+msgid "unable to parse '%s' from command-line config"
+msgstr "не удалось разобрать «%s» в конфигурации из командной строки"
-#: help.c:404 help.c:464
+#: config.c:1718
+#, c-format
+msgid "bad config variable '%s' in file '%s' at line %d"
+msgstr "неправильная переменная конфигурации «%s» в файле «%s» на строке %d"
+
+#: config.c:1777
+#, c-format
+msgid "%s has multiple values"
+msgstr "%s имеет несколько значений"
+
+#: config.c:2311
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "не удалось установить «%s» в «%s»"
+
+#: config.c:2313
+#, c-format
+msgid "could not unset '%s'"
+msgstr "не удалось сбросить значение для «%s»"
+
+#: connect.c:49
+msgid "The remote end hung up upon initial contact"
+msgstr "Внешний сервер отсоединился до начала сеанса связи"
+
+#: connect.c:51
msgid ""
+"Could not read from remote repository.\n"
"\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Возможно, вы имели в виду что-то из этого?"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
+msgstr "Не удалось прочитать из внешнего репозитория.\n\nУдостоверьтесь, что у вас есть необходимые права доступа\nи репозиторий существует."
+
+#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
+msgid "Checking connectivity"
+msgstr "Проверка соединения"
+
+#: connected.c:75
+msgid "Could not run 'git rev-list'"
+msgstr "Не удалось запустить «git rev-list»"
+
+#: connected.c:95
+msgid "failed write to rev-list"
+msgstr "сбой записи в rev-list"
+
+#: connected.c:102
+msgid "failed to close rev-list's stdin"
+msgstr "сбой закрытия стандартного ввода у rev-list"
-#: help.c:460
+#: convert.c:201
#, c-format
-msgid "%s: %s - %s"
-msgstr "%s: %s — %s"
+msgid ""
+"CRLF will be replaced by LF in %s.\n"
+"The file will have its original line endings in your working directory."
+msgstr "CRLF будет заменен на LF в %s.\nФайл будет иметь свои оригинальные концы строк в рашей рабочей копии."
-#: lockfile.c:152
+#: convert.c:205
+#, c-format
+msgid "CRLF would be replaced by LF in %s."
+msgstr "CRLF будет заменен на LF в %s."
+
+#: convert.c:211
#, 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удалите файл вручную для продолжения."
+"LF will be replaced by CRLF in %s.\n"
+"The file will have its original line endings in your working directory."
+msgstr "LF будет заменен на CRLF в %s.\nФайл будет иметь свои оригинальные концы строк в рашей рабочей копии."
-#: lockfile.c:160
+#: convert.c:215
#, c-format
-msgid "Unable to create '%s.lock': %s"
-msgstr "Не удалось создать «%s.lock»: %s"
+msgid "LF would be replaced by CRLF in %s"
+msgstr "LF будет заменен на CRLF в %s"
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "сбой чтения кэша"
+#: date.c:97
+msgid "in the future"
+msgstr "в будущем"
-#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375
-#: builtin/checkout.c:586 builtin/clone.c:732
-msgid "unable to write new index file"
-msgstr "не удалось записать новый файл индекса"
+#: date.c:103
+#, c-format
+msgid "%lu second ago"
+msgid_plural "%lu seconds ago"
+msgstr[0] "%lu секунду назад"
+msgstr[1] "%lu секунды назад"
+msgstr[2] "%lu секунд назад"
+msgstr[3] "%lu секунд назад"
+
+#: date.c:110
+#, c-format
+msgid "%lu minute ago"
+msgid_plural "%lu minutes ago"
+msgstr[0] "%lu минуту назад"
+msgstr[1] "%lu минуты назад"
+msgstr[2] "%lu минут назад"
+msgstr[3] "%lu минут назад"
+
+#: date.c:117
+#, c-format
+msgid "%lu hour ago"
+msgid_plural "%lu hours ago"
+msgstr[0] "%lu час назад"
+msgstr[1] "%lu часа назад"
+msgstr[2] "%lu часов назад"
+msgstr[3] "%lu часов назад"
+
+#: date.c:124
+#, c-format
+msgid "%lu day ago"
+msgid_plural "%lu days ago"
+msgstr[0] "%lu день назад"
+msgstr[1] "%lu дня назад"
+msgstr[2] "%lu дней назад"
+msgstr[3] "%lu дней назад"
+
+#: date.c:130
+#, c-format
+msgid "%lu week ago"
+msgid_plural "%lu weeks ago"
+msgstr[0] "%lu неделю назад"
+msgstr[1] "%lu недели назад"
+msgstr[2] "%lu недель назад"
+msgstr[3] "%lu недель назад"
-#: merge-recursive.c:189
+#: date.c:137
#, c-format
-msgid "(bad commit)\n"
-msgstr "(плохой коммит)\n"
+msgid "%lu month ago"
+msgid_plural "%lu months ago"
+msgstr[0] "%lu месяц назад"
+msgstr[1] "%lu месяца назад"
+msgstr[2] "%lu месяцев назад"
+msgstr[3] "%lu месяцев назад"
-#: merge-recursive.c:209
+#: date.c:148
#, c-format
-msgid "addinfo_cache failed for path '%s'"
-msgstr "сбой addinfo_cache для пути «%s»"
+msgid "%lu year"
+msgid_plural "%lu years"
+msgstr[0] "%lu год"
+msgstr[1] "%lu года"
+msgstr[2] "%lu лет"
+msgstr[3] "%lu лет"
-#: merge-recursive.c:270
-msgid "error building trees"
-msgstr "ошибка при построении деревьев"
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c:151
+#, c-format
+msgid "%s, %lu month ago"
+msgid_plural "%s, %lu months ago"
+msgstr[0] "%s и %lu месяц назад"
+msgstr[1] "%s и %lu месяца назад"
+msgstr[2] "%s и %lu месяцев назад"
+msgstr[3] "%s и %lu месяцев назад"
-#: merge-recursive.c:689
+#: date.c:156 date.c:161
#, c-format
-msgid "failed to create path '%s'%s"
-msgstr "не удалось создать путь «%s»%s"
+msgid "%lu year ago"
+msgid_plural "%lu years ago"
+msgstr[0] "%lu год назад"
+msgstr[1] "%lu года назад"
+msgstr[2] "%lu лет назад"
+msgstr[3] "%lu лет назад"
-#: merge-recursive.c:700
+#: diffcore-order.c:24
#, c-format
-msgid "Removing %s to make room for subdirectory\n"
-msgstr "Удаление %s, чтобы освободить место для подкаталогов\n"
+msgid "failed to read orderfile '%s'"
+msgstr "сбой чтения orderfile «%s»"
-#: merge-recursive.c:714 merge-recursive.c:735
-msgid ": perhaps a D/F conflict?"
-msgstr ": возможно, конфликт каталогов/файлов?"
+#: diffcore-rename.c:536
+msgid "Performing inexact rename detection"
+msgstr "Выполняется неточное определение переименования"
-#: merge-recursive.c:725
+#: diff.c:62
#, c-format
-msgid "refusing to lose untracked file at '%s'"
-msgstr "оÑ\82каз поÑ\82еÑ\80и неоÑ\82Ñ\81леживаемого Ñ\84айла в «%s»"
+msgid "option '%s' requires a value"
+msgstr "паÑ\80амеÑ\82Ñ\80 «%s» Ñ\82Ñ\80ебÑ\83еÑ\82 Ñ\83казаниÑ\8f знаÑ\87ениÑ\8f"
-#: merge-recursive.c:765
+#: diff.c:124
#, c-format
-msgid "cannot read object %s '%s'"
-msgstr "невозможно прочитать объект %s «%s»"
+msgid " Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr " Сбой разбора величины среза (cut-off) у dirstat «%s»\n"
-#: merge-recursive.c:767
+#: diff.c:129
#, c-format
-msgid "blob expected for %s '%s'"
-msgstr "ожидаеÑ\82Ñ\81Ñ\8f двоиÑ\87нÑ\8bй обÑ\8aекÑ\82 длÑ\8f %s «%s»"
+msgid " Unknown dirstat parameter '%s'\n"
+msgstr "Ð\9dеизвеÑ\81Ñ\82нÑ\8bй паÑ\80амеÑ\82Ñ\80 dirstat: «%s»\n"
-#: merge-recursive.c:790 builtin/clone.c:376
+#: diff.c:283
#, c-format
-msgid "failed to open '%s'"
-msgstr "не Ñ\83далоÑ\81Ñ\8c оÑ\82кÑ\80Ñ\8bÑ\82Ñ\8c «%s»"
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr "Ð\9dеизвеÑ\81Ñ\82ное знаÑ\87ениÑ\8f длÑ\8f пеÑ\80еменной «diff.submodule»: «%s»"
-#: merge-recursive.c:798
+#: diff.c:346
#, c-format
-msgid "failed to symlink '%s'"
-msgstr "не удалось создать символьную ссылку «%s»"
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr "Найдены ошибки в переменной «diff.dirstat»:\n%s"
-#: merge-recursive.c:801
+#: diff.c:3087
#, c-format
-msgid "do not know what to do with %06o %s '%s'"
-msgstr "не понятно, что делать с %06o %s «%s»"
-
-#: merge-recursive.c:939
-msgid "Failed to execute internal merge"
-msgstr "Не удалось запустить внутреннее слияние"
+msgid "external diff died, stopping at %s"
+msgstr "критическая ошибка при внешнем сравнении, останов на %s"
-#: merge-recursive.c:943
-#, c-format
-msgid "Unable to add %s to database"
-msgstr "Не удалось добавить %s в базу данных"
+#: diff.c:3412
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+msgstr "--name-only, --name-status, --check и -s нельзя использовать одновременно"
-#: merge-recursive.c:959
-msgid "unsupported object type in the tree"
-msgstr "объект неподдерживаемого типа в дереве"
+#: diff.c:3502
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow требует ровно одной спецификации пути"
-#: merge-recursive.c:1034 merge-recursive.c:1048
+#: diff.c:3665
#, c-format
msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree."
-msgstr "Ð\9aÐ\9eÐ\9dФÐ\9bÐ\98Ð\9aТ (%s/Ñ\83даление): %s Ñ\83далено в %s и %s в %s. Ð\92еÑ\80Ñ\81иÑ\8f %s из %s оÑ\81Ñ\82авлена в деÑ\80еве."
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr "Сбой Ñ\80азбоÑ\80а паÑ\80амеÑ\82Ñ\80а опÑ\86ии --dirstat/-X :\n%s"
-#: merge-recursive.c:1040 merge-recursive.c:1053
+#: diff.c:3679
#, 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."
+msgid "Failed to parse --submodule option parameter: '%s'"
+msgstr "Сбой разбора параметра опции --submodule: «%s»"
-#: merge-recursive.c:1094
-msgid "rename"
-msgstr "пеÑ\80еименование"
+#: diff.c:4700
+msgid "inexact rename detection was skipped due to too many files."
+msgstr "неÑ\82оÑ\87ное опÑ\80еделение пеÑ\80еименованиÑ\8f бÑ\8bло пÑ\80опÑ\83Ñ\89ено из-за Ñ\81лиÑ\88ком болÑ\8cÑ\88ого колиÑ\87еÑ\81Ñ\82ва Ñ\84айлов."
-#: merge-recursive.c:1094
-msgid "renamed"
-msgstr "пеÑ\80еименовано"
+#: diff.c:4703
+msgid "only found copies from modified paths due to too many files."
+msgstr "найденÑ\8b Ñ\82олÑ\8cко копии из измененнÑ\8bÑ\85 пÑ\83Ñ\82ей из-за Ñ\81лиÑ\88ком болÑ\8cÑ\88ого колиÑ\87еÑ\81Ñ\82ва Ñ\84айлов."
-#: merge-recursive.c:1150
+#: diff.c:4706
#, c-format
-msgid "%s is a directory in %s adding as %s instead"
-msgstr "%s — это каталог в %s, добавляем как %s вместо этого"
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr "возможно вы захотите установить переменную %s в как минимум значение %d и повторить вызов команды."
+
+#: dir.c:1866
+msgid "failed to get kernel name and information"
+msgstr "не удалось получить имя ядра и информацию"
+
+#: dir.c:1985
+msgid "Untracked cache is disabled on this system or location."
+msgstr "Кэш неотслеживаемых файлов отключен на этой системе или в этом месте."
-#: merge-recursive.c:1172
+#: fetch-pack.c:213
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack: ожидается передача списка для получение части"
+
+#: fetch-pack.c:225
+msgid "git fetch-pack: expected ACK/NAK, got EOF"
+msgstr "git fetch-pack: ожидается ACK/NAK, а получено EOF"
+
+#: fetch-pack.c:243
#, 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 "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack: ожидается ACK/NAK, а получено «%s»"
-#: merge-recursive.c:1177
-msgid " (left unresolved)"
-msgstr " (оставлено неразрешенным)"
+#: fetch-pack.c:295
+msgid "--stateless-rpc requires multi_ack_detailed"
+msgstr "--stateless-rpc требует multi_ack_detailed"
-#: merge-recursive.c:1231
+#: fetch-pack.c:381
#, c-format
-msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
-msgstr "Ð\9aÐ\9eÐ\9dФÐ\9bÐ\98Ð\9aТ (пеÑ\80еименование/пеÑ\80еименование): Ð\9fеÑ\80еименование «%s»â\86\92«%s» в веÑ\82ке «%s» и пеÑ\80еименование «%s»â\86\92«%s» в веÑ\82ке «%s»"
+msgid "invalid shallow line: %s"
+msgstr "непÑ\80авилÑ\8cнаÑ\8f Ñ\81Ñ\82Ñ\80ока Ñ\87аÑ\81Ñ\82иÑ\87ного полÑ\83Ñ\87ениÑ\8f: %s"
-#: merge-recursive.c:1261
+#: fetch-pack.c:387
#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
-msgstr "Ð\9fеÑ\80еименовÑ\8bваÑ\8e %s в %s и %s в %s вмеÑ\81Ñ\82о Ñ\8dÑ\82ого"
+msgid "invalid unshallow line: %s"
+msgstr "непÑ\80авилÑ\8cнаÑ\8f Ñ\81Ñ\82Ñ\80ока полного полÑ\83Ñ\87ениÑ\8f: %s"
-#: merge-recursive.c:1460
+#: fetch-pack.c:389
#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
-msgstr "Ð\9aÐ\9eÐ\9dФÐ\9bÐ\98Ð\9aТ (пеÑ\80еименование/добавление): Ð\9fеÑ\80еименование «%s»â\86\92«%s» в веÑ\82ке «%s» и добавление «%s» в веÑ\82ке «%s»"
+msgid "object not found: %s"
+msgstr "обÑ\8aекÑ\82 не найден: %s"
-#: merge-recursive.c:1470
+#: fetch-pack.c:392
#, c-format
-msgid "Adding merged %s"
-msgstr "Ð\94обавление Ñ\81лиÑ\82ого %s"
+msgid "error in object: %s"
+msgstr "оÑ\88ибка в обÑ\8aекÑ\82е: %s"
-#: merge-recursive.c:1475 merge-recursive.c:1677
+#: fetch-pack.c:394
#, c-format
-msgid "Adding as %s instead"
-msgstr "Добавление вместо этого как %s"
+msgid "no shallow found: %s"
+msgstr "частичный клон не найден: %s"
-#: merge-recursive.c:1526
+#: fetch-pack.c:397
#, c-format
-msgid "cannot read object %s"
-msgstr "невозможно пÑ\80оÑ\87иÑ\82аÑ\82Ñ\8c обÑ\8aекÑ\82 «%s»"
+msgid "expected shallow/unshallow, got %s"
+msgstr "ожидалоÑ\81Ñ\8c shallow/unshallow, а полÑ\83Ñ\87ено %s"
-#: merge-recursive.c:1529
+#: fetch-pack.c:436
#, c-format
-msgid "object %s is not a blob"
-msgstr "обÑ\8aекÑ\82 %s не Ñ\8fвлÑ\8fеÑ\82Ñ\81Ñ\8f двоиÑ\87нÑ\8bм обÑ\8aекÑ\82ом"
+msgid "got %s %d %s"
+msgstr "полÑ\83Ñ\87ено %s %d %s"
-#: merge-recursive.c:1581
-msgid "modify"
-msgstr "изменение"
+#: fetch-pack.c:450
+#, c-format
+msgid "invalid commit %s"
+msgstr "недопустимый коммит %s"
-#: merge-recursive.c:1581
-msgid "modified"
-msgstr "изменено"
+#: fetch-pack.c:483
+msgid "giving up"
+msgstr "оÑ\81Ñ\82анавливаÑ\8e далÑ\8cнейÑ\88ие попÑ\8bÑ\82ки"
-#: merge-recursive.c:1591
-msgid "content"
-msgstr "содержимое"
+#: fetch-pack.c:493 progress.c:235
+msgid "done"
+msgstr "готово"
-#: merge-recursive.c:1598
-msgid "add/add"
-msgstr "добавление/добавление"
+#: fetch-pack.c:505
+#, c-format
+msgid "got %s (%d) %s"
+msgstr "получено %s (%d) %s"
-#: merge-recursive.c:1632
+#: fetch-pack.c:551
#, c-format
-msgid "Skipped %s (merged same as existing)"
-msgstr "Пропуск %s (слиты одинаковые изменения как существующие)"
+msgid "Marking %s as complete"
+msgstr "Помечаю %s как завершенный"
-#: merge-recursive.c:1646
+#: fetch-pack.c:697
#, c-format
-msgid "Auto-merging %s"
-msgstr "Автослияние %s"
+msgid "already have %s (%s)"
+msgstr "уже есть %s (%s)"
-#: merge-recursive.c:1650 git-submodule.sh:941
-msgid "submodule"
-msgstr "подмодуль"
+#: fetch-pack.c:735
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack: не удалось запустить программу разбора данных"
-#: merge-recursive.c:1651
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "КОНФЛИКТ (%s): Конфликт слияния в %s"
+#: fetch-pack.c:743
+msgid "protocol error: bad pack header"
+msgstr "ошибка протокола: неправильный заголовок потока"
-#: merge-recursive.c:1737
+#: fetch-pack.c:799
#, c-format
-msgid "Removing %s"
-msgstr "Удаление %s"
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack: не удалось запустить программу %s"
-#: merge-recursive.c:1762
-msgid "file/directory"
-msgstr "файл/каталог"
+#: fetch-pack.c:815
+#, c-format
+msgid "%s failed"
+msgstr "%s завершен с ошибкой"
-#: merge-recursive.c:1768
-msgid "directory/file"
-msgstr "каÑ\82алог/Ñ\84айл"
+#: fetch-pack.c:817
+msgid "error in sideband demultiplexer"
+msgstr "пÑ\80оизоÑ\88ла оÑ\88ибка в пÑ\80огÑ\80амме Ñ\80азбоÑ\80а даннÑ\8bÑ\85"
-#: merge-recursive.c:1773
-#, c-format
-msgid ""
-"CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
-msgstr "КОНФЛИКТ (%s): Уже существует каталог с именем «%s» в «%s». Добавление «%s» как «%s»"
+#: fetch-pack.c:844
+msgid "Server does not support shallow clients"
+msgstr "Сервер не поддерживает клиентов с частичным клонированием"
-#: merge-recursive.c:1781
-#, c-format
-msgid "Adding %s"
-msgstr "Добавление %s"
+#: fetch-pack.c:848
+msgid "Server supports multi_ack_detailed"
+msgstr "Сервер поддерживает multi_ack_detailed"
-#: merge-recursive.c:1798
-msgid "Fatal merge failure, shouldn't happen."
-msgstr "Ð\9aÑ\80иÑ\82иÑ\87еÑ\81каÑ\8f оÑ\88ибка Ñ\81лиÑ\8fниÑ\8f, Ñ\82акого не должно Ñ\81лÑ\83Ñ\87аÑ\82Ñ\8cÑ\81Ñ\8f."
+#: fetch-pack.c:851
+msgid "Server supports no-done"
+msgstr "СеÑ\80веÑ\80 поддеÑ\80живаеÑ\82 no-done"
-#: merge-recursive.c:1817
-msgid "Already up-to-date!"
-msgstr "Уже обновлено!"
+#: fetch-pack.c:857
+msgid "Server supports multi_ack"
+msgstr "СеÑ\80веÑ\80 поддеÑ\80живаеÑ\82 multi_ack"
-#: merge-recursive.c:1826
-#, c-format
-msgid "merging of trees %s and %s failed"
-msgstr "сбой слияния деревьев «%s» и «%s»"
+#: fetch-pack.c:861
+msgid "Server supports side-band-64k"
+msgstr "Сервер поддерживает side-band-64k"
-#: merge-recursive.c:1856
-#, c-format
-msgid "Unprocessed path??? %s"
-msgstr "Необработанный путь??? %s"
+#: fetch-pack.c:865
+msgid "Server supports side-band"
+msgstr "Сервер поддерживает side-band"
-#: merge-recursive.c:1904
-msgid "Merging:"
-msgstr "СлиÑ\8fние:"
+#: fetch-pack.c:869
+msgid "Server supports allow-tip-sha1-in-want"
+msgstr "СеÑ\80веÑ\80 поддеÑ\80живаеÑ\82 allow-tip-sha1-in-want"
-#: merge-recursive.c:1917
-#, 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 общих предков:"
+#: fetch-pack.c:873
+msgid "Server supports allow-reachable-sha1-in-want"
+msgstr "Сервер поддерживает allow-reachable-sha1-in-want"
-#: merge-recursive.c:1954
-msgid "merge returned no commit"
-msgstr "слияние не вернуло коммит"
+#: fetch-pack.c:883
+msgid "Server supports ofs-delta"
+msgstr "Сервер поддерживает ofs-delta"
-#: merge-recursive.c:2011
+#: fetch-pack.c:890
#, c-format
-msgid "Could not parse object '%s'"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\80азобÑ\80аÑ\82Ñ\8c обÑ\8aекÑ\82 «%s»"
+msgid "Server version is %.*s"
+msgstr "Ð\92еÑ\80Ñ\81иÑ\8f Ñ\81еÑ\80веÑ\80а %.*s"
-#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831
-msgid "Unable to write index."
-msgstr "Ð\9dе Ñ\83даеÑ\82Ñ\81Ñ\8f запиÑ\81аÑ\82Ñ\8c индекÑ\81."
+#: fetch-pack.c:896
+msgid "Server does not support --shallow-since"
+msgstr "СеÑ\80веÑ\80 не поддеÑ\80живаеÑ\82 --shallow-since"
-#: notes-utils.c:41
-msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr "Ð\9dелÑ\8cзÑ\8f закоммиÑ\82иÑ\82Ñ\8c неиниÑ\86иализиÑ\80ованное или не имеÑ\8eÑ\89ее Ñ\81Ñ\81Ñ\8bлок деÑ\80ево замеÑ\82ок"
+#: fetch-pack.c:900
+msgid "Server does not support --shallow-exclude"
+msgstr "СеÑ\80веÑ\80 не поддеÑ\80живаеÑ\82 --shallow-exclude"
-#: notes-utils.c:100
-#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "Неправильное значение notes.rewriteMode: «%s»"
+#: fetch-pack.c:902
+msgid "Server does not support --deepen"
+msgstr "Сервер не поддерживает --deepen"
-#: notes-utils.c:110
-#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
-msgstr "Отказ в перезаписи заметок в %s (за пределами refs/notes/)"
+#: fetch-pack.c:913
+msgid "no common commits"
+msgstr "не общих коммитов"
-#. TRANSLATORS: The first %s is the name of the
-#. environment variable, the second %s is its value
-#: notes-utils.c:137
-#, c-format
-msgid "Bad %s value: '%s'"
-msgstr "Неправильное значение переменной %s: «%s»"
+#: fetch-pack.c:925
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack: ошибка при получении данных."
-#: object.c:242
-#, c-format
-msgid "unable to parse object: %s"
-msgstr "не удалось разобрать объект: %s"
+#: fetch-pack.c:1087
+msgid "no matching remote head"
+msgstr "нет соотвествующего внешнего указателя на ветку"
-#: parse-options.c:572
-msgid "..."
-msgstr "…"
+#: gpg-interface.c:185
+msgid "gpg failed to sign the data"
+msgstr "gpg не удалось подписать данные"
-#: parse-options.c:590
-#, c-format
-msgid "usage: %s"
-msgstr "использование: %s"
+#: gpg-interface.c:215
+msgid "could not create temporary file"
+msgstr "не удалось создать временный файл"
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation
-#: parse-options.c:594
+#: gpg-interface.c:217
#, c-format
-msgid " or: %s"
-msgstr " или: %s"
+msgid "failed writing detached signature to '%s'"
+msgstr "сбой записи отсоединенной подписи в «%s»"
-#: parse-options.c:597
+#: grep.c:1782
#, c-format
-msgid " %s"
-msgstr " %s"
+msgid "'%s': unable to read %s"
+msgstr "«%s»: не удалось прочесть %s"
-#: parse-options.c:631
-msgid "-NUM"
-msgstr "-КОЛИЧЕСТВО"
+#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155
+#, c-format
+msgid "failed to stat '%s'"
+msgstr "не удалось выполнить stat «%s»"
-#: parse-options-cb.c:108
+#: grep.c:1810
#, c-format
-msgid "malformed object name '%s'"
-msgstr "Неправильное имя объекта «%s»"
+msgid "'%s': short read"
+msgstr "«%s»: слишком мало данных прочитано"
-#: path.c:796
+#: help.c:203
#, c-format
-msgid "Could not make %s writable by group"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c пÑ\80едоÑ\81Ñ\82авиÑ\82Ñ\8c доÑ\81Ñ\82Ñ\83п к %s на запиÑ\81Ñ\8c"
+msgid "available git commands in '%s'"
+msgstr "доÑ\81Ñ\82Ñ\83пнÑ\8bе командÑ\8b git в «%s»"
-#: pathspec.c:133
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
-msgstr "глобалÑ\8cнÑ\8bе опÑ\86ии Ñ\81пеÑ\86иÑ\84икаÑ\86ии пÑ\83Ñ\82и «glob» и «noglob» нелÑ\8cзÑ\8f иÑ\81полÑ\8cзоваÑ\82Ñ\8c одновÑ\80еменно"
+#: help.c:210
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "командÑ\8b git, доÑ\81Ñ\82Ñ\83пнÑ\8bе в дÑ\80Ñ\83гиÑ\85 меÑ\81Ñ\82аÑ\85 ваÑ\88его $PATH"
-#: pathspec.c:143
+#: help.c:241
+msgid "These are common Git commands used in various situations:"
+msgstr "Стандартные команды Git используемые в различных ситуациях:"
+
+#: help.c:306
+#, c-format
msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
-msgstr "глобальная опция спецификации пути «literal» не совместима с другими глобальными спецификаторами доступа"
+"'%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 не работает?"
-#: pathspec.c:177
-msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr "непÑ\80авилÑ\8cнÑ\8bй паÑ\80амеÑ\82Ñ\80 длÑ\8f магиÑ\87еÑ\81кого Ñ\81лова «prefix» в Ñ\81пеÑ\86иÑ\84икаÑ\86ии пÑ\83Ñ\82и "
+#: help.c:361
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "Ð\9eй-Ñ\91й! Ð\92аÑ\88а Ñ\81иÑ\81Ñ\82ема не Ñ\81ообÑ\89аеÑ\82 ни о какиÑ\85 командаÑ\85 Git вообÑ\89е."
-#: pathspec.c:183
+#: help.c:383
#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
-msgstr "неправильное магическое слово «%.*s» в спецификации пути «%s»"
+msgid ""
+"WARNING: You called a Git command named '%s', which does not exist.\n"
+"Continuing under the assumption that you meant '%s'"
+msgstr "ВНИМАНИЕ: Вы вызвали команду Git «%s», но такой не существует.\nПродолжаем с предположением, что вы имели в виду «%s»"
-#: pathspec.c:187
+#: help.c:388
#, c-format
-msgid "Missing ')' at the end of pathspec magic in '%s'"
-msgstr "Пропущено «)» в конце магического слова спецификации пути «%s»"
+msgid "in %0.1f seconds automatically..."
+msgstr "через %0.1f секунд автоматически…"
-#: pathspec.c:205
+#: help.c:395
#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "Нереализованное магическое слово «%c» спецификации пути «%s»"
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git: «%s» не является командой git. Смотрите «git --help»."
-#: pathspec.c:230
-#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
-msgstr "%s: «literal» и «glob» не совместимы"
+#: help.c:399 help.c:465
+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Возможно, вы имели в виду что-то из этого?"
-#: pathspec.c:241
+#: help.c:461
#, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s: «%s» вне репозитория"
+msgid "%s: %s - %s"
+msgstr "%s: %s — %s"
-#: pathspec.c:291
-#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "Спецификация пути «%s» в подмодуле «%.*s»"
+#: ident.c:334
+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"
-#: pathspec.c:353
+#: lockfile.c:152
#, c-format
-msgid "%s: pathspec magic not supported by this command: %s"
-msgstr "%s: магические слова в спецификации пути не поддерживаются командой: %s"
+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удалите файл вручную для продолжения."
-#: pathspec.c:433
+#: lockfile.c:160
#, c-format
-msgid "pathspec '%s' is beyond a symbolic link"
-msgstr "спецификация пути «%s» находится за символической ссылкой"
+msgid "Unable to create '%s.lock': %s"
+msgstr "Не удалось создать «%s.lock»: %s"
-#: pathspec.c:442
-msgid ""
-"There is nothing to exclude from by :(exclude) patterns.\n"
-"Perhaps you forgot to add either ':/' or '.' ?"
-msgstr "Не указан шаблон для исключения с помощью :(exclude).\nВозможно, вы забыли «:/» или «.» ?"
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "сбой чтения кэша"
-#: pretty.c:971
-msgid "unable to parse --pretty format"
-msgstr "не удалось разобрать формат для --pretty"
+#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374
+#: builtin/checkout.c:588 builtin/clone.c:731
+msgid "unable to write new index file"
+msgstr "не удалось записать новый файл индекса"
-#: progress.c:235
-msgid "done"
-msgstr "готово"
+#: merge-recursive.c:209
+msgid "(bad commit)\n"
+msgstr "(плохой коммит)\n"
-#: read-cache.c:1281
+#: merge-recursive.c:231
#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
-msgstr "index.version указан, но значение недействительное.\nИспользую версию %i"
+msgid "addinfo_cache failed for path '%s'"
+msgstr "сбой addinfo_cache для пути «%s»"
+
+#: merge-recursive.c:301
+msgid "error building trees"
+msgstr "ошибка при построении деревьев"
-#: read-cache.c:1291
+#: merge-recursive.c:720
#, c-format
-msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
-msgstr "GIT_INDEX_VERSION указан, но значение недействительное.\nИспользую версию %i"
+msgid "failed to create path '%s'%s"
+msgstr "не удалось создать путь «%s»%s"
-#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985
-#: builtin/merge.c:995
+#: merge-recursive.c:731
#, c-format
-msgid "Could not open '%s' for writing"
-msgstr "Не удалось открыть «%s» для записи"
+msgid "Removing %s to make room for subdirectory\n"
+msgstr "Удаление %s, чтобы освободить место для подкаталогов\n"
+
+#: merge-recursive.c:745 merge-recursive.c:764
+msgid ": perhaps a D/F conflict?"
+msgstr ": возможно, конфликт каталогов/файлов?"
-#: refs/files-backend.c:2243
+#: merge-recursive.c:754
#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "не Ñ\83далоÑ\81Ñ\8c Ñ\83далиÑ\82Ñ\8c Ñ\81Ñ\81Ñ\8bлкÑ\83 %s: %s"
+msgid "refusing to lose untracked file at '%s'"
+msgstr "оÑ\82каз поÑ\82еÑ\80и неоÑ\82Ñ\81леживаемого Ñ\84айла в «%s»"
-#: refs/files-backend.c:2246
+#: merge-recursive.c:796 builtin/cat-file.c:34
#, c-format
-msgid "could not delete references: %s"
-msgstr "не удалось удалить ссылки: %s"
+msgid "cannot read object %s '%s'"
+msgstr "невозможно прочитать объект %s «%s»"
-#: refs/files-backend.c:2255
+#: merge-recursive.c:798
#, c-format
-msgid "could not remove reference %s"
-msgstr "не Ñ\83далоÑ\81Ñ\8c Ñ\83далиÑ\82Ñ\8c Ñ\81Ñ\81Ñ\8bлки %s"
+msgid "blob expected for %s '%s'"
+msgstr "ожидаеÑ\82Ñ\81Ñ\8f двоиÑ\87нÑ\8bй обÑ\8aекÑ\82 длÑ\8f %s «%s»"
-#: ref-filter.c:55
+#: merge-recursive.c:822
#, c-format
-msgid "expected format: %%(color:<color>)"
-msgstr "ожидаемÑ\8bй Ñ\84оÑ\80маÑ\82: %%(color:<color>)"
+msgid "failed to open '%s': %s"
+msgstr "не Ñ\83далоÑ\81Ñ\8c оÑ\82кÑ\80Ñ\8bÑ\82Ñ\8c «%s»: %s"
-#: ref-filter.c:57
+#: merge-recursive.c:833
#, c-format
-msgid "unrecognized color: %%(color:%s)"
-msgstr "неопознанный цвет: %%(color:%s)"
+msgid "failed to symlink '%s': %s"
+msgstr "не удалось создать символьную ссылку «%s»: %s"
-#: ref-filter.c:71
+#: merge-recursive.c:838
#, c-format
-msgid "unrecognized format: %%(%s)"
-msgstr "неопознанный формат: %%(%s)"
+msgid "do not know what to do with %06o %s '%s'"
+msgstr "не понятно, что делать с %06o %s «%s»"
-#: ref-filter.c:77
+#: merge-recursive.c:978
+msgid "Failed to execute internal merge"
+msgstr "Не удалось запустить внутреннее слияние"
+
+#: merge-recursive.c:982
#, c-format
-msgid "%%(body) does not take arguments"
-msgstr "%%(body) не принимает аргументов"
+msgid "Unable to add %s to database"
+msgstr "Не удалось добавить %s в базу данных"
-#: ref-filter.c:84
+#: merge-recursive.c:1081 merge-recursive.c:1095
#, c-format
-msgid "%%(subject) does not take arguments"
-msgstr "%%(subject) не принимает аргументов"
+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 оставлена в дереве."
-#: ref-filter.c:101
+#: merge-recursive.c:1087 merge-recursive.c:1100
#, c-format
-msgid "positive value expected contents:lines=%s"
-msgstr "положительное значение ожидает содержимое:lines=%s"
+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."
-#: ref-filter.c:103
+#: merge-recursive.c:1143
+msgid "rename"
+msgstr "переименование"
+
+#: merge-recursive.c:1143
+msgid "renamed"
+msgstr "переименовано"
+
+#: merge-recursive.c:1200
#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "неопознанный аргумент %%(contents): %s"
+msgid "%s is a directory in %s adding as %s instead"
+msgstr "%s — это каталог в %s, добавляем как %s вместо этого"
-#: ref-filter.c:113
+#: merge-recursive.c:1225
#, c-format
-msgid "unrecognized %%(objectname) argument: %s"
-msgstr "неопознанный аргумент %%(objectname): %s"
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
+"\"%s\"->\"%s\" in \"%s\"%s"
+msgstr "КОНФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке «%s» и переименование «%s»→«%s» в ветке «%s»%s"
-#: ref-filter.c:135
+#: merge-recursive.c:1230
+msgid " (left unresolved)"
+msgstr " (оставлено неразрешенным)"
+
+#: merge-recursive.c:1292
#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
-msgstr "ожидаемÑ\8bй Ñ\84оÑ\80маÑ\82: %%(align:<width>,<position>)"
+msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
+msgstr "Ð\9aÐ\9eÐ\9dФÐ\9bÐ\98Ð\9aТ (пеÑ\80еименование/пеÑ\80еименование): Ð\9fеÑ\80еименование «%s»â\86\92«%s» в веÑ\82ке «%s» и пеÑ\80еименование «%s»â\86\92«%s» в веÑ\82ке «%s»"
-#: ref-filter.c:147
+#: merge-recursive.c:1325
#, c-format
-msgid "unrecognized position:%s"
-msgstr "неопознаннаÑ\8f позиÑ\86иÑ\8f:%s"
+msgid "Renaming %s to %s and %s to %s instead"
+msgstr "Ð\9fеÑ\80еименовÑ\8bваÑ\8e %s в %s и %s в %s вмеÑ\81Ñ\82о Ñ\8dÑ\82ого"
-#: ref-filter.c:151
+#: merge-recursive.c:1531
#, c-format
-msgid "unrecognized width:%s"
-msgstr "неопознаннаÑ\8f Ñ\88иÑ\80ина:%s"
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
+msgstr "Ð\9aÐ\9eÐ\9dФÐ\9bÐ\98Ð\9aТ (пеÑ\80еименование/добавление): Ð\9fеÑ\80еименование «%s»â\86\92«%s» в веÑ\82ке «%s» и добавление «%s» в веÑ\82ке «%s»"
-#: ref-filter.c:157
+#: merge-recursive.c:1546
#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "неопознаннÑ\8bй аÑ\80гÑ\83менÑ\82 %%(align): %s"
+msgid "Adding merged %s"
+msgstr "Ð\94обавление Ñ\81лиÑ\82ого %s"
-#: ref-filter.c:161
+#: merge-recursive.c:1553 merge-recursive.c:1766
#, c-format
-msgid "positive width expected with the %%(align) atom"
-msgstr "ожидаеÑ\82Ñ\81Ñ\8f положиÑ\82елÑ\8cнаÑ\8f Ñ\88иÑ\80ина Ñ\81 Ñ\83казанием Ñ\87аÑ\81Ñ\82иÑ\86Ñ\8b %%(align)"
+msgid "Adding as %s instead"
+msgstr "Ð\94обавление вмеÑ\81Ñ\82о Ñ\8dÑ\82ого как %s"
-#: ref-filter.c:244
+#: merge-recursive.c:1610
#, c-format
-msgid "malformed field name: %.*s"
-msgstr "непÑ\80авилÑ\8cное имÑ\8f полÑ\8f: %.*s"
+msgid "cannot read object %s"
+msgstr "невозможно пÑ\80оÑ\87иÑ\82аÑ\82Ñ\8c обÑ\8aекÑ\82 «%s»"
-#: ref-filter.c:270
+#: merge-recursive.c:1613
#, c-format
-msgid "unknown field name: %.*s"
-msgstr "неизвеÑ\81Ñ\82ное имÑ\8f полÑ\8f: %.*s"
+msgid "object %s is not a blob"
+msgstr "обÑ\8aекÑ\82 %s не Ñ\8fвлÑ\8fеÑ\82Ñ\81Ñ\8f двоиÑ\87нÑ\8bм обÑ\8aекÑ\82ом"
-#: ref-filter.c:372
+#: merge-recursive.c:1666
+msgid "modify"
+msgstr "изменение"
+
+#: merge-recursive.c:1666
+msgid "modified"
+msgstr "изменено"
+
+#: merge-recursive.c:1676
+msgid "content"
+msgstr "содержимое"
+
+#: merge-recursive.c:1683
+msgid "add/add"
+msgstr "добавление/добавление"
+
+#: merge-recursive.c:1718
#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
-msgstr "формат: частица %%(end) использована без соответствующей частицы"
+msgid "Skipped %s (merged same as existing)"
+msgstr "Пропуск %s (слиты одинаковые изменения как существующие)"
-#: ref-filter.c:424
+#: merge-recursive.c:1732
#, c-format
-msgid "malformed format string %s"
-msgstr "непÑ\80авилÑ\8cнаÑ\8f Ñ\81Ñ\82Ñ\80ока Ñ\84оÑ\80маÑ\82а %s"
+msgid "Auto-merging %s"
+msgstr "Ð\90вÑ\82оÑ\81лиÑ\8fние %s"
-#: ref-filter.c:878
-msgid ":strip= requires a positive integer argument"
-msgstr ":strip= требует наличия положительного целого аргумента"
+#: merge-recursive.c:1736 git-submodule.sh:924
+msgid "submodule"
+msgstr "подмодуль"
-#: ref-filter.c:883
+#: merge-recursive.c:1737
#, c-format
-msgid "ref '%s' does not have %ld components to :strip"
-msgstr "ссылка «%s» не содержит %ld компонент для :strip"
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "КОНФЛИКТ (%s): Конфликт слияния в %s"
-#: ref-filter.c:1046
+#: merge-recursive.c:1831
#, c-format
-msgid "unknown %.*s format %s"
-msgstr "неизвеÑ\81Ñ\82нÑ\8bй %.*s Ñ\84оÑ\80маÑ\82 %s"
+msgid "Removing %s"
+msgstr "Удаление %s"
-#: ref-filter.c:1066 ref-filter.c:1097
-#, c-format
-msgid "missing object %s for %s"
-msgstr "не найден объект %s для %s"
+#: merge-recursive.c:1857
+msgid "file/directory"
+msgstr "файл/каталог"
-#: ref-filter.c:1069 ref-filter.c:1100
-#, c-format
-msgid "parse_object_buffer failed on %s for %s"
-msgstr "сбой при выполнении parse_object_buffer на %s для %s"
+#: merge-recursive.c:1863
+msgid "directory/file"
+msgstr "каталог/файл"
-#: ref-filter.c:1311
+#: merge-recursive.c:1868
#, c-format
-msgid "malformed object at '%s'"
-msgstr "Повреждённый объект «%s»"
+msgid ""
+"CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
+msgstr "КОНФЛИКТ (%s): Уже существует каталог с именем «%s» в «%s». Добавление «%s» как «%s»"
-#: ref-filter.c:1373
+#: merge-recursive.c:1877
#, c-format
-msgid "ignoring ref with broken name %s"
-msgstr "игноÑ\80иÑ\80Ñ\83Ñ\8e Ñ\81Ñ\81Ñ\8bлкÑ\83 Ñ\81 непÑ\80авилÑ\8cнÑ\8bм именем %s"
+msgid "Adding %s"
+msgstr "Ð\94обавление %s"
-#: ref-filter.c:1378
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "игнорирую неправильную ссылку %s"
+#: merge-recursive.c:1914
+msgid "Already up-to-date!"
+msgstr "Уже обновлено!"
-#: ref-filter.c:1651
+#: merge-recursive.c:1923
#, c-format
-msgid "format: %%(end) atom missing"
-msgstr "format: пропущена частица %%(end)"
+msgid "merging of trees %s and %s failed"
+msgstr "сбой слияния деревьев «%s» и «%s»"
-#: ref-filter.c:1705
-#, c-format
-msgid "malformed object name %s"
-msgstr "неправильное имя объекта %s"
+#: merge-recursive.c:2006
+msgid "Merging:"
+msgstr "Слияние:"
-#: remote.c:746
+#: merge-recursive.c:2019
#, c-format
-msgid "Cannot fetch both %s and %s to %s"
-msgstr "Нельзя извлечь одновременно %s и %s в %s"
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] "найден %u общий предок:"
+msgstr[1] "найдено %u общих предка:"
+msgstr[2] "найдено %u общих предков:"
+msgstr[3] "найдено %u общих предков:"
-#: remote.c:750
-#, c-format
-msgid "%s usually tracks %s, not %s"
-msgstr "%s обычно отслеживает %s, а не %s"
+#: merge-recursive.c:2058
+msgid "merge returned no commit"
+msgstr "слияние не вернуло коммит"
-#: remote.c:754
+#: merge-recursive.c:2121
#, c-format
-msgid "%s tracks both %s and %s"
-msgstr "%s отслеживает и %s и %s"
-
-#: remote.c:762
-msgid "Internal error"
-msgstr "Внутренняя ошибка"
+msgid "Could not parse object '%s'"
+msgstr "Не удалось разобрать объект «%s»"
-#: remote.c:1678 remote.c:1721
-msgid "HEAD does not point to a branch"
-msgstr "HEAD не указывает на ветку"
+#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
+msgid "Unable to write index."
+msgstr "Не удается записать индекс."
-#: remote.c:1687
+#: notes-merge.c:273
#, c-format
-msgid "no such branch: '%s'"
-msgstr "нет такой ветки: «%s»"
+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» для коммита или отмены предыдущего слияния и запуска нового слияния заметок."
-#: remote.c:1690
+#: notes-merge.c:280
#, c-format
-msgid "no upstream configured for branch '%s'"
-msgstr "вÑ\8bÑ\88еÑ\81Ñ\82оÑ\8fÑ\89аÑ\8f веÑ\82ка не наÑ\81Ñ\82Ñ\80оена длÑ\8f веÑ\82ки «%s»"
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "Ð\92Ñ\8b не законÑ\87или пÑ\80едÑ\8bдÑ\83Ñ\89ее Ñ\81лиÑ\8fние замеÑ\82ок (%s Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83еÑ\82)."
-#: remote.c:1696
-#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
-msgstr "вышестоящая ветка «%s» не сохранена как отслеживаемая ветка"
+#: notes-utils.c:41
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr "Нельзя закоммитить неинициализированное или не имеющее ссылок дерево заметок"
-#: remote.c:1711
+#: notes-utils.c:100
#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
-msgstr "назнаÑ\87ение длÑ\8f оÑ\82пÑ\80авки «%s» на внеÑ\88нем Ñ\81еÑ\80веÑ\80е «%s» не имееÑ\82 локалÑ\8cной оÑ\82Ñ\81леживаемой веÑ\82ки"
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "Ð\9dепÑ\80авилÑ\8cное знаÑ\87ение notes.rewriteMode: «%s»"
-#: remote.c:1726
+#: notes-utils.c:110
#, c-format
-msgid "branch '%s' has no remote for pushing"
-msgstr "веÑ\82ка «%s» не имееÑ\82 внеÑ\88него Ñ\81еÑ\80веÑ\80а длÑ\8f оÑ\82пÑ\80авки"
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "Ð\9eÑ\82каз в пеÑ\80езапиÑ\81и замеÑ\82ок в %s (за пÑ\80еделами refs/notes/)"
-#: remote.c:1737
+#. TRANSLATORS: The first %s is the name of the
+#. environment variable, the second %s is its value
+#: notes-utils.c:137
#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
-msgstr "спецификации пути для отправки «%s» не включают в себя «%s»"
+msgid "Bad %s value: '%s'"
+msgstr "Неправильное значение переменной %s: «%s»"
-#: remote.c:1750
-msgid "push has no destination (push.default is 'nothing')"
-msgstr "отправка не имеет точки назначения (push.default выставлен в «nothing»)"
+#: object.c:242
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "не удалось разобрать объект: %s"
-#: remote.c:1772
-msgid "cannot resolve 'simple' push to a single destination"
-msgstr "не удалось выполнить «simple» отправку в единственную точку назначения"
+#: parse-options.c:572
+msgid "..."
+msgstr "…"
-#: remote.c:2074
+#: parse-options.c:590
#, c-format
-msgid "Your branch is based on '%s', but the upstream is gone.\n"
-msgstr "Ваша ветка базируется на «%s», но вышестоящий репозиторий исчез.\n"
-
-#: remote.c:2078
-msgid " (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr "(для исправления запустите «git branch --unset-upstream»)\n"
+msgid "usage: %s"
+msgstr "использование: %s"
-#: remote.c:2081
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation
+#: parse-options.c:594
#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
-msgstr "Ваша ветка обновлена в соответствии с «%s».\n"
+msgid " or: %s"
+msgstr " или: %s"
-#: remote.c:2085
+#: parse-options.c:597
#, 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 " %s"
+msgstr " %s"
-#: remote.c:2091
-msgid " (use \"git push\" to publish your local commits)\n"
-msgstr " (используйте «git push», чтобы опубликовать ваши локальные коммиты)\n"
+#: parse-options.c:631
+msgid "-NUM"
+msgstr "-КОЛИЧЕСТВО"
-#: remote.c:2094
+#: parse-options-cb.c:108
#, 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:2102
-msgid " (use \"git pull\" to update your local branch)\n"
-msgstr " (используйте «git pull», чтобы обновить вашу локальную ветку)\n"
+msgid "malformed object name '%s'"
+msgstr "Неправильное имя объекта «%s»"
-#: remote.c:2105
+#: path.c:826
#, c-format
+msgid "Could not make %s writable by group"
+msgstr "Не удалось предоставить доступ к %s на запись"
+
+#: pathspec.c:133
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr "глобальные опции спецификации пути «glob» и «noglob» нельзя использовать одновременно"
+
+#: pathspec.c:143
msgid ""
-"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"
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr "глобальная опция спецификации пути «literal» не совместима с другими глобальными спецификаторами доступа"
-#: remote.c:2115
-msgid " (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr " (используйте «git pull», чтобы слить внешнюю ветку в вашу)\n"
+#: pathspec.c:177
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "неправильный параметр для магического слова «prefix» в спецификации пути "
-#: revision.c:2142
-msgid "your current branch appears to be broken"
-msgstr "похоже, ваша текущая ветка повреждена"
+#: pathspec.c:183
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "неправильное магическое слово «%.*s» в спецификации пути «%s»"
-#: revision.c:2145
+#: pathspec.c:187
#, c-format
-msgid "your current branch '%s' does not have any commits yet"
-msgstr "ваÑ\88а Ñ\82екÑ\83Ñ\89аÑ\8f веÑ\82ка «%s» еÑ\89е не Ñ\81одеÑ\80жиÑ\82 ни одного коммиÑ\82а"
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "Ð\9fÑ\80опÑ\83Ñ\89ено «)» в конÑ\86е магиÑ\87еÑ\81кого Ñ\81лова Ñ\81пеÑ\86иÑ\84икаÑ\86ии пÑ\83Ñ\82и «%s»"
-#: revision.c:2339
-msgid "--first-parent is incompatible with --bisect"
-msgstr "опцию --first-parent нельзя использовать одновременно с --bisect"
+#: pathspec.c:205
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "Нереализованное магическое слово «%c» спецификации пути «%s»"
-#: run-command.c:92
-msgid "open /dev/null failed"
-msgstr "сбой открытия /dev/null"
+#: pathspec.c:230
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s: «literal» и «glob» не совместимы"
-#: run-command.c:94
+#: pathspec.c:241
#, c-format
-msgid "dup2(%d,%d) failed"
-msgstr "dup2(%d,%d) сбой"
+msgid "%s: '%s' is outside repository"
+msgstr "%s: «%s» вне репозитория"
-#: send-pack.c:295
-msgid "failed to sign the push certificate"
-msgstr "сбой подписания сертификата отправки"
+#: pathspec.c:291
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "Спецификация пути «%s» в подмодуле «%.*s»"
-#: send-pack.c:404
-msgid "the receiving end does not support --signed push"
-msgstr "принимающая сторона не поддерживает отправку с опцией --signed"
+#: pathspec.c:353
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr "%s: магические слова в спецификации пути не поддерживаются командой: %s"
-#: send-pack.c:406
+#: pathspec.c:408
msgid ""
-"not sending a push certificate since the receiving end does not support "
-"--signed push"
-msgstr "не оÑ\82пÑ\80авлÑ\8fем Ñ\81еÑ\80Ñ\82иÑ\84икаÑ\82 длÑ\8f оÑ\82пÑ\80авки, Ñ\82ак как пÑ\80инимаÑ\8eÑ\89аÑ\8f Ñ\81Ñ\82оÑ\80она не поддеÑ\80живаеÑ\82 оÑ\82пÑ\80авкÑ\83 Ñ\81 опÑ\86ией --signed"
+"empty strings as pathspecs will be made invalid in upcoming releases. please"
+" use . instead if you meant to match all paths"
+msgstr "пÑ\83Ñ\81Ñ\82Ñ\8bе Ñ\81Ñ\82Ñ\80оки как Ñ\81пеÑ\86иÑ\84икаÑ\82оÑ\80Ñ\8b пÑ\83Ñ\82и бÑ\83дÑ\83Ñ\82 Ñ\81деланÑ\8b недопÑ\83Ñ\81Ñ\82имÑ\8bми в Ñ\81ледÑ\83Ñ\8eÑ\89иÑ\85 веÑ\80Ñ\81иÑ\8fÑ\85. иÑ\81полÑ\8cзÑ\83йÑ\82е вмеÑ\81Ñ\82о ниÑ\85 «.», Ñ\87Ñ\82о знаÑ\87иÑ\82 Ñ\81ооÑ\82веÑ\81Ñ\82вие вÑ\81ем пÑ\83Ñ\82Ñ\8fм"
-#: send-pack.c:418
-msgid "the receiving end does not support --atomic push"
-msgstr "принимающая сторона не поддерживает отправку с опцией --atomic"
+#: pathspec.c:440
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "спецификация пути «%s» находится за символической ссылкой"
-#: sequencer.c:174
+#: pathspec.c:449
msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
-msgstr "поÑ\81ле Ñ\80азÑ\80еÑ\88ениÑ\8f конÑ\84ликÑ\82ов, помеÑ\82Ñ\8cÑ\82е иÑ\81пÑ\80авленнÑ\8bе пÑ\83Ñ\82и\nÑ\81 помоÑ\89Ñ\8cÑ\8e «git add <пÑ\83Ñ\82и>» или «git rm <пÑ\83Ñ\82и>»"
+"There is nothing to exclude from by :(exclude) patterns.\n"
+"Perhaps you forgot to add either ':/' or '.' ?"
+msgstr "Ð\9dе Ñ\83казан Ñ\88аблон длÑ\8f иÑ\81клÑ\8eÑ\87ениÑ\8f Ñ\81 помоÑ\89Ñ\8cÑ\8e :(exclude).\nÐ\92озможно, вÑ\8b забÑ\8bли «:/» или «.» ?"
-#: sequencer.c:177
-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»"
+#: pretty.c:971
+msgid "unable to parse --pretty format"
+msgstr "не удалось разобрать формат для --pretty"
-#: sequencer.c:190 sequencer.c:833 sequencer.c:912
+#: read-cache.c:1315
#, c-format
-msgid "Could not write to %s"
-msgstr "Не удалось записать в %s"
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr "index.version указан, но значение недействительное.\nИспользую версию %i"
-#: sequencer.c:193
+#: read-cache.c:1325
#, c-format
-msgid "Error wrapping up %s"
-msgstr "Ошибка оборачивания %s"
-
-#: sequencer.c:208
-msgid "Your local changes would be overwritten by cherry-pick."
-msgstr "Ваши локальные изменение будут перезаписаны копией коммита."
-
-#: sequencer.c:210
-msgid "Your local changes would be overwritten by revert."
-msgstr "Ваши локальные изменения будут перезаписаны обратными изменениями коммита."
-
-#: sequencer.c:213
-msgid "Commit your changes or stash them to proceed."
-msgstr "Сделайте коммит или спрячьте ваши изменения для продолжения."
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr "GIT_INDEX_VERSION указан, но значение недействительное.\nИспользую версию %i"
-#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:300
+#: refs.c:576 builtin/merge.c:840
#, c-format
-msgid "%s: Unable to write new index file"
-msgstr "%s: Не удалось записать файл индекса"
-
-#: sequencer.c:318
-msgid "Could not resolve HEAD commit\n"
-msgstr "Не удалось определить HEAD коммит\n"
-
-#: sequencer.c:338
-msgid "Unable to update cache tree\n"
-msgstr "Не удалось обновить дерево кэша\n"
+msgid "Could not open '%s' for writing"
+msgstr "Не удалось открыть «%s» для записи"
-#: sequencer.c:390
+#: refs/files-backend.c:2481
#, c-format
-msgid "Could not parse commit %s\n"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\80азобÑ\80аÑ\82Ñ\8c коммиÑ\82 %s\n"
+msgid "could not delete reference %s: %s"
+msgstr "не Ñ\83далоÑ\81Ñ\8c Ñ\83далиÑ\82Ñ\8c Ñ\81Ñ\81Ñ\8bлкÑ\83 %s: %s"
-#: sequencer.c:395
+#: refs/files-backend.c:2484
#, c-format
-msgid "Could not parse parent commit %s\n"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\80азобÑ\80аÑ\82Ñ\8c Ñ\80одиÑ\82елÑ\8cÑ\81кÑ\83Ñ\8e коммиÑ\82 %s\n"
+msgid "could not delete references: %s"
+msgstr "не Ñ\83далоÑ\81Ñ\8c Ñ\83далиÑ\82Ñ\8c Ñ\81Ñ\81Ñ\8bлки: %s"
-#: sequencer.c:460
-msgid "Your index file is unmerged."
-msgstr "Ваш файл индекса не слит."
+#: refs/files-backend.c:2493
+#, c-format
+msgid "could not remove reference %s"
+msgstr "не удалось удалить ссылки %s"
-#: sequencer.c:479
+#: ref-filter.c:55
#, c-format
-msgid "Commit %s is a merge but no -m option was given."
-msgstr "Ð\9aоммиÑ\82 %s â\80\94 Ñ\8dÑ\82о коммиÑ\82-Ñ\81лиÑ\8fние, но опÑ\86иÑ\8f -m не Ñ\83казана."
+msgid "expected format: %%(color:<color>)"
+msgstr "ожидаемÑ\8bй Ñ\84оÑ\80маÑ\82: %%(color:<color>)"
-#: sequencer.c:487
+#: ref-filter.c:57
#, c-format
-msgid "Commit %s does not have parent %d"
-msgstr "У коммиÑ\82а %s неÑ\82 пÑ\80едка %d"
+msgid "unrecognized color: %%(color:%s)"
+msgstr "неопознаннÑ\8bй Ñ\86веÑ\82: %%(color:%s)"
-#: sequencer.c:491
+#: ref-filter.c:71
#, c-format
-msgid "Mainline was specified but commit %s is not a merge."
-msgstr "Ð\9eÑ\81новнаÑ\8f веÑ\82ка Ñ\83казана, но коммиÑ\82 %s не Ñ\8fвлÑ\8fеÑ\82Ñ\81Ñ\8f Ñ\81лиÑ\8fнием."
+msgid "unrecognized format: %%(%s)"
+msgstr "неопознаннÑ\8bй Ñ\84оÑ\80маÑ\82: %%(%s)"
-#. TRANSLATORS: The first %s will be "revert" or
-#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:504
+#: ref-filter.c:77
#, c-format
-msgid "%s: cannot parse parent commit %s"
-msgstr "%s: не удалось разобрать родительский коммит для %s"
+msgid "%%(body) does not take arguments"
+msgstr "%%(body) не принимает аргументов"
-#: sequencer.c:508
+#: ref-filter.c:84
#, c-format
-msgid "Cannot get commit message for %s"
-msgstr "Не удалось получить сообщение коммита для %s"
+msgid "%%(subject) does not take arguments"
+msgstr "%%(subject) не принимает аргументов"
-#: sequencer.c:594
+#: ref-filter.c:101
#, c-format
-msgid "could not revert %s... %s"
-msgstr "не Ñ\83далоÑ\81Ñ\8c обÑ\80аÑ\82иÑ\82Ñ\8c изменениÑ\8f коммиÑ\82а %sâ\80¦ %s"
+msgid "positive value expected contents:lines=%s"
+msgstr "положиÑ\82елÑ\8cное знаÑ\87ение ожидаеÑ\82 Ñ\81одеÑ\80жимое:lines=%s"
-#: sequencer.c:595
+#: ref-filter.c:103
#, c-format
-msgid "could not apply %s... %s"
-msgstr "не удалось применить коммит %s… %s"
-
-#: sequencer.c:630
-msgid "empty commit set passed"
-msgstr "передан пустой набор коммитов"
+msgid "unrecognized %%(contents) argument: %s"
+msgstr "неопознанный аргумент %%(contents): %s"
-#: sequencer.c:638
+#: ref-filter.c:113
#, c-format
-msgid "git %s: failed to read the index"
-msgstr "git %s: сбой чтения индекса"
+msgid "unrecognized %%(objectname) argument: %s"
+msgstr "неопознанный аргумент %%(objectname): %s"
-#: sequencer.c:642
+#: ref-filter.c:135
#, c-format
-msgid "git %s: failed to refresh the index"
-msgstr "git %s: сбой обновления индекса"
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "ожидаемый формат: %%(align:<width>,<position>)"
-#: sequencer.c:702
+#: ref-filter.c:147
#, c-format
-msgid "Cannot %s during a %s"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c %s во вÑ\80емÑ\8f %s"
+msgid "unrecognized position:%s"
+msgstr "неопознаннаÑ\8f позиÑ\86иÑ\8f:%s"
-#: sequencer.c:724
+#: ref-filter.c:151
#, c-format
-msgid "Could not parse line %d."
-msgstr "Не удалось разобрать строку %d."
-
-#: sequencer.c:729
-msgid "No commits parsed."
-msgstr "Коммиты не разобраны."
+msgid "unrecognized width:%s"
+msgstr "неопознанная ширина:%s"
-#: sequencer.c:741
+#: ref-filter.c:157
#, c-format
-msgid "Could not open %s"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c оÑ\82кÑ\80Ñ\8bÑ\82Ñ\8c %s"
+msgid "unrecognized %%(align) argument: %s"
+msgstr "неопознаннÑ\8bй аÑ\80гÑ\83менÑ\82 %%(align): %s"
-#: sequencer.c:745
+#: ref-filter.c:161
#, c-format
-msgid "Could not read %s."
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c пÑ\80оÑ\87иÑ\82аÑ\82Ñ\8c %s."
+msgid "positive width expected with the %%(align) atom"
+msgstr "ожидаеÑ\82Ñ\81Ñ\8f положиÑ\82елÑ\8cнаÑ\8f Ñ\88иÑ\80ина Ñ\81 Ñ\83казанием Ñ\87аÑ\81Ñ\82иÑ\86Ñ\8b %%(align)"
-#: sequencer.c:752
+#: ref-filter.c:244
#, c-format
-msgid "Unusable instruction sheet: %s"
-msgstr "Ð\9dепÑ\80игоднаÑ\8f длÑ\8f иÑ\81полÑ\8cзованиÑ\8f каÑ\80Ñ\82а Ñ\81 инÑ\81Ñ\82Ñ\80Ñ\83кÑ\86иÑ\8fми: %s"
+msgid "malformed field name: %.*s"
+msgstr "непÑ\80авилÑ\8cное имÑ\8f полÑ\8f: %.*s"
-#: sequencer.c:782
+#: ref-filter.c:270
#, c-format
-msgid "Invalid key: %s"
-msgstr "Ð\9dедейÑ\81Ñ\82виÑ\82елÑ\8cнÑ\8bй клÑ\8eÑ\87: %s"
+msgid "unknown field name: %.*s"
+msgstr "неизвеÑ\81Ñ\82ное имÑ\8f полÑ\8f: %.*s"
-#: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52
+#: ref-filter.c:372
#, c-format
-msgid "Invalid value for %s: %s"
-msgstr "Неправильное значение %s: %s"
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "формат: частица %%(end) использована без соответствующей частицы"
-#: sequencer.c:795
+#: ref-filter.c:424
#, c-format
-msgid "Malformed options sheet: %s"
-msgstr "Повреждённая карта с опциями: %s"
-
-#: sequencer.c:814
-msgid "a cherry-pick or revert is already in progress"
-msgstr "копирование или обращение изменений коммита уже выполняются"
+msgid "malformed format string %s"
+msgstr "неправильная строка формата %s"
-#: sequencer.c:815
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
-msgstr "попробуйте «git cherry-pick (--continue | --quit | --abort)»"
+#: ref-filter.c:878
+msgid ":strip= requires a positive integer argument"
+msgstr ":strip= требует наличия положительного целого аргумента"
-#: sequencer.c:819
+#: ref-filter.c:883
#, c-format
-msgid "Could not create sequencer directory %s"
-msgstr "Не удалось создать каталог для указателя следования коммитов %s"
+msgid "ref '%s' does not have %ld components to :strip"
+msgstr "ссылка «%s» не содержит %ld компонент для :strip"
-#: sequencer.c:835 sequencer.c:916
+#: ref-filter.c:1046
#, c-format
-msgid "Error wrapping up %s."
-msgstr "Ошибка оборачивания %s."
-
-#: sequencer.c:854 sequencer.c:986
-msgid "no cherry-pick or revert in progress"
-msgstr "копирование или обращение изменений коммита уже выполняются"
-
-#: sequencer.c:856
-msgid "cannot resolve HEAD"
-msgstr "не удалось определить HEAD"
-
-#: sequencer.c:858
-msgid "cannot abort from a branch yet to be born"
-msgstr "нельзя отменить изменения с ветки, которая еще не создана"
+msgid "unknown %.*s format %s"
+msgstr "неизвестный %.*s формат %s"
-#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851
+#: ref-filter.c:1066 ref-filter.c:1097
#, c-format
-msgid "cannot open %s"
-msgstr "не удалось открыть %s"
+msgid "missing object %s for %s"
+msgstr "не найден объект %s для %s"
-#: sequencer.c:880
+#: ref-filter.c:1069 ref-filter.c:1100
#, c-format
-msgid "cannot read %s: %s"
-msgstr "не удалось прочитать %s: %s"
-
-#: sequencer.c:881
-msgid "unexpected end of file"
-msgstr "неожиданный конец файла"
+msgid "parse_object_buffer failed on %s for %s"
+msgstr "сбой при выполнении parse_object_buffer на %s для %s"
-#: sequencer.c:887
+#: ref-filter.c:1311
#, c-format
-msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
-msgstr "сохраненный файл с HEAD перед копированием коммита «%s» поврежден"
+msgid "malformed object at '%s'"
+msgstr "Повреждённый объект «%s»"
-#: sequencer.c:909
+#: ref-filter.c:1373
#, c-format
-msgid "Could not format %s."
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c оÑ\82Ñ\84оÑ\80маÑ\82иÑ\80оваÑ\82Ñ\8c %s."
+msgid "ignoring ref with broken name %s"
+msgstr "игноÑ\80иÑ\80Ñ\83Ñ\8e Ñ\81Ñ\81Ñ\8bлкÑ\83 Ñ\81 непÑ\80авилÑ\8cнÑ\8bм именем %s"
-#: sequencer.c:1054
+#: ref-filter.c:1378
#, c-format
-msgid "%s: can't cherry-pick a %s"
-msgstr "%s: не удалось скопировать коммит %s"
+msgid "ignoring broken ref %s"
+msgstr "игнорирую неправильную ссылку %s"
-#: sequencer.c:1057
+#: ref-filter.c:1633
#, c-format
-msgid "%s: bad revision"
-msgstr "%s: плохая редакция"
-
-#: sequencer.c:1091
-msgid "Can't revert as initial commit"
-msgstr "Нельзя обратить изменения изначального коммита"
-
-#: sequencer.c:1092
-msgid "Can't cherry-pick into empty head"
-msgstr "Нельзя скопировать коммит в пустую ветку"
+msgid "format: %%(end) atom missing"
+msgstr "format: пропущена частица %%(end)"
-#: setup.c:248
+#: ref-filter.c:1687
#, c-format
-msgid "failed to read %s"
-msgstr "не удалось прочитать %s"
+msgid "malformed object name %s"
+msgstr "неправильное имя объекта %s"
-#: setup.c:468
+#: remote.c:746
#, c-format
-msgid "Expected git repo version <= %d, found %d"
-msgstr "Ожидаемая версия git репозитория <= %d, а обнаружена %d"
-
-#: setup.c:476
-msgid "unknown repository extensions found:"
-msgstr "обнаружены неизвестные расширения репозитория:"
-
-#: sha1_file.c:1080
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "сдвиг до конца файла пакета (возможно, повреждён файл .idx?)"
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "Нельзя извлечь одновременно %s и %s в %s"
-#: sha1_file.c:2458
+#: remote.c:750
#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
-msgstr "сдвиг до начала индекса пакета для %s (повреждён индекс?)"
+msgid "%s usually tracks %s, not %s"
+msgstr "%s обычно отслеживает %s, а не %s"
-#: sha1_file.c:2462
+#: remote.c:754
#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr "сдвиг за пределами индекса пакета для %s (обрезан индекс?)"
+msgid "%s tracks both %s and %s"
+msgstr "%s отслеживает и %s и %s"
-#: sha1_name.c:462
-msgid ""
-"Git normally never creates a ref that ends with 40 hex characters\n"
-"because it will be ignored when you just specify 40-hex. These refs\n"
-"may be created by mistake. For example,\n"
-"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
-"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
-msgstr "Обычно Git не создает ссылки, оканчивающиеся на 40 шестнадцатеричных\nсимволов, потому, что они будут игнорироваться, когда вы просто\nукажете это 40-символьное шестнадцатеричное число. Такие ссылки\nмогли быть созданы по ошибке. Например, с помощью:\n\n git checkout -b $br $(git rev-parse …)\n\n, если «$br» оказался пустым, то ссылка с 40-символьным\nшестнадцатеричным числом будет создана. Пожалуйста, просмотрите эти\nссылки и, возможно, удалите их. Вы можете отключить это сообщение\nзапустив «git config advice.objectNameWarning false»"
+#: remote.c:762
+msgid "Internal error"
+msgstr "Внутренняя ошибка"
-#: submodule.c:64 submodule.c:98
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
-msgstr "Не удалось изменить не слитый .gitmodules, сначала разрешите конфликты"
+#: remote.c:1677 remote.c:1720
+msgid "HEAD does not point to a branch"
+msgstr "HEAD не указывает на ветку"
-#: submodule.c:68 submodule.c:102
+#: remote.c:1686
#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c найÑ\82и Ñ\80аздел в .gitmodules, где пÑ\83Ñ\82Ñ\8c Ñ\80авен %s"
+msgid "no such branch: '%s'"
+msgstr "неÑ\82 Ñ\82акой веÑ\82ки: «%s»"
-#: submodule.c:76
+#: remote.c:1689
#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr " Не удалось обновить .gitmodules запись %s"
+msgid "no upstream configured for branch '%s'"
+msgstr "вышестоящая ветка не настроена для ветки «%s»"
-#: submodule.c:109
+#: remote.c:1695
#, c-format
-msgid "Could not remove .gitmodules entry for %s"
-msgstr "Не удалось удалить запись в .gitmodules для %s"
-
-#: submodule.c:120
-msgid "staging updated .gitmodules failed"
-msgstr "сбой индексирования обновленного .gitmodules"
-
-#: submodule.c:177
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "нельзя использовать отприцательные значения для submodule.fetchJobs"
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr "вышестоящая ветка «%s» не сохранена как отслеживаемая ветка"
-#: submodule-config.c:355
+#: remote.c:1710
#, c-format
-msgid "invalid value for %s"
-msgstr "непÑ\80авилÑ\8cное знаÑ\87ение %s"
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr "назнаÑ\87ение длÑ\8f оÑ\82пÑ\80авки «%s» на внеÑ\88нем Ñ\81еÑ\80веÑ\80е «%s» не имееÑ\82 локалÑ\8cной оÑ\82Ñ\81леживаемой веÑ\82ки"
-#: trailer.c:237
+#: remote.c:1725
#, c-format
-msgid "running trailer command '%s' failed"
-msgstr "сбой при запуске команды завершителя «%s»"
+msgid "branch '%s' has no remote for pushing"
+msgstr "ветка «%s» не имеет внешнего сервера для отправки"
-#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558
-#: trailer.c:562
+#: remote.c:1736
#, c-format
-msgid "unknown value '%s' for key '%s'"
-msgstr "неизвестное значение «%s» для ключа «%s»"
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "спецификации пути для отправки «%s» не включают в себя «%s»"
+
+#: remote.c:1749
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "отправка не имеет точки назначения (push.default выставлен в «nothing»)"
-#: trailer.c:544 trailer.c:549 builtin/remote.c:289
+#: remote.c:1771
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "не удалось выполнить «simple» отправку в единственную точку назначения"
+
+#: remote.c:2073
#, c-format
-msgid "more than one %s"
-msgstr "больше одного %s"
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr "Ваша ветка базируется на «%s», но вышестоящий репозиторий исчез.\n"
+
+#: remote.c:2077
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr "(для исправления запустите «git branch --unset-upstream»)\n"
-#: trailer.c:582
+#: remote.c:2080
#, c-format
-msgid "empty trailer token in trailer '%.*s'"
-msgstr "пÑ\83Ñ\81Ñ\82аÑ\8f поÑ\81леднÑ\8fÑ\8f лекÑ\81ема в завеÑ\80Ñ\88иÑ\82еле «%.*s»"
+msgid "Your branch is up-to-date with '%s'.\n"
+msgstr "Ð\92аÑ\88а веÑ\82ка обновлена в Ñ\81ооÑ\82веÑ\82Ñ\81Ñ\82вии Ñ\81 «%s».\n"
-#: trailer.c:702
+#: remote.c:2084
#, c-format
-msgid "could not read input file '%s'"
-msgstr "не удалось прочитать входной файл «%s»"
+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"
-#: trailer.c:705
-msgid "could not read from stdin"
-msgstr "не удалось прочитать из стандартного ввода"
+#: remote.c:2090
+msgid " (use \"git push\" to publish your local commits)\n"
+msgstr " (используйте «git push», чтобы опубликовать ваши локальные коммиты)\n"
-#: trailer.c:857 builtin/am.c:42
+#: remote.c:2093
#, c-format
-msgid "could not stat %s"
-msgstr "не удалось выполнить stat для %s"
+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"
-#: trailer.c:859
-#, c-format
-msgid "file %s is not a regular file"
-msgstr "файл %s не является обычным файлом"
+#: remote.c:2101
+msgid " (use \"git pull\" to update your local branch)\n"
+msgstr " (используйте «git pull», чтобы обновить вашу локальную ветку)\n"
-#: trailer.c:861
+#: remote.c:2104
#, c-format
-msgid "file %s is not writable by user"
-msgstr "файл %s не доступен на запись пользователю"
+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"
-#: trailer.c:873
-msgid "could not open temporary file"
-msgstr "не удалось создать временный файл"
+#: remote.c:2114
+msgid " (use \"git pull\" to merge the remote branch into yours)\n"
+msgstr " (используйте «git pull», чтобы слить внешнюю ветку в вашу)\n"
-#: trailer.c:912
-#, c-format
-msgid "could not rename temporary file to %s"
-msgstr "не удалось переименовать временный файл в %s"
+#: revision.c:2158
+msgid "your current branch appears to be broken"
+msgstr "похоже, ваша текущая ветка повреждена"
-#: transport-helper.c:1041
+#: revision.c:2161
#, c-format
-msgid "Could not read ref %s"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c пÑ\80оÑ\87иÑ\82аÑ\82Ñ\8c Ñ\81Ñ\81Ñ\8bлкÑ\83 %s"
+msgid "your current branch '%s' does not have any commits yet"
+msgstr "ваÑ\88а Ñ\82екÑ\83Ñ\89аÑ\8f веÑ\82ка «%s» еÑ\89е не Ñ\81одеÑ\80жиÑ\82 ни одного коммиÑ\82а"
-#: unpack-trees.c:64
-#, 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 can switch branches."
-msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при переключении на состояние:\n%%sСделайте коммит или спрячьте ваши изменения перед переключением веток."
+#: revision.c:2355
+msgid "--first-parent is incompatible with --bisect"
+msgstr "опцию --first-parent нельзя использовать одновременно с --bisect"
-#: unpack-trees.c:66
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
-msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при переключении на состояние:\n%%s"
+#: run-command.c:106
+msgid "open /dev/null failed"
+msgstr "сбой открытия /dev/null"
-#: unpack-trees.c:69
+#: run-command.c:108
#, 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 can merge."
-msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при слиянии:\n%%sСделайте коммит или спрячьте ваши изменения перед слиянием веток."
+msgid "dup2(%d,%d) failed"
+msgstr "dup2(%d,%d) сбой"
-#: unpack-trees.c:71
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
-msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при слиянии:\n%%s"
+#: send-pack.c:297
+msgid "failed to sign the push certificate"
+msgstr "сбой подписания сертификата отправки"
-#: unpack-trees.c:74
-#, 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 can %s."
-msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при %s:\n%%sСделайте коммит или спрячьте ваши изменения перед %s."
+#: send-pack.c:410
+msgid "the receiving end does not support --signed push"
+msgstr "принимающая сторона не поддерживает отправку с опцией --signed"
-#: unpack-trees.c:76
-#, c-format
+#: send-pack.c:412
msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
-msgstr "Ð\92аÑ\88и локалÑ\8cнÑ\8bе изменениÑ\8f в Ñ\83казаннÑ\8bÑ\85 Ñ\84айлаÑ\85 бÑ\83дÑ\83Ñ\82 пеÑ\80езапиÑ\81анÑ\8b пÑ\80и %s:\n%%s"
+"not sending a push certificate since the receiving end does not support "
+"--signed push"
+msgstr "не оÑ\82пÑ\80авлÑ\8fем Ñ\81еÑ\80Ñ\82иÑ\84икаÑ\82 длÑ\8f оÑ\82пÑ\80авки, Ñ\82ак как пÑ\80инимаÑ\8eÑ\89аÑ\8f Ñ\81Ñ\82оÑ\80она не поддеÑ\80живаеÑ\82 оÑ\82пÑ\80авкÑ\83 Ñ\81 опÑ\86ией --signed"
-#: unpack-trees.c:81
-#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in it:\n"
-"%s"
-msgstr "Обновление указанных каталогов приведет к потере неотслеживаемых файлов в них:\n%s"
+#: send-pack.c:424
+msgid "the receiving end does not support --atomic push"
+msgstr "принимающая сторона не поддерживает отправку с опцией --atomic"
-#: unpack-trees.c:85
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%sPlease move or remove them before you can switch branches."
-msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при переключении на состояние:\n%%sПереместите эти файлы или удалите их перед переключением веток."
+#: send-pack.c:429
+msgid "the receiving end does not support push options"
+msgstr "принимающая сторона не поддерживает отправку с опциями"
-#: unpack-trees.c:87
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
-msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при переключении на состояние:\n%%s"
+#: sequencer.c:171
+msgid "revert"
+msgstr "обратить изменения"
-#: unpack-trees.c:90
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you can merge."
-msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при слиянии:\n%%sПереместите эти файлы или удалите их перед переключением веток."
+#: sequencer.c:171
+msgid "cherry-pick"
+msgstr "копировать коммит"
-#: unpack-trees.c:92
-#, c-format
+#: sequencer.c:228
msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
-msgstr "УказаннÑ\8bе неоÑ\82Ñ\81леживаемÑ\8bе Ñ\84айлÑ\8b в Ñ\80абоÑ\87ем каÑ\82алоге бÑ\83дÑ\83Ñ\82 Ñ\83даленÑ\8b пÑ\80и Ñ\81лиÑ\8fнии:\n%%s"
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr "поÑ\81ле Ñ\80азÑ\80еÑ\88ениÑ\8f конÑ\84ликÑ\82ов, помеÑ\82Ñ\8cÑ\82е иÑ\81пÑ\80авленнÑ\8bе пÑ\83Ñ\82и\nÑ\81 помоÑ\89Ñ\8cÑ\8e «git add <пÑ\83Ñ\82и>» или «git rm <пÑ\83Ñ\82и>»"
-#: unpack-trees.c:95
-#, c-format
+#: sequencer.c:231
msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you can %s."
-msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при %s:\n%%sПереместите эти файлы или удалите их перед %s."
+"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»"
-#: unpack-trees.c:97
+#: sequencer.c:244 sequencer.c:1209
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
-msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при %s:\n%%s"
+msgid "could not lock '%s'"
+msgstr "не удалось заблокировать «%s»"
-#: unpack-trees.c:102
+#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by checkout:\n"
-"%%sPlease move or remove them before you can switch branches."
-msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при переключении на состояние:\n%%sПереместите эти файлы или удалите их перед переключением веток."
+msgid "could not write to '%s'"
+msgstr "не удалось записать в «%s»"
-#: unpack-trees.c:104
+#: sequencer.c:251
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by checkout:\n"
-"%%s"
-msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при переключении на состояние:\n%%s"
+msgid "could not write eol to '%s'"
+msgstr "не удалось записать eol в «%s»"
-#: unpack-trees.c:107
+#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you can merge."
-msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при слиянии:\n%%sПереместите эти файлы или удалите их перед переключением веток."
+msgid "failed to finalize '%s'."
+msgstr "не удалось завершить «%s»."
-#: unpack-trees.c:109
+#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
-msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при слиянии:\n%%s"
+msgid "could not read '%s'"
+msgstr "не удалось прочитать «%s»"
-#: unpack-trees.c:112
+#: sequencer.c:305
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you can %s."
-msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при %s:\n%%sПереместите эти файлы или удалите их перед %s."
+msgid "your local changes would be overwritten by %s."
+msgstr "ваши локальные изменения будут перезаписаны %s."
-#: unpack-trees.c:114
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%s"
-msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при %s:\n%%s"
+#: sequencer.c:309
+msgid "commit your changes or stash them to proceed."
+msgstr "для продолжения закоммитьте ваши изменения или спрячьте их."
-#: unpack-trees.c:121
+#: sequencer.c:324
#, c-format
-msgid "Entry '%s' overlaps with '%s'. Cannot bind."
-msgstr "Запись «%s» частично совпадает с «%s». Не удалось назначить соответствие."
+msgid "%s: fast-forward"
+msgstr "%s: перемотка вперед"
-#: unpack-trees.c:124
+#. TRANSLATORS: %s will be "revert" or "cherry-pick"
+#: sequencer.c:399
#, c-format
-msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
-"%s"
-msgstr "Не удалось обновить частичное состояние: следующие элементы не последней версии:\n%s"
+msgid "%s: Unable to write new index file"
+msgstr "%s: Не удалось записать файл индекса"
-#: unpack-trees.c:126
-#, c-format
-msgid ""
-"The following Working tree files would be overwritten by sparse checkout update:\n"
-"%s"
-msgstr "Указанные файлы из рабочего каталога будут перезаписаны при обновлении частичного состояния:\n%s"
+#: sequencer.c:418
+msgid "could not resolve HEAD commit\n"
+msgstr "не удалось распознать HEAD коммит\n"
-#: unpack-trees.c:128
+#: sequencer.c:438
+msgid "unable to update cache tree\n"
+msgstr "не удалось обновить дерево кэша\n"
+
+#: sequencer.c:483
#, c-format
msgid ""
-"The following Working tree files would be removed by sparse checkout update:\n"
-"%s"
-msgstr "Указанные файлы из рабочего каталога будут удалены при обновлении частичного состояния:\n%s"
+"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"
-#: unpack-trees.c:205
+#: sequencer.c:567
#, c-format
-msgid "Aborting\n"
-msgstr "Прерываю\n"
-
-#: unpack-trees.c:237
-msgid "Checking out files"
-msgstr "Распаковка файлов"
+msgid "could not parse commit %s\n"
+msgstr "не удалось разобрать коммит %s\n"
-#: urlmatch.c:120
-msgid "invalid URL scheme name or missing '://' suffix"
-msgstr "Неправильная имя URL схемы или пропущен суффикс «://»"
-
-#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#: sequencer.c:572
#, c-format
-msgid "invalid %XX escape sequence"
-msgstr "неправильная управляющая последовательность %XX"
-
-#: urlmatch.c:172
-msgid "missing host and scheme is not 'file:'"
-msgstr "пропущено имя сервера и схема доступа не «file:»"
-
-#: urlmatch.c:189
-msgid "a 'file:' URL may not have a port number"
-msgstr "URL со схемой «file:» не может содержать номер порта"
-
-#: urlmatch.c:199
-msgid "invalid characters in host name"
-msgstr "неправильные символы в имени сервера"
-
-#: urlmatch.c:244 urlmatch.c:255
-msgid "invalid port number"
-msgstr "неправильный номер порта"
+msgid "could not parse parent commit %s\n"
+msgstr "не удалось разобрать родительский коммит %s\n"
-#: urlmatch.c:322
-msgid "invalid '..' path segment"
-msgstr "непÑ\80авилÑ\8cнаÑ\8f Ñ\87аÑ\81Ñ\82Ñ\8c пÑ\83Ñ\82и «..»"
+#: sequencer.c:656
+msgid "your index file is unmerged."
+msgstr "ваÑ\88 индекÑ\81 не Ñ\81лиÑ\82."
-#: wrapper.c:222 wrapper.c:381
+#: sequencer.c:675
#, c-format
-msgid "could not open '%s' for reading and writing"
-msgstr "не Ñ\83далоÑ\81Ñ\8c оÑ\82кÑ\80Ñ\8bÑ\82Ñ\8c «%s» длÑ\8f Ñ\87Ñ\82ениÑ\8f и запиÑ\81и"
+msgid "commit %s is a merge but no -m option was given."
+msgstr "коммиÑ\82 %s â\80\94 Ñ\8dÑ\82о коммиÑ\82-Ñ\81лиÑ\8fние, но опÑ\86иÑ\8f -m не Ñ\83казана."
-#: wrapper.c:224 wrapper.c:383 builtin/am.c:779
+#: sequencer.c:683
#, c-format
-msgid "could not open '%s' for writing"
-msgstr "не удалось открыть «%s» для записи"
+msgid "commit %s does not have parent %d"
+msgstr "у коммита %s нет предка %d"
-#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772
-#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086
-#: builtin/pull.c:407
+#: sequencer.c:687
#, c-format
-msgid "could not open '%s' for reading"
-msgstr "не Ñ\83далоÑ\81Ñ\8c оÑ\82кÑ\80Ñ\8bÑ\82Ñ\8c «%s» длÑ\8f Ñ\87Ñ\82ениÑ\8f"
+msgid "mainline was specified but commit %s is not a merge."
+msgstr "оÑ\81новнаÑ\8f веÑ\82ка Ñ\83казана, но коммиÑ\82 %s не Ñ\8fвлÑ\8fеÑ\82Ñ\81Ñ\8f Ñ\81лиÑ\8fнием."
-#: wrapper.c:594 wrapper.c:615
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#: sequencer.c:700
#, c-format
-msgid "unable to access '%s'"
-msgstr "«%s» недоступно"
-
-#: wrapper.c:623
-msgid "unable to get current working directory"
-msgstr "не удалось получить текущий рабочий каталог"
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s: не удалось разобрать родительский коммит для %s"
-#: wrapper.c:650
+#: sequencer.c:705
#, c-format
-msgid "could not open %s for writing"
-msgstr "не Ñ\83далоÑ\81Ñ\8c оÑ\82кÑ\80Ñ\8bÑ\82Ñ\8c «%s» длÑ\8f запиÑ\81и"
+msgid "cannot get commit message for %s"
+msgstr "не Ñ\83далоÑ\81Ñ\8c полÑ\83Ñ\87иÑ\82Ñ\8c Ñ\81ообÑ\89ение коммиÑ\82а длÑ\8f %s"
-#: wrapper.c:661 builtin/am.c:410
+#: sequencer.c:797
#, c-format
-msgid "could not write to %s"
-msgstr "не Ñ\83далоÑ\81Ñ\8c запиÑ\81аÑ\82Ñ\8c в %s"
+msgid "could not revert %s... %s"
+msgstr "не Ñ\83далоÑ\81Ñ\8c обÑ\80аÑ\82иÑ\82Ñ\8c изменениÑ\8f коммиÑ\82а %sâ\80¦ %s"
-#: wrapper.c:667
+#: sequencer.c:798
#, c-format
-msgid "could not close %s"
-msgstr "не Ñ\83далоÑ\81Ñ\8c закÑ\80Ñ\8bÑ\82Ñ\8c %s"
+msgid "could not apply %s... %s"
+msgstr "не Ñ\83далоÑ\81Ñ\8c пÑ\80имениÑ\82Ñ\8c коммиÑ\82 %sâ\80¦ %s"
-#: wt-status.c:150
-msgid "Unmerged paths:"
-msgstr "Ð\9dе Ñ\81лиÑ\82Ñ\8bе пÑ\83Ñ\82и:"
+#: sequencer.c:833
+msgid "empty commit set passed"
+msgstr "пеÑ\80едан пÑ\83Ñ\81Ñ\82ой набоÑ\80 коммиÑ\82ов"
-#: wt-status.c:177 wt-status.c:204
+#: sequencer.c:843
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr " (используйте «git reset %s <файл>…», чтобы убрать из индекса)"
-
-#: wt-status.c:179 wt-status.c:206
-msgid " (use \"git rm --cached <file>...\" to unstage)"
-msgstr " (используйте «git rm --cached <файл>…», чтобы убрать из индекса)"
+msgid "git %s: failed to read the index"
+msgstr "git %s: сбой чтения индекса"
-#: wt-status.c:183
-msgid " (use \"git add <file>...\" to mark resolution)"
-msgstr " (используйте «git add <файл>…», чтобы пометить разрешение конфликта)"
+#: sequencer.c:850
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr "git %s: сбой обновления индекса"
-#: wt-status.c:185 wt-status.c:189
-msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
-msgstr " (используйте «git add/rm <файл>…», чтобы пометить выбранное разрешение конфликта)"
+#: sequencer.c:944
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr "неправильная строка %d: %.*s"
-#: wt-status.c:187
-msgid " (use \"git rm <file>...\" to mark resolution)"
-msgstr " (используйте «git rm <файл>…», чтобы пометить разрешение конфликта)"
+#: sequencer.c:950
+msgid "no commits parsed."
+msgstr "коммиты не разобраны."
-#: wt-status.c:198 wt-status.c:881
-msgid "Changes to be committed:"
-msgstr "Изменения, которые будут включены в коммит:"
+#: sequencer.c:966
+#, c-format
+msgid "could not read '%s'."
+msgstr "не удалось прочитать «%s»."
-#: wt-status.c:216 wt-status.c:890
-msgid "Changes not staged for commit:"
-msgstr "Изменения, которые не в индексе для коммита:"
+#: sequencer.c:972
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr "непригодная для использования карта с инструкциями: «%s»"
-#: wt-status.c:220
-msgid " (use \"git add <file>...\" to update what will be committed)"
-msgstr " (используйте «git add <файл>…», чтобы добавить файл в индекс)"
+#: sequencer.c:983
+msgid "cannot cherry-pick during a revert."
+msgstr "нельзя скопировать коммит во время процесса обращения коммита."
-#: wt-status.c:222
-msgid " (use \"git add/rm <file>...\" to update what will be committed)"
-msgstr " (используйте «git add/rm <файл>…», чтобы добавить или удалить файл из индекса)"
+#: sequencer.c:985
+msgid "cannot revert during a cherry-pick."
+msgstr "нельзя обратить изменения коммита во время копирования коммита."
-#: wt-status.c:223
-msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working "
-"directory)"
-msgstr " (используйте «git checkout -- <файл>…», чтобы отменить изменения\n в рабочем каталоге)"
+#: sequencer.c:1028
+#, c-format
+msgid "invalid key: %s"
+msgstr "недействительный ключ: %s"
-#: wt-status.c:225
-msgid " (commit or discard the untracked or modified content in submodules)"
-msgstr " (сделайте коммит или отмените изменения в неотслеживаемом или измененном содержимом в подмодулях)"
+#: sequencer.c:1031
+#, c-format
+msgid "invalid value for %s: %s"
+msgstr "неправильное значение %s: %s"
-#: wt-status.c:237
+#: sequencer.c:1063
#, c-format
-msgid " (use \"git %s <file>...\" to include in what will be committed)"
-msgstr " (используйте «git %s <файл>…», чтобы добавить в то, что будет включено в коммит)"
+msgid "malformed options sheet: '%s'"
+msgstr "испорченная карта с опциями: «%s»"
-#: wt-status.c:252
-msgid "both deleted:"
-msgstr "оба Ñ\83даленÑ\8b:"
+#: sequencer.c:1101
+msgid "a cherry-pick or revert is already in progress"
+msgstr "копиÑ\80ование или обÑ\80аÑ\89ение изменений коммиÑ\82а Ñ\83же вÑ\8bполнÑ\8fÑ\8eÑ\82Ñ\81Ñ\8f"
-#: wt-status.c:254
-msgid "added by us:"
-msgstr "добавлено нами:"
+#: sequencer.c:1102
+msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+msgstr "попÑ\80обÑ\83йÑ\82е «git cherry-pick (--continue | --quit | --abort)»"
-#: wt-status.c:256
-msgid "deleted by them:"
-msgstr "удалено ими:"
+#: sequencer.c:1106
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr "не удалось создать каталог для указателя следования коммитов «%s»"
-#: wt-status.c:258
-msgid "added by them:"
-msgstr "добавлено ими:"
+#: sequencer.c:1120
+msgid "could not lock HEAD"
+msgstr "не Ñ\83далоÑ\81Ñ\8c заблокиÑ\80оваÑ\82Ñ\8c HEAD"
-#: wt-status.c:260
-msgid "deleted by us:"
-msgstr "удалено нами:"
+#: sequencer.c:1151 sequencer.c:1289
+msgid "no cherry-pick or revert in progress"
+msgstr "копирование или обращение изменений коммита уже выполняются"
-#: wt-status.c:262
-msgid "both added:"
-msgstr "оба добавленÑ\8b:"
+#: sequencer.c:1153
+msgid "cannot resolve HEAD"
+msgstr "не Ñ\83далоÑ\81Ñ\8c опÑ\80еделиÑ\82Ñ\8c HEAD"
-#: wt-status.c:264
-msgid "both modified:"
-msgstr "оба изменÑ\8b:"
+#: sequencer.c:1155 sequencer.c:1189
+msgid "cannot abort from a branch yet to be born"
+msgstr "нелÑ\8cзÑ\8f оÑ\82мениÑ\82Ñ\8c изменениÑ\8f Ñ\81 веÑ\82ки, коÑ\82оÑ\80аÑ\8f еÑ\89е не Ñ\81оздана"
-#: wt-status.c:266
+#: sequencer.c:1175 builtin/grep.c:578
#, c-format
-msgid "bug: unhandled unmerged status %x"
-msgstr "оÑ\88ибка: необÑ\80абоÑ\82аннÑ\8bй Ñ\81Ñ\82аÑ\82Ñ\83Ñ\81 не Ñ\81лиÑ\82Ñ\8bÑ\85 изменений %x"
+msgid "cannot open '%s'"
+msgstr "не Ñ\83далоÑ\81Ñ\8c оÑ\82кÑ\80Ñ\8bÑ\82Ñ\8c «%s»"
-#: wt-status.c:274
-msgid "new file:"
-msgstr "новый файл:"
+#: sequencer.c:1177
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "не удалось прочитать «%s»: %s"
-#: wt-status.c:276
-msgid "copied:"
-msgstr "скопировано:"
+#: sequencer.c:1178
+msgid "unexpected end of file"
+msgstr "неожиданный конец файла"
-#: wt-status.c:278
-msgid "deleted:"
-msgstr "удалено:"
+#: sequencer.c:1184
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr "сохраненный файл с HEAD перед копированием коммита «%s» поврежден"
-#: wt-status.c:280
-msgid "modified:"
-msgstr "изменено:"
+#: sequencer.c:1354
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s: не удалось скопировать коммит %s"
-#: wt-status.c:282
-msgid "renamed:"
-msgstr "переименовано:"
+#: sequencer.c:1358
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s: плохая редакция"
-#: wt-status.c:284
-msgid "typechange:"
-msgstr "изменен Ñ\82ип:"
+#: sequencer.c:1391
+msgid "can't revert as initial commit"
+msgstr "нелÑ\8cзÑ\8f возвÑ\80аÑ\82иÑ\82Ñ\8c изнаÑ\87алÑ\8cнÑ\8bй коммиÑ\82"
-#: wt-status.c:286
-msgid "unknown:"
-msgstr "неизвестно:"
+#: setup.c:160
+#, 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 <команда> -- <путь>…» для указания путей, которые не существуют локально."
-#: wt-status.c:288
-msgid "unmerged:"
-msgstr "не слитые:"
+#: setup.c:173
+#, 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 <команда> [<редакция>…] -- [<файл>…]»"
-#: wt-status.c:370
-msgid "new commits, "
-msgstr "новые коммиты, "
+#: setup.c:223
+#, 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 <команда> [<редакция>…] -- [<файл>…]»"
-#: wt-status.c:372
-msgid "modified content, "
-msgstr "изменено содержимое, "
+#: setup.c:468
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Ожидаемая версия git репозитория <= %d, а обнаружена %d"
-#: wt-status.c:374
-msgid "untracked content, "
-msgstr "неоÑ\82Ñ\81леживаемое Ñ\81одеÑ\80жимое, "
+#: setup.c:476
+msgid "unknown repository extensions found:"
+msgstr "обнаÑ\80Ñ\83женÑ\8b неизвеÑ\81Ñ\82нÑ\8bе Ñ\80аÑ\81Ñ\88иÑ\80ениÑ\8f Ñ\80епозиÑ\82оÑ\80иÑ\8f:"
-#: wt-status.c:391
+#: setup.c:762
#, c-format
-msgid "bug: unhandled diff status %c"
-msgstr "оÑ\88ибка: необÑ\80абоÑ\82аннÑ\8bй Ñ\81Ñ\82аÑ\82Ñ\83Ñ\81 изменений %c"
+msgid "Not a git repository (or any of the parent directories): %s"
+msgstr "Ð\9dе найден git Ñ\80епозиÑ\82оий (или один из его каÑ\82алогов): %s"
-#: wt-status.c:755
-msgid "Submodules changed but not updated:"
-msgstr "Ð\98змененнÑ\8bе, но не обновленнÑ\8bе подмодÑ\83ли:"
+#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
+msgid "Cannot come back to cwd"
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c веÑ\80нÑ\83Ñ\82Ñ\8cÑ\81Ñ\8f в Ñ\82екÑ\83Ñ\89ий Ñ\80абоÑ\87ий каÑ\82алог"
-#: wt-status.c:757
-msgid "Submodule changes to be committed:"
-msgstr "Ð\98зменениÑ\8f в подмодÑ\83лÑ\8fÑ\85, коÑ\82оÑ\80Ñ\8bе бÑ\83дÑ\83Ñ\82 закоммиÑ\87енÑ\8b:"
+#: setup.c:845
+msgid "Unable to read current working directory"
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c пÑ\80оÑ\87иÑ\82аÑ\82Ñ\8c Ñ\82екÑ\83Ñ\89ий Ñ\80абоÑ\87ий каÑ\82алог"
-#: wt-status.c:838
+#: setup.c:920
+#, c-format
msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
-msgstr "Не трогайте строку выше этой.\nВсё, что ниже — будет удалено."
-
-#: wt-status.c:949
-msgid "You have unmerged paths."
-msgstr "У вас есть не слитые пути."
+"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 не установлен)."
-#: wt-status.c:952
-msgid " (fix conflicts and run \"git commit\")"
-msgstr " (разрешите конфликты, затем запустите «git commit»)"
+#: setup.c:927
+#, c-format
+msgid "Cannot change to '%s/..'"
+msgstr "Перейти в «%s/..»"
-#: wt-status.c:956
-msgid "All conflicts fixed but you are still merging."
-msgstr "Все конфликты исправлены, но вы все еще в процессе слияния."
+#: setup.c:989
+#, 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Владелец файлов должен всегда иметь права на чтение и на запись."
-#: wt-status.c:959
-msgid " (use \"git commit\" to conclude merge)"
-msgstr " (используйте «git commit», чтобы завершить слияние)"
+#: sha1_file.c:473
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "путь «%s» не существует"
-#: wt-status.c:969
-msgid "You are in the middle of an am session."
-msgstr "Вы в процессе сессии am."
+#: sha1_file.c:499
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr "ссылаемый репозиторий «%s» как связанное состояние, пока не поддерживается."
-#: wt-status.c:972
-msgid "The current patch is empty."
-msgstr "Текущий патч пустой."
+#: sha1_file.c:505
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "ссылаемый репозиторий «%s» не является локальным."
-#: wt-status.c:976
-msgid " (fix conflicts and then run \"git am --continue\")"
-msgstr " (разрешите конфликты, затем запустите «git am --continue»)"
+#: sha1_file.c:511
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "ссылаемый репозиторий «%s» является частичным"
-#: wt-status.c:978
-msgid " (use \"git am --skip\" to skip this patch)"
-msgstr " (используйте «git am --skip», чтобы пропустить этот патч)"
+#: sha1_file.c:519
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "ссылаемый репозиторий «%s» является сращенным"
-#: wt-status.c:980
-msgid " (use \"git am --abort\" to restore the original branch)"
-msgstr " (используйте «git am --abort», чтобы восстановить оригинальную ветку)"
+#: sha1_file.c:1159
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "сдвиг до конца файла пакета (возможно, повреждён файл .idx?)"
-#: wt-status.c:1105
-msgid "No commands done."
-msgstr "Команды не выполнены."
+#: sha1_file.c:2592
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr "сдвиг до начала индекса пакета для %s (повреждён индекс?)"
-#: wt-status.c:1108
+#: sha1_file.c:2596
#, 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 команд выполнено):"
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr "сдвиг за пределами индекса пакета для %s (обрезан индекс?)"
-#: wt-status.c:1119
+#: sha1_name.c:407
#, c-format
-msgid " (see more in file %s)"
-msgstr " (смотрите дополнительно в файле %s)"
+msgid "short SHA1 %s is ambiguous"
+msgstr "сокращённый SHA1 идентификатор %s неоднозначен"
-#: wt-status.c:1124
-msgid "No commands remaining."
-msgstr "Команд больше не осталось."
+#: sha1_name.c:418
+msgid "The candidates are:"
+msgstr "Возможно, вы имели в виду:"
+
+#: sha1_name.c:578
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+" git checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
+msgstr "Обычно Git не создает ссылки, оканчивающиеся на 40 шестнадцатеричных\nсимволов, потому, что они будут игнорироваться, когда вы просто\nукажете это 40-символьное шестнадцатеричное число. Такие ссылки\nмогли быть созданы по ошибке. Например, с помощью:\n\n git checkout -b $br $(git rev-parse …)\n\n, если «$br» оказался пустым, то ссылка с 40-символьным\nшестнадцатеричным числом будет создана. Пожалуйста, просмотрите эти\nссылки и, возможно, удалите их. Вы можете отключить это сообщение\nзапустив «git config advice.objectNameWarning false»"
-#: wt-status.c:1127
+#: submodule.c:64 submodule.c:98
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr "Не удалось изменить не слитый .gitmodules, сначала разрешите конфликты"
+
+#: submodule.c:68 submodule.c:102
#, 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 команд осталось):"
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "Не удалось найти раздел в .gitmodules, где путь равен %s"
-#: wt-status.c:1135
-msgid " (use \"git rebase --edit-todo\" to view and edit)"
-msgstr " (используйте «git rebase --edit-todo», чтобы просмотреть и изменить)"
+#: submodule.c:76
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr " Не удалось обновить .gitmodules запись %s"
-#: wt-status.c:1148
+#: submodule.c:109
#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "Ð\92Ñ\8b Ñ\81ейÑ\87аÑ\81 пеÑ\80емеÑ\89аеÑ\82е веÑ\82кÑ\83 «%s» над «%s»."
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\83далиÑ\82Ñ\8c запиÑ\81Ñ\8c в .gitmodules длÑ\8f %s"
-#: wt-status.c:1153
-msgid "You are currently rebasing."
-msgstr "Вы сейчас перемещаете ветку."
+#: submodule.c:120
+msgid "staging updated .gitmodules failed"
+msgstr "сбой индексирования обновленного .gitmodules"
-#: wt-status.c:1167
-msgid " (fix conflicts and then run \"git rebase --continue\")"
-msgstr " (разрешите конфликты, затем запустите «git rebase --continue»)"
+#: submodule.c:158
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "нельзя использовать отприцательные значения для submodule.fetchJobs"
-#: wt-status.c:1169
-msgid " (use \"git rebase --skip\" to skip this patch)"
-msgstr " (используйте «git rebase --skip», чтобы пропустить этот патч)"
+#: submodule-config.c:358
+#, c-format
+msgid "invalid value for %s"
+msgstr "неправильное значение %s"
-#: wt-status.c:1171
-msgid " (use \"git rebase --abort\" to check out the original branch)"
-msgstr " (используйте «git rebase --abort», чтобы перейти на оригинальную ветку)"
+#: trailer.c:238
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "сбой при запуске команды завершителя «%s»"
-#: wt-status.c:1177
-msgid " (all conflicts fixed: run \"git rebase --continue\")"
-msgstr " (все конфликты разрешены: запустите «git rebase --continue»)"
+#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537
+#: trailer.c:541
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr "неизвестное значение «%s» для ключа «%s»"
-#: wt-status.c:1181
+#: trailer.c:523 trailer.c:528 builtin/remote.c:289
#, c-format
-msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
-msgstr "Вы сейчас разделяете коммит при перемещении ветки «%s» над «%s»."
+msgid "more than one %s"
+msgstr "больше одного %s"
-#: wt-status.c:1186
-msgid "You are currently splitting a commit during a rebase."
-msgstr "Вы сейчас разделяете коммит при перемещении ветки."
+#: trailer.c:672
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "пустая последняя лексема в завершителе «%.*s»"
-#: wt-status.c:1189
-msgid " (Once your working directory is clean, run \"git rebase --continue\")"
-msgstr "(Как только ваш рабочий каталог будет чистый, запустите «git rebase --continue»)"
+#: trailer.c:695
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "не удалось прочитать входной файл «%s»"
-#: wt-status.c:1193
+#: trailer.c:698
+msgid "could not read from stdin"
+msgstr "не удалось прочитать из стандартного ввода"
+
+#: trailer.c:929 builtin/am.c:44
#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
-msgstr "Ð\92Ñ\8b Ñ\81ейÑ\87аÑ\81 Ñ\80едакÑ\82иÑ\80Ñ\83еÑ\82е коммиÑ\82 пÑ\80и пеÑ\80емеÑ\89ении веÑ\82ки «%s» над «%s»."
+msgid "could not stat %s"
+msgstr "не Ñ\83далоÑ\81Ñ\8c вÑ\8bполниÑ\82Ñ\8c stat длÑ\8f %s"
-#: wt-status.c:1198
-msgid "You are currently editing a commit during a rebase."
-msgstr "Вы сейчас редактируете коммит при перемещении ветки."
+#: trailer.c:931
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "файл %s не является обычным файлом"
-#: wt-status.c:1201
-msgid " (use \"git commit --amend\" to amend the current commit)"
-msgstr " (используйте «git commit --amend», чтобы исправить текущий коммит)"
+#: trailer.c:933
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "файл %s не доступен на запись пользователю"
-#: wt-status.c:1203
-msgid " (use \"git rebase --continue\" once you are satisfied with your changes)"
-msgstr " (используйте «git rebase --continue», когда будете довольны изменениями)"
+#: trailer.c:945
+msgid "could not open temporary file"
+msgstr "не удалось создать временный файл"
-#: wt-status.c:1213
+#: trailer.c:983
#, c-format
-msgid "You are currently cherry-picking commit %s."
-msgstr "Ð\92Ñ\8b копиÑ\80Ñ\83еÑ\82е коммиÑ\82 %s."
+msgid "could not rename temporary file to %s"
+msgstr "не Ñ\83далоÑ\81Ñ\8c пеÑ\80еименоваÑ\82Ñ\8c вÑ\80еменнÑ\8bй Ñ\84айл в %s"
-#: wt-status.c:1218
-msgid " (fix conflicts and run \"git cherry-pick --continue\")"
-msgstr " (разрешите конфликты, затем запустите «git cherry-pick --continue»)"
+#: transport.c:62
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Будет установлен вышестоящий репозиторий для «%s» на «%s» с «%s»\n"
-#: wt-status.c:1221
-msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
-msgstr " (все конфликты разрешены: запустите «git cherry-pick --continue»)"
+#: transport.c:151
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "транспорт: неправильный параметр глубины «%s»"
-#: wt-status.c:1223
-msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
-msgstr " (используйте «git cherry-pick --abort», чтобы отменить копирования коммита)"
+#: transport.c:817
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr "Подмодули по указанным путям содержат изменения, которые не найдены ни на одном из внешних репозиториев:\n"
-#: wt-status.c:1232
+#: transport.c:821
#, c-format
-msgid "You are currently reverting commit %s."
-msgstr "Вы сейчас обращаете изменения коммита %s."
+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"
+
+#: transport.c:829
+msgid "Aborting."
+msgstr "Прерываю."
+
+#: transport-helper.c:1075
+#, c-format
+msgid "Could not read ref %s"
+msgstr "Не удалось прочитать ссылку %s"
-#: wt-status.c:1237
-msgid " (fix conflicts and run \"git revert --continue\")"
-msgstr " (разрешите конфликты, затем запустите «git revert --continue»)"
+#: tree-walk.c:31
+msgid "too-short tree object"
+msgstr "слишком короткий объект дерева"
-#: wt-status.c:1240
-msgid " (all conflicts fixed: run \"git revert --continue\")"
-msgstr " (все конфликты разрешены: запустите «git revert --continue»)"
+#: tree-walk.c:37
+msgid "malformed mode in tree entry"
+msgstr "неправильный режим в записи дерева"
-#: wt-status.c:1242
-msgid " (use \"git revert --abort\" to cancel the revert operation)"
-msgstr " (используйте «git revert --abort», чтобы отменить операцию обращения изменений коммита)"
+#: tree-walk.c:41
+msgid "empty filename in tree entry"
+msgstr "пустое имя файла в записи дерева"
-#: wt-status.c:1253
+#: tree-walk.c:113
+msgid "too-short tree file"
+msgstr "слишком короткий файл дерева"
+
+#: unpack-trees.c:64
#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
-msgstr "Вы сейчас в процессе двоичного поиска, начатого с ветки «%s»."
+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Сделайте коммит или спрячьте ваши изменения перед переключением веток."
-#: wt-status.c:1257
-msgid "You are currently bisecting."
-msgstr "Вы сейчас в процессе двоичного поиска."
+#: unpack-trees.c:66
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при переключении на состояние:\n%%s"
-#: wt-status.c:1260
-msgid " (use \"git bisect reset\" to get back to the original branch)"
-msgstr " (используйте «git bisect reset», чтобы вернуться на исходную ветку)"
+#: unpack-trees.c:69
+#, 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Сделайте коммит или спрячьте ваши изменения перед слиянием веток."
-#: wt-status.c:1460
-msgid "On branch "
-msgstr "На ветке "
+#: unpack-trees.c:71
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при слиянии:\n%%s"
-#: wt-status.c:1466
-msgid "interactive rebase in progress; onto "
-msgstr "интерактивное перемещение в процессе; над "
+#: unpack-trees.c:74
+#, 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."
-#: wt-status.c:1468
-msgid "rebase in progress; onto "
-msgstr "перемещение в процессе; над "
+#: unpack-trees.c:76
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при %s:\n%%s"
-#: wt-status.c:1473
-msgid "HEAD detached at "
-msgstr "HEAD отделён на "
+#: unpack-trees.c:81
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in it:\n"
+"%s"
+msgstr "Обновление указанных каталогов приведет к потере неотслеживаемых файлов в них:\n%s"
-#: wt-status.c:1475
-msgid "HEAD detached from "
-msgstr "HEAD отделён начиная с "
+#: unpack-trees.c:85
+#, 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Переместите эти файлы или удалите их перед переключением веток."
-#: wt-status.c:1478
-msgid "Not currently on any branch."
-msgstr "Сейчас ни на одной из веток"
+#: unpack-trees.c:87
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при переключении на состояние:\n%%s"
-#: wt-status.c:1496
-msgid "Initial commit"
-msgstr "Начальный коммит"
+#: unpack-trees.c:90
+#, 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Переместите эти файлы или удалите их перед переключением веток."
-#: wt-status.c:1510
-msgid "Untracked files"
-msgstr "Неотслеживаемые файлы"
+#: unpack-trees.c:92
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при слиянии:\n%%s"
-#: wt-status.c:1512
-msgid "Ignored files"
-msgstr "Игнорируемые файлы"
+#: unpack-trees.c:95
+#, 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."
-#: wt-status.c:1516
+#: unpack-trees.c:97
#, 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» для подробностей)."
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при %s:\n%%s"
-#: wt-status.c:1522
+#: unpack-trees.c:102
#, c-format
-msgid "Untracked files not listed%s"
-msgstr "Неотслеживаемые файлы не показаны%s"
+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Переместите эти файлы или удалите их перед переключением веток."
-#: wt-status.c:1524
-msgid " (use -u option to show untracked files)"
-msgstr "(используйте опцию «-u», чтобы показать неотслеживаемые файлы)"
+#: unpack-trees.c:104
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by checkout:\n"
+"%%s"
+msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при переключении на состояние:\n%%s"
-#: wt-status.c:1530
-msgid "No changes"
-msgstr "Нет изменений"
+#: unpack-trees.c:107
+#, 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Переместите эти файлы или удалите их перед переключением веток."
-#: wt-status.c:1535
+#: unpack-trees.c:109
#, 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"
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при слиянии:\n%%s"
-#: wt-status.c:1538
+#: unpack-trees.c:112
#, c-format
-msgid "no changes added to commit\n"
-msgstr "нет изменений добавленных для коммита\n"
+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."
-#: wt-status.c:1541
+#: unpack-trees.c:114
#, c-format
msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
-msgstr "ниÑ\87его не добавлено в коммиÑ\82, но еÑ\81Ñ\82Ñ\8c неоÑ\82Ñ\81леживаемÑ\8bе Ñ\84айлÑ\8b (иÑ\81полÑ\8cзÑ\83йÑ\82е «git add», Ñ\87Ñ\82обÑ\8b оÑ\82Ñ\81леживаÑ\82Ñ\8c иÑ\85)\n"
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr "УказаннÑ\8bе неоÑ\82Ñ\81леживаемÑ\8bе Ñ\84айлÑ\8b в Ñ\80абоÑ\87ем каÑ\82алоге бÑ\83дÑ\83Ñ\82 пеÑ\80езапиÑ\81анÑ\8b пÑ\80и %s:\n%%s"
-#: wt-status.c:1544
+#: unpack-trees.c:121
#, c-format
-msgid "nothing added to commit but untracked files present\n"
-msgstr "ниÑ\87его не добавлено в коммиÑ\82, но еÑ\81Ñ\82Ñ\8c неоÑ\82Ñ\81леживаемÑ\8bе Ñ\84айлÑ\8b\n"
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgstr "Ð\97апиÑ\81Ñ\8c «%s» Ñ\87аÑ\81Ñ\82иÑ\87но Ñ\81овпадаеÑ\82 Ñ\81 «%s». Ð\9dе Ñ\83далоÑ\81Ñ\8c назнаÑ\87иÑ\82Ñ\8c Ñ\81ооÑ\82веÑ\82Ñ\81Ñ\82вие."
-#: wt-status.c:1547
+#: unpack-trees.c:124
#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
-msgstr "нечего коммитить (создайте/скопируйте файлы, затем запустите «git add», чтобы отслеживать их)\n"
+msgid ""
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
+msgstr "Не удалось обновить частичное состояние: следующие элементы не последней версии:\n%s"
-#: wt-status.c:1550 wt-status.c:1555
+#: unpack-trees.c:126
#, c-format
-msgid "nothing to commit\n"
-msgstr "нечего коммитить\n"
+msgid ""
+"The following working tree files would be overwritten by sparse checkout update:\n"
+"%s"
+msgstr "Указанные файлы из рабочего каталога будут перезаписаны при обновлении частичного состояния:\n%s"
-#: wt-status.c:1553
+#: unpack-trees.c:128
#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
-msgstr "нечего коммитить (используйте опцию «-u», чтобы показать неотслеживаемые файлы)\n"
+msgid ""
+"The following working tree files would be removed by sparse checkout update:\n"
+"%s"
+msgstr "Указанные файлы из рабочего каталога будут удалены при обновлении частичного состояния:\n%s"
-#: wt-status.c:1557
+#: unpack-trees.c:205
#, c-format
-msgid "nothing to commit, working directory clean\n"
-msgstr "неÑ\87его коммиÑ\82иÑ\82Ñ\8c, неÑ\82 изменений в Ñ\80абоÑ\87ем каÑ\82алоге\n"
+msgid "Aborting\n"
+msgstr "Ð\9fÑ\80еÑ\80Ñ\8bваÑ\8e\n"
-#: wt-status.c:1664
-msgid "Initial commit on "
-msgstr "Ð\9dаÑ\87алÑ\8cнÑ\8bй коммиÑ\82 на "
+#: unpack-trees.c:237
+msgid "Checking out files"
+msgstr "РаÑ\81паковка Ñ\84айлов"
-#: wt-status.c:1668
-msgid "HEAD (no branch)"
-msgstr "HEAD (нет ветки)"
+#: urlmatch.c:120
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "Неправильная имя URL схемы или пропущен суффикс «://»"
-#: wt-status.c:1697
-msgid "gone"
-msgstr "исчез"
+#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "неправильная управляющая последовательность %XX"
-#: wt-status.c:1699 wt-status.c:1707
-msgid "behind "
-msgstr "позади"
+#: urlmatch.c:172
+msgid "missing host and scheme is not 'file:'"
+msgstr "пропущено имя сервера и схема доступа не «file:»"
-#: wt-status.c:1702 wt-status.c:1705
-msgid "ahead "
-msgstr "впереди "
+#: urlmatch.c:189
+msgid "a 'file:' URL may not have a port number"
+msgstr "URL со схемой «file:» не может содержать номер порта"
+
+#: urlmatch.c:199
+msgid "invalid characters in host name"
+msgstr "неправильные символы в имени сервера"
-#: compat/precompose_utf8.c:57 builtin/clone.c:415
+#: urlmatch.c:244 urlmatch.c:255
+msgid "invalid port number"
+msgstr "неправильный номер порта"
+
+#: urlmatch.c:322
+msgid "invalid '..' path segment"
+msgstr "неправильная часть пути «..»"
+
+#: worktree.c:282
#, c-format
-msgid "failed to unlink '%s'"
-msgstr "сбой отсоединения «%s»"
+msgid "failed to read '%s'"
+msgstr "не удалось прочитать «%s»"
-#: builtin/add.c:22
-msgid "git add [<options>] [--] <pathspec>..."
-msgstr "git add [<опции>] [--] <спецификация-пути>…"
+#: wrapper.c:222 wrapper.c:392
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr "не удалось открыть «%s» для чтения и записи"
-#: builtin/add.c:65
+#: wrapper.c:224 wrapper.c:394 builtin/am.c:766
#, c-format
-msgid "unexpected diff status %c"
-msgstr "неожиданный статус различий %c"
+msgid "could not open '%s' for writing"
+msgstr "не удалось открыть «%s» для записи"
-#: builtin/add.c:70 builtin/commit.c:280
-msgid "updating files failed"
-msgstr "сбой при обновлении файлов"
+#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
+#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029
+#: builtin/pull.c:341
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "не удалось открыть «%s» для чтения"
-#: builtin/add.c:80
+#: wrapper.c:605 wrapper.c:626
#, c-format
-msgid "remove '%s'\n"
-msgstr "удалить «%s»\n"
+msgid "unable to access '%s'"
+msgstr "«%s» недоступно"
-#: builtin/add.c:134
-msgid "Unstaged changes after refreshing the index:"
-msgstr "Ð\9dепÑ\80оиндекÑ\81иÑ\80ованнÑ\8bе изменениÑ\8f поÑ\81ле обновлениÑ\8f индекÑ\81а:"
+#: wrapper.c:634
+msgid "unable to get current working directory"
+msgstr "не Ñ\83далоÑ\81Ñ\8c полÑ\83Ñ\87иÑ\82Ñ\8c Ñ\82екÑ\83Ñ\89ий Ñ\80абоÑ\87ий каÑ\82алог"
-#: builtin/add.c:194 builtin/rev-parse.c:811
-msgid "Could not read the index"
-msgstr "Не удалось прочитать индекс"
+#: wrapper.c:658
+#, c-format
+msgid "could not write to %s"
+msgstr "не удалось записать в %s"
-#: builtin/add.c:205
+#: wrapper.c:660
#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Не удалось открыть «%s» для записи."
+msgid "could not close %s"
+msgstr "не удалось закрыть %s"
+
+#: wt-status.c:151
+msgid "Unmerged paths:"
+msgstr "Не слитые пути:"
+
+#: wt-status.c:178 wt-status.c:205
+#, c-format
+msgid " (use \"git reset %s <file>...\" to unstage)"
+msgstr " (используйте «git reset %s <файл>…», чтобы убрать из индекса)"
-#: builtin/add.c:209
-msgid "Could not write patch"
-msgstr "Не удалось записать патч"
+#: wt-status.c:180 wt-status.c:207
+msgid " (use \"git rm --cached <file>...\" to unstage)"
+msgstr " (используйте «git rm --cached <файл>…», чтобы убрать из индекса)"
-#: builtin/add.c:212
-msgid "editing patch failed"
-msgstr "сбой при редактировании патча"
+#: wt-status.c:184
+msgid " (use \"git add <file>...\" to mark resolution)"
+msgstr " (используйте «git add <файл>…», чтобы пометить разрешение конфликта)"
-#: builtin/add.c:215
-#, c-format
-msgid "Could not stat '%s'"
-msgstr "Не удалось выполнить stat для «%s»"
+#: wt-status.c:186 wt-status.c:190
+msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr " (используйте «git add/rm <файл>…», чтобы пометить выбранное разрешение конфликта)"
-#: builtin/add.c:217
-msgid "Empty patch. Aborted."
-msgstr "Пустой патч. Операция прервана."
+#: wt-status.c:188
+msgid " (use \"git rm <file>...\" to mark resolution)"
+msgstr " (используйте «git rm <файл>…», чтобы пометить разрешение конфликта)"
-#: builtin/add.c:222
-#, c-format
-msgid "Could not apply '%s'"
-msgstr "Не удалось применить «%s»"
+#: wt-status.c:199 wt-status.c:945
+msgid "Changes to be committed:"
+msgstr "Изменения, которые будут включены в коммит:"
-#: builtin/add.c:232
-msgid "The following paths are ignored by one of your .gitignore files:\n"
-msgstr "СледÑ\83Ñ\8eÑ\89ие пÑ\83Ñ\82и игноÑ\80иÑ\80Ñ\83Ñ\8eÑ\82Ñ\81Ñ\8f одним из ваÑ\88иÑ\85 Ñ\84айлов .gitignore:\n"
+#: wt-status.c:217 wt-status.c:954
+msgid "Changes not staged for commit:"
+msgstr "Ð\98зменениÑ\8f, коÑ\82оÑ\80Ñ\8bе не в индекÑ\81е длÑ\8f коммиÑ\82а:"
-#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511
-#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162
-msgid "dry run"
-msgstr "пробный запуск"
+#: wt-status.c:221
+msgid " (use \"git add <file>...\" to update what will be committed)"
+msgstr " (используйте «git add <файл>…», чтобы добавить файл в индекс)"
-#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19
-#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557
-#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114
-msgid "be verbose"
-msgstr "быть многословнее"
+#: wt-status.c:223
+msgid " (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr " (используйте «git add/rm <файл>…», чтобы добавить или удалить файл из индекса)"
-#: builtin/add.c:252
-msgid "interactive picking"
-msgstr "интерактивный выбор"
+#: wt-status.c:224
+msgid ""
+" (use \"git checkout -- <file>...\" to discard changes in working "
+"directory)"
+msgstr " (используйте «git checkout -- <файл>…», чтобы отменить изменения\n в рабочем каталоге)"
-#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286
-msgid "select hunks interactively"
-msgstr "интерактивный выбор блоков"
+#: wt-status.c:226
+msgid " (commit or discard the untracked or modified content in submodules)"
+msgstr " (сделайте коммит или отмените изменения в неотслеживаемом или измененном содержимом в подмодулях)"
-#: builtin/add.c:254
-msgid "edit current diff and apply"
-msgstr "отредактировать текущий файл различий и применить его"
+#: wt-status.c:238
+#, c-format
+msgid " (use \"git %s <file>...\" to include in what will be committed)"
+msgstr " (используйте «git %s <файл>…», чтобы добавить в то, что будет включено в коммит)"
-#: builtin/add.c:255
-msgid "allow adding otherwise ignored files"
-msgstr "разрешить добавление игнорируемых иначе файлов"
+#: wt-status.c:253
+msgid "both deleted:"
+msgstr "оба удалены:"
-#: builtin/add.c:256
-msgid "update tracked files"
-msgstr "обновиÑ\82Ñ\8c оÑ\82Ñ\81леживаемÑ\8bе Ñ\84айлÑ\8b"
+#: wt-status.c:255
+msgid "added by us:"
+msgstr "добавлено нами:"
-#: builtin/add.c:257
-msgid "record only the fact that the path will be added later"
-msgstr "записать только факт, что путь будет добавлен позже"
+#: wt-status.c:257
+msgid "deleted by them:"
+msgstr "удалено ими:"
-#: builtin/add.c:258
-msgid "add changes from all tracked and untracked files"
-msgstr "добавиÑ\82Ñ\8c изменениÑ\8f из вÑ\81еÑ\85 оÑ\82Ñ\81леживаемÑ\8bÑ\85 и неоÑ\82Ñ\81леживаемÑ\8bÑ\85 Ñ\84айлов"
+#: wt-status.c:259
+msgid "added by them:"
+msgstr "добавлено ими:"
-#: builtin/add.c:261
-msgid "ignore paths removed in the working tree (same as --no-all)"
-msgstr "игнорировать пути удаленные из рабочего каталога (тоже, что и --no-all)"
+#: wt-status.c:261
+msgid "deleted by us:"
+msgstr "удалено нами:"
-#: builtin/add.c:263
-msgid "don't add, only refresh the index"
-msgstr "не добавлÑ\8fÑ\82Ñ\8c, Ñ\82олÑ\8cко обновиÑ\82Ñ\8c индекÑ\81"
+#: wt-status.c:263
+msgid "both added:"
+msgstr "оба добавленÑ\8b:"
-#: builtin/add.c:264
-msgid "just skip files which cannot be added because of errors"
-msgstr "пÑ\80опÑ\83Ñ\81каÑ\82Ñ\8c Ñ\84айлÑ\8b, коÑ\82оÑ\80Ñ\8bе не могÑ\83Ñ\82 бÑ\8bÑ\82Ñ\8c добавленÑ\8b из-за оÑ\88ибок"
+#: wt-status.c:265
+msgid "both modified:"
+msgstr "оба изменÑ\8b:"
-#: builtin/add.c:265
-msgid "check if - even missing - files are ignored in dry run"
-msgstr "удостовериться, что даже недостающие файлы будут проигнорированы при пробном запуске"
+#: wt-status.c:275
+msgid "new file:"
+msgstr "новый файл:"
-#: builtin/add.c:287
-#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "Используйте -f, если вы действительно хотите добавить их.\n"
+#: wt-status.c:277
+msgid "copied:"
+msgstr "скопировано:"
-#: builtin/add.c:294
-msgid "adding files failed"
-msgstr "ошибка при добавлении файлов"
+#: wt-status.c:279
+msgid "deleted:"
+msgstr "удалено:"
-#: builtin/add.c:330
-msgid "-A and -u are mutually incompatible"
-msgstr "-A и -u нельзя использовать одновременно"
+#: wt-status.c:281
+msgid "modified:"
+msgstr "изменено:"
-#: builtin/add.c:337
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "Ð\9eпÑ\86иÑ\8f --ignore-missing можеÑ\82 иÑ\81полÑ\8cзоваÑ\82Ñ\8cÑ\81Ñ\8f Ñ\82олÑ\8cко вмеÑ\81Ñ\82е Ñ\81 --dry-run"
+#: wt-status.c:283
+msgid "renamed:"
+msgstr "пеÑ\80еименовано:"
-#: builtin/add.c:352
-#, c-format
-msgid "Nothing specified, nothing added.\n"
-msgstr "Ничего не указано, ничего не добавлено.\n"
+#: wt-status.c:285
+msgid "typechange:"
+msgstr "изменен тип:"
-#: builtin/add.c:353
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "Возможно, вы имели в виду «git add .»?\n"
+#: wt-status.c:287
+msgid "unknown:"
+msgstr "неизвестно:"
-#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
-#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:240
-msgid "index file corrupt"
-msgstr "файл индекса поврежден"
+#: wt-status.c:289
+msgid "unmerged:"
+msgstr "не слитые:"
-#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430
-msgid "Unable to write new index file"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c запиÑ\81аÑ\82Ñ\8c новÑ\8bй Ñ\84айл индекÑ\81а"
+#: wt-status.c:371
+msgid "new commits, "
+msgstr "новÑ\8bе коммиÑ\82Ñ\8b, "
-#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089
-#, c-format
-msgid "could not read '%s'"
-msgstr "не удалось прочитать «%s»"
+#: wt-status.c:373
+msgid "modified content, "
+msgstr "изменено содержимое, "
-#: builtin/am.c:430
-msgid "could not parse author script"
-msgstr "не удалось разобрать сценарий авторства"
+#: wt-status.c:375
+msgid "untracked content, "
+msgstr "неотслеживаемое содержимое, "
-#: builtin/am.c:507
-#, c-format
-msgid "'%s' was deleted by the applypatch-msg hook"
-msgstr "«%s» был удален перехватчиком applypatch-msg"
+#: wt-status.c:818
+msgid "Submodules changed but not updated:"
+msgstr "Измененные, но не обновленные подмодули:"
-#: builtin/am.c:548 builtin/notes.c:300
-#, c-format
-msgid "Malformed input line: '%s'."
-msgstr "Неправильная строка ввода: «%s»."
+#: wt-status.c:820
+msgid "Submodule changes to be committed:"
+msgstr "Изменения в подмодулях, которые будут закоммичены:"
-#: builtin/am.c:585 builtin/notes.c:315
-#, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
-msgstr "Не удалось скопировать заметку из «%s» в «%s»"
+#: wt-status.c:901
+msgid ""
+"Do not touch the line above.\n"
+"Everything below will be removed."
+msgstr "Не трогайте строку выше этой.\nВсё, что ниже — будет удалено."
-#: builtin/am.c:611
-msgid "fseek failed"
-msgstr "сбой при выполнении fseek"
+#: wt-status.c:1013
+msgid "You have unmerged paths."
+msgstr "У вас есть не слитые пути."
-#: builtin/am.c:788
-#, c-format
-msgid "could not parse patch '%s'"
-msgstr "не удалось разобрать патч «%s»"
+#: wt-status.c:1016
+msgid " (fix conflicts and run \"git commit\")"
+msgstr " (разрешите конфликты, затем запустите «git commit»)"
-#: builtin/am.c:853
-msgid "Only one StGIT patch series can be applied at once"
-msgstr "Только серия патчей StGIT может быть применена за раз"
+#: wt-status.c:1018
+msgid " (use \"git merge --abort\" to abort the merge)"
+msgstr " (используйте «git merge --abort», чтобы остановить операцию слияния)"
-#: builtin/am.c:900
-msgid "invalid timestamp"
-msgstr "недопÑ\83Ñ\81Ñ\82имаÑ\8f меÑ\82ка даÑ\82Ñ\8b/вÑ\80емени"
+#: wt-status.c:1023
+msgid "All conflicts fixed but you are still merging."
+msgstr "Ð\92Ñ\81е конÑ\84ликÑ\82Ñ\8b иÑ\81пÑ\80авленÑ\8b, но вÑ\8b вÑ\81е еÑ\89е в пÑ\80оÑ\86еÑ\81Ñ\81е Ñ\81лиÑ\8fниÑ\8f."
-#: builtin/am.c:903 builtin/am.c:911
-msgid "invalid Date line"
-msgstr "недопустимая строка даты"
+#: wt-status.c:1026
+msgid " (use \"git commit\" to conclude merge)"
+msgstr " (используйте «git commit», чтобы завершить слияние)"
-#: builtin/am.c:908
-msgid "invalid timezone offset"
-msgstr "недопÑ\83Ñ\81Ñ\82имое Ñ\81меÑ\89ение Ñ\87аÑ\81ового поÑ\8fÑ\81а"
+#: wt-status.c:1036
+msgid "You are in the middle of an am session."
+msgstr "Ð\92Ñ\8b в пÑ\80оÑ\86еÑ\81Ñ\81е Ñ\81еÑ\81Ñ\81ии am."
-#: builtin/am.c:995
-msgid "Patch format detection failed."
-msgstr "Сбой опÑ\80еделениÑ\8f Ñ\84оÑ\80маÑ\82а паÑ\82Ñ\87а."
+#: wt-status.c:1039
+msgid "The current patch is empty."
+msgstr "ТекÑ\83Ñ\89ий паÑ\82Ñ\87 пÑ\83Ñ\81Ñ\82ой."
-#: builtin/am.c:1000 builtin/clone.c:380
-#, c-format
-msgid "failed to create directory '%s'"
-msgstr "не удалось создать каталог «%s»"
+#: wt-status.c:1043
+msgid " (fix conflicts and then run \"git am --continue\")"
+msgstr " (разрешите конфликты, затем запустите «git am --continue»)"
-#: builtin/am.c:1004
-msgid "Failed to split patches."
-msgstr "Не удалось разделить патчи на части."
+#: wt-status.c:1045
+msgid " (use \"git am --skip\" to skip this patch)"
+msgstr " (используйте «git am --skip», чтобы пропустить этот патч)"
-#: builtin/am.c:1136 builtin/commit.c:365
-msgid "unable to write index file"
-msgstr "не удалось записать индекс"
+#: wt-status.c:1047
+msgid " (use \"git am --abort\" to restore the original branch)"
+msgstr " (используйте «git am --abort», чтобы восстановить оригинальную ветку)"
-#: builtin/am.c:1187
-#, c-format
-msgid "When you have resolved this problem, run \"%s --continue\"."
-msgstr "Когда вы устраните эту проблему, запустите «%s --continue»."
+#: wt-status.c:1172
+msgid "No commands done."
+msgstr "Команды не выполнены."
-#: builtin/am.c:1188
+#: wt-status.c:1175
#, c-format
-msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
-msgstr "Если вы хотите пропустить этот патч, то запустите «%s --skip»."
+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 команд выполнено):"
-#: builtin/am.c:1189
+#: wt-status.c:1186
#, c-format
-msgid "To restore the original branch and stop patching, run \"%s --abort\"."
-msgstr "Чтобы вернуться на предыдущую ветку и остановить применение изменений, запустите «%s --abort»."
+msgid " (see more in file %s)"
+msgstr " (смотрите дополнительно в файле %s)"
-#: builtin/am.c:1327
-msgid "Patch is empty. Was it split wrong?"
-msgstr "Ð\9fаÑ\82Ñ\87 пÑ\83Ñ\81Ñ\82. Ð\92озможно, он бÑ\8bл непÑ\80авилÑ\8cно Ñ\80азделÑ\91н?"
+#: wt-status.c:1191
+msgid "No commands remaining."
+msgstr "Ð\9aоманд болÑ\8cÑ\88е не оÑ\81Ñ\82алоÑ\81Ñ\8c."
-#: builtin/am.c:1401 builtin/log.c:1516
+#: wt-status.c:1194
#, c-format
-msgid "invalid ident line: %s"
-msgstr "неправильная строка идентификации: %s"
+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:1202
+msgid " (use \"git rebase --edit-todo\" to view and edit)"
+msgstr " (используйте «git rebase --edit-todo», чтобы просмотреть и изменить)"
-#: builtin/am.c:1428
+#: wt-status.c:1215
#, c-format
-msgid "unable to parse commit %s"
-msgstr "не Ñ\83далоÑ\81Ñ\8c Ñ\80азобÑ\80аÑ\82Ñ\8c коммиÑ\82 %s"
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "Ð\92Ñ\8b Ñ\81ейÑ\87аÑ\81 пеÑ\80емеÑ\89аеÑ\82е веÑ\82кÑ\83 «%s» над «%s»."
-#: builtin/am.c:1630
-msgid "Repository lacks necessary blobs to fall back on 3-way merge."
-msgstr "В репозитории отсутствуют двоичные объекты, необходимые для отката к трехходовому слиянию."
+#: wt-status.c:1220
+msgid "You are currently rebasing."
+msgstr "Вы сейчас перемещаете ветку."
-#: builtin/am.c:1632
-msgid "Using index info to reconstruct a base tree..."
-msgstr "Использую индекс для реконструкции базового дерева…"
+#: wt-status.c:1234
+msgid " (fix conflicts and then run \"git rebase --continue\")"
+msgstr " (разрешите конфликты, затем запустите «git rebase --continue»)"
-#: builtin/am.c:1651
-msgid ""
-"Did you hand edit your patch?\n"
-"It does not apply to blobs recorded in its index."
-msgstr "Вы вручную изменяли патч?\nОн не накладывается без ошибок на двоичные объекты, записанные в его заголовке."
+#: wt-status.c:1236
+msgid " (use \"git rebase --skip\" to skip this patch)"
+msgstr " (используйте «git rebase --skip», чтобы пропустить этот патч)"
-#: builtin/am.c:1657
-msgid "Falling back to patching base and 3-way merge..."
-msgstr "Откат к применению изменений к базовому коммиту с помощью трехходового слияния…"
+#: wt-status.c:1238
+msgid " (use \"git rebase --abort\" to check out the original branch)"
+msgstr " (используйте «git rebase --abort», чтобы перейти на оригинальную ветку)"
-#: builtin/am.c:1672
-msgid "Failed to merge in the changes."
-msgstr "Не удалось слить изменения."
+#: wt-status.c:1244
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
+msgstr " (все конфликты разрешены: запустите «git rebase --continue»)"
-#: builtin/am.c:1696 builtin/merge.c:636
-msgid "git write-tree failed to write a tree"
-msgstr "git write-tree не удалось записать дерево"
+#: wt-status.c:1248
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr "Вы сейчас разделяете коммит при перемещении ветки «%s» над «%s»."
-#: builtin/am.c:1703
-msgid "applying to an empty history"
-msgstr "пÑ\80именение к пÑ\83Ñ\81Ñ\82ой иÑ\81Ñ\82оÑ\80ии"
+#: wt-status.c:1253
+msgid "You are currently splitting a commit during a rebase."
+msgstr "Ð\92Ñ\8b Ñ\81ейÑ\87аÑ\81 Ñ\80азделÑ\8fеÑ\82е коммиÑ\82 пÑ\80и пеÑ\80емеÑ\89ении веÑ\82ки."
-#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841
-#: builtin/merge.c:866
-msgid "failed to write commit object"
-msgstr "сбой записи объекта коммита"
+#: wt-status.c:1256
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr "(Как только ваш рабочий каталог будет чистый, запустите «git rebase --continue»)"
-#: builtin/am.c:1748 builtin/am.c:1752
+#: wt-status.c:1260
#, c-format
-msgid "cannot resume: %s does not exist."
-msgstr "нелÑ\8cзÑ\8f пÑ\80одолжниÑ\82Ñ\8c: %s не Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83еÑ\82 "
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr "Ð\92Ñ\8b Ñ\81ейÑ\87аÑ\81 Ñ\80едакÑ\82иÑ\80Ñ\83еÑ\82е коммиÑ\82 пÑ\80и пеÑ\80емеÑ\89ении веÑ\82ки «%s» над «%s»."
-#: builtin/am.c:1768
-msgid "cannot be interactive without stdin connected to a terminal."
-msgstr "не Ñ\83далоÑ\81Ñ\8c иÑ\81полÑ\8cзоваÑ\82Ñ\8c инÑ\82еÑ\80акÑ\82ивное поведение, без stdin подклÑ\8eÑ\87енного к Ñ\82еÑ\80миналÑ\83."
+#: wt-status.c:1265
+msgid "You are currently editing a commit during a rebase."
+msgstr "Ð\92Ñ\8b Ñ\81ейÑ\87аÑ\81 Ñ\80едакÑ\82иÑ\80Ñ\83еÑ\82е коммиÑ\82 пÑ\80и пеÑ\80емеÑ\89ении веÑ\82ки."
-#: builtin/am.c:1773
-msgid "Commit Body is:"
-msgstr "Тело коммита:"
+#: wt-status.c:1268
+msgid " (use \"git commit --amend\" to amend the current commit)"
+msgstr " (используйте «git commit --amend», чтобы исправить текущий коммит)"
-#. 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:1783
-msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
-msgstr "Применить? [y] - да/[n] - нет/[e] - редактировать/[v] - просмотреть патч/[a] - применить всё: "
+#: wt-status.c:1270
+msgid " (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr " (используйте «git rebase --continue», когда будете довольны изменениями)"
-#: builtin/am.c:1833
+#: wt-status.c:1280
#, c-format
-msgid "Dirty index: cannot apply patches (dirty: %s)"
-msgstr "Ð\98ндекÑ\81 не пÑ\83Ñ\81Ñ\82ой: нелÑ\8cзÑ\8f пÑ\80именÑ\8fÑ\82Ñ\8c паÑ\82Ñ\87и (в индекÑ\81е: %s)"
+msgid "You are currently cherry-picking commit %s."
+msgstr "Ð\92Ñ\8b копиÑ\80Ñ\83еÑ\82е коммиÑ\82 %s."
-#: builtin/am.c:1868 builtin/am.c:1940
-#, c-format
-msgid "Applying: %.*s"
-msgstr "Применение: %.*s"
+#: wt-status.c:1285
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr " (разрешите конфликты, затем запустите «git cherry-pick --continue»)"
-#: builtin/am.c:1884
-msgid "No changes -- Patch already applied."
-msgstr "Нет изменений — Патч уже применен."
+#: wt-status.c:1288
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr " (все конфликты разрешены: запустите «git cherry-pick --continue»)"
-#: builtin/am.c:1892
-#, c-format
-msgid "Patch failed at %s %.*s"
-msgstr "Ошибка применения изменений на %s %.*s"
+#: wt-status.c:1290
+msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr " (используйте «git cherry-pick --abort», чтобы отменить копирования коммита)"
-#: builtin/am.c:1898
+#: wt-status.c:1299
#, c-format
-msgid "The copy of the patch that failed is found in: %s"
-msgstr "Ð\9aопиÑ\8e изменений, коÑ\82оÑ\80Ñ\8bе не Ñ\83далоÑ\81Ñ\8c пÑ\80имениÑ\82Ñ\8c, вÑ\8b можеÑ\82е найÑ\82и в: %s"
+msgid "You are currently reverting commit %s."
+msgstr "Ð\92Ñ\8b Ñ\81ейÑ\87аÑ\81 обÑ\80аÑ\89аеÑ\82е изменениÑ\8f коммиÑ\82а %s."
-#: builtin/am.c:1943
-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Если ничего не осталось для индексации, то, скорее всего, что-то другое уже сделало те же изменения; возможно, вам следует пропустить этот патч."
+#: wt-status.c:1304
+msgid " (fix conflicts and run \"git revert --continue\")"
+msgstr " (разрешите конфликты, затем запустите «git revert --continue»)"
-#: builtin/am.c:1950
-msgid ""
-"You still have unmerged paths in your index.\n"
-"Did you forget to use 'git add'?"
-msgstr "У вас все еще имеются не слитые пути в индексе.\nВозможно, вы забыли вызвать «git add»?"
+#: wt-status.c:1307
+msgid " (all conflicts fixed: run \"git revert --continue\")"
+msgstr " (все конфликты разрешены: запустите «git revert --continue»)"
-#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308
-#: builtin/reset.c:316
+#: wt-status.c:1309
+msgid " (use \"git revert --abort\" to cancel the revert operation)"
+msgstr " (используйте «git revert --abort», чтобы отменить операцию обращения изменений коммита)"
+
+#: wt-status.c:1320
#, c-format
-msgid "Could not parse object '%s'."
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\80азобÑ\80аÑ\82Ñ\8c обÑ\8aекÑ\82 «%s»."
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "Ð\92Ñ\8b Ñ\81ейÑ\87аÑ\81 в пÑ\80оÑ\86еÑ\81Ñ\81е двоиÑ\87ного поиÑ\81ка, наÑ\87аÑ\82ого Ñ\81 веÑ\82ки «%s»."
-#: builtin/am.c:2110
-msgid "failed to clean index"
-msgstr "не Ñ\83далоÑ\81Ñ\8c оÑ\87иÑ\81Ñ\82иÑ\82Ñ\8c индекÑ\81"
+#: wt-status.c:1324
+msgid "You are currently bisecting."
+msgstr "Ð\92Ñ\8b Ñ\81ейÑ\87аÑ\81 в пÑ\80оÑ\86еÑ\81Ñ\81е двоиÑ\87ного поиÑ\81ка."
-#: builtin/am.c:2144
-msgid ""
-"You seem to have moved HEAD since the last 'am' failure.\n"
-"Not rewinding to ORIG_HEAD"
-msgstr "Похоже, что вы переместили HEAD с момента последней ошибки выполнения «am».\nПеремотка на ORIG_HEAD не выполняется"
+#: wt-status.c:1327
+msgid " (use \"git bisect reset\" to get back to the original branch)"
+msgstr " (используйте «git bisect reset», чтобы вернуться на исходную ветку)"
-#: builtin/am.c:2205
-#, c-format
-msgid "Invalid value for --patch-format: %s"
-msgstr "Неправильное значение для --patch-format: %s"
+#: wt-status.c:1524
+msgid "On branch "
+msgstr "На ветке "
-#: builtin/am.c:2238
-msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
-msgstr "git am [<опции>] [(<mbox>|<Maildir>)…]"
+#: wt-status.c:1530
+msgid "interactive rebase in progress; onto "
+msgstr "интерактивное перемещение в процессе; над "
-#: builtin/am.c:2239
-msgid "git am [<options>] (--continue | --skip | --abort)"
-msgstr "git am [<опции>] (--continue | --skip | --abort)"
+#: wt-status.c:1532
+msgid "rebase in progress; onto "
+msgstr "перемещение в процессе; над "
-#: builtin/am.c:2245
-msgid "run interactively"
-msgstr "запустить в интерактивном режиме"
+#: wt-status.c:1537
+msgid "HEAD detached at "
+msgstr "HEAD отделён на "
-#: builtin/am.c:2247
-msgid "historical option -- no-op"
-msgstr "историческая опция — ничего не делает"
+#: wt-status.c:1539
+msgid "HEAD detached from "
+msgstr "HEAD отделён начиная с "
-#: builtin/am.c:2249
-msgid "allow fall back on 3way merging if needed"
-msgstr "разрешить откатиться к трехходовому слиянию, если нужно"
+#: wt-status.c:1542
+msgid "Not currently on any branch."
+msgstr "Сейчас ни на одной из веток"
-#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57
-#: builtin/repack.c:171
-msgid "be quiet"
-msgstr "тихий режим"
+#: wt-status.c:1560
+msgid "Initial commit"
+msgstr "Начальный коммит"
-#: builtin/am.c:2252
-msgid "add a Signed-off-by line to the commit message"
-msgstr "добавиÑ\82Ñ\8c Ñ\81Ñ\82Ñ\80окÑ\83 Signed-off-by к Ñ\81ообÑ\89ениÑ\8e коммиÑ\82а"
+#: wt-status.c:1574
+msgid "Untracked files"
+msgstr "Ð\9dеоÑ\82Ñ\81леживаемÑ\8bе Ñ\84айлÑ\8b"
-#: builtin/am.c:2255
-msgid "recode into utf8 (default)"
-msgstr "пеÑ\80екодиÑ\80оваÑ\82Ñ\8c в utf8 (по Ñ\83молÑ\87аниÑ\8e)"
+#: wt-status.c:1576
+msgid "Ignored files"
+msgstr "Ð\98гноÑ\80иÑ\80Ñ\83емÑ\8bе Ñ\84айлÑ\8b"
-#: builtin/am.c:2257
-msgid "pass -k flag to git-mailinfo"
-msgstr "передать флаг -k в git-mailinfo"
+#: wt-status.c:1580
+#, 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» для подробностей)."
-#: builtin/am.c:2259
-msgid "pass -b flag to git-mailinfo"
-msgstr "передать флаг -b в git-mailinfo"
+#: wt-status.c:1586
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "Неотслеживаемые файлы не показаны%s"
-#: builtin/am.c:2261
-msgid "pass -m flag to git-mailinfo"
-msgstr "передать флаг -m в git-mailinfo"
+#: wt-status.c:1588
+msgid " (use -u option to show untracked files)"
+msgstr "(используйте опцию «-u», чтобы показать неотслеживаемые файлы)"
-#: builtin/am.c:2263
-msgid "pass --keep-cr flag to git-mailsplit for mbox format"
-msgstr "пеÑ\80едаÑ\82Ñ\8c Ñ\84лаг --keep-cr в git-mailsplit длÑ\8f Ñ\84оÑ\80маÑ\82а mbox"
+#: wt-status.c:1594
+msgid "No changes"
+msgstr "Ð\9dеÑ\82 изменений"
-#: builtin/am.c:2266
-msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
-msgstr "не передавать --keep-cr флаг в git-mailsplit вне зависимости от am.keepcr"
+#: wt-status.c:1599
+#, 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"
-#: builtin/am.c:2269
-msgid "strip everything before a scissors line"
-msgstr "обрезать все до строки обрезки"
+#: wt-status.c:1602
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "нет изменений добавленных для коммита\n"
-#: builtin/am.c:2270 builtin/apply.c:4546
-msgid "action"
-msgstr "действие"
+#: wt-status.c:1605
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr "ничего не добавлено в коммит, но есть неотслеживаемые файлы (используйте «git add», чтобы отслеживать их)\n"
-#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
-#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292
-#: builtin/am.c:2298
-msgid "pass it through git-apply"
-msgstr "передать его в git-apply"
+#: wt-status.c:1608
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
+msgstr "ничего не добавлено в коммит, но есть неотслеживаемые файлы\n"
-#: builtin/am.c:2279 builtin/apply.c:4570
-msgid "root"
-msgstr "корень"
+#: wt-status.c:1611
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgstr "нечего коммитить (создайте/скопируйте файлы, затем запустите «git add», чтобы отслеживать их)\n"
-#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508
-#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95
-#: builtin/pull.c:179 builtin/submodule--helper.c:277
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485
-#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767
-#: builtin/submodule--helper.c:770
-msgid "path"
-msgstr "путь"
+#: wt-status.c:1614 wt-status.c:1619
+#, c-format
+msgid "nothing to commit\n"
+msgstr "нечего коммитить\n"
-#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134
-#: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182
-#: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
-#: parse-options.h:132 parse-options.h:134 parse-options.h:244
-msgid "n"
-msgstr "n"
+#: wt-status.c:1617
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr "нечего коммитить (используйте опцию «-u», чтобы показать неотслеживаемые файлы)\n"
-#: builtin/am.c:2291 builtin/apply.c:4514
-msgid "num"
-msgstr "количество"
+#: wt-status.c:1621
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr "нечего коммитить, нет изменений в рабочем каталоге\n"
-#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438
-#: builtin/tag.c:372
-msgid "format"
-msgstr "формат"
+#: wt-status.c:1728
+msgid "Initial commit on "
+msgstr "Начальный коммит на "
-#: builtin/am.c:2295
-msgid "format the patch(es) are in"
-msgstr "формат, в котором находятся патчи"
+#: wt-status.c:1732
+msgid "HEAD (no branch)"
+msgstr "HEAD (нет ветки)"
-#: builtin/am.c:2301
-msgid "override error message when patch failure occurs"
-msgstr "пеÑ\80еопÑ\80еделиÑ\82Ñ\8c Ñ\81ообÑ\89ение об оÑ\88ибке, еÑ\81ли не Ñ\83далоÑ\81Ñ\8c наложиÑ\82Ñ\8c изменениÑ\8f"
+#: wt-status.c:1761
+msgid "gone"
+msgstr "иÑ\81Ñ\87ез"
-#: builtin/am.c:2303
-msgid "continue applying patches after resolving a conflict"
-msgstr "продолжить применение изменений после разрешения конфиликта"
+#: wt-status.c:1763 wt-status.c:1771
+msgid "behind "
+msgstr "позади"
-#: builtin/am.c:2306
-msgid "synonyms for --continue"
-msgstr "синоним для --continue"
+#: wt-status.c:1766 wt-status.c:1769
+msgid "ahead "
+msgstr "впереди "
-#: builtin/am.c:2309
-msgid "skip the current patch"
-msgstr "пропустить текущий патч"
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2270
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "не удалось выполнить %s: У вас есть непроиндексированные изменения."
-#: builtin/am.c:2312
-msgid "restore the original branch and abort the patching operation."
-msgstr "воÑ\81Ñ\81Ñ\82ановиÑ\82Ñ\8c оÑ\80игиналÑ\8cнÑ\83Ñ\8e веÑ\82кÑ\83 и оÑ\82мениÑ\82Ñ\8c опеÑ\80аÑ\86иÑ\8e пÑ\80именениÑ\8f изменений."
+#: wt-status.c:2276
+msgid "additionally, your index contains uncommitted changes."
+msgstr "к Ñ\82омÑ\83 же, в ваÑ\88ем индекÑ\81е еÑ\81Ñ\82Ñ\8c незакоммиÑ\87еннÑ\8bе изменениÑ\8f."
-#: builtin/am.c:2316
-msgid "lie about committer date"
-msgstr "соврать о дате коммитера"
+#: wt-status.c:2278
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "не удалось выполнить %s: В вашем индексе есть незакоммиченные изменения."
-#: builtin/am.c:2318
-msgid "use current timestamp for author date"
-msgstr "использовать текущее время как время авторства"
+#: compat/precompose_utf8.c:57 builtin/clone.c:414
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "сбой отсоединения «%s»"
-#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228
-#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
-msgid "key-id"
-msgstr "key-id"
+#: builtin/add.c:22
+msgid "git add [<options>] [--] <pathspec>..."
+msgstr "git add [<опции>] [--] <спецификация-пути>…"
-#: builtin/am.c:2321
-msgid "GPG-sign commits"
-msgstr "подписать коммиты с помощью GPG"
+#: builtin/add.c:80
+#, c-format
+msgid "unexpected diff status %c"
+msgstr "неожиданный статус различий %c"
-#: builtin/am.c:2324
-msgid "(internal use for git-rebase)"
-msgstr "(внутреннее использование для git-rebase)"
+#: builtin/add.c:85 builtin/commit.c:291
+msgid "updating files failed"
+msgstr "сбой при обновлении файлов"
-#: builtin/am.c:2339
-msgid ""
-"The -b/--binary option has been a no-op for long time, and\n"
-"it will be removed. Please do not use it anymore."
-msgstr "Опция -b/--binary уже долгое время ничего не делает и будет удалена с следующих версиях Git. Пожалуйста, не используйте ее."
+#: builtin/add.c:95
+#, c-format
+msgid "remove '%s'\n"
+msgstr "удалить «%s»\n"
-#: builtin/am.c:2346
-msgid "failed to read the index"
-msgstr "сбой чтения индекса"
+#: builtin/add.c:149
+msgid "Unstaged changes after refreshing the index:"
+msgstr "Непроиндексированные изменения после обновления индекса:"
-#: builtin/am.c:2361
-#, c-format
-msgid "previous rebase directory %s still exists but mbox given."
-msgstr "предыдущий каталог перемещения %s еще существует, но передан mbox."
+#: builtin/add.c:209 builtin/rev-parse.c:840
+msgid "Could not read the index"
+msgstr "Не удалось прочитать индекс"
-#: builtin/am.c:2385
+#: builtin/add.c:220
#, c-format
-msgid ""
-"Stray %s directory found.\n"
-"Use \"git am --abort\" to remove it."
-msgstr "Найден забытый каталог %s.\nИспользуйте «git am --abort», чтобы удалить его."
+msgid "Could not open '%s' for writing."
+msgstr "Не удалось открыть «%s» для записи."
-#: builtin/am.c:2391
-msgid "Resolve operation not in progress, we are not resuming."
-msgstr "Ð\9eпеÑ\80аÑ\86иÑ\8f Ñ\80азÑ\80еÑ\88ениÑ\8f конÑ\84ликÑ\82ов не в пÑ\80оÑ\86еÑ\81Ñ\81е вÑ\8bполнениÑ\8f, не пÑ\80одолжаем."
+#: builtin/add.c:224
+msgid "Could not write patch"
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c запиÑ\81аÑ\82Ñ\8c паÑ\82Ñ\87"
-#: builtin/apply.c:59
-msgid "git apply [<options>] [<patch>...]"
-msgstr "git apply [<опции>] [<патч>…]"
+#: builtin/add.c:227
+msgid "editing patch failed"
+msgstr "сбой при редактировании патча"
-#: builtin/apply.c:111
+#: builtin/add.c:230
#, c-format
-msgid "unrecognized whitespace option '%s'"
-msgstr "неопознаннаÑ\8f опÑ\86иÑ\8f длÑ\8f пÑ\80обелов «%s»"
+msgid "Could not stat '%s'"
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c вÑ\8bполниÑ\82Ñ\8c stat длÑ\8f «%s»"
-#: builtin/apply.c:126
-#, c-format
-msgid "unrecognized whitespace ignore option '%s'"
-msgstr "неопознанная опция для игнорирования пробелов «%s»"
+#: builtin/add.c:232
+msgid "Empty patch. Aborted."
+msgstr "Пустой патч. Операция прервана."
-#: builtin/apply.c:818
+#: builtin/add.c:237
#, c-format
-msgid "Cannot prepare timestamp regexp %s"
-msgstr "Не удалось подготовить регулярное выражение для метки времени %s"
+msgid "Could not apply '%s'"
+msgstr "Не удалось применить «%s»"
-#: builtin/apply.c:827
-#, c-format
-msgid "regexec returned %d for input: %s"
-msgstr "regexec возвратил %d для ввода: %s"
+#: builtin/add.c:247
+msgid "The following paths are ignored by one of your .gitignore files:\n"
+msgstr "Следующие пути игнорируются одним из ваших файлов .gitignore:\n"
-#: builtin/apply.c:908
-#, c-format
-msgid "unable to find filename in patch at line %d"
-msgstr "не удалось найти имя файла в строке патча %d"
+#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111
+#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521
+#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162
+msgid "dry run"
+msgstr "пробный запуск"
-#: builtin/apply.c:937
-#, c-format
-msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
-msgstr "git apply: плохой git-diff — ожидалось /dev/null, получено %s на строке %d"
+#: builtin/add.c:269
+msgid "interactive picking"
+msgstr "интерактивный выбор"
-#: builtin/apply.c:942
-#, c-format
-msgid "git apply: bad git-diff - inconsistent new filename on line %d"
-msgstr "git apply: плохой git-diff — не согласующееся новое имя файла на строке %d"
+#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286
+msgid "select hunks interactively"
+msgstr "интерактивный выбор блоков"
-#: builtin/apply.c:943
-#, c-format
-msgid "git apply: bad git-diff - inconsistent old filename on line %d"
-msgstr "git apply: плохой git-diff — не согласующееся старое имя файла на строке %d"
+#: builtin/add.c:271
+msgid "edit current diff and apply"
+msgstr "отредактировать текущий файл различий и применить его"
-#: builtin/apply.c:949
-#, c-format
-msgid "git apply: bad git-diff - expected /dev/null on line %d"
-msgstr "git apply: плохой git-diff — ожидалось /dev/null на строке %d"
+#: builtin/add.c:272
+msgid "allow adding otherwise ignored files"
+msgstr "разрешить добавление игнорируемых иначе файлов"
-#: builtin/apply.c:1406
-#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr "recount: не ожидаемая строка: %.*s"
+#: builtin/add.c:273
+msgid "update tracked files"
+msgstr "обновить отслеживаемые файлы"
-#: builtin/apply.c:1463
-#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr "фрагмент изменений без заголовка на строке %d: %.*s"
+#: builtin/add.c:274
+msgid "record only the fact that the path will be added later"
+msgstr "записать только факт, что путь будет добавлен позже"
-#: builtin/apply.c:1480
-#, 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] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущего компонента пути к файлу (строка %d)"
-msgstr[1] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (строка %d)"
-msgstr[2] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (строка %d)"
-msgstr[3] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (строка %d)"
+#: builtin/add.c:275
+msgid "add changes from all tracked and untracked files"
+msgstr "добавить изменения из всех отслеживаемых и неотслеживаемых файлов"
-#: builtin/apply.c:1646
-msgid "new file depends on old contents"
-msgstr "новÑ\8bй Ñ\84айл завиÑ\81иÑ\82 оÑ\82 Ñ\81Ñ\82аÑ\80ого Ñ\81одеÑ\80жимого"
+#: builtin/add.c:278
+msgid "ignore paths removed in the working tree (same as --no-all)"
+msgstr "игноÑ\80иÑ\80оваÑ\82Ñ\8c пÑ\83Ñ\82и Ñ\83даленнÑ\8bе из Ñ\80абоÑ\87его каÑ\82алога (Ñ\82оже, Ñ\87Ñ\82о и --no-all)"
-#: builtin/apply.c:1648
-msgid "deleted file still has contents"
-msgstr "удаленный файл все еще имеет содержимое"
+#: builtin/add.c:280
+msgid "don't add, only refresh the index"
+msgstr "не добавлять, только обновить индекс"
-#: builtin/apply.c:1674
-#, c-format
-msgid "corrupt patch at line %d"
-msgstr "патч поврежден на строке %d"
+#: builtin/add.c:281
+msgid "just skip files which cannot be added because of errors"
+msgstr "пропускать файлы, которые не могут быть добавлены из-за ошибок"
-#: builtin/apply.c:1710
-#, c-format
-msgid "new file %s depends on old contents"
-msgstr "новый файл %s зависит от старого содержимого"
+#: builtin/add.c:282
+msgid "check if - even missing - files are ignored in dry run"
+msgstr "удостовериться, что даже недостающие файлы будут проигнорированы при пробном запуске"
-#: builtin/apply.c:1712
-#, c-format
-msgid "deleted file %s still has contents"
-msgstr "удаленный файл %s все еще имеет содержимое"
+#: builtin/add.c:283 builtin/update-index.c:947
+msgid "(+/-)x"
+msgstr "(+/-)x"
-#: builtin/apply.c:1715
-#, c-format
-msgid "** warning: file %s becomes empty but is not deleted"
-msgstr "** предупреждение: файл %s становится пустым, но не удаляется"
+#: builtin/add.c:283 builtin/update-index.c:948
+msgid "override the executable bit of the listed files"
+msgstr "переопределить бит выполнения на указанных файлах"
-#: builtin/apply.c:1861
+#: builtin/add.c:305
#, c-format
-msgid "corrupt binary patch at line %d: %.*s"
-msgstr "повÑ\80ежденнÑ\8bй двоиÑ\87нÑ\8bй паÑ\82Ñ\87 на Ñ\81Ñ\82Ñ\80оке %d: %.*s"
+msgid "Use -f if you really want to add them.\n"
+msgstr "Ð\98Ñ\81полÑ\8cзÑ\83йÑ\82е -f, еÑ\81ли вÑ\8b дейÑ\81Ñ\82виÑ\82елÑ\8cно Ñ\85оÑ\82иÑ\82е добавиÑ\82Ñ\8c иÑ\85.\n"
-#: builtin/apply.c:1895
-#, c-format
-msgid "unrecognized binary patch at line %d"
-msgstr "неопознанный двоичный патч на строке %d"
+#: builtin/add.c:312
+msgid "adding files failed"
+msgstr "ошибка при добавлении файлов"
-#: builtin/apply.c:2048
-#, c-format
-msgid "patch with only garbage at line %d"
-msgstr "патч с мусором на строке %d"
+#: builtin/add.c:348
+msgid "-A and -u are mutually incompatible"
+msgstr "-A и -u нельзя использовать одновременно"
-#: builtin/apply.c:2138
-#, c-format
-msgid "unable to read symlink %s"
-msgstr "не удалось прочитать символьную ссылку %s"
+#: builtin/add.c:355
+msgid "Option --ignore-missing can only be used together with --dry-run"
+msgstr "Опция --ignore-missing может использоваться только вместе с --dry-run"
-#: builtin/apply.c:2142
+#: builtin/add.c:359
#, c-format
-msgid "unable to open or read %s"
-msgstr "не Ñ\83далоÑ\81Ñ\8c оÑ\82кÑ\80Ñ\8bÑ\82Ñ\8c или пÑ\80оÑ\87еÑ\81Ñ\82Ñ\8c %s"
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr "паÑ\80амеÑ\82Ñ\80 --chmod «%s» должен бÑ\8bÑ\82Ñ\8c -x или +x"
-#: builtin/apply.c:2775
+#: builtin/add.c:374
#, c-format
-msgid "invalid start of line: '%c'"
-msgstr "непÑ\80авилÑ\8cное наÑ\87ало Ñ\81Ñ\82Ñ\80оки: «%c»"
+msgid "Nothing specified, nothing added.\n"
+msgstr "Ð\9dиÑ\87его не Ñ\83казано, ниÑ\87его не добавлено.\n"
-#: builtin/apply.c:2894
+#: builtin/add.c:375
#, 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 строки)."
-msgstr[2] "Часть #%d успешно применена на %d (со сдвигом в %d строк)."
-msgstr[3] "Часть #%d успешно применена на %d (со сдвигом в %d строк)."
+msgid "Maybe you wanted to say 'git add .'?\n"
+msgstr "Возможно, вы имели в виду «git add .»?\n"
-#: builtin/apply.c:2906
-#, c-format
-msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
-msgstr "Контекст сужен до (%ld/%ld), чтобы применить фрагмент на %d строке"
+#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279
+#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350
+#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:244
+msgid "index file corrupt"
+msgstr "файл индекса поврежден"
-#: builtin/apply.c:2912
-#, c-format
-msgid ""
-"while searching for:\n"
-"%.*s"
-msgstr "при поиске:\n%.*s"
+#: builtin/am.c:414
+msgid "could not parse author script"
+msgstr "не удалось разобрать сценарий авторства"
-#: builtin/apply.c:2932
+#: builtin/am.c:491
#, c-format
-msgid "missing binary patch data for '%s'"
-msgstr "пропущены данные двоичного патча для «%s»"
+msgid "'%s' was deleted by the applypatch-msg hook"
+msgstr "«%s» был удален перехватчиком applypatch-msg"
-#: builtin/apply.c:3033
+#: builtin/am.c:532
#, c-format
-msgid "binary patch does not apply to '%s'"
-msgstr "не Ñ\83далоÑ\81Ñ\8c пÑ\80имениÑ\82Ñ\8c двоиÑ\87нÑ\8bй паÑ\82Ñ\87 к «%s»"
+msgid "Malformed input line: '%s'."
+msgstr "Ð\9dепÑ\80авилÑ\8cнаÑ\8f Ñ\81Ñ\82Ñ\80ока ввода: «%s»."
-#: builtin/apply.c:3039
+#: builtin/am.c:569
#, c-format
-msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
-msgstr "поÑ\81ле пÑ\80именениÑ\8f двоиÑ\87ного паÑ\82Ñ\87а длÑ\8f «%s» бÑ\8bл полÑ\83Ñ\87ен непÑ\80авилÑ\8cнÑ\8bй Ñ\80езÑ\83лÑ\8cÑ\82аÑ\82 (ожидалоÑ\81Ñ\8c %s, полÑ\83Ñ\87ено %s)"
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\81копиÑ\80оваÑ\82Ñ\8c замеÑ\82кÑ\83 из «%s» в «%s»"
-#: builtin/apply.c:3060
-#, c-format
-msgid "patch failed: %s:%ld"
-msgstr "ошибка применения изменений: %s:%ld"
+#: builtin/am.c:595
+msgid "fseek failed"
+msgstr "сбой при выполнении fseek"
-#: builtin/apply.c:3184
+#: builtin/am.c:775
#, c-format
-msgid "cannot checkout %s"
-msgstr "не удалось переключить состояние на %s"
+msgid "could not parse patch '%s'"
+msgstr "не удалось разобрать патч «%s»"
-#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285
-#, c-format
-msgid "read of %s failed"
-msgstr "ошибка чтения %s"
+#: builtin/am.c:840
+msgid "Only one StGIT patch series can be applied at once"
+msgstr "Только серия патчей StGIT может быть применена за раз"
-#: builtin/apply.c:3237
-#, c-format
-msgid "reading from '%s' beyond a symbolic link"
-msgstr "чтение из «%s» за символической ссылкой"
+#: builtin/am.c:887
+msgid "invalid timestamp"
+msgstr "недопустимая метка даты/времени"
-#: builtin/apply.c:3265 builtin/apply.c:3487
-#, c-format
-msgid "path %s has been renamed/deleted"
-msgstr "путь %s был переименован/удален"
+#: builtin/am.c:890 builtin/am.c:898
+msgid "invalid Date line"
+msgstr "недопустимая строка даты"
-#: builtin/apply.c:3346 builtin/apply.c:3501
-#, c-format
-msgid "%s: does not exist in index"
-msgstr "%s: нет в индексе"
+#: builtin/am.c:895
+msgid "invalid timezone offset"
+msgstr "недопустимое смещение часового пояса"
-#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515
-#, c-format
-msgid "%s: %s"
-msgstr "%s: %s"
+#: builtin/am.c:984
+msgid "Patch format detection failed."
+msgstr "Сбой определения формата патча."
-#: builtin/apply.c:3355 builtin/apply.c:3509
+#: builtin/am.c:989 builtin/clone.c:379
#, c-format
-msgid "%s: does not match index"
-msgstr "%s: не совпадает с индексом"
+msgid "failed to create directory '%s'"
+msgstr "не удалось создать каталог «%s»"
-#: builtin/apply.c:3457
-msgid "removal patch leaves file contents"
-msgstr "паÑ\82Ñ\87 Ñ\83далениÑ\8f не Ñ\83далил Ñ\81одеÑ\80жимое Ñ\84айла"
+#: builtin/am.c:993
+msgid "Failed to split patches."
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\80азделиÑ\82Ñ\8c паÑ\82Ñ\87и на Ñ\87аÑ\81Ñ\82и."
-#: builtin/apply.c:3526
-#, c-format
-msgid "%s: wrong type"
-msgstr "%s: неправильный тип"
+#: builtin/am.c:1125 builtin/commit.c:376
+msgid "unable to write index file"
+msgstr "не удалось записать индекс"
-#: builtin/apply.c:3528
+#: builtin/am.c:1176
#, c-format
-msgid "%s has type %o, expected %o"
-msgstr "%s имеет тип %o, а ожидался %o"
+msgid "When you have resolved this problem, run \"%s --continue\"."
+msgstr "Когда вы устраните эту проблему, запустите «%s --continue»."
-#: builtin/apply.c:3687 builtin/apply.c:3689
+#: builtin/am.c:1177
#, c-format
-msgid "invalid path '%s'"
-msgstr "непÑ\80авилÑ\8cнÑ\8bй пÑ\83Ñ\82Ñ\8c «%s»"
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+msgstr "Ð\95Ñ\81ли вÑ\8b Ñ\85оÑ\82иÑ\82е пÑ\80опÑ\83Ñ\81Ñ\82иÑ\82Ñ\8c Ñ\8dÑ\82оÑ\82 паÑ\82Ñ\87, Ñ\82о запÑ\83Ñ\81Ñ\82иÑ\82е «%s --skip»."
-#: builtin/apply.c:3744
+#: builtin/am.c:1178
#, c-format
-msgid "%s: already exists in index"
-msgstr "%s: уже содержится в индексе"
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgstr "Чтобы вернуться на предыдущую ветку и остановить применение изменений, запустите «%s --abort»."
-#: builtin/apply.c:3747
-#, c-format
-msgid "%s: already exists in working directory"
-msgstr "%s: уже содержится в рабочем каталоге"
+#: builtin/am.c:1316
+msgid "Patch is empty. Was it split wrong?"
+msgstr "Патч пуст. Возможно, он был неправильно разделён?"
-#: builtin/apply.c:3767
+#: builtin/am.c:1390 builtin/log.c:1550
#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o)"
-msgstr "новÑ\8bй Ñ\80ежим доÑ\81Ñ\82Ñ\83па (%o) длÑ\8f %s не Ñ\81ооÑ\82веÑ\82Ñ\81Ñ\82вÑ\83еÑ\82 Ñ\81Ñ\82аÑ\80омÑ\83 Ñ\80ежимÑ\83 доÑ\81Ñ\82Ñ\83па (%o)"
+msgid "invalid ident line: %s"
+msgstr "непÑ\80авилÑ\8cнаÑ\8f Ñ\81Ñ\82Ñ\80ока иденÑ\82иÑ\84икаÑ\86ии: %s"
-#: builtin/apply.c:3772
+#: builtin/am.c:1417
#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o) of %s"
-msgstr "новÑ\8bй Ñ\80ежим доÑ\81Ñ\82Ñ\83па (%o) длÑ\8f %s не Ñ\81ооÑ\82веÑ\82Ñ\81Ñ\82вÑ\83еÑ\82 Ñ\81Ñ\82аÑ\80омÑ\83 Ñ\80ежимÑ\83 доÑ\81Ñ\82Ñ\83па (%o) длÑ\8f %s"
+msgid "unable to parse commit %s"
+msgstr "не Ñ\83далоÑ\81Ñ\8c Ñ\80азобÑ\80аÑ\82Ñ\8c коммиÑ\82 %s"
-#: builtin/apply.c:3792
-#, c-format
-msgid "affected file '%s' is beyond a symbolic link"
-msgstr "затронутый файл «%s» находится за символической ссылкой"
+#: builtin/am.c:1610
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+msgstr "В репозитории отсутствуют двоичные объекты, необходимые для отката к трехходовому слиянию."
-#: builtin/apply.c:3796
-#, c-format
-msgid "%s: patch does not apply"
-msgstr "%s: не удалось применить патч"
+#: builtin/am.c:1612
+msgid "Using index info to reconstruct a base tree..."
+msgstr "Использую индекс для реконструкции базового дерева…"
-#: builtin/apply.c:3810
-#, c-format
-msgid "Checking patch %s..."
-msgstr "Проверка патча %s…"
+#: builtin/am.c:1631
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
+msgstr "Вы вручную изменяли патч?\nОн не накладывается без ошибок на двоичные объекты, записанные в его заголовке."
-#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "сбой make_cache_entry для пути «%s»"
+#: builtin/am.c:1637
+msgid "Falling back to patching base and 3-way merge..."
+msgstr "Откат к применению изменений к базовому коммиту с помощью трехходового слияния…"
+
+#: builtin/am.c:1662
+msgid "Failed to merge in the changes."
+msgstr "Не удалось слить изменения."
+
+#: builtin/am.c:1686 builtin/merge.c:628
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree не удалось записать дерево"
-#: builtin/apply.c:4046
-#, c-format
-msgid "unable to remove %s from index"
-msgstr "не удалось удалить %s из индекса"
+#: builtin/am.c:1693
+msgid "applying to an empty history"
+msgstr "применение к пустой истории"
-#: builtin/apply.c:4075
-#, c-format
-msgid "corrupt patch for submodule %s"
-msgstr "поврежденный патч для подмодуля %s"
+#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798
+#: builtin/merge.c:823
+msgid "failed to write commit object"
+msgstr "сбой записи объекта коммита"
-#: builtin/apply.c:4079
+#: builtin/am.c:1739 builtin/am.c:1743
#, c-format
-msgid "unable to stat newly created file '%s'"
-msgstr "не удалось выполнить stat для созданного файла «%s»"
+msgid "cannot resume: %s does not exist."
+msgstr "нельзя продолжнить: %s не существует "
-#: builtin/apply.c:4084
-#, c-format
-msgid "unable to create backing store for newly created file %s"
-msgstr "не удалось создать вспомогательный файл для созданного файла %s"
+#: builtin/am.c:1759
+msgid "cannot be interactive without stdin connected to a terminal."
+msgstr "не удалось использовать интерактивное поведение, без stdin подключенного к терминалу."
-#: builtin/apply.c:4087 builtin/apply.c:4195
-#, c-format
-msgid "unable to add cache entry for %s"
-msgstr "не удалось создать запись в кэше для %s"
+#: builtin/am.c:1764
+msgid "Commit Body is:"
+msgstr "Тело коммита:"
-#: builtin/apply.c:4120
-#, c-format
-msgid "closing file '%s'"
-msgstr "закрытие файла «%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:1774
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+msgstr "Применить? [y] - да/[n] - нет/[e] - редактировать/[v] - просмотреть патч/[a] - применить всё: "
-#: builtin/apply.c:4169
+#: builtin/am.c:1824
#, c-format
-msgid "unable to write file '%s' mode %o"
-msgstr "не Ñ\83далоÑ\81Ñ\8c запиÑ\81аÑ\82Ñ\8c Ñ\84айл «%s» Ñ\81 Ñ\80ежимом доÑ\81Ñ\82Ñ\83па %o"
+msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgstr "Ð\98ндекÑ\81 не пÑ\83Ñ\81Ñ\82ой: нелÑ\8cзÑ\8f пÑ\80именÑ\8fÑ\82Ñ\8c паÑ\82Ñ\87и (в индекÑ\81е: %s)"
-#: builtin/apply.c:4256
+#: builtin/am.c:1861 builtin/am.c:1933
#, c-format
-msgid "Applied patch %s cleanly."
-msgstr "Патч %s применен без ошибок."
+msgid "Applying: %.*s"
+msgstr "Применение: %.*s"
-#: builtin/apply.c:4264
-msgid "internal error"
-msgstr "внÑ\83Ñ\82Ñ\80еннÑ\8fÑ\8f оÑ\88ибка"
+#: builtin/am.c:1877
+msgid "No changes -- Patch already applied."
+msgstr "Ð\9dеÑ\82 изменений â\80\94 Ð\9fаÑ\82Ñ\87 Ñ\83же пÑ\80именен."
-#: builtin/apply.c:4267
+#: builtin/am.c:1885
#, 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 отказами…"
+msgid "Patch failed at %s %.*s"
+msgstr "Ошибка применения изменений на %s %.*s"
-#: builtin/apply.c:4277
+#: builtin/am.c:1891
#, c-format
-msgid "truncating .rej filename to %.*s.rej"
-msgstr "усечение имени .rej файла до %.*s.rej"
+msgid "The copy of the patch that failed is found in: %s"
+msgstr "Копию изменений, которые не удалось применить, вы можете найти в: %s"
-#: builtin/apply.c:4285
-#, c-format
-msgid "cannot open %s: %s"
-msgstr "не удалось открыть %s: %s"
+#: builtin/am.c:1936
+msgid ""
+"No changes - did you forget to use 'git add'?\n"
+"If there is nothing left to stage, chances are that something else\n"
+"already introduced the same changes; you might want to skip this patch."
+msgstr "Нет изменений — возможно, вы забыли вызвать «git add»?\nЕсли ничего не осталось для индексации, то, скорее всего, что-то другое уже сделало те же изменения; возможно, вам следует пропустить этот патч."
-#: builtin/apply.c:4298
-#, c-format
-msgid "Hunk #%d applied cleanly."
-msgstr "Блок №%d применен без ошибок."
+#: builtin/am.c:1943
+msgid ""
+"You still have unmerged paths in your index.\n"
+"Did you forget to use 'git add'?"
+msgstr "У вас все еще имеются не слитые пути в индексе.\nВозможно, вы забыли вызвать «git add»?"
-#: builtin/apply.c:4301
+#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
+#: builtin/reset.c:316
#, c-format
-msgid "Rejected hunk #%d."
-msgstr "Блок №%d отклонен."
+msgid "Could not parse object '%s'."
+msgstr "Не удалось разобрать объект «%s»."
+
+#: builtin/am.c:2103
+msgid "failed to clean index"
+msgstr "не удалось очистить индекс"
+
+#: builtin/am.c:2137
+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/apply.c:4387
+#: builtin/am.c:2200
#, c-format
-msgid "Skipped patch '%s'."
-msgstr "Ð\9fаÑ\82Ñ\87 «%s» пÑ\80опÑ\83Ñ\89ен."
+msgid "Invalid value for --patch-format: %s"
+msgstr "Ð\9dепÑ\80авилÑ\8cное знаÑ\87ение длÑ\8f --patch-format: %s"
-#: builtin/apply.c:4395
-msgid "unrecognized input"
-msgstr "не распознанный ввод"
+#: builtin/am.c:2233
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+msgstr "git am [<опции>] [(<mbox> | <Maildir>)…]"
-#: builtin/apply.c:4406
-msgid "unable to read index file"
-msgstr "не удалось прочитать файл индекса"
+#: builtin/am.c:2234
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<опции>] (--continue | --skip | --abort)"
-#: builtin/apply.c:4509
-msgid "don't apply changes matching the given path"
-msgstr "не пÑ\80именÑ\8fÑ\82Ñ\8c изменениÑ\8f по Ñ\83казанномÑ\83 пÑ\83Ñ\82и"
+#: builtin/am.c:2240
+msgid "run interactively"
+msgstr "запÑ\83Ñ\81Ñ\82иÑ\82Ñ\8c в инÑ\82еÑ\80акÑ\82ивном Ñ\80ежиме"
-#: builtin/apply.c:4512
-msgid "apply changes matching the given path"
-msgstr "пÑ\80именÑ\8fÑ\82Ñ\8c изменениÑ\8f по Ñ\83казанномÑ\83 пÑ\83Ñ\82и"
+#: builtin/am.c:2242
+msgid "historical option -- no-op"
+msgstr "иÑ\81Ñ\82оÑ\80иÑ\87еÑ\81каÑ\8f опÑ\86иÑ\8f â\80\94 ниÑ\87его не делаеÑ\82"
-#: builtin/apply.c:4515
-msgid "remove <num> leading slashes from traditional diff paths"
-msgstr "Ñ\83далиÑ\82Ñ\8c <колиÑ\87еÑ\81Ñ\82во> ведÑ\83Ñ\89иÑ\85 коÑ\81Ñ\8bÑ\85 Ñ\87еÑ\80Ñ\82 из Ñ\82Ñ\80адиÑ\86ионнÑ\8bÑ\85 пÑ\83Ñ\82ей Ñ\81пиÑ\81ка изменений"
+#: builtin/am.c:2244
+msgid "allow fall back on 3way merging if needed"
+msgstr "Ñ\80азÑ\80еÑ\88иÑ\82Ñ\8c оÑ\82каÑ\82иÑ\82Ñ\8cÑ\81Ñ\8f к Ñ\82Ñ\80еÑ\85Ñ\85одовомÑ\83 Ñ\81лиÑ\8fниÑ\8e, еÑ\81ли нÑ\83жно"
-#: builtin/apply.c:4518
-msgid "ignore additions made by the patch"
-msgstr "игнорировать добавления, сделанные этим патчем"
+#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
+#: builtin/repack.c:172
+msgid "be quiet"
+msgstr "тихий режим"
-#: builtin/apply.c:4520
-msgid "instead of applying the patch, output diffstat for the input"
-msgstr "вмеÑ\81Ñ\82о пÑ\80именениÑ\8f паÑ\82Ñ\87а вÑ\8bвеÑ\81Ñ\82и Ñ\81Ñ\82аÑ\82иÑ\81Ñ\82икÑ\83 добавлений и Ñ\83далений длÑ\8f ввода"
+#: builtin/am.c:2247
+msgid "add a Signed-off-by line to the commit message"
+msgstr "добавиÑ\82Ñ\8c Ñ\81Ñ\82Ñ\80окÑ\83 Signed-off-by к Ñ\81ообÑ\89ениÑ\8e коммиÑ\82а"
-#: builtin/apply.c:4524
-msgid "show number of added and deleted lines in decimal notation"
-msgstr "показаÑ\82Ñ\8c колиÑ\87еÑ\81Ñ\82во добавленнÑ\8bÑ\85 и Ñ\83даленнÑ\8bÑ\85 Ñ\81Ñ\82Ñ\80ок в деÑ\81Ñ\8fÑ\82иÑ\87ном пÑ\80едÑ\81Ñ\82авлении"
+#: builtin/am.c:2250
+msgid "recode into utf8 (default)"
+msgstr "пеÑ\80екодиÑ\80оваÑ\82Ñ\8c в utf8 (по Ñ\83молÑ\87аниÑ\8e)"
-#: builtin/apply.c:4526
-msgid "instead of applying the patch, output a summary for the input"
-msgstr "вмеÑ\81Ñ\82о пÑ\80именениÑ\8f паÑ\82Ñ\87а вÑ\8bвеÑ\81Ñ\82и Ñ\81Ñ\82аÑ\82иÑ\81Ñ\82икÑ\83 изменений длÑ\8f ввода"
+#: builtin/am.c:2252
+msgid "pass -k flag to git-mailinfo"
+msgstr "пеÑ\80едаÑ\82Ñ\8c Ñ\84лаг -k в git-mailinfo"
-#: builtin/apply.c:4528
-msgid "instead of applying the patch, see if the patch is applicable"
-msgstr "вмеÑ\81Ñ\82о пÑ\80именениÑ\8f паÑ\82Ñ\87а пÑ\80овеÑ\80иÑ\82Ñ\8c подÑ\85одиÑ\82 ли он"
+#: builtin/am.c:2254
+msgid "pass -b flag to git-mailinfo"
+msgstr "пеÑ\80едаÑ\82Ñ\8c Ñ\84лаг -b в git-mailinfo"
-#: builtin/apply.c:4530
-msgid "make sure the patch is applicable to the current index"
-msgstr "проверить, что патч применяется к текущему индексу"
+#: builtin/am.c:2256
+msgid "pass -m flag to git-mailinfo"
+msgstr "передать флаг -m в git-mailinfo"
-#: builtin/apply.c:4532
-msgid "apply a patch without touching the working tree"
-msgstr "применить патч, не изменяя рабочий каталог"
+#: builtin/am.c:2258
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+msgstr "передать флаг --keep-cr в git-mailsplit для формата mbox"
-#: builtin/apply.c:4534
-msgid "accept a patch that touches outside the working area"
-msgstr "пÑ\80инÑ\8fÑ\82Ñ\8c паÑ\82Ñ\87, коÑ\82оÑ\80Ñ\8bй заÑ\82Ñ\80агиваеÑ\82 Ñ\84айлÑ\8b за Ñ\80абоÑ\87им каÑ\82алогом"
+#: builtin/am.c:2261
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+msgstr "не пеÑ\80едаваÑ\82Ñ\8c --keep-cr Ñ\84лаг в git-mailsplit вне завиÑ\81имоÑ\81Ñ\82и оÑ\82 am.keepcr"
-#: builtin/apply.c:4536
-msgid "also apply the patch (use with --stat/--summary/--check)"
-msgstr "а Ñ\82акже пÑ\80имениÑ\82Ñ\8c паÑ\82Ñ\87 (иÑ\81полÑ\8cзÑ\83йÑ\82е Ñ\81 --stat/--summary/--check)"
+#: builtin/am.c:2264
+msgid "strip everything before a scissors line"
+msgstr "обÑ\80езаÑ\82Ñ\8c вÑ\81е до Ñ\81Ñ\82Ñ\80оки обÑ\80езки"
-#: builtin/apply.c:4538
-msgid "attempt three-way merge if a patch does not apply"
-msgstr "попытаться сделать трехходовое слияние, если патч не применяется"
+#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
+#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
+#: builtin/am.c:2293
+msgid "pass it through git-apply"
+msgstr "передать его в git-apply"
-#: builtin/apply.c:4540
-msgid "build a temporary index based on embedded index information"
-msgstr "построить временный индекс, основанный на встроенной информации об индексе"
+#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
+#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135
+#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185
+#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
+msgid "n"
+msgstr "n"
-#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425
-msgid "paths are separated with NUL character"
-msgstr "пути, отделённые НУЛЕВЫМ символом"
+#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/tag.c:372
+msgid "format"
+msgstr "формат"
-#: builtin/apply.c:4545
-msgid "ensure at least <n> lines of context match"
-msgstr "Ñ\83доÑ\81Ñ\82овеÑ\80иÑ\82Ñ\8cÑ\81Ñ\8f, Ñ\87Ñ\82о по кÑ\80айней меÑ\80е <n> Ñ\81Ñ\82Ñ\80ок конÑ\82екÑ\81Ñ\82а Ñ\81овпадаÑ\8eÑ\82"
+#: builtin/am.c:2290
+msgid "format the patch(es) are in"
+msgstr "Ñ\84оÑ\80маÑ\82, в коÑ\82оÑ\80ом наÑ\85одÑ\8fÑ\82Ñ\81Ñ\8f паÑ\82Ñ\87и"
-#: builtin/apply.c:4547
-msgid "detect new or modified lines that have whitespace errors"
-msgstr "опÑ\80еделÑ\8fÑ\82Ñ\8c новÑ\8bе или модиÑ\84иÑ\86иÑ\80ованнÑ\8bе Ñ\81Ñ\82Ñ\80оки, Ñ\83 коÑ\82оÑ\80Ñ\8bÑ\85 еÑ\81Ñ\82Ñ\8c оÑ\88ибки в пÑ\80обелÑ\8cнÑ\8bÑ\85 Ñ\81имволаÑ\85"
+#: builtin/am.c:2296
+msgid "override error message when patch failure occurs"
+msgstr "пеÑ\80еопÑ\80еделиÑ\82Ñ\8c Ñ\81ообÑ\89ение об оÑ\88ибке, еÑ\81ли не Ñ\83далоÑ\81Ñ\8c наложиÑ\82Ñ\8c изменениÑ\8f"
-#: builtin/apply.c:4550 builtin/apply.c:4553
-msgid "ignore changes in whitespace when finding context"
-msgstr "игноÑ\80иÑ\80оваÑ\82Ñ\8c изменениÑ\8f в пÑ\80обелÑ\8cнÑ\8bÑ\85 Ñ\81имволаÑ\85 пÑ\80и поиÑ\81ке конÑ\82екÑ\81та"
+#: builtin/am.c:2298
+msgid "continue applying patches after resolving a conflict"
+msgstr "пÑ\80одолжиÑ\82Ñ\8c пÑ\80именение изменений поÑ\81ле Ñ\80азÑ\80еÑ\88ениÑ\8f конÑ\84иликта"
-#: builtin/apply.c:4556
-msgid "apply the patch in reverse"
-msgstr "применить патч с обращением изменений"
+#: builtin/am.c:2301
+msgid "synonyms for --continue"
+msgstr "синоним для --continue"
-#: builtin/apply.c:4558
-msgid "don't expect at least one line of context"
-msgstr "не ожидаÑ\82Ñ\8c как минимÑ\83м одной Ñ\81Ñ\82Ñ\80оки конÑ\82екÑ\81Ñ\82а"
+#: builtin/am.c:2304
+msgid "skip the current patch"
+msgstr "пÑ\80опÑ\83Ñ\81Ñ\82иÑ\82Ñ\8c Ñ\82екÑ\83Ñ\89ий паÑ\82Ñ\87"
-#: builtin/apply.c:4560
-msgid "leave the rejected hunks in corresponding *.rej files"
-msgstr "оÑ\81Ñ\82авиÑ\82Ñ\8c оÑ\82клоненнÑ\8bе блоки изменений в Ñ\81ооÑ\82веÑ\82Ñ\81Ñ\82вÑ\83Ñ\8eÑ\89иÑ\85 *.rej Ñ\84айлаÑ\85"
+#: builtin/am.c:2307
+msgid "restore the original branch and abort the patching operation."
+msgstr "воÑ\81Ñ\81Ñ\82ановиÑ\82Ñ\8c оÑ\80игиналÑ\8cнÑ\83Ñ\8e веÑ\82кÑ\83 и оÑ\82мениÑ\82Ñ\8c опеÑ\80аÑ\86иÑ\8e пÑ\80именениÑ\8f изменений."
-#: builtin/apply.c:4562
-msgid "allow overlapping hunks"
-msgstr "Ñ\80азÑ\80еÑ\88иÑ\82Ñ\8c пеÑ\80екÑ\80Ñ\8bваÑ\8eÑ\89иеÑ\81Ñ\8f блоки изменений"
+#: builtin/am.c:2311
+msgid "lie about committer date"
+msgstr "Ñ\81овÑ\80аÑ\82Ñ\8c о даÑ\82е коммиÑ\82еÑ\80а"
-#: builtin/apply.c:4565
-msgid "tolerate incorrectly detected missing new-line at the end of file"
-msgstr "разрешить некорректно определенные пропущенные пустые строки в конце файла"
+#: builtin/am.c:2313
+msgid "use current timestamp for author date"
+msgstr "использовать текущее время как время авторства"
-#: builtin/apply.c:4568
-msgid "do not trust the line counts in the hunk headers"
-msgstr "не доверять количеству строк из заголовка блока изменений"
+#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229
+#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355
+msgid "key-id"
+msgstr "key-id"
-#: builtin/apply.c:4571
-msgid "prepend <root> to all filenames"
-msgstr "добавиÑ\82Ñ\8c <коÑ\80енÑ\8c> Ñ\81пеÑ\80еди ко вÑ\81ем именам Ñ\84айлов"
+#: builtin/am.c:2316
+msgid "GPG-sign commits"
+msgstr "подпиÑ\81аÑ\82Ñ\8c коммиÑ\82Ñ\8b Ñ\81 помоÑ\89Ñ\8cÑ\8e GPG"
-#: builtin/apply.c:4593
-msgid "--3way outside a repository"
-msgstr "--3way вне репозитория"
+#: builtin/am.c:2319
+msgid "(internal use for git-rebase)"
+msgstr "(внутреннее использование для git-rebase)"
-#: builtin/apply.c:4601
-msgid "--index outside a repository"
-msgstr "--index вне репозитория"
+#: builtin/am.c:2334
+msgid ""
+"The -b/--binary option has been a no-op for long time, and\n"
+"it will be removed. Please do not use it anymore."
+msgstr "Опция -b/--binary уже долгое время ничего не делает и будет удалена с следующих версиях Git. Пожалуйста, не используйте ее."
-#: builtin/apply.c:4604
-msgid "--cached outside a repository"
-msgstr "--cached вне репозитория"
+#: builtin/am.c:2341
+msgid "failed to read the index"
+msgstr "сбой чтения индекса"
-#: builtin/apply.c:4623
+#: builtin/am.c:2356
#, c-format
-msgid "can't open patch '%s'"
-msgstr "не Ñ\83далоÑ\81Ñ\8c оÑ\82кÑ\80Ñ\8bÑ\82Ñ\8c паÑ\82Ñ\87 «%s»"
+msgid "previous rebase directory %s still exists but mbox given."
+msgstr "пÑ\80едÑ\8bдÑ\83Ñ\89ий каÑ\82алог пеÑ\80емеÑ\89ениÑ\8f %s еÑ\89е Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83еÑ\82, но пеÑ\80едан mbox."
-#: builtin/apply.c:4637
+#: builtin/am.c:2380
#, c-format
-msgid "squelched %d whitespace error"
-msgid_plural "squelched %d whitespace errors"
-msgstr[0] "пропущена %d ошибка в пробельных символах"
-msgstr[1] "пропущено %d ошибки в пробельных символах"
-msgstr[2] "пропущено %d ошибок в пробельных символах"
-msgstr[3] "пропущено %d ошибок в пробельных символах"
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
+msgstr "Найден забытый каталог %s.\nИспользуйте «git am --abort», чтобы удалить его."
-#: builtin/apply.c:4643 builtin/apply.c:4653
-#, c-format
-msgid "%d line adds whitespace errors."
-msgid_plural "%d lines add whitespace errors."
-msgstr[0] "%d строка добавила ошибки в пробельных символах."
-msgstr[1] "%d строки добавили ошибки в пробельных символах."
-msgstr[2] "%d строк добавили ошибки в пробельных символах."
-msgstr[3] "%d строк добавили ошибки в пробельных символах."
+#: builtin/am.c:2386
+msgid "Resolve operation not in progress, we are not resuming."
+msgstr "Операция разрешения конфликтов не в процессе выполнения, не продолжаем."
+
+#: builtin/apply.c:8
+msgid "git apply [<options>] [<patch>...]"
+msgstr "git apply [<опции>] [<патч>…]"
#: builtin/archive.c:17
#, c-format
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<опции-rev-list> документированы в git-rev-list(1)"
-#: builtin/blame.c:1782
+#: builtin/blame.c:1781
msgid "Blaming lines"
msgstr "Просмотр авторов строк"
-#: builtin/blame.c:2531
+#: builtin/blame.c:2577
msgid "Show blame entries as we find them, incrementally"
msgstr "Показать записи авторства постепенно, в процессе нахождения"
-#: builtin/blame.c:2532
+#: builtin/blame.c:2578
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "Не показывать SHA-1 для коммитов, не входящих в границы запроса (По умолчанию: отключено)"
-#: builtin/blame.c:2533
+#: builtin/blame.c:2579
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Не воспринимать корневые коммиты как граничные (По умолчанию: отключено)"
-#: builtin/blame.c:2534
+#: builtin/blame.c:2580
msgid "Show work cost statistics"
msgstr "Показать статистику расходов на выполнение запроса"
-#: builtin/blame.c:2535
+#: builtin/blame.c:2581
msgid "Force progress reporting"
msgstr "Принудительно выводить прогресс выполнения"
-#: builtin/blame.c:2536
+#: builtin/blame.c:2582
msgid "Show output score for blame entries"
msgstr "Показать оценку для записей авторства"
-#: builtin/blame.c:2537
+#: builtin/blame.c:2583
msgid "Show original filename (Default: auto)"
msgstr "Показать оригинальное имя файла (По умолчанию: автоматически)"
-#: builtin/blame.c:2538
+#: builtin/blame.c:2584
msgid "Show original linenumber (Default: off)"
msgstr "Показать оригинальные номера строк (По умолчанию: отключено)"
-#: builtin/blame.c:2539
+#: builtin/blame.c:2585
msgid "Show in a format designed for machine consumption"
msgstr "Показать в формате для программного разбора"
-#: builtin/blame.c:2540
+#: builtin/blame.c:2586
msgid "Show porcelain format with per-line commit information"
msgstr "Показать в машиночитаемом формате, с построчной информацией о коммите"
-#: builtin/blame.c:2541
+#: builtin/blame.c:2587
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "Использовать такой же формат вывода, как и git-annotate (По умолчанию: отключено)"
-#: builtin/blame.c:2542
+#: builtin/blame.c:2588
msgid "Show raw timestamp (Default: off)"
msgstr "Показать необработанные временные метки (По умолчанию: отключено)"
-#: builtin/blame.c:2543
+#: builtin/blame.c:2589
msgid "Show long commit SHA1 (Default: off)"
msgstr "Показать длинный SHA1 идентификатор коммита (По умолчанию: отключено)"
-#: builtin/blame.c:2544
+#: builtin/blame.c:2590
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Не показывать имя автора и временные метки (По умолчанию: отключено)"
-#: builtin/blame.c:2545
+#: builtin/blame.c:2591
msgid "Show author email instead of name (Default: off)"
msgstr "Показать почту автора вместо имени (По умолчанию: отключено)"
-#: builtin/blame.c:2546
+#: builtin/blame.c:2592
msgid "Ignore whitespace differences"
msgstr "Игнорировать различия в пробелах"
-#: builtin/blame.c:2547
+#: builtin/blame.c:2599
+msgid "Use an experimental indent-based heuristic to improve diffs"
+msgstr "Использовать эксперементальную эвристику, основанную на отступах, чтобы улучшить файлы различий"
+
+#: builtin/blame.c:2600
+msgid "Use an experimental blank-line-based heuristic to improve diffs"
+msgstr "Использовать эксперементальную эвристику, основанную на пустых строках, чтобы улучшить файлы различий"
+
+#: builtin/blame.c:2602
msgid "Spend extra cycles to find better match"
msgstr "Потратить больше времени, для нахождения лучших совпадений"
-#: builtin/blame.c:2548
+#: builtin/blame.c:2603
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Использовать редакции из <файла> вместо вызова git-rev-list"
-#: builtin/blame.c:2549
+#: builtin/blame.c:2604
msgid "Use <file>'s contents as the final image"
msgstr "Использовать содержимое <файла> как финальный снимок"
-#: builtin/blame.c:2550 builtin/blame.c:2551
+#: builtin/blame.c:2605 builtin/blame.c:2606
msgid "score"
msgstr "мин-длина"
-#: builtin/blame.c:2550
+#: builtin/blame.c:2605
msgid "Find line copies within and across files"
msgstr "Найти копирование строк в пределах и между файлами"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2606
msgid "Find line movements within and across files"
msgstr "Найти перемещения строк в пределах и между файлами"
-#: builtin/blame.c:2552
+#: builtin/blame.c:2607
msgid "n,m"
msgstr "начало,конец"
-#: builtin/blame.c:2552
+#: builtin/blame.c:2607
msgid "Process only line range n,m, counting from 1"
msgstr "Обработать только строки в диапазоне начало,конец, начиная с 1"
+#: builtin/blame.c:2654
+msgid "--progress can't be used with --incremental or porcelain formats"
+msgstr "--progress нельзя использовать одновременно с --incremental или машиночитаемым (porcelain) форматом"
+
#. 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:2641
+#: builtin/blame.c:2700
msgid "4 years, 11 months ago"
msgstr "4 года и 11 месяцев назад"
+#: builtin/blame.c:2780
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents и --reverse не очень сочетаются."
+
+#: builtin/blame.c:2800
+msgid "cannot use --contents with final commit object name"
+msgstr "нельзя использовать --contents с указанием финального имени объекта"
+
+#: builtin/blame.c:2805
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr "при --reverse и --first-parent вместе нужно указывать конкретный последний коммит"
+
+#: builtin/blame.c:2832
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
+msgstr "при указании --reverse и --first-parent вместе, требуется также указать диапазон по цепочке первого родителя"
+
+#: builtin/blame.c:2843
+#, c-format
+msgid "no such path %s in %s"
+msgstr "нет такого пути %s в %s"
+
+#: builtin/blame.c:2854
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "невозможно прочитать объект %s для пути %s"
+
+#: builtin/blame.c:2873
+#, 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 строки"
+msgstr[2] "файл %s содержит только %lu строк"
+msgstr[3] "файл %s содержит только %lu строки"
+
#: builtin/branch.c:26
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<опции>] [-r | -a] [--merged | --no-merged]"
msgid "Deleted branch %s (was %s).\n"
msgstr "Ветка %s удалена (была %s).\n"
-#: builtin/branch.c:309
+#: builtin/branch.c:312
#, c-format
msgid "[%s: gone]"
msgstr "[%s: пропал]"
-#: builtin/branch.c:314
+#: builtin/branch.c:317
#, c-format
msgid "[%s]"
msgstr "[%s]"
-#: builtin/branch.c:319
+#: builtin/branch.c:322
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s: позади %d]"
-#: builtin/branch.c:321
+#: builtin/branch.c:324
#, c-format
msgid "[behind %d]"
msgstr "[позади %d]"
-#: builtin/branch.c:325
+#: builtin/branch.c:328
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s: впереди %d]"
-#: builtin/branch.c:327
+#: builtin/branch.c:330
#, c-format
msgid "[ahead %d]"
msgstr "[впереди %d]"
-#: builtin/branch.c:330
+#: builtin/branch.c:333
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s: впереди %d, позади %d]"
-#: builtin/branch.c:333
+#: builtin/branch.c:336
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[впереди %d, позади %d]"
-#: builtin/branch.c:346
+#: builtin/branch.c:349
msgid " **** invalid ref ****"
msgstr " **** недействительная ссылка ****"
-#: builtin/branch.c:372
+#: builtin/branch.c:375
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(нет ветки, перемещение %s)"
-#: builtin/branch.c:375
+#: builtin/branch.c:378
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(нет ветки, двоичный поиск начат на %s)"
#. TRANSLATORS: make sure this matches
#. "HEAD detached at " in wt-status.c
-#: builtin/branch.c:381
+#: builtin/branch.c:384
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD отделён на %s)"
#. TRANSLATORS: make sure this matches
#. "HEAD detached from " in wt-status.c
-#: builtin/branch.c:386
+#: builtin/branch.c:389
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD отделён начиная с %s)"
-#: builtin/branch.c:390
+#: builtin/branch.c:393
msgid "(no branch)"
msgstr "(нет ветки)"
-#: builtin/branch.c:541
+#: builtin/branch.c:544
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Производится перемещение ветки %s на %s"
-#: builtin/branch.c:545
+#: builtin/branch.c:548
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Производится двоичный поиск в ветке %s на %s"
-#: builtin/branch.c:560
+#: builtin/branch.c:563
msgid "cannot rename the current branch while not on any."
msgstr "невозможно переименовать текущую ветку, если вы не находитесь ни на одной из них."
-#: builtin/branch.c:570
+#: builtin/branch.c:573
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Недействительное имя ветки: «%s»"
-#: builtin/branch.c:587
+#: builtin/branch.c:590
msgid "Branch rename failed"
msgstr "Сбой переименования ветки"
-#: builtin/branch.c:591
+#: builtin/branch.c:594
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Переименована неправильно названная ветка «%s»"
-#: builtin/branch.c:594
+#: builtin/branch.c:597
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Ветка переименована в %s, но HEAD не обновлен!"
-#: builtin/branch.c:601
+#: builtin/branch.c:604
msgid "Branch is renamed, but update of config-file failed"
msgstr "Ветка переименована, но произошел сбой обновления файла конфигурации"
-#: builtin/branch.c:623
-msgid "could not write branch description template"
-msgstr "не удалось записать шаблон описания ветки"
+#: builtin/branch.c:620
+#, 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"
#: builtin/branch.c:651
msgid "Generic options"
msgid "change the upstream info"
msgstr "изменить информацию о вышестоящей ветке"
+#: builtin/branch.c:660
+msgid "Unset the upstream info"
+msgstr "Убрать информацию о вышестоящей ветке"
+
#: builtin/branch.c:661
msgid "use colored output"
msgstr "использовать цветной вывод"
msgid "field name to sort on"
msgstr "имя поля, по которому выполнить сортировку"
-#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401
-#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404
+#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570
#: builtin/tag.c:369
msgid "object"
msgstr "объект"
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Не удалось определить HEAD как действительную ссылку."
-#: builtin/branch.c:709 builtin/clone.c:707
+#: builtin/branch.c:709 builtin/clone.c:706
msgid "HEAD not found below refs/heads!"
msgstr "HEAD не найден в refs/heads!"
msgid "Need a repository to unbundle."
msgstr "Требуется репозиторий для распаковки."
-#: builtin/cat-file.c:428
+#: builtin/cat-file.c:513
msgid ""
-"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-"
-"type]|-e|-p|<type>|--textconv) <object>"
-msgstr "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<тип>|--textconv) <объект>"
+"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=<путь>] <объект>"
-#: builtin/cat-file.c:429
-msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
-msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
+#: builtin/cat-file.c:514
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | "
+"--filters]"
+msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]"
-#: builtin/cat-file.c:466
+#: builtin/cat-file.c:551
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<тип> может быть одним из: blob, tree, commit, tag"
-#: builtin/cat-file.c:467
+#: builtin/cat-file.c:552
msgid "show object type"
msgstr "показать тип объекта"
-#: builtin/cat-file.c:468
+#: builtin/cat-file.c:553
msgid "show object size"
msgstr "показать размер объекта"
-#: builtin/cat-file.c:470
+#: builtin/cat-file.c:555
msgid "exit with zero when there's no error"
msgstr "выйти с нулевым кодом возврата, если нет ошибки"
-#: builtin/cat-file.c:471
+#: builtin/cat-file.c:556
msgid "pretty-print object's content"
msgstr "структурированный вывод содержимого объекта"
-#: builtin/cat-file.c:473
+#: builtin/cat-file.c:558
msgid "for blob objects, run textconv on object's content"
msgstr "запустить texconv на содержимом двоичных объектов "
-#: builtin/cat-file.c:475
+#: builtin/cat-file.c:560
+msgid "for blob objects, run filters on object's content"
+msgstr "запуск фильтров на содержимом двоичных объектов "
+
+#: builtin/cat-file.c:561 git-submodule.sh:923
+msgid "blob"
+msgstr "двоичный объект"
+
+#: builtin/cat-file.c:562
+msgid "use a specific path for --textconv/--filters"
+msgstr "использовать определенный путь для --textconv/--filters"
+
+#: builtin/cat-file.c:564
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "разрешить -s и -t работать с повреждёнными объектами"
-#: builtin/cat-file.c:476
+#: builtin/cat-file.c:565
msgid "buffer --batch output"
msgstr "буфферировать вывод --batch"
-#: builtin/cat-file.c:478
+#: builtin/cat-file.c:567
msgid "show info and content of objects fed from the standard input"
msgstr "показать информацию и содержимое объектов, переданных из стандартного ввода"
-#: builtin/cat-file.c:481
+#: builtin/cat-file.c:570
msgid "show info about objects fed from the standard input"
msgstr "показать информацию об объектах, переданных из стандартного ввода"
-#: builtin/cat-file.c:484
+#: builtin/cat-file.c:573
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr "переходить по символьным ссылкам внутри дерева (используется с опциями --batch и --batch-check)"
-#: builtin/cat-file.c:486
+#: builtin/cat-file.c:575
msgid "show all objects with --batch or --batch-check"
msgstr "показать все объекты с опциями --batch или --batch-check"
msgid "use .gitattributes only from the index"
msgstr "использовать только .gitattributes из индекса"
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97
+#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
msgid "read file names from stdin"
msgstr "прочитать имена файлов из стандартного ввода"
msgid "terminate input and output records by a NUL character"
msgstr "окончание ввода и вывода записей по НУЛЕВОМУ символу"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "не выводить прогресс выполнения"
msgstr "записать содержимое во временные файлы"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494
-#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500
-#: builtin/submodule--helper.c:774
+#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598
+#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951
+#: builtin/worktree.c:469
msgid "string"
msgstr "строка"
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "Нельзя обновлять пути и переключаться на ветку «%s» одновременно."
-#: builtin/checkout.c:279 builtin/checkout.c:473
-msgid "corrupt index file"
-msgstr "файл индекса поврежден"
-
#: builtin/checkout.c:339 builtin/checkout.c:346
#, c-format
msgid "path '%s' is unmerged"
msgstr "путь «%s» не слит"
-#: builtin/checkout.c:495
+#: builtin/checkout.c:494
msgid "you need to resolve your current index first"
msgstr "сначала нужно разрешить конфликты в вашем текущем индексе"
-#: builtin/checkout.c:622
+#: builtin/checkout.c:624
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Не удалось создать журнал ссылок для «%s»: %s\n"
-#: builtin/checkout.c:660
+#: builtin/checkout.c:663
msgid "HEAD is now at"
msgstr "HEAD сейчас на"
-#: builtin/checkout.c:664 builtin/clone.c:661
+#: builtin/checkout.c:667 builtin/clone.c:660
msgid "unable to update HEAD"
msgstr "не удалось обновить HEAD"
-#: builtin/checkout.c:668
+#: builtin/checkout.c:671
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Сброс ветки «%s»\n"
-#: builtin/checkout.c:671
+#: builtin/checkout.c:674
#, c-format
msgid "Already on '%s'\n"
msgstr "Уже на «%s»\n"
-#: builtin/checkout.c:675
+#: builtin/checkout.c:678
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Переключение и сброс ветки «%s»\n"
-#: builtin/checkout.c:677 builtin/checkout.c:1067
+#: builtin/checkout.c:680 builtin/checkout.c:1069
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Переключено на новую ветку «%s»\n"
-#: builtin/checkout.c:679
+#: builtin/checkout.c:682
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Переключено на ветку «%s»\n"
-#: builtin/checkout.c:731
+#: builtin/checkout.c:733
#, c-format
msgid " ... and %d more.\n"
msgstr " … и еще %d.\n"
-#: builtin/checkout.c:737
+#: builtin/checkout.c:739
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
msgstr[2] "Предупреждение: вы оставляете позади %d коммитов не соединенные ни с одной из ваших веток:\n\n%s\n"
msgstr[3] "Предупреждение: вы оставляете позади %d коммитов не соединенные ни с одной из ваших веток:\n\n%s\n"
-#: builtin/checkout.c:756
+#: builtin/checkout.c:758
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
msgstr[2] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n"
msgstr[3] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n"
-#: builtin/checkout.c:792
+#: builtin/checkout.c:794
msgid "internal error in revision walk"
msgstr "внутренняя ошибка при хождении по редакциям"
-#: builtin/checkout.c:796
+#: builtin/checkout.c:798
msgid "Previous HEAD position was"
msgstr "Предыдущая позиция HEAD была"
-#: builtin/checkout.c:823 builtin/checkout.c:1062
+#: builtin/checkout.c:825 builtin/checkout.c:1064
msgid "You are on a branch yet to be born"
msgstr "Вы находитесь на еще не созданной ветке"
-#: builtin/checkout.c:968
+#: builtin/checkout.c:970
#, c-format
msgid "only one reference expected, %d given."
msgstr "ожидается только одна ссылка, а передано %d."
-#: builtin/checkout.c:1008 builtin/worktree.c:212
+#: builtin/checkout.c:1010 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr "неправильная ссылка: %s"
-#: builtin/checkout.c:1037
+#: builtin/checkout.c:1039
#, c-format
msgid "reference is not a tree: %s"
msgstr "в дереве нет такой ссылки: %s"
-#: builtin/checkout.c:1076
+#: builtin/checkout.c:1078
msgid "paths cannot be used with switching branches"
msgstr "нельзя использовать пути при переключении веток"
-#: builtin/checkout.c:1079 builtin/checkout.c:1083
+#: builtin/checkout.c:1081 builtin/checkout.c:1085
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "нельзя использовать «%s» при переключении веток"
-#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095
-#: builtin/checkout.c:1098
+#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097
+#: builtin/checkout.c:1100
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "«%s» нельзя использовать одновременно с «%s»"
-#: builtin/checkout.c:1103
+#: builtin/checkout.c:1105
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Нельзя переключить ветку на не коммит «%s»"
-#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323
-#: builtin/worktree.c:325
+#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
+#: builtin/worktree.c:326
msgid "branch"
msgstr "ветка"
-#: builtin/checkout.c:1137
+#: builtin/checkout.c:1139
msgid "create and checkout a new branch"
msgstr "создать и переключиться на новую ветку"
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1141
msgid "create/reset and checkout a branch"
msgstr "создать/сбросить и перключиться на новую ветку"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1142
msgid "create reflog for new branch"
msgstr "создать журнал ссылок для новой ветки"
-#: builtin/checkout.c:1141
-msgid "detach the HEAD at named commit"
+#: builtin/checkout.c:1143 builtin/worktree.c:328
+msgid "detach HEAD at named commit"
msgstr "отсоединить HEAD на указанном коммите"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1144
msgid "set upstream info for new branch"
msgstr "установить информацию о вышестоящей ветке для новой ветки"
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1146
msgid "new-branch"
msgstr "новая-ветка"
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1146
msgid "new unparented branch"
msgstr "новая ветка без родителей"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1147
msgid "checkout our version for unmerged files"
msgstr "переключиться на нашу версию для не слитых файлов"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1149
msgid "checkout their version for unmerged files"
msgstr "переключиться на их версию для не слитых файлов"
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1151
msgid "force checkout (throw away local modifications)"
msgstr "принудительное переключение на состояние (отбрасывает все локальные изменения)"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1152
msgid "perform a 3-way merge with the new branch"
msgstr "выполнить трехходовое слияние с новой веткой"
-#: builtin/checkout.c:1151 builtin/merge.c:230
+#: builtin/checkout.c:1153 builtin/merge.c:231
msgid "update ignored files (default)"
msgstr "обновить игнорируемые файлы (по умолчанию)"
-#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250
+#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251
msgid "style"
msgstr "стиль"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1155
msgid "conflict style (merge or diff3)"
msgstr "стиль конфликтов слияния (merge или diff3)"
-#: builtin/checkout.c:1156
+#: builtin/checkout.c:1158
msgid "do not limit pathspecs to sparse entries only"
msgstr "не ограничивать спецификаторы пути только частичными записями"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1160
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "пересмотр «git checkout <нет-такой-ветки>»"
-#: builtin/checkout.c:1160
+#: builtin/checkout.c:1162
msgid "do not check if another worktree is holding the given ref"
msgstr "не проверять, что другое дерево уже содержит указанную ссылку"
-#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116
-#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526
+#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119
+#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "принудительно выводить прогресс"
-#: builtin/checkout.c:1192
+#: builtin/checkout.c:1194
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B и --orphan нельзя использовать одновременно"
-#: builtin/checkout.c:1209
+#: builtin/checkout.c:1211
msgid "--track needs a branch name"
msgstr "--track требует имя ветки"
-#: builtin/checkout.c:1214
+#: builtin/checkout.c:1216
msgid "Missing branch name; try -b"
msgstr "Пропущено имя ветки; попробуйте -b"
-#: builtin/checkout.c:1250
+#: builtin/checkout.c:1252
msgid "invalid path specification"
msgstr "неправильная спецификация пути"
-#: builtin/checkout.c:1257
+#: builtin/checkout.c:1259
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
"Did you intend to checkout '%s' which can not be resolved as commit?"
msgstr "Нельзя обновить пути и одновременно переключиться на ветку «%s».\nВы хотели переключиться на «%s», что не может быть определено как коммит?"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1264
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach не принимает путь «%s» как аргумент"
-#: builtin/checkout.c:1266
+#: builtin/checkout.c:1268
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgid "remove whole directories"
msgstr "удалить каталоги полностью"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
-#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725
+#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182
msgid "pattern"
msgstr "шаблон"
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<опции>] [--] <репозиторий> [<каталог>]"
-#: builtin/clone.c:62
+#: builtin/clone.c:65
msgid "don't create a checkout"
msgstr "не переключать рабочую копию на HEAD"
-#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473
+#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
msgid "create a bare repository"
msgstr "создать голый репозиторий"
-#: builtin/clone.c:67
+#: builtin/clone.c:70
msgid "create a mirror repository (implies bare)"
msgstr "создать зеркало репозитория (включает в себя и параметр bare)"
-#: builtin/clone.c:69
+#: builtin/clone.c:72
msgid "to clone from a local repository"
msgstr "для клонирования из локального репозитория"
-#: builtin/clone.c:71
+#: builtin/clone.c:74
msgid "don't use local hardlinks, always copy"
msgstr "не использовать жесткие ссылки, всегда копировать файлы"
-#: builtin/clone.c:73
+#: builtin/clone.c:76
msgid "setup as shared repository"
msgstr "настроить как общедоступный репозиторий"
-#: builtin/clone.c:75 builtin/clone.c:77
+#: builtin/clone.c:78 builtin/clone.c:80
msgid "initialize submodules in the clone"
msgstr "инициализировать подмодули в клоне"
-#: builtin/clone.c:79
+#: builtin/clone.c:82
msgid "number of submodules cloned in parallel"
msgstr "количество подмодулей, которые будут клонированы парралельно"
-#: builtin/clone.c:80 builtin/init-db.c:470
+#: builtin/clone.c:83 builtin/init-db.c:475
msgid "template-directory"
msgstr "каталог-шаблонов"
-#: builtin/clone.c:81 builtin/init-db.c:471
+#: builtin/clone.c:84 builtin/init-db.c:476
msgid "directory from which templates will be used"
msgstr "каталог, шаблоны из которого будут использованы"
-#: builtin/clone.c:83 builtin/submodule--helper.c:498
-#: builtin/submodule--helper.c:777
+#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602
+#: builtin/submodule--helper.c:954
msgid "reference repository"
msgstr "ссылаемый репозиторий"
-#: builtin/clone.c:85
+#: builtin/clone.c:90
msgid "use --reference only while cloning"
msgstr "используйте --reference только при клонировании"
-#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr "имя"
-#: builtin/clone.c:87
+#: builtin/clone.c:92
msgid "use <name> instead of 'origin' to track upstream"
msgstr "использовать <имя> вместо «origin» для отслеживания вышестоящего репозитория"
-#: builtin/clone.c:89
+#: builtin/clone.c:94
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "переключиться на <ветку>, вместо HEAD внешнего репозитория"
-#: builtin/clone.c:91
+#: builtin/clone.c:96
msgid "path to git-upload-pack on the remote"
msgstr "путь к git-upload-pack на внешнем репозитории"
-#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667
-#: builtin/pull.c:201
+#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668
+#: builtin/pull.c:202
msgid "depth"
msgstr "глубина"
-#: builtin/clone.c:93
+#: builtin/clone.c:98
msgid "create a shallow clone of that depth"
msgstr "сделать частичный клон указанной глубины"
-#: builtin/clone.c:95
+#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848
+#: parse-options.h:142
+msgid "time"
+msgstr "время"
+
+#: builtin/clone.c:100
+msgid "create a shallow clone since a specific time"
+msgstr "сделать частичный клон до определенного времени"
+
+#: builtin/clone.c:101 builtin/fetch.c:124
+msgid "revision"
+msgstr "редакция"
+
+#: builtin/clone.c:102 builtin/fetch.c:125
+msgid "deepen history of shallow clone by excluding rev"
+msgstr "углубить историю частичного клона исключая редакцию"
+
+#: builtin/clone.c:104
msgid "clone only one branch, HEAD or --branch"
msgstr "клонировать только одну ветку, HEAD или --branch"
-#: builtin/clone.c:97
+#: builtin/clone.c:106
msgid "any cloned submodules will be shallow"
msgstr "все склонированные подмодули будут частичными клонами"
-#: builtin/clone.c:98 builtin/init-db.c:479
+#: builtin/clone.c:107 builtin/init-db.c:484
msgid "gitdir"
msgstr "каталог-git"
-#: builtin/clone.c:99 builtin/init-db.c:480
+#: builtin/clone.c:108 builtin/init-db.c:485
msgid "separate git dir from working tree"
msgstr "разместить каталог git отдельно от рабочей копии"
-#: builtin/clone.c:100
+#: builtin/clone.c:109
msgid "key=value"
msgstr "ключ=значение"
-#: builtin/clone.c:101
+#: builtin/clone.c:110
msgid "set config inside the new repository"
msgstr "установить параметры внутри нового репозитория"
-#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536
+#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547
msgid "use IPv4 addresses only"
msgstr "использовать только IPv4 адреса"
-#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538
+#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549
msgid "use IPv6 addresses only"
msgstr "использовать только IPv6 адреса"
-#: builtin/clone.c:241
+#: builtin/clone.c:250
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
msgstr "Имя каталога не может быть угадано.\nУкажите имя каталога с помощью параметра командной строки"
-#: builtin/clone.c:307
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr "ссылаемый репозиторий «%s» как связанное состояние, пока не поддерживается."
-
-#: builtin/clone.c:309
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "ссылаемый репозиторий «%s» не является локальным."
-
-#: builtin/clone.c:314
+#: builtin/clone.c:303
#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "ссылаемый репозиторий «%s» является частичным"
+msgid "info: Could not add alternate for '%s': %s\n"
+msgstr "информация: Не удалось добавить альтернативу для «%s»: %s\n"
-#: builtin/clone.c:317
+#: builtin/clone.c:375
#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "ссылаемый репозиторий «%s» является сращенным"
+msgid "failed to open '%s'"
+msgstr "не удалось открыть «%s»"
-#: builtin/clone.c:384
+#: builtin/clone.c:383
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s уже существует и не является каталогом"
-#: builtin/clone.c:398
+#: builtin/clone.c:397
#, c-format
msgid "failed to stat %s\n"
msgstr "не удалось выполнить stat %s\n"
-#: builtin/clone.c:420
+#: builtin/clone.c:419
#, c-format
msgid "failed to create link '%s'"
msgstr "не удалось создать ссылку «%s»"
-#: builtin/clone.c:424
+#: builtin/clone.c:423
#, c-format
msgid "failed to copy file to '%s'"
msgstr "не удалось копировать файл в «%s»"
-#: builtin/clone.c:449 builtin/clone.c:633
+#: builtin/clone.c:448
#, c-format
msgid "done.\n"
msgstr "готово.\n"
-#: builtin/clone.c:461
+#: builtin/clone.c:460
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"and retry the checkout with 'git checkout -f HEAD'\n"
msgstr "Клонирование прошло успешно, но во время переключения состояния произошла ошибка.\nС помощь команды «git status» вы можете просмотреть, какие файлы были обновлены, а повторить попытку переключения на ветку с помощью «git checkout -f HEAD»\n"
-#: builtin/clone.c:538
+#: builtin/clone.c:537
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Не удалось найти внешнюю ветку %s для клонирования."
-#: builtin/clone.c:628
-#, c-format
-msgid "Checking connectivity... "
-msgstr "Проверка соединения… "
-
-#: builtin/clone.c:631
+#: builtin/clone.c:632
msgid "remote did not send all necessary objects"
msgstr "внешний репозиторий прислал не все необходимые объекты"
-#: builtin/clone.c:649
+#: builtin/clone.c:648
#, c-format
msgid "unable to update %s"
msgstr "не удалось обновить %s"
-#: builtin/clone.c:698
+#: builtin/clone.c:697
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "внешний HEAD ссылается на несуществующую ссылку, нельзя переключиться на такую версию.\n"
-#: builtin/clone.c:729
+#: builtin/clone.c:728
msgid "unable to checkout working tree"
msgstr "не удалось переключиться на версию в рабочем каталоге"
-#: builtin/clone.c:767
+#: builtin/clone.c:768
msgid "unable to write parameters to config file"
msgstr "не удалось записать параметры в файл конфигурации"
-#: builtin/clone.c:830
+#: builtin/clone.c:831
msgid "cannot repack to clean up"
msgstr "не удалось выполнить перепаковку для очистки"
-#: builtin/clone.c:832
+#: builtin/clone.c:833
msgid "cannot unlink temporary alternates file"
msgstr "не удалось отсоединить временные альтернативные файлы"
-#: builtin/clone.c:864 builtin/receive-pack.c:1731
+#: builtin/clone.c:866 builtin/receive-pack.c:1895
msgid "Too many arguments."
msgstr "Слишком много аргументов."
-#: builtin/clone.c:868
+#: builtin/clone.c:870
msgid "You must specify a repository to clone."
msgstr "Вы должны указать репозиторий для клонирования."
-#: builtin/clone.c:879
+#: builtin/clone.c:883
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare и --origin %s нельзя использовать одновременно."
-#: builtin/clone.c:882
+#: builtin/clone.c:886
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare и --separate-git-dir нельзя использовать одновременно."
-#: builtin/clone.c:895
+#: builtin/clone.c:899
#, c-format
msgid "repository '%s' does not exist"
msgstr "репозиторий «%s» не существует"
-#: builtin/clone.c:901 builtin/fetch.c:1174
+#: builtin/clone.c:905 builtin/fetch.c:1338
#, c-format
msgid "depth %s is not a positive number"
msgstr "глубина %s не является положительным числом"
-#: builtin/clone.c:911
+#: builtin/clone.c:915
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "целевой путь «%s» уже существует и не является пустым каталогом."
-#: builtin/clone.c:921
+#: builtin/clone.c:925
#, c-format
msgid "working tree '%s' already exists."
msgstr "рабочий каталог «%s» уже существует."
-#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547
-#: builtin/worktree.c:220 builtin/worktree.c:247
+#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657
+#: builtin/worktree.c:222 builtin/worktree.c:249
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "не удалось создать родительские каталоги для «%s»"
-#: builtin/clone.c:939
+#: builtin/clone.c:943
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "не удалось создать рабочий каталог «%s»"
-#: builtin/clone.c:957
+#: builtin/clone.c:955
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Клонирование в голый репозиторий «%s»…\n"
-#: builtin/clone.c:959
+#: builtin/clone.c:957
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Клонирование в «%s»…\n"
-#: builtin/clone.c:998
+#: builtin/clone.c:963
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-"
+"if-able"
+msgstr "клонирование с параметром --recursive нельзя использовать одновременно ни с --reference, ни с --reference-if-able"
+
+#: builtin/clone.c:1019
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth игнорируется на локальных клонах; вместо этого используйте file://."
-#: builtin/clone.c:1001
+#: builtin/clone.c:1021
+msgid "--shallow-since is ignored in local clones; use file:// instead."
+msgstr "--shallow-since игнорируется на локальных клонах; используйте file:// вместо этого."
+
+#: builtin/clone.c:1023
+msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+msgstr "--shallow-exclude игнорируется на локальных клонах; используйте file:// вместо этого."
+
+#: builtin/clone.c:1026
msgid "source repository is shallow, ignoring --local"
msgstr "исходный репозиторий является частичным, --local игнорируется"
-#: builtin/clone.c:1006
+#: builtin/clone.c:1031
msgid "--local is ignored"
msgstr "--local игнорируется"
-#: builtin/clone.c:1010
+#: builtin/clone.c:1035
#, c-format
msgid "Don't know how to clone %s"
msgstr "Не знаю как клонировать %s"
-#: builtin/clone.c:1059 builtin/clone.c:1067
+#: builtin/clone.c:1090 builtin/clone.c:1098
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Внешняя ветка %s не найдена в вышестоящем репозитории %s"
-#: builtin/clone.c:1070
+#: builtin/clone.c:1101
msgid "You appear to have cloned an empty repository."
msgstr "Похоже, что вы клонировали пустой репозиторий."
"the remaining commits.\n"
msgstr "Если вы хотите пропустит этот коммит, используйте команду:\n\n git reset\n\nПосле этого «git cherry-pick --continue» продолжит копирование оставшихся коммитов.\n"
-#: builtin/commit.c:307
+#: builtin/commit.c:318
msgid "failed to unpack HEAD tree object"
msgstr "сбой распаковки объекта дерева HEAD"
-#: builtin/commit.c:348
+#: builtin/commit.c:359
msgid "unable to create temporary index"
msgstr "не удалось создать временный индекс"
-#: builtin/commit.c:354
+#: builtin/commit.c:365
msgid "interactive add failed"
msgstr "сбой интерактивного добавления"
-#: builtin/commit.c:367
+#: builtin/commit.c:378
msgid "unable to update temporary index"
msgstr "не удалось обновить временный индекс"
-#: builtin/commit.c:369
+#: builtin/commit.c:380
msgid "Failed to update main cache tree"
msgstr "Сбой при обновлении основного кэша дерева"
-#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465
+#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
msgid "unable to write new_index file"
msgstr "не удалось записать файл new_index"
-#: builtin/commit.c:447
+#: builtin/commit.c:458
msgid "cannot do a partial commit during a merge."
msgstr "нельзя создать частичный коммит во время слияния."
-#: builtin/commit.c:449
+#: builtin/commit.c:460
msgid "cannot do a partial commit during a cherry-pick."
msgstr "нельзя создать частичный коммит во время копирования коммита."
-#: builtin/commit.c:458
+#: builtin/commit.c:469
msgid "cannot read the index"
msgstr "не удалось прочитать индекс"
-#: builtin/commit.c:477
+#: builtin/commit.c:488
msgid "unable to write temporary index file"
msgstr "не удалось записать временный файл индекса"
"in the current commit message"
msgstr "нельзя выбрать символ комментария, который\nне используется в текущем сообщении коммита"
-#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
#, c-format
msgid "could not lookup commit %s"
msgstr "не удалось запросить коммит %s"
-#: builtin/commit.c:704 builtin/shortlog.c:285
+#: builtin/commit.c:704 builtin/shortlog.c:286
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(чтение файла журнала из стандартного ввода)\n"
msgid "Cannot read index"
msgstr "Не удалось прочитать индекс"
-#: builtin/commit.c:949
+#: builtin/commit.c:954
msgid "Error building trees"
msgstr "Ошибка при построении деревьев"
-#: builtin/commit.c:964 builtin/tag.c:266
+#: builtin/commit.c:969 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Пожалуйста, укажите сообщение, при указании опций -m или -F.\n"
-#: builtin/commit.c:1066
+#: builtin/commit.c:1071
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr "--author «%s» не в формате «Имя <почта>» и не совпадает с существующим автором"
-#: builtin/commit.c:1081 builtin/commit.c:1321
+#: builtin/commit.c:1086 builtin/commit.c:1327
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Неправильный режим неотслеживаемых файлов «%s»"
-#: builtin/commit.c:1118
+#: builtin/commit.c:1124
msgid "--long and -z are incompatible"
msgstr "--long и -z нельзя использовать одновременно"
-#: builtin/commit.c:1148
+#: builtin/commit.c:1154
msgid "Using both --reset-author and --author does not make sense"
msgstr "Указание одновременно опций --reset-author и --author не имеет смысла"
-#: builtin/commit.c:1157
+#: builtin/commit.c:1163
msgid "You have nothing to amend."
msgstr "Нечего исправлять."
-#: builtin/commit.c:1160
+#: builtin/commit.c:1166
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Вы в процессе слияния — сейчас нельзя исправлять."
-#: builtin/commit.c:1162
+#: builtin/commit.c:1168
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Вы в процессе копирования коммита — сейчас нельзя исправлять."
-#: builtin/commit.c:1165
+#: builtin/commit.c:1171
msgid "Options --squash and --fixup cannot be used together"
msgstr "Опции --squash и --fixup не могут использоваться одновременно"
-#: builtin/commit.c:1175
+#: builtin/commit.c:1181
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Может использоваться только одна из опций -c/-C/-F/--fixup."
-#: builtin/commit.c:1177
+#: builtin/commit.c:1183
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "Опция -m не может использоваться с -c/-C/-F/--fixup."
-#: builtin/commit.c:1185
+#: builtin/commit.c:1191
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author может использоваться только одновременно с опциями -C, -c или --amend."
-#: builtin/commit.c:1202
+#: builtin/commit.c:1208
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "Может использоваться только одна из опций --include/--only/--all/--interactive/--patch."
-#: builtin/commit.c:1204
+#: builtin/commit.c:1210
msgid "No paths with --include/--only does not make sense."
msgstr "Указание путей каталогов с опциями --include/--only не имеет смысла."
-#: builtin/commit.c:1206
+#: builtin/commit.c:1212
msgid "Clever... amending the last one with dirty index."
msgstr "Умно… отмена последнего с измененным индексом."
-#: builtin/commit.c:1208
+#: builtin/commit.c:1214
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "Пути явно указаны пути без опций -i или -o; предполагаю опцию --only…"
-#: builtin/commit.c:1220 builtin/tag.c:474
+#: builtin/commit.c:1226 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Неправильное значение режима очистки %s"
-#: builtin/commit.c:1225
+#: builtin/commit.c:1231
msgid "Paths with -a does not make sense."
msgstr "С опцией -a указание пути не имеет смысла."
-#: builtin/commit.c:1335 builtin/commit.c:1621
+#: builtin/commit.c:1341 builtin/commit.c:1617
msgid "show status concisely"
msgstr "кратко показать статус"
-#: builtin/commit.c:1337 builtin/commit.c:1623
+#: builtin/commit.c:1343 builtin/commit.c:1619
msgid "show branch information"
msgstr "показать информацию о версии"
-#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512
-#: builtin/worktree.c:437
+#: builtin/commit.c:1345
+msgid "version"
+msgstr "версия"
+
+#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522
+#: builtin/worktree.c:440
msgid "machine-readable output"
msgstr "машиночитаемый вывод"
-#: builtin/commit.c:1342 builtin/commit.c:1627
+#: builtin/commit.c:1348 builtin/commit.c:1623
msgid "show status in long format (default)"
msgstr "показать статус в длинном формате (по умолчанию)"
-#: builtin/commit.c:1345 builtin/commit.c:1630
+#: builtin/commit.c:1351 builtin/commit.c:1626
msgid "terminate entries with NUL"
msgstr "завершать записи НУЛЕВЫМ байтом"
-#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981
+#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "режим"
-#: builtin/commit.c:1348 builtin/commit.c:1633
+#: builtin/commit.c:1354 builtin/commit.c:1629
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "показать неотслеживаемые файлы, опциональные режимы: all (все), normal (как обычно), no (нет). (По умолчанию: all)"
-#: builtin/commit.c:1351
+#: builtin/commit.c:1357
msgid "show ignored files"
msgstr "показать игнорируемые файлы"
-#: builtin/commit.c:1352 parse-options.h:155
+#: builtin/commit.c:1358 parse-options.h:155
msgid "when"
msgstr "когда"
-#: builtin/commit.c:1353
+#: builtin/commit.c:1359
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr "игнорировать изменения в подмодулях, опционально когда: all (всегда), dirty (измененные), untracked (неотслеживаемые). (По умолчанию: all)"
-#: builtin/commit.c:1355
+#: builtin/commit.c:1361
msgid "list untracked files in columns"
msgstr "показать неотслеживаемые файлы по столбцам"
-#: builtin/commit.c:1441
+#: builtin/commit.c:1437
msgid "couldn't look up newly created commit"
msgstr "нельзя запросить новосозданный коммит"
-#: builtin/commit.c:1443
+#: builtin/commit.c:1439
msgid "could not parse newly created commit"
msgstr "нельзя разобрать новосозданный коммит"
-#: builtin/commit.c:1488
+#: builtin/commit.c:1484
msgid "detached HEAD"
msgstr "отделённый HEAD"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1487
msgid " (root-commit)"
msgstr " (корневой коммит)"
-#: builtin/commit.c:1591
+#: builtin/commit.c:1587
msgid "suppress summary after successful commit"
msgstr "не выводить сводку после успешного коммита"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1588
msgid "show diff in commit message template"
msgstr "добавить список изменений в шаблон сообщения коммита"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1590
msgid "Commit message options"
msgstr "Опции сообщения коммита"
-#: builtin/commit.c:1595 builtin/tag.c:351
+#: builtin/commit.c:1591 builtin/tag.c:351
msgid "read message from file"
msgstr "прочитать сообщение из файла"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1592
msgid "author"
msgstr "автор"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1592
msgid "override author for commit"
msgstr "подменить автора коммита"
-#: builtin/commit.c:1597 builtin/gc.c:326
+#: builtin/commit.c:1593 builtin/gc.c:326
msgid "date"
msgstr "дата"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1593
msgid "override date for commit"
msgstr "подменить дату коммита"
-#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395
-#: builtin/notes.c:558 builtin/tag.c:349
+#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398
+#: builtin/notes.c:561 builtin/tag.c:349
msgid "message"
msgstr "сообщение"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1594
msgid "commit message"
msgstr "сообщение коммита"
-#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601
-#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
+#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79
msgid "commit"
msgstr "коммит"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1595
msgid "reuse and edit message from specified commit"
msgstr "использовать и отредактировать сообщение от указанного коммита"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1596
msgid "reuse message from specified commit"
msgstr "использовать сообщение указанного коммита"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1597
msgid "use autosquash formatted message to fixup specified commit"
msgstr "использовать форматированное сообщение автоуплотнения для исправления указанного коммита"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1598
msgid "use autosquash formatted message to squash specified commit"
msgstr "использовать форматированное сообщение автоуплотнения для уплотнения указанного коммита"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1599
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "коммит теперь за моим авторством (с использованием -C/-c/--amend)"
-#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86
+#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "добавить Signed-off-by:"
-#: builtin/commit.c:1605
+#: builtin/commit.c:1601
msgid "use specified template file"
msgstr "использовать указанный файл шаблона"
-#: builtin/commit.c:1606
+#: builtin/commit.c:1602
msgid "force edit of commit"
msgstr "принудительно редактировать коммит"
-#: builtin/commit.c:1607
+#: builtin/commit.c:1603
msgid "default"
msgstr "по-умолчанию"
-#: builtin/commit.c:1607 builtin/tag.c:354
+#: builtin/commit.c:1603 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "как удалять пробелы и #комментарии из сообщения коммита"
-#: builtin/commit.c:1608
+#: builtin/commit.c:1604
msgid "include status in commit message template"
msgstr "включить статус файлов в шаблон сообщения коммита"
-#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165
+#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "подписать коммит с помощью GPG"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1609
msgid "Commit contents options"
msgstr "Опции содержимого коммита"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1610
msgid "commit all changed files"
msgstr "закоммитить все измененные файлы"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1611
msgid "add specified files to index for commit"
msgstr "добавить указанные файлы в индекс для коммита"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1612
msgid "interactively add files"
msgstr "интерактивное добавление файлов"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1613
msgid "interactively add changes"
msgstr "интерактивное добавление изменений"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1614
msgid "commit only specified files"
msgstr "закоммитить только указанные файлы"
-#: builtin/commit.c:1619
-msgid "bypass pre-commit hook"
-msgstr "пропустить перехватчик перед-коммитом"
+#: builtin/commit.c:1615
+msgid "bypass pre-commit and commit-msg hooks"
+msgstr "пропустить перехватчик pre-commit и commit-msg"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1616
msgid "show what would be committed"
msgstr "показать, что будет закоммичено"
-#: builtin/commit.c:1631
+#: builtin/commit.c:1627
msgid "amend previous commit"
msgstr "исправить предыдущий коммит"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1628
msgid "bypass post-rewrite hook"
-msgstr "пропустить перехватчик после-перезаписи"
+msgstr "пропустить перехватчик post-rewrite"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1633
msgid "ok to record an empty change"
msgstr "разрешить запись пустого коммита"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1635
msgid "ok to record a change with an empty message"
msgstr "разрешить запись изменений с пустым сообщением"
-#: builtin/commit.c:1668
+#: builtin/commit.c:1664
msgid "could not parse HEAD commit"
msgstr "не удалось разобрать HEAD коммит"
-#: builtin/commit.c:1718
+#: builtin/commit.c:1712
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Файл MERGE_HEAD поврежден (%s)"
-#: builtin/commit.c:1725
+#: builtin/commit.c:1719
msgid "could not read MERGE_MODE"
msgstr "не удалось прочитать MERGE_MODE"
-#: builtin/commit.c:1744
+#: builtin/commit.c:1738
#, c-format
msgid "could not read commit message: %s"
msgstr "не удалось открыть сообщение коммита: %s"
-#: builtin/commit.c:1755
+#: builtin/commit.c:1749
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Отмена коммита; вы не изменили сообщение.\n"
-#: builtin/commit.c:1760
+#: builtin/commit.c:1754
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Отмена коммита из-за пустого сообщения коммита.\n"
-#: builtin/commit.c:1808
+#: builtin/commit.c:1802
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
msgid "git config [<options>]"
msgstr "git config [<опции>]"
-#: builtin/config.c:56
+#: builtin/config.c:55
msgid "Config file location"
msgstr "Размещение файла конфигурации"
-#: builtin/config.c:57
+#: builtin/config.c:56
msgid "use global config file"
msgstr "использовать глобальный файл конфигурации"
-#: builtin/config.c:58
+#: builtin/config.c:57
msgid "use system config file"
msgstr "использовать системный файл конфигурации"
-#: builtin/config.c:59
+#: builtin/config.c:58
msgid "use repository config file"
msgstr "использовать файл конфигурации репозитория"
-#: builtin/config.c:60
+#: builtin/config.c:59
msgid "use given config file"
msgstr "использовать указанный файл конфигурации"
-#: builtin/config.c:61
+#: builtin/config.c:60
msgid "blob-id"
msgstr "идент-двоичн-объекта"
-#: builtin/config.c:61
+#: builtin/config.c:60
msgid "read config from given blob object"
msgstr "прочитать настройки из указанного двоичного объекта"
-#: builtin/config.c:62
+#: builtin/config.c:61
msgid "Action"
msgstr "Действие"
-#: builtin/config.c:63
+#: builtin/config.c:62
msgid "get value: name [value-regex]"
msgstr "получить значение: имя [шаблон-значений]"
-#: builtin/config.c:64
+#: builtin/config.c:63
msgid "get all values: key [value-regex]"
msgstr "получить все значения: ключ [шаблон-значений]"
-#: builtin/config.c:65
+#: builtin/config.c:64
msgid "get values for regexp: name-regex [value-regex]"
msgstr "получить значения по шаблону: шаблон-имен [шаблон-значений]"
-#: builtin/config.c:66
+#: builtin/config.c:65
msgid "get value specific for the URL: section[.var] URL"
msgstr "получить значение, специфичное для URL: раздел[.переменная] URL"
-#: builtin/config.c:67
+#: builtin/config.c:66
msgid "replace all matching variables: name value [value_regex]"
msgstr "заменить все соответствующие переменные: имя значение [шаблон-значений]"
-#: builtin/config.c:68
+#: builtin/config.c:67
msgid "add a new variable: name value"
msgstr "добавить новую переменную: имя значение"
-#: builtin/config.c:69
+#: builtin/config.c:68
msgid "remove a variable: name [value-regex]"
msgstr "удалить переменную: имя [шаблон-значений]"
-#: builtin/config.c:70
+#: builtin/config.c:69
msgid "remove all matches: name [value-regex]"
msgstr "удалить все совпадающие: имя [шаблон-значений]"
-#: builtin/config.c:71
+#: builtin/config.c:70
msgid "rename section: old-name new-name"
msgstr "переименовать раздел: старое-имя новое-имя"
-#: builtin/config.c:72
+#: builtin/config.c:71
msgid "remove a section: name"
msgstr "удалить раздел: имя"
-#: builtin/config.c:73
+#: builtin/config.c:72
msgid "list all"
msgstr "показать весь список"
-#: builtin/config.c:74
+#: builtin/config.c:73
msgid "open an editor"
msgstr "открыть в редакторе"
-#: builtin/config.c:75
+#: builtin/config.c:74
msgid "find the color configured: slot [default]"
msgstr "найти настроенный цвет: раздел [по-умолчанию]"
-#: builtin/config.c:76
+#: builtin/config.c:75
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "проверить, существует ли настроенный цвет: раздел [stdout-есть-tty]"
-#: builtin/config.c:77
+#: builtin/config.c:76
msgid "Type"
msgstr "Тип"
-#: builtin/config.c:78
+#: builtin/config.c:77
msgid "value is \"true\" or \"false\""
msgstr "значение — это «true» (правда) или «false» (ложь)"
-#: builtin/config.c:79
+#: builtin/config.c:78
msgid "value is decimal number"
msgstr "значение — это десятичное число"
-#: builtin/config.c:80
+#: builtin/config.c:79
msgid "value is --bool or --int"
msgstr "значение — это --bool или --int"
-#: builtin/config.c:81
+#: builtin/config.c:80
msgid "value is a path (file or directory name)"
msgstr "значение — это путь (к файлу или каталогу)"
-#: builtin/config.c:82
+#: builtin/config.c:81
msgid "Other"
msgstr "Другое"
-#: builtin/config.c:83
+#: builtin/config.c:82
msgid "terminate values with NUL byte"
msgstr "завершать значения НУЛЕВЫМ байтом"
-#: builtin/config.c:84
+#: builtin/config.c:83
msgid "show variable names only"
msgstr "показывать только имена переменных"
-#: builtin/config.c:85
+#: builtin/config.c:84
msgid "respect include directives on lookup"
msgstr "учитывать директивы include (включения файлов) при запросе"
-#: builtin/config.c:86
+#: builtin/config.c:85
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "показать источник настройки (файл, стандартный ввод, двоичный объект, командная строка)"
-#: builtin/config.c:328
+#: builtin/config.c:327
msgid "unable to parse default color value"
msgstr "не удалось разобрать значение цвета по умолчанию"
-#: builtin/config.c:472
+#: builtin/config.c:471
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
"#\temail = %s\n"
msgstr "# Это файл конфигурации пользователя Git.\n[user]\n# Пожалуйста, адаптируйте и раскомментируйте следующие строки:\n#\tuser = %s\n#\temail = %s\n"
-#: builtin/config.c:614
+#: builtin/config.c:613
#, c-format
msgid "cannot create configuration file %s"
msgstr "не удалось создать файл конфигурации %s"
-#: builtin/count-objects.c:77
+#: builtin/config.c:625
+#, 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."
+
+#: builtin/count-objects.c:86
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:96
msgid "print sizes in human readable format"
msgstr "вывод размеров в удобочитаемом для человека виде"
msgid "tag '%s' is really '%s' here"
msgstr "метка «%s» уже здесь «%s»"
-#: builtin/describe.c:250 builtin/log.c:465
+#: builtin/describe.c:250 builtin/log.c:480
#, c-format
msgid "Not a valid object name %s"
-msgstr "Ð\9dедейÑ\81Ñ\82виÑ\82елÑ\8cное имя объекта %s"
+msgstr "Ð\9dедопÑ\83Ñ\81Ñ\82имое имя объекта %s"
#: builtin/describe.c:253
#, c-format
msgid "only consider tags matching <pattern>"
msgstr "рассматривать только метки по <шаблону>"
-#: builtin/describe.c:410 builtin/name-rev.c:321
+#: builtin/describe.c:410 builtin/name-rev.c:320
msgid "show abbreviated commit object as fallback"
msgstr "если не найдено, показать сокращенный номер редакции коммита"
msgid "invalid option: %s"
msgstr "неправильный параметр: %s"
-#: builtin/diff.c:360
+#: builtin/diff.c:361
msgid "Not a git repository"
-msgstr "Не является репозиторием git"
+msgstr "Не найден git репозитоий"
-#: builtin/diff.c:403
+#: builtin/diff.c:404
#, c-format
msgid "invalid object '%s' given."
msgstr "передан неправильный объект «%s»."
-#: builtin/diff.c:412
+#: builtin/diff.c:413
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "передано больше двух двоичных объектов: «%s»"
-#: builtin/diff.c:419
+#: builtin/diff.c:420
#, c-format
msgid "unhandled object '%s' given."
msgstr "передан необработанный объект «%s»."
msgid "anonymize output"
msgstr "сделать вывод анонимным"
-#: builtin/fetch.c:20
+#: builtin/fetch.c:21
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<опции>] [<репозиторий> [<спецификация-ссылки>…]]"
-#: builtin/fetch.c:21
+#: builtin/fetch.c:22
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<опции>] <группа>"
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<опции>] [(<репозиторий> | <группа>)…]"
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<опции>]"
-#: builtin/fetch.c:92 builtin/pull.c:174
+#: builtin/fetch.c:95 builtin/pull.c:175
msgid "fetch from all remotes"
msgstr "извлечь со всех внешних репозиториев"
-#: builtin/fetch.c:94 builtin/pull.c:177
+#: builtin/fetch.c:97 builtin/pull.c:178
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "дописать к .git/FETCH_HEAD вместо перезаписи"
-#: builtin/fetch.c:96 builtin/pull.c:180
+#: builtin/fetch.c:99 builtin/pull.c:181
msgid "path to upload pack on remote end"
msgstr "путь к программе упаковки пакета на машине с внешним репозиторием"
-#: builtin/fetch.c:97 builtin/pull.c:182
+#: builtin/fetch.c:100 builtin/pull.c:183
msgid "force overwrite of local branch"
msgstr "принудительная перезапись локальной ветки"
-#: builtin/fetch.c:99
+#: builtin/fetch.c:102
msgid "fetch from multiple remotes"
msgstr "извлечь с нескольких внешних репозиториев"
-#: builtin/fetch.c:101 builtin/pull.c:184
+#: builtin/fetch.c:104 builtin/pull.c:185
msgid "fetch all tags and associated objects"
msgstr "извлечь все метки и связанные объекты"
-#: builtin/fetch.c:103
+#: builtin/fetch.c:106
msgid "do not fetch all tags (--no-tags)"
msgstr "не извлекать все метки (--no-tags)"
-#: builtin/fetch.c:105
+#: builtin/fetch.c:108
msgid "number of submodules fetched in parallel"
msgstr "количество подмодулей, которые будут скачаны парралельно"
-#: builtin/fetch.c:107 builtin/pull.c:187
+#: builtin/fetch.c:110 builtin/pull.c:188
msgid "prune remote-tracking branches no longer on remote"
msgstr "почистить отслеживаемые внешние ветки, которых уже нет на внешнем репозитории"
-#: builtin/fetch.c:108 builtin/pull.c:190
+#: builtin/fetch.c:111 builtin/pull.c:191
msgid "on-demand"
msgstr "по требованию"
-#: builtin/fetch.c:109 builtin/pull.c:191
+#: builtin/fetch.c:112 builtin/pull.c:192
msgid "control recursive fetching of submodules"
msgstr "управление рекурсивным извлечением подмодулей"
-#: builtin/fetch.c:113 builtin/pull.c:199
+#: builtin/fetch.c:116 builtin/pull.c:200
msgid "keep downloaded pack"
msgstr "оставить загруженный пакет данных"
-#: builtin/fetch.c:115
+#: builtin/fetch.c:118
msgid "allow updating of HEAD ref"
msgstr "разрешить обновление ссылки HEAD"
-#: builtin/fetch.c:118 builtin/pull.c:202
+#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
msgid "deepen history of shallow clone"
-msgstr "глубокая история частичного клона"
+msgstr "улугубить историю частичного клона"
+
+#: builtin/fetch.c:123
+msgid "deepen history of shallow repository based on time"
+msgstr "углубить историю частичного клона основываясь на времени"
-#: builtin/fetch.c:120 builtin/pull.c:205
+#: builtin/fetch.c:129 builtin/pull.c:206
msgid "convert to a complete repository"
msgstr "преобразовать в полный репозиторий"
-#: builtin/fetch.c:122 builtin/log.c:1399
+#: builtin/fetch.c:131 builtin/log.c:1433
msgid "dir"
msgstr "каталог"
-#: builtin/fetch.c:123
+#: builtin/fetch.c:132
msgid "prepend this to submodule path output"
msgstr "присоединять это спереди к выводу путей подмодуля"
-#: builtin/fetch.c:126
+#: builtin/fetch.c:135
msgid "default mode for recursion"
msgstr "режим по умолчанию для рекурсии"
-#: builtin/fetch.c:128 builtin/pull.c:208
+#: builtin/fetch.c:137 builtin/pull.c:209
msgid "accept refs that update .git/shallow"
msgstr "принимать ссылки, которые обновляют .git/shallow"
-#: builtin/fetch.c:129 builtin/pull.c:210
+#: builtin/fetch.c:138 builtin/pull.c:211
msgid "refmap"
msgstr "соответствие-ссылок"
-#: builtin/fetch.c:130 builtin/pull.c:211
+#: builtin/fetch.c:139 builtin/pull.c:212
msgid "specify fetch refmap"
msgstr "указать соответствие ссылок при извлечении"
-#: builtin/fetch.c:386
+#: builtin/fetch.c:398
msgid "Couldn't find remote ref HEAD"
msgstr "Не удалось найти ссылку HEAD на внешнем репозитории"
-#: builtin/fetch.c:466
+#: builtin/fetch.c:514
+#, c-format
+msgid "configuration fetch.output contains invalid value %s"
+msgstr "опция fetch.output содержит неправильное значение для %s"
+
+#: builtin/fetch.c:607
#, c-format
msgid "object %s not found"
msgstr "объект %s не найден"
-#: builtin/fetch.c:471
+#: builtin/fetch.c:611
msgid "[up to date]"
msgstr "[актуально]"
-#: builtin/fetch.c:485
-#, c-format
-msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
-msgstr "! %-*s %-*s → %s (не удалось извлечь в текущую ветку)"
-
-#: builtin/fetch.c:486 builtin/fetch.c:574
+#: builtin/fetch.c:624 builtin/fetch.c:704
msgid "[rejected]"
msgstr "[отклонено]"
-#: builtin/fetch.c:497
+#: builtin/fetch.c:625
+msgid "can't fetch in current branch"
+msgstr "нельзя извлечь текущую ветку"
+
+#: builtin/fetch.c:634
msgid "[tag update]"
msgstr "[обновление метки]"
-#: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552
-msgid " (unable to update local ref)"
-msgstr " (не удалось обновить локальную ссылку)"
+#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684
+#: builtin/fetch.c:699
+msgid "unable to update local ref"
+msgstr "не удалось обновить локальную ссылку"
-#: builtin/fetch.c:517
+#: builtin/fetch.c:654
msgid "[new tag]"
msgstr "[новая метка]"
-#: builtin/fetch.c:520
+#: builtin/fetch.c:657
msgid "[new branch]"
msgstr "[новая ветка]"
-#: builtin/fetch.c:523
+#: builtin/fetch.c:660
msgid "[new ref]"
msgstr "[новая ссылка]"
-#: builtin/fetch.c:569
-msgid "unable to update local ref"
-msgstr "не удалось обновить локальную ссылку"
-
-#: builtin/fetch.c:569
+#: builtin/fetch.c:699
msgid "forced update"
msgstr "принудительное обновление"
-#: builtin/fetch.c:576
-msgid "(non-fast-forward)"
-msgstr "(без перемотки вперед)"
+#: builtin/fetch.c:704
+msgid "non-fast-forward"
+msgstr "без перемотки вперед"
-#: builtin/fetch.c:619
+#: builtin/fetch.c:749
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s не отправил все необходимые объекты\n"
-#: builtin/fetch.c:637
+#: builtin/fetch.c:769
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "%s отклонено из-за того, что частичные корни не разрешено обновлять"
-#: builtin/fetch.c:724 builtin/fetch.c:816
+#: builtin/fetch.c:856 builtin/fetch.c:952
#, c-format
msgid "From %.*s\n"
msgstr "Из %.*s\n"
-#: builtin/fetch.c:735
+#: builtin/fetch.c:867
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches"
msgstr "не удалось обновить некоторые локальные ссылки; попробуйте запустить «git remote prune %s», чтобы почистить старые, конфликтующие ветки"
-#: builtin/fetch.c:787
+#: builtin/fetch.c:922
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s будет висящей веткой)"
-#: builtin/fetch.c:788
+#: builtin/fetch.c:923
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s стала висящей веткой)"
-#: builtin/fetch.c:820
+#: builtin/fetch.c:955
msgid "[deleted]"
msgstr "[удалено]"
-#: builtin/fetch.c:821 builtin/remote.c:1025
+#: builtin/fetch.c:956 builtin/remote.c:1020
msgid "(none)"
msgstr "(нет)"
-#: builtin/fetch.c:841
+#: builtin/fetch.c:979
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Отказ получения в текущую ветку %s не голого репозитория"
-#: builtin/fetch.c:860
+#: builtin/fetch.c:998
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Неправильное значение «%2$s» для параметра «%1$s» для %3$s"
-#: builtin/fetch.c:863
+#: builtin/fetch.c:1001
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Параметр «%s» игнорируется для %s\n"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:1077
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Не знаю как извлечь с %s"
-#: builtin/fetch.c:1080
+#: builtin/fetch.c:1237
#, c-format
msgid "Fetching %s\n"
msgstr "Извлечение из %s\n"
-#: builtin/fetch.c:1082 builtin/remote.c:96
+#: builtin/fetch.c:1239 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "Не удалось извлечь %s"
-#: builtin/fetch.c:1100
+#: builtin/fetch.c:1257
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:1123
+#: builtin/fetch.c:1280
msgid "You need to specify a tag name."
msgstr "Вам нужно указать имя метки."
-#: builtin/fetch.c:1165
+#: builtin/fetch.c:1322
+msgid "Negative depth in --deepen is not supported"
+msgstr "Отрицательная грубина для --deepen не поддерживается"
+
+#: builtin/fetch.c:1324
+msgid "--deepen and --depth are mutually exclusive"
+msgstr "--deepen и --depth нельзя использовать одновременно"
+
+#: builtin/fetch.c:1329
msgid "--depth and --unshallow cannot be used together"
msgstr "нельзя использовать одновременно --depth и --unshallow"
-#: builtin/fetch.c:1167
+#: builtin/fetch.c:1331
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow не имеет смысла на полном репозитории"
-#: builtin/fetch.c:1187
+#: builtin/fetch.c:1353
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all не принимает имя репозитория как аргумент"
-#: builtin/fetch.c:1189
+#: builtin/fetch.c:1355
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all не имеет смысла при указании спецификаций ссылок"
-#: builtin/fetch.c:1200
+#: builtin/fetch.c:1366
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Нет такого внешнего репозитория или группы: %s"
-#: builtin/fetch.c:1208
+#: builtin/fetch.c:1374
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Получение группы и указание спецификаций ссылок не имеет смысла"
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr "git fmt-merge-msg [-m <сообщение>] [--log[=<n>] | --no-log] [--file <файл>]"
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:663
msgid "populate log with at most <n> entries from shortlog"
msgstr "отправить в журнал <n> записей из короткого журнала"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:666
msgid "alias for --log (deprecated)"
msgstr "сокращение для --log (устаревшее)"
-#: builtin/fmt-merge-msg.c:673
+#: builtin/fmt-merge-msg.c:669
msgid "text"
msgstr "текст"
-#: builtin/fmt-merge-msg.c:674
+#: builtin/fmt-merge-msg.c:670
msgid "use <text> as start of message"
msgstr "использовать <текст> как начальное сообщение"
-#: builtin/fmt-merge-msg.c:675
+#: builtin/fmt-merge-msg.c:671
msgid "file to read from"
msgstr "файл для чтения"
msgid "print only refs which contain the commit"
msgstr "вывод только ссылок, которые содержат коммит"
-#: builtin/fsck.c:156 builtin/prune.c:140
-msgid "Checking connectivity"
-msgstr "Проверка соединения"
-
-#: builtin/fsck.c:486
+#: builtin/fsck.c:519
msgid "Checking object directories"
msgstr "Проверка каталогов объектов"
-#: builtin/fsck.c:552
+#: builtin/fsck.c:588
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<опции>] [<объект>…]"
-#: builtin/fsck.c:558
+#: builtin/fsck.c:594
msgid "show unreachable objects"
msgstr "показать недоступные объекты"
-#: builtin/fsck.c:559
+#: builtin/fsck.c:595
msgid "show dangling objects"
msgstr "показать объекты, на которые нет ссылок"
-#: builtin/fsck.c:560
+#: builtin/fsck.c:596
msgid "report tags"
msgstr "вывести отчет по меткам"
-#: builtin/fsck.c:561
+#: builtin/fsck.c:597
msgid "report root nodes"
msgstr "вывести отчет по корневым узлам"
-#: builtin/fsck.c:562
+#: builtin/fsck.c:598
msgid "make index objects head nodes"
msgstr "воспринимать объекты в индексе как корневые узлы"
-#: builtin/fsck.c:563
+#: builtin/fsck.c:599
msgid "make reflogs head nodes (default)"
msgstr "создать корневые узлы журналов ссылок (по умолчанию)"
-#: builtin/fsck.c:564
+#: builtin/fsck.c:600
msgid "also consider packs and alternate objects"
msgstr "также проверять пакеты и альтернативные объекты"
-#: builtin/fsck.c:565
+#: builtin/fsck.c:601
msgid "check only connectivity"
msgstr "только проверить соединение"
-#: builtin/fsck.c:566
+#: builtin/fsck.c:602
msgid "enable more strict checking"
msgstr "использовать более строгую проверку"
-#: builtin/fsck.c:568
+#: builtin/fsck.c:604
msgid "write dangling objects in .git/lost-found"
msgstr "записать объекты на которые нет ссылок в .git/lost-found"
-#: builtin/fsck.c:569 builtin/prune.c:107
+#: builtin/fsck.c:605 builtin/prune.c:107
msgid "show progress"
msgstr "показать прогресс выполнения"
-#: builtin/fsck.c:630
+#: builtin/fsck.c:606
+msgid "show verbose names for reachable objects"
+msgstr "показать подробные имена для недоступных объектов"
+
+#: builtin/fsck.c:665
msgid "Checking objects"
msgstr "Проверка объектов"
msgid "invalid number of threads specified (%d) for %s"
msgstr "указано недопустимое количество потоков (%d) для %s"
-#: builtin/grep.c:452 builtin/grep.c:487
+#: builtin/grep.c:453 builtin/grep.c:488
#, c-format
msgid "unable to read tree (%s)"
msgstr "не удалось прочитать дерево (%s)"
-#: builtin/grep.c:502
+#: builtin/grep.c:503
#, c-format
msgid "unable to grep from object of type %s"
msgstr "не удалось выполнить grep из объекта типа %s"
-#: builtin/grep.c:560
+#: builtin/grep.c:561
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "параметр «%c» ожидает числовое значение"
-#: builtin/grep.c:577
-#, c-format
-msgid "cannot open '%s'"
-msgstr "не удалось открыть «%s»"
-
-#: builtin/grep.c:646
+#: builtin/grep.c:647
msgid "search in index instead of in the work tree"
msgstr "искать в индексе, а не в рабочем каталоге"
-#: builtin/grep.c:648
+#: builtin/grep.c:649
msgid "find in contents not managed by git"
msgstr "искать в содержимом не управляемым git"
-#: builtin/grep.c:650
+#: builtin/grep.c:651
msgid "search in both tracked and untracked files"
msgstr "искать и в отслеживаемых, и в неотслеживаемых файлах"
-#: builtin/grep.c:652
+#: builtin/grep.c:653
msgid "ignore files specified via '.gitignore'"
msgstr "игнорировать файлы указанные в «.gitignore»"
-#: builtin/grep.c:655
+#: builtin/grep.c:656
msgid "show non-matching lines"
msgstr "искать в несовпадающих строках"
-#: builtin/grep.c:657
+#: builtin/grep.c:658
msgid "case insensitive matching"
msgstr "без учета регистра"
-#: builtin/grep.c:659
+#: builtin/grep.c:660
msgid "match patterns only at word boundaries"
msgstr "искать совпадения шаблона только на границах слов"
-#: builtin/grep.c:661
+#: builtin/grep.c:662
msgid "process binary files as text"
msgstr "обработка двоичных файлов как текста"
-#: builtin/grep.c:663
+#: builtin/grep.c:664
msgid "don't match patterns in binary files"
msgstr "не искать совпадения шаблона в двоичных файлах"
-#: builtin/grep.c:666
+#: builtin/grep.c:667
msgid "process binary files with textconv filters"
msgstr "обрабатываться двоичные файлы с помощью фильтров textconv"
-#: builtin/grep.c:668
+#: builtin/grep.c:669
msgid "descend at most <depth> levels"
msgstr "на глубине максиму <глубина> уровней"
-#: builtin/grep.c:672
+#: builtin/grep.c:673
msgid "use extended POSIX regular expressions"
msgstr "использовать расширенные регулярные выражения POSIX"
-#: builtin/grep.c:675
+#: builtin/grep.c:676
msgid "use basic POSIX regular expressions (default)"
msgstr "использовать базовые регулярные выражения POSIX (по умолчанию)"
-#: builtin/grep.c:678
+#: builtin/grep.c:679
msgid "interpret patterns as fixed strings"
msgstr "интерпретировать шаблоны как фиксированные строки"
-#: builtin/grep.c:681
+#: builtin/grep.c:682
msgid "use Perl-compatible regular expressions"
msgstr "использовать Perl-совместимые регулярные выражения"
-#: builtin/grep.c:684
+#: builtin/grep.c:685
msgid "show line numbers"
msgstr "вывести номера строк"
-#: builtin/grep.c:685
+#: builtin/grep.c:686
msgid "don't show filenames"
msgstr "не выводить имена файлов"
-#: builtin/grep.c:686
+#: builtin/grep.c:687
msgid "show filenames"
msgstr "выводить имена файлов"
-#: builtin/grep.c:688
+#: builtin/grep.c:689
msgid "show filenames relative to top directory"
msgstr "выводить имена файлов относительно каталога репозитория"
-#: builtin/grep.c:690
+#: builtin/grep.c:691
msgid "show only filenames instead of matching lines"
msgstr "выводить только имена файлов, а не совпадающие строки"
-#: builtin/grep.c:692
+#: builtin/grep.c:693
msgid "synonym for --files-with-matches"
msgstr "синоним для --files-with-matches"
-#: builtin/grep.c:695
+#: builtin/grep.c:696
msgid "show only the names of files without match"
msgstr "выводить только несовпадающие имена файлов"
-#: builtin/grep.c:697
+#: builtin/grep.c:698
msgid "print NUL after filenames"
msgstr "выводить двоичный НОЛЬ после списка имен файлов"
-#: builtin/grep.c:699
+#: builtin/grep.c:700
msgid "show the number of matches instead of matching lines"
msgstr "выводить количество совпадений, а не совпадающие строки"
-#: builtin/grep.c:700
+#: builtin/grep.c:701
msgid "highlight matches"
msgstr "подсвечивать совпадения"
-#: builtin/grep.c:702
+#: builtin/grep.c:703
msgid "print empty line between matches from different files"
msgstr "выводить пустую строку после совпадений из разных файлов"
-#: builtin/grep.c:704
+#: builtin/grep.c:705
msgid "show filename only once above matches from same file"
msgstr "выводить имя файла только раз на несколько совпадений в одном файле"
-#: builtin/grep.c:707
+#: builtin/grep.c:708
msgid "show <n> context lines before and after matches"
msgstr "показать <n> строк контекста перед и после совпадения"
-#: builtin/grep.c:710
+#: builtin/grep.c:711
msgid "show <n> context lines before matches"
msgstr "показать <n> строк контекста перед совпадением"
-#: builtin/grep.c:712
+#: builtin/grep.c:713
msgid "show <n> context lines after matches"
msgstr "показать <n> строк контекста после совпадения"
-#: builtin/grep.c:714
+#: builtin/grep.c:715
msgid "use <n> worker threads"
msgstr "использовать <кол> рабочих потоков"
-#: builtin/grep.c:715
+#: builtin/grep.c:716
msgid "shortcut for -C NUM"
msgstr "тоже, что и -C КОЛИЧЕСТВО"
-#: builtin/grep.c:718
+#: builtin/grep.c:719
msgid "show a line with the function name before matches"
msgstr "показать строку с именем функции перед совпадением"
-#: builtin/grep.c:720
+#: builtin/grep.c:721
msgid "show the surrounding function"
msgstr "показать окружающую функцию"
-#: builtin/grep.c:723
+#: builtin/grep.c:724
msgid "read patterns from file"
msgstr "прочитать шаблоны из файла"
-#: builtin/grep.c:725
+#: builtin/grep.c:726
msgid "match <pattern>"
msgstr "поиск соответствий с <шаблоном>"
-#: builtin/grep.c:727
+#: builtin/grep.c:728
msgid "combine patterns specified with -e"
msgstr "объединить шаблоны указанные с помощью -e"
-#: builtin/grep.c:739
+#: builtin/grep.c:740
msgid "indicate hit with exit status without output"
msgstr "ничего не выводить, указать на совпадение с помощью кода выхода"
-#: builtin/grep.c:741
+#: builtin/grep.c:742
msgid "show only matches from files that match all patterns"
msgstr "показать только совпадения из файлов в которых совпадают все шаблоны"
-#: builtin/grep.c:743
+#: builtin/grep.c:744
msgid "show parse tree for grep expression"
msgstr "показать дерево разбора для выражения поиска"
-#: builtin/grep.c:747
+#: builtin/grep.c:748
msgid "pager"
msgstr "пейджер"
-#: builtin/grep.c:747
+#: builtin/grep.c:748
msgid "show matching files in the pager"
msgstr "показать совпадающие файлы с помощью программы-пейджера"
-#: builtin/grep.c:750
+#: builtin/grep.c:751
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "разрешить вызов grep(1) (игнорируется в этой сборке)"
-#: builtin/grep.c:813
+#: builtin/grep.c:814
msgid "no pattern given."
msgstr "не задан шаблон."
-#: builtin/grep.c:845 builtin/index-pack.c:1477
+#: builtin/grep.c:846 builtin/index-pack.c:1480
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "указано неправильное количество потоков (%d)"
-#: builtin/grep.c:875
+#: builtin/grep.c:876
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager работает только в рабочем каталоге"
-#: builtin/grep.c:901
+#: builtin/grep.c:902
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached или --untracked нельзя использовать одновременно с --no-index."
-#: builtin/grep.c:906
+#: builtin/grep.c:907
msgid "--no-index or --untracked cannot be used with revs."
msgstr "--no-index или --untracked нельзя использовать одновременно с указанием редакции."
-#: builtin/grep.c:909
+#: builtin/grep.c:910
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard не может использоваться для отслеживаемого содержимого."
-#: builtin/grep.c:917
+#: builtin/grep.c:918
msgid "both --cached and trees are given."
msgstr "указано одновременно --cached и дерево."
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:93
+#: builtin/hash-object.c:94
msgid "type"
msgstr "тип"
-#: builtin/hash-object.c:93
+#: builtin/hash-object.c:94
msgid "object type"
msgstr "тип объекта"
-#: builtin/hash-object.c:94
+#: builtin/hash-object.c:95
msgid "write the object into the object database"
msgstr "запись объекта в базу данных объектов"
-#: builtin/hash-object.c:96
+#: builtin/hash-object.c:97
msgid "read the object from stdin"
msgstr "прочитать объект из стандартного ввода"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
msgid "store file as is without filters"
msgstr "сохранить файл без использования фильтров"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:100
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr "хэшировать любой мусор и создавать поврежденные объекты для отладки Git"
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
msgid "process file as it were from this path"
msgstr "обработать файл так, будто он находится по указанному пути"
-#: builtin/help.c:41
+#: builtin/help.c:42
msgid "print all available commands"
msgstr "вывести список всех доступных команд"
-#: builtin/help.c:42
+#: builtin/help.c:43
+msgid "exclude guides"
+msgstr "исключить руководства"
+
+#: builtin/help.c:44
msgid "print list of useful guides"
msgstr "вывести список полезных руководств"
-#: builtin/help.c:43
+#: builtin/help.c:45
msgid "show man page"
msgstr "открыть руководство в формате man"
-#: builtin/help.c:44
+#: builtin/help.c:46
msgid "show manual in web browser"
msgstr "открыть руководство в веб-браузере"
-#: builtin/help.c:46
+#: builtin/help.c:48
msgid "show info page"
msgstr "открыть руководство в формате info"
-#: builtin/help.c:52
+#: builtin/help.c:54
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr "git help [--all] [--guides] [--man | --web | --info] [<команда>]"
-#: builtin/help.c:64
+#: builtin/help.c:66
#, c-format
msgid "unrecognized help format '%s'"
msgstr "неопознанный формат руководства «%s»"
-#: builtin/help.c:91
+#: builtin/help.c:93
msgid "Failed to start emacsclient."
msgstr "Сбой при запуске emacsclient."
-#: builtin/help.c:104
+#: builtin/help.c:106
msgid "Failed to parse emacsclient version."
msgstr "Сбой при определении версии emacsclient."
-#: builtin/help.c:112
+#: builtin/help.c:114
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "версия emacsclient «%d» слишком старая (< 22)."
-#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
+#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
#, c-format
msgid "failed to exec '%s'"
msgstr "сбой при запуске «%s»"
-#: builtin/help.c:205
+#: builtin/help.c:207
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"Please consider using 'man.<tool>.cmd' instead."
msgstr "«%s»: путь для неподдерживаемой программы просмотра man.\nВместо этого используйте «man.<программа>.cmd»."
-#: builtin/help.c:217
+#: builtin/help.c:219
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"Please consider using 'man.<tool>.path' instead."
msgstr "«%s»: команда для неподдерживаемой программы просмотра man.\nВместо этого используйте «man.<программа>.path»."
-#: builtin/help.c:334
+#: builtin/help.c:336
#, c-format
msgid "'%s': unknown man viewer."
msgstr "«%s»: неизвестная программа просмотра man."
-#: builtin/help.c:351
+#: builtin/help.c:353
msgid "no man viewer handled the request"
msgstr "программа просмотра man не обработала запрос"
-#: builtin/help.c:359
+#: builtin/help.c:361
msgid "no info viewer handled the request"
msgstr "программа просмотра info не обработала запрос"
-#: builtin/help.c:408
+#: builtin/help.c:403
msgid "Defining attributes per path"
msgstr "Определение атрибутов для путей файлов или каталогов"
-#: builtin/help.c:409
+#: builtin/help.c:404
msgid "Everyday Git With 20 Commands Or So"
msgstr "Повседневный Git с 20 командами или около того"
-#: builtin/help.c:410
+#: builtin/help.c:405
msgid "A Git glossary"
msgstr "Глоссарий Git"
-#: builtin/help.c:411
+#: builtin/help.c:406
msgid "Specifies intentionally untracked files to ignore"
msgstr "Указание специально игнорируемых файлов"
-#: builtin/help.c:412
+#: builtin/help.c:407
msgid "Defining submodule properties"
msgstr "Определение свойств подмодулей"
-#: builtin/help.c:413
+#: builtin/help.c:408
msgid "Specifying revisions and ranges for Git"
msgstr "Указание редакций и диапазонов для Git"
-#: builtin/help.c:414
+#: builtin/help.c:409
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "Учебное введение в Git (для версии 1.5.1 или новее)"
-#: builtin/help.c:415
+#: builtin/help.c:410
msgid "An overview of recommended workflows with Git"
msgstr "Обзор рекомендуемых последовательностей выполняемых действий с Git"
-#: builtin/help.c:427
+#: builtin/help.c:422
msgid "The common Git guides are:\n"
msgstr "Основные руководства Git:\n"
-#: builtin/help.c:448 builtin/help.c:465
-#, c-format
-msgid "usage: %s%s"
-msgstr "использование: %s%s"
-
-#: builtin/help.c:481
+#: builtin/help.c:440
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "«git %s» — это сокращение для «%s»"
-#: builtin/index-pack.c:152
+#: builtin/help.c:462 builtin/help.c:479
+#, c-format
+msgid "usage: %s%s"
+msgstr "использование: %s%s"
+
+#: builtin/index-pack.c:154
#, c-format
msgid "unable to open %s"
msgstr "не удалось открыть %s"
-#: builtin/index-pack.c:202
+#: builtin/index-pack.c:204
#, c-format
msgid "object type mismatch at %s"
msgstr "несоответствие типа объекта на %s"
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:224
#, c-format
msgid "did not receive expected object %s"
msgstr "ожидаемый объект не получен на %s"
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:227
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "объект %s: ожидаемый тип %s, получен %s"
-#: builtin/index-pack.c:267
+#: builtin/index-pack.c:269
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[2] "не удалось заполнить %d байтов"
msgstr[3] "не удалось заполнить %d байтов"
-#: builtin/index-pack.c:277
+#: builtin/index-pack.c:279
msgid "early EOF"
msgstr "неожиданный конец файла"
-#: builtin/index-pack.c:278
+#: builtin/index-pack.c:280
msgid "read error on input"
msgstr "ошибка чтения ввода"
-#: builtin/index-pack.c:290
+#: builtin/index-pack.c:292
msgid "used more bytes than were available"
msgstr "использовано больше байт, чем было доступно"
-#: builtin/index-pack.c:297
+#: builtin/index-pack.c:299
msgid "pack too large for current definition of off_t"
msgstr "пакет слишком большой для текущего определения off_t"
-#: builtin/index-pack.c:313
+#: builtin/index-pack.c:302 builtin/unpack-objects.c:92
+msgid "pack exceeds maximum allowed size"
+msgstr "размер пакета превышает максимальный допустимый"
+
+#: builtin/index-pack.c:317
#, c-format
msgid "unable to create '%s'"
msgstr "не удалось создать «%s»"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:322
#, c-format
msgid "cannot open packfile '%s'"
msgstr "не удалось открыть файл пакета «%s»"
-#: builtin/index-pack.c:332
+#: builtin/index-pack.c:336
msgid "pack signature mismatch"
msgstr "несоответствие подписи пакета"
-#: builtin/index-pack.c:334
+#: builtin/index-pack.c:338
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "версия пакета %<PRIu32> не поддерживается"
-#: builtin/index-pack.c:352
+#: builtin/index-pack.c:356
#, c-format
-msgid "pack has bad object at offset %lu: %s"
-msgstr "в пакеÑ\82е Ñ\81одеÑ\80жиÑ\82Ñ\81Ñ\8f повÑ\80ежденнÑ\8bй обÑ\8aекÑ\82 по Ñ\81меÑ\89ениÑ\8e %lu: %s"
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
+msgstr "пакеÑ\82 Ñ\81одеÑ\80жиÑ\82 плоÑ\85ой обÑ\8aекÑ\82 по Ñ\81меÑ\89ениÑ\8e %<PRIuMAX>: %s"
-#: builtin/index-pack.c:473
+#: builtin/index-pack.c:478
#, c-format
msgid "inflate returned %d"
msgstr "программа сжатия вернула %d"
-#: builtin/index-pack.c:522
+#: builtin/index-pack.c:527
msgid "offset value overflow for delta base object"
msgstr "переполнение значения смещения у базового объекта дельты"
-#: builtin/index-pack.c:530
+#: builtin/index-pack.c:535
msgid "delta base offset is out of bound"
msgstr "смещение базовой дельты вышло за допустимые пределы"
-#: builtin/index-pack.c:538
+#: builtin/index-pack.c:543
#, c-format
msgid "unknown object type %d"
msgstr "неизвестный тип объекта %d"
-#: builtin/index-pack.c:569
+#: builtin/index-pack.c:574
msgid "cannot pread pack file"
msgstr "не удалось выполнить pread для файла пакета"
-#: builtin/index-pack.c:571
+#: builtin/index-pack.c:576
#, c-format
-msgid "premature end of pack file, %lu byte missing"
-msgid_plural "premature end of pack file, %lu bytes missing"
-msgstr[0] "преждевременное окончание файла пакета, %lu байт отсутствует"
-msgstr[1] "преждевременное окончание файла пакета, %lu байта отсутствует"
-msgstr[2] "преждевременное окончание файла пакета, %lu байтов отсутствует"
-msgstr[3] "преждевременное окончание файла пакета, %lu байтов отсутствует"
+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> байтов отсутствует"
-#: builtin/index-pack.c:597
+#: builtin/index-pack.c:602
msgid "serious inflate inconsistency"
msgstr "серьезное несоответствие при распаковке"
-#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772
-#: builtin/index-pack.c:806 builtin/index-pack.c:815
+#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
+#: builtin/index-pack.c:811 builtin/index-pack.c:820
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "НАЙДЕНА КОЛЛИЗИЯ SHA1 С %s !"
-#: builtin/index-pack.c:746 builtin/pack-objects.c:162
-#: builtin/pack-objects.c:254
+#: builtin/index-pack.c:751 builtin/pack-objects.c:166
+#: builtin/pack-objects.c:258
#, c-format
msgid "unable to read %s"
msgstr "не удалось прочитать %s"
-#: builtin/index-pack.c:812
+#: builtin/index-pack.c:817
#, c-format
msgid "cannot read existing object %s"
msgstr "не удалось прочитать существующий объект %s"
-#: builtin/index-pack.c:826
+#: builtin/index-pack.c:831
#, c-format
msgid "invalid blob object %s"
msgstr "неправильный файл двоичного объекта %s"
-#: builtin/index-pack.c:840
+#: builtin/index-pack.c:845
#, c-format
msgid "invalid %s"
msgstr "неправильный %s"
-#: builtin/index-pack.c:843
+#: builtin/index-pack.c:848
msgid "Error in object"
msgstr "Ошибка в объекте"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:850
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Не все дочерние объекты %s достижимы"
-#: builtin/index-pack.c:917 builtin/index-pack.c:948
+#: builtin/index-pack.c:922 builtin/index-pack.c:953
msgid "failed to apply delta"
msgstr "сбой при применении дельты"
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1123
msgid "Receiving objects"
msgstr "Получение объектов"
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1123
msgid "Indexing objects"
msgstr "Индексирование объектов"
-#: builtin/index-pack.c:1150
+#: builtin/index-pack.c:1155
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "пакет поврежден (несоответствие SHA1)"
-#: builtin/index-pack.c:1155
+#: builtin/index-pack.c:1160
msgid "cannot fstat packfile"
msgstr "не удалось выполнить fstat для файла пакета"
-#: builtin/index-pack.c:1158
+#: builtin/index-pack.c:1163
msgid "pack has junk at the end"
msgstr "файл пакета содержит мусор в конце"
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1174
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "безумная путаница в parse_pack_objects()"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1197
msgid "Resolving deltas"
msgstr "Определение изменений"
-#: builtin/index-pack.c:1205
+#: builtin/index-pack.c:1208
#, c-format
msgid "unable to create thread: %s"
msgstr "не удалось создать поток: %s"
-#: builtin/index-pack.c:1247
+#: builtin/index-pack.c:1250
msgid "confusion beyond insanity"
msgstr "безумная путаница"
-#: builtin/index-pack.c:1253
+#: builtin/index-pack.c:1256
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[2] "завершено с %d локальными объектами"
msgstr[3] "завершено с %d локальными объектами"
-#: builtin/index-pack.c:1265
+#: builtin/index-pack.c:1268
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Неожиданная контрольная сумма в конце %s (диск поврежден?)"
-#: builtin/index-pack.c:1269
+#: builtin/index-pack.c:1272
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[2] "пакет содержит %d неразрешенных дельт"
msgstr[3] "пакет содержит %d неразрешенных дельт"
-#: builtin/index-pack.c:1293
+#: builtin/index-pack.c:1296
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "нельзя сжать присоединенный объект (%d)"
-#: builtin/index-pack.c:1369
+#: builtin/index-pack.c:1372
#, c-format
msgid "local object %s is corrupt"
msgstr "локальный объект %s поврежден"
-#: builtin/index-pack.c:1393
+#: builtin/index-pack.c:1396
msgid "error while closing pack file"
msgstr "ошибка при закрытии файла пакета"
-#: builtin/index-pack.c:1406
+#: builtin/index-pack.c:1409
#, c-format
msgid "cannot write keep file '%s'"
msgstr "не удалось записать файл удержания «%s»"
-#: builtin/index-pack.c:1414
+#: builtin/index-pack.c:1417
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "не удалось закрыть записанный файл удержания «%s»"
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1430
msgid "cannot store pack file"
msgstr "не удалось сохранить файл пакета"
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1441
msgid "cannot store index file"
msgstr "не удалось сохранить файл индекса"
-#: builtin/index-pack.c:1471
+#: builtin/index-pack.c:1474
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "плохой pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1481 builtin/index-pack.c:1678
+#: builtin/index-pack.c:1484 builtin/index-pack.c:1681
#, c-format
msgid "no threads support, ignoring %s"
msgstr "нет поддержки потоков, игнорирование %s"
-#: builtin/index-pack.c:1540
+#: builtin/index-pack.c:1542
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Не удалось открыть существующий файл пакета «%s»"
-#: builtin/index-pack.c:1542
+#: builtin/index-pack.c:1544
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Не удалось открыть существующий файл индекса для «%s»"
-#: builtin/index-pack.c:1589
+#: builtin/index-pack.c:1591
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[2] "не дельты: %d объектов"
msgstr[3] "не дельты: %d объектов"
-#: builtin/index-pack.c:1596
+#: builtin/index-pack.c:1598
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[2] "длина цепочки = %d: %lu объектов"
msgstr[3] "длина цепочки = %d: %lu объектов"
-#: builtin/index-pack.c:1609
+#: builtin/index-pack.c:1611
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "имя пакета «%s» не оканчивается на «.pack»"
-#: builtin/index-pack.c:1638
-msgid "Cannot come back to cwd"
-msgstr "Не удалось вернуться в текущий рабочий каталог"
-
-#: builtin/index-pack.c:1690 builtin/index-pack.c:1693
-#: builtin/index-pack.c:1705 builtin/index-pack.c:1709
+#: builtin/index-pack.c:1693 builtin/index-pack.c:1696
+#: builtin/index-pack.c:1712 builtin/index-pack.c:1716
#, c-format
msgid "bad %s"
msgstr "плохой %s"
-#: builtin/index-pack.c:1723
+#: builtin/index-pack.c:1732
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin нельзя использовать без --stdin"
-#: builtin/index-pack.c:1731
+#: builtin/index-pack.c:1740
msgid "--verify with no packfile name given"
msgstr "--verify без указания имени файла пакета"
-#: builtin/init-db.c:55
+#: builtin/init-db.c:54
#, c-format
msgid "cannot stat '%s'"
msgstr "не удалось выполнить stat для «%s»"
-#: builtin/init-db.c:61
+#: builtin/init-db.c:60
#, c-format
msgid "cannot stat template '%s'"
msgstr "не удалось выполнить stat для шаблона «%s»"
-#: builtin/init-db.c:66
+#: builtin/init-db.c:65
#, c-format
msgid "cannot opendir '%s'"
msgstr "не удалось выполнить opendir для «%s»"
-#: builtin/init-db.c:77
+#: builtin/init-db.c:76
#, c-format
msgid "cannot readlink '%s'"
msgstr "не удалось выполнить readlink для «%s»"
-#: builtin/init-db.c:79
+#: builtin/init-db.c:78
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "не удалось создать символьную ссылку «%s» на «%s»"
-#: builtin/init-db.c:85
+#: builtin/init-db.c:84
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "не удалось скопировать файл «%s» в «%s»"
-#: builtin/init-db.c:89
+#: builtin/init-db.c:88
#, c-format
msgid "ignoring template %s"
msgstr "игнорирование шаблона %s"
-#: builtin/init-db.c:120
+#: builtin/init-db.c:119
#, c-format
msgid "templates not found %s"
msgstr "шаблоны не найдены %s"
-#: builtin/init-db.c:135
+#: builtin/init-db.c:134
#, c-format
msgid "not copying templates from '%s': %s"
msgstr "не копирую шаблоны из «%s»: %s"
-#: builtin/init-db.c:312 builtin/init-db.c:315
-#, c-format
-msgid "%s already exists"
-msgstr "%s уже существует"
-
-#: builtin/init-db.c:344
+#: builtin/init-db.c:327
#, c-format
msgid "unable to handle file type %d"
msgstr "не удается обработать файл типа %d"
-#: builtin/init-db.c:347
+#: builtin/init-db.c:330
#, c-format
msgid "unable to move %s to %s"
msgstr "не удается переместить файл %s в %s"
-#. TRANSLATORS: The first '%s' is either "Reinitialized
-#. existing" or "Initialized empty", the second " shared" or
-#. "", and the last '%s%s' is the verbatim directory name.
+#: builtin/init-db.c:347 builtin/init-db.c:350
+#, c-format
+msgid "%s already exists"
+msgstr "%s уже существует"
+
#: builtin/init-db.c:403
#, c-format
-msgid "%s%s Git repository in %s%s\n"
-msgstr "%s%s репозиторий Git в %s%s\n"
+msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgstr "Переинициализирован существующий общий репозиторий Git в %s%s\n"
#: builtin/init-db.c:404
-msgid "Reinitialized existing"
-msgstr "Переинициализация существующего"
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
+msgstr "Переинициализирован существующий репозиторий Git в %s%s\n"
-#: builtin/init-db.c:404
-msgid "Initialized empty"
-msgstr "Инициализирован пустой"
+#: builtin/init-db.c:408
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
+msgstr "Инициализирован пустой общий репозиторий Git в %s%s\n"
-#: builtin/init-db.c:405
-msgid " shared"
-msgstr " общий"
+#: builtin/init-db.c:409
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
+msgstr "Инициализирован пустой репозиторий Git в %s%s\n"
-#: builtin/init-db.c:452
+#: builtin/init-db.c:457
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] "
"[--shared[=<permissions>]] [<directory>]"
msgstr "git init [-q | --quiet] [--bare] [--template=<каталог-шаблонов>] [--shared[=<права-доступа>]] [<каталог>]"
-#: builtin/init-db.c:475
+#: builtin/init-db.c:480
msgid "permissions"
msgstr "права-доступа"
-#: builtin/init-db.c:476
+#: builtin/init-db.c:481
msgid "specify that the git repository is to be shared amongst several users"
msgstr "укажите, если репозиторий git будет использоваться несколькими пользователями"
-#: builtin/init-db.c:510 builtin/init-db.c:515
+#: builtin/init-db.c:515 builtin/init-db.c:520
#, c-format
msgid "cannot mkdir %s"
msgstr "не удалось выполнить mkdir %s"
-#: builtin/init-db.c:519
+#: builtin/init-db.c:524
#, c-format
msgid "cannot chdir to %s"
msgstr "не удалось выполнить chdir в %s"
-#: builtin/init-db.c:540
+#: builtin/init-db.c:545
#, 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:568
+#: builtin/init-db.c:573
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Не удалось получить доступ к рабочему каталогу «%s»"
msgid "no input file given for in-place editing"
msgstr "ничего не передано, для редактирования файлов на месте"
-#: builtin/log.c:43
+#: builtin/log.c:44
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<опции>] [<диапазон-редакций>] [[--] <путь>…]"
-#: builtin/log.c:44
+#: builtin/log.c:45
msgid "git show [<options>] <object>..."
msgstr "git show [<опции>] <объект>…"
-#: builtin/log.c:83
+#: builtin/log.c:84
#, c-format
msgid "invalid --decorate option: %s"
msgstr "неправильный параметр для --decorate: %s"
-#: builtin/log.c:137
+#: builtin/log.c:139
msgid "suppress diff output"
msgstr "не выводить различия"
-#: builtin/log.c:138
+#: builtin/log.c:140
msgid "show source"
msgstr "показать источник"
-#: builtin/log.c:139
+#: builtin/log.c:141
msgid "Use mail map file"
msgstr "Использовать файл соответствия почтовых адресов"
-#: builtin/log.c:140
+#: builtin/log.c:142
msgid "decorate options"
msgstr "опции формата вывода ссылок"
-#: builtin/log.c:143
+#: builtin/log.c:145
msgid "Process line range n,m in file, counting from 1"
msgstr "Обработать диапазон строк n,m из файла, начиная с 1"
-#: builtin/log.c:239
+#: builtin/log.c:241
#, c-format
msgid "Final output: %d %s\n"
msgstr "Финальный вывод: %d %s\n"
-#: builtin/log.c:471
+#: builtin/log.c:486
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: плохой файл"
-#: builtin/log.c:485 builtin/log.c:578
+#: builtin/log.c:500 builtin/log.c:594
#, c-format
msgid "Could not read object %s"
msgstr "Не удалось прочитать объект %s"
-#: builtin/log.c:602
+#: builtin/log.c:618
#, c-format
msgid "Unknown type: %d"
msgstr "Неизвестный тип объекта: %d"
-#: builtin/log.c:722
+#: builtin/log.c:739
msgid "format.headers without value"
msgstr "в format.headers не указано значение"
-#: builtin/log.c:812
+#: builtin/log.c:839
msgid "name of output directory is too long"
msgstr "слишком длинное имя выходного каталога"
-#: builtin/log.c:827
+#: builtin/log.c:854
#, c-format
msgid "Cannot open patch file %s"
msgstr "Ну удалось открыть файл изменений %s"
-#: builtin/log.c:841
+#: builtin/log.c:868
msgid "Need exactly one range."
msgstr "Нужен только один диапазон."
-#: builtin/log.c:851
+#: builtin/log.c:878
msgid "Not a range."
msgstr "Не является диапазоном."
-#: builtin/log.c:957
+#: builtin/log.c:984
msgid "Cover letter needs email format"
msgstr "Сопроводительное письмо должно быть в формате электронной почты"
-#: builtin/log.c:1036
+#: builtin/log.c:1063
#, c-format
msgid "insane in-reply-to: %s"
msgstr "ошибка в поле in-reply-to: %s"
-#: builtin/log.c:1064
+#: builtin/log.c:1091
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<опции>] [<начиная-с> | <диапазон-редакций>]"
-#: builtin/log.c:1109
+#: builtin/log.c:1141
msgid "Two output directories?"
msgstr "Два выходных каталога?"
-#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871
+#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
#, c-format
msgid "Unknown commit %s"
msgstr "Неизвестный коммит %s"
-#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304
-#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424
-#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593
-#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455
+#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Не удалось разрешить «%s» как ссылку."
-#: builtin/log.c:1231
+#: builtin/log.c:1263
msgid "Could not find exact merge base."
msgstr "Не удалось найти точную базу слияния."
-#: builtin/log.c:1235
+#: builtin/log.c:1267
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 "Не удалось получить вышестоящую ветку. Если вы хотите записать базовый коммит автомитически, то используйте git branch --set-upstream-to для отслеживания внешней ветки.\nИли же вы можете указать базовый коммит указанием --base=<идентификатор-базового-коммита> вручную."
-#: builtin/log.c:1255
+#: builtin/log.c:1287
msgid "Failed to find exact merge base"
msgstr "Не удалось найти точную базу слияния"
-#: builtin/log.c:1266
+#: builtin/log.c:1298
msgid "base commit should be the ancestor of revision list"
msgstr "базовый коммит должен быть предком списка редакций"
-#: builtin/log.c:1270
+#: builtin/log.c:1302
msgid "base commit shouldn't be in revision list"
msgstr "базовый коммит не должен быть в списке редакций"
-#: builtin/log.c:1319
+#: builtin/log.c:1351
msgid "cannot get patch id"
msgstr "не удалось получить идентификатор патча"
-#: builtin/log.c:1377
+#: builtin/log.c:1408
msgid "use [PATCH n/m] even with a single patch"
msgstr "выводить [PATCH n/m] даже когда один патч"
-#: builtin/log.c:1380
+#: builtin/log.c:1411
msgid "use [PATCH] even with multiple patches"
msgstr "выводить [PATCH] даже когда несколько патчей"
-#: builtin/log.c:1384
+#: builtin/log.c:1415
msgid "print patches to standard out"
msgstr "выводить патчи на стандартный вывод"
-#: builtin/log.c:1386
+#: builtin/log.c:1417
msgid "generate a cover letter"
msgstr "генерировать сопроводительное письмо"
-#: builtin/log.c:1388
+#: builtin/log.c:1419
msgid "use simple number sequence for output file names"
msgstr "использовать простую последовательность чисел для имен выходных файлов"
-#: builtin/log.c:1389
+#: builtin/log.c:1420
msgid "sfx"
msgstr "суффикс"
-#: builtin/log.c:1390
+#: builtin/log.c:1421
msgid "use <sfx> instead of '.patch'"
msgstr "использовать суффикс <суффикс> вместо «.patch»"
-#: builtin/log.c:1392
+#: builtin/log.c:1423
msgid "start numbering patches at <n> instead of 1"
msgstr "начать нумерацию патчей с <n>, а не с 1"
-#: builtin/log.c:1394
+#: builtin/log.c:1425
msgid "mark the series as Nth re-roll"
msgstr "пометить серию как энную попытку"
-#: builtin/log.c:1396
+#: builtin/log.c:1427
+msgid "Use [RFC PATCH] instead of [PATCH]"
+msgstr "Использовать [RFC PATCH] вместо [PATCH]"
+
+#: builtin/log.c:1430
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Использовать [<префикс>] вместо [PATCH]"
-#: builtin/log.c:1399
+#: builtin/log.c:1433
msgid "store resulting files in <dir>"
msgstr "сохранить результирующие файлы в <каталог>"
-#: builtin/log.c:1402
+#: builtin/log.c:1436
msgid "don't strip/add [PATCH]"
msgstr "не обрезать/добавлять [PATCH]"
-#: builtin/log.c:1405
+#: builtin/log.c:1439
msgid "don't output binary diffs"
msgstr "не выводить двоичные различия"
-#: builtin/log.c:1407
+#: builtin/log.c:1441
msgid "output all-zero hash in From header"
msgstr "выводить нулевую хэш-сумму в заголовке From"
-#: builtin/log.c:1409
+#: builtin/log.c:1443
msgid "don't include a patch matching a commit upstream"
msgstr "не включать патч, если коммит уже есть в вышестоящей ветке"
-#: builtin/log.c:1411
+#: builtin/log.c:1445
msgid "show patch format instead of default (patch + stat)"
msgstr "выводить в формате патча, а не в стандартном (патч + статистика)"
-#: builtin/log.c:1413
+#: builtin/log.c:1447
msgid "Messaging"
msgstr "Передача сообщений"
-#: builtin/log.c:1414
+#: builtin/log.c:1448
msgid "header"
msgstr "заголовок"
-#: builtin/log.c:1415
+#: builtin/log.c:1449
msgid "add email header"
msgstr "добавить заголовок сообщения"
-#: builtin/log.c:1416 builtin/log.c:1418
+#: builtin/log.c:1450 builtin/log.c:1452
msgid "email"
msgstr "почта"
-#: builtin/log.c:1416
+#: builtin/log.c:1450
msgid "add To: header"
msgstr "добавить заголовок To:"
-#: builtin/log.c:1418
+#: builtin/log.c:1452
msgid "add Cc: header"
msgstr "добавить заголовок Cc:"
-#: builtin/log.c:1420
+#: builtin/log.c:1454
msgid "ident"
msgstr "идентификатор"
-#: builtin/log.c:1421
+#: builtin/log.c:1455
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "установить адрес отправителя на <идентификатор> (или на идентификатор коммитера, если отсутствует)"
-#: builtin/log.c:1423
+#: builtin/log.c:1457
msgid "message-id"
msgstr "идентификатор-сообщения"
-#: builtin/log.c:1424
+#: builtin/log.c:1458
msgid "make first mail a reply to <message-id>"
msgstr "сделать первое письмо ответом на <идентификатор-сообщения>"
-#: builtin/log.c:1425 builtin/log.c:1428
+#: builtin/log.c:1459 builtin/log.c:1462
msgid "boundary"
msgstr "вложение"
-#: builtin/log.c:1426
+#: builtin/log.c:1460
msgid "attach the patch"
msgstr "приложить патч"
-#: builtin/log.c:1429
+#: builtin/log.c:1463
msgid "inline the patch"
msgstr "включить патч в текст письма"
-#: builtin/log.c:1433
+#: builtin/log.c:1467
msgid "enable message threading, styles: shallow, deep"
msgstr "включить в письмах иерархичность, стили: shallow (частичную), deep (глубокую)"
-#: builtin/log.c:1435
+#: builtin/log.c:1469
msgid "signature"
msgstr "подпись"
-#: builtin/log.c:1436
+#: builtin/log.c:1470
msgid "add a signature"
msgstr "добавить подпись"
-#: builtin/log.c:1437
+#: builtin/log.c:1471
msgid "base-commit"
msgstr "базовый коммит"
-#: builtin/log.c:1438
+#: builtin/log.c:1472
msgid "add prerequisite tree info to the patch series"
msgstr "добавить информацию о требовании дерева к серии патчей"
-#: builtin/log.c:1440
+#: builtin/log.c:1474
msgid "add a signature from a file"
msgstr "добавить подпись из файла"
-#: builtin/log.c:1441
+#: builtin/log.c:1475
msgid "don't print the patch filenames"
msgstr "не выводить имена файлов патчей"
-#: builtin/log.c:1531
+#: builtin/log.c:1565
msgid "-n and -k are mutually exclusive."
msgstr "-n и -k нельзя использовать одновременно"
-#: builtin/log.c:1533
-msgid "--subject-prefix and -k are mutually exclusive."
-msgstr "--subject-prefix и -k нельзя использовать одновременно."
+#: builtin/log.c:1567
+msgid "--subject-prefix/--rfc and -k are mutually exclusive."
+msgstr "--subject-prefix/--rfc и -k нельзя использовать одновременно."
-#: builtin/log.c:1541
+#: builtin/log.c:1575
msgid "--name-only does not make sense"
msgstr "--name-only не имеет смысла"
-#: builtin/log.c:1543
+#: builtin/log.c:1577
msgid "--name-status does not make sense"
msgstr "--name-status не имеет смысла"
-#: builtin/log.c:1545
+#: builtin/log.c:1579
msgid "--check does not make sense"
msgstr "--check не имеет смысла"
-#: builtin/log.c:1573
+#: builtin/log.c:1609
msgid "standard output, or directory, which one?"
msgstr "стандартный вывод или каталог?"
-#: builtin/log.c:1575
+#: builtin/log.c:1611
#, c-format
msgid "Could not create directory '%s'"
msgstr "Не удалось создать каталог «%s»"
-#: builtin/log.c:1672
+#: builtin/log.c:1705
#, c-format
msgid "unable to read signature file '%s'"
msgstr "не удалось прочитать файл подписи «%s»"
-#: builtin/log.c:1743
+#: builtin/log.c:1777
msgid "Failed to create output files"
msgstr "Сбой при создании выходных файлов"
-#: builtin/log.c:1792
+#: builtin/log.c:1826
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<вышестоящая-ветка> [<голова> [<ограничение>]]]"
-#: builtin/log.c:1846
+#: builtin/log.c:1880
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> "
"manually.\n"
msgstr "Не удалось найти отслеживаемую внешнюю ветку, укажите <вышестоящую-ветку> вручную.\n"
-#: builtin/ls-files.c:378
+#: builtin/ls-files.c:458
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<опции>] [<файл>…]"
-#: builtin/ls-files.c:427
+#: builtin/ls-files.c:507
msgid "identify the file status with tags"
msgstr "выводить имена файлов с метками"
-#: builtin/ls-files.c:429
+#: builtin/ls-files.c:509
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "использовать символы в нижнем регистре для «предположительно без изменений» файлов"
-#: builtin/ls-files.c:431
+#: builtin/ls-files.c:511
msgid "show cached files in the output (default)"
msgstr "показывать кэшированные файлы при выводе (по умолчанию)"
-#: builtin/ls-files.c:433
+#: builtin/ls-files.c:513
msgid "show deleted files in the output"
msgstr "показывать удаленные файлы при выводе"
-#: builtin/ls-files.c:435
+#: builtin/ls-files.c:515
msgid "show modified files in the output"
msgstr "показывать измененные файлы при выводе"
-#: builtin/ls-files.c:437
+#: builtin/ls-files.c:517
msgid "show other files in the output"
msgstr "показывать другие файлы при выводе"
-#: builtin/ls-files.c:439
+#: builtin/ls-files.c:519
msgid "show ignored files in the output"
msgstr "показывать игнорируемые файлы при выводе"
-#: builtin/ls-files.c:442
+#: builtin/ls-files.c:522
msgid "show staged contents' object name in the output"
msgstr "показывать имя индексированного объекта на выводе"
-#: builtin/ls-files.c:444
+#: builtin/ls-files.c:524
msgid "show files on the filesystem that need to be removed"
msgstr "показывать файлы в файловой системе, которые должны быть удалены"
-#: builtin/ls-files.c:446
+#: builtin/ls-files.c:526
msgid "show 'other' directories' names only"
msgstr "показывать только имена у «других» каталогов"
-#: builtin/ls-files.c:448
+#: builtin/ls-files.c:528
msgid "show line endings of files"
msgstr "показать концы строк файлов"
-#: builtin/ls-files.c:450
+#: builtin/ls-files.c:530
msgid "don't show empty directories"
msgstr "не показывать пустые каталоги"
-#: builtin/ls-files.c:453
+#: builtin/ls-files.c:533
msgid "show unmerged files in the output"
msgstr "показывать не слитые файлы на выводе"
-#: builtin/ls-files.c:455
+#: builtin/ls-files.c:535
msgid "show resolve-undo information"
msgstr "показывать информации о разрешении конфликтов и отмене"
-#: builtin/ls-files.c:457
+#: builtin/ls-files.c:537
msgid "skip files matching pattern"
msgstr "пропустить файлы, соответствующие шаблону"
-#: builtin/ls-files.c:460
+#: builtin/ls-files.c:540
msgid "exclude patterns are read from <file>"
msgstr "прочитать шаблоны исключения из <файл>"
-#: builtin/ls-files.c:463
+#: builtin/ls-files.c:543
msgid "read additional per-directory exclude patterns in <file>"
msgstr "прочитать дополнительные покаталожные шаблоны исключения из <файл>"
-#: builtin/ls-files.c:465
+#: builtin/ls-files.c:545
msgid "add the standard git exclusions"
msgstr "добавить стандартные исключения git"
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:548
msgid "make the output relative to the project top directory"
msgstr "выводить пути относительно корневого каталога проекта"
-#: builtin/ls-files.c:471
+#: builtin/ls-files.c:551
+msgid "recurse through submodules"
+msgstr "рекурсивно по подмодулям"
+
+#: builtin/ls-files.c:553
msgid "if any <file> is not in the index, treat this as an error"
msgstr "если какой-либо <файл> не в индексе, считать это ошибкой"
-#: builtin/ls-files.c:472
+#: builtin/ls-files.c:554
msgid "tree-ish"
msgstr "указатель-дерева"
-#: builtin/ls-files.c:473
+#: builtin/ls-files.c:555
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "притвориться, что пути удалены, т.к. <указатель-дерева> еще существует"
-#: builtin/ls-files.c:475
+#: builtin/ls-files.c:557
msgid "show debugging data"
msgstr "показать отладочную информацию"
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr "вывести полное дерево; не только текущий каталог (включает в себя --full-name)"
-#: builtin/merge.c:45
+#: builtin/merge.c:46
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<опции>] [<коммит>…]"
-#: builtin/merge.c:46
+#: builtin/merge.c:47
msgid "git merge [<options>] <msg> HEAD <commit>"
msgstr "git merge [<опции>] <сообщение> HEAD <коммит>"
-#: builtin/merge.c:47
+#: builtin/merge.c:48
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:101
+#: builtin/merge.c:102
msgid "switch `m' requires a value"
msgstr "при указании параметра «m» требуется указать значение"
-#: builtin/merge.c:138
+#: builtin/merge.c:139
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Не удалось найти стратегию слияния «%s».\n"
-#: builtin/merge.c:139
+#: builtin/merge.c:140
#, c-format
msgid "Available strategies are:"
msgstr "Доступные стратегии:"
-#: builtin/merge.c:144
+#: builtin/merge.c:145
#, c-format
msgid "Available custom strategies are:"
msgstr "Доступные пользовательские стратегии:"
-#: builtin/merge.c:194 builtin/pull.c:126
+#: builtin/merge.c:195 builtin/pull.c:127
msgid "do not show a diffstat at the end of the merge"
msgstr "не выводить статистику изменений после окончания слияния"
-#: builtin/merge.c:197 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:130
msgid "show a diffstat at the end of the merge"
msgstr "вывести статистику изменений после окончания слияния"
-#: builtin/merge.c:198 builtin/pull.c:132
+#: builtin/merge.c:199 builtin/pull.c:133
msgid "(synonym to --stat)"
msgstr "(синоним для --stat)"
-#: builtin/merge.c:200 builtin/pull.c:135
+#: builtin/merge.c:201 builtin/pull.c:136
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "добавить (максимум <n>) записей из короткого журнала в сообщение коммита у слияния"
-#: builtin/merge.c:203 builtin/pull.c:138
+#: builtin/merge.c:204 builtin/pull.c:139
msgid "create a single commit instead of doing a merge"
msgstr "создать один коммит, вместо выполнения слияния"
-#: builtin/merge.c:205 builtin/pull.c:141
+#: builtin/merge.c:206 builtin/pull.c:142
msgid "perform a commit if the merge succeeds (default)"
msgstr "сделать коммит, если слияние прошло успешно (по умолчанию)"
-#: builtin/merge.c:207 builtin/pull.c:144
+#: builtin/merge.c:208 builtin/pull.c:145
msgid "edit message before committing"
msgstr "отредактировать сообщение перед выполнением коммита"
-#: builtin/merge.c:208
+#: builtin/merge.c:209
msgid "allow fast-forward (default)"
msgstr "разрешить перемотку вперед (по умолчанию)"
-#: builtin/merge.c:210 builtin/pull.c:150
+#: builtin/merge.c:211 builtin/pull.c:151
msgid "abort if fast-forward is not possible"
msgstr "отменить выполнение слияния, если перемотка вперед невозможна"
-#: builtin/merge.c:214
-msgid "Verify that the named commit has a valid GPG signature"
-msgstr "Ð\9fроверить, что указанный коммит имеет верную электронную подпись GPG"
+#: builtin/merge.c:215 builtin/pull.c:154
+msgid "verify that the named commit has a valid GPG signature"
+msgstr "проверить, что указанный коммит имеет верную электронную подпись GPG"
-#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157
+#: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158
#: builtin/revert.c:89
msgid "strategy"
msgstr "стратегия"
-#: builtin/merge.c:216 builtin/pull.c:158
+#: builtin/merge.c:217 builtin/pull.c:159
msgid "merge strategy to use"
msgstr "используемая стратегия слияния"
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:218 builtin/pull.c:162
msgid "option=value"
msgstr "опция=значение"
-#: builtin/merge.c:218 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:163
msgid "option for selected merge strategy"
msgstr "опции для выбранной стратегии слияния"
-#: builtin/merge.c:220
+#: builtin/merge.c:221
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "сообщение коммита для слияния (для слияния без перемотки вперед)"
-#: builtin/merge.c:224
+#: builtin/merge.c:225
msgid "abort the current in-progress merge"
msgstr "отменить выполнение происходящего слияния"
-#: builtin/merge.c:226 builtin/pull.c:169
+#: builtin/merge.c:227 builtin/pull.c:170
msgid "allow merging unrelated histories"
msgstr "разрешить слияние несвязанных историй изменений"
-#: builtin/merge.c:254
+#: builtin/merge.c:255
msgid "could not run stash."
msgstr "не удалось выполнить stash."
-#: builtin/merge.c:259
+#: builtin/merge.c:260
msgid "stash failed"
msgstr "сбой при выполнении stash"
-#: builtin/merge.c:264
+#: builtin/merge.c:265
#, c-format
msgid "not a valid object: %s"
msgstr "неправильный объект: %s"
-#: builtin/merge.c:283 builtin/merge.c:300
+#: builtin/merge.c:284 builtin/merge.c:301
msgid "read-tree failed"
msgstr "сбой при выполнении read-tree"
-#: builtin/merge.c:330
+#: builtin/merge.c:331
msgid " (nothing to squash)"
msgstr " (нечего уплотнять)"
-#: builtin/merge.c:343
+#: builtin/merge.c:342
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Уплотнение коммита — не обновляя HEAD\n"
-#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987
-#: builtin/merge.c:1000
-#, c-format
-msgid "Could not write to '%s'"
-msgstr "Не удалось записать в «%s»"
-
-#: builtin/merge.c:375
-msgid "Writing SQUASH_MSG"
-msgstr "Запись SQUASH_MSG"
-
-#: builtin/merge.c:377
-msgid "Finishing SQUASH_MSG"
-msgstr "Завершение SQUASH_MSG"
-
-#: builtin/merge.c:400
+#: builtin/merge.c:392
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Нет сообщения слияния — не обновляем HEAD\n"
-#: builtin/merge.c:451
+#: builtin/merge.c:443
#, c-format
msgid "'%s' does not point to a commit"
msgstr "«%s» не указывает на коммит"
-#: builtin/merge.c:541
+#: builtin/merge.c:533
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Неправильная строка branch.%s.mergeoptions: %s"
-#: builtin/merge.c:660
+#: builtin/merge.c:652
msgid "Not handling anything other than two heads merge."
msgstr "Не обрабатываю ничего, кроме слияния двух указателей на ветки."
-#: builtin/merge.c:674
+#: builtin/merge.c:666
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Неизвестный параметр merge-recursive: -X%s"
-#: builtin/merge.c:687
+#: builtin/merge.c:681
#, c-format
msgid "unable to write %s"
msgstr "не удалось записать %s"
-#: builtin/merge.c:776
+#: builtin/merge.c:733
#, c-format
msgid "Could not read from '%s'"
msgstr "Не удалось прочесть из «%s»"
-#: builtin/merge.c:785
+#: builtin/merge.c:742
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr "Не выполняю коммит слияния; используйте «git commit» для завершения слияния.\n"
-#: builtin/merge.c:791
+#: builtin/merge.c:748
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"the commit.\n"
msgstr "Пожалуйста, введите сообщение коммита, для объяснения, зачем нужно\nэто слияние, особенно, если это слияние обновленной вышестоящей\nветки в тематическую ветку.\n\nСтроки, начинающиеся с «%c» будут проигнорированы, а пустое\nсообщение отменяет процесс коммита.\n"
-#: builtin/merge.c:815
+#: builtin/merge.c:772
msgid "Empty commit message."
msgstr "Пустое сообщение коммита."
-#: builtin/merge.c:835
+#: builtin/merge.c:792
#, c-format
msgid "Wonderful.\n"
msgstr "Прекрасно.\n"
-#: builtin/merge.c:890
+#: builtin/merge.c:847
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "Не удалось провести автоматическое слияние; исправьте конфликты и сделайте коммит результата.\n"
-#: builtin/merge.c:906
+#: builtin/merge.c:863
#, c-format
msgid "'%s' is not a commit"
msgstr "«%s» не является коммитом"
-#: builtin/merge.c:947
+#: builtin/merge.c:904
msgid "No current branch."
msgstr "Нет текущей ветки."
-#: builtin/merge.c:949
+#: builtin/merge.c:906
msgid "No remote for the current branch."
msgstr "У текущей ветки нет внешнего репозитория."
-#: builtin/merge.c:951
+#: builtin/merge.c:908
msgid "No default upstream defined for the current branch."
msgstr "Для текущей ветки не указана вышестоящая ветка по умолчанию."
-#: builtin/merge.c:956
+#: builtin/merge.c:913
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Не указана внешняя отслеживаемая ветка для %s на %s"
-#: builtin/merge.c:1091
+#: builtin/merge.c:960
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Плохое значение «%s» в переменной окружения «%s»"
+
+#: builtin/merge.c:1034
#, c-format
msgid "could not close '%s'"
msgstr "не удалось закрыть «%s»"
-#: builtin/merge.c:1219
+#: builtin/merge.c:1061
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr "не является тем, что можно слить в %s: %s"
+
+#: builtin/merge.c:1095
+msgid "not something we can merge"
+msgstr "не является тем, что можно слить"
+
+#: builtin/merge.c:1162
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Нет слияния, которое можно отменить (отсутствует файл MERGE_HEAD)."
-#: builtin/merge.c:1235
+#: builtin/merge.c:1178
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:1242
+#: builtin/merge.c:1185
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:1245
+#: builtin/merge.c:1188
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Вы не завершили копирование коммита (присутствует файл CHERRY_PICK_HEAD)."
-#: builtin/merge.c:1254
+#: builtin/merge.c:1197
msgid "You cannot combine --squash with --no-ff."
msgstr "Нельзя использовать одновременно --squash и --no-ff."
-#: builtin/merge.c:1262
+#: builtin/merge.c:1205
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Коммит не указан и параметр merge.defaultToUpstream не установлен."
-#: builtin/merge.c:1279
+#: builtin/merge.c:1222
msgid "Squash commit into empty head not supported yet"
msgstr "Уплотнение коммита в пустую ветку еще не поддерживается"
-#: builtin/merge.c:1281
+#: builtin/merge.c:1224
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Коммит, не являющийся перемоткой вперед, нет смысла делать в пустую ветку."
-#: builtin/merge.c:1286
+#: builtin/merge.c:1229
#, c-format
msgid "%s - not something we can merge"
msgstr "%s не является тем, что можно слить"
-#: builtin/merge.c:1288
+#: builtin/merge.c:1231
msgid "Can merge only exactly one commit into empty head"
msgstr "Можно только один коммит в пустую ветку."
-#: builtin/merge.c:1344
+#: builtin/merge.c:1287
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "Коммит %s содержит не доверенную GPG подпись, предположительно от %s."
-#: builtin/merge.c:1347
+#: builtin/merge.c:1290
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "Коммит %s содержит плохую GPG подпись, предположительно от %s."
-#: builtin/merge.c:1350
+#: builtin/merge.c:1293
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Коммит %s не содержит GPG подпись."
-#: builtin/merge.c:1353
+#: builtin/merge.c:1296
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Коммит %s содержит действительную GPG подпись, от %s.\n"
-#: builtin/merge.c:1415
+#: builtin/merge.c:1358
msgid "refusing to merge unrelated histories"
msgstr "отказ слияния несвязанных историй изменений"
-#: builtin/merge.c:1439
+#: builtin/merge.c:1367
+msgid "Already up-to-date."
+msgstr "Уже обновлено."
+
+#: builtin/merge.c:1377
#, c-format
msgid "Updating %s..%s\n"
msgstr "Обновление %s..%s\n"
-#: builtin/merge.c:1476
+#: builtin/merge.c:1418
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Попытка тривиального слияния в индексе…\n"
-#: builtin/merge.c:1483
+#: builtin/merge.c:1425
#, c-format
msgid "Nope.\n"
msgstr "Не вышло.\n"
-#: builtin/merge.c:1515
+#: builtin/merge.c:1450
+msgid "Already up-to-date. Yeeah!"
+msgstr "Уже обновлено. Круто!"
+
+#: builtin/merge.c:1456
msgid "Not possible to fast-forward, aborting."
msgstr "Перемотка вперед невозможна, отмена."
-#: builtin/merge.c:1538 builtin/merge.c:1617
+#: builtin/merge.c:1479 builtin/merge.c:1558
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Перемотка дерева к исходному состоянию…\n"
-#: builtin/merge.c:1542
+#: builtin/merge.c:1483
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Попытка слияния с помощью стратегии %s…\n"
-#: builtin/merge.c:1608
+#: builtin/merge.c:1549
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Ни одна стратегия слияния не обработала слияние.\n"
-#: builtin/merge.c:1610
+#: builtin/merge.c:1551
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Сбой при слиянии с помощью стратегии %s.\n"
-#: builtin/merge.c:1619
+#: builtin/merge.c:1560
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Использую %s для подготовки ручного разрешения конфликтов.\n"
-#: builtin/merge.c:1631
+#: builtin/merge.c:1572
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "Автоматическое слияние прошло успешно; как и запрашивали, остановлено перед выполнением коммита\n"
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <ссылка> [<коммит>]"
-#: builtin/merge-base.c:214
+#: builtin/merge-base.c:217
msgid "output all common ancestors"
msgstr "вывести всех общих предков"
-#: builtin/merge-base.c:216
+#: builtin/merge-base.c:219
msgid "find ancestors for a single n-way merge"
msgstr "вывести предков для одного многоходового слияния"
-#: builtin/merge-base.c:218
+#: builtin/merge-base.c:221
msgid "list revs not reachable from others"
msgstr "вывести список редаций, которые не достижимы из друг друга"
-#: builtin/merge-base.c:220
+#: builtin/merge-base.c:223
msgid "is the first one ancestor of the other?"
msgstr "является первым предком второго указанного коммита?"
-#: builtin/merge-base.c:222
+#: builtin/merge-base.c:225
msgid "find where <commit> forked from reflog of <ref>"
msgstr "найти журнале ссылок <ссылка> где именно <коммит> разветвился"
msgid "set labels for file1/orig-file/file2"
msgstr "установить метки для файл1/ориг-файл/файл2"
+#: builtin/merge-recursive.c:45
+#, c-format
+msgid "unknown option %s"
+msgstr "неизвестная опция %s"
+
+#: builtin/merge-recursive.c:51
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "не удалось разобрать объект «%s»"
+
+#: builtin/merge-recursive.c:55
+#, 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."
+msgstr[2] "невозможно обработать больше %d баз. Игнорирую %s."
+msgstr[3] "невозможно обработать больше %d базы. Игнорирую %s."
+
+#: builtin/merge-recursive.c:63
+msgid "not handling anything other than two heads merge."
+msgstr "не обрабатываю ничего, кроме слияния двух указателей на ветки."
+
+#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "не удалось распознать ссылку «%s»"
+
+#: builtin/merge-recursive.c:77
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "Слияние %s и %s\n"
+
#: builtin/mktree.c:65
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
msgid "skip move/rename errors"
msgstr "пропускать ошибки при перемещении/переименовании"
-#: builtin/mv.c:152
+#: builtin/mv.c:155
#, c-format
msgid "destination '%s' is not a directory"
msgstr "целевой путь «%s» не является каталогом"
-#: builtin/mv.c:163
+#: builtin/mv.c:166
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Проверка переименования из «%s» в «%s»\n"
-#: builtin/mv.c:167
+#: builtin/mv.c:170
msgid "bad source"
msgstr "плохой источник"
-#: builtin/mv.c:170
+#: builtin/mv.c:173
msgid "can not move directory into itself"
msgstr "нельзя переместить каталог в самого себя"
-#: builtin/mv.c:173
+#: builtin/mv.c:176
msgid "cannot move directory over file"
msgstr "нельзя переместить каталог в файл"
-#: builtin/mv.c:182
+#: builtin/mv.c:185
msgid "source directory is empty"
msgstr "исходный каталог пуст"
-#: builtin/mv.c:207
+#: builtin/mv.c:210
msgid "not under version control"
msgstr "не под версионным контролем"
-#: builtin/mv.c:210
+#: builtin/mv.c:213
msgid "destination exists"
msgstr "целевой путь уже существует"
-#: builtin/mv.c:218
+#: builtin/mv.c:221
#, c-format
msgid "overwriting '%s'"
msgstr "перезапись «%s»"
-#: builtin/mv.c:221
+#: builtin/mv.c:224
msgid "Cannot overwrite"
msgstr "Не удалось перезаписать"
-#: builtin/mv.c:224
+#: builtin/mv.c:227
msgid "multiple sources for the same target"
msgstr "несколько источников для одного целевого пути"
-#: builtin/mv.c:226
+#: builtin/mv.c:229
msgid "destination directory does not exist"
msgstr "целевой каталог не существует"
-#: builtin/mv.c:233
+#: builtin/mv.c:236
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, откуда=%s, куда=%s"
-#: builtin/mv.c:254
+#: builtin/mv.c:257
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Переименование %s в %s\n"
-#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365
+#: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375
#, c-format
msgid "renaming '%s' failed"
msgstr "сбой при переименовании «%s»"
-#: builtin/name-rev.c:258
+#: builtin/name-rev.c:257
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<опции>] <коммит>…"
-#: builtin/name-rev.c:259
+#: builtin/name-rev.c:258
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<опции>] --all"
-#: builtin/name-rev.c:260
+#: builtin/name-rev.c:259
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<опции>] --stdin"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:311
msgid "print only names (no SHA-1)"
msgstr "выводить только имена (без SHA-1)"
-#: builtin/name-rev.c:313
+#: builtin/name-rev.c:312
msgid "only use tags to name the commits"
msgstr "использовать только метки для именования коммитов"
-#: builtin/name-rev.c:315
+#: builtin/name-rev.c:314
msgid "only use refs matching <pattern>"
msgstr "использовать только ссылки, соответствующие <шаблону> "
-#: builtin/name-rev.c:317
+#: builtin/name-rev.c:316
msgid "list all commits reachable from all refs"
msgstr "вывести список всех коммитов, достижимых со всех ссылок"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:317
msgid "read from stdin"
msgstr "прочитать из стандартного ввода"
-#: builtin/name-rev.c:319
+#: builtin/name-rev.c:318
msgid "allow to print `undefined` names (default)"
msgstr "разрешить вывод «undefined», если не найдено (по умолчанию)"
-#: builtin/name-rev.c:325
+#: builtin/name-rev.c:324
msgid "dereference tags in the input (internal use)"
msgstr "разыменовывать введенные метки (для внутреннего использования)"
msgid "git notes get-ref"
msgstr "git notes get-ref"
+#: builtin/notes.c:94
+msgid "Write/edit the notes for the following object:"
+msgstr "Записать/изменить заметки для следующего объекта:"
+
#: builtin/notes.c:147
#, c-format
msgid "unable to start 'show' for object '%s'"
msgid "failed to finish 'show' for object '%s'"
msgstr "не удалось завершить «show» для объекта «%s»"
-#: builtin/notes.c:174 builtin/tag.c:248
-#, c-format
-msgid "could not create file '%s'"
-msgstr "не удалось создать файл «%s»"
-
-#: builtin/notes.c:193
-msgid "Please supply the note contents using either -m or -F option"
-msgstr "Пожалуйста, укажите содержимое заметки, используя опцию -m или -F"
+#: builtin/notes.c:194
+msgid "please supply the note contents using either -m or -F option"
+msgstr "пожалуйста, укажите содержимое заметки, используя опцию -m или -F"
-#: builtin/notes.c:202
+#: builtin/notes.c:203
msgid "unable to write note object"
msgstr "не удалось записать объект заметки"
-#: builtin/notes.c:204
+#: builtin/notes.c:205
#, c-format
-msgid "The note contents have been left in %s"
-msgstr "Содержимое заметки осталось в %s"
+msgid "the note contents have been left in %s"
+msgstr "содержимое заметки осталось в %s"
-#: builtin/notes.c:232 builtin/tag.c:439
+#: builtin/notes.c:233 builtin/tag.c:439
#, c-format
msgid "cannot read '%s'"
msgstr "не удалось прочитать «%s»"
-#: builtin/notes.c:234 builtin/tag.c:442
+#: builtin/notes.c:235 builtin/tag.c:442
#, c-format
msgid "could not open or read '%s'"
msgstr "не удалось открыть или прочитать «%s»"
-#: builtin/notes.c:256
+#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307
+#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513
+#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659
+#, c-format
+msgid "failed to resolve '%s' as a valid ref."
+msgstr "не удалось разрешить «%s» как ссылку."
+
+#: builtin/notes.c:257
+#, c-format
+msgid "failed to read object '%s'."
+msgstr "не удалось прочитать объект «%s»."
+
+#: builtin/notes.c:261
+#, c-format
+msgid "cannot read note data from non-blob object '%s'."
+msgstr "не удалось прочитать данные заметки из недвоичного объекта «%s»."
+
+#: builtin/notes.c:301
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr "неправильная введенная строка: «%s»."
+
+#: builtin/notes.c:316
#, c-format
-msgid "Failed to read object '%s'."
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c пÑ\80оÑ\87иÑ\82аÑ\82Ñ\8c обÑ\8aекÑ\82 «%s»."
+msgid "failed to copy notes from '%s' to '%s'"
+msgstr "не Ñ\83далоÑ\81Ñ\8c Ñ\81копиÑ\80оваÑ\82Ñ\8c замеÑ\82кÑ\83 из «%s» в «%s»"
-#: builtin/notes.c:260
+#. TRANSLATORS: the first %s will be replaced by a
+#. git notes command: 'add', 'merge', 'remove', etc.
+#: builtin/notes.c:345
#, c-format
-msgid "Cannot read note data from non-blob object '%s'."
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c пÑ\80оÑ\87иÑ\82аÑ\82Ñ\8c даннÑ\8bе замеÑ\82ки из недвоиÑ\87ного обÑ\8aекÑ\82а «%s»."
+msgid "refusing to %s notes in %s (outside of refs/notes/)"
+msgstr "оÑ\82каз в пеÑ\80езапиÑ\81и %s замеÑ\82ок в %s (за пÑ\80еделами refs/notes/)"
-#: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
-#: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
-#: builtin/notes.c:946
+#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496
+#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652
+#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970
msgid "too many parameters"
msgstr "передано слишком много параметров"
-#: builtin/notes.c:375 builtin/notes.c:662
+#: builtin/notes.c:378 builtin/notes.c:665
#, c-format
-msgid "No note found for object %s."
-msgstr "Ð\9dе найдена заметка для объекта %s."
+msgid "no note found for object %s."
+msgstr "не найдена заметка для объекта %s."
-#: builtin/notes.c:396 builtin/notes.c:559
+#: builtin/notes.c:399 builtin/notes.c:562
msgid "note contents as a string"
msgstr "текстовое содержимое заметки"
-#: builtin/notes.c:399 builtin/notes.c:562
+#: builtin/notes.c:402 builtin/notes.c:565
msgid "note contents in a file"
msgstr "содержимое заметки в файле"
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:405 builtin/notes.c:568
msgid "reuse and edit specified note object"
msgstr "использовать и отредактировать указанный объект заметки"
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:408 builtin/notes.c:571
msgid "reuse specified note object"
msgstr "использовать указанный объект заметки"
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:411 builtin/notes.c:574
msgid "allow storing empty note"
msgstr "разрешить сохранение пустой заметки"
-#: builtin/notes.c:409 builtin/notes.c:480
+#: builtin/notes.c:412 builtin/notes.c:483
msgid "replace existing notes"
msgstr "заменить существующие заметки"
-#: builtin/notes.c:434
+#: builtin/notes.c:437
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr "Не удалось добавить заметку. Найдена существующая заметка у объекта %s. Используйте параметр «-f» для перезаписи существующих заметок."
-#: builtin/notes.c:449 builtin/notes.c:528
+#: builtin/notes.c:452 builtin/notes.c:531
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Перезапись существующих заметок у объекта %s\n"
-#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886
+#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889
#, c-format
msgid "Removing note for object %s\n"
msgstr "Удаление заметки у объекта %s\n"
-#: builtin/notes.c:481
+#: builtin/notes.c:484
msgid "read objects from stdin"
msgstr "прочитать объекты из стандартного ввода"
-#: builtin/notes.c:483
+#: builtin/notes.c:486
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "загрузить настройки перезаписи для команды <команда> (включает в себя --stdin)"
-#: builtin/notes.c:501
+#: builtin/notes.c:504
msgid "too few parameters"
msgstr "передано слишком мало параметров"
-#: builtin/notes.c:522
+#: builtin/notes.c:525
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite"
" existing notes"
msgstr "Не удалось скопировать заметку. Найдена существующая заметка у объекта %s. Используйте параметр «-f» для перезаписи существующих заметок."
-#: builtin/notes.c:534
+#: builtin/notes.c:537
#, c-format
-msgid "Missing notes on source object %s. Cannot copy."
-msgstr "Ð\9dет заметок у исходного объекта %s. Нельзя скопировать."
+msgid "missing notes on source object %s. Cannot copy."
+msgstr "нет заметок у исходного объекта %s. Нельзя скопировать."
-#: builtin/notes.c:586
+#: builtin/notes.c:589
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
msgstr "Опции -m/-F/-c/-C для подкоманды «edit» устарели.\nИспользуйте вместо них «git notes add -f -m/-F/-c/-C».\n"
-#: builtin/notes.c:768
+#: builtin/notes.c:685
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr "не удалось удалить ссылку NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:687
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr "не удалось удалить ссылку NOTES_MERGE_REF"
+
+#: builtin/notes.c:689
+msgid "failed to remove 'git notes merge' worktree"
+msgstr "не удалось удалить рабочий каталог «git notes merge»"
+
+#: builtin/notes.c:709
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr "не удалось прочитать ссылку NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:711
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr "не удалось найти коммит из NOTES_MERGE_PARTIAL."
+
+#: builtin/notes.c:713
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr "не удалось разобрать коммит из NOTES_MERGE_PARTIAL."
+
+#: builtin/notes.c:726
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr "не удалось разрешить NOTES_MERGE_REF"
+
+#: builtin/notes.c:729
+msgid "failed to finalize notes merge"
+msgstr "не удалось завершить слиние заметок"
+
+#: builtin/notes.c:755
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr "неизвестная стратегия слияния заметок %s"
+
+#: builtin/notes.c:771
msgid "General options"
msgstr "Общие опции"
-#: builtin/notes.c:770
+#: builtin/notes.c:773
msgid "Merge options"
msgstr "Опции слияния"
-#: builtin/notes.c:772
+#: builtin/notes.c:775
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:774
+#: builtin/notes.c:777
msgid "Committing unmerged notes"
msgstr "Коммит не слитых заметок"
-#: builtin/notes.c:776
+#: builtin/notes.c:779
msgid "finalize notes merge by committing unmerged notes"
msgstr "завершить слияние заметок коммитом не слитых заметок"
-#: builtin/notes.c:778
+#: builtin/notes.c:781
msgid "Aborting notes merge resolution"
msgstr "Отмена разрешения слияния заметок"
-#: builtin/notes.c:780
+#: builtin/notes.c:783
msgid "abort notes merge"
msgstr "отменить слияние заметок"
-#: builtin/notes.c:857
+#: builtin/notes.c:794
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr "нельзя использовать одновременно --commit, --abort и -s/--strategy"
+
+#: builtin/notes.c:799
+msgid "must specify a notes ref to merge"
+msgstr "вы должны указать ссылку заметки для слияния"
+
+#: builtin/notes.c:823
+#, c-format
+msgid "unknown -s/--strategy: %s"
+msgstr "неизвестный параметр для -s/--strategy: %s"
+
+#: builtin/notes.c:860
+#, c-format
+msgid "a notes merge into %s is already in-progress at %s"
+msgstr "слияние заметок в %s уже выполняется на %s"
+
+#: builtin/notes.c:863
+#, c-format
+msgid "failed to store link to current notes ref (%s)"
+msgstr "не удалось сохранить адрес текущей ссылки на заметку (%s)"
+
+#: builtin/notes.c:865
#, c-format
-msgid "A notes merge into %s is already in-progress at %s"
-msgstr "Слияние заметок в %s уже выполняется на %s"
+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"
-#: builtin/notes.c:884
+#: builtin/notes.c:887
#, c-format
msgid "Object %s has no note\n"
msgstr "У объекта %s нет заметки\n"
-#: builtin/notes.c:896
+#: builtin/notes.c:899
msgid "attempt to remove non-existent note is not an error"
msgstr "попытка удаления несуществующей заметки не является ошибкой"
-#: builtin/notes.c:899
+#: builtin/notes.c:902
msgid "read object names from the standard input"
msgstr "прочитать имена объектов из стандартного ввода"
-#: builtin/notes.c:980
+#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
+msgid "do not remove, show only"
+msgstr "не удалять, только показать список"
+
+#: builtin/notes.c:941
+msgid "report pruned notes"
+msgstr "вывести список удаленных заметок"
+
+#: builtin/notes.c:983
msgid "notes-ref"
msgstr "ссылка-на-заметку"
-#: builtin/notes.c:981
+#: builtin/notes.c:984
msgid "use notes from <notes-ref>"
msgstr "использовать заметку из <ссылка-на-заметку>"
-#: builtin/notes.c:1016 builtin/remote.c:1628
+#: builtin/notes.c:1019
#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "Ð\9dеизвестная подкоманда: %s"
+msgid "unknown subcommand: %s"
+msgstr "неизвестная подкоманда: %s"
-#: builtin/pack-objects.c:28
+#: builtin/pack-objects.c:29
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr "git pack-objects --stdout [<опции>…] [< <список-ссылок> | < <список-объектов>]"
-#: builtin/pack-objects.c:29
+#: builtin/pack-objects.c:30
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr "git pack-objects [<опции>…] <имя-базы> [< <список-ссылок> | < <список-объектов>]"
-#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
+#: builtin/pack-objects.c:179 builtin/pack-objects.c:182
#, c-format
msgid "deflate error (%d)"
msgstr "ошибка сжатия (%d)"
-#: builtin/pack-objects.c:763
+#: builtin/pack-objects.c:768
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr "отключение записи битовых карт, так как карты были разбиты на части из-за pack.packSizeLimit"
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:781
msgid "Writing objects"
msgstr "Запись объектов"
-#: builtin/pack-objects.c:1017
+#: builtin/pack-objects.c:1070
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "отключение записи битовых карт, так как некоторые объекты не были упакованы"
-#: builtin/pack-objects.c:2177
+#: builtin/pack-objects.c:2346
msgid "Compressing objects"
msgstr "Сжатие объектов"
-#: builtin/pack-objects.c:2563
+#: builtin/pack-objects.c:2759
#, c-format
msgid "unsupported index version %s"
msgstr "неподдерживаемая версия индекса %s"
-#: builtin/pack-objects.c:2567
+#: builtin/pack-objects.c:2763
#, c-format
msgid "bad index version '%s'"
msgstr "плохая версия индекса «%s»"
-#: builtin/pack-objects.c:2597
+#: builtin/pack-objects.c:2793
msgid "do not show progress meter"
msgstr "не выводить прогресс выполнения"
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2795
msgid "show progress meter"
msgstr "показать прогресс выполнения"
-#: builtin/pack-objects.c:2601
+#: builtin/pack-objects.c:2797
msgid "show progress meter during object writing phase"
msgstr "показать прогресс выполнения во время записи объектов"
-#: builtin/pack-objects.c:2604
+#: builtin/pack-objects.c:2800
msgid "similar to --all-progress when progress meter is shown"
msgstr "похоже на --all-progress при включенном прогрессе выполнения"
-#: builtin/pack-objects.c:2605
+#: builtin/pack-objects.c:2801
msgid "version[,offset]"
msgstr "версия[,смещение]"
-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2802
msgid "write the pack index file in the specified idx format version"
msgstr "записать файл индекса пакета в указанной версии формата"
-#: builtin/pack-objects.c:2609
+#: builtin/pack-objects.c:2805
msgid "maximum size of each output pack file"
msgstr "максимальный размер каждого выходного файла пакета"
-#: builtin/pack-objects.c:2611
+#: builtin/pack-objects.c:2807
msgid "ignore borrowed objects from alternate object store"
msgstr "игнорировать чужие объекты, взятые из альтернативного хранилища объектов"
-#: builtin/pack-objects.c:2613
+#: builtin/pack-objects.c:2809
msgid "ignore packed objects"
msgstr "игнорировать упакованные объекты"
-#: builtin/pack-objects.c:2615
+#: builtin/pack-objects.c:2811
msgid "limit pack window by objects"
msgstr "ограничить окно пакета по количеству объектов"
-#: builtin/pack-objects.c:2617
+#: builtin/pack-objects.c:2813
msgid "limit pack window by memory in addition to object limit"
msgstr "дополнительно к количеству объектов ограничить окно пакета по памяти"
-#: builtin/pack-objects.c:2619
+#: builtin/pack-objects.c:2815
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "максимальная разрешенная длина цепочки дельт в результирующем пакете"
-#: builtin/pack-objects.c:2621
+#: builtin/pack-objects.c:2817
msgid "reuse existing deltas"
msgstr "использовать повторно существующие дельты"
-#: builtin/pack-objects.c:2623
+#: builtin/pack-objects.c:2819
msgid "reuse existing objects"
msgstr "использовать повторно существующие объекты"
-#: builtin/pack-objects.c:2625
+#: builtin/pack-objects.c:2821
msgid "use OFS_DELTA objects"
msgstr "использовать объекты OFS_DELTA"
-#: builtin/pack-objects.c:2627
+#: builtin/pack-objects.c:2823
msgid "use threads when searching for best delta matches"
msgstr "использовать многопоточность при поиске лучших совпадений дельт"
-#: builtin/pack-objects.c:2629
+#: builtin/pack-objects.c:2825
msgid "do not create an empty pack output"
msgstr "не создавать пустые выходные пакеты"
-#: builtin/pack-objects.c:2631
+#: builtin/pack-objects.c:2827
msgid "read revision arguments from standard input"
msgstr "прочитать аргументы редакций из стандартного ввода"
-#: builtin/pack-objects.c:2633
+#: builtin/pack-objects.c:2829
msgid "limit the objects to those that are not yet packed"
msgstr "ограничиться объектами, которые еще не упакованы"
-#: builtin/pack-objects.c:2636
+#: builtin/pack-objects.c:2832
msgid "include objects reachable from any reference"
msgstr "включить объекты, которые достижимы по любой из ссылок"
-#: builtin/pack-objects.c:2639
+#: builtin/pack-objects.c:2835
msgid "include objects referred by reflog entries"
msgstr "включить объекты, на которые ссылаются записи журнала ссылок"
-#: builtin/pack-objects.c:2642
+#: builtin/pack-objects.c:2838
msgid "include objects referred to by the index"
msgstr "включить объекты, на которые ссылается индекс"
-#: builtin/pack-objects.c:2645
+#: builtin/pack-objects.c:2841
msgid "output pack to stdout"
msgstr "вывести пакет на стандартный вывод"
-#: builtin/pack-objects.c:2647
+#: builtin/pack-objects.c:2843
msgid "include tag objects that refer to objects to be packed"
msgstr "включить объекты меток, которые ссылаются на упаковываемые объекты"
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2845
msgid "keep unreachable objects"
msgstr "сохранять ссылки на недоступные объекты"
-#: builtin/pack-objects.c:2650 parse-options.h:142
-msgid "time"
-msgstr "вÑ\80емÑ\8f"
+#: builtin/pack-objects.c:2847
+msgid "pack loose unreachable objects"
+msgstr "паковаÑ\82Ñ\8c недоÑ\81Ñ\82ижимÑ\8bе обÑ\8aекÑ\82Ñ\8b"
-#: builtin/pack-objects.c:2651
+#: builtin/pack-objects.c:2849
msgid "unpack unreachable objects newer than <time>"
msgstr "распаковать недоступные объекты, которые новее, чем <время>"
-#: builtin/pack-objects.c:2654
+#: builtin/pack-objects.c:2852
msgid "create thin packs"
msgstr "создавать тонкие пакеты"
-#: builtin/pack-objects.c:2656
+#: builtin/pack-objects.c:2854
msgid "create packs suitable for shallow fetches"
msgstr "создавать пакеты, подходящие для частичных извлечений"
-#: builtin/pack-objects.c:2658
+#: builtin/pack-objects.c:2856
msgid "ignore packs that have companion .keep file"
msgstr "игнорировать пакеты, рядом с которыми лежит .keep файл"
-#: builtin/pack-objects.c:2660
+#: builtin/pack-objects.c:2858
msgid "pack compression level"
msgstr "уровень сжатия пакета"
-#: builtin/pack-objects.c:2662
+#: builtin/pack-objects.c:2860
msgid "do not hide commits by grafts"
msgstr "не скрывать коммиты сращениями"
-#: builtin/pack-objects.c:2664
+#: builtin/pack-objects.c:2862
msgid "use a bitmap index if available to speed up counting objects"
msgstr "по возможности использовать индекс в битовых картах, для ускорения подсчета объектов"
-#: builtin/pack-objects.c:2666
+#: builtin/pack-objects.c:2864
msgid "write a bitmap index together with the pack index"
msgstr "запись индекса в битовых картах вместе с индексом пакета"
-#: builtin/pack-objects.c:2757
+#: builtin/pack-objects.c:2993
msgid "Counting objects"
msgstr "Подсчет объектов"
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire <время>] [--] [<имя-ветки>…]"
-#: builtin/prune.c:105 builtin/worktree.c:125
-msgid "do not remove, show only"
-msgstr "не удалять, только показать список"
-
-#: builtin/prune.c:106 builtin/worktree.c:126
+#: builtin/prune.c:106 builtin/worktree.c:128
msgid "report pruned objects"
msgstr "вывести список удаленных объектов"
-#: builtin/prune.c:109 builtin/worktree.c:128
+#: builtin/prune.c:109 builtin/worktree.c:130
msgid "expire objects older than <time>"
msgstr "удалить объекты старее чем <дата-окончания>"
msgid "cannot prune in a precious-objects repo"
msgstr "нельзя почистить неиспользуемые объекты в precious-objects репозитории"
-#: builtin/pull.c:72
+#: builtin/pull.c:51 builtin/pull.c:53
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr "Неправильное значение %s: %s"
+
+#: builtin/pull.c:73
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<опции>] [<репозиторий> [<спецификация-ссылки>…]]"
-#: builtin/pull.c:120
+#: builtin/pull.c:121
msgid "Options related to merging"
msgstr "Опции, связанные со слиянием"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "incorporate changes by rebasing rather than merging"
msgstr "забрать изменения с помощью перебазирования, а не слияния"
-#: builtin/pull.c:147 builtin/revert.c:105
+#: builtin/pull.c:148 builtin/revert.c:101
msgid "allow fast-forward"
msgstr "разрешить перемотку вперед"
-#: builtin/pull.c:153
-msgid "verify that the named commit has a valid GPG signature"
-msgstr "проверить, что указанный коммит имеет верную электронную подпись GPG"
-
-#: builtin/pull.c:156
+#: builtin/pull.c:157
msgid "automatically stash/stash pop before and after rebase"
msgstr "автоматически выполнять stash/stash pop до и после перемещения"
-#: builtin/pull.c:172
+#: builtin/pull.c:173
msgid "Options related to fetching"
msgstr "Опции, связанные с извлечением изменений"
-#: builtin/pull.c:194
+#: builtin/pull.c:195
msgid "number of submodules pulled in parallel"
msgstr "количество подмодулей, которые будут получены парралельно"
-#: builtin/pull.c:283
+#: builtin/pull.c:284
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Неправильное значение для pull.ff: %s"
-#: builtin/pull.c:379
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr "Не удалось получить с перемещением: У вас есть непроиндексированные изменения."
-
-#: builtin/pull.c:385
-msgid "Additionally, your index contains uncommitted changes."
-msgstr "К тому же, в вашем индексе есть незакоммиченные изменения."
-
-#: builtin/pull.c:387
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr "Не удалось получить с перемещением: В вашем индексе есть незакоммиченные изменения."
-
-#: builtin/pull.c:463
+#: builtin/pull.c:397
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr "Нет претендентов для перемещения среди ссылок, которые вы только что получили."
-#: builtin/pull.c:465
+#: builtin/pull.c:399
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr "Нет претендентов для слияния среди ссылок, которые вы только что получили."
-#: builtin/pull.c:466
+#: builtin/pull.c:400
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr "Обычно это означает, что вы передали спецификацию ссылки с помощью шаблона и этот шаблон ни с чем не совпал на внешнем репозитории."
-#: builtin/pull.c:469
+#: builtin/pull.c:403
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"for your current branch, you must specify a branch on the command line."
msgstr "Вы попросили получить изменения со внешнего репозитория «%s», но не указали ветку. Так как это не репозиторий по умолчанию для вашей текущей ветки, вы должны указать ветку в командной строке."
-#: builtin/pull.c:474 git-parse-remote.sh:73
+#: builtin/pull.c:408 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Вы сейчас ни на одной из веток."
-#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
+#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Пожалуйста, укажите на какую ветку вы хотите переместить изменения."
-#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
+#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Пожалуйста, укажите с какой веткой вы хотите слить изменения."
-#: builtin/pull.c:479 builtin/pull.c:494
+#: builtin/pull.c:413 builtin/pull.c:428
msgid "See git-pull(1) for details."
msgstr "Для дополнительной информации, смотрите git-pull(1)."
-#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr "<внешний-репозиторий>"
-#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501
+#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<ветка>"
-#: builtin/pull.c:489 git-parse-remote.sh:75
+#: builtin/pull.c:423 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "У текущей ветки нет информации об отслеживании."
-#: builtin/pull.c:498 git-parse-remote.sh:95
+#: builtin/pull.c:432 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr "Если вы хотите указать информацию о отслеживаемой ветке, выполните:"
-#: builtin/pull.c:503
+#: builtin/pull.c:437
#, 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» из внешнего репозитория, но такая ссылка не была получена."
-#: builtin/pull.c:864
+#: builtin/pull.c:754
+msgid "ignoring --verify-signatures for rebase"
+msgstr "игнорирование --verify-signatures при перемещении"
+
+#: builtin/pull.c:801
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "--[no-]autostash можно использовать только вместе с --rebase."
-#: builtin/pull.c:872
+#: builtin/pull.c:809
msgid "Updating an unborn branch with changes added to the index."
msgstr "Обновление еще не начавшейся ветки с изменениями, добавленными в индекс."
-#: builtin/pull.c:900
+#: builtin/pull.c:812
+msgid "pull with rebase"
+msgstr "получение с перемещением"
+
+#: builtin/pull.c:813
+msgid "please commit or stash them."
+msgstr "сделайте коммит или спрячьте их."
+
+#: builtin/pull.c:838
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"commit %s."
msgstr "извлечение обновило указатель на вашу текущую ветку.\nперемотка вашего рабочего каталога\nс коммита %s."
-#: builtin/pull.c:905
+#: builtin/pull.c:843
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"to recover."
msgstr "Не удалось перемотать вперёд изменения в вашем рабочем каталоге.\nПосле того, как вы убедитесь, что вы сохранили всё необходимое из вывода\n$ git diff %s\n, запустите\n$ git reset --hard\nдля восстановления исходного состояния."
-#: builtin/pull.c:920
+#: builtin/pull.c:858
msgid "Cannot merge multiple branches into empty head."
msgstr "Нельзя слить несколько веток в пустой указатель на ветку."
-#: builtin/pull.c:924
+#: builtin/pull.c:862
msgid "Cannot rebase onto multiple branches."
msgstr "Невозможно переместить над несколькими ветками."
msgid "failed to push some refs to '%s'"
msgstr "не удалось отправить некоторые ссылки в «%s»"
-#: builtin/push.c:365
+#: builtin/push.c:366
#, c-format
msgid "bad repository '%s'"
msgstr "плохой репозитория «%s»"
-#: builtin/push.c:366
+#: builtin/push.c:367
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote repository using\n"
" git push <name>\n"
msgstr "Не настроена точка назначения для отправки.\nЛибо укажите URL с помощью командной строки, либо настройте внешний репозиторий с помощью\n\n git remote add <имя> <адрес>\n\nа затем отправьте изменения с помощью имени внешнего репозитория\n\n git push <имя>\n"
-#: builtin/push.c:381
+#: builtin/push.c:385
msgid "--all and --tags are incompatible"
msgstr "--all и --tags нельзя использовать одновременно"
-#: builtin/push.c:382
+#: builtin/push.c:386
msgid "--all can't be combined with refspecs"
msgstr "--all нельзя использовать вместе со спецификациями ссылок"
-#: builtin/push.c:387
+#: builtin/push.c:391
msgid "--mirror and --tags are incompatible"
msgstr "--mirror и --tags нельзя использовать одновременно"
-#: builtin/push.c:388
+#: builtin/push.c:392
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror нельзя использовать вместе со спецификациями ссылок"
-#: builtin/push.c:393
+#: builtin/push.c:397
msgid "--all and --mirror are incompatible"
msgstr "--all и --mirror нельзя использовать одновременно"
-#: builtin/push.c:505
+#: builtin/push.c:515
msgid "repository"
msgstr "репозиторий"
-#: builtin/push.c:506 builtin/send-pack.c:161
+#: builtin/push.c:516 builtin/send-pack.c:161
msgid "push all refs"
msgstr "отправить все ссылки"
-#: builtin/push.c:507 builtin/send-pack.c:163
+#: builtin/push.c:517 builtin/send-pack.c:163
msgid "mirror all refs"
msgstr "сделать зеркало всех ссылок"
-#: builtin/push.c:509
+#: builtin/push.c:519
msgid "delete refs"
msgstr "удалить ссылки"
-#: builtin/push.c:510
+#: builtin/push.c:520
msgid "push tags (can't be used with --all or --mirror)"
msgstr "отправить метки (нельзя использовать вместе с --all или --mirror)"
-#: builtin/push.c:513 builtin/send-pack.c:164
+#: builtin/push.c:523 builtin/send-pack.c:164
msgid "force updates"
msgstr "принудительное обновление"
-#: builtin/push.c:515 builtin/send-pack.c:175
+#: builtin/push.c:525 builtin/send-pack.c:175
msgid "refname>:<expect"
msgstr "имя-ссылки>:<ожидается"
-#: builtin/push.c:516 builtin/send-pack.c:176
+#: builtin/push.c:526 builtin/send-pack.c:176
msgid "require old value of ref to be at this value"
msgstr "требовать, чтобы старое значение ссылки было ожидаемым"
-#: builtin/push.c:519
+#: builtin/push.c:529
msgid "control recursive pushing of submodules"
msgstr "управление рекурсивной отправкой подмодулей"
-#: builtin/push.c:521 builtin/send-pack.c:169
+#: builtin/push.c:531 builtin/send-pack.c:169
msgid "use thin pack"
msgstr "использовать тонкие пакеты"
-#: builtin/push.c:522 builtin/push.c:523 builtin/send-pack.c:158
+#: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158
#: builtin/send-pack.c:159
msgid "receive pack program"
msgstr "путь к программе упаковки на сервере"
-#: builtin/push.c:524
+#: builtin/push.c:534
msgid "set upstream for git pull/status"
msgstr "установить вышестоящую ветку для git pull/status"
-#: builtin/push.c:527
+#: builtin/push.c:537
msgid "prune locally removed refs"
msgstr "почистить локально удаленные ссылки"
-#: builtin/push.c:529
+#: builtin/push.c:539
msgid "bypass pre-push hook"
-msgstr "пропустить перехватчик перед-отправкой"
+msgstr "пропустить перехватчик pre-push"
-#: builtin/push.c:530
+#: builtin/push.c:540
msgid "push missing but relevant tags"
msgstr "отправить пропущенные, но нужные метки"
-#: builtin/push.c:533 builtin/send-pack.c:166
+#: builtin/push.c:543 builtin/send-pack.c:166
msgid "GPG sign the push"
msgstr "подписать отправку с помощью GPG"
-#: builtin/push.c:535 builtin/send-pack.c:170
+#: builtin/push.c:545 builtin/send-pack.c:170
msgid "request atomic transaction on remote side"
msgstr "запросить выполнение атомарной транзакции на внешней стороне"
-#: builtin/push.c:549
+#: builtin/push.c:546
+msgid "server-specific"
+msgstr "зависит-от-сервера"
+
+#: builtin/push.c:546
+msgid "option to transmit"
+msgstr "передаваемые опции"
+
+#: builtin/push.c:560
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete несовместимо с --all, --mirror и --tags"
-#: builtin/push.c:551
+#: builtin/push.c:562
msgid "--delete doesn't make sense without any refs"
msgstr "--delete не имеет смысла без указания ссылок"
+#: builtin/push.c:579
+msgid "push options must not have new line characters"
+msgstr "опции для отправки не должны содержать символы перевода строк"
+
#: builtin/read-tree.c:37
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>)"
msgid "debug unpack-trees"
msgstr "отладка unpack-trees"
-#: builtin/receive-pack.c:25
+#: builtin/receive-pack.c:26
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <каталог-git>"
-#: builtin/receive-pack.c:1719
+#: builtin/receive-pack.c:793
+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 'receive.denyCurrentBranch' configuration variable to\n"
+"'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 "По умолчанию, обновлять текущую ветку в репозитории с рабочей\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:813
+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 "По умолчанию, удаление текущей ветки запрещено, так как последующий\n«git clone» не сможет получить никаких файлов, что приведет к путанице.\n\nВы можете установить значение опции «receive.denyDeleteCurrent»\nв «warn» или «ignore», во внешнем репозитории, чтобы разрешить\nудаление текущей ветки с или без предупреждающего сообщения.\n\nЧтобы пропустить это сообщение, вы можете установить значение опции\nв «refuse»."
+
+#: builtin/receive-pack.c:1883
msgid "quiet"
msgstr "тихий режим"
-#: builtin/receive-pack.c:1733
+#: builtin/receive-pack.c:1897
msgid "You must specify a directory."
msgstr "Вы должны указать каталог."
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "указание отслеживаемых веток имеет смысл только при зеркальном извлечении"
-#: builtin/remote.c:190 builtin/remote.c:633
+#: builtin/remote.c:190 builtin/remote.c:629
#, c-format
msgid "remote %s already exists."
msgstr "внешний репозиторий %s уже существует"
-#: builtin/remote.c:194 builtin/remote.c:637
+#: builtin/remote.c:194 builtin/remote.c:633
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "«%s» не является допустимым именем внешнего репозитория."
msgid "(delete)"
msgstr "(удаленная)"
-#: builtin/remote.c:626 builtin/remote.c:761 builtin/remote.c:858
+#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854
#, c-format
msgid "No such remote: %s"
msgstr "Нет такого внешнего репозитория: %s"
-#: builtin/remote.c:643
+#: builtin/remote.c:639
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Не удалось переименовать секцию конфигурации с «%s» на «%s»"
-#: builtin/remote.c:663
+#: builtin/remote.c:659
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\tPlease update the configuration manually if necessary."
msgstr "Не обновляю нестандартную спецификацию ссылки для извлечения\n\t%s\n\tПожалуйста, если требуется, обновите конфигурацию вручную."
-#: builtin/remote.c:699
+#: builtin/remote.c:695
#, c-format
msgid "deleting '%s' failed"
msgstr "не удалось удалить «%s»"
-#: builtin/remote.c:733
+#: builtin/remote.c:729
#, c-format
msgid "creating '%s' failed"
msgstr "не удалось создать «%s»"
-#: builtin/remote.c:796
+#: builtin/remote.c:792
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
msgstr[2] "Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, используйте:"
msgstr[3] "Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, используйте:"
-#: builtin/remote.c:810
+#: builtin/remote.c:806
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Не удалось удалить секцию файла конфигурации «%s»"
-#: builtin/remote.c:911
+#: builtin/remote.c:907
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " новая (следующее извлечение сохранит ее в remotes/%s)"
-#: builtin/remote.c:914
+#: builtin/remote.c:910
msgid " tracked"
msgstr " отслеживается"
-#: builtin/remote.c:916
+#: builtin/remote.c:912
msgid " stale (use 'git remote prune' to remove)"
msgstr " недействительна (используйте «git remote prune», чтобы удалить)"
-#: builtin/remote.c:918
+#: builtin/remote.c:914
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:959
+#: builtin/remote.c:955
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "неправильный параметр конфигурации branch.%s.merge; невозможно переместить более чем над 1 веткой"
-#: builtin/remote.c:967
+#: builtin/remote.c:963
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "перемещается интерактивно над внешней веткой %s"
-#: builtin/remote.c:971
+#: builtin/remote.c:964
+#, c-format
+msgid "rebases onto remote %s"
+msgstr "перемещается над внешней веткой %s"
+
+#: builtin/remote.c:967
#, c-format
msgid " merges with remote %s"
msgstr " будет слита с внешней веткой %s"
-#: builtin/remote.c:972
-msgid " and with remote"
-msgstr " и с внешней веткой"
-
-#: builtin/remote.c:974
+#: builtin/remote.c:970
#, c-format
msgid "merges with remote %s"
msgstr "будет слита с внешней веткой %s"
-#: builtin/remote.c:975
-msgid " and with remote"
-msgstr " и с внешней веткой"
+#: builtin/remote.c:973
+#, c-format
+msgid "%-*s and with remote %s\n"
+msgstr "%-*s и с внешней веткой %s\n"
-#: builtin/remote.c:1021
+#: builtin/remote.c:1016
msgid "create"
msgstr "создана"
-#: builtin/remote.c:1024
+#: builtin/remote.c:1019
msgid "delete"
msgstr "удалена"
-#: builtin/remote.c:1028
+#: builtin/remote.c:1023
msgid "up to date"
msgstr "уже актуальна"
-#: builtin/remote.c:1031
+#: builtin/remote.c:1026
msgid "fast-forwardable"
msgstr "возможна перемотка вперед"
-#: builtin/remote.c:1034
+#: builtin/remote.c:1029
msgid "local out of date"
msgstr "локальная ветка устарела"
-#: builtin/remote.c:1041
+#: builtin/remote.c:1036
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s будет принудительно отправлена в %-*s (%s)"
-#: builtin/remote.c:1044
+#: builtin/remote.c:1039
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s будет отправлена в %-*s (%s)"
-#: builtin/remote.c:1048
+#: builtin/remote.c:1043
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s будет принудительно отправлена в %s"
-#: builtin/remote.c:1051
+#: builtin/remote.c:1046
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s будет отправлена в %s"
-#: builtin/remote.c:1119
+#: builtin/remote.c:1114
msgid "do not query remotes"
msgstr "не опрашивать внешние репозитории"
-#: builtin/remote.c:1146
+#: builtin/remote.c:1141
#, c-format
msgid "* remote %s"
msgstr "* внешний репозиторий %s"
-#: builtin/remote.c:1147
+#: builtin/remote.c:1142
#, c-format
msgid " Fetch URL: %s"
msgstr " URL для извлечения: %s"
-#: builtin/remote.c:1148 builtin/remote.c:1301
+#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
msgid "(no URL)"
msgstr "(нет URL)"
#. TRANSLATORS: the colon ':' should align with
#. the one in " Fetch URL: %s" translation
-#: builtin/remote.c:1159 builtin/remote.c:1161
+#: builtin/remote.c:1154 builtin/remote.c:1156
#, c-format
msgid " Push URL: %s"
-msgstr " URL для отправки: %s"
+msgstr " URL для отправки: %s"
-#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167
+#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD ветка: %s"
-#: builtin/remote.c:1169
+#: builtin/remote.c:1158
+msgid "(not queried)"
+msgstr "(не запрашивался)"
+
+#: builtin/remote.c:1160
+msgid "(unknown)"
+msgstr "(неизвестно)"
+
+#: builtin/remote.c:1164
#, c-format
msgid " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD ветка (HEAD внешнего репозитория неоднозначный, может быть одним из):\n"
-#: builtin/remote.c:1181
+#: builtin/remote.c:1176
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
-msgstr[0] " Внешняя ветка:%s"
-msgstr[1] " Внешние ветки:%s"
-msgstr[2] " Внешние ветки:%s"
-msgstr[3] " Внешние ветки:%s"
+msgstr[0] " Внешняя ветка:%s"
+msgstr[1] " Внешние ветки:%s"
+msgstr[2] " Внешние ветки:%s"
+msgstr[3] " Внешние ветки:%s"
-#: builtin/remote.c:1184 builtin/remote.c:1211
+#: builtin/remote.c:1179 builtin/remote.c:1205
msgid " (status not queried)"
-msgstr " (Ñ\81Ñ\82аÑ\82Ñ\83Ñ\81 не запÑ\80оÑ\88ен)"
+msgstr " (Ñ\81Ñ\82аÑ\82Ñ\83Ñ\81 не запÑ\80аÑ\88ивалÑ\81Ñ\8f)"
-#: builtin/remote.c:1193
+#: builtin/remote.c:1188
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Локальная ветка, настроенная для «git pull»:"
msgstr[2] " Локальные ветки, настроенные для «git pull»:"
msgstr[3] " Локальные ветки, настроенные для «git pull»:"
-#: builtin/remote.c:1201
+#: builtin/remote.c:1196
msgid " Local refs will be mirrored by 'git push'"
msgstr " Локальные ссылки, зеркалируемые с помощью «git push»"
-#: builtin/remote.c:1208
+#: builtin/remote.c:1202
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[2] " Локальные ссылки, настроенные для «git push»%s:"
msgstr[3] " Локальные ссылки, настроенные для «git push»%s:"
-#: builtin/remote.c:1229
+#: builtin/remote.c:1223
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "установить refs/remotes/<имя>/HEAD в зависимости от внешнего репозитория"
-#: builtin/remote.c:1231
+#: builtin/remote.c:1225
msgid "delete refs/remotes/<name>/HEAD"
msgstr "удалить refs/remotes/<имя>/HEAD"
-#: builtin/remote.c:1246
+#: builtin/remote.c:1240
msgid "Cannot determine remote HEAD"
msgstr "Не удалось определить внешний HEAD"
-#: builtin/remote.c:1248
+#: builtin/remote.c:1242
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Несколько внешних HEAD веток. Укажите явно одну из них:"
-#: builtin/remote.c:1258
+#: builtin/remote.c:1252
#, c-format
msgid "Could not delete %s"
msgstr "Не удалось удалить %s"
-#: builtin/remote.c:1266
+#: builtin/remote.c:1260
#, c-format
msgid "Not a valid ref: %s"
-msgstr "Ð\9dепÑ\80авилÑ\8cная ссылка: %s"
+msgstr "Ð\9dедопÑ\83Ñ\81Ñ\82имая ссылка: %s"
-#: builtin/remote.c:1268
+#: builtin/remote.c:1262
#, c-format
msgid "Could not setup %s"
msgstr "Не удалось настроить %s"
-#: builtin/remote.c:1286
+#: builtin/remote.c:1280
#, c-format
msgid " %s will become dangling!"
msgstr " %s будет висящей веткой!"
-#: builtin/remote.c:1287
+#: builtin/remote.c:1281
#, c-format
msgid " %s has become dangling!"
msgstr " %s стала висящей веткой!"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1291
#, c-format
msgid "Pruning %s"
-msgstr "Удаление %s"
+msgstr "Ð\9eÑ\87иÑ\81Ñ\82ка %s"
-#: builtin/remote.c:1298
+#: builtin/remote.c:1292
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1314
+#: builtin/remote.c:1308
#, c-format
msgid " * [would prune] %s"
msgstr " * [будет удалена] %s"
-#: builtin/remote.c:1317
+#: builtin/remote.c:1311
#, c-format
msgid " * [pruned] %s"
msgstr " * [удалена] %s"
-#: builtin/remote.c:1362
+#: builtin/remote.c:1356
msgid "prune remotes after fetching"
msgstr "почистить внешние репозитории после извлечения"
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
#, c-format
msgid "No such remote '%s'"
msgstr "Нет такого внешнего репозитория «%s»"
-#: builtin/remote.c:1441
+#: builtin/remote.c:1435
msgid "add branch"
msgstr "добавить ветку"
-#: builtin/remote.c:1448
+#: builtin/remote.c:1442
msgid "no remote specified"
msgstr "не указан внешний репозиторий"
-#: builtin/remote.c:1465
+#: builtin/remote.c:1459
msgid "query push URLs rather than fetch URLs"
msgstr "запросить URL отправки, вместо URL извлечения"
-#: builtin/remote.c:1467
+#: builtin/remote.c:1461
msgid "return all URLs"
msgstr "вернуть все URL"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1489
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "URL не настроены для внешнего репозитория «%s»"
-#: builtin/remote.c:1521
+#: builtin/remote.c:1515
msgid "manipulate push URLs"
msgstr "управление URL отправки"
-#: builtin/remote.c:1523
+#: builtin/remote.c:1517
msgid "add URL"
msgstr "добавить URL"
-#: builtin/remote.c:1525
+#: builtin/remote.c:1519
msgid "delete URLs"
msgstr "удалить URL"
-#: builtin/remote.c:1532
+#: builtin/remote.c:1526
msgid "--add --delete doesn't make sense"
msgstr "--add нельзя использовать одновременно с --delete"
-#: builtin/remote.c:1573
+#: builtin/remote.c:1567
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Неправильный шаблон старого URL: %s"
-#: builtin/remote.c:1581
+#: builtin/remote.c:1575
#, c-format
msgid "No such URL found: %s"
msgstr "Не найдены совпадения URL: %s"
-#: builtin/remote.c:1583
+#: builtin/remote.c:1577
msgid "Will not delete all non-push URLs"
msgstr "Нельзя удалить все URL не-отправки"
-#: builtin/remote.c:1597
+#: builtin/remote.c:1591
msgid "be verbose; must be placed before a subcommand"
msgstr "быть многословнее; должно стоять перед подкомандой"
+#: builtin/remote.c:1622
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Неизвестная подкоманда: %s"
+
#: builtin/repack.c:17
msgid "git repack [<options>]"
msgstr "git repack [<опции>]"
-#: builtin/repack.c:159
+#: builtin/repack.c:160
msgid "pack everything in a single pack"
msgstr "упаковать всё в один пакет"
-#: builtin/repack.c:161
+#: builtin/repack.c:162
msgid "same as -a, and turn unreachable objects loose"
msgstr "тоже, что и -a, но дополнительно отбросить недостижимые объекты"
-#: builtin/repack.c:164
+#: builtin/repack.c:165
msgid "remove redundant packs, and run git-prune-packed"
msgstr "удалите лишние пакеты и запустите git-prune-packed"
-#: builtin/repack.c:166
+#: builtin/repack.c:167
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "передать опцию --no-reuse-delta в git-pack-objects"
-#: builtin/repack.c:168
+#: builtin/repack.c:169
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "передать опцию --no-reuse-object в git-pack-objects"
-#: builtin/repack.c:170
+#: builtin/repack.c:171
msgid "do not run git-update-server-info"
msgstr "не запускать git-update-server-info"
-#: builtin/repack.c:173
+#: builtin/repack.c:174
msgid "pass --local to git-pack-objects"
msgstr "передать опцию --local в git-pack-objects"
-#: builtin/repack.c:175
+#: builtin/repack.c:176
msgid "write bitmap index"
msgstr "запись индекса в битовых картах"
-#: builtin/repack.c:176
+#: builtin/repack.c:177
msgid "approxidate"
msgstr "примерная-дата"
-#: builtin/repack.c:177
+#: builtin/repack.c:178
msgid "with -A, do not loosen objects older than this"
msgstr "с опцией -A, не отбрасывать объекты старее, чем указано"
-#: builtin/repack.c:179
+#: builtin/repack.c:180
+msgid "with -a, repack unreachable objects"
+msgstr "с параметром -a, перепаковать недоступные объекты"
+
+#: builtin/repack.c:182
msgid "size of the window used for delta compression"
msgstr "размер окна, используемый для компрессии дельт"
-#: builtin/repack.c:180 builtin/repack.c:184
+#: builtin/repack.c:183 builtin/repack.c:187
msgid "bytes"
msgstr "количество-байт"
-#: builtin/repack.c:181
+#: builtin/repack.c:184
msgid "same as the above, but limit memory size instead of entries count"
msgstr "тоже, что и выше, но ограничить размер памяти, а не количество записей"
-#: builtin/repack.c:183
+#: builtin/repack.c:186
msgid "limits the maximum delta depth"
msgstr "ограничение на максимальную глубину дельт"
-#: builtin/repack.c:185
+#: builtin/repack.c:188
msgid "maximum size of each packfile"
msgstr "максимальный размер каждого из файлов пакета"
-#: builtin/repack.c:187
+#: builtin/repack.c:190
msgid "repack objects in packs marked with .keep"
msgstr "переупаковать объекты в пакеты, помеченные файлом .keep"
-#: builtin/repack.c:197
+#: builtin/repack.c:200
msgid "cannot delete packs in a precious-objects repo"
msgstr "нельзя удалять пакеты в precious-objects репозитории"
-#: builtin/repack.c:381
+#: builtin/repack.c:204
+msgid "--keep-unreachable and -A are incompatible"
+msgstr "--keep-unreachable и -A нельзя использовать одновременно"
+
+#: builtin/repack.c:391 builtin/worktree.c:115
#, c-format
-msgid "removing '%s' failed"
-msgstr "не удалось удалить «%s»"
+msgid "failed to remove '%s'"
+msgstr "сбой удаления «%s»"
#: builtin/replace.c:19
msgid "git replace [-f] <object> <replacement>"
msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<коммит>]"
#: builtin/reset.c:27
-msgid "git reset [-q]
<tree-ish> [--] <paths>..."
-msgstr "git reset [-q] <указатель-дерева> [--] <пути>…"
+msgid "git reset [-q]
[<tree-ish>] [--] <paths>..."
+msgstr "git reset [-q] [<указатель-дерева>] [--] <пути>…"
#: builtin/reset.c:28
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgid "Could not write new index file."
msgstr "Не удалось записать новый файл индекса."
-#: builtin/rev-list.c:350
+#: builtin/rev-list.c:354
msgid "rev-list does not support display of notes"
msgstr "rev-list не поддерживает отображение заметок"
-#: builtin/rev-parse.c:358
+#: builtin/rev-parse.c:386
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<опции>] -- [<аргументы>…]"
-#: builtin/rev-parse.c:363
+#: builtin/rev-parse.c:391
msgid "keep the `--` passed as an arg"
msgstr "передавать далее «--» как аргумент"
-#: builtin/rev-parse.c:365
+#: builtin/rev-parse.c:393
msgid "stop parsing after the first non-option argument"
msgstr "остановить разбор после первого аргумента не являющегося опцией"
-#: builtin/rev-parse.c:368
+#: builtin/rev-parse.c:396
msgid "output in stuck long form"
msgstr "выводить аргументы в длинном формате"
-#: builtin/rev-parse.c:499
+#: builtin/rev-parse.c:527
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
msgid "option for merge strategy"
msgstr "опция для стратегии слияния"
-#: builtin/revert.c:104
+#: builtin/revert.c:100
msgid "append commit name"
msgstr "добавить имя коммита"
-#: builtin/revert.c:106
+#: builtin/revert.c:102
msgid "preserve initially empty commits"
msgstr "сохранить изначально пустые коммиты"
-#: builtin/revert.c:107
+#: builtin/revert.c:103
msgid "allow commits with empty messages"
msgstr "разрешить коммиты с пустыми сообщениями"
-#: builtin/revert.c:108
+#: builtin/revert.c:104
msgid "keep redundant, empty commits"
msgstr "оставить избыточные, пустые коммиты"
-#: builtin/revert.c:112
-msgid "program error"
-msgstr "ошибка в программе"
-
-#: builtin/revert.c:197
+#: builtin/revert.c:192
msgid "revert failed"
msgstr "сбой обращения изменений коммита"
-#: builtin/revert.c:212
+#: builtin/revert.c:205
msgid "cherry-pick failed"
msgstr "сбой при копировании коммита"
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<база>]] [--list] [<ссылка>]"
-#: builtin/show-branch.c:640
+#: builtin/show-branch.c:375
+#, 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 ссылок"
+msgstr[2] "игнорирование %s; невозможно обработать больше %d ссылок"
+msgstr[3] "игнорирование %s; невозможно обработать больше %d ссылки"
+
+#: builtin/show-branch.c:541
+#, c-format
+msgid "no matching refs with %s"
+msgstr "нет совпадающих записей с %s"
+
+#: builtin/show-branch.c:639
msgid "show remote-tracking and local branches"
msgstr "показать список и отслеживаемых внешних и локальных веток"
-#: builtin/show-branch.c:642
+#: builtin/show-branch.c:641
msgid "show remote-tracking branches"
msgstr "показать список отслеживаемых внешних веток"
-#: builtin/show-branch.c:644
+#: builtin/show-branch.c:643
msgid "color '*!+-' corresponding to the branch"
msgstr "окрашивать «*!+-» в соответствии с веткой"
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show <n> more commits after the common ancestor"
msgstr "показать <n> коммитов после общего предка"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "synonym to more=-1"
msgstr "синоним для more=-1"
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
msgid "suppress naming strings"
msgstr "не выводить именованные строки"
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
msgid "include the current branch"
msgstr "включить в вывод текущую ветку"
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
msgid "name commits with their object names"
msgstr "именовать коммиты их именами объектов"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "show possible merge bases"
msgstr "вывести возможные базы слияния"
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "show refs unreachable from any other ref"
msgstr "вывести ссылки, недоступные из любых других ссылок"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "show commits in topological order"
msgstr "вывести коммиты в топологическом порядке"
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
msgid "show only commits not on the first branch"
msgstr "вывести только коммиты, отсутствующие в первой ветке"
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
msgid "show merges reachable from only one tip"
msgstr "вывести слияния, достижимые только из одной из верхушек"
-#: builtin/show-branch.c:666
+#: builtin/show-branch.c:665
msgid "topologically sort, maintaining date order where possible"
msgstr "топологическая сортировка, с сохранением порядка дат, если возможно"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
msgid "<n>[,<base>]"
msgstr "<n>[,<база>]"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
msgid "show <n> most recent ref-log entries starting at base"
msgstr "показать <n> последних записей в журнале ссылок, начиная с базы"
+#: builtin/show-branch.c:703
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-"
+"base"
+msgstr "--reflog несовместимо с --all, --remotes, --independent и --merge-base"
+
+#: builtin/show-branch.c:727
+msgid "no branches given, and HEAD is not valid"
+msgstr "не указаны ветки и HEAD не действительный"
+
+#: builtin/show-branch.c:730
+msgid "--reflog option needs one branch name"
+msgstr "параметр --reflog требует указания имени одной ветки"
+
+#: builtin/show-branch.c:733
+#, 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 записи могут быть показаны одновременно."
+msgstr[2] "только %d записей могут быть показаны одновременно."
+msgstr[3] "только %d записи могут быть показаны одновременно."
+
+#: builtin/show-branch.c:737
+#, c-format
+msgid "no such ref %s"
+msgstr "нет такой ссылки %s"
+
+#: builtin/show-branch.c:829
+#, c-format
+msgid "cannot handle more than %d rev."
+msgid_plural "cannot handle more than %d revs."
+msgstr[0] "невозможно обработать больше %d редакции."
+msgstr[1] "невозможно обработать больше %d редакций."
+msgstr[2] "невозможно обработать больше %d редакций."
+msgstr[3] "невозможно обработать больше %d редакции."
+
+#: builtin/show-branch.c:833
+#, c-format
+msgid "'%s' is not a valid ref."
+msgstr "«%s» не является допустимой ссылкой на коммит."
+
+#: builtin/show-branch.c:836
+#, c-format
+msgid "cannot find commit %s (%s)"
+msgstr "не удалось найти коммит %s (%s)"
+
#: builtin/show-ref.c:10
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | "
msgid "prepend comment character and space to each line"
msgstr "добавить перед каждой строкой символ комметария и пробел"
-#: builtin/submodule--helper.c:24
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1046
#, c-format
msgid "No such ref: %s"
msgstr "Нет такой ссылки: %s"
-#: builtin/submodule--helper.c:31
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Ожидалось полное имя ссылки, а получено %s"
msgid "cannot strip one component off url '%s'"
msgstr "не удалось обрезать один компонент url «%s»"
-#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405
-#: builtin/submodule--helper.c:486
+#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408
+#: builtin/submodule--helper.c:590
msgid "alternative anchor for relative paths"
msgstr "альтернативный символ для относительных путей"
-#: builtin/submodule--helper.c:283
+#: builtin/submodule--helper.c:287
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<путь>] [<путь>…]"
-#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340
+#: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "URL для подмодуля по пути «%s» не найден в .gitmodules"
-#: builtin/submodule--helper.c:366
+#: builtin/submodule--helper.c:369
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Сбой регистрации адреса для пути подмодуля «%s»"
-#: builtin/submodule--helper.c:370
+#: builtin/submodule--helper.c:373
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Подмодуль «%s» (%s) зарегистрирован по пути «%s»\n"
-#: builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:383
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "внимание: предполагаемый режим обновления для подмодуля «%s»\n"
-#: builtin/submodule--helper.c:387
+#: builtin/submodule--helper.c:390
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "Сбой регистрации режима обновления для пути подмодуля «%s»"
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:409
msgid "Suppress output for initializing a submodule"
msgstr "Не выводить информацию о инициализации подмодуля"
-#: builtin/submodule--helper.c:411
+#: builtin/submodule--helper.c:414
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<путь>]"
-#: builtin/submodule--helper.c:432
+#: builtin/submodule--helper.c:435
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <путь>"
-#: builtin/submodule--helper.c:438
+#: builtin/submodule--helper.c:441
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "не найдено соответствие подмодулей в .gitmodules для пути «%s»"
-#: builtin/submodule--helper.c:489
+#: builtin/submodule--helper.c:524 builtin/submodule--helper.c:527
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
+msgstr "подмодулю «%s» не удалось добавить альтернативу: %s"
+
+#: builtin/submodule--helper.c:563
+#, c-format
+msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+msgstr "Значение «%s» для параметра submodule.alternateErrorStrategy не рапознано"
+
+#: builtin/submodule--helper.c:570
+#, c-format
+msgid "Value '%s' for submodule.alternateLocation is not recognized"
+msgstr "Значение «%s» для параметра submodule.alternateLocation не рапознано"
+
+#: builtin/submodule--helper.c:593
msgid "where the new submodule will be cloned to"
msgstr "куда должен быть склонирован новый подмодуль"
-#: builtin/submodule--helper.c:492
+#: builtin/submodule--helper.c:596
msgid "name of the new submodule"
msgstr "имя нового подмодуля"
-#: builtin/submodule--helper.c:495
+#: builtin/submodule--helper.c:599
msgid "url where to clone the submodule from"
msgstr "url откуда должен был склонирован новый подмодуль"
-#: builtin/submodule--helper.c:501
+#: builtin/submodule--helper.c:605
msgid "depth for shallow clones"
msgstr "глубина для частичного клона"
-#: builtin/submodule--helper.c:507
+#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964
+msgid "force cloning progress"
+msgstr "принудительно выводить прогресс клонирования"
+
+#: builtin/submodule--helper.c:613
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
msgstr "git submodule--helper clone [--prefix=<путь>] [--quiet] [--reference <репозиторий>] [--name <имя>] [--depth <глубина>] --url <url> --path <путь>"
-#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538
+#: builtin/submodule--helper.c:638 builtin/submodule--helper.c:648
#, c-format
msgid "could not create directory '%s'"
msgstr "не удалось создать каталог «%s»"
-#: builtin/submodule--helper.c:534
+#: builtin/submodule--helper.c:644
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "не удалось клонировать «%s» в подмодуль по пути «%s»"
-#: builtin/submodule--helper.c:550
+#: builtin/submodule--helper.c:660
#, c-format
msgid "cannot open file '%s'"
msgstr "не удалось открыть файл «%s»"
-#: builtin/submodule--helper.c:555
+#: builtin/submodule--helper.c:665
#, c-format
msgid "could not close file %s"
msgstr "не удалось закрыть файл %s"
-#: builtin/submodule--helper.c:562
+#: builtin/submodule--helper.c:672
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "не удалось получить каталог для подмодуля «%s»"
-#: builtin/submodule--helper.c:609
+#: builtin/submodule--helper.c:726
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Подмодуль по пути «%s» не инициализирован"
-#: builtin/submodule--helper.c:613
+#: builtin/submodule--helper.c:730
msgid "Maybe you want to use 'update --init'?"
msgstr "Возможно, вы хотели использовать «update --init»?"
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:756
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Пропуск не слитого подмодуля %s"
-#: builtin/submodule--helper.c:660
+#: builtin/submodule--helper.c:777
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Пропуск подмодуля «%s»"
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:913
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
+msgstr "Не удалось клонировать «%s». Запланирована повторная попытка"
+
+#: builtin/submodule--helper.c:924
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
+msgstr "Не удалось клонировать «%s» со второй попытки, отмена"
+
+#: builtin/submodule--helper.c:945
msgid "path into the working tree"
msgstr "путь в рабочем каталоге"
-#: builtin/submodule--helper.c:771
+#: builtin/submodule--helper.c:948
msgid "path into the working tree, across nested submodule boundaries"
msgstr "путь в рабочем каталоге, в пределах границ подмодуля"
-#: builtin/submodule--helper.c:775
+#: builtin/submodule--helper.c:952
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout или none"
-#: builtin/submodule--helper.c:779
+#: builtin/submodule--helper.c:956
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "Создать частичный клон, ограниченный указанным количеством редакций"
-#: builtin/submodule--helper.c:782
+#: builtin/submodule--helper.c:959
msgid "parallel jobs"
msgstr "параллельные задачи"
-#: builtin/submodule--helper.c:783
+#: builtin/submodule--helper.c:961
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr "должен ли изначальный процесс клонирования следовать рекомендации о частичности"
+
+#: builtin/submodule--helper.c:962
msgid "don't print cloning progress"
msgstr "вы выводить прогресс клонирования"
-#: builtin/submodule--helper.c:788
+#: builtin/submodule--helper.c:969
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<путь>] [<путь>…]"
-#: builtin/submodule--helper.c:798
+#: builtin/submodule--helper.c:979
msgid "bad value for update parameter"
msgstr "плохое значение для параметра update"
-#: builtin/submodule--helper.c:855
+#: builtin/submodule--helper.c:1050
+#, 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:1100
msgid "submodule--helper subcommand must be called with a subcommand"
msgstr "подкоманда submodule--helper должна вызываться с указанием подкоманды"
-#: builtin/submodule--helper.c:862
+#: builtin/submodule--helper.c:1107
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "«%s» не является подкомандой submodule--helper"
msgid "Updated tag '%s' (was %s)\n"
msgstr "Метка «%s» обновлена (была %s)\n"
-#: builtin/unpack-objects.c:490
+#: builtin/unpack-objects.c:493
msgid "Unpacking objects"
msgstr "Распаковка объектов"
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:575
+#: builtin/update-index.c:564
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<опции>] [--] [<файл>…]"
-#: builtin/update-index.c:930
+#: builtin/update-index.c:919
msgid "continue refresh even when index needs update"
msgstr "продолжить обновление, даже если индекс требует обновления"
-#: builtin/update-index.c:933
+#: builtin/update-index.c:922
msgid "refresh: ignore submodules"
msgstr "обновление: игнорировать подмодули"
-#: builtin/update-index.c:936
+#: builtin/update-index.c:925
msgid "do not ignore new files"
msgstr "не игнорировать новые файлы"
-#: builtin/update-index.c:938
+#: builtin/update-index.c:927
msgid "let files replace directories and vice-versa"
msgstr "разрешить файлам заменять каталоги и наоборот"
-#: builtin/update-index.c:940
+#: builtin/update-index.c:929
msgid "notice files missing from worktree"
msgstr "замечать файлы отсутствующие в рабочем каталоге"
-#: builtin/update-index.c:942
+#: builtin/update-index.c:931
msgid "refresh even if index contains unmerged entries"
msgstr "обновить, даже если в индексе имеются не слитые записи"
-#: builtin/update-index.c:945
+#: builtin/update-index.c:934
msgid "refresh stat information"
msgstr "обновить информацию о статусе файлов"
-#: builtin/update-index.c:949
+#: builtin/update-index.c:938
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "как --refresh, но игнорировать настройку assume-unchanged"
-#: builtin/update-index.c:953
+#: builtin/update-index.c:942
msgid "<mode>,<object>,<path>"
msgstr "<режим доступа>,<объект>,<путь>"
-#: builtin/update-index.c:954
+#: builtin/update-index.c:943
msgid "add the specified entry to the index"
msgstr "добавить указанную запись в индекс"
-#: builtin/update-index.c:958
-msgid "(+/-)x"
-msgstr "(+/-)x"
-
-#: builtin/update-index.c:959
-msgid "override the executable bit of the listed files"
-msgstr "переопределить бит выполнения на указанных файлах"
-
-#: builtin/update-index.c:963
+#: builtin/update-index.c:952
msgid "mark files as \"not changing\""
msgstr "пометить файлы как «не измененные»"
-#: builtin/update-index.c:966
+#: builtin/update-index.c:955
msgid "clear assumed-unchanged bit"
msgstr "убрать пометку assumed-unchanged"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:958
msgid "mark files as \"index-only\""
msgstr "пометить файлы как «только в индексе»"
-#: builtin/update-index.c:972
+#: builtin/update-index.c:961
msgid "clear skip-worktree bit"
msgstr "убрать пометку skip-worktree"
-#: builtin/update-index.c:975
+#: builtin/update-index.c:964
msgid "add to index only; do not add content to object database"
msgstr "только добавить в индекс; не добавлять содержимое в базу данных объектов"
-#: builtin/update-index.c:977
+#: builtin/update-index.c:966
msgid "remove named paths even if present in worktree"
msgstr "удалить указанные пути, даже если они существуют в рабочем каталоге"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:968
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "с опцией --stdin: строки на вводе отделяются НУЛЕВЫМ байтом"
-#: builtin/update-index.c:981
+#: builtin/update-index.c:970
msgid "read list of paths to be updated from standard input"
msgstr "прочитать список обновляемых путей из стандартного ввода"
-#: builtin/update-index.c:985
+#: builtin/update-index.c:974
msgid "add entries from standard input to the index"
msgstr "добавить записи из стандартного ввода в индекс"
-#: builtin/update-index.c:989
+#: builtin/update-index.c:978
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "заново заполнить индекс #2 и #3 для указанных путей"
-#: builtin/update-index.c:993
+#: builtin/update-index.c:982
msgid "only update entries that differ from HEAD"
msgstr "обновить только записи, которые отличаются от HEAD"
-#: builtin/update-index.c:997
+#: builtin/update-index.c:986
msgid "ignore files missing from worktree"
msgstr "игнорировать файлы, отсутствующие в рабочем каталоге"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:989
msgid "report actions to standard output"
msgstr "вывести выполняемые действия на стандартный вывод"
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:991
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(для машинной обработки) забыть сохраненные неразрешенные конфликты"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:995
msgid "write index in this format"
msgstr "записать индекс в указанном формате"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:997
msgid "enable or disable split index"
msgstr "разрешить или запретить раздельный индекс"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:999
msgid "enable/disable untracked cache"
msgstr "включить/отключить кэш неотслеживаемых файлов"
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1001
msgid "test if the filesystem supports untracked cache"
msgstr "проверить, что файловая система поддерживает кэш неотслеживаемых файлов"
-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1003
msgid "enable untracked cache without testing the filesystem"
msgstr "включить кэш неотслеживаемых файлов без проверки файловой системы"
-#: builtin/update-index.c:1134
+#: builtin/update-index.c:1119
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
+msgstr "параметр core.untrackedCache установлен true; удалите или измените его, если вы действительно хотите удалить кэш неотслеживаемых файлов"
+
+#: builtin/update-index.c:1123
msgid "Untracked cache disabled"
msgstr "Кэш неотслеживаемых файлов отключен"
-#: builtin/update-index.c:1146
+#: builtin/update-index.c:1131
+msgid ""
+"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:1135
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Кэш неотслеживаемых файлов включен для «%s»"
msgstr "git worktree add [<опции>] <путь> [<ветка>]"
#: builtin/worktree.c:16
+msgid "git worktree list [<options>]"
+msgstr "git worktree list [<опции>]"
+
+#: builtin/worktree.c:17
+msgid "git worktree lock [<options>] <path>"
+msgstr "git worktree lock [<опции>] <путь>"
+
+#: builtin/worktree.c:18
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<опции>]"
-#: builtin/worktree.c:17
-msgid "git worktree list [<options>]"
-msgstr "git worktree list [<опции>]"
+#: builtin/worktree.c:19
+msgid "git worktree unlock <path>"
+msgstr "git worktree unlock <путь>"
-#: builtin/worktree.c:40
+#: builtin/worktree.c:42
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Удаление рабочих каталогов/%s: не является каталогом"
-#: builtin/worktree.c:46
+#: builtin/worktree.c:48
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Удаление рабочих каталогов/%s: файл gitdir не существует"
-#: builtin/worktree.c:51
+#: builtin/worktree.c:53
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Удаление рабочих каталогов/%s: не удалось прочитать файл gitdir (%s)"
-#: builtin/worktree.c:62
+#: builtin/worktree.c:64
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Удаление рабочих каталогов/%s: недействительный файл gitdir"
-#: builtin/worktree.c:78
+#: builtin/worktree.c:80
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "Удаление рабочих каталогов/%s: gitdir указывает на несуществующее расположение"
-#: builtin/worktree.c:113
-#, c-format
-msgid "failed to remove '%s'"
-msgstr "сбой удаления «%s»"
-
-#: builtin/worktree.c:202
+#: builtin/worktree.c:204
#, c-format
msgid "'%s' already exists"
msgstr "«%s» уже существует"
-#: builtin/worktree.c:234
+#: builtin/worktree.c:236
#, c-format
msgid "could not create directory of '%s'"
msgstr "не удалось создать каталог «%s»"
-#: builtin/worktree.c:270
+#: builtin/worktree.c:272
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Подготовка %s (идентификатор %s)"
-#: builtin/worktree.c:322
+#: builtin/worktree.c:323
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "переключиться на <ветка> даже если она уже активна в другом рабочесм каталоге"
-#: builtin/worktree.c:324
+#: builtin/worktree.c:325
msgid "create a new branch"
msgstr "создать новую ветку"
-#: builtin/worktree.c:326
+#: builtin/worktree.c:327
msgid "create or reset a branch"
msgstr "создать или перейти на ветку"
-#: builtin/worktree.c:327
-msgid "detach HEAD at named commit"
-msgstr "отсоединить HEAD на указанном коммите"
-
-#: builtin/worktree.c:328
+#: builtin/worktree.c:329
msgid "populate the new working tree"
msgstr "наполнить новый рабочий каталог"
-#: builtin/worktree.c:336
+#: builtin/worktree.c:337
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B и --detach нельзя использовать одновременно"
+#: builtin/worktree.c:470
+msgid "reason for locking"
+msgstr "причина блокировки"
+
+#: builtin/worktree.c:482 builtin/worktree.c:515
+#, c-format
+msgid "'%s' is not a working tree"
+msgstr "«%s» не является рабочим каталогом"
+
+#: builtin/worktree.c:484 builtin/worktree.c:517
+msgid "The main working tree cannot be locked or unlocked"
+msgstr "Главный рабочий каталог не может быть заблокирован или разблокирован"
+
+#: builtin/worktree.c:489
+#, c-format
+msgid "'%s' is already locked, reason: %s"
+msgstr "«%s» уже заблокирован, причина: %s"
+
+#: builtin/worktree.c:491
+#, c-format
+msgid "'%s' is already locked"
+msgstr "«%s» уже заблокирован"
+
+#: builtin/worktree.c:519
+#, c-format
+msgid "'%s' is not locked"
+msgstr "«%s» не заблокирован"
+
#: builtin/write-tree.c:13
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "git write-tree [--missing-ok] [--prefix=<префикс>/]"
msgid "only useful for debugging"
msgstr "используется только при отладке"
+#: upload-pack.c:22
+msgid "git upload-pack [<options>] <dir>"
+msgstr "git upload-pack [<опции>] <каталог>"
+
+#: upload-pack.c:1028
+msgid "quit after a single request/response exchange"
+msgstr "выход после обмена одним запросом/ответом"
+
+#: upload-pack.c:1030
+msgid "exit immediately after initial ref advertisement"
+msgstr "выходить сразу после начального объявления списка ссылок"
+
+#: upload-pack.c:1032
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr "не проверять <каталог>/.git/ если <каталог> не является каталогом Git"
+
+#: upload-pack.c:1034
+msgid "interrupt transfer after <n> seconds of inactivity"
+msgstr "прервать передачу после <кол> секунд простоя"
+
+#: credential-cache--daemon.c:223
+#, 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"
+
#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "вывод отладочных сообщений на stderr"
"to read about a specific subcommand or concept."
msgstr "«git help -а» и «git help -g» выводит список доступных подкоманд и\nнекоторые руководства по темам. Запустите «git help <команда>» или\n«git help <термин>», чтобы прочесть о конкретных подкоманде или теме."
-#: http.c:322
+#: http.c:342
+msgid "Delegation control is not supported with cURL < 7.22.0"
+msgstr "Делегация проверки полномочий не поддерживается с cURL < 7.22.0"
+
+#: http.c:351
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "Public key pinning не поддерживается с cURL < 7.44.0"
msgid "no-op (backward compatibility)"
msgstr "ничего не делает (оставлено для обратной совместимости)"
-#: parse-options.h:237
+#: parse-options.h:238
msgid "be more verbose"
msgstr "быть многословнее"
-#: parse-options.h:239
+#: parse-options.h:240
msgid "be more quiet"
msgstr "тихий режим"
-#: parse-options.h:245
+#: parse-options.h:246
msgid "use <n> digits to display SHA-1s"
msgstr "использовать <n> цифр для вывода SHA-1"
msgid "update the index with reused conflict resolution if possible"
msgstr "обновить индекс с помощью переиспользования разрешения конфликта, если возможно"
-#: git-bisect.sh:55
+#: git-bisect.sh:54
msgid "You need to start by \"git bisect start\""
msgstr "Вам нужно начать с помощью «git bisect start»"
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:61
+#: git-bisect.sh:60
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Вы уверены, что хотите, чтобы я сделал это [Y - да/n - нет]? "
-#: git-bisect.sh:122
+#: git-bisect.sh:121
#, sh-format
msgid "unrecognised option: '$arg'"
msgstr "неопознанная опция: «$arg»"
-#: git-bisect.sh:126
+#: git-bisect.sh:125
#, sh-format
msgid "'$arg' does not appear to be a valid revision"
msgstr "«$arg» не похоже на действительную редакцию"
-#: git-bisect.sh:155
+#: git-bisect.sh:154
msgid "Bad HEAD - I need a HEAD"
msgstr "Плохой указатель HEAD — Необходим указатель HEAD"
-#: git-bisect.sh:168
+#: git-bisect.sh:167
#, sh-format
msgid ""
"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
msgstr "Сбой перехода на «$start_head». Попробуйте выполнить «git bisect reset <существующая-ветка>»."
-#: git-bisect.sh:178
+#: git-bisect.sh:177
msgid "won't bisect on cg-seek'ed tree"
msgstr "нельзя выполнить двоичный поиск на дереве после cg-seek"
-#: git-bisect.sh:182
+#: git-bisect.sh:181
msgid "Bad HEAD - strange symbolic ref"
msgstr "Плохой указатель HEAD — странная символьная ссылка"
-#: git-bisect.sh:234
+#: git-bisect.sh:233
#, sh-format
msgid "Bad bisect_write argument: $state"
msgstr "Плохой аргумент bisect_write: $state"
-#: git-bisect.sh:263
+#: git-bisect.sh:262
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Плохой ввод номера редакции: $arg"
-#: git-bisect.sh:278
-msgid "Please call 'bisect_state' with at least one argument."
-msgstr "Пожалуйста, вызывайте «bisect_state» как минимум с одним аргументом."
+#: git-bisect.sh:281
+#, sh-format
+msgid "Bad rev input: $bisected_head"
+msgstr "Плохой ввод номера редакции: $bisected_head"
#: git-bisect.sh:290
#, sh-format
"Supported options are: --term-good|--term-old and --term-bad|--term-new."
msgstr "недопустимый аргумент $arg для «git bisect terms».\nПоддерживаемые параметры: --term-good|--term-old и --term-bad|--term-new."
-#: git-rebase.sh:57
+#: 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 "Должно быть octopus не подходит."
+
+#: 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-rebase.sh:56
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
"To check out the original branch and stop rebasing, run \"git rebase --abort\"."
msgstr "Когда вы разрешите этот конфликт, запустите «git rebase --continue».\nЕсли вы хотите пропустить этот патч, то запустите «git rebase --skip».\nЧтобы перейти на оригинальную ветку и остановить перемещение, запустите «git rebase --abort»."
-#: git-rebase.sh:168
+#: git-rebase.sh:156 git-rebase.sh:395
+#, sh-format
+msgid "Could not move back to $head_name"
+msgstr "Не удалось перейти назад на $head_name"
+
+#: git-rebase.sh:167
msgid "Applied autostash."
msgstr "Применено автоматическое прятанье."
-#: git-rebase.sh:171
+#: git-rebase.sh:170
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "Не удалось сохранить $stash_sha1"
-#: git-rebase.sh:172
+#: git-rebase.sh:171
msgid ""
"Applying autostash resulted in conflicts.\n"
"Your changes are safe in the stash.\n"
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr "Применение автоматического прятанья вызвало конфликты.\nВаши изменения спрятаны и в безопасности.\nВы можете выполнить «git stash pop» или «git stash drop» в любой момент.\n"
-#: git-rebase.sh:211
+#: git-rebase.sh:210
msgid "The pre-rebase hook refused to rebase."
-msgstr "Перехватчик пре-перемещения отказал в перемещении."
+msgstr "Перехватчик pre-rebase отказал в перемещении."
-#: git-rebase.sh:216
+#: git-rebase.sh:215
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "Похоже, git-am выполняется. Перемещение невозможно."
-#: git-rebase.sh:357
+#: git-rebase.sh:356
msgid "No rebase in progress?"
msgstr "Нет перемещения в процессе?"
-#: git-rebase.sh:368
+#: git-rebase.sh:367
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "Действие --edit-todo может использоваться только при интерактивном перемещении."
-#: git-rebase.sh:375
+#: git-rebase.sh:374
msgid "Cannot read HEAD"
msgstr "Не удалось прочитать HEAD"
-#: git-rebase.sh:378
+#: git-rebase.sh:377
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr "Вы должны отредактировать все\nконфликты слияния, а потом пометить\nих как разрешенные с помощью git add"
-#: git-rebase.sh:396
-#, sh-format
-msgid "Could not move back to $head_name"
-msgstr "Не удалось перейти назад на $head_name"
-
-#: git-rebase.sh:415
+#: git-rebase.sh:414
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
"valuable there."
msgstr "Похоже, каталог $state_dir_base уже существует и я предполагаю, что вы в процессе другого перемещения. Если это так, попробуйте\n\t$cmd_live_rebase\nЕсли нет\n\t$cmd_clear_stale_rebase\nи запустите меня снова. Я останавливаюсь, чтобы вы не потеряли что-то важное."
-#: git-rebase.sh:466
+#: git-rebase.sh:465
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "недействительная вышестоящая ветка $upstream_name"
-#: git-rebase.sh:490
+#: git-rebase.sh:489
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: имеется больше одной базы слияния"
-#: git-rebase.sh:493 git-rebase.sh:497
+#: git-rebase.sh:492 git-rebase.sh:496
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: нет базы слияния"
-#: git-rebase.sh:502
+#: git-rebase.sh:501
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Не указывает на действительный коммит: $onto_name"
-#: git-rebase.sh:525
+#: git-rebase.sh:524
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "критическая ошибка: нет такой ветки: $branch_name"
-#: git-rebase.sh:558
+#: git-rebase.sh:557
msgid "Cannot autostash"
msgstr "Не удалось выполнить автоматическое прятанье"
-#: git-rebase.sh:563
+#: git-rebase.sh:562
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Изменения автоматически спрятаны: $stash_abbrev"
-#: git-rebase.sh:567
+#: git-rebase.sh:566
msgid "Please commit or stash them."
msgstr "Сделайте коммит или спрячьте их."
-#: git-rebase.sh:587
+#: git-rebase.sh:586
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "Текущая ветка $branch_name уже свежая."
-#: git-rebase.sh:591
+#: git-rebase.sh:590
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "Текущая ветка $branch_name уже свежая, принудительное перемещение."
-#: git-rebase.sh:602
+#: git-rebase.sh:601
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Изменения от $mb до $onto:"
-#: git-rebase.sh:611
+#: git-rebase.sh:610
msgid "First, rewinding head to replay your work on top of it..."
msgstr "Сначала перематываем указатель текущего коммита, чтобы применить ваши изменения поверх него…"
-#: git-rebase.sh:621
+#: git-rebase.sh:620
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "Перемотана вперед $branch_name до $onto_name."
-#: git-stash.sh:51
+#: git-stash.sh:50
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash очистка с параметрами не реализована"
-#: git-stash.sh:74
+#: git-stash.sh:73
msgid "You do not have the initial commit yet"
msgstr "У вас еще нет начального коммита"
-#: git-stash.sh:89
+#: git-stash.sh:88
msgid "Cannot save the current index state"
msgstr "Не удалось сохранить текущее состояние индекса"
-#: git-stash.sh:124 git-stash.sh:137
+#: git-stash.sh:103
+msgid "Cannot save the untracked files"
+msgstr "Невозможно сохранить неотслеживаемые файлы"
+
+#: git-stash.sh:123 git-stash.sh:136
msgid "Cannot save the current worktree state"
msgstr "Не удалось сохранить текущее состояние рабочего каталога"
-#: git-stash.sh:141
+#: git-stash.sh:140
msgid "No changes selected"
msgstr "Изменения не выбраны"
-#: git-stash.sh:144
+#: git-stash.sh:143
msgid "Cannot remove temporary index (can't happen)"
msgstr "Не удалось удалить временный индекс (не должно случаться)"
-#: git-stash.sh:157
+#: git-stash.sh:156
msgid "Cannot record working tree state"
msgstr "Не удалось записать состояние рабочего каталога"
-#: git-stash.sh:189
+#: git-stash.sh:188
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "Не удалось обновить $ref_stash с помощью $w_commit"
#. $ git stash save --blah-blah 2>&1 | head -n 2
#. error: unknown option for 'stash save': --blah-blah
#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:239
+#: git-stash.sh:238
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
" To provide a message, use git stash save -- '$option'"
msgstr "ошибка: неизвестная опция для «stash save»: $option\n Для предоставления сообщения, используйте git stash save -- «$option»"
-#: git-stash.sh:260
+#: git-stash.sh:251
+msgid "Can't use --patch and --include-untracked or --all at the same time"
+msgstr "Нельзя использовать --patch и --include-untracked или --all одновременно"
+
+#: git-stash.sh:259
msgid "No local changes to save"
msgstr "Нет локальных изменений для сохранения"
-#: git-stash.sh:264
+#: git-stash.sh:263
msgid "Cannot initialize stash"
msgstr "Не удалось инициализировать спрятанные изменения"
-#: git-stash.sh:268
+#: git-stash.sh:267
msgid "Cannot save the current status"
msgstr "Не удалось сохранить текущий статус"
-#: git-stash.sh:286
+#: git-stash.sh:268
+#, sh-format
+msgid "Saved working directory and index state $stash_msg"
+msgstr "Рабочий каталог и состояние индекса сохранены $stash_msg"
+
+#: git-stash.sh:285
msgid "Cannot remove worktree changes"
msgstr "Не удалось удалить изменения рабочего каталога"
-#: git-stash.sh:405
+#: git-stash.sh:403
#, sh-format
msgid "unknown option: $opt"
msgstr "неизвестная опция: $opt"
-#: git-stash.sh:415
+#: git-stash.sh:416
msgid "No stash found."
msgstr "Не найдены спрятанные изменения."
-#: git-stash.sh:422
+#: git-stash.sh:423
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Передано слишком много редакций: $REV"
-#: git-stash.sh:428
+#: git-stash.sh:438
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference не является действительной ссылкой"
-#: git-stash.sh:456
+#: git-stash.sh:466
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "«$args» не похоже на коммит со спрятанными изменениями"
-#: git-stash.sh:467
+#: git-stash.sh:477
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "«$args» не является ссылкой на спрятанные изменения"
-#: git-stash.sh:475
+#: git-stash.sh:485
msgid "unable to refresh index"
msgstr "не удалось обновить индекс"
-#: git-stash.sh:479
+#: git-stash.sh:489
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Нельзя применить спрятанные изменения во время выполнения слияния"
-#: git-stash.sh:487
+#: git-stash.sh:497
msgid "Conflicts in index. Try without --index."
msgstr "Конфликты в индексе. Попробуйте без --index."
-#: git-stash.sh:489
+#: git-stash.sh:499
msgid "Could not save index tree"
msgstr "Не удалось сохранить дерево индекса"
-#: git-stash.sh:523
+#: git-stash.sh:508
+msgid "Could not restore untracked files from stash"
+msgstr "Невозможно восстановить неотслеживаемые файлы из спятанных файлов"
+
+#: git-stash.sh:533
msgid "Cannot unstage modified files"
msgstr "Невозможно убрать из индекса измененные файлы"
-#: git-stash.sh:538
+#: git-stash.sh:548
msgid "Index was not unstashed."
msgstr "Индекс не был извлечён из спрятанных изменений."
-#: git-stash.sh:561
+#: git-stash.sh:562
+msgid "The stash is kept in case you need it again."
+msgstr "Спрятанные изменения сохранены, на случай если они снова вам понадобятся."
+
+#: git-stash.sh:571
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Отброшено ${REV} ($s)"
-#: git-stash.sh:562
+#: git-stash.sh:572
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Не удалось отбросить запись из спрятанных изменений"
-#: git-stash.sh:570
+#: git-stash.sh:580
msgid "No branch name specified"
msgstr "Не указано имя ветки"
-#: git-stash.sh:642
+#: git-stash.sh:652
msgid "(To restore them type \"git stash apply\")"
msgstr "(Чтобы восстановить их, наберите «git stash apply»)"
-#: git-submodule.sh:219
+#: git-submodule.sh:184
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "Относительный путь можно использовать только находясь на вершине рабочего каталога"
-#: git-submodule.sh:229
+#: git-submodule.sh:194
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "URL репозитория: «$repo» должен быть абсолютным или начинаться с ./|../"
-#: git-submodule.sh:246
+#: git-submodule.sh:211
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "«$sm_path» уже содержится в индексе"
-#: git-submodule.sh:250
+#: git-submodule.sh:215
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
"Use -f if you really want to add it."
msgstr "Следующие пути игнорируются одним из ваших файлов .gitignore:\n$sm_path\nИспользуйте опцию -f, если вы действительно хотите его добавить."
-#: git-submodule.sh:268
+#: git-submodule.sh:233
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Добавляю существующий репозиторий из «$sm_path» в индекс"
-#: git-submodule.sh:270
+#: git-submodule.sh:235
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "«$sm_path» уже существует и не является действительным репозиторием git"
-#: git-submodule.sh:278
+#: git-submodule.sh:243
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr "Каталог git для «$sm_name» найден локально на внешних репозиториях:"
-#: git-submodule.sh:280
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from"
-msgstr "Если вы хотите переиспользовать локальный каталог git вместо повторного клонирования из"
-
-#: git-submodule.sh:282
-#, sh-format
-msgid ""
-"use the '--force' option. If the local git directory is not the correct repo"
-msgstr ", то используйте опцию «--force». Если локальный каталог git не является действительным репозиторием"
-
-#: git-submodule.sh:283
+#: git-submodule.sh:245
#, sh-format
msgid ""
-"or you are unsure what this means choose another name with the '--name' "
-"option."
-msgstr "или если вы не поняли, что это значит, то просто используйте другое имя с помощью опции «--name»."
+"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»."
-#: git-submodule.sh:285
+#: git-submodule.sh:251
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Восстановление локального каталога git для подмодуля «$sm_name»."
-#: git-submodule.sh:297
+#: git-submodule.sh:263
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Не удалось переключиться на состояние у подмодуля «$sm_path»"
-#: git-submodule.sh:302
+#: git-submodule.sh:268
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Сбой добавления подмодуля «$sm_path»"
-#: git-submodule.sh:311
+#: git-submodule.sh:277
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Не удалось зарегистрировать подмодуль «$sm_path»"
-#: git-submodule.sh:355
+#: git-submodule.sh:324
#, sh-format
msgid "Entering '$displaypath'"
msgstr "Заходим в «$displaypath»"
-#: git-submodule.sh:375
+#: git-submodule.sh:344
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr "Останавливаемся на «$displaypath»; сценарий вернул не нулевой код возврата."
-#: git-submodule.sh:448
+#: git-submodule.sh:415
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr "спецификацию пути и --all нельзя использовать одновременно"
-#: git-submodule.sh:453
+#: git-submodule.sh:420
#, sh-format
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Используйте «--all», если вы действительно хотите деинициализировать все подмодули"
-#: git-submodule.sh:470
-#, sh-format
-msgid "Submodule work tree '$displaypath' contains a .git directory"
-msgstr "Рабочий каталог подмодуля «$displaypath» содержит каталог .git"
-
-#: git-submodule.sh:471
+#: git-submodule.sh:440
#, sh-format
msgid ""
+"Submodule work tree '$displaypath' contains a .git directory\n"
"(use 'rm -rf' if you really want to remove it including all of its history)"
-msgstr "(используйте «rm -rf», если вы действительно хотите удалить его, включая всю его историю)"
+msgstr "Рабочий каталог подмодуля «$displaypath» уже содержит каталог .git\n(используйте «rm -rf», если вы действительно хотите удалить его со всей историей изменений)"
-#: git-submodule.sh:477
+#: git-submodule.sh:448
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to"
" discard them"
msgstr "Рабочий каталог подмодуля «$displaypath» содержит локальные изменения; используйте «-f», чтобы отменить их"
-#: git-submodule.sh:480
+#: git-submodule.sh:451
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Очищен каталог «$displaypath»"
-#: git-submodule.sh:481
+#: git-submodule.sh:452
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr "Не удалось удалить рабочий каталог подмодуля «$displaypath»"
-#: git-submodule.sh:484
+#: git-submodule.sh:455
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "Не удалось создать пустой каталог подмодуля «$displaypath»"
-#: git-submodule.sh:493
+#: git-submodule.sh:464
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr "Подмодуль «$name» ($url) был снят с регистрации по пути «$displaypath»"
-#: git-submodule.sh:635
+#: git-submodule.sh:617
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Не удалось найти текущую редакцию для подмодуля по пути «$displaypath»"
-#: git-submodule.sh:644
+#: git-submodule.sh:627
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Не удалось выполнить извлечение для подмодуля по пути «$sm_path»"
-#: git-submodule.sh:667
+#: git-submodule.sh:632
+#, 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:650
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Не удалось выполнить извлечение для подмодуля по пути «$displaypath»"
-#: git-submodule.sh:680
+#: git-submodule.sh:656
+#, sh-format
+msgid ""
+"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
+"Direct fetching of that commit failed."
+msgstr "Получен по пути подмодуля «$displaypath», но не содержит $sha1. Сбой при прямом получении коммита."
+
+#: git-submodule.sh:663
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Не удалось переключиться на состояние «$sha1» для подмодуля по пути «$displaypath»"
-#: git-submodule.sh:681
+#: git-submodule.sh:664
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Подмодуль по пути «$displaypath»: забрано состояние «$sha1»"
-#: git-submodule.sh:685
+#: git-submodule.sh:668
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "Не удалось переместить «$sha1» для подмодуля по пути «$displaypath»"
-#: git-submodule.sh:686
+#: git-submodule.sh:669
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Подмодуль по пути «$displaypath»: перемещен над «$sha1»"
-#: git-submodule.sh:691
+#: git-submodule.sh:674
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Не удалось выполнить слияние с «$sha1» для подмодуля по пути «$displaypath»"
-#: git-submodule.sh:692
+#: git-submodule.sh:675
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Подмодуль по пути «$displaypath»: слито с «$sha1»"
-#: git-submodule.sh:697
+#: git-submodule.sh:680
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr "Сбой выполнения «$command $sha1» для подмодуля по пути «$displaypath»"
-#: git-submodule.sh:698
+#: git-submodule.sh:681
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Подмодуль по пути «$displaypath»: «$command $sha1»"
-#: git-submodule.sh:729
+#: git-submodule.sh:712
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Не удалось выполнить рекурсивно для подмодуля по пути «$displaypath»"
-#: git-submodule.sh:837
+#: git-submodule.sh:820
msgid "The --cached option cannot be used with the --files option"
msgstr "Опцию --cached нельзя использовать одновременно с опцией --files"
-#: git-submodule.sh:889
+#: git-submodule.sh:872
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "неизвестный режим $mod_dst"
-#: git-submodule.sh:909
+#: git-submodule.sh:892
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Предупреждение: $display_name не содержит коммит $sha1_src"
-#: git-submodule.sh:912
+#: git-submodule.sh:895
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Предупреждение: $display_name не содержит коммит $sha1_dst"
-#: git-submodule.sh:915
+#: git-submodule.sh:898
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " Предупреждение: $display_name не содержит коммиты $sha1_src и $sha1_dst"
-#: git-submodule.sh:940
-msgid "blob"
-msgstr "двоичный объект"
-
-#: git-submodule.sh:1059
+#: git-submodule.sh:1045
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Не удалось выполнить рекурсивно для подмодуля по пути «$sm_path»"
-#: git-submodule.sh:1123
+#: git-submodule.sh:1112
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Синхронизация url для подмодуля «$displaypath»"
#, sh-format
msgid "See git-${cmd}(1) for details."
msgstr "Для дополнительной информации, смотрите git-${cmd}(1)."
+
+#: git-rebase--interactive.sh:140
+#, sh-format
+msgid "Rebasing ($new_count/$total)"
+msgstr "Перемещение ($new_count/$total)"
+
+#: git-rebase--interactive.sh:156
+msgid ""
+"\n"
+"Commands:\n"
+" p, pick = use commit\n"
+" r, reword = use commit, but edit the commit message\n"
+" e, edit = use commit, but stop for amending\n"
+" s, squash = use commit, but meld into previous commit\n"
+" f, fixup = like \"squash\", but discard this commit's log message\n"
+" x, exec = run command (the rest of the line) using shell\n"
+" d, drop = remove commit\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 = выполнить команду (остаток строки) с помощью командной оболочки\n d, drop = удалить коммит\n\nЭти строки могут быть перемещены; выполняются по очереди сверху вниз.\n"
+
+#: git-rebase--interactive.sh:171
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr "\nНе удаляйте строки. Используйте «drop», чтобы явно удалить коммит.\n"
+
+#: git-rebase--interactive.sh:175
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr "\nЕсли вы удалите строку здесь, то УКАЗАННЫЙ КОММИТ БУДЕТ УТЕРЯН.\n"
+
+#: git-rebase--interactive.sh:211
+#, sh-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr "Теперь вы можете исправить коммит с помощью\n\n\tgit commit --amend $gpg_sign_opt_quoted\n\nКак только вы будете довольны результатом, запустите\n\n\tgit rebase --continue"
+
+#: git-rebase--interactive.sh:236
+#, sh-format
+msgid "$sha1: not a commit that can be picked"
+msgstr "$sha1: не является коммитом, который можно взять"
+
+#: git-rebase--interactive.sh:275
+#, sh-format
+msgid "Invalid commit name: $sha1"
+msgstr "Недопустимое имя коммита: $sha1"
+
+#: git-rebase--interactive.sh:317
+msgid "Cannot write current commit's replacement sha1"
+msgstr "Не удалось записать замену sha1 текущего коммита"
+
+#: git-rebase--interactive.sh:369
+#, sh-format
+msgid "Fast-forward to $sha1"
+msgstr "Перемотка вперед до $sha1"
+
+#: git-rebase--interactive.sh:371
+#, sh-format
+msgid "Cannot fast-forward to $sha1"
+msgstr "Не удалось перемотать вперед до $sha1"
+
+#: git-rebase--interactive.sh:380
+#, sh-format
+msgid "Cannot move HEAD to $first_parent"
+msgstr "Не удалось переместить HEAD на $first_parent"
+
+#: git-rebase--interactive.sh:385
+#, sh-format
+msgid "Refusing to squash a merge: $sha1"
+msgstr "Нельзя уплотнить слияние: $sha1"
+
+#: git-rebase--interactive.sh:399
+#, sh-format
+msgid "Error redoing merge $sha1"
+msgstr "Ошибка при повторении слияния $sha1"
+
+#: git-rebase--interactive.sh:407
+#, sh-format
+msgid "Could not pick $sha1"
+msgstr "Не удалось взять $sha1"
+
+#: git-rebase--interactive.sh:416
+#, sh-format
+msgid "This is the commit message #${n}:"
+msgstr "Это сообщение коммита номер #${n}:"
+
+#: git-rebase--interactive.sh:421
+#, sh-format
+msgid "The commit message #${n} will be skipped:"
+msgstr "Сообщение коммита номер #${n} будет пропущено:"
+
+#: git-rebase--interactive.sh:432
+#, 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--interactive.sh:440
+#, sh-format
+msgid "Cannot write $fixup_msg"
+msgstr "Не удалось записать $fixup_msg"
+
+#: git-rebase--interactive.sh:443
+msgid "This is a combination of 2 commits."
+msgstr "Это объединение 2 коммитов"
+
+#: git-rebase--interactive.sh:444
+msgid "This is the 1st commit message:"
+msgstr "Это 1-е сообщение коммита:"
+
+#: git-rebase--interactive.sh:484 git-rebase--interactive.sh:527
+#: git-rebase--interactive.sh:530
+#, sh-format
+msgid "Could not apply $sha1... $rest"
+msgstr "Не удалось применить $sha1… $rest"
+
+#: git-rebase--interactive.sh:558
+#, sh-format
+msgid ""
+"Could not amend commit after successfully picking $sha1... $rest\n"
+"This is most likely due to an empty commit message, or the pre-commit hook\n"
+"failed. If the pre-commit hook failed, you may need to resolve the issue before\n"
+"you are able to reword the commit."
+msgstr "Не удолось исправить коммит после успешного перехода на $sha1… $rest\nЭто произошло, скорее всего, из-за пустого сообщения коммита или из-за перехватчика перед коммитом. Если же это произошло из-за перехватчика перед коммитом, то вам нужно решить с ним проблему и повторить попытку снова."
+
+#: git-rebase--interactive.sh:573
+#, sh-format
+msgid "Stopped at $sha1_abbrev... $rest"
+msgstr "Остановлено на $sha1_abbrev… $rest"
+
+#: git-rebase--interactive.sh:588
+#, sh-format
+msgid "Cannot '$squash_style' without a previous commit"
+msgstr "Нельзя сделать «$squash_style» без указания предыдущего коммита"
+
+#: git-rebase--interactive.sh:630
+#, sh-format
+msgid "Executing: $rest"
+msgstr "Выполнение: $rest"
+
+#: git-rebase--interactive.sh:638
+#, sh-format
+msgid "Execution failed: $rest"
+msgstr "Не удалось выполнить: $rest"
+
+#: git-rebase--interactive.sh:640
+msgid "and made changes to the index and/or the working tree"
+msgstr "и были сделаны изменения в индексе и/или в рабочем каталоге"
+
+#: git-rebase--interactive.sh:642
+msgid ""
+"You can fix the problem, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr "Вы можете исправить ошибку, а затем запустить\n\n\tgit rebase --continue"
+
+#. TRANSLATORS: after these lines is a command to be issued by the user
+#: git-rebase--interactive.sh:655
+#, sh-format
+msgid ""
+"Execution succeeded: $rest\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr "Успешное выполнение: $rest\nно остались изменения в индексе и/или в рабочем каталоге\nСделайте коммит или спрячьте ваши изменения, а затем выполните\n\n\tgit rebase --continue"
+
+#: git-rebase--interactive.sh:666
+#, sh-format
+msgid "Unknown command: $command $sha1 $rest"
+msgstr "Неопознанная команда: $command $sha1 $rest"
+
+#: git-rebase--interactive.sh:667
+msgid "Please fix this using 'git rebase --edit-todo'."
+msgstr "Пожалуйста исправьте это с помощью «git rebase --edit-todo»."
+
+#: git-rebase--interactive.sh:702
+#, sh-format
+msgid "Successfully rebased and updated $head_name."
+msgstr "Успешно перебазирован и обновлён $head_name."
+
+#: git-rebase--interactive.sh:749
+msgid "Could not skip unnecessary pick commands"
+msgstr "Не удалось пропустить ненужные команды отбора (pick)"
+
+#: git-rebase--interactive.sh:907
+#, sh-format
+msgid ""
+"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
+" - $line"
+msgstr "Внимание: не найден SHA-1 или он не указывает на коммит. На строке:\n - $line"
+
+#: git-rebase--interactive.sh:940
+#, sh-format
+msgid ""
+"Warning: the command isn't recognized in the following line:\n"
+" - $line"
+msgstr "Внимание: команда не распознана на строке:\n - $line"
+
+#: git-rebase--interactive.sh:979
+msgid "could not detach HEAD"
+msgstr "не удалось отделить HEAD"
+
+#: git-rebase--interactive.sh:1017
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):"
+msgstr "Внимание: некоторые коммиты могли быть отброшены по ошибке.\nОтброшенные коммиты (от новых к старым):"
+
+#: git-rebase--interactive.sh:1025
+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."
+msgstr "Для избежания этого сообщения, используйте «drop» чтобы явно удалить коммит.\n\nИспользуйте опцию «git config rebase.missingCommitsCheck» для изменения количества предупреждений.\nВозможные значения: ignore, warn, error."
+
+#: git-rebase--interactive.sh:1036
+#, sh-format
+msgid ""
+"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
+"Ignoring."
+msgstr "Нераспознанная настройка $check_level для опции rebase.missingCommitsCheck. Игнорирую."
+
+#: git-rebase--interactive.sh:1053
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase "
+"--continue'."
+msgstr "Вы можете исправить это с помощью «git rebase --edit-todo», а потом запустив «git rebase --continue»."
+
+#: git-rebase--interactive.sh:1054
+msgid "Or you can abort the rebase with 'git rebase --abort'."
+msgstr "Или вы можете отменить процесс перебазирования с помощью «git rebase --abort»."
+
+#: git-rebase--interactive.sh:1078
+msgid "Could not remove CHERRY_PICK_HEAD"
+msgstr "Не удалось удалить CHERRY_PICK_HEAD"
+
+#: git-rebase--interactive.sh:1083
+#, sh-format
+msgid ""
+"You have staged changes in your working tree.\n"
+"If these changes are meant to be\n"
+"squashed into the previous commit, run:\n"
+"\n"
+" git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+" git commit $gpg_sign_opt_quoted\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+" git rebase --continue\n"
+msgstr "У вас имеются проиндексированные изменения в рабочем каталоге.\nЕсли эти изменения должны быть объеденены с предыдущим коммитом, то запустите:\n\n git commit --amend $gpg_sign_opt_quoted\n\nЕсли же они должны быть помещены в новый коммит, то запустите:\n\n git commit $gpg_sign_opt_quoted\n\nВ любом случае, после того как вы закончите, продолжить перемещение можно выполнив:\n\n git rebase --continue\n"
+
+#: git-rebase--interactive.sh:1100
+msgid "Error trying to find the author identity to amend commit"
+msgstr "Произошла ошибка при поиске автора для исправления коммита"
+
+#: git-rebase--interactive.sh:1105
+msgid ""
+"You have uncommitted changes in your working tree. Please commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr "У вас имеются незакоммиченные изменения в рабочем каталоге. Сделайте коммит, а затем запустите «git rebase --continue» снова."
+
+#: git-rebase--interactive.sh:1110 git-rebase--interactive.sh:1114
+msgid "Could not commit staged changes."
+msgstr "Не удалось закоммитить проиндексированные изменения."
+
+#: git-rebase--interactive.sh:1138
+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--interactive.sh:1146 git-rebase--interactive.sh:1304
+msgid "Could not execute editor"
+msgstr "Не удалось запустить редактор"
+
+#: git-rebase--interactive.sh:1159
+#, sh-format
+msgid "Could not checkout $switch_to"
+msgstr "Не удалось перейти на версию $switch_to"
+
+#: git-rebase--interactive.sh:1164
+msgid "No HEAD?"
+msgstr "Нет указателя HEAD?"
+
+#: git-rebase--interactive.sh:1165
+#, sh-format
+msgid "Could not create temporary $state_dir"
+msgstr "Не удалось создать временный каталог $state_dir"
+
+#: git-rebase--interactive.sh:1167
+msgid "Could not mark as interactive"
+msgstr "Не удалось пометить как интерактивный"
+
+#: git-rebase--interactive.sh:1177 git-rebase--interactive.sh:1182
+msgid "Could not init rewritten commits"
+msgstr "Не удалось инициализировать перезаписанные коммиты"
+
+#: git-rebase--interactive.sh:1282
+#, 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--interactive.sh:1287
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr "\nНо если вы удалите все, то процесс перемещения будет будет прерван.\n\n"
+
+#: git-rebase--interactive.sh:1294
+msgid "Note that empty commits are commented out"
+msgstr "Заметьте, что пустые коммиты закомментированны"
+
+#: git-sh-setup.sh:89 git-sh-setup.sh:94
+#, sh-format
+msgid "usage: $dashless $USAGE"
+msgstr "использование: $dashless $USAGE"
+
+#: git-sh-setup.sh:190
+#, sh-format
+msgid "Cannot chdir to $cdup, the toplevel of the working tree"
+msgstr "Не удалось выполнить chdir в $cdup, вершину рабочего каталога"
+
+#: git-sh-setup.sh:199 git-sh-setup.sh:206
+#, sh-format
+msgid "fatal: $program_name cannot be used without a working tree."
+msgstr "критическая ошибка: $program_name нельзя использовать не имея рабочего каталога."
+
+#: git-sh-setup.sh:220
+msgid "Cannot rebase: You have unstaged changes."
+msgstr "Не удалось выполнить перемещение коммитов: У вас есть непроиндексированные изменения."
+
+#: git-sh-setup.sh:223
+msgid "Cannot rewrite branches: You have unstaged changes."
+msgstr "Не удалось выполнить перезапись веток: У вас есть непроиндексированные изменения."
+
+#: git-sh-setup.sh:226
+msgid "Cannot pull with rebase: You have unstaged changes."
+msgstr "Не удалось получить с перемещением: У вас есть непроиндексированные изменения."
+
+#: git-sh-setup.sh:229
+#, sh-format
+msgid "Cannot $action: You have unstaged changes."
+msgstr "Не удалось выполнить $action: У вас есть непроиндексированные изменения."
+
+#: git-sh-setup.sh:242
+msgid "Cannot rebase: Your index contains uncommitted changes."
+msgstr "Не удалось выполнить перемещение коммитов: В вашем индексе есть незакоммиченные изменения."
+
+#: git-sh-setup.sh:245
+msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+msgstr "Не удалось получить с перемещением: В вашем индексе есть незакоммиченные изменения."
+
+#: git-sh-setup.sh:248
+#, sh-format
+msgid "Cannot $action: Your index contains uncommitted changes."
+msgstr "Не удалось выполнить $action: В вашем индексе есть незакоммиченные изменения."
+
+#: git-sh-setup.sh:252
+msgid "Additionally, your index contains uncommitted changes."
+msgstr "К тому же, в вашем индексе есть незакоммиченные изменения."
+
+#: git-sh-setup.sh:372
+msgid "You need to run this command from the toplevel of the working tree."
+msgstr "Вам нужно запускать эту команду находясь на вершине рабочего каталога."
+
+#: git-sh-setup.sh:377
+msgid "Unable to determine absolute path of git directory"
+msgstr "Не удалось определить абсолютный путь к каталогу git"
#
msgid ""
msgstr ""
-"Project-Id-Version: git 2.10.0\n"
+"Project-Id-Version: git 2.11.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-08-27 23:21+0800\n"
-"PO-Revision-Date: 2016-08-27 20:41+0100\n"
+"POT-Creation-Date: 2016-11-25 22:50+0800\n"
+"PO-Revision-Date: 2016-11-25 22:59+0800\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Svenska <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
" git checkout -b <namn-på-ny-gren>\n"
"\n"
-#: archive.c:12
-msgid "git archive [<options>] <tree-ish> [<path>...]"
-msgstr "git archive [<flaggor>] <träd-igt> [<sökväg>...]"
+#: apply.c:57
+#, c-format
+msgid "unrecognized whitespace option '%s'"
+msgstr "okänt alternativ för whitespace: \"%s\""
-#: archive.c:13
-msgid "git archive --list"
-msgstr "git archive --list"
+#: apply.c:73
+#, c-format
+msgid "unrecognized whitespace ignore option '%s'"
+msgstr "okänt alternativ för ignore-whitespace: \"%s\""
-#: archive.c:14
-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>...]"
+#: apply.c:125
+msgid "--reject and --3way cannot be used together."
+msgstr "--reject och --3way kan inte användas samtidigt"
-#: archive.c:15
-msgid "git archive --remote <repo> [--exec <cmd>] --list"
-msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"
+#: apply.c:127
+msgid "--cached and --3way cannot be used together."
+msgstr "--cached och --3way kan inte användas samtidigt"
-#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327
-#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"
+#: apply.c:130
+msgid "--3way outside a repository"
+msgstr "--3way utanför arkiv"
-#: archive.c:429
-msgid "fmt"
-msgstr "fmt"
+#: apply.c:141
+msgid "--index outside a repository"
+msgstr "--index utanför arkiv"
-#: archive.c:429
-msgid "archive format"
-msgstr "arkivformat"
+#: apply.c:144
+msgid "--cached outside a repository"
+msgstr "--cached utanför arkiv"
-#: archive.c:430 builtin/log.c:1422
-msgid "prefix"
-msgstr "prefix"
+#: apply.c:845
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s"
-#: archive.c:431
-msgid "prepend prefix to each pathname in the archive"
-msgstr "lägg till prefix till varje sökväg i arkivet"
+#: apply.c:854
+#, c-format
+msgid "regexec returned %d for input: %s"
+msgstr "regexec returnerade %d för indata: %s"
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553
-#: builtin/blame.c:2554 builtin/config.c:59 builtin/fast-export.c:987
-#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100
-#: builtin/ls-files.c:460 builtin/ls-files.c:463 builtin/notes.c:399
-#: builtin/notes.c:562 builtin/read-tree.c:109 parse-options.h:153
-msgid "file"
-msgstr "fil"
+#: apply.c:938
+#, c-format
+msgid "unable to find filename in patch at line %d"
+msgstr "kan inte hitta filnamn i patchen på rad %d"
-#: archive.c:433 builtin/archive.c:89
-msgid "write the archive to this file"
-msgstr "skriv arkivet till filen"
+#: apply.c:977
+#, 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"
-#: archive.c:435
-msgid "read .gitattributes in working directory"
-msgstr "läs .gitattributes i arbetskatalogen"
+#: apply.c:983
+#, 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"
-#: archive.c:436
-msgid "report archived files on stderr"
-msgstr "rapportera arkiverade filer på standard fel"
+#: apply.c:984
+#, 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"
-#: archive.c:437
-msgid "store only"
-msgstr "endast spara"
+#: apply.c:990
+#, 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"
-#: archive.c:438
-msgid "compress faster"
-msgstr "komprimera snabbare"
+#: apply.c:1488
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recount: förväntade rad: %.*s"
-#: archive.c:446
-msgid "compress better"
-msgstr "komprimera bättre"
+#: apply.c:1557
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "patch-fragment utan huvud på rad %d: %.*s"
-#: archive.c:449
-msgid "list supported archive formats"
-msgstr "visa understödda arkivformat"
+#: apply.c:1577
+#, 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] ""
+"git-diff-huvudet saknar filnamnsinformation när %d ledande sökvägskomponent\n"
+"tas bort (rad %d)"
+msgstr[1] ""
+"git-diff-huvudet saknar filnamnsinformation när %d ledande "
+"sökvägskomponenter\n"
+"tas bort (rad %d)"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
-#: builtin/submodule--helper.c:832
-msgid "repo"
-msgstr "arkiv"
+#: apply.c:1589
+#, c-format
+msgid "git diff header lacks filename information (line %d)"
+msgstr "git-diff-huvudet saknar filnamnsinformation (rad %d)"
-#: archive.c:452 builtin/archive.c:91
-msgid "retrieve the archive from remote repository <repo>"
-msgstr "hämta arkivet från fjärrarkivet <arkiv>"
+#: apply.c:1759
+msgid "new file depends on old contents"
+msgstr "ny fil beror på gammalt innehåll"
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483
-msgid "command"
-msgstr "kommando"
+#: apply.c:1761
+msgid "deleted file still has contents"
+msgstr "borttagen fil har fortfarande innehåll"
-#: archive.c:454 builtin/archive.c:93
-msgid "path to the remote git-upload-archive command"
-msgstr "sökväg till kommandot git-upload-archive på fjärren"
+#: apply.c:1795
+#, c-format
+msgid "corrupt patch at line %d"
+msgstr "trasig patch på rad %d"
-#: archive.c:461
-msgid "Unexpected option --remote"
-msgstr "Oväntad flagga --remote"
+#: apply.c:1832
+#, c-format
+msgid "new file %s depends on old contents"
+msgstr "nya filen %s beror på gammalt innehåll"
-#: archive.c:463
-msgid "Option --exec can only be used together with --remote"
-msgstr "Flaggan --exec kan endast användas tillsammans med --remote"
+#: apply.c:1834
+#, c-format
+msgid "deleted file %s still has contents"
+msgstr "borttagna filen %s har fortfarande innehåll"
-#: archive.c:465
-msgid "Unexpected option --output"
-msgstr "Oväntad flagga --output"
+#: 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"
-#: archive.c:487
+#: apply.c:1984
#, c-format
-msgid "Unknown archive format '%s'"
-msgstr "Okänt arkivformat \"%s\""
+msgid "corrupt binary patch at line %d: %.*s"
+msgstr "trasig binärpatch på rad %d: %.*s"
-#: archive.c:494
+#: apply.c:2021
#, c-format
-msgid "Argument not supported for format '%s': -%d"
-msgstr "Argumentet stöd inte för formatet \"%s\": -%d"
+msgid "unrecognized binary patch at line %d"
+msgstr "binärpatchen på rad %d känns inte igen"
-#: attr.c:263
-msgid ""
-"Negative patterns are ignored in git attributes\n"
-"Use '\\!' for literal leading exclamation."
-msgstr ""
-"Negativa mönster ignoreras i git-attribut\n"
-"Använd '\\!' för att inleda med ett utropstecken."
+#: apply.c:2182
+#, c-format
+msgid "patch with only garbage at line %d"
+msgstr "patch med bara skräp på rad %d"
-#: bisect.c:441
+#: apply.c:2274
#, c-format
-msgid "Could not open file '%s'"
-msgstr "Kunde inte öppna filen \"%s\""
+msgid "unable to read symlink %s"
+msgstr "kunde inte läsa symboliska länken %s"
-#: bisect.c:446
+#: apply.c:2278
#, c-format
-msgid "Badly quoted content in file '%s': %s"
-msgstr "Felaktigt citerat innehåll i filen \"%s\": %s"
+msgid "unable to open or read %s"
+msgstr "kunde inte öppna eller läsa %s"
-#: bisect.c:655
+#: apply.c:2931
#, c-format
-msgid "We cannot bisect more!\n"
-msgstr "Det finns inte mer att göra \"bisect\" på!\n"
+msgid "invalid start of line: '%c'"
+msgstr "felaktig inledning på rad: \"%c\""
-#: bisect.c:708
+#: apply.c:3050
#, c-format
-msgid "Not a valid commit name %s"
-msgstr "Namnet på incheckningen är inte giltigt: %s"
+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)."
-#: bisect.c:732
+#: apply.c:3062
#, c-format
-msgid ""
-"The merge base %s is bad.\n"
-"This means the bug has been fixed between %s and [%s].\n"
-msgstr ""
-"Sammanslagningsbasen %s är trasig.\n"
-"Det betyder att felet har rättats mellan %s och [%s].\n"
+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"
-#: bisect.c:737
+#: apply.c:3068
#, c-format
msgid ""
-"The merge base %s is new.\n"
-"The property has changed between %s and [%s].\n"
+"while searching for:\n"
+"%.*s"
msgstr ""
-"Sammanslagningsbasen %s är ny.\n"
-"Egenskapen har ändrats mellan %s och [%s].\n"
+"vid sökning efter:\n"
+"%.*s"
-#: bisect.c:742
+#: apply.c:3090
#, c-format
-msgid ""
-"The merge base %s is %s.\n"
-"This means the first '%s' commit is between %s and [%s].\n"
+msgid "missing binary patch data for '%s'"
+msgstr "saknar binära patchdata för \"%s\""
+
+#: apply.c:3098
+#, c-format
+msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
-"Sammanslagningsbasen %s är %s.\n"
-"Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n"
+"kan inte applicera en binärpatch baklänges utan den omvända patchen för \"%s"
+"\""
-#: bisect.c:750
+#: apply.c:3144
#, c-format
-msgid ""
-"Some %s revs are not ancestor of the %s rev.\n"
-"git bisect cannot work properly in this case.\n"
-"Maybe you mistook %s and %s revs?\n"
+msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
-"Några %s-revisioner är inte föräldrar till %s-revisionen.\n"
-"git bisect kan inte arbeta korrekt i detta fall.\n"
-"Kanske du skrev fel %s- och %s-revisioner?\n"
+"kan inte applicera binärpatch på \"%s\" utan den fullständiga indexraden"
-#: bisect.c:763
+#: apply.c:3154
#, 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."
+"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
-"sammanslagningsbasen mellan %s och [%s] måste hoppas över.\n"
-"Vi kan inte vara säkra på att den första %s incheckningen är mellan %s och "
-"%s.\n"
-"Vi fortsätter ändå."
+"patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande "
+"innehållet."
-#: bisect.c:798
+#: apply.c:3162
#, c-format
-msgid "Bisecting: a merge base must be tested\n"
-msgstr "Bisect: en sammanslagningsbas måste testas\n"
+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"
-#: bisect.c:849
+#: apply.c:3180
#, c-format
-msgid "a %s revision is needed"
-msgstr "en %s-revision behövs"
+msgid "the necessary postimage %s for '%s' cannot be read"
+msgstr "nödvändig efterbild %s för \"%s\" kan inte läsas"
-#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
+#: apply.c:3193
#, c-format
-msgid "could not create file '%s'"
-msgstr "kunde inte skapa filen \"%s\""
+msgid "binary patch does not apply to '%s'"
+msgstr "binärpatchen kan inte tillämpas på \"%s\""
-#: bisect.c:917
+#: apply.c:3199
#, c-format
-msgid "could not read file '%s'"
-msgstr "kunde inte läsa filen \"%s\""
+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)"
-#: bisect.c:947
-msgid "reading bisect refs failed"
-msgstr "misslyckades läsa bisect-referenser"
+#: apply.c:3220
+#, c-format
+msgid "patch failed: %s:%ld"
+msgstr "patch misslyckades: %s:%ld"
-#: bisect.c:967
+#: apply.c:3342
#, c-format
-msgid "%s was both %s and %s\n"
-msgstr "%s var både %s och %s\n"
+msgid "cannot checkout %s"
+msgstr "kan inte checka ut %s"
-#: bisect.c:975
+#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248
#, c-format
-msgid ""
-"No testable commit found.\n"
-"Maybe you started with bad path parameters?\n"
-msgstr ""
-"Ingen testbar incheckning hittades.\n"
-"Kanske du startade med felaktiga sökvägsparametrar?\n"
+msgid "failed to read %s"
+msgstr "misslyckades läsa %s"
-#: bisect.c:994
+#: apply.c:3398
#, c-format
-msgid "(roughly %d step)"
-msgid_plural "(roughly %d steps)"
-msgstr[0] "(ungefär %d steg)"
-msgstr[1] "(ungefär %d steg)"
+msgid "reading from '%s' beyond a symbolic link"
+msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk"
-#. TRANSLATORS: the last %s will be replaced with
-#. "(roughly %d steps)" translation
-#: bisect.c:998
+#: apply.c:3427 apply.c:3667
#, 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"
+msgid "path %s has been renamed/deleted"
+msgstr "sökvägen %s har ändrat namn/tagits bort"
-#: branch.c:53
+#: apply.c:3510 apply.c:3681
#, 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är du har rättat felorsaken kan du försöka rätta\n"
-"fjärrspårningsinformationen genom att utföra\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
+msgid "%s: does not exist in index"
+msgstr "%s: finns inte i indexet"
-#: branch.c:67
+#: apply.c:3519 apply.c:3689
#, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "Ställer inte in grenen %s som sin egen uppströmsgren."
+msgid "%s: does not match index"
+msgstr "%s: motsvarar inte indexet"
-#: branch.c:93
-#, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+#: apply.c:3554
+msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
-"Grenen %s ställdes in att spåra fjärrgrenen %s från %s genom ombasering."
+"arkivet saknar objekt som behövs för att falla tillbaka på 3-"
+"vägssammanslagning."
-#: branch.c:94
+#: apply.c:3557
#, 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 "Falling back to three-way merge...\n"
+msgstr "Faller tillbaka på trevägssammanslagning...\n"
-#: branch.c:98
+#: apply.c:3573 apply.c:3577
#, 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 "cannot read the current contents of '%s'"
+msgstr "kunde inte läsa aktuellt innehåll i \"%s\""
-#: branch.c:99
+#: apply.c:3589
#, 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 "Failed to fall back on three-way merge...\n"
+msgstr "Misslyckades falla tillbaka på trevägssammanslagning...\n"
-#: branch.c:104
+#: apply.c:3603
#, 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 "Applied patch to '%s' with conflicts.\n"
+msgstr "Applicerade patchen på \"%s\" med konflikter.\n"
-#: branch.c:105
+#: apply.c:3608
#, 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 patch to '%s' cleanly.\n"
+msgstr "Tillämpade patchen på \"%s\" rent.\n"
-#: branch.c:109
+#: apply.c:3634
+msgid "removal patch leaves file contents"
+msgstr "patch för borttagning lämnar kvar filinnehåll"
+
+#: apply.c:3706
#, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
-msgstr ""
-"Grenen %s ställdes in att spåra den lokala referensen %s genom ombasering."
+msgid "%s: wrong type"
+msgstr "%s: fel typ"
-#: branch.c:110
+#: apply.c:3708
#, c-format
-msgid "Branch %s set up to track local ref %s."
-msgstr "Grenen %s ställdes in att spåra den lokala referensen %s."
+msgid "%s has type %o, expected %o"
+msgstr "%s har typen %o, förväntade %o"
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "Kan inte skriva inställningar för uppströmsgren"
+#: apply.c:3859 apply.c:3861
+#, c-format
+msgid "invalid path '%s'"
+msgstr "ogiltig sökväg: %s"
-#: branch.c:156
+#: apply.c:3917
#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr "Spårar inte: tvetydig information för referensen %s"
+msgid "%s: already exists in index"
+msgstr "%s: finns redan i indexet"
-#: branch.c:185
+#: apply.c:3920
#, c-format
-msgid "'%s' is not a valid branch name."
-msgstr "\"%s\" är inte ett giltigt grennamn."
+msgid "%s: already exists in working directory"
+msgstr "%s: finns redan i arbetskatalogen"
-#: branch.c:190
+#: apply.c:3940
#, c-format
-msgid "A branch named '%s' already exists."
-msgstr "Det finns redan en gren som heter \"%s\""
+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)"
-#: branch.c:198
-msgid "Cannot force update the current branch."
-msgstr "Kan inte tvinga uppdatering av aktuell gren."
+#: apply.c:3945
+#, 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"
-#: branch.c:218
+#: apply.c:3965
#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
-msgstr "Kan inte ställa in spårning; startpunkten \"%s\" är inte en gren."
+msgid "affected file '%s' is beyond a symbolic link"
+msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk"
-#: branch.c:220
+#: apply.c:3969
#, c-format
-msgid "the requested upstream branch '%s' does not exist"
-msgstr "den efterfrågade uppströmsgrenen \"%s\" finns inte"
+msgid "%s: patch does not apply"
+msgstr "%s: patchen kan inte tillämpas"
-#: branch.c:222
-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"
-"Om du har tänkt basera ditt arbete på en uppströmsgren\n"
-"som redan finns på fjärren kan du behöva köra \"git fetch\"\n"
-"för att hämta den.\n"
-"\n"
-"Om du har tänkt sända in en ny lokal gren som skall\n"
-"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."
+#: apply.c:3984
+#, c-format
+msgid "Checking patch %s..."
+msgstr "Kontrollerar patchen %s..."
-#: branch.c:266
+#: apply.c:4075
#, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "Objektnamnet är inte giltigt: \"%s\"."
+msgid "sha1 information is lacking or useless for submodule %s"
+msgstr "sha1-informationen saknas eller är oanvändbar för undermodulen %s"
-#: branch.c:286
+#: apply.c:4082
#, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "Objektnamnet är tvetydigt: \"%s\"."
+msgid "mode change for %s, which is not in current HEAD"
+msgstr "nytt läge för %s, som inte finns i nuvarande HEAD"
-#: branch.c:291
+#: apply.c:4085
#, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "Avgreningspunkten är inte giltig: \"%s\""
+msgid "sha1 information is lacking or useless (%s)."
+msgstr "sha1-informationen saknas eller är oanvändbar (%s)."
-#: branch.c:345
+#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
-msgid "'%s' is already checked out at '%s'"
-msgstr "\"%s\" är redan utcheckad på \"%s\""
+msgid "make_cache_entry failed for path '%s'"
+msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
-#: branch.c:364
+#: apply.c:4094
#, c-format
-msgid "HEAD of working tree %s is not updated"
-msgstr "HEAD i arbetskatalogen %s har inte uppdaterats"
+msgid "could not add %s to temporary index"
+msgstr "kunde inte lägga till %s till temporärt index"
-#: bundle.c:34
+#: apply.c:4104
#, c-format
-msgid "'%s' does not look like a v2 bundle file"
-msgstr "'%s' ser inte ut som en v2-bundle-fil"
+msgid "could not write temporary index to %s"
+msgstr "kunde inte skriva temporärt index till %s"
-#: bundle.c:61
+#: apply.c:4242
#, c-format
-msgid "unrecognized header: %s%s (%d)"
-msgstr "okänt huvud: %s%s (%d)"
+msgid "unable to remove %s from index"
+msgstr "kan inte ta bort %s från indexet"
-#: bundle.c:87 builtin/commit.c:778
+#: apply.c:4277
#, c-format
-msgid "could not open '%s'"
-msgstr "kunde inte öppna \"%s\""
+msgid "corrupt patch for submodule %s"
+msgstr "trasig patch för undermodulen %s"
-#: bundle.c:139
-msgid "Repository lacks these prerequisite commits:"
-msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
+#: apply.c:4283
+#, c-format
+msgid "unable to stat newly created file '%s'"
+msgstr "kan inte ta status på nyligen skapade filen \"%s\""
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085
-#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348
-#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901
-#: builtin/merge.c:356 builtin/shortlog.c:170
-msgid "revision walk setup failed"
-msgstr "misslyckades skapa revisionstraversering"
+#: apply.c:4291
+#, 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"
-#: bundle.c:185
+#: apply.c:4297 apply.c:4441
#, c-format
-msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %d refs:"
-msgstr[0] "Paketet (bundlen) innehåller denna referens:"
-msgstr[1] "Paketet (bundlen) innehåller dessa %d referenser:"
+msgid "unable to add cache entry for %s"
+msgstr "kan inte lägga till cachepost för %s"
-#: bundle.c:192
-msgid "The bundle records a complete history."
-msgstr "Paketet (bundlen) beskriver en komplett historik."
+#: apply.c:4338
+#, c-format
+msgid "failed to write to '%s'"
+msgstr "misslyckades skriva till \"%s\""
-#: bundle.c:194
+#: apply.c:4342
#, c-format
-msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %d refs:"
-msgstr[0] "Paketet (bundlen) kräver denna referens:"
-msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:"
+msgid "closing file '%s'"
+msgstr "stänger filen \"%s\""
-#: bundle.c:253
-msgid "Could not spawn pack-objects"
-msgstr "Kunde inte starta pack-objects"
+#: apply.c:4412
+#, c-format
+msgid "unable to write file '%s' mode %o"
+msgstr "kan inte skriva filen \"%s\" läge %o"
-#: bundle.c:264
-msgid "pack-objects died"
-msgstr "pack-objects misslyckades"
+#: apply.c:4510
+#, c-format
+msgid "Applied patch %s cleanly."
+msgstr "Tillämpade patchen %s rent."
-#: bundle.c:304
-msgid "rev-list died"
-msgstr "rev-list dog"
+#: apply.c:4518
+msgid "internal error"
+msgstr "internt fel"
-#: bundle.c:353
+#: apply.c:4521
#, c-format
-msgid "ref '%s' is excluded by the rev-list options"
-msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
+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..."
-#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273
+#: apply.c:4532
#, c-format
-msgid "unrecognized argument: %s"
-msgstr "okänt argument: %s"
-
-#: bundle.c:451
-msgid "Refusing to create empty bundle."
-msgstr "Vägrar skapa ett tomt paket (bundle)."
+msgid "truncating .rej filename to %.*s.rej"
+msgstr "trunkerar .rej-filnamnet till %.*s.rej"
-#: bundle.c:463
+#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989
#, c-format
-msgid "cannot create '%s'"
-msgstr "kan inte skapa \"%s\""
-
-#: bundle.c:491
-msgid "index-pack died"
-msgstr "index-pack dog"
+msgid "cannot open %s"
+msgstr "kan inte öppna %s"
-#: color.c:290
+#: apply.c:4554
#, c-format
-msgid "invalid color value: %.*s"
-msgstr "felaktigt färgvärde: %.*s"
+msgid "Hunk #%d applied cleanly."
+msgstr "Stycke %d tillämpades rent."
-#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505
-#: builtin/am.c:2119
+#: apply.c:4558
#, c-format
-msgid "could not parse %s"
-msgstr "kunde inte tolka %s"
+msgid "Rejected hunk #%d."
+msgstr "Refuserar stycke %d."
-#: commit.c:42
+#: apply.c:4668
#, c-format
-msgid "%s %s is not a commit!"
-msgstr "%s %s är inte en incheckning!"
+msgid "Skipped patch '%s'."
+msgstr "Ignorerar patch \"%s\"."
-#: compat/obstack.c:406 compat/obstack.c:408
-msgid "memory exhausted"
-msgstr "minnet slut"
+#: apply.c:4676
+msgid "unrecognized input"
+msgstr "indata känns inte igen"
-#: config.c:516
+#: apply.c:4695
+msgid "unable to read index file"
+msgstr "kan inte läsa indexfilen"
+
+#: apply.c:4833
#, c-format
-msgid "bad config line %d in blob %s"
-msgstr "felaktig konfigurationsfil rad %d i blob:en %s"
+msgid "can't open patch '%s': %s"
+msgstr "kan inte öppna patchen \"%s\": %s"
-#: config.c:520
+#: apply.c:4858
#, c-format
-msgid "bad config line %d in file %s"
-msgstr "felaktig konfigurationsfil rad %d i filen %s"
+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"
-#: config.c:524
+#: apply.c:4864 apply.c:4879
#, c-format
-msgid "bad config line %d in standard input"
-msgstr "felaktig konfigurationsfil rad %d i standard in"
+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."
-#: config.c:528
+#: apply.c:4872
#, c-format
-msgid "bad config line %d in submodule-blob %s"
-msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s"
+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."
-#: config.c:532
-#, c-format
-msgid "bad config line %d in command line %s"
-msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s"
+#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431
+msgid "Unable to write new index file"
+msgstr "Kunde inte skriva ny indexfil"
-#: config.c:536
-#, c-format
-msgid "bad config line %d in %s"
-msgstr "felaktig konfigurationsfil rad %d i %s"
+#: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
+#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592
+#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947
+msgid "path"
+msgstr "sökväg"
-#: config.c:655
-msgid "out of range"
-msgstr "utanför intervallet"
+#: apply.c:4920
+msgid "don't apply changes matching the given path"
+msgstr "tillämpa inte ändringar som motsvarar given sökväg"
-#: config.c:655
-msgid "invalid unit"
-msgstr "ogiltig enhet"
+#: apply.c:4923
+msgid "apply changes matching the given path"
+msgstr "tillämpa ändringar som motsvarar given sökväg"
-#: config.c:661
-#, c-format
-msgid "bad numeric config value '%s' for '%s': %s"
-msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"
+#: apply.c:4925 builtin/am.c:2286
+msgid "num"
+msgstr "antal"
-#: config.c:666
-#, 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"
+#: apply.c:4926
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar"
-#: config.c:669
-#, 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"
+#: apply.c:4929
+msgid "ignore additions made by the patch"
+msgstr "ignorera tillägg gjorda av patchen"
-#: config.c:672
-#, 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"
+#: apply.c:4931
+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"
-#: config.c:675
-#, 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"
+#: apply.c:4935
+msgid "show number of added and deleted lines in decimal notation"
+msgstr "visa antal tillagda och borttagna rader decimalt"
-#: config.c:678
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+#: apply.c:4937
+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:4939
+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:4941
+msgid "make sure the patch is applicable to the current index"
+msgstr "se till att patchen kan tillämpas på aktuellt index"
+
+#: apply.c:4943
+msgid "apply a patch without touching the working tree"
+msgstr "tillämpa en patch utan att röra arbetskatalogen"
+
+#: apply.c:4945
+msgid "accept a patch that touches outside the working area"
+msgstr "godta en patch som rör filer utanför arbetskatalogen"
+
+#: apply.c:4947
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"
+
+#: apply.c:4949
+msgid "attempt three-way merge if a patch does not apply"
+msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas"
+
+#: apply.c:4951
+msgid "build a temporary index based on embedded index information"
+msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
+
+#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505
+msgid "paths are separated with NUL character"
+msgstr "sökvägar avdelas med NUL-tecken"
+
+#: apply.c:4956
+msgid "ensure at least <n> lines of context match"
+msgstr "se till att åtminstone <n> rader sammanhang är lika"
+
+#: apply.c:4957 builtin/am.c:2265
+msgid "action"
+msgstr "åtgärd"
+
+#: apply.c:4958
+msgid "detect new or modified lines that have whitespace errors"
+msgstr "detektera nya eller ändrade rader som har fel i blanktecken"
+
+#: apply.c:4961 apply.c:4964
+msgid "ignore changes in whitespace when finding context"
+msgstr "ignorera ändringar i blanktecken för sammanhang"
+
+#: apply.c:4967
+msgid "apply the patch in reverse"
+msgstr "tillämpa patchen baklänges"
+
+#: apply.c:4969
+msgid "don't expect at least one line of context"
+msgstr "förvänta inte minst en rad sammanhang"
+
+#: apply.c:4971
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
+
+#: apply.c:4973
+msgid "allow overlapping hunks"
+msgstr "tillåt överlappande stycken"
+
+#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19
+#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593
+#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114
+msgid "be verbose"
+msgstr "var pratsam"
+
+#: apply.c:4976
+msgid "tolerate incorrectly detected missing new-line at the end of file"
+msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
+
+#: apply.c:4979
+msgid "do not trust the line counts in the hunk headers"
+msgstr "lite inte på antalet linjer i styckehuvuden"
+
+#: apply.c:4981 builtin/am.c:2274
+msgid "root"
+msgstr "rot"
+
+#: apply.c:4982
+msgid "prepend <root> to all filenames"
+msgstr "lägg till <rot> i alla filnamn"
+
+#: archive.c:12
+msgid "git archive [<options>] <tree-ish> [<path>...]"
+msgstr "git archive [<flaggor>] <träd-igt> [<sökväg>...]"
+
+#: archive.c:13
+msgid "git archive --list"
+msgstr "git archive --list"
+
+#: archive.c:14
+msgid ""
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
msgstr ""
-"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden "
-"%s: %s"
+"git archive --remote <arkiv> [--exec <kmd>] [<flaggor>] <träd-igt> "
+"[<sökväg>...]"
-#: config.c:681
-#, 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"
+#: archive.c:15
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"
-#: config.c:768
+#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327
#, c-format
-msgid "failed to expand user dir in: '%s'"
-msgstr "misslyckades expandera användarkatalog i: \"%s\""
+msgid "pathspec '%s' did not match any files"
+msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"
-#: config.c:849 config.c:860
-#, c-format
-msgid "bad zlib compression level %d"
-msgstr "felaktigt zlib-komprimeringsgrad %d"
+#: archive.c:429
+msgid "fmt"
+msgstr "fmt"
-#: config.c:978
-#, c-format
-msgid "invalid mode for object creation: %s"
-msgstr "felaktigt läge för skapande av objekt: %s"
+#: archive.c:429
+msgid "archive format"
+msgstr "arkivformat"
-#: config.c:1312
-msgid "unable to parse command-line config"
-msgstr "kan inte tolka kommandoradskonfiguration"
+#: archive.c:430 builtin/log.c:1429
+msgid "prefix"
+msgstr "prefix"
-#: config.c:1362
-msgid "unknown error occurred while reading the configuration files"
-msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
+#: archive.c:431
+msgid "prepend prefix to each pathname in the archive"
+msgstr "lägg till prefix till varje sökväg i arkivet"
-#: config.c:1716
-#, c-format
-msgid "unable to parse '%s' from command-line config"
-msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603
+#: builtin/blame.c:2604 builtin/config.c:59 builtin/fast-export.c:987
+#: builtin/fast-export.c:989 builtin/grep.c:723 builtin/hash-object.c:101
+#: builtin/ls-files.c:539 builtin/ls-files.c:542 builtin/notes.c:401
+#: builtin/notes.c:564 builtin/read-tree.c:109 parse-options.h:153
+msgid "file"
+msgstr "fil"
-#: config.c:1718
-#, c-format
-msgid "bad config variable '%s' in file '%s' at line %d"
-msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d"
+#: archive.c:433 builtin/archive.c:89
+msgid "write the archive to this file"
+msgstr "skriv arkivet till filen"
-#: config.c:1777
-#, c-format
-msgid "%s has multiple values"
-msgstr "%s har flera värden"
+#: archive.c:435
+msgid "read .gitattributes in working directory"
+msgstr "läs .gitattributes i arbetskatalogen"
-#: config.c:2311
-#, c-format
-msgid "could not set '%s' to '%s'"
-msgstr "kunde inte ställa in \"%s\" till \"%s\""
+#: archive.c:436
+msgid "report archived files on stderr"
+msgstr "rapportera arkiverade filer på standard fel"
-#: config.c:2313
-#, c-format
-msgid "could not unset '%s'"
-msgstr "kunde inte ta bort inställning för \"%s\""
+#: archive.c:437
+msgid "store only"
+msgstr "endast spara"
-# Vague original, not networking-related, but rather related to the actual
-# objects in the database.
-#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
-msgid "Checking connectivity"
-msgstr "Kontrollerar konnektivitet"
+#: archive.c:438
+msgid "compress faster"
+msgstr "komprimera snabbare"
-#: connected.c:74
-msgid "Could not run 'git rev-list'"
-msgstr "Kunde inte köra \"git rev-list\""
+#: archive.c:446
+msgid "compress better"
+msgstr "komprimera bättre"
-#: connected.c:94
-msgid "failed write to rev-list"
-msgstr "kunde inte skriva till rev-list"
+#: archive.c:449
+msgid "list supported archive formats"
+msgstr "visa understödda arkivformat"
-#: connected.c:101
-msgid "failed to close rev-list's stdin"
-msgstr "kunde inte stänga rev-list:s standard in"
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
+#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953
+msgid "repo"
+msgstr "arkiv"
-#: date.c:97
-msgid "in the future"
-msgstr "i framtiden"
+#: archive.c:452 builtin/archive.c:91
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "hämta arkivet från fjärrarkivet <arkiv>"
-#: date.c:103
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
+msgid "command"
+msgstr "kommando"
+
+#: archive.c:454 builtin/archive.c:93
+msgid "path to the remote git-upload-archive command"
+msgstr "sökväg till kommandot git-upload-archive på fjärren"
+
+#: archive.c:461
+msgid "Unexpected option --remote"
+msgstr "Oväntad flagga --remote"
+
+#: archive.c:463
+msgid "Option --exec can only be used together with --remote"
+msgstr "Flaggan --exec kan endast användas tillsammans med --remote"
+
+#: archive.c:465
+msgid "Unexpected option --output"
+msgstr "Oväntad flagga --output"
+
+#: archive.c:487
#, c-format
-msgid "%lu second ago"
-msgid_plural "%lu seconds ago"
-msgstr[0] "%lu sekund sedan"
-msgstr[1] "%lu sekunder sedan"
+msgid "Unknown archive format '%s'"
+msgstr "Okänt arkivformat \"%s\""
-#: date.c:110
+#: archive.c:494
#, c-format
-msgid "%lu minute ago"
-msgid_plural "%lu minutes ago"
-msgstr[0] "%lu minut sedan"
-msgstr[1] "%lu minuter sedan"
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Argumentet stöd inte för formatet \"%s\": -%d"
-#: date.c:117
+#: attr.c:263
+msgid ""
+"Negative patterns are ignored in git attributes\n"
+"Use '\\!' for literal leading exclamation."
+msgstr ""
+"Negativa mönster ignoreras i git-attribut\n"
+"Använd '\\!' för att inleda med ett utropstecken."
+
+#: bisect.c:441
#, c-format
-msgid "%lu hour ago"
-msgid_plural "%lu hours ago"
-msgstr[0] "%lu timme sedan"
-msgstr[1] "%lu timmar sedan"
+msgid "Could not open file '%s'"
+msgstr "Kunde inte öppna filen \"%s\""
-#: date.c:124
+#: bisect.c:446
#, c-format
-msgid "%lu day ago"
-msgid_plural "%lu days ago"
-msgstr[0] "%lu dag sedan"
-msgstr[1] "%lu dagar sedan"
+msgid "Badly quoted content in file '%s': %s"
+msgstr "Felaktigt citerat innehåll i filen \"%s\": %s"
-#: date.c:130
+#: bisect.c:655
#, c-format
-msgid "%lu week ago"
-msgid_plural "%lu weeks ago"
-msgstr[0] "%lu vecka sedan"
-msgstr[1] "%lu veckor sedan"
+msgid "We cannot bisect more!\n"
+msgstr "Det finns inte mer att göra \"bisect\" på!\n"
-#: date.c:137
+#: bisect.c:708
#, c-format
-msgid "%lu month ago"
-msgid_plural "%lu months ago"
-msgstr[0] "%lu månad sedan"
-msgstr[1] "%lu månader sedan"
+msgid "Not a valid commit name %s"
+msgstr "Namnet på incheckningen är inte giltigt: %s"
-#: date.c:148
+#: bisect.c:732
#, c-format
-msgid "%lu year"
-msgid_plural "%lu years"
-msgstr[0] "%lu år"
-msgstr[1] "%lu år"
+msgid ""
+"The merge base %s is bad.\n"
+"This means the bug has been fixed between %s and [%s].\n"
+msgstr ""
+"Sammanslagningsbasen %s är trasig.\n"
+"Det betyder att felet har rättats mellan %s och [%s].\n"
-#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:151
+#: bisect.c:737
#, c-format
-msgid "%s, %lu month ago"
-msgid_plural "%s, %lu months ago"
-msgstr[0] "%s, %lu månad sedan"
-msgstr[1] "%s, %lu månader sedan"
+msgid ""
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
+msgstr ""
+"Sammanslagningsbasen %s är ny.\n"
+"Egenskapen har ändrats mellan %s och [%s].\n"
+
+#: bisect.c:742
+#, c-format
+msgid ""
+"The merge base %s is %s.\n"
+"This means the first '%s' commit is between %s and [%s].\n"
+msgstr ""
+"Sammanslagningsbasen %s är %s.\n"
+"Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n"
+
+#: bisect.c:750
+#, c-format
+msgid ""
+"Some %s revs are not ancestor of the %s rev.\n"
+"git bisect cannot work properly in this case.\n"
+"Maybe you mistook %s and %s revs?\n"
+msgstr ""
+"Några %s-revisioner är inte föräldrar till %s-revisionen.\n"
+"git bisect kan inte arbeta korrekt i detta fall.\n"
+"Kanske du skrev fel %s- och %s-revisioner?\n"
-#: date.c:156 date.c:161
+#: bisect.c:763
#, c-format
-msgid "%lu year ago"
-msgid_plural "%lu years ago"
-msgstr[0] "%lu år sedan"
-msgstr[1] "%lu år sedan"
+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 ""
+"sammanslagningsbasen mellan %s och [%s] måste hoppas över.\n"
+"Vi kan inte vara säkra på att den första %s incheckningen är mellan %s och "
+"%s.\n"
+"Vi fortsätter ändå."
-#: diffcore-order.c:24
+#: bisect.c:798
#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "kunde inte läsa orderfilen \"%s\""
+msgid "Bisecting: a merge base must be tested\n"
+msgstr "Bisect: en sammanslagningsbas måste testas\n"
-#: diffcore-rename.c:540
-msgid "Performing inexact rename detection"
-msgstr "Utför onöjaktig namnbytesdetektering"
+#: bisect.c:849
+#, c-format
+msgid "a %s revision is needed"
+msgstr "en %s-revision behövs"
-#: diff.c:116
+#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
#, c-format
-msgid " Failed to parse dirstat cut-off percentage '%s'\n"
-msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n"
+msgid "could not create file '%s'"
+msgstr "kunde inte skapa filen \"%s\""
-#: diff.c:121
+#: bisect.c:917
#, c-format
-msgid " Unknown dirstat parameter '%s'\n"
-msgstr " Okänd dirstat-parameter \"%s\"\n"
+msgid "could not read file '%s'"
+msgstr "kunde inte läsa filen \"%s\""
-#: diff.c:225
+#: bisect.c:947
+msgid "reading bisect refs failed"
+msgstr "misslyckades läsa bisect-referenser"
+
+#: bisect.c:967
#, c-format
-msgid "Unknown value for 'diff.submodule' config variable: '%s'"
-msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\""
+msgid "%s was both %s and %s\n"
+msgstr "%s var både %s och %s\n"
-#: diff.c:277
+#: bisect.c:975
#, c-format
msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
+"No testable commit found.\n"
+"Maybe you started with bad path parameters?\n"
msgstr ""
-"Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
-"%s"
+"Ingen testbar incheckning hittades.\n"
+"Kanske du startade med felaktiga sökvägsparametrar?\n"
-#: diff.c:3017
+#: bisect.c:994
#, c-format
-msgid "external diff died, stopping at %s"
-msgstr "extern diff dog, stannar vid %s"
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] "(ungefär %d steg)"
+msgstr[1] "(ungefär %d steg)"
-#: diff.c:3415
-msgid "--follow requires exactly one pathspec"
-msgstr "--follow kräver exakt en sökvägsangivelse"
+#. TRANSLATORS: the last %s will be replaced with
+#. "(roughly %d steps)" translation
+#: bisect.c:998
+#, 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"
-#: diff.c:3578
+#: branch.c:53
#, c-format
msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
+"\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 ""
-"Misslyckades tolka argument till flaggan --dirstat/-X;\n"
-"%s"
+"\n"
+"När du har rättat felorsaken kan du försöka rätta\n"
+"fjärrspårningsinformationen genom att utföra\n"
+"\"git branch --set-upstream-to=%s%s%s\"."
-#: diff.c:3592
+#: branch.c:67
#, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
-msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\""
-
-#: dir.c:1823
-msgid "failed to get kernel name and information"
-msgstr "misslyckades hämta kärnans namn och information"
-
-#: dir.c:1942
-msgid "Untracked cache is disabled on this system or location."
-msgstr "Ospårad cache är inaktiverad på systemet eller platsen."
-
-#: gpg-interface.c:178
-msgid "gpg failed to sign the data"
-msgstr "gpg misslyckades signera data"
-
-#: gpg-interface.c:208
-msgid "could not create temporary file"
-msgstr "kunde inte skapa temporära fil"
+msgid "Not setting branch %s as its own upstream."
+msgstr "Ställer inte in grenen %s som sin egen uppströmsgren."
-#: gpg-interface.c:210
+#: branch.c:93
#, c-format
-msgid "failed writing detached signature to '%s'"
-msgstr "misslyckades skriva fristående signatur till \"%s\""
+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."
-#: grep.c:1792
+#: branch.c:94
#, c-format
-msgid "'%s': unable to read %s"
-msgstr "\"%s\" kunde inte läsa %s"
+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."
-#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
+#: branch.c:98
#, c-format
-msgid "failed to stat '%s'"
-msgstr "misslyckades ta status på \"%s\""
+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."
-#: grep.c:1820
+#: branch.c:99
#, c-format
-msgid "'%s': short read"
-msgstr "\"%s\": kort läsning"
+msgid "Branch %s set up to track local branch %s."
+msgstr "Grenen %s ställdes in att spåra den lokala grenen %s."
-#: help.c:205
+#: branch.c:104
#, c-format
-msgid "available git commands in '%s'"
-msgstr "git-kommandon tillgängliga i \"%s\""
-
-#: help.c:212
-msgid "git commands available from elsewhere on your $PATH"
-msgstr "git-kommandon från andra platser i din $PATH"
+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."
-#: help.c:244
-msgid "These are common Git commands used in various situations:"
-msgstr "Dessa vanliga Git-kommandon används i olika situationer:"
+#: branch.c:105
+#, c-format
+msgid "Branch %s set up to track remote ref %s."
+msgstr "Grenen %s ställdes in att spåra fjärreferensen %s."
-#: help.c:309
+#: branch.c:109
#, c-format
-msgid ""
-"'%s' appears to be a git command, but we were not\n"
-"able to execute it. Maybe git-%s is broken?"
+msgid "Branch %s set up to track local ref %s by rebasing."
msgstr ""
-"\"%s\" verkar vara ett git-kommando, men vi kan inte\n"
-"köra det. Kanske git-%s är trasigt?"
+"Grenen %s ställdes in att spåra den lokala referensen %s genom ombasering."
-#: help.c:366
-msgid "Uh oh. Your system reports no Git commands at all."
-msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls."
+#: branch.c:110
+#, c-format
+msgid "Branch %s set up to track local ref %s."
+msgstr "Grenen %s ställdes in att spåra den lokala referensen %s."
-#: help.c:388
+#: branch.c:119
+msgid "Unable to write upstream branch configuration"
+msgstr "Kan inte skriva inställningar för uppströmsgren"
+
+#: branch.c:156
#, c-format
-msgid ""
-"WARNING: You called a Git command named '%s', which does not exist.\n"
-"Continuing under the assumption that you meant '%s'"
-msgstr ""
-"VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns.\n"
-"Fortsätter under förutsättningen att du menade \"%s\""
+msgid "Not tracking: ambiguous information for ref %s"
+msgstr "Spårar inte: tvetydig information för referensen %s"
-#: help.c:393
+#: branch.c:185
#, c-format
-msgid "in %0.1f seconds automatically..."
-msgstr "automatiskt om %0.1f sekunder..."
+msgid "'%s' is not a valid branch name."
+msgstr "\"%s\" är inte ett giltigt grennamn."
-#: help.c:400
+#: branch.c:190
#, 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 "A branch named '%s' already exists."
+msgstr "Det finns redan en gren som heter \"%s\""
-#: help.c:404 help.c:470
-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?"
+#: branch.c:198
+msgid "Cannot force update the current branch."
+msgstr "Kan inte tvinga uppdatering av aktuell gren."
-#: help.c:466
+#: branch.c:218
#, c-format
-msgid "%s: %s - %s"
-msgstr "%s: %s - %s"
+msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgstr "Kan inte ställa in spårning; startpunkten \"%s\" är inte en gren."
-#: lockfile.c:152
+#: branch.c:220
#, c-format
+msgid "the requested upstream branch '%s' does not exist"
+msgstr "den efterfrågade uppströmsgrenen \"%s\" finns inte"
+
+#: branch.c:222
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."
+"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 ""
-"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"
-
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "misslyckades läsa cachen"
-
-#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375
-#: builtin/checkout.c:589 builtin/clone.c:732
-msgid "unable to write new index file"
-msgstr "kunde inte skriva ny indexfil"
-
-#: merge-recursive.c:209
-msgid "(bad commit)\n"
-msgstr "(felaktig incheckning)\n"
-
-#: merge-recursive.c:231
-#, c-format
-msgid "addinfo_cache failed for path '%s'"
-msgstr "addinfo_cache misslyckades för sökvägen \"%s\""
-
-#: merge-recursive.c:301
-msgid "error building trees"
-msgstr "fel vid byggande av träd"
+"Om du har tänkt basera ditt arbete på en uppströmsgren\n"
+"som redan finns på fjärren kan du behöva köra \"git fetch\"\n"
+"för att hämta den.\n"
+"\n"
+"Om du har tänkt sända in en ny lokal gren som skall\n"
+"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."
-#: merge-recursive.c:720
+#: branch.c:265
#, c-format
-msgid "failed to create path '%s'%s"
-msgstr "misslyckades skapa sökvägen \"%s\"%s"
+msgid "Not a valid object name: '%s'."
+msgstr "Objektnamnet är inte giltigt: \"%s\"."
-#: merge-recursive.c:731
+#: branch.c:285
#, 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 "Ambiguous object name: '%s'."
+msgstr "Objektnamnet är tvetydigt: \"%s\"."
-#: merge-recursive.c:745 merge-recursive.c:764
-msgid ": perhaps a D/F conflict?"
-msgstr ": kanske en K/F-konflikt?"
+#: branch.c:290
+#, c-format
+msgid "Not a valid branch point: '%s'."
+msgstr "Avgreningspunkten är inte giltig: \"%s\""
-#: merge-recursive.c:754
+#: branch.c:344
#, c-format
-msgid "refusing to lose untracked file at '%s'"
-msgstr "vägrar förlora ospårad fil vid \"%s\""
+msgid "'%s' is already checked out at '%s'"
+msgstr "\"%s\" är redan utcheckad på \"%s\""
-#: merge-recursive.c:796
+#: branch.c:363
#, c-format
-msgid "cannot read object %s '%s'"
-msgstr "kan inte läsa objektet %s: \"%s\""
+msgid "HEAD of working tree %s is not updated"
+msgstr "HEAD i arbetskatalogen %s har inte uppdaterats"
-#: merge-recursive.c:798
+#: bundle.c:34
#, c-format
-msgid "blob expected for %s '%s'"
-msgstr "blob förväntades för %s \"%s\""
+msgid "'%s' does not look like a v2 bundle file"
+msgstr "'%s' ser inte ut som en v2-bundle-fil"
-#: merge-recursive.c:822
+#: bundle.c:61
#, c-format
-msgid "failed to open '%s': %s"
-msgstr "misslyckades öppna \"%s\": %s"
+msgid "unrecognized header: %s%s (%d)"
+msgstr "okänt huvud: %s%s (%d)"
-#: merge-recursive.c:833
+#: bundle.c:87 sequencer.c:963 builtin/commit.c:777
#, c-format
-msgid "failed to symlink '%s': %s"
-msgstr "misslyckades skapa symboliska länken \"%s\": %s"
+msgid "could not open '%s'"
+msgstr "kunde inte öppna \"%s\""
-#: merge-recursive.c:838
+#: bundle.c:139
+msgid "Repository lacks these prerequisite commits:"
+msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
+
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374
+#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348
+#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
+#: builtin/merge.c:356 builtin/shortlog.c:170
+msgid "revision walk setup failed"
+msgstr "misslyckades skapa revisionstraversering"
+
+#: bundle.c:185
#, c-format
-msgid "do not know what to do with %06o %s '%s'"
-msgstr "vet inte hur %06o %s \"%s\" skall hanteras"
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %d refs:"
+msgstr[0] "Paketet (bundlen) innehåller denna referens:"
+msgstr[1] "Paketet (bundlen) innehåller dessa %d referenser:"
-#: merge-recursive.c:978
-msgid "Failed to execute internal merge"
-msgstr "Misslyckades exekvera intern sammanslagning"
+#: bundle.c:192
+msgid "The bundle records a complete history."
+msgstr "Paketet (bundlen) beskriver en komplett historik."
-#: merge-recursive.c:982
+#: bundle.c:194
#, c-format
-msgid "Unable to add %s to database"
-msgstr "Kunde inte lägga till %s till databasen"
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %d refs:"
+msgstr[0] "Paketet (bundlen) kräver denna referens:"
+msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:"
-#: merge-recursive.c:1081 merge-recursive.c:1095
+#: bundle.c:253
+msgid "Could not spawn pack-objects"
+msgstr "Kunde inte starta pack-objects"
+
+#: bundle.c:264
+msgid "pack-objects died"
+msgstr "pack-objects misslyckades"
+
+#: bundle.c:304
+msgid "rev-list died"
+msgstr "rev-list dog"
+
+#: bundle.c:353
#, 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."
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
-#: merge-recursive.c:1087 merge-recursive.c:1100
+#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273
#, 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."
+msgid "unrecognized argument: %s"
+msgstr "okänt argument: %s"
-#: merge-recursive.c:1143
-msgid "rename"
-msgstr "namnbyte"
+#: bundle.c:451
+msgid "Refusing to create empty bundle."
+msgstr "Vägrar skapa ett tomt paket (bundle)."
-#: merge-recursive.c:1143
-msgid "renamed"
-msgstr "namnbytt"
+#: bundle.c:463
+#, c-format
+msgid "cannot create '%s'"
+msgstr "kan inte skapa \"%s\""
-#: merge-recursive.c:1200
+#: bundle.c:491
+msgid "index-pack died"
+msgstr "index-pack dog"
+
+#: color.c:290
#, 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"
+msgid "invalid color value: %.*s"
+msgstr "felaktigt färgvärde: %.*s"
-#: merge-recursive.c:1225
+#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493
+#: builtin/am.c:2127
+#, c-format
+msgid "could not parse %s"
+msgstr "kunde inte tolka %s"
+
+#: commit.c:42
#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s är inte en incheckning!"
+
+#: commit.c:1514
msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
+"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 ""
-"KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" "
-"namnbyte \"%s\"->\"%s\" i \"%s\"%s"
+"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"
-#: merge-recursive.c:1230
-msgid " (left unresolved)"
-msgstr " (lämnad olöst)"
+#: compat/obstack.c:406 compat/obstack.c:408
+msgid "memory exhausted"
+msgstr "minnet slut"
-#: merge-recursive.c:1292
+#: config.c:516
#, 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"
+msgid "bad config line %d in blob %s"
+msgstr "felaktig konfigurationsfil rad %d i blob:en %s"
-#: merge-recursive.c:1325
+#: config.c:520
#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
-msgstr "Byter namn på %s till %s och %s till %s istället"
+msgid "bad config line %d in file %s"
+msgstr "felaktig konfigurationsfil rad %d i filen %s"
-#: merge-recursive.c:1531
+#: config.c:524
#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
-msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. %s tillagd i %s"
+msgid "bad config line %d in standard input"
+msgstr "felaktig konfigurationsfil rad %d i standard in"
-#: merge-recursive.c:1546
+#: config.c:528
#, c-format
-msgid "Adding merged %s"
-msgstr "Lägger till sammanslagen %s"
+msgid "bad config line %d in submodule-blob %s"
+msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s"
-#: merge-recursive.c:1553 merge-recursive.c:1766
+#: config.c:532
#, c-format
-msgid "Adding as %s instead"
-msgstr "Lägger till som %s istället"
+msgid "bad config line %d in command line %s"
+msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s"
-#: merge-recursive.c:1610
+#: config.c:536
#, c-format
-msgid "cannot read object %s"
-msgstr "kan inte läsa objektet %s"
+msgid "bad config line %d in %s"
+msgstr "felaktig konfigurationsfil rad %d i %s"
-#: merge-recursive.c:1613
+#: config.c:655
+msgid "out of range"
+msgstr "utanför intervallet"
+
+#: config.c:655
+msgid "invalid unit"
+msgstr "ogiltig enhet"
+
+#: config.c:661
#, c-format
-msgid "object %s is not a blob"
-msgstr "objektet %s är inte en blob"
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"
-#: merge-recursive.c:1666
-msgid "modify"
-msgstr "ändra"
+#: config.c:666
+#, 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"
-#: merge-recursive.c:1666
-msgid "modified"
-msgstr "ändrad"
+#: config.c:669
+#, 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"
-#: merge-recursive.c:1676
-msgid "content"
-msgstr "innehåll"
+#: config.c:672
+#, 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"
-#: merge-recursive.c:1683
-msgid "add/add"
-msgstr "tillägg/tillägg"
+#: config.c:675
+#, 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"
-#: merge-recursive.c:1718
+#: config.c:678
#, c-format
-msgid "Skipped %s (merged same as existing)"
-msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
+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"
-#: merge-recursive.c:1732
+#: config.c:681
#, c-format
-msgid "Auto-merging %s"
-msgstr "Slår ihop %s automatiskt"
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s"
-#: merge-recursive.c:1736 git-submodule.sh:919
-msgid "submodule"
-msgstr "undermodul"
+#: config.c:768
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr "misslyckades expandera användarkatalog i: \"%s\""
-#: merge-recursive.c:1737
+#: config.c:852 config.c:863
#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
+msgid "bad zlib compression level %d"
+msgstr "felaktigt zlib-komprimeringsgrad %d"
-#: merge-recursive.c:1831
+#: config.c:978
#, c-format
-msgid "Removing %s"
-msgstr "Tar bort %s"
+msgid "invalid mode for object creation: %s"
+msgstr "felaktigt läge för skapande av objekt: %s"
-#: merge-recursive.c:1857
-msgid "file/directory"
-msgstr "fil/katalog"
+#: config.c:1312
+msgid "unable to parse command-line config"
+msgstr "kan inte tolka kommandoradskonfiguration"
-#: merge-recursive.c:1863
-msgid "directory/file"
-msgstr "katalog/fil"
+#: config.c:1362
+msgid "unknown error occurred while reading the configuration files"
+msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
-#: merge-recursive.c:1868
+#: config.c:1716
#, 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"
+msgid "unable to parse '%s' from command-line config"
+msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"
-#: merge-recursive.c:1877
+#: config.c:1718
#, c-format
-msgid "Adding %s"
-msgstr "Lägger till %s"
-
-#: merge-recursive.c:1914
-msgid "Already up-to-date!"
-msgstr "Redan à jour!"
+msgid "bad config variable '%s' in file '%s' at line %d"
+msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d"
-#: merge-recursive.c:1923
+#: config.c:1777
#, c-format
-msgid "merging of trees %s and %s failed"
-msgstr "sammanslagning av träden %s och %s misslyckades"
+msgid "%s has multiple values"
+msgstr "%s har flera värden"
-#: merge-recursive.c:2006
-msgid "Merging:"
-msgstr "Slår ihop:"
+#: config.c:2311
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "kunde inte ställa in \"%s\" till \"%s\""
-#: merge-recursive.c:2019
+#: config.c:2313
#, 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 "could not unset '%s'"
+msgstr "kunde inte ta bort inställning för \"%s\""
-#: merge-recursive.c:2058
-msgid "merge returned no commit"
-msgstr "sammanslagningen returnerade ingen incheckning"
+#: connect.c:49
+msgid "The remote end hung up upon initial contact"
+msgstr "Fjärren lade på vid inledande kontakt"
-#: merge-recursive.c:2121
-#, c-format
-msgid "Could not parse object '%s'"
-msgstr "Kunde inte tolka objektet \"%s\""
+#: connect.c:51
+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."
-#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
-msgid "Unable to write index."
-msgstr "Kunde inte skriva indexet."
+# Vague original, not networking-related, but rather related to the actual
+# objects in the database.
+#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
+msgid "Checking connectivity"
+msgstr "Kontrollerar konnektivitet"
-#: notes-utils.c:41
-msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd"
+#: connected.c:75
+msgid "Could not run 'git rev-list'"
+msgstr "Kunde inte köra \"git rev-list\""
-#: notes-utils.c:100
+#: connected.c:95
+msgid "failed write to rev-list"
+msgstr "kunde inte skriva till rev-list"
+
+#: connected.c:102
+msgid "failed to close rev-list's stdin"
+msgstr "kunde inte stänga rev-list:s standard in"
+
+#: convert.c:201
#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "Felaktigt värde för notes.rewriteMode: '%s'"
+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."
-#: notes-utils.c:110
+#: convert.c:205
#, 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/)"
+msgid "CRLF would be replaced by LF in %s."
+msgstr "CRLF skulle ersättas av LF i %s."
-#. TRANSLATORS: The first %s is the name of the
-#. environment variable, the second %s is its value
-#: notes-utils.c:137
+#: convert.c:211
#, c-format
-msgid "Bad %s value: '%s'"
-msgstr "Felaktigt värde på %s: \"%s\""
+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."
-#: object.c:242
+#: convert.c:215
#, c-format
-msgid "unable to parse object: %s"
-msgstr "kunde inte tolka objektet: %s"
+msgid "LF would be replaced by CRLF in %s"
+msgstr "LF skulle ersättas av CRLF i %s."
-#: parse-options.c:572
-msgid "..."
-msgstr "..."
+#: date.c:97
+msgid "in the future"
+msgstr "i framtiden"
-#: parse-options.c:590
+#: date.c:103
#, c-format
-msgid "usage: %s"
-msgstr "användning: %s"
+msgid "%lu second ago"
+msgid_plural "%lu seconds ago"
+msgstr[0] "%lu sekund sedan"
+msgstr[1] "%lu sekunder sedan"
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation
-#: parse-options.c:594
+#: date.c:110
#, c-format
-msgid " or: %s"
-msgstr " eller: %s"
+msgid "%lu minute ago"
+msgid_plural "%lu minutes ago"
+msgstr[0] "%lu minut sedan"
+msgstr[1] "%lu minuter sedan"
-#: parse-options.c:597
+#: date.c:117
#, c-format
-msgid " %s"
-msgstr " %s"
-
-#: parse-options.c:631
-msgid "-NUM"
-msgstr "-TAL"
+msgid "%lu hour ago"
+msgid_plural "%lu hours ago"
+msgstr[0] "%lu timme sedan"
+msgstr[1] "%lu timmar sedan"
-#: parse-options-cb.c:108
+#: date.c:124
#, c-format
-msgid "malformed object name '%s'"
-msgstr "felformat objektnamn \"%s\""
+msgid "%lu day ago"
+msgid_plural "%lu days ago"
+msgstr[0] "%lu dag sedan"
+msgstr[1] "%lu dagar sedan"
-#: path.c:798
+#: date.c:130
#, c-format
-msgid "Could not make %s writable by group"
-msgstr "Kunde inte göra %s skrivbar för gruppen"
-
-#: pathspec.c:133
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
-msgstr ""
-"de globala sökvägsinställningarna \"glob\" och \"noglob\" är inkompatibla"
-
-#: pathspec.c:143
-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"
+msgid "%lu week ago"
+msgid_plural "%lu weeks ago"
+msgstr[0] "%lu vecka sedan"
+msgstr[1] "%lu veckor sedan"
-#: pathspec.c:177
-msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr "ogiltig parameter för sökvägsuttrycket för \"prefix\""
+#: date.c:137
+#, c-format
+msgid "%lu month ago"
+msgid_plural "%lu months ago"
+msgstr[0] "%lu månad sedan"
+msgstr[1] "%lu månader sedan"
-#: pathspec.c:183
+#: date.c:148
#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
-msgstr "felaktigt sökvägsuttryck \"%.*s\" i \"%s\""
+msgid "%lu year"
+msgid_plural "%lu years"
+msgstr[0] "%lu år"
+msgstr[1] "%lu år"
-#: pathspec.c:187
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c:151
#, c-format
-msgid "Missing ')' at the end of pathspec magic in '%s'"
-msgstr "\")\" saknas i slutet av sökvägsuttrycket för \"%s\""
+msgid "%s, %lu month ago"
+msgid_plural "%s, %lu months ago"
+msgstr[0] "%s, %lu månad sedan"
+msgstr[1] "%s, %lu månader sedan"
-#: pathspec.c:205
+#: date.c:156 date.c:161
#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "Tecknet \"%c\" i sökvägsuttrycket i \"%s\" har inte implementerats"
+msgid "%lu year ago"
+msgid_plural "%lu years ago"
+msgstr[0] "%lu år sedan"
+msgstr[1] "%lu år sedan"
-#: pathspec.c:230
+#: diffcore-order.c:24
#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
-msgstr "%s: \"literal\" och \"glob\" är inkompatibla"
+msgid "failed to read orderfile '%s'"
+msgstr "kunde inte läsa orderfilen \"%s\""
-#: pathspec.c:241
+#: diffcore-rename.c:536
+msgid "Performing inexact rename detection"
+msgstr "Utför onöjaktig namnbytesdetektering"
+
+#: diff.c:62
#, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s: \"%s\" är utanför arkivet"
+msgid "option '%s' requires a value"
+msgstr "flaggan \"%s\" behöver ett värde"
-#: pathspec.c:291
+#: diff.c:124
#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""
+msgid " Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n"
-#: pathspec.c:353
+#: diff.c:129
#, 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"
+msgid " Unknown dirstat parameter '%s'\n"
+msgstr " Okänd dirstat-parameter \"%s\"\n"
-#: pathspec.c:433
+#: diff.c:283
#, c-format
-msgid "pathspec '%s' is beyond a symbolic link"
-msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk"
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\""
-#: pathspec.c:442
+#: diff.c:346
+#, c-format
msgid ""
-"There is nothing to exclude from by :(exclude) patterns.\n"
-"Perhaps you forgot to add either ':/' or '.' ?"
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
msgstr ""
-"Ingenting att exkludera från med :(exkludera)-mönster.\n"
-"Glömde du kanske att antingen lägga till \":/\" eller \".\"?"
+"Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
+"%s"
-#: pretty.c:973
-msgid "unable to parse --pretty format"
-msgstr "kunde inte tolka format för --pretty"
+#: diff.c:3087
+#, c-format
+msgid "external diff died, stopping at %s"
+msgstr "extern diff dog, stannar vid %s"
-#: progress.c:235
-msgid "done"
-msgstr "klart"
+#: diff.c:3412
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande"
+
+#: diff.c:3502
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow kräver exakt en sökvägsangivelse"
-#: read-cache.c:1281
+#: diff.c:3665
#, c-format
msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+"Misslyckades tolka argument till flaggan --dirstat/-X;\n"
+"%s"
+
+#: diff.c:3679
+#, c-format
+msgid "Failed to parse --submodule option parameter: '%s'"
+msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\""
+
+#: diff.c:4700
+msgid "inexact rename detection was skipped due to too many files."
msgstr ""
-"index.version satt, men värdet är ogiltigt.\n"
-"Använder version %i"
+"onöjaktig namnbytesdetektering utfördes inte på grund av för många filer"
+
+#: diff.c:4703
+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."
-#: read-cache.c:1291
+#: diff.c:4706
#, c-format
msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
+"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
-"GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"
-"Använder version %i"
+"du kan sätta variabeln %s till åtminstone %d och försöka kommandot på nytt."
-#: refs.c:551 builtin/merge.c:840
-#, c-format
-msgid "Could not open '%s' for writing"
-msgstr "Kunde inte öppna \"%s\" för skrivning"
+#: dir.c:1866
+msgid "failed to get kernel name and information"
+msgstr "misslyckades hämta kärnans namn och information"
+
+#: dir.c:1985
+msgid "Untracked cache is disabled on this system or location."
+msgstr "Ospårad cache är inaktiverad på systemet eller platsen."
-#: refs/files-backend.c:2534
+#: fetch-pack.c:213
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack: förväntade grund lista"
+
+#: fetch-pack.c:225
+msgid "git fetch-pack: expected ACK/NAK, got EOF"
+msgstr "git fetch-patch: förväntade ACK/NAK, fick EOF"
+
+#: fetch-pack.c:243
#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "kunde inte ta bort referensen %s: %s"
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\""
-#: refs/files-backend.c:2537
+#: fetch-pack.c:295
+msgid "--stateless-rpc requires multi_ack_detailed"
+msgstr "--stateless-rpc kräver \"multi ack detailed\""
+
+#: fetch-pack.c:381
#, c-format
-msgid "could not delete references: %s"
-msgstr "kunde inte ta bort referenser: %s"
+msgid "invalid shallow line: %s"
+msgstr "ogiltig \"shallow\"-rad: %s"
-#: refs/files-backend.c:2546
+#: fetch-pack.c:387
#, c-format
-msgid "could not remove reference %s"
-msgstr "kunde inte ta bort referensen %s"
+msgid "invalid unshallow line: %s"
+msgstr "ogiltig \"unshallow\"-rad: %s"
-#: ref-filter.c:55
+#: fetch-pack.c:389
#, c-format
-msgid "expected format: %%(color:<color>)"
-msgstr "förväntat format: %%(color:<color>)"
+msgid "object not found: %s"
+msgstr "objektet hittades inte: %s"
-#: ref-filter.c:57
+#: fetch-pack.c:392
#, c-format
-msgid "unrecognized color: %%(color:%s)"
-msgstr "okänd färg: %%(color:%s)"
+msgid "error in object: %s"
+msgstr "fel i objekt: %s"
-#: ref-filter.c:71
+#: fetch-pack.c:394
#, c-format
-msgid "unrecognized format: %%(%s)"
-msgstr "okänt format: %%(%s)"
+msgid "no shallow found: %s"
+msgstr "ingen \"shallow\" hittades: %s"
-#: ref-filter.c:77
+#: fetch-pack.c:397
#, c-format
-msgid "%%(body) does not take arguments"
-msgstr "%%(body) tar inte argument"
+msgid "expected shallow/unshallow, got %s"
+msgstr "förväntade shallow/unshallow, fick %s"
-#: ref-filter.c:84
+#: fetch-pack.c:436
#, c-format
-msgid "%%(subject) does not take arguments"
-msgstr "%%(subject) tar inte argument"
+msgid "got %s %d %s"
+msgstr "fick %s %d %s"
-#: ref-filter.c:101
+#: fetch-pack.c:450
#, c-format
-msgid "positive value expected contents:lines=%s"
-msgstr "positivt värde förväntat contents:lines=%s"
+msgid "invalid commit %s"
+msgstr "ogiltig incheckning %s"
-#: ref-filter.c:103
+#: fetch-pack.c:483
+msgid "giving up"
+msgstr "ger upp"
+
+#: fetch-pack.c:493 progress.c:235
+msgid "done"
+msgstr "klart"
+
+#: fetch-pack.c:505
#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "okänt %%(contents)-argument: %s"
+msgid "got %s (%d) %s"
+msgstr "fick %s (%d) %s"
-#: ref-filter.c:113
+#: fetch-pack.c:551
#, c-format
-msgid "unrecognized %%(objectname) argument: %s"
-msgstr "okänt %%(objectname)-argument: %s"
+msgid "Marking %s as complete"
+msgstr "Markerar %s som komplett"
-#: ref-filter.c:135
+#: fetch-pack.c:697
#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
-msgstr "förväntat format: %%(align:<bredd>,<position>)"
+msgid "already have %s (%s)"
+msgstr "har redan %s (%s)"
-#: ref-filter.c:147
+#: fetch-pack.c:735
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"
+
+#: fetch-pack.c:743
+msgid "protocol error: bad pack header"
+msgstr "protokollfel: felaktigt packhuvud"
+
+#: fetch-pack.c:799
#, c-format
-msgid "unrecognized position:%s"
-msgstr "okänd position:%s"
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-patch: kunde inte grena av %s"
-#: ref-filter.c:151
+#: fetch-pack.c:815
#, c-format
-msgid "unrecognized width:%s"
-msgstr "okänd bredd:%s"
+msgid "%s failed"
+msgstr "%s misslyckades"
-#: ref-filter.c:157
+#: fetch-pack.c:817
+msgid "error in sideband demultiplexer"
+msgstr "fel i sidbands-avmultiplexare"
+
+#: fetch-pack.c:844
+msgid "Server does not support shallow clients"
+msgstr "Servern stöder inte klienter med grunda arkiv"
+
+#: fetch-pack.c:848
+msgid "Server supports multi_ack_detailed"
+msgstr "Servern stöder \"multi_ack_detailed\""
+
+#: fetch-pack.c:851
+msgid "Server supports no-done"
+msgstr "Servern stöder \"no-done\""
+
+#: fetch-pack.c:857
+msgid "Server supports multi_ack"
+msgstr "Servern stöder \"multi_ack\""
+
+#: fetch-pack.c:861
+msgid "Server supports side-band-64k"
+msgstr "Servern stöder \"side-band-64k\""
+
+#: fetch-pack.c:865
+msgid "Server supports side-band"
+msgstr "Servern stöder \"side-band\""
+
+#: fetch-pack.c:869
+msgid "Server supports allow-tip-sha1-in-want"
+msgstr "Servern stöder \"allow-tip-sha1-in-want\""
+
+#: fetch-pack.c:873
+msgid "Server supports allow-reachable-sha1-in-want"
+msgstr "Servern stöder \"allow-reachable-sha1-in-want\""
+
+#: fetch-pack.c:883
+msgid "Server supports ofs-delta"
+msgstr "Servern stöder \"ofs-delta\""
+
+#: fetch-pack.c:890
#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "okänt %%(align)-argument: %s"
+msgid "Server version is %.*s"
+msgstr "Serverversionen är %.*s"
-#: ref-filter.c:161
+#: fetch-pack.c:896
+msgid "Server does not support --shallow-since"
+msgstr "Servern stöder inte --shallow-since"
+
+#: fetch-pack.c:900
+msgid "Server does not support --shallow-exclude"
+msgstr "Servern stöder inte --shallow-exclude"
+
+#: fetch-pack.c:902
+msgid "Server does not support --deepen"
+msgstr "Servern stöder inte --deepen"
+
+#: fetch-pack.c:913
+msgid "no common commits"
+msgstr "inga gemensamma incheckningar"
+
+#: fetch-pack.c:925
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-patch: hämtning misslyckades."
+
+#: fetch-pack.c:1087
+msgid "no matching remote head"
+msgstr "inget motsvarande fjärrhuvud"
+
+#: gpg-interface.c:185
+msgid "gpg failed to sign the data"
+msgstr "gpg misslyckades signera data"
+
+#: gpg-interface.c:215
+msgid "could not create temporary file"
+msgstr "kunde inte skapa temporära fil"
+
+#: gpg-interface.c:217
#, c-format
-msgid "positive width expected with the %%(align) atom"
-msgstr "positiv bredd förväntad med atomen %%(align)"
+msgid "failed writing detached signature to '%s'"
+msgstr "misslyckades skriva fristående signatur till \"%s\""
-#: ref-filter.c:244
+#: grep.c:1782
#, c-format
-msgid "malformed field name: %.*s"
-msgstr "felformat fältnamn: %.*s"
+msgid "'%s': unable to read %s"
+msgstr "\"%s\" kunde inte läsa %s"
-#: ref-filter.c:270
+#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155
#, c-format
-msgid "unknown field name: %.*s"
-msgstr "okänt fältnamn: %.*s"
+msgid "failed to stat '%s'"
+msgstr "misslyckades ta status på \"%s\""
-#: ref-filter.c:372
+#: grep.c:1810
#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
-msgstr "format: atomen %%(end) använd utan motsvarande atom"
+msgid "'%s': short read"
+msgstr "\"%s\": kort läsning"
-#: ref-filter.c:424
+#: help.c:203
#, c-format
-msgid "malformed format string %s"
-msgstr "felformad formatsträng %s"
+msgid "available git commands in '%s'"
+msgstr "git-kommandon tillgängliga i \"%s\""
-#: ref-filter.c:878
-msgid ":strip= requires a positive integer argument"
-msgstr ":strip= kräver ett positivt heltalsargument"
+#: help.c:210
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "git-kommandon från andra platser i din $PATH"
-#: ref-filter.c:883
-#, c-format
-msgid "ref '%s' does not have %ld components to :strip"
-msgstr "referensen \"%s\" har inte %ld komponenter för :strip"
+#: help.c:241
+msgid "These are common Git commands used in various situations:"
+msgstr "Dessa vanliga Git-kommandon används i olika situationer:"
-#: ref-filter.c:1046
+#: help.c:306
#, c-format
-msgid "unknown %.*s format %s"
-msgstr "okänt \"%.*s\"-format %s"
+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?"
-#: ref-filter.c:1066 ref-filter.c:1097
-#, c-format
-msgid "missing object %s for %s"
-msgstr "objektet %s saknas för %s"
+#: help.c:361
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls."
-#: ref-filter.c:1069 ref-filter.c:1100
+#: help.c:383
#, c-format
-msgid "parse_object_buffer failed on %s for %s"
-msgstr "parse_object_buffer misslyckades på %s för %s"
+msgid ""
+"WARNING: You called a Git command named '%s', which does not exist.\n"
+"Continuing under the assumption that you meant '%s'"
+msgstr ""
+"VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns.\n"
+"Fortsätter under förutsättningen att du menade \"%s\""
-#: ref-filter.c:1311
+#: help.c:388
#, c-format
-msgid "malformed object at '%s'"
-msgstr "felformat objekt vid \"%s\""
+msgid "in %0.1f seconds automatically..."
+msgstr "automatiskt om %0.1f sekunder..."
-#: ref-filter.c:1373
+#: help.c:395
#, c-format
-msgid "ignoring ref with broken name %s"
-msgstr "ignorerar referens med trasigt namn %s"
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git: \"%s\" är inte ett git-kommando. Se \"git --help\"."
-#: ref-filter.c:1378
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "ignorerar trasig referens %s"
+#: help.c:399 help.c:465
+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?"
-#: ref-filter.c:1651
+#: help.c:461
#, c-format
-msgid "format: %%(end) atom missing"
-msgstr "format: atomen %%(end) saknas"
+msgid "%s: %s - %s"
+msgstr "%s: %s - %s"
+
+#: ident.c:334
+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"
-#: ref-filter.c:1705
+#: lockfile.c:152
#, c-format
-msgid "malformed object name %s"
-msgstr "felformat objektnamn %s"
+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."
-#: remote.c:746
+#: lockfile.c:160
#, c-format
-msgid "Cannot fetch both %s and %s to %s"
-msgstr "Kan inte hämta både %s och %s till %s"
+msgid "Unable to create '%s.lock': %s"
+msgstr "kunde inte skapa \"%s.lock\": %s"
-#: remote.c:750
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "misslyckades läsa cachen"
+
+#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374
+#: builtin/checkout.c:588 builtin/clone.c:731
+msgid "unable to write new index file"
+msgstr "kunde inte skriva ny indexfil"
+
+#: merge-recursive.c:209
+msgid "(bad commit)\n"
+msgstr "(felaktig incheckning)\n"
+
+#: merge-recursive.c:231
#, c-format
-msgid "%s usually tracks %s, not %s"
-msgstr "%s spårar vanligtvis %s, inte %s"
+msgid "addinfo_cache failed for path '%s'"
+msgstr "addinfo_cache misslyckades för sökvägen \"%s\""
-#: remote.c:754
+#: merge-recursive.c:301
+msgid "error building trees"
+msgstr "fel vid byggande av träd"
+
+#: merge-recursive.c:720
#, c-format
-msgid "%s tracks both %s and %s"
-msgstr "%s spårar både %s och %s"
+msgid "failed to create path '%s'%s"
+msgstr "misslyckades skapa sökvägen \"%s\"%s"
-#: remote.c:762
-msgid "Internal error"
-msgstr "Internt fel"
+#: merge-recursive.c:731
+#, 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"
-#: remote.c:1677 remote.c:1720
-msgid "HEAD does not point to a branch"
-msgstr "HEAD pekar inte på en gren"
+#: merge-recursive.c:745 merge-recursive.c:764
+msgid ": perhaps a D/F conflict?"
+msgstr ": kanske en K/F-konflikt?"
-#: remote.c:1686
+#: merge-recursive.c:754
#, c-format
-msgid "no such branch: '%s'"
-msgstr "okänd gren: \"%s\""
+msgid "refusing to lose untracked file at '%s'"
+msgstr "vägrar förlora ospårad fil vid \"%s\""
-#: remote.c:1689
+#: merge-recursive.c:796 builtin/cat-file.c:34
#, c-format
-msgid "no upstream configured for branch '%s'"
-msgstr "ingen standarduppström angiven för grenen \"%s\""
+msgid "cannot read object %s '%s'"
+msgstr "kan inte läsa objektet %s: \"%s\""
-#: remote.c:1695
+#: merge-recursive.c:798
#, 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"
+msgid "blob expected for %s '%s'"
+msgstr "blob förväntades för %s \"%s\""
-#: remote.c:1710
+#: merge-recursive.c:822
#, 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"
+msgid "failed to open '%s': %s"
+msgstr "misslyckades öppna \"%s\": %s"
-#: remote.c:1725
+#: merge-recursive.c:833
#, c-format
-msgid "branch '%s' has no remote for pushing"
-msgstr "grenen \"%s\" har ingen fjärr för \"push\""
+msgid "failed to symlink '%s': %s"
+msgstr "misslyckades skapa symboliska länken \"%s\": %s"
-#: remote.c:1736
+#: merge-recursive.c:838
#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
-msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\""
-
-#: remote.c:1749
-msgid "push has no destination (push.default is 'nothing')"
-msgstr "\"push\" har inget mål (push.default är \"ingenting\")"
+msgid "do not know what to do with %06o %s '%s'"
+msgstr "vet inte hur %06o %s \"%s\" skall hanteras"
-#: remote.c:1771
-msgid "cannot resolve 'simple' push to a single destination"
-msgstr "\"enkel push\" motsvarar flera olika mål"
+#: merge-recursive.c:978
+msgid "Failed to execute internal merge"
+msgstr "Misslyckades exekvera intern sammanslagning"
-#: remote.c:2073
+#: merge-recursive.c:982
#, 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:2077
-msgid " (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n"
+msgid "Unable to add %s to database"
+msgstr "Kunde inte lägga till %s till databasen"
-#: remote.c:2080
+#: merge-recursive.c:1081 merge-recursive.c:1095
#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
-msgstr "Din gren är à jour med \"%s\".\n"
+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."
-#: remote.c:2084
+#: merge-recursive.c:1087 merge-recursive.c:1100
#, 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 ""
+"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."
-#: remote.c:2090
-msgid " (use \"git push\" to publish your local commits)\n"
-msgstr " (använd \"git push\" för att publicera dina lokala incheckningar)\n"
+#: merge-recursive.c:1143
+msgid "rename"
+msgstr "namnbyte"
-#: remote.c:2093
-#, 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"
+#: merge-recursive.c:1143
+msgid "renamed"
+msgstr "namnbytt"
-#: remote.c:2101
-msgid " (use \"git pull\" to update your local branch)\n"
-msgstr " (använd \"git pull\" för att uppdatera din lokala gren)\n"
+#: merge-recursive.c:1200
+#, 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"
-#: remote.c:2104
+#: merge-recursive.c:1225
#, 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"
+"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"
-#: remote.c:2114
-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"
+#: merge-recursive.c:1230
+msgid " (left unresolved)"
+msgstr " (lämnad olöst)"
-#: revision.c:2132
-msgid "your current branch appears to be broken"
-msgstr "din nuvarande gren verkar vara trasig"
+#: merge-recursive.c:1292
+#, 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"
-#: revision.c:2135
+#: merge-recursive.c:1325
#, 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 "Renaming %s to %s and %s to %s instead"
+msgstr "Byter namn på %s till %s och %s till %s istället"
-#: revision.c:2329
-msgid "--first-parent is incompatible with --bisect"
-msgstr "--first-parent är inkompatibelt med --bisect"
+#: merge-recursive.c:1531
+#, c-format
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
+msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. %s tillagd i %s"
-#: run-command.c:92
-msgid "open /dev/null failed"
-msgstr "misslyckades öppna /dev/null"
+#: merge-recursive.c:1546
+#, c-format
+msgid "Adding merged %s"
+msgstr "Lägger till sammanslagen %s"
-#: run-command.c:94
+#: merge-recursive.c:1553 merge-recursive.c:1766
#, c-format
-msgid "dup2(%d,%d) failed"
-msgstr "dup2(%d,%d) misslyckades"
+msgid "Adding as %s instead"
+msgstr "Lägger till som %s istället"
-#: send-pack.c:298
-msgid "failed to sign the push certificate"
-msgstr "misslyckades underteckna push-certifikatet"
+#: merge-recursive.c:1610
+#, c-format
+msgid "cannot read object %s"
+msgstr "kan inte läsa objektet %s"
-#: send-pack.c:411
-msgid "the receiving end does not support --signed push"
-msgstr "mottagarsidan stöder inte push med --signed"
+#: merge-recursive.c:1613
+#, c-format
+msgid "object %s is not a blob"
+msgstr "objektet %s är inte en blob"
-#: send-pack.c:413
-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"
+#: merge-recursive.c:1666
+msgid "modify"
+msgstr "ändra"
-#: send-pack.c:425
-msgid "the receiving end does not support --atomic push"
-msgstr "mottagarsidan stöder inte push med --atomic"
+#: merge-recursive.c:1666
+msgid "modified"
+msgstr "ändrad"
-#: send-pack.c:430
-msgid "the receiving end does not support push options"
-msgstr "mottagarsidan stöder inte push-flaggor"
+#: merge-recursive.c:1676
+msgid "content"
+msgstr "innehåll"
-#: sequencer.c:174
-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>\""
+#: merge-recursive.c:1683
+msgid "add/add"
+msgstr "tillägg/tillägg"
-#: sequencer.c:177
-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\""
+#: merge-recursive.c:1718
+#, c-format
+msgid "Skipped %s (merged same as existing)"
+msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
-#: sequencer.c:190 sequencer.c:841 sequencer.c:924
+#: merge-recursive.c:1732
#, c-format
-msgid "Could not write to %s"
-msgstr "Kunde inte skriva till %s"
+msgid "Auto-merging %s"
+msgstr "Slår ihop %s automatiskt"
+
+#: merge-recursive.c:1736 git-submodule.sh:924
+msgid "submodule"
+msgstr "undermodul"
-#: sequencer.c:193 sequencer.c:843 sequencer.c:928
+#: merge-recursive.c:1737
#, c-format
-msgid "Error wrapping up %s."
-msgstr "Fel vid ombrytning av %s."
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
-#: sequencer.c:208
-msgid "Your local changes would be overwritten by cherry-pick."
-msgstr "Dina lokala ändringar skulle skrivas över av \"cherry-pick\"."
+#: merge-recursive.c:1831
+#, c-format
+msgid "Removing %s"
+msgstr "Tar bort %s"
-#: sequencer.c:210
-msgid "Your local changes would be overwritten by revert."
-msgstr "Dina lokala ändringar skulle skrivas över av \"revert\"."
+#: merge-recursive.c:1857
+msgid "file/directory"
+msgstr "fil/katalog"
-#: sequencer.c:213
-msgid "Commit your changes or stash them to proceed."
-msgstr "Checka in dina ändringar eller använd \"stash\" för att fortsätta."
+#: merge-recursive.c:1863
+msgid "directory/file"
+msgstr "katalog/fil"
-#: sequencer.c:228
+#: merge-recursive.c:1868
#, c-format
-msgid "%s: fast-forward"
-msgstr "%s: snabbspola"
+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"
-#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:303
+#: merge-recursive.c:1877
#, c-format
-msgid "%s: Unable to write new index file"
-msgstr "%s: Kunde inte skriva ny indexfil"
-
-#: sequencer.c:321
-msgid "Could not resolve HEAD commit\n"
-msgstr "Kunde inte bestämma HEAD:s incheckning\n"
+msgid "Adding %s"
+msgstr "Lägger till %s"
-#: sequencer.c:341
-msgid "Unable to update cache tree\n"
-msgstr "Kan inte uppdatera cacheträd\n"
+#: merge-recursive.c:1914
+msgid "Already up-to-date!"
+msgstr "Redan à jour!"
-#: sequencer.c:393
+#: merge-recursive.c:1923
#, c-format
-msgid "Could not parse commit %s\n"
-msgstr "Kunde inte tolka incheckningen %s\n"
+msgid "merging of trees %s and %s failed"
+msgstr "sammanslagning av träden %s och %s misslyckades"
+
+#: merge-recursive.c:2006
+msgid "Merging:"
+msgstr "Slår ihop:"
-#: sequencer.c:398
+#: merge-recursive.c:2019
#, c-format
-msgid "Could not parse parent commit %s\n"
-msgstr "Kunde inte tolka föräldraincheckningen %s\n"
+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:"
-#: sequencer.c:463
-msgid "Your index file is unmerged."
-msgstr "Din indexfil har inte slagits ihop."
+#: merge-recursive.c:2058
+msgid "merge returned no commit"
+msgstr "sammanslagningen returnerade ingen incheckning"
-#: sequencer.c:482
+#: merge-recursive.c:2121
#, 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."
+msgid "Could not parse object '%s'"
+msgstr "Kunde inte tolka objektet \"%s\""
-#: sequencer.c:490
-#, c-format
-msgid "Commit %s does not have parent %d"
-msgstr "Incheckning %s har inte förälder %d"
+#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
+msgid "Unable to write index."
+msgstr "Kunde inte skriva indexet."
-#: sequencer.c:494
+#: notes-merge.c:273
#, c-format
-msgid "Mainline was specified but commit %s is not a merge."
-msgstr "Huvudlinje angavs, men incheckningen %s är inte en sammanslagning"
+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."
-#. TRANSLATORS: The first %s will be "revert" or
-#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:507
+#: notes-merge.c:280
#, c-format
-msgid "%s: cannot parse parent commit %s"
-msgstr "%s: kan inte tolka föräldraincheckningen %s"
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "Du har inte avslutat antecknings-sammanslagningen (%s finns)."
-#: sequencer.c:511
-#, c-format
-msgid "Cannot get commit message for %s"
-msgstr "Kan inte hämta incheckningsmeddelande för %s"
+#: notes-utils.c:41
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd"
-#: sequencer.c:597
+#: notes-utils.c:100
#, c-format
-msgid "could not revert %s... %s"
-msgstr "kunde inte ångra %s... %s"
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "Felaktigt värde för notes.rewriteMode: '%s'"
-#: sequencer.c:598
+#: notes-utils.c:110
#, c-format
-msgid "could not apply %s... %s"
-msgstr "kunde inte tillämpa %s... %s"
-
-#: sequencer.c:633
-msgid "empty commit set passed"
-msgstr "den angivna uppsättningen incheckningar är tom"
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)"
-#: sequencer.c:641
+#. TRANSLATORS: The first %s is the name of the
+#. environment variable, the second %s is its value
+#: notes-utils.c:137
#, c-format
-msgid "git %s: failed to read the index"
-msgstr "git %s: misslyckades läsa indexet"
+msgid "Bad %s value: '%s'"
+msgstr "Felaktigt värde på %s: \"%s\""
-#: sequencer.c:645
+#: object.c:242
#, c-format
-msgid "git %s: failed to refresh the index"
-msgstr "git %s: misslyckades uppdatera indexet"
-
-#: sequencer.c:705
-msgid "Cannot revert during another revert."
-msgstr "Kan inte utföra \"revert\" under en annan \"revert\"."
-
-#: sequencer.c:706
-msgid "Cannot revert during a cherry-pick."
-msgstr "Kan inte utföra \"revert\" under en \"cherry-pick\"."
-
-#: sequencer.c:709
-msgid "Cannot cherry-pick during a revert."
-msgstr "Kan inte utföra \"cherry-pick\" under en \"revert\"."
+msgid "unable to parse object: %s"
+msgstr "kunde inte tolka objektet: %s"
-#: sequencer.c:710
-msgid "Cannot cherry-pick during another cherry-pick."
-msgstr "Kan inte utföra \"cherry-pick\" under en annan \"cherry-pick\"."
+#: parse-options.c:572
+msgid "..."
+msgstr "..."
-#: sequencer.c:732
+#: parse-options.c:590
#, c-format
-msgid "Could not parse line %d."
-msgstr "Kan inte tolka rad %d."
-
-#: sequencer.c:737
-msgid "No commits parsed."
-msgstr "Inga incheckningar lästes."
+msgid "usage: %s"
+msgstr "användning: %s"
-#: sequencer.c:749
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation
+#: parse-options.c:594
#, c-format
-msgid "Could not open %s"
-msgstr "Kunde inte öppna %s"
+msgid " or: %s"
+msgstr " eller: %s"
-#: sequencer.c:753
+#: parse-options.c:597
#, c-format
-msgid "Could not read %s."
-msgstr "kunde inte läsa %s."
+msgid " %s"
+msgstr " %s"
-#: sequencer.c:760
-#, c-format
-msgid "Unusable instruction sheet: %s"
-msgstr "Oanvändbart manus: %s"
+#: parse-options.c:631
+msgid "-NUM"
+msgstr "-TAL"
-#: sequencer.c:790
+#: parse-options-cb.c:108
#, c-format
-msgid "Invalid key: %s"
-msgstr "Felaktig nyckel: %s"
+msgid "malformed object name '%s'"
+msgstr "felformat objektnamn \"%s\""
-#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52
+#: path.c:826
#, c-format
-msgid "Invalid value for %s: %s"
-msgstr "Felaktigt värde för %s: %s"
+msgid "Could not make %s writable by group"
+msgstr "Kunde inte göra %s skrivbar för gruppen"
-#: sequencer.c:803
-#, c-format
-msgid "Malformed options sheet: %s"
-msgstr "Trasigt manus: %s"
+#: pathspec.c:133
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr ""
+"de globala sökvägsinställningarna \"glob\" och \"noglob\" är inkompatibla"
-#: sequencer.c:822
-msgid "a cherry-pick or revert is already in progress"
-msgstr "en \"cherry-pick\" eller \"revert\" pågår redan"
+#: pathspec.c:143
+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"
-#: sequencer.c:823
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
-msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\""
+#: pathspec.c:177
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "ogiltig parameter för sökvägsuttrycket för \"prefix\""
-#: sequencer.c:827
+#: pathspec.c:183
#, c-format
-msgid "Could not create sequencer directory %s"
-msgstr "Kunde inte skapa \"sequencer\"-katalogen \"%s\""
-
-#: sequencer.c:862 sequencer.c:998
-msgid "no cherry-pick or revert in progress"
-msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
-
-#: sequencer.c:864
-msgid "cannot resolve HEAD"
-msgstr "kan inte bestämma HEAD"
-
-#: sequencer.c:866 sequencer.c:900
-msgid "cannot abort from a branch yet to be born"
-msgstr "kan inte avbryta från en gren som ännu inte är född"
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "felaktigt sökvägsuttryck \"%.*s\" i \"%s\""
-#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970
+#: pathspec.c:187
#, c-format
-msgid "cannot open %s"
-msgstr "kan inte öppna %s"
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "\")\" saknas i slutet av sökvägsuttrycket för \"%s\""
-#: sequencer.c:888
+#: pathspec.c:205
#, c-format
-msgid "cannot read %s: %s"
-msgstr "kan inte läsa %s: %s"
-
-#: sequencer.c:889
-msgid "unexpected end of file"
-msgstr "oväntat filslut"
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "Tecknet \"%c\" i sökvägsuttrycket i \"%s\" har inte implementerats"
-#: sequencer.c:895
+#: pathspec.c:230
#, 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 "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s: \"literal\" och \"glob\" är inkompatibla"
-#: sequencer.c:921
+#: pathspec.c:241
#, c-format
-msgid "Could not format %s."
-msgstr "Kunde inte formatera %s."
+msgid "%s: '%s' is outside repository"
+msgstr "%s: \"%s\" är utanför arkivet"
-#: sequencer.c:1066
+#: pathspec.c:291
#, c-format
-msgid "%s: can't cherry-pick a %s"
-msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\""
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""
-#: sequencer.c:1069
+#: pathspec.c:353
#, c-format
-msgid "%s: bad revision"
-msgstr "%s: felaktig revision"
-
-#: sequencer.c:1102
-msgid "Can't revert as initial commit"
-msgstr "Kan inte ångra som första incheckning"
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr "%s: sökvägsuttrycket hanteras inte av det här kommandot: %s"
-#: setup.c:160
-#, c-format
+#: pathspec.c:408
msgid ""
-"%s: no such path in the working tree.\n"
-"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+"empty strings as pathspecs will be made invalid in upcoming releases. please "
+"use . instead if you meant to match all paths"
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."
+"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"
-#: setup.c:173
+#: pathspec.c:440
#, 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>...]\""
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk"
-#: setup.c:223
-#, c-format
+#: pathspec.c:449
msgid ""
-"ambiguous argument '%s': both revision and filename\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
+"There is nothing to exclude from by :(exclude) patterns.\n"
+"Perhaps you forgot to add either ':/' or '.' ?"
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:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419
-#, c-format
-msgid "failed to read %s"
-msgstr "misslyckades läsa %s"
-
-#: setup.c:468
-#, c-format
-msgid "Expected git repo version <= %d, found %d"
-msgstr "Förväntade git-arkivversion <= %d, hittade %d"
+"Ingenting att exkludera från med :(exkludera)-mönster.\n"
+"Glömde du kanske att antingen lägga till \":/\" eller \".\"?"
-#: setup.c:476
-msgid "unknown repository extensions found:"
-msgstr "okända arkivutökningar hittades:"
+#: pretty.c:971
+msgid "unable to parse --pretty format"
+msgstr "kunde inte tolka format för --pretty"
-#: setup.c:762
+#: read-cache.c:1315
#, 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:764 setup.c:915 builtin/index-pack.c:1641
-msgid "Cannot come back to cwd"
-msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"
-
-#: setup.c:845
-msgid "Unable to read current working directory"
-msgstr "Kan inte läsa aktuell arbetskatalog"
+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"
-#: setup.c:920
+#: read-cache.c:1325
#, 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)."
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
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)."
+"GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"
+"Använder version %i"
-#: setup.c:927
+#: refs.c:576 builtin/merge.c:840
#, c-format
-msgid "Cannot change to '%s/..'"
-msgstr "kan inte byta till \"%s/..\""
+msgid "Could not open '%s' for writing"
+msgstr "Kunde inte öppna \"%s\" för skrivning"
-#: setup.c:989
+#: refs/files-backend.c:2481
#, 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."
-
-#: sha1_file.c:1046
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "offset före slutet av packfilen (trasig .idx?)"
+msgid "could not delete reference %s: %s"
+msgstr "kunde inte ta bort referensen %s: %s"
-#: sha1_file.c:2434
+#: refs/files-backend.c:2484
#, 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?)"
+msgid "could not delete references: %s"
+msgstr "kunde inte ta bort referenser: %s"
-#: sha1_file.c:2438
+#: refs/files-backend.c:2493
#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr "offset borton slutet av packindex för %s (trunkerat index?)"
+msgid "could not remove reference %s"
+msgstr "kunde inte ta bort referensen %s"
-#: sha1_name.c:462
-msgid ""
-"Git normally never creates a ref that ends with 40 hex characters\n"
-"because it will be ignored when you just specify 40-hex. These refs\n"
-"may be created by mistake. For example,\n"
-"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
-"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
-msgstr ""
-"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 checkout -b $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\""
+#: ref-filter.c:55
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "förväntat format: %%(color:<color>)"
-#: submodule.c:64 submodule.c:98
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
-msgstr ""
-"Kan inte ändra .gitmodules-fil som inte slagits ihop, lös "
-"sammanslagningskonflikter först"
+#: ref-filter.c:57
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr "okänd färg: %%(color:%s)"
-#: submodule.c:68 submodule.c:102
+#: ref-filter.c:71
#, 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"
+msgid "unrecognized format: %%(%s)"
+msgstr "okänt format: %%(%s)"
-#: submodule.c:76
+#: ref-filter.c:77
#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "Kunde inte uppdatera .gitmodules-posten %s"
+msgid "%%(body) does not take arguments"
+msgstr "%%(body) tar inte argument"
-#: submodule.c:109
+#: ref-filter.c:84
#, c-format
-msgid "Could not remove .gitmodules entry for %s"
-msgstr "Kunde inte ta bort .gitmodules-posten för %s"
+msgid "%%(subject) does not take arguments"
+msgstr "%%(subject) tar inte argument"
-#: submodule.c:120
-msgid "staging updated .gitmodules failed"
-msgstr "misslyckades köa uppdaterad .gitmodules"
+#: ref-filter.c:101
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "positivt värde förväntat contents:lines=%s"
-#: submodule.c:177
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "negativa värden är inte tillåtna för submodule.fetchJobs"
+#: ref-filter.c:103
+#, c-format
+msgid "unrecognized %%(contents) argument: %s"
+msgstr "okänt %%(contents)-argument: %s"
-#: submodule-config.c:358
+#: ref-filter.c:113
#, c-format
-msgid "invalid value for %s"
-msgstr "ogiltigt värde för %s"
+msgid "unrecognized %%(objectname) argument: %s"
+msgstr "okänt %%(objectname)-argument: %s"
-#: trailer.c:237
+#: ref-filter.c:135
#, c-format
-msgid "running trailer command '%s' failed"
-msgstr "misslyckades utföra \"trailer\"-kommandot \"%s\""
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "förväntat format: %%(align:<bredd>,<position>)"
-#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558
-#: trailer.c:562
+#: ref-filter.c:147
#, c-format
-msgid "unknown value '%s' for key '%s'"
-msgstr "okänt värde \"%s\" för nyckeln \"%s\""
+msgid "unrecognized position:%s"
+msgstr "okänd position:%s"
-#: trailer.c:544 trailer.c:549 builtin/remote.c:289
+#: ref-filter.c:151
#, c-format
-msgid "more than one %s"
-msgstr "mer än en %s"
+msgid "unrecognized width:%s"
+msgstr "okänd bredd:%s"
-#: trailer.c:582
+#: ref-filter.c:157
#, c-format
-msgid "empty trailer token in trailer '%.*s'"
-msgstr "tom släpradssymbol i släpraden \"%.*s\""
+msgid "unrecognized %%(align) argument: %s"
+msgstr "okänt %%(align)-argument: %s"
-#: trailer.c:702
+#: ref-filter.c:161
#, c-format
-msgid "could not read input file '%s'"
-msgstr "kunde inte läsa indatafilen \"%s\""
+msgid "positive width expected with the %%(align) atom"
+msgstr "positiv bredd förväntad med atomen %%(align)"
-#: trailer.c:705
-msgid "could not read from stdin"
-msgstr "Kunde inte läsa från standard in"
+#: ref-filter.c:244
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr "felformat fältnamn: %.*s"
-#: trailer.c:857 builtin/am.c:42
+#: ref-filter.c:270
#, c-format
-msgid "could not stat %s"
-msgstr "kunde inte ta status på %s"
+msgid "unknown field name: %.*s"
+msgstr "okänt fältnamn: %.*s"
-#: trailer.c:859
+#: ref-filter.c:372
#, c-format
-msgid "file %s is not a regular file"
-msgstr "filen %s är inte en normal fil"
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "format: atomen %%(end) använd utan motsvarande atom"
-#: trailer.c:861
+#: ref-filter.c:424
#, c-format
-msgid "file %s is not writable by user"
-msgstr "filen %s är inte skrivbar av användaren"
+msgid "malformed format string %s"
+msgstr "felformad formatsträng %s"
-#: trailer.c:873
-msgid "could not open temporary file"
-msgstr "kunde inte öppna temporär file"
+#: ref-filter.c:878
+msgid ":strip= requires a positive integer argument"
+msgstr ":strip= kräver ett positivt heltalsargument"
-#: trailer.c:912
+#: ref-filter.c:883
#, c-format
-msgid "could not rename temporary file to %s"
-msgstr "kunde inte byta nman på temporära file till %s"
+msgid "ref '%s' does not have %ld components to :strip"
+msgstr "referensen \"%s\" har inte %ld komponenter för :strip"
-#: transport.c:62
+#: ref-filter.c:1046
#, 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 "unknown %.*s format %s"
+msgstr "okänt \"%.*s\"-format %s"
-#: transport.c:151
+#: ref-filter.c:1066 ref-filter.c:1097
#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "transport: ogiltig flagga för depth: %s"
+msgid "missing object %s for %s"
+msgstr "objektet %s saknas för %s"
-#: transport.c:771
+#: ref-filter.c:1069 ref-filter.c:1100
#, 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 "parse_object_buffer failed on %s for %s"
+msgstr "parse_object_buffer misslyckades på %s för %s"
-#: transport.c:775
+#: ref-filter.c:1311
#, 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 "malformed object at '%s'"
+msgstr "felformat objekt vid \"%s\""
-#: transport.c:783
-msgid "Aborting."
-msgstr "Avbryter."
+#: ref-filter.c:1373
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr "ignorerar referens med trasigt namn %s"
-#: transport-helper.c:1041
+#: ref-filter.c:1378
#, c-format
-msgid "Could not read ref %s"
-msgstr "Kunde inte läsa referensen %s"
+msgid "ignoring broken ref %s"
+msgstr "ignorerar trasig referens %s"
-#: unpack-trees.c:64
+#: ref-filter.c:1633
#, 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 "format: %%(end) atom missing"
+msgstr "format: atomen %%(end) saknas"
-#: unpack-trees.c:66
+#: ref-filter.c:1687
#, 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 "malformed object name %s"
+msgstr "felformat objektnamn %s"
-#: unpack-trees.c:69
+#: remote.c:746
#, 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 "Cannot fetch both %s and %s to %s"
+msgstr "Kan inte hämta både %s och %s till %s"
-#: unpack-trees.c:71
+#: remote.c:750
#, 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 "%s usually tracks %s, not %s"
+msgstr "%s spårar vanligtvis %s, inte %s"
-#: unpack-trees.c:74
+#: remote.c:754
#, 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 "%s tracks both %s and %s"
+msgstr "%s spårar både %s och %s"
-#: unpack-trees.c:76
+#: remote.c:762
+msgid "Internal error"
+msgstr "Internt fel"
+
+#: remote.c:1677 remote.c:1720
+msgid "HEAD does not point to a branch"
+msgstr "HEAD pekar inte på en gren"
+
+#: remote.c:1686
#, 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 "no such branch: '%s'"
+msgstr "okänd gren: \"%s\""
-#: unpack-trees.c:81
+#: remote.c:1689
#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in it:\n"
-"%s"
-msgstr ""
-"Uppdatering av följande kataloger gör att ospårade filer går förlorade i "
-"dem:\n"
-"%s"
+msgid "no upstream configured for branch '%s'"
+msgstr "ingen standarduppström angiven för grenen \"%s\""
+
+#: remote.c:1695
+#, 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:1710
+#, 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:1725
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "grenen \"%s\" har ingen fjärr för \"push\""
-#: unpack-trees.c:85
+#: remote.c:1736
#, 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 "push refspecs for '%s' do not include '%s'"
+msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\""
-#: unpack-trees.c:87
-#, 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"
+#: remote.c:1749
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "\"push\" har inget mål (push.default är \"ingenting\")"
-#: unpack-trees.c:90
+#: remote.c:1771
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "\"enkel push\" motsvarar flera olika mål"
+
+#: remote.c:2073
#, 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."
+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"
-#: unpack-trees.c:92
+#: remote.c:2077
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n"
+
+#: remote.c:2080
#, 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 "Your branch is up-to-date with '%s'.\n"
+msgstr "Din gren är à jour med \"%s\".\n"
-#: unpack-trees.c:95
+#: remote.c:2084
#, 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 "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"
-#: unpack-trees.c:97
+#: remote.c:2090
+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:2093
#, 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 "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"
-#: unpack-trees.c:102
+#: remote.c:2101
+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:2104
#, 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."
+"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"
-#: unpack-trees.c:104
+#: remote.c:2114
+msgid " (use \"git pull\" to merge the remote branch into yours)\n"
+msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n"
+
+#: revision.c:2158
+msgid "your current branch appears to be broken"
+msgstr "din nuvarande gren verkar vara trasig"
+
+#: revision.c:2161
#, 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 "your current branch '%s' does not have any commits yet"
+msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar"
-#: unpack-trees.c:107
+#: revision.c:2355
+msgid "--first-parent is incompatible with --bisect"
+msgstr "--first-parent är inkompatibelt med --bisect"
+
+#: run-command.c:106
+msgid "open /dev/null failed"
+msgstr "misslyckades öppna /dev/null"
+
+#: run-command.c:108
#, c-format
+msgid "dup2(%d,%d) failed"
+msgstr "dup2(%d,%d) misslyckades"
+
+#: send-pack.c:297
+msgid "failed to sign the push certificate"
+msgstr "misslyckades underteckna push-certifikatet"
+
+#: send-pack.c:410
+msgid "the receiving end does not support --signed push"
+msgstr "mottagarsidan stöder inte push med --signed"
+
+#: send-pack.c:412
msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you merge."
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
msgstr ""
-"Följande ospårade filer i arbetskatalogen skulle skrivas över av "
-"sammanslagningen:\n"
-"%%sFlytta eller ta bort dem innan du byter gren."
+"sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --"
+"signed"
-#: unpack-trees.c:109
-#, c-format
+#: send-pack.c:424
+msgid "the receiving end does not support --atomic push"
+msgstr "mottagarsidan stöder inte push med --atomic"
+
+#: send-pack.c:429
+msgid "the receiving end does not support push options"
+msgstr "mottagarsidan stöder inte push-flaggor"
+
+#: sequencer.c:171
+msgid "revert"
+msgstr "revert"
+
+#: sequencer.c:171
+msgid "cherry-pick"
+msgstr "cherry-pick"
+
+#: sequencer.c:228
msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
-"Följande ospårade filer i arbetskatalogen skulle skrivas över av "
-"sammanslagningen:\n"
-"%%s"
+"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>\""
-#: unpack-trees.c:112
-#, c-format
+#: sequencer.c:231
msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you %s."
+"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 ""
-"Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"
-"%%sFlytta eller ta bort dem innan du \"%s\"."
+"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\""
-#: unpack-trees.c:114
+#: sequencer.c:244 sequencer.c:1209
#, 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 "could not lock '%s'"
+msgstr "kunde inte låsa \"%s\""
-#: unpack-trees.c:121
+#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214
#, c-format
-msgid "Entry '%s' overlaps with '%s'. Cannot bind."
-msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda."
+msgid "could not write to '%s'"
+msgstr "kunde inte skriva till \"%s\""
-#: unpack-trees.c:124
+#: sequencer.c:251
#, c-format
-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"
+msgid "could not write eol to '%s'"
+msgstr "kunde inte skriva radslut till \"%s\""
-#: unpack-trees.c:126
+#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216
#, c-format
-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 "failed to finalize '%s'."
+msgstr "misslyckades färdigställa \"%s\"."
-#: unpack-trees.c:128
+#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032
#, c-format
-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 "could not read '%s'"
+msgstr "kunde inte läsa \"%s\""
-#: unpack-trees.c:205
+#: sequencer.c:305
#, c-format
-msgid "Aborting\n"
-msgstr "Avbryter\n"
+msgid "your local changes would be overwritten by %s."
+msgstr "dina lokala ändringar skulle skrivas över av %s."
-#: unpack-trees.c:237
-msgid "Checking out files"
-msgstr "Checkar ut filer"
+#: sequencer.c:309
+msgid "commit your changes or stash them to proceed."
+msgstr "checka in dina ändringar eller använd \"stash\" för att fortsätta."
-#: urlmatch.c:120
-msgid "invalid URL scheme name or missing '://' suffix"
-msgstr "ogiltig URL-schemanamn eller saknat \"://\"-suffix"
+#: sequencer.c:324
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s: snabbspola"
-#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#. TRANSLATORS: %s will be "revert" or "cherry-pick"
+#: sequencer.c:399
#, c-format
-msgid "invalid %XX escape sequence"
-msgstr "ogiltig %XX-teckensekvens"
+msgid "%s: Unable to write new index file"
+msgstr "%s: Kunde inte skriva ny indexfil"
-#: urlmatch.c:172
-msgid "missing host and scheme is not 'file:'"
-msgstr "värd saknas och schemat är inte \"file:\""
+#: sequencer.c:418
+msgid "could not resolve HEAD commit\n"
+msgstr "kunde inte bestämma HEAD:s incheckning\n"
-#: urlmatch.c:189
-msgid "a 'file:' URL may not have a port number"
-msgstr "en \"file:\"-URL kan inte innehålla portnummer"
+#: sequencer.c:438
+msgid "unable to update cache tree\n"
+msgstr "kan inte uppdatera cacheträd\n"
+
+#: sequencer.c:483
+#, 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 skall läggas in i föregående incheckning, kör:\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"Om de skall 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"
-#: urlmatch.c:199
-msgid "invalid characters in host name"
-msgstr "ogiltiga tecken i värdnamnet"
+#: sequencer.c:567
+#, c-format
+msgid "could not parse commit %s\n"
+msgstr "kunde inte tolka incheckningen %s\n"
-#: urlmatch.c:244 urlmatch.c:255
-msgid "invalid port number"
-msgstr "felaktigt portnummer"
+#: sequencer.c:572
+#, c-format
+msgid "could not parse parent commit %s\n"
+msgstr "kunde inte tolka föräldraincheckningen %s\n"
-#: urlmatch.c:322
-msgid "invalid '..' path segment"
-msgstr "felaktigt \"..\"-sökvägssegment"
+#: sequencer.c:656
+msgid "your index file is unmerged."
+msgstr "din indexfil har inte slagits ihop."
-#: worktree.c:282
+#: sequencer.c:675
#, c-format
-msgid "failed to read '%s'"
-msgstr "misslyckades läsa \"%s\""
+msgid "commit %s is a merge but no -m option was given."
+msgstr "incheckning %s är en sammanslagning, men flaggan -m angavs inte."
-#: wrapper.c:222 wrapper.c:392
+#: sequencer.c:683
#, c-format
-msgid "could not open '%s' for reading and writing"
-msgstr "kunde inte öppna \"%s\" för läsning och skrivning"
+msgid "commit %s does not have parent %d"
+msgstr "incheckning %s har inte förälder %d"
-#: wrapper.c:224 wrapper.c:394 builtin/am.c:778
+#: sequencer.c:687
#, c-format
-msgid "could not open '%s' for writing"
-msgstr "kunde inte öppna \"%s\" för skrivning"
+msgid "mainline was specified but commit %s is not a merge."
+msgstr "huvudlinje angavs, men incheckningen %s är inte en sammanslagning"
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771
-#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029
-#: builtin/pull.c:407
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#: sequencer.c:700
#, c-format
-msgid "could not open '%s' for reading"
-msgstr "kunde inte öppna \"%s\" för läsning"
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s: kan inte tolka föräldraincheckningen %s"
-#: wrapper.c:605 wrapper.c:626
+#: sequencer.c:705
#, c-format
-msgid "unable to access '%s'"
-msgstr "kan inte komma åt \"%s\""
-
-#: wrapper.c:634
-msgid "unable to get current working directory"
-msgstr "kan inte hämta aktuell arbetskatalog"
+msgid "cannot get commit message for %s"
+msgstr "kan inte hämta incheckningsmeddelande för %s"
-#: wrapper.c:658
+#: sequencer.c:797
#, c-format
-msgid "could not write to %s"
-msgstr "kunde inte skriva till %s"
+msgid "could not revert %s... %s"
+msgstr "kunde inte ångra %s... %s"
-#: wrapper.c:660
+#: sequencer.c:798
#, c-format
-msgid "could not close %s"
-msgstr "kunde inte stänga %s"
+msgid "could not apply %s... %s"
+msgstr "kunde inte tillämpa %s... %s"
-#: wt-status.c:150
-msgid "Unmerged paths:"
-msgstr "Ej sammanslagna sökvägar:"
+#: sequencer.c:833
+msgid "empty commit set passed"
+msgstr "den angivna uppsättningen incheckningar är tom"
-#: wt-status.c:177 wt-status.c:204
+#: sequencer.c:843
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr " (använd \"git reset %s <fil>...\" för att ta bort från kö)"
-
-#: wt-status.c:179 wt-status.c:206
-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:183
-msgid " (use \"git add <file>...\" to mark resolution)"
-msgstr " (använd \"git add <fil>...\" för att ange lösning)"
-
-#: wt-status.c:185 wt-status.c:189
-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 "git %s: failed to read the index"
+msgstr "git %s: misslyckades läsa indexet"
-#: wt-status.c:187
-msgid " (use \"git rm <file>...\" to mark resolution)"
-msgstr " (använd \"git rm <fil>...\" för att ange lösning)"
+#: sequencer.c:850
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr "git %s: misslyckades uppdatera indexet"
-#: wt-status.c:198 wt-status.c:882
-msgid "Changes to be committed:"
-msgstr "Ändringar att checka in:"
+#: sequencer.c:944
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr "ogiltig rad %d: %.*s"
-#: wt-status.c:216 wt-status.c:891
-msgid "Changes not staged for commit:"
-msgstr "Ändringar ej i incheckningskön:"
+#: sequencer.c:950
+msgid "no commits parsed."
+msgstr "inga incheckningar lästes."
-#: wt-status.c:220
-msgid " (use \"git add <file>...\" to update what will be committed)"
-msgstr ""
-" (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)"
+#: sequencer.c:966
+#, c-format
+msgid "could not read '%s'."
+msgstr "kunde inte läsa \"%s\"."
-#: wt-status.c:222
-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 skall checkas in)"
+#: sequencer.c:972
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr "oanvändbart manus: %s"
-#: wt-status.c:223
-msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
-msgstr ""
-" (använd \"git checkout -- <fil>...\" för att förkasta ändringar i "
-"arbetskatalogen)"
+#: sequencer.c:983
+msgid "cannot cherry-pick during a revert."
+msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."
-#: wt-status.c:225
-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)"
+#: sequencer.c:985
+msgid "cannot revert during a cherry-pick."
+msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."
-#: wt-status.c:237
+#: sequencer.c:1028
#, 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 skall checkas in)"
-
-#: wt-status.c:252
-msgid "both deleted:"
-msgstr "borttaget av bägge:"
-
-#: wt-status.c:254
-msgid "added by us:"
-msgstr "tillagt av oss:"
+msgid "invalid key: %s"
+msgstr "felaktig nyckel: %s"
-#: wt-status.c:256
-msgid "deleted by them:"
-msgstr "borttaget av dem:"
+#: sequencer.c:1031
+#, c-format
+msgid "invalid value for %s: %s"
+msgstr "felaktigt värde för %s: %s"
-#: wt-status.c:258
-msgid "added by them:"
-msgstr "tillagt av dem:"
+#: sequencer.c:1063
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr "trasigt manus: %s"
-#: wt-status.c:260
-msgid "deleted by us:"
-msgstr "borttaget av oss:"
+#: sequencer.c:1101
+msgid "a cherry-pick or revert is already in progress"
+msgstr "en \"cherry-pick\" eller \"revert\" pågår redan"
-#: wt-status.c:262
-msgid "both added:"
-msgstr "tillagt av bägge:"
+#: sequencer.c:1102
+msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\""
-#: wt-status.c:264
-msgid "both modified:"
-msgstr "ändrat av bägge:"
+#: sequencer.c:1106
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""
-#: wt-status.c:274
-msgid "new file:"
-msgstr "ny fil:"
+#: sequencer.c:1120
+msgid "could not lock HEAD"
+msgstr "kunde inte låsa HEAD"
-#: wt-status.c:276
-msgid "copied:"
-msgstr "kopierad:"
+#: sequencer.c:1151 sequencer.c:1289
+msgid "no cherry-pick or revert in progress"
+msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
-#: wt-status.c:278
-msgid "deleted:"
-msgstr "borttagen:"
+#: sequencer.c:1153
+msgid "cannot resolve HEAD"
+msgstr "kan inte bestämma HEAD"
-#: wt-status.c:280
-msgid "modified:"
-msgstr "ändrad:"
+#: sequencer.c:1155 sequencer.c:1189
+msgid "cannot abort from a branch yet to be born"
+msgstr "kan inte avbryta från en gren som ännu inte är född"
-#: wt-status.c:282
-msgid "renamed:"
-msgstr "namnbytt:"
+#: sequencer.c:1175 builtin/grep.c:578
+#, c-format
+msgid "cannot open '%s'"
+msgstr "kan inte öppna \"%s\""
-#: wt-status.c:284
-msgid "typechange:"
-msgstr "typbyte:"
+#: sequencer.c:1177
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "kan inte läsa \"%s\": %s"
-#: wt-status.c:286
-msgid "unknown:"
-msgstr "okänd:"
+#: sequencer.c:1178
+msgid "unexpected end of file"
+msgstr "oväntat filslut"
-#: wt-status.c:288
-msgid "unmerged:"
-msgstr "osammanslagen:"
+#: sequencer.c:1184
+#, 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"
-#: wt-status.c:370
-msgid "new commits, "
-msgstr "nya incheckningar, "
+#: sequencer.c:1354
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\""
-#: wt-status.c:372
-msgid "modified content, "
-msgstr "ändrat innehåll, "
+#: sequencer.c:1358
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s: felaktig revision"
-#: wt-status.c:374
-msgid "untracked content, "
-msgstr "ospårat innehåll, "
+#: sequencer.c:1391
+msgid "can't revert as initial commit"
+msgstr "kan inte ångra som första incheckning"
-#: wt-status.c:756
-msgid "Submodules changed but not updated:"
-msgstr "Undermoduler ändrade men inte uppdaterade:"
+#: setup.c:160
+#, 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."
-#: wt-status.c:758
-msgid "Submodule changes to be committed:"
-msgstr "Undermodulers ändringar att checka in:"
+#: setup.c:173
+#, 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>...]\""
-#: wt-status.c:839
+#: setup.c:223
+#, c-format
msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-"Rör inte raden ovan.\n"
-"Allt nedan kommer tas bort."
+"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>...]\""
-#: wt-status.c:950
-msgid "You have unmerged paths."
-msgstr "Du har ej sammanslagna sökvägar."
+#: setup.c:468
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Förväntade git-arkivversion <= %d, hittade %d"
-#: wt-status.c:953
-msgid " (fix conflicts and run \"git commit\")"
-msgstr " (rätta konflikter och kör \"git commit\")"
+#: setup.c:476
+msgid "unknown repository extensions found:"
+msgstr "okända arkivutökningar hittades:"
-#: wt-status.c:955
-msgid " (use \"git merge --abort\" to abort the merge)"
-msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)"
+#: setup.c:762
+#, 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"
-#: wt-status.c:960
-msgid "All conflicts fixed but you are still merging."
-msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning."
+#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
+msgid "Cannot come back to cwd"
+msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"
-#: wt-status.c:963
-msgid " (use \"git commit\" to conclude merge)"
-msgstr " (använd \"git commit\" för att slutföra sammanslagningen)"
+#: setup.c:845
+msgid "Unable to read current working directory"
+msgstr "Kan inte läsa aktuell arbetskatalog"
-#: wt-status.c:973
-msgid "You are in the middle of an am session."
-msgstr "Du är i mitten av en körning av \"git am\"."
+#: setup.c:920
+#, 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)."
-#: wt-status.c:976
-msgid "The current patch is empty."
-msgstr "Aktuell patch är tom."
+#: setup.c:927
+#, c-format
+msgid "Cannot change to '%s/..'"
+msgstr "kan inte byta till \"%s/..\""
-#: wt-status.c:980
-msgid " (fix conflicts and then run \"git am --continue\")"
-msgstr " (rätta konflikter och kör sedan \"git am --continue\")"
+#: setup.c:989
+#, 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."
-#: wt-status.c:982
-msgid " (use \"git am --skip\" to skip this patch)"
-msgstr " (använd \"git am --skip\" för att hoppa över patchen)"
+#: sha1_file.c:473
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "sökvägen \"%s\" finns inte"
-#: wt-status.c:984
-msgid " (use \"git am --abort\" to restore the original branch)"
-msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)"
+#: sha1_file.c:499
+#, 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."
-#: wt-status.c:1109
-msgid "No commands done."
-msgstr "Inga kommandon utförda."
+#: sha1_file.c:505
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."
-#: wt-status.c:1112
+#: sha1_file.c:511
#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
-msgstr[0] "Sista kommandot utfört (%d kommando utfört):"
-msgstr[1] "Sista kommandot utfört (%d kommandon utfört):"
+msgid "reference repository '%s' is shallow"
+msgstr "referensarkivet \"%s\" är grunt"
-#: wt-status.c:1123
+#: sha1_file.c:519
#, c-format
-msgid " (see more in file %s)"
-msgstr " (se fler i filen %s)"
+msgid "reference repository '%s' is grafted"
+msgstr "referensarkivet \"%s\" är ympat"
-#: wt-status.c:1128
-msgid "No commands remaining."
-msgstr "Inga kommandon återstår."
+#: sha1_file.c:1159
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "offset före slutet av packfilen (trasig .idx?)"
-#: wt-status.c:1131
+#: sha1_file.c:2592
#, c-format
-msgid "Next command to do (%d remaining command):"
-msgid_plural "Next commands to do (%d remaining commands):"
-msgstr[0] "Nästa kommando att utföra (%d kommando återstår):"
-msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):"
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr "offset före slutet av packindex för %s (trasigt index?)"
-#: wt-status.c:1139
-msgid " (use \"git rebase --edit-todo\" to view and edit)"
-msgstr " (använd \"git rebase --edit-todo\" för att visa och redigera)"
+#: sha1_file.c:2596
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr "offset borton slutet av packindex för %s (trunkerat index?)"
-#: wt-status.c:1152
+#: sha1_name.c:407
#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"."
+msgid "short SHA1 %s is ambiguous"
+msgstr "kort SHA1 %s är tvetydig"
-#: wt-status.c:1157
-msgid "You are currently rebasing."
-msgstr "Du håller på med en ombasering."
+#: sha1_name.c:418
+msgid "The candidates are:"
+msgstr "Kandidaterna är:"
-#: wt-status.c:1171
-msgid " (fix conflicts and then run \"git rebase --continue\")"
-msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")"
+#: sha1_name.c:578
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+" git checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
+msgstr ""
+"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 checkout -b $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\""
-#: wt-status.c:1173
-msgid " (use \"git rebase --skip\" to skip this patch)"
-msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)"
+#: submodule.c:64 submodule.c:98
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr ""
+"Kan inte ändra .gitmodules-fil som inte slagits ihop, lös "
+"sammanslagningskonflikter först"
-#: wt-status.c:1175
-msgid " (use \"git rebase --abort\" to check out the original branch)"
-msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)"
+#: submodule.c:68 submodule.c:102
+#, 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"
-#: wt-status.c:1181
-msgid " (all conflicts fixed: run \"git rebase --continue\")"
-msgstr " (alla konflikter rättade: kör \"git rebase --continue\")"
+#: submodule.c:76
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "Kunde inte uppdatera .gitmodules-posten %s"
-#: wt-status.c:1185
+#: submodule.c:109
#, 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 "Could not remove .gitmodules entry for %s"
+msgstr "Kunde inte ta bort .gitmodules-posten för %s"
-#: wt-status.c:1190
-msgid "You are currently splitting a commit during a rebase."
-msgstr "Du håller på att dela upp en incheckning i en ombasering."
+#: submodule.c:120
+msgid "staging updated .gitmodules failed"
+msgstr "misslyckades köa uppdaterad .gitmodules"
-#: wt-status.c:1193
-msgid " (Once your working directory is clean, run \"git rebase --continue\")"
-msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")"
+#: submodule.c:158
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "negativa värden är inte tillåtna för submodule.fetchJobs"
-#: wt-status.c:1197
+#: submodule-config.c:358
#, 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 "invalid value for %s"
+msgstr "ogiltigt värde för %s"
-#: wt-status.c:1202
-msgid "You are currently editing a commit during a rebase."
-msgstr "Du håller på att redigera en incheckning under en ombasering."
+#: trailer.c:238
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "misslyckades utföra \"trailer\"-kommandot \"%s\""
-#: wt-status.c:1205
-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)"
+#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537
+#: trailer.c:541
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr "okänt värde \"%s\" för nyckeln \"%s\""
-#: wt-status.c:1207
-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)"
+#: trailer.c:523 trailer.c:528 builtin/remote.c:289
+#, c-format
+msgid "more than one %s"
+msgstr "mer än en %s"
-#: wt-status.c:1217
+#: trailer.c:672
#, c-format
-msgid "You are currently cherry-picking commit %s."
-msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s."
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "tom släpradssymbol i släpraden \"%.*s\""
-#: wt-status.c:1222
-msgid " (fix conflicts and run \"git cherry-pick --continue\")"
-msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")"
+#: trailer.c:695
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "kunde inte läsa indatafilen \"%s\""
-#: wt-status.c:1225
-msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
-msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")"
+#: trailer.c:698
+msgid "could not read from stdin"
+msgstr "Kunde inte läsa från standard in"
-#: wt-status.c:1227
-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)"
+#: trailer.c:929 builtin/am.c:44
+#, c-format
+msgid "could not stat %s"
+msgstr "kunde inte ta status på %s"
-#: wt-status.c:1236
+#: trailer.c:931
#, c-format
-msgid "You are currently reverting commit %s."
-msgstr "Du håller på med att ångra incheckningen %s."
+msgid "file %s is not a regular file"
+msgstr "filen %s är inte en normal fil"
-#: wt-status.c:1241
-msgid " (fix conflicts and run \"git revert --continue\")"
-msgstr " (rätta konflikter och kör sedan \"git revert --continue\")"
+#: trailer.c:933
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "filen %s är inte skrivbar av användaren"
-#: wt-status.c:1244
-msgid " (all conflicts fixed: run \"git revert --continue\")"
-msgstr " (alla konflikter rättade: kör \"git revert --continue\")"
+#: trailer.c:945
+msgid "could not open temporary file"
+msgstr "kunde inte öppna temporär file"
-#: wt-status.c:1246
-msgid " (use \"git revert --abort\" to cancel the revert operation)"
-msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)"
+#: trailer.c:983
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "kunde inte byta namn på temporär fil till %s"
-#: wt-status.c:1257
+#: transport.c:62
#, 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 "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"
-#: wt-status.c:1261
-msgid "You are currently bisecting."
-msgstr "Du håller på med en \"bisect\"."
+#: transport.c:151
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport: ogiltig flagga för depth: %s"
-#: wt-status.c:1264
-msgid " (use \"git bisect reset\" to get back to the original branch)"
+#: transport.c:817
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
msgstr ""
-" (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)"
+"Följande undermodulsökvägar innehåller ändringar som\n"
+"inte kan hittas av fjärrarna:\n"
-#: wt-status.c:1464
-msgid "On branch "
-msgstr "På grenen "
+#: transport.c:821
+#, 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"
-#: wt-status.c:1470
-msgid "interactive rebase in progress; onto "
-msgstr "interaktiv ombasering pågår; ovanpå"
+#: transport.c:829
+msgid "Aborting."
+msgstr "Avbryter."
-#: wt-status.c:1472
-msgid "rebase in progress; onto "
-msgstr "ombasering pågår; ovanpå"
+#: transport-helper.c:1075
+#, c-format
+msgid "Could not read ref %s"
+msgstr "Kunde inte läsa referensen %s"
-#: wt-status.c:1477
-msgid "HEAD detached at "
-msgstr "HEAD frånkopplad vid "
+#: tree-walk.c:31
+msgid "too-short tree object"
+msgstr "trädobjekt för kort"
-#: wt-status.c:1479
-msgid "HEAD detached from "
-msgstr "HEAD frånkopplad från "
+#: tree-walk.c:37
+msgid "malformed mode in tree entry"
+msgstr "felformat läge i trädpost"
-#: wt-status.c:1482
-msgid "Not currently on any branch."
-msgstr "Inte på någon gren för närvarande."
+#: tree-walk.c:41
+msgid "empty filename in tree entry"
+msgstr "tomt filnamn i trädpost"
-#: wt-status.c:1500
-msgid "Initial commit"
-msgstr "Första incheckning"
+#: tree-walk.c:113
+msgid "too-short tree file"
+msgstr "trädfil för kort"
-#: wt-status.c:1514
-msgid "Untracked files"
-msgstr "Ospårade filer"
+#: unpack-trees.c:64
+#, 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."
-#: wt-status.c:1516
-msgid "Ignored files"
-msgstr "Ignorerade filer"
+#: unpack-trees.c:66
+#, 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:69
+#, 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:71
+#, 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"
-#: wt-status.c:1520
+#: unpack-trees.c:74
#, 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')."
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you %s."
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\")."
+"Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"
+"%%sChecka in dina ändringar eller använd \"stash\" innan du \"%s\"."
-# %s är nästa sträng eller tom.
-#: wt-status.c:1526
+#: unpack-trees.c:76
#, c-format
-msgid "Untracked files not listed%s"
-msgstr "Ospårade filer visas ej%s"
-
-#: wt-status.c:1528
-msgid " (use -u option to show untracked files)"
-msgstr " (använd flaggan -u för att visa ospårade filer)"
-
-#: wt-status.c:1534
-msgid "No changes"
-msgstr "Inga ändringar"
+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"
-#: wt-status.c:1539
+#: unpack-trees.c:81
#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgid ""
+"Updating the following directories would lose untracked files in it:\n"
+"%s"
msgstr ""
-"inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a"
-"\")\n"
+"Uppdatering av följande kataloger gör att ospårade filer går förlorade i "
+"dem:\n"
+"%s"
-#: wt-status.c:1542
+#: unpack-trees.c:85
#, c-format
-msgid "no changes added to commit\n"
-msgstr "inga ändringar att checka in\n"
+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."
-#: wt-status.c:1545
+#: unpack-trees.c:87
#, c-format
msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
msgstr ""
-"inget köat för incheckning, men ospårade filer finns (spåra med \"git add"
-"\")\n"
+"Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
+"%%s"
-#: wt-status.c:1548
+#: unpack-trees.c:90
#, 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 ""
+"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."
-#: wt-status.c:1551
+#: unpack-trees.c:92
#, 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 ""
+"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"
-#: wt-status.c:1554 wt-status.c:1559
+#: unpack-trees.c:95
#, c-format
-msgid "nothing to commit\n"
-msgstr "inget att checka in\n"
+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\"."
-#: wt-status.c:1557
+#: unpack-trees.c:97
#, 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 ""
+"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"
-#: wt-status.c:1561
+#: unpack-trees.c:102
#, c-format
-msgid "nothing to commit, working tree clean\n"
-msgstr "inget att checka in, arbetskatalogen ren\n"
-
-#: wt-status.c:1668
-msgid "Initial commit on "
-msgstr "Första incheckning på "
-
-#: wt-status.c:1672
-msgid "HEAD (no branch)"
-msgstr "HEAD (ingen gren)"
-
-#: wt-status.c:1701
-msgid "gone"
-msgstr "försvunnen"
-
-#: wt-status.c:1703 wt-status.c:1711
-msgid "behind "
-msgstr "efter "
-
-#: wt-status.c:1706 wt-status.c:1709
-msgid "ahead "
-msgstr "före "
+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."
-#: compat/precompose_utf8.c:57 builtin/clone.c:415
+#: unpack-trees.c:104
#, c-format
-msgid "failed to unlink '%s'"
-msgstr "misslyckades ta bort länken \"%s\""
-
-#: builtin/add.c:22
-msgid "git add [<options>] [--] <pathspec>..."
-msgstr "git add [<flaggor>] [--] <sökväg>..."
+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"
-#: builtin/add.c:65
+#: unpack-trees.c:107
#, c-format
-msgid "unexpected diff status %c"
-msgstr "diff-status %c förväntades inte"
-
-#: builtin/add.c:71 builtin/commit.c:281
-msgid "updating files failed"
-msgstr "misslyckades uppdatera filer"
+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."
-#: builtin/add.c:81
+#: unpack-trees.c:109
#, c-format
-msgid "remove '%s'\n"
-msgstr "ta bort \"%s\"\n"
-
-#: builtin/add.c:136
-msgid "Unstaged changes after refreshing the index:"
-msgstr "Oköade ändringar efter att ha uppdaterat indexet:"
+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"
-#: builtin/add.c:196 builtin/rev-parse.c:811
-msgid "Could not read the index"
-msgstr "Kunde inte läsa indexet"
+#: unpack-trees.c:112
+#, 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\"."
-#: builtin/add.c:207
+#: unpack-trees.c:114
#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Kunde inte öppna \"%s\" för skrivning"
+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"
-#: builtin/add.c:211
-msgid "Could not write patch"
-msgstr "Kunde inte skriva patch"
+#: unpack-trees.c:121
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda."
-#: builtin/add.c:214
-msgid "editing patch failed"
-msgstr "redigering av patch misslyckades"
+#: unpack-trees.c:124
+#, c-format
+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"
-#: builtin/add.c:217
+#: unpack-trees.c:126
#, c-format
-msgid "Could not stat '%s'"
-msgstr "Kunde inte ta status på \"%s\""
+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"
-#: builtin/add.c:219
-msgid "Empty patch. Aborted."
-msgstr "Tom patch. Avbryter."
+#: unpack-trees.c:128
+#, c-format
+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"
-#: builtin/add.c:224
+#: unpack-trees.c:205
#, c-format
-msgid "Could not apply '%s'"
-msgstr "Kunde inte tillämpa \"%s\""
+msgid "Aborting\n"
+msgstr "Avbryter\n"
-#: builtin/add.c:234
-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"
+#: unpack-trees.c:237
+msgid "Checking out files"
+msgstr "Checkar ut filer"
-#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521
-#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162
-msgid "dry run"
-msgstr "testkörning"
+#: urlmatch.c:120
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "ogiltig URL-schemanamn eller saknat \"://\"-suffix"
-#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19
-#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593
-#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114
-msgid "be verbose"
-msgstr "var pratsam"
+#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "ogiltig %XX-teckensekvens"
-#: builtin/add.c:256
-msgid "interactive picking"
-msgstr "plocka interaktivt"
+#: urlmatch.c:172
+msgid "missing host and scheme is not 'file:'"
+msgstr "värd saknas och schemat är inte \"file:\""
-#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286
-msgid "select hunks interactively"
-msgstr "välj stycken interaktivt"
+#: urlmatch.c:189
+msgid "a 'file:' URL may not have a port number"
+msgstr "en \"file:\"-URL kan inte innehålla portnummer"
+
+#: urlmatch.c:199
+msgid "invalid characters in host name"
+msgstr "ogiltiga tecken i värdnamnet"
-#: builtin/add.c:258
-msgid "edit current diff and apply"
-msgstr "redigera aktuell diff och applicera"
+#: urlmatch.c:244 urlmatch.c:255
+msgid "invalid port number"
+msgstr "felaktigt portnummer"
-#: builtin/add.c:259
-msgid "allow adding otherwise ignored files"
-msgstr "tillåt lägga till annars ignorerade filer"
+#: urlmatch.c:322
+msgid "invalid '..' path segment"
+msgstr "felaktigt \"..\"-sökvägssegment"
-#: builtin/add.c:260
-msgid "update tracked files"
-msgstr "uppdatera spårade filer"
+#: worktree.c:282
+#, c-format
+msgid "failed to read '%s'"
+msgstr "misslyckades läsa \"%s\""
-#: builtin/add.c:261
-msgid "record only the fact that the path will be added later"
-msgstr "registrera endast att sökvägen kommer läggas till senare"
+#: wrapper.c:222 wrapper.c:392
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr "kunde inte öppna \"%s\" för läsning och skrivning"
-#: builtin/add.c:262
-msgid "add changes from all tracked and untracked files"
-msgstr "lägg till ändringar från alla spårade och ospårade filer"
+#: wrapper.c:224 wrapper.c:394 builtin/am.c:766
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "kunde inte öppna \"%s\" för skrivning"
-#: builtin/add.c:265
-msgid "ignore paths removed in the working tree (same as --no-all)"
-msgstr "ignorera sökvägar borttagna i arbetskatalogen (samma som --no-all)"
+#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
+#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029
+#: builtin/pull.c:341
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "kunde inte öppna \"%s\" för läsning"
-#: builtin/add.c:267
-msgid "don't add, only refresh the index"
-msgstr "lägg inte till, uppdatera endast indexet"
+#: wrapper.c:605 wrapper.c:626
+#, c-format
+msgid "unable to access '%s'"
+msgstr "kan inte komma åt \"%s\""
-#: builtin/add.c:268
-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"
+#: wrapper.c:634
+msgid "unable to get current working directory"
+msgstr "kan inte hämta aktuell arbetskatalog"
-#: builtin/add.c:269
-msgid "check if - even missing - files are ignored in dry run"
-msgstr "se om - även saknade - filer ignoreras i testkörning"
+#: wrapper.c:658
+#, c-format
+msgid "could not write to %s"
+msgstr "kunde inte skriva till %s"
-#: builtin/add.c:270 builtin/update-index.c:958
-msgid "(+/-)x"
-msgstr "(+/-)x"
+#: wrapper.c:660
+#, c-format
+msgid "could not close %s"
+msgstr "kunde inte stänga %s"
-#: builtin/add.c:270 builtin/update-index.c:959
-msgid "override the executable bit of the listed files"
-msgstr "överstyr exekveringsbiten för angivna filer"
+#: wt-status.c:151
+msgid "Unmerged paths:"
+msgstr "Ej sammanslagna sökvägar:"
-#: builtin/add.c:292
+#: wt-status.c:178 wt-status.c:205
#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "Använd -f om du verkligen vill lägga till dem.\n"
+msgid " (use \"git reset %s <file>...\" to unstage)"
+msgstr " (använd \"git reset %s <fil>...\" för att ta bort från kö)"
-#: builtin/add.c:300
-msgid "adding files failed"
-msgstr "misslyckades lägga till filer"
+#: wt-status.c:180 wt-status.c:207
+msgid " (use \"git rm --cached <file>...\" to unstage)"
+msgstr " (använd \"git rm --cached <fil>...\" för att ta bort från kö)"
-#: builtin/add.c:336
-msgid "-A and -u are mutually incompatible"
-msgstr "-A och -u är ömsesidigt inkompatibla"
+#: wt-status.c:184
+msgid " (use \"git add <file>...\" to mark resolution)"
+msgstr " (använd \"git add <fil>...\" för att ange lösning)"
-#: builtin/add.c:343
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run"
+#: wt-status.c:186 wt-status.c:190
+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)"
-#: builtin/add.c:352
-#, c-format
-msgid "--chmod param '%s' must be either -x or +x"
-msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x"
+#: wt-status.c:188
+msgid " (use \"git rm <file>...\" to mark resolution)"
+msgstr " (använd \"git rm <fil>...\" för att ange lösning)"
-#: builtin/add.c:367
-#, c-format
-msgid "Nothing specified, nothing added.\n"
-msgstr "Inget angivet, inget tillagt.\n"
+#: wt-status.c:199 wt-status.c:945
+msgid "Changes to be committed:"
+msgstr "Ändringar att checka in:"
-#: builtin/add.c:368
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "Kanske menade du att skriva \"git add .\"?\n"
+#: wt-status.c:217 wt-status.c:954
+msgid "Changes not staged for commit:"
+msgstr "Ändringar ej i incheckningskön:"
-#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279
-#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340
-#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:240
-msgid "index file corrupt"
-msgstr "indexfilen trasig"
+#: wt-status.c:221
+msgid " (use \"git add <file>...\" to update what will be committed)"
+msgstr ""
+" (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)"
-#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431
-msgid "Unable to write new index file"
-msgstr "Kunde inte skriva ny indexfil"
+#: wt-status.c:223
+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 skall checkas in)"
-#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032
-#, c-format
-msgid "could not read '%s'"
-msgstr "kunde inte läsa \"%s\""
+#: wt-status.c:224
+msgid ""
+" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+msgstr ""
+" (använd \"git checkout -- <fil>...\" för att förkasta ändringar i "
+"arbetskatalogen)"
-#: builtin/am.c:426
-msgid "could not parse author script"
-msgstr "kunde inte tolka författarskript"
+#: wt-status.c:226
+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)"
-#: builtin/am.c:503
+#: wt-status.c:238
#, c-format
-msgid "'%s' was deleted by the applypatch-msg hook"
-msgstr "\"%s\" togs bort av kroken applypatch-msg"
+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 skall checkas in)"
-#: builtin/am.c:544 builtin/notes.c:301
-#, c-format
-msgid "Malformed input line: '%s'."
-msgstr "Felaktig indatarad: \"%s\"."
+#: wt-status.c:253
+msgid "both deleted:"
+msgstr "borttaget av bägge:"
-#: builtin/am.c:581 builtin/notes.c:316
-#, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
-msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""
+#: wt-status.c:255
+msgid "added by us:"
+msgstr "tillagt av oss:"
-#: builtin/am.c:607
-msgid "fseek failed"
-msgstr "\"fseek\" misslyckades"
+#: wt-status.c:257
+msgid "deleted by them:"
+msgstr "borttaget av dem:"
-#: builtin/am.c:787
-#, c-format
-msgid "could not parse patch '%s'"
-msgstr "kunde inte tolka patchen \"%s\""
+#: wt-status.c:259
+msgid "added by them:"
+msgstr "tillagt av dem:"
-#: builtin/am.c:852
-msgid "Only one StGIT patch series can be applied at once"
-msgstr "Endast en StGIT-patchserie kan tillämpas åt gången"
+#: wt-status.c:261
+msgid "deleted by us:"
+msgstr "borttaget av oss:"
-#: builtin/am.c:899
-msgid "invalid timestamp"
-msgstr "ogiltig tidsstämpel"
+#: wt-status.c:263
+msgid "both added:"
+msgstr "tillagt av bägge:"
-#: builtin/am.c:902 builtin/am.c:910
-msgid "invalid Date line"
-msgstr "ogiltig \"Date\"-rad"
+#: wt-status.c:265
+msgid "both modified:"
+msgstr "ändrat av bägge:"
-#: builtin/am.c:907
-msgid "invalid timezone offset"
-msgstr "ogiltig tidszons-offset"
+#: wt-status.c:275
+msgid "new file:"
+msgstr "ny fil:"
-#: builtin/am.c:996
-msgid "Patch format detection failed."
-msgstr "Misslyckades detektera patchformat."
+#: wt-status.c:277
+msgid "copied:"
+msgstr "kopierad:"
-#: builtin/am.c:1001 builtin/clone.c:380
-#, c-format
-msgid "failed to create directory '%s'"
-msgstr "misslyckades skapa katalogen \"%s\""
+#: wt-status.c:279
+msgid "deleted:"
+msgstr "borttagen:"
-#: builtin/am.c:1005
-msgid "Failed to split patches."
-msgstr "Misslyckades dela patchar."
+#: wt-status.c:281
+msgid "modified:"
+msgstr "ändrad:"
-#: builtin/am.c:1137 builtin/commit.c:366
-msgid "unable to write index file"
-msgstr "kan inte skriva indexfil"
+#: wt-status.c:283
+msgid "renamed:"
+msgstr "namnbytt:"
-#: builtin/am.c:1188
-#, c-format
-msgid "When you have resolved this problem, run \"%s --continue\"."
-msgstr "När du har löst problemet, kör \"%s --continue\"."
+#: wt-status.c:285
+msgid "typechange:"
+msgstr "typbyte:"
-#: builtin/am.c:1189
-#, 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."
+#: wt-status.c:287
+msgid "unknown:"
+msgstr "okänd:"
-#: builtin/am.c:1190
-#, 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\"."
+#: wt-status.c:289
+msgid "unmerged:"
+msgstr "osammanslagen:"
-#: builtin/am.c:1328
-msgid "Patch is empty. Was it split wrong?"
-msgstr "Patchen är tom. Delades den upp felaktigt?"
+#: wt-status.c:371
+msgid "new commits, "
+msgstr "nya incheckningar, "
-#: builtin/am.c:1402 builtin/log.c:1543
-#, c-format
-msgid "invalid ident line: %s"
-msgstr "ogiltig ident-rad: %s"
+#: wt-status.c:373
+msgid "modified content, "
+msgstr "ändrat innehåll, "
-#: builtin/am.c:1429
-#, c-format
-msgid "unable to parse commit %s"
-msgstr "kunde inte tolka incheckningen %s"
+#: wt-status.c:375
+msgid "untracked content, "
+msgstr "ospårat innehåll, "
-#: builtin/am.c:1602
-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."
+#: wt-status.c:818
+msgid "Submodules changed but not updated:"
+msgstr "Undermoduler ändrade men inte uppdaterade:"
-#: builtin/am.c:1604
-msgid "Using index info to reconstruct a base tree..."
-msgstr "Använder indexinfo för att återskapa ett basträd..."
+#: wt-status.c:820
+msgid "Submodule changes to be committed:"
+msgstr "Undermodulers ändringar att checka in:"
-#: builtin/am.c:1623
+#: wt-status.c:901
msgid ""
-"Did you hand edit your patch?\n"
-"It does not apply to blobs recorded in its index."
-msgstr ""
-"Har du handredigerat din patch?\n"
-"Den kan inte tillämpas på blobbar som antecknats i dess index."
-
-#: builtin/am.c:1629
-msgid "Falling back to patching base and 3-way merge..."
+"Do not touch the line above.\n"
+"Everything below will be removed."
msgstr ""
-"Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."
+"Rör inte raden ovan.\n"
+"Allt nedan kommer tas bort."
-#: builtin/am.c:1654
-msgid "Failed to merge in the changes."
-msgstr "Misslyckades slå ihop ändringarna."
+#: wt-status.c:1013
+msgid "You have unmerged paths."
+msgstr "Du har ej sammanslagna sökvägar."
-#: builtin/am.c:1679 builtin/merge.c:628
-msgid "git write-tree failed to write a tree"
-msgstr "git write-tree misslyckades skriva ett träd"
+#: wt-status.c:1016
+msgid " (fix conflicts and run \"git commit\")"
+msgstr " (rätta konflikter och kör \"git commit\")"
-#: builtin/am.c:1686
-msgid "applying to an empty history"
-msgstr "tillämpar på en tom historik"
+#: wt-status.c:1018
+msgid " (use \"git merge --abort\" to abort the merge)"
+msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)"
-#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798
-#: builtin/merge.c:823
-msgid "failed to write commit object"
-msgstr "kunde inte skriva incheckningsobjekt"
+#: wt-status.c:1023
+msgid "All conflicts fixed but you are still merging."
+msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning."
-#: builtin/am.c:1731 builtin/am.c:1735
-#, c-format
-msgid "cannot resume: %s does not exist."
-msgstr "kan inte återuppta: %s finns inte."
+#: wt-status.c:1026
+msgid " (use \"git commit\" to conclude merge)"
+msgstr " (använd \"git commit\" för att slutföra sammanslagningen)"
-#: builtin/am.c:1751
-msgid "cannot be interactive without stdin connected to a terminal."
-msgstr ""
-"kan inte vara interaktiv om standard in inte är ansluten till en terminal."
+#: wt-status.c:1036
+msgid "You are in the middle of an am session."
+msgstr "Du är i mitten av en körning av \"git am\"."
-#: builtin/am.c:1756
-msgid "Commit Body is:"
-msgstr "Incheckningskroppen är:"
+#: wt-status.c:1039
+msgid "The current patch is empty."
+msgstr "Aktuell patch är tom."
-#. 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:1766
-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: "
+#: wt-status.c:1043
+msgid " (fix conflicts and then run \"git am --continue\")"
+msgstr " (rätta konflikter och kör sedan \"git am --continue\")"
-#: builtin/am.c:1816
-#, c-format
-msgid "Dirty index: cannot apply patches (dirty: %s)"
-msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"
+#: wt-status.c:1045
+msgid " (use \"git am --skip\" to skip this patch)"
+msgstr " (använd \"git am --skip\" för att hoppa över patchen)"
-#: builtin/am.c:1853 builtin/am.c:1925
-#, c-format
-msgid "Applying: %.*s"
-msgstr "Tillämpar: %.*s"
+#: wt-status.c:1047
+msgid " (use \"git am --abort\" to restore the original branch)"
+msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)"
-#: builtin/am.c:1869
-msgid "No changes -- Patch already applied."
-msgstr "Inga ändringar -- Patchen har redan tillämpats."
+#: wt-status.c:1172
+msgid "No commands done."
+msgstr "Inga kommandon utförda."
-#: builtin/am.c:1877
+#: wt-status.c:1175
#, c-format
-msgid "Patch failed at %s %.*s"
-msgstr "Patch misslyckades på %s %.*s"
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] "Sista kommandot utfört (%d kommando utfört):"
+msgstr[1] "Sista kommandot utfört (%d kommandon utfört):"
-#: builtin/am.c:1883
+#: wt-status.c:1186
#, c-format
-msgid "The copy of the patch that failed is found in: %s"
-msgstr "En kopia av patchen som misslyckades finns i: %s"
-
-#: builtin/am.c:1928
-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 ""
-"Inga ändringar - glömde du använda \"git add\"?\n"
-"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."
+msgid " (see more in file %s)"
+msgstr " (se fler i filen %s)"
-#: builtin/am.c:1935
-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 använda \"git add\"?"
+#: wt-status.c:1191
+msgid "No commands remaining."
+msgstr "Inga kommandon återstår."
-#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308
-#: builtin/reset.c:316
+#: wt-status.c:1194
#, c-format
-msgid "Could not parse object '%s'."
-msgstr "Kan inte tolka objektet \"%s\""
-
-#: builtin/am.c:2095
-msgid "failed to clean index"
-msgstr "misslyckades städa upp indexet"
+msgid "Next command to do (%d remaining command):"
+msgid_plural "Next commands to do (%d remaining commands):"
+msgstr[0] "Nästa kommando att utföra (%d kommando återstår):"
+msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):"
-#: builtin/am.c:2129
-msgid ""
-"You seem to have moved HEAD since the last 'am' failure.\n"
-"Not rewinding to ORIG_HEAD"
-msgstr ""
-"Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
-"Återställer inte till ORIG_HEAD"
+#: wt-status.c:1202
+msgid " (use \"git rebase --edit-todo\" to view and edit)"
+msgstr " (använd \"git rebase --edit-todo\" för att visa och redigera)"
-#: builtin/am.c:2192
+#: wt-status.c:1215
#, c-format
-msgid "Invalid value for --patch-format: %s"
-msgstr "Felaktigt värde för --patch-format: %s"
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"."
-#: builtin/am.c:2225
-msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
-msgstr "git am [<flaggor>] [(<mbox>|<Maildir>)...]"
+#: wt-status.c:1220
+msgid "You are currently rebasing."
+msgstr "Du håller på med en ombasering."
-#: builtin/am.c:2226
-msgid "git am [<options>] (--continue | --skip | --abort)"
-msgstr "git am [<flaggor>] (--continue | --skip | --abort)"
+#: wt-status.c:1234
+msgid " (fix conflicts and then run \"git rebase --continue\")"
+msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")"
-#: builtin/am.c:2232
-msgid "run interactively"
-msgstr "kör interaktivt"
+#: wt-status.c:1236
+msgid " (use \"git rebase --skip\" to skip this patch)"
+msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)"
-#: builtin/am.c:2234
-msgid "historical option -- no-op"
-msgstr "historisk flagga -- no-op"
+#: wt-status.c:1238
+msgid " (use \"git rebase --abort\" to check out the original branch)"
+msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)"
-#: builtin/am.c:2236
-msgid "allow fall back on 3way merging if needed"
-msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"
+#: wt-status.c:1244
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
+msgstr " (alla konflikter rättade: kör \"git rebase --continue\")"
-#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57
-#: builtin/repack.c:172
-msgid "be quiet"
-msgstr "var tyst"
+#: wt-status.c:1248
+#, 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\"."
-#: builtin/am.c:2239
-msgid "add a Signed-off-by line to the commit message"
-msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet"
+#: wt-status.c:1253
+msgid "You are currently splitting a commit during a rebase."
+msgstr "Du håller på att dela upp en incheckning i en ombasering."
-#: builtin/am.c:2242
-msgid "recode into utf8 (default)"
-msgstr "koda om till utf8 (standard)"
+#: wt-status.c:1256
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")"
-#: builtin/am.c:2244
-msgid "pass -k flag to git-mailinfo"
-msgstr "sänd flaggan -k till git-mailinfo"
+#: wt-status.c:1260
+#, 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\"."
-#: builtin/am.c:2246
-msgid "pass -b flag to git-mailinfo"
-msgstr "sänd flaggan -b till git-mailinfo"
+#: wt-status.c:1265
+msgid "You are currently editing a commit during a rebase."
+msgstr "Du håller på att redigera en incheckning under en ombasering."
-#: builtin/am.c:2248
-msgid "pass -m flag to git-mailinfo"
-msgstr "sänd flaggan -m till git-mailinfo"
+#: wt-status.c:1268
+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)"
-#: builtin/am.c:2250
-msgid "pass --keep-cr flag to git-mailsplit for mbox format"
-msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet"
+#: wt-status.c:1270
+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)"
-#: builtin/am.c:2253
-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"
+#: wt-status.c:1280
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s."
-#: builtin/am.c:2256
-msgid "strip everything before a scissors line"
-msgstr "ta bort allting före en saxlinje"
+#: wt-status.c:1285
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")"
-#: builtin/am.c:2257 builtin/apply.c:4837
-msgid "action"
-msgstr "åtgärd"
+#: wt-status.c:1288
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")"
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279
-#: builtin/am.c:2285
-msgid "pass it through git-apply"
-msgstr "sänd det genom git-apply"
+#: wt-status.c:1290
+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)"
-#: builtin/am.c:2266 builtin/apply.c:4861
-msgid "root"
-msgstr "rot"
+#: wt-status.c:1299
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "Du håller på med att ångra incheckningen %s."
-#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799
-#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96
-#: builtin/pull.c:179 builtin/submodule--helper.c:277
-#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482
-#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823
-#: builtin/submodule--helper.c:826
-msgid "path"
-msgstr "sökväg"
+#: wt-status.c:1304
+msgid " (fix conflicts and run \"git revert --continue\")"
+msgstr " (rätta konflikter och kör sedan \"git revert --continue\")"
-#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134
-#: builtin/pull.c:193 builtin/repack.c:181 builtin/repack.c:185
-#: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
-#: parse-options.h:132 parse-options.h:134 parse-options.h:244
-msgid "n"
-msgstr "n"
+#: wt-status.c:1307
+msgid " (all conflicts fixed: run \"git revert --continue\")"
+msgstr " (alla konflikter rättade: kör \"git revert --continue\")"
-#: builtin/am.c:2278 builtin/apply.c:4805
-msgid "num"
-msgstr "antal"
+#: wt-status.c:1309
+msgid " (use \"git revert --abort\" to cancel the revert operation)"
+msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)"
-#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438
-#: builtin/tag.c:372
-msgid "format"
-msgstr "format"
+#: wt-status.c:1320
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"."
-#: builtin/am.c:2282
-msgid "format the patch(es) are in"
-msgstr "format för patch(ar)"
+#: wt-status.c:1324
+msgid "You are currently bisecting."
+msgstr "Du håller på med en \"bisect\"."
-#: builtin/am.c:2288
-msgid "override error message when patch failure occurs"
-msgstr "överstyr felmeddelanden när patchfel uppstår"
+#: wt-status.c:1327
+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)"
-#: builtin/am.c:2290
-msgid "continue applying patches after resolving a conflict"
-msgstr "fortsätt applicera patchar efter att ha löst en konflikt"
+#: wt-status.c:1524
+msgid "On branch "
+msgstr "På grenen "
-#: builtin/am.c:2293
-msgid "synonyms for --continue"
-msgstr "synonymer till --continue"
+#: wt-status.c:1530
+msgid "interactive rebase in progress; onto "
+msgstr "interaktiv ombasering pågår; ovanpå"
-#: builtin/am.c:2296
-msgid "skip the current patch"
-msgstr "hoppa över den aktuella grenen"
+#: wt-status.c:1532
+msgid "rebase in progress; onto "
+msgstr "ombasering pågår; ovanpå"
-#: builtin/am.c:2299
-msgid "restore the original branch and abort the patching operation."
-msgstr "återställ originalgrenen och avbryt patchningen."
+#: wt-status.c:1537
+msgid "HEAD detached at "
+msgstr "HEAD frånkopplad vid "
-#: builtin/am.c:2303
-msgid "lie about committer date"
-msgstr "ljug om incheckningsdatum"
+#: wt-status.c:1539
+msgid "HEAD detached from "
+msgstr "HEAD frånkopplad från "
-#: builtin/am.c:2305
-msgid "use current timestamp for author date"
-msgstr "använd nuvarande tidsstämpel för författardatum"
+#: wt-status.c:1542
+msgid "Not currently on any branch."
+msgstr "Inte på någon gren för närvarande."
-#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229
-#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
-msgid "key-id"
-msgstr "nyckel-id"
+#: wt-status.c:1560
+msgid "Initial commit"
+msgstr "Första incheckning"
-#: builtin/am.c:2308
-msgid "GPG-sign commits"
-msgstr "GPG-signera incheckningar"
+#: wt-status.c:1574
+msgid "Untracked files"
+msgstr "Ospårade filer"
-#: builtin/am.c:2311
-msgid "(internal use for git-rebase)"
-msgstr "(används internt av git-rebase)"
+#: wt-status.c:1576
+msgid "Ignored files"
+msgstr "Ignorerade filer"
-#: builtin/am.c:2326
+#: wt-status.c:1580
+#, c-format
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."
+"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 ""
-"Flaggan -b/--binary har varit utan funktion länge, och\n"
-"kommer tas bort. Vi ber dig att inte använda den längre."
+"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\")."
-#: builtin/am.c:2333
-msgid "failed to read the index"
-msgstr "misslyckades läsa indexet"
+# %s är nästa sträng eller tom.
+#: wt-status.c:1586
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "Ospårade filer visas ej%s"
+
+#: wt-status.c:1588
+msgid " (use -u option to show untracked files)"
+msgstr " (använd flaggan -u för att visa ospårade filer)"
+
+#: wt-status.c:1594
+msgid "No changes"
+msgstr "Inga ändringar"
+
+#: wt-status.c:1599
+#, 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"
-#: builtin/am.c:2348
+#: wt-status.c:1602
#, c-format
-msgid "previous rebase directory %s still exists but mbox given."
-msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs."
+msgid "no changes added to commit\n"
+msgstr "inga ändringar att checka in\n"
-#: builtin/am.c:2372
+#: wt-status.c:1605
#, c-format
msgid ""
-"Stray %s directory found.\n"
-"Use \"git am --abort\" to remove it."
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
msgstr ""
-"Kvarbliven katalog %s hittades.\n"
-"Använd \"git am --abort\" för att ta bort den."
-
-#: builtin/am.c:2378
-msgid "Resolve operation not in progress, we are not resuming."
-msgstr "Lösningsoperation pågår inte, vi återupptar inte."
-
-#: builtin/apply.c:122
-msgid "git apply [<options>] [<patch>...]"
-msgstr "git apply [<flaggor>] [<patch>...]"
+"inget köat för incheckning, men ospårade filer finns (spåra med \"git add"
+"\")\n"
-#: builtin/apply.c:153
+#: wt-status.c:1608
#, c-format
-msgid "unrecognized whitespace option '%s'"
-msgstr "okänt alternativ för whitespace: \"%s\""
+msgid "nothing added to commit but untracked files present\n"
+msgstr "inget köat för incheckning, men ospårade filer finns\n"
-#: builtin/apply.c:169
+#: wt-status.c:1611
#, c-format
-msgid "unrecognized whitespace ignore option '%s'"
-msgstr "okänt alternativ för ignore-whitespace: \"%s\""
+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"
-#: builtin/apply.c:854
+#: wt-status.c:1614 wt-status.c:1619
#, c-format
-msgid "Cannot prepare timestamp regexp %s"
-msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s"
+msgid "nothing to commit\n"
+msgstr "inget att checka in\n"
-#: builtin/apply.c:863
+#: wt-status.c:1617
#, c-format
-msgid "regexec returned %d for input: %s"
-msgstr "regexec returnerade %d för indata: %s"
+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"
-#: builtin/apply.c:947
+#: wt-status.c:1621
#, c-format
-msgid "unable to find filename in patch at line %d"
-msgstr "kan inte hitta filnamn i patchen på rad %d"
+msgid "nothing to commit, working tree clean\n"
+msgstr "inget att checka in, arbetskatalogen ren\n"
-#: builtin/apply.c:984
-#, 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"
+#: wt-status.c:1728
+msgid "Initial commit on "
+msgstr "Första incheckning på "
-#: builtin/apply.c:989
-#, 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"
+#: wt-status.c:1732
+msgid "HEAD (no branch)"
+msgstr "HEAD (ingen gren)"
+
+#: wt-status.c:1761
+msgid "gone"
+msgstr "försvunnen"
-#: builtin/apply.c:990
+#: wt-status.c:1763 wt-status.c:1771
+msgid "behind "
+msgstr "efter "
+
+#: wt-status.c:1766 wt-status.c:1769
+msgid "ahead "
+msgstr "före "
+
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2270
#, 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"
+msgid "cannot %s: You have unstaged changes."
+msgstr "kan inte %s: Du har oköade ändringar."
-#: builtin/apply.c:995
+#: wt-status.c:2276
+msgid "additionally, your index contains uncommitted changes."
+msgstr "dessutom innehåller dit index ändringar som inte har checkats in."
+
+#: wt-status.c:2278
#, 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"
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in."
-#: builtin/apply.c:1489
+#: compat/precompose_utf8.c:57 builtin/clone.c:414
#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr "recount: förväntade rad: %.*s"
+msgid "failed to unlink '%s'"
+msgstr "misslyckades ta bort länken \"%s\""
+
+#: builtin/add.c:22
+msgid "git add [<options>] [--] <pathspec>..."
+msgstr "git add [<flaggor>] [--] <sökväg>..."
-#: builtin/apply.c:1550
+#: builtin/add.c:80
#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr "patch-fragment utan huvud på rad %d: %.*s"
+msgid "unexpected diff status %c"
+msgstr "diff-status %c förväntades inte"
+
+#: builtin/add.c:85 builtin/commit.c:291
+msgid "updating files failed"
+msgstr "misslyckades uppdatera filer"
-#: builtin/apply.c:1567
+#: builtin/add.c:95
#, 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] ""
-"git-diff-huvudet saknar filnamnsinformation när %d ledande sökvägskomponent\n"
-"tas bort (rad %d)"
-msgstr[1] ""
-"git-diff-huvudet saknar filnamnsinformation när %d ledande "
-"sökvägskomponenter\n"
-"tas bort (rad %d)"
+msgid "remove '%s'\n"
+msgstr "ta bort \"%s\"\n"
-#: builtin/apply.c:1743
-msgid "new file depends on old contents"
-msgstr "ny fil beror på gammalt innehåll"
+#: builtin/add.c:149
+msgid "Unstaged changes after refreshing the index:"
+msgstr "Oköade ändringar efter att ha uppdaterat indexet:"
-#: builtin/apply.c:1745
-msgid "deleted file still has contents"
-msgstr "borttagen fil har fortfarande innehåll"
+#: builtin/add.c:209 builtin/rev-parse.c:840
+msgid "Could not read the index"
+msgstr "Kunde inte läsa indexet"
-#: builtin/apply.c:1774
+#: builtin/add.c:220
#, c-format
-msgid "corrupt patch at line %d"
-msgstr "trasig patch på rad %d"
+msgid "Could not open '%s' for writing."
+msgstr "Kunde inte öppna \"%s\" för skrivning"
-#: builtin/apply.c:1810
-#, c-format
-msgid "new file %s depends on old contents"
-msgstr "nya filen %s beror på gammalt innehåll"
+#: builtin/add.c:224
+msgid "Could not write patch"
+msgstr "Kunde inte skriva patch"
-#: builtin/apply.c:1812
-#, c-format
-msgid "deleted file %s still has contents"
-msgstr "borttagna filen %s har fortfarande innehåll"
+#: builtin/add.c:227
+msgid "editing patch failed"
+msgstr "redigering av patch misslyckades"
-#: builtin/apply.c:1815
+#: builtin/add.c:230
#, c-format
-msgid "** warning: file %s becomes empty but is not deleted"
-msgstr "** varning: filen %s blir tom men har inte tagits bort"
+msgid "Could not stat '%s'"
+msgstr "Kunde inte ta status på \"%s\""
-#: builtin/apply.c:1962
-#, c-format
-msgid "corrupt binary patch at line %d: %.*s"
-msgstr "trasig binärpatch på rad %d: %.*s"
+#: builtin/add.c:232
+msgid "Empty patch. Aborted."
+msgstr "Tom patch. Avbryter."
-#: builtin/apply.c:1999
+#: builtin/add.c:237
#, c-format
-msgid "unrecognized binary patch at line %d"
-msgstr "binärpatchen på rad %d känns inte igen"
+msgid "Could not apply '%s'"
+msgstr "Kunde inte tillämpa \"%s\""
-#: builtin/apply.c:2154
-#, c-format
-msgid "patch with only garbage at line %d"
-msgstr "patch med bara skräp på rad %d"
+#: builtin/add.c:247
+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/apply.c:2244
-#, c-format
-msgid "unable to read symlink %s"
-msgstr "kunde inte läsa symboliska länken %s"
+#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111
+#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521
+#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162
+msgid "dry run"
+msgstr "testkörning"
-#: builtin/apply.c:2248
-#, c-format
-msgid "unable to open or read %s"
-msgstr "kunde inte öppna eller läsa %s"
+#: builtin/add.c:269
+msgid "interactive picking"
+msgstr "plocka interaktivt"
+
+#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286
+msgid "select hunks interactively"
+msgstr "välj stycken interaktivt"
+
+#: builtin/add.c:271
+msgid "edit current diff and apply"
+msgstr "redigera aktuell diff och applicera"
+
+#: builtin/add.c:272
+msgid "allow adding otherwise ignored files"
+msgstr "tillåt lägga till annars ignorerade filer"
+
+#: builtin/add.c:273
+msgid "update tracked files"
+msgstr "uppdatera spårade filer"
+
+#: builtin/add.c:274
+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:275
+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:278
+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:280
+msgid "don't add, only refresh the index"
+msgstr "lägg inte till, uppdatera endast indexet"
+
+#: builtin/add.c:281
+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/apply.c:2901
+#: builtin/add.c:282
+msgid "check if - even missing - files are ignored in dry run"
+msgstr "se om - även saknade - filer ignoreras i testkörning"
+
+#: builtin/add.c:283 builtin/update-index.c:947
+msgid "(+/-)x"
+msgstr "(+/-)x"
+
+#: builtin/add.c:283 builtin/update-index.c:948
+msgid "override the executable bit of the listed files"
+msgstr "överstyr exekveringsbiten för angivna filer"
+
+#: builtin/add.c:305
#, c-format
-msgid "invalid start of line: '%c'"
-msgstr "felaktig inledning på rad: \"%c\""
+msgid "Use -f if you really want to add them.\n"
+msgstr "Använd -f om du verkligen vill lägga till dem.\n"
+
+#: builtin/add.c:312
+msgid "adding files failed"
+msgstr "misslyckades lägga till filer"
-#: builtin/apply.c:3020
+#: builtin/add.c:348
+msgid "-A and -u are mutually incompatible"
+msgstr "-A och -u är ömsesidigt inkompatibla"
+
+#: builtin/add.c:355
+msgid "Option --ignore-missing can only be used together with --dry-run"
+msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run"
+
+#: builtin/add.c:359
#, 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)."
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x"
-#: builtin/apply.c:3032
+#: builtin/add.c:374
#, 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"
+msgid "Nothing specified, nothing added.\n"
+msgstr "Inget angivet, inget tillagt.\n"
-#: builtin/apply.c:3038
+#: builtin/add.c:375
#, c-format
-msgid ""
-"while searching for:\n"
-"%.*s"
-msgstr ""
-"vid sökning efter:\n"
-"%.*s"
+msgid "Maybe you wanted to say 'git add .'?\n"
+msgstr "Kanske menade du att skriva \"git add .\"?\n"
-#: builtin/apply.c:3060
+#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279
+#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350
+#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:244
+msgid "index file corrupt"
+msgstr "indexfilen trasig"
+
+#: builtin/am.c:414
+msgid "could not parse author script"
+msgstr "kunde inte tolka författarskript"
+
+#: builtin/am.c:491
#, c-format
-msgid "missing binary patch data for '%s'"
-msgstr "saknar binära patchdata för \"%s\""
+msgid "'%s' was deleted by the applypatch-msg hook"
+msgstr "\"%s\" togs bort av kroken applypatch-msg"
-#: builtin/apply.c:3163
+#: builtin/am.c:532
#, c-format
-msgid "binary patch does not apply to '%s'"
-msgstr "binärpatchen kan inte tillämpas på \"%s\""
+msgid "Malformed input line: '%s'."
+msgstr "Felaktig indatarad: \"%s\"."
-#: builtin/apply.c:3169
+#: builtin/am.c:569
#, 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)"
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""
+
+#: builtin/am.c:595
+msgid "fseek failed"
+msgstr "\"fseek\" misslyckades"
-#: builtin/apply.c:3190
+#: builtin/am.c:775
#, c-format
-msgid "patch failed: %s:%ld"
-msgstr "patch misslyckades: %s:%ld"
+msgid "could not parse patch '%s'"
+msgstr "kunde inte tolka patchen \"%s\""
+
+#: builtin/am.c:840
+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:887
+msgid "invalid timestamp"
+msgstr "ogiltig tidsstämpel"
+
+#: builtin/am.c:890 builtin/am.c:898
+msgid "invalid Date line"
+msgstr "ogiltig \"Date\"-rad"
+
+#: builtin/am.c:895
+msgid "invalid timezone offset"
+msgstr "ogiltig tidszons-offset"
+
+#: builtin/am.c:984
+msgid "Patch format detection failed."
+msgstr "Misslyckades detektera patchformat."
-#: builtin/apply.c:3314
+#: builtin/am.c:989 builtin/clone.c:379
#, c-format
-msgid "cannot checkout %s"
-msgstr "kan inte checka ut %s"
+msgid "failed to create directory '%s'"
+msgstr "misslyckades skapa katalogen \"%s\""
-#: builtin/apply.c:3370
-#, c-format
-msgid "reading from '%s' beyond a symbolic link"
-msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk"
+#: builtin/am.c:993
+msgid "Failed to split patches."
+msgstr "Misslyckades dela patchar."
-#: builtin/apply.c:3399 builtin/apply.c:3630
-#, c-format
-msgid "path %s has been renamed/deleted"
-msgstr "sökvägen %s har ändrat namn/tagits bort"
+#: builtin/am.c:1125 builtin/commit.c:376
+msgid "unable to write index file"
+msgstr "kan inte skriva indexfil"
-#: builtin/apply.c:3482 builtin/apply.c:3644
+#: builtin/am.c:1176
#, c-format
-msgid "%s: does not exist in index"
-msgstr "%s: finns inte i indexet"
+msgid "When you have resolved this problem, run \"%s --continue\"."
+msgstr "När du har löst problemet, kör \"%s --continue\"."
-#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658
+#: builtin/am.c:1177
#, c-format
-msgid "%s: %s"
-msgstr "%s: %s"
+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/apply.c:3491 builtin/apply.c:3652
+#: builtin/am.c:1178
#, c-format
-msgid "%s: does not match index"
-msgstr "%s: motsvarar inte indexet"
+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/apply.c:3597
-msgid "removal patch leaves file contents"
-msgstr "patch för borttagning lämnar kvar filinnehåll"
+#: builtin/am.c:1316
+msgid "Patch is empty. Was it split wrong?"
+msgstr "Patchen är tom. Delades den upp felaktigt?"
-#: builtin/apply.c:3669
+#: builtin/am.c:1390 builtin/log.c:1550
#, c-format
-msgid "%s: wrong type"
-msgstr "%s: fel typ"
+msgid "invalid ident line: %s"
+msgstr "ogiltig ident-rad: %s"
-#: builtin/apply.c:3671
+#: builtin/am.c:1417
#, c-format
-msgid "%s has type %o, expected %o"
-msgstr "%s har typen %o, förväntade %o"
+msgid "unable to parse commit %s"
+msgstr "kunde inte tolka incheckningen %s"
-#: builtin/apply.c:3822 builtin/apply.c:3824
-#, c-format
-msgid "invalid path '%s'"
-msgstr "ogiltig sökväg: %s"
+#: builtin/am.c:1610
+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/apply.c:3879
-#, c-format
-msgid "%s: already exists in index"
-msgstr "%s: finns redan i indexet"
+#: builtin/am.c:1612
+msgid "Using index info to reconstruct a base tree..."
+msgstr "Använder indexinfo för att återskapa ett basträd..."
-#: builtin/apply.c:3882
-#, c-format
-msgid "%s: already exists in working directory"
-msgstr "%s: finns redan i arbetskatalogen"
+#: builtin/am.c:1631
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
+msgstr ""
+"Har du handredigerat din patch?\n"
+"Den kan inte tillämpas på blobbar som antecknats i dess index."
-#: builtin/apply.c:3902
-#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o)"
-msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)"
+#: builtin/am.c:1637
+msgid "Falling back to patching base and 3-way merge..."
+msgstr ""
+"Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."
-#: builtin/apply.c:3907
-#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o) of %s"
-msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s"
+#: builtin/am.c:1662
+msgid "Failed to merge in the changes."
+msgstr "Misslyckades slå ihop ändringarna."
-#: builtin/apply.c:3927
-#, c-format
-msgid "affected file '%s' is beyond a symbolic link"
-msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk"
+#: builtin/am.c:1686 builtin/merge.c:628
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree misslyckades skriva ett träd"
-#: builtin/apply.c:3931
-#, c-format
-msgid "%s: patch does not apply"
-msgstr "%s: patchen kan inte tillämpas"
+#: builtin/am.c:1693
+msgid "applying to an empty history"
+msgstr "tillämpar på en tom historik"
-#: builtin/apply.c:3945
-#, c-format
-msgid "Checking patch %s..."
-msgstr "Kontrollerar patchen %s..."
+#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798
+#: builtin/merge.c:823
+msgid "failed to write commit object"
+msgstr "kunde inte skriva incheckningsobjekt"
-#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/am.c:1739 builtin/am.c:1743
#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
+msgid "cannot resume: %s does not exist."
+msgstr "kan inte återuppta: %s finns inte."
-#: builtin/apply.c:4182
-#, c-format
-msgid "unable to remove %s from index"
-msgstr "kan inte ta bort %s från indexet"
+#: builtin/am.c:1759
+msgid "cannot be interactive without stdin connected to a terminal."
+msgstr ""
+"kan inte vara interaktiv om standard in inte är ansluten till en terminal."
-#: builtin/apply.c:4215
-#, c-format
-msgid "corrupt patch for submodule %s"
-msgstr "trasig patch för undermodulen %s"
+#: builtin/am.c:1764
+msgid "Commit Body is:"
+msgstr "Incheckningskroppen är:"
-#: builtin/apply.c:4219
-#, c-format
-msgid "unable to stat newly created file '%s'"
-msgstr "kan inte ta status på nyligen skapade filen \"%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:1774
+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/apply.c:4224
+#: builtin/am.c:1824
#, 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"
+msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"
-#: builtin/apply.c:4227 builtin/apply.c:4340
+#: builtin/am.c:1861 builtin/am.c:1933
#, c-format
-msgid "unable to add cache entry for %s"
-msgstr "kan inte lägga till cachepost för %s"
+msgid "Applying: %.*s"
+msgstr "Tillämpar: %.*s"
-#: builtin/apply.c:4260
-#, c-format
-msgid "closing file '%s'"
-msgstr "stänger filen \"%s\""
+#: builtin/am.c:1877
+msgid "No changes -- Patch already applied."
+msgstr "Inga ändringar -- Patchen har redan tillämpats."
-#: builtin/apply.c:4313
+#: builtin/am.c:1885
#, c-format
-msgid "unable to write file '%s' mode %o"
-msgstr "kan inte skriva filen \"%s\" läge %o"
+msgid "Patch failed at %s %.*s"
+msgstr "Patch misslyckades på %s %.*s"
-#: builtin/apply.c:4403
+#: builtin/am.c:1891
#, c-format
-msgid "Applied patch %s cleanly."
-msgstr "Tillämpade patchen %s rent."
+msgid "The copy of the patch that failed is found in: %s"
+msgstr "En kopia av patchen som misslyckades finns i: %s"
-#: builtin/apply.c:4411
-msgid "internal error"
-msgstr "internt fel"
+#: builtin/am.c:1936
+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 ""
+"Inga ändringar - glömde du använda \"git add\"?\n"
+"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/apply.c:4414
-#, c-format
-msgid "Applying patch %%s with %d reject..."
-msgid_plural "Applying patch %%s with %d rejects..."
-msgstr[0] "Tillämpade patchen %%s med %d refuserad..."
-msgstr[1] "Tillämpade patchen %%s med %d refuserade..."
+#: builtin/am.c:1943
+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 använda \"git add\"?"
-#: builtin/apply.c:4424
+#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
+#: builtin/reset.c:316
#, c-format
-msgid "truncating .rej filename to %.*s.rej"
-msgstr "trunkerar .rej-filnamnet till %.*s.rej"
+msgid "Could not parse object '%s'."
+msgstr "Kan inte tolka objektet \"%s\""
-#: builtin/apply.c:4432
-#, c-format
-msgid "cannot open %s: %s"
-msgstr "kan inte öppna %s: %s"
+#: builtin/am.c:2103
+msgid "failed to clean index"
+msgstr "misslyckades städa upp indexet"
-#: builtin/apply.c:4445
-#, c-format
-msgid "Hunk #%d applied cleanly."
-msgstr "Stycke %d tillämpades rent."
+#: builtin/am.c:2137
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
+msgstr ""
+"Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
+"Återställer inte till ORIG_HEAD"
-#: builtin/apply.c:4448
+#: builtin/am.c:2200
#, c-format
-msgid "Rejected hunk #%d."
-msgstr "Refuserar stycke %d."
+msgid "Invalid value for --patch-format: %s"
+msgstr "Felaktigt värde för --patch-format: %s"
-#: builtin/apply.c:4537
-#, c-format
-msgid "Skipped patch '%s'."
-msgstr "Ignorerar patch \"%s\"."
+#: builtin/am.c:2233
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]"
-#: builtin/apply.c:4545
-msgid "unrecognized input"
-msgstr "indata känns inte igen"
+#: builtin/am.c:2234
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<flaggor>] (--continue | --skip | --abort)"
-#: builtin/apply.c:4556
-msgid "unable to read index file"
-msgstr "kan inte läsa indexfilen"
+#: builtin/am.c:2240
+msgid "run interactively"
+msgstr "kör interaktivt"
-#: builtin/apply.c:4701
-msgid "--3way outside a repository"
-msgstr "--3way utanför arkiv"
+#: builtin/am.c:2242
+msgid "historical option -- no-op"
+msgstr "historisk flagga -- no-op"
-#: builtin/apply.c:4709
-msgid "--index outside a repository"
-msgstr "--index utanför arkiv"
+#: builtin/am.c:2244
+msgid "allow fall back on 3way merging if needed"
+msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"
-#: builtin/apply.c:4712
-msgid "--cached outside a repository"
-msgstr "--cached utanför arkiv"
+#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
+#: builtin/repack.c:172
+msgid "be quiet"
+msgstr "var tyst"
-#: builtin/apply.c:4745
-#, c-format
-msgid "can't open patch '%s'"
-msgstr "kan inte öppna patchen \"%s\""
+#: builtin/am.c:2247
+msgid "add a Signed-off-by line to the commit message"
+msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet"
-#: builtin/apply.c:4760
-#, c-format
-msgid "squelched %d whitespace error"
-msgid_plural "squelched %d whitespace errors"
-msgstr[0] "undertryckte %d fel i blanksteg"
-msgstr[1] "undertryckte %d fel i blanksteg"
+#: builtin/am.c:2250
+msgid "recode into utf8 (default)"
+msgstr "koda om till utf8 (standard)"
-#: builtin/apply.c:4766 builtin/apply.c:4776
-#, 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."
+#: builtin/am.c:2252
+msgid "pass -k flag to git-mailinfo"
+msgstr "sänd flaggan -k till git-mailinfo"
-#: builtin/apply.c:4800
-msgid "don't apply changes matching the given path"
-msgstr "tillämpa inte ändringar som motsvarar given sökväg"
+#: builtin/am.c:2254
+msgid "pass -b flag to git-mailinfo"
+msgstr "sänd flaggan -b till git-mailinfo"
-#: builtin/apply.c:4803
-msgid "apply changes matching the given path"
-msgstr "tillämpa ändringar som motsvarar given sökväg"
+#: builtin/am.c:2256
+msgid "pass -m flag to git-mailinfo"
+msgstr "sänd flaggan -m till git-mailinfo"
-#: builtin/apply.c:4806
-msgid "remove <num> leading slashes from traditional diff paths"
-msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar"
+#: builtin/am.c:2258
+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/apply.c:4809
-msgid "ignore additions made by the patch"
-msgstr "ignorera tillägg gjorda av patchen"
+#: builtin/am.c:2261
+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/apply.c:4811
-msgid "instead of applying the patch, output diffstat for the input"
-msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata"
+#: builtin/am.c:2264
+msgid "strip everything before a scissors line"
+msgstr "ta bort allting före en saxlinje"
-#: builtin/apply.c:4815
-msgid "show number of added and deleted lines in decimal notation"
-msgstr "visa antal tillagda och borttagna rader decimalt"
+#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
+#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
+#: builtin/am.c:2293
+msgid "pass it through git-apply"
+msgstr "sänd det genom git-apply"
-#: builtin/apply.c:4817
-msgid "instead of applying the patch, output a summary for the input"
-msgstr "istället för att tillämpa patchen, skriv ut en summering av indata"
+#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
+#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135
+#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185
+#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
+msgid "n"
+msgstr "n"
-#: builtin/apply.c:4819
-msgid "instead of applying the patch, see if the patch is applicable"
-msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas"
+#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/tag.c:372
+msgid "format"
+msgstr "format"
-#: builtin/apply.c:4821
-msgid "make sure the patch is applicable to the current index"
-msgstr "se till att patchen kan tillämpas på aktuellt index"
+#: builtin/am.c:2290
+msgid "format the patch(es) are in"
+msgstr "format för patch(ar)"
-#: builtin/apply.c:4823
-msgid "apply a patch without touching the working tree"
-msgstr "tillämpa en patch utan att röra arbetskatalogen"
+#: builtin/am.c:2296
+msgid "override error message when patch failure occurs"
+msgstr "överstyr felmeddelanden när patchfel uppstår"
-#: builtin/apply.c:4825
-msgid "accept a patch that touches outside the working area"
-msgstr "godta en patch som rör filer utanför arbetskatalogen"
+#: builtin/am.c:2298
+msgid "continue applying patches after resolving a conflict"
+msgstr "fortsätt applicera patchar efter att ha löst en konflikt"
-#: builtin/apply.c:4827
-msgid "also apply the patch (use with --stat/--summary/--check)"
-msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"
+#: builtin/am.c:2301
+msgid "synonyms for --continue"
+msgstr "synonymer till --continue"
-#: builtin/apply.c:4829
-msgid "attempt three-way merge if a patch does not apply"
-msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas"
+#: builtin/am.c:2304
+msgid "skip the current patch"
+msgstr "hoppa över den aktuella grenen"
-#: builtin/apply.c:4831
-msgid "build a temporary index based on embedded index information"
-msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
+#: builtin/am.c:2307
+msgid "restore the original branch and abort the patching operation."
+msgstr "återställ originalgrenen och avbryt patchningen."
-#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426
-msgid "paths are separated with NUL character"
-msgstr "sökvägar avdelas med NUL-tecken"
+#: builtin/am.c:2311
+msgid "lie about committer date"
+msgstr "ljug om incheckningsdatum"
-#: builtin/apply.c:4836
-msgid "ensure at least <n> lines of context match"
-msgstr "se till att åtminstone <n> rader sammanhang är lika"
+#: builtin/am.c:2313
+msgid "use current timestamp for author date"
+msgstr "använd nuvarande tidsstämpel för författardatum"
-#: builtin/apply.c:4838
-msgid "detect new or modified lines that have whitespace errors"
-msgstr "detektera nya eller ändrade rader som har fel i blanktecken"
+#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229
+#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355
+msgid "key-id"
+msgstr "nyckel-id"
-#: builtin/apply.c:4841 builtin/apply.c:4844
-msgid "ignore changes in whitespace when finding context"
-msgstr "ignorera ändringar i blanktecken för sammanhang"
+#: builtin/am.c:2316
+msgid "GPG-sign commits"
+msgstr "GPG-signera incheckningar"
-#: builtin/apply.c:4847
-msgid "apply the patch in reverse"
-msgstr "tillämpa patchen baklänges"
+#: builtin/am.c:2319
+msgid "(internal use for git-rebase)"
+msgstr "(används internt av git-rebase)"
-#: builtin/apply.c:4849
-msgid "don't expect at least one line of context"
-msgstr "förvänta inte minst en rad sammanhang"
+#: builtin/am.c:2334
+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 ""
+"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/apply.c:4851
-msgid "leave the rejected hunks in corresponding *.rej files"
-msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
+#: builtin/am.c:2341
+msgid "failed to read the index"
+msgstr "misslyckades läsa indexet"
-#: builtin/apply.c:4853
-msgid "allow overlapping hunks"
-msgstr "tillåt överlappande stycken"
+#: builtin/am.c:2356
+#, c-format
+msgid "previous rebase directory %s still exists but mbox given."
+msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs."
-#: builtin/apply.c:4856
-msgid "tolerate incorrectly detected missing new-line at the end of file"
-msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
+#: builtin/am.c:2380
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
+msgstr ""
+"Kvarbliven katalog %s hittades.\n"
+"Använd \"git am --abort\" för att ta bort den."
-#: builtin/apply.c:4859
-msgid "do not trust the line counts in the hunk headers"
-msgstr "lite inte på antalet linjer i styckehuvuden"
+#: builtin/am.c:2386
+msgid "Resolve operation not in progress, we are not resuming."
+msgstr "Lösningsoperation pågår inte, vi återupptar inte."
-#: builtin/apply.c:4862
-msgid "prepend <root> to all filenames"
-msgstr "lägg till <rot> i alla filnamn"
+#: builtin/apply.c:8
+msgid "git apply [<options>] [<patch>...]"
+msgstr "git apply [<flaggor>] [<patch>...]"
#: builtin/archive.c:17
#, c-format
msgid "Blaming lines"
msgstr "Klandra rader"
-#: builtin/blame.c:2536
+#: builtin/blame.c:2577
msgid "Show blame entries as we find them, incrementally"
msgstr "Visa klandringsposter när vi hittar dem, interaktivt"
-#: builtin/blame.c:2537
+#: builtin/blame.c:2578
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)"
-#: builtin/blame.c:2538
+#: builtin/blame.c:2579
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Behandla inte rotincheckningar som gränser (Standard: av)"
-#: builtin/blame.c:2539
+#: builtin/blame.c:2580
msgid "Show work cost statistics"
msgstr "Visa statistik över arbetskostnad"
-#: builtin/blame.c:2540
+#: builtin/blame.c:2581
msgid "Force progress reporting"
msgstr "Tvinga förloppsrapportering"
-#: builtin/blame.c:2541
+#: builtin/blame.c:2582
msgid "Show output score for blame entries"
msgstr "Visa utdatapoäng för klandringsposter"
-#: builtin/blame.c:2542
+#: builtin/blame.c:2583
msgid "Show original filename (Default: auto)"
msgstr "Visa originalfilnamn (Standard: auto)"
-#: builtin/blame.c:2543
+#: builtin/blame.c:2584
msgid "Show original linenumber (Default: off)"
msgstr "Visa ursprungligt radnummer (Standard: av)"
-#: builtin/blame.c:2544
+#: builtin/blame.c:2585
msgid "Show in a format designed for machine consumption"
msgstr "Visa i ett format avsett för maskinkonsumtion"
-#: builtin/blame.c:2545
+#: builtin/blame.c:2586
msgid "Show porcelain format with per-line commit information"
msgstr "Visa porslinsformat med per-rad-incheckningsinformation"
-#: builtin/blame.c:2546
+#: builtin/blame.c:2587
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:2547
+#: builtin/blame.c:2588
msgid "Show raw timestamp (Default: off)"
msgstr "Visa rå tidsstämpel (Standard: av)"
-#: builtin/blame.c:2548
+#: builtin/blame.c:2589
msgid "Show long commit SHA1 (Default: off)"
msgstr "Visa lång inchecknings-SHA1 (Standard: av)"
-#: builtin/blame.c:2549
+#: builtin/blame.c:2590
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)"
-#: builtin/blame.c:2550
+#: builtin/blame.c:2591
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:2551
+#: builtin/blame.c:2592
msgid "Ignore whitespace differences"
msgstr "Ignorera ändringar i blanksteg"
-#: builtin/blame.c:2552
+#: builtin/blame.c:2599
+msgid "Use an experimental indent-based heuristic to improve diffs"
+msgstr ""
+"Använd en experimentell indenteringsbaserad algoritm för att förbättra diffar"
+
+#: builtin/blame.c:2600
+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"
+
+#: builtin/blame.c:2602
msgid "Spend extra cycles to find better match"
msgstr "Slösa extra cykler med att hitta bättre träff"
-#: builtin/blame.c:2553
+#: builtin/blame.c:2603
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:2554
+#: builtin/blame.c:2604
msgid "Use <file>'s contents as the final image"
msgstr "Använd <fil>s innehåll som slutgiltig bild"
-#: builtin/blame.c:2555 builtin/blame.c:2556
+#: builtin/blame.c:2605 builtin/blame.c:2606
msgid "score"
msgstr "poäng"
-#: builtin/blame.c:2555
+#: builtin/blame.c:2605
msgid "Find line copies within and across files"
msgstr "Hitta kopierade rader inuti och mellan filer"
-#: builtin/blame.c:2556
+#: builtin/blame.c:2606
msgid "Find line movements within and across files"
msgstr "Hitta flyttade rader inuti och mellan filer"
-#: builtin/blame.c:2557
+#: builtin/blame.c:2607
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2557
+#: builtin/blame.c:2607
msgid "Process only line range n,m, counting from 1"
msgstr "Behandla endast radintervallet n,m, med början på 1"
+#: builtin/blame.c:2654
+msgid "--progress can't be used with --incremental or porcelain formats"
+msgstr "--progress kan inte användas med --incremental eller porslinsformat"
+
#. 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:2649
+#: builtin/blame.c:2700
msgid "4 years, 11 months ago"
msgstr "4 år, 11 månader sedan"
+#: builtin/blame.c:2780
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents och --reverse fungerar inte så bra tillsammans."
+
+#: builtin/blame.c:2800
+msgid "cannot use --contents with final commit object name"
+msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt"
+
+#: builtin/blame.c:2805
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr ""
+"--reverse och --first-parent tillsammans kräver att du anger senaste "
+"incheckningen"
+
+#: builtin/blame.c:2832
+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"
+
+#: builtin/blame.c:2843
+#, c-format
+msgid "no such path %s in %s"
+msgstr "sökvägen %s i %s finns inte"
+
+#: builtin/blame.c:2854
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "kan inte läsa objektet %s för sökvägen %s"
+
+#: builtin/blame.c:2873
+#, 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/branch.c:26
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<flaggor>] [-r | -a] [--merged | --no-merged]"
msgid "change the upstream info"
msgstr "ändra uppströmsinformationen"
+#: builtin/branch.c:660
+msgid "Unset the upstream info"
+msgstr "ta bort uppströmsinformationen"
+
#: builtin/branch.c:661
msgid "use colored output"
msgstr "använd färgad utdata"
msgid "field name to sort on"
msgstr "fältnamn att sortera på"
-#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402
-#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404
+#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570
#: builtin/tag.c:369
msgid "object"
msgstr "objekt"
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Misslyckades slå upp HEAD som giltig referens"
-#: builtin/branch.c:709 builtin/clone.c:707
+#: builtin/branch.c:709 builtin/clone.c:706
msgid "HEAD not found below refs/heads!"
msgstr "HEAD hittades inte under refs/heads!"
msgid "Need a repository to unbundle."
msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)."
-#: builtin/cat-file.c:443
+#: builtin/cat-file.c:513
msgid ""
-"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
-"<type>|--textconv) <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|"
-"<typ>|--textconv) <objekt>"
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <typ> | --textconv | --filters) [--path=<sökväg>] <objekt>"
-#: builtin/cat-file.c:444
-msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
-msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
+#: builtin/cat-file.c:514
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
+msgstr ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
-#: builtin/cat-file.c:481
+#: builtin/cat-file.c:551
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<typ> kan vara en av: blob, tree, commit, tag"
-#: builtin/cat-file.c:482
+#: builtin/cat-file.c:552
msgid "show object type"
msgstr "visa objekttyp"
-#: builtin/cat-file.c:483
+#: builtin/cat-file.c:553
msgid "show object size"
msgstr "visa objektstorlek"
-#: builtin/cat-file.c:485
+#: builtin/cat-file.c:555
msgid "exit with zero when there's no error"
msgstr "avsluta med noll när det inte uppstått något fel"
-#: builtin/cat-file.c:486
+#: builtin/cat-file.c:556
msgid "pretty-print object's content"
msgstr "visa objektets innehåll snyggt"
-#: builtin/cat-file.c:488
+#: builtin/cat-file.c:558
msgid "for blob objects, run textconv on object's content"
-msgstr "för blob-objekt, kör textconv på objektets innehåll"
+msgstr "för blob-objekt, kör filter på objektets innehåll"
+
+#: builtin/cat-file.c:560
+msgid "for blob objects, run filters on object's content"
+msgstr "för blob-objekt, kör filger på objektets innehåll"
+
+#: builtin/cat-file.c:561 git-submodule.sh:923
+msgid "blob"
+msgstr "blob"
-#: builtin/cat-file.c:490
+#: builtin/cat-file.c:562
+msgid "use a specific path for --textconv/--filters"
+msgstr "använd specifik sökväg för --textconv/--filters"
+
+#: builtin/cat-file.c:564
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:491
+#: builtin/cat-file.c:565
msgid "buffer --batch output"
msgstr "buffra utdata från --batch"
-#: builtin/cat-file.c:493
+#: builtin/cat-file.c:567
msgid "show info and content of objects fed from the standard input"
msgstr "visa information och innehåll för objekt som listas på standard in"
-#: builtin/cat-file.c:496
+#: builtin/cat-file.c:570
msgid "show info about objects fed from the standard input"
msgstr "visa information för objekt som listas på standard in"
-#: builtin/cat-file.c:499
+#: builtin/cat-file.c:573
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"följ symboliska länkar i trädet (använd med --batch eller --batch-check)"
-#: builtin/cat-file.c:501
+#: builtin/cat-file.c:575
msgid "show all objects with --batch or --batch-check"
msgstr "visa alla objekt med --batch eller --batch-check"
msgid "use .gitattributes only from the index"
msgstr "använd .gitattributes endast från indexet"
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97
+#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
msgid "read file names from stdin"
msgstr "läs filnamn från standard in"
msgid "terminate input and output records by a NUL character"
msgstr "avsluta in- och utdataposter med NUL-tecken"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "undertryck förloppsrapportering"
msgstr "skriv innehåll till temporära filer"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491
-#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497
-#: builtin/submodule--helper.c:830 builtin/worktree.c:469
+#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598
+#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951
+#: builtin/worktree.c:469
msgid "string"
msgstr "sträng"
msgid "path '%s' is unmerged"
msgstr "sökvägen \"%s\" har inte slagits ihop"
-#: builtin/checkout.c:495
+#: builtin/checkout.c:494
msgid "you need to resolve your current index first"
msgstr "du måste lösa ditt befintliga index först"
-#: builtin/checkout.c:625
+#: builtin/checkout.c:624
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"
-#: builtin/checkout.c:664
+#: builtin/checkout.c:663
msgid "HEAD is now at"
msgstr "HEAD är nu på"
-#: builtin/checkout.c:668 builtin/clone.c:661
+#: builtin/checkout.c:667 builtin/clone.c:660
msgid "unable to update HEAD"
msgstr "kan inte uppdatera HEAD"
-#: builtin/checkout.c:672
+#: builtin/checkout.c:671
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Återställ gren \"%s\"\n"
-#: builtin/checkout.c:675
+#: builtin/checkout.c:674
#, c-format
msgid "Already on '%s'\n"
msgstr "Redan på \"%s\"\n"
-#: builtin/checkout.c:679
+#: builtin/checkout.c:678
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Växlade till och nollställde grenen \"%s\"\n"
-#: builtin/checkout.c:681 builtin/checkout.c:1070
+#: builtin/checkout.c:680 builtin/checkout.c:1069
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Växlade till en ny gren \"%s\"\n"
-#: builtin/checkout.c:683
+#: builtin/checkout.c:682
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Växlade till grenen \"%s\"\n"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:733
#, c-format
msgid " ... and %d more.\n"
msgstr " ... och %d till.\n"
-#: builtin/checkout.c:740
+#: builtin/checkout.c:739
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:759
+#: builtin/checkout.c:758
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
" git branch <nytt_grennamn> %s\n"
"\n"
-#: builtin/checkout.c:795
+#: builtin/checkout.c:794
msgid "internal error in revision walk"
msgstr "internt fel vid genomgång av revisioner (revision walk)"
-#: builtin/checkout.c:799
+#: builtin/checkout.c:798
msgid "Previous HEAD position was"
msgstr "Tidigare position för HEAD var"
-#: builtin/checkout.c:826 builtin/checkout.c:1065
+#: builtin/checkout.c:825 builtin/checkout.c:1064
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:971
+#: builtin/checkout.c:970
#, c-format
msgid "only one reference expected, %d given."
msgstr "endast en referens förväntades, %d gavs."
-#: builtin/checkout.c:1011 builtin/worktree.c:214
+#: builtin/checkout.c:1010 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr "felaktig referens: %s"
-#: builtin/checkout.c:1040
+#: builtin/checkout.c:1039
#, c-format
msgid "reference is not a tree: %s"
msgstr "referensen är inte ett träd: %s"
-#: builtin/checkout.c:1079
+#: builtin/checkout.c:1078
msgid "paths cannot be used with switching branches"
msgstr "sökvägar kan inte användas vid byte av gren"
-#: builtin/checkout.c:1082 builtin/checkout.c:1086
+#: builtin/checkout.c:1081 builtin/checkout.c:1085
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "\"%s\" kan inte användas vid byte av gren"
-#: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097
+#: builtin/checkout.c:1100
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "\"%s\" kan inte användas med \"%s\""
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1105
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Kan inte växla gren till icke-incheckningen \"%s\""
-#: builtin/checkout.c:1139 builtin/checkout.c:1141 builtin/clone.c:88
+#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93
#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
#: builtin/worktree.c:326
msgid "branch"
msgstr "gren"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1139
msgid "create and checkout a new branch"
msgstr "skapa och checka ut en ny gren"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1141
msgid "create/reset and checkout a branch"
msgstr "skapa/nollställ och checka ut en gren"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1142
msgid "create reflog for new branch"
msgstr "skapa reflogg för ny gren"
-#: builtin/checkout.c:1144 builtin/worktree.c:328
+#: builtin/checkout.c:1143 builtin/worktree.c:328
msgid "detach HEAD at named commit"
msgstr "koppla från HEAD vid namngiven incheckning"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
msgid "set upstream info for new branch"
msgstr "sätt uppströmsinformation för ny gren"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1146
msgid "new-branch"
msgstr "ny-gren"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1146
msgid "new unparented branch"
msgstr "ny gren utan förälder"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1147
msgid "checkout our version for unmerged files"
msgstr "checka ut vår version för ej sammanslagna filer"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1149
msgid "checkout their version for unmerged files"
msgstr "checka ut deras version för ej sammanslagna filer"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1151
msgid "force checkout (throw away local modifications)"
msgstr "tvinga utcheckning (kasta bort lokala ändringar)"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1152
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:1154 builtin/merge.c:231
+#: builtin/checkout.c:1153 builtin/merge.c:231
msgid "update ignored files (default)"
msgstr "uppdatera ignorerade filer (standard)"
-#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250
+#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251
msgid "style"
msgstr "stil"
-#: builtin/checkout.c:1156
+#: builtin/checkout.c:1155
msgid "conflict style (merge or diff3)"
msgstr "konfliktstil (merge eller diff3)"
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1158
msgid "do not limit pathspecs to sparse entries only"
msgstr "begränsa inte sökvägar till endast glesa poster"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1160
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "förutspå \"git checkout <gren-saknas>\""
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1162
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:1164 builtin/clone.c:60 builtin/fetch.c:117
-#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536
+#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119
+#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "tvinga förloppsrapportering"
-#: builtin/checkout.c:1195
+#: builtin/checkout.c:1194
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B och --orphan är ömsesidigt uteslutande"
-#: builtin/checkout.c:1212
+#: builtin/checkout.c:1211
msgid "--track needs a branch name"
msgstr "--track behöver ett namn på en gren"
-#: builtin/checkout.c:1217
+#: builtin/checkout.c:1216
msgid "Missing branch name; try -b"
msgstr "Grennamn saknas; försök med -b"
-#: builtin/checkout.c:1253
+#: builtin/checkout.c:1252
msgid "invalid path specification"
msgstr "felaktig sökvägsangivelse"
-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1259
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
"Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt.\n"
"Ville du checka ut \"%s\" som inte kan lösas som en utcheckning?"
-#: builtin/checkout.c:1265
+#: builtin/checkout.c:1264
#, 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:1269
+#: builtin/checkout.c:1268
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgid "remove whole directories"
msgstr "ta bort hela kataloger"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
-#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725
+#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182
msgid "pattern"
msgstr "mönster"
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]"
-#: builtin/clone.c:62
+#: builtin/clone.c:65
msgid "don't create a checkout"
msgstr "skapa inte någon utcheckning"
-#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476
+#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
msgid "create a bare repository"
msgstr "skapa ett naket (\"bare\") arkiv"
-#: builtin/clone.c:67
+#: builtin/clone.c:70
msgid "create a mirror repository (implies bare)"
msgstr "skapa ett spegelarkiv (implicerar \"bare\")"
-#: builtin/clone.c:69
+#: builtin/clone.c:72
msgid "to clone from a local repository"
msgstr "för att klona från ett lokalt arkiv"
-#: builtin/clone.c:71
+#: builtin/clone.c:74
msgid "don't use local hardlinks, always copy"
msgstr "skapa inte lokala hårda länkar, kopiera alltid"
-#: builtin/clone.c:73
+#: builtin/clone.c:76
msgid "setup as shared repository"
msgstr "skapa som ett delat arkiv"
-#: builtin/clone.c:75 builtin/clone.c:77
+#: builtin/clone.c:78 builtin/clone.c:80
msgid "initialize submodules in the clone"
msgstr "initiera undermoduler i klonen"
-#: builtin/clone.c:79
+#: builtin/clone.c:82
msgid "number of submodules cloned in parallel"
msgstr "antal undermoduler som klonas parallellt"
-#: builtin/clone.c:80 builtin/init-db.c:473
+#: builtin/clone.c:83 builtin/init-db.c:475
msgid "template-directory"
msgstr "mallkatalog"
-#: builtin/clone.c:81 builtin/init-db.c:474
+#: builtin/clone.c:84 builtin/init-db.c:476
msgid "directory from which templates will be used"
msgstr "katalog att använda mallar från"
-#: builtin/clone.c:83 builtin/submodule--helper.c:495
-#: builtin/submodule--helper.c:833
+#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602
+#: builtin/submodule--helper.c:954
msgid "reference repository"
msgstr "referensarkiv"
-#: builtin/clone.c:85
+#: builtin/clone.c:90
msgid "use --reference only while cloning"
msgstr "använd --reference endast under kloningen"
-#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr "namn"
-#: builtin/clone.c:87
+#: builtin/clone.c:92
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:89
+#: builtin/clone.c:94
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "checka ut <gren> istället för fjärrens HEAD"
-#: builtin/clone.c:91
+#: builtin/clone.c:96
msgid "path to git-upload-pack on the remote"
msgstr "sökväg till git-upload-pack på fjärren"
-#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667
-#: builtin/pull.c:201
+#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668
+#: builtin/pull.c:202
msgid "depth"
msgstr "djup"
-#: builtin/clone.c:93
+#: builtin/clone.c:98
msgid "create a shallow clone of that depth"
msgstr "skapa en grund klon på detta djup"
-#: builtin/clone.c:95
+#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848
+#: parse-options.h:142
+msgid "time"
+msgstr "tid"
+
+#: builtin/clone.c:100
+msgid "create a shallow clone since a specific time"
+msgstr "skapa en grund klon från en angiven tidpunkt"
+
+#: builtin/clone.c:101 builtin/fetch.c:124
+msgid "revision"
+msgstr "revision"
+
+#: builtin/clone.c:102 builtin/fetch.c:125
+msgid "deepen history of shallow clone by excluding rev"
+msgstr "fördjupa historik för grund klon genom att exkludera revision"
+
+#: builtin/clone.c:104
msgid "clone only one branch, HEAD or --branch"
msgstr "klona endast en gren, HEAD eller --branch"
-#: builtin/clone.c:97
+#: builtin/clone.c:106
msgid "any cloned submodules will be shallow"
msgstr "klonade undermoduler kommer vara grunda"
-#: builtin/clone.c:98 builtin/init-db.c:482
+#: builtin/clone.c:107 builtin/init-db.c:484
msgid "gitdir"
msgstr "gitkat"
-#: builtin/clone.c:99 builtin/init-db.c:483
+#: builtin/clone.c:108 builtin/init-db.c:485
msgid "separate git dir from working tree"
msgstr "separera gitkatalogen från arbetskatalogen"
-#: builtin/clone.c:100
+#: builtin/clone.c:109
msgid "key=value"
msgstr "nyckel=värde"
-#: builtin/clone.c:101
+#: builtin/clone.c:110
msgid "set config inside the new repository"
msgstr "ställ in konfiguration i det nya arkivet"
-#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547
+#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547
msgid "use IPv4 addresses only"
msgstr "använd endast IPv4-adresser"
-#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549
+#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549
msgid "use IPv6 addresses only"
msgstr "använd endast IPv6-adresser"
-#: builtin/clone.c:241
+#: builtin/clone.c:250
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"Kunde inte gissa katalognamn.\n"
"Ange en katalog på kommandoraden"
-#: builtin/clone.c:307
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu."
-
-#: builtin/clone.c:309
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."
-
-#: builtin/clone.c:314
+#: builtin/clone.c:303
#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "referensarkivet \"%s\" är grunt"
-
-#: builtin/clone.c:317
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "referensarkivet \"%s\" är ympat"
+msgid "info: Could not add alternate for '%s': %s\n"
+msgstr "info: Kan inte skapa alternativ för \"%s\": %s\n"
-#: builtin/clone.c:376
+#: builtin/clone.c:375
#, c-format
msgid "failed to open '%s'"
msgstr "misslyckades öppna \"%s\""
-#: builtin/clone.c:384
+#: builtin/clone.c:383
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s finns och är ingen katalog"
-#: builtin/clone.c:398
+#: builtin/clone.c:397
#, c-format
msgid "failed to stat %s\n"
msgstr "misslyckades ta status på %s\n"
-#: builtin/clone.c:420
+#: builtin/clone.c:419
#, c-format
msgid "failed to create link '%s'"
msgstr "misslyckades skapa länken \"%s\""
-#: builtin/clone.c:424
+#: builtin/clone.c:423
#, c-format
msgid "failed to copy file to '%s'"
msgstr "misslyckades kopiera filen till \"%s\""
-#: builtin/clone.c:449
+#: builtin/clone.c:448
#, c-format
msgid "done.\n"
msgstr "klart.\n"
-#: builtin/clone.c:461
+#: builtin/clone.c:460
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"Du kan inspektera det som checkades ut med \"git status\"\n"
"och försöka checka ut igen med \"git checkout -f HEAD\"\n"
-#: builtin/clone.c:538
+#: builtin/clone.c:537
#, 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:633
+#: builtin/clone.c:632
msgid "remote did not send all necessary objects"
msgstr "fjärren sände inte alla nödvändiga objekt"
-#: builtin/clone.c:649
+#: builtin/clone.c:648
#, c-format
msgid "unable to update %s"
msgstr "kan inte uppdatera %s"
-#: builtin/clone.c:698
+#: builtin/clone.c:697
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:729
+#: builtin/clone.c:728
msgid "unable to checkout working tree"
msgstr "kunde inte checka ut arbetskatalogen"
-#: builtin/clone.c:766
+#: builtin/clone.c:768
msgid "unable to write parameters to config file"
msgstr "kunde inte skriva parametrar till konfigurationsfilen"
-#: builtin/clone.c:829
+#: builtin/clone.c:831
msgid "cannot repack to clean up"
msgstr "kan inte packa om för att städa upp"
-#: builtin/clone.c:831
+#: builtin/clone.c:833
msgid "cannot unlink temporary alternates file"
msgstr "kunde inte ta bort temporär \"alternates\"-fil"
-#: builtin/clone.c:863 builtin/receive-pack.c:1855
+#: builtin/clone.c:866 builtin/receive-pack.c:1895
msgid "Too many arguments."
msgstr "För många argument."
-#: builtin/clone.c:867
+#: builtin/clone.c:870
msgid "You must specify a repository to clone."
msgstr "Du måste ange ett arkiv att klona."
-#: builtin/clone.c:878
+#: builtin/clone.c:883
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "flaggorna --bare och --origin %s är inkompatibla."
-#: builtin/clone.c:881
+#: builtin/clone.c:886
msgid "--bare and --separate-git-dir are incompatible."
msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
-#: builtin/clone.c:894
+#: builtin/clone.c:899
#, c-format
msgid "repository '%s' does not exist"
msgstr "arkivet \"%s\" finns inte"
-#: builtin/clone.c:900 builtin/fetch.c:1293
+#: builtin/clone.c:905 builtin/fetch.c:1338
#, c-format
msgid "depth %s is not a positive number"
msgstr "djupet %s är inte ett positivt tal"
-#: builtin/clone.c:910
+#: builtin/clone.c:915
#, 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:920
+#: builtin/clone.c:925
#, c-format
msgid "working tree '%s' already exists."
msgstr "arbetsträdet \"%s\" finns redan."
-#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544
+#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657
#: builtin/worktree.c:222 builtin/worktree.c:249
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "kunde inte skapa inledande kataloger för \"%s\""
-#: builtin/clone.c:938
+#: builtin/clone.c:943
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "kunde inte skapa arbetskatalogen \"%s\""
-#: builtin/clone.c:956
+#: builtin/clone.c:955
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klonar till ett naket arkiv \"%s\"...\n"
-#: builtin/clone.c:958
+#: builtin/clone.c:957
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klonar till \"%s\"...\n"
-#: builtin/clone.c:997
+#: builtin/clone.c:963
+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:1019
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth ignoreras i lokala kloningar; använd file:// istället"
-#: builtin/clone.c:1000
+#: builtin/clone.c:1021
+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:1023
+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:1026
msgid "source repository is shallow, ignoring --local"
msgstr "källarkivet är grunt, ignorerar --local"
-#: builtin/clone.c:1005
+#: builtin/clone.c:1031
msgid "--local is ignored"
msgstr "--local ignoreras"
-#: builtin/clone.c:1009
+#: builtin/clone.c:1035
#, c-format
msgid "Don't know how to clone %s"
msgstr "Vet inte hur man klonar %s"
-#: builtin/clone.c:1058 builtin/clone.c:1066
+#: builtin/clone.c:1090 builtin/clone.c:1098
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"
-#: builtin/clone.c:1069
+#: builtin/clone.c:1101
msgid "You appear to have cloned an empty repository."
msgstr "Du verkar ha klonat ett tomt arkiv."
"\"git cherry-pick --continue\" kommer därefter att återuppta\n"
"cherry-pick för återstående incheckningar.\n"
-#: builtin/commit.c:308
+#: builtin/commit.c:318
msgid "failed to unpack HEAD tree object"
msgstr "misslyckades packa upp HEAD:s trädobjekt"
-#: builtin/commit.c:349
+#: builtin/commit.c:359
msgid "unable to create temporary index"
msgstr "kunde inte skapa temporär indexfil"
-#: builtin/commit.c:355
+#: builtin/commit.c:365
msgid "interactive add failed"
msgstr "interaktiv tilläggning misslyckades"
-#: builtin/commit.c:368
+#: builtin/commit.c:378
msgid "unable to update temporary index"
msgstr "kan inte uppdatera temporärt index"
-#: builtin/commit.c:370
+#: builtin/commit.c:380
msgid "Failed to update main cache tree"
msgstr "Misslyckades uppdatera huvud-cacheträdet"
-#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466
+#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
msgid "unable to write new_index file"
msgstr "kunde inte skriva filen new_index"
-#: builtin/commit.c:448
+#: builtin/commit.c:458
msgid "cannot do a partial commit during a merge."
msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
-#: builtin/commit.c:450
+#: builtin/commit.c:460
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:459
+#: builtin/commit.c:469
msgid "cannot read the index"
msgstr "kan inte läsa indexet"
-#: builtin/commit.c:478
+#: builtin/commit.c:488
msgid "unable to write temporary index file"
msgstr "kunde inte skriva temporär indexfil"
-#: builtin/commit.c:583
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "incheckningen \"%s\" saknar författarhuvud"
-#: builtin/commit.c:585
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "incheckningen \"%s\" har felformaterat författarhuvud"
-#: builtin/commit.c:604
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "felformad \"--author\"-flagga"
-#: builtin/commit.c:612
+#: builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "felaktigt datumformat: %s"
-#: builtin/commit.c:656
+#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
"kunde inte välja ett kommentarstecken som inte använts\n"
"i det befintliga incheckningsmeddelandet"
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
#, c-format
msgid "could not lookup commit %s"
msgstr "kunde inte slå upp incheckningen %s"
-#: builtin/commit.c:705 builtin/shortlog.c:286
+#: builtin/commit.c:704 builtin/shortlog.c:286
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(läser loggmeddelande från standard in)\n"
-#: builtin/commit.c:707
+#: builtin/commit.c:706
msgid "could not read log from standard input"
msgstr "kunde inte läsa logg från standard in"
-#: builtin/commit.c:711
+#: builtin/commit.c:710
#, c-format
msgid "could not read log file '%s'"
msgstr "kunde inte läsa loggfilen \"%s\""
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:737 builtin/commit.c:745
msgid "could not read SQUASH_MSG"
msgstr "kunde inte läsa SQUASH_MSG"
-#: builtin/commit.c:743
+#: builtin/commit.c:742
msgid "could not read MERGE_MSG"
msgstr "kunde inte läsa MERGE_MSG"
-#: builtin/commit.c:797
+#: builtin/commit.c:796
msgid "could not write commit template"
msgstr "kunde inte skriva incheckningsmall"
-#: builtin/commit.c:815
+#: builtin/commit.c:814
#, c-format
msgid ""
"\n"
"\t%s\n"
"och försöker igen.\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
"\t%s\n"
"och försöker igen.\n"
-#: builtin/commit.c:833
+#: builtin/commit.c:832
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "
"incheckningen.\n"
-#: builtin/commit.c:840
+#: builtin/commit.c:839
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"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:860
+#: builtin/commit.c:859
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sFörfattare: %.*s <%.*s>"
-#: builtin/commit.c:868
+#: builtin/commit.c:867
#, c-format
msgid "%sDate: %s"
msgstr "%sDatum: %s"
-#: builtin/commit.c:875
+#: builtin/commit.c:874
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sIncheckare: %.*s <%.*s>"
-#: builtin/commit.c:893
+#: builtin/commit.c:892
msgid "Cannot read index"
msgstr "Kan inte läsa indexet"
-#: builtin/commit.c:950
+#: builtin/commit.c:954
msgid "Error building trees"
msgstr "Fel vid byggande av träd"
-#: builtin/commit.c:965 builtin/tag.c:266
+#: builtin/commit.c:969 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Ange meddelandet en av flaggorna -m eller -F.\n"
-#: builtin/commit.c:1067
+#: builtin/commit.c:1071
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare"
-#: builtin/commit.c:1082 builtin/commit.c:1322
+#: builtin/commit.c:1086 builtin/commit.c:1327
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ogiltigt läge för ospårade filer: \"%s\""
-#: builtin/commit.c:1119
+#: builtin/commit.c:1124
msgid "--long and -z are incompatible"
msgstr "--long och -z är inkompatibla"
-#: builtin/commit.c:1149
+#: builtin/commit.c:1154
msgid "Using both --reset-author and --author does not make sense"
msgstr "Kan inte använda både --reset-author och --author"
-#: builtin/commit.c:1158
+#: builtin/commit.c:1163
msgid "You have nothing to amend."
msgstr "Du har inget att utöka."
-#: builtin/commit.c:1161
+#: builtin/commit.c:1166
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:1163
+#: builtin/commit.c:1168
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:1166
+#: builtin/commit.c:1171
msgid "Options --squash and --fixup cannot be used together"
msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"
-#: builtin/commit.c:1176
+#: builtin/commit.c:1181
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Endast en av -c/-C/-F/--fixup kan användas."
-#: builtin/commit.c:1178
+#: builtin/commit.c:1183
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup."
-#: builtin/commit.c:1186
+#: builtin/commit.c:1191
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:1203
+#: builtin/commit.c:1208
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Endast en av --include/--only/--all/--interactive/--patch kan användas."
-#: builtin/commit.c:1205
+#: builtin/commit.c:1210
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:1207
+#: builtin/commit.c:1212
msgid "Clever... amending the last one with dirty index."
msgstr "Smart... utöka den senaste med smutsigt index."
-#: builtin/commit.c:1209
+#: builtin/commit.c:1214
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..."
-#: builtin/commit.c:1221 builtin/tag.c:474
+#: builtin/commit.c:1226 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Felaktigt städningsläge %s"
-#: builtin/commit.c:1226
+#: builtin/commit.c:1231
msgid "Paths with -a does not make sense."
msgstr "Kan inte ange sökvägar med -a."
-#: builtin/commit.c:1336 builtin/commit.c:1622
+#: builtin/commit.c:1341 builtin/commit.c:1617
msgid "show status concisely"
msgstr "visa koncis status"
-#: builtin/commit.c:1338 builtin/commit.c:1624
+#: builtin/commit.c:1343 builtin/commit.c:1619
msgid "show branch information"
msgstr "visa information om gren"
-#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522
+#: builtin/commit.c:1345
+msgid "version"
+msgstr "version"
+
+#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522
#: builtin/worktree.c:440
msgid "machine-readable output"
msgstr "maskinläsbar utdata"
-#: builtin/commit.c:1343 builtin/commit.c:1628
+#: builtin/commit.c:1348 builtin/commit.c:1623
msgid "show status in long format (default)"
msgstr "visa status i långt format (standard)"
-#: builtin/commit.c:1346 builtin/commit.c:1631
+#: builtin/commit.c:1351 builtin/commit.c:1626
msgid "terminate entries with NUL"
msgstr "terminera poster med NUL"
-#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981
+#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "läge"
-#: builtin/commit.c:1349 builtin/commit.c:1634
+#: builtin/commit.c:1354 builtin/commit.c:1629
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)"
-#: builtin/commit.c:1352
+#: builtin/commit.c:1357
msgid "show ignored files"
msgstr "visa ignorerade filer"
-#: builtin/commit.c:1353 parse-options.h:155
+#: builtin/commit.c:1358 parse-options.h:155
msgid "when"
msgstr "när"
-#: builtin/commit.c:1354
+#: builtin/commit.c:1359
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
"ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "
"(Default: all)"
-#: builtin/commit.c:1356
+#: builtin/commit.c:1361
msgid "list untracked files in columns"
msgstr "visa ospårade filer i spalter"
-#: builtin/commit.c:1442
+#: builtin/commit.c:1437
msgid "couldn't look up newly created commit"
msgstr "kunde inte slå upp en precis skapad incheckning"
-#: builtin/commit.c:1444
+#: builtin/commit.c:1439
msgid "could not parse newly created commit"
msgstr "kunde inte tolka en precis skapad incheckning"
-#: builtin/commit.c:1489
+#: builtin/commit.c:1484
msgid "detached HEAD"
msgstr "frånkopplad HEAD"
-#: builtin/commit.c:1492
+#: builtin/commit.c:1487
msgid " (root-commit)"
msgstr " (rotincheckning)"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1587
msgid "suppress summary after successful commit"
msgstr "undertryck sammanfattning efter framgångsrik incheckning"
-#: builtin/commit.c:1593
+#: builtin/commit.c:1588
msgid "show diff in commit message template"
msgstr "visa diff i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1590
msgid "Commit message options"
msgstr "Alternativ för incheckningsmeddelande"
-#: builtin/commit.c:1596 builtin/tag.c:351
+#: builtin/commit.c:1591 builtin/tag.c:351
msgid "read message from file"
msgstr "läs meddelande från fil"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1592
msgid "author"
msgstr "författare"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1592
msgid "override author for commit"
msgstr "överstyr författare för incheckningen"
-#: builtin/commit.c:1598 builtin/gc.c:326
+#: builtin/commit.c:1593 builtin/gc.c:326
msgid "date"
msgstr "datum"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1593
msgid "override date for commit"
msgstr "överstyr datum för incheckningen"
-#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396
-#: builtin/notes.c:559 builtin/tag.c:349
+#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398
+#: builtin/notes.c:561 builtin/tag.c:349
msgid "message"
msgstr "meddelande"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1594
msgid "commit message"
msgstr "incheckningsmeddelande"
-#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602
-#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
+#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79
msgid "commit"
msgstr "incheckning"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1595
msgid "reuse and edit message from specified commit"
msgstr "återanvänd och redigera meddelande från angiven incheckning"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1596
msgid "reuse message from specified commit"
msgstr "återanvänd meddelande från angiven incheckning"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1597
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"använd autosquash-formaterat meddelande för att fixa angiven incheckning"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1598
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:1604
+#: builtin/commit.c:1599
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:1605 builtin/log.c:1409 builtin/revert.c:86
+#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "lägg till Signed-off-by:"
-#: builtin/commit.c:1606
+#: builtin/commit.c:1601
msgid "use specified template file"
msgstr "använd angiven mallfil"
-#: builtin/commit.c:1607
+#: builtin/commit.c:1602
msgid "force edit of commit"
msgstr "tvinga redigering av incheckning"
-#: builtin/commit.c:1608
+#: builtin/commit.c:1603
msgid "default"
msgstr "standard"
-#: builtin/commit.c:1608 builtin/tag.c:354
+#: builtin/commit.c:1603 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"
-#: builtin/commit.c:1609
+#: builtin/commit.c:1604
msgid "include status in commit message template"
msgstr "inkludera status i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165
+#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "GPG-signera incheckning"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1609
msgid "Commit contents options"
msgstr "Alternativ för incheckningens innehåll"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1610
msgid "commit all changed files"
msgstr "checka in alla ändrade filer"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1611
msgid "add specified files to index for commit"
msgstr "lägg till angivna filer till indexet för incheckning"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1612
msgid "interactively add files"
msgstr "lägg till filer interaktivt"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1613
msgid "interactively add changes"
msgstr "lägg till ändringar interaktivt"
-#: builtin/commit.c:1619
+#: builtin/commit.c:1614
msgid "commit only specified files"
msgstr "checka endast in angivna filer"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1615
msgid "bypass pre-commit and commit-msg hooks"
msgstr "förbigå pre-commit- och commit-msg-krokar"
-#: builtin/commit.c:1621
+#: builtin/commit.c:1616
msgid "show what would be committed"
msgstr "visa vad som skulle checkas in"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1627
msgid "amend previous commit"
msgstr "lägg till föregående incheckning"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1628
msgid "bypass post-rewrite hook"
msgstr "förbigå post-rewrite-krok"
-#: builtin/commit.c:1638
+#: builtin/commit.c:1633
msgid "ok to record an empty change"
msgstr "ok att registrera en tom ändring"
-#: builtin/commit.c:1640
+#: builtin/commit.c:1635
msgid "ok to record a change with an empty message"
msgstr "ok att registrera en ändring med tomt meddelande"
-#: builtin/commit.c:1669
+#: builtin/commit.c:1664
msgid "could not parse HEAD commit"
msgstr "kunde inte tolka HEAD:s incheckning"
-#: builtin/commit.c:1719
+#: builtin/commit.c:1712
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Trasig MERGE_HEAD-fil (%s)"
-#: builtin/commit.c:1726
+#: builtin/commit.c:1719
msgid "could not read MERGE_MODE"
msgstr "kunde inte läsa MERGE_MODE"
-#: builtin/commit.c:1745
+#: builtin/commit.c:1738
#, c-format
msgid "could not read commit message: %s"
msgstr "kunde inte läsa incheckningsmeddelande: %s"
-#: builtin/commit.c:1756
+#: builtin/commit.c:1749
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
-#: builtin/commit.c:1761
+#: builtin/commit.c:1754
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"
-#: builtin/commit.c:1809
+#: builtin/commit.c:1802
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
msgid "cannot create configuration file %s"
msgstr "kan inte skapa konfigurationsfilen \"%s\""
-#: builtin/count-objects.c:77
+#: builtin/config.c:625
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+" Use a regexp, --add or --replace-all to change %s."
+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/count-objects.c:86
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:96
msgid "print sizes in human readable format"
msgstr "skriv storlekar i människoläsbart format"
msgid "only consider tags matching <pattern>"
msgstr "överväg endast taggar som motsvarar <mönster>"
-#: builtin/describe.c:410 builtin/name-rev.c:321
+#: builtin/describe.c:410 builtin/name-rev.c:320
msgid "show abbreviated commit object as fallback"
msgstr "visa förkortade incheckningsobjekt som standard"
msgid "invalid option: %s"
msgstr "ogiltig flagga: %s"
-#: builtin/diff.c:360
+#: builtin/diff.c:361
msgid "Not a git repository"
msgstr "Inte ett git-arkiv"
-#: builtin/diff.c:403
+#: builtin/diff.c:404
#, c-format
msgid "invalid object '%s' given."
msgstr "objektet \"%s\" som angavs är felaktigt."
-#: builtin/diff.c:412
+#: builtin/diff.c:413
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "mer än två blobbar angavs: \"%s\""
-#: builtin/diff.c:419
+#: builtin/diff.c:420
#, c-format
msgid "unhandled object '%s' given."
msgstr "ej hanterat objekt \"%s\" angavs."
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<flaggor>]"
-#: builtin/fetch.c:93 builtin/pull.c:174
+#: builtin/fetch.c:95 builtin/pull.c:175
msgid "fetch from all remotes"
msgstr "hämta från alla fjärrar"
-#: builtin/fetch.c:95 builtin/pull.c:177
+#: builtin/fetch.c:97 builtin/pull.c:178
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:97 builtin/pull.c:180
+#: builtin/fetch.c:99 builtin/pull.c:181
msgid "path to upload pack on remote end"
msgstr "sökväg till upload pack på fjärren"
-#: builtin/fetch.c:98 builtin/pull.c:182
+#: builtin/fetch.c:100 builtin/pull.c:183
msgid "force overwrite of local branch"
msgstr "tvinga överskrivning av lokal gren"
-#: builtin/fetch.c:100
+#: builtin/fetch.c:102
msgid "fetch from multiple remotes"
msgstr "hämta från flera fjärrar"
-#: builtin/fetch.c:102 builtin/pull.c:184
+#: builtin/fetch.c:104 builtin/pull.c:185
msgid "fetch all tags and associated objects"
msgstr "hämta alla taggar och associerade objekt"
-#: builtin/fetch.c:104
+#: builtin/fetch.c:106
msgid "do not fetch all tags (--no-tags)"
msgstr "hämta inte alla taggar (--no-tags)"
-#: builtin/fetch.c:106
+#: builtin/fetch.c:108
msgid "number of submodules fetched in parallel"
msgstr "antal undermoduler som hämtas parallellt"
-#: builtin/fetch.c:108 builtin/pull.c:187
+#: builtin/fetch.c:110 builtin/pull.c:188
msgid "prune remote-tracking branches no longer on remote"
msgstr "rensa fjärrspårande grenar ej längre på fjärren"
-#: builtin/fetch.c:109 builtin/pull.c:190
+#: builtin/fetch.c:111 builtin/pull.c:191
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:110 builtin/pull.c:191
+#: builtin/fetch.c:112 builtin/pull.c:192
msgid "control recursive fetching of submodules"
msgstr "styr rekursiv hämtning av undermoduler"
-#: builtin/fetch.c:114 builtin/pull.c:199
+#: builtin/fetch.c:116 builtin/pull.c:200
msgid "keep downloaded pack"
msgstr "behåll hämtade paket"
-#: builtin/fetch.c:116
+#: builtin/fetch.c:118
msgid "allow updating of HEAD ref"
msgstr "tillåt uppdatering av HEAD-referens"
-#: builtin/fetch.c:119 builtin/pull.c:202
+#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
msgid "deepen history of shallow clone"
msgstr "fördjupa historik för grund klon"
-#: builtin/fetch.c:121 builtin/pull.c:205
+#: builtin/fetch.c:123
+msgid "deepen history of shallow repository based on time"
+msgstr "fördjupa historik för grund klon baserad på tid"
+
+#: builtin/fetch.c:129 builtin/pull.c:206
msgid "convert to a complete repository"
msgstr "konvertera till komplett arkiv"
-#: builtin/fetch.c:123 builtin/log.c:1426
+#: builtin/fetch.c:131 builtin/log.c:1433
msgid "dir"
msgstr "kat"
-#: builtin/fetch.c:124
+#: builtin/fetch.c:132
msgid "prepend this to submodule path output"
msgstr "lägg till i början av undermodulens sökvägsutdata"
-#: builtin/fetch.c:127
+#: builtin/fetch.c:135
msgid "default mode for recursion"
msgstr "standardläge för rekursion"
-#: builtin/fetch.c:129 builtin/pull.c:208
+#: builtin/fetch.c:137 builtin/pull.c:209
msgid "accept refs that update .git/shallow"
msgstr "tar emot referenser som uppdaterar .git/shallow"
-#: builtin/fetch.c:130 builtin/pull.c:210
+#: builtin/fetch.c:138 builtin/pull.c:211
msgid "refmap"
msgstr "referenskarta"
-#: builtin/fetch.c:131 builtin/pull.c:211
+#: builtin/fetch.c:139 builtin/pull.c:212
msgid "specify fetch refmap"
msgstr "ange referenskarta för \"fetch\""
-#: builtin/fetch.c:387
+#: builtin/fetch.c:398
msgid "Couldn't find remote ref HEAD"
msgstr "Kunde inte hitta fjärr-referensen HEAD"
-#: builtin/fetch.c:503
+#: builtin/fetch.c:514
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "konfigurationen för fetch.output innehåller ogiltigt värde %s"
-#: builtin/fetch.c:592
+#: builtin/fetch.c:607
#, c-format
msgid "object %s not found"
msgstr "objektet %s hittades inte"
-#: builtin/fetch.c:596
+#: builtin/fetch.c:611
msgid "[up to date]"
msgstr "[àjour]"
-#: builtin/fetch.c:609 builtin/fetch.c:689
+#: builtin/fetch.c:624 builtin/fetch.c:704
msgid "[rejected]"
msgstr "[refuserad]"
-#: builtin/fetch.c:610
+#: builtin/fetch.c:625
msgid "can't fetch in current branch"
msgstr "kan inte hämta i aktuell gren"
-#: builtin/fetch.c:619
+#: builtin/fetch.c:634
msgid "[tag update]"
msgstr "[uppdaterad tagg]"
-#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669
-#: builtin/fetch.c:684
+#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684
+#: builtin/fetch.c:699
msgid "unable to update local ref"
msgstr "kunde inte uppdatera lokal ref"
-#: builtin/fetch.c:639
+#: builtin/fetch.c:654
msgid "[new tag]"
msgstr "[ny tagg]"
-#: builtin/fetch.c:642
+#: builtin/fetch.c:657
msgid "[new branch]"
msgstr "[ny gren]"
-#: builtin/fetch.c:645
+#: builtin/fetch.c:660
msgid "[new ref]"
msgstr "[ny ref]"
-#: builtin/fetch.c:684
+#: builtin/fetch.c:699
msgid "forced update"
msgstr "tvingad uppdatering"
-#: builtin/fetch.c:689
+#: builtin/fetch.c:704
msgid "non-fast-forward"
msgstr "ej snabbspolad"
-#: builtin/fetch.c:733
+#: builtin/fetch.c:749
#, 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:753
+#: builtin/fetch.c:769
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "avvisa %s då grunda rötter inte kan uppdateras"
-#: builtin/fetch.c:839 builtin/fetch.c:934
+#: builtin/fetch.c:856 builtin/fetch.c:952
#, c-format
msgid "From %.*s\n"
msgstr "Från %.*s\n"
-#: builtin/fetch.c:850
+#: builtin/fetch.c:867
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
"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:904
+#: builtin/fetch.c:922
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s kommer bli dinglande)"
-#: builtin/fetch.c:905
+#: builtin/fetch.c:923
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s har blivit dinglande)"
-#: builtin/fetch.c:937
+#: builtin/fetch.c:955
msgid "[deleted]"
msgstr "[borttagen]"
-#: builtin/fetch.c:938 builtin/remote.c:1020
+#: builtin/fetch.c:956 builtin/remote.c:1020
msgid "(none)"
msgstr "(ingen)"
-#: builtin/fetch.c:960
+#: builtin/fetch.c:979
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv"
-#: builtin/fetch.c:979
+#: builtin/fetch.c:998
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s"
-#: builtin/fetch.c:982
+#: builtin/fetch.c:1001
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Flaggan \"%s\" ignoreras för %s\n"
-#: builtin/fetch.c:1039
+#: builtin/fetch.c:1077
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Vet inte hur man hämtar från %s"
-#: builtin/fetch.c:1199
+#: builtin/fetch.c:1237
#, c-format
msgid "Fetching %s\n"
msgstr "Hämtar %s\n"
-#: builtin/fetch.c:1201 builtin/remote.c:96
+#: builtin/fetch.c:1239 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "Kunde inte hämta %s"
-#: builtin/fetch.c:1219
+#: builtin/fetch.c:1257
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
"Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"
"fjärrarkiv som nya incheckningar skall hämtas från."
-#: builtin/fetch.c:1242
+#: builtin/fetch.c:1280
msgid "You need to specify a tag name."
msgstr "Du måste ange namnet på en tagg."
-#: builtin/fetch.c:1284
+#: builtin/fetch.c:1322
+msgid "Negative depth in --deepen is not supported"
+msgstr "Negativa djup stöds inte i --deepen"
+
+#: builtin/fetch.c:1324
+msgid "--deepen and --depth are mutually exclusive"
+msgstr "--deepen och --depth är ömsesidigt uteslutande"
+
+#: builtin/fetch.c:1329
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth och --unshallow kan inte användas samtidigt"
-#: builtin/fetch.c:1286
+#: builtin/fetch.c:1331
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow kan inte användas på ett komplett arkiv"
-#: builtin/fetch.c:1306
+#: builtin/fetch.c:1353
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all tar inte namnet på ett arkiv som argument"
-#: builtin/fetch.c:1308
+#: builtin/fetch.c:1355
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kan inte anges med referensspecifikationer"
-#: builtin/fetch.c:1319
+#: builtin/fetch.c:1366
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Fjärren eller fjärrgruppen finns inte: %s"
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1374
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Kan inte hämta från grupp och ange referensspecifikationer"
msgstr ""
"git fmt-merge-msg [-m <meddelande>] [--log[=<n>] | --no-log] [--file <fil>]"
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:663
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:670
+#: builtin/fmt-merge-msg.c:666
msgid "alias for --log (deprecated)"
msgstr "alias för --log (avråds)"
-#: builtin/fmt-merge-msg.c:673
+#: builtin/fmt-merge-msg.c:669
msgid "text"
msgstr "text"
-#: builtin/fmt-merge-msg.c:674
+#: builtin/fmt-merge-msg.c:670
msgid "use <text> as start of message"
msgstr "inled meddelande med <text>"
-#: builtin/fmt-merge-msg.c:675
+#: builtin/fmt-merge-msg.c:671
msgid "file to read from"
msgstr "fil att läsa från"
msgid "show verbose names for reachable objects"
msgstr "visa ordrika namn för nåbara objekt"
-#: builtin/fsck.c:671
+#: builtin/fsck.c:665
msgid "Checking objects"
msgstr "Kontrollerar objekt"
msgid "invalid number of threads specified (%d) for %s"
msgstr "felaktigt antal trådar angivet (%d) för %s"
-#: builtin/grep.c:452 builtin/grep.c:487
+#: builtin/grep.c:453 builtin/grep.c:488
#, c-format
msgid "unable to read tree (%s)"
msgstr "kunde inte läsa träd (%s)"
-#: builtin/grep.c:502
+#: builtin/grep.c:503
#, c-format
msgid "unable to grep from object of type %s"
msgstr "Kunde inte \"grep\" från objekt av typen %s"
-#: builtin/grep.c:560
+#: builtin/grep.c:561
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "flaggan \"%c\" antar ett numeriskt värde"
-#: builtin/grep.c:577
-#, c-format
-msgid "cannot open '%s'"
-msgstr "kan inte öppna \"%s\""
-
-#: builtin/grep.c:646
+#: builtin/grep.c:647
msgid "search in index instead of in the work tree"
msgstr "sök i indexet istället för i arbetskatalogen"
-#: builtin/grep.c:648
+#: builtin/grep.c:649
msgid "find in contents not managed by git"
msgstr "sök i innehåll som inte hanteras av git"
-#: builtin/grep.c:650
+#: builtin/grep.c:651
msgid "search in both tracked and untracked files"
msgstr "sök i både spårade och ospårade filer"
-#: builtin/grep.c:652
+#: builtin/grep.c:653
msgid "ignore files specified via '.gitignore'"
msgstr "ignorera filer angivna i \".gitignore\""
-#: builtin/grep.c:655
+#: builtin/grep.c:656
msgid "show non-matching lines"
msgstr "visa rader som inte träffas"
-#: builtin/grep.c:657
+#: builtin/grep.c:658
msgid "case insensitive matching"
msgstr "skiftlägesokänslig sökning"
-#: builtin/grep.c:659
+#: builtin/grep.c:660
msgid "match patterns only at word boundaries"
msgstr "matcha endast mönster vid ordgränser"
-#: builtin/grep.c:661
+#: builtin/grep.c:662
msgid "process binary files as text"
msgstr "hantera binärfiler som text"
-#: builtin/grep.c:663
+#: builtin/grep.c:664
msgid "don't match patterns in binary files"
msgstr "träffa inte mönster i binärfiler"
-#: builtin/grep.c:666
+#: builtin/grep.c:667
msgid "process binary files with textconv filters"
msgstr "hantera binärfiler med textconv-filter"
-#: builtin/grep.c:668
+#: builtin/grep.c:669
msgid "descend at most <depth> levels"
msgstr "gå som mest ned <djup> nivåer"
-#: builtin/grep.c:672
+#: builtin/grep.c:673
msgid "use extended POSIX regular expressions"
msgstr "använd utökade POSIX-reguljära uttryck"
-#: builtin/grep.c:675
+#: builtin/grep.c:676
msgid "use basic POSIX regular expressions (default)"
msgstr "använd grundläggande POSIX-reguljära uttryck (standard)"
-#: builtin/grep.c:678
+#: builtin/grep.c:679
msgid "interpret patterns as fixed strings"
msgstr "tolka mönster som fixerade strängar"
-#: builtin/grep.c:681
+#: builtin/grep.c:682
msgid "use Perl-compatible regular expressions"
msgstr "använd Perlkompatibla reguljära uttryck"
-#: builtin/grep.c:684
+#: builtin/grep.c:685
msgid "show line numbers"
msgstr "visa radnummer"
-#: builtin/grep.c:685
+#: builtin/grep.c:686
msgid "don't show filenames"
msgstr "visa inte filnamn"
-#: builtin/grep.c:686
+#: builtin/grep.c:687
msgid "show filenames"
msgstr "visa filnamn"
-#: builtin/grep.c:688
+#: builtin/grep.c:689
msgid "show filenames relative to top directory"
msgstr "visa filnamn relativa till toppkatalogen"
-#: builtin/grep.c:690
+#: builtin/grep.c:691
msgid "show only filenames instead of matching lines"
msgstr "visa endast filnamn istället för träffade rader"
-#: builtin/grep.c:692
+#: builtin/grep.c:693
msgid "synonym for --files-with-matches"
msgstr "synonym för --files-with-matches"
-#: builtin/grep.c:695
+#: builtin/grep.c:696
msgid "show only the names of files without match"
msgstr "visa endast namn på filer utan träffar"
-#: builtin/grep.c:697
+#: builtin/grep.c:698
msgid "print NUL after filenames"
msgstr "skriv NUL efter filnamn"
-#: builtin/grep.c:699
+#: builtin/grep.c:700
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:700
+#: builtin/grep.c:701
msgid "highlight matches"
msgstr "ljusmarkera träffar"
-#: builtin/grep.c:702
+#: builtin/grep.c:703
msgid "print empty line between matches from different files"
msgstr "skriv tomma rader mellan träffar från olika filer"
-#: builtin/grep.c:704
+#: builtin/grep.c:705
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:707
+#: builtin/grep.c:708
msgid "show <n> context lines before and after matches"
msgstr "visa <n> rader sammanhang före och efter träffar"
-#: builtin/grep.c:710
+#: builtin/grep.c:711
msgid "show <n> context lines before matches"
msgstr "visa <n> rader sammanhang före träffar"
-#: builtin/grep.c:712
+#: builtin/grep.c:713
msgid "show <n> context lines after matches"
msgstr "visa <n> rader sammanhang efter träffar"
-#: builtin/grep.c:714
+#: builtin/grep.c:715
msgid "use <n> worker threads"
msgstr "använd <n> jobbtrådar"
-#: builtin/grep.c:715
+#: builtin/grep.c:716
msgid "shortcut for -C NUM"
msgstr "genväg för -C NUM"
-#: builtin/grep.c:718
+#: builtin/grep.c:719
msgid "show a line with the function name before matches"
msgstr "visa en rad med funktionsnamnet före träffen"
-#: builtin/grep.c:720
+#: builtin/grep.c:721
msgid "show the surrounding function"
msgstr "visa den omkringliggande funktionen"
-#: builtin/grep.c:723
+#: builtin/grep.c:724
msgid "read patterns from file"
msgstr "läs mönster från fil"
-#: builtin/grep.c:725
+#: builtin/grep.c:726
msgid "match <pattern>"
msgstr "träffa <mönster>"
-#: builtin/grep.c:727
+#: builtin/grep.c:728
msgid "combine patterns specified with -e"
msgstr "kombinera mönster som anges med -e"
-#: builtin/grep.c:739
+#: builtin/grep.c:740
msgid "indicate hit with exit status without output"
msgstr "ange träff med slutstatuskod utan utdata"
-#: builtin/grep.c:741
+#: builtin/grep.c:742
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:743
+#: builtin/grep.c:744
msgid "show parse tree for grep expression"
msgstr "visa analysträd för grep-uttryck"
-#: builtin/grep.c:747
+#: builtin/grep.c:748
msgid "pager"
msgstr "bläddrare"
-#: builtin/grep.c:747
+#: builtin/grep.c:748
msgid "show matching files in the pager"
msgstr "visa träffade filer i filbläddraren"
-#: builtin/grep.c:750
+#: builtin/grep.c:751
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"
-#: builtin/grep.c:813
+#: builtin/grep.c:814
msgid "no pattern given."
msgstr "inget mönster angavs."
-#: builtin/grep.c:845 builtin/index-pack.c:1479
+#: builtin/grep.c:846 builtin/index-pack.c:1480
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "felaktigt antal trådar angivet (%d)"
-#: builtin/grep.c:875
+#: builtin/grep.c:876
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"
-#: builtin/grep.c:901
+#: builtin/grep.c:902
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached och --untracked kan inte användas med --no-index."
-#: builtin/grep.c:906
+#: builtin/grep.c:907
msgid "--no-index or --untracked cannot be used with revs."
msgstr "--no-index och --untracked kan inte användas med revisioner."
-#: builtin/grep.c:909
+#: builtin/grep.c:910
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:917
+#: builtin/grep.c:918
msgid "both --cached and trees are given."
msgstr "både --cached och träd angavs."
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:93
+#: builtin/hash-object.c:94
msgid "type"
msgstr "typ"
-#: builtin/hash-object.c:93
+#: builtin/hash-object.c:94
msgid "object type"
msgstr "objekttyp"
-#: builtin/hash-object.c:94
+#: builtin/hash-object.c:95
msgid "write the object into the object database"
msgstr "skriv objektet till objektdatabasen"
-#: builtin/hash-object.c:96
+#: builtin/hash-object.c:97
msgid "read the object from stdin"
msgstr "läs objektet från standard in"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
msgid "store file as is without filters"
msgstr "spara filen som den är utan filer"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:100
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:100
+#: builtin/hash-object.c:101
msgid "process file as it were from this path"
msgstr "hantera filen som om den kom från sökvägen"
-#: builtin/help.c:41
+#: builtin/help.c:42
msgid "print all available commands"
msgstr "visa alla tillgängliga kommandon"
-#: builtin/help.c:42
+#: builtin/help.c:43
+msgid "exclude guides"
+msgstr "uteslut vägledningar"
+
+#: builtin/help.c:44
msgid "print list of useful guides"
msgstr "lista användbara vägledningar"
-#: builtin/help.c:43
+#: builtin/help.c:45
msgid "show man page"
msgstr "visa manualsida"
-#: builtin/help.c:44
+#: builtin/help.c:46
msgid "show manual in web browser"
msgstr "visa manual i webbläsare"
-#: builtin/help.c:46
+#: builtin/help.c:48
msgid "show info page"
msgstr "visa info-sida"
-#: builtin/help.c:52
+#: builtin/help.c:54
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr "git help [--all] [--guides] [--man | --web | --info] [<kommando>]"
-#: builtin/help.c:64
+#: builtin/help.c:66
#, c-format
msgid "unrecognized help format '%s'"
msgstr "okänt hjälpformat: %s"
-#: builtin/help.c:91
+#: builtin/help.c:93
msgid "Failed to start emacsclient."
msgstr "Misslyckades starta emacsclient."
-#: builtin/help.c:104
+#: builtin/help.c:106
msgid "Failed to parse emacsclient version."
msgstr "Kunde inte tolka emacsclient-version."
-#: builtin/help.c:112
+#: builtin/help.c:114
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient version \"%d\" för gammal (< 22)."
-#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
+#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
#, c-format
msgid "failed to exec '%s'"
msgstr "exec misslyckades för \"%s\""
-#: builtin/help.c:205
+#: builtin/help.c:207
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"\"%s\": sökväg för man-visare som ej stöds.\n"
"Använd \"man.<verktyg>.cmd\" istället."
-#: builtin/help.c:217
+#: builtin/help.c:219
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"\"%s\": kommando för man-visare som stöds.\n"
"Använd \"man.<verktyg>.path\" istället."
-#: builtin/help.c:334
+#: builtin/help.c:336
#, c-format
msgid "'%s': unknown man viewer."
msgstr "\"%s\": okänd man-visare."
-#: builtin/help.c:351
+#: builtin/help.c:353
msgid "no man viewer handled the request"
msgstr "ingen man-visare hanterade förfrågan"
-#: builtin/help.c:359
+#: builtin/help.c:361
msgid "no info viewer handled the request"
msgstr "ingen info-visare hanterade förfrågan"
-#: builtin/help.c:401
+#: builtin/help.c:403
msgid "Defining attributes per path"
msgstr "Definierar attribut per sökväg"
-#: builtin/help.c:402
+#: builtin/help.c:404
msgid "Everyday Git With 20 Commands Or So"
msgstr "Git för dagligt bruk i ungefär 20 kommandon"
-#: builtin/help.c:403
+#: builtin/help.c:405
msgid "A Git glossary"
msgstr "En Git-ordlista"
-#: builtin/help.c:404
+#: builtin/help.c:406
msgid "Specifies intentionally untracked files to ignore"
msgstr "Ange avsiktligen ospårade filer att ignorera"
-#: builtin/help.c:405
+#: builtin/help.c:407
msgid "Defining submodule properties"
msgstr "Ange egenskaper för undermoduler"
-#: builtin/help.c:406
+#: builtin/help.c:408
msgid "Specifying revisions and ranges for Git"
msgstr "Ange versioner och intervall i Git"
-#: builtin/help.c:407
+#: builtin/help.c:409
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "Introduktion till Git (för version 1.5.1 och senare)"
-#: builtin/help.c:408
+#: builtin/help.c:410
msgid "An overview of recommended workflows with Git"
msgstr "Översikt över rekommenderade arbetsflöden med Git"
-#: builtin/help.c:420
+#: builtin/help.c:422
msgid "The common Git guides are:\n"
msgstr "De vanliga Git-vägledningarna är:\n"
-#: builtin/help.c:441 builtin/help.c:458
-#, c-format
-msgid "usage: %s%s"
-msgstr "användning: %s%s"
-
-#: builtin/help.c:474
+#: builtin/help.c:440
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "\"git %s\" är ett alias för \"%s\""
-#: builtin/index-pack.c:153
+#: builtin/help.c:462 builtin/help.c:479
+#, c-format
+msgid "usage: %s%s"
+msgstr "användning: %s%s"
+
+#: builtin/index-pack.c:154
#, c-format
msgid "unable to open %s"
msgstr "kunde inte öppna %s"
-#: builtin/index-pack.c:203
+#: builtin/index-pack.c:204
#, c-format
msgid "object type mismatch at %s"
msgstr "objekttyp stämmer inte överens vid %s"
-#: builtin/index-pack.c:223
+#: builtin/index-pack.c:224
#, c-format
msgid "did not receive expected object %s"
msgstr "emottog inte det förväntade objektet %s"
-#: builtin/index-pack.c:226
+#: builtin/index-pack.c:227
#, 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:268
+#: builtin/index-pack.c:269
#, 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:278
+#: builtin/index-pack.c:279
msgid "early EOF"
msgstr "tidigt filslut"
-#: builtin/index-pack.c:279
+#: builtin/index-pack.c:280
msgid "read error on input"
msgstr "indataläsfel"
-#: builtin/index-pack.c:291
+#: builtin/index-pack.c:292
msgid "used more bytes than were available"
msgstr "använde fler byte än tillgängligt"
-#: builtin/index-pack.c:298
+#: builtin/index-pack.c:299
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:314
+#: builtin/index-pack.c:302 builtin/unpack-objects.c:92
+msgid "pack exceeds maximum allowed size"
+msgstr "paket är större än tillåten maximal storlek"
+
+#: builtin/index-pack.c:317
#, c-format
msgid "unable to create '%s'"
msgstr "kunde inte skapa \"%s\""
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:322
#, c-format
msgid "cannot open packfile '%s'"
msgstr "kan inte öppna paketfilen \"%s\""
-#: builtin/index-pack.c:333
+#: builtin/index-pack.c:336
msgid "pack signature mismatch"
msgstr "paketsignatur stämmer inte överens"
-#: builtin/index-pack.c:335
+#: builtin/index-pack.c:338
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "paketversion %<PRIu32> stöds ej"
-#: builtin/index-pack.c:353
+#: builtin/index-pack.c:356
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s"
-#: builtin/index-pack.c:475
+#: builtin/index-pack.c:478
#, c-format
msgid "inflate returned %d"
msgstr "inflate returnerade %d"
-#: builtin/index-pack.c:524
+#: builtin/index-pack.c:527
msgid "offset value overflow for delta base object"
msgstr "indexvärdespill för deltabasobjekt"
-#: builtin/index-pack.c:532
+#: builtin/index-pack.c:535
msgid "delta base offset is out of bound"
msgstr "deltabasindex utanför gränsen"
-#: builtin/index-pack.c:540
+#: builtin/index-pack.c:543
#, c-format
msgid "unknown object type %d"
msgstr "okänd objekttyp %d"
-#: builtin/index-pack.c:571
+#: builtin/index-pack.c:574
msgid "cannot pread pack file"
msgstr "kan inte utföra \"pread\" på paketfil"
-#: builtin/index-pack.c:573
+#: builtin/index-pack.c:576
#, 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:599
+#: builtin/index-pack.c:602
msgid "serious inflate inconsistency"
msgstr "allvarlig inflate-inkonsekvens"
-#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774
-#: builtin/index-pack.c:808 builtin/index-pack.c:817
+#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
+#: builtin/index-pack.c:811 builtin/index-pack.c:820
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"
-#: builtin/index-pack.c:748 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:256
+#: builtin/index-pack.c:751 builtin/pack-objects.c:166
+#: builtin/pack-objects.c:258
#, c-format
msgid "unable to read %s"
msgstr "kunde inte läsa %s"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:817
#, c-format
msgid "cannot read existing object %s"
msgstr "kan inte läsa befintligt objekt %s"
-#: builtin/index-pack.c:828
+#: builtin/index-pack.c:831
#, c-format
msgid "invalid blob object %s"
msgstr "ogiltigt blob-objekt %s"
-#: builtin/index-pack.c:842
+#: builtin/index-pack.c:845
#, c-format
msgid "invalid %s"
msgstr "ogiltigt %s"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:848
msgid "Error in object"
msgstr "Fel i objekt"
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:850
#, 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:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:922 builtin/index-pack.c:953
msgid "failed to apply delta"
msgstr "misslyckades tillämpa delta"
-#: builtin/index-pack.c:1120
+#: builtin/index-pack.c:1123
msgid "Receiving objects"
msgstr "Tar emot objekt"
-#: builtin/index-pack.c:1120
+#: builtin/index-pack.c:1123
msgid "Indexing objects"
msgstr "Skapar index för objekt"
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1155
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "paketet är trasigt (SHA1 stämmer inte)"
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
msgid "cannot fstat packfile"
msgstr "kan inte utföra \"fstat\" på paketfil"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1163
msgid "pack has junk at the end"
msgstr "paket har skräp i slutet"
-#: builtin/index-pack.c:1171
+#: builtin/index-pack.c:1174
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "förvirrad bortom vanvett i parse_pack_objects()"
-#: builtin/index-pack.c:1196
+#: builtin/index-pack.c:1197
msgid "Resolving deltas"
msgstr "Analyserar delta"
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
#, c-format
msgid "unable to create thread: %s"
msgstr "kunde inte skapa tråd: %s"
-#: builtin/index-pack.c:1249
+#: builtin/index-pack.c:1250
msgid "confusion beyond insanity"
msgstr "förvirrad bortom vanvett"
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1256
#, 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:1267
+#: builtin/index-pack.c:1268
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Oväntad svanschecksumma för %s (trasig disk?)"
-#: builtin/index-pack.c:1271
+#: builtin/index-pack.c:1272
#, 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:1295
+#: builtin/index-pack.c:1296
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"
-#: builtin/index-pack.c:1371
+#: builtin/index-pack.c:1372
#, c-format
msgid "local object %s is corrupt"
msgstr "lokalt objekt %s är trasigt"
-#: builtin/index-pack.c:1395
+#: builtin/index-pack.c:1396
msgid "error while closing pack file"
msgstr "fel vid stängning av paketfil"
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
#, c-format
msgid "cannot write keep file '%s'"
msgstr "kan inte ta skriva \"keep\"-fil \"%s\""
-#: builtin/index-pack.c:1416
+#: builtin/index-pack.c:1417
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "akn inte stänga skriven \"keep\"-fil \"%s\""
-#: builtin/index-pack.c:1429
+#: builtin/index-pack.c:1430
msgid "cannot store pack file"
msgstr "kan inte spara paketfil"
-#: builtin/index-pack.c:1440
+#: builtin/index-pack.c:1441
msgid "cannot store index file"
msgstr "kan inte spara indexfil"
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1474
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "felaktig pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1483 builtin/index-pack.c:1681
+#: builtin/index-pack.c:1484 builtin/index-pack.c:1681
#, c-format
msgid "no threads support, ignoring %s"
msgstr "trådstöd saknas, ignorerar %s"
msgid "bad %s"
msgstr "felaktig %s"
-#: builtin/index-pack.c:1730
+#: builtin/index-pack.c:1732
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin kan inte användas med --stdin"
-#: builtin/index-pack.c:1738
+#: builtin/index-pack.c:1740
msgid "--verify with no packfile name given"
msgstr "--verify angavs utan paketfilnamn"
-#: builtin/init-db.c:55
+#: builtin/init-db.c:54
#, c-format
msgid "cannot stat '%s'"
msgstr "kan inte ta status på \"%s\""
-#: builtin/init-db.c:61
+#: builtin/init-db.c:60
#, c-format
msgid "cannot stat template '%s'"
msgstr "kan inte ta status på mallen \"%s\""
-#: builtin/init-db.c:66
+#: builtin/init-db.c:65
#, c-format
msgid "cannot opendir '%s'"
msgstr "kan inte öppna katalogen (opendir) \"%s\""
-#: builtin/init-db.c:77
+#: builtin/init-db.c:76
#, c-format
msgid "cannot readlink '%s'"
msgstr "kan inte läsa länk (readlink) \"%s\""
-#: builtin/init-db.c:79
+#: builtin/init-db.c:78
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "kan inte skapa symbolisk länk \"%s\" \"%s\""
-#: builtin/init-db.c:85
+#: builtin/init-db.c:84
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "kan inte kopiera \"%s\" till \"%s\""
-#: builtin/init-db.c:89
+#: builtin/init-db.c:88
#, c-format
msgid "ignoring template %s"
msgstr "ignorerar mallen %s"
-#: builtin/init-db.c:120
+#: builtin/init-db.c:119
#, c-format
msgid "templates not found %s"
msgstr "mallarna hittades inte %s"
-#: builtin/init-db.c:135
-#, c-format
-msgid "not copying templates from '%s': %s"
-msgstr "kopierade inte mallar från \"%s\": %s"
-
-#: builtin/init-db.c:312 builtin/init-db.c:315
-#, c-format
-msgid "%s already exists"
-msgstr "%s finns redan"
+#: builtin/init-db.c:134
+#, c-format
+msgid "not copying templates from '%s': %s"
+msgstr "kopierade inte mallar från \"%s\": %s"
-#: builtin/init-db.c:344
+#: builtin/init-db.c:327
#, c-format
msgid "unable to handle file type %d"
msgstr "kan inte hantera filtyp %d"
-#: builtin/init-db.c:347
+#: builtin/init-db.c:330
#, c-format
msgid "unable to move %s to %s"
msgstr "kan inte flytta %s till %s"
-#: builtin/init-db.c:402
+#: builtin/init-db.c:347 builtin/init-db.c:350
+#, c-format
+msgid "%s already exists"
+msgstr "%s finns redan"
+
+#: builtin/init-db.c:403
#, 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:403
+#: builtin/init-db.c:404
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "Ominitierade befintligt Git-arkiv i %s%s\n"
-#: builtin/init-db.c:407
+#: builtin/init-db.c:408
#, 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:408
+#: builtin/init-db.c:409
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "Initierade tomt Git-arkiv i %s%s\n"
-#: builtin/init-db.c:455
+#: builtin/init-db.c:457
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--"
"shared[=<behörigheter>]] [<katalog>]"
-#: builtin/init-db.c:478
+#: builtin/init-db.c:480
msgid "permissions"
msgstr "behörigheter"
-#: builtin/init-db.c:479
+#: builtin/init-db.c:481
msgid "specify that the git repository is to be shared amongst several users"
msgstr "ange att git-arkivet skall delas bland flera användare"
-#: builtin/init-db.c:513 builtin/init-db.c:518
+#: builtin/init-db.c:515 builtin/init-db.c:520
#, c-format
msgid "cannot mkdir %s"
msgstr "kan inte skapa katalogen (mkdir) %s"
-#: builtin/init-db.c:522
+#: builtin/init-db.c:524
#, c-format
msgid "cannot chdir to %s"
msgstr "kan inte byta katalog (chdir) till %s"
-#: builtin/init-db.c:543
+#: builtin/init-db.c:545
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-"
"dir=<katalog>)"
-#: builtin/init-db.c:571
+#: builtin/init-db.c:573
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Kan inte komma åt arbetskatalogen \"%s\""
msgid "Cover letter needs email format"
msgstr "Omslagsbrevet behöver e-postformat"
-#: builtin/log.c:1064
+#: builtin/log.c:1063
#, c-format
msgid "insane in-reply-to: %s"
msgstr "tokigt in-reply-to: %s"
-#: builtin/log.c:1092
+#: builtin/log.c:1091
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]"
-#: builtin/log.c:1137
+#: builtin/log.c:1141
msgid "Two output directories?"
msgstr "Två utdatakataloger?"
-#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897
+#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
#, c-format
msgid "Unknown commit %s"
msgstr "Okänd incheckning %s"
-#: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305
-#: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425
-#: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594
-#: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455
+#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Kunde inte slå upp \"%s\" som en giltig referens."
-#: builtin/log.c:1259
+#: builtin/log.c:1263
msgid "Could not find exact merge base."
msgstr "Kunde inte hitta exakt sammanslagningsbas."
-#: builtin/log.c:1263
+#: builtin/log.c:1267
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"
"Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> "
"manuellt."
-#: builtin/log.c:1283
+#: builtin/log.c:1287
msgid "Failed to find exact merge base"
msgstr "Kunde inte hitta exakt sammanslagningsbas"
-#: builtin/log.c:1294
+#: builtin/log.c:1298
msgid "base commit should be the ancestor of revision list"
msgstr "basincheckningen bör vara förfader till revisionslistan"
-#: builtin/log.c:1298
+#: builtin/log.c:1302
msgid "base commit shouldn't be in revision list"
msgstr "basincheckningen bör inte vara i revisionslistan"
-#: builtin/log.c:1347
+#: builtin/log.c:1351
msgid "cannot get patch id"
msgstr "kan inte hämta patch-id"
-#: builtin/log.c:1404
+#: builtin/log.c:1408
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:1407
+#: builtin/log.c:1411
msgid "use [PATCH] even with multiple patches"
msgstr "använd [PATCH] även för flera patchar"
-#: builtin/log.c:1411
+#: builtin/log.c:1415
msgid "print patches to standard out"
msgstr "skriv patcharna på standard ut"
-#: builtin/log.c:1413
+#: builtin/log.c:1417
msgid "generate a cover letter"
msgstr "generera ett följebrev"
-#: builtin/log.c:1415
+#: builtin/log.c:1419
msgid "use simple number sequence for output file names"
msgstr "använd enkel nummersekvens för utdatafilnamn"
-#: builtin/log.c:1416
+#: builtin/log.c:1420
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1417
+#: builtin/log.c:1421
msgid "use <sfx> instead of '.patch'"
msgstr "använd <sfx> istället för \".patch\""
-#: builtin/log.c:1419
+#: builtin/log.c:1423
msgid "start numbering patches at <n> instead of 1"
msgstr "börja numrera patchar på <n> istället för 1"
-#: builtin/log.c:1421
+#: builtin/log.c:1425
msgid "mark the series as Nth re-roll"
msgstr "markera serien som N:te försök"
-#: builtin/log.c:1423
+#: builtin/log.c:1427
+msgid "Use [RFC PATCH] instead of [PATCH]"
+msgstr "Använd [RFC PATCH] istället för [PATCH]"
+
+#: builtin/log.c:1430
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Använd [<prefix>] istället för [PATCH]"
-#: builtin/log.c:1426
+#: builtin/log.c:1433
msgid "store resulting files in <dir>"
msgstr "spara filerna i <katalog>"
-#: builtin/log.c:1429
+#: builtin/log.c:1436
msgid "don't strip/add [PATCH]"
msgstr "ta inte bort eller lägg till [PATCH]"
-#: builtin/log.c:1432
+#: builtin/log.c:1439
msgid "don't output binary diffs"
msgstr "skriv inte binära diffar"
-#: builtin/log.c:1434
+#: builtin/log.c:1441
msgid "output all-zero hash in From header"
msgstr "använd hashvärde med nollor i From-huvud"
-#: builtin/log.c:1436
+#: builtin/log.c:1443
msgid "don't include a patch matching a commit upstream"
msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"
-#: builtin/log.c:1438
+#: builtin/log.c:1445
msgid "show patch format instead of default (patch + stat)"
msgstr "visa patchformat istället för standard (patch + stat)"
-#: builtin/log.c:1440
+#: builtin/log.c:1447
msgid "Messaging"
msgstr "E-post"
-#: builtin/log.c:1441
+#: builtin/log.c:1448
msgid "header"
msgstr "huvud"
-#: builtin/log.c:1442
+#: builtin/log.c:1449
msgid "add email header"
msgstr "lägg till e-posthuvud"
-#: builtin/log.c:1443 builtin/log.c:1445
+#: builtin/log.c:1450 builtin/log.c:1452
msgid "email"
msgstr "epost"
-#: builtin/log.c:1443
+#: builtin/log.c:1450
msgid "add To: header"
msgstr "Lägg till mottagarhuvud (\"To:\")"
-#: builtin/log.c:1445
+#: builtin/log.c:1452
msgid "add Cc: header"
msgstr "Lägg till kopiehuvud (\"Cc:\")"
-#: builtin/log.c:1447
+#: builtin/log.c:1454
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1448
+#: builtin/log.c:1455
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:1450
+#: builtin/log.c:1457
msgid "message-id"
msgstr "meddelande-id"
-#: builtin/log.c:1451
+#: builtin/log.c:1458
msgid "make first mail a reply to <message-id>"
msgstr "Gör det första brevet ett svar till <meddelande-id>"
-#: builtin/log.c:1452 builtin/log.c:1455
+#: builtin/log.c:1459 builtin/log.c:1462
msgid "boundary"
msgstr "gräns"
-#: builtin/log.c:1453
+#: builtin/log.c:1460
msgid "attach the patch"
msgstr "bifoga patchen"
-#: builtin/log.c:1456
+#: builtin/log.c:1463
msgid "inline the patch"
msgstr "gör patchen ett inline-objekt"
-#: builtin/log.c:1460
+#: builtin/log.c:1467
msgid "enable message threading, styles: shallow, deep"
msgstr "aktivera brevtrådning, typer: shallow, deep"
-#: builtin/log.c:1462
+#: builtin/log.c:1469
msgid "signature"
msgstr "signatur"
-#: builtin/log.c:1463
+#: builtin/log.c:1470
msgid "add a signature"
msgstr "lägg till signatur"
-#: builtin/log.c:1464
+#: builtin/log.c:1471
msgid "base-commit"
msgstr "basincheckning"
-#: builtin/log.c:1465
+#: builtin/log.c:1472
msgid "add prerequisite tree info to the patch series"
msgstr "lägg till förhandskrävd trädinfo i patchserien"
-#: builtin/log.c:1467
+#: builtin/log.c:1474
msgid "add a signature from a file"
msgstr "lägg till signatur från fil"
-#: builtin/log.c:1468
+#: builtin/log.c:1475
msgid "don't print the patch filenames"
msgstr "visa inte filnamn för patchar"
-#: builtin/log.c:1558
+#: builtin/log.c:1565
msgid "-n and -k are mutually exclusive."
msgstr "-n och -k kan inte användas samtidigt."
-#: builtin/log.c:1560
-msgid "--subject-prefix and -k are mutually exclusive."
-msgstr "--subject-prefix och -k kan inte användas samtidigt."
+#: builtin/log.c:1567
+msgid "--subject-prefix/--rfc and -k are mutually exclusive."
+msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt."
-#: builtin/log.c:1568
+#: builtin/log.c:1575
msgid "--name-only does not make sense"
msgstr "kan inte använda --name-only"
-#: builtin/log.c:1570
+#: builtin/log.c:1577
msgid "--name-status does not make sense"
msgstr "kan inte använda --name-status"
-#: builtin/log.c:1572
+#: builtin/log.c:1579
msgid "--check does not make sense"
msgstr "kan inte använda --check"
-#: builtin/log.c:1602
+#: builtin/log.c:1609
msgid "standard output, or directory, which one?"
msgstr "standard ut, eller katalog, vilken skall det vara?"
-#: builtin/log.c:1604
+#: builtin/log.c:1611
#, c-format
msgid "Could not create directory '%s'"
msgstr "Kunde inte skapa katalogen \"%s\""
-#: builtin/log.c:1698
+#: builtin/log.c:1705
#, c-format
msgid "unable to read signature file '%s'"
msgstr "kunde inte läsa signaturfil \"%s\""
-#: builtin/log.c:1769
+#: builtin/log.c:1777
msgid "Failed to create output files"
msgstr "Misslyckades skapa utdatafiler"
-#: builtin/log.c:1818
+#: builtin/log.c:1826
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"
-#: builtin/log.c:1872
+#: builtin/log.c:1880
#, 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:379
+#: builtin/ls-files.c:458
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<flaggor>] [<fil>...]"
-#: builtin/ls-files.c:428
+#: builtin/ls-files.c:507
msgid "identify the file status with tags"
msgstr "identifiera filstatus med taggar"
-#: builtin/ls-files.c:430
+#: builtin/ls-files.c:509
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:432
+#: builtin/ls-files.c:511
msgid "show cached files in the output (default)"
msgstr "visa cachade filer i utdata (standard)"
-#: builtin/ls-files.c:434
+#: builtin/ls-files.c:513
msgid "show deleted files in the output"
msgstr "visa borttagna filer i utdata"
-#: builtin/ls-files.c:436
+#: builtin/ls-files.c:515
msgid "show modified files in the output"
msgstr "visa modifierade filer i utdata"
-#: builtin/ls-files.c:438
+#: builtin/ls-files.c:517
msgid "show other files in the output"
msgstr "visa andra filer i utdata"
-#: builtin/ls-files.c:440
+#: builtin/ls-files.c:519
msgid "show ignored files in the output"
msgstr "visa ignorerade filer i utdata"
-#: builtin/ls-files.c:443
+#: builtin/ls-files.c:522
msgid "show staged contents' object name in the output"
msgstr "visa köat innehålls objektnamn i utdata"
-#: builtin/ls-files.c:445
+#: builtin/ls-files.c:524
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:447
+#: builtin/ls-files.c:526
msgid "show 'other' directories' names only"
msgstr "visa endast namn för \"andra\" kataloger"
-#: builtin/ls-files.c:449
+#: builtin/ls-files.c:528
msgid "show line endings of files"
msgstr "visa radslut i filer"
-#: builtin/ls-files.c:451
+#: builtin/ls-files.c:530
msgid "don't show empty directories"
msgstr "visa inte tomma kataloger"
-#: builtin/ls-files.c:454
+#: builtin/ls-files.c:533
msgid "show unmerged files in the output"
msgstr "visa ej sammanslagna filer i utdata"
-#: builtin/ls-files.c:456
+#: builtin/ls-files.c:535
msgid "show resolve-undo information"
msgstr "visa \"resolve-undo\"-information"
-#: builtin/ls-files.c:458
+#: builtin/ls-files.c:537
msgid "skip files matching pattern"
msgstr "hoppa över filer som motsvarar mönster"
-#: builtin/ls-files.c:461
+#: builtin/ls-files.c:540
msgid "exclude patterns are read from <file>"
msgstr "exkludera mönster som läses från <fil>"
-#: builtin/ls-files.c:464
+#: builtin/ls-files.c:543
msgid "read additional per-directory exclude patterns in <file>"
msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>"
-#: builtin/ls-files.c:466
+#: builtin/ls-files.c:545
msgid "add the standard git exclusions"
msgstr "lägg till git:s standardexkluderingar"
-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:548
msgid "make the output relative to the project top directory"
msgstr "gör utdata relativ till projektets toppkatalog"
-#: builtin/ls-files.c:472
+#: builtin/ls-files.c:551
+msgid "recurse through submodules"
+msgstr "rekursera ner i undermoduler"
+
+#: builtin/ls-files.c:553
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:473
+#: builtin/ls-files.c:554
msgid "tree-ish"
msgstr "träd-igt"
-#: builtin/ls-files.c:474
+#: builtin/ls-files.c:555
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:476
+#: builtin/ls-files.c:557
msgid "show debugging data"
msgstr "visa felsökningsutdata"
msgid "Available custom strategies are:"
msgstr "Tillgängliga skräddarsydda strategier är:"
-#: builtin/merge.c:195 builtin/pull.c:126
+#: builtin/merge.c:195 builtin/pull.c:127
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:198 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:130
msgid "show a diffstat at the end of the merge"
msgstr "visa en diffstat när sammanslagningen är färdig"
-#: builtin/merge.c:199 builtin/pull.c:132
+#: builtin/merge.c:199 builtin/pull.c:133
msgid "(synonym to --stat)"
msgstr "(synonym till --stat)"
-#: builtin/merge.c:201 builtin/pull.c:135
+#: builtin/merge.c:201 builtin/pull.c:136
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:204 builtin/pull.c:138
+#: builtin/merge.c:204 builtin/pull.c:139
msgid "create a single commit instead of doing a merge"
msgstr "skapa en ensam incheckning istället för en sammanslagning"
-#: builtin/merge.c:206 builtin/pull.c:141
+#: builtin/merge.c:206 builtin/pull.c:142
msgid "perform a commit if the merge succeeds (default)"
msgstr "utför en incheckning om sammanslagningen lyckades (standard)"
-#: builtin/merge.c:208 builtin/pull.c:144
+#: builtin/merge.c:208 builtin/pull.c:145
msgid "edit message before committing"
msgstr "redigera meddelande innan incheckning"
msgid "allow fast-forward (default)"
msgstr "tillåt snabbspolning (standard)"
-#: builtin/merge.c:211 builtin/pull.c:150
+#: builtin/merge.c:211 builtin/pull.c:151
msgid "abort if fast-forward is not possible"
msgstr "avbryt om snabbspolning inte är möjlig"
-#: builtin/merge.c:215 builtin/pull.c:153
+#: builtin/merge.c:215 builtin/pull.c:154
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:216 builtin/notes.c:772 builtin/pull.c:157
+#: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158
#: builtin/revert.c:89
msgid "strategy"
msgstr "strategi"
-#: builtin/merge.c:217 builtin/pull.c:158
+#: builtin/merge.c:217 builtin/pull.c:159
msgid "merge strategy to use"
msgstr "sammanslagningsstrategi att använda"
-#: builtin/merge.c:218 builtin/pull.c:161
+#: builtin/merge.c:218 builtin/pull.c:162
msgid "option=value"
msgstr "alternativ=värde"
-#: builtin/merge.c:219 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:163
msgid "option for selected merge strategy"
msgstr "alternativ för vald sammanslagningsstrategi"
msgid "abort the current in-progress merge"
msgstr "avbryt den pågående sammanslagningen"
-#: builtin/merge.c:227 builtin/pull.c:169
+#: builtin/merge.c:227 builtin/pull.c:170
msgid "allow merging unrelated histories"
msgstr "tillåt sammanslagning av orelaterade historier"
msgid "Already up-to-date."
msgstr "Redan à jour."
-#: builtin/merge.c:1382
+#: builtin/merge.c:1377
#, c-format
msgid "Updating %s..%s\n"
msgstr "Uppdaterar %s..%s\n"
-#: builtin/merge.c:1419
+#: builtin/merge.c:1418
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"
-#: builtin/merge.c:1426
+#: builtin/merge.c:1425
#, c-format
msgid "Nope.\n"
msgstr "Nej.\n"
-#: builtin/merge.c:1451
+#: builtin/merge.c:1450
msgid "Already up-to-date. Yeeah!"
msgstr "Redan à jour. Toppen!"
-#: builtin/merge.c:1457
+#: builtin/merge.c:1456
msgid "Not possible to fast-forward, aborting."
msgstr "Kan inte snabbspola, avbryter."
-#: builtin/merge.c:1480 builtin/merge.c:1559
+#: builtin/merge.c:1479 builtin/merge.c:1558
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Återspolar trädet till orört...\n"
-#: builtin/merge.c:1484
+#: builtin/merge.c:1483
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Försöker sammanslagningsstrategin %s...\n"
-#: builtin/merge.c:1550
+#: builtin/merge.c:1549
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
-#: builtin/merge.c:1552
+#: builtin/merge.c:1551
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Sammanslagning med strategin %s misslyckades.\n"
-#: builtin/merge.c:1561
+#: builtin/merge.c:1560
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Använder %s för att förbereda lösning för hand.\n"
-#: builtin/merge.c:1573
+#: builtin/merge.c:1572
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <ref> <incheckning>"
-#: builtin/merge-base.c:214
+#: builtin/merge-base.c:217
msgid "output all common ancestors"
msgstr "skriv ut alla gemensamma anfäder"
-#: builtin/merge-base.c:216
+#: builtin/merge-base.c:219
msgid "find ancestors for a single n-way merge"
msgstr "hitta anfader för enkel n-vägssammanslagning"
-#: builtin/merge-base.c:218
+#: builtin/merge-base.c:221
msgid "list revs not reachable from others"
msgstr "visa revisioner som inte kan nås från andra"
-#: builtin/merge-base.c:220
+#: builtin/merge-base.c:223
msgid "is the first one ancestor of the other?"
msgstr "är den första anfader till den andra?"
-#: builtin/merge-base.c:222
+#: builtin/merge-base.c:225
msgid "find where <commit> forked from reflog of <ref>"
msgstr "se var <incheckning> grenades av från referensloggen från <ref>"
msgid "set labels for file1/orig-file/file2"
msgstr "sätt etiketter för fil1/origfil/fil2"
+#: builtin/merge-recursive.c:45
+#, c-format
+msgid "unknown option %s"
+msgstr "okänd flagga %s"
+
+#: builtin/merge-recursive.c:51
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "kunde inte tolka objektet \"%s\""
+
+#: builtin/merge-recursive.c:55
+#, 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:63
+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:69 builtin/merge-recursive.c:71
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "kunde inte bestämma referensen %s"
+
+#: builtin/merge-recursive.c:77
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "Slår ihop %s med %s\n"
+
#: builtin/mktree.c:65
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
msgid "renaming '%s' failed"
msgstr "misslyckades byta namn på \"%s\""
-#: builtin/name-rev.c:258
+#: builtin/name-rev.c:257
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<flaggor>] <incheckning>..."
-#: builtin/name-rev.c:259
+#: builtin/name-rev.c:258
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<flaggor>] --all"
-#: builtin/name-rev.c:260
+#: builtin/name-rev.c:259
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<flaggor>] --stdin"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:311
msgid "print only names (no SHA-1)"
msgstr "skriv endast namn (ingen SHA-1)"
-#: builtin/name-rev.c:313
+#: builtin/name-rev.c:312
msgid "only use tags to name the commits"
msgstr "använd endast taggar för att namnge incheckningar"
-#: builtin/name-rev.c:315
+#: builtin/name-rev.c:314
msgid "only use refs matching <pattern>"
msgstr "använd endast referenser som motsvarar <mönster>"
-#: builtin/name-rev.c:317
+#: builtin/name-rev.c:316
msgid "list all commits reachable from all refs"
msgstr "lista alla incheckningar som kan nås alla referenser"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:317
msgid "read from stdin"
msgstr "läs från standard in"
-#: builtin/name-rev.c:319
+#: builtin/name-rev.c:318
msgid "allow to print `undefined` names (default)"
msgstr "tillåt att skriva \"odefinierade\" namn (standard)"
-#: builtin/name-rev.c:325
+#: builtin/name-rev.c:324
msgid "dereference tags in the input (internal use)"
msgstr "avreferera taggar i indata (används internt)"
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"
+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"
#: builtin/notes.c:205
#, c-format
-msgid "The note contents have been left in %s"
-msgstr "Anteckningens innehåll har lämnats kvar i %s"
+msgid "the note contents have been left in %s"
+msgstr "anteckningens innehåll har lämnats kvar i %s"
#: builtin/notes.c:233 builtin/tag.c:439
#, c-format
msgid "could not open or read '%s'"
msgstr "kunde inte öppna eller läsa \"%s\""
+#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307
+#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513
+#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659
+#, c-format
+msgid "failed to resolve '%s' as a valid ref."
+msgstr "kunde inte slå upp \"%s\" som en giltig referens."
+
#: builtin/notes.c:257
#, c-format
-msgid "Failed to read object '%s'."
-msgstr "Kunde inte läsa objektet \"%s\"."
+msgid "failed to read object '%s'."
+msgstr "kunde inte läsa objektet \"%s\"."
#: builtin/notes.c:261
#, c-format
-msgid "Cannot read note data from non-blob object '%s'."
+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:363 builtin/notes.c:418 builtin/notes.c:494
-#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650
-#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968
+#: builtin/notes.c:301
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr "felaktig indatarad: \"%s\"."
+
+#: builtin/notes.c:316
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
+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:345
+#, 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:365 builtin/notes.c:420 builtin/notes.c:496
+#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652
+#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970
msgid "too many parameters"
msgstr "för många parametrar"
-#: builtin/notes.c:376 builtin/notes.c:663
+#: builtin/notes.c:378 builtin/notes.c:665
#, c-format
-msgid "No note found for object %s."
-msgstr "Inga anteckningar hittades för objektet %s."
+msgid "no note found for object %s."
+msgstr "inga anteckningar hittades för objektet %s."
-#: builtin/notes.c:397 builtin/notes.c:560
+#: builtin/notes.c:399 builtin/notes.c:562
msgid "note contents as a string"
msgstr "anteckningsinnehåll som sträng"
-#: builtin/notes.c:400 builtin/notes.c:563
+#: builtin/notes.c:402 builtin/notes.c:565
msgid "note contents in a file"
msgstr "anteckningsinnehåll i en fil"
-#: builtin/notes.c:403 builtin/notes.c:566
+#: builtin/notes.c:405 builtin/notes.c:568
msgid "reuse and edit specified note object"
msgstr "återanvänd och redigera angivet anteckningsobjekt"
-#: builtin/notes.c:406 builtin/notes.c:569
+#: builtin/notes.c:408 builtin/notes.c:571
msgid "reuse specified note object"
msgstr "återanvänd angivet anteckningsobjekt"
-#: builtin/notes.c:409 builtin/notes.c:572
+#: builtin/notes.c:411 builtin/notes.c:574
msgid "allow storing empty note"
msgstr "tillåt lagra tom anteckning"
-#: builtin/notes.c:410 builtin/notes.c:481
+#: builtin/notes.c:412 builtin/notes.c:483
msgid "replace existing notes"
msgstr "ersätt befintliga anteckningar"
-#: builtin/notes.c:435
+#: builtin/notes.c:437
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"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:450 builtin/notes.c:529
+#: builtin/notes.c:452 builtin/notes.c:531
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Skriver över befintliga anteckningar för objektet %s\n"
-#: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887
+#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889
#, c-format
msgid "Removing note for object %s\n"
msgstr "Tar bort anteckning för objektet %s\n"
-#: builtin/notes.c:482
+#: builtin/notes.c:484
msgid "read objects from stdin"
msgstr "läs objekt från standard in"
-#: builtin/notes.c:484
+#: builtin/notes.c:486
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)"
-#: builtin/notes.c:502
+#: builtin/notes.c:504
msgid "too few parameters"
msgstr "för få parametrar"
-#: builtin/notes.c:523
+#: builtin/notes.c:525
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet "
"%s. Använd \"-f\" för att skriva över befintliga anteckningar"
-#: builtin/notes.c:535
+#: builtin/notes.c:537
#, c-format
-msgid "Missing notes on source object %s. Cannot copy."
-msgstr "Anteckningar på källobjektet %s saknas. Kan inte kopiera."
+msgid "missing notes on source object %s. Cannot copy."
+msgstr "anteckningar på källobjektet %s saknas. Kan inte kopiera."
-#: builtin/notes.c:587
+#: builtin/notes.c:589
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"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:753
+#: builtin/notes.c:685
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr "misslyckades ta bort referensen NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:687
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr "misslyckades ta bort referensen NOTES_MERGE_REF"
+
+#: builtin/notes.c:689
+msgid "failed to remove 'git notes merge' worktree"
+msgstr "misslyckades ta bort arbetskatalogen för \"git notes merge\""
+
+#: builtin/notes.c:709
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr "misslyckades läsa references NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:711
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr "kunde inte hitta incheckning från NOTES_MERGE_PARTIAL."
+
+#: builtin/notes.c:713
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr "kunde inte tolka incheckning från NOTES_MERGE_PARTIAL."
+
+#: builtin/notes.c:726
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr "misslyckades bestämma NOTES_MERGE_REF"
+
+#: builtin/notes.c:729
+msgid "failed to finalize notes merge"
+msgstr "misslyckades färdigställa sammanslagning av anteckningar"
+
+#: builtin/notes.c:755
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "okänd sammanslagningsstrategi för anteckningar: %s"
-#: builtin/notes.c:769
+#: builtin/notes.c:771
msgid "General options"
msgstr "Allmänna flaggor"
-#: builtin/notes.c:771
+#: builtin/notes.c:773
msgid "Merge options"
msgstr "Flaggor för sammanslagning"
-#: builtin/notes.c:773
+#: builtin/notes.c:775
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
"läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/"
"cat_sort_uniq)"
-#: builtin/notes.c:775
+#: builtin/notes.c:777
msgid "Committing unmerged notes"
msgstr "Checkar in ej sammanslagna anteckningar"
-#: builtin/notes.c:777
+#: builtin/notes.c:779
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:779
+#: builtin/notes.c:781
msgid "Aborting notes merge resolution"
msgstr "Avbryt lösning av sammanslagning av anteckningar"
-#: builtin/notes.c:781
+#: builtin/notes.c:783
msgid "abort notes merge"
msgstr "avbryt sammanslagning av anteckningar"
-#: builtin/notes.c:792
+#: builtin/notes.c:794
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "kan inte blanda --commit, --abort eller -s/--strategy"
-#: builtin/notes.c:797
-msgid "Must specify a notes ref to merge"
-msgstr "Måste ange en antecknings-referens att slå ihop"
+#: builtin/notes.c:799
+msgid "must specify a notes ref to merge"
+msgstr "måste ange en antecknings-referens att slå ihop"
-#: builtin/notes.c:821
+#: builtin/notes.c:823
#, c-format
-msgid "Unknown -s/--strategy: %s"
-msgstr "Okänd -s/--strategy: %s"
+msgid "unknown -s/--strategy: %s"
+msgstr "okänd -s/--strategy: %s"
-#: builtin/notes.c:858
+#: builtin/notes.c:860
#, 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"
+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:861
+#: builtin/notes.c:863
#, c-format
-msgid "Failed to store link to current notes ref (%s)"
-msgstr "Kunde inte lagra länk till aktuell anteckningsreferens (%s)"
+msgid "failed to store link to current notes ref (%s)"
+msgstr "misslyckades lagra länk till aktuell anteckningsreferens (%s)"
-#: builtin/notes.c:863
+#: builtin/notes.c:865
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
"%s och checka in resultatet med \"git notes merge --commit\", eller avbryt "
"sammanslagningen med \"git notes merge --abort\".\n"
-#: builtin/notes.c:885
+#: builtin/notes.c:887
#, c-format
msgid "Object %s has no note\n"
msgstr "Objektet %s har ingen anteckning\n"
-#: builtin/notes.c:897
+#: builtin/notes.c:899
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:900
+#: builtin/notes.c:902
msgid "read object names from the standard input"
msgstr "läs objektnamn från standard in"
-#: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127
+#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
msgid "do not remove, show only"
msgstr "ta inte bort, bara visa"
-#: builtin/notes.c:939
+#: builtin/notes.c:941
msgid "report pruned notes"
msgstr "rapportera borttagna anteckningar"
-#: builtin/notes.c:981
+#: builtin/notes.c:983
msgid "notes-ref"
msgstr "anteckningar-ref"
-#: builtin/notes.c:982
+#: builtin/notes.c:984
msgid "use notes from <notes-ref>"
msgstr "använd anteckningar från <anteckningsref>"
-#: builtin/notes.c:1017 builtin/remote.c:1623
+#: builtin/notes.c:1019
#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "Okänt underkommando: %s"
+msgid "unknown subcommand: %s"
+msgstr "okänt underkommando: %s"
-#: builtin/pack-objects.c:28
+#: builtin/pack-objects.c:29
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [<flaggor>...] [< <reflista> | < <objektlista>]"
-#: builtin/pack-objects.c:29
+#: builtin/pack-objects.c:30
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]"
-#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
+#: builtin/pack-objects.c:179 builtin/pack-objects.c:182
#, c-format
msgid "deflate error (%d)"
msgstr "fel i deflate (%d)"
-#: builtin/pack-objects.c:766
+#: builtin/pack-objects.c:768
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:779
+#: builtin/pack-objects.c:781
msgid "Writing objects"
msgstr "Skriver objekt"
-#: builtin/pack-objects.c:1037
+#: builtin/pack-objects.c:1070
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:2197
+#: builtin/pack-objects.c:2346
msgid "Compressing objects"
msgstr "Komprimerar objekt"
-#: builtin/pack-objects.c:2611
+#: builtin/pack-objects.c:2759
#, c-format
msgid "unsupported index version %s"
msgstr "indexversionen %s stöds ej"
-#: builtin/pack-objects.c:2615
+#: builtin/pack-objects.c:2763
#, c-format
msgid "bad index version '%s'"
msgstr "felaktig indexversion \"%s\""
-#: builtin/pack-objects.c:2645
+#: builtin/pack-objects.c:2793
msgid "do not show progress meter"
msgstr "visa inte förloppsindikator"
-#: builtin/pack-objects.c:2647
+#: builtin/pack-objects.c:2795
msgid "show progress meter"
msgstr "visa förloppsindikator"
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2797
msgid "show progress meter during object writing phase"
msgstr "visa förloppsindikator under objektskrivningsfasen"
-#: builtin/pack-objects.c:2652
+#: builtin/pack-objects.c:2800
msgid "similar to --all-progress when progress meter is shown"
msgstr "som --all-progress när förloppsindikatorn visas"
-#: builtin/pack-objects.c:2653
+#: builtin/pack-objects.c:2801
msgid "version[,offset]"
msgstr "version[,offset]"
-#: builtin/pack-objects.c:2654
+#: builtin/pack-objects.c:2802
msgid "write the pack index file in the specified idx format version"
msgstr "skriv paketindexfilen i angiven indexformatversion"
-#: builtin/pack-objects.c:2657
+#: builtin/pack-objects.c:2805
msgid "maximum size of each output pack file"
msgstr "maximal storlek på varje utdatapaketfil"
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2807
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorera lånade objekt från alternativa objektlager"
-#: builtin/pack-objects.c:2661
+#: builtin/pack-objects.c:2809
msgid "ignore packed objects"
msgstr "ignorera packade objekt"
-#: builtin/pack-objects.c:2663
+#: builtin/pack-objects.c:2811
msgid "limit pack window by objects"
msgstr "begränsa paketfönster efter objekt"
-#: builtin/pack-objects.c:2665
+#: builtin/pack-objects.c:2813
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:2667
+#: builtin/pack-objects.c:2815
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:2669
+#: builtin/pack-objects.c:2817
msgid "reuse existing deltas"
msgstr "återanvänd befintliga delta"
-#: builtin/pack-objects.c:2671
+#: builtin/pack-objects.c:2819
msgid "reuse existing objects"
msgstr "återanvänd befintliga objekt"
-#: builtin/pack-objects.c:2673
+#: builtin/pack-objects.c:2821
msgid "use OFS_DELTA objects"
msgstr "använd OFS_DELTA-objekt"
-#: builtin/pack-objects.c:2675
+#: builtin/pack-objects.c:2823
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:2677
+#: builtin/pack-objects.c:2825
msgid "do not create an empty pack output"
msgstr "försök inte skapa tom paketutdata"
-#: builtin/pack-objects.c:2679
+#: builtin/pack-objects.c:2827
msgid "read revision arguments from standard input"
msgstr "läs revisionsargument från standard in"
-#: builtin/pack-objects.c:2681
+#: builtin/pack-objects.c:2829
msgid "limit the objects to those that are not yet packed"
msgstr "begränsa objekt till de som ännu inte packats"
-#: builtin/pack-objects.c:2684
+#: builtin/pack-objects.c:2832
msgid "include objects reachable from any reference"
msgstr "inkludera objekt som kan nås från någon referens"
-#: builtin/pack-objects.c:2687
+#: builtin/pack-objects.c:2835
msgid "include objects referred by reflog entries"
msgstr "inkludera objekt som refereras från referensloggposter"
-#: builtin/pack-objects.c:2690
+#: builtin/pack-objects.c:2838
msgid "include objects referred to by the index"
msgstr "inkludera objekt som refereras från indexet"
-#: builtin/pack-objects.c:2693
+#: builtin/pack-objects.c:2841
msgid "output pack to stdout"
msgstr "skriv paket på standard ut"
-#: builtin/pack-objects.c:2695
+#: builtin/pack-objects.c:2843
msgid "include tag objects that refer to objects to be packed"
msgstr "inkludera taggobjekt som refererar objekt som skall packas"
-#: builtin/pack-objects.c:2697
+#: builtin/pack-objects.c:2845
msgid "keep unreachable objects"
msgstr "behåll onåbara objekt"
-#: builtin/pack-objects.c:2699
+#: builtin/pack-objects.c:2847
msgid "pack loose unreachable objects"
msgstr "packa lösa onåbara objekt"
-#: builtin/pack-objects.c:2700 parse-options.h:142
-msgid "time"
-msgstr "tid"
-
-#: builtin/pack-objects.c:2701
+#: builtin/pack-objects.c:2849
msgid "unpack unreachable objects newer than <time>"
msgstr "packa upp onåbara objekt nyare än <tid>"
-#: builtin/pack-objects.c:2704
+#: builtin/pack-objects.c:2852
msgid "create thin packs"
msgstr "skapa tunna paket"
-#: builtin/pack-objects.c:2706
+#: builtin/pack-objects.c:2854
msgid "create packs suitable for shallow fetches"
msgstr "skapa packfiler lämpade för grunda hämtningar"
-#: builtin/pack-objects.c:2708
+#: builtin/pack-objects.c:2856
msgid "ignore packs that have companion .keep file"
msgstr "ignorera paket som har tillhörande .keep-fil"
-#: builtin/pack-objects.c:2710
+#: builtin/pack-objects.c:2858
msgid "pack compression level"
msgstr "komprimeringsgrad för paket"
-#: builtin/pack-objects.c:2712
+#: builtin/pack-objects.c:2860
msgid "do not hide commits by grafts"
msgstr "göm inte incheckningar med ympningar (\"grafts\")"
-#: builtin/pack-objects.c:2714
+#: builtin/pack-objects.c:2862
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:2716
+#: builtin/pack-objects.c:2864
msgid "write a bitmap index together with the pack index"
msgstr "använd bitkartindex tillsammans med packindexet"
-#: builtin/pack-objects.c:2829
+#: builtin/pack-objects.c:2993
msgid "Counting objects"
msgstr "Räknar objekt"
msgid "cannot prune in a precious-objects repo"
msgstr "kan inte rensa i ett \"precious-objekt\"-arkiv"
-#: builtin/pull.c:72
+#: builtin/pull.c:51 builtin/pull.c:53
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr "Felaktigt värde för %s: %s"
+
+#: builtin/pull.c:73
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]"
-#: builtin/pull.c:120
+#: builtin/pull.c:121
msgid "Options related to merging"
msgstr "Alternativ gällande sammanslagning"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "incorporate changes by rebasing rather than merging"
msgstr "inlemma ändringar genom ombasering i stället för sammanslagning"
-#: builtin/pull.c:147 builtin/revert.c:101
+#: builtin/pull.c:148 builtin/revert.c:101
msgid "allow fast-forward"
msgstr "tillåt snabbspolning"
-#: builtin/pull.c:156
+#: builtin/pull.c:157
msgid "automatically stash/stash pop before and after rebase"
msgstr "utför automatiskt stash/stash pop före och efter ombasering"
-#: builtin/pull.c:172
+#: builtin/pull.c:173
msgid "Options related to fetching"
msgstr "Alternativ gällande hämtningar"
-#: builtin/pull.c:194
+#: builtin/pull.c:195
msgid "number of submodules pulled in parallel"
msgstr "antal undermoduler som hämtas parallellt"
-#: builtin/pull.c:283
+#: builtin/pull.c:284
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Felaktigt värde för pull.ff: %s"
-#: builtin/pull.c:379 git-sh-setup.sh:226
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr "Kan inte hämta med ombasering: Du har oköade ändringar."
-
-#: builtin/pull.c:385 git-sh-setup.sh:252
-msgid "Additionally, your index contains uncommitted changes."
-msgstr "Dessutom innehåller dit index ändringar som inte har checkats in."
-
-#: builtin/pull.c:387 git-sh-setup.sh:245
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"Kan inte hämta med ombasering: Ditt index innehåller oincheckade ändringar."
-
-#: builtin/pull.c:463
+#: builtin/pull.c:397
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
"Det finns ingen kandidat för ombasering bland referenserna du precis har "
"hämtat."
-#: builtin/pull.c:465
+#: builtin/pull.c:399
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:466
+#: builtin/pull.c:400
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
"Det betyder vanligtvis att du använt en jokertecken-refspec som inte\n"
"motsvarade något i fjärränden."
-#: builtin/pull.c:469
+#: builtin/pull.c:403
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"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:474 git-parse-remote.sh:73
+#: builtin/pull.c:408 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Du är inte på någon gren för närvarande."
-#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
+#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Ange vilken gren du vill ombasera mot."
-#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
+#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Ange vilken gren du vill slå samman med."
-#: builtin/pull.c:479 builtin/pull.c:494
+#: builtin/pull.c:413 builtin/pull.c:428
msgid "See git-pull(1) for details."
msgstr "Se git-pull(1) för detaljer."
-#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr "<fjärr>"
-#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451
+#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<gren>"
-#: builtin/pull.c:489 git-parse-remote.sh:75
+#: builtin/pull.c:423 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "Det finns ingen spårningsinformation för aktuell gren."
-#: builtin/pull.c:498 git-parse-remote.sh:95
+#: builtin/pull.c:432 git-parse-remote.sh:95
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:503
+#: builtin/pull.c:437
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"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:820
+#: builtin/pull.c:754
msgid "ignoring --verify-signatures for rebase"
msgstr "ignorera --verify-signatures för ombasering"
-#: builtin/pull.c:867
+#: builtin/pull.c:801
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "--[no-]autostash är endast giltig med --rebase."
-#: builtin/pull.c:875
+#: builtin/pull.c:809
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:903
+#: builtin/pull.c:812
+msgid "pull with rebase"
+msgstr "pull med ombasering"
+
+#: builtin/pull.c:813
+msgid "please commit or stash them."
+msgstr "checka in eller använd \"stash\" på dem."
+
+#: builtin/pull.c:838
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"snabbspolar din arbetskatalog från\n"
"incheckningen %s."
-#: builtin/pull.c:908
+#: builtin/pull.c:843
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"$ git reset --hard\n"
"för att återgå."
-#: builtin/pull.c:923
+#: builtin/pull.c:858
msgid "Cannot merge multiple branches into empty head."
msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."
-#: builtin/pull.c:927
+#: builtin/pull.c:862
msgid "Cannot rebase onto multiple branches."
msgstr "Kan inte ombasera ovanpå flera grenar."
msgid "debug unpack-trees"
msgstr "felsök unpack-trees"
-#: builtin/receive-pack.c:25
+#: builtin/receive-pack.c:26
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-katalog>"
-#: builtin/receive-pack.c:1843
+#: builtin/receive-pack.c:793
+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 'receive.denyCurrentBranch' configuration variable to\n"
+"'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 ""
+"Normalt tillåts inte uppdatering av aktuell gren i ett icke-naket\n"
+"arkiv, då index och arbetskatalog inte kommer stämma med det du\n"
+"sände och \"git reset --hard\" krävs för att få arbetskatalogen och\n"
+"HEAD att stämma överens.\n"
+"\n"
+"Du kan ställa in variabeln \"receive.denyCurrentBranch\" till\n"
+"\"ignore\" eller \"warn\" i fjärrarkivet för att tillåta sändning till\n"
+"dess aktuella gren; detta rekommenderas dock inte såvida du inte\n"
+"sett till att dess arbetskatalog uppdateras till det tu sände in\n"
+"på annat sätt.\n"
+"\n"
+"För att undvika detta meddelande och fortfarande behålla det\n"
+"normala beteendet, sätt \"receive.denyCurrentBranch\" till \"refuse\"."
+
+#: builtin/receive-pack.c:813
+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 ""
+"Normalt tillåts inte radering av aktuell gren, eftersom nästa\n"
+"\"git clone\" inte kommer innebära att några filer checkas ut,\n"
+"vilket är förvirrande.\n"
+"\n"
+"Du kan ställa in variabeln \"receive.denyDeleteCurrent\" till\n"
+"\"warn\" eller \"ignore\" i fjärrarkivet för att tillåta borttagning\n"
+"av aktuell gren, med eller utan varningsmeddelande.\n"
+"\n"
+"För att undvika detta meddelande kan du sätta det till \"refuse\"."
+
+#: builtin/receive-pack.c:1883
msgid "quiet"
msgstr "tyst"
-#: builtin/receive-pack.c:1857
+#: builtin/receive-pack.c:1897
msgid "You must specify a directory."
msgstr "Du måste ange en katalog."
msgid " Fetch URL: %s"
msgstr " Hämt-URL: %s"
-#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296
+#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
msgid "(no URL)"
msgstr "(ingen URL)"
msgstr[0] " Fjärrgren:%s"
msgstr[1] " Fjärrgrenar:%s"
-#: builtin/remote.c:1179 builtin/remote.c:1206
+#: builtin/remote.c:1179 builtin/remote.c:1205
msgid " (status not queried)"
msgstr " (status inte förfrågad)"
msgid " Local refs will be mirrored by 'git push'"
msgstr " Lokala referenser speglas av \"git push\""
-#: builtin/remote.c:1203
+#: builtin/remote.c:1202
#, 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:1224
+#: builtin/remote.c:1223
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren"
-#: builtin/remote.c:1226
+#: builtin/remote.c:1225
msgid "delete refs/remotes/<name>/HEAD"
msgstr "ta bort refs/remotes/<namn>/HEAD"
-#: builtin/remote.c:1241
+#: builtin/remote.c:1240
msgid "Cannot determine remote HEAD"
msgstr "Kan inte bestämma HEAD på fjärren"
-#: builtin/remote.c:1243
+#: builtin/remote.c:1242
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:1253
+#: builtin/remote.c:1252
#, c-format
msgid "Could not delete %s"
msgstr "Kunde inte ta bort %s"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1260
#, c-format
msgid "Not a valid ref: %s"
msgstr "Inte en giltig referens: %s"
-#: builtin/remote.c:1263
+#: builtin/remote.c:1262
#, c-format
msgid "Could not setup %s"
msgstr "Kunde inte ställa in %s"
-#: builtin/remote.c:1281
+#: builtin/remote.c:1280
#, c-format
msgid " %s will become dangling!"
msgstr " %s kommer bli dinglande!"
-#: builtin/remote.c:1282
+#: builtin/remote.c:1281
#, c-format
msgid " %s has become dangling!"
msgstr " %s har blivit dinglande!"
-#: builtin/remote.c:1292
+#: builtin/remote.c:1291
#, c-format
msgid "Pruning %s"
msgstr "Rensar %s"
-#: builtin/remote.c:1293
+#: builtin/remote.c:1292
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1309
+#: builtin/remote.c:1308
#, c-format
msgid " * [would prune] %s"
msgstr " * [skulle rensa] %s"
-#: builtin/remote.c:1312
+#: builtin/remote.c:1311
#, c-format
msgid " * [pruned] %s"
msgstr " * [rensad] %s"
-#: builtin/remote.c:1357
+#: builtin/remote.c:1356
msgid "prune remotes after fetching"
msgstr "rensa fjärrar efter hämtning"
-#: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542
+#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
#, c-format
msgid "No such remote '%s'"
msgstr "Ingen sådan fjärr \"%s\""
-#: builtin/remote.c:1436
+#: builtin/remote.c:1435
msgid "add branch"
msgstr "lägg till gren"
-#: builtin/remote.c:1443
+#: builtin/remote.c:1442
msgid "no remote specified"
msgstr "ingen fjärr angavs"
-#: builtin/remote.c:1460
+#: builtin/remote.c:1459
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:1462
+#: builtin/remote.c:1461
msgid "return all URLs"
msgstr "returnera alla URL:er"
-#: builtin/remote.c:1490
+#: builtin/remote.c:1489
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "ingen URL:er angivna för fjärren \"%s\""
-#: builtin/remote.c:1516
+#: builtin/remote.c:1515
msgid "manipulate push URLs"
msgstr "manipulera URL:ar för sändning"
-#: builtin/remote.c:1518
+#: builtin/remote.c:1517
msgid "add URL"
msgstr "lägg till URL"
-#: builtin/remote.c:1520
+#: builtin/remote.c:1519
msgid "delete URLs"
msgstr "ta bort URL:ar"
-#: builtin/remote.c:1527
+#: builtin/remote.c:1526
msgid "--add --delete doesn't make sense"
msgstr "--add --delete ger ingen mening"
-#: builtin/remote.c:1568
+#: builtin/remote.c:1567
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Felaktig gammalt URL-mönster: %s"
-#: builtin/remote.c:1576
+#: builtin/remote.c:1575
#, c-format
msgid "No such URL found: %s"
msgstr "Ingen sådan URL hittades: %s"
-#: builtin/remote.c:1578
+#: builtin/remote.c:1577
msgid "Will not delete all non-push URLs"
msgstr "Kommer inte ta bort alla icke-sänd-URL:er"
-#: builtin/remote.c:1592
+#: builtin/remote.c:1591
msgid "be verbose; must be placed before a subcommand"
msgstr "var pratsam; måste skrivas före ett underkommando"
+#: builtin/remote.c:1622
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Okänt underkommando: %s"
+
#: builtin/repack.c:17
msgid "git repack [<options>]"
msgstr "git repack [<flaggor>]"
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<incheckning>]"
#: builtin/reset.c:27
-msgid "git reset [-q]
<tree-ish> [--] <paths>..."
-msgstr "git reset [-q] <träd-igt> [--] <sökvägar>..."
+msgid "git reset [-q]
[<tree-ish>] [--] <paths>..."
+msgstr "git reset [-q] [<träd-igt>] [--] <sökvägar>..."
#: builtin/reset.c:28
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgid "Could not write new index file."
msgstr "Kunde inte skriva ny indexfil."
-#: builtin/rev-list.c:362
+#: builtin/rev-list.c:354
msgid "rev-list does not support display of notes"
msgstr "rev-list stöder inte visning av anteckningar"
-#: builtin/rev-parse.c:358
+#: builtin/rev-parse.c:386
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<options>] -- [<argument>...]"
-#: builtin/rev-parse.c:363
+#: builtin/rev-parse.c:391
msgid "keep the `--` passed as an arg"
msgstr "behåll \"--\" sänt som argument"
-#: builtin/rev-parse.c:365
+#: builtin/rev-parse.c:393
msgid "stop parsing after the first non-option argument"
msgstr "sluta tolka efter första argument som inte är flagga"
-#: builtin/rev-parse.c:368
+#: builtin/rev-parse.c:396
msgid "output in stuck long form"
msgstr "utdata fast i lång form"
-#: builtin/rev-parse.c:499
+#: builtin/rev-parse.c:527
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
msgid "revert failed"
msgstr "\"revert\" misslyckades"
-#: builtin/revert.c:207
+#: builtin/revert.c:205
msgid "cherry-pick failed"
msgstr "\"cherry-pick\" misslyckades"
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<bas>]] [--list] [<ref>]"
-#: builtin/show-branch.c:640
+#: builtin/show-branch.c:375
+#, 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:541
+#, c-format
+msgid "no matching refs with %s"
+msgstr "inga motsvarande referenser med %s"
+
+#: builtin/show-branch.c:639
msgid "show remote-tracking and local branches"
msgstr "visa fjärrspårande och lokala grenar"
-#: builtin/show-branch.c:642
+#: builtin/show-branch.c:641
msgid "show remote-tracking branches"
msgstr "visa fjärrspårande grenar"
-#: builtin/show-branch.c:644
+#: builtin/show-branch.c:643
msgid "color '*!+-' corresponding to the branch"
msgstr "färga \"*!+-\" enligt grenen"
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show <n> more commits after the common ancestor"
msgstr "visa <n> ytterligare incheckningar efter gemensam anfader"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "synonym to more=-1"
msgstr "synonym till more=-1"
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
msgid "suppress naming strings"
msgstr "undertyck namnsträngar"
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
msgid "include the current branch"
msgstr "inkludera aktuell gren"
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
msgid "name commits with their object names"
msgstr "namnge incheckningar med deras objektnamn"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "show possible merge bases"
msgstr "visa möjliga sammanslagningsbaser"
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
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:659
+#: builtin/show-branch.c:658
msgid "show commits in topological order"
msgstr "visa incheckningar i topologisk ordning"
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
msgid "show only commits not on the first branch"
msgstr "visa endast incheckningar inte på den första grenen"
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
msgid "show merges reachable from only one tip"
msgstr "visa sammanslagningar som endast kan nås från en spets"
-#: builtin/show-branch.c:666
+#: builtin/show-branch.c:665
msgid "topologically sort, maintaining date order where possible"
msgstr "sortera topologiskt, behåll datumordning när möjligt"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
msgid "<n>[,<base>]"
msgstr "<n>[,<bas>]"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
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:703
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+msgstr ""
+"--reflog är inkompatibel med --all, --remotes, --independent eller --merge-"
+"base"
+
+#: builtin/show-branch.c:727
+msgid "no branches given, and HEAD is not valid"
+msgstr "inga grenar angavs, och HEAD är inte giltigt"
+
+#: builtin/show-branch.c:730
+msgid "--reflog option needs one branch name"
+msgstr "--reflog behöver ett namn på en gren"
+
+#: builtin/show-branch.c:733
+#, 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:737
+#, c-format
+msgid "no such ref %s"
+msgstr "ingen sådan referens %s"
+
+#: builtin/show-branch.c:829
+#, 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:833
+#, c-format
+msgid "'%s' is not a valid ref."
+msgstr "\"%s\" är inte en giltig referens."
+
+#: builtin/show-branch.c:836
+#, c-format
+msgid "cannot find commit %s (%s)"
+msgstr "hittar inte incheckning %s (%s)"
+
#: builtin/show-ref.c:10
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
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:24 builtin/submodule--helper.c:923
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1046
#, c-format
msgid "No such ref: %s"
msgstr "Ingen sådan referens: %s"
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Förväntade fullt referensnamn, fick %s"
msgid "cannot strip one component off url '%s'"
msgstr "kan inte ta bort en komponent från url:en \"%s\""
-#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403
-#: builtin/submodule--helper.c:483
+#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408
+#: builtin/submodule--helper.c:590
msgid "alternative anchor for relative paths"
msgstr "alternativa ankare för relativa sökvägar"
-#: builtin/submodule--helper.c:283
+#: builtin/submodule--helper.c:287
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]"
-#: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338
+#: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343
#, 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:364
+#: builtin/submodule--helper.c:369
#, 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:368
+#: builtin/submodule--helper.c:373
#, 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:378
+#: builtin/submodule--helper.c:383
#, 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:385
+#: builtin/submodule--helper.c:390
#, 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:404
+#: builtin/submodule--helper.c:409
msgid "Suppress output for initializing a submodule"
msgstr "Dölj utdata från initiering av undermodul"
-#: builtin/submodule--helper.c:409
+#: builtin/submodule--helper.c:414
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<sökväg>]"
-#: builtin/submodule--helper.c:430
+#: builtin/submodule--helper.c:435
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <sökväg>"
-#: builtin/submodule--helper.c:436
+#: builtin/submodule--helper.c:441
#, 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:486
+#: builtin/submodule--helper.c:524 builtin/submodule--helper.c:527
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
+msgstr "undermodulen \"%s\" kan inte lägga till alternativ: %s"
+
+#: builtin/submodule--helper.c:563
+#, 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:570
+#, 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:593
msgid "where the new submodule will be cloned to"
msgstr "var den nya undermodulen skall klonas till"
-#: builtin/submodule--helper.c:489
+#: builtin/submodule--helper.c:596
msgid "name of the new submodule"
msgstr "namn på den nya undermodulen"
-#: builtin/submodule--helper.c:492
+#: builtin/submodule--helper.c:599
msgid "url where to clone the submodule from"
msgstr "URL att klona undermodulen från"
-#: builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:605
msgid "depth for shallow clones"
msgstr "djup för grunda kloner"
-#: builtin/submodule--helper.c:504
+#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964
+msgid "force cloning progress"
+msgstr "tvinga kloningsförlopp"
+
+#: builtin/submodule--helper.c:613
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
"git submodule--helper clone [--prefix=<sökväg>] [--quiet] [--reference "
"<arkvi>] [--name <namn>] [--depth <djup>] --url <url> --path <sökväg>"
-#: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535
+#: builtin/submodule--helper.c:638 builtin/submodule--helper.c:648
#, c-format
msgid "could not create directory '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
-#: builtin/submodule--helper.c:531
+#: builtin/submodule--helper.c:644
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\""
-#: builtin/submodule--helper.c:547
+#: builtin/submodule--helper.c:660
#, c-format
msgid "cannot open file '%s'"
msgstr "kan inte öppna filen \"%s\""
-#: builtin/submodule--helper.c:552
+#: builtin/submodule--helper.c:665
#, c-format
msgid "could not close file %s"
msgstr "kunde inte stänga filen %s"
-#: builtin/submodule--helper.c:559
+#: builtin/submodule--helper.c:672
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "kunde inte få tag i undermodulkatalog för \"%s\""
-#: builtin/submodule--helper.c:611
+#: builtin/submodule--helper.c:726
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Undermodulsökvägen \"%s\" har inte initierats"
-#: builtin/submodule--helper.c:615
+#: builtin/submodule--helper.c:730
msgid "Maybe you want to use 'update --init'?"
msgstr "Kanske menade du att använda \"update --init\"?"
-#: builtin/submodule--helper.c:641
+#: builtin/submodule--helper.c:756
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Hoppar över ej sammanslagen undermodul %s"
-#: builtin/submodule--helper.c:662
+#: builtin/submodule--helper.c:777
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Hoppar över undermodulen \"%s\""
-#: builtin/submodule--helper.c:792
+#: builtin/submodule--helper.c:913
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Misslyckades klona \"%s\". Nytt försök planlagt"
-#: builtin/submodule--helper.c:803
+#: builtin/submodule--helper.c:924
#, 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:824
+#: builtin/submodule--helper.c:945
msgid "path into the working tree"
msgstr "sökväg inuti arbetskatalogen"
-#: builtin/submodule--helper.c:827
+#: builtin/submodule--helper.c:948
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:831
+#: builtin/submodule--helper.c:952
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout eller none"
-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:956
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:838
+#: builtin/submodule--helper.c:959
msgid "parallel jobs"
msgstr "parallella jobb"
-#: builtin/submodule--helper.c:840
+#: builtin/submodule--helper.c:961
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "om den första klonen skall följa rekommendation för grund kloning"
-#: builtin/submodule--helper.c:841
+#: builtin/submodule--helper.c:962
msgid "don't print cloning progress"
msgstr "skriv inte klonförlopp"
-#: builtin/submodule--helper.c:846
+#: builtin/submodule--helper.c:969
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<sökväg>] [<sökväg>...]"
-#: builtin/submodule--helper.c:856
+#: builtin/submodule--helper.c:979
msgid "bad value for update parameter"
msgstr "felaktigt värde för parametern update"
-#: builtin/submodule--helper.c:927
+#: builtin/submodule--helper.c:1050
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"Undermodulens (%s) gren inställd på att ärva gren från huvudprojektet, men "
"huvudprojektet är inte på någon gren"
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:1100
msgid "submodule--helper subcommand must be called with a subcommand"
msgstr "underkommandot submodule--helper måste anropas med ett underkommando"
-#: builtin/submodule--helper.c:984
+#: builtin/submodule--helper.c:1107
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper"
msgid "Updated tag '%s' (was %s)\n"
msgstr "Uppdaterad tagg \"%s\" (var %s)\n"
-#: builtin/unpack-objects.c:490
+#: builtin/unpack-objects.c:493
msgid "Unpacking objects"
msgstr "Packar upp objekt"
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:575
+#: builtin/update-index.c:564
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<flaggor>] [--] [<fil>...]"
-#: builtin/update-index.c:930
+#: builtin/update-index.c:919
msgid "continue refresh even when index needs update"
msgstr "fortsätt uppdatera även när index inte är àjour"
-#: builtin/update-index.c:933
+#: builtin/update-index.c:922
msgid "refresh: ignore submodules"
msgstr "refresh: ignorera undermoduler"
-#: builtin/update-index.c:936
+#: builtin/update-index.c:925
msgid "do not ignore new files"
msgstr "ignorera inte nya filer"
-#: builtin/update-index.c:938
+#: builtin/update-index.c:927
msgid "let files replace directories and vice-versa"
msgstr "låt filer ersätta kataloger och omvänt"
-#: builtin/update-index.c:940
+#: builtin/update-index.c:929
msgid "notice files missing from worktree"
msgstr "lägg märke till filer som saknas i arbetskatalogen"
-#: builtin/update-index.c:942
+#: builtin/update-index.c:931
msgid "refresh even if index contains unmerged entries"
msgstr "uppdatera även om indexet innehåller ej sammanslagna poster"
-#: builtin/update-index.c:945
+#: builtin/update-index.c:934
msgid "refresh stat information"
msgstr "uppdatera statusinformation"
-#: builtin/update-index.c:949
+#: builtin/update-index.c:938
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "som --refresh, men ignorera assume-unchanged-inställning"
-#: builtin/update-index.c:953
+#: builtin/update-index.c:942
msgid "<mode>,<object>,<path>"
msgstr "<läge>,<objekt>,<sökväg>"
-#: builtin/update-index.c:954
+#: builtin/update-index.c:943
msgid "add the specified entry to the index"
msgstr "lägg till angiven post i indexet"
-#: builtin/update-index.c:963
+#: builtin/update-index.c:952
msgid "mark files as \"not changing\""
msgstr "markera filer som \"ändras inte\""
-#: builtin/update-index.c:966
+#: builtin/update-index.c:955
msgid "clear assumed-unchanged bit"
msgstr "rensa \"assume-unchanged\"-biten"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:958
msgid "mark files as \"index-only\""
msgstr "markera filer som \"endast index\""
-#: builtin/update-index.c:972
+#: builtin/update-index.c:961
msgid "clear skip-worktree bit"
msgstr "töm \"skip-worktree\"-biten"
-#: builtin/update-index.c:975
+#: builtin/update-index.c:964
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:977
+#: builtin/update-index.c:966
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:979
+#: builtin/update-index.c:968
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "med --stdin: indatarader termineras med null-byte"
-#: builtin/update-index.c:981
+#: builtin/update-index.c:970
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:985
+#: builtin/update-index.c:974
msgid "add entries from standard input to the index"
msgstr "lägg poster från standard in till indexet"
-#: builtin/update-index.c:989
+#: builtin/update-index.c:978
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:993
+#: builtin/update-index.c:982
msgid "only update entries that differ from HEAD"
msgstr "uppdatera endast poster som skiljer sig från HEAD"
-#: builtin/update-index.c:997
+#: builtin/update-index.c:986
msgid "ignore files missing from worktree"
msgstr "ignorera filer som saknas i arbetskatalogen"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:989
msgid "report actions to standard output"
msgstr "rapportera åtgärder på standard ut"
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:991
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(för porslin) glöm sparade olösta konflikter"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:995
msgid "write index in this format"
msgstr "skriv index i detta format"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:997
msgid "enable or disable split index"
msgstr "aktivera eller inaktivera delat index"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:999
msgid "enable/disable untracked cache"
msgstr "aktivera/inaktivera ospårad cache"
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1001
msgid "test if the filesystem supports untracked cache"
msgstr "testa om filsystemet stöder ospårad cache"
-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1003
msgid "enable untracked cache without testing the filesystem"
msgstr "aktivera ospårad cache utan att testa filsystemet"
-#: builtin/update-index.c:1134
+#: builtin/update-index.c:1119
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
+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:1123
msgid "Untracked cache disabled"
msgstr "Ospårad cache är inaktiverad"
-#: builtin/update-index.c:1146
+#: builtin/update-index.c:1131
+msgid ""
+"core.untrackedCache is set to false; remove or change it, if you really want "
+"to enable the untracked cache"
+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:1135
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Ospårad cache är aktiverad för \"%s\""
msgid "only useful for debugging"
msgstr "endast användbart vid felsökning"
-#: upload-pack.c:20
+#: upload-pack.c:22
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<flaggor>] <katalog>"
-#: upload-pack.c:837
+#: upload-pack.c:1028
msgid "quit after a single request/response exchange"
msgstr "avsluta omedelbart efter första anrop/svar-utväxling"
-#: upload-pack.c:839
+#: upload-pack.c:1030
msgid "exit immediately after initial ref advertisement"
msgstr "avsluta omedelbart efter inledande kungörelse av referenser"
-#: upload-pack.c:841
+#: upload-pack.c:1032
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr "testa inte <katalog>/.git/ om <katalog> inte är en Git-katalog"
-#: upload-pack.c:843
+#: upload-pack.c:1034
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "avbryt överföringen efter <n> sekunders inaktivitet"
+#: credential-cache--daemon.c:223
+#, 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 ""
+"Behörigheten på din uttags-katalog (socket) är för lös; andra\n"
+"användare kan läsa dina cachade inloggningsuppgifter. Du bör köra:\n"
+"\n"
+"\tchmod 0700 %s"
+
#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "skriv felsökningsmeddelanden på standard fel"
"några konceptvägledningar. Se \"git help <kommando>\" eller \"git help\n"
"<koncept>\" för att läsa mer om specifika underkommandon och koncept."
-#: http.c:323
+#: http.c:342
+msgid "Delegation control is not supported with cURL < 7.22.0"
+msgstr "Delegerad styrning stöds inte av cURL < 7.22.0"
+
+#: http.c:351
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "Fastnålning av öppen nyckel stöds inte av cURL < 7.44.0"
msgid "no-op (backward compatibility)"
msgstr "ingen funktion (bakåtkompatibilitet)"
-#: parse-options.h:237
+#: parse-options.h:238
msgid "be more verbose"
msgstr "var mer pratsam"
-#: parse-options.h:239
+#: parse-options.h:240
msgid "be more quiet"
msgstr "var mer tyst"
-#: parse-options.h:245
+#: parse-options.h:246
msgid "use <n> digits to display SHA-1s"
msgstr "använd <n> siffror för att visa SHA-1:or"
msgstr "Automatisk sammanslagning misslyckades."
#: git-merge-octopus.sh:62
-msgid "Should not be doing an Octopus."
-msgstr "Borde inte använda Octopus."
+msgid "Should not be doing an octopus."
+msgstr "Borde inte använda octopus."
#: git-merge-octopus.sh:73
#, sh-format
msgid "Cannot save the current index state"
msgstr "Kan inte spara aktuellt tillstånd för indexet"
+#: git-stash.sh:103
+msgid "Cannot save the untracked files"
+msgstr "Kan inte spara ospårade filer"
+
#: git-stash.sh:123 git-stash.sh:136
msgid "Cannot save the current worktree state"
msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen"
"fel: felaktig flagga för \"stash save\": $option\n"
" För att ange ett meddelande, använd git stash save -- \"$option\""
+#: git-stash.sh:251
+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."
+
#: git-stash.sh:259
msgid "No local changes to save"
msgstr "Inga lokala ändringar att spara"
msgid "Cannot remove worktree changes"
msgstr "Kan inte ta bort ändringar i arbetskatalogen"
-#: git-stash.sh:404
+#: git-stash.sh:403
#, sh-format
msgid "unknown option: $opt"
msgstr "okänd flagga: $opt"
-#: git-stash.sh:414
+#: git-stash.sh:416
msgid "No stash found."
msgstr "Ingen \"stash\" hittades."
-#: git-stash.sh:421
+#: git-stash.sh:423
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "För många revisioner angivna: $REV"
-#: git-stash.sh:427
+#: git-stash.sh:438
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference är inte en giltig referens"
-#: git-stash.sh:455
+#: git-stash.sh:466
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "\"$args\" är inte en \"stash\"-liknande incheckning"
-#: git-stash.sh:466
+#: git-stash.sh:477
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "\"$args\" är inte en \"stash\"-referens"
-#: git-stash.sh:474
+#: git-stash.sh:485
msgid "unable to refresh index"
msgstr "kan inte uppdatera indexet"
-#: git-stash.sh:478
+#: git-stash.sh:489
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Kan inte tillämpa en \"stash\" mitt i en sammanslagning"
-#: git-stash.sh:486
+#: git-stash.sh:497
msgid "Conflicts in index. Try without --index."
msgstr "Konflikter i indexet. Testa utan --index."
-#: git-stash.sh:488
+#: git-stash.sh:499
msgid "Could not save index tree"
msgstr "Kunde inte spara indexträd"
-#: git-stash.sh:522
+#: git-stash.sh:508
+msgid "Could not restore untracked files from stash"
+msgstr "Kunde inte återställa ospårade filer från stash"
+
+#: git-stash.sh:533
msgid "Cannot unstage modified files"
msgstr "Kan inte ta bort ändrade filer ur kön"
-#: git-stash.sh:537
+#: git-stash.sh:548
msgid "Index was not unstashed."
msgstr "Indexet har inte tagits ur kön."
-#: git-stash.sh:551
+#: git-stash.sh:562
msgid "The stash is kept in case you need it again."
msgstr "\"Stash\":en behålls ifall du behöver den igen."
-#: git-stash.sh:560
+#: git-stash.sh:571
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Kastade ${REV} ($s)"
-#: git-stash.sh:561
+#: git-stash.sh:572
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Kunde inte kasta \"stash\"-post"
-#: git-stash.sh:569
+#: git-stash.sh:580
msgid "No branch name specified"
msgstr "Inget grennamn angavs"
-#: git-stash.sh:641
+#: git-stash.sh:652
msgid "(To restore them type \"git stash apply\")"
msgstr "(För att återställa dem, skriv \"git stash apply\")"
-#: git-submodule.sh:183
+#: git-submodule.sh:184
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "Relativ sökväg kan endast användas från arbetskatalogens toppnivå"
-#: git-submodule.sh:193
+#: git-submodule.sh:194
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "arkiv-URL: \"$repo\" måste vara absolut eller börja med ./|../"
-#: git-submodule.sh:210
+#: git-submodule.sh:211
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "\"$sm_path\" finns redan i indexet"
-#: git-submodule.sh:214
+#: git-submodule.sh:215
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
"$sm_path\n"
"Använd -f om du verkligen vill lägga till den"
-#: git-submodule.sh:232
+#: git-submodule.sh:233
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet"
-#: git-submodule.sh:234
+#: git-submodule.sh:235
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "\"$sm_path\" finns redan och är inte ett giltigt git-arkiv"
-#: git-submodule.sh:242
+#: git-submodule.sh:243
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr "En git-katalog för \"$sm_name\" hittades lokalt med fjärr(ar):"
-#: git-submodule.sh:244
+#: git-submodule.sh:245
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
"arkiv eller om du är osäker på vad det här betyder, välj ett annat namn med\n"
"flaggan \"--name\"."
-#: git-submodule.sh:250
+#: git-submodule.sh:251
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Aktiverar lokal git-katalog för undermodulen \"$sm_name\" på nytt."
-#: git-submodule.sh:262
+#: git-submodule.sh:263
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Kan inte checka ut undermodulen \"$sm_path\""
-#: git-submodule.sh:267
+#: git-submodule.sh:268
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Misslyckades lägga till undermodulen \"$sm_path\""
-#: git-submodule.sh:276
+#: git-submodule.sh:277
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Misslyckades registrera undermodulen \"$sm_path\""
-#: git-submodule.sh:323
+#: git-submodule.sh:324
#, sh-format
msgid "Entering '$displaypath'"
msgstr "Går in i \"$displaypath\""
-#: git-submodule.sh:343
+#: git-submodule.sh:344
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr ""
"Stoppar på \"$displaypath\"; skriptet returnerade en status skild från noll."
-#: git-submodule.sh:414
+#: git-submodule.sh:415
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr "sökvägsangivelse och --all är inkompatibla"
-#: git-submodule.sh:419
+#: git-submodule.sh:420
#, sh-format
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Använd \"--all\" om du verkligen vill avinitiera alla undermoduler"
-#: git-submodule.sh:439
+#: git-submodule.sh:440
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains a .git directory\n"
"Undermodulsarbetskatalogen \"$displaypath\" innehåller en .git-katalog\n"
"(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)"
-#: git-submodule.sh:447
+#: git-submodule.sh:448
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
"Undermodulens arbetskatalog \"$displaypath\" har lokala ändringar; \"-f\" "
"kastar bort dem"
-#: git-submodule.sh:450
+#: git-submodule.sh:451
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Rensade katalogen \"$displaypath\""
-#: git-submodule.sh:451
+#: git-submodule.sh:452
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr "Kunde inte ta bort undermodulens arbetskatalog \"$displaypath\""
-#: git-submodule.sh:454
+#: git-submodule.sh:455
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "Kunde inte skapa tom undermodulskatalog \"$displaypath\""
-#: git-submodule.sh:463
+#: git-submodule.sh:464
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
"Undermodulen \"$name\" ($url) avregistrerad för sökvägen \"$displaypath\""
-#: git-submodule.sh:612
+#: git-submodule.sh:617
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Kan inte hitta aktuell revision i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:622
+#: git-submodule.sh:627
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\""
-#: git-submodule.sh:627
+#: git-submodule.sh:632
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"Kan inte hitta aktuell revision för ${remote_name}/${branch} i "
"undermodulsökvägen \"$sm_path\""
-#: git-submodule.sh:645
+#: git-submodule.sh:650
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Kan inte hämta i undermodulsökväg \"$displaypath\""
-#: git-submodule.sh:651
+#: git-submodule.sh:656
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. "
"Direkt hämtning av incheckningen misslyckades."
-#: git-submodule.sh:658
+#: git-submodule.sh:663
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:659
+#: git-submodule.sh:664
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\""
-#: git-submodule.sh:663
+#: git-submodule.sh:668
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:664
+#: git-submodule.sh:669
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\""
-#: git-submodule.sh:669
+#: git-submodule.sh:674
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:670
+#: git-submodule.sh:675
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\""
-#: git-submodule.sh:675
+#: git-submodule.sh:680
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:676
+#: git-submodule.sh:681
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\""
-#: git-submodule.sh:707
+#: git-submodule.sh:712
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:815
+#: git-submodule.sh:820
msgid "The --cached option cannot be used with the --files option"
msgstr "Flaggan --cached kan inte användas med flaggan --files"
-#: git-submodule.sh:867
+#: git-submodule.sh:872
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "oväntat läge $mod_dst"
-#: git-submodule.sh:887
+#: git-submodule.sh:892
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Varning: $display_name innehåller inte incheckningen $sha1_src"
-#: git-submodule.sh:890
+#: git-submodule.sh:895
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Varning: $display_name innehåller inte incheckningen $sha1_dst"
-#: git-submodule.sh:893
+#: git-submodule.sh:898
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" Varning: $display_name innehåller inte incheckningarna $sha1_src och "
"$sha1_dst"
-#: git-submodule.sh:918
-msgid "blob"
-msgstr "blob"
-
-#: git-submodule.sh:1040
+#: git-submodule.sh:1045
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""
-#: git-submodule.sh:1107
+#: git-submodule.sh:1112
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synkroniserar undermodul-url för \"$displaypath\""
"Okänt val $check_level för flaggan rebase.missingCommitsCheck. Ignorerar."
#: git-rebase--interactive.sh:1044
-msgid "You can fix this with 'git rebase --edit-todo'."
-msgstr "Du kan rätta detta med \"git rebase --edit-todo\"."
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'."
+msgstr ""
+"Du kan rätta detta med \"git rebase --edit-todo\" följt av \"git rebase --"
+"continue\"."
#: git-rebase--interactive.sh:1045
msgid "Or you can abort the rebase with 'git rebase --abort'."
"\n"
" git commit $gpg_sign_opt_quoted\n"
"\n"
-"In both case, once you're done, continue with:\n"
+"In both cases, once you're done, continue with:\n"
"\n"
" git rebase --continue\n"
msgstr ""
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1298
+#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1295
msgid "Could not execute editor"
msgstr "Kunde inte starta textredigerare"
-#: git-rebase--interactive.sh:1145
-msgid "You need to set your committer info first"
-msgstr "Du måste ställa in din incheckarinformation först"
-
-#: git-rebase--interactive.sh:1153
+#: git-rebase--interactive.sh:1150
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "Kunde inte checka ut $switch_to"
-#: git-rebase--interactive.sh:1158
+#: git-rebase--interactive.sh:1155
msgid "No HEAD?"
msgstr "Inget HEAD?"
-#: git-rebase--interactive.sh:1159
+#: git-rebase--interactive.sh:1156
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Kunde inte skapa temporär $state_dir"
-#: git-rebase--interactive.sh:1161
+#: git-rebase--interactive.sh:1158
msgid "Could not mark as interactive"
msgstr "Kunde inte markera som interaktiv"
-#: git-rebase--interactive.sh:1171 git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:1168 git-rebase--interactive.sh:1173
msgid "Could not init rewritten commits"
msgstr "Kunde inte initiera omskrivna incheckningar"
-#: git-rebase--interactive.sh:1276
+#: git-rebase--interactive.sh:1273
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "Ombasera $shortrevisions på $shortonto ($todocount incheckning)"
msgstr[1] "Ombasera $shortrevisions på $shortonto ($todocount incheckningar)"
-#: git-rebase--interactive.sh:1281
+#: git-rebase--interactive.sh:1278
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"Ombaseringen kommer dock att avbrytas om du tar bort allting.\n"
"\n"
-#: git-rebase--interactive.sh:1288
+#: git-rebase--interactive.sh:1285
msgid "Note that empty commits are commented out"
msgstr "Observera att tomma incheckningar är utkommenterade"
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "Kan inte skriva om grenar: Du har oköade ändringar."
+#: git-sh-setup.sh:226
+msgid "Cannot pull with rebase: You have unstaged changes."
+msgstr "Kan inte hämta med ombasering: Du har oköade ändringar."
+
#: git-sh-setup.sh:229
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr ""
"Kan inte ombasera: Ditt index innehåller ändringar som inte checkats in."
+#: git-sh-setup.sh:245
+msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+msgstr ""
+"Kan inte hämta med ombasering: Ditt index innehåller oincheckade ändringar."
+
#: git-sh-setup.sh:248
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
"Kan inte $action: Ditt index innehåller ändringar som inte checkats in."
+#: git-sh-setup.sh:252
+msgid "Additionally, your index contains uncommitted changes."
+msgstr "Dessutom innehåller dit index ändringar som inte har checkats in."
+
#: git-sh-setup.sh:372
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 "Unable to determine absolute path of git directory"
msgstr "Kunde inte bestämma absolut sökväg till git-katalogen"
+#~ msgid "Could not write to %s"
+#~ msgstr "Kunde inte skriva till %s"
+
+#~ msgid "Error wrapping up %s."
+#~ msgstr "Fel vid ombrytning av %s."
+
+#~ msgid "Your local changes would be overwritten by cherry-pick."
+#~ msgstr "Dina lokala ändringar skulle skrivas över av \"cherry-pick\"."
+
+#~ msgid "Cannot revert during another revert."
+#~ msgstr "Kan inte utföra \"revert\" under en annan \"revert\"."
+
+#~ msgid "Cannot cherry-pick during another cherry-pick."
+#~ msgstr "Kan inte utföra \"cherry-pick\" under en annan \"cherry-pick\"."
+
+#~ msgid "Could not parse line %d."
+#~ msgstr "Kan inte tolka rad %d."
+
+#~ msgid "Could not open %s"
+#~ msgstr "Kunde inte öppna %s"
+
+#~ msgid "Could not read %s."
+#~ msgstr "kunde inte läsa %s."
+
+#~ msgid "Could not format %s."
+#~ msgstr "Kunde inte formatera %s."
+
+#~ msgid "%s: %s"
+#~ msgstr "%s: %s"
+
+#~ msgid "cannot open %s: %s"
+#~ msgstr "kan inte öppna %s: %s"
+
+#~ msgid "You need to set your committer info first"
+#~ msgstr "Du måste ställa in din incheckarinformation först"
+
#~ msgid "bad numeric config value '%s' for '%s': invalid unit"
#~ msgstr ""
#~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": ogiltig enhet"
#~ msgid "Verify that the named commit has a valid GPG signature"
#~ msgstr "Bekräfta att den namngivna incheckningen har en giltig GPG-signatur"
-#~ msgid "Could not write to '%s'"
-#~ msgstr "Kunde inte skriva till \"%s\""
-
#~ msgid "Writing SQUASH_MSG"
#~ msgstr "Skriver SQUASH_MSG"
#~ msgid "-d option is no longer supported. Do not use."
#~ msgstr "Flaggan -d stöds inte lägre. Använd inte."
-#~ msgid "cherry-pick"
-#~ msgstr "cherry-pick"
-
#~ msgid "Could not extract email from committer identity."
#~ msgstr "Kunde inte extrahera e-postadress från incheckarens identitet."
#
msgid ""
msgstr ""
-"Project-Id-Version: git v2.10.0-rc2\n"
+"Project-Id-Version: git v2.11.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-08-27 23:21+0800\n"
-"PO-Revision-Date: 2016-08-28 07:19+0700\n"
+"POT-Creation-Date: 2016-11-25 22:50+0800\n"
+"PO-Revision-Date: 2016-11-25 23:00+0800\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"
" git checkout -b <tên-nhánh-mới>\n"
"\n"
-#: archive.c:12
-msgid "git archive [<options>] <tree-ish> [<path>...]"
-msgstr "git archive [<các-tùy-chọn>] <tree-ish> [<đường-dẫn>…]"
+#: apply.c:57
+#, c-format
+msgid "unrecognized whitespace option '%s'"
+msgstr "không nhận ra tùy chọn về khoảng trắng “%s”"
-#: archive.c:13
-msgid "git archive --list"
-msgstr "git archive --list"
+#: apply.c:73
+#, 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”"
-#: archive.c:14
-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>…]"
+#: apply.c:125
+msgid "--reject and --3way cannot be used together."
+msgstr "--reject và --3way không thể dùng cùng nhau."
-#: archive.c:15
-msgid "git archive --remote <repo> [--exec <cmd>] --list"
-msgstr "git archive --remote <kho> [--exec <lệnh>] --list"
+#: apply.c:127
+msgid "--cached and --3way cannot be used together."
+msgstr "--cached và --3way không thể dùng cùng nhau."
-#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327
-#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr "đặc tả đường dẫn “%s” không khớp với bất kỳ tập tin nào"
+#: apply.c:130
+msgid "--3way outside a repository"
+msgstr "--3way ở ngoài một kho chứa"
-#: archive.c:429
-msgid "fmt"
-msgstr "định_dạng"
+#: apply.c:141
+msgid "--index outside a repository"
+msgstr "--index ở ngoài một kho chứa"
-#: archive.c:429
-msgid "archive format"
-msgstr "định dạng lưu trữ"
+#: apply.c:144
+msgid "--cached outside a repository"
+msgstr "--cached ở ngoài một kho chứa"
-#: archive.c:430 builtin/log.c:1422
-msgid "prefix"
-msgstr "tiền_tố"
+#: apply.c:845
+#, 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"
-#: archive.c:431
-msgid "prepend prefix to each pathname in the archive"
-msgstr "nối thêm tiền tố vào từng đường dẫn tập tin trong kho lưu"
+#: apply.c:854
+#, 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"
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553 builtin/blame.c:2554
-#: builtin/config.c:59 builtin/fast-export.c:987 builtin/fast-export.c:989
-#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:460
-#: builtin/ls-files.c:463 builtin/notes.c:399 builtin/notes.c:562
-#: builtin/read-tree.c:109 parse-options.h:153
-msgid "file"
-msgstr "tập_tin"
+#: apply.c:938
+#, 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"
-#: archive.c:433 builtin/archive.c:89
-msgid "write the archive to this file"
-msgstr "ghi kho lưu vào tập tin này"
+#: apply.c:977
+#, 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"
-#: archive.c:435
-msgid "read .gitattributes in working directory"
-msgstr "đọc .gitattributes trong thư mục làm việc"
+#: apply.c:983
+#, 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"
-#: archive.c:436
-msgid "report archived files on stderr"
-msgstr "liệt kê các tập tin được lưu trữ vào stderr (đầu ra lỗi tiêu chuẩn)"
+#: apply.c:984
+#, 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"
-#: archive.c:437
-msgid "store only"
-msgstr "chỉ lưu (không nén)"
+#: apply.c:990
+#, 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"
-#: archive.c:438
-msgid "compress faster"
-msgstr "nén nhanh hơn"
+#: apply.c:1488
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "chi tiết: dòng không cần: %.*s"
-#: archive.c:446
-msgid "compress better"
-msgstr "nén nhỏ hơn"
+#: apply.c:1557
+#, 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"
-#: archive.c:449
-msgid "list supported archive formats"
-msgstr "liệt kê các kiểu nén được hỗ trợ"
+#: apply.c:1577
+#, 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] ""
+"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)"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
-#: builtin/submodule--helper.c:832
-msgid "repo"
-msgstr "kho"
+#: apply.c:1589
+#, 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)"
-#: archive.c:452 builtin/archive.c:91
-msgid "retrieve the archive from remote repository <repo>"
-msgstr "nhận kho nén từ kho chứa <kho> trên máy chủ"
+#: 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ũ"
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483
-msgid "command"
-msgstr "lệnh"
+#: apply.c:1761
+msgid "deleted file still has contents"
+msgstr "tập tin đã xóa vẫn còn nội dung"
-#: archive.c:454 builtin/archive.c:93
-msgid "path to the remote git-upload-archive command"
-msgstr "đường dẫn đến lệnh git-upload-pack trên máy chủ"
+#: apply.c:1795
+#, c-format
+msgid "corrupt patch at line %d"
+msgstr "miếng vá hỏng tại dòng %d"
-#: archive.c:461
-msgid "Unexpected option --remote"
-msgstr "Gặp tùy chọn --remote không cần"
+#: 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ũ"
-#: archive.c:463
-msgid "Option --exec can only be used together with --remote"
-msgstr "Tùy chọn --exec chỉ có thể được dùng cùng với --remote"
+#: 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"
-#: archive.c:465
-msgid "Unexpected option --output"
-msgstr "Gặp tùy chọn không cần --output"
+#: 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"
-#: archive.c:487
+#: apply.c:1984
#, c-format
-msgid "Unknown archive format '%s'"
-msgstr "Không hiểu định dạng “%s”"
+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"
-#: archive.c:494
+#: apply.c:2021
#, c-format
-msgid "Argument not supported for format '%s': -%d"
-msgstr "Tham số không được hỗ trợ cho định dạng “%s”: -%d"
+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"
-#: attr.c:263
-msgid ""
-"Negative patterns are ignored in git attributes\n"
-"Use '\\!' for literal leading exclamation."
-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."
+#: apply.c:2182
+#, c-format
+msgid "patch with only garbage at line %d"
+msgstr "vá chỉ với “rác” tại dòng %d"
-#: bisect.c:441
+#: apply.c:2274
#, c-format
-msgid "Could not open file '%s'"
-msgstr "Không thể mở tập tin “%s”"
+msgid "unable to read symlink %s"
+msgstr "không thể đọc liên kết mềm %s"
-#: bisect.c:446
+#: apply.c:2278
#, c-format
-msgid "Badly quoted content in file '%s': %s"
-msgstr "nội dung được trích dẫn sai tập tin “%s”: %s"
+msgid "unable to open or read %s"
+msgstr "không thể mở hay đọc %s"
-#: bisect.c:655
+#: apply.c:2931
#, c-format
-msgid "We cannot bisect more!\n"
-msgstr "Chúng tôi không bisect thêm nữa!\n"
+msgid "invalid start of line: '%c'"
+msgstr "sai khởi đầu dòng: “%c”"
-#: bisect.c:708
+#: apply.c:3050
#, c-format
-msgid "Not a valid commit name %s"
-msgstr "Không phải tên đối tượng commit %s hợp lệ"
+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)."
-#: bisect.c:732
+#: apply.c:3062
#, c-format
-msgid ""
-"The merge base %s is bad.\n"
-"This means the bug has been fixed between %s and [%s].\n"
-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"
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
+msgstr "Nội dung bị giảm xuống còn (%ld/%ld) để áp dụng mảnh dữ liệu tại %d"
-#: bisect.c:737
+#: apply.c:3068
#, c-format
msgid ""
-"The merge base %s is new.\n"
-"The property has changed between %s and [%s].\n"
+"while searching for:\n"
+"%.*s"
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"
+"trong khi đang tìm kiếm cho:\n"
+"%.*s"
-#: bisect.c:742
+#: apply.c:3090
#, c-format
-msgid ""
-"The merge base %s is %s.\n"
-"This means the first '%s' commit is between %s and [%s].\n"
+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:3098
+#, c-format
+msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
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"
+"không thể reverse-apply một miếng vá nhị phân mà không đảo ngược hunk thành "
+"“%s”"
-#: bisect.c:750
+#: apply.c:3144
#, c-format
-msgid ""
-"Some %s revs are not ancestor of the %s rev.\n"
-"git bisect cannot work properly in this case.\n"
-"Maybe you mistook %s and %s revs?\n"
+msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
-"Một số điểm xét duyệt %s không phải tổ tiên của %s.\n"
-"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"
+"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 "
+"đủ"
-#: bisect.c:763
+#: apply.c:3154
#, 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."
+"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
-"hòa trộn trên cơ sở giữa %s và [%s] phải bị bỏ qua.\n"
-"Do vậy chúng tôi không thể chắc lần chuyển giao đầu tiên %s là giữa %s và "
-"%s.\n"
-"Chúng tôi vẫn cứ tiếp tục."
+"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."
-#: bisect.c:798
+#: apply.c:3162
#, 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"
+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"
-#: bisect.c:849
+#: apply.c:3180
#, c-format
-msgid "a %s revision is needed"
-msgstr "cần một điểm xét duyệt %s"
+msgid "the necessary postimage %s for '%s' cannot be read"
+msgstr "không thể đọc postimage %s cần thiết cho “%s”"
-#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
+#: apply.c:3193
#, c-format
-msgid "could not create file '%s'"
-msgstr "không thể tạo tập tin “%s”"
+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”"
-#: bisect.c:917
+#: apply.c:3199
#, c-format
-msgid "could not read file '%s'"
-msgstr "không thể đọc tập tin “%s”"
+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)"
-#: bisect.c:947
-msgid "reading bisect refs failed"
-msgstr "việc đọc tham chiếu bisect gặp lỗi"
+#: apply.c:3220
+#, c-format
+msgid "patch failed: %s:%ld"
+msgstr "gặp lỗi khi vá: %s:%ld"
-#: bisect.c:967
+#: apply.c:3342
#, c-format
-msgid "%s was both %s and %s\n"
-msgstr "%s là cả %s và %s\n"
+msgid "cannot checkout %s"
+msgstr "không thể lấy ra %s"
-#: bisect.c:975
+#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248
#, c-format
-msgid ""
-"No testable commit found.\n"
-"Maybe you started with bad path parameters?\n"
-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"
+msgid "failed to read %s"
+msgstr "gặp lỗi khi đọc %s"
-#: bisect.c:994
+#: apply.c:3398
#, c-format
-msgid "(roughly %d step)"
-msgid_plural "(roughly %d steps)"
-msgstr[0] "(ước chừng %d bước)"
+msgid "reading from '%s' beyond a symbolic link"
+msgstr "đọc từ “%s” vượt ra ngoài liên kết mềm"
-#. TRANSLATORS: the last %s will be replaced with
-#. "(roughly %d steps)" translation
-#: bisect.c:998
+#: apply.c:3427 apply.c:3667
#, 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"
+msgid "path %s has been renamed/deleted"
+msgstr "đường dẫn %s đã bị xóa hoặc đổi tên"
-#: branch.c:53
+#: apply.c:3510 apply.c:3681
#, 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"
-"Sau khi sửa nguyên nhân 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\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
+msgid "%s: does not exist in index"
+msgstr "%s: không tồn tại trong bảng mục lục"
-#: branch.c:67
+#: apply.c:3519 apply.c:3689
#, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "Chưa cài đặt nhánh %s như là thượng nguồn của nó."
+msgid "%s: does not match index"
+msgstr "%s: không khớp trong mục lục"
-#: branch.c:93
-#, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
-msgstr "Nhánh %s cài đặt để theo dõi nhánh máy chủ %s từ %s bằng cách rebase."
+#: apply.c:3554
+msgid "repository lacks the necessary blob to fall back on 3-way merge."
+msgstr "Kho thiếu đối tượng blob cần thiết để trở về trên “3-way merge”."
-#: branch.c:94
+#: apply.c:3557
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
-msgstr "Nhánh %s cài đặt để theo dõi nhánh máy chủ %s từ %s."
+msgid "Falling back to three-way merge...\n"
+msgstr "Đang trở lại hòa trộn “3-đường”…\n"
-#: branch.c:98
+#: apply.c:3573 apply.c:3577
#, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
-msgstr "Nhánh %s cài đặt để theo dõi nhánh nội bộ %s bằng cách rebase."
+msgid "cannot read the current contents of '%s'"
+msgstr "không thể đọc nội dung hiện hành của “%s”"
-#: branch.c:99
+#: apply.c:3589
#, c-format
-msgid "Branch %s set up to track local branch %s."
-msgstr "Nhánh %s cài đặt để theo dõi nhánh nội bộ %s."
+msgid "Failed to fall back on three-way merge...\n"
+msgstr "Gặp lỗi khi quay trở lại để hòa trộn kiểu “three-way”…\n"
-#: branch.c:104
+#: apply.c:3603
#, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
-msgstr "Nhánh %s cài đặt để theo dõi nhánh máy chủ %s bằng cách rebase."
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr "Đã áp dụng miếng vá %s với các xung đột.\n"
-#: branch.c:105
+#: apply.c:3608
#, c-format
-msgid "Branch %s set up to track remote ref %s."
-msgstr "Nhánh %s cài đặt để theo dõi tham chiếu máy chủ %s."
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr "Đã áp dụng miếng vá %s một cách sạch sẽ.\n"
-#: branch.c:109
+#: apply.c:3634
+msgid "removal patch leaves file contents"
+msgstr "loại bỏ miếng vá để lại nội dung tập tin"
+
+#: apply.c:3706
#, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
-msgstr ""
-"Nhánh %s cài đặt để theo dõi vết tham chiếu nội bộ %s bằng cách rebase."
+msgid "%s: wrong type"
+msgstr "%s: sai kiểu"
-#: branch.c:110
+#: apply.c:3708
#, c-format
-msgid "Branch %s set up to track local ref %s."
-msgstr "Nhánh %s cài đặt để theo dõi tham chiếu nội bộ %s."
+msgid "%s has type %o, expected %o"
+msgstr "%s có kiểu %o, cần %o"
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "Không thể ghi cấu hình nhánh thượng nguồn"
+#: apply.c:3859 apply.c:3861
+#, c-format
+msgid "invalid path '%s'"
+msgstr "đường dẫn không hợp lệ “%s”"
-#: branch.c:156
+#: apply.c:3917
#, 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"
+msgid "%s: already exists in index"
+msgstr "%s: đã có từ trước trong bảng mục lục"
-#: branch.c:185
+#: apply.c:3920
#, 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ệ."
+msgid "%s: already exists in working directory"
+msgstr "%s: đã sẵn có trong thư mục đang làm việc"
-#: branch.c:190
+#: apply.c:3940
#, c-format
-msgid "A branch named '%s' already exists."
-msgstr "Đã có nhánh mang tên “%s”."
+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)"
-#: branch.c:198
-msgid "Cannot force update the current branch."
-msgstr "Không thể ép buộc cập nhật nhánh hiện hành."
+#: apply.c:3945
+#, 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"
-#: branch.c:218
+#: apply.c:3965
#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
-msgstr ""
-"Không thể cài đặt thông tin theo dõi; điểm bắt đầu “%s” không phải là một "
-"nhánh."
+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"
-#: branch.c:220
+#: apply.c:3969
#, 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"
+msgid "%s: patch does not apply"
+msgstr "%s: miếng vá không được áp dụng"
-#: branch.c:222
-msgid ""
-"\n"
-"If you are planning on basing your work on an upstream\n"
-"branch that already exists at the remote, you may need to\n"
-"run \"git fetch\" to retrieve it.\n"
-"\n"
-"If you are planning to push out a new local branch that\n"
-"will track its remote counterpart, you may want to use\n"
-"\"git push -u\" to set the upstream config as you push."
-msgstr ""
-"\n"
-"Nếu bạn có ý định “cải tổ” công việc của bạn trên nhánh thượng nguồn\n"
-"(upstream) cái mà đã sẵn có trên máy chủ, bạn cần chạy\n"
-"lệnh \"git fetch\" để lấy nó về.\n"
-"\n"
-"Nếu bạn có ý định đẩy lên lên một nhánh nội bộ mới cái mà\n"
-"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."
+#: apply.c:3984
+#, c-format
+msgid "Checking patch %s..."
+msgstr "Đang kiểm tra miếng vá %s…"
-#: branch.c:266
+#: apply.c:4075
#, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "Không phải tên đối tượng hợp lệ: “%s”."
+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"
-#: branch.c:286
+#: apply.c:4082
#, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "Tên đối tượng chưa rõ ràng: “%s”."
+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"
-#: branch.c:291
+#: apply.c:4085
#, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "Nhánh không hợp lệ: “%s”."
+msgid "sha1 information is lacking or useless (%s)."
+msgstr "thông tin sha1 còn thiếu hay không dùng được(%s)."
-#: branch.c:345
+#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
-msgid "'%s' is already checked out at '%s'"
-msgstr "“%s” đã được lấy ra tại “%s” rồi"
+msgid "make_cache_entry failed for path '%s'"
+msgstr "make_cache_entry gặp lỗi đối với đường dẫn “%s”"
-#: branch.c:364
+#: apply.c:4094
#, 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"
+msgid "could not add %s to temporary index"
+msgstr "không thể thêm %s vào chỉ mục tạm thời"
-#: bundle.c:34
+#: apply.c:4104
#, c-format
-msgid "'%s' does not look like a v2 bundle file"
-msgstr "“%s” không giống như tập tin v2 bundle (định dạng dump của git)"
+msgid "could not write temporary index to %s"
+msgstr "không thểghi mục lục tạm vào %s"
-#: bundle.c:61
+#: apply.c:4242
#, c-format
-msgid "unrecognized header: %s%s (%d)"
-msgstr "phần đầu không được thừa nhận: %s%s (%d)"
+msgid "unable to remove %s from index"
+msgstr "không thể gỡ bỏ %s từ mục lục"
-#: bundle.c:87 builtin/commit.c:778
+#: apply.c:4277
#, c-format
-msgid "could not open '%s'"
-msgstr "không thể mở “%s”"
+msgid "corrupt patch for submodule %s"
+msgstr "miếng vá sai hỏng cho mô-đun-con %s"
-#: bundle.c:139
-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:"
+#: apply.c:4283
+#, 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"
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085
-#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348
-#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901
-#: builtin/merge.c:356 builtin/shortlog.c:170
-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"
+#: apply.c:4291
+#, 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"
-#: bundle.c:185
+#: apply.c:4297 apply.c:4441
#, c-format
-msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %d refs:"
-msgstr[0] "Bó dữ liệu chứa %d tham chiếu:"
+msgid "unable to add cache entry for %s"
+msgstr "không thể thêm mục nhớ đệm cho %s"
-#: bundle.c:192
-msgid "The bundle records a complete history."
-msgstr "Lệnh bundle ghi lại toàn bộ lịch sử."
+#: apply.c:4338
+#, c-format
+msgid "failed to write to '%s'"
+msgstr "gặp lỗi khi ghi vào “%s”"
-#: bundle.c:194
+#: apply.c:4342
#, c-format
-msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %d refs:"
-msgstr[0] "Lệnh bundle yêu cầu %d tham chiếu này:"
+msgid "closing file '%s'"
+msgstr "đang đóng tập tin “%s”"
-#: bundle.c:253
-msgid "Could not spawn pack-objects"
-msgstr "Không thể sản sinh đối tượng gói"
+#: apply.c:4412
+#, c-format
+msgid "unable to write file '%s' mode %o"
+msgstr "không thể ghi vào tập tin “%s” chế độ %o"
-#: bundle.c:264
-msgid "pack-objects died"
-msgstr "đối tượng gói đã chết"
+#: apply.c:4510
+#, c-format
+msgid "Applied patch %s cleanly."
+msgstr "Đã áp dụng miếng vá %s một cách sạch sẽ."
-#: bundle.c:304
-msgid "rev-list died"
-msgstr "rev-list đã chết"
+#: apply.c:4518
+msgid "internal error"
+msgstr "lỗi nội bộ"
-#: bundle.c:353
+#: apply.c:4521
#, 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"
+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…"
-#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273
+#: apply.c:4532
#, c-format
-msgid "unrecognized argument: %s"
-msgstr "đối số không được thừa nhận: %s"
-
-#: bundle.c:451
-msgid "Refusing to create empty bundle."
-msgstr "Từ chối tạo một bó dữ liệu trống rỗng."
+msgid "truncating .rej filename to %.*s.rej"
+msgstr "đang cắt ngắn tên tập tin .rej thành %.*s.rej"
-#: bundle.c:463
+#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989
#, c-format
-msgid "cannot create '%s'"
-msgstr "không thể tạo “%s”"
-
-#: bundle.c:491
-msgid "index-pack died"
-msgstr "mục lục gói đã chết"
+msgid "cannot open %s"
+msgstr "không mở được “%s”"
-#: color.c:290
+#: apply.c:4554
#, c-format
-msgid "invalid color value: %.*s"
-msgstr "giá trị màu không hợp lệ: %.*s"
+msgid "Hunk #%d applied cleanly."
+msgstr "Khối nhớ #%d được áp dụng gọn gàng."
-#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505
-#: builtin/am.c:2119
+#: apply.c:4558
#, c-format
-msgid "could not parse %s"
-msgstr "không thể phân tích cú pháp %s"
+msgid "Rejected hunk #%d."
+msgstr "đoạn dữ liệu #%d bị từ chối."
-#: commit.c:42
+#: apply.c:4668
#, 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 "Skipped patch '%s'."
+msgstr "bỏ qua đường dẫn “%s”."
-#: compat/obstack.c:406 compat/obstack.c:408
-msgid "memory exhausted"
-msgstr "hết bộ nhớ"
+#: apply.c:4676
+msgid "unrecognized input"
+msgstr "không thừa nhận đầu vào"
-#: config.c:516
-#, 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"
+#: apply.c:4695
+msgid "unable to read index file"
+msgstr "không thể đọc tập tin lưu bảng mục lục"
-#: config.c:520
+#: apply.c:4833
#, 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"
+msgid "can't open patch '%s': %s"
+msgstr "không thể mở miếng vá “%s”: %s"
-#: config.c:524
+#: apply.c:4858
#, 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"
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] "đã chấm dứt %d lỗi khoảng trắng"
-#: config.c:528
+#: apply.c:4864 apply.c:4879
#, 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"
+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."
-#: config.c:532
+#: apply.c:4872
#, 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"
+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."
-#: config.c:536
-#, c-format
-msgid "bad config line %d in %s"
-msgstr "cấu hình sai tại dòng %d trong %s"
+#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431
+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"
-#: config.c:655
-msgid "out of range"
-msgstr "nằm ngoài phạm vi"
+#: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
+#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592
+#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947
+msgid "path"
+msgstr "đường-dẫn"
-#: config.c:655
-msgid "invalid unit"
-msgstr "đơn vị không hợp lệ"
+#: apply.c:4920
+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"
-#: config.c:661
-#, 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"
+#: apply.c:4923
+msgid "apply changes matching the given path"
+msgstr "áp dụng các thay đổi khớp với đường dẫn đã cho"
-#: config.c:666
-#, 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"
+#: apply.c:4925 builtin/am.c:2286
+msgid "num"
+msgstr "số"
-#: config.c:669
-#, 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"
+#: apply.c:4926
+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"
-#: config.c:672
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+#: apply.c:4929
+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:4931
+msgid "instead of applying the patch, output diffstat for the input"
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"
+"thay vì áp dụng một miếng vá, kết xuất kết quả từ lệnh diffstat cho đầu ra"
-#: config.c:675
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+#: apply.c:4935
+msgid "show number of added and deleted lines in decimal notation"
msgstr ""
-"sai giá trị bằng số của cấu hình “%s” cho “%s” trong submodule-blob %s: %s"
+"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"
-#: config.c:678
-#, 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"
+#: apply.c:4937
+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"
-#: config.c:681
-#, 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"
+#: apply.c:4939
+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"
-#: config.c:768
-#, 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”"
+#: apply.c:4941
+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"
-#: config.c:849 config.c:860
-#, c-format
-msgid "bad zlib compression level %d"
-msgstr "mức nén zlib %d là sai"
+#: apply.c:4943
+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"
-#: config.c:978
-#, 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"
+#: apply.c:4945
+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"
-#: config.c:1312
-msgid "unable to parse command-line config"
-msgstr "không thể phân tích cấu hình dòng lệnh"
+#: apply.c:4947
+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)"
-#: config.c:1362
-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"
+#: apply.c:4949
+msgid "attempt three-way merge if a patch does not apply"
+msgstr "thử hòa trộn kiểu three-way nếu việc vá không thể thực hiện được"
-#: config.c:1716
-#, 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"
+#: apply.c:4951
+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"
-#: config.c:1718
-#, 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"
+#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505
+msgid "paths are separated with NUL character"
+msgstr "các đường dẫn bị ngăn cách bởi ký tự NULL"
-#: config.c:1777
-#, c-format
-msgid "%s has multiple values"
-msgstr "%s có đa giá trị"
+#: apply.c:4956
+msgid "ensure at least <n> lines of context match"
+msgstr "đảm bảo rằng có ít nhất <n> dòng nội dung khớp"
-#: config.c:2311
-#, c-format
-msgid "could not set '%s' to '%s'"
-msgstr "không thể đặt “%s” thành “%s”"
+#: apply.c:4957 builtin/am.c:2265
+msgid "action"
+msgstr "hành động"
-#: config.c:2313
+#: apply.c:4958
+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:4961 apply.c:4964
+msgid "ignore changes in whitespace when finding context"
+msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi quét nội dung"
+
+#: apply.c:4967
+msgid "apply the patch in reverse"
+msgstr "áp dụng miếng vá theo chiều ngược"
+
+#: apply.c:4969
+msgid "don't expect at least one line of context"
+msgstr "đừng hy vọng có ít nhất một dòng nội dung"
+
+#: apply.c:4971
+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:4973
+msgid "allow overlapping hunks"
+msgstr "cho phép chồng khối nhớ"
+
+#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19
+#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593
+#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114
+msgid "be verbose"
+msgstr "chi tiết"
+
+#: apply.c:4976
+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:4979
+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:4981 builtin/am.c:2274
+msgid "root"
+msgstr "gốc"
+
+#: apply.c:4982
+msgid "prepend <root> to all filenames"
+msgstr "treo thêm <root> vào tất cả các tên tập tin"
+
+#: archive.c:12
+msgid "git archive [<options>] <tree-ish> [<path>...]"
+msgstr "git archive [<các-tùy-chọn>] <tree-ish> [<đường-dẫn>…]"
+
+#: archive.c:13
+msgid "git archive --list"
+msgstr "git archive --list"
+
+#: archive.c:14
+msgid ""
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
+msgstr ""
+"git archive --remote <kho> [--exec <lệnh>] [<các-tùy-chọn>] <tree-ish> "
+"[<đường-dẫn>…]"
+
+#: archive.c:15
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr "git archive --remote <kho> [--exec <lệnh>] --list"
+
+#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327
#, c-format
-msgid "could not unset '%s'"
-msgstr "không thể thôi đặt “%s”"
+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"
-#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
-msgid "Checking connectivity"
-msgstr "Ä\90ang kiá»\83m tra kết ná»\91i"
+#: archive.c:429
+msgid "fmt"
+msgstr "Ä\91á»\8bnh_dạng"
-#: connected.c:74
-msgid "Could not run 'git rev-list'"
-msgstr "Không thể chạy “git rev-list”"
+#: archive.c:429
+msgid "archive format"
+msgstr "định dạng lưu trữ"
-#: connected.c:94
-msgid "failed write to rev-list"
-msgstr "gặp lỗi khi ghi vào rev-list"
+#: archive.c:430 builtin/log.c:1429
+msgid "prefix"
+msgstr "tiền_tố"
-#: connected.c:101
-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"
+#: archive.c:431
+msgid "prepend prefix to each pathname in the archive"
+msgstr "nối thêm tiền tố vào từng đường dẫn tập tin trong kho lưu"
-#: date.c:97
-msgid "in the future"
-msgstr "trong tương lai"
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603
+#: builtin/blame.c:2604 builtin/config.c:59 builtin/fast-export.c:987
+#: builtin/fast-export.c:989 builtin/grep.c:723 builtin/hash-object.c:101
+#: builtin/ls-files.c:539 builtin/ls-files.c:542 builtin/notes.c:401
+#: builtin/notes.c:564 builtin/read-tree.c:109 parse-options.h:153
+msgid "file"
+msgstr "tập_tin"
-#: date.c:103
+#: archive.c:433 builtin/archive.c:89
+msgid "write the archive to this file"
+msgstr "ghi kho lưu vào tập tin này"
+
+#: archive.c:435
+msgid "read .gitattributes in working directory"
+msgstr "đọc .gitattributes trong thư mục làm việc"
+
+#: archive.c:436
+msgid "report archived files on stderr"
+msgstr "liệt kê các tập tin được lưu trữ vào stderr (đầu ra lỗi tiêu chuẩn)"
+
+#: archive.c:437
+msgid "store only"
+msgstr "chỉ lưu (không nén)"
+
+#: archive.c:438
+msgid "compress faster"
+msgstr "nén nhanh hơn"
+
+#: archive.c:446
+msgid "compress better"
+msgstr "nén nhỏ hơn"
+
+#: archive.c:449
+msgid "list supported archive formats"
+msgstr "liệt kê các kiểu nén được hỗ trợ"
+
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
+#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953
+msgid "repo"
+msgstr "kho"
+
+#: archive.c:452 builtin/archive.c:91
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "nhận kho nén từ kho chứa <kho> trên máy chủ"
+
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
+msgid "command"
+msgstr "lệnh"
+
+#: archive.c:454 builtin/archive.c:93
+msgid "path to the remote git-upload-archive command"
+msgstr "đường dẫn đến lệnh git-upload-pack trên máy chủ"
+
+#: archive.c:461
+msgid "Unexpected option --remote"
+msgstr "Gặp tùy chọn --remote không cần"
+
+#: archive.c:463
+msgid "Option --exec can only be used together with --remote"
+msgstr "Tùy chọn --exec chỉ có thể được dùng cùng với --remote"
+
+#: archive.c:465
+msgid "Unexpected option --output"
+msgstr "Gặp tùy chọn không cần --output"
+
+#: archive.c:487
#, c-format
-msgid "%lu second ago"
-msgid_plural "%lu seconds ago"
-msgstr[0] "%lu giây trước"
+msgid "Unknown archive format '%s'"
+msgstr "Không hiểu định dạng “%s”"
-#: date.c:110
+#: archive.c:494
#, c-format
-msgid "%lu minute ago"
-msgid_plural "%lu minutes ago"
-msgstr[0] "%lu phút trước"
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Tham số không được hỗ trợ cho định dạng “%s”: -%d"
-#: date.c:117
+#: attr.c:263
+msgid ""
+"Negative patterns are ignored in git attributes\n"
+"Use '\\!' for literal leading exclamation."
+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:441
#, c-format
-msgid "%lu hour ago"
-msgid_plural "%lu hours ago"
-msgstr[0] "%lu giờ trước"
+msgid "Could not open file '%s'"
+msgstr "Không thể mở tập tin “%s”"
-#: date.c:124
+#: bisect.c:446
#, c-format
-msgid "%lu day ago"
-msgid_plural "%lu days ago"
-msgstr[0] "%lu ngày trước"
+msgid "Badly quoted content in file '%s': %s"
+msgstr "nội dung được trích dẫn sai tập tin “%s”: %s"
-#: date.c:130
+#: bisect.c:655
#, c-format
-msgid "%lu week ago"
-msgid_plural "%lu weeks ago"
-msgstr[0] "%lu tuần trước"
+msgid "We cannot bisect more!\n"
+msgstr "Chúng tôi không bisect thêm nữa!\n"
-#: date.c:137
+#: bisect.c:708
#, c-format
-msgid "%lu month ago"
-msgid_plural "%lu months ago"
-msgstr[0] "%lu tháng trước"
+msgid "Not a valid commit name %s"
+msgstr "Không phải tên đối tượng commit %s hợp lệ"
-#: date.c:148
+#: bisect.c:732
#, c-format
-msgid "%lu year"
-msgid_plural "%lu years"
-msgstr[0] "%lu năm"
+msgid ""
+"The merge base %s is bad.\n"
+"This means the bug has been fixed between %s and [%s].\n"
+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"
-#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:151
+#: bisect.c:737
#, c-format
-msgid "%s, %lu month ago"
-msgid_plural "%s, %lu months ago"
-msgstr[0] "%s, %lu tháng trước"
+msgid ""
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
+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"
-#: date.c:156 date.c:161
+#: bisect.c:742
#, c-format
-msgid "%lu year ago"
-msgid_plural "%lu years ago"
-msgstr[0] "%lu năm trước"
+msgid ""
+"The merge base %s is %s.\n"
+"This means the first '%s' commit is between %s and [%s].\n"
+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"
-#: diffcore-order.c:24
+#: bisect.c:750
+#, c-format
+msgid ""
+"Some %s revs are not ancestor of the %s rev.\n"
+"git bisect cannot work properly in this case.\n"
+"Maybe you mistook %s and %s revs?\n"
+msgstr ""
+"Một số điểm xét duyệt %s không phải tổ tiên của %s.\n"
+"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:763
+#, 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 ""
+"hòa trộn trên cơ sở giữa %s và [%s] phải bị bỏ qua.\n"
+"Do vậy chúng tôi không thể chắc lần chuyển giao đầu tiên %s là giữa %s và "
+"%s.\n"
+"Chúng tôi vẫn cứ tiếp tục."
+
+#: bisect.c:798
#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "gặp lỗi khi đọc tập-tin-thứ-tự “%s”"
+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"
-#: diffcore-rename.c:540
-msgid "Performing inexact rename detection"
-msgstr "Đang thực hiện dò tìm đổi tên không chính xác"
+#: bisect.c:849
+#, c-format
+msgid "a %s revision is needed"
+msgstr "cần một điểm xét duyệt %s"
-#: diff.c:116
+#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
#, 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"
+msgid "could not create file '%s'"
+msgstr "không thể tạo tập tin “%s”"
-#: diff.c:121
+#: bisect.c:917
#, c-format
-msgid " Unknown dirstat parameter '%s'\n"
-msgstr " Không hiểu đối số dirstat “%s”\n"
+msgid "could not read file '%s'"
+msgstr "không thể đọc tập tin “%s”"
+
+#: bisect.c:947
+msgid "reading bisect refs failed"
+msgstr "việc đọc tham chiếu bisect gặp lỗi"
-#: diff.c:225
+#: bisect.c:967
#, 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”"
+msgid "%s was both %s and %s\n"
+msgstr "%s là cả %s và %s\n"
-#: diff.c:277
+#: bisect.c:975
#, c-format
msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
+"No testable commit found.\n"
+"Maybe you started with bad path parameters?\n"
msgstr ""
-"Tìm thấy các lỗi trong biến cấu hình “diff.dirstat”:\n"
-"%s"
+"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"
-#: diff.c:3017
+#: bisect.c:994
#, 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"
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] "(ước chừng %d bước)"
-#: diff.c:3415
-msgid "--follow requires exactly one pathspec"
-msgstr "--follow cần chính xác một đặc tả đường dẫn"
+#. TRANSLATORS: the last %s will be replaced with
+#. "(roughly %d steps)" translation
+#: bisect.c:998
+#, 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"
-#: diff.c:3578
+#: branch.c:53
#, c-format
msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
+"\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 ""
-"Gặp lỗi khi phân tích đối số tùy chọn --dirstat/-X:\n"
-"%s"
+"\n"
+"Sau khi sửa nguyên nhân 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\n"
+"\"git branch --set-upstream-to=%s%s%s\"."
-#: diff.c:3592
+#: branch.c:67
#, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
-msgstr "Gặp lỗi khi phân tích đối số tùy chọn --submodule: “%s”"
-
-#: dir.c:1823
-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:1942
-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."
-
-#: gpg-interface.c:178
-msgid "gpg failed to sign the data"
-msgstr "gpg gặp lỗi khi ký dữ liệu"
-
-#: gpg-interface.c:208
-msgid "could not create temporary file"
-msgstr "không thể tạo tập tin tạm thời"
+msgid "Not setting branch %s as its own upstream."
+msgstr "Chưa cài đặt nhánh %s như là thượng nguồn của nó."
-#: gpg-interface.c:210
+#: branch.c:93
#, 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 "Branch %s set up to track remote branch %s from %s by rebasing."
+msgstr "Nhánh %s cài đặt để theo dõi nhánh máy chủ %s từ %s bằng cách rebase."
-#: grep.c:1792
+#: branch.c:94
#, c-format
-msgid "'%s': unable to read %s"
-msgstr "“%s”: không thể đọc %s"
+msgid "Branch %s set up to track remote branch %s from %s."
+msgstr "Nhánh %s cài đặt để theo dõi nhánh máy chủ %s từ %s."
-#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
+#: branch.c:98
#, c-format
-msgid "failed to stat '%s'"
-msgstr "gặp lỗi khi lấy thống kê về “%s”"
+msgid "Branch %s set up to track local branch %s by rebasing."
+msgstr "Nhánh %s cài đặt để theo dõi nhánh nội bộ %s bằng cách rebase."
-#: grep.c:1820
+#: branch.c:99
#, c-format
-msgid "'%s': short read"
-msgstr "“%s”: đọc ngắn"
+msgid "Branch %s set up to track local branch %s."
+msgstr "Nhánh %s cài đặt để theo dõi nhánh nội bộ %s."
-#: help.c:205
+#: branch.c:104
#, c-format
-msgid "available git commands in '%s'"
-msgstr "các lệnh git sẵn có trong thư mục “%s”:"
-
-#: help.c:212
-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 "Branch %s set up to track remote ref %s by rebasing."
+msgstr "Nhánh %s cài đặt để theo dõi nhánh máy chủ %s bằng cách rebase."
-#: help.c:244
-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:"
+#: branch.c:105
+#, c-format
+msgid "Branch %s set up to track remote ref %s."
+msgstr "Nhánh %s cài đặt để theo dõi tham chiếu máy chủ %s."
-#: help.c:309
+#: branch.c:109
#, c-format
-msgid ""
-"'%s' appears to be a git command, but we were not\n"
-"able to execute it. Maybe git-%s is broken?"
+msgid "Branch %s set up to track local ref %s by rebasing."
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?"
+"Nhánh %s cài đặt để theo dõi vết tham chiếu nội bộ %s bằng cách rebase."
-#: help.c:366
-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ả."
+#: branch.c:110
+#, c-format
+msgid "Branch %s set up to track local ref %s."
+msgstr "Nhánh %s cài đặt để theo dõi tham chiếu nội bộ %s."
-#: help.c:388
+#: branch.c:119
+msgid "Unable to write upstream branch configuration"
+msgstr "Không thể ghi cấu hình nhánh thượng nguồn"
+
+#: branch.c:156
#, c-format
-msgid ""
-"WARNING: You called a Git command named '%s', which does not exist.\n"
-"Continuing under the assumption that you meant '%s'"
-msgstr ""
-"CẢNH BÁO: Bạn đã gọi lệnh Git có tên “%s”, mà nó lại không có sẵn.\n"
-"Tiếp tục và coi rằng ý bạn là “%s”"
+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"
-#: help.c:393
+#: branch.c:185
#, c-format
-msgid "in %0.1f seconds automatically..."
-msgstr "trong %0.1f giây một cách tự động…"
+msgid "'%s' is not a valid branch name."
+msgstr "“%s” không phải là một tên nhánh hợp lệ."
-#: help.c:400
+#: branch.c:190
#, 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 "A branch named '%s' already exists."
+msgstr "Đã có nhánh mang tên “%s”."
-#: help.c:404 help.c:470
-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?"
+#: branch.c:198
+msgid "Cannot force update the current branch."
+msgstr "Không thể ép buộc cập nhật nhánh hiện hành."
-#: help.c:466
+#: branch.c:218
#, c-format
-msgid "%s: %s - %s"
-msgstr "%s: %s - %s"
+msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgstr ""
+"Không thể cài đặt thông tin theo dõi; điểm bắt đầu “%s” không phải là một "
+"nhánh."
-#: lockfile.c:152
+#: branch.c:220
#, 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:222
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."
+"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 ""
-"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."
+"Nếu bạn có ý định “cải tổ” công việc của bạn trên nhánh thượng nguồn\n"
+"(upstream) cái mà đã sẵn có trên máy chủ, bạn cần chạy\n"
+"lệnh \"git fetch\" để lấy nó về.\n"
+"\n"
+"Nếu bạn có ý định đẩy lên lên một nhánh nội bộ mới cái mà\n"
+"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."
-#: lockfile.c:160
+#: branch.c:265
#, c-format
-msgid "Unable to create '%s.lock': %s"
-msgstr "Không thể tạo “%s.lock”: %s"
+msgid "Not a valid object name: '%s'."
+msgstr "Không phải tên đối tượng hợp lệ: “%s”."
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "gặp lỗi khi đọc bộ nhớ đệm"
+#: branch.c:285
+#, c-format
+msgid "Ambiguous object name: '%s'."
+msgstr "Tên đối tượng chưa rõ ràng: “%s”."
-#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375
-#: builtin/checkout.c:589 builtin/clone.c:732
-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"
+#: branch.c:290
+#, c-format
+msgid "Not a valid branch point: '%s'."
+msgstr "Nhánh không hợp lệ: “%s”."
-#: merge-recursive.c:209
-msgid "(bad commit)\n"
-msgstr "(commit sai)\n"
+#: branch.c:344
+#, c-format
+msgid "'%s' is already checked out at '%s'"
+msgstr "“%s” đã được lấy ra tại “%s” rồi"
-#: merge-recursive.c:231
+#: branch.c:363
#, c-format
-msgid "addinfo_cache failed for path '%s'"
-msgstr "addinfo_cache gặp lỗi đối với đường dẫn “%s”"
+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"
-#: merge-recursive.c:301
-msgid "error building trees"
-msgstr "gặp lỗi khi xây dựng cây"
+#: bundle.c:34
+#, c-format
+msgid "'%s' does not look like a v2 bundle file"
+msgstr "“%s” không giống như tập tin v2 bundle (định dạng dump của git)"
-#: merge-recursive.c:720
+#: bundle.c:61
#, c-format
-msgid "failed to create path '%s'%s"
-msgstr "gặp lỗi khi tạo đường dẫn “%s”%s"
+msgid "unrecognized header: %s%s (%d)"
+msgstr "phần đầu không được thừa nhận: %s%s (%d)"
-#: merge-recursive.c:731
+#: bundle.c:87 sequencer.c:963 builtin/commit.c:777
#, 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 "could not open '%s'"
+msgstr "không thể mở “%s”"
-#: merge-recursive.c:745 merge-recursive.c:764
-msgid ": perhaps a D/F conflict?"
-msgstr ": có lẽ là một xung đột D/F?"
+#: bundle.c:139
+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:"
-#: merge-recursive.c:754
-#, 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”"
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374
+#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348
+#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
+#: builtin/merge.c:356 builtin/shortlog.c:170
+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"
-#: merge-recursive.c:796
+#: bundle.c:185
#, c-format
-msgid "cannot read object %s '%s'"
-msgstr "không thể đọc đối tượng %s “%s”"
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %d refs:"
+msgstr[0] "Bó dữ liệu chứa %d tham chiếu:"
-#: merge-recursive.c:798
-#, c-format
-msgid "blob expected for %s '%s'"
-msgstr "đối tượng blob được mong đợi cho %s “%s”"
+#: bundle.c:192
+msgid "The bundle records a complete history."
+msgstr "Lệnh bundle ghi lại toàn bộ lịch sử."
-#: merge-recursive.c:822
+#: bundle.c:194
#, c-format
-msgid "failed to open '%s': %s"
-msgstr "gặp lỗi khi mở “%s”: %s"
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %d refs:"
+msgstr[0] "Lệnh bundle yêu cầu %d tham chiếu này:"
-#: merge-recursive.c:833
-#, 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"
+#: bundle.c:253
+msgid "Could not spawn pack-objects"
+msgstr "Không thể sản sinh đối tượng gói"
-#: merge-recursive.c:838
-#, 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”"
+#: bundle.c:264
+msgid "pack-objects died"
+msgstr "đối tượng gói đã chết"
-#: merge-recursive.c:978
-msgid "Failed to execute internal merge"
-msgstr "Gặp lỗi khi thực hiện trộn nội bộ"
+#: bundle.c:304
+msgid "rev-list died"
+msgstr "rev-list đã chết"
-#: merge-recursive.c:982
+#: bundle.c:353
#, c-format
-msgid "Unable to add %s to database"
-msgstr "Không thể thêm %s vào cơ sở dữ liệu"
+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"
-#: merge-recursive.c:1081 merge-recursive.c:1095
+#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273
#, 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)."
+msgid "unrecognized argument: %s"
+msgstr "đối số không được thừa nhận: %s"
-#: merge-recursive.c:1087 merge-recursive.c:1100
+#: bundle.c:451
+msgid "Refusing to create empty bundle."
+msgstr "Từ chối tạo một bó dữ liệu trống rỗng."
+
+#: bundle.c:463
#, 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."
+msgid "cannot create '%s'"
+msgstr "không thể tạo “%s”"
-#: merge-recursive.c:1143
-msgid "rename"
-msgstr "đổi tên"
+#: bundle.c:491
+msgid "index-pack died"
+msgstr "mục lục gói đã chết"
-#: merge-recursive.c:1143
-msgid "renamed"
-msgstr "đã đổi tên"
+#: color.c:290
+#, c-format
+msgid "invalid color value: %.*s"
+msgstr "giá trị màu không hợp lệ: %.*s"
-#: merge-recursive.c:1200
+#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493
+#: builtin/am.c:2127
#, 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"
+msgid "could not parse %s"
+msgstr "không thể phân tích cú pháp %s"
-#: merge-recursive.c:1225
+#: commit.c:42
#, 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:1514
msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
+"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 ""
-"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:1230
-msgid " (left unresolved)"
-msgstr " (cần giải quyết)"
+"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"
-#: merge-recursive.c:1292
-#, 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"
+#: compat/obstack.c:406 compat/obstack.c:408
+msgid "memory exhausted"
+msgstr "hết bộ nhớ"
-#: merge-recursive.c:1325
+#: config.c:516
#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
-msgstr "Đang đổi tên %s thành %s thay vì %s thành %s"
+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"
-#: merge-recursive.c:1531
+#: config.c:520
#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
-msgstr ""
-"XUNG ĐỘT (đổi-tên/thêm): Đổi tên %s->%s trong %s. %s được thêm vào trong %s"
+msgid "bad config line %d in file %s"
+msgstr "cấu hình sai tại dòng %d trong tập tin %s"
-#: merge-recursive.c:1546
+#: config.c:524
#, c-format
-msgid "Adding merged %s"
-msgstr "Thêm hòa trộn %s"
+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"
-#: merge-recursive.c:1553 merge-recursive.c:1766
+#: config.c:528
#, c-format
-msgid "Adding as %s instead"
-msgstr "Thay vào đó thêm vào %s"
+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"
-#: merge-recursive.c:1610
+#: config.c:532
#, c-format
-msgid "cannot read object %s"
-msgstr "không thể đọc đối tượng %s"
+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"
-#: merge-recursive.c:1613
+#: config.c:536
#, c-format
-msgid "object %s is not a blob"
-msgstr "đối tượng %s không phải là một blob"
-
-#: merge-recursive.c:1666
-msgid "modify"
-msgstr "sửa đổi"
+msgid "bad config line %d in %s"
+msgstr "cấu hình sai tại dòng %d trong %s"
-#: merge-recursive.c:1666
-msgid "modified"
-msgstr "đã sửa"
+#: config.c:655
+msgid "out of range"
+msgstr "nằm ngoài phạm vi"
-#: merge-recursive.c:1676
-msgid "content"
-msgstr "nội dung"
+#: config.c:655
+msgid "invalid unit"
+msgstr "đơn vị không hợp lệ"
-#: merge-recursive.c:1683
-msgid "add/add"
-msgstr "thêm/thêm"
+#: config.c:661
+#, 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"
-#: merge-recursive.c:1718
+#: config.c:666
#, c-format
-msgid "Skipped %s (merged same as existing)"
-msgstr "Đã bỏ qua %s (đã có sẵn lần hòa trộn này)"
+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"
-#: merge-recursive.c:1732
+#: config.c:669
#, c-format
-msgid "Auto-merging %s"
-msgstr "Tự-động-hòa-trộn %s"
+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"
-#: merge-recursive.c:1736 git-submodule.sh:919
-msgid "submodule"
-msgstr "mô-đun-con"
+#: config.c:672
+#, 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"
-#: merge-recursive.c:1737
+#: config.c:675
#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "XUNG ĐỘT (%s): Xung đột hòa trộn trong %s"
+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"
-#: merge-recursive.c:1831
+#: config.c:678
#, c-format
-msgid "Removing %s"
-msgstr "Đang xóa %s"
+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"
-#: merge-recursive.c:1857
-msgid "file/directory"
-msgstr "tập-tin/thư-mục"
+#: config.c:681
+#, 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"
-#: merge-recursive.c:1863
-msgid "directory/file"
-msgstr "thư-mục/tập-tin"
+#: config.c:768
+#, 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”"
-#: merge-recursive.c:1868
+#: config.c:852 config.c:863
#, 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"
+msgid "bad zlib compression level %d"
+msgstr "mức nén zlib %d là sai"
-#: merge-recursive.c:1877
+#: config.c:978
#, c-format
-msgid "Adding %s"
-msgstr "Thêm \"%s\""
+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"
-#: merge-recursive.c:1914
-msgid "Already up-to-date!"
-msgstr "Đã cập nhật rồi!"
+#: config.c:1312
+msgid "unable to parse command-line config"
+msgstr "không thể phân tích cấu hình dòng lệnh"
-#: merge-recursive.c:1923
+#: config.c:1362
+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:1716
#, 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 "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"
-#: merge-recursive.c:2006
-msgid "Merging:"
-msgstr "Đang trộn:"
+#: config.c:1718
+#, 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"
-#: merge-recursive.c:2019
+#: config.c:1777
#, 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 "%s has multiple values"
+msgstr "%s có đa giá trị"
-#: merge-recursive.c:2058
-msgid "merge returned no commit"
-msgstr "hòa trộn không trả về lần chuyển giao nào"
+#: config.c:2311
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "không thể đặt “%s” thành “%s”"
-#: merge-recursive.c:2121
+#: config.c:2313
#, c-format
-msgid "Could not parse object '%s'"
-msgstr "Không thể phân tích đối tượng “%s”"
+msgid "could not unset '%s'"
+msgstr "không thể thôi đặt “%s”"
-#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
-msgid "Unable to write index."
-msgstr "Không thể ghi bảng mục lục"
+#: connect.c:49
+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"
-#: notes-utils.c:41
-msgid "Cannot commit uninitialized/unreferenced notes tree"
+#: connect.c:51
+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ể chuyển giao cây ghi chú chưa được khởi tạo hoặc không được tham "
-"chiếu"
+"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ó."
-#: notes-utils.c:100
+#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
+msgid "Checking connectivity"
+msgstr "Đang kiểm tra kết nối"
+
+#: connected.c:75
+msgid "Could not run 'git rev-list'"
+msgstr "Không thể chạy “git rev-list”"
+
+#: connected.c:95
+msgid "failed write to rev-list"
+msgstr "gặp lỗi khi ghi vào rev-list"
+
+#: connected.c:102
+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:201
#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "Giá trị notes.rewriteMode sai: “%s”"
+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."
-#: notes-utils.c:110
+#: convert.c:205
#, 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/)"
+msgid "CRLF would be replaced by LF in %s."
+msgstr "CRLF nên được thay bằng LF trong %s."
-#. TRANSLATORS: The first %s is the name of the
-#. environment variable, the second %s is its value
-#: notes-utils.c:137
+#: convert.c:211
#, c-format
-msgid "Bad %s value: '%s'"
-msgstr "Giá trị %s sai: “%s”"
+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."
-#: object.c:242
+#: convert.c:215
#, c-format
-msgid "unable to parse object: %s"
-msgstr "không thể phân tích đối tượng: “%s”"
+msgid "LF would be replaced by CRLF in %s"
+msgstr "LF nên thay bằng CRLF trong %s"
-#: parse-options.c:572
-msgid "..."
-msgstr "…"
+#: date.c:97
+msgid "in the future"
+msgstr "trong tương lai"
-#: parse-options.c:590
+#: date.c:103
#, c-format
-msgid "usage: %s"
-msgstr "cách dùng: %s"
+msgid "%lu second ago"
+msgid_plural "%lu seconds ago"
+msgstr[0] "%lu giây trước"
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation
-#: parse-options.c:594
+#: date.c:110
#, c-format
-msgid " or: %s"
-msgstr " hoặc: %s"
+msgid "%lu minute ago"
+msgid_plural "%lu minutes ago"
+msgstr[0] "%lu phút trước"
-#: parse-options.c:597
+#: date.c:117
#, c-format
-msgid " %s"
-msgstr " %s"
-
-#: parse-options.c:631
-msgid "-NUM"
-msgstr "-SỐ"
+msgid "%lu hour ago"
+msgid_plural "%lu hours ago"
+msgstr[0] "%lu giờ trước"
-#: parse-options-cb.c:108
+#: date.c:124
#, c-format
-msgid "malformed object name '%s'"
-msgstr "tên đối tượng dị hình “%s”"
+msgid "%lu day ago"
+msgid_plural "%lu days ago"
+msgstr[0] "%lu ngày trước"
-#: path.c:798
+#: date.c:130
#, c-format
-msgid "Could not make %s writable by group"
-msgstr "Không thể làm %s được ghi bởi nhóm"
-
-#: pathspec.c:133
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
-msgstr ""
-"các cài đặt đặc tả đường dẫn “glob” và “noglob” toàn cục là xung khắc nhau"
-
-#: pathspec.c:143
-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 "%lu week ago"
+msgid_plural "%lu weeks ago"
+msgstr[0] "%lu tuần trước"
-#: pathspec.c:177
-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"
+#: date.c:137
+#, c-format
+msgid "%lu month ago"
+msgid_plural "%lu months ago"
+msgstr[0] "%lu tháng trước"
-#: pathspec.c:183
+#: date.c:148
#, 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”"
+msgid "%lu year"
+msgid_plural "%lu years"
+msgstr[0] "%lu năm"
-#: pathspec.c:187
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c:151
#, 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”"
+msgid "%s, %lu month ago"
+msgid_plural "%s, %lu months ago"
+msgstr[0] "%s, %lu tháng trước"
-#: pathspec.c:205
+#: date.c:156 date.c:161
#, 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”"
+msgid "%lu year ago"
+msgid_plural "%lu years ago"
+msgstr[0] "%lu năm trước"
-#: pathspec.c:230
+#: diffcore-order.c:24
#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
-msgstr "%s: “literal” và “glob” xung khắc nhau"
+msgid "failed to read orderfile '%s'"
+msgstr "gặp lỗi khi đọc tập-tin-thứ-tự “%s”"
-#: pathspec.c:241
+#: diffcore-rename.c:536
+msgid "Performing inexact rename detection"
+msgstr "Đang thực hiện dò tìm đổi tên không chính xác"
+
+#: diff.c:62
#, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s: “%s” ngoài một kho chứa"
+msgid "option '%s' requires a value"
+msgstr "tùy chọn “%s” yêu cầu một giá trị"
-#: pathspec.c:291
+#: diff.c:124
#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "Đặc tả đường dẫn “%s” thì ở trong mô-đun-con “%.*s”"
+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"
-#: pathspec.c:353
+#: diff.c:129
#, 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"
+msgid " Unknown dirstat parameter '%s'\n"
+msgstr " Không hiểu đối số dirstat “%s”\n"
-#: pathspec.c:433
+#: diff.c:283
#, 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"
+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”"
-#: pathspec.c:442
+#: diff.c:346
+#, c-format
msgid ""
-"There is nothing to exclude from by :(exclude) patterns.\n"
-"Perhaps you forgot to add either ':/' or '.' ?"
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
msgstr ""
-"Ở đây không có gì bị loại trừ bởi: các mẫu (loại trừ).\n"
-"Có lẽ bạn đã quên thêm hoặc là “:/” hoặc là “.”?"
+"Tìm thấy các lỗi trong biến cấu hình “diff.dirstat”:\n"
+"%s"
-#: pretty.c:973
-msgid "unable to parse --pretty format"
-msgstr "không thể phân tích định dạng --pretty"
+#: diff.c:3087
+#, 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"
-#: progress.c:235
-msgid "done"
-msgstr "xong"
+#: diff.c:3412
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+msgstr "--name-only, --name-status, --check và -s loại từ lẫn nhau"
-#: read-cache.c:1281
-#, 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"
+#: diff.c:3502
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow cần chính xác một đặc tả đường dẫn"
-#: read-cache.c:1291
+#: diff.c:3665
#, c-format
msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
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"
+"Gặp lỗi khi phân tích đối số tùy chọn --dirstat/-X:\n"
+"%s"
-#: refs.c:551 builtin/merge.c:840
+#: diff.c:3679
#, c-format
-msgid "Could not open '%s' for writing"
-msgstr "Không thể mở “%s” để ghi"
+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”"
-#: refs/files-backend.c:2534
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "không thể xóa bỏ tham chiếu %s: %s"
+#: diff.c:4700
+msgid "inexact rename detection was skipped due to too many files."
+msgstr ""
+"nhận thấy đổi tên không chính xác đã bị bỏ qua bởi có quá nhiều tập tin."
-#: refs/files-backend.c:2537
-#, c-format
-msgid "could not delete references: %s"
-msgstr "không thể xóa bỏ tham chiếu: %s"
+#: diff.c:4703
+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."
-#: refs/files-backend.c:2546
+#: diff.c:4706
#, c-format
-msgid "could not remove reference %s"
-msgstr "không thể gỡ bỏ tham chiếu: %s"
+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."
-#: ref-filter.c:55
-#, c-format
-msgid "expected format: %%(color:<color>)"
-msgstr "cần định dạng: %%(color:<color>)"
+#: dir.c:1866
+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"
-#: ref-filter.c:57
-#, c-format
-msgid "unrecognized color: %%(color:%s)"
-msgstr "không nhận ra màu: %%(màu:%s)"
+#: dir.c:1985
+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."
-#: ref-filter.c:71
-#, c-format
-msgid "unrecognized format: %%(%s)"
-msgstr "không nhận ra định dạng: %%(%s)"
+#: fetch-pack.c:213
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack: cần danh sách shallow"
-#: ref-filter.c:77
-#, c-format
-msgid "%%(body) does not take arguments"
-msgstr "%%(body) không nhận các đối số"
+#: fetch-pack.c:225
+msgid "git fetch-pack: expected ACK/NAK, got EOF"
+msgstr "git fetch-pack: cần ACK/NAK, nhưng lại nhận được EOF"
-#: ref-filter.c:84
+#: fetch-pack.c:243
#, c-format
-msgid "%%(subject) does not take arguments"
-msgstr "%%(subject) không nhận các đối số"
+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”"
-#: ref-filter.c:101
-#, c-format
-msgid "positive value expected contents:lines=%s"
-msgstr "cần nội dung mang giá trị dương:lines=%s"
+#: fetch-pack.c:295
+msgid "--stateless-rpc requires multi_ack_detailed"
+msgstr "--stateless-rpc cần multi_ack_detailed"
-#: ref-filter.c:103
+#: fetch-pack.c:381
#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "đối số không được thừa nhận %%(contents): %s"
+msgid "invalid shallow line: %s"
+msgstr "dòng shallow không hợp lệ: %s"
-#: ref-filter.c:113
+#: fetch-pack.c:387
#, c-format
-msgid "unrecognized %%(objectname) argument: %s"
-msgstr "đối số không được thừa nhận %%(objectname): %s"
+msgid "invalid unshallow line: %s"
+msgstr "dòng unshallow không hợp lệ: %s"
-#: ref-filter.c:135
+#: fetch-pack.c:389
#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
-msgstr "cần định dạng: %%(align:<width>,<position>)"
+msgid "object not found: %s"
+msgstr "Không tìm thấy đối tượng: %s"
-#: ref-filter.c:147
+#: fetch-pack.c:392
#, c-format
-msgid "unrecognized position:%s"
-msgstr "vị trí không được thừa nhận:%s"
+msgid "error in object: %s"
+msgstr "lỗi trong đối tượng: %s"
-#: ref-filter.c:151
+#: fetch-pack.c:394
#, c-format
-msgid "unrecognized width:%s"
-msgstr "chiều rộng không được thừa nhận:%s"
+msgid "no shallow found: %s"
+msgstr "không tìm shallow nào: %s"
-#: ref-filter.c:157
+#: fetch-pack.c:397
#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "đối số không được thừa nhận %%(align): %s"
+msgid "expected shallow/unshallow, got %s"
+msgstr "cần shallow/unshallow, nhưng lại nhận được %s"
-#: ref-filter.c:161
+#: fetch-pack.c:436
#, 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)"
+msgid "got %s %d %s"
+msgstr "nhận %s %d - %s"
-#: ref-filter.c:244
+#: fetch-pack.c:450
#, c-format
-msgid "malformed field name: %.*s"
-msgstr "tên trường dị hình: %.*s"
+msgid "invalid commit %s"
+msgstr "lần chuyển giao %s không hợp lệ"
-#: ref-filter.c:270
+#: fetch-pack.c:483
+msgid "giving up"
+msgstr "chịu thua"
+
+#: fetch-pack.c:493 progress.c:235
+msgid "done"
+msgstr "xong"
+
+#: fetch-pack.c:505
#, c-format
-msgid "unknown field name: %.*s"
-msgstr "không hiểu tên trường: %.*s"
+msgid "got %s (%d) %s"
+msgstr "nhận %s (%d) %s"
-#: ref-filter.c:372
+#: fetch-pack.c:551
#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
-msgstr "Ä\91á»\8bnh dạng: nguyên tá» %%(end) Ä\91ược dùng mà không có nguyên tá» tÆ°Æ¡ng ứng"
+msgid "Marking %s as complete"
+msgstr "Ä\90ánh dấu %s là Ä\91ã hoà n thà nh"
-#: ref-filter.c:424
+#: fetch-pack.c:697
#, c-format
-msgid "malformed format string %s"
-msgstr "chuỗi định dạng dị hình %s"
+msgid "already have %s (%s)"
+msgstr "đã sẵn có %s (%s)"
-#: ref-filter.c:878
-msgid ":strip= requires a positive integer argument"
-msgstr ":strip= cần một đối số nguyên dương"
+#: fetch-pack.c:735
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack: không thể rẽ nhánh sideband demultiplexer"
-#: ref-filter.c:883
-#, c-format
-msgid "ref '%s' does not have %ld components to :strip"
-msgstr "tham chiếu “%s” không có %ld thành phần để mà :strip"
+#: fetch-pack.c:743
+msgid "protocol error: bad pack header"
+msgstr "lỗi giao thức: phần đầu gói bị sai"
-#: ref-filter.c:1046
+#: fetch-pack.c:799
#, c-format
-msgid "unknown %.*s format %s"
-msgstr "Không hiểu định dạng %.*s %s"
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack: không thể rẽ nhánh %s"
-#: ref-filter.c:1066 ref-filter.c:1097
+#: fetch-pack.c:815
#, c-format
-msgid "missing object %s for %s"
-msgstr "thiếu đối tượng %s cho %s"
+msgid "%s failed"
+msgstr "%s gặp lỗi"
-#: ref-filter.c:1069 ref-filter.c:1100
+#: fetch-pack.c:817
+msgid "error in sideband demultiplexer"
+msgstr "có lỗi trong sideband demultiplexer"
+
+#: fetch-pack.c:844
+msgid "Server does not support shallow clients"
+msgstr "Máy chủ không hỗ trợ máy khách shallow"
+
+#: fetch-pack.c:848
+msgid "Server supports multi_ack_detailed"
+msgstr "Máy chủ hỗ trợ multi_ack_detailed"
+
+#: fetch-pack.c:851
+msgid "Server supports no-done"
+msgstr "Máy chủ hỗ trợ no-done"
+
+#: fetch-pack.c:857
+msgid "Server supports multi_ack"
+msgstr "Máy chủ hỗ trợ multi_ack"
+
+#: fetch-pack.c:861
+msgid "Server supports side-band-64k"
+msgstr "Máy chủ hỗ trợ side-band-64k"
+
+#: fetch-pack.c:865
+msgid "Server supports side-band"
+msgstr "Máy chủ hỗ trợ side-band"
+
+#: fetch-pack.c:869
+msgid "Server supports allow-tip-sha1-in-want"
+msgstr "Máy chủ hỗ trợ allow-tip-sha1-in-want"
+
+#: fetch-pack.c:873
+msgid "Server supports allow-reachable-sha1-in-want"
+msgstr "Máy chủ hỗ trợ allow-reachable-sha1-in-want"
+
+#: fetch-pack.c:883
+msgid "Server supports ofs-delta"
+msgstr "Máy chủ hỗ trợ ofs-delta"
+
+#: fetch-pack.c:890
#, c-format
-msgid "parse_object_buffer failed on %s for %s"
-msgstr "parse_object_buffer gặp lỗi trên %s cho %s"
+msgid "Server version is %.*s"
+msgstr "Phiên bản máy chủ là %.*s"
-#: ref-filter.c:1311
+#: fetch-pack.c:896
+msgid "Server does not support --shallow-since"
+msgstr "Máy chủ không hỗ trợ --shallow-since"
+
+#: fetch-pack.c:900
+msgid "Server does not support --shallow-exclude"
+msgstr "Máy chủ không hỗ trợ --shallow-exclude"
+
+#: fetch-pack.c:902
+msgid "Server does not support --deepen"
+msgstr "Máy chủ không hỗ trợ --deepen"
+
+#: fetch-pack.c:913
+msgid "no common commits"
+msgstr "không có lần chuyển giao chung nào"
+
+#: fetch-pack.c:925
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack: fetch gặp lỗi."
+
+#: fetch-pack.c:1087
+msgid "no matching remote head"
+msgstr "không khớp phần đầu máy chủ"
+
+#: gpg-interface.c:185
+msgid "gpg failed to sign the data"
+msgstr "gpg gặp lỗi khi ký dữ liệu"
+
+#: gpg-interface.c:215
+msgid "could not create temporary file"
+msgstr "không thể tạo tập tin tạm thời"
+
+#: gpg-interface.c:217
#, c-format
-msgid "malformed object at '%s'"
-msgstr "đối tượng dị hình tại “%s”"
+msgid "failed writing detached signature to '%s'"
+msgstr "gặp lỗi khi ghi chữ ký đính kèm vào “%s”"
-#: ref-filter.c:1373
+#: grep.c:1782
#, c-format
-msgid "ignoring ref with broken name %s"
-msgstr "đang lờ đi tham chiếu với tên hỏng %s"
+msgid "'%s': unable to read %s"
+msgstr "“%s”: không thể đọc %s"
-#: ref-filter.c:1378
+#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155
#, c-format
-msgid "ignoring broken ref %s"
-msgstr "đang lờ đi tham chiếu hỏng %s"
+msgid "failed to stat '%s'"
+msgstr "gặp lỗi khi lấy thống kê về “%s”"
-#: ref-filter.c:1651
+#: grep.c:1810
#, c-format
-msgid "format: %%(end) atom missing"
-msgstr "định dạng: thiếu nguyên tử %%(end)"
+msgid "'%s': short read"
+msgstr "“%s”: đọc ngắn"
-#: ref-filter.c:1705
+#: help.c:203
#, c-format
-msgid "malformed object name %s"
-msgstr "tên đối tượng dị hình %s"
+msgid "available git commands in '%s'"
+msgstr "các lệnh git sẵn có trong thư mục “%s”:"
-#: remote.c:746
+#: help.c:210
+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:241
+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:306
#, c-format
-msgid "Cannot fetch both %s and %s to %s"
-msgstr "Không thể lấy về cả %s và %s cho %s"
+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?"
-#: remote.c:750
+#: help.c:361
+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:383
#, c-format
-msgid "%s usually tracks %s, not %s"
-msgstr "%s thường theo dõi %s, không phải %s"
+msgid ""
+"WARNING: You called a Git command named '%s', which does not exist.\n"
+"Continuing under the assumption that you meant '%s'"
+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.\n"
+"Tiếp tục và coi rằng ý bạn là “%s”"
-#: remote.c:754
+#: help.c:388
#, c-format
-msgid "%s tracks both %s and %s"
-msgstr "%s theo dõi cả %s và %s"
+msgid "in %0.1f seconds automatically..."
+msgstr "trong %0.1f giây một cách tự động…"
-#: remote.c:762
-msgid "Internal error"
-msgstr "Lỗi nội bộ"
+#: help.c:395
+#, 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”."
-#: remote.c:1677 remote.c:1720
-msgid "HEAD does not point to a branch"
-msgstr "HEAD không chỉ đến một nhánh nào cả"
+#: help.c:399 help.c:465
+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?"
-#: remote.c:1686
+#: help.c:461
#, c-format
-msgid "no such branch: '%s'"
-msgstr "không có nhánh nào như thế: “%s”"
+msgid "%s: %s - %s"
+msgstr "%s: %s - %s"
-#: remote.c:1689
-#, 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”"
+#: ident.c:334
+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"
-#: remote.c:1695
+#: lockfile.c:152
#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
+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 ""
-"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ủ"
+"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."
-#: remote.c:1710
+#: lockfile.c:160
#, 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ộ"
+msgid "Unable to create '%s.lock': %s"
+msgstr "Không thể tạo “%s.lock”: %s"
-#: remote.c:1725
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "gặp lỗi khi đọc bộ nhớ đệm"
+
+#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374
+#: builtin/checkout.c:588 builtin/clone.c:731
+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"
+
+#: merge-recursive.c:209
+msgid "(bad commit)\n"
+msgstr "(commit sai)\n"
+
+#: merge-recursive.c:231
#, c-format
-msgid "branch '%s' has no remote for pushing"
-msgstr "nhánh “%s” không có máy chủ để đẩy lên"
+msgid "addinfo_cache failed for path '%s'"
+msgstr "addinfo_cache gặp lỗi đối với đường dẫn “%s”"
-#: remote.c:1736
+#: merge-recursive.c:301
+msgid "error building trees"
+msgstr "gặp lỗi khi xây dựng cây"
+
+#: merge-recursive.c:720
#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
-msgstr "đẩy refspecs cho “%s” không bao gồm “%s”"
+msgid "failed to create path '%s'%s"
+msgstr "gặp lỗi khi tạo đường dẫn “%s”%s"
-#: remote.c:1749
-msgid "push has no destination (push.default is 'nothing')"
-msgstr "đẩy lên mà không có đích (push.default là “nothing”)"
+#: merge-recursive.c:731
+#, 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"
-#: remote.c:1771
-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"
+#: merge-recursive.c:745 merge-recursive.c:764
+msgid ": perhaps a D/F conflict?"
+msgstr ": có lẽ là một xung đột D/F?"
-#: remote.c:2073
+#: merge-recursive.c:754
#, 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 "refusing to lose untracked file at '%s'"
+msgstr "từ chối đóng tập tin không được theo dõi tại “%s”"
-#: remote.c:2077
-msgid " (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr " (dùng \" git branch --unset-upstream\" để sửa)\n"
+#: merge-recursive.c:796 builtin/cat-file.c:34
+#, c-format
+msgid "cannot read object %s '%s'"
+msgstr "không thể đọc đối tượng %s “%s”"
+
+#: merge-recursive.c:798
+#, c-format
+msgid "blob expected for %s '%s'"
+msgstr "đối tượng blob được mong đợi cho %s “%s”"
+
+#: merge-recursive.c:822
+#, c-format
+msgid "failed to open '%s': %s"
+msgstr "gặp lỗi khi mở “%s”: %s"
-#: remote.c:2080
+#: merge-recursive.c:833
#, 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"
+msgid "failed to symlink '%s': %s"
+msgstr "gặp lỗi khi tạo liên kết mềm (symlink) “%s”: %s"
-#: remote.c:2084
+#: merge-recursive.c:838
#, 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 "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”"
-#: remote.c:2090
-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"
+#: merge-recursive.c:978
+msgid "Failed to execute internal merge"
+msgstr "Gặp lỗi khi thực hiện trộn nội bộ"
-#: remote.c:2093
+#: merge-recursive.c:982
#, 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:2101
-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"
+msgid "Unable to add %s to database"
+msgstr "Không thể thêm %s vào cơ sở dữ liệu"
-#: remote.c:2104
+#: merge-recursive.c:1081 merge-recursive.c:1095
#, 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:2114
-msgid " (use \"git pull\" to merge the remote branch into yours)\n"
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
msgstr ""
-" (dùng \"git pull\" để hòa trộn nhánh trên máy chủ vào trong nhánh của "
-"bạn)\n"
-
-#: revision.c:2132
-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"
+"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)."
-#: revision.c:2135
+#: merge-recursive.c:1087 merge-recursive.c:1100
#, 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 ""
+"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."
-#: revision.c:2329
-msgid "--first-parent is incompatible with --bisect"
-msgstr "--first-parent xung khắc với --bisect"
+#: merge-recursive.c:1143
+msgid "rename"
+msgstr "đổi tên"
-#: run-command.c:92
-msgid "open /dev/null failed"
-msgstr "gặp lỗi khi mở “/dev/null”"
+#: merge-recursive.c:1143
+msgid "renamed"
+msgstr "đã đổi tên"
-#: run-command.c:94
+#: merge-recursive.c:1200
#, c-format
-msgid "dup2(%d,%d) failed"
-msgstr "dup2(%d,%d) gặp lỗi"
-
-#: send-pack.c:298
-msgid "failed to sign the push certificate"
-msgstr "gặp lỗi khi ký chứng thực đẩy"
-
-#: send-pack.c:411
-msgid "the receiving end does not support --signed push"
-msgstr "kết thúc nhận không hỗ trợ đẩy --signed"
+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"
-#: send-pack.c:413
+#: merge-recursive.c:1225
+#, c-format
msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
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:425
-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:430
-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"
+"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"
-#: sequencer.c:174
-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 <đường_dẫn>” hoặc “git rm <đường_dẫn>”"
+#: merge-recursive.c:1230
+msgid " (left unresolved)"
+msgstr " (cần giải quyết)"
-#: sequencer.c:177
-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'"
+#: merge-recursive.c:1292
+#, c-format
+msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
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 <đường_dẫn>” hoặc “git rm <đường_dẫn>”\n"
-"và chuyển giao kết quả bằng lệnh “git commit”"
+"XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên %s->%s trong %s. Đổi tên %s->%s trong %s"
-#: sequencer.c:190 sequencer.c:841 sequencer.c:924
+#: merge-recursive.c:1325
#, c-format
-msgid "Could not write to %s"
-msgstr "Không thể ghi vào %s"
+msgid "Renaming %s to %s and %s to %s instead"
+msgstr "Đang đổi tên %s thành %s thay vì %s thành %s"
-#: sequencer.c:193 sequencer.c:843 sequencer.c:928
+#: merge-recursive.c:1531
#, c-format
-msgid "Error wrapping up %s."
-msgstr "Lỗi bao bọc %s."
-
-#: sequencer.c:208
-msgid "Your local changes would be overwritten by cherry-pick."
-msgstr "Các thay đổi nội bộ của bạn có thể bị ghi đè bởi lệnh cherry-pick."
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
+msgstr ""
+"XUNG ĐỘT (đổi-tên/thêm): Đổi tên %s->%s trong %s. %s được thêm vào trong %s"
-#: sequencer.c:210
-msgid "Your local changes would be overwritten by revert."
-msgstr "Các thay đổi nội bộ của bạn có thể bị ghi đè bởi lệnh hoàn nguyên."
+#: merge-recursive.c:1546
+#, c-format
+msgid "Adding merged %s"
+msgstr "Thêm hòa trộn %s"
-#: sequencer.c:213
-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ý."
+#: merge-recursive.c:1553 merge-recursive.c:1766
+#, c-format
+msgid "Adding as %s instead"
+msgstr "Thay vào đó thêm vào %s"
-#: sequencer.c:228
+#: merge-recursive.c:1610
#, c-format
-msgid "%s: fast-forward"
-msgstr "%s: chuyển-tiếp-nhanh"
+msgid "cannot read object %s"
+msgstr "không thể đọc đối tượng %s"
-#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:303
+#: merge-recursive.c:1613
#, 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 "object %s is not a blob"
+msgstr "đối tượng %s không phải là một blob"
+
+#: merge-recursive.c:1666
+msgid "modify"
+msgstr "sửa đổi"
+
+#: merge-recursive.c:1666
+msgid "modified"
+msgstr "đã sửa"
-#: sequencer.c:321
-msgid "Could not resolve HEAD commit\n"
-msgstr "Không thể phân giải lần chuyển giao HEAD\n"
+#: merge-recursive.c:1676
+msgid "content"
+msgstr "nội dung"
-#: sequencer.c:341
-msgid "Unable to update cache tree\n"
-msgstr "Không thể cập nhật cây bộ nhớ đệm\n"
+#: merge-recursive.c:1683
+msgid "add/add"
+msgstr "thêm/thêm"
-#: sequencer.c:393
+#: merge-recursive.c:1718
#, c-format
-msgid "Could not parse commit %s\n"
-msgstr "Không thể phân tích lần chuyển giao %s\n"
+msgid "Skipped %s (merged same as existing)"
+msgstr "Đã bỏ qua %s (đã có sẵn lần hòa trộn này)"
-#: sequencer.c:398
+#: merge-recursive.c:1732
#, c-format
-msgid "Could not parse parent commit %s\n"
-msgstr "Không thể phân tích lần chuyển giao cha mẹ “%s”\n"
+msgid "Auto-merging %s"
+msgstr "Tự-động-hòa-trộn %s"
-#: sequencer.c:463
-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."
+#: merge-recursive.c:1736 git-submodule.sh:924
+msgid "submodule"
+msgstr "mô-đun-con"
-#: sequencer.c:482
+#: merge-recursive.c:1737
#, 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."
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "XUNG ĐỘT (%s): Xung đột hòa trộn trong %s"
-#: sequencer.c:490
+#: merge-recursive.c:1831
#, c-format
-msgid "Commit %s does not have parent %d"
-msgstr "Lần chuyển giao %s không có cha mẹ %d"
+msgid "Removing %s"
+msgstr "Đang xóa %s"
-#: sequencer.c:494
-#, c-format
-msgid "Mainline was specified but commit %s is not a merge."
-msgstr ""
-"Luồng chính đã được chỉ ra nhưng lần chuyển giao %s không phải là một lần "
-"hòa trộn."
+#: merge-recursive.c:1857
+msgid "file/directory"
+msgstr "tập-tin/thư-mục"
-#. TRANSLATORS: The first %s will be "revert" or
-#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:507
-#, 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"
+#: merge-recursive.c:1863
+msgid "directory/file"
+msgstr "thư-mục/tập-tin"
-#: sequencer.c:511
+#: merge-recursive.c:1868
#, c-format
-msgid "Cannot get commit message for %s"
-msgstr "Không thể lấy ghi chú lần chuyển giao cho %s"
+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"
-#: sequencer.c:597
+#: merge-recursive.c:1877
#, c-format
-msgid "could not revert %s... %s"
-msgstr "không thể hoàn nguyên %s… %s"
+msgid "Adding %s"
+msgstr "Thêm \"%s\""
+
+#: merge-recursive.c:1914
+msgid "Already up-to-date!"
+msgstr "Đã cập nhật rồi!"
-#: sequencer.c:598
+#: merge-recursive.c:1923
#, c-format
-msgid "could not apply %s... %s"
-msgstr "không thể áp dụng miếng vá %s… %s"
+msgid "merging of trees %s and %s failed"
+msgstr "hòa trộn các cây %s và %s gặp lỗi"
-#: sequencer.c:633
-msgid "empty commit set passed"
-msgstr "lần chuyển giao trống rỗng đặt là hợp quy cách"
+#: merge-recursive.c:2006
+msgid "Merging:"
+msgstr "Đang trộn:"
-#: sequencer.c:641
+#: merge-recursive.c:2019
#, c-format
-msgid "git %s: failed to read the index"
-msgstr "git %s: gặp lỗi đọc bảng mục lục"
+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:2058
+msgid "merge returned no commit"
+msgstr "hòa trộn không trả về lần chuyển giao nào"
-#: sequencer.c:645
+#: merge-recursive.c:2121
#, 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"
+msgid "Could not parse object '%s'"
+msgstr "Không thể phân tích đối tượng “%s”"
-#: sequencer.c:705
-msgid "Cannot revert during another revert."
-msgstr "Không thể hoàn nguyên trong khi có hoàn nguyên khác."
+#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
+msgid "Unable to write index."
+msgstr "Không thể ghi bảng mục lục"
-#: sequencer.c:706
-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."
+#: notes-merge.c:273
+#, 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."
-#: sequencer.c:709
-msgid "Cannot cherry-pick during a revert."
-msgstr "Không thể cherry-pick trong khi hoàn nguyên."
+#: notes-merge.c:280
+#, 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)."
-#: sequencer.c:710
-msgid "Cannot cherry-pick during another cherry-pick."
+#: notes-utils.c:41
+msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
-"Không thể thực hiện việc cherry-pick trong khi khi đang cherry-pick khác."
+"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"
-#: sequencer.c:732
+#: notes-utils.c:100
#, c-format
-msgid "Could not parse line %d."
-msgstr "Không phân tích được dòng %d."
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "Giá trị notes.rewriteMode sai: “%s”"
-#: sequencer.c:737
-msgid "No commits parsed."
-msgstr "Không có lần chuyển giao nào được phân tích."
+#: notes-utils.c:110
+#, 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/)"
-#: sequencer.c:749
+#. TRANSLATORS: The first %s is the name of the
+#. environment variable, the second %s is its value
+#: notes-utils.c:137
#, c-format
-msgid "Could not open %s"
-msgstr "Không thể mở %s"
+msgid "Bad %s value: '%s'"
+msgstr "Giá trị %s sai: “%s”"
-#: sequencer.c:753
+#: object.c:242
#, c-format
-msgid "Could not read %s."
-msgstr "Không thể đọc %s."
+msgid "unable to parse object: %s"
+msgstr "không thể phân tích đối tượng: “%s”"
-#: sequencer.c:760
-#, c-format
-msgid "Unusable instruction sheet: %s"
-msgstr "Bảng chỉ thị không thể dùng được: %s"
+#: parse-options.c:572
+msgid "..."
+msgstr "…"
-#: sequencer.c:790
+#: parse-options.c:590
#, c-format
-msgid "Invalid key: %s"
-msgstr "Khóa không đúng: %s"
+msgid "usage: %s"
+msgstr "cách dùng: %s"
-#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation
+#: parse-options.c:594
#, c-format
-msgid "Invalid value for %s: %s"
-msgstr "Giá trị không hợp lệ %s: %s"
+msgid " or: %s"
+msgstr " hoặc: %s"
-#: sequencer.c:803
+#: parse-options.c:597
#, c-format
-msgid "Malformed options sheet: %s"
-msgstr "Bảng tùy chọn dị hình: %s"
+msgid " %s"
+msgstr " %s"
-#: sequencer.c:822
-msgid "a cherry-pick or revert is already in progress"
-msgstr "có một thao tác “cherry-pick” hoặc “revert” đang được thực hiện"
+#: parse-options.c:631
+msgid "-NUM"
+msgstr "-SỐ"
-#: sequencer.c:823
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
-msgstr "hãy thử \"git cherry-pick (--continue | --quit | --abort)\""
+#: parse-options-cb.c:108
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "tên đối tượng dị hình “%s”"
-#: sequencer.c:827
+#: path.c:826
#, 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 make %s writable by group"
+msgstr "Không thể làm %s được ghi bởi nhóm"
-#: sequencer.c:862 sequencer.c:998
-msgid "no cherry-pick or revert in progress"
-msgstr "không cherry-pick hay hoàn nguyên trong tiến trình"
+#: pathspec.c:133
+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"
-#: sequencer.c:864
-msgid "cannot resolve HEAD"
-msgstr "không thể phân giải HEAD"
+#: pathspec.c:143
+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"
-#: sequencer.c:866 sequencer.c:900
-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"
+#: pathspec.c:177
+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"
-#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970
+#: pathspec.c:183
#, c-format
-msgid "cannot open %s"
-msgstr "không mở được “%s”"
+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”"
-#: sequencer.c:888
+#: pathspec.c:187
#, c-format
-msgid "cannot read %s: %s"
-msgstr "không thể đọc %s: %s"
+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”"
-#: sequencer.c:889
-msgid "unexpected end of file"
-msgstr "gặp kết thúc tập tin đột xuất"
+#: pathspec.c:205
+#, 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”"
-#: sequencer.c:895
+#: pathspec.c:230
#, 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 "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s: “literal” và “glob” xung khắc nhau"
-#: sequencer.c:921
+#: pathspec.c:241
#, c-format
-msgid "Could not format %s."
-msgstr "Không thể định dạng “%s”."
+msgid "%s: '%s' is outside repository"
+msgstr "%s: “%s” ngoài một kho chứa"
-#: sequencer.c:1066
+#: pathspec.c:291
#, c-format
-msgid "%s: can't cherry-pick a %s"
-msgstr "%s: không thể cherry-pick một %s"
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "Đặc tả đường dẫn “%s” thì ở trong mô-đun-con “%.*s”"
-#: sequencer.c:1069
+#: pathspec.c:353
#, c-format
-msgid "%s: bad revision"
-msgstr "%s: điểm xét duyệt sai"
+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"
-#: sequencer.c:1102
-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"
+#: pathspec.c:408
+msgid ""
+"empty strings as pathspecs will be made invalid in upcoming releases. please "
+"use . instead if you meant to match all paths"
+msgstr ""
+"chuỗi rỗng làm đặc tả đường dẫn không hợp lệ ở lần phát hành kế tiếp. Vui "
+"lòng dùng . để thay thế nếu ý bạn là khớp mọi đường dẫn"
-#: setup.c:160
+#: pathspec.c:440
#, 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:449
msgid ""
-"%s: no such path in the working tree.\n"
-"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+"There is nothing to exclude from by :(exclude) patterns.\n"
+"Perhaps you forgot to add either ':/' or '.' ?"
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ộ."
+"Ở đây không có gì bị loại trừ bởi: các mẫu (loại trừ).\n"
+"Có lẽ bạn đã quên thêm hoặc là “:/” hoặc là “.”?"
-#: setup.c:173
+#: pretty.c:971
+msgid "unable to parse --pretty format"
+msgstr "không thể phân tích định dạng --pretty"
+
+#: read-cache.c:1315
#, 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>...]'"
+"index.version set, but the value is invalid.\n"
+"Using version %i"
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>…]”"
+"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"
-#: setup.c:223
+#: read-cache.c:1325
#, c-format
msgid ""
-"ambiguous argument '%s': both revision and filename\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
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>…]”"
+"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"
-#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419
+#: refs.c:576 builtin/merge.c:840
#, c-format
-msgid "failed to read %s"
-msgstr "gặp lỗi khi đọc %s"
+msgid "Could not open '%s' for writing"
+msgstr "Không thể mở “%s” để ghi"
-#: setup.c:468
+#: refs/files-backend.c:2481
#, 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 "could not delete reference %s: %s"
+msgstr "không thể xóa bỏ tham chiếu %s: %s"
-#: setup.c:476
-msgid "unknown repository extensions found:"
-msgstr "tìm thấy phần mở rộng kho chưa biết:"
+#: refs/files-backend.c:2484
+#, c-format
+msgid "could not delete references: %s"
+msgstr "không thể xóa bỏ tham chiếu: %s"
-#: setup.c:762
+#: refs/files-backend.c:2493
#, 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"
+msgid "could not remove reference %s"
+msgstr "không thể gỡ bỏ tham chiếu: %s"
-#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
-msgid "Cannot come back to cwd"
-msgstr "Không thể quay lại cwd"
+#: ref-filter.c:55
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "cần định dạng: %%(color:<color>)"
-#: setup.c:845
-msgid "Unable to read current working directory"
-msgstr "Không thể đọc thư mục làm việc hiện hành"
+#: ref-filter.c:57
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr "không nhận ra màu: %%(màu:%s)"
-#: setup.c:920
+#: ref-filter.c:71
#, 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 đ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)."
+msgid "unrecognized format: %%(%s)"
+msgstr "không nhận ra định dạng: %%(%s)"
-#: setup.c:927
+#: ref-filter.c:77
#, c-format
-msgid "Cannot change to '%s/..'"
-msgstr "Không thể chuyển sang “%s/..”"
+msgid "%%(body) does not take arguments"
+msgstr "%%(body) không nhận các đối số"
-#: setup.c:989
+#: ref-filter.c:84
#, 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 gía 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 "%%(subject) does not take arguments"
+msgstr "%%(subject) không nhận các đối số"
-#: sha1_file.c:1046
-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 à?)"
+#: ref-filter.c:101
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "cần nội dung mang giá trị dương:lines=%s"
-#: sha1_file.c:2434
+#: ref-filter.c:103
#, 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 à?)"
+msgid "unrecognized %%(contents) argument: %s"
+msgstr "đối số không được thừa nhận %%(contents): %s"
-#: sha1_file.c:2438
+#: ref-filter.c:113
#, 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 à?)"
+msgid "unrecognized %%(objectname) argument: %s"
+msgstr "đối số không được thừa nhận %%(objectname): %s"
-#: sha1_name.c:462
-msgid ""
-"Git normally never creates a ref that ends with 40 hex characters\n"
-"because it will be ignored when you just specify 40-hex. These refs\n"
-"may be created by mistake. For example,\n"
-"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
-"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
-msgstr ""
-"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 checkout -b $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\""
+#: ref-filter.c:135
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "cần định dạng: %%(align:<width>,<position>)"
-#: submodule.c:64 submodule.c:98
-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"
+#: ref-filter.c:147
+#, c-format
+msgid "unrecognized position:%s"
+msgstr "vị trí không được thừa nhận:%s"
-#: submodule.c:68 submodule.c:102
+#: ref-filter.c:151
+#, c-format
+msgid "unrecognized width:%s"
+msgstr "chiều rộng không được thừa nhận:%s"
+
+#: ref-filter.c:157
+#, c-format
+msgid "unrecognized %%(align) argument: %s"
+msgstr "đối số không được thừa nhận %%(align): %s"
+
+#: ref-filter.c:161
+#, 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:244
#, 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"
+msgid "malformed field name: %.*s"
+msgstr "tên trường dị hình: %.*s"
-#: submodule.c:76
+#: ref-filter.c:270
#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "Không thể cập nhật mục .gitmodules %s"
+msgid "unknown field name: %.*s"
+msgstr "không hiểu tên trường: %.*s"
-#: submodule.c:109
+#: ref-filter.c:372
#, c-format
-msgid "Could not remove .gitmodules entry for %s"
-msgstr "Không thể gỡ bỏ mục .gitmodules dành cho %s"
+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"
-#: submodule.c:120
-msgid "staging updated .gitmodules failed"
-msgstr "gặp lỗi khi tổ chức .gitmodules đã cập nhật"
+#: ref-filter.c:424
+#, c-format
+msgid "malformed format string %s"
+msgstr "chuỗi định dạng dị hình %s"
-#: submodule.c:177
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "không cho phép giá trị âm ở submodule.fetchJobs"
+#: ref-filter.c:878
+msgid ":strip= requires a positive integer argument"
+msgstr ":strip= cần một đối số nguyên dương"
-#: submodule-config.c:358
+#: ref-filter.c:883
#, c-format
-msgid "invalid value for %s"
-msgstr "giá trị cho %s không hợp lệ"
+msgid "ref '%s' does not have %ld components to :strip"
+msgstr "tham chiếu “%s” không có %ld thành phần để mà :strip"
-#: trailer.c:237
+#: ref-filter.c:1046
#, c-format
-msgid "running trailer command '%s' failed"
-msgstr "chạy lệnh kéo theo “%s” gặp lỗi"
+msgid "unknown %.*s format %s"
+msgstr "Không hiểu định dạng %.*s %s"
-#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558
-#: trailer.c:562
+#: ref-filter.c:1066 ref-filter.c:1097
#, c-format
-msgid "unknown value '%s' for key '%s'"
-msgstr "không hiểu giá trị “%s” cho khóa “%s”"
+msgid "missing object %s for %s"
+msgstr "thiếu đối tượng %s cho %s"
-#: trailer.c:544 trailer.c:549 builtin/remote.c:289
+#: ref-filter.c:1069 ref-filter.c:1100
#, c-format
-msgid "more than one %s"
-msgstr "nhiều hơn một %s"
+msgid "parse_object_buffer failed on %s for %s"
+msgstr "parse_object_buffer gặp lỗi trên %s cho %s"
-#: trailer.c:582
+#: ref-filter.c:1311
#, c-format
-msgid "empty trailer token in trailer '%.*s'"
-msgstr "thẻ thừa trống rỗng trong phần thừa “%.*s”"
+msgid "malformed object at '%s'"
+msgstr "đối tượng dị hình tại “%s”"
-#: trailer.c:702
+#: ref-filter.c:1373
#, c-format
-msgid "could not read input file '%s'"
-msgstr "không đọc được tập tin đầu vào “%s”"
-
-#: trailer.c:705
-msgid "could not read from stdin"
-msgstr "không thể đọc từ đầu vào tiêu chuẩn"
+msgid "ignoring ref with broken name %s"
+msgstr "đang lờ đi tham chiếu với tên hỏng %s"
-#: trailer.c:857 builtin/am.c:42
+#: ref-filter.c:1378
#, c-format
-msgid "could not stat %s"
-msgstr "không thể lấy thông tin thống kê về %s"
+msgid "ignoring broken ref %s"
+msgstr "đang lờ đi tham chiếu hỏng %s"
-#: trailer.c:859
+#: ref-filter.c:1633
#, c-format
-msgid "file %s is not a regular file"
-msgstr "\"%s\" không phải là tập tin bình thường"
+msgid "format: %%(end) atom missing"
+msgstr "định dạng: thiếu nguyên tử %%(end)"
-#: trailer.c:861
+#: ref-filter.c:1687
#, 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:873
-msgid "could not open temporary file"
-msgstr "không thể tạo tập tin tạm thời"
+msgid "malformed object name %s"
+msgstr "tên đối tượng dị hình %s"
-#: trailer.c:912
+#: remote.c:746
#, 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 "Cannot fetch both %s and %s to %s"
+msgstr "Không thể lấy về cả %s và %s cho %s"
-#: transport.c:62
+#: remote.c:750
#, 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"
+msgid "%s usually tracks %s, not %s"
+msgstr "%s thường theo dõi %s, không phải %s"
-#: transport.c:151
+#: remote.c:754
#, 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 "%s tracks both %s and %s"
+msgstr "%s theo dõi cả %s và %s"
-#: transport.c:771
-#, 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"
+#: remote.c:762
+msgid "Internal error"
+msgstr "Lỗi nội bộ"
-#: transport.c:775
-#, 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"
+#: remote.c:1677 remote.c:1720
+msgid "HEAD does not point to a branch"
+msgstr "HEAD không chỉ đến một nhánh nào cả"
-#: transport.c:783
-msgid "Aborting."
-msgstr "Bãi bỏ."
+#: remote.c:1686
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "không có nhánh nào như thế: “%s”"
-#: transport-helper.c:1041
+#: remote.c:1689
#, c-format
-msgid "Could not read ref %s"
-msgstr "Không thể đọc tham chiếu %s"
+msgid "no upstream configured for branch '%s'"
+msgstr "không có thượng nguồn được cấu hình cho nhánh “%s”"
-#: unpack-trees.c:64
+#: remote.c:1695
#, 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."
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
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."
+"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ủ"
-#: unpack-trees.c:66
+#: remote.c:1710
#, 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"
+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ộ"
-#: unpack-trees.c:69
+#: remote.c:1725
#, 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."
+msgid "branch '%s' has no remote for pushing"
+msgstr "nhánh “%s” không có máy chủ để đẩy lên"
-#: unpack-trees.c:71
+#: remote.c:1736
#, 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"
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "đẩy refspecs cho “%s” không bao gồm “%s”"
-#: unpack-trees.c:74
+#: remote.c:1749
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "đẩy lên mà không có đích (push.default là “nothing”)"
+
+#: remote.c:1771
+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:2073
#, 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."
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
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."
+"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"
-#: unpack-trees.c:76
+#: remote.c:2077
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr " (dùng \" git branch --unset-upstream\" để sửa)\n"
+
+#: remote.c:2080
#, 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"
+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"
-#: unpack-trees.c:81
+#: remote.c:2084
#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in it:\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 theo dõi trong "
-"nó:\n"
-"%s"
+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"
-#: unpack-trees.c:85
+#: remote.c:2090
+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:2093
#, 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."
+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:2101
+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"
-#: unpack-trees.c:87
+#: remote.c:2104
#, c-format
msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
+"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:2114
+msgid " (use \"git pull\" to merge the remote branch into yours)\n"
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"
+" (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"
-#: unpack-trees.c:90
+#: revision.c:2158
+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:2161
#, 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."
+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ả"
-#: unpack-trees.c:92
+#: revision.c:2355
+msgid "--first-parent is incompatible with --bisect"
+msgstr "--first-parent xung khắc với --bisect"
+
+#: run-command.c:106
+msgid "open /dev/null failed"
+msgstr "gặp lỗi khi mở “/dev/null”"
+
+#: run-command.c:108
#, c-format
+msgid "dup2(%d,%d) failed"
+msgstr "dup2(%d,%d) gặp lỗi"
+
+#: send-pack.c:297
+msgid "failed to sign the push certificate"
+msgstr "gặp lỗi khi ký chứng thực đẩy"
+
+#: send-pack.c:410
+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:412
msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
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"
+"đừ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"
-#: unpack-trees.c:95
-#, c-format
+#: send-pack.c:424
+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:429
+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:171
+msgid "revert"
+msgstr "hoàn nguyên"
+
+#: sequencer.c:171
+msgid "cherry-pick"
+msgstr "cherry-pick"
+
+#: sequencer.c:228
msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you %s."
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
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."
+"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 <đường_dẫn>” hoặc “git rm <đường_dẫn>”"
-#: unpack-trees.c:97
-#, c-format
+#: sequencer.c:231
msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
+"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 ""
-"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"
+"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 <đường_dẫn>” hoặc “git rm <đường_dẫn>”\n"
+"và chuyển giao kết quả bằng lệnh “git commit”"
-#: unpack-trees.c:102
+#: sequencer.c:244 sequencer.c:1209
#, 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."
+msgid "could not lock '%s'"
+msgstr "không thể khóa “%s”"
-#: unpack-trees.c:104
+#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214
#, 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"
+msgid "could not write to '%s'"
+msgstr "không thể ghi vào “%s”"
-#: unpack-trees.c:107
+#: sequencer.c:251
#, 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."
+msgid "could not write eol to '%s'"
+msgstr "không thể ghi eol vào “%s”"
-#: unpack-trees.c:109
+#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216
#, 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"
+msgid "failed to finalize '%s'."
+msgstr "gặp lỗi khi finalize “%s”"
-#: unpack-trees.c:112
+#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032
#, 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."
+msgid "could not read '%s'"
+msgstr "Không thể đọc “%s”."
-#: unpack-trees.c:114
+#: sequencer.c:305
#, 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"
+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."
-#: unpack-trees.c:121
+#: sequencer.c:309
+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:324
#, c-format
-msgid "Entry '%s' overlaps with '%s'. Cannot bind."
-msgstr "Mục “%s” đè lên “%s”. Không thể buộc."
+msgid "%s: fast-forward"
+msgstr "%s: chuyển-tiếp-nhanh"
-#: unpack-trees.c:124
+#. TRANSLATORS: %s will be "revert" or "cherry-pick"
+#: sequencer.c:399
#, c-format
-msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
-"%s"
-msgstr ""
-"Không thể cập nhật checkout rải rác: các mục tin sau đây chưa cập nhật:\n"
-"%s"
+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"
-#: unpack-trees.c:126
+#: sequencer.c:418
+msgid "could not resolve HEAD commit\n"
+msgstr "không thể phân giải lần chuyển giao HEAD\n"
+
+#: sequencer.c:438
+msgid "unable to update cache tree\n"
+msgstr "không thể cập nhật cây bộ nhớ đệm\n"
+
+#: sequencer.c:483
#, c-format
msgid ""
-"The following Working tree files would be overwritten by sparse checkout "
-"update:\n"
-"%s"
+"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 ""
-"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi cập "
-"nhật checkout rải rác:\n"
-"%s"
+"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"
-#: unpack-trees.c:128
+#: sequencer.c:567
#, c-format
-msgid ""
-"The following Working tree files would be removed by sparse checkout "
-"update:\n"
-"%s"
-msgstr ""
-"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị xóa bỏ bởi cập "
-"nhật checkout rải rác:\n"
-"%s"
+msgid "could not parse commit %s\n"
+msgstr "không thể phân tích lần chuyển giao %s\n"
-#: unpack-trees.c:205
+#: sequencer.c:572
#, c-format
-msgid "Aborting\n"
-msgstr "Bãi bỏ\n"
+msgid "could not parse parent commit %s\n"
+msgstr "không thể phân tích lần chuyển giao cha mẹ “%s”\n"
-#: unpack-trees.c:237
-msgid "Checking out files"
-msgstr "Đang lấy ra các tập tin"
+#: sequencer.c:656
+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."
-#: urlmatch.c:120
-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ố “://”"
+#: sequencer.c:675
+#, 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."
-#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#: sequencer.c:683
#, c-format
-msgid "invalid %XX escape sequence"
-msgstr "thoát chuỗi %XX không hợp lệ"
+msgid "commit %s does not have parent %d"
+msgstr "lần chuyển giao %s không có cha mẹ %d"
-#: urlmatch.c:172
-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:”"
+#: sequencer.c:687
+#, c-format
+msgid "mainline was specified but commit %s is not a merge."
+msgstr ""
+"luồng chính đã được chỉ ra nhưng lần chuyển giao %s không phải là một lần "
+"hòa trộn."
-#: urlmatch.c:189
-msgid "a 'file:' URL may not have a port number"
-msgstr "URL kiểu “file:” không được chứa cổng"
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#: sequencer.c:700
+#, 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"
-#: urlmatch.c:199
-msgid "invalid characters in host name"
-msgstr "có các ký tự không hợp lệ trong tên máy"
+#: sequencer.c:705
+#, c-format
+msgid "cannot get commit message for %s"
+msgstr "không thể lấy ghi chú lần chuyển giao cho %s"
-#: urlmatch.c:244 urlmatch.c:255
-msgid "invalid port number"
-msgstr "tên cổng không hợp lệ"
+#: sequencer.c:797
+#, c-format
+msgid "could not revert %s... %s"
+msgstr "không thể hoàn nguyên %s… %s"
-#: urlmatch.c:322
-msgid "invalid '..' path segment"
-msgstr "đoạn đường dẫn “..” không hợp lệ"
+#: sequencer.c:798
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "không thể áp dụng miếng vá %s… %s"
-#: worktree.c:282
+#: sequencer.c:833
+msgid "empty commit set passed"
+msgstr "lần chuyển giao trống rỗng đặt là hợp quy cách"
+
+#: sequencer.c:843
#, c-format
-msgid "failed to read '%s'"
-msgstr "gặp lỗi khi đọc “%s”"
+msgid "git %s: failed to read the index"
+msgstr "git %s: gặp lỗi đọc bảng mục lục"
-#: wrapper.c:222 wrapper.c:392
+#: sequencer.c:850
#, c-format
-msgid "could not open '%s' for reading and writing"
-msgstr "không thể mở “%s” để đọc và ghi"
+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"
-#: wrapper.c:224 wrapper.c:394 builtin/am.c:778
+#: sequencer.c:944
#, c-format
-msgid "could not open '%s' for writing"
-msgstr "không thể mở “%s” để ghi"
+msgid "invalid line %d: %.*s"
+msgstr "dòng không hợp lệ %d: %.*s"
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771
-#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029
-#: builtin/pull.c:407
+#: sequencer.c:950
+msgid "no commits parsed."
+msgstr "không có lần chuyển giao nào được phân tích."
+
+#: sequencer.c:966
#, c-format
-msgid "could not open '%s' for reading"
-msgstr "không thể mở “%s” để đọc"
+msgid "could not read '%s'."
+msgstr "không thể đọc “%s”."
-#: wrapper.c:605 wrapper.c:626
+#: sequencer.c:972
#, c-format
-msgid "unable to access '%s'"
-msgstr "không thể truy cập “%s”"
+msgid "unusable instruction sheet: '%s'"
+msgstr "bảng chỉ thị không thể dùng được: %s"
+
+#: sequencer.c:983
+msgid "cannot cherry-pick during a revert."
+msgstr "không thể cherry-pick trong khi hoàn nguyên."
+
+#: sequencer.c:985
+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."
-#: wrapper.c:634
-msgid "unable to get current working directory"
-msgstr "Không thể lấy thư mục làm việc hiện hành"
+#: sequencer.c:1028
+#, c-format
+msgid "invalid key: %s"
+msgstr "khóa không đúng: %s"
-#: wrapper.c:658
+#: sequencer.c:1031
#, c-format
-msgid "could not write to %s"
-msgstr "không thể ghi vào %s"
+msgid "invalid value for %s: %s"
+msgstr "giá trị cho %s không hợp lệ: %s"
-#: wrapper.c:660
+#: sequencer.c:1063
#, c-format
-msgid "could not close %s"
-msgstr "không thể đóng %s"
+msgid "malformed options sheet: '%s'"
+msgstr "bảng tùy chọn dị hình: “%s”"
-#: wt-status.c:150
-msgid "Unmerged paths:"
-msgstr "Những đường dẫn chưa được hòa trộn:"
+#: sequencer.c:1101
+msgid "a cherry-pick or revert is already in progress"
+msgstr "có một thao tác “cherry-pick” hoặc “revert” đang được thực hiện"
+
+#: sequencer.c:1102
+msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+msgstr "hãy thử \"git cherry-pick (--continue | --quit | --abort)\""
-#: wt-status.c:177 wt-status.c:204
+#: sequencer.c:1106
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr " (dùng \"git reset %s <tập-tin>…\" để bỏ ra khỏi bệ phóng)"
+msgid "could not create sequencer directory '%s'"
+msgstr "không thể tạo thư mục xếp dãy “%s”"
-#: wt-status.c:179 wt-status.c:206
-msgid " (use \"git rm --cached <file>...\" to unstage)"
-msgstr " (dùng \"git rm --cached <tập-tin>…\" để bỏ ra khỏi bệ phóng)"
+#: sequencer.c:1120
+msgid "could not lock HEAD"
+msgstr "không thể khóa HEAD"
-#: wt-status.c:183
-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)"
+#: sequencer.c:1151 sequencer.c:1289
+msgid "no cherry-pick or revert in progress"
+msgstr "không cherry-pick hay hoàn nguyên trong tiến trình"
-#: wt-status.c:185 wt-status.c:189
-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)"
+#: sequencer.c:1153
+msgid "cannot resolve HEAD"
+msgstr "không thể phân giải HEAD"
-#: wt-status.c:187
-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)"
+#: sequencer.c:1155 sequencer.c:1189
+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"
-#: wt-status.c:198 wt-status.c:882
-msgid "Changes to be committed:"
-msgstr "Những thay đổi sẽ được chuyển giao:"
+#: sequencer.c:1175 builtin/grep.c:578
+#, c-format
+msgid "cannot open '%s'"
+msgstr "không mở được “%s”"
-#: wt-status.c:216 wt-status.c:891
-msgid "Changes not staged for commit:"
-msgstr "Các thay đổi chưa được đặt lên bệ phóng để chuyển giao:"
+#: sequencer.c:1177
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "không thể đọc “%s”: %s"
-#: wt-status.c:220
-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)"
+#: sequencer.c:1178
+msgid "unexpected end of file"
+msgstr "gặp kết thúc tập tin đột xuất"
-#: wt-status.c:222
-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)"
+#: sequencer.c:1184
+#, 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"
-#: wt-status.c:223
+#: sequencer.c:1354
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s: không thể cherry-pick một %s"
+
+#: sequencer.c:1358
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s: điểm xét duyệt sai"
+
+#: sequencer.c:1391
+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"
+
+#: setup.c:160
+#, c-format
msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
msgstr ""
-" (dùng \"git checkout -- <tập-tin>…\" để loại bỏ các thay đổi trong thư mục "
-"làm việc)"
+"%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ộ."
-#: wt-status.c:225
-msgid " (commit or discard the untracked or modified content in submodules)"
+#: setup.c:173
+#, 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 ""
-" (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)"
+"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>…]”"
-#: wt-status.c:237
+#: setup.c:223
#, c-format
-msgid " (use \"git %s <file>...\" to include in what will be committed)"
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-" (dùng \"git %s <tập-tin>…\" để thêm vào những gì cần được chuyển giao)"
-
-#: wt-status.c:252
-msgid "both deleted:"
-msgstr "bị xóa bởi cả hai:"
-
-#: wt-status.c:254
-msgid "added by us:"
-msgstr "được thêm vào bởi chúng ta:"
+"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>…]”"
-#: wt-status.c:256
-msgid "deleted by them:"
-msgstr "bị xóa đi bởi họ:"
+#: setup.c:468
+#, 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"
-#: wt-status.c:258
-msgid "added by them:"
-msgstr "được thêm vào bởi họ:"
+#: setup.c:476
+msgid "unknown repository extensions found:"
+msgstr "tìm thấy phần mở rộng kho chưa biết:"
-#: wt-status.c:260
-msgid "deleted by us:"
-msgstr "bị xóa bởi chúng ta:"
+#: setup.c:762
+#, 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"
-#: wt-status.c:262
-msgid "both added:"
-msgstr "được thêm vào bởi cả hai:"
+#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
+msgid "Cannot come back to cwd"
+msgstr "Không thể quay lại cwd"
-#: wt-status.c:264
-msgid "both modified:"
-msgstr "bị sửa bởi cả hai:"
+#: setup.c:845
+msgid "Unable to read current working directory"
+msgstr "Không thể đọc thư mục làm việc hiện hành"
-#: wt-status.c:274
-msgid "new file:"
-msgstr "tập tin mới:"
+#: setup.c:920
+#, 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 đ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)."
-#: wt-status.c:276
-msgid "copied:"
-msgstr "đã chép:"
+#: setup.c:927
+#, c-format
+msgid "Cannot change to '%s/..'"
+msgstr "Không thể chuyển sang “%s/..”"
-#: wt-status.c:278
-msgid "deleted:"
-msgstr "đã xóa:"
+#: setup.c:989
+#, 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 gía 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."
-#: wt-status.c:280
-msgid "modified:"
-msgstr "đã sửa:"
+#: sha1_file.c:473
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "đường dẫn “%s” không tồn tại"
-#: wt-status.c:282
-msgid "renamed:"
-msgstr "đã đổi tên:"
+#: sha1_file.c:499
+#, 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ợ."
-#: wt-status.c:284
-msgid "typechange:"
-msgstr "đổi-kiểu:"
+#: sha1_file.c:505
+#, 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ộ."
-#: wt-status.c:286
-msgid "unknown:"
-msgstr "không hiểu:"
+#: sha1_file.c:511
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "kho tham chiếu “%s” là nông"
-#: wt-status.c:288
-msgid "unmerged:"
-msgstr "chưa hòa trộn:"
+#: sha1_file.c:519
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "kho tham chiếu “%s” bị cấy ghép"
-#: wt-status.c:370
-msgid "new commits, "
-msgstr "lần chuyển giao mới, "
+#: sha1_file.c:1159
+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 à?)"
-#: wt-status.c:372
-msgid "modified content, "
-msgstr "nội dung bị sửa đổi, "
+#: sha1_file.c:2592
+#, 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 à?)"
-#: wt-status.c:374
-msgid "untracked content, "
-msgstr "nội dung chưa được theo dõi, "
+#: sha1_file.c:2596
+#, 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 à?)"
-#: wt-status.c:756
-msgid "Submodules changed but not updated:"
-msgstr "Những mô-đun-con đã bị thay đổi nhưng chưa được cập nhật:"
+#: sha1_name.c:407
+#, c-format
+msgid "short SHA1 %s is ambiguous"
+msgstr "tóm lược SHA1 %s chưa rõ ràng"
-#: wt-status.c:758
-msgid "Submodule changes to be committed:"
-msgstr "Những mô-đun-con thay đổi đã được chuyển giao:"
+#: sha1_name.c:418
+msgid "The candidates are:"
+msgstr "Các ứng cử là:"
-#: wt-status.c:839
+#: sha1_name.c:578
msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+" git checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
msgstr ""
-"Không động đến đường ở trên.\n"
-"Mọi thứ phía dưới sẽ được xóa bỏ."
-
-#: wt-status.c:950
-msgid "You have unmerged paths."
-msgstr "Bạn có những đường dẫn chưa được hòa trộn."
-
-#: wt-status.c:953
-msgid " (fix conflicts and run \"git commit\")"
-msgstr " (sửa các xung đột rồi chạy \"git commit\")"
-
-#: wt-status.c:955
-msgid " (use \"git merge --abort\" to abort the merge)"
-msgstr " (dùng \"git merge --abort\" để bãi bỏ việc hòa trộn)"
+"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 checkout -b $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\""
-#: wt-status.c:960
-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."
+#: submodule.c:64 submodule.c:98
+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"
-#: wt-status.c:963
-msgid " (use \"git commit\" to conclude merge)"
-msgstr " (dùng \"git commit\" để hoàn tất việc hòa trộn)"
+#: submodule.c:68 submodule.c:102
+#, 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"
-#: wt-status.c:973
-msgid "You are in the middle of an am session."
-msgstr "Bạn đang ở giữa của một phiên “am”."
+#: submodule.c:76
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "Không thể cập nhật mục .gitmodules %s"
-#: wt-status.c:976
-msgid "The current patch is empty."
-msgstr "Miếng vá hiện tại bị trống rỗng."
+#: submodule.c:109
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "Không thể gỡ bỏ mục .gitmodules dành cho %s"
-#: wt-status.c:980
-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\")"
+#: submodule.c:120
+msgid "staging updated .gitmodules failed"
+msgstr "gặp lỗi khi tổ chức .gitmodules đã cập nhật"
-#: wt-status.c:982
-msgid " (use \"git am --skip\" to skip this patch)"
-msgstr " (dùng \"git am --skip\" để bỏ qua miếng vá này)"
+#: submodule.c:158
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "không cho phép giá trị âm ở submodule.fetchJobs"
-#: wt-status.c:984
-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)"
+#: submodule-config.c:358
+#, c-format
+msgid "invalid value for %s"
+msgstr "giá trị cho %s không hợp lệ"
-#: wt-status.c:1109
-msgid "No commands done."
-msgstr "Không thực hiện lệnh nào."
+#: trailer.c:238
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "chạy lệnh kéo theo “%s” gặp lỗi"
-#: wt-status.c:1112
+#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537
+#: trailer.c:541
#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
-msgstr[0] "Lệnh thực hiện cuối (%d lệnh được thực thi):"
+msgid "unknown value '%s' for key '%s'"
+msgstr "không hiểu giá trị “%s” cho khóa “%s”"
-#: wt-status.c:1123
+#: trailer.c:523 trailer.c:528 builtin/remote.c:289
#, c-format
-msgid " (see more in file %s)"
-msgstr " (xem thêm trong %s)"
+msgid "more than one %s"
+msgstr "nhiều hơn một %s"
-#: wt-status.c:1128
-msgid "No commands remaining."
-msgstr "Không có lệnh nào còn lại."
+#: trailer.c:672
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "thẻ thừa trống rỗng trong phần thừa “%.*s”"
-#: wt-status.c:1131
+#: trailer.c:695
#, c-format
-msgid "Next command to do (%d remaining command):"
-msgid_plural "Next commands to do (%d remaining commands):"
-msgstr[0] "Lệnh cần làm kế tiếp (%d lệnh còn lại):"
+msgid "could not read input file '%s'"
+msgstr "không đọc được tập tin đầu vào “%s”"
-#: wt-status.c:1139
-msgid " (use \"git rebase --edit-todo\" to view and edit)"
-msgstr " (dùng lệnh \"git rebase --edit-todo\" để xem và sửa)"
+#: trailer.c:698
+msgid "could not read from stdin"
+msgstr "không thể đọc từ đầu vào tiêu chuẩn"
-#: wt-status.c:1152
+#: trailer.c:929 builtin/am.c:44
#, 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 "could not stat %s"
+msgstr "không thể lấy thông tin thống kê về %s"
-#: wt-status.c:1157
-msgid "You are currently rebasing."
-msgstr "Bạn hiện nay đang thực hiện việc “rebase” (“cải tổ”)."
+#: trailer.c:931
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "\"%s\" không phải là tập tin bình thường"
-#: wt-status.c:1171
-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\")"
+#: trailer.c:933
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "tập tin %s người dùng không thể ghi được"
-#: wt-status.c:1173
-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)"
+#: trailer.c:945
+msgid "could not open temporary file"
+msgstr "không thể tạo tập tin tạm thời"
-#: wt-status.c:1175
-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)"
+#: trailer.c:983
+#, 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"
-#: wt-status.c:1181
-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\")"
+#: transport.c:62
+#, 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"
-#: wt-status.c:1185
+#: transport.c:151
+#, 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:817
#, c-format
msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
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”."
+"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"
-#: wt-status.c:1190
-msgid "You are currently splitting a commit during a rebase."
+#: transport.c:821
+#, 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 ""
-"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."
+"\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"
-#: wt-status.c:1193
-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\")"
+#: transport.c:829
+msgid "Aborting."
+msgstr "Bãi bỏ."
-#: wt-status.c:1197
+#: transport-helper.c:1075
#, 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 "Could not read ref %s"
+msgstr "Không thể đọc tham chiếu %s"
-#: wt-status.c:1202
-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."
+#: tree-walk.c:31
+msgid "too-short tree object"
+msgstr "đối tượng cây quá ngắn"
-#: wt-status.c:1205
-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)"
+#: tree-walk.c:37
+msgid "malformed mode in tree entry"
+msgstr "chế độ dị hình trong đề mục cây"
-#: wt-status.c:1207
+#: tree-walk.c:41
+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:113
+msgid "too-short tree file"
+msgstr "tập tin cây quá ngắn"
+
+#: unpack-trees.c:64
+#, c-format
msgid ""
-" (use \"git rebase --continue\" once you are satisfied with your changes)"
+"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 ""
-" (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)"
+"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."
-#: wt-status.c:1217
+#: unpack-trees.c:66
#, 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:1222
-msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
msgstr ""
-" (sửa các xung đột và sau đó chạy lệnh \"git cherry-pick --continue\")"
+"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"
-#: wt-status.c:1225
-msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+#: unpack-trees.c:69
+#, 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 ""
-" (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git cherry-pick --"
-"continue\")"
-
-#: wt-status.c:1227
-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)"
+"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."
-#: wt-status.c:1236
+#: unpack-trees.c:71
#, 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:1241
-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:1244
-msgid " (all conflicts fixed: run \"git revert --continue\")"
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
msgstr ""
-" (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git revert --continue\")"
-
-#: wt-status.c:1246
-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á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"
-#: wt-status.c:1257
+#: unpack-trees.c:74
#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
+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 ""
-"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:1261
-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:1264
-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:1464
-msgid "On branch "
-msgstr "Trên nhánh "
-
-#: wt-status.c:1470
-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:1472
-msgid "rebase in progress; onto "
-msgstr "rebase đang được thực hiện: lên trên "
-
-#: wt-status.c:1477
-msgid "HEAD detached at "
-msgstr "HEAD được tách rời tại "
-
-#: wt-status.c:1479
-msgid "HEAD detached from "
-msgstr "HEAD được tách rời từ "
-
-#: wt-status.c:1482
-msgid "Not currently on any branch."
-msgstr "Hiện tại chẳng ở nhánh nào cả."
-
-#: wt-status.c:1500
-msgid "Initial commit"
-msgstr "Lần chuyển giao khởi tạo"
+"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."
-#: wt-status.c:1514
-msgid "Untracked files"
-msgstr "Những tập tin chưa được theo dõi"
+#: unpack-trees.c:76
+#, 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"
-#: wt-status.c:1516
-msgid "Ignored files"
-msgstr "Những tập tin bị lờ đi"
+#: unpack-trees.c:81
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in it:\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 theo dõi trong "
+"nó:\n"
+"%s"
-#: wt-status.c:1520
+#: unpack-trees.c:85
#, 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')."
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you switch branches."
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á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."
-#: wt-status.c:1526
+#: unpack-trees.c:87
#, 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:1528
-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:1534
-msgid "No changes"
-msgstr "Không có thay đổi nào"
+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"
-#: wt-status.c:1539
+#: unpack-trees.c:90
#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
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á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."
-#: wt-status.c:1542
+#: unpack-trees.c:92
#, 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"
+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"
-#: wt-status.c:1545
+#: unpack-trees.c:95
#, c-format
msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
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á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."
-#: wt-status.c:1548
+#: unpack-trees.c:97
#, c-format
-msgid "nothing added to commit but untracked files present\n"
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
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á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"
-#: wt-status.c:1551
+#: unpack-trees.c:102
#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you switch branches."
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á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."
-#: wt-status.c:1554 wt-status.c:1559
+#: unpack-trees.c:104
#, c-format
-msgid "nothing to commit\n"
-msgstr "không có gì để chuyển giao\n"
+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"
-#: wt-status.c:1557
+#: unpack-trees.c:107
#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
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á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."
-#: wt-status.c:1561
+#: unpack-trees.c:109
#, 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:1668
-msgid "Initial commit on "
-msgstr "Lần chuyển giao khởi tạo trên "
+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"
-#: wt-status.c:1672
-msgid "HEAD (no branch)"
-msgstr "HEAD (không nhánh)"
+#: unpack-trees.c:112
+#, 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."
-#: wt-status.c:1701
-msgid "gone"
-msgstr "đã ra đi"
+#: unpack-trees.c:114
+#, 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"
-#: wt-status.c:1703 wt-status.c:1711
-msgid "behind "
-msgstr "đằng sau "
+#: unpack-trees.c:121
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgstr "Mục “%s” đè lên “%s”. Không thể buộc."
-#: wt-status.c:1706 wt-status.c:1709
-msgid "ahead "
-msgstr "phía trước "
+#: unpack-trees.c:124
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
+msgstr ""
+"Không thể cập nhật checkout rải rác: các mục tin sau đây chưa cập nhật:\n"
+"%s"
-#: compat/precompose_utf8.c:57 builtin/clone.c:415
+#: unpack-trees.c:126
#, c-format
-msgid "failed to unlink '%s'"
-msgstr "gặp lỗi khi bỏ liên kết (unlink) “%s”"
+msgid ""
+"The following working tree files would be overwritten by sparse checkout "
+"update:\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 cập "
+"nhật checkout rải rác:\n"
+"%s"
-#: builtin/add.c:22
-msgid "git add [<options>] [--] <pathspec>..."
-msgstr "git add [<các-tùy-chọn>] [--] <pathspec>…"
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"The following working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị xóa bỏ bởi cập "
+"nhật checkout rải rác:\n"
+"%s"
-#: builtin/add.c:65
+#: unpack-trees.c:205
#, c-format
-msgid "unexpected diff status %c"
-msgstr "trạng thái lệnh diff không như mong đợi %c"
+msgid "Aborting\n"
+msgstr "Bãi bỏ\n"
-#: builtin/add.c:71 builtin/commit.c:281
-msgid "updating files failed"
-msgstr "Cập nhật tập tin gặp lỗi"
+#: unpack-trees.c:237
+msgid "Checking out files"
+msgstr "Đang lấy ra các tập tin"
+
+#: urlmatch.c:120
+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ố “://”"
-#: builtin/add.c:81
+#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
#, c-format
-msgid "remove '%s'\n"
-msgstr "gỡ bỏ “%s”\n"
+msgid "invalid %XX escape sequence"
+msgstr "thoát chuỗi %XX không hợp lệ"
-#: builtin/add.c:136
-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:"
+#: urlmatch.c:172
+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:”"
-#: builtin/add.c:196 builtin/rev-parse.c:811
-msgid "Could not read the index"
-msgstr "Không thể đọc bảng mục lục"
+#: urlmatch.c:189
+msgid "a 'file:' URL may not have a port number"
+msgstr "URL kiểu “file:” không được chứa cổng"
-#: builtin/add.c:207
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Không thể mở “%s” để ghi."
+#: urlmatch.c:199
+msgid "invalid characters in host name"
+msgstr "có các ký tự không hợp lệ trong tên máy"
-#: builtin/add.c:211
-msgid "Could not write patch"
-msgstr "Không thể ghi ra miếng vá"
+#: urlmatch.c:244 urlmatch.c:255
+msgid "invalid port number"
+msgstr "tên cổng không hợp lệ"
-#: builtin/add.c:214
-msgid "editing patch failed"
-msgstr "gặp lỗi khi sửa miếng vá"
+#: urlmatch.c:322
+msgid "invalid '..' path segment"
+msgstr "đoạn đường dẫn “..” không hợp lệ"
-#: builtin/add.c:217
+#: worktree.c:282
#, c-format
-msgid "Could not stat '%s'"
-msgstr "không thể lấy thông tin thống kê về “%s”"
+msgid "failed to read '%s'"
+msgstr "gặp lỗi khi đọc “%s”"
-#: builtin/add.c:219
-msgid "Empty patch. Aborted."
-msgstr "Miếng vá trống rỗng. Nên bỏ qua."
+#: wrapper.c:222 wrapper.c:392
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr "không thể mở “%s” để đọc và ghi"
-#: builtin/add.c:224
+#: wrapper.c:224 wrapper.c:394 builtin/am.c:766
#, c-format
-msgid "Could not apply '%s'"
-msgstr "Không thể áp dụng miếng vá “%s”"
+msgid "could not open '%s' for writing"
+msgstr "không thể mở “%s” để ghi"
-#: builtin/add.c:234
-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"
+#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
+#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029
+#: builtin/pull.c:341
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "không thể mở “%s” để đọc"
-#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521
-#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162
-msgid "dry run"
-msgstr "chạy thử"
+#: wrapper.c:605 wrapper.c:626
+#, c-format
+msgid "unable to access '%s'"
+msgstr "không thể truy cập “%s”"
-#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19
-#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593
-#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114
-msgid "be verbose"
-msgstr "chi tiết"
+#: wrapper.c:634
+msgid "unable to get current working directory"
+msgstr "Không thể lấy thư mục làm việc hiện hành"
-#: builtin/add.c:256
-msgid "interactive picking"
-msgstr "sửa bằng cách tương tác"
+#: wrapper.c:658
+#, c-format
+msgid "could not write to %s"
+msgstr "không thể ghi vào %s"
-#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286
-msgid "select hunks interactively"
-msgstr "chọn “hunks” theo kiểu tương tác"
+#: wrapper.c:660
+#, c-format
+msgid "could not close %s"
+msgstr "không thể đóng %s"
-#: builtin/add.c:258
-msgid "edit current diff and apply"
-msgstr "sửa diff hiện nay và áp dụng nó"
+#: wt-status.c:151
+msgid "Unmerged paths:"
+msgstr "Những đường dẫn chưa được hòa trộn:"
-#: builtin/add.c:259
-msgid "allow adding otherwise ignored files"
-msgstr "cho phép thêm các tập tin bị bỏ qua khác"
+#: wt-status.c:178 wt-status.c:205
+#, c-format
+msgid " (use \"git reset %s <file>...\" to unstage)"
+msgstr " (dùng \"git reset %s <tập-tin>…\" để bỏ ra khỏi bệ phóng)"
-#: builtin/add.c:260
-msgid "update tracked files"
-msgstr "cập nhật các tập tin được theo dõi"
+#: wt-status.c:180 wt-status.c:207
+msgid " (use \"git rm --cached <file>...\" to unstage)"
+msgstr " (dùng \"git rm --cached <tập-tin>…\" để bỏ ra khỏi bệ phóng)"
-#: builtin/add.c:261
-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"
+#: wt-status.c:184
+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)"
-#: builtin/add.c:262
-msgid "add changes from all tracked and untracked files"
+#: wt-status.c:186 wt-status.c:190
+msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
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"
+" (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)"
-#: builtin/add.c:265
-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)"
+#: wt-status.c:188
+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)"
-#: builtin/add.c:267
-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"
+#: wt-status.c:199 wt-status.c:945
+msgid "Changes to be committed:"
+msgstr "Những thay đổi sẽ được chuyển giao:"
-#: builtin/add.c:268
-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"
+#: wt-status.c:217 wt-status.c:954
+msgid "Changes not staged for commit:"
+msgstr "Các thay đổi chưa được đặt lên bệ phóng để chuyển giao:"
-#: builtin/add.c:269
-msgid "check if - even missing - files are ignored in dry run"
+#: wt-status.c:221
+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:223
+msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
-"kiểm tra xem - thậm chí thiếu - tập tin bị bỏ qua trong quá trình chạy thử"
+" (dùng \"git add/rm <tập-tin>…\" để cập nhật những gì sẽ được chuyển giao)"
-#: builtin/add.c:270 builtin/update-index.c:958
-msgid "(+/-)x"
-msgstr "(+/-)x"
+#: wt-status.c:224
+msgid ""
+" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+msgstr ""
+" (dùng \"git checkout -- <tập-tin>…\" để loại bỏ các thay đổi trong thư mục "
+"làm việc)"
-#: builtin/add.c:270 builtin/update-index.c:959
-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ê"
+#: wt-status.c:226
+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)"
-#: builtin/add.c:292
+#: wt-status.c:238
#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "Sử dụng tùy chọn -f nếu bạn thực sự muốn thêm chúng vào.\n"
+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)"
-#: builtin/add.c:300
-msgid "adding files failed"
-msgstr "thêm tập tin gặp lỗi"
+#: wt-status.c:253
+msgid "both deleted:"
+msgstr "bị xóa bởi cả hai:"
-#: builtin/add.c:336
-msgid "-A and -u are mutually incompatible"
-msgstr "-A và -u xung khắc nhau"
+#: wt-status.c:255
+msgid "added by us:"
+msgstr "được thêm vào bởi chúng ta:"
-#: builtin/add.c:343
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "Tùy chọn --ignore-missing chỉ có thể được dùng cùng với --dry-run"
+#: wt-status.c:257
+msgid "deleted by them:"
+msgstr "bị xóa đi bởi họ:"
-#: builtin/add.c:352
-#, 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"
+#: wt-status.c:259
+msgid "added by them:"
+msgstr "được thêm vào bởi họ:"
-#: builtin/add.c:367
-#, 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"
+#: wt-status.c:261
+msgid "deleted by us:"
+msgstr "bị xóa bởi chúng ta:"
-#: builtin/add.c:368
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "Có lẽ ý bạn là “git add .” phải không?\n"
+#: wt-status.c:263
+msgid "both added:"
+msgstr "được thêm vào bởi cả hai:"
-#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279
-#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340
-#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:240
-msgid "index file corrupt"
-msgstr "tập tin ghi bảng mục lục bị hỏng"
+#: wt-status.c:265
+msgid "both modified:"
+msgstr "bị sửa bởi cả hai:"
-#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431
-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"
+#: wt-status.c:275
+msgid "new file:"
+msgstr "tập tin mới:"
-#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032
-#, c-format
-msgid "could not read '%s'"
-msgstr "Không thể đọc “%s”."
+#: wt-status.c:277
+msgid "copied:"
+msgstr "đã chép:"
-#: builtin/am.c:426
-msgid "could not parse author script"
-msgstr "không thể phân tích cú pháp văn lệnh tác giả"
+#: wt-status.c:279
+msgid "deleted:"
+msgstr "đã xóa:"
-#: builtin/am.c:503
-#, c-format
-msgid "'%s' was deleted by the applypatch-msg hook"
-msgstr "“%s” bị xóa bởi móc applypatch-msg"
+#: wt-status.c:281
+msgid "modified:"
+msgstr "đã sửa:"
-#: builtin/am.c:544 builtin/notes.c:301
-#, c-format
-msgid "Malformed input line: '%s'."
-msgstr "Dòng đầu vào dị hình: “%s”."
+#: wt-status.c:283
+msgid "renamed:"
+msgstr "đã đổi tên:"
-#: builtin/am.c:581 builtin/notes.c:316
-#, 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”"
+#: wt-status.c:285
+msgid "typechange:"
+msgstr "đổi-kiểu:"
-#: builtin/am.c:607
-msgid "fseek failed"
-msgstr "fseek gặp lỗi"
+#: wt-status.c:287
+msgid "unknown:"
+msgstr "không hiểu:"
-#: builtin/am.c:787
-#, c-format
-msgid "could not parse patch '%s'"
-msgstr "không thể phân tích cú pháp “%s”"
+#: wt-status.c:289
+msgid "unmerged:"
+msgstr "chưa hòa trộn:"
-#: builtin/am.c:852
-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"
+#: wt-status.c:371
+msgid "new commits, "
+msgstr "lần chuyển giao mới, "
-#: builtin/am.c:899
-msgid "invalid timestamp"
-msgstr "dấu thời gian không hợp lệ"
+#: wt-status.c:373
+msgid "modified content, "
+msgstr "nội dung bị sửa đổi, "
-#: builtin/am.c:902 builtin/am.c:910
-msgid "invalid Date line"
-msgstr "dòng Ngày tháng không hợp lệ"
+#: wt-status.c:375
+msgid "untracked content, "
+msgstr "nội dung chưa được theo dõi, "
-#: builtin/am.c:907
-msgid "invalid timezone offset"
-msgstr "độ lệch múi giờ không hợp lệ"
+#: wt-status.c:818
+msgid "Submodules changed but not updated:"
+msgstr "Những mô-đun-con đã bị thay đổi nhưng chưa được cập nhật:"
-#: builtin/am.c:996
-msgid "Patch format detection failed."
-msgstr "Dò tìm định dạng miếng vá gặp lỗi."
+#: wt-status.c:820
+msgid "Submodule changes to be committed:"
+msgstr "Những mô-đun-con thay đổi đã được chuyển giao:"
-#: builtin/am.c:1001 builtin/clone.c:380
-#, c-format
-msgid "failed to create directory '%s'"
-msgstr "tạo thư mục \"%s\" gặp lỗi"
+#: wt-status.c:901
+msgid ""
+"Do not touch the line above.\n"
+"Everything below will be removed."
+msgstr ""
+"Không động đến đường ở trên.\n"
+"Mọi thứ phía dưới sẽ được xóa bỏ."
-#: builtin/am.c:1005
-msgid "Failed to split patches."
-msgstr "Gặp lỗi khi chia nhỏ các miếng vá."
+#: wt-status.c:1013
+msgid "You have unmerged paths."
+msgstr "Bạn có những đường dẫn chưa được hòa trộn."
-#: builtin/am.c:1137 builtin/commit.c:366
-msgid "unable to write index file"
-msgstr "không thể ghi tập tin lưu mục lục"
+#: wt-status.c:1016
+msgid " (fix conflicts and run \"git commit\")"
+msgstr " (sửa các xung đột rồi chạy \"git commit\")"
-#: builtin/am.c:1188
-#, c-format
-msgid "When you have resolved this problem, run \"%s --continue\"."
-msgstr "Khi bạn đã phân giải xong trục trặc này, hãy chạy \"%s --continue\"."
+#: wt-status.c:1018
+msgid " (use \"git merge --abort\" to abort the merge)"
+msgstr " (dùng \"git merge --abort\" để bãi bỏ việc hòa trộn)"
-#: builtin/am.c:1189
-#, 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ế."
+#: wt-status.c:1023
+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."
-#: builtin/am.c:1190
-#, 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\"."
+#: wt-status.c:1026
+msgid " (use \"git commit\" to conclude merge)"
+msgstr " (dùng \"git commit\" để hoàn tất việc hòa trộn)"
-#: builtin/am.c:1328
-msgid "Patch is empty. Was it split wrong?"
-msgstr "Miếng vá trống rỗng. Quá trình chia nhỏ miếng vá có lỗi?"
+#: wt-status.c:1036
+msgid "You are in the middle of an am session."
+msgstr "Bạn đang ở giữa của một phiên “am”."
-#: builtin/am.c:1402 builtin/log.c:1543
-#, c-format
-msgid "invalid ident line: %s"
-msgstr "dòng thụt lề không hợp lệ: %s"
+#: wt-status.c:1039
+msgid "The current patch is empty."
+msgstr "Miếng vá hiện tại bị trống rỗng."
-#: builtin/am.c:1429
-#, c-format
-msgid "unable to parse commit %s"
-msgstr "không thể phân tích lần chuyển giao “%s”"
+#: wt-status.c:1043
+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\")"
-#: builtin/am.c:1602
-msgid "Repository lacks necessary blobs to fall back on 3-way merge."
-msgstr "Kho thiếu đối tượng blob cần thiết để trở về trên “3-way merge”."
+#: wt-status.c:1045
+msgid " (use \"git am --skip\" to skip this patch)"
+msgstr " (dùng \"git am --skip\" để bỏ qua miếng vá này)"
-#: builtin/am.c:1604
-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ở…"
+#: wt-status.c:1047
+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)"
-#: builtin/am.c:1623
-msgid ""
-"Did you hand edit your patch?\n"
-"It does not apply to blobs recorded in its index."
-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ó."
+#: wt-status.c:1172
+msgid "No commands done."
+msgstr "Không thực hiện lệnh nào."
-#: builtin/am.c:1629
-msgid "Falling back to patching base and 3-way merge..."
-msgstr "Đang trở lại để vá cơ sở và “hòa trộn 3-đường”…"
+#: wt-status.c:1175
+#, c-format
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] "Lệnh thực hiện cuối (%d lệnh được thực thi):"
-#: builtin/am.c:1654
-msgid "Failed to merge in the changes."
-msgstr "Gặp lỗi khi trộn vào các thay đổi."
+#: wt-status.c:1186
+#, c-format
+msgid " (see more in file %s)"
+msgstr " (xem thêm trong %s)"
-#: builtin/am.c:1679 builtin/merge.c:628
-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"
+#: wt-status.c:1191
+msgid "No commands remaining."
+msgstr "Không có lệnh nào còn lại."
-#: builtin/am.c:1686
-msgid "applying to an empty history"
-msgstr "áp dụng vào một lịch sử trống rỗng"
+#: wt-status.c:1194
+#, c-format
+msgid "Next command to do (%d remaining command):"
+msgid_plural "Next commands to do (%d remaining commands):"
+msgstr[0] "Lệnh cần làm kế tiếp (%d lệnh còn lại):"
-#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798
-#: builtin/merge.c:823
-msgid "failed to write commit object"
-msgstr "gặp lỗi khi ghi đối tượng chuyển giao"
+#: wt-status.c:1202
+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:1215
+#, 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”."
-#: builtin/am.c:1731 builtin/am.c:1735
-#, c-format
-msgid "cannot resume: %s does not exist."
-msgstr "không thể phục hồi: %s không tồn tại."
+#: wt-status.c:1220
+msgid "You are currently rebasing."
+msgstr "Bạn hiện nay đang thực hiện việc “rebase” (“cải tổ”)."
-#: builtin/am.c:1751
-msgid "cannot be interactive without stdin connected to a terminal."
+#: wt-status.c:1234
+msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
-"không thể được tương tác mà không có stdin kết nối với một thiết bị cuối"
+" (sửa các xung đột và sau đó chạy lệnh “cải tổ” \"git rebase --continue\")"
-#: builtin/am.c:1756
-msgid "Commit Body is:"
-msgstr "Thân của lần chuyển giao là:"
+#: wt-status.c:1236
+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)"
-#. 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:1766
-msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+#: wt-status.c:1238
+msgid " (use \"git rebase --abort\" to check out the original branch)"
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]: "
+" (dùng lệnh “cải tổ” \"git rebase --abort\" để check-out nhánh nguyên thủy)"
-#: builtin/am.c:1816
-#, 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)"
+#: wt-status.c:1244
+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\")"
-#: builtin/am.c:1853 builtin/am.c:1925
+#: wt-status.c:1248
#, c-format
-msgid "Applying: %.*s"
-msgstr "Áp dụng: %.*s"
+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”."
-#: builtin/am.c:1869
-msgid "No changes -- Patch already applied."
-msgstr "Không thay đổi gì cả -- Miếng vá đã được áp dụng rồi."
+#: wt-status.c:1253
+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."
-#: builtin/am.c:1877
-#, c-format
-msgid "Patch failed at %s %.*s"
-msgstr "Gặp lỗi khi vá tại %s %.*s"
+#: wt-status.c:1256
+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\")"
-#: builtin/am.c:1883
+#: wt-status.c:1260
#, c-format
-msgid "The copy of the patch that failed is found in: %s"
-msgstr "Bản sao chép của miếng vá mà nó gặp lỗi thì được tìm thấy trong: %s"
-
-#: builtin/am.c:1928
-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."
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
-"Không có thay đổi nào - bạn đã quên sử dụng lệnh “git add” à?\n"
-"Nếu ở đây không có gì còn lại stage, tình cờ là có một số thứ khác\n"
-"đã 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."
+"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:1265
+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:1268
+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)"
-#: builtin/am.c:1935
+#: wt-status.c:1270
msgid ""
-"You still have unmerged paths in your index.\n"
-"Did you forget to use 'git add'?"
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-"Bạn vẫn có những đường dẫn chưa được hòa trộn trong bảng mục lục của mình.\n"
-"Bạn đã quên sử dụng lệnh “git add” à?"
+" (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)"
-#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308
-#: builtin/reset.c:316
+#: wt-status.c:1280
#, c-format
-msgid "Could not parse object '%s'."
-msgstr "không thể phân tích đối tượng “%s”."
-
-#: builtin/am.c:2095
-msgid "failed to clean index"
-msgstr "gặp lỗi khi dọn bảng mục lục"
+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."
-#: builtin/am.c:2129
-msgid ""
-"You seem to have moved HEAD since the last 'am' failure.\n"
-"Not rewinding to ORIG_HEAD"
+#: wt-status.c:1285
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
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"
+" (sửa các xung đột và sau đó chạy lệnh \"git cherry-pick --continue\")"
-#: builtin/am.c:2192
-#, c-format
-msgid "Invalid value for --patch-format: %s"
-msgstr "Giá trị không hợp lệ cho --patch-format: %s"
+#: wt-status.c:1288
+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\")"
-#: builtin/am.c:2225
-msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
-msgstr "git am [<các-tùy-chọn>] [(<mbox>|<Maildir>)…]"
+#: wt-status.c:1290
+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)"
-#: builtin/am.c:2226
-msgid "git am [<options>] (--continue | --skip | --abort)"
-msgstr "git am [<các-tùy-chọn>] (--continue | --skip | --abort)"
+#: wt-status.c:1299
+#, 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”."
-#: builtin/am.c:2232
-msgid "run interactively"
-msgstr "chạy kiểu tương tác"
+#: wt-status.c:1304
+msgid " (fix conflicts and run \"git revert --continue\")"
+msgstr " (sửa các xung đột và sau đó chạy lệnh \"git revert --continue\")"
-#: builtin/am.c:2234
-msgid "historical option -- no-op"
-msgstr "tùy chọn lịch sử -- không-toán-tử"
+#: wt-status.c:1307
+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\")"
-#: builtin/am.c:2236
-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"
+#: wt-status.c:1309
+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)"
-#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57
-#: builtin/repack.c:172
-msgid "be quiet"
-msgstr "im lặng"
+#: wt-status.c:1320
+#, 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”."
-#: builtin/am.c:2239
-msgid "add a Signed-off-by line to the commit message"
-msgstr "Thêm dòng Signed-off-by cho ghi chú của lần chuyển giao"
+#: wt-status.c:1324
+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)."
-#: builtin/am.c:2242
-msgid "recode into utf8 (default)"
-msgstr "chuyển mã thành utf8 (mặc định)"
+#: wt-status.c:1327
+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)"
-#: builtin/am.c:2244
-msgid "pass -k flag to git-mailinfo"
-msgstr "chuyển cờ -k cho git-mailinfo"
+#: wt-status.c:1524
+msgid "On branch "
+msgstr "Trên nhánh "
-#: builtin/am.c:2246
-msgid "pass -b flag to git-mailinfo"
-msgstr "chuyển cờ -b cho git-mailinfo"
+#: wt-status.c:1530
+msgid "interactive rebase in progress; onto "
+msgstr "rebase ở chế độ tương tác đang được thực hiện; lên trên "
-#: builtin/am.c:2248
-msgid "pass -m flag to git-mailinfo"
-msgstr "chuyển cờ -m cho git-mailinfo"
+#: wt-status.c:1532
+msgid "rebase in progress; onto "
+msgstr "rebase đang được thực hiện: lên trên "
-#: builtin/am.c:2250
-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"
+#: wt-status.c:1537
+msgid "HEAD detached at "
+msgstr "HEAD được tách rời tại "
-#: builtin/am.c:2253
-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"
+#: wt-status.c:1539
+msgid "HEAD detached from "
+msgstr "HEAD được tách rời từ "
-#: builtin/am.c:2256
-msgid "strip everything before a scissors line"
-msgstr "cắt mọi thứ trước dòng scissors"
+#: wt-status.c:1542
+msgid "Not currently on any branch."
+msgstr "Hiện tại chẳng ở nhánh nào cả."
-#: builtin/am.c:2257 builtin/apply.c:4837
-msgid "action"
-msgstr "hành động"
+#: wt-status.c:1560
+msgid "Initial commit"
+msgstr "Lần chuyển giao khởi tạo"
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279
-#: builtin/am.c:2285
-msgid "pass it through git-apply"
-msgstr "chuyển nó qua git-apply"
+#: wt-status.c:1574
+msgid "Untracked files"
+msgstr "Những tập tin chưa được theo dõi"
-#: builtin/am.c:2266 builtin/apply.c:4861
-msgid "root"
-msgstr "gốc"
+#: wt-status.c:1576
+msgid "Ignored files"
+msgstr "Những tập tin bị lờ đi"
-#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799
-#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96
-#: builtin/pull.c:179 builtin/submodule--helper.c:277
-#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482
-#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823
-#: builtin/submodule--helper.c:826
-msgid "path"
-msgstr "đường-dẫn"
+#: wt-status.c:1580
+#, 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”.."
-#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134 builtin/pull.c:193
-#: builtin/repack.c:181 builtin/repack.c:185 builtin/show-branch.c:645
-#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
-#: parse-options.h:134 parse-options.h:244
-msgid "n"
-msgstr "n"
+#: wt-status.c:1586
+#, 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"
-#: builtin/am.c:2278 builtin/apply.c:4805
-msgid "num"
-msgstr "số"
+#: wt-status.c:1588
+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)"
-#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438
-#: builtin/tag.c:372
-msgid "format"
-msgstr "định dạng"
+#: wt-status.c:1594
+msgid "No changes"
+msgstr "Không có thay đổi nào"
-#: builtin/am.c:2282
-msgid "format the patch(es) are in"
-msgstr "định dạng (các) miếng vá theo"
+#: wt-status.c:1599
+#, 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"
-#: builtin/am.c:2288
-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"
+#: wt-status.c:1602
+#, 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"
-#: builtin/am.c:2290
-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"
+#: wt-status.c:1605
+#, 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"
-#: builtin/am.c:2293
-msgid "synonyms for --continue"
-msgstr "đồng nghĩa với --continue"
+#: wt-status.c:1608
+#, 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"
-#: builtin/am.c:2296
-msgid "skip the current patch"
-msgstr "bỏ qua miếng vá hiện hành"
+#: wt-status.c:1611
+#, 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"
-#: builtin/am.c:2299
-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á."
+#: wt-status.c:1614 wt-status.c:1619
+#, c-format
+msgid "nothing to commit\n"
+msgstr "không có gì để chuyển giao\n"
-#: builtin/am.c:2303
-msgid "lie about committer date"
-msgstr "nói dối về ngày chuyển giao"
+#: wt-status.c:1617
+#, 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"
-#: builtin/am.c:2305
-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ả"
+#: wt-status.c:1621
+#, 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"
-#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229
-#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
-msgid "key-id"
-msgstr "mã-số-khóa"
+#: wt-status.c:1728
+msgid "Initial commit on "
+msgstr "Lần chuyển giao khởi tạo trên "
-#: builtin/am.c:2308
-msgid "GPG-sign commits"
-msgstr "lần chuyển giao ký-GPG"
+#: wt-status.c:1732
+msgid "HEAD (no branch)"
+msgstr "HEAD (không nhánh)"
-#: builtin/am.c:2311
-msgid "(internal use for git-rebase)"
-msgstr "(dùng nội bộ cho git-rebase)"
+#: wt-status.c:1761
+msgid "gone"
+msgstr "đã ra đi"
-#: builtin/am.c:2326
-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 ""
-"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."
+#: wt-status.c:1763 wt-status.c:1771
+msgid "behind "
+msgstr "đằng sau "
-#: builtin/am.c:2333
-msgid "failed to read the index"
-msgstr "gặp lỗi đọc bảng mục lục"
+#: wt-status.c:1766 wt-status.c:1769
+msgid "ahead "
+msgstr "phía trước "
-#: builtin/am.c:2348
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2270
#, 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."
+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:2276
+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."
-#: builtin/am.c:2372
+#: wt-status.c:2278
#, c-format
-msgid ""
-"Stray %s directory found.\n"
-"Use \"git am --abort\" to remove it."
+msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
-"Tìm thấy thư mục lạc %s.\n"
-"Dùng \"git am --abort\" để loại bỏ nó đi."
+"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."
-#: builtin/am.c:2378
-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."
+#: compat/precompose_utf8.c:57 builtin/clone.c:414
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "gặp lỗi khi bỏ liên kết (unlink) “%s”"
-#: builtin/apply.c:122
-msgid "git apply [<options>] [<patch>...]"
-msgstr "git apply [<các-tùy-chọn>] [<miếng-vá>…]"
+#: builtin/add.c:22
+msgid "git add [<options>] [--] <pathspec>..."
+msgstr "git add [<các-tùy-chọn>] [--] <pathspec>…"
-#: builtin/apply.c:153
+#: builtin/add.c:80
#, c-format
-msgid "unrecognized whitespace option '%s'"
-msgstr "không nhận ra tùy chọn về khoảng trắng “%s”"
+msgid "unexpected diff status %c"
+msgstr "trạng thái lệnh diff không như mong đợi %c"
-#: builtin/apply.c:169
-#, c-format
-msgid "unrecognized whitespace ignore option '%s'"
-msgstr "không nhận ra tùy chọn bỏ qua khoảng trắng “%s”"
+#: builtin/add.c:85 builtin/commit.c:291
+msgid "updating files failed"
+msgstr "Cập nhật tập tin gặp lỗi"
-#: builtin/apply.c:854
+#: builtin/add.c:95
#, c-format
-msgid "Cannot prepare timestamp regexp %s"
+msgid "remove '%s'\n"
+msgstr "gỡ bỏ “%s”\n"
+
+#: builtin/add.c:149
+msgid "Unstaged changes after refreshing the index:"
msgstr ""
-"Không thể chuẩn bị biểu thức chính qui dấu vết thời gian (timestamp regexp) "
-"%s"
+"Đư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:209 builtin/rev-parse.c:840
+msgid "Could not read the index"
+msgstr "Không thể đọc bảng mục lục"
-#: builtin/apply.c:863
+#: builtin/add.c:220
#, 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"
+msgid "Could not open '%s' for writing."
+msgstr "Không thể mở “%s” để ghi."
+
+#: builtin/add.c:224
+msgid "Could not write patch"
+msgstr "Không thể ghi ra miếng vá"
+
+#: builtin/add.c:227
+msgid "editing patch failed"
+msgstr "gặp lỗi khi sửa miếng vá"
-#: builtin/apply.c:947
+#: builtin/add.c:230
#, 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"
+msgid "Could not stat '%s'"
+msgstr "không thể lấy thông tin thống kê về “%s”"
+
+#: builtin/add.c:232
+msgid "Empty patch. Aborted."
+msgstr "Miếng vá trống rỗng. Nên bỏ qua."
-#: builtin/apply.c:984
+#: builtin/add.c:237
#, c-format
-msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
+msgid "Could not apply '%s'"
+msgstr "Không thể áp dụng miếng vá “%s”"
+
+#: builtin/add.c:247
+msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-"git apply: git-diff sai - cần /dev/null, nhưng lại nhận được %s trên dòng %d"
+"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/apply.c:989
-#, c-format
-msgid "git apply: bad git-diff - inconsistent new filename on line %d"
-msgstr "git apply: git-diff sai - tên tập tin mới không nhất quán trên dòng %d"
+#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111
+#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521
+#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162
+msgid "dry run"
+msgstr "chạy thử"
-#: builtin/apply.c:990
-#, c-format
-msgid "git apply: bad git-diff - inconsistent old filename on line %d"
-msgstr "git apply: git-diff sai - tên tập tin cũ không nhất quán trên dòng %d"
+#: builtin/add.c:269
+msgid "interactive picking"
+msgstr "sửa bằng cách tương tác"
-#: builtin/apply.c:995
-#, c-format
-msgid "git apply: bad git-diff - expected /dev/null on line %d"
-msgstr "git apply: git-diff sai - cần “/dev/null” trên dòng %d"
+#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286
+msgid "select hunks interactively"
+msgstr "chọn “hunks” theo kiểu tương tác"
-#: builtin/apply.c:1489
-#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr "chi tiết: dòng không cần: %.*s"
+#: builtin/add.c:271
+msgid "edit current diff and apply"
+msgstr "sửa diff hiện nay và áp dụng nó"
-#: builtin/apply.c:1550
-#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr "miếng vá phân mảnh mà không có phần đầu tại dòng %d: %.*s"
+#: builtin/add.c:272
+msgid "allow adding otherwise ignored files"
+msgstr "cho phép thêm các tập tin bị bỏ qua khác"
-#: builtin/apply.c:1567
-#, 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] ""
-"phần đầu diff cho git thiếu thông tin tên tập tin khi gỡ bỏ đi %d trong "
-"thành phần dẫn đầu tên của đường dẫn (dòng %d)"
+#: builtin/add.c:273
+msgid "update tracked files"
+msgstr "cập nhật các tập tin được theo dõi"
-#: builtin/apply.c:1743
-msgid "new file depends on old contents"
-msgstr "tập tin mới phụ thuộc vào nội dung cũ"
+#: builtin/add.c:274
+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/apply.c:1745
-msgid "deleted file still has contents"
-msgstr "tập tin đã xóa vẫn còn nội dung"
+#: builtin/add.c:275
+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/apply.c:1774
-#, c-format
-msgid "corrupt patch at line %d"
-msgstr "miếng vá hỏng tại dòng %d"
+#: builtin/add.c:278
+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/apply.c:1810
-#, c-format
-msgid "new file %s depends on old contents"
-msgstr "tập tin mới %s phụ thuộc vào nội dung cũ"
+#: builtin/add.c:280
+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/apply.c:1812
-#, c-format
-msgid "deleted file %s still has contents"
-msgstr "tập tin đã xóa %s vẫn còn nội dung"
+#: builtin/add.c:281
+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/apply.c:1815
-#, c-format
-msgid "** warning: file %s becomes empty but is not deleted"
-msgstr "** cảnh báo: tập tin %s trở nên trống rỗng nhưng không bị xóa"
+#: builtin/add.c:282
+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/apply.c:1962
-#, c-format
-msgid "corrupt binary patch at line %d: %.*s"
-msgstr "miếng vá định dạng nhị phân sai hỏng tại dòng %d: %.*s"
+#: builtin/add.c:283 builtin/update-index.c:947
+msgid "(+/-)x"
+msgstr "(+/-)x"
-#: builtin/apply.c:1999
-#, c-format
-msgid "unrecognized binary patch at line %d"
-msgstr "miếng vá định dạng nhị phân không được nhận ra tại dòng %d"
+#: builtin/add.c:283 builtin/update-index.c:948
+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/apply.c:2154
+#: builtin/add.c:305
#, c-format
-msgid "patch with only garbage at line %d"
-msgstr "vá chỉ với “rác” tại dòng %d"
+msgid "Use -f if you really want to add them.\n"
+msgstr "Sử dụng tùy chọn -f nếu bạn thực sự muốn thêm chúng vào.\n"
-#: builtin/apply.c:2244
-#, c-format
-msgid "unable to read symlink %s"
-msgstr "không thể đọc liên kết mềm %s"
+#: builtin/add.c:312
+msgid "adding files failed"
+msgstr "thêm tập tin gặp lỗi"
-#: builtin/apply.c:2248
-#, c-format
-msgid "unable to open or read %s"
-msgstr "không thể mở hay đọc %s"
+#: builtin/add.c:348
+msgid "-A and -u are mutually incompatible"
+msgstr "-A và -u xung khắc nhau"
-#: builtin/apply.c:2901
-#, c-format
-msgid "invalid start of line: '%c'"
-msgstr "sai khởi đầu dòng: “%c”"
+#: builtin/add.c:355
+msgid "Option --ignore-missing can only be used together with --dry-run"
+msgstr "Tùy chọn --ignore-missing chỉ có thể được dùng cùng với --dry-run"
-#: builtin/apply.c:3020
+#: builtin/add.c:359
#, 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)."
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr "--chmod tham số “%s” phải hoặc là -x hay +x"
-#: builtin/apply.c:3032
+#: builtin/add.c:374
#, c-format
-msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
-msgstr "Nội dung bị giảm xuống còn (%ld/%ld) để áp dụng mảnh dữ liệu tại %d"
+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/apply.c:3038
+#: builtin/add.c:375
#, c-format
-msgid ""
-"while searching for:\n"
-"%.*s"
-msgstr ""
-"trong khi đang tìm kiếm cho:\n"
-"%.*s"
+msgid "Maybe you wanted to say 'git add .'?\n"
+msgstr "Có lẽ ý bạn là “git add .” phải không?\n"
-#: builtin/apply.c:3060
-#, c-format
-msgid "missing binary patch data for '%s'"
-msgstr "thiếu dữ liệu của miếng vá định dạng nhị phân cho “%s”"
+#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279
+#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350
+#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:244
+msgid "index file corrupt"
+msgstr "tập tin ghi bảng mục lục bị hỏng"
+
+#: builtin/am.c:414
+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/apply.c:3163
+#: builtin/am.c:491
#, 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”"
+msgid "'%s' was deleted by the applypatch-msg hook"
+msgstr "“%s” bị xóa bởi móc applypatch-msg"
-#: builtin/apply.c:3169
+#: builtin/am.c:532
#, 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)"
+msgid "Malformed input line: '%s'."
+msgstr "Dòng đầu vào dị hình: “%s”."
-#: builtin/apply.c:3190
+#: builtin/am.c:569
#, c-format
-msgid "patch failed: %s:%ld"
-msgstr "gặp lỗi khi vá: %s:%ld"
+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:595
+msgid "fseek failed"
+msgstr "fseek gặp lỗi"
-#: builtin/apply.c:3314
+#: builtin/am.c:775
#, c-format
-msgid "cannot checkout %s"
-msgstr "không thể lấy ra %s"
+msgid "could not parse patch '%s'"
+msgstr "không thể phân tích cú pháp “%s”"
+
+#: builtin/am.c:840
+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:887
+msgid "invalid timestamp"
+msgstr "dấu thời gian không hợp lệ"
+
+#: builtin/am.c:890 builtin/am.c:898
+msgid "invalid Date line"
+msgstr "dòng Ngày tháng không hợp lệ"
+
+#: builtin/am.c:895
+msgid "invalid timezone offset"
+msgstr "độ lệch múi giờ không hợp lệ"
+
+#: builtin/am.c:984
+msgid "Patch format detection failed."
+msgstr "Dò tìm định dạng miếng vá gặp lỗi."
-#: builtin/apply.c:3370
+#: builtin/am.c:989 builtin/clone.c:379
#, 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"
+msgid "failed to create directory '%s'"
+msgstr "tạo thư mục \"%s\" gặp lỗi"
-#: builtin/apply.c:3399 builtin/apply.c:3630
-#, c-format
-msgid "path %s has been renamed/deleted"
-msgstr "đường dẫn %s đã bị xóa hoặc đổi tên"
+#: builtin/am.c:993
+msgid "Failed to split patches."
+msgstr "Gặp lỗi khi chia nhỏ các miếng vá."
+
+#: builtin/am.c:1125 builtin/commit.c:376
+msgid "unable to write index file"
+msgstr "không thể ghi tập tin lưu mục lục"
-#: builtin/apply.c:3482 builtin/apply.c:3644
+#: builtin/am.c:1176
#, c-format
-msgid "%s: does not exist in index"
-msgstr "%s: không tồn tại trong bảng mục lục"
+msgid "When you have resolved this problem, run \"%s --continue\"."
+msgstr "Khi bạn đã phân giải xong trục trặc này, hãy chạy \"%s --continue\"."
-#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658
+#: builtin/am.c:1177
#, c-format
-msgid "%s: %s"
-msgstr "%s: %s"
+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/apply.c:3491 builtin/apply.c:3652
+#: builtin/am.c:1178
#, c-format
-msgid "%s: does not match index"
-msgstr "%s: không khớp trong mục lục"
+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/apply.c:3597
-msgid "removal patch leaves file contents"
-msgstr "loại bỏ miếng vá để lại nội dung tập tin"
+#: builtin/am.c:1316
+msgid "Patch is empty. Was it split wrong?"
+msgstr "Miếng vá trống rỗng. Quá trình chia nhỏ miếng vá có lỗi?"
-#: builtin/apply.c:3669
+#: builtin/am.c:1390 builtin/log.c:1550
#, c-format
-msgid "%s: wrong type"
-msgstr "%s: sai kiểu"
+msgid "invalid ident line: %s"
+msgstr "dòng thụt lề không hợp lệ: %s"
-#: builtin/apply.c:3671
+#: builtin/am.c:1417
#, c-format
-msgid "%s has type %o, expected %o"
-msgstr "%s có kiểu %o, cần %o"
+msgid "unable to parse commit %s"
+msgstr "không thể phân tích lần chuyển giao “%s”"
-#: builtin/apply.c:3822 builtin/apply.c:3824
-#, c-format
-msgid "invalid path '%s'"
-msgstr "đường dẫn không hợp lệ “%s”"
+#: builtin/am.c:1610
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+msgstr "Kho thiếu đối tượng blob cần thiết để trở về trên “3-way merge”."
-#: builtin/apply.c:3879
-#, c-format
-msgid "%s: already exists in index"
-msgstr "%s: đã có từ trước trong bảng mục lục"
+#: builtin/am.c:1612
+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/apply.c:3882
-#, c-format
-msgid "%s: already exists in working directory"
-msgstr "%s: đã sẵn có trong thư mục đang làm việc"
+#: builtin/am.c:1631
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
+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/apply.c:3902
-#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o)"
-msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o)"
+#: builtin/am.c:1637
+msgid "Falling back to patching base and 3-way merge..."
+msgstr "Đang trở lại để vá cơ sở và “hòa trộn 3-đường”…"
-#: builtin/apply.c:3907
-#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o) of %s"
-msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o) của %s"
+#: builtin/am.c:1662
+msgid "Failed to merge in the changes."
+msgstr "Gặp lỗi khi trộn vào các thay đổi."
-#: builtin/apply.c:3927
-#, c-format
-msgid "affected file '%s' is beyond a symbolic link"
-msgstr "tập tin chịu tác động “%s” vượt ra ngoài liên kết mềm"
+#: builtin/am.c:1686 builtin/merge.c:628
+msgid "git write-tree failed to write a tree"
+msgstr "lệnh git write-tree gặp lỗi khi ghi một cây"
-#: builtin/apply.c:3931
-#, c-format
-msgid "%s: patch does not apply"
-msgstr "%s: miếng vá không được áp dụng"
+#: builtin/am.c:1693
+msgid "applying to an empty history"
+msgstr "áp dụng vào một lịch sử trống rỗng"
-#: builtin/apply.c:3945
-#, c-format
-msgid "Checking patch %s..."
-msgstr "Đang kiểm tra miếng vá %s…"
+#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798
+#: builtin/merge.c:823
+msgid "failed to write commit object"
+msgstr "gặp lỗi khi ghi đối tượng chuyển giao"
-#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/am.c:1739 builtin/am.c:1743
#, 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”"
+msgid "cannot resume: %s does not exist."
+msgstr "không thể phục hồi: %s không tồn tại."
-#: builtin/apply.c:4182
-#, c-format
-msgid "unable to remove %s from index"
-msgstr "không thể gỡ bỏ %s từ mục lục"
+#: builtin/am.c:1759
+msgid "cannot be interactive without stdin connected to a terminal."
+msgstr ""
+"không thể được tương tác mà không có stdin kết nối với một thiết bị cuối"
-#: builtin/apply.c:4215
-#, c-format
-msgid "corrupt patch for submodule %s"
-msgstr "miếng vá sai hỏng cho mô-đun-con %s"
+#: builtin/am.c:1764
+msgid "Commit Body is:"
+msgstr "Thân của lần chuyển giao là:"
-#: builtin/apply.c:4219
-#, 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"
+#. 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:1774
+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/apply.c:4224
+#: builtin/am.c:1824
#, 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"
+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/apply.c:4227 builtin/apply.c:4340
+#: builtin/am.c:1861 builtin/am.c:1933
#, c-format
-msgid "unable to add cache entry for %s"
-msgstr "không thể thêm mục nhớ đệm cho %s"
+msgid "Applying: %.*s"
+msgstr "Áp dụng: %.*s"
-#: builtin/apply.c:4260
-#, c-format
-msgid "closing file '%s'"
-msgstr "đang đóng tập tin “%s”"
+#: builtin/am.c:1877
+msgid "No changes -- Patch already applied."
+msgstr "Không thay đổi gì cả -- Miếng vá đã được áp dụng rồi."
-#: builtin/apply.c:4313
+#: builtin/am.c:1885
#, c-format
-msgid "unable to write file '%s' mode %o"
-msgstr "không thể ghi vào tập tin “%s” chế độ %o"
+msgid "Patch failed at %s %.*s"
+msgstr "Gặp lỗi khi vá tại %s %.*s"
-#: builtin/apply.c:4403
+#: builtin/am.c:1891
#, c-format
-msgid "Applied patch %s cleanly."
-msgstr "Đã áp dụng miếng vá %s một cách sạch sẽ."
-
-#: builtin/apply.c:4411
-msgid "internal error"
-msgstr "lỗi nội bộ"
+msgid "The copy of the patch that failed is found in: %s"
+msgstr "Bản sao chép của miếng vá mà nó gặp lỗi thì được tìm thấy trong: %s"
-#: builtin/apply.c:4414
-#, c-format
-msgid "Applying patch %%s with %d reject..."
-msgid_plural "Applying patch %%s with %d rejects..."
-msgstr[0] "Đang áp dụng miếng vá %%s với %d lần từ chối…"
+#: builtin/am.c:1936
+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 ""
+"Không có thay đổi nào - bạn đã quên sử dụng lệnh “git add” à?\n"
+"Nếu ở đây không có gì còn lại stage, tình cờ là có một số thứ khác\n"
+"đã 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/apply.c:4424
-#, c-format
-msgid "truncating .rej filename to %.*s.rej"
-msgstr "đang cắt ngắn tên tập tin .rej thành %.*s.rej"
+#: builtin/am.c:1943
+msgid ""
+"You still have unmerged paths in your index.\n"
+"Did you forget to use 'git add'?"
+msgstr ""
+"Bạn vẫn có những đường dẫn chưa được hòa trộn trong bảng mục lục của mình.\n"
+"Bạn đã quên sử dụng lệnh “git add” à?"
-#: builtin/apply.c:4432
+#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
+#: builtin/reset.c:316
#, c-format
-msgid "cannot open %s: %s"
-msgstr "không thể mở %s: %s"
+msgid "Could not parse object '%s'."
+msgstr "không thể phân tích đối tượng “%s”."
-#: builtin/apply.c:4445
-#, c-format
-msgid "Hunk #%d applied cleanly."
-msgstr "Khối nhớ #%d được áp dụng gọn gàng."
+#: builtin/am.c:2103
+msgid "failed to clean index"
+msgstr "gặp lỗi khi dọn bảng mục lục"
-#: builtin/apply.c:4448
-#, c-format
-msgid "Rejected hunk #%d."
-msgstr "đoạn dữ liệu #%d bị từ chối."
+#: builtin/am.c:2137
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
+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/apply.c:4537
+#: builtin/am.c:2200
#, c-format
-msgid "Skipped patch '%s'."
-msgstr "bỏ qua đường dẫn “%s”."
+msgid "Invalid value for --patch-format: %s"
+msgstr "Giá trị không hợp lệ cho --patch-format: %s"
-#: builtin/apply.c:4545
-msgid "unrecognized input"
-msgstr "không thừa nhận đầu vào"
+#: builtin/am.c:2233
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+msgstr "git am [<các-tùy-chọn>] [(<mbox>|<Maildir>)…]"
-#: builtin/apply.c:4556
-msgid "unable to read index file"
-msgstr "không thể đọc tập tin lưu bảng mục lục"
+#: builtin/am.c:2234
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<các-tùy-chọn>] (--continue | --skip | --abort)"
-#: builtin/apply.c:4701
-msgid "--3way outside a repository"
-msgstr "--3way ở ngoài một kho chứa"
+#: builtin/am.c:2240
+msgid "run interactively"
+msgstr "chạy kiểu tương tác"
-#: builtin/apply.c:4709
-msgid "--index outside a repository"
-msgstr "--index ở ngoài một kho chứa"
+#: builtin/am.c:2242
+msgid "historical option -- no-op"
+msgstr "tùy chọn lịch sử -- không-toán-tử"
-#: builtin/apply.c:4712
-msgid "--cached outside a repository"
-msgstr "--cached ở ngoài một kho chứa"
+#: builtin/am.c:2244
+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/apply.c:4745
-#, c-format
-msgid "can't open patch '%s'"
-msgstr "không thể mở miếng vá “%s”"
+#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
+#: builtin/repack.c:172
+msgid "be quiet"
+msgstr "im lặng"
-#: builtin/apply.c:4760
-#, c-format
-msgid "squelched %d whitespace error"
-msgid_plural "squelched %d whitespace errors"
-msgstr[0] "đã chấm dứt %d lỗi khoảng trắng"
+#: builtin/am.c:2247
+msgid "add a Signed-off-by line to the commit message"
+msgstr "Thêm dòng Signed-off-by cho ghi chú của lần chuyển giao"
-#: builtin/apply.c:4766 builtin/apply.c:4776
-#, 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."
+#: builtin/am.c:2250
+msgid "recode into utf8 (default)"
+msgstr "chuyển mã thành utf8 (mặc định)"
-#: builtin/apply.c:4800
-msgid "don't apply changes matching the given path"
-msgstr "không áp dụng các thay đổi khớp với đường dẫn đã cho"
+#: builtin/am.c:2252
+msgid "pass -k flag to git-mailinfo"
+msgstr "chuyển cờ -k cho git-mailinfo"
-#: builtin/apply.c:4803
-msgid "apply changes matching the given path"
-msgstr "áp dụng các thay đổi khớp với đường dẫn đã cho"
+#: builtin/am.c:2254
+msgid "pass -b flag to git-mailinfo"
+msgstr "chuyển cờ -b cho git-mailinfo"
-#: builtin/apply.c:4806
-msgid "remove <num> leading slashes from traditional diff paths"
-msgstr "gỡ bỏ <số> dấu gạch chéo dẫn đầu từ đường dẫn diff cổ điển"
+#: builtin/am.c:2256
+msgid "pass -m flag to git-mailinfo"
+msgstr "chuyển cờ -m cho git-mailinfo"
-#: builtin/apply.c:4809
-msgid "ignore additions made by the patch"
-msgstr "lờ đi phần bổ xung được tạo ra bởi miếng vá"
+#: builtin/am.c:2258
+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/apply.c:4811
-msgid "instead of applying the patch, output diffstat for the input"
+#: builtin/am.c:2261
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
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"
+"đừng chuyển cờ --keep-cr cho git-mailsplit không phụ thuộc vào am.keepcr"
-#: builtin/apply.c:4815
-msgid "show number of added and deleted lines in decimal notation"
-msgstr ""
-"hiển thị số lượng các dòng được thêm vào và xóa đi theo ký hiệu thập phân"
+#: builtin/am.c:2264
+msgid "strip everything before a scissors line"
+msgstr "cắt mọi thứ trước dòng scissors"
-#: builtin/apply.c:4817
-msgid "instead of applying the patch, output a summary for the input"
-msgstr "thay vì áp dụng một miếng vá, kết xuất kết quả cho đầu vào"
+#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
+#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
+#: builtin/am.c:2293
+msgid "pass it through git-apply"
+msgstr "chuyển nó qua git-apply"
-#: builtin/apply.c:4819
-msgid "instead of applying the patch, see if the patch is applicable"
-msgstr "thay vì áp dụng miếng vá, hãy xem xem miếng vá có thích hợp không"
+#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
+#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135
+#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185
+#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
+msgid "n"
+msgstr "n"
-#: builtin/apply.c:4821
-msgid "make sure the patch is applicable to the current index"
-msgstr "hãy chắc chắn là miếng vá thích hợp với bảng mục lục hiện hành"
+#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/tag.c:372
+msgid "format"
+msgstr "định dạng"
+
+#: builtin/am.c:2290
+msgid "format the patch(es) are in"
+msgstr "định dạng (các) miếng vá theo"
-#: builtin/apply.c:4823
-msgid "apply a patch without touching the working tree"
-msgstr "áp dụng một miếng vá mà không động chạm đến cây làm việc"
+#: builtin/am.c:2296
+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/apply.c:4825
-msgid "accept a patch that touches outside the working area"
-msgstr "chấp nhận một miếng vá mà không động chạm đến cây làm việc"
+#: builtin/am.c:2298
+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/apply.c:4827
-msgid "also apply the patch (use with --stat/--summary/--check)"
-msgstr ""
-"đồng thời áp dụng miếng vá (dùng với tùy chọn --stat/--summary/--check)"
+#: builtin/am.c:2301
+msgid "synonyms for --continue"
+msgstr "đồng nghĩa với --continue"
-#: builtin/apply.c:4829
-msgid "attempt three-way merge if a patch does not apply"
-msgstr "thử hòa trộn kiểu three-way nếu việc vá không thể thực hiện được"
+#: builtin/am.c:2304
+msgid "skip the current patch"
+msgstr "bỏ qua miếng vá hiện hành"
-#: builtin/apply.c:4831
-msgid "build a temporary index based on embedded index information"
-msgstr ""
-"xây dựng bảng mục lục tạm thời trên cơ sở thông tin bảng mục lục được nhúng"
+#: builtin/am.c:2307
+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/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426
-msgid "paths are separated with NUL character"
-msgstr "các đường dẫn bị ngăn cách bởi ký tự NULL"
+#: builtin/am.c:2311
+msgid "lie about committer date"
+msgstr "nói dối về ngày chuyển giao"
-#: builtin/apply.c:4836
-msgid "ensure at least <n> lines of context match"
-msgstr "đảm bảo rằng có ít nhất <n> dòng nội dung khớp"
+#: builtin/am.c:2313
+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/apply.c:4838
-msgid "detect new or modified lines that have whitespace errors"
-msgstr "tìm thấy một dòng mới hoặc bị sửa đổi mà nó có lỗi do khoảng trắng"
+#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229
+#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355
+msgid "key-id"
+msgstr "mã-số-khóa"
-#: builtin/apply.c:4841 builtin/apply.c:4844
-msgid "ignore changes in whitespace when finding context"
-msgstr "lá»\9d Ä\91i sá»± thay Ä\91á»\95i do khoảng trắng gây ra khi quét ná»\99i dung"
+#: builtin/am.c:2316
+msgid "GPG-sign commits"
+msgstr "lần chuyá»\83n giao ký-GPG"
-#: builtin/apply.c:4847
-msgid "apply the patch in reverse"
-msgstr "áp dụng miếng vá theo chiều ngược"
+#: builtin/am.c:2319
+msgid "(internal use for git-rebase)"
+msgstr "(dùng nội bộ cho git-rebase)"
-#: builtin/apply.c:4849
-msgid "don't expect at least one line of context"
-msgstr "đừng hy vọng có ít nhất một dòng nội dung"
+#: builtin/am.c:2334
+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 ""
+"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/apply.c:4851
-msgid "leave the rejected hunks in corresponding *.rej files"
-msgstr "để lại khối dữ liệu bị từ chối trong các tập tin *.rej tương ứng"
+#: builtin/am.c:2341
+msgid "failed to read the index"
+msgstr "gặp lỗi đọc bảng mục lục"
-#: builtin/apply.c:4853
-msgid "allow overlapping hunks"
-msgstr "cho phép chồng khối nhớ"
+#: builtin/am.c:2356
+#, 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/apply.c:4856
-msgid "tolerate incorrectly detected missing new-line at the end of file"
+#: builtin/am.c:2380
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
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"
+"Tìm thấy thư mục lạc %s.\n"
+"Dùng \"git am --abort\" để loại bỏ nó đi."
-#: builtin/apply.c:4859
-msgid "do not trust the line counts in the hunk headers"
-msgstr "không tin số lượng dòng trong phần đầu khối dữ liệu"
+#: builtin/am.c:2386
+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/apply.c:4862
-msgid "prepend <root> to all filenames"
-msgstr "treo thêm <root> vào tất cả các tên tập tin"
+#: builtin/apply.c:8
+msgid "git apply [<options>] [<patch>...]"
+msgstr "git apply [<các-tùy-chọn>] [<miếng-vá>…]"
#: builtin/archive.c:17
#, c-format
msgid "Blaming lines"
msgstr "Các dòng blame"
-#: builtin/blame.c:2536
+#: builtin/blame.c:2577
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:2537
+#: builtin/blame.c:2578
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
"Hiển thị SHA-1 trắng cho những lần chuyển giao biên giới (Mặc định: off)"
-#: builtin/blame.c:2538
+#: builtin/blame.c:2579
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:2539
+#: builtin/blame.c:2580
msgid "Show work cost statistics"
msgstr "Hiển thị thống kê công sức làm việc"
-#: builtin/blame.c:2540
+#: builtin/blame.c:2581
msgid "Force progress reporting"
msgstr "Ép buộc báo cáo tiến triển công việc"
-#: builtin/blame.c:2541
+#: builtin/blame.c:2582
msgid "Show output score for blame entries"
msgstr "Hiển thị kết xuất điểm số có các mục tin “blame”"
-#: builtin/blame.c:2542
+#: builtin/blame.c:2583
msgid "Show original filename (Default: auto)"
msgstr "Hiển thị tên tập tin gốc (Mặc định: auto)"
-#: builtin/blame.c:2543
+#: builtin/blame.c:2584
msgid "Show original linenumber (Default: off)"
msgstr "Hiển thị số dòng gốc (Mặc định: off)"
-#: builtin/blame.c:2544
+#: builtin/blame.c:2585
msgid "Show in a format designed for machine consumption"
msgstr "Hiển thị ở định dạng đã thiết kế cho sự tiêu dùng bằng máy"
-#: builtin/blame.c:2545
+#: builtin/blame.c:2586
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:2546
+#: builtin/blame.c:2587
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:2547
+#: builtin/blame.c:2588
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:2548
+#: builtin/blame.c:2589
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:2549
+#: builtin/blame.c:2590
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:2550
+#: builtin/blame.c:2591
msgid "Show author email instead of name (Default: off)"
msgstr "Hiển thị thư điện tử của tác giả thay vì tên (Mặc định: off)"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2592
msgid "Ignore whitespace differences"
msgstr "Bỏ qua các khác biệt do khoảng trắng gây ra"
-#: builtin/blame.c:2552
+#: builtin/blame.c:2599
+msgid "Use an experimental indent-based heuristic to improve diffs"
+msgstr "Dùng một phỏng đoán dựa trên thụt lề thử nghiệm để tăng cường các diff"
+
+#: builtin/blame.c:2600
+msgid "Use an experimental blank-line-based heuristic to improve diffs"
+msgstr ""
+"Dùng một phỏng đoán dựa trên dòng trắng thử nghiệm để tăng cường các diff"
+
+#: builtin/blame.c:2602
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:2553
+#: builtin/blame.c:2603
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
"Sử dụng điểm xét duyệt (revision) từ <tập tin> thay vì gọi “git-rev-list”"
-#: builtin/blame.c:2554
+#: builtin/blame.c:2604
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:2555 builtin/blame.c:2556
+#: builtin/blame.c:2605 builtin/blame.c:2606
msgid "score"
msgstr "điểm số"
-#: builtin/blame.c:2555
+#: builtin/blame.c:2605
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:2556
+#: builtin/blame.c:2606
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:2557
+#: builtin/blame.c:2607
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2557
+#: builtin/blame.c:2607
msgid "Process only line range n,m, counting from 1"
msgstr "Xử lý chỉ dòng vùng n,m, tính từ 1"
+#: builtin/blame.c:2654
+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"
+
#. 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:2649
+#: builtin/blame.c:2700
msgid "4 years, 11 months ago"
msgstr "4 năm, 11 tháng trước"
+#: builtin/blame.c:2780
+msgid "--contents and --reverse do not blend well."
+msgstr "tùy chọn--contents và --reverse không được trộn vào nhau."
+
+#: builtin/blame.c:2800
+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"
+
+#: builtin/blame.c:2805
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr ""
+"--reverse và --first-parent cùng nhau cần chỉ định lần chuyển giao cuối"
+
+#: builtin/blame.c:2832
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
+msgstr ""
+"--reverse --first-parent cùng nhau yêu cầu vùng cùng với chuỗi cha-mẹ-đầu-"
+"tiên"
+
+#: builtin/blame.c:2843
+#, c-format
+msgid "no such path %s in %s"
+msgstr "không có đường dẫn %s trong “%s”"
+
+#: builtin/blame.c:2854
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "không thể đọc blob %s cho đường dẫn “%s”"
+
+#: builtin/blame.c:2873
+#, 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/branch.c:26
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<các-tùy-chọn>] [-r | -a] [--merged | --no-merged]"
msgid "change the upstream info"
msgstr "thay đổi thông tin thượng nguồn"
+#: builtin/branch.c:660
+msgid "Unset the upstream info"
+msgstr "Bỏ đặt thông tin thượng nguồn"
+
#: builtin/branch.c:661
msgid "use colored output"
msgstr "tô màu kết xuất"
msgid "field name to sort on"
msgstr "tên trường cần sắp xếp"
-#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402
-#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404
+#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570
#: builtin/tag.c:369
msgid "object"
msgstr "đối tượng"
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Gặp lỗi khi phân giải HEAD như là một tham chiếu hợp lệ."
-#: builtin/branch.c:709 builtin/clone.c:707
+#: builtin/branch.c:709 builtin/clone.c:706
msgid "HEAD not found below refs/heads!"
msgstr "không tìm thấy HEAD ở dưới refs/heads!"
msgid "Need a repository to unbundle."
msgstr "Cần một kho chứa để có thể giải nén một bundle."
-#: builtin/cat-file.c:443
+#: builtin/cat-file.c:513
msgid ""
-"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
-"<type>|--textconv) <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|"
-"<kiểu>|--textconv) <đối_tượng>"
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <kiểu> | --textconv) | --filters) [--path=<đường/dẫn>] <đối_tượng>"
-#: builtin/cat-file.c:444
-msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
-msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
+#: builtin/cat-file.c:514
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
+msgstr ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
-#: builtin/cat-file.c:481
+#: builtin/cat-file.c:551
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<kiểu> là một trong số: blob, tree, commit hoặc tag"
-#: builtin/cat-file.c:482
+#: builtin/cat-file.c:552
msgid "show object type"
msgstr "hiển thị kiểu đối tượng"
-#: builtin/cat-file.c:483
+#: builtin/cat-file.c:553
msgid "show object size"
msgstr "hiển thị kích thước đối tượng"
-#: builtin/cat-file.c:485
+#: builtin/cat-file.c:555
msgid "exit with zero when there's no error"
msgstr "thoát với 0 khi không có lỗi"
-#: builtin/cat-file.c:486
+#: builtin/cat-file.c:556
msgid "pretty-print object's content"
msgstr "in nội dung đối tượng dạng dễ đọc"
-#: builtin/cat-file.c:488
+#: builtin/cat-file.c:558
msgid "for blob objects, run textconv on object's content"
msgstr "với đối tượng blob, chạy lệnh textconv trên nội dung của đối tượng"
-#: builtin/cat-file.c:490
+#: builtin/cat-file.c:560
+msgid "for blob objects, run filters on object's content"
+msgstr "với đối tượng blob, chạy lệnh filters trên nội dung của đối tượng"
+
+#: builtin/cat-file.c:561 git-submodule.sh:923
+msgid "blob"
+msgstr "blob"
+
+#: builtin/cat-file.c:562
+msgid "use a specific path for --textconv/--filters"
+msgstr "dùng một đường dẫn rõ ràng cho --textconv/--filters"
+
+#: builtin/cat-file.c:564
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:491
+#: builtin/cat-file.c:565
msgid "buffer --batch output"
msgstr "đệm kết xuất --batch"
-#: builtin/cat-file.c:493
+#: builtin/cat-file.c:567
msgid "show info and content of objects fed from the standard input"
msgstr ""
"hiển thị thông tin và nội dung của các đối tượng lấy từ đầu vào tiêu chuẩn"
-#: builtin/cat-file.c:496
+#: builtin/cat-file.c:570
msgid "show info about objects fed from the standard input"
msgstr "hiển thị các thông tin về đối tượng fed từ đầu vào tiêu chuẩn"
-#: builtin/cat-file.c:499
+#: builtin/cat-file.c:573
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr "theo liên kết mềm trong-cây (được dùng với --batch hay --batch-check)"
-#: builtin/cat-file.c:501
+#: builtin/cat-file.c:575
msgid "show all objects with --batch or --batch-check"
msgstr "hiển thị mọi đối tượng với --batch hay --batch-check"
msgid "use .gitattributes only from the index"
msgstr "chỉ dùng .gitattributes từ bảng mục lục"
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97
+#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
msgid "read file names from stdin"
msgstr "đọc tên tập tin từ đầu vào tiêu chuẩn"
msgid "terminate input and output records by a NUL character"
msgstr "chấm dứt các bản ghi vào và ra bằng ký tự NULL"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "chặn các báo cáo tiến trình hoạt động"
msgstr "ghi nội dung vào tập tin tạm"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491
-#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497
-#: builtin/submodule--helper.c:830 builtin/worktree.c:469
+#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598
+#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951
+#: builtin/worktree.c:469
msgid "string"
msgstr "chuỗi"
msgid "path '%s' is unmerged"
msgstr "đường dẫn “%s” không được hòa trộn"
-#: builtin/checkout.c:495
+#: builtin/checkout.c:494
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:625
+#: builtin/checkout.c:624
#, 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:664
+#: builtin/checkout.c:663
msgid "HEAD is now at"
msgstr "HEAD hiện giờ tại"
-#: builtin/checkout.c:668 builtin/clone.c:661
+#: builtin/checkout.c:667 builtin/clone.c:660
msgid "unable to update HEAD"
msgstr "không thể cập nhật HEAD"
-#: builtin/checkout.c:672
+#: builtin/checkout.c:671
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Đặt lại nhánh “%s”\n"
-#: builtin/checkout.c:675
+#: builtin/checkout.c:674
#, c-format
msgid "Already on '%s'\n"
msgstr "Đã sẵn sàng trên “%s”\n"
-#: builtin/checkout.c:679
+#: builtin/checkout.c:678
#, 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:681 builtin/checkout.c:1070
+#: builtin/checkout.c:680 builtin/checkout.c:1069
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Đã chuyển đến nhánh mới “%s”\n"
-#: builtin/checkout.c:683
+#: builtin/checkout.c:682
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Đã chuyển đến nhánh “%s”\n"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:733
#, c-format
msgid " ... and %d more.\n"
msgstr " … và nhiều hơn %d.\n"
-#: builtin/checkout.c:740
+#: builtin/checkout.c:739
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:759
+#: builtin/checkout.c:758
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
" git branch <tên_nhánh_mới> %s\n"
"\n"
-#: builtin/checkout.c:795
+#: builtin/checkout.c:794
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:799
+#: builtin/checkout.c:798
msgid "Previous HEAD position was"
msgstr "Vị trí trước kia của HEAD là"
-#: builtin/checkout.c:826 builtin/checkout.c:1065
+#: builtin/checkout.c:825 builtin/checkout.c:1064
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:971
+#: builtin/checkout.c:970
#, 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:1011 builtin/worktree.c:214
+#: builtin/checkout.c:1010 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr "tham chiếu không hợp lệ: %s"
-#: builtin/checkout.c:1040
+#: builtin/checkout.c:1039
#, 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:1079
+#: builtin/checkout.c:1078
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:1082 builtin/checkout.c:1086
+#: builtin/checkout.c:1081 builtin/checkout.c:1085
#, 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:1090 builtin/checkout.c:1093 builtin/checkout.c:1098
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097
+#: builtin/checkout.c:1100
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "“%s” không thể được dùng với “%s”"
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1105
#, 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:1139 builtin/checkout.c:1141 builtin/clone.c:88
+#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93
#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
#: builtin/worktree.c:326
msgid "branch"
msgstr "nhánh"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1139
msgid "create and checkout a new branch"
msgstr "tạo và checkout một nhánh mới"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1141
msgid "create/reset and checkout a branch"
msgstr "tạo/đặt_lại và checkout một nhánh"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1142
msgid "create reflog for new branch"
msgstr "tạo reflog cho nhánh mới"
-#: builtin/checkout.c:1144 builtin/worktree.c:328
+#: builtin/checkout.c:1143 builtin/worktree.c:328
msgid "detach HEAD at named commit"
msgstr "rời bỏ HEAD tại lần chuyển giao theo tên"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
msgid "set upstream info for new branch"
msgstr "đặt thông tin thượng nguồn cho nhánh mới"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1146
msgid "new-branch"
msgstr "nhánh-mới"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1146
msgid "new unparented branch"
msgstr "nhánh không cha mới"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1147
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:1150
+#: builtin/checkout.c:1149
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:1152
+#: builtin/checkout.c:1151
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:1153
+#: builtin/checkout.c:1152
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:1154 builtin/merge.c:231
+#: builtin/checkout.c:1153 builtin/merge.c:231
msgid "update ignored files (default)"
msgstr "cập nhật các tập tin bị bỏ qua (mặc định)"
-#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250
+#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251
msgid "style"
msgstr "kiểu"
-#: builtin/checkout.c:1156
+#: builtin/checkout.c:1155
msgid "conflict style (merge or diff3)"
msgstr "xung đột kiểu (hòa trộn hoặc diff3)"
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1158
msgid "do not limit pathspecs to sparse entries only"
msgstr "không giới hạn đặc tả đường dẫn thành chỉ các mục thưa thớt"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1160
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "gợi ý thứ hai \"git checkout <không-nhánh-nào-như-vậy>\""
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1162
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:1164 builtin/clone.c:60 builtin/fetch.c:117
-#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536
+#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119
+#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "ép buộc báo cáo tiến triển công việc"
-#: builtin/checkout.c:1195
+#: builtin/checkout.c:1194
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "Các tùy chọn -b, -B và --orphan loại từ lẫn nhau"
-#: builtin/checkout.c:1212
+#: builtin/checkout.c:1211
msgid "--track needs a branch name"
msgstr "--track cần tên một nhánh"
-#: builtin/checkout.c:1217
+#: builtin/checkout.c:1216
msgid "Missing branch name; try -b"
msgstr "Thiếu tên nhánh; hãy thử -b"
-#: builtin/checkout.c:1253
+#: builtin/checkout.c:1252
msgid "invalid path specification"
msgstr "đường dẫn đã cho không hợp lệ"
-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1259
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
"Bạn đã có ý định checkout “%s” cái mà không thể được phân giải như là lần "
"chuyển giao?"
-#: builtin/checkout.c:1265
+#: builtin/checkout.c:1264
#, 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:1269
+#: builtin/checkout.c:1268
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgid "remove whole directories"
msgstr "gỡ bỏ toàn bộ thư mục"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
-#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725
+#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182
msgid "pattern"
msgstr "mẫu"
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<các-tùy-chọn>] [--] <kho> [<t.mục>]"
-#: builtin/clone.c:62
+#: builtin/clone.c:65
msgid "don't create a checkout"
msgstr "không tạo một checkout"
-#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476
+#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
msgid "create a bare repository"
msgstr "tạo kho thuần"
-#: builtin/clone.c:67
+#: builtin/clone.c:70
msgid "create a mirror repository (implies bare)"
msgstr "tạo kho bản sao (ý là kho thuần)"
-#: builtin/clone.c:69
+#: builtin/clone.c:72
msgid "to clone from a local repository"
msgstr "để nhân bản từ kho nội bộ"
-#: builtin/clone.c:71
+#: builtin/clone.c:74
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:73
+#: builtin/clone.c:76
msgid "setup as shared repository"
msgstr "cài đặt đây là kho chia sẻ"
-#: builtin/clone.c:75 builtin/clone.c:77
+#: builtin/clone.c:78 builtin/clone.c:80
msgid "initialize submodules in the clone"
msgstr "khởi tạo mô-đun-con trong bản sao"
-#: builtin/clone.c:79
+#: builtin/clone.c:82
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:80 builtin/init-db.c:473
+#: builtin/clone.c:83 builtin/init-db.c:475
msgid "template-directory"
msgstr "thư-mục-mẫu"
-#: builtin/clone.c:81 builtin/init-db.c:474
+#: builtin/clone.c:84 builtin/init-db.c:476
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:83 builtin/submodule--helper.c:495
-#: builtin/submodule--helper.c:833
+#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602
+#: builtin/submodule--helper.c:954
msgid "reference repository"
msgstr "kho tham chiếu"
-#: builtin/clone.c:85
+#: builtin/clone.c:90
msgid "use --reference only while cloning"
msgstr "chỉ dùng --reference khi nhân bản"
-#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr "tên"
-#: builtin/clone.c:87
+#: builtin/clone.c:92
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:89
+#: builtin/clone.c:94
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:91
+#: builtin/clone.c:96
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:92 builtin/fetch.c:118 builtin/grep.c:667 builtin/pull.c:201
+#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668
+#: builtin/pull.c:202
msgid "depth"
msgstr "độ-sâu"
-#: builtin/clone.c:93
+#: builtin/clone.c:98
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:95
+#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848
+#: parse-options.h:142
+msgid "time"
+msgstr "thời-gian"
+
+#: builtin/clone.c:100
+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:101 builtin/fetch.c:124
+msgid "revision"
+msgstr "điểm xét duyệt"
+
+#: builtin/clone.c:102 builtin/fetch.c:125
+msgid "deepen history of shallow clone by 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:104
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:97
+#: builtin/clone.c:106
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:98 builtin/init-db.c:482
+#: builtin/clone.c:107 builtin/init-db.c:484
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:99 builtin/init-db.c:483
+#: builtin/clone.c:108 builtin/init-db.c:485
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:100
+#: builtin/clone.c:109
msgid "key=value"
msgstr "khóa=giá_trị"
-#: builtin/clone.c:101
+#: builtin/clone.c:110
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:102 builtin/fetch.c:132 builtin/push.c:547
+#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547
msgid "use IPv4 addresses only"
msgstr "chỉ dùng địa chỉ IPv4"
-#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549
+#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549
msgid "use IPv6 addresses only"
msgstr "chỉ dùng địa chỉ IPv6"
-#: builtin/clone.c:241
+#: builtin/clone.c:250
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"Không đoán được thư mục tên là gì.\n"
"Vui lòng chỉ định tên một thư mục trên dòng lệnh"
-#: builtin/clone.c:307
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr "kho tham chiếu “%s” như là lấy ra liên kết vẫn chưa được hỗ trợ."
-
-#: builtin/clone.c:309
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "kho tham chiếu “%s” không phải là một kho nội bộ."
-
-#: builtin/clone.c:314
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "kho tham chiếu “%s” là nông"
-
-#: builtin/clone.c:317
+#: builtin/clone.c:303
#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "kho tham chiếu “%s” bị cấy ghép"
+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:376
+#: builtin/clone.c:375
#, c-format
msgid "failed to open '%s'"
msgstr "gặp lỗi khi mở “%s”"
-#: builtin/clone.c:384
+#: builtin/clone.c:383
#, 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:398
+#: builtin/clone.c:397
#, c-format
msgid "failed to stat %s\n"
msgstr "gặp lỗi khi lấy thông tin thống kê về %s\n"
-#: builtin/clone.c:420
+#: builtin/clone.c:419
#, 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:424
+#: builtin/clone.c:423
#, 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:449
+#: builtin/clone.c:448
#, c-format
msgid "done.\n"
msgstr "hoàn tất.\n"
-#: builtin/clone.c:461
+#: builtin/clone.c:460
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"Bạn kiểm tra kỹ xem cái gì được lấy ra bằng lệnh “git status”\n"
"và thử lấy ra với lệnh “git checkout -f HEAD”\n"
-#: builtin/clone.c:538
+#: builtin/clone.c:537
#, 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:633
+#: builtin/clone.c:632
msgid "remote did not send all necessary objects"
msgstr "máy chủ đã không gửi tất cả các đối tượng cần thiết"
-#: builtin/clone.c:649
+#: builtin/clone.c:648
#, c-format
msgid "unable to update %s"
msgstr "không thể cập nhật %s"
-#: builtin/clone.c:698
+#: builtin/clone.c:697
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:729
+#: builtin/clone.c:728
msgid "unable to checkout working tree"
msgstr "không thể lấy ra (checkout) cây làm việc"
-#: builtin/clone.c:766
+#: builtin/clone.c:768
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:829
+#: builtin/clone.c:831
msgid "cannot repack to clean up"
msgstr "không thể đóng gói để dọn dẹp"
-#: builtin/clone.c:831
+#: builtin/clone.c:833
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:863 builtin/receive-pack.c:1855
+#: builtin/clone.c:866 builtin/receive-pack.c:1895
msgid "Too many arguments."
msgstr "Có quá nhiều đối số."
-#: builtin/clone.c:867
+#: builtin/clone.c:870
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:878
+#: builtin/clone.c:883
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "tùy chọn --bare và --origin %s xung khắc nhau."
-#: builtin/clone.c:881
+#: builtin/clone.c:886
msgid "--bare and --separate-git-dir are incompatible."
msgstr "tùy chọn --bare và --separate-git-dir xung khắc nhau."
-#: builtin/clone.c:894
+#: builtin/clone.c:899
#, c-format
msgid "repository '%s' does not exist"
msgstr "kho chứa “%s” chưa tồn tại"
-#: builtin/clone.c:900 builtin/fetch.c:1293
+#: builtin/clone.c:905 builtin/fetch.c:1338
#, 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:910
+#: builtin/clone.c:915
#, 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:920
+#: builtin/clone.c:925
#, 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:935 builtin/clone.c:946 builtin/submodule--helper.c:544
+#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657
#: builtin/worktree.c:222 builtin/worktree.c:249
#, 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:938
+#: builtin/clone.c:943
#, 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:956
+#: builtin/clone.c:955
#, 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:958
+#: builtin/clone.c:957
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Đang nhân bản thành “%s”…\n"
-#: builtin/clone.c:997
+#: builtin/clone.c:963
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
+msgstr ""
+"nhân bản --recursive không tương thích với cả hai --reference và --reference-"
+"if-able"
+
+#: builtin/clone.c:1019
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:1000
+#: builtin/clone.c:1021
+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:1023
+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:1026
msgid "source repository is shallow, ignoring --local"
msgstr "kho nguồn là nông, nên bỏ qua --local"
-#: builtin/clone.c:1005
+#: builtin/clone.c:1031
msgid "--local is ignored"
msgstr "--local bị lờ đi"
-#: builtin/clone.c:1009
+#: builtin/clone.c:1035
#, c-format
msgid "Don't know how to clone %s"
msgstr "Không biết làm cách nào để nhân bản (clone) %s"
-#: builtin/clone.c:1058 builtin/clone.c:1066
+#: builtin/clone.c:1090 builtin/clone.c:1098
#, 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:1069
+#: builtin/clone.c:1101
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."
"Thế thì \"git cherry-pick --continue\" sẽ phục hồi lại việc cherry-pick\n"
"những lần chuyển giao còn lại.\n"
-#: builtin/commit.c:308
+#: builtin/commit.c:318
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:349
+#: builtin/commit.c:359
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:355
+#: builtin/commit.c:365
msgid "interactive add failed"
msgstr "gặp lỗi khi thêm bằng cách tương"
-#: builtin/commit.c:368
+#: builtin/commit.c:378
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:370
+#: builtin/commit.c:380
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:394 builtin/commit.c:417 builtin/commit.c:466
+#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
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:448
+#: builtin/commit.c:458
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:450
+#: builtin/commit.c:460
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:459
+#: builtin/commit.c:469
msgid "cannot read the index"
msgstr "không đọc được bảng mục lục"
-#: builtin/commit.c:478
+#: builtin/commit.c:488
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:583
+#: builtin/commit.c:582
#, 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:585
+#: builtin/commit.c:584
#, 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:604
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "đối số cho --author bị dị hình"
-#: builtin/commit.c:612
+#: builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "ngày tháng không hợp lệ: %s"
-#: builtin/commit.c:656
+#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
"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:693 builtin/commit.c:726 builtin/commit.c:1092
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
#, 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:705 builtin/shortlog.c:286
+#: builtin/commit.c:704 builtin/shortlog.c:286
#, 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:707
+#: builtin/commit.c:706
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:711
+#: builtin/commit.c:710
#, c-format
msgid "could not read log file '%s'"
msgstr "không đọc được tệp nhật ký “%s”"
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:737 builtin/commit.c:745
msgid "could not read SQUASH_MSG"
msgstr "không thể đọc SQUASH_MSG"
-#: builtin/commit.c:743
+#: builtin/commit.c:742
msgid "could not read MERGE_MSG"
msgstr "không thể đọc MERGE_MSG"
-#: builtin/commit.c:797
+#: builtin/commit.c:796
msgid "could not write commit template"
msgstr "không thể ghi mẫu chuyển giao"
-#: builtin/commit.c:815
+#: builtin/commit.c:814
#, c-format
msgid ""
"\n"
"\t%s\n"
"và thử lại.\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
"\t%s\n"
"và thử lại.\n"
-#: builtin/commit.c:833
+#: builtin/commit.c:832
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"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:840
+#: builtin/commit.c:839
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\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"
"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:860
+#: builtin/commit.c:859
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sTác giả: %.*s <%.*s>"
-#: builtin/commit.c:868
+#: builtin/commit.c:867
#, c-format
msgid "%sDate: %s"
msgstr "%sNgày tháng: %s"
-#: builtin/commit.c:875
+#: builtin/commit.c:874
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sNgười chuyển giao: %.*s <%.*s>"
-#: builtin/commit.c:893
+#: builtin/commit.c:892
msgid "Cannot read index"
msgstr "Không đọc được bảng mục lục"
-#: builtin/commit.c:950
+#: builtin/commit.c:954
msgid "Error building trees"
msgstr "Gặp lỗi khi xây dựng cây"
-#: builtin/commit.c:965 builtin/tag.c:266
+#: builtin/commit.c:969 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Xin hãy cung cấp lời chú giải hoặc là dùng tùy chọn -m hoặc là -F.\n"
-#: builtin/commit.c:1067
+#: builtin/commit.c:1071
#, 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:1082 builtin/commit.c:1322
+#: builtin/commit.c:1086 builtin/commit.c:1327
#, 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:1119
+#: builtin/commit.c:1124
msgid "--long and -z are incompatible"
msgstr "hai tùy chọn -long và -z không tương thích với nhau"
-#: builtin/commit.c:1149
+#: builtin/commit.c:1154
msgid "Using both --reset-author and --author does not make sense"
msgstr "Sử dụng cả hai tùy chọn --reset-author và --author không hợp lý"
-#: builtin/commit.c:1158
+#: builtin/commit.c:1163
msgid "You have nothing to amend."
msgstr "Không có gì để mà “tu bổ” cả."
-#: builtin/commit.c:1161
+#: builtin/commit.c:1166
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:1163
+#: builtin/commit.c:1168
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:1166
+#: builtin/commit.c:1171
msgid "Options --squash and --fixup cannot be used together"
msgstr "Các tùy chọn --squash và --fixup không thể sử dụng cùng với nhau"
-#: builtin/commit.c:1176
+#: builtin/commit.c:1181
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
"Chỉ được dùng một trong số tùy chọn trong số các tùy chọn -c/-C/-F/--fixup"
-#: builtin/commit.c:1178
+#: builtin/commit.c:1183
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "Tùy chọn -m không thể được tổ hợp cùng với -c/-C/-F/--fixup."
-#: builtin/commit.c:1186
+#: builtin/commit.c:1191
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:1203
+#: builtin/commit.c:1208
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Chỉ một trong các tùy chọn --include/--only/--all/--interactive/--patch được "
"sử dụng."
-#: builtin/commit.c:1205
+#: builtin/commit.c:1210
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:1207
+#: builtin/commit.c:1212
msgid "Clever... amending the last one with dirty index."
msgstr "Giỏi… “tu bổ” cái cuối với bảng mục lục bẩn."
-#: builtin/commit.c:1209
+#: builtin/commit.c:1214
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr ""
"Những đường dẫn rõ ràng được chỉ ra không có tùy chọn -i cũng không -o; coi "
"là --only những đường dẫn"
-#: builtin/commit.c:1221 builtin/tag.c:474
+#: builtin/commit.c:1226 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Chế độ dọn dẹp không hợp lệ %s"
-#: builtin/commit.c:1226
+#: builtin/commit.c:1231
msgid "Paths with -a does not make sense."
msgstr "Các đường dẫn với tùy chọn -a không hợp lý."
-#: builtin/commit.c:1336 builtin/commit.c:1622
+#: builtin/commit.c:1341 builtin/commit.c:1617
msgid "show status concisely"
msgstr "hiển thị trạng thái ở dạng súc tích"
-#: builtin/commit.c:1338 builtin/commit.c:1624
+#: builtin/commit.c:1343 builtin/commit.c:1619
msgid "show branch information"
msgstr "hiển thị thông tin nhánh"
-#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522
+#: builtin/commit.c:1345
+msgid "version"
+msgstr "phiên bản"
+
+#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522
#: builtin/worktree.c:440
msgid "machine-readable output"
msgstr "kết xuất dạng máy-có-thể-đọc"
-#: builtin/commit.c:1343 builtin/commit.c:1628
+#: builtin/commit.c:1348 builtin/commit.c:1623
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:1346 builtin/commit.c:1631
+#: builtin/commit.c:1351 builtin/commit.c:1626
msgid "terminate entries with NUL"
msgstr "chấm dứt các mục bằng NUL"
-#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981
+#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "chế độ"
-#: builtin/commit.c:1349 builtin/commit.c:1634
+#: builtin/commit.c:1354 builtin/commit.c:1629
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:1352
+#: builtin/commit.c:1357
msgid "show ignored files"
msgstr "hiển thị các tập tin ẩn"
-#: builtin/commit.c:1353 parse-options.h:155
+#: builtin/commit.c:1358 parse-options.h:155
msgid "when"
msgstr "khi"
-#: builtin/commit.c:1354
+#: builtin/commit.c:1359
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
"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:1356
+#: builtin/commit.c:1361
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:1442
+#: builtin/commit.c:1437
msgid "couldn't look up newly created commit"
msgstr "không thể tìm thấy lần chuyển giao mới hơn đã được tạo"
-#: builtin/commit.c:1444
+#: builtin/commit.c:1439
msgid "could not parse newly created commit"
msgstr ""
"không thể phân tích cú pháp của đối tượng chuyển giao mới hơn đã được tạo"
-#: builtin/commit.c:1489
+#: builtin/commit.c:1484
msgid "detached HEAD"
msgstr "đã rời khỏi HEAD"
-#: builtin/commit.c:1492
+#: builtin/commit.c:1487
msgid " (root-commit)"
msgstr " (root-commit)"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1587
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:1593
+#: builtin/commit.c:1588
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:1595
+#: builtin/commit.c:1590
msgid "Commit message options"
msgstr "Các tùy chọn ghi chú commit"
-#: builtin/commit.c:1596 builtin/tag.c:351
+#: builtin/commit.c:1591 builtin/tag.c:351
msgid "read message from file"
msgstr "đọc chú thích từ tập tin"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1592
msgid "author"
msgstr "tác giả"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1592
msgid "override author for commit"
msgstr "ghi đè tác giả cho commit"
-#: builtin/commit.c:1598 builtin/gc.c:326
+#: builtin/commit.c:1593 builtin/gc.c:326
msgid "date"
msgstr "ngày tháng"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1593
msgid "override date for commit"
msgstr "ghi đè ngày tháng cho lần chuyển giao"
-#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396
-#: builtin/notes.c:559 builtin/tag.c:349
+#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398
+#: builtin/notes.c:561 builtin/tag.c:349
msgid "message"
msgstr "chú thích"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1594
msgid "commit message"
msgstr "chú thích của lần chuyển giao"
-#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602
-#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
+#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79
msgid "commit"
msgstr "lần_chuyển_giao"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1595
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:1601
+#: builtin/commit.c:1596
msgid "reuse message from specified commit"
msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1597
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"dùng ghi chú có định dạng autosquash để sửa chữa lần chuyển giao đã chỉ ra"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1598
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:1604
+#: builtin/commit.c:1599
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:1605 builtin/log.c:1409 builtin/revert.c:86
+#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "(nên dùng) thêm dòng Signed-off-by:"
-#: builtin/commit.c:1606
+#: builtin/commit.c:1601
msgid "use specified template file"
msgstr "sử dụng tập tin mẫu đã cho"
-#: builtin/commit.c:1607
+#: builtin/commit.c:1602
msgid "force edit of commit"
msgstr "ép buộc sửa lần commit"
-#: builtin/commit.c:1608
+#: builtin/commit.c:1603
msgid "default"
msgstr "mặc định"
-#: builtin/commit.c:1608 builtin/tag.c:354
+#: builtin/commit.c:1603 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "làm thế nào để cắt bỏ khoảng trắng và #ghichú từ mẩu tin nhắn"
-#: builtin/commit.c:1609
+#: builtin/commit.c:1604
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:1611 builtin/merge.c:230 builtin/pull.c:165
+#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "ký lần chuyển giao dùng GPG"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1609
msgid "Commit contents options"
msgstr "Các tùy nội dung ghi chú commit"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1610
msgid "commit all changed files"
msgstr "chuyển giao tất cả các tập tin có thay đổi"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1611
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:1617
+#: builtin/commit.c:1612
msgid "interactively add files"
msgstr "thêm các tập-tin bằng tương tác"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1613
msgid "interactively add changes"
msgstr "thêm các thay đổi bằng tương tác"
-#: builtin/commit.c:1619
+#: builtin/commit.c:1614
msgid "commit only specified files"
msgstr "chỉ chuyển giao các tập tin đã chỉ ra"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1615
msgid "bypass pre-commit and commit-msg hooks"
msgstr "vòng qua móc (hook) pre-commit và commit-msg"
-#: builtin/commit.c:1621
+#: builtin/commit.c:1616
msgid "show what would be committed"
msgstr "hiển thị xem cái gì có thể được chuyển giao"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1627
msgid "amend previous commit"
msgstr "“tu bổ” (amend) lần commit trước"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1628
msgid "bypass post-rewrite hook"
msgstr "vòng qua móc (hook) post-rewrite"
-#: builtin/commit.c:1638
+#: builtin/commit.c:1633
msgid "ok to record an empty change"
msgstr "ok để ghi lại một thay đổi trống rỗng"
-#: builtin/commit.c:1640
+#: builtin/commit.c:1635
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:1669
+#: builtin/commit.c:1664
msgid "could not parse HEAD commit"
msgstr "không thể phân tích commit (lần chuyển giao) HEAD"
-#: builtin/commit.c:1719
+#: builtin/commit.c:1712
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Tập tin MERGE_HEAD sai hỏng (%s)"
-#: builtin/commit.c:1726
+#: builtin/commit.c:1719
msgid "could not read MERGE_MODE"
msgstr "không thể đọc MERGE_MODE"
-#: builtin/commit.c:1745
+#: builtin/commit.c:1738
#, c-format
msgid "could not read commit message: %s"
msgstr "không thể đọc phần chú thích (message) của llần chuyển giao: %s"
-#: builtin/commit.c:1756
+#: builtin/commit.c:1749
#, 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:1761
+#: builtin/commit.c:1754
#, 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:1809
+#: builtin/commit.c:1802
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
msgid "cannot create configuration file %s"
msgstr "không thể tạo tập tin cấu hình “%s”"
-#: builtin/count-objects.c:77
+#: builtin/config.c:625
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+" Use a regexp, --add or --replace-all to change %s."
+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/count-objects.c:86
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:96
msgid "print sizes in human readable format"
msgstr "hiển thị kích cỡ theo định dạng dành cho người đọc"
msgid "only consider tags matching <pattern>"
msgstr "chỉ cân nhắc đến những thẻ khớp với <mẫu>"
-#: builtin/describe.c:410 builtin/name-rev.c:321
+#: builtin/describe.c:410 builtin/name-rev.c:320
msgid "show abbreviated commit object as fallback"
msgstr "hiển thị đối tượng chuyển giao vắn tắt như là fallback"
msgid "invalid option: %s"
msgstr "tùy chọn không hợp lệ: %s"
-#: builtin/diff.c:360
+#: builtin/diff.c:361
msgid "Not a git repository"
msgstr "Không phải là kho git"
-#: builtin/diff.c:403
+#: builtin/diff.c:404
#, c-format
msgid "invalid object '%s' given."
msgstr "đối tượng đã cho “%s” không hợp lệ."
-#: builtin/diff.c:412
+#: builtin/diff.c:413
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "đã cho nhiều hơn hai đối tượng blob: “%s”"
-#: builtin/diff.c:419
+#: builtin/diff.c:420
#, c-format
msgid "unhandled object '%s' given."
msgstr "đã cho đối tượng không thể nắm giữ “%s”."
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<các-tùy-chọn>]"
-#: builtin/fetch.c:93 builtin/pull.c:174
+#: builtin/fetch.c:95 builtin/pull.c:175
msgid "fetch from all remotes"
msgstr "lấy về từ tất cả các máy chủ"
-#: builtin/fetch.c:95 builtin/pull.c:177
+#: builtin/fetch.c:97 builtin/pull.c:178
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:97 builtin/pull.c:180
+#: builtin/fetch.c:99 builtin/pull.c:181
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:98 builtin/pull.c:182
+#: builtin/fetch.c:100 builtin/pull.c:183
msgid "force overwrite of local branch"
msgstr "ép buộc ghi đè lên nhánh nội bộ"
-#: builtin/fetch.c:100
+#: builtin/fetch.c:102
msgid "fetch from multiple remotes"
msgstr "lấy từ nhiều máy chủ cùng lúc"
-#: builtin/fetch.c:102 builtin/pull.c:184
+#: builtin/fetch.c:104 builtin/pull.c:185
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:104
+#: builtin/fetch.c:106
msgid "do not fetch all tags (--no-tags)"
msgstr "không lấy tất cả các thẻ (--no-tags)"
-#: builtin/fetch.c:106
+#: builtin/fetch.c:108
msgid "number of submodules fetched in parallel"
msgstr "số lượng mô-đun-con được lấy đồng thời"
-#: builtin/fetch.c:108 builtin/pull.c:187
+#: builtin/fetch.c:110 builtin/pull.c:188
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:109 builtin/pull.c:190
+#: builtin/fetch.c:111 builtin/pull.c:191
msgid "on-demand"
msgstr "khi-cần"
-#: builtin/fetch.c:110 builtin/pull.c:191
+#: builtin/fetch.c:112 builtin/pull.c:192
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:114 builtin/pull.c:199
+#: builtin/fetch.c:116 builtin/pull.c:200
msgid "keep downloaded pack"
msgstr "giữ lại gói đã tải về"
-#: builtin/fetch.c:116
+#: builtin/fetch.c:118
msgid "allow updating of HEAD ref"
msgstr "cho phép cập nhật th.chiếu HEAD"
-#: builtin/fetch.c:119 builtin/pull.c:202
+#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
msgid "deepen history of shallow clone"
msgstr "làm sâu hơn lịch sử của bản sao"
-#: builtin/fetch.c:121 builtin/pull.c:205
+#: builtin/fetch.c:123
+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:129 builtin/pull.c:206
msgid "convert to a complete repository"
msgstr "chuyển đổi hoàn toàn sang kho git"
-#: builtin/fetch.c:123 builtin/log.c:1426
+#: builtin/fetch.c:131 builtin/log.c:1433
msgid "dir"
msgstr "tmục"
-#: builtin/fetch.c:124
+#: builtin/fetch.c:132
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:127
+#: builtin/fetch.c:135
msgid "default mode for recursion"
msgstr "chế độ mặc định cho đệ qui"
-#: builtin/fetch.c:129 builtin/pull.c:208
+#: builtin/fetch.c:137 builtin/pull.c:209
msgid "accept refs that update .git/shallow"
msgstr "chấp nhận tham chiếu cập nhật .git/shallow"
-#: builtin/fetch.c:130 builtin/pull.c:210
+#: builtin/fetch.c:138 builtin/pull.c:211
msgid "refmap"
msgstr "refmap"
-#: builtin/fetch.c:131 builtin/pull.c:211
+#: builtin/fetch.c:139 builtin/pull.c:212
msgid "specify fetch refmap"
msgstr "chỉ ra refmap cần lấy về"
-#: builtin/fetch.c:387
+#: builtin/fetch.c:398
msgid "Couldn't find remote ref HEAD"
msgstr "Không thể tìm thấy máy chủ cho tham chiếu HEAD"
-#: builtin/fetch.c:503
+#: builtin/fetch.c:514
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "phần cấu hình fetch.output có chứa giá-trị không hợp lệ %s"
-#: builtin/fetch.c:592
+#: builtin/fetch.c:607
#, c-format
msgid "object %s not found"
msgstr "Không tìm thấy đối tượng %s"
-#: builtin/fetch.c:596
+#: builtin/fetch.c:611
msgid "[up to date]"
msgstr "[đã cập nhật]"
-#: builtin/fetch.c:609 builtin/fetch.c:689
+#: builtin/fetch.c:624 builtin/fetch.c:704
msgid "[rejected]"
msgstr "[Bị từ chối]"
-#: builtin/fetch.c:610
+#: builtin/fetch.c:625
msgid "can't fetch in current branch"
msgstr "không thể fetch (lấy) về nhánh hiện hành"
-#: builtin/fetch.c:619
+#: builtin/fetch.c:634
msgid "[tag update]"
msgstr "[cập nhật thẻ]"
-#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669
-#: builtin/fetch.c:684
+#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684
+#: builtin/fetch.c:699
msgid "unable to update local ref"
msgstr "không thể cập nhật tham chiếu nội bộ"
-#: builtin/fetch.c:639
+#: builtin/fetch.c:654
msgid "[new tag]"
msgstr "[thẻ mới]"
-#: builtin/fetch.c:642
+#: builtin/fetch.c:657
msgid "[new branch]"
msgstr "[nhánh mới]"
-#: builtin/fetch.c:645
+#: builtin/fetch.c:660
msgid "[new ref]"
msgstr "[ref (tham chiếu) mới]"
-#: builtin/fetch.c:684
+#: builtin/fetch.c:699
msgid "forced update"
msgstr "cưỡng bức cập nhật"
-#: builtin/fetch.c:689
+#: builtin/fetch.c:704
msgid "non-fast-forward"
msgstr "không-phải-chuyển-tiếp-nhanh"
-#: builtin/fetch.c:733
+#: builtin/fetch.c:749
#, 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:753
+#: builtin/fetch.c:769
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "từ chối %s bởi vì các gốc nông thì không được phép cập nhật"
-#: builtin/fetch.c:839 builtin/fetch.c:934
+#: builtin/fetch.c:856 builtin/fetch.c:952
#, c-format
msgid "From %.*s\n"
msgstr "Từ %.*s\n"
-#: builtin/fetch.c:850
+#: builtin/fetch.c:867
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
"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:904
+#: builtin/fetch.c:922
#, 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:905
+#: builtin/fetch.c:923
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s đã trở thành không đầu (không được quản lý))"
-#: builtin/fetch.c:937
+#: builtin/fetch.c:955
msgid "[deleted]"
msgstr "[đã xóa]"
-#: builtin/fetch.c:938 builtin/remote.c:1020
+#: builtin/fetch.c:956 builtin/remote.c:1020
msgid "(none)"
msgstr "(không)"
-#: builtin/fetch.c:960
+#: builtin/fetch.c:979
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
"Từ chối việc lấy vào trong nhánh hiện tại %s của một kho chứa không phải kho "
"trần (bare)"
-#: builtin/fetch.c:979
+#: builtin/fetch.c:998
#, 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:982
+#: builtin/fetch.c:1001
#, 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:1039
+#: builtin/fetch.c:1077
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Không biết làm cách nào để lấy về từ %s"
-#: builtin/fetch.c:1199
+#: builtin/fetch.c:1237
#, c-format
msgid "Fetching %s\n"
msgstr "Đang lấy “%s” về\n"
-#: builtin/fetch.c:1201 builtin/remote.c:96
+#: builtin/fetch.c:1239 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "không thể “%s” về"
-#: builtin/fetch.c:1219
+#: builtin/fetch.c:1257
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
"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:1242
+#: builtin/fetch.c:1280
msgid "You need to specify a tag name."
msgstr "Bạn phải định rõ tên thẻ."
-#: builtin/fetch.c:1284
+#: builtin/fetch.c:1322
+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:1324
+msgid "--deepen and --depth are mutually exclusive"
+msgstr "Các tùy chọn--deepen và --depth loại từ lẫn nhau"
+
+#: builtin/fetch.c:1329
msgid "--depth and --unshallow cannot be used together"
msgstr "tùy chọn --depth và --unshallow không thể sử dụng cùng với nhau"
-#: builtin/fetch.c:1286
+#: builtin/fetch.c:1331
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:1306
+#: builtin/fetch.c:1353
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:1308
+#: builtin/fetch.c:1355
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:1319
+#: builtin/fetch.c:1366
#, 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:1327
+#: builtin/fetch.c:1374
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Việc lấy về cả một nhóm và chỉ định refspecs không hợp lý"
"git fmt-merge-msg [-m <chú_thích>] [--log[=<n>] | --no-log] [--file <tập-"
"tin>]"
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:663
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:670
+#: builtin/fmt-merge-msg.c:666
msgid "alias for --log (deprecated)"
msgstr "bí danh cho --log (không được dùng)"
-#: builtin/fmt-merge-msg.c:673
+#: builtin/fmt-merge-msg.c:669
msgid "text"
msgstr "văn bản"
-#: builtin/fmt-merge-msg.c:674
+#: builtin/fmt-merge-msg.c:670
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:675
+#: builtin/fmt-merge-msg.c:671
msgid "file to read from"
msgstr "tập tin để đọc dữ liệu từ đó"
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:671
+#: builtin/fsck.c:665
msgid "Checking objects"
msgstr "Đang kiểm tra các đối tượng"
msgid "invalid number of threads specified (%d) for %s"
msgstr "số tuyến đã cho không hợp lệ (%d) cho %s"
-#: builtin/grep.c:452 builtin/grep.c:487
+#: builtin/grep.c:453 builtin/grep.c:488
#, c-format
msgid "unable to read tree (%s)"
msgstr "không thể đọc cây (%s)"
-#: builtin/grep.c:502
+#: builtin/grep.c:503
#, 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:560
+#: builtin/grep.c:561
#, 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:577
-#, c-format
-msgid "cannot open '%s'"
-msgstr "không mở được “%s”"
-
-#: builtin/grep.c:646
+#: builtin/grep.c:647
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:648
+#: builtin/grep.c:649
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:650
+#: builtin/grep.c:651
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:652
+#: builtin/grep.c:653
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:655
+#: builtin/grep.c:656
msgid "show non-matching lines"
msgstr "hiển thị những dòng không khớp với mẫu"
-#: builtin/grep.c:657
+#: builtin/grep.c:658
msgid "case insensitive matching"
msgstr "phân biệt HOA/thường"
-#: builtin/grep.c:659
+#: builtin/grep.c:660
msgid "match patterns only at word boundaries"
msgstr "chỉ khớp mẫu tại đường ranh giới từ"
-#: builtin/grep.c:661
+#: builtin/grep.c:662
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:663
+#: builtin/grep.c:664
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:666
+#: builtin/grep.c:667
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:668
+#: builtin/grep.c:669
msgid "descend at most <depth> levels"
msgstr "hạ xuống ít nhất là mức <sâu>"
-#: builtin/grep.c:672
+#: builtin/grep.c:673
msgid "use extended POSIX regular expressions"
msgstr "dùng biểu thức chính qui POSIX có mở rộng"
-#: builtin/grep.c:675
+#: builtin/grep.c:676
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:678
+#: builtin/grep.c:679
msgid "interpret patterns as fixed strings"
msgstr "diễn dịch các mẫu như là chuỗi cố định"
-#: builtin/grep.c:681
+#: builtin/grep.c:682
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:684
+#: builtin/grep.c:685
msgid "show line numbers"
msgstr "hiển thị số của dòng"
-#: builtin/grep.c:685
+#: builtin/grep.c:686
msgid "don't show filenames"
msgstr "không hiển thị tên tập tin"
-#: builtin/grep.c:686
+#: builtin/grep.c:687
msgid "show filenames"
msgstr "hiển thị các tên tập tin"
-#: builtin/grep.c:688
+#: builtin/grep.c:689
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:690
+#: builtin/grep.c:691
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:692
+#: builtin/grep.c:693
msgid "synonym for --files-with-matches"
msgstr "đồng nghĩa với --files-with-matches"
-#: builtin/grep.c:695
+#: builtin/grep.c:696
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:697
+#: builtin/grep.c:698
msgid "print NUL after filenames"
msgstr "thêm NUL vào sau tên tập tin"
-#: builtin/grep.c:699
+#: builtin/grep.c:700
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:700
+#: builtin/grep.c:701
msgid "highlight matches"
msgstr "tô sáng phần khớp mẫu"
-#: builtin/grep.c:702
+#: builtin/grep.c:703
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:704
+#: builtin/grep.c:705
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:707
+#: builtin/grep.c:708
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:710
+#: builtin/grep.c:711
msgid "show <n> context lines before matches"
msgstr "hiển thị <n> dòng nội dung trước khớp"
-#: builtin/grep.c:712
+#: builtin/grep.c:713
msgid "show <n> context lines after matches"
msgstr "hiển thị <n> dòng nội dung sau khớp"
-#: builtin/grep.c:714
+#: builtin/grep.c:715
msgid "use <n> worker threads"
msgstr "dùng <n> tuyến trình làm việc"
-#: builtin/grep.c:715
+#: builtin/grep.c:716
msgid "shortcut for -C NUM"
msgstr "dạng viết tắt của -C SỐ"
-#: builtin/grep.c:718
+#: builtin/grep.c:719
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:720
+#: builtin/grep.c:721
msgid "show the surrounding function"
msgstr "hiển thị hàm bao quanh"
-#: builtin/grep.c:723
+#: builtin/grep.c:724
msgid "read patterns from file"
msgstr "đọc mẫu từ tập-tin"
-#: builtin/grep.c:725
+#: builtin/grep.c:726
msgid "match <pattern>"
msgstr "match <mẫu>"
-#: builtin/grep.c:727
+#: builtin/grep.c:728
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:739
+#: builtin/grep.c:740
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:741
+#: builtin/grep.c:742
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:743
+#: builtin/grep.c:744
msgid "show parse tree for grep expression"
msgstr "hiển thị cây phân tích cú pháp cho biểu thức “grep” (tìm kiếm)"
-#: builtin/grep.c:747
+#: builtin/grep.c:748
msgid "pager"
msgstr "dàn trang"
-#: builtin/grep.c:747
+#: builtin/grep.c:748
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:750
+#: builtin/grep.c:751
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:813
+#: builtin/grep.c:814
msgid "no pattern given."
msgstr "chưa chỉ ra mẫu."
-#: builtin/grep.c:845 builtin/index-pack.c:1479
+#: builtin/grep.c:846 builtin/index-pack.c:1480
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "số tuyến chỉ ra không hợp lệ (%d)"
-#: builtin/grep.c:875
+#: builtin/grep.c:876
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:901
+#: builtin/grep.c:902
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached hay --untracked không được sử dụng với --no-index."
-#: builtin/grep.c:906
+#: builtin/grep.c:907
msgid "--no-index or --untracked cannot be used with revs."
msgstr ""
"--no-index hay --untracked không được sử dụng cùng với các tùy chọn liên "
"quan đến revs."
-#: builtin/grep.c:909
+#: builtin/grep.c:910
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:917
+#: builtin/grep.c:918
msgid "both --cached and trees are given."
msgstr "cả hai --cached và các cây phải được chỉ ra."
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:93
+#: builtin/hash-object.c:94
msgid "type"
msgstr "kiểu"
-#: builtin/hash-object.c:93
+#: builtin/hash-object.c:94
msgid "object type"
msgstr "kiểu đối tượng"
-#: builtin/hash-object.c:94
+#: builtin/hash-object.c:95
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:96
+#: builtin/hash-object.c:97
msgid "read the object from stdin"
msgstr "đọc đối tượng từ đầu vào tiêu chuẩn stdin"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
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:99
+#: builtin/hash-object.c:100
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:100
+#: builtin/hash-object.c:101
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:41
+#: builtin/help.c:42
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:42
+#: builtin/help.c:43
+msgid "exclude guides"
+msgstr "hướng dẫn loại trừ"
+
+#: builtin/help.c:44
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:43
+#: builtin/help.c:45
msgid "show man page"
msgstr "hiển thị trang man"
-#: builtin/help.c:44
+#: builtin/help.c:46
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:46
+#: builtin/help.c:48
msgid "show info page"
msgstr "hiện trang info"
-#: builtin/help.c:52
+#: builtin/help.c:54
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr "git help [--all] [--guides] [--man | --web | --info] [<lệnh>]"
-#: builtin/help.c:64
+#: builtin/help.c:66
#, c-format
msgid "unrecognized help format '%s'"
msgstr "không nhận ra định dạng trợ giúp “%s”"
-#: builtin/help.c:91
+#: builtin/help.c:93
msgid "Failed to start emacsclient."
msgstr "Gặp lỗi khi khởi chạy emacsclient."
-#: builtin/help.c:104
+#: builtin/help.c:106
msgid "Failed to parse emacsclient version."
msgstr "Gặp lỗi khi phân tích phiên bản emacsclient."
-#: builtin/help.c:112
+#: builtin/help.c:114
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "phiên bản của emacsclient “%d” quá cũ (< 22)."
-#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
+#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
#, c-format
msgid "failed to exec '%s'"
msgstr "gặp lỗi khi thực thi “%s”"
-#: builtin/help.c:205
+#: builtin/help.c:207
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"“%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:217
+#: builtin/help.c:219
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"“%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:334
+#: builtin/help.c:336
#, c-format
msgid "'%s': unknown man viewer."
msgstr "“%s”: không rõ chương trình xem man."
-#: builtin/help.c:351
+#: builtin/help.c:353
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:359
+#: builtin/help.c:361
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:401
+#: builtin/help.c:403
msgid "Defining attributes per path"
msgstr "Định nghĩa các thuộc tính cho mỗi đường dẫn"
-#: builtin/help.c:402
+#: builtin/help.c:404
msgid "Everyday Git With 20 Commands Or So"
msgstr "Mỗi ngày học 20 lệnh Git hay hơn"
-#: builtin/help.c:403
+#: builtin/help.c:405
msgid "A Git glossary"
msgstr "Thuật ngữ chuyên môn Git"
-#: builtin/help.c:404
+#: builtin/help.c:406
msgid "Specifies intentionally untracked files to ignore"
msgstr "Chỉ định các tập tin không cần theo dõi"
-#: builtin/help.c:405
+#: builtin/help.c:407
msgid "Defining submodule properties"
msgstr "Định nghĩa thuộc tính mô-đun-con"
-#: builtin/help.c:406
+#: builtin/help.c:408
msgid "Specifying revisions and ranges for Git"
msgstr "Chỉ định điểm xét duyệt và vùng cho Git"
-#: builtin/help.c:407
+#: builtin/help.c:409
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "Hướng dẫn cách dùng Git ở mức cơ bản (bản 1.5.1 hay mới hơn)"
-#: builtin/help.c:408
+#: builtin/help.c:410
msgid "An overview of recommended workflows with Git"
msgstr "Tổng quan về luồng công việc khuyến nghị nên dùng với Git."
-#: builtin/help.c:420
+#: builtin/help.c:422
msgid "The common Git guides are:\n"
msgstr "Các chỉ dẫn chung về cách dùng Git là:\n"
-#: builtin/help.c:441 builtin/help.c:458
-#, c-format
-msgid "usage: %s%s"
-msgstr "cách dùng: %s%s"
-
-#: builtin/help.c:474
+#: builtin/help.c:440
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "“git %s” được đặt bí danh thành “%s”"
-#: builtin/index-pack.c:153
+#: builtin/help.c:462 builtin/help.c:479
+#, c-format
+msgid "usage: %s%s"
+msgstr "cách dùng: %s%s"
+
+#: builtin/index-pack.c:154
#, c-format
msgid "unable to open %s"
msgstr "không thể mở %s"
-#: builtin/index-pack.c:203
+#: builtin/index-pack.c:204
#, 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:223
+#: builtin/index-pack.c:224
#, 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:226
+#: builtin/index-pack.c:227
#, 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:268
+#: builtin/index-pack.c:269
#, 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:278
+#: builtin/index-pack.c:279
msgid "early EOF"
msgstr "gặp kết thúc tập tin EOF quá sớm"
-#: builtin/index-pack.c:279
+#: builtin/index-pack.c:280
msgid "read error on input"
msgstr "lỗi đọc ở đầu vào"
-#: builtin/index-pack.c:291
+#: builtin/index-pack.c:292
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:298
+#: builtin/index-pack.c:299
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:314
+#: builtin/index-pack.c:302 builtin/unpack-objects.c:92
+msgid "pack exceeds maximum allowed size"
+msgstr "gói đã vượt quá cỡ tối đa được phép"
+
+#: builtin/index-pack.c:317
#, c-format
msgid "unable to create '%s'"
msgstr "không thể tạo “%s”"
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:322
#, c-format
msgid "cannot open packfile '%s'"
msgstr "không thể mở packfile “%s”"
-#: builtin/index-pack.c:333
+#: builtin/index-pack.c:336
msgid "pack signature mismatch"
msgstr "chữ ký cho gói không khớp"
-#: builtin/index-pack.c:335
+#: builtin/index-pack.c:338
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "không hỗ trợ phiên bản gói %<PRIu32>"
-#: builtin/index-pack.c:353
+#: builtin/index-pack.c:356
#, 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:475
+#: builtin/index-pack.c:478
#, c-format
msgid "inflate returned %d"
msgstr "xả nén trả về %d"
-#: builtin/index-pack.c:524
+#: builtin/index-pack.c:527
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:532
+#: builtin/index-pack.c:535
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:540
+#: builtin/index-pack.c:543
#, c-format
msgid "unknown object type %d"
msgstr "không hiểu kiểu đối tượng %d"
-#: builtin/index-pack.c:571
+#: builtin/index-pack.c:574
msgid "cannot pread pack file"
msgstr "không thể chạy hàm pread cho tập tin gói"
-#: builtin/index-pack.c:573
+#: builtin/index-pack.c:576
#, 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:599
+#: builtin/index-pack.c:602
msgid "serious inflate inconsistency"
msgstr "sự mâu thuẫn xả nén nghiêm trọng"
-#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774
-#: builtin/index-pack.c:808 builtin/index-pack.c:817
+#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
+#: builtin/index-pack.c:811 builtin/index-pack.c:820
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SỰ VA CHẠM SHA1 ĐÃ XẢY RA VỚI %s!"
-#: builtin/index-pack.c:748 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:256
+#: builtin/index-pack.c:751 builtin/pack-objects.c:166
+#: builtin/pack-objects.c:258
#, c-format
msgid "unable to read %s"
msgstr "không thể đọc %s"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:817
#, 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:828
+#: builtin/index-pack.c:831
#, c-format
msgid "invalid blob object %s"
msgstr "đối tượng blob không hợp lệ %s"
-#: builtin/index-pack.c:842
+#: builtin/index-pack.c:845
#, c-format
msgid "invalid %s"
msgstr "%s không hợp lệ"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:848
msgid "Error in object"
msgstr "Lỗi trong đối tượng"
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:850
#, 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:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:922 builtin/index-pack.c:953
msgid "failed to apply delta"
msgstr "gặp lỗi khi áp dụng delta"
-#: builtin/index-pack.c:1120
+#: builtin/index-pack.c:1123
msgid "Receiving objects"
msgstr "Đang nhận về các đối tượng"
-#: builtin/index-pack.c:1120
+#: builtin/index-pack.c:1123
msgid "Indexing objects"
msgstr "Các đối tượng bảng mục lục"
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1155
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "gói bị sai hỏng (SHA1 không khớp)"
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
msgid "cannot fstat packfile"
msgstr "không thể lấy thông tin thống kê packfile"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1163
msgid "pack has junk at the end"
msgstr "pack có phần thừa ở cuối"
-#: builtin/index-pack.c:1171
+#: builtin/index-pack.c:1174
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:1196
+#: builtin/index-pack.c:1197
msgid "Resolving deltas"
msgstr "Đang phân giải các delta"
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
#, c-format
msgid "unable to create thread: %s"
msgstr "không thể tạo tuyến: %s"
-#: builtin/index-pack.c:1249
+#: builtin/index-pack.c:1250
msgid "confusion beyond insanity"
msgstr "lộn xộn hơn cả điên rồ"
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1256
#, 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:1267
+#: builtin/index-pack.c:1268
#, 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:1271
+#: builtin/index-pack.c:1272
#, 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:1295
+#: builtin/index-pack.c:1296
#, 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:1371
+#: builtin/index-pack.c:1372
#, c-format
msgid "local object %s is corrupt"
msgstr "đối tượng nội bộ %s bị hỏng"
-#: builtin/index-pack.c:1395
+#: builtin/index-pack.c:1396
msgid "error while closing pack file"
msgstr "gặp lỗi trong khi đóng tập tin gói"
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
#, c-format
msgid "cannot write keep file '%s'"
msgstr "không thể ghi tập tin giữ lại “%s”"
-#: builtin/index-pack.c:1416
+#: builtin/index-pack.c:1417
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "không thể đóng tập tin giữ lại đã được ghi “%s”"
-#: builtin/index-pack.c:1429
+#: builtin/index-pack.c:1430
msgid "cannot store pack file"
msgstr "không thể lưu tập tin gói"
-#: builtin/index-pack.c:1440
+#: builtin/index-pack.c:1441
msgid "cannot store index file"
msgstr "không thể lưu trữ tập tin ghi mục lục"
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1474
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "sai pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1483 builtin/index-pack.c:1681
+#: builtin/index-pack.c:1484 builtin/index-pack.c:1681
#, c-format
msgid "no threads support, ignoring %s"
msgstr "không hỗ trợ đa tuyến, bỏ qua %s"
msgid "bad %s"
msgstr "%s sai"
-#: builtin/index-pack.c:1730
+#: builtin/index-pack.c:1732
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin không thể được dùng mà không có --stdin"
-#: builtin/index-pack.c:1738
+#: builtin/index-pack.c:1740
msgid "--verify with no packfile name given"
msgstr "dùng tùy chọn --verify mà không đưa ra tên packfile"
-#: builtin/init-db.c:55
+#: builtin/init-db.c:54
#, c-format
msgid "cannot stat '%s'"
msgstr "không thể lấy thông tin thống kê về “%s”"
-#: builtin/init-db.c:61
+#: builtin/init-db.c:60
#, 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:66
+#: builtin/init-db.c:65
#, c-format
msgid "cannot opendir '%s'"
msgstr "không thể opendir() “%s”"
-#: builtin/init-db.c:77
+#: builtin/init-db.c:76
#, c-format
msgid "cannot readlink '%s'"
msgstr "không thể readlink “%s”"
-#: builtin/init-db.c:79
+#: builtin/init-db.c:78
#, 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:85
+#: builtin/init-db.c:84
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "không thể sao chép “%s” sang “%s”"
-#: builtin/init-db.c:89
+#: builtin/init-db.c:88
#, c-format
msgid "ignoring template %s"
msgstr "đang lờ đi mẫu “%s”"
-#: builtin/init-db.c:120
+#: builtin/init-db.c:119
#, c-format
msgid "templates not found %s"
msgstr "các mẫu không được tìm thấy %s"
-#: builtin/init-db.c:135
+#: builtin/init-db.c:134
#, 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:312 builtin/init-db.c:315
-#, c-format
-msgid "%s already exists"
-msgstr "%s đã có từ trước rồi"
+msgstr "không sao chép các mẫu từ “%s”: %s"
-#: builtin/init-db.c:344
+#: builtin/init-db.c:327
#, 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:347
+#: builtin/init-db.c:330
#, c-format
msgid "unable to move %s to %s"
msgstr "không di chuyển được %s vào %s"
-#: builtin/init-db.c:402
+#: builtin/init-db.c:347 builtin/init-db.c:350
+#, c-format
+msgid "%s already exists"
+msgstr "%s đã có từ trước rồi"
+
+#: builtin/init-db.c:403
#, 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:403
+#: builtin/init-db.c:404
#, 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:407
+#: builtin/init-db.c:408
#, 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:408
+#: builtin/init-db.c:409
#, 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:455
+#: builtin/init-db.c:457
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
"git init [-q | --quiet] [--bare] [--template=<thư-mục-tạm>] [--shared[=<các-"
"quyền>]] [thư-mục]"
-#: builtin/init-db.c:478
+#: builtin/init-db.c:480
msgid "permissions"
msgstr "các quyền"
-#: builtin/init-db.c:479
+#: builtin/init-db.c:481
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:513 builtin/init-db.c:518
+#: builtin/init-db.c:515 builtin/init-db.c:520
#, c-format
msgid "cannot mkdir %s"
msgstr "không thể mkdir (tạo thư mục): %s"
-#: builtin/init-db.c:522
+#: builtin/init-db.c:524
#, c-format
msgid "cannot chdir to %s"
msgstr "không thể chdir (chuyển đổi thư mục) sang %s"
-#: builtin/init-db.c:543
+#: builtin/init-db.c:545
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"%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:571
+#: builtin/init-db.c:573
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "không thể truy cập cây (tree) làm việc “%s”"
msgid "Cover letter needs email format"
msgstr "“Cover letter” cần cho định dạng thư"
-#: builtin/log.c:1064
+#: builtin/log.c:1063
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to điên rồ: %s"
-#: builtin/log.c:1092
+#: builtin/log.c:1091
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:1137
+#: builtin/log.c:1141
msgid "Two output directories?"
msgstr "Hai thư mục kết xuất?"
-#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897
+#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
#, c-format
msgid "Unknown commit %s"
msgstr "Không hiểu lần chuyển giao %s"
-#: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305
-#: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425
-#: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594
-#: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455
+#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455
#, 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:1259
+#: builtin/log.c:1263
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:1263
+#: builtin/log.c:1267
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"
"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:1283
+#: builtin/log.c:1287
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:1294
+#: builtin/log.c:1298
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:1298
+#: builtin/log.c:1302
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:1347
+#: builtin/log.c:1351
msgid "cannot get patch id"
msgstr "không thể lấy mã miếng vá"
-#: builtin/log.c:1404
+#: builtin/log.c:1408
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:1407
+#: builtin/log.c:1411
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:1411
+#: builtin/log.c:1415
msgid "print patches to standard out"
msgstr "hiển thị miếng vá ra đầu ra chuẩn"
-#: builtin/log.c:1413
+#: builtin/log.c:1417
msgid "generate a cover letter"
msgstr "tạo bì thư"
-#: builtin/log.c:1415
+#: builtin/log.c:1419
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:1416
+#: builtin/log.c:1420
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1417
+#: builtin/log.c:1421
msgid "use <sfx> instead of '.patch'"
msgstr "sử dụng <sfx> thay cho “.patch”"
-#: builtin/log.c:1419
+#: builtin/log.c:1423
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:1421
+#: builtin/log.c:1425
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:1423
+#: builtin/log.c:1427
+msgid "Use [RFC PATCH] instead of [PATCH]"
+msgstr "Dùng [RFC VÁ] thay cho [VÁ]"
+
+#: builtin/log.c:1430
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Dùng [<tiền-tố>] thay cho [VÁ]"
-#: builtin/log.c:1426
+#: builtin/log.c:1433
msgid "store resulting files in <dir>"
msgstr "lưu các tập tin kết quả trong <t.mục>"
-#: builtin/log.c:1429
+#: builtin/log.c:1436
msgid "don't strip/add [PATCH]"
msgstr "không strip/add [VÁ]"
-#: builtin/log.c:1432
+#: builtin/log.c:1439
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:1434
+#: builtin/log.c:1441
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:1436
+#: builtin/log.c:1443
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:1438
+#: builtin/log.c:1445
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:1440
+#: builtin/log.c:1447
msgid "Messaging"
msgstr "Lời nhắn"
-#: builtin/log.c:1441
+#: builtin/log.c:1448
msgid "header"
msgstr "đầu đề thư"
-#: builtin/log.c:1442
+#: builtin/log.c:1449
msgid "add email header"
msgstr "thêm đầu đề thư"
-#: builtin/log.c:1443 builtin/log.c:1445
+#: builtin/log.c:1450 builtin/log.c:1452
msgid "email"
msgstr "thư điện tử"
-#: builtin/log.c:1443
+#: builtin/log.c:1450
msgid "add To: header"
msgstr "thêm To: đầu đề thư"
-#: builtin/log.c:1445
+#: builtin/log.c:1452
msgid "add Cc: header"
msgstr "thêm Cc: đầu đề thư"
-#: builtin/log.c:1447
+#: builtin/log.c:1454
msgid "ident"
msgstr "thụt lề"
-#: builtin/log.c:1448
+#: builtin/log.c:1455
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:1450
+#: builtin/log.c:1457
msgid "message-id"
msgstr "message-id"
-#: builtin/log.c:1451
+#: builtin/log.c:1458
msgid "make first mail a reply to <message-id>"
msgstr "dùng thư đầu tiên để trả lời <message-id>"
-#: builtin/log.c:1452 builtin/log.c:1455
+#: builtin/log.c:1459 builtin/log.c:1462
msgid "boundary"
msgstr "ranh giới"
-#: builtin/log.c:1453
+#: builtin/log.c:1460
msgid "attach the patch"
msgstr "đính kèm miếng vá"
-#: builtin/log.c:1456
+#: builtin/log.c:1463
msgid "inline the patch"
msgstr "dùng miếng vá làm nội dung"
-#: builtin/log.c:1460
+#: builtin/log.c:1467
msgid "enable message threading, styles: shallow, deep"
msgstr "cho phép luồng lời nhắn, kiểu: “shallow”, “deep”"
-#: builtin/log.c:1462
+#: builtin/log.c:1469
msgid "signature"
msgstr "chữ ký"
-#: builtin/log.c:1463
+#: builtin/log.c:1470
msgid "add a signature"
msgstr "thêm chữ ký"
-#: builtin/log.c:1464
+#: builtin/log.c:1471
msgid "base-commit"
msgstr "lần_chuyển_giao_nền"
-#: builtin/log.c:1465
+#: builtin/log.c:1472
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:1467
+#: builtin/log.c:1474
msgid "add a signature from a file"
msgstr "thêm chữ ký từ một tập tin"
-#: builtin/log.c:1468
+#: builtin/log.c:1475
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:1558
+#: builtin/log.c:1565
msgid "-n and -k are mutually exclusive."
msgstr "-n và -k loại từ lẫn nhau."
-#: builtin/log.c:1560
-msgid "--subject-prefix and -k are mutually exclusive."
-msgstr "--subject-prefix và -k xung khắc nhau."
+#: builtin/log.c:1567
+msgid "--subject-prefix/--rfc and -k are mutually exclusive."
+msgstr "--subject-prefix/--rfc và -k xung khắc nhau."
-#: builtin/log.c:1568
+#: builtin/log.c:1575
msgid "--name-only does not make sense"
msgstr "--name-only không hợp lý"
-#: builtin/log.c:1570
+#: builtin/log.c:1577
msgid "--name-status does not make sense"
msgstr "--name-status không hợp lý"
-#: builtin/log.c:1572
+#: builtin/log.c:1579
msgid "--check does not make sense"
msgstr "--check không hợp lý"
-#: builtin/log.c:1602
+#: builtin/log.c:1609
msgid "standard output, or directory, which one?"
msgstr "đầu ra chuẩn, hay thư mục, chọn cái nào?"
-#: builtin/log.c:1604
+#: builtin/log.c:1611
#, c-format
msgid "Could not create directory '%s'"
msgstr "Không thể tạo thư mục “%s”"
-#: builtin/log.c:1698
+#: builtin/log.c:1705
#, c-format
msgid "unable to read signature file '%s'"
msgstr "không thể đọc tập tin chữ ký “%s”"
-#: builtin/log.c:1769
+#: builtin/log.c:1777
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:1818
+#: builtin/log.c:1826
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<thượng-nguồn> [<đầu> [<giới-hạn>]]]"
-#: builtin/log.c:1872
+#: builtin/log.c:1880
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
"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:379
+#: builtin/ls-files.c:458
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<các-tùy-chọn>] [<tập-tin>…]"
-#: builtin/ls-files.c:428
+#: builtin/ls-files.c:507
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:430
+#: builtin/ls-files.c:509
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:432
+#: builtin/ls-files.c:511
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:434
+#: builtin/ls-files.c:513
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:436
+#: builtin/ls-files.c:515
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:438
+#: builtin/ls-files.c:517
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:440
+#: builtin/ls-files.c:519
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:443
+#: builtin/ls-files.c:522
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:445
+#: builtin/ls-files.c:524
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:447
+#: builtin/ls-files.c:526
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:449
+#: builtin/ls-files.c:528
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:451
+#: builtin/ls-files.c:530
msgid "don't show empty directories"
msgstr "không hiển thị thư mục rỗng"
-#: builtin/ls-files.c:454
+#: builtin/ls-files.c:533
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:456
+#: builtin/ls-files.c:535
msgid "show resolve-undo information"
msgstr "hiển thị thông tin resolve-undo"
-#: builtin/ls-files.c:458
+#: builtin/ls-files.c:537
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:461
+#: builtin/ls-files.c:540
msgid "exclude patterns are read from <file>"
msgstr "mẫu loại trừ được đọc từ <tập tin>"
-#: builtin/ls-files.c:464
+#: builtin/ls-files.c:543
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:466
+#: builtin/ls-files.c:545
msgid "add the standard git exclusions"
msgstr "thêm loại trừ tiêu chuẩn kiểu git"
-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:548
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:472
+#: builtin/ls-files.c:551
+msgid "recurse through submodules"
+msgstr "đệ quy xuyên qua mô-đun con"
+
+#: builtin/ls-files.c:553
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:473
+#: builtin/ls-files.c:554
msgid "tree-ish"
msgstr "tree-ish"
-#: builtin/ls-files.c:474
+#: builtin/ls-files.c:555
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:476
+#: builtin/ls-files.c:557
msgid "show debugging data"
msgstr "hiển thị dữ liệu gỡ lỗi"
msgid "Available custom strategies are:"
msgstr "Các chiến lược tùy chỉnh sẵn sàng là:"
-#: builtin/merge.c:195 builtin/pull.c:126
+#: builtin/merge.c:195 builtin/pull.c:127
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:198 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:130
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:199 builtin/pull.c:132
+#: builtin/merge.c:199 builtin/pull.c:133
msgid "(synonym to --stat)"
msgstr "(đồng nghĩa với --stat)"
-#: builtin/merge.c:201 builtin/pull.c:135
+#: builtin/merge.c:201 builtin/pull.c:136
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:204 builtin/pull.c:138
+#: builtin/merge.c:204 builtin/pull.c:139
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:206 builtin/pull.c:141
+#: builtin/merge.c:206 builtin/pull.c:142
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:208 builtin/pull.c:144
+#: builtin/merge.c:208 builtin/pull.c:145
msgid "edit message before committing"
msgstr "sửa chú thích trước khi chuyển giao"
msgid "allow fast-forward (default)"
msgstr "cho phép chuyển-tiếp-nhanh (mặc định)"
-#: builtin/merge.c:211 builtin/pull.c:150
+#: builtin/merge.c:211 builtin/pull.c:151
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:215 builtin/pull.c:153
+#: builtin/merge.c:215 builtin/pull.c:154
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:216 builtin/notes.c:772 builtin/pull.c:157
+#: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158
#: builtin/revert.c:89
msgid "strategy"
msgstr "chiến lược"
-#: builtin/merge.c:217 builtin/pull.c:158
+#: builtin/merge.c:217 builtin/pull.c:159
msgid "merge strategy to use"
msgstr "chiến lược hòa trộn sẽ dùng"
-#: builtin/merge.c:218 builtin/pull.c:161
+#: builtin/merge.c:218 builtin/pull.c:162
msgid "option=value"
msgstr "tùy_chọn=giá_trị"
-#: builtin/merge.c:219 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:163
msgid "option for selected merge strategy"
msgstr "tùy chọn cho chiến lược hòa trộn đã chọn"
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:227 builtin/pull.c:169
+#: builtin/merge.c:227 builtin/pull.c:170
msgid "allow merging unrelated histories"
msgstr "cho phép hòa trộn lịch sử không liên quan"
msgid "Already up-to-date."
msgstr "Đã cập nhật rồi."
-#: builtin/merge.c:1382
+#: builtin/merge.c:1377
#, c-format
msgid "Updating %s..%s\n"
msgstr "Đang cập nhật %s..%s\n"
-#: builtin/merge.c:1419
+#: builtin/merge.c:1418
#, 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:1426
+#: builtin/merge.c:1425
#, c-format
msgid "Nope.\n"
msgstr "Không.\n"
-#: builtin/merge.c:1451
+#: builtin/merge.c:1450
msgid "Already up-to-date. Yeeah!"
msgstr "Đã cập nhật rồi. Yeeah!"
-#: builtin/merge.c:1457
+#: builtin/merge.c:1456
msgid "Not possible to fast-forward, aborting."
msgstr "Thực hiện lệnh chuyển-tiếp-nhanh là không thể được, đang bỏ qua."
-#: builtin/merge.c:1480 builtin/merge.c:1559
+#: builtin/merge.c:1479 builtin/merge.c:1558
#, 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:1484
+#: builtin/merge.c:1483
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Đang thử chiến lược hòa trộn %s…\n"
-#: builtin/merge.c:1550
+#: builtin/merge.c:1549
#, 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:1552
+#: builtin/merge.c:1551
#, 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:1561
+#: builtin/merge.c:1560
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Sử dụng %s để chuẩn bị giải quyết bằng tay.\n"
-#: builtin/merge.c:1573
+#: builtin/merge.c:1572
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
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:214
+#: builtin/merge-base.c:217
msgid "output all common ancestors"
msgstr "xuất ra tất cả các ông bà, tổ tiên chung"
-#: builtin/merge-base.c:216
+#: builtin/merge-base.c:219
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:218
+#: builtin/merge-base.c:221
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:220
+#: builtin/merge-base.c:223
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:222
+#: builtin/merge-base.c:225
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>"
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:45
+#, c-format
+msgid "unknown option %s"
+msgstr "không hiểu tùy chọn %s"
+
+#: builtin/merge-recursive.c:51
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "không thể phân tích đối tượng “%s”"
+
+#: builtin/merge-recursive.c:55
+#, 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:63
+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-recursive.c:69 builtin/merge-recursive.c:71
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "không thể phân giải tham chiếu %s"
+
+#: builtin/merge-recursive.c:77
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "Đang hòa trộn %s với %s\n"
+
#: builtin/mktree.c:65
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
msgid "renaming '%s' failed"
msgstr "gặp lỗi khi đổi tên “%s”"
-#: builtin/name-rev.c:258
+#: builtin/name-rev.c:257
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<các-tùy-chọn>] <commit>…"
-#: builtin/name-rev.c:259
+#: builtin/name-rev.c:258
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<các-tùy-chọn>] --all"
-#: builtin/name-rev.c:260
+#: builtin/name-rev.c:259
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<các-tùy-chọn>] --stdin"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:311
msgid "print only names (no SHA-1)"
msgstr "chỉ hiển thị tên (không SHA-1)"
-#: builtin/name-rev.c:313
+#: builtin/name-rev.c:312
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:315
+#: builtin/name-rev.c:314
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:317
+#: builtin/name-rev.c:316
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:318
+#: builtin/name-rev.c:317
msgid "read from stdin"
msgstr "đọc từ đầu vào tiêu chuẩn"
-#: builtin/name-rev.c:319
+#: builtin/name-rev.c:318
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:325
+#: builtin/name-rev.c:324
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ộ)"
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"
+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"
+"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"
#: builtin/notes.c:205
#, c-format
-msgid "The note contents have been left in %s"
-msgstr "Nội dung ghi chú còn lại %s"
+msgid "the note contents have been left in %s"
+msgstr "nội dung ghi chú còn lại %s"
#: builtin/notes.c:233 builtin/tag.c:439
#, c-format
msgid "could not open or read '%s'"
msgstr "không thể mở hay đọc “%s”"
+#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307
+#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513
+#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659
+#, 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:257
#, c-format
-msgid "Failed to read object '%s'."
-msgstr "Gặp lỗi khi đọc đối tượng “%s”."
+msgid "failed to read object '%s'."
+msgstr "gặp lỗi khi đọc đối tượng “%s”."
#: builtin/notes.c:261
#, c-format
-msgid "Cannot read note data from non-blob object '%s'."
+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:363 builtin/notes.c:418 builtin/notes.c:494
-#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650
-#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968
+#: builtin/notes.c:301
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr "dòng đầu vào dị hình: “%s”."
+
+#: builtin/notes.c:316
+#, 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”"
+
+#. TRANSLATORS: the first %s will be replaced by a
+#. git notes command: 'add', 'merge', 'remove', etc.
+#: builtin/notes.c:345
+#, 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:365 builtin/notes.c:420 builtin/notes.c:496
+#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652
+#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970
msgid "too many parameters"
msgstr "quá nhiều đối số"
-#: builtin/notes.c:376 builtin/notes.c:663
+#: builtin/notes.c:378 builtin/notes.c:665
#, c-format
-msgid "No note found for object %s."
+msgid "no note found for object %s."
msgstr "không tìm thấy ghi chú cho đối tượng %s."
-#: builtin/notes.c:397 builtin/notes.c:560
+#: builtin/notes.c:399 builtin/notes.c:562
msgid "note contents as a string"
msgstr "nội dung ghi chú (note) nằm trong một chuỗi"
-#: builtin/notes.c:400 builtin/notes.c:563
+#: builtin/notes.c:402 builtin/notes.c:565
msgid "note contents in a file"
msgstr "nội dung ghi chú (note) nằm trong một tập tin"
-#: builtin/notes.c:403 builtin/notes.c:566
+#: builtin/notes.c:405 builtin/notes.c:568
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:406 builtin/notes.c:569
+#: builtin/notes.c:408 builtin/notes.c:571
msgid "reuse specified note object"
msgstr "dùng lại đối tượng ghi chú (note) đã chỉ ra"
-#: builtin/notes.c:409 builtin/notes.c:572
+#: builtin/notes.c:411 builtin/notes.c:574
msgid "allow storing empty note"
msgstr "cho lưu trữ ghi chú trống rỗng"
-#: builtin/notes.c:410 builtin/notes.c:481
+#: builtin/notes.c:412 builtin/notes.c:483
msgid "replace existing notes"
msgstr "thay thế ghi chú trước"
-#: builtin/notes.c:435
+#: builtin/notes.c:437
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"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:450 builtin/notes.c:529
+#: builtin/notes.c:452 builtin/notes.c:531
#, 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:461 builtin/notes.c:622 builtin/notes.c:887
+#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889
#, 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:482
+#: builtin/notes.c:484
msgid "read objects from stdin"
msgstr "đọc các đối tượng từ đầu vào tiêu chuẩn"
-#: builtin/notes.c:484
+#: builtin/notes.c:486
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:502
+#: builtin/notes.c:504
msgid "too few parameters"
msgstr "quá ít đối số"
-#: builtin/notes.c:523
+#: builtin/notes.c:525
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"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:535
+#: builtin/notes.c:537
#, 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."
+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:587
+#: builtin/notes.c:589
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"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:753
+#: builtin/notes.c:685
+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:687
+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:689
+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:709
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr "gặp lỗi khi đọc tham chiếu NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:711
+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:713
+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:726
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr "gặp lỗi khi phân giải NOTES_MERGE_REF"
+
+#: builtin/notes.c:729
+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:755
#, 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:769
+#: builtin/notes.c:771
msgid "General options"
msgstr "Tùy chọn chung"
-#: builtin/notes.c:771
+#: builtin/notes.c:773
msgid "Merge options"
msgstr "Tùy chọn về hòa trộn"
-#: builtin/notes.c:773
+#: builtin/notes.c:775
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
"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:775
+#: builtin/notes.c:777
msgid "Committing unmerged notes"
msgstr "Chuyển giao các note chưa được hòa trộn"
-#: builtin/notes.c:777
+#: builtin/notes.c:779
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:779
+#: builtin/notes.c:781
msgid "Aborting notes merge resolution"
msgstr "Hủy bỏ phân giải ghi chú (note) hòa trộn"
-#: builtin/notes.c:781
+#: builtin/notes.c:783
msgid "abort notes merge"
msgstr "bỏ qua hòa trộn các ghi chú (note)"
-#: builtin/notes.c:792
+#: builtin/notes.c:794
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "không thể trộn lẫn --commit, --abort hay -s/--strategy"
-#: builtin/notes.c:797
-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:799
+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:821
+#: builtin/notes.c:823
#, c-format
-msgid "Unknown -s/--strategy: %s"
-msgstr "Không hiểu -s/--strategy: %s"
+msgid "unknown -s/--strategy: %s"
+msgstr "không hiểu -s/--strategy: %s"
-#: builtin/notes.c:858
+#: builtin/notes.c:860
#, c-format
-msgid "A notes merge into %s is already in-progress at %s"
-msgstr "Các ghi chú hòa trộn vào %s đã sẵn trong quá trình xử lý tại %s"
+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:861
+#: builtin/notes.c:863
#, 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)"
+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:863
+#: builtin/notes.c:865
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
"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:885
+#: builtin/notes.c:887
#, c-format
msgid "Object %s has no note\n"
msgstr "Đối tượng %s không có ghi chú (note)\n"
-#: builtin/notes.c:897
+#: builtin/notes.c:899
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:900
+#: builtin/notes.c:902
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:938 builtin/prune.c:105 builtin/worktree.c:127
+#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
msgid "do not remove, show only"
msgstr "không gỡ bỏ, chỉ hiển thị"
-#: builtin/notes.c:939
+#: builtin/notes.c:941
msgid "report pruned notes"
msgstr "báo cáo các đối tượng đã prune"
-#: builtin/notes.c:981
+#: builtin/notes.c:983
msgid "notes-ref"
msgstr "notes-ref"
-#: builtin/notes.c:982
+#: builtin/notes.c:984
msgid "use notes from <notes-ref>"
msgstr "dùng “notes” từ <notes-ref>"
-#: builtin/notes.c:1017 builtin/remote.c:1623
+#: builtin/notes.c:1019
#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "Không hiểu câu lệnh con: %s"
+msgid "unknown subcommand: %s"
+msgstr "không hiểu câu lệnh con: %s"
-#: builtin/pack-objects.c:28
+#: builtin/pack-objects.c:29
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:29
+#: builtin/pack-objects.c:30
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:177 builtin/pack-objects.c:180
+#: builtin/pack-objects.c:179 builtin/pack-objects.c:182
#, c-format
msgid "deflate error (%d)"
msgstr "lỗi giải nén (%d)"
-#: builtin/pack-objects.c:766
+#: builtin/pack-objects.c:768
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:779
+#: builtin/pack-objects.c:781
msgid "Writing objects"
msgstr "Đang ghi lại các đối tượng"
-#: builtin/pack-objects.c:1037
+#: builtin/pack-objects.c:1070
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:2197
+#: builtin/pack-objects.c:2346
msgid "Compressing objects"
msgstr "Đang nén các đối tượng"
-#: builtin/pack-objects.c:2611
+#: builtin/pack-objects.c:2759
#, 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:2615
+#: builtin/pack-objects.c:2763
#, c-format
msgid "bad index version '%s'"
msgstr "phiên bản mục lục sai “%s”"
-#: builtin/pack-objects.c:2645
+#: builtin/pack-objects.c:2793
msgid "do not show progress meter"
msgstr "không hiển thị bộ đo tiến trình"
-#: builtin/pack-objects.c:2647
+#: builtin/pack-objects.c:2795
msgid "show progress meter"
msgstr "hiển thị bộ đo tiến trình"
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2797
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/pack-objects.c:2652
+#: builtin/pack-objects.c:2800
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/pack-objects.c:2653
+#: builtin/pack-objects.c:2801
msgid "version[,offset]"
msgstr "phiên bản[,offset]"
-#: builtin/pack-objects.c:2654
+#: builtin/pack-objects.c:2802
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:2657
+#: builtin/pack-objects.c:2805
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:2659
+#: builtin/pack-objects.c:2807
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:2661
+#: builtin/pack-objects.c:2809
msgid "ignore packed objects"
msgstr "bỏ qua các đối tượng đóng gói"
-#: builtin/pack-objects.c:2663
+#: builtin/pack-objects.c:2811
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:2665
+#: builtin/pack-objects.c:2813
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:2667
+#: builtin/pack-objects.c:2815
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:2669
+#: builtin/pack-objects.c:2817
msgid "reuse existing deltas"
msgstr "dùng lại các delta sẵn có"
-#: builtin/pack-objects.c:2671
+#: builtin/pack-objects.c:2819
msgid "reuse existing objects"
msgstr "dùng lại các đối tượng sẵn có"
-#: builtin/pack-objects.c:2673
+#: builtin/pack-objects.c:2821
msgid "use OFS_DELTA objects"
msgstr "dùng các đối tượng OFS_DELTA"
-#: builtin/pack-objects.c:2675
+#: builtin/pack-objects.c:2823
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:2677
+#: builtin/pack-objects.c:2825
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:2679
+#: builtin/pack-objects.c:2827
msgid "read revision arguments from standard input"
msgstr " đọc tham số “revision” từ thiết bị nhập chuẩn"
-#: builtin/pack-objects.c:2681
+#: builtin/pack-objects.c:2829
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:2684
+#: builtin/pack-objects.c:2832
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:2687
+#: builtin/pack-objects.c:2835
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:2690
+#: builtin/pack-objects.c:2838
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:2693
+#: builtin/pack-objects.c:2841
msgid "output pack to stdout"
msgstr "xuất gói ra đầu ra tiêu chuẩn"
-#: builtin/pack-objects.c:2695
+#: builtin/pack-objects.c:2843
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:2697
+#: builtin/pack-objects.c:2845
msgid "keep unreachable objects"
msgstr "giữ lại các đối tượng không thể đọc được"
-#: builtin/pack-objects.c:2699
+#: builtin/pack-objects.c:2847
msgid "pack loose unreachable objects"
msgstr "pack mất các đối tượng không thể đọc được"
-#: builtin/pack-objects.c:2700 parse-options.h:142
-msgid "time"
-msgstr "thời-gian"
-
-#: builtin/pack-objects.c:2701
+#: builtin/pack-objects.c:2849
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:2704
+#: builtin/pack-objects.c:2852
msgid "create thin packs"
msgstr "tạo gói nhẹ"
-#: builtin/pack-objects.c:2706
+#: builtin/pack-objects.c:2854
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:2708
+#: builtin/pack-objects.c:2856
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:2710
+#: builtin/pack-objects.c:2858
msgid "pack compression level"
msgstr "mức nén gói"
-#: builtin/pack-objects.c:2712
+#: builtin/pack-objects.c:2860
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:2714
+#: builtin/pack-objects.c:2862
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:2716
+#: builtin/pack-objects.c:2864
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:2829
+#: builtin/pack-objects.c:2993
msgid "Counting objects"
msgstr "Đang đếm các đối tượng"
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:72
+#: builtin/pull.c:51 builtin/pull.c:53
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr "Giá trị không hợp lệ %s: %s"
+
+#: builtin/pull.c:73
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<các-tùy-chọn>] [<kho-chứa> [<refspec>…]]"
-#: builtin/pull.c:120
+#: builtin/pull.c:121
msgid "Options related to merging"
msgstr "Các tùy chọn liên quan đến hòa trộn"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
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:147 builtin/revert.c:101
+#: builtin/pull.c:148 builtin/revert.c:101
msgid "allow fast-forward"
msgstr "cho phép chuyển-tiếp-nhanh"
-#: builtin/pull.c:156
+#: builtin/pull.c:157
msgid "automatically stash/stash pop before and after rebase"
msgstr "tự động stash/stash pop tước và sau tu bổ (rebase)"
-#: builtin/pull.c:172
+#: builtin/pull.c:173
msgid "Options related to fetching"
msgstr "Các tùy chọn liên quan đến lệnh lấy về"
-#: builtin/pull.c:194
+#: builtin/pull.c:195
msgid "number of submodules pulled in parallel"
msgstr "số lượng mô-đun-con được đẩy lên đồng thời"
-#: builtin/pull.c:283
+#: builtin/pull.c:284
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Giá trị không hợp lệ cho pull.ff: %s"
-#: builtin/pull.c:379 git-sh-setup.sh:226
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr ""
-"Không thể pull với cải tổ: Bạn có các thay đổi chưa được đưa lên bệ phóng."
-
-#: builtin/pull.c:385 git-sh-setup.sh:252
-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."
-
-#: builtin/pull.c:387 git-sh-setup.sh:245
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr "Không thể pull với cải tổ: Bạn có các thay đổi chưa được chuyển giao."
-
-#: builtin/pull.c:463
+#: builtin/pull.c:397
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
"Ở đâ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:465
+#: builtin/pull.c:399
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:466
+#: builtin/pull.c:400
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
"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:469
+#: builtin/pull.c:403
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"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:474 git-parse-remote.sh:73
+#: builtin/pull.c:408 git-parse-remote.sh:73
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:476 builtin/pull.c:491 git-parse-remote.sh:79
+#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
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:478 builtin/pull.c:493 git-parse-remote.sh:82
+#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
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:479 builtin/pull.c:494
+#: builtin/pull.c:413 builtin/pull.c:428
msgid "See git-pull(1) for details."
msgstr "Xem git-pull(1) để biết thêm chi tiết."
-#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr "<máy chủ>"
-#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451
+#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<nhánh>"
-#: builtin/pull.c:489 git-parse-remote.sh:75
+#: builtin/pull.c:423 git-parse-remote.sh:75
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:498 git-parse-remote.sh:95
+#: builtin/pull.c:432 git-parse-remote.sh:95
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:503
+#: builtin/pull.c:437
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"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:820
+#: builtin/pull.c:754
msgid "ignoring --verify-signatures for rebase"
msgstr "bỏ qua --verify-signatures khi rebase"
-#: builtin/pull.c:867
+#: builtin/pull.c:801
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "tùy chọn --[no-]autostash chỉ hợp lệ khi dùng với --rebase."
-#: builtin/pull.c:875
+#: builtin/pull.c:809
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:903
+#: builtin/pull.c:812
+msgid "pull with rebase"
+msgstr "pull với rebase"
+
+#: builtin/pull.c:813
+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:838
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"đ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:908
+#: builtin/pull.c:843
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"$ git reset --hard\n"
"để khôi phục lại."
-#: builtin/pull.c:923
+#: builtin/pull.c:858
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:927
+#: builtin/pull.c:862
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."
msgid "debug unpack-trees"
msgstr "gỡ lỗi “unpack-trees”"
-#: builtin/receive-pack.c:25
+#: builtin/receive-pack.c:26
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <thư-mục-git>"
-#: builtin/receive-pack.c:1843
+#: builtin/receive-pack.c:793
+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 'receive.denyCurrentBranch' configuration variable to\n"
+"'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 ""
+"Theo mặc định, việc cập nhật nhánh hiện tại không một kho không-thuần\n"
+"bị từ chối, bởi vì nó sẽ làm cho chỉ mục và cây làm việc mâu thuẫn với\n"
+"cái mà bạn đẩy lên, và sẽ yêu cầu lệnh “git reset --hard” để mà làm\n"
+"cho cây làm việc khớp với HEAD.\n"
+"\n"
+"Bạn có thể đặt biến cấu hình “receive.denyCurrentBranch” thành\n"
+"“ignore” hay “warn” trong kho máy chủ để cho phép đẩy lên nhánh\n"
+"hiện tại của nó; tuy nhiên, không nên làm như thế trừ phi bạn\n"
+"sắp đặt để cập nhật cây làm việc của nó tương ứng với cái mà bạn đẩy\n"
+"lên theo cách nào đó.\n"
+"\n"
+"Để 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:813
+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 ""
+"Theo mặc định, việc cập xóa nhánh hiện tại bị từ chối, bởi vì\n"
+"lệnh “git clone” tiếp theo sẽ không có tác dụng trong việc lấy\n"
+"ra bất kỳ tập tin nào, dẫn đến hỗn loạn\n"
+"\n"
+"Bạn có thể đặt biến cấu hình “receive.denyDeleteCurrent” thành\n"
+"“warn” hay “ignore” trong kho máy chủ để cho phép đẩy xóa nhánh\n"
+"hiện tại của nó có hoặc không cảnh báo.\n"
+"\n"
+"Để chấm dứt lời nhắn này, bạn hãy đặt nó thành “refuse”."
+
+#: builtin/receive-pack.c:1883
msgid "quiet"
msgstr "im lặng"
-#: builtin/receive-pack.c:1857
+#: builtin/receive-pack.c:1897
msgid "You must specify a directory."
msgstr "Bạn phải chỉ định thư mục."
msgid " Fetch URL: %s"
msgstr " URL để lấy về: %s"
-#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296
+#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
msgid "(no URL)"
msgstr "(không có URL)"
msgid_plural " Remote branches:%s"
msgstr[0] " Những nhánh trên máy chủ:%s"
-#: builtin/remote.c:1179 builtin/remote.c:1206
+#: builtin/remote.c:1179 builtin/remote.c:1205
msgid " (status not queried)"
msgstr " (trạng thái không được yêu cầu)"
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:1203
+#: builtin/remote.c:1202
#, 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:1224
+#: builtin/remote.c:1223
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:1226
+#: builtin/remote.c:1225
msgid "delete refs/remotes/<name>/HEAD"
msgstr "xóa refs/remotes/<tên>/HEAD"
-#: builtin/remote.c:1241
+#: builtin/remote.c:1240
msgid "Cannot determine remote HEAD"
msgstr "Không thể xác định được HEAD máy chủ"
-#: builtin/remote.c:1243
+#: builtin/remote.c:1242
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:1253
+#: builtin/remote.c:1252
#, c-format
msgid "Could not delete %s"
msgstr "Không thể xóa bỏ %s"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1260
#, c-format
msgid "Not a valid ref: %s"
msgstr "Không phải là tham chiếu hợp lệ: %s"
-#: builtin/remote.c:1263
+#: builtin/remote.c:1262
#, c-format
msgid "Could not setup %s"
msgstr "Không thể cài đặt %s"
-#: builtin/remote.c:1281
+#: builtin/remote.c:1280
#, 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:1282
+#: builtin/remote.c:1281
#, c-format
msgid " %s has become dangling!"
msgstr " %s đã trở thành không đầu (không được quản lý)!"
-#: builtin/remote.c:1292
+#: builtin/remote.c:1291
#, c-format
msgid "Pruning %s"
msgstr "Đang xén bớt %s"
-#: builtin/remote.c:1293
+#: builtin/remote.c:1292
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1309
+#: builtin/remote.c:1308
#, c-format
msgid " * [would prune] %s"
msgstr " * [nên xén bớt] %s"
-#: builtin/remote.c:1312
+#: builtin/remote.c:1311
#, c-format
msgid " * [pruned] %s"
msgstr " * [đã bị xén] %s"
-#: builtin/remote.c:1357
+#: builtin/remote.c:1356
msgid "prune remotes after fetching"
msgstr "cắt máy chủ sau khi lấy về"
-#: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542
+#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
#, c-format
msgid "No such remote '%s'"
msgstr "Không có máy chủ nào có tên “%s”"
-#: builtin/remote.c:1436
+#: builtin/remote.c:1435
msgid "add branch"
msgstr "thêm nhánh"
-#: builtin/remote.c:1443
+#: builtin/remote.c:1442
msgid "no remote specified"
msgstr "chưa chỉ ra máy chủ nào"
-#: builtin/remote.c:1460
+#: builtin/remote.c:1459
msgid "query push URLs rather than fetch URLs"
msgstr "truy vấn đẩy URL thay vì lấy"
-#: builtin/remote.c:1462
+#: builtin/remote.c:1461
msgid "return all URLs"
msgstr "trả về mọi URL"
-#: builtin/remote.c:1490
+#: builtin/remote.c:1489
#, 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:1516
+#: builtin/remote.c:1515
msgid "manipulate push URLs"
msgstr "đẩy các “URL” bằng tay"
-#: builtin/remote.c:1518
+#: builtin/remote.c:1517
msgid "add URL"
msgstr "thêm URL"
-#: builtin/remote.c:1520
+#: builtin/remote.c:1519
msgid "delete URLs"
msgstr "xóa URLs"
-#: builtin/remote.c:1527
+#: builtin/remote.c:1526
msgid "--add --delete doesn't make sense"
msgstr "--add --delete không hợp lý"
-#: builtin/remote.c:1568
+#: builtin/remote.c:1567
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Kiểu mẫu URL cũ không hợp lệ: %s"
-#: builtin/remote.c:1576
+#: builtin/remote.c:1575
#, c-format
msgid "No such URL found: %s"
msgstr "Không tìm thấy URL như vậy: %s"
-#: builtin/remote.c:1578
+#: builtin/remote.c:1577
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:1592
+#: builtin/remote.c:1591
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/remote.c:1622
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Không hiểu câu lệnh con: %s"
+
#: builtin/repack.c:17
msgid "git repack [<options>]"
msgstr "git repack [<các-tùy-chọn>]"
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
#: builtin/reset.c:27
-msgid "git reset [-q]
<tree-ish> [--] <paths>..."
-msgstr "git reset [-q] <tree-ish> [--] <đường-dẫn>…"
+msgid "git reset [-q]
[<tree-ish>] [--] <paths>..."
+msgstr "git reset [-q] [<tree-ish>] [--] <đường-dẫn>…"
#: builtin/reset.c:28
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
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:362
+#: builtin/rev-list.c:354
msgid "rev-list does not support display of notes"
msgstr "rev-list không hỗ trợ hiển thị các ghi chú"
-#: builtin/rev-parse.c:358
+#: builtin/rev-parse.c:386
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:363
+#: builtin/rev-parse.c:391
msgid "keep the `--` passed as an arg"
msgstr "giữ lại “--” chuyển sang làm tham số"
-#: builtin/rev-parse.c:365
+#: builtin/rev-parse.c:393
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:368
+#: builtin/rev-parse.c:396
msgid "output in stuck long form"
msgstr "kết xuất trong định dạng gậy dài"
-#: builtin/rev-parse.c:499
+#: builtin/rev-parse.c:527
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
msgid "revert failed"
msgstr "hoàn nguyên gặp lỗi"
-#: builtin/revert.c:207
+#: builtin/revert.c:205
msgid "cherry-pick failed"
msgstr "cherry-pick gặp lỗi"
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:640
+#: builtin/show-branch.c:375
+#, 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:541
+#, 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:639
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:642
+#: builtin/show-branch.c:641
msgid "show remote-tracking branches"
msgstr "hiển thị các nhánh remote-tracking"
-#: builtin/show-branch.c:644
+#: builtin/show-branch.c:643
msgid "color '*!+-' corresponding to the branch"
msgstr "màu “*!+-” tương ứng với nhánh"
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
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:648
+#: builtin/show-branch.c:647
msgid "synonym to more=-1"
msgstr "đồng nghĩa với more=-1"
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
msgid "suppress naming strings"
msgstr "chặn các chuỗi đặt tên"
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
msgid "include the current branch"
msgstr "bao gồm nhánh hiện hành"
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
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:655
+#: builtin/show-branch.c:654
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:657
+#: builtin/show-branch.c:656
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:659
+#: builtin/show-branch.c:658
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:662
+#: builtin/show-branch.c:661
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:664
+#: builtin/show-branch.c:663
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:666
+#: builtin/show-branch.c:665
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:669
+#: builtin/show-branch.c:668
msgid "<n>[,<base>]"
msgstr "<n>[,<cơ_sở>]"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
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:703
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+msgstr ""
+"--reflog là không tương thích với các tùy chọn --all, --remotes, --"
+"independent hay --merge-base"
+
+#: builtin/show-branch.c:727
+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:730
+msgid "--reflog option needs one branch name"
+msgstr "--reflog cần tên một nhánh"
+
+#: builtin/show-branch.c:733
+#, 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:737
+#, c-format
+msgid "no such ref %s"
+msgstr "không có tham chiếu nào như thế %s"
+
+#: builtin/show-branch.c:829
+#, 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:833
+#, 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:836
+#, 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-ref.c:10
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
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:24 builtin/submodule--helper.c:923
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1046
#, c-format
msgid "No such ref: %s"
msgstr "Không có tham chiếu nào như thế: %s"
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055
#, 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"
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:278 builtin/submodule--helper.c:403
-#: builtin/submodule--helper.c:483
+#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408
+#: builtin/submodule--helper.c:590
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:283
+#: builtin/submodule--helper.c:287
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=</đường/dẫn>] [</đường/dẫn>…]"
-#: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338
+#: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343
#, 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:364
+#: builtin/submodule--helper.c:369
#, 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:368
+#: builtin/submodule--helper.c:373
#, 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:378
+#: builtin/submodule--helper.c:383
#, 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:385
+#: builtin/submodule--helper.c:390
#, 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:404
+#: builtin/submodule--helper.c:409
msgid "Suppress output for initializing a submodule"
msgstr "Chặn kết xuất cho khởi tạo một mô-đun-con"
-#: builtin/submodule--helper.c:409
+#: builtin/submodule--helper.c:414
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [</đường/dẫn>]"
-#: builtin/submodule--helper.c:430
+#: builtin/submodule--helper.c:435
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name </đường/dẫn>"
-#: builtin/submodule--helper.c:436
+#: builtin/submodule--helper.c:441
#, 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:486
+#: builtin/submodule--helper.c:524 builtin/submodule--helper.c:527
+#, 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:563
+#, 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:570
+#, 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:593
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:489
+#: builtin/submodule--helper.c:596
msgid "name of the new submodule"
msgstr "tên của mô-đun-con mới"
-#: builtin/submodule--helper.c:492
+#: builtin/submodule--helper.c:599
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:498
+#: builtin/submodule--helper.c:605
msgid "depth for shallow clones"
msgstr "chiều sâu lịch sử khi tạo bản sao"
-#: builtin/submodule--helper.c:504
+#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964
+msgid "force cloning progress"
+msgstr "ép buộc tiến trình nhân bản"
+
+#: builtin/submodule--helper.c:613
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
"git submodule--helper clone [--prefix=</đường/dẫn>] [--quiet] [--reference "
"<kho>] [--name <tên>] [--depth <sâu>] [--url <url>] [</đường/dẫn>…]"
-#: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535
+#: builtin/submodule--helper.c:638 builtin/submodule--helper.c:648
#, c-format
msgid "could not create directory '%s'"
msgstr "không thể tạo thư mục “%s”"
-#: builtin/submodule--helper.c:531
+#: builtin/submodule--helper.c:644
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "Nhân bản “%s” vào đường dẫn mô-đun-con “%s” gặp lỗi"
-#: builtin/submodule--helper.c:547
+#: builtin/submodule--helper.c:660
#, c-format
msgid "cannot open file '%s'"
msgstr "không thể mở tập tin “%s”"
-#: builtin/submodule--helper.c:552
+#: builtin/submodule--helper.c:665
#, c-format
msgid "could not close file %s"
msgstr "không thể đóng tập tin %s"
-#: builtin/submodule--helper.c:559
+#: builtin/submodule--helper.c:672
#, 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:611
+#: builtin/submodule--helper.c:726
#, 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:615
+#: builtin/submodule--helper.c:730
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:641
+#: builtin/submodule--helper.c:756
#, 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:662
+#: builtin/submodule--helper.c:777
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Bỏ qua mô-đun-con “%s”"
-#: builtin/submodule--helper.c:792
+#: builtin/submodule--helper.c:913
#, 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:803
+#: builtin/submodule--helper.c:924
#, 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:824
+#: builtin/submodule--helper.c:945
msgid "path into the working tree"
msgstr "đường dẫn đến cây làm việc"
-#: builtin/submodule--helper.c:827
+#: builtin/submodule--helper.c:948
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:831
+#: builtin/submodule--helper.c:952
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout hoặc không làm gì cả"
-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:956
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:838
+#: builtin/submodule--helper.c:959
msgid "parallel jobs"
msgstr "công việc đồng thời"
-#: builtin/submodule--helper.c:840
+#: builtin/submodule--helper.c:961
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:841
+#: builtin/submodule--helper.c:962
msgid "don't print cloning progress"
msgstr "đừng in tiến trình nhân bản"
-#: builtin/submodule--helper.c:846
+#: builtin/submodule--helper.c:969
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr ""
"git submodule--helper update_clone [--prefix=</đường/dẫn>] [</đường/dẫn>…]"
-#: builtin/submodule--helper.c:856
+#: builtin/submodule--helper.c:979
msgid "bad value for update parameter"
msgstr "giá trị cho tham số cập nhật bị sai"
-#: builtin/submodule--helper.c:927
+#: builtin/submodule--helper.c:1050
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"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:977
+#: builtin/submodule--helper.c:1100
msgid "submodule--helper subcommand must be called with a subcommand"
msgstr "lệnh con submodule--helper phải được gọi với một lệnh con"
-#: builtin/submodule--helper.c:984
+#: builtin/submodule--helper.c:1107
#, 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ệ"
msgid "Updated tag '%s' (was %s)\n"
msgstr "Đã cập nhật thẻ “%s” (trước là %s)\n"
-#: builtin/unpack-objects.c:490
+#: builtin/unpack-objects.c:493
msgid "Unpacking objects"
msgstr "Đang giải nén các đối tượng"
msgid " OK"
msgstr " Đồng ý"
-#: builtin/update-index.c:575
+#: builtin/update-index.c:564
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<các-tùy-chọn>] [--] [<tập-tin>…]"
-#: builtin/update-index.c:930
+#: builtin/update-index.c:919
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:933
+#: builtin/update-index.c:922
msgid "refresh: ignore submodules"
msgstr "refresh: lờ đi mô-đun-con"
-#: builtin/update-index.c:936
+#: builtin/update-index.c:925
msgid "do not ignore new files"
msgstr "không bỏ qua các tập tin mới tạo"
-#: builtin/update-index.c:938
+#: builtin/update-index.c:927
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:940
+#: builtin/update-index.c:929
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:942
+#: builtin/update-index.c:931
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:945
+#: builtin/update-index.c:934
msgid "refresh stat information"
msgstr "lấy lại thông tin thống kê"
-#: builtin/update-index.c:949
+#: builtin/update-index.c:938
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:953
+#: builtin/update-index.c:942
msgid "<mode>,<object>,<path>"
msgstr "<chế_độ>,<đối_tượng>,<đường_dẫn>"
-#: builtin/update-index.c:954
+#: builtin/update-index.c:943
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:963
+#: builtin/update-index.c:952
msgid "mark files as \"not changing\""
msgstr "Đánh dấu các tập tin là \"không thay đổi\""
-#: builtin/update-index.c:966
+#: builtin/update-index.c:955
msgid "clear assumed-unchanged bit"
msgstr "xóa bít assumed-unchanged (giả định là không thay đổi)"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:958
msgid "mark files as \"index-only\""
msgstr "đánh dấu các tập tin là “chỉ-đọc”"
-#: builtin/update-index.c:972
+#: builtin/update-index.c:961
msgid "clear skip-worktree bit"
msgstr "xóa bít skip-worktree"
-#: builtin/update-index.c:975
+#: builtin/update-index.c:964
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:977
+#: builtin/update-index.c:966
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:979
+#: builtin/update-index.c:968
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:981
+#: builtin/update-index.c:970
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:985
+#: builtin/update-index.c:974
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:989
+#: builtin/update-index.c:978
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:993
+#: builtin/update-index.c:982
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:997
+#: builtin/update-index.c:986
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:1000
+#: builtin/update-index.c:989
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:1002
+#: builtin/update-index.c:991
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:1006
+#: builtin/update-index.c:995
msgid "write index in this format"
msgstr "ghi mục lục ở định dạng này"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:997
msgid "enable or disable split index"
msgstr "bật/tắt chia cắt bảng mục lục"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:999
msgid "enable/disable untracked cache"
msgstr "bật/tắt bộ đệm không theo vết"
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1001
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:1014
+#: builtin/update-index.c:1003
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:1134
+#: builtin/update-index.c:1119
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
+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:1123
msgid "Untracked cache disabled"
msgstr "Nhớ đệm không theo vết bị tắt"
-#: builtin/update-index.c:1146
+#: builtin/update-index.c:1131
+msgid ""
+"core.untrackedCache is set to false; remove or change it, if you really want "
+"to enable the untracked cache"
+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:1135
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Nhớ đệm không theo vết được bật cho “%s”"
msgid "only useful for debugging"
msgstr "chỉ hữu ích khi cần gỡ lỗi"
-#: upload-pack.c:20
+#: upload-pack.c:22
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<các-tùy-chọn>] </đường/dẫn>"
-#: upload-pack.c:837
+#: upload-pack.c:1028
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"
-#: upload-pack.c:839
+#: upload-pack.c:1030
msgid "exit immediately after initial ref advertisement"
msgstr "thoát ngay sau khi khởi tạo quảng cáo tham chiếu"
-#: upload-pack.c:841
+#: upload-pack.c:1032
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"
-#: upload-pack.c:843
+#: upload-pack.c:1034
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "ngắt truyền thông sau <n> giây không hoạt động"
+#: credential-cache--daemon.c:223
+#, 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 ""
+"Quyền hạn trên thư mục gói mạng của bạn không chính xác; người dùng\n"
+"khác có lẽ có thể đọc được chứng thư được lưu đệm của bạn. Cân nhắc chạy:\n"
+"\n"
+"\tchmod 0700 %s"
+
#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "in thông tin gỡ lỗi ra đầu ra lỗi tiêu chuẩ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ể."
-#: http.c:323
+#: http.c:342
+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:351
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "Chốt khóa công không được hỗ trợ với cURL < 7.44.0"
msgid "no-op (backward compatibility)"
msgstr "no-op (tương thích ngược)"
-#: parse-options.h:237
+#: parse-options.h:238
msgid "be more verbose"
msgstr "chi tiết hơn nữa"
-#: parse-options.h:239
+#: parse-options.h:240
msgid "be more quiet"
msgstr "im lặng hơn nữa"
-#: parse-options.h:245
+#: parse-options.h:246
msgid "use <n> digits to display SHA-1s"
msgstr "sử dụng <n> chữ số để hiển thị SHA-1s"
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."
+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 "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"
+#: git-stash.sh:103
+msgid "Cannot save the untracked files"
+msgstr "Không thể ghi lại các tập tin chưa theo dõi"
+
#: git-stash.sh:123 git-stash.sh:136
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"
" Để có thể dùng lời chú thích có chứa -- ở đầu,\n"
" dùng git stash save -- \"$option\""
+#: git-stash.sh:251
+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."
+
#: git-stash.sh:259
msgid "No local changes to save"
msgstr "Không có thay đổi nội bộ nào được ghi lại"
msgid "Cannot remove worktree changes"
msgstr "Không thể gỡ bỏ các thay đổi cây-làm-việc"
-#: git-stash.sh:404
+#: git-stash.sh:403
#, sh-format
msgid "unknown option: $opt"
msgstr "không hiểu tùy chọn: $opt"
-#: git-stash.sh:414
+#: git-stash.sh:416
msgid "No stash found."
msgstr "Không tìm thấy lần chuyển giao cất đi (stash) nào."
-#: git-stash.sh:421
+#: git-stash.sh:423
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Chỉ ra quá nhiều điểm xét duyệt: $REV"
-#: git-stash.sh:427
+#: git-stash.sh:438
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference không phải là tham chiếu hợp lệ"
-#: git-stash.sh:455
+#: git-stash.sh:466
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "“$args” không phải là lần chuyển giao kiểu-stash (cất đi)"
-#: git-stash.sh:466
+#: git-stash.sh:477
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "”$args” không phải tham chiếu đến stash"
-#: git-stash.sh:474
+#: git-stash.sh:485
msgid "unable to refresh index"
msgstr "không thể làm tươi mới bảng mục lục"
-#: git-stash.sh:478
+#: git-stash.sh:489
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Không thể áp dụng một stash ở giữa của quá trình hòa trộn"
-#: git-stash.sh:486
+#: git-stash.sh:497
msgid "Conflicts in index. Try without --index."
msgstr "Xung đột trong bảng mục lục. Hãy thử mà không dùng tùy chọn --index."
-#: git-stash.sh:488
+#: git-stash.sh:499
msgid "Could not save index tree"
msgstr "Không thể ghi lại cây chỉ mục"
-#: git-stash.sh:522
+#: git-stash.sh:508
+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ừ stash"
+
+#: git-stash.sh:533
msgid "Cannot unstage modified files"
msgstr "Không thể bỏ ra khỏi bệ phóng các tập tin đã được sửa chữa"
-#: git-stash.sh:537
+#: git-stash.sh:548
msgid "Index was not unstashed."
msgstr "Bảng mục lục đã không được bỏ stash."
-#: git-stash.sh:551
+#: git-stash.sh:562
msgid "The stash is kept in case you need it again."
msgstr "stash được giữ trong trường hợp bạn lại cần nó."
-#: git-stash.sh:560
+#: git-stash.sh:571
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Đã xóa ${REV} ($s)"
-#: git-stash.sh:561
+#: git-stash.sh:572
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Không thể xóa bỏ mục stash"
-#: git-stash.sh:569
+#: git-stash.sh:580
msgid "No branch name specified"
msgstr "Chưa chỉ ra tên của nhánh"
-#: git-stash.sh:641
+#: git-stash.sh:652
msgid "(To restore them type \"git stash apply\")"
msgstr "(Để phục hồi lại chúng hãy gõ \"git stash apply\")"
-#: git-submodule.sh:183
+#: git-submodule.sh:184
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"Đường dẫn tương đối chỉ có thể dùng từ thư mục ở mức cao nhất của cây làm "
"việc"
-#: git-submodule.sh:193
+#: git-submodule.sh:194
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
"repo URL: “$repo” phải là đường dẫn tuyệt đối hoặc là bắt đầu bằng ./|../"
-#: git-submodule.sh:210
+#: git-submodule.sh:211
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "”$sm_path” thực sự đã tồn tại ở bảng mục lục rồi"
-#: git-submodule.sh:214
+#: git-submodule.sh:215
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
"$sm_path\n"
"Sử dụng -f nếu bạn thực sự muốn thêm nó vào."
-#: git-submodule.sh:232
+#: git-submodule.sh:233
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Đang thêm repo có sẵn tại “$sm_path” vào bảng mục lục"
-#: git-submodule.sh:234
+#: git-submodule.sh:235
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "”$sm_path” đã tồn tại từ trước và không phải là một kho git hợp lệ"
-#: git-submodule.sh:242
+#: git-submodule.sh:243
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Thư mục git cho “$sm_name” được tìm thấy một cách cục bộ với các máy chủ:"
-#: git-submodule.sh:244
+#: git-submodule.sh:245
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
"hoặc là bạn không chắc chắn điều đó nghĩa là gì thì chọn tên khác với tùy "
"chọn “--name”."
-#: git-submodule.sh:250
+#: git-submodule.sh:251
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr ""
"Phục hồi sự hoạt động của thư mục git nội bộ cho mô-đun-con “$sm_name”."
-#: git-submodule.sh:262
+#: git-submodule.sh:263
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Không thể lấy ra mô-đun-con “$sm_path”"
-#: git-submodule.sh:267
+#: git-submodule.sh:268
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Gặp lỗi khi thêm mô-đun-con “$sm_path”"
-#: git-submodule.sh:276
+#: git-submodule.sh:277
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Gặp lỗi khi đăng ký với hệ thống mô-đun-con “$sm_path”"
-#: git-submodule.sh:323
+#: git-submodule.sh:324
#, sh-format
msgid "Entering '$displaypath'"
msgstr "Đang vào “$displaypath”"
-#: git-submodule.sh:343
+#: git-submodule.sh:344
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr "Dừng lại tại “$displaypath”; script trả về trạng thái khác không."
-#: git-submodule.sh:414
+#: git-submodule.sh:415
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr "đặc tả đường dẫn và --all xung khắc nhau"
-#: git-submodule.sh:419
+#: git-submodule.sh:420
#, sh-format
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"
-#: git-submodule.sh:439
+#: git-submodule.sh:440
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains a .git directory\n"
"(dùng “rm -rf” nếu bạn thực sự muốn gỡ bỏ nó cùng với tất cả lịch sử của "
"chúng)"
-#: git-submodule.sh:447
+#: git-submodule.sh:448
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
"Cây làm việc mô-đun-con “$displaypath” chứa các thay đổi nội bộ; hãy dùng “-"
"f” để loại bỏ chúng đi"
-#: git-submodule.sh:450
+#: git-submodule.sh:451
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Đã tạo thư mục “$displaypath”"
-#: git-submodule.sh:451
+#: git-submodule.sh:452
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr "Không thể gỡ bỏ cây làm việc mô-đun-con “$displaypath”"
-#: git-submodule.sh:454
+#: git-submodule.sh:455
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "Không thể tạo thư mục mô-đun-con rỗng “$displaypath”"
-#: git-submodule.sh:463
+#: git-submodule.sh:464
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr "Mô-đun-con “$name” ($url) được bỏ đăng ký cho đường dẫn “$displaypath”"
-#: git-submodule.sh:612
+#: git-submodule.sh:617
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
"Không tìm thấy điểm xét duyệt hiện hành trong đường dẫn mô-đun-con "
"“$displaypath”"
-#: git-submodule.sh:622
+#: git-submodule.sh:627
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Không thể lấy về trong đường dẫn mô-đun-con “$sm_path”"
-#: git-submodule.sh:627
+#: git-submodule.sh:632
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"Không thể tìm thấy điểm xét duyệt hiện hành ${remote_name}/${branch} trong "
"đường dẫn mô-đun-con “$sm_path”"
-#: git-submodule.sh:645
+#: git-submodule.sh:650
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Không thể lấy về trong đường dẫn mô-đun-con “$displaypath”"
-#: git-submodule.sh:651
+#: git-submodule.sh:656
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Đã lấy về từ đường dẫn mô-đun con “$displaypath”, nhưng nó không chứa $sha1. "
"Lấy về theo định hướng của lần chuyển giao đó gặp lỗi."
-#: git-submodule.sh:658
+#: git-submodule.sh:663
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Không thể lấy ra “$sha1” trong đường dẫn mô-đun-con “$displaypath”"
-#: git-submodule.sh:659
+#: git-submodule.sh:664
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Đường dẫn mô-đun-con “$displaypath”: đã checkout “$sha1”"
-#: git-submodule.sh:663
+#: git-submodule.sh:668
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "Không thể cải tổ “$sha1” trong đường dẫn mô-đun-con “$displaypath”"
-#: git-submodule.sh:664
+#: git-submodule.sh:669
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Đường dẫn mô-đun-con “$displaypath”: được rebase vào trong “$sha1”"
-#: git-submodule.sh:669
+#: git-submodule.sh:674
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
"Không thể hòa trộn (merge) “$sha1” trong đường dẫn mô-đun-con “$displaypath”"
-#: git-submodule.sh:670
+#: git-submodule.sh:675
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Đường dẫn mô-đun-con “$displaypath”: được hòa trộn vào “$sha1”"
-#: git-submodule.sh:675
+#: git-submodule.sh:680
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"Thực hiện không thành công lệnh “$command $sha1” trong đường dẫn mô-đun-con "
"“$displaypath”"
-#: git-submodule.sh:676
+#: git-submodule.sh:681
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Đường dẫn mô-đun-con “$displaypath”: “$command $sha1”"
-#: git-submodule.sh:707
+#: git-submodule.sh:712
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Gặp lỗi khi đệ quy vào trong đường dẫn mô-đun-con “$displaypath”"
-#: git-submodule.sh:815
+#: git-submodule.sh:820
msgid "The --cached option cannot be used with the --files option"
msgstr "Tùy chọn --cached không thể dùng cùng với tùy chọn --files"
-#: git-submodule.sh:867
+#: git-submodule.sh:872
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "chế độ không như mong chờ $mod_dst"
-#: git-submodule.sh:887
+#: git-submodule.sh:892
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Cảnh báo: $display_name không chứa lần chuyển giao $sha1_src"
-#: git-submodule.sh:890
+#: git-submodule.sh:895
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Cảnh báo: $display_name không chứa lần chuyển giao $sha1_dst"
-#: git-submodule.sh:893
+#: git-submodule.sh:898
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" Cảnh báo: $display_name không chứa những lần chuyển giao $sha1_src và "
"$sha1_dst"
-#: git-submodule.sh:918
-msgid "blob"
-msgstr "blob"
-
-#: git-submodule.sh:1040
+#: git-submodule.sh:1045
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Gặp lỗi khi đệ quy vào trong đường dẫn mô-đun-con “$sm_path”"
-#: git-submodule.sh:1107
+#: git-submodule.sh:1112
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Url Mô-đun-con đồng bộ hóa cho “$displaypath”"
"Nên bỏ qua."
#: git-rebase--interactive.sh:1044
-msgid "You can fix this with 'git rebase --edit-todo'."
-msgstr "Bạn có thể sửa nó bằng “git rebase --edit-todo”."
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'."
+msgstr ""
+"Bạn có thể sửa nó bằng “git rebase --edit-todo” và sau đó chạy “git rebase --"
+"continue”."
#: git-rebase--interactive.sh:1045
msgid "Or you can abort the rebase with 'git rebase --abort'."
"\n"
" git commit $gpg_sign_opt_quoted\n"
"\n"
-"In both case, once you're done, continue with:\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\n"
+"Bạn có các thay đổi so với trong bệ phóng trong\n"
+"thư mục làm việc của bạn. Nếu các thay đổi này là muốn\n"
"squash vào lần chuyển giao kế trước, chạy:\n"
"\n"
" git commit --amend $gpg_sign_opt_quoted\n"
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1298
+#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1295
msgid "Could not execute editor"
msgstr "Không thể thực thi trình biên soạn"
-#: git-rebase--interactive.sh:1145
-msgid "You need to set your committer info first"
-msgstr "Bạn cần đặt thông tin về người chuyển giao mã nguồn trước đã"
-
-#: git-rebase--interactive.sh:1153
+#: git-rebase--interactive.sh:1150
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "Không thể checkout $switch_to"
-#: git-rebase--interactive.sh:1158
+#: git-rebase--interactive.sh:1155
msgid "No HEAD?"
msgstr "Không HEAD?"
-#: git-rebase--interactive.sh:1159
+#: git-rebase--interactive.sh:1156
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Không thể tạo thư mục tạm thời $state_dir"
-#: git-rebase--interactive.sh:1161
+#: git-rebase--interactive.sh:1158
msgid "Could not mark as interactive"
msgstr "Không thể đánh dấu là tương tác"
-#: git-rebase--interactive.sh:1171 git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:1168 git-rebase--interactive.sh:1173
msgid "Could not init rewritten commits"
msgstr "Không thể khởi tạo các lần chuyển giao ghi lại"
-#: git-rebase--interactive.sh:1276
+#: git-rebase--interactive.sh:1273
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "Cải tổ $shortrevisions vào $shortonto (các lệnh $todocount)"
-#: git-rebase--interactive.sh:1281
+#: git-rebase--interactive.sh:1278
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"\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"
-#: git-rebase--interactive.sh:1288
+#: git-rebase--interactive.sh:1285
msgid "Note that empty commits are commented out"
msgstr "Chú ý rằng lần chuyển giao trống rỗng là ghi chú"
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:226
+msgid "Cannot pull with rebase: You have unstaged changes."
+msgstr ""
+"Không thể pull với cải tổ: Bạn có các thay đổi chưa được đưa lên bệ phóng."
+
#: git-sh-setup.sh:229
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr ""
"Không thể cải tổ: Mục lục của bạn có chứa các thay đổi chưa được chuyển giao."
+#: git-sh-setup.sh:245
+msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+msgstr "Không thể pull với cải tổ: Bạn có các thay đổi chưa được chuyển giao."
+
#: git-sh-setup.sh:248
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
"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:252
+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:372
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."
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"
+#~ msgid "Could not write to %s"
+#~ msgstr "Không thể ghi vào %s"
+
+#~ msgid "Error wrapping up %s."
+#~ msgstr "Lỗi bao bọc %s."
+
+#~ msgid "Your local changes would be overwritten by cherry-pick."
+#~ msgstr "Các thay đổi nội bộ của bạn có thể bị ghi đè bởi lệnh cherry-pick."
+
+#~ msgid "Cannot revert during another revert."
+#~ msgstr "Không thể hoàn nguyên trong khi có hoàn nguyên khác."
+
+#~ msgid "Cannot cherry-pick during another cherry-pick."
+#~ msgstr ""
+#~ "Không thể thực hiện việc cherry-pick trong khi khi đang cherry-pick khác."
+
+#~ msgid "Could not parse line %d."
+#~ msgstr "Không phân tích được dòng %d."
+
+#~ msgid "Could not open %s"
+#~ msgstr "Không thể mở %s"
+
+#~ msgid "Could not read %s."
+#~ msgstr "Không thể đọc %s."
+
+#~ msgid "Could not format %s."
+#~ msgstr "Không thể định dạng “%s”."
+
+#~ msgid "%s: %s"
+#~ msgstr "%s: %s"
+
+#~ msgid "cannot open %s: %s"
+#~ msgstr "không thể mở %s: %s"
+
+#~ msgid "You need to set your committer info first"
+#~ msgstr "Bạn cần đặt thông tin về người chuyển giao mã nguồn trước đã"
+
#~ msgid "bad numeric config value '%s' for '%s': invalid unit"
#~ msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s”: đơn vị sai"
#~ msgstr ""
#~ "Thẩm tra xem lần chuyển giao có tên đó có chữ ký GPG hợp lệ hay không"
-#~ msgid "Could not write to '%s'"
-#~ msgstr "Không thể ghi vào “%s”"
-
#~ msgid "Writing SQUASH_MSG"
#~ msgstr "Đang ghi SQUASH_MSG"
#~ msgid "Could not extract email from committer identity."
#~ msgstr ""
#~ "Không thể rút trích địa chỉ thư điện tử từ định danh người chuyển giao"
-
-#~ msgid "could not parse commit %s\n"
-#~ msgstr "không thể phân tích commit (lần chuyển giao) %s\n"
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-08-27 23:21+0800\n"
-"PO-Revision-Date: 2016-09-05 23:36+0800\n"
+"POT-Creation-Date: 2016-11-25 22:50+0800\n"
+"PO-Revision-Date: 2016-11-25 22:54+0800\n"
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
"Language: zh_CN\n"
msgstr ""
"注意：正在检出 '%s'。\n"
"\n"
-"您正处于分离头指针状态。您可以查看、做试验性的修改及提交，并且您可以通过另外\n"
+"您正处于分离头指针状态。您可以查看、做试验性的修改及提交，并且您可以通过另"
+"外\n"
"的检出分支操作丢弃在这个状态下所做的任何提交。\n"
"\n"
"如果您想要通过创建分支来保留在此状态下所做的提交，您可以通过在检出命令添加\n"
" git checkout -b <new-branch-name>\n"
"\n"
-#: archive.c:12
-msgid "git archive [<options>] <tree-ish> [<path>...]"
-msgstr "git archive [<选项>] <树或提交> [<路径>...]"
-
-#: archive.c:13
-msgid "git archive --list"
-msgstr "git archive --list"
-
-#: archive.c:14
-msgid ""
-"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
-msgstr ""
-"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
-
-#: archive.c:15
-msgid "git archive --remote <repo> [--exec <cmd>] --list"
-msgstr "git archive --remote <仓库> [--exec <命令>] --list"
+#: apply.c:57
+#, c-format
+msgid "unrecognized whitespace option '%s'"
+msgstr "未能识别的空白字符选项 '%s'"
-#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327
+#: apply.c:73
#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr "路径规格 '%s' 未匹配任何文件"
+msgid "unrecognized whitespace ignore option '%s'"
+msgstr "未能识别的空白字符忽略选项 '%s'"
-#: archive.c:429
-msgid "fmt"
-msgstr "格式"
+#: apply.c:125
+msgid "--reject and --3way cannot be used together."
+msgstr "--reject 和 --3say 不能同时使用。"
-#: archive.c:429
-msgid "archive format"
-msgstr "归档格式"
+#: apply.c:127
+msgid "--cached and --3way cannot be used together."
+msgstr "--cached 和 --3way 不能同时使用。"
-#: archive.c:430 builtin/log.c:1422
-msgid "prefix"
-msgstr "前缀"
+#: apply.c:130
+msgid "--3way outside a repository"
+msgstr "--3way 在一个仓库之外"
-#: archive.c:431
-msgid "prepend prefix to each pathname in the archive"
-msgstr "为归档中每个路径名加上前缀"
+#: apply.c:141
+msgid "--index outside a repository"
+msgstr "--index 在一个仓库之外"
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553
-#: builtin/blame.c:2554 builtin/config.c:59 builtin/fast-export.c:987
-#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100
-#: builtin/ls-files.c:460 builtin/ls-files.c:463 builtin/notes.c:399
-#: builtin/notes.c:562 builtin/read-tree.c:109 parse-options.h:153
-msgid "file"
-msgstr "文件"
+#: apply.c:144
+msgid "--cached outside a repository"
+msgstr "--cached 在一个仓库之外"
-#: archive.c:433 builtin/archive.c:89
-msgid "write the archive to this file"
-msgstr "归档写入此文件"
+#: apply.c:845
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr "无法准备时间戳正则表达式 %s"
-#: archive.c:435
-msgid "read .gitattributes in working directory"
-msgstr "读取工作区中的 .gitattributes"
+#: apply.c:854
+#, c-format
+msgid "regexec returned %d for input: %s"
+msgstr "regexec 返回 %d，输入为：%s"
-#: archive.c:436
-msgid "report archived files on stderr"
-msgstr "在标准错误上报告归档文件"
+#: apply.c:938
+#, c-format
+msgid "unable to find filename in patch at line %d"
+msgstr "不能在补丁的第 %d 行找到文件名"
-#: archive.c:437
-msgid "store only"
-msgstr "只存储"
+#: apply.c:977
+#, 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"
-#: archive.c:438
-msgid "compress faster"
-msgstr "压缩速度更快"
+#: apply.c:983
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"
-#: archive.c:446
-msgid "compress better"
-msgstr "压缩效果更好"
+#: apply.c:984
+#, c-format
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"
-#: archive.c:449
-msgid "list supported archive formats"
-msgstr "列出支持的归档格式"
+#: apply.c:990
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null on line %d"
+msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
-#: builtin/submodule--helper.c:832
-msgid "repo"
-msgstr "仓库"
+#: apply.c:1488
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recount：意外的行：%.*s"
-#: archive.c:452 builtin/archive.c:91
-msgid "retrieve the archive from remote repository <repo>"
-msgstr "从远程仓库（<仓库>）提取归档文件"
+#: apply.c:1557
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "第 %d 行的补丁片段没有头信息：%.*s"
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483
-msgid "command"
-msgstr "命令"
+#: apply.c:1577
+#, c-format
+msgid ""
+"git diff header lacks filename information when removing %d leading pathname "
+"component (line %d)"
+msgid_plural ""
+"git diff header lacks filename information when removing %d leading pathname "
+"components (line %d)"
+msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
+msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
-#: archive.c:454 builtin/archive.c:93
-msgid "path to the remote git-upload-archive command"
-msgstr "远程 git-upload-archive 命令的路径"
+#: apply.c:1589
+#, c-format
+msgid "git diff header lacks filename information (line %d)"
+msgstr "git diff 的头信息中缺乏文件名信息（第 %d 行）"
-#: archive.c:461
-msgid "Unexpected option --remote"
-msgstr "æ\9cªç\9f¥å\8f\82æ\95° --remote"
+#: apply.c:1759
+msgid "new file depends on old contents"
+msgstr "æ\96°æ\96\87件ä¾\9dèµ\96æ\97§å\86\85容"
-#: archive.c:463
-msgid "Option --exec can only be used together with --remote"
-msgstr "选项 --exec 只能和 --remote 同时使用"
+#: apply.c:1761
+msgid "deleted file still has contents"
+msgstr "删除的文件仍有内容"
-#: archive.c:465
-msgid "Unexpected option --output"
-msgstr "未知参数 --output"
+#: apply.c:1795
+#, c-format
+msgid "corrupt patch at line %d"
+msgstr "补丁在第 %d 行损坏"
-#: archive.c:487
+#: apply.c:1832
#, c-format
-msgid "Unknown archive format '%s'"
-msgstr "æ\9cªç\9f¥å½\92æ¡£æ ¼å¼\8f '%s'"
+msgid "new file %s depends on old contents"
+msgstr "æ\96°æ\96\87件 %s ä¾\9dèµ\96æ\97§å\86\85容"
-#: archive.c:494
+#: apply.c:1834
#, c-format
-msgid "Argument not supported for format '%s': -%d"
-msgstr "å\8f\82æ\95°ä¸\8dæ\94¯æ\8c\81æ¤æ ¼å¼\8f '%s'ï¼\9a-%d"
+msgid "deleted file %s still has contents"
+msgstr "å\88 é\99¤ç\9a\84æ\96\87件 %s ä»\8dæ\9c\89å\86\85容"
-#: attr.c:263
-msgid ""
-"Negative patterns are ignored in git attributes\n"
-"Use '\\!' for literal leading exclamation."
-msgstr ""
-"负值模版在 git attributes 中被忽略\n"
-"当字符串确实要以感叹号开始时，使用 '\\!'。"
+#: apply.c:1837
+#, c-format
+msgid "** warning: file %s becomes empty but is not deleted"
+msgstr "** 警告：文件 %s 成为空文件但并未删除"
-#: bisect.c:441
+#: apply.c:1984
#, c-format
-msgid "Could not open file '%s'"
-msgstr "ä¸\8dè\83½æ\89\93å¼\80æ\96\87件 '%s'"
+msgid "corrupt binary patch at line %d: %.*s"
+msgstr "äº\8cè¿\9bå\88¶è¡¥ä¸\81å\9c¨ç¬¬ %d è¡\8cæ\8d\9få\9d\8fï¼\9a%.*s"
-#: bisect.c:446
+#: apply.c:2021
#, c-format
-msgid "Badly quoted content in file '%s': %s"
-msgstr "æ\96\87件 '%s' å\8c\85å\90«é\94\99误ç\9a\84å¼\95ç\94¨æ ¼å¼\8fï¼\9a%s"
+msgid "unrecognized binary patch at line %d"
+msgstr "æ\9cªè\83½è¯\86å\88«ç\9a\84äº\8cè¿\9bå\88¶è¡¥ä¸\81ä½\8däº\8e第 %d è¡\8c"
-#: bisect.c:655
+#: apply.c:2182
#, c-format
-msgid "We cannot bisect more!\n"
-msgstr "我们无法进行更多的二分查找！\n"
+msgid "patch with only garbage at line %d"
+msgstr "补丁文件的第 %d 行只有垃圾数据"
-#: bisect.c:708
+#: apply.c:2274
#, c-format
-msgid "Not a valid commit name %s"
-msgstr "不是一个有效的提交名 %s"
+msgid "unable to read symlink %s"
+msgstr "无法读取符号链接 %s"
-#: bisect.c:732
+#: apply.c:2278
#, 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] 之间的 bug 已经被修复。\n"
+msgid "unable to open or read %s"
+msgstr "不能打开或读取 %s"
-#: bisect.c:737
+#: apply.c:2931
#, 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"
+msgid "invalid start of line: '%c'"
+msgstr "无效的行首字符：'%c'"
-#: bisect.c:742
+#: apply.c:3050
#, 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"
+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 行）"
-#: bisect.c:750
+#: apply.c:3062
#, c-format
-msgid ""
-"Some %s revs are not ancestor 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 二分查找无法正常工作。\n"
-"您可能弄错了 %s 和 %s 版本？\n"
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
+msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"
-#: bisect.c:763
+#: apply.c:3068
#, 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."
+"while searching for:\n"
+"%.*s"
msgstr ""
-"介于 %s 和 [%s] 的合并基线一定被忽略了。\n"
-"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
-"我们仍旧继续。"
+"当查询：\n"
+"%.*s"
-#: bisect.c:798
+#: apply.c:3090
#, c-format
-msgid "Bisecting: a merge base must be tested\n"
-msgstr "二分查找中：合并基线必须是经过测试的\n"
+msgid "missing binary patch data for '%s'"
+msgstr "缺失 '%s' 的二进制补丁数据"
-#: bisect.c:849
+#: apply.c:3098
#, c-format
-msgid "a %s revision is needed"
-msgstr "需要一个 %s 版本"
+msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
+msgstr "不能反向应用一个没有至 '%s' 的反向数据块的二进制补丁"
-#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
+#: apply.c:3144
#, c-format
-msgid "could not create file '%s'"
-msgstr "ä¸\8dè\83½å\88\9b建æ\96\87件 '%s'"
+msgid "cannot apply binary patch to '%s' without full index line"
+msgstr "ä¸\8dè\83½å\9c¨ '%s' ä¸\8aåº\94ç\94¨æ²¡æ\9c\89å®\8cæ\95´ç´¢å¼\95è¡\8cç\9a\84äº\8cè¿\9bå\88¶è¡¥ä¸\81"
-#: bisect.c:917
+#: apply.c:3154
#, c-format
-msgid "could not read file '%s'"
-msgstr "不能读取文件 '%s'"
+msgid ""
+"the patch applies to '%s' (%s), which does not match the current contents."
+msgstr "补丁引用到 '%s' (%s)，但是和当前内容不匹配。"
-#: bisect.c:947
-msgid "reading bisect refs failed"
-msgstr "读取二分查找引用失败"
+#: apply.c:3162
+#, c-format
+msgid "the patch applies to an empty '%s' but it is not empty"
+msgstr "补丁应用到空文件 '%s'，但是它并不空"
-#: bisect.c:967
+#: apply.c:3180
#, c-format
-msgid "%s was both %s and %s\n"
-msgstr "%s 同时为 %s 和 %s\n"
+msgid "the necessary postimage %s for '%s' cannot be read"
+msgstr "无法读取 '%2$s' 必须的目标文件 %1$s"
-#: bisect.c:975
+#: apply.c:3193
#, c-format
-msgid ""
-"No testable commit found.\n"
-"Maybe you started with bad path parameters?\n"
-msgstr ""
-"没有发现可测试的提交。\n"
-"可能您在运行时使用了错误的路径参数？\n"
+msgid "binary patch does not apply to '%s'"
+msgstr "二进制补丁未应用到 '%s'"
-#: bisect.c:994
+#: apply.c:3199
#, c-format
-msgid "(roughly %d step)"
-msgid_plural "(roughly %d steps)"
-msgstr[0] "（大概 %d 步）"
-msgstr[1] "（大概 %d 步）"
+msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
+msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"
-#. TRANSLATORS: the last %s will be replaced with
-#. "(roughly %d steps)" translation
-#: bisect.c:998
-#, 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"
-
-#: branch.c:53
+#: apply.c:3220
#, 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"
-"\"git branch --set-upstream-to=%s%s%s\" 。"
+msgid "patch failed: %s:%ld"
+msgstr "打补丁失败：%s:%ld"
-#: branch.c:67
+#: apply.c:3342
#, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "未设置分支 %s 作为它自己的上游。"
+msgid "cannot checkout %s"
+msgstr "不能检出 %s"
-#: branch.c:93
+#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
-msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
+msgid "failed to read %s"
+msgstr "无法读取 %s"
-#: branch.c:94
+#: apply.c:3398
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
-msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
+msgid "reading from '%s' beyond a symbolic link"
+msgstr "读取位于符号链接中的 '%s'"
-#: branch.c:98
+#: apply.c:3427 apply.c:3667
#, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
-msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
+msgid "path %s has been renamed/deleted"
+msgstr "路径 %s 已经被重命名/删除"
-#: branch.c:99
+#: apply.c:3510 apply.c:3681
#, c-format
-msgid "Branch %s set up to track local branch %s."
-msgstr "分支 %s 设置为跟踪本地分支 %s。"
+msgid "%s: does not exist in index"
+msgstr "%s：不存在于索引中"
-#: branch.c:104
+#: apply.c:3519 apply.c:3689
#, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
-msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
+msgid "%s: does not match index"
+msgstr "%s：和索引不匹配"
-#: branch.c:105
-#, c-format
-msgid "Branch %s set up to track remote ref %s."
-msgstr "分支 %s 设置为跟踪远程引用 %s。"
+#: apply.c:3554
+msgid "repository lacks the necessary blob to fall back on 3-way merge."
+msgstr "仓库缺乏必要的数据对象以进行三方合并。"
-#: branch.c:109
+#: apply.c:3557
#, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
-msgstr "å\88\86æ\94¯ %s 设置为使ç\94¨å\8f\98å\9fºæ\9d¥è·\9f踪æ\9c¬å\9c°å¼\95ç\94¨ %sã\80\82"
+msgid "Falling back to three-way merge...\n"
+msgstr "å\9b\9eè\90½å\88°ä¸\89æ\96¹å\90\88并...\n"
-#: branch.c:110
+#: apply.c:3573 apply.c:3577
#, 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 "无法写入上游分支配置"
+msgid "cannot read the current contents of '%s'"
+msgstr "无法读取 '%s' 的当前内容"
-#: branch.c:156
+#: apply.c:3589
#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr "æ\9cªè·\9f踪ï¼\9aå¼\95ç\94¨ %s æ\9c\89æ§ä¹\89"
+msgid "Failed to fall back on three-way merge...\n"
+msgstr "æ\97 æ³\95å\9b\9eè\90½å\88°ä¸\89æ\96¹å\90\88并...\n"
-#: branch.c:185
+#: apply.c:3603
#, c-format
-msgid "'%s' is not a valid branch name."
-msgstr "'%s' 不是一个有效的分支名称。"
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr "应用补丁到 '%s' 存在冲突。\n"
-#: branch.c:190
+#: apply.c:3608
#, c-format
-msgid "A branch named '%s' already exists."
-msgstr "一个分支名 '%s' 已经存在。"
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr "成功应用补丁到 '%s'。\n"
-#: branch.c:198
-msgid "Cannot force update the current branch."
-msgstr "无法强制更新当前分支。"
+#: apply.c:3634
+msgid "removal patch leaves file contents"
+msgstr "移除补丁仍留下了文件内容"
-#: branch.c:218
+#: apply.c:3706
#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
-msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支。"
+msgid "%s: wrong type"
+msgstr "%s：错误类型"
-#: branch.c:220
+#: apply.c:3708
#, c-format
-msgid "the requested upstream branch '%s' does not exist"
-msgstr "请求的上游分支 '%s' 不存在"
-
-#: branch.c:222
-msgid ""
-"\n"
-"If you are planning on basing your work on an upstream\n"
-"branch that already exists at the remote, you may need to\n"
-"run \"git fetch\" to retrieve it.\n"
-"\n"
-"If you are planning to push out a new local branch that\n"
-"will track its remote counterpart, you may want to use\n"
-"\"git push -u\" to set the upstream config as you push."
-msgstr ""
-"\n"
-"如果您正计划基于远程一个现存的上游分支开始你的工作，\n"
-"您可能需要执行 \"git fetch\" 来获取分支。\n"
-"\n"
-"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n"
-"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
+msgid "%s has type %o, expected %o"
+msgstr "%s 的类型是 %o，应为 %o"
-#: branch.c:266
+#: apply.c:3859 apply.c:3861
#, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "不是一个有效的对象名：'%s'。"
+msgid "invalid path '%s'"
+msgstr "无效路径 '%s'"
-#: branch.c:286
+#: apply.c:3917
#, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "歧义的对象名：'%s'。"
+msgid "%s: already exists in index"
+msgstr "%s：已经存在于索引中"
-#: branch.c:291
+#: apply.c:3920
#, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "无效的分支点：'%s'。"
+msgid "%s: already exists in working directory"
+msgstr "%s：已经存在于工作区中"
-#: branch.c:345
+#: apply.c:3940
#, c-format
-msgid "'%s' is already checked out at '%s'"
-msgstr "'%s' 已经检出到 '%s'"
+msgid "new mode (%o) of %s does not match old mode (%o)"
+msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
-#: branch.c:364
+#: apply.c:3945
#, c-format
-msgid "HEAD of working tree %s is not updated"
-msgstr "工作区 %s 的 HEAD 指向没有被更新"
+msgid "new mode (%o) of %s does not match old mode (%o) of %s"
+msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"
-#: bundle.c:34
+#: apply.c:3965
#, c-format
-msgid "'%s' does not look like a v2 bundle file"
-msgstr "'%s' 不像是一个 v2 版本的包文件"
+msgid "affected file '%s' is beyond a symbolic link"
+msgstr "受影响的文件 '%s' 位于符号链接中"
-#: bundle.c:61
+#: apply.c:3969
#, c-format
-msgid "unrecognized header: %s%s (%d)"
-msgstr "未能识别的包头：%s%s (%d)"
+msgid "%s: patch does not apply"
+msgstr "%s：补丁未应用"
-#: bundle.c:87 builtin/commit.c:778
+#: apply.c:3984
#, c-format
-msgid "could not open '%s'"
-msgstr "不能打开 '%s'"
-
-#: bundle.c:139
-msgid "Repository lacks these prerequisite commits:"
-msgstr "仓库中缺少这些必备的提交："
+msgid "Checking patch %s..."
+msgstr "检查补丁 %s..."
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085
-#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348
-#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901
-#: builtin/merge.c:356 builtin/shortlog.c:170
-msgid "revision walk setup failed"
-msgstr "版本遍历设置失败"
+#: apply.c:4075
+#, c-format
+msgid "sha1 information is lacking or useless for submodule %s"
+msgstr "子模组 %s 的 sha1 信息缺失或无效"
-#: bundle.c:185
+#: apply.c:4082
#, c-format
-msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %d refs:"
-msgstr[0] "这个包中含有这个引用："
-msgstr[1] "这个包中含有 %d 个引用："
+msgid "mode change for %s, which is not in current HEAD"
+msgstr "%s 的属性改变，但它不再当前 HEAD 中"
-#: bundle.c:192
-msgid "The bundle records a complete history."
-msgstr "这个包记录一个完整历史。"
+#: apply.c:4085
+#, c-format
+msgid "sha1 information is lacking or useless (%s)."
+msgstr "sha1 信息缺失或无效（%s）。"
-#: bundle.c:194
+#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
-msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %d refs:"
-msgstr[0] "这个包需要这个引用："
-msgstr[1] "这个包需要 %d 个引用："
+msgid "make_cache_entry failed for path '%s'"
+msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
-#: bundle.c:253
-msgid "Could not spawn pack-objects"
-msgstr "不能生成 pack-objects 进程"
+#: apply.c:4094
+#, c-format
+msgid "could not add %s to temporary index"
+msgstr "不能在临时索引中添加 %s"
-#: bundle.c:264
-msgid "pack-objects died"
-msgstr "pack-objects 终止"
+#: apply.c:4104
+#, c-format
+msgid "could not write temporary index to %s"
+msgstr "不能把临时索引写入到 %s"
-#: bundle.c:304
-msgid "rev-list died"
-msgstr "rev-list 终止"
+#: apply.c:4242
+#, c-format
+msgid "unable to remove %s from index"
+msgstr "不能从索引中移除 %s"
-#: bundle.c:353
+#: apply.c:4277
#, c-format
-msgid "ref '%s' is excluded by the rev-list options"
-msgstr "å¼\95ç\94¨ '%s' 被 rev-list é\80\89项æ\8e\92é\99¤"
+msgid "corrupt patch for submodule %s"
+msgstr "å\90模ç»\84 %s æ\8d\9få\9d\8fç\9a\84è¡¥ä¸\81"
-#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273
+#: apply.c:4283
#, c-format
-msgid "unrecognized argument: %s"
-msgstr "未能识别的参数：%s"
+msgid "unable to stat newly created file '%s'"
+msgstr "不能枚举新建文件 '%s' 的状态"
-#: bundle.c:451
-msgid "Refusing to create empty bundle."
-msgstr "不能创建空包。"
+#: apply.c:4291
+#, c-format
+msgid "unable to create backing store for newly created file %s"
+msgstr "不能为新建文件 %s 创建后端存储"
-#: bundle.c:463
+#: apply.c:4297 apply.c:4441
#, c-format
-msgid "cannot create '%s'"
-msgstr "不能创建 '%s'"
+msgid "unable to add cache entry for %s"
+msgstr "无法为 %s 添加缓存条目"
-#: bundle.c:491
-msgid "index-pack died"
-msgstr "index-pack 终止"
+#: apply.c:4338
+#, c-format
+msgid "failed to write to '%s'"
+msgstr "无法写入 '%s'"
-#: color.c:290
+#: apply.c:4342
#, c-format
-msgid "invalid color value: %.*s"
-msgstr "无效的颜色值：%.*s"
+msgid "closing file '%s'"
+msgstr "关闭文件 '%s'"
-#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505
-#: builtin/am.c:2119
+#: apply.c:4412
#, c-format
-msgid "could not parse %s"
-msgstr "不能解析 %s"
+msgid "unable to write file '%s' mode %o"
+msgstr "不能写文件 '%s' 权限 %o"
-#: commit.c:42
+#: apply.c:4510
#, c-format
-msgid "%s %s is not a commit!"
-msgstr "%s %s 不是一个提交!"
+msgid "Applied patch %s cleanly."
+msgstr "成功应用补丁 %s。"
-#: compat/obstack.c:406 compat/obstack.c:408
-msgid "memory exhausted"
-msgstr "内存耗尽"
+#: apply.c:4518
+msgid "internal error"
+msgstr "内部错误"
-#: config.c:516
+#: apply.c:4521
#, c-format
-msgid "bad config line %d in blob %s"
-msgstr "数据对象 %2$s 中错误的配置行 %1$d"
+msgid "Applying patch %%s with %d reject..."
+msgid_plural "Applying patch %%s with %d rejects..."
+msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."
+msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."
-#: config.c:520
+#: apply.c:4532
#, c-format
-msgid "bad config line %d in file %s"
-msgstr "æ\96\87件 %2$s ä¸é\94\99误ç\9a\84é\85\8dç½®è¡\8c %1$d"
+msgid "truncating .rej filename to %.*s.rej"
+msgstr "æ\88ªç\9f .rej æ\96\87件å\90\8d为 %.*s.rej"
-#: config.c:524
+#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989
#, c-format
-msgid "bad config line %d in standard input"
-msgstr "标准输入中错误的配置行 %d"
+msgid "cannot open %s"
+msgstr "不能打开 %s"
-#: config.c:528
+#: apply.c:4554
#, c-format
-msgid "bad config line %d in submodule-blob %s"
-msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
+msgid "Hunk #%d applied cleanly."
+msgstr "第 #%d 个片段成功应用。"
-#: config.c:532
+#: apply.c:4558
#, c-format
-msgid "bad config line %d in command line %s"
-msgstr "命令行 %2$s 中错误的配置行 %1$d"
+msgid "Rejected hunk #%d."
+msgstr "拒绝第 #%d 个片段。"
-#: config.c:536
+#: apply.c:4668
#, c-format
-msgid "bad config line %d in %s"
-msgstr "在 %2$s 中错误的配置行 %1$d"
+msgid "Skipped patch '%s'."
+msgstr "略过补丁 '%s'。"
-#: config.c:655
-msgid "out of range"
-msgstr "超出范围"
+#: apply.c:4676
+msgid "unrecognized input"
+msgstr "未能识别的输入"
-#: config.c:655
-msgid "invalid unit"
-msgstr "æ\97 æ\95\88ç\9a\84å\8d\95ä½\8d"
+#: apply.c:4695
+msgid "unable to read index file"
+msgstr "æ\97 æ³\95读å\8f\96ç´¢å¼\95æ\96\87件"
-#: config.c:661
+#: apply.c:4833
#, c-format
-msgid "bad numeric config value '%s' for '%s': %s"
-msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s"
+msgid "can't open patch '%s': %s"
+msgstr "不能打开补丁 '%s'：%s"
-#: config.c:666
+#: apply.c:4858
#, c-format
-msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
-msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] "抑制下仍有 %d 个空白字符误用"
+msgstr[1] "抑制下仍有 %d 个空白字符误用"
-#: config.c:669
+#: apply.c:4864 apply.c:4879
#, c-format
-msgid "bad numeric config value '%s' for '%s' in file %s: %s"
-msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] "%d 行有空白字符误用。"
+msgstr[1] "%d 行有空白字符误用。"
-#: config.c:672
+#: apply.c:4872
#, c-format
-msgid "bad numeric config value '%s' for '%s' in standard input: %s"
-msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s"
+msgid "%d line applied after fixing whitespace errors."
+msgid_plural "%d lines applied after fixing whitespace errors."
+msgstr[0] "修复空白错误后，应用了 %d 行。"
+msgstr[1] "修复空白错误后，应用了 %d 行。"
-#: config.c:675
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
-msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
+#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431
+msgid "Unable to write new index file"
+msgstr "无法写入新索引文件"
-#: config.c:678
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
-msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
+#: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
+#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592
+#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947
+msgid "path"
+msgstr "路径"
-#: config.c:681
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in %s: %s"
-msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
+#: apply.c:4920
+msgid "don't apply changes matching the given path"
+msgstr "不要应用与给出路径向匹配的变更"
-#: config.c:768
-#, c-format
-msgid "failed to expand user dir in: '%s'"
-msgstr "无法扩展 '%s' 中的用户目录"
+#: apply.c:4923
+msgid "apply changes matching the given path"
+msgstr "应用与给出路径向匹配的变更"
-#: config.c:849 config.c:860
-#, c-format
-msgid "bad zlib compression level %d"
-msgstr "错误的 zlib 压缩级别 %d"
+#: apply.c:4925 builtin/am.c:2286
+msgid "num"
+msgstr "数字"
-#: config.c:978
-#, c-format
-msgid "invalid mode for object creation: %s"
-msgstr "无效的对象创建模式：%s"
+#: apply.c:4926
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
-#: config.c:1312
-msgid "unable to parse command-line config"
-msgstr "无法解析命令行中的配置"
+#: apply.c:4929
+msgid "ignore additions made by the patch"
+msgstr "忽略补丁中的添加的文件"
-#: config.c:1362
-msgid "unknown error occurred while reading the configuration files"
-msgstr "在读取配置文件时遇到未知错误"
+#: apply.c:4931
+msgid "instead of applying the patch, output diffstat for the input"
+msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
-#: config.c:1716
-#, c-format
-msgid "unable to parse '%s' from command-line config"
-msgstr "无法解析命令行配置中的 '%s'"
+#: apply.c:4935
+msgid "show number of added and deleted lines in decimal notation"
+msgstr "以十进制数显示添加和删除的行数"
-#: config.c:1718
-#, c-format
-msgid "bad config variable '%s' in file '%s' at line %d"
-msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
+#: apply.c:4937
+msgid "instead of applying the patch, output a summary for the input"
+msgstr "不应用补丁，而是显示输入的概要"
-#: config.c:1777
-#, c-format
-msgid "%s has multiple values"
-msgstr "%s 有多个取值"
+#: apply.c:4939
+msgid "instead of applying the patch, see if the patch is applicable"
+msgstr "不应用补丁，而是查看补丁是否可应用"
-#: config.c:2311
-#, c-format
-msgid "could not set '%s' to '%s'"
-msgstr "不能设置 '%s' 为 '%s'"
+#: apply.c:4941
+msgid "make sure the patch is applicable to the current index"
+msgstr "确认补丁可以应用到当前索引"
-#: config.c:2313
-#, c-format
-msgid "could not unset '%s'"
-msgstr "不能取消设置 '%s'"
+#: apply.c:4943
+msgid "apply a patch without touching the working tree"
+msgstr "应用补丁而不修改工作区"
-#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
-msgid "Checking connectivity"
-msgstr "æ£\80æ\9f¥è¿\9eæ\8e¥ä¸"
+#: apply.c:4945
+msgid "accept a patch that touches outside the working area"
+msgstr "æ\8e¥å\8f\97ä¿®æ\94¹å·¥ä½\9cå\8cºä¹\8bå¤\96æ\96\87件ç\9a\84è¡¥ä¸\81"
-#: connected.c:74
-msgid "Could not run 'git rev-list'"
-msgstr "不能执行 'git rev-list'"
+#: apply.c:4947
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
-#: connected.c:94
-msgid "failed write to rev-list"
-msgstr "无法写入 rev-list"
+#: apply.c:4949
+msgid "attempt three-way merge if a patch does not apply"
+msgstr "如果一个补丁不能应用则尝试三方合并"
-#: connected.c:101
-msgid "failed to close rev-list's stdin"
-msgstr "无法关闭 rev-list 的标准输入"
+#: apply.c:4951
+msgid "build a temporary index based on embedded index information"
+msgstr "创建一个临时索引基于嵌入的索引信息"
-#: date.c:97
-msgid "in the future"
-msgstr "在将来"
+#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505
+msgid "paths are separated with NUL character"
+msgstr "路径以 NUL 字符分隔"
-#: date.c:103
-#, c-format
-msgid "%lu second ago"
-msgid_plural "%lu seconds ago"
-msgstr[0] "%lu 秒钟前"
-msgstr[1] "%lu 秒钟前"
+#: apply.c:4956
+msgid "ensure at least <n> lines of context match"
+msgstr "确保至少匹配 <n> 行上下文"
-#: date.c:110
-#, c-format
-msgid "%lu minute ago"
-msgid_plural "%lu minutes ago"
-msgstr[0] "%lu 分钟前"
-msgstr[1] "%lu 分钟前"
+#: apply.c:4957 builtin/am.c:2265
+msgid "action"
+msgstr "动作"
-#: date.c:117
-#, c-format
-msgid "%lu hour ago"
-msgid_plural "%lu hours ago"
-msgstr[0] "%lu 小时前"
-msgstr[1] "%lu 小时前"
+#: apply.c:4958
+msgid "detect new or modified lines that have whitespace errors"
+msgstr "检查新增和修改的行中间的空白字符滥用"
-#: date.c:124
-#, c-format
-msgid "%lu day ago"
-msgid_plural "%lu days ago"
-msgstr[0] "%lu 天前"
-msgstr[1] "%lu 天前"
+#: apply.c:4961 apply.c:4964
+msgid "ignore changes in whitespace when finding context"
+msgstr "查找上下文时忽略空白字符的变更"
-#: date.c:130
-#, c-format
-msgid "%lu week ago"
-msgid_plural "%lu weeks ago"
-msgstr[0] "%lu 周前"
-msgstr[1] "%lu 周前"
+#: apply.c:4967
+msgid "apply the patch in reverse"
+msgstr "反向应用补丁"
-#: date.c:137
-#, c-format
-msgid "%lu month ago"
-msgid_plural "%lu months ago"
-msgstr[0] "%lu 个月前"
-msgstr[1] "%lu 个月前"
+#: apply.c:4969
+msgid "don't expect at least one line of context"
+msgstr "无需至少一行上下文"
-#: date.c:148
-#, c-format
-msgid "%lu year"
-msgid_plural "%lu years"
-msgstr[0] "%lu 年"
-msgstr[1] "%lu 年"
+#: apply.c:4971
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
-#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:151
-#, c-format
-msgid "%s, %lu month ago"
-msgid_plural "%s, %lu months ago"
-msgstr[0] "%s %lu 个月前"
-msgstr[1] "%s %lu 个月前"
+#: apply.c:4973
+msgid "allow overlapping hunks"
+msgstr "允许重叠的补丁片段"
-#: date.c:156 date.c:161
-#, c-format
-msgid "%lu year ago"
-msgid_plural "%lu years ago"
-msgstr[0] "%lu 年前"
-msgstr[1] "%lu 年前"
+#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19
+#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593
+#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114
+msgid "be verbose"
+msgstr "冗长输出"
-#: diffcore-order.c:24
-#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "无法读取排序文件 '%s'"
+#: apply.c:4976
+msgid "tolerate incorrectly detected missing new-line at the end of file"
+msgstr "允许不正确的文件末尾换行符"
-#: diffcore-rename.c:540
-msgid "Performing inexact rename detection"
-msgstr "正在进行非精确的重命名检测"
+#: apply.c:4979
+msgid "do not trust the line counts in the hunk headers"
+msgstr "不信任补丁片段的头信息中的行号"
-# 译者：注意保持前导空格
-#: diff.c:116
-#, c-format
-msgid " Failed to parse dirstat cut-off percentage '%s'\n"
-msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n"
+#: apply.c:4981 builtin/am.c:2274
+msgid "root"
+msgstr "根目录"
-# 译者：注意保持前导空格
-#: diff.c:121
-#, c-format
-msgid " Unknown dirstat parameter '%s'\n"
-msgstr " 未知的 dirstat 参数 '%s'\n"
+#: apply.c:4982
+msgid "prepend <root> to all filenames"
+msgstr "为所有文件名前添加 <根目录>"
-#: diff.c:225
-#, c-format
-msgid "Unknown value for 'diff.submodule' config variable: '%s'"
-msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"
+#: archive.c:12
+msgid "git archive [<options>] <tree-ish> [<path>...]"
+msgstr "git archive [<选项>] <树或提交> [<路径>...]"
-#: diff.c:277
-#, c-format
+#: archive.c:13
+msgid "git archive --list"
+msgstr "git archive --list"
+
+#: archive.c:14
msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
msgstr ""
-"发现配置变量 'diff.dirstat' 中的错误：\n"
-"%s"
-
-#: diff.c:3017
-#, c-format
-msgid "external diff died, stopping at %s"
-msgstr "外部 diff 退出，停止在 %s"
+"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
-#: diff.c:3415
-msgid "--follow requires exactly one pathspec"
-msgstr "--follow 明确要求只跟一个路径规格"
+#: archive.c:15
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr "git archive --remote <仓库> [--exec <命令>] --list"
-#: diff.c:3578
+#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327
#, c-format
-msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
-msgstr ""
-"无法解析 --dirstat/-X 选项的参数：\n"
-"%s"
+msgid "pathspec '%s' did not match any files"
+msgstr "路径规格 '%s' 未匹配任何文件"
-#: diff.c:3592
-#, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
-msgstr "无法解析 --submodule 选项的参数：'%s'"
+#: archive.c:429
+msgid "fmt"
+msgstr "格式"
-#: dir.c:1823
-msgid "failed to get kernel name and information"
-msgstr "无法获得内核名称和信息"
+#: archive.c:429
+msgid "archive format"
+msgstr "归档格式"
-#: dir.c:1942
-msgid "Untracked cache is disabled on this system or location."
-msgstr "缓存未跟踪文件在本系统或位置中被禁用。"
+#: archive.c:430 builtin/log.c:1429
+msgid "prefix"
+msgstr "前缀"
-#: gpg-interface.c:178
-msgid "gpg failed to sign the data"
-msgstr "gpg 无法为数据签名"
+#: archive.c:431
+msgid "prepend prefix to each pathname in the archive"
+msgstr "为归档中每个路径名加上前缀"
-#: gpg-interface.c:208
-msgid "could not create temporary file"
-msgstr "不能创建临时文件"
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603
+#: builtin/blame.c:2604 builtin/config.c:59 builtin/fast-export.c:987
+#: builtin/fast-export.c:989 builtin/grep.c:723 builtin/hash-object.c:101
+#: builtin/ls-files.c:539 builtin/ls-files.c:542 builtin/notes.c:401
+#: builtin/notes.c:564 builtin/read-tree.c:109 parse-options.h:153
+msgid "file"
+msgstr "文件"
-#: gpg-interface.c:210
-#, c-format
-msgid "failed writing detached signature to '%s'"
-msgstr "无法将分离式签名写入 '%s'"
+#: archive.c:433 builtin/archive.c:89
+msgid "write the archive to this file"
+msgstr "归档写入此文件"
-#: grep.c:1792
-#, c-format
-msgid "'%s': unable to read %s"
-msgstr "'%s'：无法读取 %s"
+#: archive.c:435
+msgid "read .gitattributes in working directory"
+msgstr "读取工作区中的 .gitattributes"
-#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "无法枚举 '%s' 状态"
+#: archive.c:436
+msgid "report archived files on stderr"
+msgstr "在标准错误上报告归档文件"
-#: grep.c:1820
-#, c-format
-msgid "'%s': short read"
-msgstr "'%s'：读取不完整"
+#: archive.c:437
+msgid "store only"
+msgstr "只存储"
-#: help.c:205
-#, c-format
-msgid "available git commands in '%s'"
-msgstr "在 '%s' 下可用的 git 命令"
+#: archive.c:438
+msgid "compress faster"
+msgstr "压缩速度更快"
-#: help.c:212
-msgid "git commands available from elsewhere on your $PATH"
-msgstr "å\9c¨ $PATH è·¯å¾\84ä¸ç\9a\84å\85¶ä»\96å\9c°æ\96¹å\8f¯ç\94¨ç\9a\84 git å\91½ä»¤"
+#: archive.c:446
+msgid "compress better"
+msgstr "å\8e\8b缩æ\95\88æ\9e\9cæ\9b´å¥½"
-#: help.c:244
-msgid "These are common Git commands used in various situations:"
-msgstr "这些是各种场合常见的 Git 命令："
+#: archive.c:449
+msgid "list supported archive formats"
+msgstr "列出支持的归档格式"
-#: help.c:309
-#, 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 受损？"
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
+#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953
+msgid "repo"
+msgstr "仓库"
-#: help.c:366
-msgid "Uh oh. Your system reports no Git commands at all."
-msgstr "唉呀，您的系统中未发现 Git 命令。"
+#: archive.c:452 builtin/archive.c:91
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "从远程仓库（<仓库>）提取归档文件"
-#: help.c:388
-#, c-format
-msgid ""
-"WARNING: You called a Git command named '%s', which does not exist.\n"
-"Continuing under the assumption that you meant '%s'"
-msgstr ""
-"警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要运行的\n"
-"是 '%s'"
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
+msgid "command"
+msgstr "命令"
-#: help.c:393
-#, c-format
-msgid "in %0.1f seconds automatically..."
-msgstr "在 %0.1f 秒钟后自动运行..."
+#: archive.c:454 builtin/archive.c:93
+msgid "path to the remote git-upload-archive command"
+msgstr "远程 git-upload-archive 命令的路径"
-#: help.c:400
-#, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
-msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"
+#: archive.c:461
+msgid "Unexpected option --remote"
+msgstr "未知参数 --remote"
-#: help.c:404 help.c:470
-msgid ""
-"\n"
-"Did you mean this?"
-msgid_plural ""
-"\n"
-"Did you mean one of these?"
-msgstr[0] ""
-"\n"
-"您指的是这个么？"
-msgstr[1] ""
-"\n"
-"您指的是这其中的某一个么？"
+#: archive.c:463
+msgid "Option --exec can only be used together with --remote"
+msgstr "选项 --exec 只能和 --remote 同时使用"
+
+#: archive.c:465
+msgid "Unexpected option --output"
+msgstr "未知参数 --output"
-#: help.c:466
+#: archive.c:487
#, c-format
-msgid "%s: %s - %s"
-msgstr "%s：%s - %s"
+msgid "Unknown archive format '%s'"
+msgstr "未知归档格式 '%s'"
-#: lockfile.c:152
+#: archive.c:494
#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "参数不支持此格式 '%s'：-%d"
+
+#: attr.c:263
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."
+"Negative patterns are ignored in git attributes\n"
+"Use '\\!' for literal leading exclamation."
msgstr ""
-"无法创建 '%s.lock'：%s。\n"
-"\n"
-"似乎另外一个 git 进程在这个仓库中运行，例如：'git commit' 命令打\n"
-"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错，\n"
-"可能之前有一个 git 进程在这个仓库中异常退出：\n"
-"手动删除这个文件再继续。"
+"负值模版在 git attributes 中被忽略\n"
+"当字符串确实要以感叹号开始时，使用 '\\!'。"
-#: lockfile.c:160
+#: bisect.c:441
#, c-format
-msgid "Unable to create '%s.lock': %s"
-msgstr "不能创建 '%s.lock'：%s"
-
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "无法读取缓存"
-
-#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375
-#: builtin/checkout.c:589 builtin/clone.c:732
-msgid "unable to write new index file"
-msgstr "无法写新的索引文件"
-
-#: merge-recursive.c:209
-msgid "(bad commit)\n"
-msgstr "（坏提交）\n"
+msgid "Could not open file '%s'"
+msgstr "不能打开文件 '%s'"
-#: merge-recursive.c:231
+#: bisect.c:446
#, c-format
-msgid "addinfo_cache failed for path '%s'"
-msgstr "为路径 '%s' addinfo_cache 失败"
+msgid "Badly quoted content in file '%s': %s"
+msgstr "文件 '%s' 包含错误的引用格式：%s"
-#: merge-recursive.c:301
-msgid "error building trees"
-msgstr "无法创建树"
+#: bisect.c:655
+#, c-format
+msgid "We cannot bisect more!\n"
+msgstr "我们无法进行更多的二分查找！\n"
-#: merge-recursive.c:720
+#: bisect.c:708
#, c-format
-msgid "failed to create path '%s'%s"
-msgstr "无法创建路径 '%s'%s"
+msgid "Not a valid commit name %s"
+msgstr "不是一个有效的提交名 %s"
-#: merge-recursive.c:731
+#: bisect.c:732
#, c-format
-msgid "Removing %s to make room for subdirectory\n"
-msgstr "删除 %s 以便为子目录留出空间\n"
+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] 之间的 bug 已经被修复。\n"
-#: merge-recursive.c:745 merge-recursive.c:764
-msgid ": perhaps a D/F conflict?"
-msgstr "：可能是一个目录/文件冲突？"
+#: bisect.c:737
+#, 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"
-#: merge-recursive.c:754
+#: bisect.c:742
#, c-format
-msgid "refusing to lose untracked file at '%s'"
-msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
+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"
-#: merge-recursive.c:796
+#: bisect.c:750
#, c-format
-msgid "cannot read object %s '%s'"
-msgstr "不能读取对象 %s '%s'"
+msgid ""
+"Some %s revs are not ancestor 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 二分查找无法正常工作。\n"
+"您可能弄错了 %s 和 %s 版本？\n"
-#: merge-recursive.c:798
+#: bisect.c:763
#, c-format
-msgid "blob expected for %s '%s'"
-msgstr "%s '%s' 应为数据对象"
+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"
+"我们仍旧继续。"
-#: merge-recursive.c:822
+#: bisect.c:798
#, c-format
-msgid "failed to open '%s': %s"
-msgstr "无法打开 '%s'：%s"
+msgid "Bisecting: a merge base must be tested\n"
+msgstr "二分查找中：合并基线必须是经过测试的\n"
-#: merge-recursive.c:833
+#: bisect.c:849
#, c-format
-msgid "failed to symlink '%s': %s"
-msgstr "无法创建符号链接 '%s'：%s"
+msgid "a %s revision is needed"
+msgstr "需要一个 %s 版本"
-#: merge-recursive.c:838
+#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
#, c-format
-msgid "do not know what to do with %06o %s '%s'"
-msgstr "不知道如何处理 %06o %s '%s'"
+msgid "could not create file '%s'"
+msgstr "不能创建文件 '%s'"
-#: merge-recursive.c:978
-msgid "Failed to execute internal merge"
-msgstr "无法执行内部合并"
-
-#: merge-recursive.c:982
+#: bisect.c:917
#, c-format
-msgid "Unable to add %s to database"
-msgstr "不能添加 %s 至对象库"
+msgid "could not read file '%s'"
+msgstr "不能读取文件 '%s'"
-#: merge-recursive.c:1081 merge-recursive.c:1095
+#: bisect.c:947
+msgid "reading bisect refs failed"
+msgstr "读取二分查找引用失败"
+
+#: bisect.c:967
#, 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 中"
-"的版本被保留。"
+msgid "%s was both %s and %s\n"
+msgstr "%s 同时为 %s 和 %s\n"
-#: merge-recursive.c:1087 merge-recursive.c:1100
+#: bisect.c:975
#, c-format
msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree at %s."
+"No testable commit found.\n"
+"Maybe you started with bad path parameters?\n"
msgstr ""
-"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
-"的版本保留于 %8$s 中。"
-
-#: merge-recursive.c:1143
-msgid "rename"
-msgstr "重命名"
+"没有发现可测试的提交。\n"
+"可能您在运行时使用了错误的路径参数？\n"
-#: merge-recursive.c:1143
-msgid "renamed"
-msgstr "重命名"
+#: bisect.c:994
+#, c-format
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] "（大概 %d 步）"
+msgstr[1] "（大概 %d 步）"
-#: merge-recursive.c:1200
+#. TRANSLATORS: the last %s will be replaced with
+#. "(roughly %d steps)" translation
+#: bisect.c:998
#, c-format
-msgid "%s is a directory in %s adding as %s instead"
-msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
+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"
-#: merge-recursive.c:1225
+#: branch.c:53
#, c-format
msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
+"\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 ""
-"冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "
-"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
-
-#: merge-recursive.c:1230
-msgid " (left unresolved)"
-msgstr "（留下未解决）"
+"\n"
+"在修复错误后，您可以尝试修改远程跟踪分支，通过执行命令\n"
+"\"git branch --set-upstream-to=%s%s%s\" 。"
-#: merge-recursive.c:1292
+#: branch.c:67
#, 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"
+msgid "Not setting branch %s as its own upstream."
+msgstr "未设置分支 %s 作为它自己的上游。"
-#: merge-recursive.c:1325
+#: branch.c:93
#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
-msgstr "而是重命名 %s 至 %s，以及 %s 至 %s"
+msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
-#: merge-recursive.c:1531
+#: branch.c:94
#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
-msgstr "å\86²çª\81ï¼\88é\87\8då\91½å\90\8d/æ·»å\8a ï¼\89ï¼\9aå\9c¨ %3$s ä¸é\87\8då\91½å\90\8d %1$s->%2$sã\80\82å\9c¨ %5$s ä¸æ·»å\8a %4$s"
+msgid "Branch %s set up to track remote branch %s from %s."
+msgstr "å\88\86æ\94¯ %1$s 设置为è·\9f踪æ\9d¥è\87ª %3$s ç\9a\84è¿\9cç¨\8bå\88\86æ\94¯ %2$sã\80\82"
-#: merge-recursive.c:1546
+#: branch.c:98
#, c-format
-msgid "Adding merged %s"
-msgstr "添加合并后的 %s"
+msgid "Branch %s set up to track local branch %s by rebasing."
+msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
-#: merge-recursive.c:1553 merge-recursive.c:1766
+#: branch.c:99
#, c-format
-msgid "Adding as %s instead"
-msgstr "而是以 %s 为名添加"
+msgid "Branch %s set up to track local branch %s."
+msgstr "分支 %s 设置为跟踪本地分支 %s。"
-#: merge-recursive.c:1610
+#: branch.c:104
#, c-format
-msgid "cannot read object %s"
-msgstr "不能读取对象 %s"
+msgid "Branch %s set up to track remote ref %s by rebasing."
+msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
-#: merge-recursive.c:1613
+#: branch.c:105
#, c-format
-msgid "object %s is not a blob"
-msgstr "对象 %s ä¸\8dæ\98¯ä¸\80个æ\95°æ\8d®å¯¹è±¡"
+msgid "Branch %s set up to track remote ref %s."
+msgstr "å\88\86æ\94¯ %s 设置为è·\9f踪è¿\9cç¨\8bå¼\95ç\94¨ %sã\80\82"
-#: merge-recursive.c:1666
-msgid "modify"
-msgstr "修改"
+#: branch.c:109
+#, c-format
+msgid "Branch %s set up to track local ref %s by rebasing."
+msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
-#: merge-recursive.c:1666
-msgid "modified"
-msgstr "修改"
+#: branch.c:110
+#, c-format
+msgid "Branch %s set up to track local ref %s."
+msgstr "分支 %s 设置为跟踪本地引用 %s。"
-#: merge-recursive.c:1676
-msgid "content"
-msgstr "内容"
+#: branch.c:119
+msgid "Unable to write upstream branch configuration"
+msgstr "无法写入上游分支配置"
-#: merge-recursive.c:1683
-msgid "add/add"
-msgstr "添加/添加"
+#: branch.c:156
+#, c-format
+msgid "Not tracking: ambiguous information for ref %s"
+msgstr "未跟踪：引用 %s 有歧义"
-#: merge-recursive.c:1718
+#: branch.c:185
#, c-format
-msgid "Skipped %s (merged same as existing)"
-msgstr "略过 %s（已经做过相同合并）"
+msgid "'%s' is not a valid branch name."
+msgstr "'%s' 不是一个有效的分支名称。"
-#: merge-recursive.c:1732
+#: branch.c:190
#, c-format
-msgid "Auto-merging %s"
-msgstr "自动合并 %s"
+msgid "A branch named '%s' already exists."
+msgstr "一个分支名 '%s' 已经存在。"
-#: merge-recursive.c:1736 git-submodule.sh:919
-msgid "submodule"
-msgstr "子模组"
+#: branch.c:198
+msgid "Cannot force update the current branch."
+msgstr "无法强制更新当前分支。"
-#: merge-recursive.c:1737
+#: branch.c:218
#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "冲突（%s）：合并冲突于 %s"
+msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支。"
-#: merge-recursive.c:1831
+#: branch.c:220
#, c-format
-msgid "Removing %s"
-msgstr "删除 %s"
-
-#: merge-recursive.c:1857
-msgid "file/directory"
-msgstr "文件/目录"
+msgid "the requested upstream branch '%s' does not exist"
+msgstr "请求的上游分支 '%s' 不存在"
-#: merge-recursive.c:1863
-msgid "directory/file"
-msgstr "目录/文件"
+#: branch.c:222
+msgid ""
+"\n"
+"If you are planning on basing your work on an upstream\n"
+"branch that already exists at the remote, you may need to\n"
+"run \"git fetch\" to retrieve it.\n"
+"\n"
+"If you are planning to push out a new local branch that\n"
+"will track its remote counterpart, you may want to use\n"
+"\"git push -u\" to set the upstream config as you push."
+msgstr ""
+"\n"
+"如果您正计划基于远程一个现存的上游分支开始你的工作，\n"
+"您可能需要执行 \"git fetch\" 来获取分支。\n"
+"\n"
+"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n"
+"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
-#: merge-recursive.c:1868
+#: branch.c:265
#, 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"
+msgid "Not a valid object name: '%s'."
+msgstr "不是一个有效的对象名：'%s'。"
-#: merge-recursive.c:1877
+#: branch.c:285
#, c-format
-msgid "Adding %s"
-msgstr "æ·»å\8a %s"
+msgid "Ambiguous object name: '%s'."
+msgstr "æ§ä¹\89ç\9a\84对象å\90\8dï¼\9a'%s'ã\80\82"
-#: merge-recursive.c:1914
-msgid "Already up-to-date!"
-msgstr "已经是最新的！"
+#: branch.c:290
+#, c-format
+msgid "Not a valid branch point: '%s'."
+msgstr "无效的分支点：'%s'。"
-#: merge-recursive.c:1923
+#: branch.c:344
#, c-format
-msgid "merging of trees %s and %s failed"
-msgstr "无法合并树 %s 和 %s"
+msgid "'%s' is already checked out at '%s'"
+msgstr "'%s' 已经检出到 '%s'"
-#: merge-recursive.c:2006
-msgid "Merging:"
-msgstr "合并："
+#: branch.c:363
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "工作区 %s 的 HEAD 指向没有被更新"
-#: merge-recursive.c:2019
+#: bundle.c:34
#, c-format
-msgid "found %u common ancestor:"
-msgid_plural "found %u common ancestors:"
-msgstr[0] "发现 %u 个共同祖先："
-msgstr[1] "发现 %u 个共同祖先："
+msgid "'%s' does not look like a v2 bundle file"
+msgstr "'%s' 不像是一个 v2 版本的包文件"
-#: merge-recursive.c:2058
-msgid "merge returned no commit"
-msgstr "合并未返回提交"
+#: bundle.c:61
+#, c-format
+msgid "unrecognized header: %s%s (%d)"
+msgstr "未能识别的包头：%s%s (%d)"
-#: merge-recursive.c:2121
+#: bundle.c:87 sequencer.c:963 builtin/commit.c:777
#, c-format
-msgid "Could not parse object '%s'"
-msgstr "不能解析对象 '%s'"
+msgid "could not open '%s'"
+msgstr "不能打开 '%s'"
-#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
-msgid "Unable to write index."
-msgstr "ä¸\8dè\83½å\86\99å\85¥ç´¢å¼\95ã\80\82"
+#: bundle.c:139
+msgid "Repository lacks these prerequisite commits:"
+msgstr "ä»\93åº\93ä¸ç¼ºå°\91è¿\99äº\9bå¿\85å¤\87ç\9a\84æ\8f\90交ï¼\9a"
-#: notes-utils.c:41
-msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr "不能提交未初始化/未引用的注解树"
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374
+#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348
+#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
+#: builtin/merge.c:356 builtin/shortlog.c:170
+msgid "revision walk setup failed"
+msgstr "版本遍历设置失败"
-#: notes-utils.c:100
+#: bundle.c:185
#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "坏的 notes.rewriteMode 值：'%s'"
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %d refs:"
+msgstr[0] "这个包中含有这个引用："
+msgstr[1] "这个包中含有 %d 个引用："
-#: notes-utils.c:110
-#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
-msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"
+#: bundle.c:192
+msgid "The bundle records a complete history."
+msgstr "这个包记录一个完整历史。"
-#. TRANSLATORS: The first %s is the name of the
-#. environment variable, the second %s is its value
-#: notes-utils.c:137
+#: bundle.c:194
#, c-format
-msgid "Bad %s value: '%s'"
-msgstr "坏的 %s 值：'%s'"
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %d refs:"
+msgstr[0] "这个包需要这个引用："
+msgstr[1] "这个包需要 %d 个引用："
-#: object.c:242
-#, c-format
-msgid "unable to parse object: %s"
-msgstr "不能解析对象：%s"
+#: bundle.c:253
+msgid "Could not spawn pack-objects"
+msgstr "不能生成 pack-objects 进程"
-#: parse-options.c:572
-msgid "..."
-msgstr "..."
+#: bundle.c:264
+msgid "pack-objects died"
+msgstr "pack-objects 终止"
-#: parse-options.c:590
+#: bundle.c:304
+msgid "rev-list died"
+msgstr "rev-list 终止"
+
+#: bundle.c:353
#, c-format
-msgid "usage: %s"
-msgstr "用法：%s"
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr "引用 '%s' 被 rev-list 选项排除"
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation
-#: parse-options.c:594
+#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273
#, c-format
-msgid " or: %s"
-msgstr " 或：%s"
+msgid "unrecognized argument: %s"
+msgstr "未能识别的参数：%s"
-# 译者：为保证在输出中对齐，注意调整句中空格！
-#: parse-options.c:597
+#: bundle.c:451
+msgid "Refusing to create empty bundle."
+msgstr "不能创建空包。"
+
+#: bundle.c:463
#, c-format
-msgid " %s"
-msgstr " %s"
+msgid "cannot create '%s'"
+msgstr "不能创建 '%s'"
-#: parse-options.c:631
-msgid "-NUM"
-msgstr "-数字"
+#: bundle.c:491
+msgid "index-pack died"
+msgstr "index-pack 终止"
-#: parse-options-cb.c:108
+#: color.c:290
#, c-format
-msgid "malformed object name '%s'"
-msgstr "非法的对象名 '%s'"
+msgid "invalid color value: %.*s"
+msgstr "无效的颜色值：%.*s"
-#: path.c:798
+#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493
+#: builtin/am.c:2127
#, c-format
-msgid "Could not make %s writable by group"
-msgstr "ä¸\8dè\83½è®¾ç½® %s 为ç»\84å\8f¯å\86\99"
+msgid "could not parse %s"
+msgstr "ä¸\8dè\83½è§£æ\9e\90 %s"
-#: pathspec.c:133
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
-msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
+#: commit.c:42
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s 不是一个提交!"
-#: pathspec.c:143
+#: commit.c:1514
msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
-msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
-
-#: pathspec.c:177
-msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr "路径规格包含无效的神奇前缀"
-
-#: pathspec.c:183
-#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
-msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
+"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"
-#: pathspec.c:187
-#, c-format
-msgid "Missing ')' at the end of pathspec magic in '%s'"
-msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
+#: compat/obstack.c:406 compat/obstack.c:408
+msgid "memory exhausted"
+msgstr "内存耗尽"
-#: pathspec.c:205
+#: config.c:516
#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
+msgid "bad config line %d in blob %s"
+msgstr "数据对象 %2$s 中错误的配置行 %1$d"
-#: pathspec.c:230
+#: config.c:520
#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
-msgstr "%s：'literal' 和 'glob' 不兼容"
+msgid "bad config line %d in file %s"
+msgstr "文件 %2$s 中错误的配置行 %1$d"
-#: pathspec.c:241
+#: config.c:524
#, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s：'%s' 在仓库之外"
+msgid "bad config line %d in standard input"
+msgstr "标准输入中错误的配置行 %d"
-#: pathspec.c:291
+#: config.c:528
#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
+msgid "bad config line %d in submodule-blob %s"
+msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
-#: pathspec.c:353
+#: config.c:532
#, c-format
-msgid "%s: pathspec magic not supported by this command: %s"
-msgstr "%s：路径规格神奇前缀不被此命令支持：%s"
+msgid "bad config line %d in command line %s"
+msgstr "命令行 %2$s 中错误的配置行 %1$d"
-#: pathspec.c:433
+#: config.c:536
#, c-format
-msgid "pathspec '%s' is beyond a symbolic link"
-msgstr "路径规格 '%s' 位于符号链接中"
-
-#: pathspec.c:442
-msgid ""
-"There is nothing to exclude from by :(exclude) patterns.\n"
-"Perhaps you forgot to add either ':/' or '.' ?"
-msgstr ""
-"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
-"添加 ':/' 或 '.' ？"
+msgid "bad config line %d in %s"
+msgstr "在 %2$s 中错误的配置行 %1$d"
-#: pretty.c:973
-msgid "unable to parse --pretty format"
-msgstr "不能解析 --pretty 格式"
+#: config.c:655
+msgid "out of range"
+msgstr "超出范围"
-#: progress.c:235
-msgid "done"
-msgstr "完成"
+#: config.c:655
+msgid "invalid unit"
+msgstr "无效的单位"
-#: read-cache.c:1281
+#: config.c:661
#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-"设置了 index.version，但是取值无效。\n"
-"使用版本 %i"
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s"
-#: read-cache.c:1291
+#: config.c:666
#, c-format
-msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-"设置了 GIT_INDEX_VERSION，但是取值无效。\n"
-"使用版本 %i"
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-#: refs.c:551 builtin/merge.c:840
+#: config.c:669
#, c-format
-msgid "Could not open '%s' for writing"
-msgstr "æ\97 æ³\95æ\89\93å¼\80 '%s' è¿\9bè¡\8cå\86\99å\85¥"
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgstr "æ\96\87件 %3$s ä¸é\85\8dç½®å\8f\98é\87\8f '%2$s' é\94\99误ç\9a\84å\8f\96å\80¼ '%1$s'ï¼\9a%4$s"
-#: refs/files-backend.c:2534
+#: config.c:672
#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "æ\97 æ³\95å\88 é\99¤å¼\95ç\94¨ %sï¼\9a%s"
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgstr "æ \87å\87\86è¾\93å\85¥ä¸é\85\8dç½®å\8f\98é\87\8f '%2$s' é\94\99误ç\9a\84å\8f\96å\80¼ '%1$s'ï¼\9a%3$s"
-#: refs/files-backend.c:2537
+#: config.c:675
#, c-format
-msgid "could not delete references: %s"
-msgstr "无法删除引用：%s"
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-#: refs/files-backend.c:2546
+#: config.c:678
#, c-format
-msgid "could not remove reference %s"
-msgstr "无法删除引用 %s"
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-#: ref-filter.c:55
+#: config.c:681
#, c-format
-msgid "expected format: %%(color:<color>)"
-msgstr "期望的格式：%%(color:<color>)"
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-#: ref-filter.c:57
+#: config.c:768
#, c-format
-msgid "unrecognized color: %%(color:%s)"
-msgstr "æ\9cªè\83½è¯\86å\88«ç\9a\84é¢\9cè\89²ï¼\9a%%(color:%s)"
+msgid "failed to expand user dir in: '%s'"
+msgstr "æ\97 æ³\95æ\89©å±\95 '%s' ä¸ç\9a\84ç\94¨æ\88·ç\9b®å½\95"
-#: ref-filter.c:71
+#: config.c:852 config.c:863
#, c-format
-msgid "unrecognized format: %%(%s)"
-msgstr "未能识别的格式：%%(%s)"
+msgid "bad zlib compression level %d"
+msgstr "错误的 zlib 压缩级别 %d"
-#: ref-filter.c:77
+#: config.c:978
#, c-format
-msgid "%%(body) does not take arguments"
-msgstr "%%(body) 不带参数"
+msgid "invalid mode for object creation: %s"
+msgstr "无效的对象创建模式：%s"
-#: ref-filter.c:84
-#, c-format
-msgid "%%(subject) does not take arguments"
-msgstr "%%(subject) 不带参数"
+#: config.c:1312
+msgid "unable to parse command-line config"
+msgstr "无法解析命令行中的配置"
-#: ref-filter.c:101
-#, c-format
-msgid "positive value expected contents:lines=%s"
-msgstr "要为 contents:lines=%s 提供一个正数"
+#: config.c:1362
+msgid "unknown error occurred while reading the configuration files"
+msgstr "在读取配置文件时遇到未知错误"
-#: ref-filter.c:103
+#: config.c:1716
#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "æ\9cªè\83½è¯\86å\88«ç\9a\84 %%(contents) å\8f\82æ\95°ï¼\9a%s"
+msgid "unable to parse '%s' from command-line config"
+msgstr "æ\97 æ³\95解æ\9e\90å\91½ä»¤è¡\8cé\85\8dç½®ä¸ç\9a\84 '%s'"
-#: ref-filter.c:113
+#: config.c:1718
#, c-format
-msgid "unrecognized %%(objectname) argument: %s"
-msgstr "未能识别的 %%(objectname) 参数：%s"
+msgid "bad config variable '%s' in file '%s' at line %d"
+msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
-#: ref-filter.c:135
+#: config.c:1777
#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
-msgstr "期望的格式：%%(align:<width>,<position>)"
+msgid "%s has multiple values"
+msgstr "%s 有多个取值"
-#: ref-filter.c:147
+#: config.c:2311
#, c-format
-msgid "unrecognized position:%s"
-msgstr "未能识别的位置：%s"
+msgid "could not set '%s' to '%s'"
+msgstr "不能设置 '%s' 为 '%s'"
-#: ref-filter.c:151
+#: config.c:2313
#, c-format
-msgid "unrecognized width:%s"
-msgstr "未能识别的宽度：%s"
+msgid "could not unset '%s'"
+msgstr "不能取消设置 '%s'"
-#: ref-filter.c:157
+#: connect.c:49
+msgid "The remote end hung up upon initial contact"
+msgstr "远端在初始连接时即挂断"
+
+#: connect.c:51
+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"
+"请确认您有正确的访问权限并且仓库存在。"
+
+#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
+msgid "Checking connectivity"
+msgstr "检查连接中"
+
+#: connected.c:75
+msgid "Could not run 'git rev-list'"
+msgstr "不能执行 'git rev-list'"
+
+#: connected.c:95
+msgid "failed write to rev-list"
+msgstr "无法写入 rev-list"
+
+#: connected.c:102
+msgid "failed to close rev-list's stdin"
+msgstr "无法关闭 rev-list 的标准输入"
+
+#: convert.c:201
#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "未能识别的 %%(align) 参数：%s"
+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"
+"在工作区中该文件仍保持原有的换行符。"
-#: ref-filter.c:161
+#: convert.c:205
#, c-format
-msgid "positive width expected with the %%(align) atom"
-msgstr "元素 %%(align) 需要一个正数的宽度"
+msgid "CRLF would be replaced by LF in %s."
+msgstr "文件 %s 中的 CRLF 将被 LF 替换。"
-#: ref-filter.c:244
+#: convert.c:211
#, c-format
-msgid "malformed field name: %.*s"
-msgstr "非法的字段名：%.*s"
+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"
+"在工作区中该文件仍保持原有的换行符。"
-#: ref-filter.c:270
+#: convert.c:215
#, c-format
-msgid "unknown field name: %.*s"
-msgstr "æ\9cªç\9f¥ç\9a\84å\97段å\90\8dï¼\9a%.*s"
+msgid "LF would be replaced by CRLF in %s"
+msgstr "æ\96\87件 %s ä¸ç\9a\84 LF å°\86被 CRLF æ\9b¿æ\8d¢"
-#: ref-filter.c:372
+#: date.c:97
+msgid "in the future"
+msgstr "在将来"
+
+#: date.c:103
#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
-msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"
+msgid "%lu second ago"
+msgid_plural "%lu seconds ago"
+msgstr[0] "%lu 秒钟前"
+msgstr[1] "%lu 秒钟前"
-#: ref-filter.c:424
+#: date.c:110
#, c-format
-msgid "malformed format string %s"
-msgstr "非法的格式化字符串 %s"
+msgid "%lu minute ago"
+msgid_plural "%lu minutes ago"
+msgstr[0] "%lu 分钟前"
+msgstr[1] "%lu 分钟前"
-#: ref-filter.c:878
-msgid ":strip= requires a positive integer argument"
-msgstr ":strip= 需要一个正整型参数"
+#: date.c:117
+#, c-format
+msgid "%lu hour ago"
+msgid_plural "%lu hours ago"
+msgstr[0] "%lu 小时前"
+msgstr[1] "%lu 小时前"
-#: ref-filter.c:883
+#: date.c:124
#, c-format
-msgid "ref '%s' does not have %ld components to :strip"
-msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件"
+msgid "%lu day ago"
+msgid_plural "%lu days ago"
+msgstr[0] "%lu 天前"
+msgstr[1] "%lu 天前"
-#: ref-filter.c:1046
+#: date.c:130
#, c-format
-msgid "unknown %.*s format %s"
-msgstr "未知的 %.*s 格式 %s"
+msgid "%lu week ago"
+msgid_plural "%lu weeks ago"
+msgstr[0] "%lu 周前"
+msgstr[1] "%lu 周前"
-#: ref-filter.c:1066 ref-filter.c:1097
+#: date.c:137
#, c-format
-msgid "missing object %s for %s"
-msgstr "缺失 %2$s 的对象 %1$s"
+msgid "%lu month ago"
+msgid_plural "%lu months ago"
+msgstr[0] "%lu 个月前"
+msgstr[1] "%lu 个月前"
-#: ref-filter.c:1069 ref-filter.c:1100
+#: date.c:148
#, c-format
-msgid "parse_object_buffer failed on %s for %s"
-msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
+msgid "%lu year"
+msgid_plural "%lu years"
+msgstr[0] "%lu 年"
+msgstr[1] "%lu 年"
-#: ref-filter.c:1311
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c:151
#, c-format
-msgid "malformed object at '%s'"
-msgstr "非法的对象于 '%s'"
+msgid "%s, %lu month ago"
+msgid_plural "%s, %lu months ago"
+msgstr[0] "%s %lu 个月前"
+msgstr[1] "%s %lu 个月前"
-#: ref-filter.c:1373
+#: date.c:156 date.c:161
#, c-format
-msgid "ignoring ref with broken name %s"
-msgstr "忽略带有错误名称 %s 的引用"
+msgid "%lu year ago"
+msgid_plural "%lu years ago"
+msgstr[0] "%lu 年前"
+msgstr[1] "%lu 年前"
-#: ref-filter.c:1378
+#: diffcore-order.c:24
#, c-format
-msgid "ignoring broken ref %s"
-msgstr "忽略损坏的引用 %s"
+msgid "failed to read orderfile '%s'"
+msgstr "无法读取排序文件 '%s'"
+
+#: diffcore-rename.c:536
+msgid "Performing inexact rename detection"
+msgstr "正在进行非精确的重命名检测"
-#: ref-filter.c:1651
+#: diff.c:62
#, c-format
-msgid "format: %%(end) atom missing"
-msgstr "格式：缺少 %%(end) 元素"
+msgid "option '%s' requires a value"
+msgstr "选项 '%s' 需要一个值"
-#: ref-filter.c:1705
+# 译者：注意保持前导空格
+#: diff.c:124
#, c-format
-msgid "malformed object name %s"
-msgstr "非法的对象名 %s"
+msgid " Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n"
-#: remote.c:746
+# 译者：注意保持前导空格
+#: diff.c:129
#, c-format
-msgid "Cannot fetch both %s and %s to %s"
-msgstr "不能同时获取 %s 和 %s 至 %s"
+msgid " Unknown dirstat parameter '%s'\n"
+msgstr " 未知的 dirstat 参数 '%s'\n"
-#: remote.c:750
+#: diff.c:283
#, c-format
-msgid "%s usually tracks %s, not %s"
-msgstr "%s 通常跟踪 %s，而非 %s"
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"
-#: remote.c:754
+#: diff.c:346
#, c-format
-msgid "%s tracks both %s and %s"
-msgstr "%s 同时跟踪 %s 和 %s"
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+"发现配置变量 'diff.dirstat' 中的错误：\n"
+"%s"
-#: remote.c:762
-msgid "Internal error"
-msgstr "内部错误"
+#: diff.c:3087
+#, c-format
+msgid "external diff died, stopping at %s"
+msgstr "外部 diff 退出，停止在 %s"
-#: remote.c:1677 remote.c:1720
-msgid "HEAD does not point to a branch"
-msgstr "HEAD 没有指向一个分支"
+#: diff.c:3412
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
-#: remote.c:1686
+#: diff.c:3502
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow 明确要求只跟一个路径规格"
+
+#: diff.c:3665
#, c-format
-msgid "no such branch: '%s'"
-msgstr "没有此分支：'%s'"
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+"无法解析 --dirstat/-X 选项的参数：\n"
+"%s"
-#: remote.c:1689
+#: diff.c:3679
#, c-format
-msgid "no upstream configured for branch '%s'"
-msgstr "尚未给分支 '%s' 设置上游"
+msgid "Failed to parse --submodule option parameter: '%s'"
+msgstr "无法解析 --submodule 选项的参数：'%s'"
-#: remote.c:1695
+#: diff.c:4700
+msgid "inexact rename detection was skipped due to too many files."
+msgstr "因为文件太多，略过不严格的重命名检查。"
+
+#: diff.c:4703
+msgid "only found copies from modified paths due to too many files."
+msgstr "因为文件太多，只在修改的路径中查找拷贝。"
+
+#: diff.c:4706
#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
-msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr "您可能想要将您的 %s 变量至少设置为 %d 并重复此命令。"
-#: remote.c:1710
+#: dir.c:1866
+msgid "failed to get kernel name and information"
+msgstr "无法获得内核名称和信息"
+
+#: dir.c:1985
+msgid "Untracked cache is disabled on this system or location."
+msgstr "缓存未跟踪文件在本系统或位置中被禁用。"
+
+#: fetch-pack.c:213
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack：应为 shallow 列表"
+
+#: fetch-pack.c:225
+msgid "git fetch-pack: expected ACK/NAK, got EOF"
+msgstr "git fetch-pack：应为 ACK/NAK，却得到 EOF"
+
+#: fetch-pack.c:243
#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
-msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"
-#: remote.c:1725
+#: fetch-pack.c:295
+msgid "--stateless-rpc requires multi_ack_detailed"
+msgstr "--stateless-rpc 需要 multi_ack_detailed"
+
+#: fetch-pack.c:381
#, c-format
-msgid "branch '%s' has no remote for pushing"
-msgstr "分支 '%s' 没有设置要推送的远程服务器"
+msgid "invalid shallow line: %s"
+msgstr "无效的 shallow 信息：%s"
-#: remote.c:1736
+#: fetch-pack.c:387
#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
-msgstr "向 '%s' 推送引用规格未包含 '%s'"
+msgid "invalid unshallow line: %s"
+msgstr "无效的 unshallow 信息：%s"
-#: remote.c:1749
-msgid "push has no destination (push.default is 'nothing')"
-msgstr "推送无目标（push.default 是 'nothing'）"
+#: fetch-pack.c:389
+#, c-format
+msgid "object not found: %s"
+msgstr "对象未找到：%s"
-#: remote.c:1771
-msgid "cannot resolve 'simple' push to a single destination"
-msgstr "无法解析 'simple' 推送至一个单独的目标"
+#: fetch-pack.c:392
+#, c-format
+msgid "error in object: %s"
+msgstr "对象中出错：%s"
-#: remote.c:2073
+#: fetch-pack.c:394
#, c-format
-msgid "Your branch is based on '%s', but the upstream is gone.\n"
-msgstr "æ\82¨ç\9a\84å\88\86æ\94¯å\9fºäº\8e '%s'ï¼\8cä½\86æ¤ä¸\8a游å\88\86æ\94¯å·²ç»\8fä¸\8då\98å\9c¨ã\80\82\n"
+msgid "no shallow found: %s"
+msgstr "æ\9cªå\8f\91ç\8e° shallowï¼\9a%s"
-#: remote.c:2077
-msgid " (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"
+#: fetch-pack.c:397
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr "应为 shallow/unshallow，却得到 %s"
-#: remote.c:2080
+#: fetch-pack.c:436
#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
-msgstr "您的分支与上游分支 '%s' 一致。\n"
+msgid "got %s %d %s"
+msgstr "得到 %s %d %s"
-#: remote.c:2084
+#: fetch-pack.c:450
#, 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"
+msgid "invalid commit %s"
+msgstr "无效提交 %s"
-#: remote.c:2090
-msgid " (use \"git push\" to publish your local commits)\n"
-msgstr " （使用 \"git push\" 来发布您的本地提交）\n"
+#: fetch-pack.c:483
+msgid "giving up"
+msgstr "放弃"
-#: remote.c:2093
+#: fetch-pack.c:493 progress.c:235
+msgid "done"
+msgstr "完成"
+
+#: fetch-pack.c:505
#, 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"
+msgid "got %s (%d) %s"
+msgstr "得到 %s (%d) %s"
-# 译者：注意保持前导空格
-#: remote.c:2101
-msgid " (use \"git pull\" to update your local branch)\n"
-msgstr " （使用 \"git pull\" 来更新您的本地分支）\n"
+#: fetch-pack.c:551
+#, c-format
+msgid "Marking %s as complete"
+msgstr "标记 %s 为完成"
-#: remote.c:2104
+#: fetch-pack.c:697
#, 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 "already have %s (%s)"
+msgstr "已经有 %s (%s)"
-# 译者：注意保持前导空格
-#: remote.c:2114
-msgid " (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr " （使用 \"git pull\" 来合并远程分支）\n"
+#: fetch-pack.c:735
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack：无法派生 sideband 多路输出"
-#: revision.c:2132
-msgid "your current branch appears to be broken"
-msgstr "您的当前分支好像被损坏"
+#: fetch-pack.c:743
+msgid "protocol error: bad pack header"
+msgstr "协议错误：坏的包头"
-#: revision.c:2135
+#: fetch-pack.c:799
#, c-format
-msgid "your current branch '%s' does not have any commits yet"
-msgstr "您的当前分支 '%s' 尚无任何提交"
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack：无法派生进程 %s"
-#: revision.c:2329
-msgid "--first-parent is incompatible with --bisect"
-msgstr "--first-parent 与 --bisect 不兼容"
+#: fetch-pack.c:815
+#, c-format
+msgid "%s failed"
+msgstr "%s 失败"
-#: run-command.c:92
-msgid "open /dev/null failed"
-msgstr "不能打开 /dev/null"
+#: fetch-pack.c:817
+msgid "error in sideband demultiplexer"
+msgstr "sideband 多路输出出错"
-#: run-command.c:94
-#, c-format
-msgid "dup2(%d,%d) failed"
-msgstr "不能调用 dup2(%d,%d)"
+#: fetch-pack.c:844
+msgid "Server does not support shallow clients"
+msgstr "服务器不支持 shalllow 客户端"
-#: send-pack.c:298
-msgid "failed to sign the push certificate"
-msgstr "æ\97 æ³\95为æ\8e¨é\80\81è¯\81书ç¾å\90\8d"
+#: fetch-pack.c:848
+msgid "Server supports multi_ack_detailed"
+msgstr "æ\9c\8då\8a¡å\99¨æ\94¯æ\8c\81 multi_ack_detailed"
-#: send-pack.c:411
-msgid "the receiving end does not support --signed push"
-msgstr "æ\8e¥æ\94¶ç«¯ä¸\8dæ\94¯æ\8c\81ç¾å\90\8dæ\8e¨é\80\81"
+#: fetch-pack.c:851
+msgid "Server supports no-done"
+msgstr "æ\9c\8då\8a¡å\99¨æ\94¯æ\8c\81 no-done"
-#: send-pack.c:413
-msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
-msgstr "未发送推送证书，因为接收端不支持签名推送"
+#: fetch-pack.c:857
+msgid "Server supports multi_ack"
+msgstr "服务器支持 multi_ack"
-#: send-pack.c:425
-msgid "the receiving end does not support --atomic push"
-msgstr "æ\8e¥æ\94¶ç«¯ä¸\8dæ\94¯æ\8c\81å\8e\9få\90æ\8e¨é\80\81"
+#: fetch-pack.c:861
+msgid "Server supports side-band-64k"
+msgstr "æ\9c\8då\8a¡å\99¨æ\94¯æ\8c\81 side-band-64k"
-#: send-pack.c:430
-msgid "the receiving end does not support push options"
-msgstr "æ\8e¥æ\94¶ç«¯ä¸\8dæ\94¯æ\8c\81æ\8e¨é\80\81é\80\89项"
+#: fetch-pack.c:865
+msgid "Server supports side-band"
+msgstr "æ\9c\8då\8a¡å\99¨æ\94¯æ\8c\81 side-band"
-#: sequencer.c:174
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
-msgstr ""
-"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
-"命令标记修正后的文件"
+#: fetch-pack.c:869
+msgid "Server supports allow-tip-sha1-in-want"
+msgstr "服务器支持 allow-tip-sha1-in-want"
-#: sequencer.c:177
-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' 提交"
+#: fetch-pack.c:873
+msgid "Server supports allow-reachable-sha1-in-want"
+msgstr "服务器支持 allow-reachable-sha1-in-want"
-#: sequencer.c:190 sequencer.c:841 sequencer.c:924
-#, c-format
-msgid "Could not write to %s"
-msgstr "不能写入 %s"
+#: fetch-pack.c:883
+msgid "Server supports ofs-delta"
+msgstr "服务器支持 ofs-delta"
-#: sequencer.c:193 sequencer.c:843 sequencer.c:928
+#: fetch-pack.c:890
#, c-format
-msgid "Error wrapping up %s."
-msgstr "错误收尾 %s。"
+msgid "Server version is %.*s"
+msgstr "服务器版本 %.*s"
-#: sequencer.c:208
-msgid "Your local changes would be overwritten by cherry-pick."
-msgstr "æ\82¨ç\9a\84æ\9c¬å\9c°ä¿®æ\94¹å°\86被æ\8b£é\80\89æ\93\8dä½\9cè¦\86ç\9b\96ã\80\82"
+#: fetch-pack.c:896
+msgid "Server does not support --shallow-since"
+msgstr "æ\9c\8då\8a¡å\99¨ä¸\8dæ\94¯æ\8c\81 --shallow-since"
-#: sequencer.c:210
-msgid "Your local changes would be overwritten by revert."
-msgstr "æ\82¨ç\9a\84æ\9c¬å\9c°ä¿®æ\94¹å°\86被è¿\98å\8e\9fæ\93\8dä½\9cè¦\86ç\9b\96ã\80\82"
+#: fetch-pack.c:900
+msgid "Server does not support --shallow-exclude"
+msgstr "æ\9c\8då\8a¡å\99¨ä¸\8dæ\94¯æ\8c\81 --shallow-exclude"
-#: sequencer.c:213
-msgid "Commit your changes or stash them to proceed."
-msgstr "æ\8f\90交æ\82¨ç\9a\84ä¿®æ\94¹æ\88\96ä¿\9då\98è¿\9b度å\90\8eå\86\8d继ç»ã\80\82"
+#: fetch-pack.c:902
+msgid "Server does not support --deepen"
+msgstr "æ\9c\8då\8a¡å\99¨ä¸\8dæ\94¯æ\8c\81 --deepen"
-#: sequencer.c:228
-#, c-format
-msgid "%s: fast-forward"
-msgstr "%s：快进"
+#: fetch-pack.c:913
+msgid "no common commits"
+msgstr "没有共同的提交"
-#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:303
-#, c-format
-msgid "%s: Unable to write new index file"
-msgstr "%s：无法写入新索引文件"
+#: fetch-pack.c:925
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack：获取失败。"
-#: sequencer.c:321
-msgid "Could not resolve HEAD commit\n"
-msgstr "不能解析 HEAD 提交\n"
+#: fetch-pack.c:1087
+msgid "no matching remote head"
+msgstr "没有匹配的远程分支"
-#: sequencer.c:341
-msgid "Unable to update cache tree\n"
-msgstr "不能更新缓存\n"
+#: gpg-interface.c:185
+msgid "gpg failed to sign the data"
+msgstr "gpg 无法为数据签名"
-#: sequencer.c:393
-#, c-format
-msgid "Could not parse commit %s\n"
-msgstr "不能解析提交 %s\n"
+#: gpg-interface.c:215
+msgid "could not create temporary file"
+msgstr "不能创建临时文件"
-#: sequencer.c:398
+#: gpg-interface.c:217
#, c-format
-msgid "Could not parse parent commit %s\n"
-msgstr "不能解析父提交 %s\n"
-
-#: sequencer.c:463
-msgid "Your index file is unmerged."
-msgstr "您的索引文件未完成合并。"
+msgid "failed writing detached signature to '%s'"
+msgstr "无法将分离式签名写入 '%s'"
-#: sequencer.c:482
+#: grep.c:1782
#, c-format
-msgid "Commit %s is a merge but no -m option was given."
-msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
+msgid "'%s': unable to read %s"
+msgstr "'%s'：无法读取 %s"
-#: sequencer.c:490
+#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155
#, c-format
-msgid "Commit %s does not have parent %d"
-msgstr "æ\8f\90交 %s 没æ\9c\89ç\88¶æ\8f\90交 %d"
+msgid "failed to stat '%s'"
+msgstr "æ\97 æ³\95æ\9e\9a举 '%s' ç\8a¶æ\80\81"
-#: sequencer.c:494
+#: grep.c:1810
#, c-format
-msgid "Mainline was specified but commit %s is not a merge."
-msgstr "指定了主线但提交 %s 不是一个合并。"
+msgid "'%s': short read"
+msgstr "'%s'：读取不完整"
-#. TRANSLATORS: The first %s will be "revert" or
-#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:507
+#: help.c:203
#, c-format
-msgid "%s: cannot parse parent commit %s"
-msgstr "%s：不能解析父提交 %s"
+msgid "available git commands in '%s'"
+msgstr "在 '%s' 下可用的 git 命令"
-#: sequencer.c:511
-#, c-format
-msgid "Cannot get commit message for %s"
-msgstr "不能得到 %s 的提交说明"
+#: help.c:210
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
-#: sequencer.c:597
-#, c-format
-msgid "could not revert %s... %s"
-msgstr "不能还原 %s... %s"
+#: help.c:241
+msgid "These are common Git commands used in various situations:"
+msgstr "这些是各种场合常见的 Git 命令："
-#: sequencer.c:598
+#: help.c:306
#, c-format
-msgid "could not apply %s... %s"
-msgstr "不能应用 %s... %s"
+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 受损？"
-#: sequencer.c:633
-msgid "empty commit set passed"
-msgstr "提供了空的提交集"
+#: help.c:361
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "唉呀，您的系统中未发现 Git 命令。"
-#: sequencer.c:641
+#: help.c:383
#, c-format
-msgid "git %s: failed to read the index"
-msgstr "git %s：无法读取索引"
+msgid ""
+"WARNING: You called a Git command named '%s', which does not exist.\n"
+"Continuing under the assumption that you meant '%s'"
+msgstr ""
+"警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要运行的\n"
+"是 '%s'"
-#: sequencer.c:645
+#: help.c:388
#, c-format
-msgid "git %s: failed to refresh the index"
-msgstr "git %s：无法刷新索引"
-
-#: sequencer.c:705
-msgid "Cannot revert during another revert."
-msgstr "不能在回退中执行另一回退。"
-
-#: sequencer.c:706
-msgid "Cannot revert during a cherry-pick."
-msgstr "不能在拣选中执行回退。"
+msgid "in %0.1f seconds automatically..."
+msgstr "在 %0.1f 秒钟后自动运行..."
-#: sequencer.c:709
-msgid "Cannot cherry-pick during a revert."
-msgstr "不能在回退中执行拣选。"
+#: help.c:395
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"
-#: sequencer.c:710
-msgid "Cannot cherry-pick during another cherry-pick."
-msgstr "不能在拣选过程中执行另一拣选。"
+#: help.c:399 help.c:465
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+"\n"
+"您指的是这个么？"
+msgstr[1] ""
+"\n"
+"您指的是这其中的某一个么？"
-#: sequencer.c:732
+#: help.c:461
#, c-format
-msgid "Could not parse line %d."
-msgstr "不能解析第 %d 行。"
+msgid "%s: %s - %s"
+msgstr "%s：%s - %s"
-#: sequencer.c:737
-msgid "No commits parsed."
-msgstr "没有提交被解析。"
+#: ident.c:334
+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"
-#: sequencer.c:749
+#: lockfile.c:152
#, c-format
-msgid "Could not open %s"
-msgstr "不能打开 %s"
+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"
+"手动删除这个文件再继续。"
-#: sequencer.c:753
+#: lockfile.c:160
#, c-format
-msgid "Could not read %s."
-msgstr "不能读取 %s。"
+msgid "Unable to create '%s.lock': %s"
+msgstr "不能创建 '%s.lock'：%s"
-#: sequencer.c:760
-#, c-format
-msgid "Unusable instruction sheet: %s"
-msgstr "无用的指令表单：%s"
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "无法读取缓存"
-#: sequencer.c:790
-#, c-format
-msgid "Invalid key: %s"
-msgstr "æ\97 æ\95\88é\94®å\90\8dï¼\9a%s"
+#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374
+#: builtin/checkout.c:588 builtin/clone.c:731
+msgid "unable to write new index file"
+msgstr "æ\97 æ³\95å\86\99æ\96°ç\9a\84ç´¢å¼\95æ\96\87件"
-#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52
-#, c-format
-msgid "Invalid value for %s: %s"
-msgstr "%s 的值无效：%s"
+#: merge-recursive.c:209
+msgid "(bad commit)\n"
+msgstr "（坏提交）\n"
-#: sequencer.c:803
+#: merge-recursive.c:231
#, c-format
-msgid "Malformed options sheet: %s"
-msgstr "非法的选项表单：%s"
-
-#: sequencer.c:822
-msgid "a cherry-pick or revert is already in progress"
-msgstr "一个拣选或还原操作已在进行"
+msgid "addinfo_cache failed for path '%s'"
+msgstr "为路径 '%s' addinfo_cache 失败"
-#: sequencer.c:823
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
-msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
+#: merge-recursive.c:301
+msgid "error building trees"
+msgstr "无法创建树"
-#: sequencer.c:827
+#: merge-recursive.c:720
#, c-format
-msgid "Could not create sequencer directory %s"
-msgstr "不能创建序列目录 %s"
-
-#: sequencer.c:862 sequencer.c:998
-msgid "no cherry-pick or revert in progress"
-msgstr "拣选或还原操作并未进行"
+msgid "failed to create path '%s'%s"
+msgstr "无法创建路径 '%s'%s"
-#: sequencer.c:864
-msgid "cannot resolve HEAD"
-msgstr "不能解析 HEAD"
+#: merge-recursive.c:731
+#, c-format
+msgid "Removing %s to make room for subdirectory\n"
+msgstr "删除 %s 以便为子目录留出空间\n"
-#: sequencer.c:866 sequencer.c:900
-msgid "cannot abort from a branch yet to be born"
-msgstr "不能从尚未建立的分支终止"
+#: merge-recursive.c:745 merge-recursive.c:764
+msgid ": perhaps a D/F conflict?"
+msgstr "：可能是一个目录/文件冲突？"
-#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970
+#: merge-recursive.c:754
#, c-format
-msgid "cannot open %s"
-msgstr "不能打开 %s"
+msgid "refusing to lose untracked file at '%s'"
+msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
-#: sequencer.c:888
+#: merge-recursive.c:796 builtin/cat-file.c:34
#, c-format
-msgid "cannot read %s: %s"
-msgstr "不能读取 %s：%s"
-
-#: sequencer.c:889
-msgid "unexpected end of file"
-msgstr "意外的文件结束"
+msgid "cannot read object %s '%s'"
+msgstr "不能读取对象 %s '%s'"
-#: sequencer.c:895
+#: merge-recursive.c:798
#, c-format
-msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
-msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
+msgid "blob expected for %s '%s'"
+msgstr "%s '%s' 应为数据对象"
-#: sequencer.c:921
+#: merge-recursive.c:822
#, c-format
-msgid "Could not format %s."
-msgstr "不能格式化 %s。"
+msgid "failed to open '%s': %s"
+msgstr "无法打开 '%s'：%s"
-#: sequencer.c:1066
+#: merge-recursive.c:833
#, c-format
-msgid "%s: can't cherry-pick a %s"
-msgstr "%s：不能拣选一个%s"
+msgid "failed to symlink '%s': %s"
+msgstr "无法创建符号链接 '%s'：%s"
-#: sequencer.c:1069
+#: merge-recursive.c:838
#, c-format
-msgid "%s: bad revision"
-msgstr "%s：错误的版本"
+msgid "do not know what to do with %06o %s '%s'"
+msgstr "不知道如何处理 %06o %s '%s'"
-#: sequencer.c:1102
-msgid "Can't revert as initial commit"
-msgstr "不能作为初始提交还原"
+#: merge-recursive.c:978
+msgid "Failed to execute internal merge"
+msgstr "无法执行内部合并"
-#: setup.c:160
+#: merge-recursive.c:982
#, 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 <command> -- <path>...' 来指定本地不存在的路径。"
+msgid "Unable to add %s to database"
+msgstr "不能添加 %s 至对象库"
-#: setup.c:173
+#: merge-recursive.c:1081 merge-recursive.c:1095
#, 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>...]'"
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
msgstr ""
-"有歧义的参数 '%s'：未知的版本或路径不存在于工作区中。\n"
-"使用 '--' 来分隔版本和路径，例如：\n"
-"'git <command> [<revision>...] -- [<file>...]'"
+"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
+"的版本被保留。"
-#: setup.c:223
+#: merge-recursive.c:1087 merge-recursive.c:1100
#, c-format
msgid ""
-"ambiguous argument '%s': both revision and filename\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
msgstr ""
-"有歧义的参数 '%s'：可同时是版本和文件\n"
-"使用 '--' 来分隔版本和路径，例如：\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-
-#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419
-#, c-format
-msgid "failed to read %s"
-msgstr "无法读取 %s"
+"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
+"的版本保留于 %8$s 中。"
-#: setup.c:468
-#, c-format
-msgid "Expected git repo version <= %d, found %d"
-msgstr "期望 git 仓库版本 <= %d，却得到 %d"
+#: merge-recursive.c:1143
+msgid "rename"
+msgstr "重命名"
-#: setup.c:476
-msgid "unknown repository extensions found:"
-msgstr "发现未知的仓库扩展："
+#: merge-recursive.c:1143
+msgid "renamed"
+msgstr "重命名"
-#: setup.c:762
+#: merge-recursive.c:1200
#, c-format
-msgid "Not a git repository (or any of the parent directories): %s"
-msgstr "不是一个 git 仓库（或者任何父目录）：%s"
-
-#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
-msgid "Cannot come back to cwd"
-msgstr "无法返回当前工作目录"
-
-#: setup.c:845
-msgid "Unable to read current working directory"
-msgstr "不能读取当前工作目录"
+msgid "%s is a directory in %s adding as %s instead"
+msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
-#: setup.c:920
+#: merge-recursive.c:1225
#, 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)."
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
msgstr ""
-"不是一个 git 仓库（或者向上递归至挂载点 %s 的任何祖先目录）\n"
-"停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
+"冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "
+"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
-#: setup.c:927
-#, c-format
-msgid "Cannot change to '%s/..'"
-msgstr "不能切换到 '%s/..'"
+#: merge-recursive.c:1230
+msgid " (left unresolved)"
+msgstr "（留下未解决）"
-#: setup.c:989
+#: merge-recursive.c:1292
#, c-format
-msgid ""
-"Problem with core.sharedRepository filemode value (0%.3o).\n"
-"The owner of files must always have read and write permissions."
+msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-"参数 core.sharedRepository 的文件权限值有错（0%.3o）。\n"
-"文件属主必须始终拥有读写权限。"
-
-#: sha1_file.c:1046
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "偏移量在包文件结束之前（损坏的 .idx？）"
+"冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->"
+"%5$s"
-#: sha1_file.c:2434
+#: merge-recursive.c:1325
#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
-msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"
+msgid "Renaming %s to %s and %s to %s instead"
+msgstr "而是重命名 %s 至 %s，以及 %s 至 %s"
-#: sha1_file.c:2438
+#: merge-recursive.c:1531
#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"
-
-#: sha1_name.c:462
-msgid ""
-"Git normally never creates a ref that ends with 40 hex characters\n"
-"because it will be ignored when you just specify 40-hex. These refs\n"
-"may be created by mistake. For example,\n"
-"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
-"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
-msgstr ""
-"Git 通常不会创建一个以40位十六进制字符命名的引用，因为当你提供40位\n"
-"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如：\n"
-"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
-"\n"
-"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用，\n"
-"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
-"命令关闭本消息通知。"
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
+msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
-#: submodule.c:64 submodule.c:98
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
-msgstr "无法修改未合并的 .gitmodules，先解决合并冲突"
+#: merge-recursive.c:1546
+#, c-format
+msgid "Adding merged %s"
+msgstr "添加合并后的 %s"
-#: submodule.c:68 submodule.c:102
+#: merge-recursive.c:1553 merge-recursive.c:1766
#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
-msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
+msgid "Adding as %s instead"
+msgstr "而是以 %s 为名添加"
-#: submodule.c:76
+#: merge-recursive.c:1610
#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "不能更新 .gitmodules 条目 %s"
+msgid "cannot read object %s"
+msgstr "不能读取对象 %s"
-#: submodule.c:109
+#: merge-recursive.c:1613
#, c-format
-msgid "Could not remove .gitmodules entry for %s"
-msgstr "无法移除 %s 的 .gitmodules 条目"
+msgid "object %s is not a blob"
+msgstr "对象 %s 不是一个数据对象"
-#: submodule.c:120
-msgid "staging updated .gitmodules failed"
-msgstr "将更新后 .gitmodules 添加暂存区失败"
+#: merge-recursive.c:1666
+msgid "modify"
+msgstr "修改"
-#: submodule.c:177
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "submodule.fetchJobs 不允许为负值"
+#: merge-recursive.c:1666
+msgid "modified"
+msgstr "修改"
-#: submodule-config.c:358
+#: merge-recursive.c:1676
+msgid "content"
+msgstr "内容"
+
+#: merge-recursive.c:1683
+msgid "add/add"
+msgstr "添加/添加"
+
+#: merge-recursive.c:1718
#, c-format
-msgid "invalid value for %s"
-msgstr "%s 的值无效"
+msgid "Skipped %s (merged same as existing)"
+msgstr "略过 %s（已经做过相同合并）"
-#: trailer.c:237
+#: merge-recursive.c:1732
#, c-format
-msgid "running trailer command '%s' failed"
-msgstr "执行 trailer 命令 '%s' 失败"
+msgid "Auto-merging %s"
+msgstr "自动合并 %s"
-#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558
-#: trailer.c:562
+#: merge-recursive.c:1736 git-submodule.sh:924
+msgid "submodule"
+msgstr "子模组"
+
+#: merge-recursive.c:1737
#, c-format
-msgid "unknown value '%s' for key '%s'"
-msgstr "键 '%2$s' 的未知取值 '%1$s'"
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "冲突（%s）：合并冲突于 %s"
-#: trailer.c:544 trailer.c:549 builtin/remote.c:289
+#: merge-recursive.c:1831
#, c-format
-msgid "more than one %s"
-msgstr "多于一个 %s"
+msgid "Removing %s"
+msgstr "删除 %s"
+
+#: merge-recursive.c:1857
+msgid "file/directory"
+msgstr "文件/目录"
+
+#: merge-recursive.c:1863
+msgid "directory/file"
+msgstr "目录/文件"
-#: trailer.c:582
+#: merge-recursive.c:1868
#, c-format
-msgid "empty trailer token in trailer '%.*s'"
-msgstr "签名 '%.*s' 的键为空"
+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"
-#: trailer.c:702
+#: merge-recursive.c:1877
#, c-format
-msgid "could not read input file '%s'"
-msgstr "不能读取输入文件 '%s'"
+msgid "Adding %s"
+msgstr "添加 %s"
-#: trailer.c:705
-msgid "could not read from stdin"
-msgstr "不能自标准输入读取"
+#: merge-recursive.c:1914
+msgid "Already up-to-date!"
+msgstr "已经是最新的！"
-#: trailer.c:857 builtin/am.c:42
+#: merge-recursive.c:1923
#, c-format
-msgid "could not stat %s"
-msgstr "不能获取 %s 的文件状态"
+msgid "merging of trees %s and %s failed"
+msgstr "无法合并树 %s 和 %s"
-#: trailer.c:859
-#, c-format
-msgid "file %s is not a regular file"
-msgstr "文件 %s 不是一个正规文件"
+#: merge-recursive.c:2006
+msgid "Merging:"
+msgstr "合并："
-#: trailer.c:861
+#: merge-recursive.c:2019
#, c-format
-msgid "file %s is not writable by user"
-msgstr "文件 %s 用户不可写"
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] "发现 %u 个共同祖先："
+msgstr[1] "发现 %u 个共同祖先："
-#: trailer.c:873
-msgid "could not open temporary file"
-msgstr "不能打开临时文件"
+#: merge-recursive.c:2058
+msgid "merge returned no commit"
+msgstr "合并未返回提交"
-#: trailer.c:912
+#: merge-recursive.c:2121
#, c-format
-msgid "could not rename temporary file to %s"
-msgstr "不能重命名临时文件为 %s"
+msgid "Could not parse object '%s'"
+msgstr "不能解析对象 '%s'"
-#: transport.c:62
+#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
+msgid "Unable to write index."
+msgstr "不能写入索引。"
+
+#: notes-merge.c:273
#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
+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' 来提交/终止前一次合并。"
-#: transport.c:151
+#: notes-merge.c:280
#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "传输：无效的深度选项 '%s'"
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "您尚未结束注释合并（存在 %s）。"
+
+#: notes-utils.c:41
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr "不能提交未初始化/未引用的注解树"
-#: transport.c:771
+#: notes-utils.c:100
#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n"
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "坏的 notes.rewriteMode 值：'%s'"
-#: transport.c:775
+#: notes-utils.c:110
#, 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:783
-msgid "Aborting."
-msgstr "正在终止。"
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"
-#: transport-helper.c:1041
+#. TRANSLATORS: The first %s is the name of the
+#. environment variable, the second %s is its value
+#: notes-utils.c:137
#, c-format
-msgid "Could not read ref %s"
-msgstr "不能读取引用 %s"
+msgid "Bad %s value: '%s'"
+msgstr "坏的 %s 值：'%s'"
-#: unpack-trees.c:64
+#: object.c:242
#, 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请在切换分支前提交您的修改或者保存进度。"
+msgid "unable to parse object: %s"
+msgstr "不能解析对象：%s"
-#: unpack-trees.c:66
+#: parse-options.c:572
+msgid "..."
+msgstr "..."
+
+#: parse-options.c:590
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
-msgstr ""
-"您对下列文件的本地修改将被检出操作覆盖：\n"
-"%%s"
+msgid "usage: %s"
+msgstr "用法：%s"
-#: unpack-trees.c:69
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation
+#: parse-options.c:594
#, 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请在合并前提交您的修改或者保存进度。"
+msgid " or: %s"
+msgstr " 或：%s"
-#: unpack-trees.c:71
+# 译者：为保证在输出中对齐，注意调整句中空格！
+#: parse-options.c:597
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-"您对下列文件的本地修改将被合并操作覆盖：\n"
-"%%s"
+msgid " %s"
+msgstr " %s"
-#: unpack-trees.c:74
+#: parse-options.c:631
+msgid "-NUM"
+msgstr "-数字"
+
+#: parse-options-cb.c:108
#, 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 "malformed object name '%s'"
+msgstr "非法的对象名 '%s'"
-#: unpack-trees.c:76
+#: path.c:826
#, c-format
+msgid "Could not make %s writable by group"
+msgstr "不能设置 %s 为组可写"
+
+#: pathspec.c:133
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
+
+#: pathspec.c:143
msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-"您对下列文件的本地修改将被 %s 覆盖：\n"
-"%%s"
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
-#: unpack-trees.c:81
+#: pathspec.c:177
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "路径规格包含无效的神奇前缀"
+
+#: pathspec.c:183
#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in it:\n"
-"%s"
-msgstr ""
-"更新如下目录将会丢失其中未跟踪的文件：\n"
-"%s"
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
-#: unpack-trees.c:85
+#: pathspec.c:187
#, 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请在切换分支之前移动或删除。"
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
-#: unpack-trees.c:87
+#: pathspec.c:205
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
-msgstr ""
-"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
-"%%s"
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
-#: unpack-trees.c:90
+#: pathspec.c:230
#, 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请在合并前移动或删除。"
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s：'literal' 和 'glob' 不兼容"
-#: unpack-trees.c:92
+#: pathspec.c:241
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
-msgstr ""
-"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
-"%%s"
+msgid "%s: '%s' is outside repository"
+msgstr "%s：'%s' 在仓库之外"
-#: unpack-trees.c:95
+#: pathspec.c:291
#, 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 前移动或删除。"
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
-#: unpack-trees.c:97
+#: pathspec.c:353
#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr "%s：路径规格神奇前缀不被此命令支持：%s"
+
+#: pathspec.c:408
msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
+"empty strings as pathspecs will be made invalid in upcoming releases. please "
+"use . instead if you meant to match all paths"
msgstr ""
-"å·¥ä½\9cå\8cºä¸ä¸\8bå\88\97æ\9cªè·\9f踪ç\9a\84æ\96\87件å°\86ä¼\9aå\9b 为 %s æ\93\8dä½\9cè\80\8c被å\88 é\99¤ï¼\9a\n"
-"%%s"
+"å\9c¨å\8d³å°\86å\88°æ\9d¥ç\9a\84ç\89\88æ\9c¬ï¼\8cä¸\8dè\83½å\86\8d使ç\94¨ç©ºå\97符串ä½\9c为路å¾\84表达å¼\8fã\80\82å¦\82æ\9e\9cè¦\81å\8c¹é\85\8dæ\89\80æ\9c\89è·¯å¾\84ï¼\8c\n"
+"请代之以 ."
-#: unpack-trees.c:102
+#: pathspec.c:440
#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "路径规格 '%s' 位于符号链接中"
+
+#: pathspec.c:449
msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%sPlease move or remove them before you switch branches."
+"There is nothing to exclude from by :(exclude) patterns.\n"
+"Perhaps you forgot to add either ':/' or '.' ?"
msgstr ""
-"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
-"%%s请在切换分支前移动或删除。"
+"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
+"添加 ':/' 或 '.' ？"
-#: unpack-trees.c:104
+#: pretty.c:971
+msgid "unable to parse --pretty format"
+msgstr "不能解析 --pretty 格式"
+
+#: read-cache.c:1315
#, c-format
msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%s"
+"index.version set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
-"%%s"
+"设置了 index.version，但是取值无效。\n"
+"使用版本 %i"
-#: unpack-trees.c:107
+#: read-cache.c:1325
#, c-format
msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you merge."
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
-"%%s请在合并前移动或删除。"
+"设置了 GIT_INDEX_VERSION，但是取值无效。\n"
+"使用版本 %i"
-#: unpack-trees.c:109
+#: refs.c:576 builtin/merge.c:840
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
-"%%s"
+msgid "Could not open '%s' for writing"
+msgstr "无法打开 '%s' 进行写入"
-#: unpack-trees.c:112
+#: refs/files-backend.c:2481
#, 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 前移动或删除。"
+msgid "could not delete reference %s: %s"
+msgstr "无法删除引用 %s：%s"
-#: unpack-trees.c:114
+#: refs/files-backend.c:2484
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
-"%%s"
+msgid "could not delete references: %s"
+msgstr "无法删除引用：%s"
-#: unpack-trees.c:121
+#: refs/files-backend.c:2493
#, c-format
-msgid "Entry '%s' overlaps with '%s'. Cannot bind."
-msgstr "æ\9d¡ç\9b® '%s' å\92\8c '%s' é\87\8då\8f ã\80\82æ\97 æ³\95å\90\88并ã\80\82"
+msgid "could not remove reference %s"
+msgstr "æ\97 æ³\95å\88 é\99¤å¼\95ç\94¨ %s"
-#: unpack-trees.c:124
+#: ref-filter.c:55
#, c-format
-msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
-"%s"
-msgstr ""
-"无法更新稀疏检出：如下条目不是最新：\n"
-"%s"
+msgid "expected format: %%(color:<color>)"
+msgstr "期望的格式：%%(color:<color>)"
-#: unpack-trees.c:126
+#: ref-filter.c:57
#, c-format
-msgid ""
-"The following Working tree files would be overwritten by sparse checkout "
-"update:\n"
-"%s"
-msgstr ""
-"工作区中下列文件将会因为稀疏检出而被覆盖：\n"
-"%s"
+msgid "unrecognized color: %%(color:%s)"
+msgstr "未能识别的颜色：%%(color:%s)"
-#: unpack-trees.c:128
+#: ref-filter.c:71
#, c-format
-msgid ""
-"The following Working tree files would be removed by sparse checkout "
-"update:\n"
-"%s"
-msgstr ""
-"工作区中下列文件将会因为稀疏检出而被删除：\n"
-"%s"
+msgid "unrecognized format: %%(%s)"
+msgstr "未能识别的格式：%%(%s)"
-#: unpack-trees.c:205
+#: ref-filter.c:77
#, c-format
-msgid "Aborting\n"
-msgstr "终止中\n"
+msgid "%%(body) does not take arguments"
+msgstr "%%(body) 不带参数"
-#: unpack-trees.c:237
-msgid "Checking out files"
-msgstr "正在检出文件"
+#: ref-filter.c:84
+#, c-format
+msgid "%%(subject) does not take arguments"
+msgstr "%%(subject) 不带参数"
-#: urlmatch.c:120
-msgid "invalid URL scheme name or missing '://' suffix"
-msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
+#: ref-filter.c:101
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "要为 contents:lines=%s 提供一个正数"
-#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#: ref-filter.c:103
#, c-format
-msgid "invalid %XX escape sequence"
-msgstr "æ\97 æ\95\88ç\9a\84 %XX 转ä¹\89åº\8få\88\97"
+msgid "unrecognized %%(contents) argument: %s"
+msgstr "æ\9cªè\83½è¯\86å\88«ç\9a\84 %%(contents) å\8f\82æ\95°ï¼\9a%s"
-#: urlmatch.c:172
-msgid "missing host and scheme is not 'file:'"
-msgstr "缺失主机名且 URL 方案不是 'file:'"
+#: ref-filter.c:113
+#, c-format
+msgid "unrecognized %%(objectname) argument: %s"
+msgstr "未能识别的 %%(objectname) 参数：%s"
-#: urlmatch.c:189
-msgid "a 'file:' URL may not have a port number"
-msgstr "一个 'file:' URL 不应该包含端口号"
+#: ref-filter.c:135
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "期望的格式：%%(align:<width>,<position>)"
-#: urlmatch.c:199
-msgid "invalid characters in host name"
-msgstr "主机名中包含无效的字符"
+#: ref-filter.c:147
+#, c-format
+msgid "unrecognized position:%s"
+msgstr "未能识别的位置：%s"
-#: urlmatch.c:244 urlmatch.c:255
-msgid "invalid port number"
-msgstr "无效的端口号"
+#: ref-filter.c:151
+#, c-format
+msgid "unrecognized width:%s"
+msgstr "未能识别的宽度：%s"
-#: urlmatch.c:322
-msgid "invalid '..' path segment"
-msgstr "无效的 '..' 路径片段"
+#: ref-filter.c:157
+#, c-format
+msgid "unrecognized %%(align) argument: %s"
+msgstr "未能识别的 %%(align) 参数：%s"
-#: worktree.c:282
+#: ref-filter.c:161
#, c-format
-msgid "failed to read '%s'"
-msgstr "无法读取 '%s'"
+msgid "positive width expected with the %%(align) atom"
+msgstr "元素 %%(align) 需要一个正数的宽度"
-#: wrapper.c:222 wrapper.c:392
+#: ref-filter.c:244
#, c-format
-msgid "could not open '%s' for reading and writing"
-msgstr "无法打开 '%s' 进行读写"
+msgid "malformed field name: %.*s"
+msgstr "非法的字段名：%.*s"
-#: wrapper.c:224 wrapper.c:394 builtin/am.c:778
+#: ref-filter.c:270
#, c-format
-msgid "could not open '%s' for writing"
-msgstr "æ\97 æ³\95æ\89\93å¼\80 '%s' è¿\9bè¡\8cå\86\99å\85¥"
+msgid "unknown field name: %.*s"
+msgstr "æ\9cªç\9f¥ç\9a\84å\97段å\90\8dï¼\9a%.*s"
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771
-#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029
-#: builtin/pull.c:407
+#: ref-filter.c:372
#, c-format
-msgid "could not open '%s' for reading"
-msgstr "æ\97 æ³\95æ\89\93å¼\80 '%s' è¿\9bè¡\8c读å\8f\96"
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "æ ¼å¼\8fï¼\9a使ç\94¨äº\86 %%(end) å\85\83ç´ å\8d´æ²¡æ\9c\89å®\83ç\9a\84对åº\94å\85\83ç´ "
-#: wrapper.c:605 wrapper.c:626
+#: ref-filter.c:424
#, c-format
-msgid "unable to access '%s'"
-msgstr "不能访问 '%s'"
+msgid "malformed format string %s"
+msgstr "非法的格式化字符串 %s"
-#: wrapper.c:634
-msgid "unable to get current working directory"
-msgstr "不能获取当前工作目录"
+#: ref-filter.c:878
+msgid ":strip= requires a positive integer argument"
+msgstr ":strip= 需要一个正整型参数"
-#: wrapper.c:658
+#: ref-filter.c:883
#, c-format
-msgid "could not write to %s"
-msgstr "不能写入 %s"
+msgid "ref '%s' does not have %ld components to :strip"
+msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件"
-#: wrapper.c:660
+#: ref-filter.c:1046
#, c-format
-msgid "could not close %s"
-msgstr "不能关闭 %s"
+msgid "unknown %.*s format %s"
+msgstr "未知的 %.*s 格式 %s"
-#: wt-status.c:150
-msgid "Unmerged paths:"
-msgstr "未合并的路径："
+#: ref-filter.c:1066 ref-filter.c:1097
+#, c-format
+msgid "missing object %s for %s"
+msgstr "缺失 %2$s 的对象 %1$s"
-# 译者：注意保持前导空格
-#: wt-status.c:177 wt-status.c:204
+#: ref-filter.c:1069 ref-filter.c:1100
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr " （使用 \"git reset %s <文件>...\" 以取消暂存）"
+msgid "parse_object_buffer failed on %s for %s"
+msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
-# 译者：注意保持前导空格
-#: wt-status.c:179 wt-status.c:206
-msgid " (use \"git rm --cached <file>...\" to unstage)"
-msgstr " （使用 \"git rm --cached <文件>...\" 以取消暂存）"
+#: ref-filter.c:1311
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "非法的对象于 '%s'"
-# 译者：注意保持前导空格
-#: wt-status.c:183
-msgid " (use \"git add <file>...\" to mark resolution)"
-msgstr " （使用 \"git add <文件>...\" 标记解决方案）"
+#: ref-filter.c:1373
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr "忽略带有错误名称 %s 的引用"
-# 译者：注意保持前导空格
-#: wt-status.c:185 wt-status.c:189
-msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
-msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）"
+#: ref-filter.c:1378
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "忽略损坏的引用 %s"
-# 译者：注意保持前导空格
-#: wt-status.c:187
-msgid " (use \"git rm <file>...\" to mark resolution)"
-msgstr " （使用 \"git rm <文件>...\" 标记解决方案）"
+#: ref-filter.c:1633
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "格式：缺少 %%(end) 元素"
-#: wt-status.c:198 wt-status.c:882
-msgid "Changes to be committed:"
-msgstr "要提交的变更："
+#: ref-filter.c:1687
+#, c-format
+msgid "malformed object name %s"
+msgstr "非法的对象名 %s"
-#: wt-status.c:216 wt-status.c:891
-msgid "Changes not staged for commit:"
-msgstr "尚未暂存以备提交的变更："
+#: remote.c:746
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "不能同时获取 %s 和 %s 至 %s"
-# 译者：注意保持前导空格
-#: wt-status.c:220
-msgid " (use \"git add <file>...\" to update what will be committed)"
-msgstr " （使用 \"git add <文件>...\" 更新要提交的内容）"
+#: remote.c:750
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%s 通常跟踪 %s，而非 %s"
-# 译者：注意保持前导空格
-#: wt-status.c:222
-msgid " (use \"git add/rm <file>...\" to update what will be committed)"
-msgstr " （使用 \"git add/rm <文件>...\" 更新要提交的内容）"
+#: remote.c:754
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "%s 同时跟踪 %s 和 %s"
-# 译者：注意保持前导空格
-#: wt-status.c:223
-msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
-msgstr " （使用 \"git checkout -- <文件>...\" 丢弃工作区的改动）"
+#: remote.c:762
+msgid "Internal error"
+msgstr "内部错误"
-# 译者：注意保持前导空格
-#: wt-status.c:225
-msgid " (commit or discard the untracked or modified content in submodules)"
-msgstr " （提交或丢弃子模组中未跟踪或修改的内容）"
+#: remote.c:1677 remote.c:1720
+msgid "HEAD does not point to a branch"
+msgstr "HEAD 没有指向一个分支"
-# 译者：注意保持前导空格
-#: wt-status.c:237
+#: remote.c:1686
#, c-format
-msgid " (use \"git %s <file>...\" to include in what will be committed)"
-msgstr " （使用 \"git %s <文件>...\" 以包含要提交的内容）"
-
-#: wt-status.c:252
-msgid "both deleted:"
-msgstr "双方删除："
+msgid "no such branch: '%s'"
+msgstr "没有此分支：'%s'"
-#: wt-status.c:254
-msgid "added by us:"
-msgstr "由我们添加："
+#: remote.c:1689
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "尚未给分支 '%s' 设置上游"
-#: wt-status.c:256
-msgid "deleted by them:"
-msgstr "由他们删除："
+#: remote.c:1695
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
-#: wt-status.c:258
-msgid "added by them:"
-msgstr "由他们添加："
+#: remote.c:1710
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
-#: wt-status.c:260
-msgid "deleted by us:"
-msgstr "由我们删除："
+#: remote.c:1725
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "分支 '%s' 没有设置要推送的远程服务器"
-#: wt-status.c:262
-msgid "both added:"
-msgstr "双方添加："
+#: remote.c:1736
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "向 '%s' 推送引用规格未包含 '%s'"
-#: wt-status.c:264
-msgid "both modified:"
-msgstr "双方修改："
+#: remote.c:1749
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "推送无目标（push.default 是 'nothing'）"
-#: wt-status.c:274
-msgid "new file:"
-msgstr "新文件："
-
-#: wt-status.c:276
-msgid "copied:"
-msgstr "拷贝："
+#: remote.c:1771
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "无法解析 'simple' 推送至一个单独的目标"
-#: wt-status.c:278
-msgid "deleted:"
-msgstr "删除："
+#: remote.c:2073
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"
-#: wt-status.c:280
-msgid "modified:"
-msgstr "修改："
+#: remote.c:2077
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"
-#: wt-status.c:282
-msgid "renamed:"
-msgstr "重命名："
+#: remote.c:2080
+#, c-format
+msgid "Your branch is up-to-date with '%s'.\n"
+msgstr "您的分支与上游分支 '%s' 一致。\n"
-#: wt-status.c:284
-msgid "typechange:"
-msgstr "类型变更："
+#: remote.c:2084
+#, 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"
-#: wt-status.c:286
-msgid "unknown:"
-msgstr "未知："
+#: remote.c:2090
+msgid " (use \"git push\" to publish your local commits)\n"
+msgstr " （使用 \"git push\" 来发布您的本地提交）\n"
-#: wt-status.c:288
-msgid "unmerged:"
-msgstr "未合并："
+#: remote.c:2093
+#, 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"
-# è¯\91è\80\85ï¼\9aæ\9c«å°¾ä¸¤ä¸ªå\97è\8a\82å\8f¯è\83½è¢«å\88 å\87\8fï¼\8cå¦\82æ\9e\9cç¿»è¯\91为ä¸æ\96\87æ \87ç\82¹ä¼\9aå\87ºç\8e°å\8d\8a个æ±\89å\97
-#: wt-status.c:370
-msgid "new commits, "
-msgstr "新提交, "
+# è¯\91è\80\85ï¼\9a注æ\84\8fä¿\9dæ\8c\81å\89\8då¯¼ç©ºæ ¼
+#: remote.c:2101
+msgid " (use \"git pull\" to update your local branch)\n"
+msgstr " （使用 \"git pull\" 来更新您的本地分支）\n"
-# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:372
-msgid "modified content, "
-msgstr "修改的内容, "
+#: remote.c:2104
+#, 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"
-# è¯\91è\80\85ï¼\9aæ\9c«å°¾ä¸¤ä¸ªå\97è\8a\82å\8f¯è\83½è¢«å\88 å\87\8fï¼\8cå¦\82æ\9e\9cç¿»è¯\91为ä¸æ\96\87æ \87ç\82¹ä¼\9aå\87ºç\8e°å\8d\8a个æ±\89å\97
-#: wt-status.c:374
-msgid "untracked content, "
-msgstr "未跟踪的内容, "
+# è¯\91è\80\85ï¼\9a注æ\84\8fä¿\9dæ\8c\81å\89\8då¯¼ç©ºæ ¼
+#: remote.c:2114
+msgid " (use \"git pull\" to merge the remote branch into yours)\n"
+msgstr " （使用 \"git pull\" 来合并远程分支）\n"
-#: wt-status.c:756
-msgid "Submodules changed but not updated:"
-msgstr "子模组已修改但尚未更新："
+#: revision.c:2158
+msgid "your current branch appears to be broken"
+msgstr "您的当前分支好像被损坏"
-#: wt-status.c:758
-msgid "Submodule changes to be committed:"
-msgstr "要提交的子模组变更："
+#: revision.c:2161
+#, c-format
+msgid "your current branch '%s' does not have any commits yet"
+msgstr "您的当前分支 '%s' 尚无任何提交"
-#: wt-status.c:839
-msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
-msgstr ""
-"不要改动上面的一行。\n"
-"下面的所有内容均将被删除。"
+#: revision.c:2355
+msgid "--first-parent is incompatible with --bisect"
+msgstr "--first-parent 与 --bisect 不兼容"
-#: wt-status.c:950
-msgid "You have unmerged paths."
-msgstr "您有尚未合并的路径。"
+#: run-command.c:106
+msgid "open /dev/null failed"
+msgstr "不能打开 /dev/null"
-# 译者：注意保持前导空格
-#: wt-status.c:953
-msgid " (fix conflicts and run \"git commit\")"
-msgstr " （解决冲突并运行 \"git commit\"）"
+#: run-command.c:108
+#, c-format
+msgid "dup2(%d,%d) failed"
+msgstr "不能调用 dup2(%d,%d)"
-# 译者：注意保持前导空格
-#: wt-status.c:955
-msgid " (use \"git merge --abort\" to abort the merge)"
-msgstr " （使用 \"git merge --abort\" 终止合并）"
+#: send-pack.c:297
+msgid "failed to sign the push certificate"
+msgstr "无法为推送证书签名"
-#: wt-status.c:960
-msgid "All conflicts fixed but you are still merging."
-msgstr "æ\89\80æ\9c\89å\86²çª\81已解å\86³ä½\86æ\82¨ä»\8då¤\84äº\8eå\90\88并ä¸ã\80\82"
+#: send-pack.c:410
+msgid "the receiving end does not support --signed push"
+msgstr "æ\8e¥æ\94¶ç«¯ä¸\8dæ\94¯æ\8c\81ç¾å\90\8dæ\8e¨é\80\81"
-# 译者：注意保持前导空格
-#: wt-status.c:963
-msgid " (use \"git commit\" to conclude merge)"
-msgstr " （使用 \"git commit\" 结束合并）"
+#: send-pack.c:412
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr "未发送推送证书，因为接收端不支持签名推送"
-#: wt-status.c:973
-msgid "You are in the middle of an am session."
-msgstr "æ\82¨æ£å¤\84äº\8e am æ\93\8dä½\9cè¿\87ç¨\8bä¸ã\80\82"
+#: send-pack.c:424
+msgid "the receiving end does not support --atomic push"
+msgstr "æ\8e¥æ\94¶ç«¯ä¸\8dæ\94¯æ\8c\81å\8e\9få\90æ\8e¨é\80\81"
-#: wt-status.c:976
-msgid "The current patch is empty."
-msgstr "当前的补丁为空。"
+#: send-pack.c:429
+msgid "the receiving end does not support push options"
+msgstr "接收端不支持推送选项"
-# 译者：注意保持前导空格
-#: wt-status.c:980
-msgid " (fix conflicts and then run \"git am --continue\")"
-msgstr " （解决冲突，然后运行 \"git am --continue\"）"
+#: sequencer.c:171
+msgid "revert"
+msgstr "还原"
-# 译者：注意保持前导空格
-#: wt-status.c:982
-msgid " (use \"git am --skip\" to skip this patch)"
-msgstr " （使用 \"git am --skip\" 跳过此补丁）"
+#: sequencer.c:171
+msgid "cherry-pick"
+msgstr "拣选"
-# 译者：注意保持前导空格
-#: wt-status.c:984
-msgid " (use \"git am --abort\" to restore the original branch)"
-msgstr " （使用 \"git am --abort\" 恢复原有分支）"
+#: sequencer.c:228
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr ""
+"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
+"命令标记修正后的文件"
-#: wt-status.c:1109
-msgid "No commands done."
-msgstr "没有命令被执行。"
+#: sequencer.c:231
+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' 提交"
-#: wt-status.c:1112
+#: sequencer.c:244 sequencer.c:1209
#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
-msgstr[0] "最后一条命令已完成（%d 条命令被执行）："
-msgstr[1] "最后的命令已完成（%d 条命令被执行）："
+msgid "could not lock '%s'"
+msgstr "不能锁定 '%s'"
-#: wt-status.c:1123
+#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214
#, c-format
-msgid " (see more in file %s)"
-msgstr " （更多参见文件 %s）"
+msgid "could not write to '%s'"
+msgstr "不能写入 '%s'"
-#: wt-status.c:1128
-msgid "No commands remaining."
-msgstr "未剩下任何命令。"
+#: sequencer.c:251
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr "不能将换行符写入 '%s'"
-#: wt-status.c:1131
+#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216
#, 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 条命令）："
+msgid "failed to finalize '%s'."
+msgstr "无法完成 '%s'。"
-# 译者：注意保持前导空格
-#: wt-status.c:1139
-msgid " (use \"git rebase --edit-todo\" to view and edit)"
-msgstr " （使用 \"git rebase --edit-todo\" 来查看和编辑）"
+#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032
+#, c-format
+msgid "could not read '%s'"
+msgstr "不能读取 '%s'"
-#: wt-status.c:1152
+#: sequencer.c:305
#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
+msgid "your local changes would be overwritten by %s."
+msgstr "您的本地修改将被%s覆盖。"
-#: wt-status.c:1157
-msgid "You are currently rebasing."
-msgstr "æ\82¨å\9c¨æ\89§è¡\8cå\8f\98å\9fºæ\93\8dä½\9c。"
+#: sequencer.c:309
+msgid "commit your changes or stash them to proceed."
+msgstr "æ\8f\90交æ\82¨ç\9a\84ä¿®æ\94¹æ\88\96ä¿\9då\98è¿\9b度å\90\8eå\86\8d继ç»。"
-# 译者：注意保持前导空格
-#: wt-status.c:1171
-msgid " (fix conflicts and then run \"git rebase --continue\")"
-msgstr " （解决冲突，然后运行 \"git rebase --continue\"）"
+#: sequencer.c:324
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s：快进"
-# 译者：注意保持前导空格
-#: wt-status.c:1173
-msgid " (use \"git rebase --skip\" to skip this patch)"
-msgstr " （使用 \"git rebase --skip\" 跳过此补丁）"
+#. TRANSLATORS: %s will be "revert" or "cherry-pick"
+#: sequencer.c:399
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr "%s：无法写入新索引文件"
-# 译者：注意保持前导空格
-#: wt-status.c:1175
-msgid " (use \"git rebase --abort\" to check out the original branch)"
-msgstr " （使用 \"git rebase --abort\" 以检出原有分支）"
+#: sequencer.c:418
+msgid "could not resolve HEAD commit\n"
+msgstr "不能解析 HEAD 提交\n"
-# 译者：注意保持前导空格
-#: wt-status.c:1181
-msgid " (all conflicts fixed: run \"git rebase --continue\")"
-msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）"
+#: sequencer.c:438
+msgid "unable to update cache tree\n"
+msgstr "不能更新缓存\n"
-#: wt-status.c:1185
+#: sequencer.c:483
#, c-format
msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
-msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
-
-#: wt-status.c:1190
-msgid "You are currently splitting a commit during a rebase."
-msgstr "您在执行变基操作时拆分提交。"
-
-# 译者：注意保持前导空格
-#: wt-status.c:1193
-msgid " (Once your working directory is clean, run \"git rebase --continue\")"
-msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"
+"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"
-#: wt-status.c:1197
+#: sequencer.c:567
#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
-msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
+msgid "could not parse commit %s\n"
+msgstr "不能解析提交 %s\n"
-#: wt-status.c:1202
-msgid "You are currently editing a commit during a rebase."
-msgstr "您在执行变基操作时编辑提交。"
+#: sequencer.c:572
+#, c-format
+msgid "could not parse parent commit %s\n"
+msgstr "不能解析父提交 %s\n"
-# 译者：注意保持前导空格
-#: wt-status.c:1205
-msgid " (use \"git commit --amend\" to amend the current commit)"
-msgstr " （使用 \"git commit --amend\" 修补当前提交）"
+#: sequencer.c:656
+msgid "your index file is unmerged."
+msgstr "您的索引文件未完成合并。"
-# 译者：注意保持前导空格
-#: wt-status.c:1207
-msgid ""
-" (use \"git rebase --continue\" once you are satisfied with your changes)"
-msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"
+#: sequencer.c:675
+#, c-format
+msgid "commit %s is a merge but no -m option was given."
+msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
-#: wt-status.c:1217
+#: sequencer.c:683
#, c-format
-msgid "You are currently cherry-picking commit %s."
-msgstr "æ\82¨å\9c¨æ\89§è¡\8cæ\8b£é\80\89æ\8f\90交 %s ç\9a\84æ\93\8dä½\9cã\80\82"
+msgid "commit %s does not have parent %d"
+msgstr "æ\8f\90交 %s 没æ\9c\89第 %d 个ç\88¶æ\8f\90交"
-# 译者：注意保持前导空格
-#: wt-status.c:1222
-msgid " (fix conflicts and run \"git cherry-pick --continue\")"
-msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）"
+#: sequencer.c:687
+#, c-format
+msgid "mainline was specified but commit %s is not a merge."
+msgstr "指定了主线，但是提交 %s 不是一个合并提交。"
-# 译者：注意保持前导空格
-#: wt-status.c:1225
-msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
-msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）"
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#: sequencer.c:700
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s：不能解析父提交 %s"
-# 译者：注意保持前导空格
-#: wt-status.c:1227
-msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
-msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）"
+#: sequencer.c:705
+#, c-format
+msgid "cannot get commit message for %s"
+msgstr "不能得到 %s 的提交说明"
-#: wt-status.c:1236
+#: sequencer.c:797
#, c-format
-msgid "You are currently reverting commit %s."
-msgstr "您在执行反转提交 %s 的操作。"
+msgid "could not revert %s... %s"
+msgstr "不能还原 %s... %s"
-# 译者：注意保持前导空格
-#: wt-status.c:1241
-msgid " (fix conflicts and run \"git revert --continue\")"
-msgstr " （解决冲突并运行 \"git revert --continue\"）"
+#: sequencer.c:798
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "不能应用 %s... %s"
-# 译者：注意保持前导空格
-#: wt-status.c:1244
-msgid " (all conflicts fixed: run \"git revert --continue\")"
-msgstr " （所有冲突已解决：运行 \"git revert --continue\"）"
+#: sequencer.c:833
+msgid "empty commit set passed"
+msgstr "提供了空的提交集"
-# 译者：注意保持前导空格
-#: wt-status.c:1246
-msgid " (use \"git revert --abort\" to cancel the revert operation)"
-msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）"
+#: sequencer.c:843
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr "git %s：无法读取索引"
-#: wt-status.c:1257
+#: sequencer.c:850
#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
-msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
+msgid "git %s: failed to refresh the index"
+msgstr "git %s：无法刷新索引"
-#: wt-status.c:1261
-msgid "You are currently bisecting."
-msgstr "您在执行二分查找操作。"
+#: sequencer.c:944
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr "无效行 %d：%.*s"
-# 译者：注意保持前导空格
-#: wt-status.c:1264
-msgid " (use \"git bisect reset\" to get back to the original branch)"
-msgstr " （使用 \"git bisect reset\" 以回到原有分支）"
+#: sequencer.c:950
+msgid "no commits parsed."
+msgstr "没有解析提交。"
+
+#: sequencer.c:966
+#, c-format
+msgid "could not read '%s'."
+msgstr "不能读取 '%s'。"
+
+#: sequencer.c:972
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr "无用的指令清单：'%s'"
+
+#: sequencer.c:983
+msgid "cannot cherry-pick during a revert."
+msgstr "不能在回退中执行拣选。"
+
+#: sequencer.c:985
+msgid "cannot revert during a cherry-pick."
+msgstr "不能在拣选中执行回退。"
+
+#: sequencer.c:1028
+#, c-format
+msgid "invalid key: %s"
+msgstr "无效键名：%s"
+
+#: sequencer.c:1031
+#, c-format
+msgid "invalid value for %s: %s"
+msgstr "%s 的值无效：%s"
+
+#: sequencer.c:1063
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr "非法的选项清单：'%s'"
+
+#: sequencer.c:1101
+msgid "a cherry-pick or revert is already in progress"
+msgstr "一个拣选或还原操作已在进行"
+
+#: sequencer.c:1102
+msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
+
+#: sequencer.c:1106
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr "不能创建序列目录 '%s'"
+
+#: sequencer.c:1120
+msgid "could not lock HEAD"
+msgstr "不能锁定 HEAD"
+
+#: sequencer.c:1151 sequencer.c:1289
+msgid "no cherry-pick or revert in progress"
+msgstr "拣选或还原操作并未进行"
+
+#: sequencer.c:1153
+msgid "cannot resolve HEAD"
+msgstr "不能解析 HEAD"
+
+#: sequencer.c:1155 sequencer.c:1189
+msgid "cannot abort from a branch yet to be born"
+msgstr "不能从尚未建立的分支终止"
+
+#: sequencer.c:1175 builtin/grep.c:578
+#, c-format
+msgid "cannot open '%s'"
+msgstr "不能打开 '%s'"
+
+#: sequencer.c:1177
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "不能读取 '%s'：%s"
+
+#: sequencer.c:1178
+msgid "unexpected end of file"
+msgstr "意外的文件结束"
+
+#: sequencer.c:1184
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
+
+#: sequencer.c:1354
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s：不能拣选一个%s"
+
+#: sequencer.c:1358
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s：错误的版本"
+
+#: sequencer.c:1391
+msgid "can't revert as initial commit"
+msgstr "不能作为初始提交回退"
+
+#: setup.c:160
+#, 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 <command> -- <path>...' 来指定本地不存在的路径。"
+
+#: setup.c:173
+#, 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 <command> [<revision>...] -- [<file>...]'"
+
+#: setup.c:223
+#, 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 <command> [<revision>...] -- [<file>...]'"
+
+#: setup.c:468
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "期望 git 仓库版本 <= %d，却得到 %d"
+
+#: setup.c:476
+msgid "unknown repository extensions found:"
+msgstr "发现未知的仓库扩展："
+
+#: setup.c:762
+#, c-format
+msgid "Not a git repository (or any of the parent directories): %s"
+msgstr "不是一个 git 仓库（或者任何父目录）：%s"
+
+#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
+msgid "Cannot come back to cwd"
+msgstr "无法返回当前工作目录"
+
+#: setup.c:845
+msgid "Unable to read current working directory"
+msgstr "不能读取当前工作目录"
+
+#: setup.c:920
+#, 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:927
+#, c-format
+msgid "Cannot change to '%s/..'"
+msgstr "不能切换到 '%s/..'"
+
+#: setup.c:989
+#, 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"
+"文件属主必须始终拥有读写权限。"
+
+#: sha1_file.c:473
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "路径 '%s' 不存在"
+
+#: sha1_file.c:499
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
+
+#: sha1_file.c:505
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "参考仓库 '%s' 不是一个本地仓库。"
+
+#: sha1_file.c:511
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "参考仓库 '%s' 是一个浅克隆"
+
+#: sha1_file.c:519
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "参考仓库 '%s' 已被嫁接"
+
+#: sha1_file.c:1159
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "偏移量在包文件结束之前（损坏的 .idx？）"
+
+#: sha1_file.c:2592
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"
+
+#: sha1_file.c:2596
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"
+
+#: sha1_name.c:407
+#, c-format
+msgid "short SHA1 %s is ambiguous"
+msgstr "歧义的短 SHA1 %s"
+
+#: sha1_name.c:418
+msgid "The candidates are:"
+msgstr "候选者有："
+
+#: sha1_name.c:578
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+" git checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
+msgstr ""
+"Git 通常不会创建一个以40位十六进制字符命名的引用，因为当你提供40位\n"
+"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如：\n"
+"\n"
+" git checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用，\n"
+"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
+"命令关闭本消息通知。"
+
+#: submodule.c:64 submodule.c:98
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr "无法修改未合并的 .gitmodules，先解决合并冲突"
+
+#: submodule.c:68 submodule.c:102
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
+
+#: submodule.c:76
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "不能更新 .gitmodules 条目 %s"
+
+#: submodule.c:109
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "无法移除 %s 的 .gitmodules 条目"
+
+#: submodule.c:120
+msgid "staging updated .gitmodules failed"
+msgstr "将更新后 .gitmodules 添加暂存区失败"
+
+#: submodule.c:158
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "submodule.fetchJobs 不允许为负值"
+
+#: submodule-config.c:358
+#, c-format
+msgid "invalid value for %s"
+msgstr "%s 的值无效"
+
+#: trailer.c:238
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "执行 trailer 命令 '%s' 失败"
+
+#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537
+#: trailer.c:541
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr "键 '%2$s' 的未知取值 '%1$s'"
+
+#: trailer.c:523 trailer.c:528 builtin/remote.c:289
+#, c-format
+msgid "more than one %s"
+msgstr "多于一个 %s"
+
+#: trailer.c:672
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "签名 '%.*s' 的键为空"
+
+#: trailer.c:695
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "不能读取输入文件 '%s'"
+
+#: trailer.c:698
+msgid "could not read from stdin"
+msgstr "不能自标准输入读取"
+
+#: trailer.c:929 builtin/am.c:44
+#, c-format
+msgid "could not stat %s"
+msgstr "不能获取 %s 的文件状态"
+
+#: trailer.c:931
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "文件 %s 不是一个正规文件"
+
+#: trailer.c:933
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "文件 %s 用户不可写"
+
+#: trailer.c:945
+msgid "could not open temporary file"
+msgstr "不能打开临时文件"
+
+#: trailer.c:983
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "不能重命名临时文件为 %s"
+
+#: transport.c:62
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
+
+#: transport.c:151
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "传输：无效的深度选项 '%s'"
+
+#: transport.c:817
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n"
+
+#: transport.c:821
+#, 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:829
+msgid "Aborting."
+msgstr "正在终止。"
+
+#: transport-helper.c:1075
+#, c-format
+msgid "Could not read ref %s"
+msgstr "不能读取引用 %s"
+
+#: tree-walk.c:31
+msgid "too-short tree object"
+msgstr "太短的树对象"
+
+#: tree-walk.c:37
+msgid "malformed mode in tree entry"
+msgstr "树对象中的条目属性错误"
+
+#: tree-walk.c:41
+msgid "empty filename in tree entry"
+msgstr "树对象条目中空的文件名"
+
+#: tree-walk.c:113
+msgid "too-short tree file"
+msgstr "太短的树文件"
+
+#: unpack-trees.c:64
+#, 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:66
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"您对下列文件的本地修改将被检出操作覆盖：\n"
+"%%s"
+
+#: unpack-trees.c:69
+#, 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:71
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"您对下列文件的本地修改将被合并操作覆盖：\n"
+"%%s"
+
+#: unpack-trees.c:74
+#, 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 之前提交您的修改或者保存进度。"
-#: wt-status.c:1464
-msgid "On branch "
-msgstr "位于分支 "
+#: unpack-trees.c:76
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"您对下列文件的本地修改将被 %s 覆盖：\n"
+"%%s"
-#: wt-status.c:1470
-msgid "interactive rebase in progress; onto "
-msgstr "交互式变基操作正在进行中；至 "
+#: unpack-trees.c:81
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in it:\n"
+"%s"
+msgstr ""
+"更新如下目录将会丢失其中未跟踪的文件：\n"
+"%s"
-#: wt-status.c:1472
-msgid "rebase in progress; onto "
-msgstr "变基操作正在进行中；至 "
+#: unpack-trees.c:85
+#, 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请在切换分支之前移动或删除。"
-#: wt-status.c:1477
-msgid "HEAD detached at "
-msgstr "头指针分离于 "
+#: unpack-trees.c:87
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
+"%%s"
-#: wt-status.c:1479
-msgid "HEAD detached from "
-msgstr "头指针分离自 "
+#: unpack-trees.c:90
+#, 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请在合并前移动或删除。"
-#: wt-status.c:1482
-msgid "Not currently on any branch."
-msgstr "当前不在任何分支上。"
+#: unpack-trees.c:92
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
+"%%s"
-#: wt-status.c:1500
-msgid "Initial commit"
-msgstr "初始提交"
+#: unpack-trees.c:95
+#, 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 前移动或删除。"
-#: wt-status.c:1514
-msgid "Untracked files"
-msgstr "未跟踪的文件"
+#: unpack-trees.c:97
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
+"%%s"
-#: wt-status.c:1516
-msgid "Ignored files"
-msgstr "忽略的文件"
+#: unpack-trees.c:102
+#, 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请在切换分支前移动或删除。"
-#: wt-status.c:1520
+#: unpack-trees.c:104
#, 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')."
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
msgstr ""
-"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"
-"但您需要小心不要忘了添加新文件（参见 'git help status'）。"
+"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
+"%%s"
-#: wt-status.c:1526
+#: unpack-trees.c:107
#, c-format
-msgid "Untracked files not listed%s"
-msgstr "未跟踪的文件没有列出%s"
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
+"%%s请在合并前移动或删除。"
-# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1528
-msgid " (use -u option to show untracked files)"
-msgstr "（使用 -u 参数显示未跟踪的文件）"
+#: unpack-trees.c:109
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
+"%%s"
-#: wt-status.c:1534
-msgid "No changes"
-msgstr "没有修改"
+#: unpack-trees.c:112
+#, 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 前移动或删除。"
-#: wt-status.c:1539
+#: unpack-trees.c:114
#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
-msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
+"%%s"
-#: wt-status.c:1542
+#: unpack-trees.c:121
#, c-format
-msgid "no changes added to commit\n"
-msgstr "修改尚未加入提交\n"
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
-#: wt-status.c:1545
+#: unpack-trees.c:124
#, c-format
msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
-msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
+msgstr ""
+"无法更新稀疏检出：如下条目不是最新：\n"
+"%s"
-#: wt-status.c:1548
+#: unpack-trees.c:126
#, c-format
-msgid "nothing added to commit but untracked files present\n"
-msgstr "提交为空，但是存在尚未跟踪的文件\n"
+msgid ""
+"The following working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"工作区中下列文件将被稀疏检出更新所覆盖：\n"
+"%s"
-# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1551
+#: unpack-trees.c:128
#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
-msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"
+msgid ""
+"The following working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"工作区中下列文件将被稀疏检出更新所删除：\n"
+"%s"
-#: wt-status.c:1554 wt-status.c:1559
+#: unpack-trees.c:205
#, c-format
-msgid "nothing to commit\n"
-msgstr "无文件要提交\n"
+msgid "Aborting\n"
+msgstr "终止中\n"
-# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1557
-#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
-msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"
+#: unpack-trees.c:237
+msgid "Checking out files"
+msgstr "正在检出文件"
-# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1561
+#: urlmatch.c:120
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
+
+#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
#, c-format
-msgid "nothing to commit, working tree clean\n"
-msgstr "æ\97 æ\96\87件è¦\81æ\8f\90交ï¼\8cå¹²å\87\80ç\9a\84å·¥ä½\9cå\8cº\n"
+msgid "invalid %XX escape sequence"
+msgstr "æ\97 æ\95\88ç\9a\84 %XX 转ä¹\89åº\8få\88\97"
-# 译者：注意保持句尾空格
-#: wt-status.c:1668
-msgid "Initial commit on "
-msgstr "初始提交于 "
+#: urlmatch.c:172
+msgid "missing host and scheme is not 'file:'"
+msgstr "缺失主机名且 URL 方案不是 'file:'"
-#: wt-status.c:1672
-msgid "HEAD (no branch)"
-msgstr "HEAD（非分支）"
+#: urlmatch.c:189
+msgid "a 'file:' URL may not have a port number"
+msgstr "一个 'file:' URL 不应该包含端口号"
-#: wt-status.c:1701
-msgid "gone"
-msgstr "丢失"
+#: urlmatch.c:199
+msgid "invalid characters in host name"
+msgstr "主æ\9cºå\90\8dä¸å\8c\85å\90«æ\97 æ\95\88ç\9a\84å\97符"
-# 译者：注意保持句尾空格
-#: wt-status.c:1703 wt-status.c:1711
-msgid "behind "
-msgstr "落后 "
+#: urlmatch.c:244 urlmatch.c:255
+msgid "invalid port number"
+msgstr "无效的端口号"
-#: wt-status.c:1706 wt-status.c:1709
-msgid "ahead "
-msgstr "领先 "
+#: urlmatch.c:322
+msgid "invalid '..' path segment"
+msgstr "无效的 '..' 路径片段"
-#: compat/precompose_utf8.c:57 builtin/clone.c:415
+#: worktree.c:282
#, c-format
-msgid "failed to unlink '%s'"
-msgstr "无法删除 '%s'"
-
-#: builtin/add.c:22
-msgid "git add [<options>] [--] <pathspec>..."
-msgstr "git add [<选项>] [--] <路径规格>..."
+msgid "failed to read '%s'"
+msgstr "无法读取 '%s'"
-#: builtin/add.c:65
+#: wrapper.c:222 wrapper.c:392
#, c-format
-msgid "unexpected diff status %c"
-msgstr "æ\84\8få¤\96ç\9a\84å·®å¼\82ç\8a¶æ\80\81 %c"
+msgid "could not open '%s' for reading and writing"
+msgstr "æ\97 æ³\95æ\89\93å¼\80 '%s' è¿\9bè¡\8c读å\86\99"
-#: builtin/add.c:71 builtin/commit.c:281
-msgid "updating files failed"
-msgstr "更新文件失败"
+#: wrapper.c:224 wrapper.c:394 builtin/am.c:766
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "无法打开 '%s' 进行写入"
-#: builtin/add.c:81
+#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
+#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029
+#: builtin/pull.c:341
#, c-format
-msgid "remove '%s'\n"
-msgstr "删除 '%s'\n"
+msgid "could not open '%s' for reading"
+msgstr "无法打开 '%s' 进行读取"
-#: builtin/add.c:136
-msgid "Unstaged changes after refreshing the index:"
-msgstr "刷新索引之后尚未被暂存的变更："
+#: wrapper.c:605 wrapper.c:626
+#, c-format
+msgid "unable to access '%s'"
+msgstr "不能访问 '%s'"
-#: builtin/add.c:196 builtin/rev-parse.c:811
-msgid "Could not read the index"
-msgstr "ä¸\8dè\83½è¯»å\8f\96ç´¢å¼\95"
+#: wrapper.c:634
+msgid "unable to get current working directory"
+msgstr "ä¸\8dè\83½è\8e·å\8f\96å½\93å\89\8då·¥ä½\9cç\9b®å½\95"
-#: builtin/add.c:207
+#: wrapper.c:658
#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "无法打开 '%s' 进行写入。"
+msgid "could not write to %s"
+msgstr "不能写入 %s"
-#: builtin/add.c:211
-msgid "Could not write patch"
-msgstr "不能生成补丁"
+#: wrapper.c:660
+#, c-format
+msgid "could not close %s"
+msgstr "不能关闭 %s"
-#: builtin/add.c:214
-msgid "editing patch failed"
-msgstr "编辑补丁失败"
+#: wt-status.c:151
+msgid "Unmerged paths:"
+msgstr "未合并的路径："
-#: builtin/add.c:217
+# 译者：注意保持前导空格
+#: wt-status.c:178 wt-status.c:205
#, c-format
-msgid "Could not stat '%s'"
-msgstr "不能查看文件状态 '%s'"
+msgid " (use \"git reset %s <file>...\" to unstage)"
+msgstr " （使用 \"git reset %s <文件>...\" 以取消暂存）"
-#: builtin/add.c:219
-msgid "Empty patch. Aborted."
-msgstr "空补丁。异常终止。"
+# 译者：注意保持前导空格
+#: wt-status.c:180 wt-status.c:207
+msgid " (use \"git rm --cached <file>...\" to unstage)"
+msgstr " （使用 \"git rm --cached <文件>...\" 以取消暂存）"
-#: builtin/add.c:224
-#, c-format
-msgid "Could not apply '%s'"
-msgstr "不能应用 '%s'"
+# 译者：注意保持前导空格
+#: wt-status.c:184
+msgid " (use \"git add <file>...\" to mark resolution)"
+msgstr " （使用 \"git add <文件>...\" 标记解决方案）"
-#: builtin/add.c:234
-msgid "The following paths are ignored by one of your .gitignore files:\n"
-msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
+# 译者：注意保持前导空格
+#: wt-status.c:186 wt-status.c:190
+msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）"
-#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521
-#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162
-msgid "dry run"
-msgstr "演习"
+# 译者：注意保持前导空格
+#: wt-status.c:188
+msgid " (use \"git rm <file>...\" to mark resolution)"
+msgstr " （使用 \"git rm <文件>...\" 标记解决方案）"
-#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19
-#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593
-#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114
-msgid "be verbose"
-msgstr "冗长输出"
+#: wt-status.c:199 wt-status.c:945
+msgid "Changes to be committed:"
+msgstr "要提交的变更："
-#: builtin/add.c:256
-msgid "interactive picking"
-msgstr "交互式拣选"
+#: wt-status.c:217 wt-status.c:954
+msgid "Changes not staged for commit:"
+msgstr "尚未暂存以备提交的变更："
-#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286
-msgid "select hunks interactively"
-msgstr "交互式挑选数据块"
+# 译者：注意保持前导空格
+#: wt-status.c:221
+msgid " (use \"git add <file>...\" to update what will be committed)"
+msgstr " （使用 \"git add <文件>...\" 更新要提交的内容）"
-#: builtin/add.c:258
-msgid "edit current diff and apply"
-msgstr "编辑当前差异并应用"
+# 译者：注意保持前导空格
+#: wt-status.c:223
+msgid " (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr " （使用 \"git add/rm <文件>...\" 更新要提交的内容）"
-#: builtin/add.c:259
-msgid "allow adding otherwise ignored files"
-msgstr "允许添加忽略的文件"
+# 译者：注意保持前导空格
+#: wt-status.c:224
+msgid ""
+" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+msgstr " （使用 \"git checkout -- <文件>...\" 丢弃工作区的改动）"
-#: builtin/add.c:260
-msgid "update tracked files"
-msgstr "更新已跟踪的文件"
+# 译者：注意保持前导空格
+#: wt-status.c:226
+msgid " (commit or discard the untracked or modified content in submodules)"
+msgstr " （提交或丢弃子模组中未跟踪或修改的内容）"
-#: builtin/add.c:261
-msgid "record only the fact that the path will be added later"
-msgstr "只记录，该路径稍后再添加"
+# 译者：注意保持前导空格
+#: wt-status.c:238
+#, c-format
+msgid " (use \"git %s <file>...\" to include in what will be committed)"
+msgstr " （使用 \"git %s <文件>...\" 以包含要提交的内容）"
-#: builtin/add.c:262
-msgid "add changes from all tracked and untracked files"
-msgstr "添加所有改变的已跟踪文件和未跟踪文件"
+#: wt-status.c:253
+msgid "both deleted:"
+msgstr "双方删除："
-#: builtin/add.c:265
-msgid "ignore paths removed in the working tree (same as --no-all)"
-msgstr "忽略工作区中移除的路径（和 --no-all 相同）"
+#: wt-status.c:255
+msgid "added by us:"
+msgstr "由我们添加："
-#: builtin/add.c:267
-msgid "don't add, only refresh the index"
-msgstr "不添加，只刷新索引"
+#: wt-status.c:257
+msgid "deleted by them:"
+msgstr "由他们删除："
-#: builtin/add.c:268
-msgid "just skip files which cannot be added because of errors"
-msgstr "跳过因出错不能添加的文件"
+#: wt-status.c:259
+msgid "added by them:"
+msgstr "由他们添加："
-#: builtin/add.c:269
-msgid "check if - even missing - files are ignored in dry run"
-msgstr "检查在演习模式下文件（即使不存在）是否被忽略"
+#: wt-status.c:261
+msgid "deleted by us:"
+msgstr "由我们删除："
-#: builtin/add.c:270 builtin/update-index.c:958
-msgid "(+/-)x"
-msgstr "(+/-)x"
+#: wt-status.c:263
+msgid "both added:"
+msgstr "双方添加："
-#: builtin/add.c:270 builtin/update-index.c:959
-msgid "override the executable bit of the listed files"
-msgstr "覆盖列表里文件的可执行位"
+#: wt-status.c:265
+msgid "both modified:"
+msgstr "双方修改："
-#: builtin/add.c:292
-#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "使用 -f 参数如果您确实要添加它们。\n"
+#: wt-status.c:275
+msgid "new file:"
+msgstr "新文件："
-#: builtin/add.c:300
-msgid "adding files failed"
-msgstr "æ·»å\8a æ\96\87件失败"
+#: wt-status.c:277
+msgid "copied:"
+msgstr "æ\8b·è´\9dï¼\9a"
-#: builtin/add.c:336
-msgid "-A and -u are mutually incompatible"
-msgstr "-A 和 -u 选项互斥"
+#: wt-status.c:279
+msgid "deleted:"
+msgstr "删除："
-#: builtin/add.c:343
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
+#: wt-status.c:281
+msgid "modified:"
+msgstr "修改："
-#: builtin/add.c:352
-#, c-format
-msgid "--chmod param '%s' must be either -x or +x"
-msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
+#: wt-status.c:283
+msgid "renamed:"
+msgstr "重命名："
-#: builtin/add.c:367
-#, c-format
-msgid "Nothing specified, nothing added.\n"
-msgstr "没有指定文件，也没有文件被添加。\n"
+#: wt-status.c:285
+msgid "typechange:"
+msgstr "类型变更："
-#: builtin/add.c:368
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "也许您想要执行 'git add .'？\n"
+#: wt-status.c:287
+msgid "unknown:"
+msgstr "未知："
-#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279
-#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340
-#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:240
-msgid "index file corrupt"
-msgstr "索引文件损坏"
+#: wt-status.c:289
+msgid "unmerged:"
+msgstr "未合并："
-#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431
-msgid "Unable to write new index file"
-msgstr "无法写入新索引文件"
+# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
+#: wt-status.c:371
+msgid "new commits, "
+msgstr "新提交, "
-#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032
-#, c-format
-msgid "could not read '%s'"
-msgstr "ä¸\8dè\83½è¯»å\8f\96 '%s'"
+# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
+#: wt-status.c:373
+msgid "modified content, "
+msgstr "ä¿®æ\94¹ç\9a\84å\86\85容, "
-#: builtin/am.c:426
-msgid "could not parse author script"
-msgstr "不能解析作者脚本"
+# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
+#: wt-status.c:375
+msgid "untracked content, "
+msgstr "未跟踪的内容, "
-#: builtin/am.c:503
-#, c-format
-msgid "'%s' was deleted by the applypatch-msg hook"
-msgstr "'%s' 被 applypatch-msg 钩子删除"
+#: wt-status.c:818
+msgid "Submodules changed but not updated:"
+msgstr "子模组已修改但尚未更新："
-#: builtin/am.c:544 builtin/notes.c:301
-#, c-format
-msgid "Malformed input line: '%s'."
-msgstr "非法的输入行：'%s'。"
+#: wt-status.c:820
+msgid "Submodule changes to be committed:"
+msgstr "要提交的子模组变更："
-#: builtin/am.c:581 builtin/notes.c:316
-#, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
-msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
+#: wt-status.c:901
+msgid ""
+"Do not touch the line above.\n"
+"Everything below will be removed."
+msgstr ""
+"不要改动上面的一行。\n"
+"下面的所有内容均将被删除。"
-#: builtin/am.c:607
-msgid "fseek failed"
-msgstr "fseek 失败"
+#: wt-status.c:1013
+msgid "You have unmerged paths."
+msgstr "您有尚未合并的路径。"
-#: builtin/am.c:787
-#, c-format
-msgid "could not parse patch '%s'"
-msgstr "无法解析补丁 '%s'"
+# 译者：注意保持前导空格
+#: wt-status.c:1016
+msgid " (fix conflicts and run \"git commit\")"
+msgstr " （解决冲突并运行 \"git commit\"）"
-#: builtin/am.c:852
-msgid "Only one StGIT patch series can be applied at once"
-msgstr "一次只能有一个 StGIT 补丁队列被应用"
+# 译者：注意保持前导空格
+#: wt-status.c:1018
+msgid " (use \"git merge --abort\" to abort the merge)"
+msgstr " （使用 \"git merge --abort\" 终止合并）"
-#: builtin/am.c:899
-msgid "invalid timestamp"
-msgstr "æ\97 æ\95\88ç\9a\84æ\97¶é\97´æ\88³"
+#: wt-status.c:1023
+msgid "All conflicts fixed but you are still merging."
+msgstr "æ\89\80æ\9c\89å\86²çª\81已解å\86³ä½\86æ\82¨ä»\8då¤\84äº\8eå\90\88并ä¸ã\80\82"
-#: builtin/am.c:902 builtin/am.c:910
-msgid "invalid Date line"
-msgstr "无效的日期行"
+# 译者：注意保持前导空格
+#: wt-status.c:1026
+msgid " (use \"git commit\" to conclude merge)"
+msgstr " （使用 \"git commit\" 结束合并）"
-#: builtin/am.c:907
-msgid "invalid timezone offset"
-msgstr "æ\97 æ\95\88ç\9a\84æ\97¶å\8cºå\81\8f移å\80¼"
+#: wt-status.c:1036
+msgid "You are in the middle of an am session."
+msgstr "æ\82¨æ£å¤\84äº\8e am æ\93\8dä½\9cè¿\87ç¨\8bä¸ã\80\82"
-#: builtin/am.c:996
-msgid "Patch format detection failed."
-msgstr "补丁格式检测失败。"
+#: wt-status.c:1039
+msgid "The current patch is empty."
+msgstr "当前的补丁为空。"
-#: builtin/am.c:1001 builtin/clone.c:380
-#, c-format
-msgid "failed to create directory '%s'"
-msgstr "无法创建目录 '%s'"
+# 译者：注意保持前导空格
+#: wt-status.c:1043
+msgid " (fix conflicts and then run \"git am --continue\")"
+msgstr " （解决冲突，然后运行 \"git am --continue\"）"
-#: builtin/am.c:1005
-msgid "Failed to split patches."
-msgstr "无法拆分补丁。"
+# 译者：注意保持前导空格
+#: wt-status.c:1045
+msgid " (use \"git am --skip\" to skip this patch)"
+msgstr " （使用 \"git am --skip\" 跳过此补丁）"
-#: builtin/am.c:1137 builtin/commit.c:366
-msgid "unable to write index file"
-msgstr "无法写入索引文件"
+# 译者：注意保持前导空格
+#: wt-status.c:1047
+msgid " (use \"git am --abort\" to restore the original branch)"
+msgstr " （使用 \"git am --abort\" 恢复原有分支）"
-#: builtin/am.c:1188
-#, c-format
-msgid "When you have resolved this problem, run \"%s --continue\"."
-msgstr "当您解决这一问题，执行 \"%s --continue\"。"
+#: wt-status.c:1172
+msgid "No commands done."
+msgstr "没有命令被执行。"
-#: builtin/am.c:1189
+#: wt-status.c:1175
#, c-format
-msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
-msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。"
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] "最后一条命令已完成（%d 条命令被执行）："
+msgstr[1] "最后的命令已完成（%d 条命令被执行）："
-#: builtin/am.c:1190
+#: wt-status.c:1186
#, c-format
-msgid "To restore the original branch and stop patching, run \"%s --abort\"."
-msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。"
+msgid " (see more in file %s)"
+msgstr " （更多参见文件 %s）"
-#: builtin/am.c:1328
-msgid "Patch is empty. Was it split wrong?"
-msgstr "补丁为空。是不是切分错误？"
+#: wt-status.c:1191
+msgid "No commands remaining."
+msgstr "未剩下任何命令。"
-#: builtin/am.c:1402 builtin/log.c:1543
+#: wt-status.c:1194
#, c-format
-msgid "invalid ident line: %s"
-msgstr "包含无效的身份标识：%s"
+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:1202
+msgid " (use \"git rebase --edit-todo\" to view and edit)"
+msgstr " （使用 \"git rebase --edit-todo\" 来查看和编辑）"
-#: builtin/am.c:1429
+#: wt-status.c:1215
#, c-format
-msgid "unable to parse commit %s"
-msgstr "不能解析提交 %s"
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
-#: builtin/am.c:1602
-msgid "Repository lacks necessary blobs to fall back on 3-way merge."
-msgstr "仓库缺乏必要的数据对象以进行三方合并。"
+#: wt-status.c:1220
+msgid "You are currently rebasing."
+msgstr "您在执行变基操作。"
-#: builtin/am.c:1604
-msgid "Using index info to reconstruct a base tree..."
-msgstr "使用索引来重建一个（三方合并的）基础目录树..."
+# 译者：注意保持前导空格
+#: wt-status.c:1234
+msgid " (fix conflicts and then run \"git rebase --continue\")"
+msgstr " （解决冲突，然后运行 \"git rebase --continue\"）"
-#: builtin/am.c:1623
-msgid ""
-"Did you hand edit your patch?\n"
-"It does not apply to blobs recorded in its index."
-msgstr ""
-"您是否曾手动编辑过您的补丁？\n"
-"无法应用补丁到索引中的数据对象上。"
+# 译者：注意保持前导空格
+#: wt-status.c:1236
+msgid " (use \"git rebase --skip\" to skip this patch)"
+msgstr " （使用 \"git rebase --skip\" 跳过此补丁）"
-#: builtin/am.c:1629
-msgid "Falling back to patching base and 3-way merge..."
-msgstr "回落到基础版本上打补丁及进行三方合并..."
+# 译者：注意保持前导空格
+#: wt-status.c:1238
+msgid " (use \"git rebase --abort\" to check out the original branch)"
+msgstr " （使用 \"git rebase --abort\" 以检出原有分支）"
-#: builtin/am.c:1654
-msgid "Failed to merge in the changes."
-msgstr "无法合并变更。"
+# 译者：注意保持前导空格
+#: wt-status.c:1244
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
+msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）"
-#: builtin/am.c:1679 builtin/merge.c:628
-msgid "git write-tree failed to write a tree"
-msgstr "git write-tree 无法写入一树对象"
+#: wt-status.c:1248
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
-#: builtin/am.c:1686
-msgid "applying to an empty history"
-msgstr "æ£åº\94ç\94¨å\88°ä¸\80个空å\8e\86å\8f²ä¸\8a"
+#: wt-status.c:1253
+msgid "You are currently splitting a commit during a rebase."
+msgstr "æ\82¨å\9c¨æ\89§è¡\8cå\8f\98å\9fºæ\93\8dä½\9cæ\97¶æ\8b\86å\88\86æ\8f\90交ã\80\82"
-#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798
-#: builtin/merge.c:823
-msgid "failed to write commit object"
-msgstr "无法写提交对象"
+# 译者：注意保持前导空格
+#: wt-status.c:1256
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"
-#: builtin/am.c:1731 builtin/am.c:1735
+#: wt-status.c:1260
#, c-format
-msgid "cannot resume: %s does not exist."
-msgstr "æ\97 æ³\95继ç»ï¼\9a%s ä¸\8då\98å\9c¨。"
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr "æ\82¨å\9c¨æ\89§è¡\8cå°\86å\88\86æ\94¯ '%s' å\8f\98å\9fºå\88° '%s' ç\9a\84æ\93\8dä½\9cæ\97¶ç¼\96è¾\91æ\8f\90交。"
-#: builtin/am.c:1751
-msgid "cannot be interactive without stdin connected to a terminal."
-msgstr "æ \87å\87\86è¾\93å\85¥æ²¡æ\9c\89å\92\8cç»\88端å\85³è\81\94ï¼\8cä¸\8dè\83½è¿\9bè¡\8c交äº\92å¼\8fæ\93\8dä½\9c。"
+#: wt-status.c:1265
+msgid "You are currently editing a commit during a rebase."
+msgstr "æ\82¨å\9c¨æ\89§è¡\8cå\8f\98å\9fºæ\93\8dä½\9cæ\97¶ç¼\96è¾\91æ\8f\90交。"
-#: builtin/am.c:1756
-msgid "Commit Body is:"
-msgstr "提交内容为："
+# 译者：注意保持前导空格
+#: wt-status.c:1268
+msgid " (use \"git commit --amend\" to amend the current commit)"
+msgstr " （使用 \"git commit --amend\" 修补当前提交）"
-# 译者：注意保持句尾空格
-#. 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:1766
-msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
-msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]："
+# 译者：注意保持前导空格
+#: wt-status.c:1270
+msgid ""
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"
-#: builtin/am.c:1816
+#: wt-status.c:1280
#, c-format
-msgid "Dirty index: cannot apply patches (dirty: %s)"
-msgstr "脏索引：不能应用补丁（脏文件：%s）"
+msgid "You are currently cherry-picking commit %s."
+msgstr "您在执行拣选提交 %s 的操作。"
-#: builtin/am.c:1853 builtin/am.c:1925
-#, c-format
-msgid "Applying: %.*s"
-msgstr "应用：%.*s"
+# 译者：注意保持前导空格
+#: wt-status.c:1285
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）"
-#: builtin/am.c:1869
-msgid "No changes -- Patch already applied."
-msgstr "没有变更 —— 补丁已经应用过。"
+# 译者：注意保持前导空格
+#: wt-status.c:1288
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）"
-#: builtin/am.c:1877
-#, c-format
-msgid "Patch failed at %s %.*s"
-msgstr "打补丁失败于 %s %.*s"
+# 译者：注意保持前导空格
+#: wt-status.c:1290
+msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）"
-#: builtin/am.c:1883
+#: wt-status.c:1299
#, c-format
-msgid "The copy of the patch that failed is found in: %s"
-msgstr "失败的补丁文件副本位于：%s"
-
-#: builtin/am.c:1928
-msgid ""
-"No changes - did you forget to use 'git add'?\n"
-"If there is nothing left to stage, chances are that something else\n"
-"already introduced the same changes; you might want to skip this patch."
-msgstr ""
-"没有变更 —— 您是不是忘了执行 'git add'？\n"
-"如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"
-"您也许想要跳过这个补丁。"
-
-#: builtin/am.c:1935
-msgid ""
-"You still have unmerged paths in your index.\n"
-"Did you forget to use 'git add'?"
-msgstr ""
-"您的索引中仍有未合并的路径。\n"
-"您是否忘了执行 'git add'？"
+msgid "You are currently reverting commit %s."
+msgstr "您在执行反转提交 %s 的操作。"
-#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308
-#: builtin/reset.c:316
-#, c-format
-msgid "Could not parse object '%s'."
-msgstr "不能解析对象 '%s'。"
+# 译者：注意保持前导空格
+#: wt-status.c:1304
+msgid " (fix conflicts and run \"git revert --continue\")"
+msgstr " （解决冲突并运行 \"git revert --continue\"）"
-#: builtin/am.c:2095
-msgid "failed to clean index"
-msgstr "无法清空索引"
+# 译者：注意保持前导空格
+#: wt-status.c:1307
+msgid " (all conflicts fixed: run \"git revert --continue\")"
+msgstr " （所有冲突已解决：运行 \"git revert --continue\"）"
-#: builtin/am.c:2129
-msgid ""
-"You seem to have moved HEAD since the last 'am' failure.\n"
-"Not rewinding to ORIG_HEAD"
-msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
+# 译者：注意保持前导空格
+#: wt-status.c:1309
+msgid " (use \"git revert --abort\" to cancel the revert operation)"
+msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）"
-#: builtin/am.c:2192
+#: wt-status.c:1320
#, c-format
-msgid "Invalid value for --patch-format: %s"
-msgstr "æ\97 æ\95\88ç\9a\84 --patch-format å\80¼ï¼\9a%s"
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "æ\82¨å\9c¨æ\89§è¡\8cä»\8eå\88\86æ\94¯ '%s' å¼\80å§\8bç\9a\84äº\8cå\88\86æ\9f¥æ\89¾æ\93\8dä½\9cã\80\82"
-#: builtin/am.c:2225
-msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
-msgstr "git am [<选项>] [(<mbox>|<Maildir>)...]"
+#: wt-status.c:1324
+msgid "You are currently bisecting."
+msgstr "您在执行二分查找操作。"
-#: builtin/am.c:2226
-msgid "git am [<options>] (--continue | --skip | --abort)"
-msgstr "git am [<选项>] (--continue | --skip | --abort)"
+# 译者：注意保持前导空格
+#: wt-status.c:1327
+msgid " (use \"git bisect reset\" to get back to the original branch)"
+msgstr " （使用 \"git bisect reset\" 以回到原有分支）"
-#: builtin/am.c:2232
-msgid "run interactively"
-msgstr "以交äº\92å¼\8fæ\96¹å¼\8fè¿\90è¡\8c"
+#: wt-status.c:1524
+msgid "On branch "
+msgstr "ä½\8däº\8eå\88\86æ\94¯ "
-#: builtin/am.c:2234
-msgid "historical option -- no-op"
-msgstr "老的参数 —— 无作用"
+#: wt-status.c:1530
+msgid "interactive rebase in progress; onto "
+msgstr "交互式变基操作正在进行中；至 "
-#: builtin/am.c:2236
-msgid "allow fall back on 3way merging if needed"
-msgstr "å¦\82æ\9e\9cå¿\85è¦\81ï¼\8cå\85\81许使ç\94¨ä¸\89æ\96¹å\90\88并ã\80\82"
+#: wt-status.c:1532
+msgid "rebase in progress; onto "
+msgstr "å\8f\98å\9fºæ\93\8dä½\9cæ£å\9c¨è¿\9bè¡\8cä¸ï¼\9bè\87³ "
-#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57
-#: builtin/repack.c:172
-msgid "be quiet"
-msgstr "静默模式"
+#: wt-status.c:1537
+msgid "HEAD detached at "
+msgstr "头指针分离于 "
-#: builtin/am.c:2239
-msgid "add a Signed-off-by line to the commit message"
-msgstr "å\9c¨æ\8f\90交说æ\98\8eä¸æ·»å\8a ä¸\80个 Signed-off-by ç¾å\90\8d"
+#: wt-status.c:1539
+msgid "HEAD detached from "
+msgstr "头æ\8c\87é\92\88å\88\86离è\87ª "
-#: builtin/am.c:2242
-msgid "recode into utf8 (default)"
-msgstr "使用 utf8 字符集（默认）"
+#: wt-status.c:1542
+msgid "Not currently on any branch."
+msgstr "当前不在任何分支上。"
-#: builtin/am.c:2244
-msgid "pass -k flag to git-mailinfo"
-msgstr "å\90\91 git-mailinfo ä¼ é\80\92 -k å\8f\82æ\95°"
+#: wt-status.c:1560
+msgid "Initial commit"
+msgstr "å\88\9då§\8bæ\8f\90交"
-#: builtin/am.c:2246
-msgid "pass -b flag to git-mailinfo"
-msgstr "向 git-mailinfo 传递 -b 参数"
+#: wt-status.c:1574
+msgid "Untracked files"
+msgstr "未跟踪的文件"
-#: builtin/am.c:2248
-msgid "pass -m flag to git-mailinfo"
-msgstr "å\90\91 git-mailinfo ä¼ é\80\92 -m å\8f\82æ\95°"
+#: wt-status.c:1576
+msgid "Ignored files"
+msgstr "忽ç\95¥ç\9a\84æ\96\87件"
-#: builtin/am.c:2250
-msgid "pass --keep-cr flag to git-mailsplit for mbox format"
-msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"
+#: wt-status.c:1580
+#, 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'）。"
-#: builtin/am.c:2253
-msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
-msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"
+#: wt-status.c:1586
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "未跟踪的文件没有列出%s"
-#: builtin/am.c:2256
-msgid "strip everything before a scissors line"
-msgstr "丢弃裁切线前的所有内容"
+# 译者：中文字符串拼接，可删除前导空格
+#: wt-status.c:1588
+msgid " (use -u option to show untracked files)"
+msgstr "（使用 -u 参数显示未跟踪的文件）"
-#: builtin/am.c:2257 builtin/apply.c:4837
-msgid "action"
-msgstr "动作"
+#: wt-status.c:1594
+msgid "No changes"
+msgstr "没有修改"
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279
-#: builtin/am.c:2285
-msgid "pass it through git-apply"
-msgstr "传递给 git-apply"
+#: wt-status.c:1599
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"
-#: builtin/am.c:2266 builtin/apply.c:4861
-msgid "root"
-msgstr "根目录"
+#: wt-status.c:1602
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "修改尚未加入提交\n"
-#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799
-#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96
-#: builtin/pull.c:179 builtin/submodule--helper.c:277
-#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482
-#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823
-#: builtin/submodule--helper.c:826
-msgid "path"
-msgstr "路径"
+#: wt-status.c:1605
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"
-#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134
-#: builtin/pull.c:193 builtin/repack.c:181 builtin/repack.c:185
-#: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
-#: parse-options.h:132 parse-options.h:134 parse-options.h:244
-msgid "n"
-msgstr "n"
+#: wt-status.c:1608
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
+msgstr "提交为空，但是存在尚未跟踪的文件\n"
-#: builtin/am.c:2278 builtin/apply.c:4805
-msgid "num"
-msgstr "数字"
+# 译者：中文字符串拼接，可删除前导空格
+#: wt-status.c:1611
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"
-#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438
-#: builtin/tag.c:372
-msgid "format"
-msgstr "格式"
+#: wt-status.c:1614 wt-status.c:1619
+#, c-format
+msgid "nothing to commit\n"
+msgstr "无文件要提交\n"
+
+# 译者：中文字符串拼接，可删除前导空格
+#: wt-status.c:1617
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"
-#: builtin/am.c:2282
-msgid "format the patch(es) are in"
-msgstr "补丁的格式"
+# 译者：中文字符串拼接，可删除前导空格
+#: wt-status.c:1621
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr "无文件要提交，干净的工作区\n"
-#: builtin/am.c:2288
-msgid "override error message when patch failure occurs"
-msgstr "打补丁失败时显示的错误信息"
+# 译者：注意保持句尾空格
+#: wt-status.c:1728
+msgid "Initial commit on "
+msgstr "初始提交于 "
-#: builtin/am.c:2290
-msgid "continue applying patches after resolving a conflict"
-msgstr "冲突解决后继续应用补丁"
+#: wt-status.c:1732
+msgid "HEAD (no branch)"
+msgstr "HEAD（非分支）"
-#: builtin/am.c:2293
-msgid "synonyms for --continue"
-msgstr "和 --continue 同义"
+#: wt-status.c:1761
+msgid "gone"
+msgstr "丢失"
-#: builtin/am.c:2296
-msgid "skip the current patch"
-msgstr "跳过当前补丁"
+# 译者：注意保持句尾空格
+#: wt-status.c:1763 wt-status.c:1771
+msgid "behind "
+msgstr "落后 "
-#: builtin/am.c:2299
-msgid "restore the original branch and abort the patching operation."
-msgstr "恢复原始分支并终止打补丁操作。"
+#: wt-status.c:1766 wt-status.c:1769
+msgid "ahead "
+msgstr "领先 "
-#: builtin/am.c:2303
-msgid "lie about committer date"
-msgstr "将作者日期作为提交日期"
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2270
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "不能%s：您有未暂存的变更。"
-#: builtin/am.c:2305
-msgid "use current timestamp for author date"
-msgstr "用当前时间作为作者日期"
+#: wt-status.c:2276
+msgid "additionally, your index contains uncommitted changes."
+msgstr "而且您的索引中包含未提交的变更。"
-#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229
-#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
-msgid "key-id"
-msgstr "key-id"
+#: wt-status.c:2278
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "不能%s：您的索引中包含未提交的变更。"
-#: builtin/am.c:2308
-msgid "GPG-sign commits"
-msgstr "使用 GPG 签名提交"
+#: compat/precompose_utf8.c:57 builtin/clone.c:414
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "无法删除 '%s'"
-#: builtin/am.c:2311
-msgid "(internal use for git-rebase)"
-msgstr "（内部使用，用于 git-rebase）"
+#: builtin/add.c:22
+msgid "git add [<options>] [--] <pathspec>..."
+msgstr "git add [<选项>] [--] <路径规格>..."
-#: builtin/am.c:2326
-msgid ""
-"The -b/--binary option has been a no-op for long time, and\n"
-"it will be removed. Please do not use it anymore."
-msgstr ""
-"参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n"
-"请不要再使用它了。"
+#: builtin/add.c:80
+#, c-format
+msgid "unexpected diff status %c"
+msgstr "意外的差异状态 %c"
-#: builtin/am.c:2333
-msgid "failed to read the index"
-msgstr "æ\97 æ³\95读å\8f\96ç´¢å¼\95"
+#: builtin/add.c:85 builtin/commit.c:291
+msgid "updating files failed"
+msgstr "æ\9b´æ\96°æ\96\87件失败"
-#: builtin/am.c:2348
+#: builtin/add.c:95
#, c-format
-msgid "previous rebase directory %s still exists but mbox given."
-msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"
+msgid "remove '%s'\n"
+msgstr "删除 '%s'\n"
+
+#: builtin/add.c:149
+msgid "Unstaged changes after refreshing the index:"
+msgstr "刷新索引之后尚未被暂存的变更："
+
+#: builtin/add.c:209 builtin/rev-parse.c:840
+msgid "Could not read the index"
+msgstr "不能读取索引"
-#: builtin/am.c:2372
+#: builtin/add.c:220
#, c-format
-msgid ""
-"Stray %s directory found.\n"
-"Use \"git am --abort\" to remove it."
-msgstr ""
-"发现了错误的 %s 目录。\n"
-"使用 \"git am --abort\" 删除它。"
+msgid "Could not open '%s' for writing."
+msgstr "无法打开 '%s' 进行写入。"
-#: builtin/am.c:2378
-msgid "Resolve operation not in progress, we are not resuming."
-msgstr "解决操作未进行，我们不会继续。"
+#: builtin/add.c:224
+msgid "Could not write patch"
+msgstr "不能生成补丁"
-#: builtin/apply.c:122
-msgid "git apply [<options>] [<patch>...]"
-msgstr "git apply [<选项>] [<补丁>...]"
+#: builtin/add.c:227
+msgid "editing patch failed"
+msgstr "编辑补丁失败"
-#: builtin/apply.c:153
+#: builtin/add.c:230
#, c-format
-msgid "unrecognized whitespace option '%s'"
-msgstr "未能识别的空白字符选项 '%s'"
+msgid "Could not stat '%s'"
+msgstr "不能查看文件状态 '%s'"
-#: builtin/apply.c:169
-#, c-format
-msgid "unrecognized whitespace ignore option '%s'"
-msgstr "未能识别的空白字符忽略选项 '%s'"
+#: builtin/add.c:232
+msgid "Empty patch. Aborted."
+msgstr "空补丁。异常终止。"
-#: builtin/apply.c:854
+#: builtin/add.c:237
#, c-format
-msgid "Cannot prepare timestamp regexp %s"
-msgstr "无法准备时间戳正则表达式 %s"
+msgid "Could not apply '%s'"
+msgstr "不能应用 '%s'"
-#: builtin/apply.c:863
-#, c-format
-msgid "regexec returned %d for input: %s"
-msgstr "regexec 返回 %d，输入为：%s"
+#: builtin/add.c:247
+msgid "The following paths are ignored by one of your .gitignore files:\n"
+msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
-#: builtin/apply.c:947
-#, c-format
-msgid "unable to find filename in patch at line %d"
-msgstr "不能在补丁的第 %d 行找到文件名"
+#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111
+#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521
+#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162
+msgid "dry run"
+msgstr "演习"
-#: builtin/apply.c:984
-#, c-format
-msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
-msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s"
+#: builtin/add.c:269
+msgid "interactive picking"
+msgstr "交互式拣选"
-#: builtin/apply.c:989
-#, c-format
-msgid "git apply: bad git-diff - inconsistent new filename on line %d"
-msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"
+#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286
+msgid "select hunks interactively"
+msgstr "交互式挑选数据块"
-#: builtin/apply.c:990
-#, c-format
-msgid "git apply: bad git-diff - inconsistent old filename on line %d"
-msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"
+#: builtin/add.c:271
+msgid "edit current diff and apply"
+msgstr "编辑当前差异并应用"
-#: builtin/apply.c:995
-#, c-format
-msgid "git apply: bad git-diff - expected /dev/null on line %d"
-msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"
+#: builtin/add.c:272
+msgid "allow adding otherwise ignored files"
+msgstr "允许添加忽略的文件"
-#: builtin/apply.c:1489
-#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr "recount：意外的行：%.*s"
+#: builtin/add.c:273
+msgid "update tracked files"
+msgstr "更新已跟踪的文件"
-#: builtin/apply.c:1550
-#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr "第 %d 行的补丁片段没有头信息：%.*s"
+#: builtin/add.c:274
+msgid "record only the fact that the path will be added later"
+msgstr "只记录，该路径稍后再添加"
-#: builtin/apply.c:1567
-#, c-format
-msgid ""
-"git diff header lacks filename information when removing %d leading pathname "
-"component (line %d)"
-msgid_plural ""
-"git diff header lacks filename information when removing %d leading pathname "
-"components (line %d)"
-msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
-msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
+#: builtin/add.c:275
+msgid "add changes from all tracked and untracked files"
+msgstr "添加所有改变的已跟踪文件和未跟踪文件"
-#: builtin/apply.c:1743
-msgid "new file depends on old contents"
-msgstr "新文件依赖旧内容"
+#: builtin/add.c:278
+msgid "ignore paths removed in the working tree (same as --no-all)"
+msgstr "忽略工作区中移除的路径（和 --no-all 相同）"
-#: builtin/apply.c:1745
-msgid "deleted file still has contents"
-msgstr "删除的文件仍有内容"
+#: builtin/add.c:280
+msgid "don't add, only refresh the index"
+msgstr "不添加，只刷新索引"
-#: builtin/apply.c:1774
-#, c-format
-msgid "corrupt patch at line %d"
-msgstr "补丁在第 %d 行损坏"
+#: builtin/add.c:281
+msgid "just skip files which cannot be added because of errors"
+msgstr "跳过因出错不能添加的文件"
-#: builtin/apply.c:1810
-#, c-format
-msgid "new file %s depends on old contents"
-msgstr "新文件 %s 依赖旧内容"
+#: builtin/add.c:282
+msgid "check if - even missing - files are ignored in dry run"
+msgstr "检查在演习模式下文件（即使不存在）是否被忽略"
-#: builtin/apply.c:1812
-#, c-format
-msgid "deleted file %s still has contents"
-msgstr "删除的文件 %s 仍有内容"
+#: builtin/add.c:283 builtin/update-index.c:947
+msgid "(+/-)x"
+msgstr "(+/-)x"
-#: builtin/apply.c:1815
-#, c-format
-msgid "** warning: file %s becomes empty but is not deleted"
-msgstr "** 警告：文件 %s 成为空文件但并未删除"
+#: builtin/add.c:283 builtin/update-index.c:948
+msgid "override the executable bit of the listed files"
+msgstr "覆盖列表里文件的可执行位"
-#: builtin/apply.c:1962
+#: builtin/add.c:305
#, c-format
-msgid "corrupt binary patch at line %d: %.*s"
-msgstr "äº\8cè¿\9bå\88¶è¡¥ä¸\81å\9c¨ç¬¬ %d è¡\8cæ\8d\9få\9d\8fï¼\9a%.*s"
+msgid "Use -f if you really want to add them.\n"
+msgstr "使ç\94¨ -f å\8f\82æ\95°å¦\82æ\9e\9cæ\82¨ç¡®å®\9eè¦\81æ·»å\8a å®\83们ã\80\82\n"
-#: builtin/apply.c:1999
-#, c-format
-msgid "unrecognized binary patch at line %d"
-msgstr "未能识别的二进制补丁位于第 %d 行"
+#: builtin/add.c:312
+msgid "adding files failed"
+msgstr "添加文件失败"
-#: builtin/apply.c:2154
-#, c-format
-msgid "patch with only garbage at line %d"
-msgstr "补丁文件的第 %d 行只有垃圾数据"
+#: builtin/add.c:348
+msgid "-A and -u are mutually incompatible"
+msgstr "-A 和 -u 选项互斥"
-#: builtin/apply.c:2244
-#, c-format
-msgid "unable to read symlink %s"
-msgstr "无法读取符号链接 %s"
+#: builtin/add.c:355
+msgid "Option --ignore-missing can only be used together with --dry-run"
+msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
-#: builtin/apply.c:2248
+#: builtin/add.c:359
#, c-format
-msgid "unable to open or read %s"
-msgstr "不能打开或读取 %s"
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
-#: builtin/apply.c:2901
+#: builtin/add.c:374
#, c-format
-msgid "invalid start of line: '%c'"
-msgstr "æ\97 æ\95\88ç\9a\84è¡\8cé¦\96å\97符ï¼\9a'%c'"
+msgid "Nothing specified, nothing added.\n"
+msgstr "没æ\9c\89æ\8c\87å®\9aæ\96\87件ï¼\8cä¹\9f没æ\9c\89æ\96\87件被添å\8a ã\80\82\n"
-#: builtin/apply.c:3020
+#: builtin/add.c:375
#, 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 行）"
+msgid "Maybe you wanted to say 'git add .'?\n"
+msgstr "也许您想要执行 'git add .'？\n"
+
+#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279
+#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350
+#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:244
+msgid "index file corrupt"
+msgstr "索引文件损坏"
+
+#: builtin/am.c:414
+msgid "could not parse author script"
+msgstr "不能解析作者脚本"
-#: builtin/apply.c:3032
+#: builtin/am.c:491
#, c-format
-msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
-msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"
+msgid "'%s' was deleted by the applypatch-msg hook"
+msgstr "'%s' 被 applypatch-msg 钩子删除"
-#: builtin/apply.c:3038
+#: builtin/am.c:532
#, c-format
-msgid ""
-"while searching for:\n"
-"%.*s"
-msgstr ""
-"当查询：\n"
-"%.*s"
+msgid "Malformed input line: '%s'."
+msgstr "非法的输入行：'%s'。"
-#: builtin/apply.c:3060
+#: builtin/am.c:569
#, c-format
-msgid "missing binary patch data for '%s'"
-msgstr "缺失 '%s' 的二进制补丁数据"
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
-#: builtin/apply.c:3163
+#: builtin/am.c:595
+msgid "fseek failed"
+msgstr "fseek 失败"
+
+#: builtin/am.c:775
#, c-format
-msgid "binary patch does not apply to '%s'"
-msgstr "二进制补丁未应用到 '%s'"
+msgid "could not parse patch '%s'"
+msgstr "无法解析补丁 '%s'"
+
+#: builtin/am.c:840
+msgid "Only one StGIT patch series can be applied at once"
+msgstr "一次只能有一个 StGIT 补丁队列被应用"
+
+#: builtin/am.c:887
+msgid "invalid timestamp"
+msgstr "无效的时间戳"
+
+#: builtin/am.c:890 builtin/am.c:898
+msgid "invalid Date line"
+msgstr "无效的日期行"
-#: builtin/apply.c:3169
-#, c-format
-msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
-msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"
+#: builtin/am.c:895
+msgid "invalid timezone offset"
+msgstr "无效的时区偏移值"
-#: builtin/apply.c:3190
-#, c-format
-msgid "patch failed: %s:%ld"
-msgstr "打补丁失败：%s:%ld"
+#: builtin/am.c:984
+msgid "Patch format detection failed."
+msgstr "补丁格式检测失败。"
-#: builtin/apply.c:3314
+#: builtin/am.c:989 builtin/clone.c:379
#, c-format
-msgid "cannot checkout %s"
-msgstr "不能检出 %s"
+msgid "failed to create directory '%s'"
+msgstr "无法创建目录 '%s'"
-#: builtin/apply.c:3370
-#, c-format
-msgid "reading from '%s' beyond a symbolic link"
-msgstr "读取位于符号链接中的 '%s'"
+#: builtin/am.c:993
+msgid "Failed to split patches."
+msgstr "无法拆分补丁。"
-#: builtin/apply.c:3399 builtin/apply.c:3630
-#, c-format
-msgid "path %s has been renamed/deleted"
-msgstr "路径 %s 已经被重命名/删除"
+#: builtin/am.c:1125 builtin/commit.c:376
+msgid "unable to write index file"
+msgstr "无法写入索引文件"
-#: builtin/apply.c:3482 builtin/apply.c:3644
+#: builtin/am.c:1176
#, c-format
-msgid "%s: does not exist in index"
-msgstr "%s：不存在于索引中"
+msgid "When you have resolved this problem, run \"%s --continue\"."
+msgstr "当您解决这一问题，执行 \"%s --continue\"。"
-#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658
+#: builtin/am.c:1177
#, c-format
-msgid "%s: %s"
-msgstr "%s：%s"
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。"
-#: builtin/apply.c:3491 builtin/apply.c:3652
+#: builtin/am.c:1178
#, c-format
-msgid "%s: does not match index"
-msgstr "%s：和索引不匹配"
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。"
-#: builtin/apply.c:3597
-msgid "removal patch leaves file contents"
-msgstr "移除补丁仍留下了文件内容"
+#: builtin/am.c:1316
+msgid "Patch is empty. Was it split wrong?"
+msgstr "补丁为空。是不是切分错误？"
-#: builtin/apply.c:3669
+#: builtin/am.c:1390 builtin/log.c:1550
#, c-format
-msgid "%s: wrong type"
-msgstr "%s：错误类型"
+msgid "invalid ident line: %s"
+msgstr "包含无效的身份标识：%s"
-#: builtin/apply.c:3671
+#: builtin/am.c:1417
#, c-format
-msgid "%s has type %o, expected %o"
-msgstr "%s 的类型是 %o，应为 %o"
+msgid "unable to parse commit %s"
+msgstr "不能解析提交 %s"
-#: builtin/apply.c:3822 builtin/apply.c:3824
-#, c-format
-msgid "invalid path '%s'"
-msgstr "无效路径 '%s'"
+#: builtin/am.c:1610
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+msgstr "仓库缺乏必要的数据对象以进行三方合并。"
-#: builtin/apply.c:3879
-#, c-format
-msgid "%s: already exists in index"
-msgstr "%s：已经存在于索引中"
+#: builtin/am.c:1612
+msgid "Using index info to reconstruct a base tree..."
+msgstr "使用索引来重建一个（三方合并的）基础目录树..."
-#: builtin/apply.c:3882
-#, c-format
-msgid "%s: already exists in working directory"
-msgstr "%s：已经存在于工作区中"
+#: builtin/am.c:1631
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
+msgstr ""
+"您是否曾手动编辑过您的补丁？\n"
+"无法应用补丁到索引中的数据对象上。"
-#: builtin/apply.c:3902
-#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o)"
-msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
+#: builtin/am.c:1637
+msgid "Falling back to patching base and 3-way merge..."
+msgstr "回落到基础版本上打补丁及进行三方合并..."
-#: builtin/apply.c:3907
-#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o) of %s"
-msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"
+#: builtin/am.c:1662
+msgid "Failed to merge in the changes."
+msgstr "无法合并变更。"
-#: builtin/apply.c:3927
-#, c-format
-msgid "affected file '%s' is beyond a symbolic link"
-msgstr "受影响的文件 '%s' 位于符号链接中"
+#: builtin/am.c:1686 builtin/merge.c:628
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree 无法写入一树对象"
-#: builtin/apply.c:3931
-#, c-format
-msgid "%s: patch does not apply"
-msgstr "%s：补丁未应用"
+#: builtin/am.c:1693
+msgid "applying to an empty history"
+msgstr "正应用到一个空历史上"
-#: builtin/apply.c:3945
-#, c-format
-msgid "Checking patch %s..."
-msgstr "æ£\80æ\9f¥è¡¥ä¸\81 %s..."
+#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798
+#: builtin/merge.c:823
+msgid "failed to write commit object"
+msgstr "æ\97 æ³\95å\86\99æ\8f\90交对象"
-#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/am.c:1739 builtin/am.c:1743
#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
+msgid "cannot resume: %s does not exist."
+msgstr "无法继续：%s 不存在。"
-#: builtin/apply.c:4182
-#, c-format
-msgid "unable to remove %s from index"
-msgstr "不能从索引中移除 %s"
+#: builtin/am.c:1759
+msgid "cannot be interactive without stdin connected to a terminal."
+msgstr "标准输入没有和终端关联，不能进行交互式操作。"
-#: builtin/apply.c:4215
-#, c-format
-msgid "corrupt patch for submodule %s"
-msgstr "子模组 %s 损坏的补丁"
+#: builtin/am.c:1764
+msgid "Commit Body is:"
+msgstr "提交内容为："
-#: builtin/apply.c:4219
-#, c-format
-msgid "unable to stat newly created file '%s'"
-msgstr "不能枚举新建文件 '%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:1774
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]："
-#: builtin/apply.c:4224
+#: builtin/am.c:1824
#, c-format
-msgid "unable to create backing store for newly created file %s"
-msgstr "不能为新建文件 %s 创建后端存储"
+msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgstr "脏索引：不能应用补丁（脏文件：%s）"
-#: builtin/apply.c:4227 builtin/apply.c:4340
+#: builtin/am.c:1861 builtin/am.c:1933
#, c-format
-msgid "unable to add cache entry for %s"
-msgstr "无法为 %s 添加缓存条目"
+msgid "Applying: %.*s"
+msgstr "应用：%.*s"
-#: builtin/apply.c:4260
-#, c-format
-msgid "closing file '%s'"
-msgstr "关闭文件 '%s'"
+#: builtin/am.c:1877
+msgid "No changes -- Patch already applied."
+msgstr "没有变更 —— 补丁已经应用过。"
-#: builtin/apply.c:4313
+#: builtin/am.c:1885
#, c-format
-msgid "unable to write file '%s' mode %o"
-msgstr "不能写文件 '%s' 权限 %o"
+msgid "Patch failed at %s %.*s"
+msgstr "打补丁失败于 %s %.*s"
-#: builtin/apply.c:4403
+#: builtin/am.c:1891
#, c-format
-msgid "Applied patch %s cleanly."
-msgstr "成功应用补丁 %s。"
+msgid "The copy of the patch that failed is found in: %s"
+msgstr "失败的补丁文件副本位于：%s"
-#: builtin/apply.c:4411
-msgid "internal error"
-msgstr "内部错误"
+#: builtin/am.c:1936
+msgid ""
+"No changes - did you forget to use 'git add'?\n"
+"If there is nothing left to stage, chances are that something else\n"
+"already introduced the same changes; you might want to skip this patch."
+msgstr ""
+"没有变更 —— 您是不是忘了执行 'git add'？\n"
+"如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"
+"您也许想要跳过这个补丁。"
-#: builtin/apply.c:4414
-#, c-format
-msgid "Applying patch %%s with %d reject..."
-msgid_plural "Applying patch %%s with %d rejects..."
-msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."
-msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."
+#: builtin/am.c:1943
+msgid ""
+"You still have unmerged paths in your index.\n"
+"Did you forget to use 'git add'?"
+msgstr ""
+"您的索引中仍有未合并的路径。\n"
+"您是否忘了执行 'git add'？"
-#: builtin/apply.c:4424
+#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
+#: builtin/reset.c:316
#, c-format
-msgid "truncating .rej filename to %.*s.rej"
-msgstr "截短 .rej 文件名为 %.*s.rej"
+msgid "Could not parse object '%s'."
+msgstr "不能解析对象 '%s'。"
-#: builtin/apply.c:4432
-#, c-format
-msgid "cannot open %s: %s"
-msgstr "不能打开 %s：%s"
+#: builtin/am.c:2103
+msgid "failed to clean index"
+msgstr "无法清空索引"
-#: builtin/apply.c:4445
-#, c-format
-msgid "Hunk #%d applied cleanly."
-msgstr "第 #%d 个片段成功应用。"
+#: builtin/am.c:2137
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
+msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
-#: builtin/apply.c:4448
+#: builtin/am.c:2200
#, c-format
-msgid "Rejected hunk #%d."
-msgstr "æ\8b\92ç»\9d第 #%d 个ç\89\87段ã\80\82"
+msgid "Invalid value for --patch-format: %s"
+msgstr "æ\97 æ\95\88ç\9a\84 --patch-format å\80¼ï¼\9a%s"
-#: builtin/apply.c:4537
-#, c-format
-msgid "Skipped patch '%s'."
-msgstr "略过补丁 '%s'。"
+#: builtin/am.c:2233
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
-#: builtin/apply.c:4545
-msgid "unrecognized input"
-msgstr "未能识别的输入"
+#: builtin/am.c:2234
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<选项>] (--continue | --skip | --abort)"
-#: builtin/apply.c:4556
-msgid "unable to read index file"
-msgstr "无法读取索引文件"
+#: builtin/am.c:2240
+msgid "run interactively"
+msgstr "以交互式方式运行"
-#: builtin/apply.c:4701
-msgid "--3way outside a repository"
-msgstr "--3way 在一个仓库之外"
+#: builtin/am.c:2242
+msgid "historical option -- no-op"
+msgstr "老的参数 —— 无作用"
-#: builtin/apply.c:4709
-msgid "--index outside a repository"
-msgstr "--index 在一个仓库之外"
+#: builtin/am.c:2244
+msgid "allow fall back on 3way merging if needed"
+msgstr "如果必要，允许使用三方合并。"
-#: builtin/apply.c:4712
-msgid "--cached outside a repository"
-msgstr "--cached 在一个仓库之外"
+#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
+#: builtin/repack.c:172
+msgid "be quiet"
+msgstr "静默模式"
-#: builtin/apply.c:4745
-#, c-format
-msgid "can't open patch '%s'"
-msgstr "不能打开补丁 '%s'"
+#: builtin/am.c:2247
+msgid "add a Signed-off-by line to the commit message"
+msgstr "在提交说明中添加一个 Signed-off-by 签名"
-#: builtin/apply.c:4760
-#, c-format
-msgid "squelched %d whitespace error"
-msgid_plural "squelched %d whitespace errors"
-msgstr[0] "抑制下仍有 %d 个空白字符误用"
-msgstr[1] "抑制下仍有 %d 个空白字符误用"
+#: builtin/am.c:2250
+msgid "recode into utf8 (default)"
+msgstr "使用 utf8 字符集（默认）"
-#: builtin/apply.c:4766 builtin/apply.c:4776
-#, c-format
-msgid "%d line adds whitespace errors."
-msgid_plural "%d lines add whitespace errors."
-msgstr[0] "%d 行有空白字符误用。"
-msgstr[1] "%d 行有空白字符误用。"
+#: builtin/am.c:2252
+msgid "pass -k flag to git-mailinfo"
+msgstr "向 git-mailinfo 传递 -k 参数"
-#: builtin/apply.c:4800
-msgid "don't apply changes matching the given path"
-msgstr "不要应用与给出路径向匹配的变更"
+#: builtin/am.c:2254
+msgid "pass -b flag to git-mailinfo"
+msgstr "向 git-mailinfo 传递 -b 参数"
-#: builtin/apply.c:4803
-msgid "apply changes matching the given path"
-msgstr "åº\94ç\94¨ä¸\8eç»\99å\87ºè·¯å¾\84å\90\91å\8c¹é\85\8dç\9a\84å\8f\98æ\9b´"
+#: builtin/am.c:2256
+msgid "pass -m flag to git-mailinfo"
+msgstr "å\90\91 git-mailinfo ä¼ é\80\92 -m å\8f\82æ\95°"
-#: builtin/apply.c:4806
-msgid "remove <num> leading slashes from traditional diff paths"
-msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
+#: builtin/am.c:2258
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"
-#: builtin/apply.c:4809
-msgid "ignore additions made by the patch"
-msgstr "忽略补丁中的添加的文件"
+#: builtin/am.c:2261
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"
-#: builtin/apply.c:4811
-msgid "instead of applying the patch, output diffstat for the input"
-msgstr "ä¸\8dåº\94ç\94¨è¡¥ä¸\81ï¼\8cè\80\8cæ\98¯æ\98¾ç¤ºè¾\93å\85¥ç\9a\84å·®å¼\82ç»\9f计ï¼\88diffstatï¼\89"
+#: builtin/am.c:2264
+msgid "strip everything before a scissors line"
+msgstr "丢å¼\83è£\81å\88\87线å\89\8dç\9a\84æ\89\80æ\9c\89å\86\85容"
-#: builtin/apply.c:4815
-msgid "show number of added and deleted lines in decimal notation"
-msgstr "以十进制数显示添加和删除的行数"
+#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
+#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
+#: builtin/am.c:2293
+msgid "pass it through git-apply"
+msgstr "传递给 git-apply"
-#: builtin/apply.c:4817
-msgid "instead of applying the patch, output a summary for the input"
-msgstr "不应用补丁，而是显示输入的概要"
+#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
+#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135
+#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185
+#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
+msgid "n"
+msgstr "n"
-#: builtin/apply.c:4819
-msgid "instead of applying the patch, see if the patch is applicable"
-msgstr "不应用补丁，而是查看补丁是否可应用"
+#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/tag.c:372
+msgid "format"
+msgstr "格式"
-#: builtin/apply.c:4821
-msgid "make sure the patch is applicable to the current index"
-msgstr "确认补丁可以应用到当前索引"
+#: builtin/am.c:2290
+msgid "format the patch(es) are in"
+msgstr "补丁的格式"
-#: builtin/apply.c:4823
-msgid "apply a patch without touching the working tree"
-msgstr "应用补丁而不修改工作区"
+#: builtin/am.c:2296
+msgid "override error message when patch failure occurs"
+msgstr "打补丁失败时显示的错误信息"
-#: builtin/apply.c:4825
-msgid "accept a patch that touches outside the working area"
-msgstr "接受修改工作区之外文件的补丁"
+#: builtin/am.c:2298
+msgid "continue applying patches after resolving a conflict"
+msgstr "冲突解决后继续应用补丁"
-#: builtin/apply.c:4827
-msgid "also apply the patch (use with --stat/--summary/--check)"
-msgstr "è¿\98åº\94ç\94¨æ¤è¡¥ä¸\81ï¼\88ä¸\8e --stat/--summary/--check é\80\89项å\90\8cæ\97¶ä½¿ç\94¨ï¼\89"
+#: builtin/am.c:2301
+msgid "synonyms for --continue"
+msgstr "å\92\8c --continue å\90\8cä¹\89"
-#: builtin/apply.c:4829
-msgid "attempt three-way merge if a patch does not apply"
-msgstr "如果一个补丁不能应用则尝试三方合并"
+#: builtin/am.c:2304
+msgid "skip the current patch"
+msgstr "跳过当前补丁"
-#: builtin/apply.c:4831
-msgid "build a temporary index based on embedded index information"
-msgstr "创建一个临时索引基于嵌入的索引信息"
+#: builtin/am.c:2307
+msgid "restore the original branch and abort the patching operation."
+msgstr "恢复原始分支并终止打补丁操作。"
-#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426
-msgid "paths are separated with NUL character"
-msgstr "路径以 NUL 字符分隔"
+#: builtin/am.c:2311
+msgid "lie about committer date"
+msgstr "将作者日期作为提交日期"
-#: builtin/apply.c:4836
-msgid "ensure at least <n> lines of context match"
-msgstr "ç¡®ä¿\9dè\87³å°\91å\8c¹é\85\8d <n> è¡\8cä¸\8aä¸\8bæ\96\87"
+#: builtin/am.c:2313
+msgid "use current timestamp for author date"
+msgstr "ç\94¨å½\93å\89\8dæ\97¶é\97´ä½\9c为ä½\9cè\80\85æ\97¥æ\9c\9f"
-#: builtin/apply.c:4838
-msgid "detect new or modified lines that have whitespace errors"
-msgstr "检查新增和修改的行中间的空白字符滥用"
+#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229
+#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355
+msgid "key-id"
+msgstr "key-id"
-#: builtin/apply.c:4841 builtin/apply.c:4844
-msgid "ignore changes in whitespace when finding context"
-msgstr "查找上下文时忽略空白字符的变更"
+#: builtin/am.c:2316
+msgid "GPG-sign commits"
+msgstr "使用 GPG 签名提交"
-#: builtin/apply.c:4847
-msgid "apply the patch in reverse"
-msgstr "反向应用补丁"
+#: builtin/am.c:2319
+msgid "(internal use for git-rebase)"
+msgstr "（内部使用，用于 git-rebase）"
-#: builtin/apply.c:4849
-msgid "don't expect at least one line of context"
-msgstr "无需至少一行上下文"
+#: builtin/am.c:2334
+msgid ""
+"The -b/--binary option has been a no-op for long time, and\n"
+"it will be removed. Please do not use it anymore."
+msgstr ""
+"参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n"
+"请不要再使用它了。"
-#: builtin/apply.c:4851
-msgid "leave the rejected hunks in corresponding *.rej files"
-msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
+#: builtin/am.c:2341
+msgid "failed to read the index"
+msgstr "无法读取索引"
-#: builtin/apply.c:4853
-msgid "allow overlapping hunks"
-msgstr "允许重叠的补丁片段"
+#: builtin/am.c:2356
+#, c-format
+msgid "previous rebase directory %s still exists but mbox given."
+msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"
-#: builtin/apply.c:4856
-msgid "tolerate incorrectly detected missing new-line at the end of file"
-msgstr "允许不正确的文件末尾换行符"
+#: builtin/am.c:2380
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
+msgstr ""
+"发现了错误的 %s 目录。\n"
+"使用 \"git am --abort\" 删除它。"
-#: builtin/apply.c:4859
-msgid "do not trust the line counts in the hunk headers"
-msgstr "不信任补丁片段的头信息中的行号"
+#: builtin/am.c:2386
+msgid "Resolve operation not in progress, we are not resuming."
+msgstr "解决操作未进行，我们不会继续。"
-#: builtin/apply.c:4862
-msgid "prepend <root> to all filenames"
-msgstr "为所有文件名前添加 <根目录>"
+#: builtin/apply.c:8
+msgid "git apply [<options>] [<patch>...]"
+msgstr "git apply [<选项>] [<补丁>...]"
#: builtin/archive.c:17
#, c-format
#: builtin/archive.c:68
msgid "git archive: expected a flush"
-msgstr "git archive：应为刷新"
+msgstr "git archive：应有一个 flush 刷新"
#: builtin/bisect--helper.c:7
msgid "git bisect--helper --next-all [--no-checkout]"
msgid "Blaming lines"
msgstr "追踪代码行"
-#: builtin/blame.c:2536
+#: builtin/blame.c:2577
msgid "Show blame entries as we find them, incrementally"
msgstr "增量式地显示发现的 blame 条目"
-#: builtin/blame.c:2537
+#: builtin/blame.c:2578
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "边界提交显示空的 SHA-1（默认：关闭）"
-#: builtin/blame.c:2538
+#: builtin/blame.c:2579
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "不把根提交作为边界（默认：关闭）"
-#: builtin/blame.c:2539
+#: builtin/blame.c:2580
msgid "Show work cost statistics"
msgstr "显示命令消耗统计"
-#: builtin/blame.c:2540
+#: builtin/blame.c:2581
msgid "Force progress reporting"
msgstr "强制进度显示"
-#: builtin/blame.c:2541
+#: builtin/blame.c:2582
msgid "Show output score for blame entries"
msgstr "显示判断 blame 条目位移的得分诊断信息"
-#: builtin/blame.c:2542
+#: builtin/blame.c:2583
msgid "Show original filename (Default: auto)"
msgstr "显示原始文件名（默认：自动）"
-#: builtin/blame.c:2543
+#: builtin/blame.c:2584
msgid "Show original linenumber (Default: off)"
msgstr "显示原始的行号（默认：关闭）"
-#: builtin/blame.c:2544
+#: builtin/blame.c:2585
msgid "Show in a format designed for machine consumption"
msgstr "显示为一个适合机器读取的格式"
-#: builtin/blame.c:2545
+#: builtin/blame.c:2586
msgid "Show porcelain format with per-line commit information"
msgstr "为每一行显示机器适用的提交信息"
-#: builtin/blame.c:2546
+#: builtin/blame.c:2587
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）"
-#: builtin/blame.c:2547
+#: builtin/blame.c:2588
msgid "Show raw timestamp (Default: off)"
msgstr "显示原始时间戳（默认：关闭）"
-#: builtin/blame.c:2548
+#: builtin/blame.c:2589
msgid "Show long commit SHA1 (Default: off)"
msgstr "显示长的 SHA1 提交号（默认：关闭）"
-#: builtin/blame.c:2549
+#: builtin/blame.c:2590
msgid "Suppress author name and timestamp (Default: off)"
msgstr "隐藏作者名字和时间戳（默认：关闭）"
-#: builtin/blame.c:2550
+#: builtin/blame.c:2591
msgid "Show author email instead of name (Default: off)"
msgstr "显示作者的邮箱而不是名字（默认：关闭）"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2592
msgid "Ignore whitespace differences"
msgstr "忽略空白差异"
-#: builtin/blame.c:2552
+#: builtin/blame.c:2599
+msgid "Use an experimental indent-based heuristic to improve diffs"
+msgstr "使用一个试验性的基于缩进的启发式算法改进差异显示"
+
+#: builtin/blame.c:2600
+msgid "Use an experimental blank-line-based heuristic to improve diffs"
+msgstr "使用一个试验性的基于空行的启发式算法改进差异显示"
+
+#: builtin/blame.c:2602
msgid "Spend extra cycles to find better match"
msgstr "花费额外的循环来找到更好的匹配"
-#: builtin/blame.c:2553
+#: builtin/blame.c:2603
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
-#: builtin/blame.c:2554
+#: builtin/blame.c:2604
msgid "Use <file>'s contents as the final image"
msgstr "使用 <文件> 的内容作为最终的图片"
-#: builtin/blame.c:2555 builtin/blame.c:2556
+#: builtin/blame.c:2605 builtin/blame.c:2606
msgid "score"
msgstr "得分"
-#: builtin/blame.c:2555
+#: builtin/blame.c:2605
msgid "Find line copies within and across files"
msgstr "找到文件内及跨文件的行拷贝"
-#: builtin/blame.c:2556
+#: builtin/blame.c:2606
msgid "Find line movements within and across files"
msgstr "找到文件内及跨文件的行移动"
-#: builtin/blame.c:2557
+#: builtin/blame.c:2607
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2557
+#: builtin/blame.c:2607
msgid "Process only line range n,m, counting from 1"
msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"
+#: builtin/blame.c:2654
+msgid "--progress can't be used with --incremental or porcelain formats"
+msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
+
#. 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:2649
+#: builtin/blame.c:2700
msgid "4 years, 11 months ago"
msgstr "4 年 11 个月前"
+#: builtin/blame.c:2780
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents 和 --reverse 不能混用。"
+
+#: builtin/blame.c:2800
+msgid "cannot use --contents with final commit object name"
+msgstr "不能将 --contents 和最终的提交对象名共用"
+
+#: builtin/blame.c:2805
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
+
+#: builtin/blame.c:2832
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
+msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围"
+
+#: builtin/blame.c:2843
+#, c-format
+msgid "no such path %s in %s"
+msgstr "在 %2$s 中无此路径 %1$s"
+
+#: builtin/blame.c:2854
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "不能为路径 %2$s 读取对象 %1$s"
+
+#: builtin/blame.c:2873
+#, 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/branch.c:26
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
msgid "change the upstream info"
msgstr "改变上游信息"
+#: builtin/branch.c:660
+msgid "Unset the upstream info"
+msgstr "取消上游信息的设置"
+
#: builtin/branch.c:661
msgid "use colored output"
msgstr "使用彩色输出"
msgid "field name to sort on"
msgstr "排序的字段名"
-#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402
-#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404
+#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570
#: builtin/tag.c:369
msgid "object"
msgstr "对象"
msgid "Failed to resolve HEAD as a valid ref."
msgstr "无法将 HEAD 解析为有效引用。"
-#: builtin/branch.c:709 builtin/clone.c:707
+#: builtin/branch.c:709 builtin/clone.c:706
msgid "HEAD not found below refs/heads!"
msgstr "HEAD 没有位于 /refs/heads 之下！"
msgid "Need a repository to unbundle."
msgstr "需要一个仓库来解包。"
-#: builtin/cat-file.c:443
+#: builtin/cat-file.c:513
msgid ""
-"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
-"<type>|--textconv) <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|<类型"
-">|--textconv) <对象>"
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
-#: builtin/cat-file.c:444
-msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
-msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
+#: builtin/cat-file.c:514
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
+msgstr ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
-#: builtin/cat-file.c:481
+#: builtin/cat-file.c:551
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<类型> 可以是其中之一：blob、tree、commit、tag"
-#: builtin/cat-file.c:482
+#: builtin/cat-file.c:552
msgid "show object type"
msgstr "显示对象类型"
-#: builtin/cat-file.c:483
+#: builtin/cat-file.c:553
msgid "show object size"
msgstr "显示对象大小"
-#: builtin/cat-file.c:485
+#: builtin/cat-file.c:555
msgid "exit with zero when there's no error"
msgstr "当没有错误时退出并返回零"
-#: builtin/cat-file.c:486
+#: builtin/cat-file.c:556
msgid "pretty-print object's content"
msgstr "美观地打印对象的内容"
-#: builtin/cat-file.c:488
+#: builtin/cat-file.c:558
msgid "for blob objects, run textconv on object's content"
-msgstr "对于数据对象，对其内容执行 textconv"
+msgstr "对于数据对象，对其内容做文本转换"
+
+#: builtin/cat-file.c:560
+msgid "for blob objects, run filters on object's content"
+msgstr "对于数据对象，对其内容做过滤"
+
+#: builtin/cat-file.c:561 git-submodule.sh:923
+msgid "blob"
+msgstr "数据对象"
+
+#: builtin/cat-file.c:562
+msgid "use a specific path for --textconv/--filters"
+msgstr "对于 --textconv/--filters 使用一个特定的路径"
-#: builtin/cat-file.c:490
+#: builtin/cat-file.c:564
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "允许 -s 和 -t 对损坏的对象生效"
-#: builtin/cat-file.c:491
+#: builtin/cat-file.c:565
msgid "buffer --batch output"
msgstr "缓冲 --batch 的输出"
-#: builtin/cat-file.c:493
+#: builtin/cat-file.c:567
msgid "show info and content of objects fed from the standard input"
msgstr "显示从标准输入提供的对象的信息和内容"
-#: builtin/cat-file.c:496
+#: builtin/cat-file.c:570
msgid "show info about objects fed from the standard input"
msgstr "显示从标准输入提供的对象的信息"
-#: builtin/cat-file.c:499
+#: builtin/cat-file.c:573
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr "跟随树内符号链接（和 --batch 或 --batch-check 共用）"
-#: builtin/cat-file.c:501
+#: builtin/cat-file.c:575
msgid "show all objects with --batch or --batch-check"
msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
msgid "use .gitattributes only from the index"
msgstr "只使用索引中的 .gitattributes"
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97
+#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
msgid "read file names from stdin"
msgstr "从标准输入读出文件名"
msgid "terminate input and output records by a NUL character"
msgstr "输入和输出的记录使用 NUL 字符终结"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "不显示进度报告"
msgstr "将内容写入临时文件"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491
-#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497
-#: builtin/submodule--helper.c:830 builtin/worktree.c:469
+#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598
+#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951
+#: builtin/worktree.c:469
msgid "string"
msgstr "字符串"
msgid "path '%s' is unmerged"
msgstr "路径 '%s' 未合并"
-#: builtin/checkout.c:495
+#: builtin/checkout.c:494
msgid "you need to resolve your current index first"
msgstr "您需要先解决当前索引的冲突"
-#: builtin/checkout.c:625
+#: builtin/checkout.c:624
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "不能对 '%s' 执行 reflog 操作：%s\n"
-#: builtin/checkout.c:664
+#: builtin/checkout.c:663
msgid "HEAD is now at"
msgstr "HEAD 目前位于"
-#: builtin/checkout.c:668 builtin/clone.c:661
+#: builtin/checkout.c:667 builtin/clone.c:660
msgid "unable to update HEAD"
msgstr "不能更新 HEAD"
-#: builtin/checkout.c:672
+#: builtin/checkout.c:671
#, c-format
msgid "Reset branch '%s'\n"
msgstr "重置分支 '%s'\n"
-#: builtin/checkout.c:675
+#: builtin/checkout.c:674
#, c-format
msgid "Already on '%s'\n"
msgstr "已经位于 '%s'\n"
-#: builtin/checkout.c:679
+#: builtin/checkout.c:678
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "切换并重置分支 '%s'\n"
-#: builtin/checkout.c:681 builtin/checkout.c:1070
+#: builtin/checkout.c:680 builtin/checkout.c:1069
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "切换到一个新分支 '%s'\n"
-#: builtin/checkout.c:683
+#: builtin/checkout.c:682
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "切换到分支 '%s'\n"
# 译者：注意保持前导空格
-#: builtin/checkout.c:734
+#: builtin/checkout.c:733
#, c-format
msgid " ... and %d more.\n"
msgstr " ... 及其它 %d 个。\n"
-#: builtin/checkout.c:740
+#: builtin/checkout.c:739
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:759
+#: builtin/checkout.c:758
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
" git branch <新分支名> %s\n"
"\n"
-#: builtin/checkout.c:795
+#: builtin/checkout.c:794
msgid "internal error in revision walk"
msgstr "在版本遍历时遇到内部错误"
-#: builtin/checkout.c:799
+#: builtin/checkout.c:798
msgid "Previous HEAD position was"
msgstr "之前的 HEAD 位置是"
-#: builtin/checkout.c:826 builtin/checkout.c:1065
+#: builtin/checkout.c:825 builtin/checkout.c:1064
msgid "You are on a branch yet to be born"
msgstr "您位于一个尚未初始化的分支"
-#: builtin/checkout.c:971
+#: builtin/checkout.c:970
#, c-format
msgid "only one reference expected, %d given."
-msgstr "å\8fªè¦\81一个引用，却给出了 %d 个"
+msgstr "åº\94å\8fªæ\9c\89一个引用，却给出了 %d 个"
-#: builtin/checkout.c:1011 builtin/worktree.c:214
+#: builtin/checkout.c:1010 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr "无效引用：%s"
-#: builtin/checkout.c:1040
+#: builtin/checkout.c:1039
#, c-format
msgid "reference is not a tree: %s"
msgstr "引用不是一个树：%s"
-#: builtin/checkout.c:1079
+#: builtin/checkout.c:1078
msgid "paths cannot be used with switching branches"
msgstr "路径不能和切换分支同时使用"
-#: builtin/checkout.c:1082 builtin/checkout.c:1086
+#: builtin/checkout.c:1081 builtin/checkout.c:1085
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' 不能和切换分支同时使用"
-#: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097
+#: builtin/checkout.c:1100
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' 不能和 '%s' 同时使用"
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1105
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "不能切换分支到一个非提交 '%s'"
-#: builtin/checkout.c:1139 builtin/checkout.c:1141 builtin/clone.c:88
+#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93
#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
#: builtin/worktree.c:326
msgid "branch"
msgstr "分支"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1139
msgid "create and checkout a new branch"
msgstr "创建并检出一个新的分支"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1141
msgid "create/reset and checkout a branch"
msgstr "创建/重置并检出一个分支"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1142
msgid "create reflog for new branch"
msgstr "为新的分支创建引用日志"
-#: builtin/checkout.c:1144 builtin/worktree.c:328
+#: builtin/checkout.c:1143 builtin/worktree.c:328
msgid "detach HEAD at named commit"
msgstr "HEAD 从指定的提交分离"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
msgid "set upstream info for new branch"
msgstr "为新的分支设置上游信息"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1146
msgid "new-branch"
msgstr "新分支"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1146
msgid "new unparented branch"
msgstr "新的没有父提交的分支"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1147
msgid "checkout our version for unmerged files"
msgstr "对尚未合并的文件检出我们的版本"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1149
msgid "checkout their version for unmerged files"
msgstr "对尚未合并的文件检出他们的版本"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1151
msgid "force checkout (throw away local modifications)"
msgstr "强制检出（丢弃本地修改）"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1152
msgid "perform a 3-way merge with the new branch"
msgstr "和新的分支执行三方合并"
-#: builtin/checkout.c:1154 builtin/merge.c:231
+#: builtin/checkout.c:1153 builtin/merge.c:231
msgid "update ignored files (default)"
msgstr "更新忽略的文件（默认）"
-#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250
+#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251
msgid "style"
msgstr "风格"
-#: builtin/checkout.c:1156
+#: builtin/checkout.c:1155
msgid "conflict style (merge or diff3)"
msgstr "冲突输出风格（merge 或 diff3）"
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1158
msgid "do not limit pathspecs to sparse entries only"
msgstr "对路径不做稀疏检出的限制"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1160
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "二次猜测'git checkout <无此分支>'"
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1162
msgid "do not check if another worktree is holding the given ref"
msgstr "不检查指定的引用是否被其他工作区所占用"
-#: builtin/checkout.c:1164 builtin/clone.c:60 builtin/fetch.c:117
-#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536
+#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119
+#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "强制显示进度报告"
-#: builtin/checkout.c:1195
+#: builtin/checkout.c:1194
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b、-B 和 --orphan 是互斥的"
-#: builtin/checkout.c:1212
+#: builtin/checkout.c:1211
msgid "--track needs a branch name"
msgstr "--track 需要一个分支名"
-#: builtin/checkout.c:1217
+#: builtin/checkout.c:1216
msgid "Missing branch name; try -b"
msgstr "缺少分支名；尝试 -b"
-#: builtin/checkout.c:1253
+#: builtin/checkout.c:1252
msgid "invalid path specification"
msgstr "无效的路径规格"
-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1259
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
"不能同时更新路径并切换到分支'%s'。\n"
"您是想要检出 '%s' 但其未能解析为提交么？"
-#: builtin/checkout.c:1265
+#: builtin/checkout.c:1264
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout：--detach 不能接收路径参数 '%s'"
-#: builtin/checkout.c:1269
+#: builtin/checkout.c:1268
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgid "remove whole directories"
msgstr "删除整个目录"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
-#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725
+#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182
msgid "pattern"
msgstr "模式"
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
-#: builtin/clone.c:62
+#: builtin/clone.c:65
msgid "don't create a checkout"
msgstr "不创建一个检出"
-#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476
+#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
msgid "create a bare repository"
msgstr "创建一个纯仓库"
-#: builtin/clone.c:67
+#: builtin/clone.c:70
msgid "create a mirror repository (implies bare)"
msgstr "创建一个镜像仓库（也是纯仓库）"
-#: builtin/clone.c:69
+#: builtin/clone.c:72
msgid "to clone from a local repository"
msgstr "从本地仓库克隆"
-#: builtin/clone.c:71
+#: builtin/clone.c:74
msgid "don't use local hardlinks, always copy"
msgstr "不使用本地硬链接，始终复制"
-#: builtin/clone.c:73
+#: builtin/clone.c:76
msgid "setup as shared repository"
msgstr "设置为共享仓库"
-#: builtin/clone.c:75 builtin/clone.c:77
+#: builtin/clone.c:78 builtin/clone.c:80
msgid "initialize submodules in the clone"
msgstr "在克隆时初始化子模组"
-#: builtin/clone.c:79
+#: builtin/clone.c:82
msgid "number of submodules cloned in parallel"
msgstr "并发克隆的子模组的数量"
-#: builtin/clone.c:80 builtin/init-db.c:473
+#: builtin/clone.c:83 builtin/init-db.c:475
msgid "template-directory"
msgstr "模板目录"
-#: builtin/clone.c:81 builtin/init-db.c:474
+#: builtin/clone.c:84 builtin/init-db.c:476
msgid "directory from which templates will be used"
msgstr "模板目录将被使用"
-#: builtin/clone.c:83 builtin/submodule--helper.c:495
-#: builtin/submodule--helper.c:833
+#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602
+#: builtin/submodule--helper.c:954
msgid "reference repository"
msgstr "参考仓库"
-#: builtin/clone.c:85
+#: builtin/clone.c:90
msgid "use --reference only while cloning"
msgstr "仅在克隆时参考 --reference 指向的本地仓库"
-#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr "名称"
-#: builtin/clone.c:87
+#: builtin/clone.c:92
msgid "use <name> instead of 'origin' to track upstream"
msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
-#: builtin/clone.c:89
+#: builtin/clone.c:94
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "检出 <分支> 而不是远程 HEAD"
-#: builtin/clone.c:91
+#: builtin/clone.c:96
msgid "path to git-upload-pack on the remote"
msgstr "远程 git-upload-pack 路径"
-#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667
-#: builtin/pull.c:201
+#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668
+#: builtin/pull.c:202
msgid "depth"
msgstr "深度"
-#: builtin/clone.c:93
+#: builtin/clone.c:98
msgid "create a shallow clone of that depth"
msgstr "创建一个指定深度的浅克隆"
-#: builtin/clone.c:95
+#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848
+#: parse-options.h:142
+msgid "time"
+msgstr "时间"
+
+#: builtin/clone.c:100
+msgid "create a shallow clone since a specific time"
+msgstr "从一个特定时间创建一个浅克隆"
+
+#: builtin/clone.c:101 builtin/fetch.c:124
+msgid "revision"
+msgstr "版本"
+
+#: builtin/clone.c:102 builtin/fetch.c:125
+msgid "deepen history of shallow clone by excluding rev"
+msgstr "通过排除版本来深化浅克隆的历史"
+
+#: builtin/clone.c:104
msgid "clone only one branch, HEAD or --branch"
msgstr "只克隆一个分支、HEAD 或 --branch"
-#: builtin/clone.c:97
+#: builtin/clone.c:106
msgid "any cloned submodules will be shallow"
msgstr "子模组将以浅下载模式克隆"
-#: builtin/clone.c:98 builtin/init-db.c:482
+#: builtin/clone.c:107 builtin/init-db.c:484
msgid "gitdir"
msgstr "git目录"
-#: builtin/clone.c:99 builtin/init-db.c:483
+#: builtin/clone.c:108 builtin/init-db.c:485
msgid "separate git dir from working tree"
msgstr "git目录和工作区分离"
-#: builtin/clone.c:100
+#: builtin/clone.c:109
msgid "key=value"
msgstr "key=value"
-#: builtin/clone.c:101
+#: builtin/clone.c:110
msgid "set config inside the new repository"
msgstr "在新仓库中设置配置信息"
-#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547
+#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547
msgid "use IPv4 addresses only"
msgstr "只使用 IPv4 地址"
-#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549
+#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549
msgid "use IPv6 addresses only"
msgstr "只使用 IPv6 地址"
-#: builtin/clone.c:241
+#: builtin/clone.c:250
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"无法猜到目录名。\n"
"请在命令行指定一个目录"
-#: builtin/clone.c:307
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
-
-#: builtin/clone.c:309
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "参考仓库 '%s' 不是一个本地仓库。"
-
-#: builtin/clone.c:314
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "参考仓库 '%s' 是一个浅克隆"
-
-#: builtin/clone.c:317
+#: builtin/clone.c:303
#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "参考仓库 '%s' 已被嫁接"
+msgid "info: Could not add alternate for '%s': %s\n"
+msgstr "info: 不能为 '%s' 添加一个备用：%s\n"
-#: builtin/clone.c:376
+#: builtin/clone.c:375
#, c-format
msgid "failed to open '%s'"
msgstr "无法打开 '%s'"
-#: builtin/clone.c:384
+#: builtin/clone.c:383
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s 存在且不是一个目录"
-#: builtin/clone.c:398
+#: builtin/clone.c:397
#, c-format
msgid "failed to stat %s\n"
msgstr "无法枚举 %s 状态\n"
-#: builtin/clone.c:420
+#: builtin/clone.c:419
#, c-format
msgid "failed to create link '%s'"
msgstr "无法创建链接 '%s'"
-#: builtin/clone.c:424
+#: builtin/clone.c:423
#, c-format
msgid "failed to copy file to '%s'"
msgstr "无法拷贝文件至 '%s'"
-#: builtin/clone.c:449
+#: builtin/clone.c:448
#, c-format
msgid "done.\n"
msgstr "完成。\n"
-#: builtin/clone.c:461
+#: builtin/clone.c:460
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"
"'git checkout -f HEAD' 重试\n"
-#: builtin/clone.c:538
+#: builtin/clone.c:537
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "不能发现要克隆的远程分支 %s。"
-#: builtin/clone.c:633
+#: builtin/clone.c:632
msgid "remote did not send all necessary objects"
msgstr "远程没有发送所有必须的对象"
-#: builtin/clone.c:649
+#: builtin/clone.c:648
#, c-format
msgid "unable to update %s"
msgstr "不能更新 %s"
-#: builtin/clone.c:698
+#: builtin/clone.c:697
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
-#: builtin/clone.c:729
+#: builtin/clone.c:728
msgid "unable to checkout working tree"
msgstr "不能检出工作区"
-#: builtin/clone.c:766
+#: builtin/clone.c:768
msgid "unable to write parameters to config file"
msgstr "无法将参数写入配置文件"
-#: builtin/clone.c:829
+#: builtin/clone.c:831
msgid "cannot repack to clean up"
msgstr "无法执行 repack 来清理"
-#: builtin/clone.c:831
+#: builtin/clone.c:833
msgid "cannot unlink temporary alternates file"
msgstr "无法删除临时的 alternates 文件"
-#: builtin/clone.c:863 builtin/receive-pack.c:1855
+#: builtin/clone.c:866 builtin/receive-pack.c:1895
msgid "Too many arguments."
msgstr "太多参数。"
-#: builtin/clone.c:867
+#: builtin/clone.c:870
msgid "You must specify a repository to clone."
msgstr "您必须指定一个仓库来克隆。"
-#: builtin/clone.c:878
+#: builtin/clone.c:883
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare 和 --origin %s 选项不兼容。"
-#: builtin/clone.c:881
+#: builtin/clone.c:886
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare 和 --separate-git-dir 选项不兼容。"
-#: builtin/clone.c:894
+#: builtin/clone.c:899
#, c-format
msgid "repository '%s' does not exist"
msgstr "仓库 '%s' 不存在"
-#: builtin/clone.c:900 builtin/fetch.c:1293
+#: builtin/clone.c:905 builtin/fetch.c:1338
#, c-format
msgid "depth %s is not a positive number"
msgstr "深度 %s 不是一个正数"
-#: builtin/clone.c:910
+#: builtin/clone.c:915
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
-#: builtin/clone.c:920
+#: builtin/clone.c:925
#, c-format
msgid "working tree '%s' already exists."
msgstr "工作区 '%s' 已经存在。"
-#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544
+#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657
#: builtin/worktree.c:222 builtin/worktree.c:249
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "不能为 '%s' 创建先导目录"
-#: builtin/clone.c:938
+#: builtin/clone.c:943
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "不能创建工作区目录 '%s'"
-#: builtin/clone.c:956
+#: builtin/clone.c:955
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "克隆到纯仓库 '%s'...\n"
-#: builtin/clone.c:958
+#: builtin/clone.c:957
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "正克隆到 '%s'...\n"
-#: builtin/clone.c:997
+#: builtin/clone.c:963
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
+msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
+
+#: builtin/clone.c:1019
msgid "--depth is ignored in local clones; use file:// instead."
-msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"
+msgstr "--depth 在本地克隆时被忽略，请改用 file:// 协议。"
+
+#: builtin/clone.c:1021
+msgid "--shallow-since is ignored in local clones; use file:// instead."
+msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1000
+#: builtin/clone.c:1023
+msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// 协议。"
+
+#: builtin/clone.c:1026
msgid "source repository is shallow, ignoring --local"
msgstr "源仓库是浅克隆，忽略 --local"
-#: builtin/clone.c:1005
+#: builtin/clone.c:1031
msgid "--local is ignored"
msgstr "--local 被忽略"
-#: builtin/clone.c:1009
+#: builtin/clone.c:1035
#, c-format
msgid "Don't know how to clone %s"
msgstr "不知道如何克隆 %s"
-#: builtin/clone.c:1058 builtin/clone.c:1066
+#: builtin/clone.c:1090 builtin/clone.c:1098
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "远程分支 %s 在上游 %s 未发现"
-#: builtin/clone.c:1069
+#: builtin/clone.c:1101
msgid "You appear to have cloned an empty repository."
msgstr "您似乎克隆了一个空仓库。"
"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
"操作。\n"
-#: builtin/commit.c:308
+#: builtin/commit.c:318
msgid "failed to unpack HEAD tree object"
msgstr "无法解包 HEAD 树对象"
-#: builtin/commit.c:349
+#: builtin/commit.c:359
msgid "unable to create temporary index"
msgstr "不能创建临时索引"
-#: builtin/commit.c:355
+#: builtin/commit.c:365
msgid "interactive add failed"
msgstr "交互式添加失败"
-#: builtin/commit.c:368
+#: builtin/commit.c:378
msgid "unable to update temporary index"
msgstr "无法更新临时索引"
-#: builtin/commit.c:370
+#: builtin/commit.c:380
msgid "Failed to update main cache tree"
msgstr "不能更新树的主缓存"
-#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466
+#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
msgid "unable to write new_index file"
msgstr "无法写 new_index 文件"
-#: builtin/commit.c:448
+#: builtin/commit.c:458
msgid "cannot do a partial commit during a merge."
msgstr "在合并过程中不能做部分提交。"
-#: builtin/commit.c:450
+#: builtin/commit.c:460
msgid "cannot do a partial commit during a cherry-pick."
msgstr "在拣选过程中不能做部分提交。"
-#: builtin/commit.c:459
+#: builtin/commit.c:469
msgid "cannot read the index"
msgstr "无法读取索引"
-#: builtin/commit.c:478
+#: builtin/commit.c:488
msgid "unable to write temporary index file"
msgstr "无法写临时索引文件"
-#: builtin/commit.c:583
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "提交 '%s' 缺少作者信息"
-#: builtin/commit.c:585
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "提交 '%s' 有非法的作者信息"
-#: builtin/commit.c:604
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "非法的 --author 参数"
-#: builtin/commit.c:612
+#: builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "无效的日期格式：%s"
-#: builtin/commit.c:656
+#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr "无法选择一个未被当前提交说明使用的注释字符"
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
#, c-format
msgid "could not lookup commit %s"
msgstr "不能查询提交 %s"
-#: builtin/commit.c:705 builtin/shortlog.c:286
+#: builtin/commit.c:704 builtin/shortlog.c:286
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "（正从标准输入中读取日志信息）\n"
-#: builtin/commit.c:707
+#: builtin/commit.c:706
msgid "could not read log from standard input"
msgstr "不能从标准输入中读取日志信息"
-#: builtin/commit.c:711
+#: builtin/commit.c:710
#, c-format
msgid "could not read log file '%s'"
msgstr "不能读取日志文件 '%s'"
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:737 builtin/commit.c:745
msgid "could not read SQUASH_MSG"
msgstr "不能读取 SQUASH_MSG"
-#: builtin/commit.c:743
+#: builtin/commit.c:742
msgid "could not read MERGE_MSG"
msgstr "不能读取 MERGE_MSG"
-#: builtin/commit.c:797
+#: builtin/commit.c:796
msgid "could not write commit template"
msgstr "不能写提交模版"
-#: builtin/commit.c:815
+#: builtin/commit.c:814
#, c-format
msgid ""
"\n"
"\t%s\n"
"然后重试。\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
"\t%s\n"
"然后重试。\n"
-#: builtin/commit.c:833
+#: builtin/commit.c:832
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"
"说明将会终止提交。\n"
-#: builtin/commit.c:840
+#: builtin/commit.c:839
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"也可以删除它们。一个空的提交说明将会终止提交。\n"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:860
+#: builtin/commit.c:859
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%s作者： %.*s <%.*s>"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:868
+#: builtin/commit.c:867
#, c-format
msgid "%sDate: %s"
msgstr "%s日期： %s"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:875
+#: builtin/commit.c:874
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%s提交者：%.*s <%.*s>"
-#: builtin/commit.c:893
+#: builtin/commit.c:892
msgid "Cannot read index"
msgstr "无法读取索引"
-#: builtin/commit.c:950
+#: builtin/commit.c:954
msgid "Error building trees"
msgstr "无法创建树对象"
-#: builtin/commit.c:965 builtin/tag.c:266
+#: builtin/commit.c:969 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
-#: builtin/commit.c:1067
+#: builtin/commit.c:1071
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr "--author '%s' 不是 'Name <email>' 格式，且未能在现有作者中找到匹配"
-#: builtin/commit.c:1082 builtin/commit.c:1322
+#: builtin/commit.c:1086 builtin/commit.c:1327
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "无效的未追踪文件参数 '%s'"
-#: builtin/commit.c:1119
+#: builtin/commit.c:1124
msgid "--long and -z are incompatible"
msgstr "--long 和 -z 选项不兼容"
-#: builtin/commit.c:1149
+#: builtin/commit.c:1154
msgid "Using both --reset-author and --author does not make sense"
msgstr "同时使用 --reset-author 和 --author 没有意义"
-#: builtin/commit.c:1158
+#: builtin/commit.c:1163
msgid "You have nothing to amend."
msgstr "您没有可修补的提交。"
-#: builtin/commit.c:1161
+#: builtin/commit.c:1166
msgid "You are in the middle of a merge -- cannot amend."
msgstr "您正处于一个合并过程中 -- 无法修补提交。"
-#: builtin/commit.c:1163
+#: builtin/commit.c:1168
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
-#: builtin/commit.c:1166
+#: builtin/commit.c:1171
msgid "Options --squash and --fixup cannot be used together"
msgstr "选项 --squash 和 --fixup 不能同时使用"
-#: builtin/commit.c:1176
+#: builtin/commit.c:1181
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
-#: builtin/commit.c:1178
+#: builtin/commit.c:1183
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
-#: builtin/commit.c:1186
+#: builtin/commit.c:1191
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
-#: builtin/commit.c:1203
+#: builtin/commit.c:1208
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
-#: builtin/commit.c:1205
+#: builtin/commit.c:1210
msgid "No paths with --include/--only does not make sense."
msgstr "参数 --include/--only 不跟路径没有意义。"
-#: builtin/commit.c:1207
+#: builtin/commit.c:1212
msgid "Clever... amending the last one with dirty index."
msgstr "聪明... 用脏索引修补最后一个提交。"
-#: builtin/commit.c:1209
+#: builtin/commit.c:1214
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "指定了明确的路径而没有使用 -i 或 -o 选项，认为是 --only paths..."
-#: builtin/commit.c:1221 builtin/tag.c:474
+#: builtin/commit.c:1226 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "无效的清理模式 %s"
-#: builtin/commit.c:1226
+#: builtin/commit.c:1231
msgid "Paths with -a does not make sense."
msgstr "路径和 -a 选项同时使用没有意义。"
-#: builtin/commit.c:1336 builtin/commit.c:1622
+#: builtin/commit.c:1341 builtin/commit.c:1617
msgid "show status concisely"
msgstr "以简洁的格式显示状态"
-#: builtin/commit.c:1338 builtin/commit.c:1624
+#: builtin/commit.c:1343 builtin/commit.c:1619
msgid "show branch information"
msgstr "显示分支信息"
-#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522
+#: builtin/commit.c:1345
+msgid "version"
+msgstr "版本"
+
+#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522
#: builtin/worktree.c:440
msgid "machine-readable output"
msgstr "机器可读的输出"
-#: builtin/commit.c:1343 builtin/commit.c:1628
+#: builtin/commit.c:1348 builtin/commit.c:1623
msgid "show status in long format (default)"
msgstr "以长格式显示状态（默认）"
-#: builtin/commit.c:1346 builtin/commit.c:1631
+#: builtin/commit.c:1351 builtin/commit.c:1626
msgid "terminate entries with NUL"
msgstr "条目以 NUL 字符结尾"
-#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981
+#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "模式"
-#: builtin/commit.c:1349 builtin/commit.c:1634
+#: builtin/commit.c:1354 builtin/commit.c:1629
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"
-#: builtin/commit.c:1352
+#: builtin/commit.c:1357
msgid "show ignored files"
msgstr "显示忽略的文件"
-#: builtin/commit.c:1353 parse-options.h:155
+#: builtin/commit.c:1358 parse-options.h:155
msgid "when"
msgstr "何时"
-#: builtin/commit.c:1354
+#: builtin/commit.c:1359
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
"忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"
-#: builtin/commit.c:1356
+#: builtin/commit.c:1361
msgid "list untracked files in columns"
msgstr "以列的方式显示未跟踪的文件"
-#: builtin/commit.c:1442
+#: builtin/commit.c:1437
msgid "couldn't look up newly created commit"
msgstr "无法找到新创建的提交"
-#: builtin/commit.c:1444
+#: builtin/commit.c:1439
msgid "could not parse newly created commit"
msgstr "不能解析新创建的提交"
-#: builtin/commit.c:1489
+#: builtin/commit.c:1484
msgid "detached HEAD"
msgstr "分离头指针"
# 译者：中文字符串拼接，可删除前导空格
-#: builtin/commit.c:1492
+#: builtin/commit.c:1487
msgid " (root-commit)"
msgstr "（根提交）"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1587
msgid "suppress summary after successful commit"
msgstr "提交成功后不显示概述信息"
-#: builtin/commit.c:1593
+#: builtin/commit.c:1588
msgid "show diff in commit message template"
msgstr "在提交说明模板里显示差异"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1590
msgid "Commit message options"
msgstr "提交说明选项"
-#: builtin/commit.c:1596 builtin/tag.c:351
+#: builtin/commit.c:1591 builtin/tag.c:351
msgid "read message from file"
msgstr "从文件中读取提交说明"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1592
msgid "author"
msgstr "作者"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1592
msgid "override author for commit"
msgstr "提交时覆盖作者"
-#: builtin/commit.c:1598 builtin/gc.c:326
+#: builtin/commit.c:1593 builtin/gc.c:326
msgid "date"
msgstr "日期"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1593
msgid "override date for commit"
msgstr "提交时覆盖日期"
-#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396
-#: builtin/notes.c:559 builtin/tag.c:349
+#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398
+#: builtin/notes.c:561 builtin/tag.c:349
msgid "message"
msgstr "说明"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1594
msgid "commit message"
msgstr "提交说明"
-#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602
-#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
+#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79
msgid "commit"
msgstr "提交"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1595
msgid "reuse and edit message from specified commit"
msgstr "重用并编辑指定提交的提交说明"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1596
msgid "reuse message from specified commit"
msgstr "重用指定提交的提交说明"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1597
msgid "use autosquash formatted message to fixup specified commit"
msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1598
msgid "use autosquash formatted message to squash specified commit"
msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1599
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"
-#: builtin/commit.c:1605 builtin/log.c:1409 builtin/revert.c:86
+#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "添加 Signed-off-by: 签名"
-#: builtin/commit.c:1606
+#: builtin/commit.c:1601
msgid "use specified template file"
msgstr "使用指定的模板文件"
-#: builtin/commit.c:1607
+#: builtin/commit.c:1602
msgid "force edit of commit"
msgstr "强制编辑提交"
# 译者：可选值，不能翻译（或是原文中笔误，应为 mode）
-#: builtin/commit.c:1608
+#: builtin/commit.c:1603
msgid "default"
msgstr "default"
-#: builtin/commit.c:1608 builtin/tag.c:354
+#: builtin/commit.c:1603 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "设置如何删除提交说明里的空格和#注释"
-#: builtin/commit.c:1609
+#: builtin/commit.c:1604
msgid "include status in commit message template"
msgstr "在提交说明模板里包含状态信息"
-#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165
+#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "GPG 提交签名"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1609
msgid "Commit contents options"
msgstr "提交内容选项"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1610
msgid "commit all changed files"
msgstr "提交所有改动的文件"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1611
msgid "add specified files to index for commit"
msgstr "添加指定的文件到索引区等待提交"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1612
msgid "interactively add files"
msgstr "交互式添加文件"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1613
msgid "interactively add changes"
msgstr "交互式添加变更"
-#: builtin/commit.c:1619
+#: builtin/commit.c:1614
msgid "commit only specified files"
msgstr "只提交指定的文件"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1615
msgid "bypass pre-commit and commit-msg hooks"
msgstr "绕过 pre-commit 和 commit-msg 钩子"
-#: builtin/commit.c:1621
+#: builtin/commit.c:1616
msgid "show what would be committed"
msgstr "显示将要提交的内容"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1627
msgid "amend previous commit"
msgstr "修改先前的提交"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1628
msgid "bypass post-rewrite hook"
msgstr "绕过 post-rewrite 钩子"
-#: builtin/commit.c:1638
+#: builtin/commit.c:1633
msgid "ok to record an empty change"
msgstr "允许一个空提交"
-#: builtin/commit.c:1640
+#: builtin/commit.c:1635
msgid "ok to record a change with an empty message"
msgstr "允许空的提交说明"
-#: builtin/commit.c:1669
+#: builtin/commit.c:1664
msgid "could not parse HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: builtin/commit.c:1719
+#: builtin/commit.c:1712
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "损坏的 MERGE_HEAD 文件（%s）"
-#: builtin/commit.c:1726
+#: builtin/commit.c:1719
msgid "could not read MERGE_MODE"
msgstr "不能读取 MERGE_MODE"
-#: builtin/commit.c:1745
+#: builtin/commit.c:1738
#, c-format
msgid "could not read commit message: %s"
msgstr "不能读取提交说明：%s"
-#: builtin/commit.c:1756
+#: builtin/commit.c:1749
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "终止提交；您未更改来自模版的提交说明。\n"
-#: builtin/commit.c:1761
+#: builtin/commit.c:1754
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "终止提交因为提交说明为空。\n"
-#: builtin/commit.c:1809
+#: builtin/commit.c:1802
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
msgid "cannot create configuration file %s"
msgstr "不能创建配置文件 %s"
-#: builtin/count-objects.c:77
+#: builtin/config.c:625
+#, 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。"
+
+#: builtin/count-objects.c:86
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:96
msgid "print sizes in human readable format"
msgstr "以用户可读的格式显示大小"
msgid "only consider tags matching <pattern>"
msgstr "只考虑匹配 <模式> 的标签"
-#: builtin/describe.c:410 builtin/name-rev.c:321
+#: builtin/describe.c:410 builtin/name-rev.c:320
msgid "show abbreviated commit object as fallback"
msgstr "显示简写的提交号作为后备"
msgid "invalid option: %s"
msgstr "无效选项：%s"
-#: builtin/diff.c:360
+#: builtin/diff.c:361
msgid "Not a git repository"
msgstr "不是一个 git 仓库"
-#: builtin/diff.c:403
+#: builtin/diff.c:404
#, c-format
msgid "invalid object '%s' given."
msgstr "提供了无效对象 '%s'。"
-#: builtin/diff.c:412
+#: builtin/diff.c:413
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "提供了超过两个数据对象：'%s'"
-#: builtin/diff.c:419
+#: builtin/diff.c:420
#, c-format
msgid "unhandled object '%s' given."
msgstr "无法处理的对象 '%s'。"
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<选项>]"
-#: builtin/fetch.c:93 builtin/pull.c:174
+#: builtin/fetch.c:95 builtin/pull.c:175
msgid "fetch from all remotes"
msgstr "从所有的远程抓取"
-#: builtin/fetch.c:95 builtin/pull.c:177
+#: builtin/fetch.c:97 builtin/pull.c:178
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
-#: builtin/fetch.c:97 builtin/pull.c:180
+#: builtin/fetch.c:99 builtin/pull.c:181
msgid "path to upload pack on remote end"
msgstr "上传包到远程的路径"
-#: builtin/fetch.c:98 builtin/pull.c:182
+#: builtin/fetch.c:100 builtin/pull.c:183
msgid "force overwrite of local branch"
msgstr "强制覆盖本地分支"
-#: builtin/fetch.c:100
+#: builtin/fetch.c:102
msgid "fetch from multiple remotes"
msgstr "从多个远程抓取"
-#: builtin/fetch.c:102 builtin/pull.c:184
+#: builtin/fetch.c:104 builtin/pull.c:185
msgid "fetch all tags and associated objects"
msgstr "抓取所有的标签和关联对象"
-#: builtin/fetch.c:104
+#: builtin/fetch.c:106
msgid "do not fetch all tags (--no-tags)"
msgstr "不抓取任何标签(--no-tags)"
-#: builtin/fetch.c:106
+#: builtin/fetch.c:108
msgid "number of submodules fetched in parallel"
msgstr "子模组获取的并发数"
-#: builtin/fetch.c:108 builtin/pull.c:187
+#: builtin/fetch.c:110 builtin/pull.c:188
msgid "prune remote-tracking branches no longer on remote"
msgstr "清除远程已经不存在的分支的跟踪分支"
# 译者：可选值，不能翻译
-#: builtin/fetch.c:109 builtin/pull.c:190
+#: builtin/fetch.c:111 builtin/pull.c:191
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:110 builtin/pull.c:191
+#: builtin/fetch.c:112 builtin/pull.c:192
msgid "control recursive fetching of submodules"
msgstr "控制子模组的递归抓取"
-#: builtin/fetch.c:114 builtin/pull.c:199
+#: builtin/fetch.c:116 builtin/pull.c:200
msgid "keep downloaded pack"
msgstr "保持下载包"
-#: builtin/fetch.c:116
+#: builtin/fetch.c:118
msgid "allow updating of HEAD ref"
msgstr "允许更新 HEAD 引用"
-#: builtin/fetch.c:119 builtin/pull.c:202
+#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
msgid "deepen history of shallow clone"
msgstr "深化浅克隆的历史"
-#: builtin/fetch.c:121 builtin/pull.c:205
+#: builtin/fetch.c:123
+msgid "deepen history of shallow repository based on time"
+msgstr "基于时间来深化浅克隆的历史"
+
+#: builtin/fetch.c:129 builtin/pull.c:206
msgid "convert to a complete repository"
msgstr "转换为一个完整的仓库"
-#: builtin/fetch.c:123 builtin/log.c:1426
+#: builtin/fetch.c:131 builtin/log.c:1433
msgid "dir"
msgstr "目录"
-#: builtin/fetch.c:124
+#: builtin/fetch.c:132
msgid "prepend this to submodule path output"
msgstr "在子模组路径输出的前面加上此目录"
-#: builtin/fetch.c:127
+#: builtin/fetch.c:135
msgid "default mode for recursion"
msgstr "递归的默认模式"
-#: builtin/fetch.c:129 builtin/pull.c:208
+#: builtin/fetch.c:137 builtin/pull.c:209
msgid "accept refs that update .git/shallow"
msgstr "接受更新 .git/shallow 的引用"
-#: builtin/fetch.c:130 builtin/pull.c:210
+#: builtin/fetch.c:138 builtin/pull.c:211
msgid "refmap"
msgstr "引用映射"
-#: builtin/fetch.c:131 builtin/pull.c:211
+#: builtin/fetch.c:139 builtin/pull.c:212
msgid "specify fetch refmap"
msgstr "指定获取操作的引用映射"
-#: builtin/fetch.c:387
+#: builtin/fetch.c:398
msgid "Couldn't find remote ref HEAD"
msgstr "无法发现远程 HEAD 引用"
-#: builtin/fetch.c:503
+#: builtin/fetch.c:514
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "配置变量 fetch.output 包含无效值 %s"
-#: builtin/fetch.c:592
+#: builtin/fetch.c:607
#, c-format
msgid "object %s not found"
msgstr "对象 %s 未发现"
-#: builtin/fetch.c:596
+#: builtin/fetch.c:611
msgid "[up to date]"
msgstr "[最新]"
-#: builtin/fetch.c:609 builtin/fetch.c:689
+#: builtin/fetch.c:624 builtin/fetch.c:704
msgid "[rejected]"
msgstr "[已拒绝]"
-#: builtin/fetch.c:610
+#: builtin/fetch.c:625
msgid "can't fetch in current branch"
msgstr "当前分支下不能执行获取操作"
-#: builtin/fetch.c:619
+#: builtin/fetch.c:634
msgid "[tag update]"
msgstr "[标签更新]"
-#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669
-#: builtin/fetch.c:684
+#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684
+#: builtin/fetch.c:699
msgid "unable to update local ref"
msgstr "不能更新本地引用"
-#: builtin/fetch.c:639
+#: builtin/fetch.c:654
msgid "[new tag]"
msgstr "[新标签]"
-#: builtin/fetch.c:642
+#: builtin/fetch.c:657
msgid "[new branch]"
msgstr "[新分支]"
-#: builtin/fetch.c:645
+#: builtin/fetch.c:660
msgid "[new ref]"
msgstr "[新引用]"
-#: builtin/fetch.c:684
+#: builtin/fetch.c:699
msgid "forced update"
msgstr "强制更新"
-#: builtin/fetch.c:689
+#: builtin/fetch.c:704
msgid "non-fast-forward"
msgstr "非快进"
-#: builtin/fetch.c:733
+#: builtin/fetch.c:749
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s 未发送所有必须的对象\n"
-#: builtin/fetch.c:753
+#: builtin/fetch.c:769
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "拒绝 %s 因为浅克隆不允许被更新"
-#: builtin/fetch.c:839 builtin/fetch.c:934
+#: builtin/fetch.c:856 builtin/fetch.c:952
#, c-format
msgid "From %.*s\n"
msgstr "来自 %.*s\n"
-#: builtin/fetch.c:850
+#: builtin/fetch.c:867
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' 来删除旧的、有冲突的分支"
# 译者：注意保持前导空格
-#: builtin/fetch.c:904
+#: builtin/fetch.c:922
#, c-format
msgid " (%s will become dangling)"
msgstr " （%s 将成为摇摆状态）"
# 译者：注意保持前导空格
-#: builtin/fetch.c:905
+#: builtin/fetch.c:923
#, c-format
msgid " (%s has become dangling)"
msgstr " （%s 已成为摇摆状态）"
-#: builtin/fetch.c:937
+#: builtin/fetch.c:955
msgid "[deleted]"
msgstr "[已删除]"
-#: builtin/fetch.c:938 builtin/remote.c:1020
+#: builtin/fetch.c:956 builtin/remote.c:1020
msgid "(none)"
msgstr "（无）"
-#: builtin/fetch.c:960
+#: builtin/fetch.c:979
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "拒绝获取到非纯仓库的当前分支 %s"
-#: builtin/fetch.c:979
+#: builtin/fetch.c:998
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
-#: builtin/fetch.c:982
+#: builtin/fetch.c:1001
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "选项 \"%s\" 为 %s 所忽略\n"
-#: builtin/fetch.c:1039
+#: builtin/fetch.c:1077
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "不知道如何从 %s 获取"
-#: builtin/fetch.c:1199
+#: builtin/fetch.c:1237
#, c-format
msgid "Fetching %s\n"
msgstr "正在获取 %s\n"
-#: builtin/fetch.c:1201 builtin/remote.c:96
+#: builtin/fetch.c:1239 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "不能获取 %s"
-#: builtin/fetch.c:1219
+#: builtin/fetch.c:1257
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:1242
+#: builtin/fetch.c:1280
msgid "You need to specify a tag name."
msgstr "您需要指定一个标签名称。"
-#: builtin/fetch.c:1284
+#: builtin/fetch.c:1322
+msgid "Negative depth in --deepen is not supported"
+msgstr "--deepen 不支持负数深度"
+
+#: builtin/fetch.c:1324
+msgid "--deepen and --depth are mutually exclusive"
+msgstr "--deepen 和 --depth 是互斥的"
+
+#: builtin/fetch.c:1329
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth 和 --unshallow 不能同时使用"
-#: builtin/fetch.c:1286
+#: builtin/fetch.c:1331
msgid "--unshallow on a complete repository does not make sense"
msgstr "对于一个完整的仓库，参数 --unshallow 没有意义"
-#: builtin/fetch.c:1306
+#: builtin/fetch.c:1353
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all 不能带一个仓库参数"
-#: builtin/fetch.c:1308
+#: builtin/fetch.c:1355
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all 带引用规格没有任何意义"
-#: builtin/fetch.c:1319
+#: builtin/fetch.c:1366
#, c-format
msgid "No such remote or remote group: %s"
msgstr "没有这样的远程或远程组：%s"
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1374
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "获取组并指定引用规格没有意义"
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:663
msgid "populate log with at most <n> entries from shortlog"
msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:666
msgid "alias for --log (deprecated)"
msgstr "参数 --log 的别名（已弃用）"
-#: builtin/fmt-merge-msg.c:673
+#: builtin/fmt-merge-msg.c:669
msgid "text"
msgstr "文本"
-#: builtin/fmt-merge-msg.c:674
+#: builtin/fmt-merge-msg.c:670
msgid "use <text> as start of message"
msgstr "使用 <文本> 作为提交说明的开始"
-#: builtin/fmt-merge-msg.c:675
+#: builtin/fmt-merge-msg.c:671
msgid "file to read from"
msgstr "从文件中读取"
msgid "show verbose names for reachable objects"
msgstr "显示可达对象的详细名称"
-#: builtin/fsck.c:671
+#: builtin/fsck.c:665
msgid "Checking objects"
msgstr "检查对象中"
msgid "invalid number of threads specified (%d) for %s"
msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
-#: builtin/grep.c:452 builtin/grep.c:487
+#: builtin/grep.c:453 builtin/grep.c:488
#, c-format
msgid "unable to read tree (%s)"
msgstr "无法读取树（%s）"
-#: builtin/grep.c:502
+#: builtin/grep.c:503
#, c-format
msgid "unable to grep from object of type %s"
msgstr "无法抓取来自于 %s 类型的对象"
-#: builtin/grep.c:560
+#: builtin/grep.c:561
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "开关 `%c' 期望一个数字值"
-#: builtin/grep.c:577
-#, c-format
-msgid "cannot open '%s'"
-msgstr "不能打开 '%s'"
-
-#: builtin/grep.c:646
+#: builtin/grep.c:647
msgid "search in index instead of in the work tree"
msgstr "在索引区搜索而不是在工作区"
-#: builtin/grep.c:648
+#: builtin/grep.c:649
msgid "find in contents not managed by git"
msgstr "在未被 git 管理的内容中查找"
# 译者：中文字符串拼接，可删除前导空格
-#: builtin/grep.c:650
+#: builtin/grep.c:651
msgid "search in both tracked and untracked files"
msgstr "在跟踪和未跟踪的文件中搜索"
-#: builtin/grep.c:652
+#: builtin/grep.c:653
msgid "ignore files specified via '.gitignore'"
msgstr "忽略 '.gitignore' 包含的文件"
-#: builtin/grep.c:655
+#: builtin/grep.c:656
msgid "show non-matching lines"
msgstr "显示未匹配的行"
-#: builtin/grep.c:657
+#: builtin/grep.c:658
msgid "case insensitive matching"
msgstr "不区分大小写匹配"
-#: builtin/grep.c:659
+#: builtin/grep.c:660
msgid "match patterns only at word boundaries"
msgstr "只在单词边界匹配模式"
-#: builtin/grep.c:661
+#: builtin/grep.c:662
msgid "process binary files as text"
msgstr "把二进制文件当做文本处理"
-#: builtin/grep.c:663
+#: builtin/grep.c:664
msgid "don't match patterns in binary files"
msgstr "不在二进制文件中匹配模式"
-#: builtin/grep.c:666
+#: builtin/grep.c:667
msgid "process binary files with textconv filters"
msgstr "用 textconv 过滤器处理二进制文件"
-#: builtin/grep.c:668
+#: builtin/grep.c:669
msgid "descend at most <depth> levels"
msgstr "最多以指定的深度向下寻找"
-#: builtin/grep.c:672
+#: builtin/grep.c:673
msgid "use extended POSIX regular expressions"
msgstr "使用扩展的 POSIX 正则表达式"
-#: builtin/grep.c:675
+#: builtin/grep.c:676
msgid "use basic POSIX regular expressions (default)"
msgstr "使用基本的 POSIX 正则表达式（默认）"
-#: builtin/grep.c:678
+#: builtin/grep.c:679
msgid "interpret patterns as fixed strings"
msgstr "把模式解析为固定的字符串"
-#: builtin/grep.c:681
+#: builtin/grep.c:682
msgid "use Perl-compatible regular expressions"
msgstr "使用 Perl 兼容的正则表达式"
-#: builtin/grep.c:684
+#: builtin/grep.c:685
msgid "show line numbers"
msgstr "显示行号"
-#: builtin/grep.c:685
+#: builtin/grep.c:686
msgid "don't show filenames"
msgstr "不显示文件名"
-#: builtin/grep.c:686
+#: builtin/grep.c:687
msgid "show filenames"
msgstr "显示文件名"
-#: builtin/grep.c:688
+#: builtin/grep.c:689
msgid "show filenames relative to top directory"
msgstr "显示相对于顶级目录的文件名"
-#: builtin/grep.c:690
+#: builtin/grep.c:691
msgid "show only filenames instead of matching lines"
msgstr "只显示文件名而不显示匹配的行"
-#: builtin/grep.c:692
+#: builtin/grep.c:693
msgid "synonym for --files-with-matches"
msgstr "和 --files-with-matches 同义"
-#: builtin/grep.c:695
+#: builtin/grep.c:696
msgid "show only the names of files without match"
msgstr "只显示未匹配的文件名"
-#: builtin/grep.c:697
+#: builtin/grep.c:698
msgid "print NUL after filenames"
msgstr "在文件名后输出 NUL 字符"
-#: builtin/grep.c:699
+#: builtin/grep.c:700
msgid "show the number of matches instead of matching lines"
msgstr "显示总匹配行数，而不显示匹配的行"
-#: builtin/grep.c:700
+#: builtin/grep.c:701
msgid "highlight matches"
msgstr "高亮显示匹配项"
-#: builtin/grep.c:702
+#: builtin/grep.c:703
msgid "print empty line between matches from different files"
msgstr "在不同文件的匹配项之间打印空行"
-#: builtin/grep.c:704
+#: builtin/grep.c:705
msgid "show filename only once above matches from same file"
msgstr "只在同一文件的匹配项的上面显示一次文件名"
-#: builtin/grep.c:707
+#: builtin/grep.c:708
msgid "show <n> context lines before and after matches"
msgstr "显示匹配项前后的 <n> 行上下文"
-#: builtin/grep.c:710
+#: builtin/grep.c:711
msgid "show <n> context lines before matches"
msgstr "显示匹配项前 <n> 行上下文"
-#: builtin/grep.c:712
+#: builtin/grep.c:713
msgid "show <n> context lines after matches"
msgstr "显示匹配项后 <n> 行上下文"
-#: builtin/grep.c:714
+#: builtin/grep.c:715
msgid "use <n> worker threads"
msgstr "使用 <n> 个工作线程"
-#: builtin/grep.c:715
+#: builtin/grep.c:716
msgid "shortcut for -C NUM"
msgstr "快捷键 -C 数字"
-#: builtin/grep.c:718
+#: builtin/grep.c:719
msgid "show a line with the function name before matches"
msgstr "在匹配的前面显示一行函数名"
-#: builtin/grep.c:720
+#: builtin/grep.c:721
msgid "show the surrounding function"
msgstr "显示所在函数的前后内容"
-#: builtin/grep.c:723
+#: builtin/grep.c:724
msgid "read patterns from file"
msgstr "从文件读取模式"
-#: builtin/grep.c:725
+#: builtin/grep.c:726
msgid "match <pattern>"
msgstr "匹配 <模式>"
-#: builtin/grep.c:727
+#: builtin/grep.c:728
msgid "combine patterns specified with -e"
msgstr "组合用 -e 参数设定的模式"
-#: builtin/grep.c:739
+#: builtin/grep.c:740
msgid "indicate hit with exit status without output"
msgstr "不输出，而用退出码标识命中状态"
-#: builtin/grep.c:741
+#: builtin/grep.c:742
msgid "show only matches from files that match all patterns"
msgstr "只显示匹配所有模式的文件中的匹配"
-#: builtin/grep.c:743
+#: builtin/grep.c:744
msgid "show parse tree for grep expression"
msgstr "显示 grep 表达式的解析树"
-#: builtin/grep.c:747
+#: builtin/grep.c:748
msgid "pager"
msgstr "分页"
-#: builtin/grep.c:747
+#: builtin/grep.c:748
msgid "show matching files in the pager"
msgstr "分页显示匹配的文件"
-#: builtin/grep.c:750
+#: builtin/grep.c:751
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "允许调用 grep(1)（本次构建忽略）"
-#: builtin/grep.c:813
+#: builtin/grep.c:814
msgid "no pattern given."
msgstr "未提供模式匹配。"
-#: builtin/grep.c:845 builtin/index-pack.c:1479
+#: builtin/grep.c:846 builtin/index-pack.c:1480
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "指定的线程数无效（%d）"
-#: builtin/grep.c:875
+#: builtin/grep.c:876
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager 仅用于工作区"
-#: builtin/grep.c:901
+#: builtin/grep.c:902
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
-#: builtin/grep.c:906
+#: builtin/grep.c:907
msgid "--no-index or --untracked cannot be used with revs."
msgstr "--no-index 或 --untracked 不能和版本同时使用。"
-#: builtin/grep.c:909
+#: builtin/grep.c:910
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
-#: builtin/grep.c:917
+#: builtin/grep.c:918
msgid "both --cached and trees are given."
msgstr "同时给出了 --cached 和树对象。"
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:93
+#: builtin/hash-object.c:94
msgid "type"
msgstr "类型"
-#: builtin/hash-object.c:93
+#: builtin/hash-object.c:94
msgid "object type"
msgstr "对象类型"
-#: builtin/hash-object.c:94
+#: builtin/hash-object.c:95
msgid "write the object into the object database"
msgstr "将对象写入对象数据库"
-#: builtin/hash-object.c:96
+#: builtin/hash-object.c:97
msgid "read the object from stdin"
msgstr "从标准输入读取对象"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
msgid "store file as is without filters"
msgstr "原样存储文件不使用过滤器"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:100
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
msgid "process file as it were from this path"
msgstr "处理文件并假设其来自于此路径"
-#: builtin/help.c:41
+#: builtin/help.c:42
msgid "print all available commands"
msgstr "打印所有可用的命令"
-#: builtin/help.c:42
+#: builtin/help.c:43
+msgid "exclude guides"
+msgstr "排除向导"
+
+#: builtin/help.c:44
msgid "print list of useful guides"
msgstr "显示有用的指南列表"
-#: builtin/help.c:43
+#: builtin/help.c:45
msgid "show man page"
msgstr "显示 man 手册"
-#: builtin/help.c:44
+#: builtin/help.c:46
msgid "show manual in web browser"
msgstr "在 web 浏览器中显示手册"
-#: builtin/help.c:46
+#: builtin/help.c:48
msgid "show info page"
msgstr "显示 info 手册"
-#: builtin/help.c:52
+#: builtin/help.c:54
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
-#: builtin/help.c:64
+#: builtin/help.c:66
#, c-format
msgid "unrecognized help format '%s'"
msgstr "未能识别的帮助格式 '%s'"
-#: builtin/help.c:91
+#: builtin/help.c:93
msgid "Failed to start emacsclient."
msgstr "无法启动 emacsclient。"
-#: builtin/help.c:104
+#: builtin/help.c:106
msgid "Failed to parse emacsclient version."
msgstr "无法解析 emacsclient 版本。"
-#: builtin/help.c:112
+#: builtin/help.c:114
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient 版本 '%d' 太老（< 22）。"
-#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
+#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
#, c-format
msgid "failed to exec '%s'"
msgstr "无法执行 '%s'"
-#: builtin/help.c:205
+#: builtin/help.c:207
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"'%s'：不支持的 man 手册查看器的路径。\n"
"请使用 'man.<工具>.cmd'。"
-#: builtin/help.c:217
+#: builtin/help.c:219
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"'%s': 支持的 man 手册查看器命令。\n"
"请使用 'man.<工具>.path'。"
-#: builtin/help.c:334
+#: builtin/help.c:336
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s'：未知的 man 查看器。"
-#: builtin/help.c:351
+#: builtin/help.c:353
msgid "no man viewer handled the request"
msgstr "没有 man 查看器处理此请求"
-#: builtin/help.c:359
+#: builtin/help.c:361
msgid "no info viewer handled the request"
msgstr "没有 info 查看器处理此请求"
-#: builtin/help.c:401
+#: builtin/help.c:403
msgid "Defining attributes per path"
msgstr "定义路径的属性"
-#: builtin/help.c:402
+#: builtin/help.c:404
msgid "Everyday Git With 20 Commands Or So"
msgstr "每一天 Git 常用的约 20 条命令"
-#: builtin/help.c:403
+#: builtin/help.c:405
msgid "A Git glossary"
msgstr "Git 词汇表"
-#: builtin/help.c:404
+#: builtin/help.c:406
msgid "Specifies intentionally untracked files to ignore"
msgstr "忽略指定的未跟踪文件"
-#: builtin/help.c:405
+#: builtin/help.c:407
msgid "Defining submodule properties"
msgstr "定义子模组属性"
-#: builtin/help.c:406
+#: builtin/help.c:408
msgid "Specifying revisions and ranges for Git"
msgstr "指定 Git 的版本和版本范围"
-#: builtin/help.c:407
+#: builtin/help.c:409
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "一个 Git 教程（针对 1.5.1 或更新版本）"
-#: builtin/help.c:408
+#: builtin/help.c:410
msgid "An overview of recommended workflows with Git"
msgstr "Git 推荐的工作流概览"
-#: builtin/help.c:420
+#: builtin/help.c:422
msgid "The common Git guides are:\n"
msgstr "最常用的 Git 向导有：\n"
-#: builtin/help.c:441 builtin/help.c:458
-#, c-format
-msgid "usage: %s%s"
-msgstr "用法：%s%s"
-
-#: builtin/help.c:474
+#: builtin/help.c:440
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "`git %s' 是 `%s' 的别名"
-#: builtin/index-pack.c:153
+#: builtin/help.c:462 builtin/help.c:479
+#, c-format
+msgid "usage: %s%s"
+msgstr "用法：%s%s"
+
+#: builtin/index-pack.c:154
#, c-format
msgid "unable to open %s"
msgstr "不能打开 %s"
-#: builtin/index-pack.c:203
+#: builtin/index-pack.c:204
#, c-format
msgid "object type mismatch at %s"
msgstr "%s 的对象类型不匹配"
-#: builtin/index-pack.c:223
+#: builtin/index-pack.c:224
#, c-format
msgid "did not receive expected object %s"
-msgstr "未能获取期望的对象 %s"
+msgstr "未能获取预期的对象 %s"
-#: builtin/index-pack.c:226
+#: builtin/index-pack.c:227
#, c-format
msgid "object %s: expected type %s, found %s"
-msgstr "对象 %s：期待类型 %s，却是 %s"
+msgstr "对象 %s：应为类型 %s，却是 %s"
-#: builtin/index-pack.c:268
+#: builtin/index-pack.c:269
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "无法填充 %d 字节"
msgstr[1] "无法填充 %d 字节"
-#: builtin/index-pack.c:278
+#: builtin/index-pack.c:279
msgid "early EOF"
msgstr "过早的文件结束符（EOF）"
-#: builtin/index-pack.c:279
+#: builtin/index-pack.c:280
msgid "read error on input"
msgstr "输入上的读错误"
-#: builtin/index-pack.c:291
+#: builtin/index-pack.c:292
msgid "used more bytes than were available"
msgstr "用掉了超过可用的字节"
-#: builtin/index-pack.c:298
+#: builtin/index-pack.c:299
msgid "pack too large for current definition of off_t"
msgstr "包太大超过了当前 off_t 的定义"
-#: builtin/index-pack.c:314
+#: builtin/index-pack.c:302 builtin/unpack-objects.c:92
+msgid "pack exceeds maximum allowed size"
+msgstr "包超过了最大允许值"
+
+#: builtin/index-pack.c:317
#, c-format
msgid "unable to create '%s'"
msgstr "不能创建 '%s'"
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:322
#, c-format
msgid "cannot open packfile '%s'"
msgstr "无法打开包文件 '%s'"
-#: builtin/index-pack.c:333
+#: builtin/index-pack.c:336
msgid "pack signature mismatch"
msgstr "包签名不匹配"
-#: builtin/index-pack.c:335
+#: builtin/index-pack.c:338
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "不支持包版本 %<PRIu32>"
-#: builtin/index-pack.c:353
+#: builtin/index-pack.c:356
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>：%s"
-#: builtin/index-pack.c:475
+#: builtin/index-pack.c:478
#, c-format
msgid "inflate returned %d"
msgstr "解压缩返回 %d"
-#: builtin/index-pack.c:524
+#: builtin/index-pack.c:527
msgid "offset value overflow for delta base object"
msgstr "偏移值覆盖了 delta 基准对象"
-#: builtin/index-pack.c:532
+#: builtin/index-pack.c:535
msgid "delta base offset is out of bound"
msgstr "delta 基准偏移越界"
-#: builtin/index-pack.c:540
+#: builtin/index-pack.c:543
#, c-format
msgid "unknown object type %d"
msgstr "未知对象类型 %d"
-#: builtin/index-pack.c:571
+#: builtin/index-pack.c:574
msgid "cannot pread pack file"
msgstr "无法读取包文件"
-#: builtin/index-pack.c:573
+#: builtin/index-pack.c:576
#, 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:599
+#: builtin/index-pack.c:602
msgid "serious inflate inconsistency"
msgstr "解压缩严重的不一致"
-#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774
-#: builtin/index-pack.c:808 builtin/index-pack.c:817
+#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
+#: builtin/index-pack.c:811 builtin/index-pack.c:820
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "发现 %s 出现 SHA1 冲突！"
-#: builtin/index-pack.c:748 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:256
+#: builtin/index-pack.c:751 builtin/pack-objects.c:166
+#: builtin/pack-objects.c:258
#, c-format
msgid "unable to read %s"
msgstr "不能读 %s"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:817
#, c-format
msgid "cannot read existing object %s"
msgstr "不能读取现存对象 %s"
-#: builtin/index-pack.c:828
+#: builtin/index-pack.c:831
#, c-format
msgid "invalid blob object %s"
msgstr "无效的数据对象 %s"
-#: builtin/index-pack.c:842
+#: builtin/index-pack.c:845
#, c-format
msgid "invalid %s"
msgstr "无效的 %s"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:848
msgid "Error in object"
msgstr "对象中出错"
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:850
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "%s 的所有子对象并非都可达"
-#: builtin/index-pack.c:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:922 builtin/index-pack.c:953
msgid "failed to apply delta"
msgstr "无法应用 delta"
-#: builtin/index-pack.c:1120
+#: builtin/index-pack.c:1123
msgid "Receiving objects"
msgstr "接收对象中"
-#: builtin/index-pack.c:1120
+#: builtin/index-pack.c:1123
msgid "Indexing objects"
msgstr "索引对象中"
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1155
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "包冲突（SHA1 不匹配）"
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
msgid "cannot fstat packfile"
msgstr "不能枚举包文件状态"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1163
msgid "pack has junk at the end"
msgstr "包的结尾有垃圾数据"
-#: builtin/index-pack.c:1171
+#: builtin/index-pack.c:1174
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "parse_pack_objects() 中遇到不可理喻的问题"
-#: builtin/index-pack.c:1196
+#: builtin/index-pack.c:1197
msgid "Resolving deltas"
msgstr "处理 delta 中"
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
#, c-format
msgid "unable to create thread: %s"
msgstr "不能创建线程：%s"
-#: builtin/index-pack.c:1249
+#: builtin/index-pack.c:1250
msgid "confusion beyond insanity"
msgstr "不可理喻"
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1256
#, 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:1267
+#: builtin/index-pack.c:1268
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）"
-#: builtin/index-pack.c:1271
+#: builtin/index-pack.c:1272
#, 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:1295
+#: builtin/index-pack.c:1296
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "不能压缩附加对象（%d）"
-#: builtin/index-pack.c:1371
+#: builtin/index-pack.c:1372
#, c-format
msgid "local object %s is corrupt"
msgstr "本地对象 %s 已损坏"
-#: builtin/index-pack.c:1395
+#: builtin/index-pack.c:1396
msgid "error while closing pack file"
msgstr "关闭包文件时出错"
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
#, c-format
msgid "cannot write keep file '%s'"
msgstr "无法写保留文件 '%s'"
-#: builtin/index-pack.c:1416
+#: builtin/index-pack.c:1417
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "无法关闭保留文件 '%s'"
-#: builtin/index-pack.c:1429
+#: builtin/index-pack.c:1430
msgid "cannot store pack file"
msgstr "无法存储包文件"
-#: builtin/index-pack.c:1440
+#: builtin/index-pack.c:1441
msgid "cannot store index file"
msgstr "无法存储索引文件"
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1474
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "坏的 pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1483 builtin/index-pack.c:1681
+#: builtin/index-pack.c:1484 builtin/index-pack.c:1681
#, c-format
msgid "no threads support, ignoring %s"
msgstr "没有线程支持，忽略 %s"
msgid "bad %s"
msgstr "错误选项 %s"
-#: builtin/index-pack.c:1730
+#: builtin/index-pack.c:1732
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin 不能和 --stdin 同时使用"
-#: builtin/index-pack.c:1738
+#: builtin/index-pack.c:1740
msgid "--verify with no packfile name given"
msgstr "--verify 没有提供包文件名参数"
-#: builtin/init-db.c:55
+#: builtin/init-db.c:54
#, c-format
msgid "cannot stat '%s'"
msgstr "不能枚举 '%s' 状态"
-#: builtin/init-db.c:61
+#: builtin/init-db.c:60
#, c-format
msgid "cannot stat template '%s'"
msgstr "不能枚举模版 '%s' 状态"
-#: builtin/init-db.c:66
+#: builtin/init-db.c:65
#, c-format
msgid "cannot opendir '%s'"
msgstr "不能打开目录 '%s'"
-#: builtin/init-db.c:77
+#: builtin/init-db.c:76
#, c-format
msgid "cannot readlink '%s'"
msgstr "不能读取链接 '%s'"
-#: builtin/init-db.c:79
+#: builtin/init-db.c:78
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "不能自 '%s' 到 '%s' 创建符号链接"
-#: builtin/init-db.c:85
+#: builtin/init-db.c:84
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "不能拷贝 '%s' 至 '%s'"
-#: builtin/init-db.c:89
+#: builtin/init-db.c:88
#, c-format
msgid "ignoring template %s"
msgstr "忽略模版 %s"
-#: builtin/init-db.c:120
+#: builtin/init-db.c:119
#, c-format
msgid "templates not found %s"
msgstr "模版未找到 %s"
-#: builtin/init-db.c:135
+#: builtin/init-db.c:134
#, c-format
msgid "not copying templates from '%s': %s"
msgstr "没有从 '%s' 复制模版：%s"
-#: builtin/init-db.c:312 builtin/init-db.c:315
-#, c-format
-msgid "%s already exists"
-msgstr "%s 已经存在"
-
-#: builtin/init-db.c:344
+#: builtin/init-db.c:327
#, c-format
msgid "unable to handle file type %d"
msgstr "不能处理 %d 类型的文件"
-#: builtin/init-db.c:347
+#: builtin/init-db.c:330
#, c-format
msgid "unable to move %s to %s"
msgstr "不能移动 %s 至 %s"
-#: builtin/init-db.c:402
+#: builtin/init-db.c:347 builtin/init-db.c:350
+#, c-format
+msgid "%s already exists"
+msgstr "%s 已经存在"
+
+#: builtin/init-db.c:403
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
-#: builtin/init-db.c:403
+#: builtin/init-db.c:404
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
-#: builtin/init-db.c:407
+#: builtin/init-db.c:408
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
-#: builtin/init-db.c:408
+#: builtin/init-db.c:409
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "已初始化空的 Git 仓库于 %s%s\n"
-#: builtin/init-db.c:455
+#: builtin/init-db.c:457
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
"[<目录>]"
-#: builtin/init-db.c:478
+#: builtin/init-db.c:480
msgid "permissions"
msgstr "权限"
-#: builtin/init-db.c:479
+#: builtin/init-db.c:481
msgid "specify that the git repository is to be shared amongst several users"
msgstr "指定 git 仓库是多个用户之间共享的"
-#: builtin/init-db.c:513 builtin/init-db.c:518
+#: builtin/init-db.c:515 builtin/init-db.c:520
#, c-format
msgid "cannot mkdir %s"
msgstr "不能创建目录 %s"
-#: builtin/init-db.c:522
+#: builtin/init-db.c:524
#, c-format
msgid "cannot chdir to %s"
msgstr "不能切换目录到 %s"
-#: builtin/init-db.c:543
+#: builtin/init-db.c:545
#, 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:571
+#: builtin/init-db.c:573
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "不能访问工作区 '%s'"
msgid "Cover letter needs email format"
msgstr "信封需要邮件地址格式"
-#: builtin/log.c:1064
+#: builtin/log.c:1063
#, c-format
msgid "insane in-reply-to: %s"
msgstr "不正常的 in-reply-to：%s"
-#: builtin/log.c:1092
+#: builtin/log.c:1091
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
-#: builtin/log.c:1137
+#: builtin/log.c:1141
msgid "Two output directories?"
msgstr "两个输出目录？"
-#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897
+#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
#, c-format
msgid "Unknown commit %s"
msgstr "未知提交 %s"
-#: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305
-#: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425
-#: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594
-#: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455
+#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "无法解析 '%s' 为一个有效引用。"
-#: builtin/log.c:1259
+#: builtin/log.c:1263
msgid "Could not find exact merge base."
msgstr "不能找到准确的合并基线。"
-#: builtin/log.c:1263
+#: builtin/log.c:1267
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"
"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
"参数 --base=<base-commit-id> 手动指定一个基线提交。"
-#: builtin/log.c:1283
+#: builtin/log.c:1287
msgid "Failed to find exact merge base"
msgstr "无法找到准确的合并基线"
-#: builtin/log.c:1294
+#: builtin/log.c:1298
msgid "base commit should be the ancestor of revision list"
msgstr "基线提交应该是版本列表的祖先"
-#: builtin/log.c:1298
+#: builtin/log.c:1302
msgid "base commit shouldn't be in revision list"
msgstr "基线提交不应该出现在版本列表中"
-#: builtin/log.c:1347
+#: builtin/log.c:1351
msgid "cannot get patch id"
msgstr "无法得到补丁 id"
-#: builtin/log.c:1404
+#: builtin/log.c:1408
msgid "use [PATCH n/m] even with a single patch"
msgstr "使用 [PATCH n/m]，即使只有一个补丁"
-#: builtin/log.c:1407
+#: builtin/log.c:1411
msgid "use [PATCH] even with multiple patches"
msgstr "使用 [PATCH]，即使有多个补丁"
-#: builtin/log.c:1411
+#: builtin/log.c:1415
msgid "print patches to standard out"
msgstr "打印补丁到标准输出"
-#: builtin/log.c:1413
+#: builtin/log.c:1417
msgid "generate a cover letter"
msgstr "生成一封附信"
-#: builtin/log.c:1415
+#: builtin/log.c:1419
msgid "use simple number sequence for output file names"
msgstr "使用简单的数字序列作为输出文件名"
-#: builtin/log.c:1416
+#: builtin/log.c:1420
msgid "sfx"
msgstr "后缀"
-#: builtin/log.c:1417
+#: builtin/log.c:1421
msgid "use <sfx> instead of '.patch'"
msgstr "使用 <后缀> 代替 '.patch'"
-#: builtin/log.c:1419
+#: builtin/log.c:1423
msgid "start numbering patches at <n> instead of 1"
msgstr "补丁以 <n> 开始编号，而不是1"
-#: builtin/log.c:1421
+#: builtin/log.c:1425
msgid "mark the series as Nth re-roll"
msgstr "标记补丁系列是第几次重制"
-#: builtin/log.c:1423
+#: builtin/log.c:1427
+msgid "Use [RFC PATCH] instead of [PATCH]"
+msgstr "使用 [RFC PATCH] 代替 [PATCH]"
+
+#: builtin/log.c:1430
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "使用 [<前缀>] 代替 [PATCH]"
-#: builtin/log.c:1426
+#: builtin/log.c:1433
msgid "store resulting files in <dir>"
msgstr "把结果文件存储在 <目录>"
-#: builtin/log.c:1429
+#: builtin/log.c:1436
msgid "don't strip/add [PATCH]"
msgstr "不删除/添加 [PATCH]"
-#: builtin/log.c:1432
+#: builtin/log.c:1439
msgid "don't output binary diffs"
msgstr "不输出二进制差异"
-#: builtin/log.c:1434
+#: builtin/log.c:1441
msgid "output all-zero hash in From header"
msgstr "在 From 头信息中输出全为零的哈希值"
-#: builtin/log.c:1436
+#: builtin/log.c:1443
msgid "don't include a patch matching a commit upstream"
msgstr "不包含已在上游提交中的补丁"
-#: builtin/log.c:1438
+#: builtin/log.c:1445
msgid "show patch format instead of default (patch + stat)"
msgstr "显示纯补丁格式而非默认的（补丁+状态）"
-#: builtin/log.c:1440
+#: builtin/log.c:1447
msgid "Messaging"
msgstr "邮件发送"
-#: builtin/log.c:1441
+#: builtin/log.c:1448
msgid "header"
msgstr "header"
-#: builtin/log.c:1442
+#: builtin/log.c:1449
msgid "add email header"
msgstr "添加邮件头"
-#: builtin/log.c:1443 builtin/log.c:1445
+#: builtin/log.c:1450 builtin/log.c:1452
msgid "email"
msgstr "邮件地址"
-#: builtin/log.c:1443
+#: builtin/log.c:1450
msgid "add To: header"
msgstr "添加收件人"
-#: builtin/log.c:1445
+#: builtin/log.c:1452
msgid "add Cc: header"
msgstr "添加抄送"
-#: builtin/log.c:1447
+#: builtin/log.c:1454
msgid "ident"
msgstr "标识"
-#: builtin/log.c:1448
+#: builtin/log.c:1455
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）"
-#: builtin/log.c:1450
+#: builtin/log.c:1457
msgid "message-id"
msgstr "邮件标识"
-#: builtin/log.c:1451
+#: builtin/log.c:1458
msgid "make first mail a reply to <message-id>"
msgstr "使第一封邮件作为对 <邮件标识> 的回复"
-#: builtin/log.c:1452 builtin/log.c:1455
+#: builtin/log.c:1459 builtin/log.c:1462
msgid "boundary"
msgstr "边界"
-#: builtin/log.c:1453
+#: builtin/log.c:1460
msgid "attach the patch"
msgstr "附件方式添加补丁"
-#: builtin/log.c:1456
+#: builtin/log.c:1463
msgid "inline the patch"
msgstr "内联显示补丁"
-#: builtin/log.c:1460
+#: builtin/log.c:1467
msgid "enable message threading, styles: shallow, deep"
msgstr "启用邮件线索，风格：浅，深"
-#: builtin/log.c:1462
+#: builtin/log.c:1469
msgid "signature"
msgstr "签名"
-#: builtin/log.c:1463
+#: builtin/log.c:1470
msgid "add a signature"
msgstr "添加一个签名"
-#: builtin/log.c:1464
+#: builtin/log.c:1471
msgid "base-commit"
msgstr "基线提交"
-#: builtin/log.c:1465
+#: builtin/log.c:1472
msgid "add prerequisite tree info to the patch series"
msgstr "为补丁列表添加前置树信息"
-#: builtin/log.c:1467
+#: builtin/log.c:1474
msgid "add a signature from a file"
msgstr "从文件添加一个签名"
-#: builtin/log.c:1468
+#: builtin/log.c:1475
msgid "don't print the patch filenames"
msgstr "不要打印补丁文件名"
-#: builtin/log.c:1558
+#: builtin/log.c:1565
msgid "-n and -k are mutually exclusive."
msgstr "-n 和 -k 互斥。"
-#: builtin/log.c:1560
-msgid "--subject-prefix and -k are mutually exclusive."
-msgstr "--subject-prefix 和 -k 互斥。"
+#: builtin/log.c:1567
+msgid "--subject-prefix/--rfc and -k are mutually exclusive."
+msgstr "--subject-prefix/--rfc 和 -k 互斥。"
-#: builtin/log.c:1568
+#: builtin/log.c:1575
msgid "--name-only does not make sense"
msgstr "--name-only 无意义"
-#: builtin/log.c:1570
+#: builtin/log.c:1577
msgid "--name-status does not make sense"
msgstr "--name-status 无意义"
-#: builtin/log.c:1572
+#: builtin/log.c:1579
msgid "--check does not make sense"
msgstr "--check 无意义"
-#: builtin/log.c:1602
+#: builtin/log.c:1609
msgid "standard output, or directory, which one?"
msgstr "标准输出或目录，哪一个？"
-#: builtin/log.c:1604
+#: builtin/log.c:1611
#, c-format
msgid "Could not create directory '%s'"
msgstr "不能创建目录 '%s'"
-#: builtin/log.c:1698
+#: builtin/log.c:1705
#, c-format
msgid "unable to read signature file '%s'"
msgstr "无法读取签名文件 '%s'"
-#: builtin/log.c:1769
+#: builtin/log.c:1777
msgid "Failed to create output files"
msgstr "无法创建输出文件"
-#: builtin/log.c:1818
+#: builtin/log.c:1826
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
-#: builtin/log.c:1872
+#: builtin/log.c:1880
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n"
-#: builtin/ls-files.c:379
+#: builtin/ls-files.c:458
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<选项>] [<文件>...]"
-#: builtin/ls-files.c:428
+#: builtin/ls-files.c:507
msgid "identify the file status with tags"
msgstr "用标签标识文件的状态"
-#: builtin/ls-files.c:430
+#: builtin/ls-files.c:509
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "使用小写字母表示 '假设未改变的' 文件"
-#: builtin/ls-files.c:432
+#: builtin/ls-files.c:511
msgid "show cached files in the output (default)"
msgstr "显示缓存的文件（默认）"
-#: builtin/ls-files.c:434
+#: builtin/ls-files.c:513
msgid "show deleted files in the output"
msgstr "显示已删除的文件"
-#: builtin/ls-files.c:436
+#: builtin/ls-files.c:515
msgid "show modified files in the output"
msgstr "显示已修改的文件"
-#: builtin/ls-files.c:438
+#: builtin/ls-files.c:517
msgid "show other files in the output"
msgstr "显示其它文件"
-#: builtin/ls-files.c:440
+#: builtin/ls-files.c:519
msgid "show ignored files in the output"
msgstr "显示忽略的文件"
-#: builtin/ls-files.c:443
+#: builtin/ls-files.c:522
msgid "show staged contents' object name in the output"
msgstr "显示暂存区内容的对象名称"
-#: builtin/ls-files.c:445
+#: builtin/ls-files.c:524
msgid "show files on the filesystem that need to be removed"
msgstr "显示文件系统需要删除的文件"
-#: builtin/ls-files.c:447
+#: builtin/ls-files.c:526
msgid "show 'other' directories' names only"
msgstr "只显示“其他”目录的名称"
-#: builtin/ls-files.c:449
+#: builtin/ls-files.c:528
msgid "show line endings of files"
msgstr "显示文件换行符格式"
-#: builtin/ls-files.c:451
+#: builtin/ls-files.c:530
msgid "don't show empty directories"
msgstr "不显示空目录"
-#: builtin/ls-files.c:454
+#: builtin/ls-files.c:533
msgid "show unmerged files in the output"
msgstr "显示未合并的文件"
-#: builtin/ls-files.c:456
+#: builtin/ls-files.c:535
msgid "show resolve-undo information"
msgstr "显示 resolve-undo 信息"
-#: builtin/ls-files.c:458
+#: builtin/ls-files.c:537
msgid "skip files matching pattern"
msgstr "匹配排除文件的模式"
-#: builtin/ls-files.c:461
+#: builtin/ls-files.c:540
msgid "exclude patterns are read from <file>"
msgstr "从 <文件> 中读取排除模式"
-#: builtin/ls-files.c:464
+#: builtin/ls-files.c:543
msgid "read additional per-directory exclude patterns in <file>"
msgstr "从 <文件> 读取额外的每个目录的排除模式"
-#: builtin/ls-files.c:466
+#: builtin/ls-files.c:545
msgid "add the standard git exclusions"
msgstr "添加标准的 git 排除"
-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:548
msgid "make the output relative to the project top directory"
msgstr "显示相对于顶级目录的文件名"
-#: builtin/ls-files.c:472
+#: builtin/ls-files.c:551
+msgid "recurse through submodules"
+msgstr "在子模组中递归"
+
+#: builtin/ls-files.c:553
msgid "if any <file> is not in the index, treat this as an error"
msgstr "如果任何 <文件> 都不在索引区，视为错误"
-#: builtin/ls-files.c:473
+#: builtin/ls-files.c:554
msgid "tree-ish"
msgstr "树或提交"
-#: builtin/ls-files.c:474
+#: builtin/ls-files.c:555
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
-#: builtin/ls-files.c:476
+#: builtin/ls-files.c:557
msgid "show debugging data"
msgstr "显示调试数据"
msgid "Available custom strategies are:"
msgstr "可用的自定义策略有："
-#: builtin/merge.c:195 builtin/pull.c:126
+#: builtin/merge.c:195 builtin/pull.c:127
msgid "do not show a diffstat at the end of the merge"
msgstr "在合并的最后不显示差异统计"
-#: builtin/merge.c:198 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:130
msgid "show a diffstat at the end of the merge"
msgstr "在合并的最后显示差异统计"
-#: builtin/merge.c:199 builtin/pull.c:132
+#: builtin/merge.c:199 builtin/pull.c:133
msgid "(synonym to --stat)"
msgstr "（和 --stat 同义）"
-#: builtin/merge.c:201 builtin/pull.c:135
+#: builtin/merge.c:201 builtin/pull.c:136
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录"
-#: builtin/merge.c:204 builtin/pull.c:138
+#: builtin/merge.c:204 builtin/pull.c:139
msgid "create a single commit instead of doing a merge"
msgstr "创建一个单独的提交而不是做一次合并"
-#: builtin/merge.c:206 builtin/pull.c:141
+#: builtin/merge.c:206 builtin/pull.c:142
msgid "perform a commit if the merge succeeds (default)"
msgstr "如果合并成功，执行一次提交（默认）"
-#: builtin/merge.c:208 builtin/pull.c:144
+#: builtin/merge.c:208 builtin/pull.c:145
msgid "edit message before committing"
msgstr "在提交前编辑提交说明"
msgid "allow fast-forward (default)"
msgstr "允许快进（默认）"
-#: builtin/merge.c:211 builtin/pull.c:150
+#: builtin/merge.c:211 builtin/pull.c:151
msgid "abort if fast-forward is not possible"
msgstr "如果不能快进就放弃合并"
-#: builtin/merge.c:215 builtin/pull.c:153
+#: builtin/merge.c:215 builtin/pull.c:154
msgid "verify that the named commit has a valid GPG signature"
msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
-#: builtin/merge.c:216 builtin/notes.c:772 builtin/pull.c:157
+#: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158
#: builtin/revert.c:89
msgid "strategy"
msgstr "策略"
-#: builtin/merge.c:217 builtin/pull.c:158
+#: builtin/merge.c:217 builtin/pull.c:159
msgid "merge strategy to use"
msgstr "要使用的合并策略"
-#: builtin/merge.c:218 builtin/pull.c:161
+#: builtin/merge.c:218 builtin/pull.c:162
msgid "option=value"
msgstr "option=value"
-#: builtin/merge.c:219 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:163
msgid "option for selected merge strategy"
msgstr "所选的合并策略的选项"
msgid "abort the current in-progress merge"
msgstr "放弃当前正在进行的合并"
-#: builtin/merge.c:227 builtin/pull.c:169
+#: builtin/merge.c:227 builtin/pull.c:170
msgid "allow merging unrelated histories"
msgstr "允许合并不相关的历史"
msgid "Already up-to-date."
msgstr "已经是最新的。"
-#: builtin/merge.c:1382
+#: builtin/merge.c:1377
#, c-format
msgid "Updating %s..%s\n"
msgstr "更新 %s..%s\n"
-#: builtin/merge.c:1419
+#: builtin/merge.c:1418
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "尝试非常小的索引内合并...\n"
-#: builtin/merge.c:1426
+#: builtin/merge.c:1425
#, c-format
msgid "Nope.\n"
msgstr "无。\n"
-#: builtin/merge.c:1451
+#: builtin/merge.c:1450
msgid "Already up-to-date. Yeeah!"
msgstr "已经是最新的。耶！"
-#: builtin/merge.c:1457
+#: builtin/merge.c:1456
msgid "Not possible to fast-forward, aborting."
msgstr "无法快进，终止。"
-#: builtin/merge.c:1480 builtin/merge.c:1559
+#: builtin/merge.c:1479 builtin/merge.c:1558
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "将树回滚至原始状态...\n"
-#: builtin/merge.c:1484
+#: builtin/merge.c:1483
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "尝试合并策略 %s...\n"
-#: builtin/merge.c:1550
+#: builtin/merge.c:1549
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "没有合并策略处理此合并。\n"
-#: builtin/merge.c:1552
+#: builtin/merge.c:1551
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "使用策略 %s 合并失败。\n"
-#: builtin/merge.c:1561
+#: builtin/merge.c:1560
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "使用 %s 以准备手工解决。\n"
-#: builtin/merge.c:1573
+#: builtin/merge.c:1572
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "自动合并进展顺利，按要求在提交前停止\n"
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <引用> [<提交>]"
-#: builtin/merge-base.c:214
+#: builtin/merge-base.c:217
msgid "output all common ancestors"
msgstr "输出所有共同的祖先"
-#: builtin/merge-base.c:216
+#: builtin/merge-base.c:219
msgid "find ancestors for a single n-way merge"
msgstr "查找一个多路合并的祖先提交"
-#: builtin/merge-base.c:218
+#: builtin/merge-base.c:221
msgid "list revs not reachable from others"
msgstr "显示不能被其他访问到的版本"
-#: builtin/merge-base.c:220
+#: builtin/merge-base.c:223
msgid "is the first one ancestor of the other?"
msgstr "第一个是其他的祖先提交么？"
-#: builtin/merge-base.c:222
+#: builtin/merge-base.c:225
msgid "find where <commit> forked from reflog of <ref>"
msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
msgid "set labels for file1/orig-file/file2"
msgstr "为 文件1/初始文件/文件2 设置标签"
+#: builtin/merge-recursive.c:45
+#, c-format
+msgid "unknown option %s"
+msgstr "未知选项 %s"
+
+#: builtin/merge-recursive.c:51
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "不能解析对象 '%s'"
+
+#: builtin/merge-recursive.c:55
+#, 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:63
+msgid "not handling anything other than two heads merge."
+msgstr "不能处理两个头合并之外的任何操作。"
+
+#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "无法解析引用 '%s'"
+
+#: builtin/merge-recursive.c:77
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "合并 %s 和 %s\n"
+
#: builtin/mktree.c:65
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
msgid "renaming '%s' failed"
msgstr "重命名 '%s' 失败"
-#: builtin/name-rev.c:258
+#: builtin/name-rev.c:257
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<选项>] <提交>..."
-#: builtin/name-rev.c:259
+#: builtin/name-rev.c:258
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<选项>] --all"
-#: builtin/name-rev.c:260
+#: builtin/name-rev.c:259
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<选项>] --stdin"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:311
msgid "print only names (no SHA-1)"
msgstr "只打印名称（无 SHA-1）"
-#: builtin/name-rev.c:313
+#: builtin/name-rev.c:312
msgid "only use tags to name the commits"
msgstr "只使用标签来命名提交"
-#: builtin/name-rev.c:315
+#: builtin/name-rev.c:314
msgid "only use refs matching <pattern>"
msgstr "只使用和 <模式> 相匹配的引用"
-#: builtin/name-rev.c:317
+#: builtin/name-rev.c:316
msgid "list all commits reachable from all refs"
msgstr "列出可以从所有引用访问的提交"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:317
msgid "read from stdin"
msgstr "从标准输入读取"
-#: builtin/name-rev.c:319
+#: builtin/name-rev.c:318
msgid "allow to print `undefined` names (default)"
msgstr "允许打印 `未定义` 的名称（默认）"
-#: builtin/name-rev.c:325
+#: builtin/name-rev.c:324
msgid "dereference tags in the input (internal use)"
msgstr "反向解析输入中的标签（内部使用）"
msgstr "无法为对象 '%s' 完成 'show'"
#: builtin/notes.c:194
-msgid "Please supply the note contents using either -m or -F option"
+msgid "please supply the note contents using either -m or -F option"
msgstr "请通过 -m 或 -F 选项为注解提供内容"
#: builtin/notes.c:203
#: builtin/notes.c:205
#, c-format
-msgid "The note contents have been left in %s"
+msgid "the note contents have been left in %s"
msgstr "注解内容被留在 %s 中"
#: builtin/notes.c:233 builtin/tag.c:439
msgid "could not open or read '%s'"
msgstr "不能打开或读取 '%s'"
+#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307
+#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513
+#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659
+#, c-format
+msgid "failed to resolve '%s' as a valid ref."
+msgstr "无法解析 '%s' 为一个有效引用。"
+
#: builtin/notes.c:257
#, c-format
-msgid "Failed to read object '%s'."
+msgid "failed to read object '%s'."
msgstr "无法读取对象 '%s'。"
#: builtin/notes.c:261
#, c-format
-msgid "Cannot read note data from non-blob object '%s'."
-msgstr "不能从非数据对象 '%s' 中读取注解数据"
+msgid "cannot read note data from non-blob object '%s'."
+msgstr "不能从非数据对象 '%s' 中读取注解数据。"
+
+#: builtin/notes.c:301
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr "非法的输入行：'%s'。"
+
+#: builtin/notes.c:316
+#, 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:345
+#, c-format
+msgid "refusing to %s notes in %s (outside of refs/notes/)"
+msgstr "拒绝向 %2$s（在 refs/notes/ 之外）%1$s注解"
-#: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494
-#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650
-#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968
+#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496
+#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652
+#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970
msgid "too many parameters"
msgstr "参数太多"
-#: builtin/notes.c:376 builtin/notes.c:663
+#: builtin/notes.c:378 builtin/notes.c:665
#, c-format
-msgid "No note found for object %s."
+msgid "no note found for object %s."
msgstr "未发现对象 %s 的注解。"
-#: builtin/notes.c:397 builtin/notes.c:560
+#: builtin/notes.c:399 builtin/notes.c:562
msgid "note contents as a string"
msgstr "注解内容作为一个字符串"
-#: builtin/notes.c:400 builtin/notes.c:563
+#: builtin/notes.c:402 builtin/notes.c:565
msgid "note contents in a file"
msgstr "注解内容到一个文件中"
-#: builtin/notes.c:403 builtin/notes.c:566
+#: builtin/notes.c:405 builtin/notes.c:568
msgid "reuse and edit specified note object"
msgstr "重用和编辑指定的注解对象"
-#: builtin/notes.c:406 builtin/notes.c:569
+#: builtin/notes.c:408 builtin/notes.c:571
msgid "reuse specified note object"
msgstr "重用指定的注解对象"
-#: builtin/notes.c:409 builtin/notes.c:572
+#: builtin/notes.c:411 builtin/notes.c:574
msgid "allow storing empty note"
msgstr "允许保存空白注释"
-#: builtin/notes.c:410 builtin/notes.c:481
+#: builtin/notes.c:412 builtin/notes.c:483
msgid "replace existing notes"
msgstr "替换已存在的注解"
-#: builtin/notes.c:435
+#: builtin/notes.c:437
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
-#: builtin/notes.c:450 builtin/notes.c:529
+#: builtin/notes.c:452 builtin/notes.c:531
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "覆盖对象 %s 现存注解\n"
-#: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887
+#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889
#, c-format
msgid "Removing note for object %s\n"
msgstr "删除对象 %s 的注解\n"
-#: builtin/notes.c:482
+#: builtin/notes.c:484
msgid "read objects from stdin"
msgstr "从标准输入读取对象"
-#: builtin/notes.c:484
+#: builtin/notes.c:486
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "重新加载 <命令> 的配置（隐含 --stdin）"
-#: builtin/notes.c:502
+#: builtin/notes.c:504
msgid "too few parameters"
msgstr "参数太少"
-#: builtin/notes.c:523
+#: builtin/notes.c:525
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
-#: builtin/notes.c:535
+#: builtin/notes.c:537
#, c-format
-msgid "Missing notes on source object %s. Cannot copy."
+msgid "missing notes on source object %s. Cannot copy."
msgstr "源对象 %s 缺少注解。不能拷贝。"
-#: builtin/notes.c:587
+#: builtin/notes.c:589
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
"请换用 'git notes add -f -m/-F/-c/-C'。\n"
-#: builtin/notes.c:753
+#: builtin/notes.c:685
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr "无法删除引用 NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:687
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr "无法删除引用 NOTES_MERGE_REF"
+
+#: builtin/notes.c:689
+msgid "failed to remove 'git notes merge' worktree"
+msgstr "无法删除 'git notes merge' 工作区"
+
+#: builtin/notes.c:709
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr "无法读取引用 NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:711
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
+
+#: builtin/notes.c:713
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
+
+#: builtin/notes.c:726
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr "无法解析 NOTES_MERGE_REF"
+
+#: builtin/notes.c:729
+msgid "failed to finalize notes merge"
+msgstr "无法完成注解合并"
+
+#: builtin/notes.c:755
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "未知的注解合并策略 %s"
-#: builtin/notes.c:769
+#: builtin/notes.c:771
msgid "General options"
msgstr "通用选项"
-#: builtin/notes.c:771
+#: builtin/notes.c:773
msgid "Merge options"
msgstr "合并选项"
-#: builtin/notes.c:773
+#: builtin/notes.c:775
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:775
+#: builtin/notes.c:777
msgid "Committing unmerged notes"
msgstr "提交未合并的注解"
-#: builtin/notes.c:777
+#: builtin/notes.c:779
msgid "finalize notes merge by committing unmerged notes"
msgstr "通过提交未合并的注解来完成注解合并"
-#: builtin/notes.c:779
+#: builtin/notes.c:781
msgid "Aborting notes merge resolution"
msgstr "中止注解合并的方案"
-#: builtin/notes.c:781
+#: builtin/notes.c:783
msgid "abort notes merge"
msgstr "中止注解合并"
-#: builtin/notes.c:792
+#: builtin/notes.c:794
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "不能混用 --commit、--abort 或 -s/--strategy"
-#: builtin/notes.c:797
-msgid "Must specify a notes ref to merge"
+#: builtin/notes.c:799
+msgid "must specify a notes ref to merge"
msgstr "必须指定一个注解引用来合并"
-#: builtin/notes.c:821
+#: builtin/notes.c:823
#, c-format
-msgid "Unknown -s/--strategy: %s"
+msgid "unknown -s/--strategy: %s"
msgstr "未知的 -s/--strategy：%s"
-#: builtin/notes.c:858
+#: builtin/notes.c:860
#, c-format
-msgid "A notes merge into %s is already in-progress at %s"
-msgstr "ä¸\80个å\88° %s ç\9a\84注解å\90\88并已ç»\8få\9c¨ %s 执行中"
+msgid "a notes merge into %s is already in-progress at %s"
+msgstr "ä½\8däº\8e %2$s ç\9a\84ä¸\80个å\88° %1$s ä¸ç\9a\84注解å\90\88并æ£å\9c¨执行中"
-#: builtin/notes.c:861
+#: builtin/notes.c:863
#, c-format
-msgid "Failed to store link to current notes ref (%s)"
-msgstr "无法存储链接到当前注解的引用（%s）"
+msgid "failed to store link to current notes ref (%s)"
+msgstr "无法存储链接到当前的注解引用（%s）"
-#: builtin/notes.c:863
+#: builtin/notes.c:865
#, 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"
+msgstr ""
+"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
+"交结果，或者使用命令 'git notes merge --abort' 终止合并。\n"
-#: builtin/notes.c:885
+#: builtin/notes.c:887
#, c-format
msgid "Object %s has no note\n"
msgstr "对象 %s 没有注解\n"
-#: builtin/notes.c:897
+#: builtin/notes.c:899
msgid "attempt to remove non-existent note is not an error"
msgstr "尝试删除不存在的注解不是一个错误"
-#: builtin/notes.c:900
+#: builtin/notes.c:902
msgid "read object names from the standard input"
msgstr "从标准输入读取对象名称"
-#: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127
+#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
msgid "do not remove, show only"
msgstr "不删除，只显示"
-#: builtin/notes.c:939
+#: builtin/notes.c:941
msgid "report pruned notes"
msgstr "报告清除的注解"
-#: builtin/notes.c:981
+#: builtin/notes.c:983
msgid "notes-ref"
msgstr "注解引用"
-#: builtin/notes.c:982
+#: builtin/notes.c:984
msgid "use notes from <notes-ref>"
msgstr "从 <注解引用> 使用注解"
-#: builtin/notes.c:1017 builtin/remote.c:1623
+#: builtin/notes.c:1019
#, c-format
-msgid "Unknown subcommand: %s"
+msgid "unknown subcommand: %s"
msgstr "未知子命令：%s"
-#: builtin/pack-objects.c:28
+#: builtin/pack-objects.c:29
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
-#: builtin/pack-objects.c:29
+#: builtin/pack-objects.c:30
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]"
-#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
+#: builtin/pack-objects.c:179 builtin/pack-objects.c:182
#, c-format
msgid "deflate error (%d)"
msgstr "压缩错误 (%d)"
-#: builtin/pack-objects.c:766
+#: builtin/pack-objects.c:768
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr "禁用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个"
-#: builtin/pack-objects.c:779
+#: builtin/pack-objects.c:781
msgid "Writing objects"
msgstr "写入对象中"
-#: builtin/pack-objects.c:1037
+#: builtin/pack-objects.c:1070
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "禁用 bitmap 写入，因为一些对象将不会被打包"
-#: builtin/pack-objects.c:2197
+#: builtin/pack-objects.c:2346
msgid "Compressing objects"
msgstr "压缩对象中"
-#: builtin/pack-objects.c:2611
+#: builtin/pack-objects.c:2759
#, c-format
msgid "unsupported index version %s"
msgstr "不支持的索引版本 %s"
-#: builtin/pack-objects.c:2615
+#: builtin/pack-objects.c:2763
#, c-format
msgid "bad index version '%s'"
msgstr "坏的索引版本 '%s'"
-#: builtin/pack-objects.c:2645
+#: builtin/pack-objects.c:2793
msgid "do not show progress meter"
msgstr "不显示进度表"
-#: builtin/pack-objects.c:2647
+#: builtin/pack-objects.c:2795
msgid "show progress meter"
msgstr "显示进度表"
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2797
msgid "show progress meter during object writing phase"
msgstr "在对象写入阶段显示进度表"
-#: builtin/pack-objects.c:2652
+#: builtin/pack-objects.c:2800
msgid "similar to --all-progress when progress meter is shown"
msgstr "当进度表显示时类似于 --all-progress"
-#: builtin/pack-objects.c:2653
+#: builtin/pack-objects.c:2801
msgid "version[,offset]"
msgstr "版本[,偏移]"
-#: builtin/pack-objects.c:2654
+#: builtin/pack-objects.c:2802
msgid "write the pack index file in the specified idx format version"
msgstr "用指定的 idx 格式版本来写包索引文件"
-#: builtin/pack-objects.c:2657
+#: builtin/pack-objects.c:2805
msgid "maximum size of each output pack file"
msgstr "每个输出包的最大尺寸"
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2807
msgid "ignore borrowed objects from alternate object store"
msgstr "忽略从备用对象存储里借用对象"
-#: builtin/pack-objects.c:2661
+#: builtin/pack-objects.c:2809
msgid "ignore packed objects"
msgstr "忽略包对象"
-#: builtin/pack-objects.c:2663
+#: builtin/pack-objects.c:2811
msgid "limit pack window by objects"
msgstr "限制打包窗口的对象数"
-#: builtin/pack-objects.c:2665
+#: builtin/pack-objects.c:2813
msgid "limit pack window by memory in addition to object limit"
msgstr "除对象数量限制外设置打包窗口的内存限制"
-#: builtin/pack-objects.c:2667
+#: builtin/pack-objects.c:2815
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "打包允许的 delta 链的最大长度"
-#: builtin/pack-objects.c:2669
+#: builtin/pack-objects.c:2817
msgid "reuse existing deltas"
msgstr "重用已存在的 deltas"
-#: builtin/pack-objects.c:2671
+#: builtin/pack-objects.c:2819
msgid "reuse existing objects"
msgstr "重用已存在的对象"
-#: builtin/pack-objects.c:2673
+#: builtin/pack-objects.c:2821
msgid "use OFS_DELTA objects"
msgstr "使用 OFS_DELTA 对象"
-#: builtin/pack-objects.c:2675
+#: builtin/pack-objects.c:2823
msgid "use threads when searching for best delta matches"
msgstr "使用线程查询最佳 delta 匹配"
-#: builtin/pack-objects.c:2677
+#: builtin/pack-objects.c:2825
msgid "do not create an empty pack output"
msgstr "不创建空的包输出"
-#: builtin/pack-objects.c:2679
+#: builtin/pack-objects.c:2827
msgid "read revision arguments from standard input"
msgstr "从标准输入读取版本号参数"
-#: builtin/pack-objects.c:2681
+#: builtin/pack-objects.c:2829
msgid "limit the objects to those that are not yet packed"
msgstr "限制那些尚未打包的对象"
-#: builtin/pack-objects.c:2684
+#: builtin/pack-objects.c:2832
msgid "include objects reachable from any reference"
msgstr "包括可以从任何引用访问到的对象"
-#: builtin/pack-objects.c:2687
+#: builtin/pack-objects.c:2835
msgid "include objects referred by reflog entries"
msgstr "包括被引用日志引用到的对象"
-#: builtin/pack-objects.c:2690
+#: builtin/pack-objects.c:2838
msgid "include objects referred to by the index"
msgstr "包括被索引引用到的对象"
-#: builtin/pack-objects.c:2693
+#: builtin/pack-objects.c:2841
msgid "output pack to stdout"
msgstr "输出包到标准输出"
-#: builtin/pack-objects.c:2695
+#: builtin/pack-objects.c:2843
msgid "include tag objects that refer to objects to be packed"
msgstr "包括那些引用了待打包对象的标签对象"
-#: builtin/pack-objects.c:2697
+#: builtin/pack-objects.c:2845
msgid "keep unreachable objects"
msgstr "维持不可达的对象"
-#: builtin/pack-objects.c:2699
+#: builtin/pack-objects.c:2847
msgid "pack loose unreachable objects"
msgstr "打包松散的不可达对象"
-#: builtin/pack-objects.c:2700 parse-options.h:142
-msgid "time"
-msgstr "时间"
-
-#: builtin/pack-objects.c:2701
+#: builtin/pack-objects.c:2849
msgid "unpack unreachable objects newer than <time>"
msgstr "将比给定 <时间> 新的无法访问的对象解包"
-#: builtin/pack-objects.c:2704
+#: builtin/pack-objects.c:2852
msgid "create thin packs"
msgstr "创建精简包"
-#: builtin/pack-objects.c:2706
+#: builtin/pack-objects.c:2854
msgid "create packs suitable for shallow fetches"
msgstr "创建适合浅克隆仓库获取的包"
-#: builtin/pack-objects.c:2708
+#: builtin/pack-objects.c:2856
msgid "ignore packs that have companion .keep file"
msgstr "忽略配有 .keep 文件的包"
-#: builtin/pack-objects.c:2710
+#: builtin/pack-objects.c:2858
msgid "pack compression level"
msgstr "打包压缩级别"
-#: builtin/pack-objects.c:2712
+#: builtin/pack-objects.c:2860
msgid "do not hide commits by grafts"
msgstr "显示被嫁接隐藏的提交"
-#: builtin/pack-objects.c:2714
+#: builtin/pack-objects.c:2862
msgid "use a bitmap index if available to speed up counting objects"
msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度"
-#: builtin/pack-objects.c:2716
+#: builtin/pack-objects.c:2864
msgid "write a bitmap index together with the pack index"
msgstr "在建立包索引的同时创建 bitmap 索引"
-#: builtin/pack-objects.c:2829
+#: builtin/pack-objects.c:2993
msgid "Counting objects"
msgstr "对象计数中"
msgid "cannot prune in a precious-objects repo"
msgstr "不能在珍品仓库中执行清理操作"
-#: builtin/pull.c:72
+#: builtin/pull.c:51 builtin/pull.c:53
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr "%s 的值无效：%s"
+
+#: builtin/pull.c:73
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
-#: builtin/pull.c:120
+#: builtin/pull.c:121
msgid "Options related to merging"
msgstr "和合并相关的选项"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "incorporate changes by rebasing rather than merging"
msgstr "使用变基操作取代合并操作以合入修改"
-#: builtin/pull.c:147 builtin/revert.c:101
+#: builtin/pull.c:148 builtin/revert.c:101
msgid "allow fast-forward"
msgstr "允许快进式"
-#: builtin/pull.c:156
+#: builtin/pull.c:157
msgid "automatically stash/stash pop before and after rebase"
msgstr "自动在变基操作前后执行 stash/stash pop"
-#: builtin/pull.c:172
+#: builtin/pull.c:173
msgid "Options related to fetching"
msgstr "和获取相关的参数"
-#: builtin/pull.c:194
+#: builtin/pull.c:195
msgid "number of submodules pulled in parallel"
msgstr "并发拉取的子模组的数量"
-#: builtin/pull.c:283
+#: builtin/pull.c:284
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "pull.ff 的取值无效：%s"
-#: builtin/pull.c:379 git-sh-setup.sh:226
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr "无法通过变基方式拉取：您有未暂存的变更。"
-
-#: builtin/pull.c:385 git-sh-setup.sh:252
-msgid "Additionally, your index contains uncommitted changes."
-msgstr "而且您的索引中包含未提交的变更。"
-
-#: builtin/pull.c:387 git-sh-setup.sh:245
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr "无法通过变基方式拉取：您的索引中包含未提交的变更。"
-
-#: builtin/pull.c:463
+#: builtin/pull.c:397
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
-#: builtin/pull.c:465
+#: builtin/pull.c:399
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
-#: builtin/pull.c:466
+#: builtin/pull.c:400
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
-#: builtin/pull.c:469
+#: builtin/pull.c:403
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"您要求从远程 '%s' 拉取，但是未指定一个分支。因为这不是当前\n"
"分支默认的远程仓库，您必须在命令行中指定一个分支名。"
-#: builtin/pull.c:474 git-parse-remote.sh:73
+#: builtin/pull.c:408 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "您当前不在一个分支上。"
-#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
+#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "请指定您要变基到哪一个分支。"
-#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
+#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "请指定您要合并哪一个分支。"
-#: builtin/pull.c:479 builtin/pull.c:494
+#: builtin/pull.c:413 builtin/pull.c:428
msgid "See git-pull(1) for details."
msgstr "详见 git-pull(1)。"
-#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr "<远程>"
-#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451
+#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<分支>"
-#: builtin/pull.c:489 git-parse-remote.sh:75
+#: builtin/pull.c:423 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "当前分支没有跟踪信息。"
-#: builtin/pull.c:498 git-parse-remote.sh:95
+#: builtin/pull.c:432 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr "如果您想要为此分支创建跟踪信息，您可以执行："
-#: builtin/pull.c:503
+#: builtin/pull.c:437
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"您的配置中指定要合并远程的引用 '%s'，\n"
"但是没有获取到这个引用。"
-#: builtin/pull.c:820
+#: builtin/pull.c:754
msgid "ignoring --verify-signatures for rebase"
msgstr "为变基操作忽略 --verify-signatures"
-#: builtin/pull.c:867
+#: builtin/pull.c:801
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
-#: builtin/pull.c:875
+#: builtin/pull.c:809
msgid "Updating an unborn branch with changes added to the index."
msgstr "更新尚未诞生的分支，变更添加至索引。"
-#: builtin/pull.c:903
+#: builtin/pull.c:812
+msgid "pull with rebase"
+msgstr "变基式拉取"
+
+#: builtin/pull.c:813
+msgid "please commit or stash them."
+msgstr "请提交或为它们保存进度。"
+
+#: builtin/pull.c:838
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"fetch 更新了当前的分支。快进您的工作区\n"
"至提交 %s。"
-#: builtin/pull.c:908
+#: builtin/pull.c:843
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"$ git reset --hard\n"
"恢复之前的状态。"
-#: builtin/pull.c:923
+#: builtin/pull.c:858
msgid "Cannot merge multiple branches into empty head."
msgstr "无法将多个分支合并到空分支。"
-#: builtin/pull.c:927
+#: builtin/pull.c:862
msgid "Cannot rebase onto multiple branches."
msgstr "无法变基到多个分支。"
msgid "debug unpack-trees"
msgstr "调试 unpack-trees"
-#: builtin/receive-pack.c:25
+#: builtin/receive-pack.c:26
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
-#: builtin/receive-pack.c:1843
+#: builtin/receive-pack.c:793
+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 'receive.denyCurrentBranch' configuration variable to\n"
+"'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 ""
+"默认禁止更新非纯仓库的当前分支，因为您推送的内容将导致索引和工作区\n"
+"不一致，并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n"
+"\n"
+"您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n"
+"'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做，除非您\n"
+"用某种方式将其工作区更新至您推送的状态。\n"
+"\n"
+"若要屏蔽此信息且保持默认行为，设置 'receive.denyCurrentBranch'\n"
+"配置变量为 'refuse'。"
+
+#: builtin/receive-pack.c:813
+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 ""
+"默认禁止删除当前分支，因为下一次 'git clone' 将不会检出任何文件，\n"
+"导致混淆。\n"
+"\n"
+"您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n"
+"'warn' 或 'ignore' 以允许删除当前分支，显示或者不显示警告。\n"
+"\n"
+"若要屏蔽此信息，您可以设置它为 'refuse'。"
+
+#: builtin/receive-pack.c:1883
msgid "quiet"
msgstr "静默模式"
-#: builtin/receive-pack.c:1857
+#: builtin/receive-pack.c:1897
msgid "You must specify a directory."
msgstr "您必须指定一个目录。"
msgid " Fetch URL: %s"
msgstr " 获取地址：%s"
-#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296
+#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
msgid "(no URL)"
msgstr "(无 URL)"
msgstr[1] " 远程分支：%s"
# 译者：中文字符串拼接，可删除前导空格
-#: builtin/remote.c:1179 builtin/remote.c:1206
+#: builtin/remote.c:1179 builtin/remote.c:1205
msgid " (status not queried)"
msgstr "（状态未查询）"
msgid " Local refs will be mirrored by 'git push'"
msgstr " 本地引用将在 'git push' 时被镜像"
-#: builtin/remote.c:1203
+#: builtin/remote.c:1202
#, 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:1224
+#: builtin/remote.c:1223
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
-#: builtin/remote.c:1226
+#: builtin/remote.c:1225
msgid "delete refs/remotes/<name>/HEAD"
msgstr "删除 refs/remotes/<名称>/HEAD"
-#: builtin/remote.c:1241
+#: builtin/remote.c:1240
msgid "Cannot determine remote HEAD"
msgstr "无法确定远程 HEAD"
-#: builtin/remote.c:1243
+#: builtin/remote.c:1242
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "多个远程 HEAD 分支。请明确地选择一个用命令："
-#: builtin/remote.c:1253
+#: builtin/remote.c:1252
#, c-format
msgid "Could not delete %s"
msgstr "无法删除 %s"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1260
#, c-format
msgid "Not a valid ref: %s"
msgstr "不是一个有效引用：%s"
-#: builtin/remote.c:1263
+#: builtin/remote.c:1262
#, c-format
msgid "Could not setup %s"
msgstr "不能设置 %s"
# 译者：注意保持前导空格
-#: builtin/remote.c:1281
+#: builtin/remote.c:1280
#, c-format
msgid " %s will become dangling!"
msgstr " %s 将成为摇摆状态！"
# 译者：注意保持前导空格
-#: builtin/remote.c:1282
+#: builtin/remote.c:1281
#, c-format
msgid " %s has become dangling!"
msgstr " %s 已成为摇摆状态！"
-#: builtin/remote.c:1292
+#: builtin/remote.c:1291
#, c-format
msgid "Pruning %s"
msgstr "修剪 %s"
-#: builtin/remote.c:1293
+#: builtin/remote.c:1292
#, c-format
msgid "URL: %s"
msgstr "URL：%s"
-#: builtin/remote.c:1309
+#: builtin/remote.c:1308
#, c-format
msgid " * [would prune] %s"
msgstr " * [将删除] %s"
-#: builtin/remote.c:1312
+#: builtin/remote.c:1311
#, c-format
msgid " * [pruned] %s"
msgstr " * [已删除] %s"
-#: builtin/remote.c:1357
+#: builtin/remote.c:1356
msgid "prune remotes after fetching"
msgstr "抓取后清除远程"
-#: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542
+#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
#, c-format
msgid "No such remote '%s'"
msgstr "没有此远程 '%s'"
-#: builtin/remote.c:1436
+#: builtin/remote.c:1435
msgid "add branch"
msgstr "添加分支"
-#: builtin/remote.c:1443
+#: builtin/remote.c:1442
msgid "no remote specified"
msgstr "未指定远程"
-#: builtin/remote.c:1460
+#: builtin/remote.c:1459
msgid "query push URLs rather than fetch URLs"
msgstr "查询推送 URL 地址，而非获取 URL 地址"
-#: builtin/remote.c:1462
+#: builtin/remote.c:1461
msgid "return all URLs"
msgstr "返回所有 URL 地址"
-#: builtin/remote.c:1490
+#: builtin/remote.c:1489
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "没有给远程仓库 '%s' 设定 URL"
-#: builtin/remote.c:1516
+#: builtin/remote.c:1515
msgid "manipulate push URLs"
msgstr "操作推送 URLS"
-#: builtin/remote.c:1518
+#: builtin/remote.c:1517
msgid "add URL"
msgstr "添加 URL"
-#: builtin/remote.c:1520
+#: builtin/remote.c:1519
msgid "delete URLs"
msgstr "删除 URLS"
-#: builtin/remote.c:1527
+#: builtin/remote.c:1526
msgid "--add --delete doesn't make sense"
msgstr "--add --delete 无意义"
-#: builtin/remote.c:1568
+#: builtin/remote.c:1567
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "无效的旧 URL 匹配模版：%s"
-#: builtin/remote.c:1576
+#: builtin/remote.c:1575
#, c-format
msgid "No such URL found: %s"
msgstr "未找到此 URL：%s"
-#: builtin/remote.c:1578
+#: builtin/remote.c:1577
msgid "Will not delete all non-push URLs"
msgstr "将不会删除所有非推送 URL 地址"
-#: builtin/remote.c:1592
+#: builtin/remote.c:1591
msgid "be verbose; must be placed before a subcommand"
msgstr "冗长输出；必须置于子命令之前"
+#: builtin/remote.c:1622
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "未知子命令：%s"
+
#: builtin/repack.c:17
msgid "git repack [<options>]"
msgstr "git repack [<选项>]"
msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
#: builtin/reset.c:27
-msgid "git reset [-q]
<tree-ish> [--] <paths>..."
-msgstr "git reset [-q] <树或提交> [--] <路径>..."
+msgid "git reset [-q]
[<tree-ish>] [--] <paths>..."
+msgstr "git reset [-q] [<树或提交>] [--] <路径>..."
#: builtin/reset.c:28
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgid "Could not write new index file."
msgstr "不能写入新的索引文件。"
-#: builtin/rev-list.c:362
+#: builtin/rev-list.c:354
msgid "rev-list does not support display of notes"
msgstr "rev-list 不支持显示注解"
-#: builtin/rev-parse.c:358
+#: builtin/rev-parse.c:386
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
-#: builtin/rev-parse.c:363
+#: builtin/rev-parse.c:391
msgid "keep the `--` passed as an arg"
msgstr "保持 `--` 作为一个参数传递"
-#: builtin/rev-parse.c:365
+#: builtin/rev-parse.c:393
msgid "stop parsing after the first non-option argument"
msgstr "遇到第一个非选项参数后停止解析"
-#: builtin/rev-parse.c:368
+#: builtin/rev-parse.c:396
msgid "output in stuck long form"
msgstr "以固定长格式输出"
-#: builtin/rev-parse.c:499
+#: builtin/rev-parse.c:527
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
msgid "revert failed"
msgstr "还原失败"
-#: builtin/revert.c:207
+#: builtin/revert.c:205
msgid "cherry-pick failed"
msgstr "拣选失败"
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
-#: builtin/show-branch.c:640
+#: builtin/show-branch.c:375
+#, 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:541
+#, c-format
+msgid "no matching refs with %s"
+msgstr "没有和 %s 匹配的引用"
+
+#: builtin/show-branch.c:639
msgid "show remote-tracking and local branches"
msgstr "显示远程跟踪的和本地的分支"
-#: builtin/show-branch.c:642
+#: builtin/show-branch.c:641
msgid "show remote-tracking branches"
msgstr "显示远程跟踪的分支"
-#: builtin/show-branch.c:644
+#: builtin/show-branch.c:643
msgid "color '*!+-' corresponding to the branch"
msgstr "着色 '*!+-' 到相应的分支"
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show <n> more commits after the common ancestor"
msgstr "显示共同祖先后的 <n> 个提交"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "synonym to more=-1"
msgstr "和 more=-1 同义"
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
msgid "suppress naming strings"
msgstr "不显示字符串命名"
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
msgid "include the current branch"
msgstr "包括当前分支"
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
msgid "name commits with their object names"
msgstr "以对象名字命名提交"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "show possible merge bases"
msgstr "显示可能合并的基线"
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "show refs unreachable from any other ref"
msgstr "显示没有任何引用的的引用"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "show commits in topological order"
msgstr "以拓扑顺序显示提交"
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
msgid "show only commits not on the first branch"
msgstr "只显示不在第一个分支上的提交"
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
msgid "show merges reachable from only one tip"
msgstr "显示仅一个分支可访问的合并提交"
-#: builtin/show-branch.c:666
+#: builtin/show-branch.c:665
msgid "topologically sort, maintaining date order where possible"
msgstr "拓扑方式排序，并尽可能地保持日期顺序"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
msgid "show <n> most recent ref-log entries starting at base"
msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
+#: builtin/show-branch.c:703
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
+
+#: builtin/show-branch.c:727
+msgid "no branches given, and HEAD is not valid"
+msgstr "未提供分支，且 HEAD 无效"
+
+#: builtin/show-branch.c:730
+msgid "--reflog option needs one branch name"
+msgstr "选项 --reflog 需要一个分支名"
+
+#: builtin/show-branch.c:733
+#, 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:737
+#, c-format
+msgid "no such ref %s"
+msgstr "无此引用 %s"
+
+#: builtin/show-branch.c:829
+#, 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:833
+#, c-format
+msgid "'%s' is not a valid ref."
+msgstr "'%s' 不是一个有效的引用。"
+
+#: builtin/show-branch.c:836
+#, c-format
+msgid "cannot find commit %s (%s)"
+msgstr "不能找到提交 %s (%s)"
+
#: builtin/show-ref.c:10
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
msgid "prepend comment character and space to each line"
msgstr "为每一行的行首添加注释符和空格"
-#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:923
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1046
#, c-format
msgid "No such ref: %s"
msgstr "没有这样的引用：%s"
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "期望一个完整的引用名称，却得到 %s"
msgid "cannot strip one component off url '%s'"
msgstr "无法从 url '%s' 剥离一个组件"
-#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403
-#: builtin/submodule--helper.c:483
+#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408
+#: builtin/submodule--helper.c:590
msgid "alternative anchor for relative paths"
msgstr "相对路径的替代锚记（anchor）"
-#: builtin/submodule--helper.c:283
+#: builtin/submodule--helper.c:287
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
-#: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338
+#: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
-#: builtin/submodule--helper.c:364
+#: builtin/submodule--helper.c:369
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "无法为子模组 '%s' 注册 url"
-#: builtin/submodule--helper.c:368
+#: builtin/submodule--helper.c:373
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "子模组 '%s'（%s）未对路径 '%s' 注册\n"
#
-#: builtin/submodule--helper.c:378
+#: builtin/submodule--helper.c:383
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "警告：建议子模组 '%s' 使用命令更新模式\n"
-#: builtin/submodule--helper.c:385
+#: builtin/submodule--helper.c:390
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "无法为子模组 '%s' 注册更新模式"
-#: builtin/submodule--helper.c:404
+#: builtin/submodule--helper.c:409
msgid "Suppress output for initializing a submodule"
msgstr "初始化子模组时抑制输出"
-#: builtin/submodule--helper.c:409
+#: builtin/submodule--helper.c:414
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<路径>]"
-#: builtin/submodule--helper.c:430
+#: builtin/submodule--helper.c:435
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <路径>"
-#: builtin/submodule--helper.c:436
+#: builtin/submodule--helper.c:441
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
-#: builtin/submodule--helper.c:486
+#: builtin/submodule--helper.c:524 builtin/submodule--helper.c:527
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
+msgstr "子模组 '%s' 不能添加仓库备选：%s"
+
+#: builtin/submodule--helper.c:563
+#, c-format
+msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
+
+#: builtin/submodule--helper.c:570
+#, c-format
+msgid "Value '%s' for submodule.alternateLocation is not recognized"
+msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
+
+#: builtin/submodule--helper.c:593
msgid "where the new submodule will be cloned to"
msgstr "新的子模组将要克隆的路径"
-#: builtin/submodule--helper.c:489
+#: builtin/submodule--helper.c:596
msgid "name of the new submodule"
msgstr "新子模组的名称"
-#: builtin/submodule--helper.c:492
+#: builtin/submodule--helper.c:599
msgid "url where to clone the submodule from"
msgstr "克隆子模组的 url 地址"
-#: builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:605
msgid "depth for shallow clones"
msgstr "浅克隆的深度"
-#: builtin/submodule--helper.c:504
+#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964
+msgid "force cloning progress"
+msgstr "显示克隆进度"
+
+#: builtin/submodule--helper.c:613
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
"[--name <名字>] [--depth <深度>] --url <url> --path <路径>"
-#: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535
+#: builtin/submodule--helper.c:638 builtin/submodule--helper.c:648
#, c-format
msgid "could not create directory '%s'"
msgstr "不能创建目录 '%s'"
-#: builtin/submodule--helper.c:531
+#: builtin/submodule--helper.c:644
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "无法克隆 '%s' 到子模组路径 '%s'"
-#: builtin/submodule--helper.c:547
+#: builtin/submodule--helper.c:660
#, c-format
msgid "cannot open file '%s'"
msgstr "无法打开文件 '%s'"
-#: builtin/submodule--helper.c:552
+#: builtin/submodule--helper.c:665
#, c-format
msgid "could not close file %s"
msgstr "无法关闭文件 %s"
-#: builtin/submodule--helper.c:559
+#: builtin/submodule--helper.c:672
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "无法得到 '%s' 的子模组目录"
-#: builtin/submodule--helper.c:611
+#: builtin/submodule--helper.c:726
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "子模组 '%s' 尚未初始化"
-#: builtin/submodule--helper.c:615
+#: builtin/submodule--helper.c:730
msgid "Maybe you want to use 'update --init'?"
msgstr "也许您想要执行 'update --init'？"
-#: builtin/submodule--helper.c:641
+#: builtin/submodule--helper.c:756
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "略过未合并的子模组 %s"
-#: builtin/submodule--helper.c:662
+#: builtin/submodule--helper.c:777
#, c-format
msgid "Skipping submodule '%s'"
msgstr "略过子模组 '%s'"
-#: builtin/submodule--helper.c:792
+#: builtin/submodule--helper.c:913
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "克隆 '%s' 失败。按计划重试"
-#: builtin/submodule--helper.c:803
+#: builtin/submodule--helper.c:924
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "第二次尝试克隆 '%s' 失败，退出"
-#: builtin/submodule--helper.c:824
+#: builtin/submodule--helper.c:945
msgid "path into the working tree"
msgstr "到工作区的路径"
-#: builtin/submodule--helper.c:827
+#: builtin/submodule--helper.c:948
msgid "path into the working tree, across nested submodule boundaries"
msgstr "工作区中的路径，递归嵌套子模组"
-#: builtin/submodule--helper.c:831
+#: builtin/submodule--helper.c:952
msgid "rebase, merge, checkout or none"
msgstr "rebase、merge、checkout 或 none"
-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:956
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "创建一个指定深度的浅克隆"
-#: builtin/submodule--helper.c:838
+#: builtin/submodule--helper.c:959
msgid "parallel jobs"
msgstr "并发任务"
-#: builtin/submodule--helper.c:840
+#: builtin/submodule--helper.c:961
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
-#: builtin/submodule--helper.c:841
+#: builtin/submodule--helper.c:962
msgid "don't print cloning progress"
msgstr "不要输出克隆进度"
-#: builtin/submodule--helper.c:846
+#: builtin/submodule--helper.c:969
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
-#: builtin/submodule--helper.c:856
+#: builtin/submodule--helper.c:979
msgid "bad value for update parameter"
msgstr "update 参数取值错误"
-#: builtin/submodule--helper.c:927
+#: builtin/submodule--helper.c:1050
#, 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:977
+#: builtin/submodule--helper.c:1100
msgid "submodule--helper subcommand must be called with a subcommand"
msgstr "submodule-helper 子命令必须由另外的子命令调用"
-#: builtin/submodule--helper.c:984
+#: builtin/submodule--helper.c:1107
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
msgid "Updated tag '%s' (was %s)\n"
msgstr "已更新标签 '%s'（曾为 %s）\n"
-#: builtin/unpack-objects.c:490
+#: builtin/unpack-objects.c:493
msgid "Unpacking objects"
msgstr "展开对象中"
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:575
+#: builtin/update-index.c:564
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<选项>] [--] [<文件>...]"
-#: builtin/update-index.c:930
+#: builtin/update-index.c:919
msgid "continue refresh even when index needs update"
msgstr "当索引需要更新时继续刷新"
-#: builtin/update-index.c:933
+#: builtin/update-index.c:922
msgid "refresh: ignore submodules"
msgstr "刷新：忽略子模组"
-#: builtin/update-index.c:936
+#: builtin/update-index.c:925
msgid "do not ignore new files"
msgstr "不忽略新的文件"
-#: builtin/update-index.c:938
+#: builtin/update-index.c:927
msgid "let files replace directories and vice-versa"
msgstr "让文件替换目录（反之亦然）"
-#: builtin/update-index.c:940
+#: builtin/update-index.c:929
msgid "notice files missing from worktree"
msgstr "通知文件从工作区丢失"
-#: builtin/update-index.c:942
+#: builtin/update-index.c:931
msgid "refresh even if index contains unmerged entries"
msgstr "即使索引区包含未合并的条目也执行刷新"
-#: builtin/update-index.c:945
+#: builtin/update-index.c:934
msgid "refresh stat information"
msgstr "刷新统计信息"
-#: builtin/update-index.c:949
+#: builtin/update-index.c:938
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置"
-#: builtin/update-index.c:953
+#: builtin/update-index.c:942
msgid "<mode>,<object>,<path>"
msgstr "<存取模式>,<对象>,<路径>"
-#: builtin/update-index.c:954
+#: builtin/update-index.c:943
msgid "add the specified entry to the index"
msgstr "添加指定的条目到索引区"
-#: builtin/update-index.c:963
+#: builtin/update-index.c:952
msgid "mark files as \"not changing\""
msgstr "把文件标记为 \"没有变更\""
-#: builtin/update-index.c:966
+#: builtin/update-index.c:955
msgid "clear assumed-unchanged bit"
msgstr "清除 assumed-unchanged 位"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:958
msgid "mark files as \"index-only\""
msgstr "把文件标记为 \"仅索引\""
-#: builtin/update-index.c:972
+#: builtin/update-index.c:961
msgid "clear skip-worktree bit"
msgstr "清除 skip-worktree 位"
-#: builtin/update-index.c:975
+#: builtin/update-index.c:964
msgid "add to index only; do not add content to object database"
msgstr "只添加到索引区；不添加对象到对象库"
-#: builtin/update-index.c:977
+#: builtin/update-index.c:966
msgid "remove named paths even if present in worktree"
msgstr "即使存在工作区里，也删除路径"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:968
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "携带 --stdin：输入的行以 null 字符终止"
-#: builtin/update-index.c:981
+#: builtin/update-index.c:970
msgid "read list of paths to be updated from standard input"
msgstr "从标准输入中读取需要更新的路径列表"
-#: builtin/update-index.c:985
+#: builtin/update-index.c:974
msgid "add entries from standard input to the index"
msgstr "从标准输入添加条目到索引区"
-#: builtin/update-index.c:989
+#: builtin/update-index.c:978
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "为指定文件重新生成第2和第3暂存区"
-#: builtin/update-index.c:993
+#: builtin/update-index.c:982
msgid "only update entries that differ from HEAD"
msgstr "只更新与 HEAD 不同的条目"
-#: builtin/update-index.c:997
+#: builtin/update-index.c:986
msgid "ignore files missing from worktree"
msgstr "忽略工作区丢失的文件"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:989
msgid "report actions to standard output"
msgstr "在标准输出显示操作"
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:991
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(for porcelains) 忘记保存的未解决的冲突"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:995
msgid "write index in this format"
msgstr "以这种格式写入索引区"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:997
msgid "enable or disable split index"
msgstr "启用或禁用索引拆分"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:999
msgid "enable/disable untracked cache"
msgstr "启用/禁用对未跟踪文件的缓存"
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1001
msgid "test if the filesystem supports untracked cache"
msgstr "测试文件系统是否支持未跟踪文件缓存"
-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1003
msgid "enable untracked cache without testing the filesystem"
msgstr "无需检测文件系统，启用对未跟踪文件的缓存"
-#: builtin/update-index.c:1134
+#: builtin/update-index.c:1119
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
+msgstr ""
+"core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存，请删除或修"
+"改它。"
+
+#: builtin/update-index.c:1123
msgid "Untracked cache disabled"
msgstr "缓存未跟踪文件被禁用"
-#: builtin/update-index.c:1146
+#: builtin/update-index.c:1131
+msgid ""
+"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:1135
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "缓存未跟踪文件在 '%s' 启用"
msgid "only useful for debugging"
msgstr "只对调试有用"
-#: upload-pack.c:20
+#: upload-pack.c:22
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<选项>] <目录>"
-#: upload-pack.c:837
+#: upload-pack.c:1028
msgid "quit after a single request/response exchange"
msgstr "在一次单独的请求/响应（request/response）交换后退出"
-#: upload-pack.c:839
+#: upload-pack.c:1030
msgid "exit immediately after initial ref advertisement"
msgstr "在初始的引用广告后立即退出"
-#: upload-pack.c:841
+#: upload-pack.c:1032
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr "不要尝试 <directory>/.git/ 如果 <directory> 不是一个 Git 目录"
-#: upload-pack.c:843
+#: upload-pack.c:1034
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "不活动 <n> 秒钟后终止传输"
+#: credential-cache--daemon.c:223
+#, 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 ""
+"您 socket 目录权限过于放松，其他用户可能会读取您缓存的认证信息。考虑执行：\n"
+"\n"
+"\tchmod 0700 %s"
+
#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "调试信息输出到标准错误"
"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
"帮助。"
-#: http.c:323
+#: http.c:342
+msgid "Delegation control is not supported with cURL < 7.22.0"
+msgstr "当 cURL < 7.22.0 时，不支持委托控制"
+
+#: http.c:351
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "不支持公钥文件锁定，因为 cURL < 7.44.0"
msgid "no-op (backward compatibility)"
msgstr "空操作（向后兼容）"
-#: parse-options.h:237
+#: parse-options.h:238
msgid "be more verbose"
msgstr "更加详细"
-#: parse-options.h:239
+#: parse-options.h:240
msgid "be more quiet"
msgstr "更加安静"
-#: parse-options.h:245
+#: parse-options.h:246
msgid "use <n> digits to display SHA-1s"
msgstr "用 <n> 位数字显示 SHA-1 哈希值"
msgstr "自动合并未生效。"
#: git-merge-octopus.sh:62
-msgid "Should not be doing an Octopus."
+msgid "Should not be doing an octopus."
msgstr "不应该执行章鱼式合并。"
#: git-merge-octopus.sh:73
msgid "Cannot save the current index state"
msgstr "无法保存当前索引状态"
+#: git-stash.sh:103
+msgid "Cannot save the untracked files"
+msgstr "无法保存未跟踪文件"
+
#: git-stash.sh:123 git-stash.sh:136
msgid "Cannot save the current worktree state"
msgstr "无法保存当前工作区状态"
"错误：'stash save' 的未知选项：$option\n"
" 要提供一个描述信息，使用 git stash save -- '$option'"
+#: git-stash.sh:251
+msgid "Can't use --patch and --include-untracked or --all at the same time"
+msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
+
#: git-stash.sh:259
msgid "No local changes to save"
msgstr "没有要保存的本地修改"
msgid "Cannot remove worktree changes"
msgstr "无法删除工作区变更"
-#: git-stash.sh:404
+#: git-stash.sh:403
#, sh-format
msgid "unknown option: $opt"
msgstr "未知选项: $opt"
-#: git-stash.sh:414
+#: git-stash.sh:416
msgid "No stash found."
msgstr "未发现 stash。"
-#: git-stash.sh:421
+#: git-stash.sh:423
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "指定了太多的版本：$REV"
-#: git-stash.sh:427
+#: git-stash.sh:438
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference 不是一个有效的引用"
-#: git-stash.sh:455
+#: git-stash.sh:466
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' 不是 stash 样提交"
-#: git-stash.sh:466
+#: git-stash.sh:477
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' 不是一个 stash 引用"
-#: git-stash.sh:474
+#: git-stash.sh:485
msgid "unable to refresh index"
msgstr "无法刷新索引"
-#: git-stash.sh:478
+#: git-stash.sh:489
msgid "Cannot apply a stash in the middle of a merge"
msgstr "无法在合并过程中恢复进度"
-#: git-stash.sh:486
+#: git-stash.sh:497
msgid "Conflicts in index. Try without --index."
msgstr "索引中有冲突。尝试不使用 --index。"
-#: git-stash.sh:488
+#: git-stash.sh:499
msgid "Could not save index tree"
msgstr "不能保存索引树"
-#: git-stash.sh:522
+#: git-stash.sh:508
+msgid "Could not restore untracked files from stash"
+msgstr "无法从进度保存中恢复未跟踪文件"
+
+#: git-stash.sh:533
msgid "Cannot unstage modified files"
msgstr "无法将修改的文件取消暂存"
-#: git-stash.sh:537
+#: git-stash.sh:548
msgid "Index was not unstashed."
msgstr "索引的进度没有被恢复。"
-#: git-stash.sh:551
+#: git-stash.sh:562
msgid "The stash is kept in case you need it again."
msgstr "暂存被保留以备您再次需要。"
-#: git-stash.sh:560
+#: git-stash.sh:571
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "丢弃了 ${REV} ($s)"
-#: git-stash.sh:561
+#: git-stash.sh:572
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}：不能丢弃进度条目"
-#: git-stash.sh:569
+#: git-stash.sh:580
msgid "No branch name specified"
msgstr "未指定分支名"
-#: git-stash.sh:641
+#: git-stash.sh:652
msgid "(To restore them type \"git stash apply\")"
msgstr "（为恢复数据输入 \"git stash apply\"）"
-#: git-submodule.sh:183
+#: git-submodule.sh:184
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "只能在工作区的顶级目录中使用相对路径"
-#: git-submodule.sh:193
+#: git-submodule.sh:194
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "仓库 URL：'$repo' 必须是绝对路径或以 ./|../ 起始"
-#: git-submodule.sh:210
+#: git-submodule.sh:211
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' 已经存在于索引中"
-#: git-submodule.sh:214
+#: git-submodule.sh:215
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
"$sm_path\n"
"如果您确实想添加它，使用 -f 参数。"
-#: git-submodule.sh:232
+#: git-submodule.sh:233
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "添加位于 '$sm_path' 的现存仓库到索引"
-#: git-submodule.sh:234
+#: git-submodule.sh:235
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
-#: git-submodule.sh:242
+#: git-submodule.sh:243
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr "本地发现 '$sm_name' 的一个 git 目录，与其对应的远程仓库："
-#: git-submodule.sh:244
+#: git-submodule.sh:245
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
"使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
"或者您不确定这里的含义，使用 '--name' 选项选择另外的名称。"
-#: git-submodule.sh:250
+#: git-submodule.sh:251
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "激活本地 git 目录到子模组 '$sm_name'。"
-#: git-submodule.sh:262
+#: git-submodule.sh:263
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "不能检出子模组 '$sm_path'"
-#: git-submodule.sh:267
+#: git-submodule.sh:268
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "无法添加子模组 '$sm_path'"
-#: git-submodule.sh:276
+#: git-submodule.sh:277
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "无法注册子模组 '$sm_path'"
-#: git-submodule.sh:323
+#: git-submodule.sh:324
#, sh-format
msgid "Entering '$displaypath'"
msgstr "正在进入 '$displaypath'"
-#: git-submodule.sh:343
+#: git-submodule.sh:344
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr "停止于 '$displaypath'；脚本返回非零值。"
-#: git-submodule.sh:414
+#: git-submodule.sh:415
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr "pathspec 和 --all 不兼容"
-#: git-submodule.sh:419
+#: git-submodule.sh:420
#, sh-format
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "如果您确实想要对所有子模组执行取消初始化，请使用 '--all'"
-#: git-submodule.sh:439
+#: git-submodule.sh:440
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains a .git directory\n"
"子模组工作区 '$displaypath' 包含一个 .git 目录\n"
"（如果您真的想删除它及其全部历史，使用 'rm -rf' 命令）"
-#: git-submodule.sh:447
+#: git-submodule.sh:448
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
"discard them"
msgstr "子模组工作区 '$displaypath' 包含本地修改；使用 '-f' 丢弃它们"
-#: git-submodule.sh:450
+#: git-submodule.sh:451
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "已清除目录 '$displaypath'"
-#: git-submodule.sh:451
+#: git-submodule.sh:452
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr "无法移除子模组工作区 '$displaypath'"
-#: git-submodule.sh:454
+#: git-submodule.sh:455
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "不能创建空的子模组目录 '$displaypath'"
-#: git-submodule.sh:463
+#: git-submodule.sh:464
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
-#: git-submodule.sh:612
+#: git-submodule.sh:617
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
-#: git-submodule.sh:622
+#: git-submodule.sh:627
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中获取"
-#: git-submodule.sh:627
+#: git-submodule.sh:632
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
-#: git-submodule.sh:645
+#: git-submodule.sh:650
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中获取"
-#: git-submodule.sh:651
+#: git-submodule.sh:656
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Direct fetching of that commit failed."
-msgstr "获取了子模组路径 '$displaypath'，但是它没有包含 $sha1。直接获取该提交失败。"
+msgstr ""
+"获取了子模组路径 '$displaypath'，但是它没有包含 $sha1。直接获取该提交失败。"
-#: git-submodule.sh:658
+#: git-submodule.sh:663
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
-#: git-submodule.sh:659
+#: git-submodule.sh:664
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "子模组路径 '$displaypath'：检出 '$sha1'"
-#: git-submodule.sh:663
+#: git-submodule.sh:668
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
-#: git-submodule.sh:664
+#: git-submodule.sh:669
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "子模组路径 '$displaypath'：变基至 '$sha1'"
-#: git-submodule.sh:669
+#: git-submodule.sh:674
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
-#: git-submodule.sh:670
+#: git-submodule.sh:675
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'"
-#: git-submodule.sh:675
+#: git-submodule.sh:680
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
-#: git-submodule.sh:676
+#: git-submodule.sh:681
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "子模组 '$displaypath'：'$command $sha1'"
-#: git-submodule.sh:707
+#: git-submodule.sh:712
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "无法递归进子模组路径 '$displaypath'"
-#: git-submodule.sh:815
+#: git-submodule.sh:820
msgid "The --cached option cannot be used with the --files option"
msgstr "选项 --cached 不能和选项 --files 同时使用"
-#: git-submodule.sh:867
+#: git-submodule.sh:872
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "意外的模式 $mod_dst"
# 译者：注意保持前导空格
-#: git-submodule.sh:887
+#: git-submodule.sh:892
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " 警告：$display_name 未包含提交 $sha1_src"
# 译者：注意保持前导空格
-#: git-submodule.sh:890
+#: git-submodule.sh:895
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " 警告：$display_name 未包含提交 $sha1_dst"
# 译者：注意保持前导空格
-#: git-submodule.sh:893
+#: git-submodule.sh:898
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " 警告：$display_name 未包含提交 $sha1_src 和 $sha1_dst"
-#: git-submodule.sh:918
-msgid "blob"
-msgstr "数据对象"
-
-#: git-submodule.sh:1040
+#: git-submodule.sh:1045
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "无法递归进子模组路径 '$sm_path'"
-#: git-submodule.sh:1107
+#: git-submodule.sh:1112
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "为 '$displaypath' 同步子模组 url"
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
-msgstr "\n不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
+msgstr ""
+"\n"
+"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
#: git-rebase--interactive.sh:166
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
-msgstr "\n如果您在这里删除一行，对应的提交将会丢失。\n"
+msgstr ""
+"\n"
+"如果您在这里删除一行，对应的提交将会丢失。\n"
#: git-rebase--interactive.sh:202
#, sh-format
msgstr "选项 rebase.missingCommitsCheck 的值 $check_level 无法被识别。已忽略。"
#: git-rebase--interactive.sh:1044
-msgid "You can fix this with 'git rebase --edit-todo'."
-msgstr "您可以使用 'git rebase --edit-todo' 命令修改。"
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'."
+msgstr ""
+"您可以用命令 'git rebase --edit-todo' 修正然后执行命令 'git rebase --"
+"continue'。"
#: git-rebase--interactive.sh:1045
msgid "Or you can abort the rebase with 'git rebase --abort'."
"\n"
" git commit $gpg_sign_opt_quoted\n"
"\n"
-"In both case, once you're done, continue with:\n"
+"In both cases, once you're done, continue with:\n"
"\n"
" git rebase --continue\n"
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'。"
+msgstr ""
+"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
#: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105
msgid "Could not commit staged changes."
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1298
+#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1295
msgid "Could not execute editor"
msgstr "无法运行编辑器"
-#: git-rebase--interactive.sh:1145
-msgid "You need to set your committer info first"
-msgstr "您需要先设置您的提交者信息"
-
-#: git-rebase--interactive.sh:1153
+#: git-rebase--interactive.sh:1150
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "不能检出 $switch_to"
-#: git-rebase--interactive.sh:1158
+#: git-rebase--interactive.sh:1155
msgid "No HEAD?"
msgstr "没有 HEAD？"
-#: git-rebase--interactive.sh:1159
+#: git-rebase--interactive.sh:1156
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "不能创建临时 $state_dir"
-#: git-rebase--interactive.sh:1161
+#: git-rebase--interactive.sh:1158
msgid "Could not mark as interactive"
msgstr "不能标记为交互式"
-#: git-rebase--interactive.sh:1171 git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:1168 git-rebase--interactive.sh:1173
msgid "Could not init rewritten commits"
msgstr "不能对重写提交进行初始化"
-#: git-rebase--interactive.sh:1276
+#: git-rebase--interactive.sh:1273
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）"
msgstr[1] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）"
-#: git-rebase--interactive.sh:1281
+#: git-rebase--interactive.sh:1278
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"\n"
-msgstr "\n然而，如果您删除全部内容，变基操作将会终止。\n\n"
+msgstr ""
+"\n"
+"然而，如果您删除全部内容，变基操作将会终止。\n"
+"\n"
-#: git-rebase--interactive.sh:1288
+#: git-rebase--interactive.sh:1285
msgid "Note that empty commits are commented out"
msgstr "注意空提交已被注释掉"
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "不能重写分支：您有未暂存的变更。"
+#: git-sh-setup.sh:226
+msgid "Cannot pull with rebase: You have unstaged changes."
+msgstr "无法通过变基方式拉取：您有未暂存的变更。"
+
#: git-sh-setup.sh:229
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr "不能变基：您的索引中包含未提交的变更。"
+#: git-sh-setup.sh:245
+msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+msgstr "无法通过变基方式拉取：您的索引中包含未提交的变更。"
+
#: git-sh-setup.sh:248
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr "不能 $action：您的索引中包含未提交的变更。"
+#: git-sh-setup.sh:252
+msgid "Additionally, your index contains uncommitted changes."
+msgstr "而且您的索引中包含未提交的变更。"
+
#: git-sh-setup.sh:372
msgid "You need to run this command from the toplevel of the working tree."
msgstr "您需要在工作区的顶级目录中运行这个命令。"
#: git-sh-setup.sh:377
msgid "Unable to determine absolute path of git directory"
msgstr "不能确定 git 目录的绝对路径"
+
+#~ msgid "Could not write to %s"
+#~ msgstr "不能写入 %s"
+
+#~ msgid "Error wrapping up %s."
+#~ msgstr "错误收尾 %s。"
+
+#~ msgid "Your local changes would be overwritten by cherry-pick."
+#~ msgstr "您的本地修改将被拣选操作覆盖。"
+
+#~ msgid "Cannot revert during another revert."
+#~ msgstr "不能在回退中执行另一回退。"
+
+#~ msgid "Cannot cherry-pick during another cherry-pick."
+#~ msgstr "不能在拣选过程中执行另一拣选。"
+
+#~ msgid "Could not parse line %d."
+#~ msgstr "不能解析第 %d 行。"
+
+#~ msgid "Could not open %s"
+#~ msgstr "不能打开 %s"
+
+#~ msgid "Could not read %s."
+#~ msgstr "不能读取 %s。"
+
+#~ msgid "Could not format %s."
+#~ msgstr "不能格式化 %s。"
+
+#~ msgid "%s: %s"
+#~ msgstr "%s：%s"
+
+#~ msgid "cannot open %s: %s"
+#~ msgstr "不能打开 %s：%s"
+
+#~ msgid "You need to set your committer info first"
+#~ msgstr "您需要先设置您的提交者信息"
head = resolve_ref_unsafe("HEAD", RESOLVE_REF_READING,
sha1, NULL);
- if (!strcmp(ref->refname, head))
+ if (head && !strcmp(ref->refname, head))
v->s = "*";
else
v->s = " ";
}
if (append_eol && write(msg_fd, "\n", 1) < 0) {
rollback_lock_file(&msg_file);
- return error_errno(_("could not write eol to '%s"), filename);
+ return error_errno(_("could not write eol to '%s'"), filename);
}
if (commit_lock_file(&msg_file) < 0) {
rollback_lock_file(&msg_file);
static const char *command_to_string(const enum todo_command command)
{
- if (command < ARRAY_SIZE(todo_command_strings))
+ if ((size_t)command < ARRAY_SIZE(todo_command_strings))
return todo_command_strings[command];
die("Unknown command: %d", command);
}
}
strbuf_addstr(&pathbuf, entry);
- if (strbuf_normalize_path(&pathbuf) < 0) {
+ if (strbuf_normalize_path(&pathbuf) < 0 && relative_base) {
error("unable to normalize alternate object path: %s",
pathbuf.buf);
strbuf_release(&pathbuf);
return 1;
}
-static int submodule_needs_pushing(const char *path, const unsigned char sha1[20])
+static int append_sha1_to_argv(const unsigned char sha1[20], void *data)
{
- if (add_submodule_odb(path) || !lookup_commit_reference(sha1))
+ struct argv_array *argv = data;
+ argv_array_push(argv, sha1_to_hex(sha1));
+ return 0;
+}
+
+static int check_has_commit(const unsigned char sha1[20], void *data)
+{
+ int *has_commit = data;
+
+ if (!lookup_commit_reference(sha1))
+ *has_commit = 0;
+
+ return 0;
+}
+
+static int submodule_has_commits(const char *path, struct sha1_array *commits)
+{
+ int has_commit = 1;
+
+ if (add_submodule_odb(path))
+ return 0;
+
+ sha1_array_for_each_unique(commits, check_has_commit, &has_commit);
+ return has_commit;
+}
+
+static int submodule_needs_pushing(const char *path, struct sha1_array *commits)
+{
+ if (!submodule_has_commits(path, commits))
+ /*
+ * NOTE: We do consider it safe to return "no" here. The
+ * correct answer would be "We do not know" instead of
+ * "No push needed", but it is quite hard to change
+ * the submodule pointer without having the submodule
+ * around. If a user did however change the submodules
+ * without having the submodule around, this indicates
+ * an expert who knows what they are doing or a
+ * maintainer integrating work from other people. In
+ * both cases it should be safe to skip this check.
+ */
return 0;
if (for_each_remote_ref_submodule(path, has_remote, NULL) > 0) {
struct child_process cp = CHILD_PROCESS_INIT;
- const char *argv[] = {"rev-list", NULL, "--not", "--remotes", "-n", "1" , NULL};
struct strbuf buf = STRBUF_INIT;
int needs_pushing = 0;
- argv[1] = sha1_to_hex(sha1);
- cp.argv = argv;
+ argv_array_push(&cp.args, "rev-list");
+ sha1_array_for_each_unique(commits, append_sha1_to_argv, &cp.args);
+ argv_array_pushl(&cp.args, "--not", "--remotes", "-n", "1" , NULL);
+
prepare_submodule_repo_env(&cp.env_array);
cp.git_cmd = 1;
cp.no_stdin = 1;
cp.out = -1;
cp.dir = path;
if (start_command(&cp))
- die("Could not run 'git rev-list %s --not --remotes -n 1' command in submodule %s",
- sha1_to_hex(sha1), path);
+ die("Could not run 'git rev-list <commits> --not --remotes -n 1' command in submodule %s",
+ path);
if (strbuf_read(&buf, cp.out, 41))
needs_pushing = 1;
finish_command(&cp);
return 0;
}
+static struct sha1_array *submodule_commits(struct string_list *submodules,
+ const char *path)
+{
+ struct string_list_item *item;
+
+ item = string_list_insert(submodules, path);
+ if (item->util)
+ return (struct sha1_array *) item->util;
+
+ /* NEEDSWORK: should we have sha1_array_init()? */
+ item->util = xcalloc(1, sizeof(struct sha1_array));
+ return (struct sha1_array *) item->util;
+}
+
static void collect_submodules_from_diff(struct diff_queue_struct *q,
struct diff_options *options,
void *data)
{
int i;
- struct string_list *needs_pushing = data;
+ struct string_list *submodules = data;
for (i = 0; i < q->nr; i++) {
struct diff_filepair *p = q->queue[i];
+ struct sha1_array *commits;
if (!S_ISGITLINK(p->two->mode))
continue;
- if (submodule_needs_pushing(p->two->path, p->two->oid.hash))
- string_list_insert(needs_pushing, p->two->path);
+ commits = submodule_commits(submodules, p->two->path);
+ sha1_array_append(commits, p->two->oid.hash);
}
}
diff_tree_combined_merge(commit, 1, &rev);
}
-int find_unpushed_submodules(unsigned char new_sha1[20],
+static void free_submodules_sha1s(struct string_list *submodules)
+{
+ struct string_list_item *item;
+ for_each_string_list_item(item, submodules)
+ sha1_array_clear((struct sha1_array *) item->util);
+ string_list_clear(submodules, 1);
+}
+
+int find_unpushed_submodules(struct sha1_array *commits,
const char *remotes_name, struct string_list *needs_pushing)
{
struct rev_info rev;
struct commit *commit;
- const char *argv[] = {NULL, NULL, "--not", "NULL", NULL};
- int argc = ARRAY_SIZE(argv) - 1;
- char *sha1_copy;
-
- struct strbuf remotes_arg = STRBUF_INIT;
+ struct string_list submodules = STRING_LIST_INIT_DUP;
+ struct string_list_item *submodule;
+ struct argv_array argv = ARGV_ARRAY_INIT;
- strbuf_addf(&remotes_arg, "--remotes=%s", remotes_name);
init_revisions(&rev, NULL);
- sha1_copy = xstrdup(sha1_to_hex(new_sha1));
- argv[1] = sha1_copy;
- argv[3] = remotes_arg.buf;
- setup_revisions(argc, argv, &rev, NULL);
+
+ /* argv.argv[0] will be ignored by setup_revisions */
+ argv_array_push(&argv, "find_unpushed_submodules");
+ sha1_array_for_each_unique(commits, append_sha1_to_argv, &argv);
+ argv_array_push(&argv, "--not");
+ argv_array_pushf(&argv, "--remotes=%s", remotes_name);
+
+ setup_revisions(argv.argc, argv.argv, &rev, NULL);
if (prepare_revision_walk(&rev))
die("revision walk setup failed");
while ((commit = get_revision(&rev)) != NULL)
- find_unpushed_submodule_commits(commit, needs_pushing);
+ find_unpushed_submodule_commits(commit, &submodules);
reset_revision_walk();
- free(sha1_copy);
- strbuf_release(&remotes_arg);
+ argv_array_clear(&argv);
+
+ for_each_string_list_item(submodule, &submodules) {
+ struct sha1_array *commits = (struct sha1_array *) submodule->util;
+
+ if (submodule_needs_pushing(submodule->string, commits))
+ string_list_insert(needs_pushing, submodule->string);
+ }
+ free_submodules_sha1s(&submodules);
return needs_pushing->nr;
}
-static int push_submodule(const char *path)
+static int push_submodule(const char *path, int dry_run)
{
if (add_submodule_odb(path))
return 1;
if (for_each_remote_ref_submodule(path, has_remote, NULL) > 0) {
struct child_process cp = CHILD_PROCESS_INIT;
- const char *argv[] = {"push", NULL};
+ argv_array_push(&cp.args, "push");
+ if (dry_run)
+ argv_array_push(&cp.args, "--dry-run");
- cp.argv = argv;
prepare_submodule_repo_env(&cp.env_array);
cp.git_cmd = 1;
cp.no_stdin = 1;
return 1;
}
-int push_unpushed_submodules(unsigned char new_sha1[20], const char *remotes_name)
+int push_unpushed_submodules(struct sha1_array *commits,
+ const char *remotes_name,
+ int dry_run)
{
int i, ret = 1;
struct string_list needs_pushing = STRING_LIST_INIT_DUP;
- if (!find_unpushed_submodules(new_sha1, remotes_name, &needs_pushing))
+ if (!find_unpushed_submodules(commits, remotes_name, &needs_pushing))
return 1;
for (i = 0; i < needs_pushing.nr; i++) {
const char *path = needs_pushing.items[i].string;
fprintf(stderr, "Pushing submodule '%s'\n", path);
- if (!push_submodule(path)) {
+ if (!push_submodule(path, dry_run)) {
fprintf(stderr, "Unable to push submodule '%s'\n", path);
ret = 0;
}
struct diff_options;
struct argv_array;
+struct sha1_array;
enum {
RECURSE_SUBMODULES_CHECK = -4,
int ok_to_remove_submodule(const char *path);
int merge_submodule(unsigned char result[20], const char *path, const unsigned char base[20],
const unsigned char a[20], const unsigned char b[20], int search);
-int find_unpushed_submodules(unsigned char new_sha1[20], const char *remotes_name,
+int find_unpushed_submodules(struct sha1_array *commits, const char *remotes_name,
struct string_list *needs_pushing);
-int push_unpushed_submodules(unsigned char new_sha1[20], const char *remotes_name);
+extern int push_unpushed_submodules(struct sha1_array *commits,
+ const char *remotes_name,
+ int dry_run);
void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir);
int parallel_submodules(void);
. ./test-lib.sh
-TEST_ROOT="$(pwd)"
+TEST_ROOT="$PWD"
+PATH=$TEST_ROOT:$PATH
-cat <<EOF >"$TEST_ROOT/rot13.sh"
-#!$SHELL_PATH
+write_script <<\EOF "$TEST_ROOT/rot13.sh"
tr \
'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' \
'nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM'
EOF
-chmod +x "$TEST_ROOT/rot13.sh"
+
+write_script rot13-filter.pl "$PERL_PATH" \
+ <"$TEST_DIRECTORY"/t0021/rot13-filter.pl
generate_random_characters () {
LEN=$1
}
file_size () {
- cat "$1" | wc -c | sed "s/^[ ]*//"
+ perl -e 'print -s $ARGV[0]' "$1"
}
filter_git () {
rm -f rot13-filter.log &&
- git "$@" 2>git-stderr.log &&
- rm -f git-stderr.log
+ git "$@"
}
# Compare two files and ensure that `clean` and `smudge` respectively are
actual=$2
for FILE in "$expect" "$actual"
do
- sort "$FILE" | uniq -c | sed "s/^[ ]*//" |
- sed "s/^\([0-9]\) IN: clean/x IN: clean/" |
- sed "s/^\([0-9]\) IN: smudge/x IN: smudge/" >"$FILE.tmp" &&
- mv "$FILE.tmp" "$FILE"
+ sort "$FILE" | uniq -c |
+ sed -e "s/^ *[0-9][0-9]*[ ]*IN: /x IN: /" >"$FILE.tmp" &&
+ mv "$FILE.tmp" "$FILE" || return
done &&
test_cmp "$expect" "$actual"
}
# is equal to the committed content.
test_cmp_committed_rot13 () {
test_cmp "$1" "$2" &&
- "$TEST_ROOT/rot13.sh" <"$1" >expected &&
+ rot13.sh <"$1" >expected &&
git cat-file blob :"$2" >actual &&
test_cmp expected actual
}
'
test_expect_success PERL 'required process filter should filter data' '
- test_config_global filter.protocol.process "$TEST_DIRECTORY/t0021/rot13-filter.pl clean smudge" &&
+ test_config_global filter.protocol.process "rot13-filter.pl clean smudge" &&
test_config_global filter.protocol.required true &&
rm -rf repo &&
mkdir repo &&
test_expect_success PERL 'required process filter takes precedence' '
test_config_global filter.protocol.clean false &&
- test_config_global filter.protocol.process "$TEST_DIRECTORY/t0021/rot13-filter.pl clean" &&
+ test_config_global filter.protocol.process "rot13-filter.pl clean" &&
test_config_global filter.protocol.required true &&
rm -rf repo &&
mkdir repo &&
'
test_expect_success PERL 'required process filter should be used only for "clean" operation only' '
- test_config_global filter.protocol.process "$TEST_DIRECTORY/t0021/rot13-filter.pl clean" &&
+ test_config_global filter.protocol.process "rot13-filter.pl clean" &&
rm -rf repo &&
mkdir repo &&
(
'
test_expect_success PERL 'required process filter should process multiple packets' '
- test_config_global filter.protocol.process "$TEST_DIRECTORY/t0021/rot13-filter.pl clean smudge" &&
+ test_config_global filter.protocol.process "rot13-filter.pl clean smudge" &&
test_config_global filter.protocol.required true &&
rm -rf repo &&
for FILE in "$TEST_ROOT"/*.file
do
cp "$FILE" . &&
- "$TEST_ROOT/rot13.sh" <"$FILE" >"$FILE.rot13"
+ rot13.sh <"$FILE" >"$FILE.rot13"
done &&
echo "*.file filter=protocol" >.gitattributes &&
'
test_expect_success PERL 'required process filter with clean error should fail' '
- test_config_global filter.protocol.process "$TEST_DIRECTORY/t0021/rot13-filter.pl clean smudge" &&
+ test_config_global filter.protocol.process "rot13-filter.pl clean smudge" &&
test_config_global filter.protocol.required true &&
rm -rf repo &&
mkdir repo &&
'
test_expect_success PERL 'process filter should restart after unexpected write failure' '
- test_config_global filter.protocol.process "$TEST_DIRECTORY/t0021/rot13-filter.pl clean smudge" &&
+ test_config_global filter.protocol.process "rot13-filter.pl clean smudge" &&
rm -rf repo &&
mkdir repo &&
(
# Smudge failed
! test_cmp smudge-write-fail.o smudge-write-fail.r &&
- "$TEST_ROOT/rot13.sh" <smudge-write-fail.o >expected &&
+ rot13.sh <smudge-write-fail.o >expected &&
git cat-file blob :smudge-write-fail.r >actual &&
test_cmp expected actual
)
'
test_expect_success PERL 'process filter should not be restarted if it signals an error' '
- test_config_global filter.protocol.process "$TEST_DIRECTORY/t0021/rot13-filter.pl clean smudge" &&
+ test_config_global filter.protocol.process "rot13-filter.pl clean smudge" &&
rm -rf repo &&
mkdir repo &&
(
'
test_expect_success PERL 'process filter abort stops processing of all further files' '
- test_config_global filter.protocol.process "$TEST_DIRECTORY/t0021/rot13-filter.pl clean smudge" &&
+ test_config_global filter.protocol.process "rot13-filter.pl clean smudge" &&
rm -rf repo &&
mkdir repo &&
(
-#!/usr/bin/perl
#
# Example implementation for the Git filter protocol version 2
# See Documentation/gitattributes.txt, section "Filter Protocol"
use strict;
use warnings;
+use IO::File;
my $MAX_PACKET_CONTENT_SIZE = 65516;
my @capabilities = @ARGV;
test_cmp expect actual
'
+test_expect_success '-c with comment char defined in .git/config' '
+ test_config core.commentchar = &&
+ printf "= foo\n" >expect &&
+ printf "foo" | (
+ mkdir sub && cd sub && git stripspace -c
+ ) >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'avoid SP-HT sequence in commented line' '
printf "#\tone\n#\n# two\n" >expect &&
printf "\tone\n\ntwo\n" | git stripspace -c >actual &&
rm -rf bare1
'
+test_expect_success 'broken main worktree still at the top' '
+ git init broken-main &&
+ (
+ cd broken-main &&
+ test_commit new &&
+ git worktree add linked &&
+ cat >expected <<-EOF &&
+ worktree $(pwd)
+ HEAD $_z40
+
+ EOF
+ cd linked &&
+ echo "worktree $(pwd)" >expected &&
+ echo "ref: .broken" >../.git/HEAD &&
+ git worktree list --porcelain | head -n 3 >actual &&
+ test_cmp ../expected actual &&
+ git worktree list | head -n 1 >actual.2 &&
+ grep -F "(error)" actual.2
+ )
+'
+
+test_expect_success 'linked worktrees are sorted' '
+ mkdir sorted &&
+ git init sorted/main &&
+ (
+ cd sorted/main &&
+ test_tick &&
+ test_commit new &&
+ git worktree add ../first &&
+ git worktree add ../second &&
+ git worktree list --porcelain | grep ^worktree >actual
+ ) &&
+ cat >expected <<-EOF &&
+ worktree $(pwd)/sorted/main
+ worktree $(pwd)/sorted/first
+ worktree $(pwd)/sorted/second
+ EOF
+ test_cmp expected sorted/main/actual
+'
+
test_done
test_must_fail test -d d
'
-test_expect_failure 'merge-recursive simple w/submodule' '
+test_expect_success 'merge-recursive simple w/submodule' '
git checkout submod &&
git merge remove
'
-test_expect_failure 'merge-recursive simple w/submodule result' '
+test_expect_success 'merge-recursive simple w/submodule result' '
git ls-files -s >actual &&
(
test B = $(git cat-file commit HEAD^ | sed -ne \$p)
'
+test_expect_success 'rebase -i respects core.commentchar=auto' '
+ test_config core.commentchar auto &&
+ write_script copy-edit-script.sh <<-\EOF &&
+ cp "$1" edit-script
+ EOF
+ test_set_editor "$(pwd)/copy-edit-script.sh" &&
+ test_when_finished "git rebase --abort || :" &&
+ git rebase -i HEAD^ &&
+ test -z "$(grep -ve "^#" -e "^\$" -e "^pick" edit-script)"
+'
+
test_expect_success 'rebase -i, with <onto> and <upstream> specified as :/quuxery' '
test_when_finished "git branch -D torebase" &&
git checkout -b torebase branch1 &&
git rebase -i "$1"
}
-KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
-# The real reason "replace directory with submodule" fails is because a
-# directory "sub1" exists, but we reuse the suppression added for merge here
test_submodule_switch "git_rebase_interactive"
test_done
'
}
+# run "$@" inside a non-git directory
+nongit () {
+ test -d non-repo ||
+ mkdir non-repo ||
+ return 1
+
+ (
+ GIT_CEILING_DIRECTORIES=$(pwd) &&
+ export GIT_CEILING_DIRECTORIES &&
+ cd non-repo &&
+ "$@"
+ )
+}
+
test_expect_success \
'populate workdir' \
'mkdir a &&
'git archive --remote=. HEAD >b5.tar &&
test_cmp_bin b.tar b5.tar'
+test_expect_success 'git archive --remote with configured remote' '
+ git config remote.foo.url . &&
+ (
+ cd a &&
+ git archive --remote=foo --output=../b5-nick.tar HEAD
+ ) &&
+ test_cmp_bin b.tar b5-nick.tar
+'
+
test_expect_success \
'validate file modification time' \
'mkdir extract &&
test_cmp_bin b.tar d4.zip
'
-test_expect_success \
- 'git archive --list outside of a git repo' \
- 'GIT_DIR=some/non-existing/directory git archive --list'
+test_expect_success 'git archive --list outside of a git repo' '
+ nongit git archive --list
+'
+
+test_expect_success 'git archive --remote outside of a git repo' '
+ git archive HEAD >expect.tar &&
+ nongit git archive --remote="$PWD" HEAD >actual.tar &&
+ test_cmp_bin expect.tar actual.tar
+'
test_expect_success 'clients cannot access unreachable commits' '
test_commit unreachable &&
test_cmp "$DATA/comment.expect" comment/info
'
+test_expect_success 'mailinfo with mailinfo.scissors config' '
+ test_config mailinfo.scissors true &&
+ (
+ mkdir sub &&
+ cd sub &&
+ git mailinfo ../msg0014.sc ../patch0014.sc <../0014 >../info0014.sc
+ ) &&
+ test_cmp "$DATA/msg0014--scissors" msg0014.sc &&
+ test_cmp "$DATA/patch0014--scissors" patch0014.sc &&
+ test_cmp "$DATA/info0014--scissors" info0014.sc
+'
+
+
test_done
cd submodule.git &&
git rev-parse master >../actual
) &&
+ test_when_finished git -C work reset --hard master^ &&
test_cmp expected actual
'
+test_expect_success 'push --dry-run does not recursively update submodules' '
+ (
+ cd work/gar/bage &&
+ git checkout master &&
+ git rev-parse master >../../../expected_submodule &&
+ > junk9 &&
+ git add junk9 &&
+ git commit -m "Ninth junk" &&
+
+ # Go up to 'work' directory
+ cd ../.. &&
+ git checkout master &&
+ git rev-parse master >../expected_pub &&
+ git add gar/bage &&
+ git commit -m "Ninth commit for gar/bage" &&
+ git push --dry-run --recurse-submodules=on-demand ../pub.git master
+ ) &&
+ git -C submodule.git rev-parse master >actual_submodule &&
+ git -C pub.git rev-parse master >actual_pub &&
+ test_cmp expected_pub actual_pub &&
+ test_cmp expected_submodule actual_submodule
+'
+
test_done
--- /dev/null
+#!/bin/sh
+
+test_description='handling of alternates in environment variables'
+. ./test-lib.sh
+
+check_obj () {
+ alt=$1; shift
+ while read obj expect
+ do
+ echo "$obj" >&3 &&
+ echo "$obj $expect" >&4
+ done 3>input 4>expect &&
+ GIT_ALTERNATE_OBJECT_DIRECTORIES=$alt \
+ git "$@" cat-file --batch-check='%(objectname) %(objecttype)' \
+ <input >actual &&
+ test_cmp expect actual
+}
+
+test_expect_success 'create alternate repositories' '
+ git init --bare one.git &&
+ one=$(echo one | git -C one.git hash-object -w --stdin) &&
+ git init --bare two.git &&
+ two=$(echo two | git -C two.git hash-object -w --stdin)
+'
+
+test_expect_success 'objects inaccessible without alternates' '
+ check_obj "" <<-EOF
+ $one missing
+ $two missing
+ EOF
+'
+
+test_expect_success 'access alternate via absolute path' '
+ check_obj "$PWD/one.git/objects" <<-EOF
+ $one blob
+ $two missing
+ EOF
+'
+
+test_expect_success 'access multiple alternates' '
+ check_obj "$PWD/one.git/objects:$PWD/two.git/objects" <<-EOF
+ $one blob
+ $two blob
+ EOF
+'
+
+# bare paths are relative from $GIT_DIR
+test_expect_success 'access alternate via relative path (bare)' '
+ git init --bare bare.git &&
+ check_obj "../one.git/objects" -C bare.git <<-EOF
+ $one blob
+ EOF
+'
+
+# non-bare paths are relative to top of worktree
+test_expect_success 'access alternate via relative path (worktree)' '
+ git init worktree &&
+ check_obj "../one.git/objects" -C worktree <<-EOF
+ $one blob
+ EOF
+'
+
+# path is computed after moving to top-level of worktree
+test_expect_success 'access alternate via relative path (subdir)' '
+ mkdir subdir &&
+ check_obj "one.git/objects" -C subdir <<-EOF
+ $one blob
+ EOF
+'
+
+test_done
test_expect_success 'custom merge does not lock index' '
git reset --hard anchor &&
- write_script sleep-one-second.sh <<-\EOF &&
- sleep 1 &
+ write_script sleep-an-hour.sh <<-\EOF &&
+ sleep 3600 &
echo $! >sleep.pid
EOF
- test_when_finished "kill \$(cat sleep.pid)" &&
test_write_lines >.gitattributes \
- "* merge=ours" "text merge=sleep-one-second" &&
+ "* merge=ours" "text merge=sleep-an-hour" &&
test_config merge.ours.driver true &&
- test_config merge.sleep-one-second.driver ./sleep-one-second.sh &&
+ test_config merge.sleep-an-hour.driver ./sleep-an-hour.sh &&
+
+ # We are testing that the custom merge driver does not block
+ # index.lock on Windows due to an inherited file handle.
+ # To ensure that the backgrounded process ran sufficiently
+ # long (and has been started in the first place), we do not
+ # ignore the result of the kill command.
+ # By packaging the command in test_when_finished, we get both
+ # the correctness check and the clean-up.
+ test_when_finished "kill \$(cat sleep.pid)" &&
git merge master
'
test_cmp expect actual
'
+test_expect_success 'symbolic final^1^@ = final^1^1 final^1^2' '
+ git rev-parse --symbolic final^1^1 final^1^2 >expect &&
+ git rev-parse --symbolic final^1^@ >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'final^1^! = final^1 ^final^1^1 ^final^1^2' '
git rev-parse final^1 ^final^1^1 ^final^1^2 >expect &&
git rev-parse final^1^! >actual &&
test_cmp expect actual
'
+test_expect_success 'symbolic final^1^! = final^1 ^final^1^1 ^final^1^2' '
+ git rev-parse --symbolic final^1 ^final^1^1 ^final^1^2 >expect &&
+ git rev-parse --symbolic final^1^! >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'large graft octopus' '
test_cmp_rev_output b31 "git rev-parse --verify b1^30"
'
test_cmp expect actual
'
+test_expect_success 'symbolic merge^-1 = merge^1..merge' '
+ git rev-parse --symbolic merge^1..merge >expect &&
+ git rev-parse --symbolic merge^-1 >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'rev-parse merge^-0 (invalid parent)' '
test_must_fail git rev-parse merge^-0
'
refs/tags/bogo refs/tags/master > actual &&
test_cmp expected actual
'
+
+test_expect_success 'do not dereference NULL upon %(HEAD) on unborn branch' '
+ test_when_finished "git checkout master" &&
+ git for-each-ref --format="%(HEAD) %(refname:short)" refs/heads/ >actual &&
+ sed -e "s/^\* / /" actual >expect &&
+ git checkout --orphan HEAD &&
+ git for-each-ref --format="%(HEAD) %(refname:short)" refs/heads/ >actual &&
+ test_cmp expect actual
+'
+
test_done
test_lazy_prereq MKTEMP '
tempdir=$(mktemp -d -t foo.XXXXXX) &&
- test -d "$tempdir"
+ test -d "$tempdir" &&
+ rmdir "$tempdir"
'
test_expect_success MKTEMP 'temporary filenames are used with mergetool.writeToTemp' '
)
'
+test_expect_success 'submit --shelve' '
+ test_when_finished cleanup_git &&
+ git p4 clone --dest="$git" //depot &&
+ (
+ cd "$cli" &&
+ p4 revert ... &&
+ cd "$git" &&
+ git config git-p4.skipSubmitEdit true &&
+ test_commit "shelveme1" &&
+ git p4 submit --origin=HEAD^ &&
+
+ echo 654321 >shelveme2.t &&
+ echo 123456 >>shelveme1.t &&
+ git add shelveme* &&
+ git commit -m"shelvetest" &&
+ git p4 submit --shelve --origin=HEAD^ &&
+
+ test_path_is_file shelveme1.t &&
+ test_path_is_file shelveme2.t
+ ) &&
+ (
+ cd "$cli" &&
+ change=$(p4 -G changes -s shelved -m 1 //depot/... | \
+ marshal_dump change) &&
+ p4 describe -S $change | grep shelveme2 &&
+ p4 describe -S $change | grep 123456 &&
+ test_path_is_file shelveme1.t &&
+ test_path_is_missing shelveme2.t
+ )
+'
+
+# Update an existing shelved changelist
+
+test_expect_success 'submit --update-shelve' '
+ test_when_finished cleanup_git &&
+ git p4 clone --dest="$git" //depot &&
+ (
+ cd "$cli" &&
+ p4 revert ... &&
+ cd "$git" &&
+ git config git-p4.skipSubmitEdit true &&
+ test_commit "test-update-shelved-change" &&
+ git p4 submit --origin=HEAD^ --shelve &&
+
+ shelf_cl=$(p4 -G changes -s shelved -m 1 |\
+ marshal_dump change) &&
+ test -n $shelf_cl &&
+ echo "updating shelved change list $shelf_cl" &&
+
+ echo "updated-line" >>shelf.t &&
+ echo added-file.t >added-file.t &&
+ git add shelf.t added-file.t &&
+ git rm -f test-update-shelved-change.t &&
+ git commit --amend -C HEAD &&
+ git show --stat HEAD &&
+ git p4 submit -v --origin HEAD^ --update-shelve $shelf_cl &&
+ echo "done git p4 submit"
+ ) &&
+ (
+ cd "$cli" &&
+ change=$(p4 -G changes -s shelved -m 1 //depot/... | \
+ marshal_dump change) &&
+ p4 unshelve -c $change -s $change &&
+ grep -q updated-line shelf.t &&
+ p4 describe -S $change | grep added-file.t &&
+ test_path_is_missing test-update-shelved-change.t
+ )
+'
+
test_expect_success 'kill p4d' '
kill_p4d
'
(
cd "$cli" &&
+ >file0.dat &&
+ p4 add file0.dat &&
echo "content 1 txt 23 bytes" >file1.txt &&
p4 add file1.txt &&
echo "content 2-3 bin 25 bytes" >file2.dat &&
if ((flags & TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND) && !is_bare_repository()) {
struct ref *ref = remote_refs;
+ struct sha1_array commits = SHA1_ARRAY_INIT;
+
for (; ref; ref = ref->next)
- if (!is_null_oid(&ref->new_oid) &&
- !push_unpushed_submodules(ref->new_oid.hash,
- transport->remote->name))
- die ("Failed to push all needed submodules!");
+ if (!is_null_oid(&ref->new_oid))
+ sha1_array_append(&commits, ref->new_oid.hash);
+
+ if (!push_unpushed_submodules(&commits,
+ transport->remote->name,
+ pretend)) {
+ sha1_array_clear(&commits);
+ die("Failed to push all needed submodules!");
+ }
+ sha1_array_clear(&commits);
}
- if ((flags & (TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND |
- TRANSPORT_RECURSE_SUBMODULES_CHECK)) && !is_bare_repository()) {
+ if (((flags & TRANSPORT_RECURSE_SUBMODULES_CHECK) ||
+ ((flags & TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND) &&
+ !pretend)) && !is_bare_repository()) {
struct ref *ref = remote_refs;
struct string_list needs_pushing = STRING_LIST_INIT_DUP;
+ struct sha1_array commits = SHA1_ARRAY_INIT;
for (; ref; ref = ref->next)
- if (!is_null_oid(&ref->new_oid) &&
- find_unpushed_submodules(ref->new_oid.hash,
- transport->remote->name, &needs_pushing))
- die_with_unpushed_submodules(&needs_pushing);
+ if (!is_null_oid(&ref->new_oid))
+ sha1_array_append(&commits, ref->new_oid.hash);
+
+ if (find_unpushed_submodules(&commits, transport->remote->name,
+ &needs_pushing)) {
+ sha1_array_clear(&commits);
+ die_with_unpushed_submodules(&needs_pushing);
+ }
+ string_list_clear(&needs_pushing, 0);
+ sha1_array_clear(&commits);
}
push_ret = transport->push_refs(transport, remote_refs, flags);
strbuf_addf(&path, "%s/HEAD", get_git_common_dir());
- if (parse_ref(path.buf, &head_ref, &is_detached) < 0)
- goto done;
-
- worktree = xmalloc(sizeof(struct worktree));
+ worktree = xcalloc(1, sizeof(*worktree));
worktree->path = strbuf_detach(&worktree_path, NULL);
- worktree->id = NULL;
worktree->is_bare = is_bare;
- worktree->head_ref = NULL;
worktree->is_detached = is_detached;
- worktree->is_current = 0;
- add_head_info(&head_ref, worktree);
- worktree->lock_reason = NULL;
- worktree->lock_reason_valid = 0;
+ if (!parse_ref(path.buf, &head_ref, &is_detached))
+ add_head_info(&head_ref, worktree);
-done:
strbuf_release(&path);
strbuf_release(&worktree_path);
strbuf_release(&head_ref);
if (parse_ref(path.buf, &head_ref, &is_detached) < 0)
goto done;
- worktree = xmalloc(sizeof(struct worktree));
+ worktree = xcalloc(1, sizeof(*worktree));
worktree->path = strbuf_detach(&worktree_path, NULL);
worktree->id = xstrdup(id);
- worktree->is_bare = 0;
- worktree->head_ref = NULL;
worktree->is_detached = is_detached;
- worktree->is_current = 0;
add_head_info(&head_ref, worktree);
- worktree->lock_reason = NULL;
- worktree->lock_reason_valid = 0;
done:
strbuf_release(&path);
free(git_dir);
}
-struct worktree **get_worktrees(void)
+static int compare_worktree(const void *a_, const void *b_)
+{
+ const struct worktree *const *a = a_;
+ const struct worktree *const *b = b_;
+ return fspathcmp((*a)->path, (*b)->path);
+}
+
+struct worktree **get_worktrees(unsigned flags)
{
struct worktree **list = NULL;
struct strbuf path = STRBUF_INIT;
list = xmalloc(alloc * sizeof(struct worktree *));
- if ((list[counter] = get_main_worktree()))
- counter++;
+ list[counter++] = get_main_worktree();
strbuf_addf(&path, "%s/worktrees", get_git_common_dir());
dir = opendir(path.buf);
ALLOC_GROW(list, counter + 1, alloc);
list[counter] = NULL;
+ if (flags & GWT_SORT_LINKED)
+ /*
+ * don't sort the first item (main worktree), which will
+ * always be the first
+ */
+ QSORT(list + 1, counter - 1, compare_worktree);
+
mark_current_worktree(list);
return list;
}
if (worktrees)
free_worktrees(worktrees);
- worktrees = get_worktrees();
+ worktrees = get_worktrees(0);
for (i = 0; worktrees[i]; i++) {
struct worktree *wt = worktrees[i];
/* Functions for acting on the information about worktrees. */
+#define GWT_SORT_LINKED (1 << 0) /* keeps linked worktrees sorted */
+
/*
* Get the worktrees. The primary worktree will always be the first returned,
* and linked worktrees will be pointed to by 'next' in each subsequent
* The caller is responsible for freeing the memory from the returned
* worktree(s).
*/
-extern struct worktree **get_worktrees(void);
+extern struct worktree **get_worktrees(unsigned flags);
/*
* Return git dir of the worktree. Note that the path may be relative.