aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Documentation/RelNotes/1.8.4.4.txt10
-rw-r--r--Documentation/RelNotes/1.8.5.txt166
-rw-r--r--Documentation/date-formats.txt4
-rw-r--r--Documentation/git-blame.txt2
-rw-r--r--Documentation/git-cvsimport.txt4
-rw-r--r--Documentation/git-fast-import.txt10
-rw-r--r--Documentation/git-svn.txt6
-rw-r--r--Documentation/git.txt8
-rw-r--r--Documentation/gitweb.conf.txt14
-rw-r--r--Documentation/rev-list-options.txt4
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--builtin/blame.c4
-rw-r--r--builtin/branch.c8
-rwxr-xr-xcontrib/remote-helpers/git-remote-hg2
-rw-r--r--pathspec.c9
-rw-r--r--pathspec.h7
-rw-r--r--po/TEAMS2
-rw-r--r--po/de.po2716
-rw-r--r--po/fr.po2743
-rw-r--r--po/git.pot2664
-rw-r--r--po/sv.po2716
-rw-r--r--po/vi.po2838
-rw-r--r--po/zh_CN.po2778
-rw-r--r--revision.c4
-rwxr-xr-xt/t6040-tracking-info.sh24
-rwxr-xr-xt/t6130-pathspec-noglob.sh7
-rw-r--r--tree-diff.c4
-rw-r--r--upload-pack.c1
28 files changed, 9220 insertions, 7537 deletions
diff --git a/Documentation/RelNotes/1.8.4.4.txt b/Documentation/RelNotes/1.8.4.4.txt
new file mode 100644
index 000000000..7bc4c5dcc
--- /dev/null
+++ b/Documentation/RelNotes/1.8.4.4.txt
@@ -0,0 +1,10 @@
+Git v1.8.4.4 Release Notes
+========================
+
+Fixes since v1.8.4.3
+--------------------
+
+ * The fix in v1.8.4.3 to the pack transfer protocol to propagate
+ the target of symbolic refs broke "git clone/git fetch" from a
+ repository with too many symbolic refs. As a hotfix/workaround,
+ we transfer only the information on HEAD.
diff --git a/Documentation/RelNotes/1.8.5.txt b/Documentation/RelNotes/1.8.5.txt
index 13b4336e5..602df0cac 100644
--- a/Documentation/RelNotes/1.8.5.txt
+++ b/Documentation/RelNotes/1.8.5.txt
@@ -8,7 +8,7 @@ When "git push [$there]" does not say what to push, we have used the
traditional "matching" semantics so far (all your branches were sent
to the remote as long as there already are branches of the same name
over there). In Git 2.0, the default will change to the "simple"
-semantics that pushes:
+semantics, which pushes:
- only the current branch to the branch with the same name, and only
when the current branch is set to integrate with that remote
@@ -53,9 +53,12 @@ Updates since v1.8.4
Foreign interfaces, subsystems and ports.
- * "git-svn" used with SVN 1.8.0 when talking over https:// connection
+ * "git-svn" has been taught to use the serf library, which is the
+ only option SVN 1.8.0 offers us when talking the HTTP protocol.
+
+ * "git-svn" talking over an https:// connection using the serf library
dumped core due to a bug in the serf library that SVN uses. Work
- it around on our side, even though the SVN side is being fixed.
+ around it on our side, even though the SVN side is being fixed.
* On MacOS X, we detected if the filesystem needs the "pre-composed
unicode strings" workaround, but did not automatically enable it.
@@ -65,10 +68,7 @@ Foreign interfaces, subsystems and ports.
repository relative to the home directory, e.g. "clone hg::~/there".
* imap-send ported to OS X uses Apple's security framework instead of
- OpenSSL one.
-
- * Subversion 1.8.0 that was recently released breaks older subversion
- clients coming over http/https in various ways.
+ OpenSSL's.
* "git fast-import" treats an empty path given to "ls" as the root of
the tree.
@@ -79,22 +79,22 @@ UI, Workflows & Features
* xdg-open can be used as a browser backend for "git web-browse"
(hence to show "git help -w" output), when available.
- * "git grep" and "git show" pays attention to "--textconv" option
+ * "git grep" and "git show" pay attention to the "--textconv" option
when these commands are told to operate on blob objects (e.g. "git
- grep -e pattern HEAD:Makefile").
+ grep -e pattern --textconv HEAD:Makefile").
* "git replace" helper no longer allows an object to be replaced with
another object of a different type to avoid confusion (you can
- still manually craft such replacement using "git update-ref", as an
+ still manually craft such a replacement using "git update-ref", as an
escape hatch).
- * "git status" no longer prints dirty status information for
+ * "git status" no longer prints the dirty status information of
submodules for which submodule.$name.ignore is set to "all".
* "git rebase -i" honours core.abbrev when preparing the insn sheet
for editing.
- * "git status" during a cherry-pick shows what original commit is
+ * "git status" during a cherry-pick shows which original commit is
being picked.
* Instead of typing four capital letters "HEAD", you can say "@" now,
@@ -102,21 +102,21 @@ UI, Workflows & Features
* "git check-ignore" follows the same rule as "git add" and "git
status" in that the ignore/exclude mechanism does not take effect
- on paths that are already tracked. With "--no-index" option, it
+ on paths that are already tracked. With the "--no-index" option, it
can be used to diagnose which paths that should have been ignored
have been mistakenly added to the index.
* Some irrelevant "advice" messages that are shared with "git status"
output have been removed from the commit log template.
- * "update-refs" learnt a "--stdin" option to read multiple update
+ * "update-refs" learned a "--stdin" option to read multiple update
requests and perform them in an all-or-none fashion.
* Just like "make -C <directory>", "git -C <directory> ..." tells Git
to go there before doing anything else.
- * Just like "git checkout -" knows to check out and "git merge -"
- knows to merge the branch you were previously on, "git cherry-pick"
+ * Just like "git checkout -" knows to check out, and "git merge -"
+ knows to merge, the branch you were previously on, "git cherry-pick"
now understands "git cherry-pick -" to pick from the previous
branch.
@@ -126,56 +126,58 @@ UI, Workflows & Features
"git status --porcelain" instead, as its format is stable and easier
to parse.
- * Make "foo^{tag}" to peel a tag to itself, i.e. no-op., and fail if
- "foo" is not a tag. "git rev-parse --verify v1.0^{tag}" would be
- a more convenient way to say "test $(git cat-file -t v1.0) = tag".
+ * The ref syntax "foo^{tag}" (with the literal string "{tag}") peels a
+ tag ref to itself, i.e. it's a no-op., and fails if
+ "foo" is not a tag. "git rev-parse --verify v1.0^{tag}" is
+ a more convenient way than "test $(git cat-file -t v1.0) = tag" to
+ check if v1.0 is a tag.
* "git branch -v -v" (and "git status") did not distinguish among a
- branch that does not build on any other branch, a branch that is in
- sync with the branch it builds on, and a branch that is configured
- to build on some other branch that no longer exists.
+ branch that is not based on any other branch, a branch that is in
+ sync with its upstream branch, and a branch that is configured with an
+ upstream branch that no longer exists.
- * Earlier we started rejecting an attempt to add 0{40} object name to
+ * Earlier we started rejecting any attempt to add the 0{40} object name to
the index and to tree objects, but it sometimes is necessary to
- allow so to be able to use tools like filter-branch to correct such
- broken tree objects. "filter-branch" can again be used to to do
- so.
+ allow this to be able to use tools like filter-branch to correct such
+ broken tree objects. "filter-branch" can again be used to do this.
* "git config" did not provide a way to set or access numbers larger
than a native "int" on the platform; it now provides 64-bit signed
integers on all platforms.
* "git pull --rebase" always chose to do the bog-standard flattening
- rebase. You can tell it to run "rebase --preserve-merges" by
+ rebase. You can tell it to run "rebase --preserve-merges" with
+ "git pull --rebase=preserve" or by
setting "pull.rebase" configuration to "preserve".
* "git push --no-thin" actually disables the "thin pack transfer"
optimization.
- * Magic pathspecs like ":(icase)makefile" that matches both Makefile
- and makefile and ":(glob)foo/**/bar" that matches "bar" in "foo"
- and any subdirectory of "foo" can be used in more places.
+ * Magic pathspecs like ":(icase)makefile" (matches both Makefile
+ and makefile) and ":(glob)foo/**/bar" (matches "bar" in "foo"
+ and any subdirectory of "foo") can be used in more places.
- * The "http.*" variables can now be specified per URL that the
- configuration applies. For example,
+ * The "http.*" variables can now be specified for individual URLs.
+ For example,
[http]
sslVerify = true
[http "https://weak.example.com/"]
sslVerify = false
- would flip http.sslVerify off only when talking to that specified
+ would flip http.sslVerify off only when talking to that specific
site.
- * "git mv A B" when moving a submodule A has been taught to
- relocate its working tree and to adjust the paths in the
+ * "git mv A B" when moving a submodule has been taught to
+ relocate the submodule's working tree and to adjust the paths in the
.gitmodules file.
* "git blame" can now take more than one -L option to discover the
- origin of multiple blocks of the lines.
+ origin of multiple blocks of lines.
* The http transport clients can optionally ask to save cookies
- with http.savecookies configuration variable.
+ with the http.savecookies configuration variable.
* "git push" learned a more fine grained control over a blunt
"--force" when requesting a non-fast-forward update with the
@@ -197,7 +199,7 @@ UI, Workflows & Features
* "git whatchanged" may still be used by old timers, but mention of
it in documents meant for new users will only waste readers' time
- wonderig what the difference is between it and "git log". Make it
+ wondering what the difference is between it and "git log". Make it
less prominent in the general part of the documentation and explain
that it is merely a "git log" with different default behaviour in
its own document.
@@ -219,23 +221,23 @@ Performance, Internal Implementation, etc.
should apply the same "no subprocess or pipe" optimization as we
apply to user-supplied GIT_PAGER=cat.
- * Many commands use --dashed-option as a operation mode selector
- (e.g. "git tag --delete") that the user can use at most one
- (e.g. "git tag --delete --verify" is a nonsense) and you cannot
- negate (e.g. "git tag --no-delete" is a nonsense). parse-options
+ * Many commands use a --dashed-option as an operation mode selector
+ (e.g. "git tag --delete") that excludes other operation modes
+ (e.g. "git tag --delete --verify" is nonsense) and that cannot be
+ negated (e.g. "git tag --no-delete" is nonsense). The parse-options
API learned a new OPT_CMDMODE macro to make it easier to implement
such a set of options.
- * OPT_BOOLEAN() in parse-options API was misdesigned to be "counting
+ * OPT_BOOLEAN() in the parse-options API was misdesigned to be "counting
up" but many subcommands expect it to behave as "on/off". Update
them to use OPT_BOOL() which is a proper boolean.
- * "git gc" exits early without doing a double-work when it detects
+ * "git gc" exits early without doing any work when it detects
that another instance of itself is already running.
* Under memory pressure and/or file descriptor pressure, we used to
- close pack windows that are not used and also closed filehandle to
- an open but unused packfiles. These are now controlled separately
+ close pack windows that are not used and also closed filehandles to
+ open but unused packfiles. These are now controlled separately
to better cope with the load.
Also contains various documentation updates and code clean-ups.
@@ -245,32 +247,32 @@ Fixes since v1.8.4
------------------
Unless otherwise noted, all the fixes since v1.8.4 in the maintenance
-track are contained in this release (see release notes to them for
+track are contained in this release (see the maintenance releases' notes for
details).
* An ancient How-To on serving Git repositories on an HTTP server
- lacked a warning that it has been mostly superseded with more
+ lacked a warning that it has been mostly superseded with a more
modern way.
(merge 6d52bc3 sc/doc-howto-dumb-http later to maint).
- * The interaction between use of Perl in our test suite and NO_PERL
+ * The interaction between the use of Perl in our test suite and NO_PERL
has been clarified a bit.
(merge f8fc0ee jn/test-prereq-perl-doc later to maint).
- * The synopsis section of "git unpack-objects" documentation has been
+ * The synopsis section of the "git unpack-objects" documentation has been
clarified a bit.
(merge 61e2e22 vd/doc-unpack-objects later to maint).
- * We did not generate HTML version of documentation to "git subtree"
+ * We did not generate the HTML version of the documentation to "git subtree"
in contrib/.
(merge 95c62fb jk/subtree-install-fix later to maint).
* A fast-import stream expresses a pathname with funny characters by
- quoting them in C style; remote-hg remote helper forgot to unquote
+ quoting them in C style; the remote-hg remote helper forgot to unquote
such a path.
(merge 1136265 ap/remote-hg-unquote-cquote later to maint).
- * "git reset -p HEAD" has a codepath to special case it to behave
+ * "git reset -p HEAD" has a codepath to special-case it to behave
differently from resetting to contents of other commits, but a
recent change broke it.
@@ -289,38 +291,38 @@ details).
"HEAD" points at, and the receiving end needed to guess. A new
capability has been defined in the pack protocol to convey this
information so that cloning from a repository with more than one
- branches pointing at the same commit where the HEAD is at now
+ branch pointing at the same commit where the HEAD is at now
reliably sets the initial branch in the resulting repository.
(merge 360a326 jc/upload-pack-send-symref later to maint).
- * We did not handle cases where http transport gets redirected during
+ * We did not handle cases where the http transport gets redirected during
the authorization request (e.g. from http:// to https://).
(merge 70900ed jk/http-auth-redirects later to maint).
* Bash prompting code to deal with an SVN remote as an upstream
- were coded in a way not supported by older Bash versions (3.x).
+ was coded in a way unsupported by older Bash versions (3.x).
(merge 52ec889 sg/prompt-svn-remote-fix later to maint).
* The fall-back parsing of commit objects with broken author or
- committer lines were less robust than ideal in picking up the
+ committer lines was less robust than ideal in picking up the
timestamps.
(merge 03818a4 jk/split-broken-ident later to maint).
- * "git rev-list --objects ^v1.0^ v1.0" gave v1.0 tag itself in the
+ * "git rev-list --objects ^v1.0^ v1.0" gave the v1.0 tag itself in the
output, but "git rev-list --objects v1.0^..v1.0" did not.
(merge 895c5ba jc/revision-range-unpeel later to maint).
- * "git clone" gave some progress messages to the standard output, not
- to the standard error, and did not allow suppressing them with the
+ * "git clone" wrote some progress messages to standard output, not
+ to standard error, and did not suppress them with the
--no-progress option.
(merge 643f918 jk/clone-progress-to-stderr later to maint).
- * "format-patch --from=<whom>" forgot to omit unnecessary in-body
+ * "format-patch --from=<whom>" forgot to omit an unnecessary in-body
from line, i.e. when <whom> is the same as the real author.
(merge 662cc30 jk/format-patch-from later to maint).
* "git shortlog" used to choke and die when there is a malformed
- commit (e.g. missing authors); it now simply ignore such a commit
+ commit (e.g. missing authors); it now simply ignores such a commit
and keeps going.
(merge cd4f09e jk/shortlog-tolerate-broken-commit later to maint).
@@ -334,16 +336,16 @@ details).
small empty messages to keep the connection alive.
(merge 115dedd jk/upload-pack-keepalive later to maint).
- * "git rebase" had a portability regression in v1.8.4 to trigger a
+ * "git rebase" had a portability regression in v1.8.4 that triggered a
bug in some BSD shell implementations.
(merge 99855dd mm/rebase-continue-freebsd-WB later to maint).
* "git branch --track" had a minor regression in v1.8.3.2 and later
that made it impossible to base your local work on anything but a
- local branch of the upstream repository you are tracking from.
+ local branch of the upstream repository you are tracking.
(merge b0f49ff jh/checkout-auto-tracking later to maint).
- * When the webserver responds with "405 Method Not Allowed", "git
+ * When the web server responds with "405 Method Not Allowed", "git
http-backend" should tell the client what methods are allowed with
the "Allow" header.
(merge 9247be0 bc/http-backend-allow-405 later to maint).
@@ -357,22 +359,22 @@ details).
executable files.
(merge 1b48d56 jc/cvsserver-perm-bit-fix later to maint).
- * When send-email comes up with an error message to die with upon
+ * When send-email obtains an error message to die with upon
failure to start an SSL session, it tried to read the error string
from a wrong place.
(merge 6cb0c88 bc/send-email-ssl-die-message-fix later to maint).
- * The implementation of "add -i" has a crippling code to work around
+ * The implementation of "add -i" has some crippling code to work around an
ActiveState Perl limitation but it by mistake also triggered on Git
for Windows where MSYS perl is used.
(merge df17e77 js/add-i-mingw later to maint).
- * We made sure that we notice the user-supplied GIT_DIR is actually a
+ * We made sure that we notice when the user-supplied GIT_DIR is actually a
gitfile, but did not do the same when the default ".git" is a
gitfile.
(merge 487a2b7 nd/git-dir-pointing-at-gitfile later to maint).
- * When an object is not found after checking the packfiles and then
+ * When an object is not found after checking the packfiles and the
loose object directory, read_sha1_file() re-checks the packfiles to
prevent racing with a concurrent repacker; teach the same logic to
has_sha1_file().
@@ -390,22 +392,22 @@ details).
made it unnecessarily inefficient.
(merge 680be04 jc/ls-files-killed-optim later to maint).
- * The commit object names in the insn sheet that was prepared at the
- beginning of "rebase -i" session can become ambiguous as the
+ * The shortened commit object names in the insn sheet that is prepared at the
+ beginning of a "rebase -i" session can become ambiguous as the
rebasing progresses and the repository gains more commits. Make
sure the internal record is kept with full 40-hex object names.
(merge 75c6976 es/rebase-i-no-abbrev later to maint).
* "git rebase --preserve-merges" internally used the merge machinery
- and as a side effect, left merge summary message in the log, but
- when rebasing, there should not be a need for merge summary.
+ and as a side effect left the merge summary message in the log, but
+ when rebasing there is no need for the merge summary.
(merge a9f739c rt/rebase-p-no-merge-summary later to maint).
- * A call to xread() was used without a loop around to cope with short
- read in the codepath to stream new contents to a pack.
+ * A call to xread() was used without a loop around it to cope with short
+ reads in the codepath to stream new contents to a pack.
(merge e92527c js/xread-in-full later to maint).
- * "git rebase -i" forgot that the comment character can be
+ * "git rebase -i" forgot that the comment character is
configurable while reading its insn sheet.
(merge 7bca7af es/rebase-i-respect-core-commentchar later to maint).
@@ -416,8 +418,8 @@ details).
* We used to send a large request to read(2)/write(2) as a single
system call, which was bad from the latency point of view when
the operation needs to be killed, and also triggered an error on
- broken 64-bit systems that refuse to take more than 2GB read or
- write in one go.
+ broken 64-bit systems that refuse to read or write more than 2GB
+ in one go.
(merge a487916 sp/clip-read-write-to-8mb later to maint).
* "git fetch" that auto-followed tags incorrectly reused the
@@ -431,17 +433,17 @@ details).
had a similar problem.
(merge 838f9a1 tr/log-full-diff-keep-true-parents later to maint).
- * Setting submodule.*.path configuration variable to true (without
+ * Setting a submodule.*.path configuration variable to true (without
giving "= value") caused Git to segfault.
(merge 4b05440 jl/some-submodule-config-are-not-boolean later to maint).
* "git rebase -i" (there could be others, as the root cause is pretty
- generic) fed a random, data dependeant string to 'echo' and
- expects it to come out literally, corrupting its error message.
+ generic) fed a random, data dependent string to 'echo' and
+ expected it to come out literally, corrupting its error message.
(merge 89b0230 mm/no-shell-escape-in-die-message later to maint).
* Some people still use rather old versions of bash, which cannot
- grok some constructs like 'printf -v varname' the prompt and
+ grok some constructs like 'printf -v varname' which the prompt and
completion code started to use recently.
(merge a44aa69 bc/completion-for-bash-3.0 later to maint).
diff --git a/Documentation/date-formats.txt b/Documentation/date-formats.txt
index c000f08a9..ccd1fc812 100644
--- a/Documentation/date-formats.txt
+++ b/Documentation/date-formats.txt
@@ -8,9 +8,9 @@ endif::git-commit[]
support the following date formats:
Git internal format::
- It is `<unix timestamp> <timezone offset>`, where `<unix
+ It is `<unix timestamp> <time zone offset>`, where `<unix
timestamp>` is the number of seconds since the UNIX epoch.
- `<timezone offset>` is a positive or negative offset from UTC.
+ `<time zone offset>` is a positive or negative offset from UTC.
For example CET (which is 2 hours ahead UTC) is `+0200`.
RFC 2822::
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
index f2c85cc63..8e70a6184 100644
--- a/Documentation/git-blame.txt
+++ b/Documentation/git-blame.txt
@@ -103,7 +103,7 @@ This header line is followed by the following information
at least once for each commit:
- the author name ("author"), email ("author-mail"), time
- ("author-time"), and timezone ("author-tz"); similarly
+ ("author-time"), and time zone ("author-tz"); similarly
for committer.
- the filename in the commit that the line is attributed to.
- the first line of the commit log message ("summary").
diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index d1bcda28f..2df995396 100644
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -144,7 +144,7 @@ This option can be used several times to provide several detection regexes.
CVS by default uses the Unix username when writing its
commit logs. Using this option and an author-conv-file
maps the name recorded in CVS to author name, e-mail and
- optional timezone:
+ optional time zone:
+
---------
exon=Andreas Ericsson <ae@op5.se>
@@ -154,7 +154,7 @@ This option can be used several times to provide several detection regexes.
+
'git cvsimport' will make it appear as those authors had
their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly
-all along. If a timezone is specified, GIT_AUTHOR_DATE will
+all along. If a time zone is specified, GIT_AUTHOR_DATE will
have the corresponding offset applied.
+
For convenience, this data is saved to `$GIT_DIR/cvs-authors`
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index 73f980638..fd22a9a0c 100644
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -251,7 +251,7 @@ advisement to help formatting routines display the timestamp.
If the local offset is not available in the source material, use
``+0000'', or the most common local offset. For example many
organizations have a CVS repository which has only ever been accessed
-by users who are located in the same location and timezone. In this
+by users who are located in the same location and time zone. In this
case a reasonable offset from UTC could be assumed.
+
Unlike the `rfc2822` format, this format is very strict. Any
@@ -271,7 +271,7 @@ the malformed string. There are also some types of malformed
strings which Git will parse wrong, and yet consider valid.
Seriously malformed strings will be rejected.
+
-Unlike the `raw` format above, the timezone/UTC offset information
+Unlike the `raw` format above, the time zone/UTC offset information
contained in an RFC 2822 date string is used to adjust the date
value to UTC prior to storage. Therefore it is important that
this information be as accurate as possible.
@@ -287,13 +287,13 @@ format, or its format is easily convertible to it, as there is no
ambiguity in parsing.
`now`::
- Always use the current time and timezone. The literal
+ Always use the current time and time zone. The literal
`now` must always be supplied for `<when>`.
+
-This is a toy format. The current time and timezone of this system
+This is a toy format. The current time and time zone of this system
is always copied into the identity string at the time it is being
created by fast-import. There is no way to specify a different time or
-timezone.
+time zone.
+
This particular format is supplied as it's short to implement and
may be useful to a process that wants to create a new commit
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index dcad89061..30c5ee256 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -124,15 +124,15 @@ This automatically updates the rev_map if needed (see
'$GIT_DIR/svn/\*\*/.rev_map.*' in the FILES section below for details).
--localtime;;
- Store Git commit times in the local timezone instead of UTC. This
+ Store Git commit times in the local time zone instead of UTC. This
makes 'git log' (even without --date=local) show the same times
- that `svn log` would in the local timezone.
+ that `svn log` would in the local time zone.
+
This doesn't interfere with interoperating with the Subversion
repository you cloned from, but if you wish for your local Git
repository to be able to interoperate with someone else's local Git
repository, either don't use this option or you should both use it in
-the same local timezone.
+the same local time zone.
--parent;;
Fetch only from the SVN parent of the current HEAD.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 10cddb5b4..b73a24a3c 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,15 @@ unreleased) version of Git, that is available from 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
-* link:v1.8.4.3/git.html[documentation for release 1.8.4.3]
+* link:v1.8.5/git.html[documentation for release 1.8.5]
* release notes for
+ link:RelNotes/1.8.5.txt[1.8.5].
+
+* link:v1.8.4.4/git.html[documentation for release 1.8.4.4]
+
+* release notes for
+ link:RelNotes/1.8.4.4.txt[1.8.4.4],
link:RelNotes/1.8.4.3.txt[1.8.4.3],
link:RelNotes/1.8.4.2.txt[1.8.4.2],
link:RelNotes/1.8.4.1.txt[1.8.4.1],
diff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt
index 305db633c..e2113d93c 100644
--- a/Documentation/gitweb.conf.txt
+++ b/Documentation/gitweb.conf.txt
@@ -822,18 +822,18 @@ timed::
Project specific override is not supported.
javascript-timezone::
- Enable and configure the ability to change a common timezone for dates
+ Enable and configure the ability to change a common time zone for dates
in gitweb output via JavaScript. Dates in gitweb output include
authordate and committerdate in "commit", "commitdiff" and "log"
views, and taggerdate in "tag" view. Enabled by default.
+
-The value is a list of three values: a default timezone (for if the client
-hasn't selected some other timezone and saved it in a cookie), a name of cookie
-where to store selected timezone, and a CSS class used to mark up
+The value is a list of three values: a default time zone (for if the client
+hasn't selected some other time zone and saved it in a cookie), a name of cookie
+where to store selected time zone, and a CSS class used to mark up
dates for manipulation. If you want to turn this feature off, set "default"
to empty list: `[]`.
+
-Typical gitweb config files will only change starting (default) timezone,
+Typical gitweb config files will only change starting (default) time zone,
and leave other elements at their default values:
+
---------------------------------------------------------------------------
@@ -843,9 +843,9 @@ $feature{'javascript-timezone'}{'default'}[0] = "utc";
The example configuration presented here is guaranteed to be backwards
and forward compatible.
+
-Timezone values can be "local" (for local timezone that browser uses), "utc"
+Time zone values can be "local" (for local time zone that browser uses), "utc"
(what gitweb uses when JavaScript or this feature is disabled), or numerical
-timezones in the form of "+/-HHMM", such as "+0200".
+time zones in the form of "+/-HHMM", such as "+0200".
+
Project specific override is not supported.
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 5bdfb4285..ec86d0919 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -720,7 +720,7 @@ include::pretty-options.txt[]
`--date=relative` shows dates relative to the current time,
e.g. "2 hours ago".
+
-`--date=local` shows timestamps in user's local timezone.
+`--date=local` shows timestamps in user's local time zone.
+
`--date=iso` (or `--date=iso8601`) shows timestamps in ISO 8601 format.
+
@@ -731,7 +731,7 @@ format, often found in E-mail messages.
+
`--date=raw` shows the date in the internal raw Git format `%s %z` format.
+
-`--date=default` shows timestamps in the original timezone
+`--date=default` shows timestamps in the original time zone
(either committer's or author's).
ifdef::git-rev-list[]
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 366705cbe..99a62f3ba 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.8.5-rc1
+DEF_VER=v1.8.5
LF='
'
diff --git a/builtin/blame.c b/builtin/blame.c
index 6da723396..1407ae7eb 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -409,7 +409,9 @@ static struct origin *find_origin(struct scoreboard *sb,
paths[0] = origin->path;
paths[1] = NULL;
- parse_pathspec(&diff_opts.pathspec, PATHSPEC_ALL_MAGIC, 0, "", paths);
+ parse_pathspec(&diff_opts.pathspec,
+ PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
+ PATHSPEC_LITERAL_PATH, "", paths);
diff_setup_done(&diff_opts);
if (is_null_sha1(origin->commit->object.sha1))
diff --git a/builtin/branch.c b/builtin/branch.c
index 5696cf0ef..f157f92f4 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -424,6 +424,7 @@ static void fill_tracking_info(struct strbuf *stat, const char *branch_name,
struct branch *branch = branch_get(branch_name);
struct strbuf fancy = STRBUF_INIT;
int upstream_is_gone = 0;
+ int added_decoration = 1;
switch (stat_tracking_info(branch, &ours, &theirs)) {
case 0:
@@ -451,9 +452,13 @@ static void fill_tracking_info(struct strbuf *stat, const char *branch_name,
if (upstream_is_gone) {
if (show_upstream_ref)
strbuf_addf(stat, _("[%s: gone]"), fancy.buf);
+ else
+ added_decoration = 0;
} else if (!ours && !theirs) {
if (show_upstream_ref)
strbuf_addf(stat, _("[%s]"), fancy.buf);
+ else
+ added_decoration = 0;
} else if (!ours) {
if (show_upstream_ref)
strbuf_addf(stat, _("[%s: behind %d]"), fancy.buf, theirs);
@@ -474,7 +479,8 @@ static void fill_tracking_info(struct strbuf *stat, const char *branch_name,
ours, theirs);
}
strbuf_release(&fancy);
- strbuf_addch(stat, ' ');
+ if (added_decoration)
+ strbuf_addch(stat, ' ');
free(ref);
}
diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
index 3222afd9d..c6026b9be 100755
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/remote-helpers/git-remote-hg
@@ -747,7 +747,7 @@ def parse_commit(parser):
f = { 'deleted' : True }
else:
die('Unknown file command: %s' % line)
- path = c_style_unescape(path).decode('utf-8')
+ path = c_style_unescape(path)
files[path] = f
# only export the commits if we are on an internal proxy repo
diff --git a/pathspec.c b/pathspec.c
index ad1a9f5b2..4cf2bd365 100644
--- a/pathspec.c
+++ b/pathspec.c
@@ -128,7 +128,11 @@ static unsigned prefix_pathspec(struct pathspec_item *item,
die(_("global 'literal' pathspec setting is incompatible "
"with all other global pathspec settings"));
- if (elt[0] != ':' || literal_global) {
+ if (flags & PATHSPEC_LITERAL_PATH)
+ global_magic = 0;
+
+ if (elt[0] != ':' || literal_global ||
+ (flags & PATHSPEC_LITERAL_PATH)) {
; /* nothing to do */
} else if (elt[1] == '(') {
/* longhand */
@@ -405,6 +409,9 @@ void parse_pathspec(struct pathspec *pathspec,
item[i].magic = prefix_pathspec(item + i, &short_magic,
argv + i, flags,
prefix, prefixlen, entry);
+ if ((flags & PATHSPEC_LITERAL_PATH) &&
+ !(magic_mask & PATHSPEC_LITERAL))
+ item[i].magic |= PATHSPEC_LITERAL;
if (item[i].magic & magic_mask)
unsupported_magic(entry,
item[i].magic & magic_mask,
diff --git a/pathspec.h b/pathspec.h
index 944baeb62..a75e9242d 100644
--- a/pathspec.h
+++ b/pathspec.h
@@ -58,6 +58,13 @@ struct pathspec {
#define PATHSPEC_STRIP_SUBMODULE_SLASH_EXPENSIVE (1<<5)
#define PATHSPEC_PREFIX_ORIGIN (1<<6)
#define PATHSPEC_KEEP_ORDER (1<<7)
+/*
+ * For the callers that just need pure paths from somewhere else, not
+ * from command line. Global --*-pathspecs options are ignored. No
+ * magic is parsed in each pathspec either. If PATHSPEC_LITERAL is
+ * allowed, then it will automatically set for every pathspec.
+ */
+#define PATHSPEC_LITERAL_PATH (1<<8)
extern void parse_pathspec(struct pathspec *pathspec,
unsigned magic_mask,
diff --git a/po/TEAMS b/po/TEAMS
index 107aa5917..f9a99ed32 100644
--- a/po/TEAMS
+++ b/po/TEAMS
@@ -8,7 +8,7 @@ Leader: Byrial Jensen <byrial@vip.cybercity.dk>
Language: de (German)
Repository: https://github.com/ralfth/git-po-de
Leader: Ralf Thielow <ralf.thielow@googlemail.com>
-Members: Thomas Rast <trast@student.ethz.ch>
+Members: Thomas Rast <tr@thomasrast.ch>
Jan Krüger <jk@jk.gs>
Christian Stimming <stimming@tuhh.de>
diff --git a/po/de.po b/po/de.po
index 35a44b946..5e2d709e1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,9 +5,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: git 1.8.4\n"
+"Project-Id-Version: git 1.8.5\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2013-08-06 14:10+0800\n"
+"POT-Creation-Date: 2013-11-02 08:06+0800\n"
"PO-Revision-Date: 2013-07-28 18:42+0200\n"
"Last-Translator: Ralf Thielow <ralf.thielow@gmail.com>\n"
"Language-Team: German <>\n"
@@ -57,71 +57,76 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <Repository> [--exec <Programm>] --list"
-#: archive.c:323
+#: archive.c:242 builtin/add.c:240 builtin/add.c:556 builtin/rm.c:328
+#, c-format
+msgid "pathspec '%s' did not match any files"
+msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein"
+
+#: archive.c:327
msgid "fmt"
msgstr "Format"
-#: archive.c:323
+#: archive.c:327
msgid "archive format"
msgstr "Archivformat"
-#: archive.c:324 builtin/log.c:1173
+#: archive.c:328 builtin/log.c:1193
msgid "prefix"
msgstr "Prefix"
-#: archive.c:325
+#: archive.c:329
msgid "prepend prefix to each pathname in the archive"
msgstr "stellt einen Präfix vor jeden Pfadnamen in dem Archiv"
-#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2292
-#: builtin/blame.c:2293 builtin/config.c:56 builtin/fast-export.c:673
-#: builtin/fast-export.c:675 builtin/grep.c:714 builtin/hash-object.c:77
-#: builtin/ls-files.c:496 builtin/ls-files.c:499 builtin/notes.c:408
-#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:152
+#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2264
+#: builtin/blame.c:2265 builtin/config.c:58 builtin/fast-export.c:680
+#: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77
+#: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408
+#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154
msgid "file"
msgstr "Datei"
-#: archive.c:327 builtin/archive.c:89
+#: archive.c:331 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "schreibt das Archiv in diese Datei"
-#: archive.c:329
+#: archive.c:333
msgid "read .gitattributes in working directory"
msgstr "liest .gitattributes aus dem Arbeitsverzeichnis"
-#: archive.c:330
+#: archive.c:334
msgid "report archived files on stderr"
msgstr "gibt archivierte Dateien in der Standard-Fehlerausgabe aus"
-#: archive.c:331
+#: archive.c:335
msgid "store only"
msgstr "nur speichern"
-#: archive.c:332
+#: archive.c:336
msgid "compress faster"
msgstr "schneller komprimieren"
-#: archive.c:340
+#: archive.c:344
msgid "compress better"
msgstr "besser komprimieren"
-#: archive.c:343
+#: archive.c:347
msgid "list supported archive formats"
msgstr "listet unterstützte Archivformate auf"
-#: archive.c:345 builtin/archive.c:90 builtin/clone.c:85
+#: archive.c:349 builtin/archive.c:90 builtin/clone.c:84
msgid "repo"
msgstr "Repository"
-#: archive.c:346 builtin/archive.c:91
+#: archive.c:350 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "ruft das Archiv von Remote-Repository <Repository> ab"
-#: archive.c:347 builtin/archive.c:92 builtin/notes.c:487
+#: archive.c:351 builtin/archive.c:92 builtin/notes.c:487
msgid "command"
msgstr "Programm"
-#: archive.c:348 builtin/archive.c:93
+#: archive.c:352 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "Pfad zum externen \"git-upload-archive\"-Programm"
@@ -207,19 +212,19 @@ msgstr "Branch '%s' existiert bereits."
msgid "Cannot force update the current branch."
msgstr "Kann Aktualisierung des aktuellen Branches nicht erzwingen."
-#: branch.c:216
+#: branch.c:215
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
"Kann Tracking-Informationen nicht einrichten; Startpunkt '%s' ist kein "
"Branch."
-#: branch.c:218
+#: branch.c:217
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "der angeforderte Upstream-Branch '%s' existiert nicht"
-#: branch.c:220
+#: branch.c:219
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -240,26 +245,26 @@ msgstr ""
"\"git push -u\" verwenden, um den Upstream-Branch beim \"push\"\n"
"zu konfigurieren."
-#: branch.c:265
+#: branch.c:264
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "Ungültiger Objekt-Name: '%s'"
-#: branch.c:285
+#: branch.c:284
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "mehrdeutiger Objekt-Name: '%s'"
-#: branch.c:290
+#: branch.c:289
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "Ungültiger Branchpunkt: '%s'"
-#: branch.c:296
+#: branch.c:295
msgid "Failed to lock ref for update"
msgstr "Fehler beim Sperren der Referenz zur Aktualisierung."
-#: branch.c:314
+#: branch.c:313
msgid "Failed to write ref"
msgstr "Fehler beim Schreiben der Referenz."
@@ -273,7 +278,7 @@ msgstr "'%s' sieht nicht wie eine v2 Paketdatei aus"
msgid "unrecognized header: %s%s (%d)"
msgstr "nicht erkannter Kopfbereich: %s%s (%d)"
-#: bundle.c:89 builtin/commit.c:697
+#: bundle.c:89 builtin/commit.c:706
#, c-format
msgid "could not open '%s'"
msgstr "Konnte '%s' nicht öffnen"
@@ -282,9 +287,9 @@ msgstr "Konnte '%s' nicht öffnen"
msgid "Repository lacks these prerequisite commits:"
msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:"
-#: bundle.c:164 sequencer.c:661 sequencer.c:1111 builtin/log.c:331
-#: builtin/log.c:801 builtin/log.c:1399 builtin/log.c:1625 builtin/merge.c:364
-#: builtin/shortlog.c:156
+#: bundle.c:164 sequencer.c:662 sequencer.c:1112 builtin/log.c:332
+#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:364
+#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr "Einrichtung des Revisionsgangs fehlgeschlagen"
@@ -310,7 +315,7 @@ msgstr[1] "Das Paket benötigt diese %d Referenzen:"
msgid "rev-list died"
msgstr "\"rev-list\" abgebrochen"
-#: bundle.c:300 builtin/log.c:1310 builtin/shortlog.c:259
+#: bundle.c:300 builtin/log.c:1329 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr "nicht erkanntes Argument: %s"
@@ -461,7 +466,7 @@ msgstr ""
"Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n"
"%s"
-#: diff.c:3487
+#: diff.c:3490
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -470,7 +475,7 @@ msgstr ""
"Fehler beim Parsen des --dirstat/-X Optionsparameters:\n"
"%s"
-#: diff.c:3501
+#: diff.c:3504
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'"
@@ -497,17 +502,17 @@ msgstr "konnte temporäre Datei '%s' nicht erstellen: %s"
msgid "failed writing detached signature to '%s': %s"
msgstr "Fehler beim Schreiben der Signatur nach '%s': %s"
-#: grep.c:1623
+#: grep.c:1695
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': konnte nicht lesen %s"
-#: grep.c:1640
+#: grep.c:1712
#, c-format
msgid "'%s': %s"
msgstr "'%s': %s"
-#: grep.c:1651
+#: grep.c:1723
#, c-format
msgid "'%s': short read %s"
msgstr "'%s': read() zu kurz %s"
@@ -580,8 +585,8 @@ msgstr "%s: %s - %s"
msgid "failed to read the cache"
msgstr "Lesen des Zwischenspeichers fehlgeschlagen"
-#: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566
-#: builtin/clone.c:656
+#: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559
+#: builtin/clone.c:655
msgid "unable to write new index file"
msgstr "Konnte neue Staging-Area-Datei nicht schreiben."
@@ -630,7 +635,7 @@ msgstr "kann Objekt %s '%s' nicht lesen"
msgid "blob expected for %s '%s'"
msgstr "Blob erwartet für %s '%s'"
-#: merge-recursive.c:774 builtin/clone.c:312
+#: merge-recursive.c:774 builtin/clone.c:311
#, c-format
msgid "failed to open '%s'"
msgstr "Fehler beim Öffnen von '%s'"
@@ -767,7 +772,7 @@ msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)"
msgid "Auto-merging %s"
msgstr "automatischer Merge von %s"
-#: merge-recursive.c:1634 git-submodule.sh:1118
+#: merge-recursive.c:1634 git-submodule.sh:1125
msgid "submodule"
msgstr "Submodul"
@@ -866,58 +871,122 @@ msgstr ""
msgid "Bad %s value: '%s'"
msgstr "Ungültiger %s Wert: '%s'"
-#: object.c:204
+#: object.c:202
#, c-format
msgid "unable to parse object: %s"
msgstr "Konnte Objekt '%s' nicht parsen."
-#: parse-options.c:489
+#: parse-options.c:537
msgid "..."
msgstr "..."
-#: parse-options.c:507
+#: parse-options.c:555
#, c-format
msgid "usage: %s"
msgstr "Verwendung: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:511
+#: parse-options.c:559
#, c-format
msgid " or: %s"
msgstr " oder: %s"
-#: parse-options.c:514
+#: parse-options.c:562
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:548
+#: parse-options.c:596
msgid "-NUM"
msgstr "-NUM"
-#: pathspec.c:83
+#: pathspec.c:118
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr "Globale Einstellungen zur Pfadspezifikation 'glob' und 'noglob' sind inkompatibel."
+
+#: pathspec.c:128
+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:158
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "ungültiger Parameter für Pfadspezifikationsangabe 'prefix'"
+
+#: pathspec.c:164
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "ungültige Pfadspezifikationsangabe '%.*s' in '%s'"
+
+#: pathspec.c:168
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "Fehlendes ')' am Ende der Pfadspezifikationsangabe in '%s'"
+
+#: pathspec.c:186
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "nicht unterstützte Pfadspezifikationsangabe '%c' in '%s'"
+
+#: pathspec.c:211
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s: 'literal' und 'glob' sind inkompatibel"
+
+#: pathspec.c:222
+#, c-format
+msgid "%s: '%s' is outside repository"
+msgstr "%s: '%s' liegt außerhalb des Repositories"
+
+#: pathspec.c:278
#, c-format
-msgid "Path '%s' is in submodule '%.*s'"
-msgstr "Pfad '%s' befindet sich in Submodul '%.*s'"
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "Pfadspezifikation '%s' befindet sich in Submodul '%.*s'"
-#: pathspec.c:99
+#.
+#. * We may want to substitute "this command" with a command
+#. * name. E.g. when add--interactive dies when running
+#. * "checkout -p"
+#.
+#: pathspec.c:340
#, c-format
-msgid "'%s' is beyond a symbolic link"
-msgstr "'%s' ist hinter einem symbolischen Verweis"
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr "%s: Pfadspezifikationsangabe wird von diesem Kommando nicht unterstützt: %s"
-#: remote.c:1788
+#: pathspec.c:415
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "Pfadspezifikation '%s' ist hinter einem symbolischen Verweis"
+
+#: remote.c:1833
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr "Ihr Branch basiert auf '%s', aber Upstream-Branch wurde entfernt.\n"
+
+#: remote.c:1837
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr " (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n"
+
+#: remote.c:1840
+#, c-format
+msgid "Your branch is up-to-date with '%s'.\n"
+msgstr "Ihr Branch ist auf dem selben Stand wie '%s'.\n"
+
+#: remote.c:1844
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Ihr Branch ist vor '%s' um %d Commit.\n"
msgstr[1] "Ihr Branch ist vor '%s' um %d Commits.\n"
-#: remote.c:1794
+#: remote.c:1850
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (benutzen Sie \"git push\" um lokale Commits zu publizieren)\n"
-#: remote.c:1797
+#: remote.c:1853
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -927,12 +996,12 @@ msgstr[0] ""
msgstr[1] ""
"Ihr Branch ist zu '%s' um %d Commits hinterher, und kann vorgespult werden.\n"
-#: remote.c:1805
+#: remote.c:1861
msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
" (benutzen Sie \"git pull\" um Ihren lokalen Branch zu aktualisieren)\n"
-#: remote.c:1808
+#: remote.c:1864
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -947,7 +1016,7 @@ msgstr[1] ""
"Ihr Branch und '%s' sind divergiert,\n"
"und haben jeweils %d und %d unterschiedliche Commits.\n"
-#: remote.c:1818
+#: remote.c:1874
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
" (benutzen Sie \"git pull\" um Ihren Branch mit dem Remote-Branch "
@@ -992,7 +1061,7 @@ msgstr ""
"mit 'git add <Pfade>' oder 'git rm <Pfade>'und tragen Sie das Ergebnis mit\n"
"'git commit' ein"
-#: sequencer.c:245 sequencer.c:869 sequencer.c:952
+#: sequencer.c:245 sequencer.c:870 sequencer.c:953
#, c-format
msgid "Could not write to %s"
msgstr "Konnte nicht nach %s schreiben"
@@ -1017,197 +1086,197 @@ msgstr ""
"Tragen Sie Ihre Änderungen ein oder benutzen Sie \"stash\" um fortzufahren."
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:324
+#: sequencer.c:325
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Konnte neue Staging-Area-Datei nicht schreiben"
-#: sequencer.c:355
+#: sequencer.c:356
msgid "Could not resolve HEAD commit\n"
msgstr "Konnte Commit von HEAD nicht auflösen\n"
-#: sequencer.c:377
+#: sequencer.c:378
msgid "Unable to update cache tree\n"
msgstr "Konnte Cache-Verzeichnis nicht aktualisieren\n"
-#: sequencer.c:422
+#: sequencer.c:423
#, c-format
msgid "Could not parse commit %s\n"
msgstr "Konnte Commit %s nicht parsen\n"
-#: sequencer.c:427
+#: sequencer.c:428
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr "Konnte Eltern-Commit %s nicht parsen\n"
-#: sequencer.c:493
+#: sequencer.c:494
msgid "Your index file is unmerged."
msgstr "Ihre Staging-Area-Datei ist nicht zusammengeführt."
-#: sequencer.c:512
+#: sequencer.c:513
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr "Commit %s ist ein Merge, aber die Option -m wurde nicht angegeben."
-#: sequencer.c:520
+#: sequencer.c:521
#, c-format
msgid "Commit %s does not have parent %d"
msgstr "Commit %s hat keinen Elternteil %d"
-#: sequencer.c:524
+#: sequencer.c:525
#, c-format
msgid "Mainline was specified but commit %s is not a merge."
msgstr "Hauptlinie wurde spezifiziert, aber Commit %s ist kein Merge."
#. TRANSLATORS: The first %s will be "revert" or
#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:537
+#: sequencer.c:538
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: kann Eltern-Commit %s nicht parsen"
-#: sequencer.c:541
+#: sequencer.c:542
#, c-format
msgid "Cannot get commit message for %s"
msgstr "Kann keine Commit-Beschreibung für %s bekommen"
-#: sequencer.c:627
+#: sequencer.c:628
#, c-format
msgid "could not revert %s... %s"
msgstr "Konnte \"revert\" nicht auf %s ausführen... %s"
-#: sequencer.c:628
+#: sequencer.c:629
#, c-format
msgid "could not apply %s... %s"
msgstr "Konnte %s nicht anwenden... %s"
-#: sequencer.c:664
+#: sequencer.c:665
msgid "empty commit set passed"
msgstr "leere Menge von Commits übergeben"
-#: sequencer.c:672
+#: sequencer.c:673
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: Fehler beim Lesen der Staging-Area"
-#: sequencer.c:677
+#: sequencer.c:678
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: Fehler beim Aktualisieren der Staging-Area"
-#: sequencer.c:735
+#: sequencer.c:736
#, c-format
msgid "Cannot %s during a %s"
msgstr "Kann %s nicht während eines %s durchführen"
-#: sequencer.c:757
+#: sequencer.c:758
#, c-format
msgid "Could not parse line %d."
msgstr "Konnte Zeile %d nicht parsen."
-#: sequencer.c:762
+#: sequencer.c:763
msgid "No commits parsed."
msgstr "Keine Commits geparst."
-#: sequencer.c:775
+#: sequencer.c:776
#, c-format
msgid "Could not open %s"
msgstr "Konnte %s nicht öffnen"
-#: sequencer.c:779
+#: sequencer.c:780
#, c-format
msgid "Could not read %s."
msgstr "Konnte %s nicht lesen."
-#: sequencer.c:786
+#: sequencer.c:787
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr "Unbenutzbares Instruktionsblatt: %s"
-#: sequencer.c:814
+#: sequencer.c:815
#, c-format
msgid "Invalid key: %s"
msgstr "Ungültiger Schlüssel: %s"
-#: sequencer.c:817
+#: sequencer.c:818
#, c-format
msgid "Invalid value for %s: %s"
msgstr "Ungültiger Wert für %s: %s"
-#: sequencer.c:829
+#: sequencer.c:830
#, c-format
msgid "Malformed options sheet: %s"
msgstr "Fehlerhaftes Optionsblatt: %s"
-#: sequencer.c:850
+#: sequencer.c:851
msgid "a cherry-pick or revert is already in progress"
msgstr "\"cherry-pick\" oder \"revert\" ist bereits im Gang"
-#: sequencer.c:851
+#: sequencer.c:852
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "versuchen Sie \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:855
+#: sequencer.c:856
#, c-format
msgid "Could not create sequencer directory %s"
msgstr "Konnte \"sequencer\"-Verzeichnis %s nicht erstellen"
-#: sequencer.c:871 sequencer.c:956
+#: sequencer.c:872 sequencer.c:957
#, c-format
msgid "Error wrapping up %s."
msgstr "Fehler beim Einpacken von %s."
-#: sequencer.c:890 sequencer.c:1024
+#: sequencer.c:891 sequencer.c:1025
msgid "no cherry-pick or revert in progress"
msgstr "kein \"cherry-pick\" oder \"revert\" im Gang"
-#: sequencer.c:892
+#: sequencer.c:893
msgid "cannot resolve HEAD"
msgstr "kann HEAD nicht auflösen"
-#: sequencer.c:894
+#: sequencer.c:895
msgid "cannot abort from a branch yet to be born"
msgstr "kann nicht abbrechen: bin auf einem Branch, der noch geboren wird"
-#: sequencer.c:916 builtin/apply.c:4061
+#: sequencer.c:917 builtin/apply.c:4061
#, c-format
msgid "cannot open %s: %s"
msgstr "Kann %s nicht öffnen: %s"
-#: sequencer.c:919
+#: sequencer.c:920
#, c-format
msgid "cannot read %s: %s"
msgstr "Kann %s nicht lesen: %s"
-#: sequencer.c:920
+#: sequencer.c:921
msgid "unexpected end of file"
msgstr "Unerwartetes Dateiende"
-#: sequencer.c:926
+#: sequencer.c:927
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "gespeicherte \"pre-cherry-pick\" HEAD Datei '%s' ist beschädigt"
-#: sequencer.c:949
+#: sequencer.c:950
#, c-format
msgid "Could not format %s."
msgstr "Konnte %s nicht formatieren."
-#: sequencer.c:1092
+#: sequencer.c:1093
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden"
-#: sequencer.c:1095
+#: sequencer.c:1096
#, c-format
msgid "%s: bad revision"
msgstr "%s: ungültiger Commit"
-#: sequencer.c:1129
+#: sequencer.c:1130
msgid "Can't revert as initial commit"
msgstr "Kann nicht als allerersten Commit einen Revert ausführen."
-#: sequencer.c:1130
+#: sequencer.c:1131
msgid "Can't cherry-pick into empty head"
msgstr "Kann nicht als allerersten Commit einen Cherry-Pick ausführen."
@@ -1236,275 +1305,368 @@ msgstr ""
"indem Sie \"git config advice.objectNameWarning false\"\n"
"ausführen."
-#: sha1_name.c:1097
+#: sha1_name.c:1112
msgid "HEAD does not point to a branch"
msgstr "HEAD zeigt auf keinen Branch"
-#: sha1_name.c:1100
+#: sha1_name.c:1115
#, c-format
msgid "No such branch: '%s'"
msgstr "Kein solcher Branch '%s'"
-#: sha1_name.c:1102
+#: sha1_name.c:1117
#, c-format
msgid "No upstream configured for branch '%s'"
msgstr "Kein Upstream-Branch für Branch '%s' konfiguriert."
-#: sha1_name.c:1106
+#: sha1_name.c:1121
#, c-format
msgid "Upstream branch '%s' not stored as a remote-tracking branch"
msgstr "Upstream-Branch '%s' ist nicht als Remote-Tracking-Branch gespeichert"
-#: wrapper.c:408
+#: 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"
+
+#. Maybe the user already did that, don't error out here
+#: submodule.c:76
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "Konnte Eintrag '%s' in .gitmodules nicht aktualisieren"
+
+#. Maybe the user already did that, don't error out here
+#: submodule.c:109
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "Konnte Eintrag '%s' nicht aus .gitmodules entfernen"
+
+#: submodule.c:127
+msgid "could not find .gitmodules in index"
+msgstr "Konnte .gitmodules nicht in der Staging-Area finden"
+
+#: submodule.c:133
+msgid "reading updated .gitmodules failed"
+msgstr "Lesen der aktualisierten .gitmodules-Datei fehlgeschlagen"
+
+#: submodule.c:135
+msgid "unable to stat updated .gitmodules"
+msgstr "Konnte aktualisierte .gitmodules-Datei nicht lesen"
+
+#: submodule.c:139
+msgid "unable to remove .gitmodules from index"
+msgstr "Konnte .gitmodules nicht aus der Staging-Area entfernen"
+
+#: submodule.c:141
+msgid "adding updated .gitmodules failed"
+msgstr "Konnte aktualisierte .gitmodules-Datei nicht hinzufügen"
+
+#: submodule.c:143
+msgid "staging updated .gitmodules failed"
+msgstr "Konnte aktualisierte .gitmodules-Datei nicht zum Commit vormerken"
+
+#: submodule.c:1144 builtin/init-db.c:363
+#, c-format
+msgid "Could not create git link %s"
+msgstr "Konnte git-Verweis %s nicht erstellen"
+
+#: submodule.c:1155
+#, c-format
+msgid "Could not set core.worktree in %s"
+msgstr "Konnte core.worktree in '%s' nicht setzen."
+
+#: urlmatch.c:120
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "Ungültiges URL-Schema oder Suffix '://' fehlt"
+
+#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#, 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:'"
+
+#: urlmatch.c:189
+msgid "a 'file:' URL may not have a port number"
+msgstr "eine 'file:' URL darf keine Portnummer enthalten"
+
+#: urlmatch.c:199
+msgid "invalid characters in host name"
+msgstr "Hostname enthält ungültige Zeichen"
+
+#: urlmatch.c:244 urlmatch.c:255
+msgid "invalid port number"
+msgstr "ungültige Portnummer"
+
+#: urlmatch.c:322
+msgid "invalid '..' path segment"
+msgstr "ungültiges '..' Pfadsegment"
+
+#: wrapper.c:422
#, c-format
msgid "unable to access '%s': %s"
msgstr "konnte nicht auf '%s' zugreifen: %s"
-#: wrapper.c:429
+#: wrapper.c:443
#, c-format
msgid "unable to access '%s'"
msgstr "konnte nicht auf '%s' zugreifen"
-#: wrapper.c:440
+#: wrapper.c:454
#, c-format
msgid "unable to look up current user in the passwd file: %s"
msgstr "konnte aktuellen Benutzer nicht in Passwort-Datei finden: %s"
-#: wrapper.c:441
+#: wrapper.c:455
msgid "no such user"
msgstr "kein solcher Benutzer"
-#: wt-status.c:141
+#: wt-status.c:146
msgid "Unmerged paths:"
msgstr "Nicht zusammengeführte Pfade:"
-#: wt-status.c:168 wt-status.c:195
+#: wt-status.c:173 wt-status.c:200
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr ""
" (benutzen Sie \"git reset %s <Datei>...\" zum Entfernen aus der Staging-"
"Area)"
-#: wt-status.c:170 wt-status.c:197
+#: wt-status.c:175 wt-status.c:202
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
" (benutzen Sie \"git rm --cached <Datei>...\" zum Entfernen aus der Staging-"
"Area)"
-#: wt-status.c:174
+#: wt-status.c:179
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
" (benutzen Sie \"git add/rm <Datei>...\" um die Auflösung zu markieren)"
-#: wt-status.c:176 wt-status.c:180
+#: wt-status.c:181 wt-status.c:185
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (benutzen Sie \"git add/rm <Datei>...\" um die Auflösung entsprechend zu "
"markieren)"
-#: wt-status.c:178
+#: wt-status.c:183
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
" (benutzen Sie \"git add/rm <Datei>...\" um die Auflösung zu markieren)"
-#: wt-status.c:189
+#: wt-status.c:194
msgid "Changes to be committed:"
msgstr "zum Commit vorgemerkte Änderungen:"
-#: wt-status.c:207
+#: wt-status.c:212
msgid "Changes not staged for commit:"
msgstr "Änderungen, die nicht zum Commit vorgemerkt sind:"
-#: wt-status.c:211
+#: wt-status.c:216
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
" (benutzen Sie \"git add <Datei>...\" um die Änderungen zum Commit "
"vorzumerken)"
-#: wt-status.c:213
+#: wt-status.c:218
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
" (benutzen Sie \"git add/rm <Datei>...\" um die Änderungen zum Commit "
"vorzumerken)"
-#: wt-status.c:214
+#: wt-status.c:219
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
" (benutzen Sie \"git checkout -- <Datei>...\" um die Änderungen im "
"Arbeitsverzeichnis zu verwerfen)"
-#: wt-status.c:216
+#: wt-status.c:221
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (committen oder verwerfen Sie den unbeobachteten oder geänderten Inhalt in "
"den Submodulen)"
-#: wt-status.c:228
+#: wt-status.c:233
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (benutzen Sie \"git %s <Datei>...\" um die Änderungen zum Commit "
"vorzumerken)"
-#: wt-status.c:245
+#: wt-status.c:250
msgid "bug"
msgstr "Fehler"
-#: wt-status.c:250
+#: wt-status.c:255
msgid "both deleted:"
msgstr "beide gelöscht:"
-#: wt-status.c:251
+#: wt-status.c:256
msgid "added by us:"
msgstr "von uns hinzugefügt:"
-#: wt-status.c:252
+#: wt-status.c:257
msgid "deleted by them:"
msgstr "von denen gelöscht:"
-#: wt-status.c:253
+#: wt-status.c:258
msgid "added by them:"
msgstr "von denen hinzugefügt:"
-#: wt-status.c:254
+#: wt-status.c:259
msgid "deleted by us:"
msgstr "von uns gelöscht:"
-#: wt-status.c:255
+#: wt-status.c:260
msgid "both added:"
msgstr "von beiden hinzugefügt:"
-#: wt-status.c:256
+#: wt-status.c:261
msgid "both modified:"
msgstr "von beiden geändert:"
-#: wt-status.c:286
+#: wt-status.c:291
msgid "new commits, "
msgstr "neue Commits, "
-#: wt-status.c:288
+#: wt-status.c:293
msgid "modified content, "
msgstr "geänderter Inhalt, "
-#: wt-status.c:290
+#: wt-status.c:295
msgid "untracked content, "
msgstr "unbeobachteter Inhalt, "
-#: wt-status.c:307
+#: wt-status.c:312
#, c-format
msgid "new file: %s"
msgstr "neue Datei: %s"
-#: wt-status.c:310
+#: wt-status.c:315
#, c-format
msgid "copied: %s -> %s"
msgstr "kopiert: %s -> %s"
-#: wt-status.c:313
+#: wt-status.c:318
#, c-format
msgid "deleted: %s"
msgstr "gelöscht: %s"
-#: wt-status.c:316
+#: wt-status.c:321
#, c-format
msgid "modified: %s"
msgstr "geändert: %s"
-#: wt-status.c:319
+#: wt-status.c:324
#, c-format
msgid "renamed: %s -> %s"
msgstr "umbenannt: %s -> %s"
-#: wt-status.c:322
+#: wt-status.c:327
#, c-format
msgid "typechange: %s"
msgstr "Typänderung: %s"
-#: wt-status.c:325
+#: wt-status.c:330
#, c-format
msgid "unknown: %s"
msgstr "unbekannt: %s"
-#: wt-status.c:328
+#: wt-status.c:333
#, c-format
msgid "unmerged: %s"
msgstr "nicht zusammengeführt: %s"
-#: wt-status.c:331
+#: wt-status.c:336
#, c-format
msgid "bug: unhandled diff status %c"
msgstr "Fehler: unbehandelter Differenz-Status %c"
-#: wt-status.c:803
+#: wt-status.c:703
+msgid "Submodules changed but not updated:"
+msgstr "Submodule geändert, aber nicht aktualisiert:"
+
+#: wt-status.c:705
+msgid "Submodule changes to be committed:"
+msgstr "Änderungen in Submodul zum Committen:"
+
+#: wt-status.c:848
msgid "You have unmerged paths."
msgstr "Sie haben nicht zusammengeführte Pfade."
-#: wt-status.c:806
+#: wt-status.c:851
msgid " (fix conflicts and run \"git commit\")"
msgstr " (beheben Sie die Konflikte und führen Sie \"git commit\" aus)"
-#: wt-status.c:809
+#: wt-status.c:854
msgid "All conflicts fixed but you are still merging."
msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge."
-#: wt-status.c:812
+#: wt-status.c:857
msgid " (use \"git commit\" to conclude merge)"
msgstr " (benutzen Sie \"git commit\" um den Merge abzuschließen)"
-#: wt-status.c:822
+#: wt-status.c:867
msgid "You are in the middle of an am session."
msgstr "Eine \"am\"-Sitzung ist im Gange."
-#: wt-status.c:825
+#: wt-status.c:870
msgid "The current patch is empty."
msgstr "Der aktuelle Patch ist leer."
-#: wt-status.c:829
+#: wt-status.c:874
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
" (beheben Sie die Konflikte und führen Sie dann \"git am --continue\" aus)"
-#: wt-status.c:831
+#: wt-status.c:876
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (benutzen Sie \"git am --skip\" um diesen Patch auszulassen)"
-#: wt-status.c:833
+#: wt-status.c:878
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
" (benutzen Sie \"git am --abort\" um den ursprünglichen Branch "
"wiederherzustellen)"
-#: wt-status.c:893 wt-status.c:910
+#: wt-status.c:938 wt-status.c:955
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Sie sind gerade beim Rebase von Branch '%s' auf '%s'."
-#: wt-status.c:898 wt-status.c:915
+#: wt-status.c:943 wt-status.c:960
msgid "You are currently rebasing."
msgstr "Sie sind gerade beim Rebase."
-#: wt-status.c:901
+#: wt-status.c:946
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
" (beheben Sie die Konflikte und führen Sie dann \"git rebase --continue\" "
"aus)"
-#: wt-status.c:903
+#: wt-status.c:948
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (benutzen Sie \"git rebase --skip\" um diesen Patch auszulassen)"
-#: wt-status.c:905
+#: wt-status.c:950
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
" (benutzen Sie \"git rebase --abort\" um den ursprünglichen Branch "
"auszuchecken)"
-#: wt-status.c:918
+#: wt-status.c:963
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (alle Konflikte behoben: führen Sie \"git rebase --continue\" aus)"
-#: wt-status.c:922
+#: wt-status.c:967
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -1512,128 +1674,129 @@ msgstr ""
"Sie teilen gerade einen Commit auf, während ein Rebase von Branch '%s' auf "
"'%s' im Gange ist."
-#: wt-status.c:927
+#: wt-status.c:972
msgid "You are currently splitting a commit during a rebase."
msgstr "Sie teilen gerade einen Commit während eines Rebase auf."
-#: wt-status.c:930
+#: wt-status.c:975
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Sobald Ihr Arbeitsverzeichnis unverändert ist, führen Sie \"git rebase --"
"continue\" aus)"
-#: wt-status.c:934
+#: wt-status.c:979
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Sie editieren gerade einen Commit während eines Rebase von Branch '%s' auf "
"'%s'."
-#: wt-status.c:939
+#: wt-status.c:984
msgid "You are currently editing a commit during a rebase."
msgstr "Sie editieren gerade einen Commit während eines Rebase."
-#: wt-status.c:942
+#: wt-status.c:987
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
" (benutzen Sie \"git commit --amend\" um den aktuellen Commit nachzubessern)"
-#: wt-status.c:944
+#: wt-status.c:989
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (benutzen Sie \"git rebase --continue\" sobald Ihre Änderungen "
"abgeschlossen sind)"
-#: wt-status.c:954
-msgid "You are currently cherry-picking."
-msgstr "Sie führen gerade \"cherry-pick\" aus."
+#: wt-status.c:999
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "Sie führen gerade \"cherry-pick\" von Commit %s aus."
-#: wt-status.c:958
+#: wt-status.c:1004
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
" (beheben Sie die Konflikte und führen Sie dann \"git cherry-pick --continue"
"\" aus)"
-#: wt-status.c:961
+#: wt-status.c:1007
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (alle Konflikte behoben: führen Sie \"git cherry-pick --continue\" aus)"
-#: wt-status.c:963
+#: wt-status.c:1009
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (benutzen Sie \"git cherry-pick --abort\" um die Cherry-Pick-Operation "
"abzubrechen)"
-#: wt-status.c:972
+#: wt-status.c:1018
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Sie sind gerade an einem Revert von Commit '%s'."
-#: wt-status.c:977
+#: wt-status.c:1023
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
" (beheben Sie die Konflikte und führen Sie dann \"git revert --continue\" "
"aus)"
-#: wt-status.c:980
+#: wt-status.c:1026
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (alle Konflikte behoben: führen Sie \"git revert --continue\" aus)"
-#: wt-status.c:982
+#: wt-status.c:1028
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
" (benutzen Sie \"git revert --abort\" um die Revert-Operation abzubrechen)"
-#: wt-status.c:993
+#: wt-status.c:1039
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Sie sind gerade bei einer binären Suche, gestartet von Branch '%s'."
-#: wt-status.c:997
+#: wt-status.c:1043
msgid "You are currently bisecting."
msgstr "Sie sind gerade bei einer binären Suche."
-#: wt-status.c:1000
+#: wt-status.c:1046
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
" (benutzen Sie \"git bisect reset\" um zum ursprünglichen Branch "
"zurückzukehren)"
-#: wt-status.c:1173
+#: wt-status.c:1221
msgid "On branch "
msgstr "Auf Branch "
-#: wt-status.c:1180
+#: wt-status.c:1228
msgid "rebase in progress; onto "
msgstr "Rebase im Gange; auf "
-#: wt-status.c:1187
+#: wt-status.c:1235
msgid "HEAD detached at "
msgstr "HEAD losgelöst bei "
-#: wt-status.c:1189
+#: wt-status.c:1237
msgid "HEAD detached from "
msgstr "HEAD losgelöst von "
-#: wt-status.c:1192
+#: wt-status.c:1240
msgid "Not currently on any branch."
msgstr "Im Moment auf keinem Branch."
-#: wt-status.c:1209
+#: wt-status.c:1257
msgid "Initial commit"
msgstr "Initialer Commit"
-#: wt-status.c:1223
+#: wt-status.c:1271
msgid "Untracked files"
msgstr "Unbeobachtete Dateien"
-#: wt-status.c:1225
+#: wt-status.c:1273
msgid "Ignored files"
msgstr "Ignorierte Dateien"
-#: wt-status.c:1229
+#: wt-status.c:1277
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -1644,32 +1807,32 @@ msgstr ""
"'status -uno' könnte das beschleunigen, aber Sie müssen darauf achten,\n"
"neue Dateien selbstständig hinzuzufügen (siehe 'git help status')."
-#: wt-status.c:1235
+#: wt-status.c:1283
#, c-format
msgid "Untracked files not listed%s"
msgstr "Unbeobachtete Dateien nicht aufgelistet%s"
-#: wt-status.c:1237
+#: wt-status.c:1285
msgid " (use -u option to show untracked files)"
msgstr " (benutzen Sie die Option -u um unbeobachteten Dateien anzuzeigen)"
-#: wt-status.c:1243
+#: wt-status.c:1291
msgid "No changes"
msgstr "Keine Änderungen"
-#: wt-status.c:1248
+#: wt-status.c:1296
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"keine Änderungen zum Commit vorgemerkt (benutzen Sie \"git add\" und/oder "
"\"git commit -a\")\n"
-#: wt-status.c:1251
+#: wt-status.c:1299
#, c-format
msgid "no changes added to commit\n"
msgstr "keine Änderungen zum Commit vorgemerkt\n"
-#: wt-status.c:1254
+#: wt-status.c:1302
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -1678,56 +1841,60 @@ msgstr ""
"nichts zum Commit vorgemerkt, aber es gibt unbeobachtete Dateien (benutzen "
"Sie \"git add\" zum Beobachten)\n"
-#: wt-status.c:1257
+#: wt-status.c:1305
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "nichts zum Commit vorgemerkt, aber es gibt unbeobachtete Dateien\n"
-#: wt-status.c:1260
+#: wt-status.c:1308
#, 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 Beobachten)\n"
-#: wt-status.c:1263 wt-status.c:1268
+#: wt-status.c:1311 wt-status.c:1316
#, c-format
msgid "nothing to commit\n"
msgstr "nichts zu committen\n"
-#: wt-status.c:1266
+#: wt-status.c:1314
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"nichts zu committen (benutzen Sie die Option -u, um unbeobachtete Dateien "
"anzuzeigen)\n"
-#: wt-status.c:1270
+#: wt-status.c:1318
#, c-format
msgid "nothing to commit, working directory clean\n"
msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n"
-#: wt-status.c:1378
+#: wt-status.c:1427
msgid "HEAD (no branch)"
msgstr "HEAD (kein Branch)"
-#: wt-status.c:1384
+#: wt-status.c:1433
msgid "Initial commit on "
msgstr "Initialer Commit auf "
-#: wt-status.c:1399
+#: wt-status.c:1463
+msgid "gone"
+msgstr "entfernt"
+
+#: wt-status.c:1465
msgid "behind "
msgstr "hinterher "
-#: wt-status.c:1402 wt-status.c:1405
+#: wt-status.c:1468 wt-status.c:1471
msgid "ahead "
msgstr "voraus "
-#: wt-status.c:1407
+#: wt-status.c:1473
msgid ", behind "
msgstr ", hinterher "
-#: compat/precompose_utf8.c:58 builtin/clone.c:351
+#: compat/precompose_utf8.c:55 builtin/clone.c:350
#, c-format
msgid "failed to unlink '%s'"
msgstr "Konnte '%s' nicht entfernen."
@@ -1813,7 +1980,7 @@ msgstr ""
msgid "unexpected diff status %c"
msgstr "unerwarteter Differenz-Status %c"
-#: builtin/add.c:149 builtin/commit.c:252
+#: builtin/add.c:149 builtin/commit.c:260
msgid "updating files failed"
msgstr "Aktualisierung der Dateien fehlgeschlagen"
@@ -1822,147 +1989,142 @@ msgstr "Aktualisierung der Dateien fehlgeschlagen"
msgid "remove '%s'\n"
msgstr "lösche '%s'\n"
-#: builtin/add.c:253
+#: builtin/add.c:237
msgid "Unstaged changes after refreshing the index:"
msgstr ""
"Nicht zum Commit vorgemerkte Änderungen nach Aktualisierung der Staging-Area:"
-#: builtin/add.c:256 builtin/add.c:573 builtin/rm.c:337
-#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein"
-
-#: builtin/add.c:339
+#: builtin/add.c:299
msgid "Could not read the index"
msgstr "Konnte die Staging-Area nicht lesen"
-#: builtin/add.c:350
+#: builtin/add.c:310
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Konnte '%s' nicht zum Schreiben öffnen."
-#: builtin/add.c:354
+#: builtin/add.c:314
msgid "Could not write patch"
msgstr "Konnte Patch nicht schreiben"
-#: builtin/add.c:359
+#: builtin/add.c:319
#, c-format
msgid "Could not stat '%s'"
msgstr "Konnte Verzeichnis '%s' nicht lesen"
-#: builtin/add.c:361
+#: builtin/add.c:321
msgid "Empty patch. Aborted."
msgstr "Leerer Patch. Abgebrochen."
-#: builtin/add.c:367
+#: builtin/add.c:327
#, c-format
msgid "Could not apply '%s'"
msgstr "Konnte '%s' nicht anwenden."
-#: builtin/add.c:377
+#: builtin/add.c:337
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Die folgenden Pfade werden durch eine Ihrer \".gitignore\" Dateien "
"ignoriert:\n"
-#: builtin/add.c:394 builtin/clean.c:875 builtin/fetch.c:78 builtin/mv.c:63
-#: builtin/prune-packed.c:73 builtin/push.c:451 builtin/remote.c:1253
-#: builtin/rm.c:268
+#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:92 builtin/mv.c:66
+#: builtin/prune-packed.c:73 builtin/push.c:459 builtin/remote.c:1253
+#: builtin/rm.c:269
msgid "dry run"
msgstr "Probelauf"
-#: builtin/add.c:395 builtin/apply.c:4410 builtin/check-ignore.c:19
-#: builtin/commit.c:1220 builtin/count-objects.c:95 builtin/fsck.c:613
-#: builtin/log.c:1573 builtin/mv.c:62 builtin/read-tree.c:113
+#: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19
+#: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612
+#: builtin/log.c:1592 builtin/mv.c:65 builtin/read-tree.c:113
msgid "be verbose"
msgstr "erweiterte Ausgaben"
-#: builtin/add.c:397
+#: builtin/add.c:357
msgid "interactive picking"
msgstr "interaktives Auswählen"
-#: builtin/add.c:398 builtin/checkout.c:1073 builtin/reset.c:261
+#: builtin/add.c:358 builtin/checkout.c:1109 builtin/reset.c:272
msgid "select hunks interactively"
msgstr "Blöcke interaktiv auswählen"
-#: builtin/add.c:399
+#: builtin/add.c:359
msgid "edit current diff and apply"
msgstr "aktuelle Unterschiede editieren und anwenden"
-#: builtin/add.c:400
+#: builtin/add.c:360
msgid "allow adding otherwise ignored files"
msgstr "erlaubt das Hinzufügen andernfalls ignorierter Dateien"
-#: builtin/add.c:401
+#: builtin/add.c:361
msgid "update tracked files"
msgstr "aktualisiert beobachtete Dateien"
-#: builtin/add.c:402
+#: builtin/add.c:362
msgid "record only the fact that the path will be added later"
msgstr "speichert nur, dass der Pfad später hinzugefügt werden soll"
-#: builtin/add.c:403
+#: builtin/add.c:363
msgid "add changes from all tracked and untracked files"
msgstr ""
"fügt Änderungen von allen beobachteten und unbeobachteten Dateien hinzu"
#. takes no arguments
-#: builtin/add.c:406
+#: builtin/add.c:366
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "ignoriert gelöschte Pfade im Arbeitsverzeichnis (genau wie --no-all)"
-#: builtin/add.c:408
+#: builtin/add.c:368
msgid "don't add, only refresh the index"
msgstr "fügt nichts hinzu, aktualisiert nur die Staging-Area"
-#: builtin/add.c:409
+#: builtin/add.c:369
msgid "just skip files which cannot be added because of errors"
msgstr ""
"überspringt Dateien, die aufgrund von Fehlern nicht hinzugefügt werden "
"konnten"
-#: builtin/add.c:410
+#: builtin/add.c:370
msgid "check if - even missing - files are ignored in dry run"
msgstr "prüft ob - auch fehlende - Dateien im Probelauf ignoriert werden"
-#: builtin/add.c:432
+#: builtin/add.c:392
#, 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"
-#: builtin/add.c:433
+#: builtin/add.c:393
msgid "no files added"
msgstr "keine Dateien hinzugefügt"
-#: builtin/add.c:439
+#: builtin/add.c:399
msgid "adding files failed"
msgstr "Hinzufügen von Dateien fehlgeschlagen"
-#: builtin/add.c:478
+#: builtin/add.c:438
msgid "-A and -u are mutually incompatible"
msgstr "Die Optionen -A und -u sind zueinander inkompatibel."
-#: builtin/add.c:496
+#: builtin/add.c:456
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
"Die Option --ignore-missing kann nur zusammen mit --dry-run verwendet werden."
-#: builtin/add.c:526
+#: builtin/add.c:486
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Nichts spezifiziert, nichts hinzugefügt.\n"
-#: builtin/add.c:527
+#: builtin/add.c:487
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Wollten Sie vielleicht 'git add .' sagen?\n"
-#: builtin/add.c:533 builtin/check-ignore.c:161 builtin/clean.c:919
-#: builtin/commit.c:312 builtin/mv.c:82 builtin/rm.c:297
+#: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919
+#: builtin/commit.c:320 builtin/mv.c:86 builtin/reset.c:224 builtin/rm.c:299
msgid "index file corrupt"
msgstr "Staging-Area-Datei beschädigt"
-#: builtin/add.c:605 builtin/apply.c:4506 builtin/mv.c:229 builtin/rm.c:432
+#: builtin/add.c:589 builtin/apply.c:4506 builtin/mv.c:259 builtin/rm.c:432
msgid "Unable to write new index file"
msgstr "Konnte neue Staging-Area-Datei nicht schreiben."
@@ -2220,7 +2382,7 @@ msgstr "%s: Patch konnte nicht angewendet werden"
msgid "Checking patch %s..."
msgstr "Prüfe Patch %s..."
-#: builtin/apply.c:3680 builtin/checkout.c:216 builtin/reset.c:127
+#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:127
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen"
@@ -2300,8 +2462,8 @@ msgstr "nicht erkannte Eingabe"
msgid "unable to read index file"
msgstr "Konnte Staging-Area-Datei nicht lesen"
-#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:91
-#: builtin/fetch.c:63
+#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90
+#: builtin/fetch.c:77
msgid "path"
msgstr "Pfad"
@@ -2374,7 +2536,7 @@ msgstr ""
"erstellt eine temporäre Staging-Area basierend auf den integrierten Staging-"
"Area-Informationen"
-#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:462
+#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:452
msgid "paths are separated with NUL character"
msgstr "Pfade sind getrennt durch NUL Zeichen"
@@ -2508,104 +2670,104 @@ msgstr "führt 'git bisect next' aus"
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "aktualisiert BISECT_HEAD, anstatt den aktuellen Commit auszuchecken"
-#: builtin/blame.c:26
+#: builtin/blame.c:27
msgid "git blame [options] [rev-opts] [rev] [--] file"
msgstr "git blame [Optionen] [rev-opts] [rev] [--] Datei"
-#: builtin/blame.c:31
+#: builtin/blame.c:32
msgid "[rev-opts] are documented in git-rev-list(1)"
msgstr "[rev-opts] sind dokumentiert in git-rev-list(1)"
-#: builtin/blame.c:2276
+#: builtin/blame.c:2248
msgid "Show blame entries as we find them, incrementally"
msgstr "Zeigt \"blame\"-Einträge schrittweise, während wir sie generieren"
-#: builtin/blame.c:2277
+#: builtin/blame.c:2249
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "Zeigt leere SHA-1 für Grenz-Commits (Standard: aus)"
-#: builtin/blame.c:2278
+#: builtin/blame.c:2250
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Behandelt Ursprungs-Commit nicht als Grenzen (Standard: aus)"
-#: builtin/blame.c:2279
+#: builtin/blame.c:2251
msgid "Show work cost statistics"
msgstr "Zeigt Statistiken zum Arbeitsaufwand"
-#: builtin/blame.c:2280
+#: builtin/blame.c:2252
msgid "Show output score for blame entries"
msgstr "Zeigt Ausgabebewertung für \"blame\"-Einträge"
-#: builtin/blame.c:2281
+#: builtin/blame.c:2253
msgid "Show original filename (Default: auto)"
msgstr "Zeigt ursprünglichen Dateinamen (Standard: auto)"
-#: builtin/blame.c:2282
+#: builtin/blame.c:2254
msgid "Show original linenumber (Default: off)"
msgstr "Zeigt ursprüngliche Zeilennummer (Standard: aus)"
-#: builtin/blame.c:2283
+#: builtin/blame.c:2255
msgid "Show in a format designed for machine consumption"
msgstr "Anzeige in einem Format für maschinelle Auswertung"
-#: builtin/blame.c:2284
+#: builtin/blame.c:2256
msgid "Show porcelain format with per-line commit information"
msgstr ""
"Anzeige in Format für Fremdprogramme mit Commit-Informationen pro Zeile"
-#: builtin/blame.c:2285
+#: builtin/blame.c:2257
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "Benutzt den gleichen Ausgabemodus wie \"git-annotate\" (Standard: aus)"
-#: builtin/blame.c:2286
+#: builtin/blame.c:2258
msgid "Show raw timestamp (Default: off)"
msgstr "Zeigt unbearbeiteten Zeitstempel (Standard: aus)"
-#: builtin/blame.c:2287
+#: builtin/blame.c:2259
msgid "Show long commit SHA1 (Default: off)"
msgstr "Zeigt langen Commit-SHA1 (Standard: aus)"
-#: builtin/blame.c:2288
+#: builtin/blame.c:2260
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Unterdrückt den Namen des Autors und den Zeitstempel (Standard: aus)"
-#: builtin/blame.c:2289
+#: builtin/blame.c:2261
msgid "Show author email instead of name (Default: off)"
msgstr "Zeigt anstatt des Namens die Email-Adresse des Autors (Standard: aus)"
-#: builtin/blame.c:2290
+#: builtin/blame.c:2262
msgid "Ignore whitespace differences"
msgstr "Ignoriert Unterschiede im Whitespace"
-#: builtin/blame.c:2291
+#: builtin/blame.c:2263
msgid "Spend extra cycles to find better match"
msgstr "arbeite länger, um bessere Übereinstimmungen zu finden"
-#: builtin/blame.c:2292
+#: builtin/blame.c:2264
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Benutzt Commits von <Datei> anstatt \"git-rev-list\" aufzurufen"
-#: builtin/blame.c:2293
+#: builtin/blame.c:2265
msgid "Use <file>'s contents as the final image"
msgstr "Benutzt Inhalte der <Datei>en als entgültiges Abbild"
-#: builtin/blame.c:2294 builtin/blame.c:2295
+#: builtin/blame.c:2266 builtin/blame.c:2267
msgid "score"
msgstr "Bewertung"
-#: builtin/blame.c:2294
+#: builtin/blame.c:2266
msgid "Find line copies within and across files"
msgstr "Findet kopierte Zeilen innerhalb oder zwischen Dateien"
-#: builtin/blame.c:2295
+#: builtin/blame.c:2267
msgid "Find line movements within and across files"
msgstr "Findet verschobene Zeilen innerhalb oder zwischen Dateien"
-#: builtin/blame.c:2296
+#: builtin/blame.c:2268
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2296
+#: builtin/blame.c:2268
msgid "Process only line range n,m, counting from 1"
msgstr "Verarbeitet nur Zeilen im Bereich n,m, gezählt von 1"
@@ -2713,240 +2875,250 @@ msgstr "Branch '%s' zeigt auf keinen Commit"
#: builtin/branch.c:453
#, c-format
+msgid "[%s: gone]"
+msgstr "[%s: entfernt]"
+
+#: builtin/branch.c:456
+#, c-format
+msgid "[%s]"
+msgstr "[%s]"
+
+#: builtin/branch.c:459
+#, c-format
msgid "[%s: behind %d]"
msgstr "[%s: %d hinterher]"
-#: builtin/branch.c:455
+#: builtin/branch.c:461
#, c-format
msgid "[behind %d]"
msgstr "[%d hinterher]"
-#: builtin/branch.c:459
+#: builtin/branch.c:465
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s: %d voraus]"
-#: builtin/branch.c:461
+#: builtin/branch.c:467
#, c-format
msgid "[ahead %d]"
msgstr "[%d voraus]"
-#: builtin/branch.c:464
+#: builtin/branch.c:470
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s: %d voraus, %d hinterher]"
-#: builtin/branch.c:467
+#: builtin/branch.c:473
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[%d voraus, %d hinterher]"
-#: builtin/branch.c:490
+#: builtin/branch.c:496
msgid " **** invalid ref ****"
msgstr " **** ungültige Referenz ****"
-#: builtin/branch.c:582
+#: builtin/branch.c:588
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(kein Branch, Rebase von Branch %s im Gange)"
-#: builtin/branch.c:585
+#: builtin/branch.c:591
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(kein Branch, binäre Suche begonnen bei %s)"
-#: builtin/branch.c:588
+#: builtin/branch.c:594
#, c-format
msgid "(detached from %s)"
msgstr "(losgelöst von %s)"
-#: builtin/branch.c:591
+#: builtin/branch.c:597
msgid "(no branch)"
msgstr "(kein Branch)"
-#: builtin/branch.c:637
+#: builtin/branch.c:643
#, c-format
msgid "object '%s' does not point to a commit"
msgstr "Objekt '%s' zeigt auf keinen Commit"
-#: builtin/branch.c:669
+#: builtin/branch.c:675
msgid "some refs could not be read"
msgstr "Konnte einige Referenzen nicht lesen"
-#: builtin/branch.c:682
+#: builtin/branch.c:688
msgid "cannot rename the current branch while not on any."
msgstr ""
"Kann aktuellen Branch nicht umbenennen, solange Sie sich auf keinem befinden."
-#: builtin/branch.c:692
+#: builtin/branch.c:698
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Ungültiger Branchname: '%s'"
-#: builtin/branch.c:707
+#: builtin/branch.c:713
msgid "Branch rename failed"
msgstr "Umbenennung des Branches fehlgeschlagen"
-#: builtin/branch.c:711
+#: builtin/branch.c:717
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "falsch benannten Branch '%s' umbenannt"
-#: builtin/branch.c:715
+#: builtin/branch.c:721
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Branch umbenannt zu %s, aber HEAD ist nicht aktualisiert!"
-#: builtin/branch.c:722
+#: builtin/branch.c:728
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"Branch ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist "
"fehlgeschlagen."
-#: builtin/branch.c:737
+#: builtin/branch.c:743
#, c-format
msgid "malformed object name %s"
msgstr "Missgebildeter Objektname %s"
-#: builtin/branch.c:761
+#: builtin/branch.c:767
#, c-format
msgid "could not write branch description template: %s"
msgstr "Konnte Beschreibungsvorlage für Branch nicht schreiben: %s"
-#: builtin/branch.c:791
+#: builtin/branch.c:797
msgid "Generic options"
msgstr "Allgemeine Optionen"
-#: builtin/branch.c:793
+#: builtin/branch.c:799
msgid "show hash and subject, give twice for upstream branch"
msgstr "Zeigt Hash und Betreff; -vv: zusätzlich Upstream-Branch"
-#: builtin/branch.c:794
+#: builtin/branch.c:800
msgid "suppress informational messages"
msgstr "unterdrückt Informationsmeldungen"
-#: builtin/branch.c:795
+#: builtin/branch.c:801
msgid "set up tracking mode (see git-pull(1))"
msgstr "stellt den Übernahmemodus ein (siehe git-pull(1))"
-#: builtin/branch.c:797
+#: builtin/branch.c:803
msgid "change upstream info"
msgstr "ändert Informationen zum Upstream-Branch"
-#: builtin/branch.c:801
+#: builtin/branch.c:807
msgid "use colored output"
msgstr "verwendet farbliche Ausgaben"
-#: builtin/branch.c:802
+#: builtin/branch.c:808
msgid "act on remote-tracking branches"
msgstr "wirkt auf Remote-Tracking-Branches"
-#: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832
-#: builtin/branch.c:838 builtin/commit.c:1433 builtin/commit.c:1434
-#: builtin/commit.c:1435 builtin/commit.c:1436 builtin/tag.c:468
+#: builtin/branch.c:811 builtin/branch.c:817 builtin/branch.c:838
+#: builtin/branch.c:844 builtin/commit.c:1460 builtin/commit.c:1461
+#: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468
msgid "commit"
msgstr "Commit"
-#: builtin/branch.c:806 builtin/branch.c:812
+#: builtin/branch.c:812 builtin/branch.c:818
msgid "print only branches that contain the commit"
msgstr "gibt nur Branches aus, welche diesen Commit beinhalten"
-#: builtin/branch.c:818
+#: builtin/branch.c:824
msgid "Specific git-branch actions:"
msgstr "spezifische Aktionen für \"git-branch\":"
-#: builtin/branch.c:819
+#: builtin/branch.c:825
msgid "list both remote-tracking and local branches"
msgstr "listet Remote-Tracking und lokale Branches auf"
-#: builtin/branch.c:821
+#: builtin/branch.c:827
msgid "delete fully merged branch"
msgstr "entfernt vollständig zusammengeführten Branch"
-#: builtin/branch.c:822
+#: builtin/branch.c:828
msgid "delete branch (even if not merged)"
msgstr "löscht Branch (auch wenn nicht zusammengeführt)"
-#: builtin/branch.c:823
+#: builtin/branch.c:829
msgid "move/rename a branch and its reflog"
msgstr "verschiebt/benennt einen Branch und dessen Reflog um"
-#: builtin/branch.c:824
+#: builtin/branch.c:830
msgid "move/rename a branch, even if target exists"
msgstr ""
"verschiebt/benennt einen Branch um, auch wenn das Ziel bereits existiert"
-#: builtin/branch.c:825
+#: builtin/branch.c:831
msgid "list branch names"
msgstr "listet Branchnamen auf"
-#: builtin/branch.c:826
+#: builtin/branch.c:832
msgid "create the branch's reflog"
msgstr "erzeugt das Reflog des Branches"
-#: builtin/branch.c:828
+#: builtin/branch.c:834
msgid "edit the description for the branch"
msgstr "bearbeitet die Beschreibung für den Branch"
-#: builtin/branch.c:829
+#: builtin/branch.c:835
msgid "force creation (when already exists)"
msgstr "erzeuge auch, wenn der Branch bereits existiert"
-#: builtin/branch.c:832
+#: builtin/branch.c:838
msgid "print only not merged branches"
msgstr "gibt nur Branches aus, die nicht zusammengeführt sind"
-#: builtin/branch.c:838
+#: builtin/branch.c:844
msgid "print only merged branches"
msgstr "gibt nur Branches aus, die zusammengeführt sind"
-#: builtin/branch.c:842
+#: builtin/branch.c:848
msgid "list branches in columns"
msgstr "listet Branches in Spalten auf"
-#: builtin/branch.c:855
+#: builtin/branch.c:861
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Konnte HEAD nicht als gültige Referenz auflösen."
-#: builtin/branch.c:860 builtin/clone.c:630
+#: builtin/branch.c:866 builtin/clone.c:629
msgid "HEAD not found below refs/heads!"
msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!"
-#: builtin/branch.c:883
+#: builtin/branch.c:890
msgid "--column and --verbose are incompatible"
msgstr "Die Optionen --column und --verbose sind inkompatibel."
-#: builtin/branch.c:889 builtin/branch.c:928
+#: builtin/branch.c:896 builtin/branch.c:935
msgid "branch name required"
msgstr "Branchname erforderlich"
-#: builtin/branch.c:904
+#: builtin/branch.c:911
msgid "Cannot give description to detached HEAD"
msgstr "zu losgelöstem HEAD kann keine Beschreibung hinterlegt werden"
-#: builtin/branch.c:909
+#: builtin/branch.c:916
msgid "cannot edit description of more than one branch"
msgstr "Beschreibung von mehr als einem Branch kann nicht bearbeitet werden"
-#: builtin/branch.c:916
+#: builtin/branch.c:923
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Noch kein Commit in Branch '%s'."
-#: builtin/branch.c:919
+#: builtin/branch.c:926
#, c-format
msgid "No branch named '%s'."
msgstr "Branch '%s' nicht vorhanden."
-#: builtin/branch.c:934
+#: builtin/branch.c:941
msgid "too many branches for a rename operation"
msgstr "zu viele Branches für eine Umbenennen-Operation angegeben"
-#: builtin/branch.c:939
+#: builtin/branch.c:946
msgid "too many branches to set new upstream"
msgstr "zu viele Branches angegeben um Upstream-Branch zu setzen"
-#: builtin/branch.c:943
+#: builtin/branch.c:950
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -2954,43 +3126,43 @@ msgstr ""
"Konnte keinen neuen Upstream-Branch von HEAD zu %s setzen, da dieser auf\n"
"keinen Branch zeigt."
-#: builtin/branch.c:946 builtin/branch.c:968 builtin/branch.c:990
+#: builtin/branch.c:953 builtin/branch.c:975 builtin/branch.c:997
#, c-format
msgid "no such branch '%s'"
msgstr "Kein solcher Branch '%s'"
-#: builtin/branch.c:950
+#: builtin/branch.c:957
#, c-format
msgid "branch '%s' does not exist"
msgstr "Branch '%s' existiert nicht"
-#: builtin/branch.c:962
+#: builtin/branch.c:969
msgid "too many branches to unset upstream"
msgstr ""
"zu viele Branches angegeben um Konfiguration zu Upstream-Branch zu entfernen"
-#: builtin/branch.c:966
+#: builtin/branch.c:973
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"Konnte Konfiguration zu Upstream-Branch von HEAD nicht entfernen, da dieser\n"
"auf keinen Branch zeigt."
-#: builtin/branch.c:972
+#: builtin/branch.c:979
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
-#: builtin/branch.c:987
+#: builtin/branch.c:994
msgid "it does not make sense to create 'HEAD' manually"
msgstr "'HEAD' darf nicht manuell erstellt werden"
-#: builtin/branch.c:993
+#: builtin/branch.c:1000
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
"Die Optionen -a und -r bei 'git branch' können nicht gemeimsam mit einem "
"Branchnamen verwendet werden."
-#: builtin/branch.c:996
+#: builtin/branch.c:1003
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -2999,7 +3171,7 @@ msgstr ""
"Die --set-upstream Option ist veraltet und wird entfernt. Benutzen Sie --"
"track oder --set-upstream-to\n"
-#: builtin/branch.c:1013
+#: builtin/branch.c:1020
#, c-format
msgid ""
"\n"
@@ -3010,12 +3182,12 @@ msgstr ""
"Wenn Sie wollten, dass '%s' den Branch '%s' als Upstream-Branch hat, führen "
"Sie aus:\n"
-#: builtin/branch.c:1014
+#: builtin/branch.c:1021
#, c-format
msgid " git branch -d %s\n"
msgstr " git branch -d %s\n"
-#: builtin/branch.c:1015
+#: builtin/branch.c:1022
#, c-format
msgid " git branch --set-upstream-to %s\n"
msgstr " git branch --set-upstream-to %s\n"
@@ -3033,45 +3205,45 @@ msgstr "Um ein Paket zu erstellen wird ein Repository benötigt."
msgid "Need a repository to unbundle."
msgstr "Zum Entpacken wird ein Repository benötigt."
-#: builtin/cat-file.c:285
+#: builtin/cat-file.c:312
msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
msgstr "git cat-file (-t|-s|-e|-p|<Art>|--textconv) <Objekt>"
-#: builtin/cat-file.c:286
+#: builtin/cat-file.c:313
msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
msgstr "git cat-file (--batch|--batch-check) < <Liste_von_Objekten>"
-#: builtin/cat-file.c:323
+#: builtin/cat-file.c:350
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<Art> kann sein: blob, tree, commit, tag"
-#: builtin/cat-file.c:324
+#: builtin/cat-file.c:351
msgid "show object type"
msgstr "zeigt Objektart"
-#: builtin/cat-file.c:325
+#: builtin/cat-file.c:352
msgid "show object size"
msgstr "zeigt Objektgröße"
-#: builtin/cat-file.c:327
+#: builtin/cat-file.c:354
msgid "exit with zero when there's no error"
msgstr "beendet mit Rückgabewert 0, wenn kein Fehler aufgetreten ist"
-#: builtin/cat-file.c:328
+#: builtin/cat-file.c:355
msgid "pretty-print object's content"
msgstr "ansprechende Anzeige des Objektinhaltes"
-#: builtin/cat-file.c:330
+#: builtin/cat-file.c:357
msgid "for blob objects, run textconv on object's content"
msgstr "führt eine Textkonvertierung auf den Inhalt von Blob-Objekten aus"
-#: builtin/cat-file.c:332
+#: builtin/cat-file.c:359
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:335
+#: builtin/cat-file.c:362
msgid "show info about objects fed from the standard input"
msgstr ""
"Anzeige von Informationen über Objekte, gelesen von der Standard-Eingabe"
@@ -3098,10 +3270,10 @@ msgid "read file names from stdin"
msgstr "liest Dateinamen von der Standard-Eingabe"
#: builtin/check-attr.c:23 builtin/check-ignore.c:24
-msgid "input paths are terminated by a null character"
-msgstr "Eingabepfade sind durch ein NUL Zeichen abgeschlossen"
+msgid "terminate input and output records by a NUL character"
+msgstr "schließt Einträge von Ein- und Ausgabe mit NUL-Zeichen ab"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1054 builtin/gc.c:177
+#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:259
msgid "suppress progress reporting"
msgstr "unterdrückt Fortschrittsanzeige"
@@ -3109,28 +3281,32 @@ msgstr "unterdrückt Fortschrittsanzeige"
msgid "show non-matching input paths"
msgstr "zeigt Eingabe-Pfade ohne Übereinstimmungen"
-#: builtin/check-ignore.c:143
+#: builtin/check-ignore.c:28
+msgid "ignore index when checking"
+msgstr "ignoriert Staging-Area bei der Prüfung"
+
+#: builtin/check-ignore.c:154
msgid "cannot specify pathnames with --stdin"
msgstr "Angabe von Pfadnamen kann nicht gemeinsam mit --stdin verwendet werden"
-#: builtin/check-ignore.c:146
+#: builtin/check-ignore.c:157
msgid "-z only makes sense with --stdin"
msgstr "Die Option -z kann nur mit --stdin verwendet werden."
-#: builtin/check-ignore.c:148
+#: builtin/check-ignore.c:159
msgid "no path specified"
msgstr "kein Pfad angegeben"
-#: builtin/check-ignore.c:152
+#: builtin/check-ignore.c:163
msgid "--quiet is only valid with a single pathname"
msgstr "Die Option --quiet ist nur mit einem einzelnen Pfadnamen gültig."
-#: builtin/check-ignore.c:154
+#: builtin/check-ignore.c:165
msgid "cannot have both --quiet and --verbose"
msgstr ""
"Die Optionen --quiet und --verbose können nicht gemeinsam verwendet werden."
-#: builtin/check-ignore.c:157
+#: builtin/check-ignore.c:168
msgid "--non-matching is only valid with --verbose"
msgstr "--non-matching ist nur mit --verbose zulässig"
@@ -3206,107 +3382,107 @@ msgstr "git checkout [Optionen] <Branch>"
msgid "git checkout [options] [<branch>] -- <file>..."
msgstr "git checkout [Optionen] [<Branch>] -- <Datei>..."
-#: builtin/checkout.c:117 builtin/checkout.c:150
+#: builtin/checkout.c:114 builtin/checkout.c:147
#, c-format
msgid "path '%s' does not have our version"
msgstr "Pfad '%s' hat nicht unsere Version."
-#: builtin/checkout.c:119 builtin/checkout.c:152
+#: builtin/checkout.c:116 builtin/checkout.c:149
#, c-format
msgid "path '%s' does not have their version"
msgstr "Pfad '%s' hat nicht deren Version."
-#: builtin/checkout.c:135
+#: builtin/checkout.c:132
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "Pfad '%s' hat nicht alle notwendigen Versionen."
-#: builtin/checkout.c:179
+#: builtin/checkout.c:176
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "Pfad '%s' hat nicht die notwendigen Versionen."
-#: builtin/checkout.c:196
+#: builtin/checkout.c:193
#, c-format
msgid "path '%s': cannot merge"
msgstr "Pfad '%s': kann nicht zusammenführen"
-#: builtin/checkout.c:213
+#: builtin/checkout.c:210
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Konnte Merge-Ergebnis von '%s' nicht hinzufügen."
-#: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243
-#: builtin/checkout.c:246
+#: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238
+#: builtin/checkout.c:241
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' kann nicht mit Pfaden verwendet werden"
-#: builtin/checkout.c:249 builtin/checkout.c:252
+#: builtin/checkout.c:244 builtin/checkout.c:247
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' kann nicht mit '%s' verwendet werden"
-#: builtin/checkout.c:255
+#: builtin/checkout.c:250
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Kann nicht gleichzeitig Pfade aktualisieren und zu Branch '%s' wechseln"
-#: builtin/checkout.c:266 builtin/checkout.c:458
+#: builtin/checkout.c:261 builtin/checkout.c:451
msgid "corrupt index file"
msgstr "beschädigte Staging-Area-Datei"
-#: builtin/checkout.c:329 builtin/checkout.c:336
+#: builtin/checkout.c:322 builtin/checkout.c:329
#, c-format
msgid "path '%s' is unmerged"
msgstr "Pfad '%s' ist nicht zusammengeführt."
-#: builtin/checkout.c:480
+#: builtin/checkout.c:473
msgid "you need to resolve your current index first"
msgstr "Sie müssen zuerst Ihre aktuelle Staging-Area auflösen."
-#: builtin/checkout.c:601
+#: builtin/checkout.c:594
#, c-format
msgid "Can not do reflog for '%s'\n"
msgstr "Konnte \"reflog\" für '%s' nicht durchführen\n"
-#: builtin/checkout.c:639
+#: builtin/checkout.c:632
msgid "HEAD is now at"
msgstr "HEAD ist jetzt bei"
-#: builtin/checkout.c:646
+#: builtin/checkout.c:639
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Setze Branch '%s' neu\n"
-#: builtin/checkout.c:649
+#: builtin/checkout.c:642
#, c-format
msgid "Already on '%s'\n"
msgstr "Bereits auf '%s'\n"
-#: builtin/checkout.c:653
+#: builtin/checkout.c:646
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Gewechselt zu umgesetzten Branch '%s'\n"
-#: builtin/checkout.c:655 builtin/checkout.c:997
+#: builtin/checkout.c:648 builtin/checkout.c:1033
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Gewechselt zu einem neuem Branch '%s'\n"
-#: builtin/checkout.c:657
+#: builtin/checkout.c:650
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Gewechselt zu Branch '%s'\n"
-#: builtin/checkout.c:713
+#: builtin/checkout.c:706
#, c-format
msgid " ... and %d more.\n"
msgstr " ... und %d weitere.\n"
#. The singular version
-#: builtin/checkout.c:719
+#: builtin/checkout.c:712
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -3329,7 +3505,7 @@ msgstr[1] ""
"\n"
"%s\n"
-#: builtin/checkout.c:737
+#: builtin/checkout.c:730
#, c-format
msgid ""
"If you want to keep them by creating a new branch, this may be a good time\n"
@@ -3344,136 +3520,140 @@ msgstr ""
" git branch neuer_branch_name %s\n"
"\n"
-#: builtin/checkout.c:767
+#: builtin/checkout.c:760
msgid "internal error in revision walk"
msgstr "interner Fehler im Revisionsgang"
-#: builtin/checkout.c:771
+#: builtin/checkout.c:764
msgid "Previous HEAD position was"
msgstr "Vorherige Position von HEAD war"
-#: builtin/checkout.c:798 builtin/checkout.c:992
+#: builtin/checkout.c:791 builtin/checkout.c:1028
msgid "You are on a branch yet to be born"
msgstr "Sie sind auf einem Branch, der noch geboren wird"
-#. case (1)
-#: builtin/checkout.c:928
+#: builtin/checkout.c:935
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "nur eine Referenz erwartet, %d gegeben."
+
+#: builtin/checkout.c:974
#, c-format
msgid "invalid reference: %s"
msgstr "Ungültige Referenz: %s"
#. case (1): want a tree
-#: builtin/checkout.c:967
+#: builtin/checkout.c:1003
#, c-format
msgid "reference is not a tree: %s"
msgstr "Referenz ist kein \"Tree\"-Objekt: %s"
-#: builtin/checkout.c:1006
+#: builtin/checkout.c:1042
msgid "paths cannot be used with switching branches"
msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden"
-#: builtin/checkout.c:1009 builtin/checkout.c:1013
+#: builtin/checkout.c:1045 builtin/checkout.c:1049
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden"
-#: builtin/checkout.c:1017 builtin/checkout.c:1020 builtin/checkout.c:1025
-#: builtin/checkout.c:1028
+#: builtin/checkout.c:1053 builtin/checkout.c:1056 builtin/checkout.c:1061
+#: builtin/checkout.c:1064
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' kann nicht mit '%s' verwendet werden"
-#: builtin/checkout.c:1033
+#: builtin/checkout.c:1069
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln"
-#: builtin/checkout.c:1055 builtin/checkout.c:1057 builtin/clone.c:89
+#: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88
#: builtin/remote.c:169 builtin/remote.c:171
msgid "branch"
msgstr "Branch"
-#: builtin/checkout.c:1056
+#: builtin/checkout.c:1092
msgid "create and checkout a new branch"
msgstr "erzeugt und checkt einen neuen Branch aus"
-#: builtin/checkout.c:1058
+#: builtin/checkout.c:1094
msgid "create/reset and checkout a branch"
msgstr "erzeugt/setzt um und checkt einen Branch aus"
-#: builtin/checkout.c:1059
+#: builtin/checkout.c:1095
msgid "create reflog for new branch"
msgstr "erzeugt das Reflog für den neuen Branch"
-#: builtin/checkout.c:1060
+#: builtin/checkout.c:1096
msgid "detach the HEAD at named commit"
msgstr "setzt HEAD zu benanntem Commit"
-#: builtin/checkout.c:1061
+#: builtin/checkout.c:1097
msgid "set upstream info for new branch"
msgstr "setzt Informationen zum Upstream-Branch für den neuen Branch"
-#: builtin/checkout.c:1063
+#: builtin/checkout.c:1099
msgid "new branch"
msgstr "neuer Branch"
-#: builtin/checkout.c:1063
+#: builtin/checkout.c:1099
msgid "new unparented branch"
msgstr "neuer Branch ohne Eltern-Commit"
-#: builtin/checkout.c:1064
+#: builtin/checkout.c:1100
msgid "checkout our version for unmerged files"
msgstr "checkt unsere Variante für nicht zusammengeführte Dateien aus"
-#: builtin/checkout.c:1066
+#: builtin/checkout.c:1102
msgid "checkout their version for unmerged files"
msgstr "checkt ihre Variante für nicht zusammengeführte Dateien aus"
-#: builtin/checkout.c:1068
+#: builtin/checkout.c:1104
msgid "force checkout (throw away local modifications)"
msgstr "erzwingt Auschecken (verwirft lokale Änderungen)"
-#: builtin/checkout.c:1069
+#: builtin/checkout.c:1105
msgid "perform a 3-way merge with the new branch"
msgstr "führt einen 3-Wege-Merge mit dem neuen Branch aus"
-#: builtin/checkout.c:1070 builtin/merge.c:232
+#: builtin/checkout.c:1106 builtin/merge.c:232
msgid "update ignored files (default)"
msgstr "aktualisiert ignorierte Dateien (Standard)"
-#: builtin/checkout.c:1071 builtin/log.c:1208 parse-options.h:249
+#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:251
msgid "style"
msgstr "Stil"
-#: builtin/checkout.c:1072
+#: builtin/checkout.c:1108
msgid "conflict style (merge or diff3)"
msgstr "Konfliktstil (merge oder diff3)"
-#: builtin/checkout.c:1075
+#: builtin/checkout.c:1111
msgid "do not limit pathspecs to sparse entries only"
msgstr "Pfadspezifikationen ignorieren Einstellungen zum partiellen Auschecken"
-#: builtin/checkout.c:1077
+#: builtin/checkout.c:1113
msgid "second guess 'git checkout no-such-branch'"
msgstr "second guess 'git checkout no-such-branch'"
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1136
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "Die Optionen -b, -B und --orphan schließen sich gegenseitig aus."
-#: builtin/checkout.c:1118
+#: builtin/checkout.c:1153
msgid "--track needs a branch name"
msgstr "Bei der Option --track muss ein Branchname angegeben werden."
-#: builtin/checkout.c:1125
+#: builtin/checkout.c:1160
msgid "Missing branch name; try -b"
msgstr "Vermisse Branchnamen; versuchen Sie -b"
-#: builtin/checkout.c:1160
+#: builtin/checkout.c:1197
msgid "invalid path specification"
msgstr "ungültige Pfadspezifikation"
-#: builtin/checkout.c:1167
+#: builtin/checkout.c:1204
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -3483,12 +3663,12 @@ msgstr ""
"Haben Sie beabsichtigt '%s' auszuchecken, welcher nicht als Commit aufgelöst "
"werden kann?"
-#: builtin/checkout.c:1172
+#: builtin/checkout.c:1209
#, 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:1176
+#: builtin/checkout.c:1213
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -3496,38 +3676,38 @@ msgstr ""
"git checkout: --ours/--theirs, --force und --merge sind inkompatibel wenn\n"
"Sie aus der Staging-Area auschecken."
-#: builtin/clean.c:25
+#: builtin/clean.c:26
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <Muster>] [-x | -X] [--] <Pfade>..."
-#: builtin/clean.c:29
+#: builtin/clean.c:30
#, c-format
msgid "Removing %s\n"
msgstr "Lösche %s\n"
-#: builtin/clean.c:30
+#: builtin/clean.c:31
#, c-format
msgid "Would remove %s\n"
msgstr "Würde %s löschen\n"
-#: builtin/clean.c:31
+#: builtin/clean.c:32
#, c-format
msgid "Skipping repository %s\n"
msgstr "Überspringe Repository %s\n"
-#: builtin/clean.c:32
+#: builtin/clean.c:33
#, c-format
msgid "Would skip repository %s\n"
msgstr "Würde Repository %s überspringen\n"
-#: builtin/clean.c:33
+#: builtin/clean.c:34
#, c-format
msgid "failed to remove %s"
msgstr "Fehler beim Löschen von %s"
-#: builtin/clean.c:293
+#: builtin/clean.c:294
msgid ""
"Prompt help:\n"
"1 - select a numbered item\n"
@@ -3539,7 +3719,7 @@ msgstr ""
"foo - Element anhand eines eindeutigen Prefix auswählen\n"
" - (leer) nichts auswählen"
-#: builtin/clean.c:297
+#: builtin/clean.c:298
msgid ""
"Prompt help:\n"
"1 - select a single item\n"
@@ -3559,35 +3739,35 @@ msgstr ""
"* - alle Elemente auswählen\n"
" - (leer) Auswahl beenden"
-#: builtin/clean.c:515
+#: builtin/clean.c:516
#, c-format
msgid "Huh (%s)?"
msgstr "Wie bitte (%s)?"
-#: builtin/clean.c:658
+#: builtin/clean.c:659
#, c-format
msgid "Input ignore patterns>> "
msgstr "Ignorier-Muster eingeben>> "
-#: builtin/clean.c:695
+#: builtin/clean.c:696
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "WARNUNG: Kann keine Einträge finden die Muster entsprechen: %s"
-#: builtin/clean.c:716
+#: builtin/clean.c:717
msgid "Select items to delete"
msgstr "Wählen Sie Einträge zum Löschen"
-#: builtin/clean.c:756
+#: builtin/clean.c:757
#, c-format
msgid "remove %s? "
msgstr "'%s' löschen? "
-#: builtin/clean.c:781
+#: builtin/clean.c:782
msgid "Bye."
msgstr "Tschüss."
-#: builtin/clean.c:789
+#: builtin/clean.c:790
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -3605,21 +3785,21 @@ msgstr ""
"help - diese Meldung anzeigen\n"
"? - Hilfe zur Auswahl mittels Eingabe anzeigen"
-#: builtin/clean.c:816
+#: builtin/clean.c:817
msgid "*** Commands ***"
msgstr "*** Kommandos ***"
-#: builtin/clean.c:817
+#: builtin/clean.c:818
msgid "What now"
msgstr "Was nun"
-#: builtin/clean.c:825
+#: builtin/clean.c:826
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Würde das folgende Element entfernen:"
msgstr[1] "Würde die folgenden Elemente entfernen:"
-#: builtin/clean.c:842
+#: builtin/clean.c:843
msgid "No more files to clean, exiting."
msgstr "Keine Dateien mehr zum Löschen, beende."
@@ -3639,8 +3819,8 @@ msgstr "interaktives Clean"
msgid "remove whole directories"
msgstr "löscht ganze Verzeichnisse"
-#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:716
-#: builtin/ls-files.c:493 builtin/name-rev.c:315 builtin/show-ref.c:186
+#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718
+#: builtin/ls-files.c:483 builtin/name-rev.c:315 builtin/show-ref.c:185
msgid "pattern"
msgstr "Muster"
@@ -3680,8 +3860,8 @@ msgstr ""
msgid "git clone [options] [--] <repo> [<dir>]"
msgstr "git clone [Optionen] [--] <Repository> [<Verzeichnis>]"
-#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:229
-#: builtin/push.c:462
+#: builtin/clone.c:64 builtin/fetch.c:96 builtin/merge.c:229
+#: builtin/push.c:474
msgid "force progress reporting"
msgstr "erzwingt Fortschrittsanzeige"
@@ -3693,123 +3873,123 @@ msgstr "kein Auschecken"
msgid "create a bare repository"
msgstr "erstellt ein Bare-Repository"
-#: builtin/clone.c:72
+#: builtin/clone.c:71
msgid "create a mirror repository (implies bare)"
msgstr "erstellt ein Spiegelarchiv (impliziert --bare)"
-#: builtin/clone.c:74
+#: builtin/clone.c:73
msgid "to clone from a local repository"
msgstr "um von einem lokalen Repository zu klonen"
-#: builtin/clone.c:76
+#: builtin/clone.c:75
msgid "don't use local hardlinks, always copy"
msgstr "verwendet lokal keine harten Verweise, immer Kopien"
-#: builtin/clone.c:78
+#: builtin/clone.c:77
msgid "setup as shared repository"
msgstr "Einrichtung als verteiltes Repository"
-#: builtin/clone.c:80 builtin/clone.c:82
+#: builtin/clone.c:79 builtin/clone.c:81
msgid "initialize submodules in the clone"
msgstr "initialisiert Submodule im Klon"
-#: builtin/clone.c:83 builtin/init-db.c:485
+#: builtin/clone.c:82 builtin/init-db.c:485
msgid "template-directory"
msgstr "Vorlagenverzeichnis"
-#: builtin/clone.c:84 builtin/init-db.c:486
+#: builtin/clone.c:83 builtin/init-db.c:486
msgid "directory from which templates will be used"
msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden"
-#: builtin/clone.c:86
+#: builtin/clone.c:85
msgid "reference repository"
msgstr "referenziert Repository"
-#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr "Name"
-#: builtin/clone.c:88
+#: builtin/clone.c:87
msgid "use <name> instead of 'origin' to track upstream"
msgstr "verwendet <Name> statt 'origin' für Upstream-Repository"
-#: builtin/clone.c:90
+#: builtin/clone.c:89
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "checkt <Branch> aus, anstatt HEAD des Remote-Repositories"
-#: builtin/clone.c:92
+#: builtin/clone.c:91
msgid "path to git-upload-pack on the remote"
msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite"
-#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:661
+#: builtin/clone.c:92 builtin/fetch.c:97 builtin/grep.c:663
msgid "depth"
msgstr "Tiefe"
-#: builtin/clone.c:94
+#: builtin/clone.c:93
msgid "create a shallow clone of that depth"
msgstr "erstellt einen flachen Klon mit dieser Tiefe"
-#: builtin/clone.c:96
+#: builtin/clone.c:95
msgid "clone only one branch, HEAD or --branch"
msgstr "klont nur einen Branch, HEAD oder --branch"
-#: builtin/clone.c:97 builtin/init-db.c:494
+#: builtin/clone.c:96 builtin/init-db.c:494
msgid "gitdir"
msgstr ".git-Verzeichnis"
-#: builtin/clone.c:98 builtin/init-db.c:495
+#: builtin/clone.c:97 builtin/init-db.c:495
msgid "separate git dir from working tree"
msgstr "separiert Git-Verzeichnis vom Arbeitsverzeichnis"
-#: builtin/clone.c:99
+#: builtin/clone.c:98
msgid "key=value"
msgstr "Schlüssel=Wert"
-#: builtin/clone.c:100
+#: builtin/clone.c:99
msgid "set config inside the new repository"
msgstr "setzt Konfiguration innerhalb des neuen Repositories"
-#: builtin/clone.c:253
+#: builtin/clone.c:252
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "Referenziertes Repository '%s' ist kein lokales Repository."
-#: builtin/clone.c:316
+#: builtin/clone.c:315
#, c-format
msgid "failed to create directory '%s'"
msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
-#: builtin/clone.c:318 builtin/diff.c:77
+#: builtin/clone.c:317 builtin/diff.c:77
#, c-format
msgid "failed to stat '%s'"
msgstr "Konnte '%s' nicht lesen"
-#: builtin/clone.c:320
+#: builtin/clone.c:319
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existiert und ist kein Verzeichnis"
-#: builtin/clone.c:334
+#: builtin/clone.c:333
#, c-format
msgid "failed to stat %s\n"
msgstr "Konnte %s nicht lesen\n"
-#: builtin/clone.c:356
+#: builtin/clone.c:355
#, c-format
msgid "failed to create link '%s'"
msgstr "Konnte Verweis '%s' nicht erstellen"
-#: builtin/clone.c:360
+#: builtin/clone.c:359
#, c-format
msgid "failed to copy file to '%s'"
msgstr "Konnte Datei nicht nach '%s' kopieren"
-#: builtin/clone.c:383
+#: builtin/clone.c:382 builtin/clone.c:559
#, c-format
msgid "done.\n"
msgstr "Fertig.\n"
-#: builtin/clone.c:396
+#: builtin/clone.c:395
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -3819,108 +3999,103 @@ msgstr ""
"Sie können mit 'git status' prüfen, was ausgecheckt worden ist\n"
"und das Auschecken mit 'git checkout -f HEAD' erneut versuchen.\n"
-#: builtin/clone.c:475
+#: builtin/clone.c:474
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Konnte zu klonenden Remote-Branch %s nicht finden."
-#: builtin/clone.c:555
+#: builtin/clone.c:554
#, c-format
msgid "Checking connectivity... "
msgstr "Prüfe Konnektivität... "
-#: builtin/clone.c:558
+#: builtin/clone.c:557
msgid "remote did not send all necessary objects"
msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet."
-#: builtin/clone.c:560
-#, c-format
-msgid "done\n"
-msgstr "Fertig\n"
-
-#: builtin/clone.c:621
+#: builtin/clone.c:620
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:652
+#: builtin/clone.c:651
msgid "unable to checkout working tree"
msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden"
-#: builtin/clone.c:760
+#: builtin/clone.c:759
msgid "Too many arguments."
msgstr "Zu viele Argumente."
-#: builtin/clone.c:764
+#: builtin/clone.c:763
msgid "You must specify a repository to clone."
msgstr "Sie müssen ein Repository zum Klonen angeben."
-#: builtin/clone.c:775
+#: builtin/clone.c:774
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "Die Optionen --bare und --origin %s sind inkompatibel."
-#: builtin/clone.c:778
+#: builtin/clone.c:777
msgid "--bare and --separate-git-dir are incompatible."
msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel."
-#: builtin/clone.c:791
+#: builtin/clone.c:790
#, c-format
msgid "repository '%s' does not exist"
msgstr "Repository '%s' existiert nicht."
-#: builtin/clone.c:796
+#: builtin/clone.c:795
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:798
+#: builtin/clone.c:797
msgid "--local is ignored"
msgstr "--local wird ignoriert"
-#: builtin/clone.c:808
+#: builtin/clone.c:807
#, 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:818
+#: builtin/clone.c:817
#, c-format
msgid "working tree '%s' already exists."
msgstr "Arbeitsverzeichnis '%s' existiert bereits."
-#: builtin/clone.c:831 builtin/clone.c:843
+#: builtin/clone.c:830 builtin/clone.c:842
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen."
-#: builtin/clone.c:834
+#: builtin/clone.c:833
#, c-format
msgid "could not create work tree dir '%s'."
msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen."
-#: builtin/clone.c:853
+#: builtin/clone.c:852
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klone in Bare-Repository '%s'...\n"
-#: builtin/clone.c:855
+#: builtin/clone.c:854
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klone nach '%s'...\n"
-#: builtin/clone.c:890
+#: builtin/clone.c:888
#, c-format
msgid "Don't know how to clone %s"
msgstr "Weiß nicht wie %s zu klonen ist."
-#: builtin/clone.c:942
+#: builtin/clone.c:939 builtin/clone.c:947
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden"
-#: builtin/clone.c:949
+#: builtin/clone.c:950
msgid "You appear to have cloned an empty repository."
msgstr "Sie scheinen ein leeres Repository geklont zu haben."
@@ -3956,15 +4131,15 @@ msgstr "Abstand zwischen Spalten"
msgid "--command must be the first argument"
msgstr "Die Option --command muss an erster Stelle stehen."
-#: builtin/commit.c:35
+#: builtin/commit.c:36
msgid "git commit [options] [--] <pathspec>..."
msgstr "git commit [Optionen] [--] <Pfadspezifikation>..."
-#: builtin/commit.c:40
+#: builtin/commit.c:41
msgid "git status [options] [--] <pathspec>..."
msgstr "git status [Optionen] [--] <Pfadspezifikation>..."
-#: builtin/commit.c:45
+#: builtin/commit.c:46
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -3990,7 +4165,7 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: builtin/commit.c:57
+#: builtin/commit.c:58
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -4000,7 +4175,7 @@ msgstr ""
"machen. Sie können Ihr Kommando mit --allow-empty wiederholen, oder diesen\n"
"Commit mit \"git reset HEAD^\" vollständig entfernen.\n"
-#: builtin/commit.c:62
+#: builtin/commit.c:63
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -4015,11 +4190,11 @@ msgstr ""
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:69
+#: builtin/commit.c:70
msgid "Otherwise, please use 'git reset'\n"
msgstr "Andernfalls benutzen Sie bitte 'git reset'\n"
-#: builtin/commit.c:72
+#: builtin/commit.c:73
msgid ""
"If you wish to skip this commit, use:\n"
"\n"
@@ -4035,94 +4210,94 @@ msgstr ""
"Benutzen Sie anschließend \"git cherry-pick --continue\", um die\n"
"Cherry-Pick-Operation mit den verbleibenden Commits fortzusetzen.\n"
-#: builtin/commit.c:279
+#: builtin/commit.c:287
msgid "failed to unpack HEAD tree object"
msgstr "Fehler beim Entpacken des \"Tree\"-Objektes von HEAD."
-#: builtin/commit.c:321
+#: builtin/commit.c:329
msgid "unable to create temporary index"
msgstr "Konnte temporäre Staging-Area nicht erstellen."
-#: builtin/commit.c:327
+#: builtin/commit.c:335
msgid "interactive add failed"
msgstr "interaktives Hinzufügen fehlgeschlagen"
-#: builtin/commit.c:360 builtin/commit.c:381 builtin/commit.c:431
+#: builtin/commit.c:368 builtin/commit.c:389 builtin/commit.c:439
msgid "unable to write new_index file"
msgstr "Konnte new_index Datei nicht schreiben"
-#: builtin/commit.c:412
+#: builtin/commit.c:420
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:414
+#: builtin/commit.c:422
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:424
+#: builtin/commit.c:432
msgid "cannot read the index"
msgstr "Kann Staging-Area nicht lesen"
-#: builtin/commit.c:444
+#: builtin/commit.c:452
msgid "unable to write temporary index file"
msgstr "Konnte temporäre Staging-Area-Datei nicht schreiben."
-#: builtin/commit.c:535 builtin/commit.c:541
+#: builtin/commit.c:543 builtin/commit.c:549
#, c-format
msgid "invalid commit: %s"
msgstr "Ungültiger Commit: %s"
-#: builtin/commit.c:563
+#: builtin/commit.c:571
msgid "malformed --author parameter"
msgstr "Fehlerhafter --author Parameter"
-#: builtin/commit.c:583
+#: builtin/commit.c:591
#, c-format
msgid "Malformed ident string: '%s'"
msgstr "Fehlerhafter Ident-String: '%s'"
-#: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:982
+#: builtin/commit.c:630 builtin/commit.c:663 builtin/commit.c:1007
#, c-format
msgid "could not lookup commit %s"
msgstr "Konnte Commit %s nicht nachschlagen"
-#: builtin/commit.c:633 builtin/shortlog.c:271
+#: builtin/commit.c:642 builtin/shortlog.c:273
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(lese Log-Nachricht von Standard-Eingabe)\n"
-#: builtin/commit.c:635
+#: builtin/commit.c:644
msgid "could not read log from standard input"
msgstr "Konnte Log nicht von Standard-Eingabe lesen."
-#: builtin/commit.c:639
+#: builtin/commit.c:648
#, c-format
msgid "could not read log file '%s'"
msgstr "Konnte Log-Datei '%s' nicht lesen"
-#: builtin/commit.c:645
+#: builtin/commit.c:654
msgid "commit has empty message"
msgstr "Commit hat eine leere Beschreibung"
-#: builtin/commit.c:661
+#: builtin/commit.c:670
msgid "could not read MERGE_MSG"
msgstr "Konnte MERGE_MSG nicht lesen"
-#: builtin/commit.c:665
+#: builtin/commit.c:674
msgid "could not read SQUASH_MSG"
msgstr "Konnte SQUASH_MSG nicht lesen"
-#: builtin/commit.c:669
+#: builtin/commit.c:678
#, c-format
msgid "could not read '%s'"
msgstr "Konnte '%s' nicht lesen"
-#: builtin/commit.c:730
+#: builtin/commit.c:749
msgid "could not write commit template"
msgstr "Konnte Commit-Vorlage nicht schreiben"
-#: builtin/commit.c:741
+#: builtin/commit.c:760
#, c-format
msgid ""
"\n"
@@ -4137,7 +4312,7 @@ msgstr ""
"\t%s\n"
"und versuchen Sie es erneut.\n"
-#: builtin/commit.c:746
+#: builtin/commit.c:765
#, c-format
msgid ""
"\n"
@@ -4152,7 +4327,7 @@ msgstr ""
"\t%s\n"
"und versuchen Sie es erneut.\n"
-#: builtin/commit.c:758
+#: builtin/commit.c:777
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -4162,7 +4337,7 @@ msgstr ""
"die mit '%c' beginnen, werden ignoriert, und eine leere Beschreibung\n"
"bricht den Commit ab.\n"
-#: builtin/commit.c:763
+#: builtin/commit.c:782
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -4175,152 +4350,152 @@ msgstr ""
"entfernen.\n"
"Eine leere Beschreibung bricht den Commit ab.\n"
-#: builtin/commit.c:776
+#: builtin/commit.c:795
#, c-format
msgid "%sAuthor: %s"
msgstr "%sAutor: %s"
-#: builtin/commit.c:783
+#: builtin/commit.c:802
#, c-format
msgid "%sCommitter: %s"
msgstr "%sCommit-Ersteller: %s"
-#: builtin/commit.c:803
+#: builtin/commit.c:822
msgid "Cannot read index"
msgstr "Kann Staging-Area nicht lesen"
-#: builtin/commit.c:845
+#: builtin/commit.c:865
msgid "Error building trees"
msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte"
-#: builtin/commit.c:860 builtin/tag.c:359
+#: builtin/commit.c:880 builtin/tag.c:359
#, 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:957
+#: builtin/commit.c:982
#, c-format
msgid "No existing author found with '%s'"
msgstr "Kein existierender Autor mit '%s' gefunden."
-#: builtin/commit.c:972 builtin/commit.c:1208
+#: builtin/commit.c:997 builtin/commit.c:1237
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ungültiger Modus '%s' für unbeobachtete Dateien"
-#: builtin/commit.c:1009
+#: builtin/commit.c:1034
msgid "--long and -z are incompatible"
msgstr "Die Optionen --long und -z sind inkompatibel."
-#: builtin/commit.c:1039
+#: builtin/commit.c:1064
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:1050
+#: builtin/commit.c:1075
msgid "You have nothing to amend."
msgstr "Sie haben nichts für \"--amend\"."
-#: builtin/commit.c:1053
+#: builtin/commit.c:1078
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:1055
+#: builtin/commit.c:1080
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:1058
+#: builtin/commit.c:1083
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
"Die Optionen --squash und --fixup können nicht gemeinsam verwendet werden."
-#: builtin/commit.c:1068
+#: builtin/commit.c:1093
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:1070
+#: builtin/commit.c:1095
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:1078
+#: builtin/commit.c:1103
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:1095
+#: builtin/commit.c:1120
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:1097
+#: builtin/commit.c:1122
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:1099
+#: builtin/commit.c:1124
msgid "Clever... amending the last one with dirty index."
msgstr ""
"Klug... den letzten Commit mit einer geänderten Staging-Area nachbessern."
-#: builtin/commit.c:1101
+#: builtin/commit.c:1126
msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
msgstr ""
"Explizite Pfade ohne -i oder -o angegeben; unter der Annahme von --only "
"Pfaden..."
-#: builtin/commit.c:1111 builtin/tag.c:575
+#: builtin/commit.c:1136 builtin/tag.c:572
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Ungültiger \"cleanup\" Modus %s"
-#: builtin/commit.c:1116
+#: builtin/commit.c:1141
msgid "Paths with -a does not make sense."
msgstr "Die Option -a kann nur mit der Angabe von Pfaden verwendet werden."
-#: builtin/commit.c:1222 builtin/commit.c:1455
+#: builtin/commit.c:1251 builtin/commit.c:1482
msgid "show status concisely"
msgstr "zeigt Status im Kurzformat"
-#: builtin/commit.c:1224 builtin/commit.c:1457
+#: builtin/commit.c:1253 builtin/commit.c:1484
msgid "show branch information"
msgstr "zeigt Branchinformationen"
-#: builtin/commit.c:1226 builtin/commit.c:1459 builtin/push.c:452
+#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:460
msgid "machine-readable output"
msgstr "maschinenlesbare Ausgabe"
-#: builtin/commit.c:1229 builtin/commit.c:1461
+#: builtin/commit.c:1258 builtin/commit.c:1488
msgid "show status in long format (default)"
msgstr "zeigt Status im Langformat (Standard)"
-#: builtin/commit.c:1232 builtin/commit.c:1464
+#: builtin/commit.c:1261 builtin/commit.c:1491
msgid "terminate entries with NUL"
msgstr "schließt Einträge mit NUL-Zeichen ab"
-#: builtin/commit.c:1234 builtin/commit.c:1467 builtin/fast-export.c:667
-#: builtin/fast-export.c:670 builtin/tag.c:459
+#: builtin/commit.c:1263 builtin/commit.c:1494 builtin/fast-export.c:674
+#: builtin/fast-export.c:677 builtin/tag.c:459
msgid "mode"
msgstr "Modus"
-#: builtin/commit.c:1235 builtin/commit.c:1467
+#: builtin/commit.c:1264 builtin/commit.c:1494
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"zeigt nicht beobachtete Dateien, optionale Modi: all, normal, no. (Standard: "
"all)"
-#: builtin/commit.c:1238
+#: builtin/commit.c:1267
msgid "show ignored files"
msgstr "zeigt ignorierte Dateien"
-#: builtin/commit.c:1239 parse-options.h:154
+#: builtin/commit.c:1268 parse-options.h:156
msgid "when"
msgstr "wann"
-#: builtin/commit.c:1240
+#: builtin/commit.c:1269
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -4328,219 +4503,219 @@ msgstr ""
"ignoriert Änderungen in Submodulen, optional wenn: all, dirty, untracked. "
"(Standard: all)"
-#: builtin/commit.c:1242
+#: builtin/commit.c:1271
msgid "list untracked files in columns"
msgstr "listet unbeobachtete Dateien in Spalten auf"
-#: builtin/commit.c:1313
+#: builtin/commit.c:1340
msgid "couldn't look up newly created commit"
msgstr "Konnte neu erstellten Commit nicht nachschlagen."
-#: builtin/commit.c:1315
+#: builtin/commit.c:1342
msgid "could not parse newly created commit"
msgstr "Konnte neulich erstellten Commit nicht analysieren."
-#: builtin/commit.c:1356
+#: builtin/commit.c:1383
msgid "detached HEAD"
msgstr "losgelöster HEAD"
-#: builtin/commit.c:1358
+#: builtin/commit.c:1385
msgid " (root-commit)"
msgstr " (Basis-Commit)"
-#: builtin/commit.c:1425
+#: builtin/commit.c:1452
msgid "suppress summary after successful commit"
msgstr "unterdrückt Zusammenfassung nach erfolgreichem Commit"
-#: builtin/commit.c:1426
+#: builtin/commit.c:1453
msgid "show diff in commit message template"
msgstr "zeigt Unterschiede in Commit-Beschreibungsvorlage an"
-#: builtin/commit.c:1428
+#: builtin/commit.c:1455
msgid "Commit message options"
msgstr "Optionen für Commit-Beschreibung"
-#: builtin/commit.c:1429 builtin/tag.c:457
+#: builtin/commit.c:1456 builtin/tag.c:457
msgid "read message from file"
msgstr "liest Beschreibung von Datei"
-#: builtin/commit.c:1430
+#: builtin/commit.c:1457
msgid "author"
msgstr "Autor"
-#: builtin/commit.c:1430
+#: builtin/commit.c:1457
msgid "override author for commit"
msgstr "überschreibt Autor eines Commits"
-#: builtin/commit.c:1431 builtin/gc.c:178
+#: builtin/commit.c:1458 builtin/gc.c:260
msgid "date"
msgstr "Datum"
-#: builtin/commit.c:1431
+#: builtin/commit.c:1458
msgid "override date for commit"
msgstr "überschreibt Datum eines Commits"
-#: builtin/commit.c:1432 builtin/merge.c:223 builtin/notes.c:405
+#: builtin/commit.c:1459 builtin/merge.c:223 builtin/notes.c:405
#: builtin/notes.c:562 builtin/tag.c:455
msgid "message"
msgstr "Beschreibung"
-#: builtin/commit.c:1432
+#: builtin/commit.c:1459
msgid "commit message"
msgstr "Commit-Beschreibung"
-#: builtin/commit.c:1433
+#: builtin/commit.c:1460
msgid "reuse and edit message from specified commit"
msgstr "verwendet wieder und editiert Beschreibung des angegebenen Commits"
-#: builtin/commit.c:1434
+#: builtin/commit.c:1461
msgid "reuse message from specified commit"
msgstr "verwendet Beschreibung des angegebenen Commits wieder"
-#: builtin/commit.c:1435
+#: builtin/commit.c:1462
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"verwendet eine automatisch zusammengesetzte Beschreibung zum Nachbessern des "
"angegebenen Commits"
-#: builtin/commit.c:1436
+#: builtin/commit.c:1463
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"verwendet eine automatisch zusammengesetzte Beschreibung beim \"squash\" des "
"angegebenen Commits"
-#: builtin/commit.c:1437
+#: builtin/commit.c:1464
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "Setzt Sie als Autor des Commits (verwendet mit -C/-c/--amend)"
-#: builtin/commit.c:1438 builtin/log.c:1160 builtin/revert.c:111
+#: builtin/commit.c:1465 builtin/log.c:1180 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "fügt 'Signed-off-by:'-Zeile hinzu"
-#: builtin/commit.c:1439
+#: builtin/commit.c:1466
msgid "use specified template file"
msgstr "verwendet angegebene Vorlagendatei"
-#: builtin/commit.c:1440
+#: builtin/commit.c:1467
msgid "force edit of commit"
msgstr "erzwingt Bearbeitung des Commits"
-#: builtin/commit.c:1441
+#: builtin/commit.c:1468
msgid "default"
msgstr "Standard"
-#: builtin/commit.c:1441 builtin/tag.c:460
+#: builtin/commit.c:1468 builtin/tag.c:460
msgid "how to strip spaces and #comments from message"
msgstr ""
"wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen"
-#: builtin/commit.c:1442
+#: builtin/commit.c:1469
msgid "include status in commit message template"
msgstr "fügt Status in die Commit-Beschreibungsvorlage ein"
-#: builtin/commit.c:1443 builtin/merge.c:230 builtin/tag.c:461
+#: builtin/commit.c:1470 builtin/merge.c:230 builtin/tag.c:461
msgid "key id"
msgstr "Schlüssel-ID"
-#: builtin/commit.c:1444 builtin/merge.c:231
+#: builtin/commit.c:1471 builtin/merge.c:231
msgid "GPG sign commit"
msgstr "signiert Commit mit GPG"
#. end commit message options
-#: builtin/commit.c:1447
+#: builtin/commit.c:1474
msgid "Commit contents options"
msgstr "Optionen für Commit-Inhalt"
-#: builtin/commit.c:1448
+#: builtin/commit.c:1475
msgid "commit all changed files"
msgstr "committet alle geänderten Dateien"
-#: builtin/commit.c:1449
+#: builtin/commit.c:1476
msgid "add specified files to index for commit"
msgstr "merkt die angegebenen Dateien zusätzlich zum Commit vor"
-#: builtin/commit.c:1450
+#: builtin/commit.c:1477
msgid "interactively add files"
msgstr "interaktives Hinzufügen von Dateien"
-#: builtin/commit.c:1451
+#: builtin/commit.c:1478
msgid "interactively add changes"
msgstr "interaktives Hinzufügen von Änderungen"
-#: builtin/commit.c:1452
+#: builtin/commit.c:1479
msgid "commit only specified files"
msgstr "committet nur die angegebenen Dateien"
-#: builtin/commit.c:1453
+#: builtin/commit.c:1480
msgid "bypass pre-commit hook"
msgstr "umgeht \"pre-commit hook\""
-#: builtin/commit.c:1454
+#: builtin/commit.c:1481
msgid "show what would be committed"
msgstr "zeigt an, was committet werden würde"
-#: builtin/commit.c:1465
+#: builtin/commit.c:1492
msgid "amend previous commit"
msgstr "ändert vorherigen Commit"
-#: builtin/commit.c:1466
+#: builtin/commit.c:1493
msgid "bypass post-rewrite hook"
msgstr "umgeht \"post-rewrite hook\""
-#: builtin/commit.c:1471
+#: builtin/commit.c:1498
msgid "ok to record an empty change"
msgstr "erlaubt Aufzeichnung einer leeren Änderung"
-#: builtin/commit.c:1474
+#: builtin/commit.c:1500
msgid "ok to record a change with an empty message"
msgstr "erlaubt Aufzeichnung einer Änderung mit einer leeren Beschreibung"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1529
msgid "could not parse HEAD commit"
msgstr "Konnte Commit von HEAD nicht analysieren."
-#: builtin/commit.c:1545 builtin/merge.c:525
+#: builtin/commit.c:1567 builtin/merge.c:525
#, c-format
msgid "could not open '%s' for reading"
msgstr "Konnte '%s' nicht zum Lesen öffnen."
-#: builtin/commit.c:1552
+#: builtin/commit.c:1574
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Beschädigte MERGE_HEAD-Datei (%s)"
-#: builtin/commit.c:1559
+#: builtin/commit.c:1581
msgid "could not read MERGE_MODE"
msgstr "Konnte MERGE_MODE nicht lesen"
-#: builtin/commit.c:1578
+#: builtin/commit.c:1600
#, c-format
msgid "could not read commit message: %s"
msgstr "Konnte Commit-Beschreibung nicht lesen: %s"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1614
#, 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:1597
+#: builtin/commit.c:1619
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Commit aufgrund leerer Beschreibung abgebrochen.\n"
-#: builtin/commit.c:1612 builtin/merge.c:861 builtin/merge.c:886
+#: builtin/commit.c:1634 builtin/merge.c:861 builtin/merge.c:886
msgid "failed to write commit object"
msgstr "Fehler beim Schreiben des Commit-Objektes."
-#: builtin/commit.c:1633
+#: builtin/commit.c:1655
msgid "cannot lock HEAD ref"
msgstr "Kann Referenz von HEAD nicht sperren."
-#: builtin/commit.c:1637
+#: builtin/commit.c:1659
msgid "cannot update HEAD ref"
msgstr "Kann Referenz von HEAD nicht aktualisieren."
-#: builtin/commit.c:1648
+#: builtin/commit.c:1670
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full or quota is\n"
@@ -4551,127 +4726,131 @@ msgstr ""
"voll und Ihr Kontingent nicht aufgebraucht ist und führen Sie\n"
"anschließend \"git reset HEAD\" zu Wiederherstellung aus."
-#: builtin/config.c:7
+#: builtin/config.c:8
msgid "git config [options]"
msgstr "git config [Optionen]"
-#: builtin/config.c:52
+#: builtin/config.c:54
msgid "Config file location"
msgstr "Ort der Konfigurationsdatei"
-#: builtin/config.c:53
+#: builtin/config.c:55
msgid "use global config file"
msgstr "verwendet globale Konfigurationsdatei"
-#: builtin/config.c:54
+#: builtin/config.c:56
msgid "use system config file"
msgstr "verwendet systemweite Konfigurationsdatei"
-#: builtin/config.c:55
+#: builtin/config.c:57
msgid "use repository config file"
msgstr "verwendet Konfigurationsdatei des Repositories"
-#: builtin/config.c:56
+#: builtin/config.c:58
msgid "use given config file"
msgstr "verwendet die angegebene Konfigurationsdatei"
-#: builtin/config.c:57
+#: builtin/config.c:59
msgid "blob-id"
msgstr "Blob-Id"
-#: builtin/config.c:57
+#: builtin/config.c:59
msgid "read config from given blob object"
msgstr "liest Konfiguration von angegebenem Blob-Objekt"
-#: builtin/config.c:58
+#: builtin/config.c:60
msgid "Action"
msgstr "Aktion"
-#: builtin/config.c:59
+#: builtin/config.c:61
msgid "get value: name [value-regex]"
msgstr "gibt Wert zurück: Name [Wert-regex]"
-#: builtin/config.c:60
+#: builtin/config.c:62
msgid "get all values: key [value-regex]"
msgstr "gibt alle Werte zurück: Schlüssel [Wert-regex]"
-#: builtin/config.c:61
+#: builtin/config.c:63
msgid "get values for regexp: name-regex [value-regex]"
msgstr "gibt Werte für den regulären Ausdruck zurück: Name-regex [Wert-regex]"
-#: builtin/config.c:62
+#: builtin/config.c:64
+msgid "get value specific for the URL: section[.var] URL"
+msgstr "gibt Wert spezifisch für eine URL zurück: section[.var] URL"
+
+#: builtin/config.c:65
msgid "replace all matching variables: name value [value_regex]"
msgstr "ersetzt alle passenden Variablen: Name Wert [Wert-regex] "
-#: builtin/config.c:63
+#: builtin/config.c:66
msgid "add a new variable: name value"
msgstr "fügt neue Variable hinzu: Name Wert"
-#: builtin/config.c:64
+#: builtin/config.c:67
msgid "remove a variable: name [value-regex]"
msgstr "entfernt eine Variable: Name [Wert-regex]"
-#: builtin/config.c:65
+#: builtin/config.c:68
msgid "remove all matches: name [value-regex]"
msgstr "entfernt alle Übereinstimmungen: Name [Wert-regex]"
-#: builtin/config.c:66
+#: builtin/config.c:69
msgid "rename section: old-name new-name"
msgstr "benennt eine Sektion um: alter-Name neuer-Name"
-#: builtin/config.c:67
+#: builtin/config.c:70
msgid "remove a section: name"
msgstr "entfernt eine Sektion: Name"
-#: builtin/config.c:68
+#: builtin/config.c:71
msgid "list all"
msgstr "listet alles auf"
-#: builtin/config.c:69
+#: builtin/config.c:72
msgid "open an editor"
msgstr "öffnet einen Editor"
-#: builtin/config.c:70 builtin/config.c:71
+#: builtin/config.c:73 builtin/config.c:74
msgid "slot"
msgstr "Slot"
-#: builtin/config.c:70
+#: builtin/config.c:73
msgid "find the color configured: [default]"
msgstr "findet die konfigurierte Farbe: [Standard]"
-#: builtin/config.c:71
+#: builtin/config.c:74
msgid "find the color setting: [stdout-is-tty]"
msgstr "findet die Farbeinstellung: [Standard-Ausgabe-ist-Terminal]"
-#: builtin/config.c:72
+#: builtin/config.c:75
msgid "Type"
msgstr "Typ"
-#: builtin/config.c:73
+#: builtin/config.c:76
msgid "value is \"true\" or \"false\""
msgstr "Wert ist \"true\" oder \"false\""
-#: builtin/config.c:74
+#: builtin/config.c:77
msgid "value is decimal number"
msgstr "Wert ist eine Dezimalzahl"
-#: builtin/config.c:75
+#: builtin/config.c:78
msgid "value is --bool or --int"
msgstr "Wert ist --bool oder --int"
-#: builtin/config.c:76
+#: builtin/config.c:79
msgid "value is a path (file or directory name)"
msgstr "Wert ist ein Pfad (Datei oder Verzeichnisname)"
-#: builtin/config.c:77
+#: builtin/config.c:80
msgid "Other"
msgstr "Sonstiges"
-#: builtin/config.c:78
+#: builtin/config.c:81
msgid "terminate values with NUL byte"
msgstr "schließt Werte mit NUL-Byte ab"
-#: builtin/config.c:79
+#: builtin/config.c:82
msgid "respect include directives on lookup"
msgstr "beachtet \"include\"-Direktiven beim Nachschlagen"
@@ -4858,39 +5037,39 @@ msgstr "unbehandeltes Objekt '%s' angegeben"
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:666
+#: builtin/fast-export.c:673
msgid "show progress after <n> objects"
msgstr "zeigt Fortschritt nach <n> Objekten an"
-#: builtin/fast-export.c:668
+#: builtin/fast-export.c:675
msgid "select handling of signed tags"
msgstr "wählt Behandlung von signierten Tags"
-#: builtin/fast-export.c:671
+#: builtin/fast-export.c:678
msgid "select handling of tags that tag filtered objects"
msgstr "wählt Behandlung von Tags, die gefilterte Objekte markieren"
-#: builtin/fast-export.c:674
+#: builtin/fast-export.c:681
msgid "Dump marks to this file"
msgstr "Schreibt Kennzeichen in diese Datei"
-#: builtin/fast-export.c:676
+#: builtin/fast-export.c:683
msgid "Import marks from this file"
msgstr "Importiert Kennzeichen von dieser Datei"
-#: builtin/fast-export.c:678
+#: builtin/fast-export.c:685
msgid "Fake a tagger when tags lack one"
msgstr "erzeugt künstlich einen Tag-Ersteller, wenn das Tag keinen hat"
-#: builtin/fast-export.c:680
+#: builtin/fast-export.c:687
msgid "Output full tree for each commit"
msgstr "gibt für jeden Commit das gesamte Verzeichnis aus"
-#: builtin/fast-export.c:682
+#: builtin/fast-export.c:689
msgid "Use the done feature to terminate the stream"
msgstr "Benutzt die \"done\"-Funktion um den Strom abzuschließen"
-#: builtin/fast-export.c:683
+#: builtin/fast-export.c:690
msgid "Skip output of blob data"
msgstr "Überspringt Ausgabe von Blob-Daten"
@@ -4910,147 +5089,147 @@ msgstr "git fetch --multiple [<Optionen>] [(<Repository> | <Gruppe>)...]"
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<Optionen>]"
-#: builtin/fetch.c:60
+#: builtin/fetch.c:74
msgid "fetch from all remotes"
msgstr "fordert von allen Remote-Repositories an"
-#: builtin/fetch.c:62
+#: builtin/fetch.c:76
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "hängt an .git/FETCH_HEAD an, anstatt zu überschreiben"
-#: builtin/fetch.c:64
+#: builtin/fetch.c:78
msgid "path to upload pack on remote end"
msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite"
-#: builtin/fetch.c:65
+#: builtin/fetch.c:79
msgid "force overwrite of local branch"
msgstr "erzwingt das Überschreiben von lokalen Branches"
-#: builtin/fetch.c:67
+#: builtin/fetch.c:81
msgid "fetch from multiple remotes"
msgstr "fordert von mehreren Remote-Repositories an"
-#: builtin/fetch.c:69
+#: builtin/fetch.c:83
msgid "fetch all tags and associated objects"
msgstr "fordert alle Tags und verbundene Objekte an"
-#: builtin/fetch.c:71
+#: builtin/fetch.c:85
msgid "do not fetch all tags (--no-tags)"
msgstr "fordert nicht alle Tags an (--no-tags)"
-#: builtin/fetch.c:73
+#: builtin/fetch.c:87
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
"entfernt Remote-Tracking-Branches, die sich nicht mehr im Remote-Repository "
"befinden"
-#: builtin/fetch.c:74
+#: builtin/fetch.c:88
msgid "on-demand"
msgstr "bei-Bedarf"
-#: builtin/fetch.c:75
+#: builtin/fetch.c:89
msgid "control recursive fetching of submodules"
msgstr "kontrolliert rekursive Anforderungen von Submodulen"
-#: builtin/fetch.c:79
+#: builtin/fetch.c:93
msgid "keep downloaded pack"
msgstr "behält heruntergeladenes Paket"
-#: builtin/fetch.c:81
+#: builtin/fetch.c:95
msgid "allow updating of HEAD ref"
msgstr "erlaubt Aktualisierung der \"HEAD\"-Referenz"
-#: builtin/fetch.c:84
+#: builtin/fetch.c:98
msgid "deepen history of shallow clone"
msgstr "vertieft die Historie eines flachen Klons"
-#: builtin/fetch.c:86
+#: builtin/fetch.c:100
msgid "convert to a complete repository"
msgstr "konvertiert zu einem vollständigen Repository"
-#: builtin/fetch.c:88 builtin/log.c:1177
+#: builtin/fetch.c:102 builtin/log.c:1197
msgid "dir"
msgstr "Verzeichnis"
-#: builtin/fetch.c:89
+#: builtin/fetch.c:103
msgid "prepend this to submodule path output"
msgstr "stellt dies an die Ausgabe der Submodul-Pfade voran"
-#: builtin/fetch.c:92
+#: builtin/fetch.c:106
msgid "default mode for recursion"
msgstr "Standard-Modus für Rekursion"
-#: builtin/fetch.c:220
+#: builtin/fetch.c:236
msgid "Couldn't find remote ref HEAD"
msgstr "Konnte Remote-Referenz von HEAD nicht finden."
-#: builtin/fetch.c:273
+#: builtin/fetch.c:290
#, c-format
msgid "object %s not found"
msgstr "Objekt %s nicht gefunden"
-#: builtin/fetch.c:278
+#: builtin/fetch.c:295
msgid "[up to date]"
msgstr "[aktuell]"
-#: builtin/fetch.c:292
+#: builtin/fetch.c:309
#, c-format
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr ""
"! %-*s %-*s -> %s (kann \"fetch\" im aktuellen Branch nicht ausführen)"
-#: builtin/fetch.c:293 builtin/fetch.c:379
+#: builtin/fetch.c:310 builtin/fetch.c:396
msgid "[rejected]"
msgstr "[zurückgewiesen]"
-#: builtin/fetch.c:304
+#: builtin/fetch.c:321
msgid "[tag update]"
msgstr "[Tag Aktualisierung]"
-#: builtin/fetch.c:306 builtin/fetch.c:341 builtin/fetch.c:359
+#: builtin/fetch.c:323 builtin/fetch.c:358 builtin/fetch.c:376
msgid " (unable to update local ref)"
msgstr " (kann lokale Referenz nicht aktualisieren)"
-#: builtin/fetch.c:324
+#: builtin/fetch.c:341
msgid "[new tag]"
msgstr "[neues Tag]"
-#: builtin/fetch.c:327
+#: builtin/fetch.c:344
msgid "[new branch]"
msgstr "[neuer Branch]"
-#: builtin/fetch.c:330
+#: builtin/fetch.c:347
msgid "[new ref]"
msgstr "[neue Referenz]"
-#: builtin/fetch.c:375
+#: builtin/fetch.c:392
msgid "unable to update local ref"
msgstr "kann lokale Referenz nicht aktualisieren"
-#: builtin/fetch.c:375
+#: builtin/fetch.c:392
msgid "forced update"
msgstr "Aktualisierung erzwungen"
-#: builtin/fetch.c:381
+#: builtin/fetch.c:398
msgid "(non-fast-forward)"
msgstr "(kein Vorspulen)"
-#: builtin/fetch.c:412 builtin/fetch.c:718
+#: builtin/fetch.c:429 builtin/fetch.c:735
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kann %s nicht öffnen: %s\n"
-#: builtin/fetch.c:421
+#: builtin/fetch.c:438
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n"
-#: builtin/fetch.c:520
+#: builtin/fetch.c:537
#, c-format
msgid "From %.*s\n"
msgstr "Von %.*s\n"
-#: builtin/fetch.c:531
+#: builtin/fetch.c:548
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -5059,57 +5238,57 @@ msgstr ""
"Einige lokale Referenzen konnten nicht aktualisiert werden; versuchen Sie\n"
"'git remote prune %s' um jeden älteren, widersprüchlichen Branch zu löschen."
-#: builtin/fetch.c:581
+#: builtin/fetch.c:598
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s wird unreferenziert)"
-#: builtin/fetch.c:582
+#: builtin/fetch.c:599
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s wurde unreferenziert)"
-#: builtin/fetch.c:589
+#: builtin/fetch.c:606
msgid "[deleted]"
msgstr "[gelöscht]"
-#: builtin/fetch.c:590 builtin/remote.c:1055
+#: builtin/fetch.c:607 builtin/remote.c:1055
msgid "(none)"
msgstr "(nichts)"
-#: builtin/fetch.c:708
+#: builtin/fetch.c:725
#, 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:742
-#, c-format
-msgid "Don't know how to fetch from %s"
-msgstr "Weiß nicht wie von %s angefordert wird."
-
-#: builtin/fetch.c:823
+#: builtin/fetch.c:744
#, 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:826
+#: builtin/fetch.c:747
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Option \"%s\" wird ignoriert für %s\n"
-#: builtin/fetch.c:928
+#: builtin/fetch.c:801
+#, c-format
+msgid "Don't know how to fetch from %s"
+msgstr "Weiß nicht wie von %s angefordert wird."
+
+#: builtin/fetch.c:976
#, c-format
msgid "Fetching %s\n"
msgstr "Fordere an von %s\n"
-#: builtin/fetch.c:930 builtin/remote.c:100
+#: builtin/fetch.c:978 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr "Konnte nicht von %s anfordern"
-#: builtin/fetch.c:949
+#: builtin/fetch.c:997
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -5118,35 +5297,35 @@ msgstr ""
"oder den Namen des Remote-Repositories an, von welchem neue\n"
"Commits angefordert werden sollen."
-#: builtin/fetch.c:969
+#: builtin/fetch.c:1020
msgid "You need to specify a tag name."
msgstr "Sie müssen den Namen des Tags angeben."
-#: builtin/fetch.c:1015
+#: builtin/fetch.c:1068
msgid "--depth and --unshallow cannot be used together"
msgstr ""
"Die Optionen --depth und --unshallow können nicht gemeinsam verwendet werden."
-#: builtin/fetch.c:1017
+#: builtin/fetch.c:1070
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
"Die Option --unshallow kann nicht in einem vollständigen Repository "
"verwendet werden."
-#: builtin/fetch.c:1036
+#: builtin/fetch.c:1089
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all akzeptiert kein Repository als Argument"
-#: builtin/fetch.c:1038
+#: builtin/fetch.c:1091
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kann nicht mit Refspecs verwendet werden."
-#: builtin/fetch.c:1049
+#: builtin/fetch.c:1102
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Kein Remote-Repository (einzeln oder Gruppe): %s"
-#: builtin/fetch.c:1057
+#: builtin/fetch.c:1110
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"
@@ -5157,9 +5336,9 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
msgstr ""
"git fmt-merge-msg [-m <Beschreibung>] [--log[=<n>]|--no-log] [--file <Datei>]"
-#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700
-#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:179
-#: builtin/tag.c:446 parse-options.h:133 parse-options.h:243
+#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702
+#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:178
+#: builtin/tag.c:446 parse-options.h:135 parse-options.h:245
msgid "n"
msgstr "Anzahl"
@@ -5183,117 +5362,122 @@ msgstr "verwendet <Text> als Beschreibungsanfang"
msgid "file to read from"
msgstr "Datei zum Einlesen"
-#: builtin/for-each-ref.c:979
+#: builtin/for-each-ref.c:995
msgid "git for-each-ref [options] [<pattern>]"
msgstr "git for-each-ref [Optionen] [<Muster>]"
-#: builtin/for-each-ref.c:994
+#: builtin/for-each-ref.c:1010
msgid "quote placeholders suitably for shells"
msgstr "formatiert Platzhalter als Shell-String"
-#: builtin/for-each-ref.c:996
+#: builtin/for-each-ref.c:1012
msgid "quote placeholders suitably for perl"
msgstr "formatiert Platzhalter als Perl-String"
-#: builtin/for-each-ref.c:998
+#: builtin/for-each-ref.c:1014
msgid "quote placeholders suitably for python"
msgstr "formatiert Platzhalter als Python-String"
-#: builtin/for-each-ref.c:1000
+#: builtin/for-each-ref.c:1016
msgid "quote placeholders suitably for tcl"
msgstr "formatiert Platzhalter als TCL-String"
-#: builtin/for-each-ref.c:1003
+#: builtin/for-each-ref.c:1019
msgid "show only <n> matched refs"
msgstr "zeigt nur <n> passende Referenzen"
-#: builtin/for-each-ref.c:1004
+#: builtin/for-each-ref.c:1020
msgid "format"
msgstr "Format"
-#: builtin/for-each-ref.c:1004
+#: builtin/for-each-ref.c:1020
msgid "format to use for the output"
msgstr "für die Ausgabe zu verwendendes Format"
-#: builtin/for-each-ref.c:1005
+#: builtin/for-each-ref.c:1021
msgid "key"
msgstr "Schüssel"
-#: builtin/for-each-ref.c:1006
+#: builtin/for-each-ref.c:1022
msgid "field name to sort on"
msgstr "sortiere nach diesem Feld"
-#: builtin/fsck.c:608
+#: builtin/fsck.c:607
msgid "git fsck [options] [<object>...]"
msgstr "git fsck [Optionen] [<Objekt>...]"
-#: builtin/fsck.c:614
+#: builtin/fsck.c:613
msgid "show unreachable objects"
msgstr "zeigt unerreichbare Objekte"
-#: builtin/fsck.c:615
+#: builtin/fsck.c:614
msgid "show dangling objects"
msgstr "zeigt unreferenzierte Objekte"
-#: builtin/fsck.c:616
+#: builtin/fsck.c:615
msgid "report tags"
msgstr "meldet Tags"
-#: builtin/fsck.c:617
+#: builtin/fsck.c:616
msgid "report root nodes"
msgstr "meldet Hauptwurzeln"
-#: builtin/fsck.c:618
+#: builtin/fsck.c:617
msgid "make index objects head nodes"
msgstr "prüft Objekte in der Staging-Area"
-#: builtin/fsck.c:619
+#: builtin/fsck.c:618
msgid "make reflogs head nodes (default)"
msgstr "prüft die Reflogs (Standard)"
-#: builtin/fsck.c:620
+#: builtin/fsck.c:619
msgid "also consider packs and alternate objects"
msgstr ""
-#: builtin/fsck.c:621
+#: builtin/fsck.c:620
msgid "enable more strict checking"
msgstr "aktiviert genauere Prüfung"
-#: builtin/fsck.c:623
+#: builtin/fsck.c:622
msgid "write dangling objects in .git/lost-found"
msgstr "schreibt unreferenzierte Objekte nach .git/lost-found"
-#: builtin/fsck.c:624 builtin/prune.c:134
+#: builtin/fsck.c:623 builtin/prune.c:134
msgid "show progress"
msgstr "zeigt Fortschrittsanzeige"
-#: builtin/gc.c:22
+#: builtin/gc.c:23
msgid "git gc [options]"
msgstr "git gc [Optionen]"
-#: builtin/gc.c:63
+#: builtin/gc.c:79
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Ungültiger %s: '%s'"
-#: builtin/gc.c:90
+#: builtin/gc.c:106
#, c-format
msgid "insanely long object directory %.*s"
msgstr "zu langes Objekt-Verzeichnis %.*s"
-#: builtin/gc.c:179
+#: builtin/gc.c:261
msgid "prune unreferenced objects"
msgstr "entfernt unreferenzierte Objekte"
-#: builtin/gc.c:181
+#: builtin/gc.c:263
msgid "be more thorough (increased runtime)"
msgstr "mehr Gründlichkeit (erhöht Laufzeit)"
-#: builtin/gc.c:182
+#: builtin/gc.c:264
msgid "enable auto-gc mode"
msgstr "aktiviert \"auto-gc\" Modus"
-#: builtin/gc.c:222
+#: builtin/gc.c:265
+msgid "force running gc even if there may be another gc running"
+msgstr "erzwingt Ausführung von \"git gc\" selbst wenn ein anderes\n"
+"\"git gc\" bereits ausgeführt wird"
+
+#: builtin/gc.c:305
#, c-format
msgid ""
"Auto packing the repository for optimum performance. You may also\n"
@@ -5303,43 +5487,52 @@ msgstr ""
"komprimiert. Sie können auch \"git gc\" manuell ausführen.\n"
"Siehe \"git help gc\" für weitere Informationen.\n"
-#: builtin/gc.c:249
+#. be quiet on --auto
+#: builtin/gc.c:315
+#, c-format
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgstr ""
+"\"git gc\" wird bereits auf Maschine '%s' pid %<PRIuMAX> ausgeführt\n"
+"(benutzen Sie --force falls nicht)"
+
+#: builtin/gc.c:340
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Es gibt zu viele unerreichbare lose Objekte; führen Sie 'git prune' aus, um "
"diese zu löschen."
-#: builtin/grep.c:22
+#: builtin/grep.c:23
msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [Optionen] [-e] <Muster> [<Commit>...] [[--] <Pfad>...]"
-#: builtin/grep.c:217
+#: builtin/grep.c:218
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: Fehler beim Erzeugen eines Thread: %s"
-#: builtin/grep.c:364
+#: builtin/grep.c:365
#, c-format
msgid "Failed to chdir: %s"
msgstr "Fehler beim Verzeichniswechsel: %s"
-#: builtin/grep.c:442 builtin/grep.c:477
+#: builtin/grep.c:443 builtin/grep.c:478
#, c-format
msgid "unable to read tree (%s)"
msgstr "konnte \"Tree\"-Objekt (%s) nicht lesen"
-#: builtin/grep.c:492
+#: builtin/grep.c:493
#, 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:550
+#: builtin/grep.c:551
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "Schalter '%c' erwartet einen numerischen Wert"
-#: builtin/grep.c:567
+#: builtin/grep.c:568
#, c-format
msgid "cannot open '%s'"
msgstr "kann '%s' nicht öffnen"
@@ -5381,169 +5574,173 @@ msgid "don't match patterns in binary files"
msgstr "findet keine Muster in Binärdateien"
#: builtin/grep.c:662
+msgid "process binary files with textconv filters"
+msgstr "verarbeitet binäre Dateien mit \"textconv\"-Filtern"
+
+#: builtin/grep.c:664
msgid "descend at most <depth> levels"
msgstr "durchläuft höchstens <Tiefe> Ebenen"
-#: builtin/grep.c:666
+#: builtin/grep.c:668
msgid "use extended POSIX regular expressions"
msgstr "verwendet erweiterte reguläre Ausdrücke aus POSIX"
-#: builtin/grep.c:669
+#: builtin/grep.c:671
msgid "use basic POSIX regular expressions (default)"
msgstr "verwendet grundlegende reguläre Ausdrücke aus POSIX (Standard)"
-#: builtin/grep.c:672
+#: builtin/grep.c:674
msgid "interpret patterns as fixed strings"
msgstr "interpretiert Muster als feste Zeichenketten"
-#: builtin/grep.c:675
+#: builtin/grep.c:677
msgid "use Perl-compatible regular expressions"
msgstr "verwendet Perl-kompatible reguläre Ausdrücke"
-#: builtin/grep.c:678
+#: builtin/grep.c:680
msgid "show line numbers"
msgstr "zeigt Zeilennummern"
-#: builtin/grep.c:679
+#: builtin/grep.c:681
msgid "don't show filenames"
msgstr "zeigt keine Dateinamen"
-#: builtin/grep.c:680
+#: builtin/grep.c:682
msgid "show filenames"
msgstr "zeigt Dateinamen"
-#: builtin/grep.c:682
+#: builtin/grep.c:684
msgid "show filenames relative to top directory"
msgstr "zeigt Dateinamen relativ zum Projektverzeichnis"
-#: builtin/grep.c:684
+#: builtin/grep.c:686
msgid "show only filenames instead of matching lines"
msgstr "zeigt nur Dateinamen anstatt übereinstimmende Zeilen"
-#: builtin/grep.c:686
+#: builtin/grep.c:688
msgid "synonym for --files-with-matches"
msgstr "Synonym für --files-with-matches"
-#: builtin/grep.c:689
+#: builtin/grep.c:691
msgid "show only the names of files without match"
msgstr "zeigt nur die Dateinamen ohne Übereinstimmungen"
-#: builtin/grep.c:691
+#: builtin/grep.c:693
msgid "print NUL after filenames"
msgstr "gibt NUL-Zeichen nach Dateinamen aus"
-#: builtin/grep.c:693
+#: builtin/grep.c:695
msgid "show the number of matches instead of matching lines"
msgstr "zeigt, anstatt der Zeilen, die Anzahl der übereinstimmenden Zeilen"
-#: builtin/grep.c:694
+#: builtin/grep.c:696
msgid "highlight matches"
msgstr "hebt Übereinstimmungen hervor"
-#: builtin/grep.c:696
+#: builtin/grep.c:698
msgid "print empty line between matches from different files"
msgstr ""
"gibt eine Leerzeile zwischen Übereinstimmungen in verschiedenen Dateien aus"
-#: builtin/grep.c:698
+#: builtin/grep.c:700
msgid "show filename only once above matches from same file"
msgstr ""
"zeigt den Dateinamen nur einmal oberhalb der Übereinstimmungen aus dieser "
"Datei an"
-#: builtin/grep.c:701
+#: builtin/grep.c:703
msgid "show <n> context lines before and after matches"
msgstr "zeigt <n> Zeilen vor und nach den Übereinstimmungen an"
-#: builtin/grep.c:704
+#: builtin/grep.c:706
msgid "show <n> context lines before matches"
msgstr "zeigt <n> Zeilen vor den Übereinstimmungen an"
-#: builtin/grep.c:706
+#: builtin/grep.c:708
msgid "show <n> context lines after matches"
msgstr "zeigt <n> Zeilen nach den Übereinstimmungen an"
-#: builtin/grep.c:707
+#: builtin/grep.c:709
msgid "shortcut for -C NUM"
msgstr "Kurzform für -C NUM"
-#: builtin/grep.c:710
+#: builtin/grep.c:712
msgid "show a line with the function name before matches"
msgstr "zeigt eine Zeile mit dem Funktionsnamen vor Übereinstimmungen an"
-#: builtin/grep.c:712
+#: builtin/grep.c:714
msgid "show the surrounding function"
msgstr "zeigt die umgebende Funktion an"
-#: builtin/grep.c:715
+#: builtin/grep.c:717
msgid "read patterns from file"
msgstr "liest Muster von einer Datei"
-#: builtin/grep.c:717
+#: builtin/grep.c:719
msgid "match <pattern>"
msgstr "findet <Muster>"
-#: builtin/grep.c:719
+#: builtin/grep.c:721
msgid "combine patterns specified with -e"
msgstr "kombiniert Muster, die mit -e angegeben wurden"
-#: builtin/grep.c:731
+#: builtin/grep.c:733
msgid "indicate hit with exit status without output"
msgstr "zeigt Übereinstimmungen nur durch Beendigungsstatus an"
-#: builtin/grep.c:733
+#: builtin/grep.c:735
msgid "show only matches from files that match all patterns"
msgstr "zeigt nur Übereinstimmungen von Dateien, die allen Mustern entsprechen"
-#: builtin/grep.c:735
+#: builtin/grep.c:737
msgid "show parse tree for grep expression"
msgstr "zeigt geparstes Verzeichnis für \"grep\"-Ausdruck"
-#: builtin/grep.c:739
+#: builtin/grep.c:741
msgid "pager"
msgstr "Anzeigeprogramm"
-#: builtin/grep.c:739
+#: builtin/grep.c:741
msgid "show matching files in the pager"
msgstr "zeigt Dateien mit Übereinstimmungen im Anzeigeprogramm"
-#: builtin/grep.c:742
+#: builtin/grep.c:744
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "erlaubt den Aufruf von grep(1) (von dieser Programmversion ignoriert)"
-#: builtin/grep.c:743 builtin/show-ref.c:188
+#: builtin/grep.c:745 builtin/show-ref.c:187
msgid "show usage"
msgstr "zeigt Verwendung"
-#: builtin/grep.c:810
+#: builtin/grep.c:812
msgid "no pattern given."
msgstr "keine Muster angegeben"
-#: builtin/grep.c:865
+#: builtin/grep.c:870
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:888
+#: builtin/grep.c:893
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:893
+#: builtin/grep.c:898
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:896
+#: builtin/grep.c:901
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
"Die Option --[no-]exclude-standard kann nicht mit beobachteten Inhalten "
"verwendet werden."
-#: builtin/grep.c:904
+#: builtin/grep.c:909
msgid "both --cached and trees are given."
msgstr "Die Option --cached kann nicht mit \"Tree\"-Objekten verwendet werden."
@@ -5799,8 +5996,8 @@ msgstr "ernsthafte Inkonsistenz nach Dekomprimierung"
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SHA1 KOLLISION MIT %s GEFUNDEN !"
-#: builtin/index-pack.c:669 builtin/pack-objects.c:170
-#: builtin/pack-objects.c:262
+#: builtin/index-pack.c:669 builtin/pack-objects.c:171
+#: builtin/pack-objects.c:263
#, c-format
msgid "unable to read %s"
msgstr "kann %s nicht lesen"
@@ -5829,155 +6026,155 @@ msgstr "Fehler in Objekt"
msgid "Not all child objects of %s are reachable"
msgstr "Nicht alle Kind-Objekte von %s sind erreichbar"
-#: builtin/index-pack.c:838 builtin/index-pack.c:868
+#: builtin/index-pack.c:839 builtin/index-pack.c:869
msgid "failed to apply delta"
msgstr "Konnte Dateiunterschied nicht anwenden"
-#: builtin/index-pack.c:1009
+#: builtin/index-pack.c:1010
msgid "Receiving objects"
msgstr "Empfange Objekte"
-#: builtin/index-pack.c:1009
+#: builtin/index-pack.c:1010
msgid "Indexing objects"
msgstr "Indiziere Objekte"
-#: builtin/index-pack.c:1035
+#: builtin/index-pack.c:1036
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "Paket ist beschädigt (SHA1 unterschiedlich)"
-#: builtin/index-pack.c:1040
+#: builtin/index-pack.c:1041
msgid "cannot fstat packfile"
msgstr "kann Paketdatei nicht lesen"
-#: builtin/index-pack.c:1043
+#: builtin/index-pack.c:1044
msgid "pack has junk at the end"
msgstr "Paketende enthält nicht verwendbaren Inhalt"
-#: builtin/index-pack.c:1054
+#: builtin/index-pack.c:1055
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "Fehler beim Ausführen von \"parse_pack_objects()\""
-#: builtin/index-pack.c:1077
+#: builtin/index-pack.c:1078
msgid "Resolving deltas"
msgstr "Löse Unterschiede auf"
-#: builtin/index-pack.c:1087
+#: builtin/index-pack.c:1088
#, c-format
msgid "unable to create thread: %s"
msgstr "kann Thread nicht erzeugen: %s"
-#: builtin/index-pack.c:1129
+#: builtin/index-pack.c:1130
msgid "confusion beyond insanity"
msgstr "Fehler beim Auflösen der Unterschiede"
-#: builtin/index-pack.c:1137
+#: builtin/index-pack.c:1138
#, c-format
msgid "completed with %d local objects"
msgstr "vervollständigt mit %d lokalen Objekten"
-#: builtin/index-pack.c:1147
+#: builtin/index-pack.c:1148
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Unerwartete Prüfsumme für %s (Festplattenfehler?)"
-#: builtin/index-pack.c:1151
+#: builtin/index-pack.c:1152
#, 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:1176
+#: builtin/index-pack.c:1177
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren"
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1256
#, c-format
msgid "local object %s is corrupt"
msgstr "lokales Objekt %s ist beschädigt"
-#: builtin/index-pack.c:1279
+#: builtin/index-pack.c:1280
msgid "error while closing pack file"
msgstr "Fehler beim Schließen der Paketdatei"
-#: builtin/index-pack.c:1292
+#: builtin/index-pack.c:1293
#, c-format
msgid "cannot write keep file '%s'"
msgstr "Kann Paketbeschreibungsdatei '%s' nicht schreiben"
-#: builtin/index-pack.c:1300
+#: builtin/index-pack.c:1301
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "Kann eben erstellte Paketbeschreibungsdatei '%s' nicht schließen"
-#: builtin/index-pack.c:1313
+#: builtin/index-pack.c:1314
msgid "cannot store pack file"
msgstr "Kann Paketdatei nicht speichern"
-#: builtin/index-pack.c:1324
+#: builtin/index-pack.c:1325
msgid "cannot store index file"
msgstr "Kann Indexdatei nicht speichern"
-#: builtin/index-pack.c:1357
+#: builtin/index-pack.c:1358
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig"
-#: builtin/index-pack.c:1363
+#: builtin/index-pack.c:1364
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "ungültige Anzahl von Threads angegeben (%d)"
-#: builtin/index-pack.c:1367 builtin/index-pack.c:1545
+#: builtin/index-pack.c:1368 builtin/index-pack.c:1546
#, c-format
msgid "no threads support, ignoring %s"
msgstr "keine Unterstützung von Threads, '%s' wird ignoriert"
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1426
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Kann existierende Paketdatei '%s' nicht öffnen"
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1428
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Kann existierende Indexdatei für Paket '%s' nicht öffnen"
-#: builtin/index-pack.c:1474
+#: builtin/index-pack.c:1475
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "kein Unterschied: %d Objekt"
msgstr[1] "kein Unterschied: %d Objekte"
-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1482
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "Länge der Objekt-Liste = %d: %lu Objekt"
msgstr[1] "Länge der Objekt-Liste = %d: %lu Objekte"
-#: builtin/index-pack.c:1509
+#: builtin/index-pack.c:1510
msgid "Cannot come back to cwd"
msgstr "Kann nicht zurück zu Arbeitsverzeichnis wechseln"
-#: builtin/index-pack.c:1557 builtin/index-pack.c:1560
-#: builtin/index-pack.c:1572 builtin/index-pack.c:1576
+#: builtin/index-pack.c:1558 builtin/index-pack.c:1561
+#: builtin/index-pack.c:1573 builtin/index-pack.c:1577
#, c-format
msgid "bad %s"
msgstr "%s ist ungültig"
-#: builtin/index-pack.c:1590
+#: builtin/index-pack.c:1591
msgid "--fix-thin cannot be used without --stdin"
msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden."
-#: builtin/index-pack.c:1594 builtin/index-pack.c:1604
+#: builtin/index-pack.c:1595 builtin/index-pack.c:1605
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'"
-#: builtin/index-pack.c:1613
+#: builtin/index-pack.c:1614
msgid "--verify with no packfile name given"
msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben."
@@ -6066,11 +6263,6 @@ msgstr "kann nicht mit Dateityp %d umgehen"
msgid "unable to move %s to %s"
msgstr "Konnte %s nicht nach %s verschieben"
-#: builtin/init-db.c:363
-#, c-format
-msgid "Could not create git link %s"
-msgstr "Konnte git-Verweis %s nicht erstellen"
-
#.
#. * TRANSLATORS: The first '%s' is either "Reinitialized
#. * existing" or "Initialized empty", the second " shared" or
@@ -6113,7 +6305,7 @@ msgstr "Berechtigungen"
msgid "specify that the git repository is to be shared amongst several users"
msgstr "gibt an, dass das Git-Repository mit mehreren Benutzern geteilt wird"
-#: builtin/init-db.c:493 builtin/prune-packed.c:75
+#: builtin/init-db.c:493 builtin/prune-packed.c:75 builtin/repack.c:155
msgid "be quiet"
msgstr "weniger Ausgaben"
@@ -6153,249 +6345,249 @@ msgstr "git log [<Optionen>] [Commitbereich>] [[--] <Pfad>...]\n"
msgid " or: git show [options] <object>..."
msgstr " oder: git show [Optionen] <Objekt>..."
-#: builtin/log.c:124
+#: builtin/log.c:125
msgid "suppress diff output"
msgstr "unterdrückt Ausgabe der Unterschiede"
-#: builtin/log.c:125
+#: builtin/log.c:126
msgid "show source"
msgstr "zeigt Quelle"
-#: builtin/log.c:126
+#: builtin/log.c:127
msgid "Use mail map file"
msgstr "verwendet \"mailmap\"-Datei"
-#: builtin/log.c:127
+#: builtin/log.c:128
msgid "decorate options"
msgstr "decorate-Optionen"
-#: builtin/log.c:230
+#: builtin/log.c:231
#, c-format
msgid "Final output: %d %s\n"
msgstr "letzte Ausgabe: %d %s\n"
-#: builtin/log.c:453 builtin/log.c:545
+#: builtin/log.c:473 builtin/log.c:565
#, c-format
msgid "Could not read object %s"
msgstr "Kann Objekt %s nicht lesen."
-#: builtin/log.c:569
+#: builtin/log.c:589
#, c-format
msgid "Unknown type: %d"
msgstr "Unbekannter Typ: %d"
-#: builtin/log.c:669
+#: builtin/log.c:689
msgid "format.headers without value"
msgstr "format.headers ohne Wert"
-#: builtin/log.c:751
+#: builtin/log.c:771
msgid "name of output directory is too long"
msgstr "Name des Ausgabeverzeichnisses ist zu lang."
-#: builtin/log.c:767
+#: builtin/log.c:787
#, c-format
msgid "Cannot open patch file %s"
msgstr "Kann Patch-Datei %s nicht öffnen"
-#: builtin/log.c:781
+#: builtin/log.c:801
msgid "Need exactly one range."
msgstr "Brauche genau einen Commit-Bereich."
-#: builtin/log.c:789
+#: builtin/log.c:809
msgid "Not a range."
msgstr "Kein Commit-Bereich."
-#: builtin/log.c:891
+#: builtin/log.c:911
msgid "Cover letter needs email format"
msgstr "Anschreiben benötigt E-Mail-Format"
-#: builtin/log.c:967
+#: builtin/log.c:987
#, c-format
msgid "insane in-reply-to: %s"
msgstr "ungültiges in-reply-to: %s"
-#: builtin/log.c:995
+#: builtin/log.c:1015
msgid "git format-patch [options] [<since> | <revision range>]"
msgstr "git format-patch [Optionen] [<seit> | <Commitbereich>]"
-#: builtin/log.c:1040
+#: builtin/log.c:1060
msgid "Two output directories?"
msgstr "Zwei Ausgabeverzeichnisse?"
-#: builtin/log.c:1155
+#: builtin/log.c:1175
msgid "use [PATCH n/m] even with a single patch"
msgstr "verwendet [PATCH n/m] auch mit einzelnem Patch"
-#: builtin/log.c:1158
+#: builtin/log.c:1178
msgid "use [PATCH] even with multiple patches"
msgstr "verwendet [PATCH] auch mit mehreren Patches"
-#: builtin/log.c:1162
+#: builtin/log.c:1182
msgid "print patches to standard out"
msgstr "Ausgabe der Patches in Standard-Ausgabe"
-#: builtin/log.c:1164
+#: builtin/log.c:1184
msgid "generate a cover letter"
msgstr "erzeugt ein Deckblatt"
-#: builtin/log.c:1166
+#: builtin/log.c:1186
msgid "use simple number sequence for output file names"
msgstr "verwendet einfache Nummernfolge für die Namen der Ausgabedateien"
-#: builtin/log.c:1167
+#: builtin/log.c:1187
msgid "sfx"
msgstr "Dateiendung"
-#: builtin/log.c:1168
+#: builtin/log.c:1188
msgid "use <sfx> instead of '.patch'"
msgstr "verwendet <Dateiendung> anstatt '.patch'"
-#: builtin/log.c:1170
+#: builtin/log.c:1190
msgid "start numbering patches at <n> instead of 1"
msgstr "beginnt die Nummerierung der Patches bei <n> anstatt bei 1"
-#: builtin/log.c:1172
+#: builtin/log.c:1192
msgid "mark the series as Nth re-roll"
msgstr "kennzeichnet die Serie als n-te Fassung"
-#: builtin/log.c:1174
+#: builtin/log.c:1194
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "verwendet [<Prefix>] anstatt [PATCH]"
-#: builtin/log.c:1177
+#: builtin/log.c:1197
msgid "store resulting files in <dir>"
msgstr "speichert erzeugte Dateien in <Verzeichnis>"
-#: builtin/log.c:1180
+#: builtin/log.c:1200
msgid "don't strip/add [PATCH]"
msgstr "[PATCH] wird nicht entfernt/hinzugefügt"
-#: builtin/log.c:1183
+#: builtin/log.c:1203
msgid "don't output binary diffs"
msgstr "gibt keine binären Unterschiede aus"
-#: builtin/log.c:1185
+#: builtin/log.c:1205
msgid "don't include a patch matching a commit upstream"
msgstr ""
"schließt keine Patches ein, die einem Commit im Upstream-Branch entsprechen"
-#: builtin/log.c:1187
+#: builtin/log.c:1207
msgid "show patch format instead of default (patch + stat)"
msgstr "zeigt Patchformat anstatt des Standards (Patch + Zusammenfassung)"
-#: builtin/log.c:1189
+#: builtin/log.c:1209
msgid "Messaging"
msgstr "Email-Einstellungen"
-#: builtin/log.c:1190
+#: builtin/log.c:1210
msgid "header"
msgstr "Header"
-#: builtin/log.c:1191
+#: builtin/log.c:1211
msgid "add email header"
msgstr "fügt Email-Header hinzu"
-#: builtin/log.c:1192 builtin/log.c:1194
+#: builtin/log.c:1212 builtin/log.c:1214
msgid "email"
msgstr "Email"
-#: builtin/log.c:1192
+#: builtin/log.c:1212
msgid "add To: header"
msgstr "fügt \"To:\"-Header hinzu"
-#: builtin/log.c:1194
+#: builtin/log.c:1214
msgid "add Cc: header"
msgstr "fügt \"Cc:\"-Header hinzu"
-#: builtin/log.c:1196
+#: builtin/log.c:1216
msgid "ident"
msgstr "Ident"
-#: builtin/log.c:1197
+#: builtin/log.c:1217
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"setzt \"From\"-Adresse auf <Ident> (oder Ident des Commit-Erstellers,wenn "
"fehlend)"
-#: builtin/log.c:1199
+#: builtin/log.c:1219
msgid "message-id"
msgstr "message-id"
-#: builtin/log.c:1200
+#: builtin/log.c:1220
msgid "make first mail a reply to <message-id>"
msgstr "macht aus erster Email eine Antwort zu <message-id>"
-#: builtin/log.c:1201 builtin/log.c:1204
+#: builtin/log.c:1221 builtin/log.c:1224
msgid "boundary"
msgstr "Grenze"
-#: builtin/log.c:1202
+#: builtin/log.c:1222
msgid "attach the patch"
msgstr "hängt einen Patch an"
-#: builtin/log.c:1205
+#: builtin/log.c:1225
msgid "inline the patch"
msgstr "fügt den Patch direkt in die Nachricht ein"
-#: builtin/log.c:1209
+#: builtin/log.c:1229
msgid "enable message threading, styles: shallow, deep"
msgstr "aktiviert Nachrichtenverkettung, Stile: shallow, deep"
-#: builtin/log.c:1211
+#: builtin/log.c:1231
msgid "signature"
msgstr "Signatur"
-#: builtin/log.c:1212
+#: builtin/log.c:1232
msgid "add a signature"
msgstr "fügt eine Signatur hinzu"
-#: builtin/log.c:1214
+#: builtin/log.c:1233
msgid "don't print the patch filenames"
msgstr "zeigt keine Dateinamen der Patches"
-#: builtin/log.c:1288
+#: builtin/log.c:1307
#, c-format
msgid "invalid ident line: %s"
msgstr "Ungültige Identifikationszeile: %s"
-#: builtin/log.c:1303
+#: builtin/log.c:1322
msgid "-n and -k are mutually exclusive."
msgstr "Die Optionen -n und -k schließen sich gegenseitig aus."
-#: builtin/log.c:1305
+#: builtin/log.c:1324
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "Die Optionen --subject-prefix und -k schließen sich gegenseitig aus."
-#: builtin/log.c:1313
+#: builtin/log.c:1332
msgid "--name-only does not make sense"
msgstr "Die Option --name-only kann nicht verwendet werden."
-#: builtin/log.c:1315
+#: builtin/log.c:1334
msgid "--name-status does not make sense"
msgstr "Die Option --name-status kann nicht verwendet werden."
-#: builtin/log.c:1317
+#: builtin/log.c:1336
msgid "--check does not make sense"
msgstr "Die Option --check kann nicht verwendet werden."
-#: builtin/log.c:1340
+#: builtin/log.c:1359
msgid "standard output, or directory, which one?"
msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?"
-#: builtin/log.c:1342
+#: builtin/log.c:1361
#, c-format
msgid "Could not create directory '%s'"
msgstr "Konnte Verzeichnis '%s' nicht erstellen."
-#: builtin/log.c:1490
+#: builtin/log.c:1509
msgid "Failed to create output files"
msgstr "Fehler beim Erstellen der Ausgabedateien."
-#: builtin/log.c:1539
+#: builtin/log.c:1558
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]"
-#: builtin/log.c:1594
+#: builtin/log.c:1613
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -6403,143 +6595,143 @@ msgstr ""
"Konnte gefolgten Remote-Branch nicht finden, bitte geben Sie <Upstream> "
"manuell an.\n"
-#: builtin/log.c:1607 builtin/log.c:1609 builtin/log.c:1621
+#: builtin/log.c:1626 builtin/log.c:1628 builtin/log.c:1640
#, c-format
msgid "Unknown commit %s"
msgstr "Unbekannter Commit %s"
-#: builtin/ls-files.c:408
+#: builtin/ls-files.c:398
msgid "git ls-files [options] [<file>...]"
msgstr "git ls-files [Optionen] [<Datei>...]"
-#: builtin/ls-files.c:465
+#: builtin/ls-files.c:455
msgid "identify the file status with tags"
msgstr "zeigt den Dateistatus mit Tags"
-#: builtin/ls-files.c:467
+#: builtin/ls-files.c:457
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
"verwendet Kleinbuchstaben für Dateien mit 'assume unchanged' Markierung"
-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:459
msgid "show cached files in the output (default)"
msgstr "zeigt zwischengespeicherten Dateien in der Ausgabe an (Standard)"
-#: builtin/ls-files.c:471
+#: builtin/ls-files.c:461
msgid "show deleted files in the output"
msgstr "zeigt entfernte Dateien in der Ausgabe an"
-#: builtin/ls-files.c:473
+#: builtin/ls-files.c:463
msgid "show modified files in the output"
msgstr "zeigt geänderte Dateien in der Ausgabe an"
-#: builtin/ls-files.c:475
+#: builtin/ls-files.c:465
msgid "show other files in the output"
msgstr "zeigt sonstige Dateien in der Ausgabe an"
-#: builtin/ls-files.c:477
+#: builtin/ls-files.c:467
msgid "show ignored files in the output"
msgstr "zeigt ignorierte Dateien in der Ausgabe an"
-#: builtin/ls-files.c:480
+#: builtin/ls-files.c:470
msgid "show staged contents' object name in the output"
msgstr ""
"zeigt Objektnamen von Inhalten, die zum Commit vorgemerkt sind, in der "
"Ausgabe an"
-#: builtin/ls-files.c:482
+#: builtin/ls-files.c:472
msgid "show files on the filesystem that need to be removed"
msgstr "zeigt Dateien im Dateisystem, die gelöscht werden müssen, an"
-#: builtin/ls-files.c:484
+#: builtin/ls-files.c:474
msgid "show 'other' directories' name only"
msgstr "zeigt nur Namen von 'sonstigen' Verzeichnissen an"
-#: builtin/ls-files.c:487
+#: builtin/ls-files.c:477
msgid "don't show empty directories"
msgstr "zeigt keine leeren Verzeichnisse an"
-#: builtin/ls-files.c:490
+#: builtin/ls-files.c:480
msgid "show unmerged files in the output"
msgstr "zeigt nicht zusammengeführte Dateien in der Ausgabe an"
-#: builtin/ls-files.c:492
+#: builtin/ls-files.c:482
msgid "show resolve-undo information"
msgstr "zeigt 'resolve-undo' Informationen an"
-#: builtin/ls-files.c:494
+#: builtin/ls-files.c:484
msgid "skip files matching pattern"
msgstr "lässt Dateien aus, die einem Muster entsprechen"
-#: builtin/ls-files.c:497
+#: builtin/ls-files.c:487
msgid "exclude patterns are read from <file>"
msgstr "schließt Muster, gelesen von <Datei>, aus"
-#: builtin/ls-files.c:500
+#: builtin/ls-files.c:490
msgid "read additional per-directory exclude patterns in <file>"
msgstr "liest zusätzliche pro-Verzeichnis Auschlussmuster aus <Datei>"
-#: builtin/ls-files.c:502
+#: builtin/ls-files.c:492
msgid "add the standard git exclusions"
msgstr "fügt die standardmäßigen Git-Ausschlüsse hinzu"
-#: builtin/ls-files.c:505
+#: builtin/ls-files.c:495
msgid "make the output relative to the project top directory"
msgstr "Ausgabe relativ zum Projektverzeichnis"
-#: builtin/ls-files.c:508
+#: builtin/ls-files.c:498
msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
"behandle es als Fehler, wenn sich eine <Datei> nicht in der Staging-Area "
"befindet"
-#: builtin/ls-files.c:509
+#: builtin/ls-files.c:499
msgid "tree-ish"
msgstr "Commit-Referenz"
-#: builtin/ls-files.c:510
+#: builtin/ls-files.c:500
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"gibt vor, dass Pfade, die seit <Commit-Referenz> gelöscht wurden, immer noch "
"vorhanden sind"
-#: builtin/ls-files.c:512
+#: builtin/ls-files.c:502
msgid "show debugging data"
msgstr "zeigt Ausgaben zur Fehlersuche an"
-#: builtin/ls-tree.c:27
+#: builtin/ls-tree.c:28
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr "git ls-tree [<Optionen>] <Commit-Referenz> [<Pfad>...]"
-#: builtin/ls-tree.c:125
+#: builtin/ls-tree.c:126
msgid "only show trees"
msgstr "zeigt nur Verzeichnisse an"
-#: builtin/ls-tree.c:127
+#: builtin/ls-tree.c:128
msgid "recurse into subtrees"
msgstr "führt Rekursion in Unterverzeichnissen durch"
-#: builtin/ls-tree.c:129
+#: builtin/ls-tree.c:130
msgid "show trees when recursing"
msgstr "zeigt Verzeichnisse bei Rekursion an"
-#: builtin/ls-tree.c:132
+#: builtin/ls-tree.c:133
msgid "terminate entries with NUL byte"
msgstr "schließt Einträge mit NUL-Byte ab"
-#: builtin/ls-tree.c:133
+#: builtin/ls-tree.c:134
msgid "include object size"
msgstr "schließt Objektgröße ein"
-#: builtin/ls-tree.c:135 builtin/ls-tree.c:137
+#: builtin/ls-tree.c:136 builtin/ls-tree.c:138
msgid "list only filenames"
msgstr "listet nur Dateinamen auf"
-#: builtin/ls-tree.c:140
+#: builtin/ls-tree.c:141
msgid "use full path names"
msgstr "verwendet vollständige Pfadnamen"
-#: builtin/ls-tree.c:142
+#: builtin/ls-tree.c:143
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
"listet das gesamte Verzeichnis auf; nicht nur das aktuelle Verzeichnis "
@@ -6618,7 +6810,7 @@ msgstr "bricht ab, wenn kein Vorspulen möglich ist"
msgid "Verify that the named commit has a valid GPG signature"
msgstr "überprüft den genannten Commit auf eine gültige GPG-Signatur"
-#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:114
+#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:89
msgid "strategy"
msgstr "Strategie"
@@ -6994,76 +7186,87 @@ msgstr "erlaubt fehlende Objekte"
msgid "allow creation of more than one tree"
msgstr "erlaubt die Erstellung von mehr als einem \"Tree\"-Objekt"
-#: builtin/mv.c:14
+#: builtin/mv.c:15
msgid "git mv [options] <source>... <destination>"
msgstr "git mv [Optionen] <Quelle>... <Ziel>"
-#: builtin/mv.c:64
+#: builtin/mv.c:67
msgid "force move/rename even if target exists"
msgstr "erzwingt Verschieben/Umbenennen, auch wenn das Ziel existiert"
-#: builtin/mv.c:65
+#: builtin/mv.c:68
msgid "skip move/rename errors"
msgstr "überspringt Fehler beim Verschieben oder Umbenennen"
-#: builtin/mv.c:108
+#: builtin/mv.c:113
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Prüfe Umbenennung von '%s' nach '%s'\n"
-#: builtin/mv.c:112
+#: builtin/mv.c:117
msgid "bad source"
msgstr "ungültige Quelle"
-#: builtin/mv.c:115
+#: builtin/mv.c:120
msgid "can not move directory into itself"
msgstr "kann Verzeichnis nicht in sich selbst verschieben"
-#: builtin/mv.c:118
+#: builtin/mv.c:123
msgid "cannot move directory over file"
msgstr "kann Verzeichnis nicht über Datei verschieben"
-#: builtin/mv.c:128
+#: builtin/mv.c:129
+#, c-format
+msgid "Huh? Directory %s is in index and no submodule?"
+msgstr "Huh? Verzeichnis %s ist zum Commit vorgemerkt und kein Submodul?"
+
+#: builtin/mv.c:131 builtin/rm.c:318
+msgid "Please, stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+"Bitte merken Sie Ihre Änderungen in .gitmodules zum Commit vor oder benutzen\n"
+"Sie \"stash\" um fortzufahren."
+
+#: builtin/mv.c:147
#, c-format
msgid "Huh? %.*s is in index?"
msgstr "Huh? %.*s ist zum Commit vorgemerkt?"
-#: builtin/mv.c:140
+#: builtin/mv.c:159
msgid "source directory is empty"
msgstr "Quellverzeichnis ist leer"
-#: builtin/mv.c:171
+#: builtin/mv.c:191
msgid "not under version control"
msgstr "nicht unter Versionskontrolle"
-#: builtin/mv.c:173
+#: builtin/mv.c:193
msgid "destination exists"
msgstr "Ziel existiert bereits"
-#: builtin/mv.c:181
+#: builtin/mv.c:201
#, c-format
msgid "overwriting '%s'"
msgstr "überschreibe '%s'"
-#: builtin/mv.c:184
+#: builtin/mv.c:204
msgid "Cannot overwrite"
msgstr "Kann nicht überschreiben"
-#: builtin/mv.c:187
+#: builtin/mv.c:207
msgid "multiple sources for the same target"
msgstr "mehrere Quellen für das selbe Ziel"
-#: builtin/mv.c:202
+#: builtin/mv.c:222
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, Quelle=%s, Ziel=%s"
-#: builtin/mv.c:212
+#: builtin/mv.c:232
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Benenne %s nach %s um\n"
-#: builtin/mv.c:215 builtin/remote.c:731
+#: builtin/mv.c:235 builtin/remote.c:731 builtin/repack.c:330
#, c-format
msgid "renaming '%s' failed"
msgstr "Umbenennung von '%s' fehlgeschlagen"
@@ -7101,8 +7304,8 @@ msgid "read from stdin"
msgstr "liest von der Standard-Eingabe"
#: builtin/name-rev.c:320
-msgid "allow to print `undefined` names"
-msgstr "erlaubt Ausgabe von `undefinierten` Namen"
+msgid "allow to print `undefined` names (default)"
+msgstr "erlaubt Ausgabe von `undefinierten` Namen (Standard)"
#: builtin/name-rev.c:326
msgid "dereference tags in the input (internal use)"
@@ -7258,12 +7461,12 @@ msgstr "Konnte Notiz-Objekt nicht schreiben"
msgid "The note contents has been left in %s"
msgstr "Die Notiz-Inhalte wurden in %s belassen"
-#: builtin/notes.c:248 builtin/tag.c:540
+#: builtin/notes.c:248 builtin/tag.c:537
#, c-format
msgid "cannot read '%s'"
msgstr "kann '%s' nicht lesen"
-#: builtin/notes.c:250 builtin/tag.c:543
+#: builtin/notes.c:250 builtin/tag.c:540
#, c-format
msgid "could not open or read '%s'"
msgstr "konnte '%s' nicht öffnen oder lesen"
@@ -7271,7 +7474,7 @@ msgstr "konnte '%s' nicht öffnen oder lesen"
#: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318
#: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515
#: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637
-#: builtin/notes.c:839 builtin/tag.c:556
+#: builtin/notes.c:839 builtin/tag.c:553
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
@@ -7448,153 +7651,153 @@ msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
msgstr ""
"git pack-objects [Optionen...] Basis-Name [< Referenzliste | < Objektliste]"
-#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
+#: builtin/pack-objects.c:184 builtin/pack-objects.c:187
#, c-format
msgid "deflate error (%d)"
msgstr "Fehler beim Komprimieren (%d)"
-#: builtin/pack-objects.c:2397
+#: builtin/pack-objects.c:2398
#, c-format
msgid "unsupported index version %s"
msgstr "Nicht unterstützte Staging-Area-Version %s"
-#: builtin/pack-objects.c:2401
+#: builtin/pack-objects.c:2402
#, c-format
msgid "bad index version '%s'"
msgstr "Ungültige Staging-Area-Version '%s'"
-#: builtin/pack-objects.c:2424
+#: builtin/pack-objects.c:2425
#, c-format
msgid "option %s does not accept negative form"
msgstr "Option %s akzeptiert keine negative Form"
-#: builtin/pack-objects.c:2428
+#: builtin/pack-objects.c:2429
#, c-format
msgid "unable to parse value '%s' for option %s"
msgstr "konnte Wert '%s' für Option %s nicht parsen"
-#: builtin/pack-objects.c:2447
+#: builtin/pack-objects.c:2448
msgid "do not show progress meter"
msgstr "zeigt keine Fortschrittsanzeige"
-#: builtin/pack-objects.c:2449
+#: builtin/pack-objects.c:2450
msgid "show progress meter"
msgstr "zeigt Fortschrittsanzeige"
-#: builtin/pack-objects.c:2451
+#: builtin/pack-objects.c:2452
msgid "show progress meter during object writing phase"
msgstr "zeigt Forschrittsanzeige während der Phase des Schreibens der Objekte"
-#: builtin/pack-objects.c:2454
+#: builtin/pack-objects.c:2455
msgid "similar to --all-progress when progress meter is shown"
msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird"
-#: builtin/pack-objects.c:2455
+#: builtin/pack-objects.c:2456
msgid "version[,offset]"
msgstr "version[,offset]"
-#: builtin/pack-objects.c:2456
+#: builtin/pack-objects.c:2457
msgid "write the pack index file in the specified idx format version"
msgstr ""
"schreibt die Index-Datei des Paketes in der angegebenen Indexformat-Version"
-#: builtin/pack-objects.c:2459
+#: builtin/pack-objects.c:2460
msgid "maximum size of each output pack file"
msgstr "maximale Größe für jede ausgegebene Paketdatei"
-#: builtin/pack-objects.c:2461
+#: builtin/pack-objects.c:2462
msgid "ignore borrowed objects from alternate object store"
msgstr "ignoriert geliehene Objekte von alternativem Objektspeicher"
-#: builtin/pack-objects.c:2463
+#: builtin/pack-objects.c:2464
msgid "ignore packed objects"
msgstr "ignoriert gepackte Objekte"
-#: builtin/pack-objects.c:2465
+#: builtin/pack-objects.c:2466
msgid "limit pack window by objects"
msgstr "begrenzt Paketfenster durch Objekte"
-#: builtin/pack-objects.c:2467
+#: builtin/pack-objects.c:2468
msgid "limit pack window by memory in addition to object limit"
msgstr "begrenzt Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher"
-#: builtin/pack-objects.c:2469
+#: builtin/pack-objects.c:2470
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:2471
+#: builtin/pack-objects.c:2472
msgid "reuse existing deltas"
msgstr "verwendet existierende Unterschiede wieder"
-#: builtin/pack-objects.c:2473
+#: builtin/pack-objects.c:2474
msgid "reuse existing objects"
msgstr "verwendet existierende Objekte wieder"
-#: builtin/pack-objects.c:2475
+#: builtin/pack-objects.c:2476
msgid "use OFS_DELTA objects"
msgstr "verwendet OFS_DELTA Objekte"
-#: builtin/pack-objects.c:2477
+#: builtin/pack-objects.c:2478
msgid "use threads when searching for best delta matches"
msgstr ""
"verwendet Threads bei der Suche nach den besten Übereinstimmungen bei "
"Unterschieden"
-#: builtin/pack-objects.c:2479
+#: builtin/pack-objects.c:2480
msgid "do not create an empty pack output"
msgstr "erzeugt keine leeren Pakete"
-#: builtin/pack-objects.c:2481
+#: builtin/pack-objects.c:2482
msgid "read revision arguments from standard input"
msgstr "liest Argumente bezüglich Commits von der Standard-Eingabe"
-#: builtin/pack-objects.c:2483
+#: builtin/pack-objects.c:2484
msgid "limit the objects to those that are not yet packed"
msgstr "begrenzt die Objekte zu solchen, die noch nicht gepackt wurden"
-#: builtin/pack-objects.c:2486
+#: builtin/pack-objects.c:2487
msgid "include objects reachable from any reference"
msgstr "schließt Objekte ein, die von jeder Referenz erreichbar sind"
-#: builtin/pack-objects.c:2489
+#: builtin/pack-objects.c:2490
msgid "include objects referred by reflog entries"
msgstr ""
"schließt Objekte ein, die von Einträgen des Reflogs referenziert werden"
-#: builtin/pack-objects.c:2492
+#: builtin/pack-objects.c:2493
msgid "output pack to stdout"
msgstr "schreibt Paket in die Standard-Ausgabe"
-#: builtin/pack-objects.c:2494
+#: builtin/pack-objects.c:2495
msgid "include tag objects that refer to objects to be packed"
msgstr "schließt Tag-Objekte ein, die auf gepackte Objekte referenzieren"
-#: builtin/pack-objects.c:2496
+#: builtin/pack-objects.c:2497
msgid "keep unreachable objects"
msgstr "behält nicht erreichbare Objekte"
-#: builtin/pack-objects.c:2497 parse-options.h:141
+#: builtin/pack-objects.c:2498 parse-options.h:143
msgid "time"
msgstr "Zeit"
-#: builtin/pack-objects.c:2498
+#: builtin/pack-objects.c:2499
msgid "unpack unreachable objects newer than <time>"
msgstr "entpackt nicht erreichbare Objekte, die neuer als <Zeit> sind"
-#: builtin/pack-objects.c:2501
+#: builtin/pack-objects.c:2502
msgid "create thin packs"
msgstr "erzeugt dünnere Pakete"
-#: builtin/pack-objects.c:2503
+#: builtin/pack-objects.c:2504
msgid "ignore packs that have companion .keep file"
msgstr "ignoriert Pakete die .keep Dateien haben"
-#: builtin/pack-objects.c:2505
+#: builtin/pack-objects.c:2506
msgid "pack compression level"
msgstr "Komprimierungsgrad für Paketierung"
-#: builtin/pack-objects.c:2507
+#: builtin/pack-objects.c:2508
msgid "do not hide commits by grafts"
msgstr "verbirgt keine Commits mit künstlichen Vorgängern (\"grafts\")"
@@ -7634,15 +7837,15 @@ msgstr "lässt Objekte älter als <Zeit> verfallen"
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<Optionen>] [<Repository> [<Refspec>...]]"
-#: builtin/push.c:45
+#: builtin/push.c:47
msgid "tag shorthand without <tag>"
msgstr "Kurzschrift für Tag ohne <Tag>"
-#: builtin/push.c:64
+#: builtin/push.c:66
msgid "--delete only accepts plain target ref names"
msgstr "Die Option --delete akzeptiert nur reine Referenznamen als Ziel."
-#: builtin/push.c:99
+#: builtin/push.c:101
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -7651,7 +7854,7 @@ msgstr ""
"Um eine Variante permanent zu verwenden, siehe push.default in 'git help "
"config'."
-#: builtin/push.c:102
+#: builtin/push.c:104
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -7677,7 +7880,7 @@ msgstr ""
" git push %s %s\n"
"%s"
-#: builtin/push.c:117
+#: builtin/push.c:119
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -7692,7 +7895,7 @@ msgstr ""
"\n"
" git push %s HEAD:<Name-des-Remote-Branches>\n"
-#: builtin/push.c:131
+#: builtin/push.c:133
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -7706,13 +7909,13 @@ msgstr ""
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:139
+#: builtin/push.c:141
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
"Der aktuelle Branch %s hat mehrere Upstream-Branches, \"push\" verweigert."
-#: builtin/push.c:142
+#: builtin/push.c:144
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -7720,10 +7923,10 @@ msgid ""
"to update which remote branch."
msgstr ""
"Sie versenden nach '%s', welches kein Upstream-Repository Ihres aktuellen\n"
-"Branches '%s' ist, ohne mir mitzuteilen, was ich versenden soll, um welchen\n"
+"Branches '%s' ist, ohne anzugeben, was versendet werden soll, um welchen\n"
"Remote-Branch zu aktualisieren."
-#: builtin/push.c:165
+#: builtin/push.c:167
msgid ""
"push.default is unset; its implicit value is changing in\n"
"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
@@ -7758,14 +7961,14 @@ msgstr ""
"Modus 'current' anstatt 'simple', falls Sie gelegentlich ältere Versionen "
"von Git benutzen.)"
-#: builtin/push.c:225
+#: builtin/push.c:227
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"Sie haben keine Refspec für \"push\" angegeben, und push.default ist "
"\"nothing\"."
-#: builtin/push.c:232
+#: builtin/push.c:234
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -7779,7 +7982,7 @@ msgstr ""
"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
"für weitere Details."
-#: builtin/push.c:238
+#: builtin/push.c:240
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. If you did not intend to push that branch, you may want to\n"
@@ -7795,7 +7998,7 @@ msgstr ""
"'simple', 'current'\n"
"oder 'upstream' setzen, um nur den aktuellen Branch zu versenden."
-#: builtin/push.c:244
+#: builtin/push.c:246
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
@@ -7809,7 +8012,7 @@ msgstr ""
"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
"für weitere Details."
-#: builtin/push.c:250
+#: builtin/push.c:252
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
@@ -7828,13 +8031,13 @@ msgstr ""
"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
"für weitere Details."
-#: builtin/push.c:257
+#: builtin/push.c:259
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
"Aktualisierungen wurden zurückgewiesen, weil das Tag bereits\n"
"im Remote-Repository existiert."
-#: builtin/push.c:260
+#: builtin/push.c:262
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
@@ -7844,22 +8047,22 @@ msgstr ""
"das kein Commit ist, oder es auf ein solches Objekt zeigen lassen, ohne\n"
"die Option '--force' zu verwenden.\n"
-#: builtin/push.c:320
+#: builtin/push.c:328
#, c-format
msgid "Pushing to %s\n"
msgstr "Versende nach %s\n"
-#: builtin/push.c:324
+#: builtin/push.c:332
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "Fehler beim Versenden einiger Referenzen nach '%s'"
-#: builtin/push.c:357
+#: builtin/push.c:365
#, c-format
msgid "bad repository '%s'"
msgstr "ungültiges Repository '%s'"
-#: builtin/push.c:358
+#: builtin/push.c:366
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -7881,87 +8084,95 @@ msgstr ""
"\n"
" git push <Name>\n"
-#: builtin/push.c:373
+#: builtin/push.c:381
msgid "--all and --tags are incompatible"
msgstr "Die Optionen --all und --tags sind inkompatibel."
-#: builtin/push.c:374
+#: builtin/push.c:382
msgid "--all can't be combined with refspecs"
msgstr "Die Option --all kann nicht mit Refspecs kombiniert werden."
-#: builtin/push.c:379
+#: builtin/push.c:387
msgid "--mirror and --tags are incompatible"
msgstr "Die Optionen --mirror und --tags sind inkompatibel."
-#: builtin/push.c:380
+#: builtin/push.c:388
msgid "--mirror can't be combined with refspecs"
msgstr "Die Option --mirror kann nicht mit Refspecs kombiniert werden."
-#: builtin/push.c:385
+#: builtin/push.c:393
msgid "--all and --mirror are incompatible"
msgstr "Die Optionen --all und --mirror sind inkompatibel."
-#: builtin/push.c:445
+#: builtin/push.c:453
msgid "repository"
msgstr "Repository"
-#: builtin/push.c:446
+#: builtin/push.c:454
msgid "push all refs"
msgstr "versendet alle Referenzen"
-#: builtin/push.c:447
+#: builtin/push.c:455
msgid "mirror all refs"
msgstr "spiegelt alle Referenzen"
-#: builtin/push.c:449
+#: builtin/push.c:457
msgid "delete refs"
msgstr "löscht Referenzen"
-#: builtin/push.c:450
+#: builtin/push.c:458
msgid "push tags (can't be used with --all or --mirror)"
msgstr "versendet Tags (kann nicht mit --all oder --mirror verwendet werden)"
-#: builtin/push.c:453
+#: builtin/push.c:461
msgid "force updates"
msgstr "erzwingt Aktualisierung"
-#: builtin/push.c:454
+#: builtin/push.c:463
+msgid "refname>:<expect"
+msgstr "Referenzname>:<Erwartungswert"
+
+#: builtin/push.c:464
+msgid "require old value of ref to be at this value"
+msgstr "Referenz muss sich auf dem angegebenen Wert befinden"
+
+#: builtin/push.c:466
msgid "check"
msgstr ""
-#: builtin/push.c:455
+#: builtin/push.c:467
msgid "control recursive pushing of submodules"
msgstr "steuert rekursiven \"push\" von Submodulen"
-#: builtin/push.c:457
+#: builtin/push.c:469
msgid "use thin pack"
msgstr "verwendet kleinere Pakete"
-#: builtin/push.c:458 builtin/push.c:459
+#: builtin/push.c:470 builtin/push.c:471
msgid "receive pack program"
msgstr "'receive pack' Programm"
-#: builtin/push.c:460
+#: builtin/push.c:472
msgid "set upstream for git pull/status"
msgstr "setzt Upstream für \"git pull/status\""
-#: builtin/push.c:463
+#: builtin/push.c:475
msgid "prune locally removed refs"
msgstr "entfernt lokal gelöschte Referenzen"
-#: builtin/push.c:465
+#: builtin/push.c:477
msgid "bypass pre-push hook"
msgstr "umgeht \"pre-push hook\""
-#: builtin/push.c:466
+#: builtin/push.c:478
msgid "push missing but relevant tags"
msgstr "versendet fehlende, aber relevante Tags"
-#: builtin/push.c:476
+#: builtin/push.c:488
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "Die Option --delete ist inkompatibel mit --all, --mirror und --tags."
-#: builtin/push.c:478
+#: builtin/push.c:490
msgid "--delete doesn't make sense without any refs"
msgstr "Die Option --delete kann nur mit Referenzen verwendet werden."
@@ -8040,12 +8251,12 @@ msgstr "überspringt Anwendung des Filters für spärliches Auschecken"
msgid "debug unpack-trees"
msgstr "protokolliert Entpacken der Bäume"
-#: builtin/reflog.c:500
+#: builtin/reflog.c:499
#, c-format
msgid "%s' for '%s' is not a valid timestamp"
msgstr "'%s' für '%s' ist kein gültiger Zeitstempel"
-#: builtin/reflog.c:616 builtin/reflog.c:621
+#: builtin/reflog.c:615 builtin/reflog.c:620
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "'%s' ist kein gültiger Zeitstempel"
@@ -8070,9 +8281,9 @@ msgstr "git remote rename <alt> <neu>"
msgid "git remote remove <name>"
msgstr "git remote remove <Name>"
-#: builtin/remote.c:15 builtin/remote.c:42
-msgid "git remote set-head <name> (-a | -d | <branch>)"
-msgstr "git remote set-head <Name> (-a | -d | <Branch>)"
+#: builtin/remote.c:15
+msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
+msgstr "git remote set-head <Name> (-a | --auto | -d | --delete | <Branch>)"
#: builtin/remote.c:16
msgid "git remote [-v | --verbose] show [-n] <name>"
@@ -8108,6 +8319,10 @@ msgstr "git remote set-url --delete <Name> <URL>"
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<Optionen>] <Name> <URL>"
+#: builtin/remote.c:42
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+msgstr "git remote set-head <Name> (-a | --auto | -d | --delete | <Branch>)"
+
#: builtin/remote.c:47
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <Name> <Branch>..."
@@ -8557,6 +8772,68 @@ msgstr "Werde keine URLs entfernen, die nicht für \"push\" bestimmt sind"
msgid "be verbose; must be placed before a subcommand"
msgstr "erweiterte Ausgaben; muss vor einem Unterkommando angegeben werden"
+#: builtin/repack.c:15
+msgid "git repack [options]"
+msgstr "git repack [Optionen]"
+
+#: builtin/repack.c:143
+msgid "pack everything in a single pack"
+msgstr "packt alles in eine einzige Pack-Datei"
+
+#: builtin/repack.c:145
+msgid "same as -a, and turn unreachable objects loose"
+msgstr "genau wie -a, unerreichbare Objekte werden aber nicht gelöscht"
+
+#: builtin/repack.c:148
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr "entfernt redundante Pakete und führt \"git-prune-packed\" aus"
+
+#: builtin/repack.c:150
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr "übergibt --no-reuse-delta an git-pack-objects"
+
+#: builtin/repack.c:152
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr "übergibt --no-reuse-object an git-pack-objects"
+
+#: builtin/repack.c:154
+msgid "do not run git-update-server-info"
+msgstr "git-update-server-info nicht ausführen"
+
+#: builtin/repack.c:157
+msgid "pass --local to git-pack-objects"
+msgstr "übergibt --local an git-pack-objects"
+
+#: builtin/repack.c:158
+msgid "approxidate"
+msgstr "Datumsangabe"
+
+#: builtin/repack.c:159
+msgid "with -A, do not loosen objects older than this"
+msgstr "mit -A, löscht keine Objekte älter als dieses Datum"
+
+#: builtin/repack.c:161
+msgid "size of the window used for delta compression"
+msgstr "Größe des Fensters für die Delta-Kompression"
+
+#: builtin/repack.c:163
+msgid "same as the above, but limit memory size instead of entries count"
+msgstr "gleiches wie oben, limitiert aber die Speichergröße anstatt der\n"
+"Anzahl der Einträge"
+
+#: builtin/repack.c:165
+msgid "limits the maximum delta depth"
+msgstr "limitiert die maximale Delta-Tiefe"
+
+#: builtin/repack.c:167
+msgid "maximum size of each packfile"
+msgstr "maximale Größe für jede Paketdatei"
+
+#: builtin/repack.c:345
+#, c-format
+msgid "removing '%s' failed"
+msgstr "Löschen von '%s' fehlgeschlagen"
+
#: builtin/replace.c:17
msgid "git replace [-f] <object> <replacement>"
msgstr "git replace [-f] <Objekt> <Ersetzung>"
@@ -8569,23 +8846,23 @@ msgstr "git replace -d <Objekt>..."
msgid "git replace -l [<pattern>]"
msgstr "git replace -l [<Muster>]"
-#: builtin/replace.c:121
+#: builtin/replace.c:131
msgid "list replace refs"
msgstr "listet ersetzende Referenzen auf"
-#: builtin/replace.c:122
+#: builtin/replace.c:132
msgid "delete replace refs"
msgstr "löscht ersetzende Referenzen"
-#: builtin/replace.c:123
+#: builtin/replace.c:133
msgid "replace the ref if it exists"
msgstr "ersetzt die Referenz, wenn sie existiert"
-#: builtin/rerere.c:11
+#: builtin/rerere.c:12
msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
msgstr "git rerere [clean | forget path... | status | remaining | diff | gc]"
-#: builtin/rerere.c:56
+#: builtin/rerere.c:57
msgid "register clean resolutions in index"
msgstr "registriert saubere Auflösungen in der Staging-Area"
@@ -8646,71 +8923,71 @@ msgstr "HEAD ist jetzt bei %s"
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Kann keinen '%s'-Reset durchführen, während ein Merge im Gange ist."
-#: builtin/reset.c:251
+#: builtin/reset.c:262
msgid "be quiet, only report errors"
msgstr "weniger Ausgaben, meldet nur Fehler"
-#: builtin/reset.c:253
+#: builtin/reset.c:264
msgid "reset HEAD and index"
msgstr "setzt HEAD und Staging-Area um"
-#: builtin/reset.c:254
+#: builtin/reset.c:265
msgid "reset only HEAD"
msgstr "setzt nur HEAD um"
-#: builtin/reset.c:256 builtin/reset.c:258
+#: builtin/reset.c:267 builtin/reset.c:269
msgid "reset HEAD, index and working tree"
msgstr "setzt HEAD, Staging-Area und Arbeitsverzeichnis um"
-#: builtin/reset.c:260
+#: builtin/reset.c:271
msgid "reset HEAD but keep local changes"
msgstr "setzt HEAD um, behält aber lokale Änderungen"
-#: builtin/reset.c:278
+#: builtin/reset.c:289
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Konnte '%s' nicht als gültigen Commit auflösen."
-#: builtin/reset.c:281 builtin/reset.c:289
+#: builtin/reset.c:292 builtin/reset.c:300
#, c-format
msgid "Could not parse object '%s'."
msgstr "Konnte Objekt '%s' nicht parsen."
-#: builtin/reset.c:286
+#: builtin/reset.c:297
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Konnte '%s' nicht als gültiges \"Tree\"-Objekt auflösen."
-#: builtin/reset.c:295
+#: builtin/reset.c:306
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch ist inkompatibel mit --{hard,mixed,soft}"
-#: builtin/reset.c:304
+#: builtin/reset.c:315
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed mit Pfaden ist veraltet; benutzen Sie stattdessen 'git reset -- "
"<Pfade>'."
-#: builtin/reset.c:306
+#: builtin/reset.c:317
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Ein '%s'-Reset mit Pfaden ist nicht möglich."
-#: builtin/reset.c:316
+#: builtin/reset.c:327
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "'%s'-Reset ist in einem Bare-Repository nicht erlaubt"
-#: builtin/reset.c:336
+#: builtin/reset.c:344
+msgid "Unstaged changes after reset:"
+msgstr "Nicht zum Commit vorgemerkte Änderungen nach Zurücksetzung:"
+
+#: builtin/reset.c:350
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Konnte Staging-Area-Datei nicht zu Commit '%s' setzen."
-#: builtin/reset.c:342
-msgid "Unstaged changes after reset:"
-msgstr "Nicht zum Commit vorgemerkte Änderungen nach Zurücksetzung:"
-
-#: builtin/reset.c:347
+#: builtin/reset.c:355
msgid "Could not write new index file."
msgstr "Konnte neue Staging-Area-Datei nicht schreiben."
@@ -8757,84 +9034,84 @@ msgstr "git cherry-pick [Optionen] <Commit-Angabe>..."
msgid "git cherry-pick <subcommand>"
msgstr "git cherry-pick <Unterkommando>"
-#: builtin/revert.c:71 builtin/revert.c:94
+#: builtin/revert.c:71
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr "%s: %s kann nicht mit %s verwendet werden"
-#: builtin/revert.c:105
+#: builtin/revert.c:80
msgid "end revert or cherry-pick sequence"
msgstr "beendet \"revert\" oder \"cherry-pick\" Ablauf"
-#: builtin/revert.c:106
+#: builtin/revert.c:81
msgid "resume revert or cherry-pick sequence"
msgstr "setzt \"revert\" oder \"cherry-pick\" Ablauf fort"
-#: builtin/revert.c:107
+#: builtin/revert.c:82
msgid "cancel revert or cherry-pick sequence"
msgstr "bricht \"revert\" oder \"cherry-pick\" Ablauf ab"
-#: builtin/revert.c:108
+#: builtin/revert.c:83
msgid "don't automatically commit"
msgstr "committet nicht automatisch"
-#: builtin/revert.c:109
+#: builtin/revert.c:84
msgid "edit the commit message"
msgstr "Bearbeitung der Commit-Beschreibung"
-#: builtin/revert.c:112
+#: builtin/revert.c:87
msgid "parent number"
msgstr "Nummer des Elternteils"
-#: builtin/revert.c:114
+#: builtin/revert.c:89
msgid "merge strategy"
msgstr "Merge-Strategie"
-#: builtin/revert.c:115
+#: builtin/revert.c:90
msgid "option"
msgstr "Option"
-#: builtin/revert.c:116
+#: builtin/revert.c:91
msgid "option for merge strategy"
msgstr "Option für Merge-Strategie"
-#: builtin/revert.c:127
+#: builtin/revert.c:102
msgid "append commit name"
msgstr "hängt Commit-Namen an"
-#: builtin/revert.c:128
+#: builtin/revert.c:103
msgid "allow fast-forward"
msgstr "erlaubt Vorspulen"
-#: builtin/revert.c:129
+#: builtin/revert.c:104
msgid "preserve initially empty commits"
msgstr "erhält ursprüngliche, leere Commits"
-#: builtin/revert.c:130
+#: builtin/revert.c:105
msgid "allow commits with empty messages"
msgstr "erlaubt Commits mit leerer Beschreibung"
-#: builtin/revert.c:131
+#: builtin/revert.c:106
msgid "keep redundant, empty commits"
msgstr "behält redundante, leere Commits"
-#: builtin/revert.c:135
+#: builtin/revert.c:110
msgid "program error"
msgstr "Programmfehler"
-#: builtin/revert.c:225
+#: builtin/revert.c:195
msgid "revert failed"
msgstr "\"revert\" fehlgeschlagen"
-#: builtin/revert.c:240
+#: builtin/revert.c:210
msgid "cherry-pick failed"
msgstr "\"cherry-pick\" fehlgeschlagen"
-#: builtin/rm.c:16
+#: builtin/rm.c:17
msgid "git rm [options] [--] <file>..."
msgstr "git rm [Optionen] [--] [<Datei>...]"
-#: builtin/rm.c:64
+#: builtin/rm.c:65
msgid ""
"the following submodule (or one of its nested submodules)\n"
"uses a .git directory:"
@@ -8848,7 +9125,7 @@ msgstr[1] ""
"die folgenden Submodule (oder ein geschachteltes Submodul hiervon)\n"
"benutzen ein .git-Verzeichnis:"
-#: builtin/rm.c:70
+#: builtin/rm.c:71
msgid ""
"\n"
"(use 'rm -rf' if you really want to remove it including all of its history)"
@@ -8857,7 +9134,7 @@ msgstr ""
"(benutzen Sie 'rm -rf' wenn Sie dieses Submodul wirklich mitsamt\n"
"seiner Historie löschen möchten)"
-#: builtin/rm.c:230
+#: builtin/rm.c:231
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
@@ -8872,7 +9149,7 @@ msgstr[1] ""
"unterschiedlich\n"
"zu der Datei und HEAD:"
-#: builtin/rm.c:235
+#: builtin/rm.c:236
msgid ""
"\n"
"(use -f to force removal)"
@@ -8880,13 +9157,13 @@ msgstr ""
"\n"
"(benutzen Sie -f um die Löschung zu erzwingen)"
-#: builtin/rm.c:239
+#: builtin/rm.c:240
msgid "the following file has changes staged in the index:"
msgid_plural "the following files have changes staged in the index:"
msgstr[0] "die folgende Datei hat zum Commit vorgemerkte Änderungen:"
msgstr[1] "die folgenden Dateien haben zum Commit vorgemerkte Änderungen:"
-#: builtin/rm.c:243 builtin/rm.c:254
+#: builtin/rm.c:244 builtin/rm.c:255
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
@@ -8895,38 +9172,38 @@ msgstr ""
"(benutzen Sie --cached um die Datei zu behalten, oder -f um die Entfernung "
"zu erzwingen)"
-#: builtin/rm.c:251
+#: builtin/rm.c:252
msgid "the following file has local modifications:"
msgid_plural "the following files have local modifications:"
msgstr[0] "die folgende Datei hat lokale Änderungen:"
msgstr[1] "die folgenden Dateien haben lokale Änderungen:"
-#: builtin/rm.c:269
+#: builtin/rm.c:270
msgid "do not list removed files"
msgstr "listet keine gelöschten Dateien auf"
-#: builtin/rm.c:270
+#: builtin/rm.c:271
msgid "only remove from the index"
msgstr "entfernt nur aus der Staging-Area"
-#: builtin/rm.c:271
+#: builtin/rm.c:272
msgid "override the up-to-date check"
msgstr "überschreibt die \"up-to-date\" Prüfung"
-#: builtin/rm.c:272
+#: builtin/rm.c:273
msgid "allow recursive removal"
msgstr "erlaubt rekursive Entfernung"
-#: builtin/rm.c:274
+#: builtin/rm.c:275
msgid "exit with a zero status even if nothing matched"
msgstr "beendet mit Rückgabewert 0, wenn keine Übereinstimmung gefunden wurde"
-#: builtin/rm.c:345
+#: builtin/rm.c:336
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "'%s' wird nicht ohne -r rekursiv entfernt"
-#: builtin/rm.c:384
+#: builtin/rm.c:375
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: konnte %s nicht löschen"
@@ -8940,23 +9217,23 @@ msgstr "git shortlog [<Optionen>] [Commitbereich] [[--] <Pfad>...]"
msgid "Missing author: %s"
msgstr "fehlender Autor: %s"
-#: builtin/shortlog.c:228
+#: builtin/shortlog.c:230
msgid "sort output according to the number of commits per author"
msgstr "sortiert die Ausgabe entsprechend der Anzahl von Commits pro Autor"
-#: builtin/shortlog.c:230
+#: builtin/shortlog.c:232
msgid "Suppress commit descriptions, only provides commit count"
msgstr "Unterdrückt Commit-Beschreibungen, liefert nur Anzahl der Commits"
-#: builtin/shortlog.c:232
+#: builtin/shortlog.c:234
msgid "Show the email address of each author"
msgstr "Zeigt die Email-Adresse von jedem Autor"
-#: builtin/shortlog.c:233
+#: builtin/shortlog.c:235
msgid "w[,i1[,i2]]"
msgstr "w[,i1[,i2]]"
-#: builtin/shortlog.c:234
+#: builtin/shortlog.c:236
msgid "Linewrap output"
msgstr "Ausgabe mit Zeilenumbrüchen"
@@ -9064,24 +9341,24 @@ msgstr "zeigt nur Branches (kann mit \"tags\" kombiniert werden)"
msgid "stricter reference checking, requires exact ref path"
msgstr "strengere Referenzprüfung, erfordert exakten Referenzpfad"
-#: builtin/show-ref.c:173 builtin/show-ref.c:176
+#: builtin/show-ref.c:173 builtin/show-ref.c:175
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "zeigt die HEAD-Referenz, selbst wenn diese ausgefiltert werden würde"
-#: builtin/show-ref.c:178
+#: builtin/show-ref.c:177
msgid "dereference tags into object IDs"
msgstr "dereferenziert Tags in Objekt-Identifikationen"
-#: builtin/show-ref.c:180
+#: builtin/show-ref.c:179
msgid "only show SHA1 hash using <n> digits"
msgstr "zeigt nur SHA1 Hash mit <n> Ziffern"
-#: builtin/show-ref.c:184
+#: builtin/show-ref.c:183
msgid "do not print results to stdout (useful with --verify)"
msgstr ""
"keine Ausgabe der Ergebnisse in die Standard-Ausgabe (nützlich mit --verify)"
-#: builtin/show-ref.c:186
+#: builtin/show-ref.c:185
msgid "show refs from stdin that aren't in local repository"
msgstr ""
"zeigt Referenzen von der Standard-Eingabe, die sich nicht im lokalen "
@@ -9108,11 +9385,11 @@ msgstr "löscht symbolische Referenzen"
msgid "shorten ref output"
msgstr "verkürzte Ausgabe der Referenzen"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254
msgid "reason"
msgstr "Grund"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254
msgid "reason of the update"
msgstr "Grund für die Aktualisierung"
@@ -9278,191 +9555,203 @@ msgstr "gibt nur Tags aus, die diesen Commit beinhalten"
msgid "print only tags of the object"
msgstr "gibt nur Tags von dem Objekt aus"
-#: builtin/tag.c:504
+#: builtin/tag.c:501
msgid "--column and -n are incompatible"
msgstr "--column und -n sind inkompatibel"
-#: builtin/tag.c:521
+#: builtin/tag.c:518
msgid "-n option is only allowed with -l."
msgstr "-n Option ist nur erlaubt mit -l."
-#: builtin/tag.c:523
+#: builtin/tag.c:520
msgid "--contains option is only allowed with -l."
msgstr "--contains Option ist nur erlaubt mit -l."
-#: builtin/tag.c:525
+#: builtin/tag.c:522
msgid "--points-at option is only allowed with -l."
msgstr "--points-at Option ist nur erlaubt mit -l."
-#: builtin/tag.c:533
+#: builtin/tag.c:530
msgid "only one -F or -m option is allowed."
msgstr "nur eine -F oder -m Option ist erlaubt."
-#: builtin/tag.c:553
+#: builtin/tag.c:550
msgid "too many params"
msgstr "zu viele Parameter"
-#: builtin/tag.c:559
+#: builtin/tag.c:556
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' ist kein gültiger Tagname."
-#: builtin/tag.c:564
+#: builtin/tag.c:561
#, c-format
msgid "tag '%s' already exists"
msgstr "Tag '%s' existiert bereits"
-#: builtin/tag.c:582
+#: builtin/tag.c:579
#, c-format
msgid "%s: cannot lock the ref"
msgstr "%s: kann Referenz nicht sperren"
-#: builtin/tag.c:584
+#: builtin/tag.c:581
#, c-format
msgid "%s: cannot update the ref"
msgstr "%s: kann Referenz nicht aktualisieren"
-#: builtin/tag.c:586
+#: builtin/tag.c:583
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Tag '%s' aktualisiert (war %s)\n"
-#: builtin/update-index.c:401
+#: builtin/update-index.c:402
msgid "git update-index [options] [--] [<file>...]"
msgstr "git update-index [Optionen] [--] [<Datei>...]"
-#: builtin/update-index.c:718
+#: builtin/update-index.c:720
msgid "continue refresh even when index needs update"
msgstr ""
"Aktualisierung fortsetzen, auch wenn die Staging-Area aktualisiert werden "
"muss"
-#: builtin/update-index.c:721
+#: builtin/update-index.c:723
msgid "refresh: ignore submodules"
msgstr "Aktualisierung: ignoriert Submodule"
-#: builtin/update-index.c:724
+#: builtin/update-index.c:726
msgid "do not ignore new files"
msgstr "ignoriert keine neuen Dateien"
-#: builtin/update-index.c:726
+#: builtin/update-index.c:728
msgid "let files replace directories and vice-versa"
msgstr "lässt Dateien Verzeichnisse ersetzen, und umgedreht"
-#: builtin/update-index.c:728
+#: builtin/update-index.c:730
msgid "notice files missing from worktree"
msgstr "beachtet fehlende Dateien im Arbeitsverzeichnis"
-#: builtin/update-index.c:730
+#: builtin/update-index.c:732
msgid "refresh even if index contains unmerged entries"
msgstr ""
"aktualisiert, auch wenn die Staging-Area nicht zusammengeführte Einträge "
"beinhaltet"
-#: builtin/update-index.c:733
+#: builtin/update-index.c:735
msgid "refresh stat information"
msgstr "aktualisiert Dateiinformationen"
-#: builtin/update-index.c:737
+#: builtin/update-index.c:739
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "wie --refresh, ignoriert aber \"assume-unchanged\" Einstellung"
-#: builtin/update-index.c:741
+#: builtin/update-index.c:743
msgid "<mode> <object> <path>"
msgstr "<Modus> <Objekt> <Pfad>"
-#: builtin/update-index.c:742
+#: builtin/update-index.c:744
msgid "add the specified entry to the index"
msgstr "merkt den angegebenen Eintrag zum Commit vor"
-#: builtin/update-index.c:746
+#: builtin/update-index.c:748
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/update-index.c:747
+#: builtin/update-index.c:749
msgid "override the executable bit of the listed files"
msgstr "überschreibt das \"ausführbar\"-Bit der aufgelisteten Dateien"
-#: builtin/update-index.c:751
+#: builtin/update-index.c:753
msgid "mark files as \"not changing\""
msgstr "betrachte diese Datei immer als unverändert"
-#: builtin/update-index.c:754
+#: builtin/update-index.c:756
msgid "clear assumed-unchanged bit"
msgstr "löscht \"assumed-unchanged\"-Bit"
-#: builtin/update-index.c:757
+#: builtin/update-index.c:759
msgid "mark files as \"index-only\""
msgstr "markiert Dateien als \"index-only\""
-#: builtin/update-index.c:760
+#: builtin/update-index.c:762
msgid "clear skip-worktree bit"
msgstr "löscht \"skip-worktree\"-Bit"
-#: builtin/update-index.c:763
+#: builtin/update-index.c:765
msgid "add to index only; do not add content to object database"
msgstr ""
"merkt die Änderungen nur zum Commit vor; Inhalt wird nicht der Objekt-"
"Datenbank hinzugefügt"
-#: builtin/update-index.c:765
+#: builtin/update-index.c:767
msgid "remove named paths even if present in worktree"
msgstr ""
"löscht benannte Pfade, auch wenn sie sich im Arbeitsverzeichnis befinden"
-#: builtin/update-index.c:767
+#: builtin/update-index.c:769
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "mit --stdin: eingegebene Zeilen sind durch NUL-Bytes abgeschlossen"
-#: builtin/update-index.c:769
+#: builtin/update-index.c:771
msgid "read list of paths to be updated from standard input"
msgstr "liest Liste der zu aktualisierenden Pfade von der Standard-Eingabe"
-#: builtin/update-index.c:773
+#: builtin/update-index.c:775
msgid "add entries from standard input to the index"
msgstr "merkt Einträge von der Standard-Eingabe zum Commit vor"
-#: builtin/update-index.c:777
+#: builtin/update-index.c:779
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:781
+#: builtin/update-index.c:783
msgid "only update entries that differ from HEAD"
msgstr "aktualisiert nur Einträge, die unterschiedlich zu HEAD sind"
-#: builtin/update-index.c:785
+#: builtin/update-index.c:787
msgid "ignore files missing from worktree"
msgstr "ignoriert fehlende Dateien im Arbeitsverzeichnis"
-#: builtin/update-index.c:788
+#: builtin/update-index.c:790
msgid "report actions to standard output"
msgstr "gibt die Aktionen in der Standard-Ausgabe aus"
-#: builtin/update-index.c:790
+#: builtin/update-index.c:792
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(für Fremdprogramme) keine gespeicherten, nicht aufgelöste Konflikte"
-#: builtin/update-index.c:794
+#: builtin/update-index.c:796
msgid "write index in this format"
msgstr "schreibt Staging-Area-Datei in diesem Format"
-#: builtin/update-ref.c:7
+#: builtin/update-ref.c:9
msgid "git update-ref [options] -d <refname> [<oldval>]"
msgstr "git update-ref [Optionen] -d <Referenzname> [<alterWert>]"
-#: builtin/update-ref.c:8
+#: builtin/update-ref.c:10
msgid "git update-ref [options] <refname> <newval> [<oldval>]"
msgstr "git update-ref [Optionen] <Referenzname> <neuerWert> [<alterWert>]"
-#: builtin/update-ref.c:19
+#: builtin/update-ref.c:11
+msgid "git update-ref [options] --stdin [-z]"
+msgstr "git update-ref [Optionen] --stdin [-z]"
+
+#: builtin/update-ref.c:255
msgid "delete the reference"
msgstr "löscht diese Referenz"
-#: builtin/update-ref.c:21
+#: builtin/update-ref.c:257
msgid "update <refname> not the one it points to"
msgstr "aktualisiert <Referenzname>, nicht den Verweis"
+#: builtin/update-ref.c:258
+msgid "stdin has NUL-terminated arguments"
+msgstr "Standard-Eingabe hat durch NUL-Zeichen abgeschlossene Argumente"
+
+#: builtin/update-ref.c:259
+msgid "read updates from stdin"
+msgstr "liest Aktualisierungen von der Standard-Eingabe"
+
#: builtin/update-server-info.c:6
msgid "git update-server-info [--force]"
msgstr "git update-server-info [--force]"
@@ -9518,23 +9807,23 @@ msgstr ""
"oder 'git help <Konzept>' um mehr über ein spezifisches Kommando oder\n"
"Konzept zu erfahren."
-#: parse-options.h:144
+#: parse-options.h:146
msgid "expiry date"
msgstr "Verfallsdatum"
-#: parse-options.h:159
+#: parse-options.h:161
msgid "no-op (backward compatibility)"
msgstr "Kein Effekt (Rückwärtskompatibilität)"
-#: parse-options.h:236
+#: parse-options.h:238
msgid "be more verbose"
msgstr "erweiterte Ausgaben"
-#: parse-options.h:238
+#: parse-options.h:240
msgid "be more quiet"
msgstr "weniger Ausgaben"
-#: parse-options.h:244
+#: parse-options.h:246
msgid "use <n> digits to display SHA-1s"
msgstr "benutze <n> Ziffern zur Anzeige von SHA-1s"
@@ -9993,7 +10282,7 @@ msgid "Pull is not possible because you have unmerged files."
msgstr ""
"\"pull\" ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
-#: git-pull.sh:203
+#: git-pull.sh:223
msgid "updating an unborn branch with changes added to the index"
msgstr ""
"Aktualisiere einen ungeborenen Branch mit Änderungen, die zum Commit "
@@ -10003,7 +10292,7 @@ msgstr ""
#. The working tree and the index file is still based on the
#. $orig_head commit, but we are merging into $curr_head.
#. First update the working tree to match $curr_head.
-#: git-pull.sh:235
+#: git-pull.sh:255
#, sh-format
msgid ""
"Warning: fetch updated the current branch head.\n"
@@ -10013,11 +10302,11 @@ msgstr ""
"Warnung: \"fetch\" aktualisierte die Spitze des aktuellen Branches.\n"
"Warnung: Spule Ihr Arbeitsverzeichnis von Commit $orig_head vor."
-#: git-pull.sh:260
+#: git-pull.sh:280
msgid "Cannot merge multiple branches into empty head"
msgstr "Kann nicht mehrere Branches in einen ungeborenen Branch zusammenführen"
-#: git-pull.sh:264
+#: git-pull.sh:284
msgid "Cannot rebase onto multiple branches"
msgstr "kann Rebase nicht auf mehrere Branches ausführen"
@@ -10054,33 +10343,33 @@ msgstr ""
"Ihre Änderungen sind im Stash sicher.\n"
"Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n"
-#: git-rebase.sh:190
+#: git-rebase.sh:199
msgid "The pre-rebase hook refused to rebase."
msgstr "Der \"pre-rebase hook\" hat den Rebase zurückgewiesen."
-#: git-rebase.sh:195
+#: git-rebase.sh:204
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "\"git-am\" scheint im Gange zu sein. Kann Rebase nicht durchführen."
-#: git-rebase.sh:329
+#: git-rebase.sh:338
msgid "The --exec option must be used with the --interactive option"
msgstr "Die Option --exec muss mit --interactive verwendet werden."
-#: git-rebase.sh:334
+#: git-rebase.sh:343
msgid "No rebase in progress?"
msgstr "Kein Rebase im Gange?"
-#: git-rebase.sh:345
+#: git-rebase.sh:354
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"Die --edit-todo Aktion kann nur während eines interaktiven Rebase verwendet "
"werden."
-#: git-rebase.sh:352
+#: git-rebase.sh:361
msgid "Cannot read HEAD"
msgstr "Kann HEAD nicht lesen"
-#: git-rebase.sh:355
+#: git-rebase.sh:364
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -10088,12 +10377,12 @@ msgstr ""
"Sie müssen alle Merge-Konflikte editieren und diese dann\n"
"mittels \"git add\" als aufgelöst markieren"
-#: git-rebase.sh:373
+#: git-rebase.sh:382
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Konnte nicht zu $head_name zurückgehen"
-#: git-rebase.sh:392
+#: git-rebase.sh:401
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -10114,68 +10403,68 @@ msgstr ""
"und führen Sie dieses Kommando nochmal aus. Es wird angehalten, falls noch\n"
"etwas Schützenswertes vorhanden ist."
-#: git-rebase.sh:437
+#: git-rebase.sh:446
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "ungültiger Upstream-Branch $upstream_name"
-#: git-rebase.sh:461
+#: git-rebase.sh:470
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: es gibt mehr als eine Merge-Basis"
-#: git-rebase.sh:464 git-rebase.sh:468
+#: git-rebase.sh:473 git-rebase.sh:477
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: es gibt keine Merge-Basis"
-#: git-rebase.sh:473
+#: git-rebase.sh:482
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "$onto_name zeigt auf keinen gültigen Commit"
-#: git-rebase.sh:496
+#: git-rebase.sh:505
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "fatal: Branch $branch_name nicht gefunden"
-#: git-rebase.sh:519
+#: git-rebase.sh:528
msgid "Cannot autostash"
msgstr "Kann \"autostash\" nicht ausführen."
-#: git-rebase.sh:524
+#: git-rebase.sh:533
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "\"autostash\" erzeugt: $stash_abbrev"
-#: git-rebase.sh:528
+#: git-rebase.sh:537
msgid "Please commit or stash them."
msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
-#: git-rebase.sh:548
+#: git-rebase.sh:557
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "Aktueller Branch $branch_name ist auf dem neusten Stand."
-#: git-rebase.sh:552
+#: git-rebase.sh:561
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
"Aktueller Branch $branch_name ist auf dem neusten Stand, Rebase erzwungen."
-#: git-rebase.sh:563
+#: git-rebase.sh:572
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Änderungen von $mb zu $onto:"
#. Detach HEAD and reset the tree
-#: git-rebase.sh:572
+#: git-rebase.sh:581
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Zunächst wird der Branch zurückgespult, um Ihre Änderungen\n"
"darauf neu anzuwenden..."
-#: git-rebase.sh:582
+#: git-rebase.sh:591
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "$branch_name zu $onto_name vorgespult."
@@ -10223,7 +10512,7 @@ msgstr "Kann $ref_stash nicht mit $w_commit aktualisieren."
#. $ git stash save --blah-blah 2>&1 | head -n 2
#. error: unknown option for 'stash save': --blah-blah
#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:241
+#: git-stash.sh:237
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
@@ -10233,100 +10522,85 @@ msgstr ""
" Um eine Beschreibung anzugeben, benutzen Sie \"git stash save -- "
"'$option'\""
-#: git-stash.sh:262
+#: git-stash.sh:258
msgid "No local changes to save"
msgstr "Keine lokalen Änderungen zum Speichern"
-#: git-stash.sh:268
-msgid ""
-"The following untracked files would NOT be saved but need to be removed by "
-"stash save:"
-msgstr ""
-"Die folgenden unbeobachteten Dateien würden NICHT gespeichert werden,\n"
-"müssen aber durch \"stash save\" entfernt werden:"
-
-#: git-stash.sh:270
-msgid ""
-"Aborting. Consider using either the --force or --include-untracked option."
-msgstr ""
-"Abgebrochen. Benutzen Sie entweder die Option --force oder --include-"
-"untracked."
-
-#: git-stash.sh:274
+#: git-stash.sh:262
msgid "Cannot initialize stash"
msgstr "Kann \"stash\" nicht initialisieren"
-#: git-stash.sh:278
+#: git-stash.sh:266
msgid "Cannot save the current status"
msgstr "Kann den aktuellen Status nicht speichern"
-#: git-stash.sh:296
+#: git-stash.sh:284
msgid "Cannot remove worktree changes"
msgstr "Kann Änderungen im Arbeitsverzeichnis nicht löschen"
-#: git-stash.sh:395
+#: git-stash.sh:383
msgid "No stash found."
msgstr "Kein \"stash\" gefunden."
-#: git-stash.sh:402
+#: git-stash.sh:390
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Zu viele Commits angegeben: $REV"
-#: git-stash.sh:408
+#: git-stash.sh:396
#, sh-format
msgid "$reference is not valid reference"
msgstr "$reference ist keine gültige Referenz"
-#: git-stash.sh:436
+#: git-stash.sh:424
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' ist kein \"stash\"-artiger Commit"
-#: git-stash.sh:447
+#: git-stash.sh:435
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' ist keine \"stash\"-Referenz"
-#: git-stash.sh:455
+#: git-stash.sh:443
msgid "unable to refresh index"
msgstr "unfähig die Staging-Area zu aktualisieren"
-#: git-stash.sh:459
+#: git-stash.sh:447
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:467
+#: git-stash.sh:455
msgid "Conflicts in index. Try without --index."
msgstr "Konflikte in der Staging-Area. Versuchen Sie es ohne --index."
-#: git-stash.sh:469
+#: git-stash.sh:457
msgid "Could not save index tree"
msgstr "Konnte Staging-Area-Verzeichnis nicht speichern"
-#: git-stash.sh:503
+#: git-stash.sh:491
msgid "Cannot unstage modified files"
msgstr "Kann geänderte Dateien nicht aus der Staging-Area entfernen"
-#: git-stash.sh:518
+#: git-stash.sh:506
msgid "Index was not unstashed."
msgstr "Staging-Area wurde nicht aus dem Stash zurückgeladen."
-#: git-stash.sh:535
+#: git-stash.sh:523
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Gelöscht ${REV} ($s)"
-#: git-stash.sh:536
+#: git-stash.sh:524
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Konnte \"stash\"-Eintrag nicht löschen"
-#: git-stash.sh:543
+#: git-stash.sh:531
msgid "No branch name specified"
msgstr "Kein Branchname spezifiziert"
-#: git-stash.sh:615
+#: git-stash.sh:603
msgid "(To restore them type \"git stash apply\")"
msgstr "(Zur Wiederherstellung geben Sie \"git stash apply\" ein)"
@@ -10608,49 +10882,60 @@ msgstr ""
"Die Optionen --cached und --files können nicht gemeinsam verwendet werden."
#. unexpected type
-#: git-submodule.sh:1066
+#: git-submodule.sh:1073
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "unerwarteter Modus $mod_dst"
-#: git-submodule.sh:1086
+#: git-submodule.sh:1093
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_src"
-#: git-submodule.sh:1089
+#: git-submodule.sh:1096
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_dst"
-#: git-submodule.sh:1092
+#: git-submodule.sh:1099
#, 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:1117
+#: git-submodule.sh:1124
msgid "blob"
msgstr "Blob"
-#: git-submodule.sh:1155
-msgid "Submodules changed but not updated:"
-msgstr "Submodule geändert, aber nicht aktualisiert:"
-
-#: git-submodule.sh:1157
-msgid "Submodule changes to be committed:"
-msgstr "Änderungen in Submodul zum Committen:"
-
-#: git-submodule.sh:1242
+#: git-submodule.sh:1238
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Fehler bei Rekursion in Submodul-Pfad '$sm_path'"
-#: git-submodule.sh:1306
+#: git-submodule.sh:1302
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synchronisiere Submodul-URL für '$displaypath'"
+#~ msgid "input paths are terminated by a null character"
+#~ msgstr "Eingabepfade sind durch ein NUL Zeichen abgeschlossen"
+
+#~ msgid "done\n"
+#~ msgstr "Fertig\n"
+
+#~ msgid ""
+#~ "The following untracked files would NOT be saved but need to be removed "
+#~ "by stash save:"
+#~ msgstr ""
+#~ "Die folgenden unbeobachteten Dateien würden NICHT gespeichert werden,\n"
+#~ "müssen aber durch \"stash save\" entfernt werden:"
+
+#~ msgid ""
+#~ "Aborting. Consider using either the --force or --include-untracked option."
+#~ msgstr ""
+#~ "Abgebrochen. Benutzen Sie entweder die Option --force oder --include-"
+#~ "untracked."
+
#~ msgid " (fix conflicts and then run \"git am --resolved\")"
#~ msgstr ""
#~ " (beheben Sie die Konflikte und führen Sie dann \"git am --resolved\" "
@@ -10783,9 +11068,6 @@ msgstr "Synchronisiere Submodul-URL für '$displaypath'"
#~ msgid "-B cannot be used with -b"
#~ msgstr "-B kann nicht mit -b benutzt werden"
-#~ msgid "--patch is incompatible with all other options"
-#~ msgstr "--patch ist inkompatibel mit allen anderen Optionen"
-
#~ msgid "--detach cannot be used with -b/-B/--orphan"
#~ msgstr "--detach kann nicht mit -b/-B/--orphan benutzt werden"
diff --git a/po/fr.po b/po/fr.po
index 7a7daa398..44995ba61 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -72,8 +72,8 @@ msgid ""
msgstr ""
"Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2013-08-06 14:10+0800\n"
-"PO-Revision-Date: 2013-10-05 21:17+0200\n"
+"POT-Creation-Date: 2013-11-02 08:06+0800\n"
+"PO-Revision-Date: 2013-11-07 21:41+0100\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language: fr\n"
@@ -123,71 +123,76 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <dépôt> [--exec <commande>] --list"
-#: archive.c:323
+#: archive.c:242 builtin/add.c:240 builtin/add.c:556 builtin/rm.c:328
+#, c-format
+msgid "pathspec '%s' did not match any files"
+msgstr "le chemin '%s' ne correspond à aucun fichier"
+
+#: archive.c:327
msgid "fmt"
msgstr "fmt"
-#: archive.c:323
+#: archive.c:327
msgid "archive format"
msgstr "format d'archive"
-#: archive.c:324 builtin/log.c:1173
+#: archive.c:328 builtin/log.c:1193
msgid "prefix"
msgstr "préfixe"
-#: archive.c:325
+#: archive.c:329
msgid "prepend prefix to each pathname in the archive"
msgstr "préfixer chaque chemin de fichier dans l'archive"
-#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2292
-#: builtin/blame.c:2293 builtin/config.c:56 builtin/fast-export.c:673
-#: builtin/fast-export.c:675 builtin/grep.c:714 builtin/hash-object.c:77
-#: builtin/ls-files.c:496 builtin/ls-files.c:499 builtin/notes.c:408
-#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:152
+#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2264
+#: builtin/blame.c:2265 builtin/config.c:58 builtin/fast-export.c:680
+#: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77
+#: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408
+#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154
msgid "file"
msgstr "fichier"
-#: archive.c:327 builtin/archive.c:89
+#: archive.c:331 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "écrire l'archive dans ce fichier"
-#: archive.c:329
+#: archive.c:333
msgid "read .gitattributes in working directory"
msgstr "lire .gitattributes dans le répertoire de travail"
-#: archive.c:330
+#: archive.c:334
msgid "report archived files on stderr"
msgstr "afficher les fichiers archivés sur stderr"
-#: archive.c:331
+#: archive.c:335
msgid "store only"
msgstr "stockage seulement"
-#: archive.c:332
+#: archive.c:336
msgid "compress faster"
msgstr "compression rapide"
-#: archive.c:340
+#: archive.c:344
msgid "compress better"
msgstr "compression efficace"
-#: archive.c:343
+#: archive.c:347
msgid "list supported archive formats"
msgstr "afficher les formats d'archive supportés"
-#: archive.c:345 builtin/archive.c:90 builtin/clone.c:85
+#: archive.c:349 builtin/archive.c:90 builtin/clone.c:84
msgid "repo"
msgstr "dépôt"
-#: archive.c:346 builtin/archive.c:91
+#: archive.c:350 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "récupérer l'archive depuis le dépôt distant <dépôt>"
-#: archive.c:347 builtin/archive.c:92 builtin/notes.c:487
+#: archive.c:351 builtin/archive.c:92 builtin/notes.c:487
msgid "command"
msgstr "commande"
-#: archive.c:348 builtin/archive.c:93
+#: archive.c:352 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "chemin vers la commande distante git-upload-archive"
@@ -275,19 +280,19 @@ msgstr "Une branche nommée '%s' existe déjà."
msgid "Cannot force update the current branch."
msgstr "Impossible de forcer la mise à jour de la branche courante."
-#: branch.c:216
+#: branch.c:215
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
"Impossible de paramétrer le suivi de branche ; le point de départ '%s' n'est "
"pas une branche."
-#: branch.c:218
+#: branch.c:217
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "la branche amont demandée '%s' n'existe pas"
-#: branch.c:220
+#: branch.c:219
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -307,26 +312,26 @@ msgstr ""
"sa jumelle distante, vous souhaiterez utiliser \"git push -u\"\n"
"pour paramétrer le suivi distant en même temps que vous poussez."
-#: branch.c:265
+#: branch.c:264
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "Nom d'objet invalide : '%s'."
-#: branch.c:285
+#: branch.c:284
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "Nom d'objet ambigu : '%s'."
-#: branch.c:290
+#: branch.c:289
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "Point d'embranchement invalide : '%s'."
-#: branch.c:296
+#: branch.c:295
msgid "Failed to lock ref for update"
msgstr "Échec du verrouillage de la référence pour mise à jour"
-#: branch.c:314
+#: branch.c:313
msgid "Failed to write ref"
msgstr "Échec de l'écriture de la référence"
@@ -340,7 +345,7 @@ msgstr "'%s' ne semble pas être un fichier bundle v2"
msgid "unrecognized header: %s%s (%d)"
msgstr "en-tête non reconnu : %s%s (%d)"
-#: bundle.c:89 builtin/commit.c:697
+#: bundle.c:89 builtin/commit.c:706
#, c-format
msgid "could not open '%s'"
msgstr "impossible d'ouvrir '%s'"
@@ -349,9 +354,9 @@ msgstr "impossible d'ouvrir '%s'"
msgid "Repository lacks these prerequisite commits:"
msgstr "Le dépôt ne dispose pas des commits prérequis :"
-#: bundle.c:164 sequencer.c:661 sequencer.c:1111 builtin/log.c:331
-#: builtin/log.c:801 builtin/log.c:1399 builtin/log.c:1625 builtin/merge.c:364
-#: builtin/shortlog.c:156
+#: bundle.c:164 sequencer.c:662 sequencer.c:1112 builtin/log.c:332
+#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:364
+#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr "échec de la préparation du parcours des révisions"
@@ -377,7 +382,7 @@ msgstr[1] "Le colis exige ces %d références :"
msgid "rev-list died"
msgstr "rev-list a disparu"
-#: bundle.c:300 builtin/log.c:1310 builtin/shortlog.c:259
+#: bundle.c:300 builtin/log.c:1329 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr "argument non reconnu : %s"
@@ -529,7 +534,7 @@ msgstr ""
"Erreurs dans la variable de configuration 'diff.dirstat' :\n"
"%s"
-#: diff.c:3487
+#: diff.c:3490
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -538,7 +543,7 @@ msgstr ""
"Impossible d'analyser le paramètre de l'option --dirstat/-X :\n"
"%s"
-#: diff.c:3501
+#: diff.c:3504
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'"
@@ -565,17 +570,17 @@ msgstr "impossible de créer un fichier temporaire '%s' : %s"
msgid "failed writing detached signature to '%s': %s"
msgstr "impossible d'écrire la signature détachée dans '%s' : %s"
-#: grep.c:1623
+#: grep.c:1695
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s' : lecture de %s impossible"
-#: grep.c:1640
+#: grep.c:1712
#, c-format
msgid "'%s': %s"
msgstr "'%s' : %s"
-#: grep.c:1651
+#: grep.c:1723
#, c-format
msgid "'%s': short read %s"
msgstr "'%s' : lecture tronquée %s"
@@ -649,8 +654,8 @@ msgstr "%s: %s - %s"
msgid "failed to read the cache"
msgstr "impossible de lire le cache"
-#: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566
-#: builtin/clone.c:656
+#: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559
+#: builtin/clone.c:655
msgid "unable to write new index file"
msgstr "impossible d'écrire le nouveau fichier d'index"
@@ -699,7 +704,7 @@ msgstr "impossible de lire l'objet %s '%s'"
msgid "blob expected for %s '%s'"
msgstr "blob attendu pour %s '%s'"
-#: merge-recursive.c:774 builtin/clone.c:312
+#: merge-recursive.c:774 builtin/clone.c:311
#, c-format
msgid "failed to open '%s'"
msgstr "échec à l'ouverture de '%s'"
@@ -835,7 +840,7 @@ msgstr "%s sauté (fusion identique à l'existant)"
msgid "Auto-merging %s"
msgstr "Fusion automatique de %s"
-#: merge-recursive.c:1634 git-submodule.sh:1118
+#: merge-recursive.c:1634 git-submodule.sh:1125
msgid "submodule"
msgstr "sous-module"
@@ -931,58 +936,121 @@ msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)"
msgid "Bad %s value: '%s'"
msgstr "Mauvaise valeur de %s : '%s'"
-#: object.c:204
+#: object.c:202
#, c-format
msgid "unable to parse object: %s"
msgstr "impossible d'analyser l'objet : %s"
-#: parse-options.c:489
+#: parse-options.c:537
msgid "..."
msgstr "..."
-#: parse-options.c:507
+#: parse-options.c:555
#, c-format
msgid "usage: %s"
msgstr "usage : %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:511
+#: parse-options.c:559
#, c-format
msgid " or: %s"
msgstr " ou : %s"
-#: parse-options.c:514
+#: parse-options.c:562
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:548
+#: parse-options.c:596
msgid "-NUM"
msgstr "-NUM"
-#: pathspec.c:83
+#: pathspec.c:118
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr "les réglages de spécificateurs de chemin généraux 'glob' et 'noglob' sont incompatibles"
+
+#: pathspec.c:128
+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:158
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "paramètre invalide pour le spécificateur magique de chemin 'prefix'"
+
+#: pathspec.c:164
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "La spécification magique de chemin '%.*s' est invalide dans '%s'"
+
+#: pathspec.c:168
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "')' manquante à la fin du spécificateur magique de chemin dans '%s'"
+
+#: pathspec.c:186
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "Spécificateur magique '%c' non implémenté dans '%s'"
+
+#: pathspec.c:211
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s : 'literal' et 'glob' sont incompatibles"
+
+#: pathspec.c:222
+#, c-format
+msgid "%s: '%s' is outside repository"
+msgstr "%s : '%s' est hors du dépôt"
+
+#: pathspec.c:278
#, c-format
-msgid "Path '%s' is in submodule '%.*s'"
+msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Le chemin '%s' est dans le sous-module '%.*s'"
-#: pathspec.c:99
+#.
+#. * We may want to substitute "this command" with a command
+#. * name. E.g. when add--interactive dies when running
+#. * "checkout -p"
+#.
+#: pathspec.c:340
#, c-format
-msgid "'%s' is beyond a symbolic link"
-msgstr "'%s' est au delà d'un lien symbolique"
+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"
-#: remote.c:1788
+#: pathspec.c:415
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "le chemin '%s' est au-delà d'un lien symbolique"
+
+#: remote.c:1833
+#, 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:1837
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr " (utilisez \"git branch -unset-upstream\" pour corriger)\n"
+
+#: remote.c:1840
+#, c-format
+msgid "Your branch is up-to-date with '%s'.\n"
+msgstr "Votre branche est à jour avec '%s'.\n"
+
+#: remote.c:1844
#, 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:1794
+#: remote.c:1850
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n"
-#: remote.c:1797
+#: remote.c:1853
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -994,11 +1062,11 @@ msgstr[1] ""
"Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour "
"en avance rapide.\n"
-#: remote.c:1805
+#: remote.c:1861
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n"
-#: remote.c:1808
+#: remote.c:1864
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1013,7 +1081,7 @@ msgstr[1] ""
"Votre branche et '%s' ont divergé,\n"
"et ont %d et %d commits différents chacune respectivement.\n"
-#: remote.c:1818
+#: remote.c:1874
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"
@@ -1057,7 +1125,7 @@ msgstr ""
"avec 'git add <chemins>' ou 'git rm <chemins>'\n"
"puis validez le résultat avec 'git commit'"
-#: sequencer.c:245 sequencer.c:869 sequencer.c:952
+#: sequencer.c:245 sequencer.c:870 sequencer.c:953
#, c-format
msgid "Could not write to %s"
msgstr "Impossible d'écrire dans %s"
@@ -1077,47 +1145,47 @@ msgstr "Vos modifications locales seraient écrasées par revert."
#: sequencer.c:268
msgid "Commit your changes or stash them to proceed."
-msgstr "Validez vos modifications ou remisez-les pour continuer."
+msgstr "Validez vos modifications ou les remiser pour continuer."
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:324
+#: sequencer.c:325
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Impossible d'écrire le nouveau fichier index"
-#: sequencer.c:355
+#: sequencer.c:356
msgid "Could not resolve HEAD commit\n"
msgstr "Impossible de résoudre le commit HEAD\n"
-#: sequencer.c:377
+#: sequencer.c:378
msgid "Unable to update cache tree\n"
msgstr "Impossible de mettre à jour l'arbre de cache\n"
-#: sequencer.c:422
+#: sequencer.c:423
#, c-format
msgid "Could not parse commit %s\n"
msgstr "Impossible d'analyser le commit %s\n"
-#: sequencer.c:427
+#: sequencer.c:428
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr "Impossible d'analyser le commit parent %s\n"
-#: sequencer.c:493
+#: sequencer.c:494
msgid "Your index file is unmerged."
msgstr "Votre fichier d'index n'est pas fusionné."
-#: sequencer.c:512
+#: sequencer.c:513
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr "Le commit %s est une fusion mais l'option -m n'a pas été spécifiée."
-#: sequencer.c:520
+#: sequencer.c:521
#, c-format
msgid "Commit %s does not have parent %d"
msgstr "Le commit %s n'a pas le parent %d"
-#: sequencer.c:524
+#: sequencer.c:525
#, c-format
msgid "Mainline was specified but commit %s is not a merge."
msgstr ""
@@ -1126,153 +1194,153 @@ msgstr ""
#. TRANSLATORS: The first %s will be "revert" or
#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:537
+#: sequencer.c:538
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s : impossible d'analyser le commit parent %s"
-#: sequencer.c:541
+#: sequencer.c:542
#, c-format
msgid "Cannot get commit message for %s"
msgstr "Impossible d'obtenir un message de validation pour %s"
-#: sequencer.c:627
+#: sequencer.c:628
#, c-format
msgid "could not revert %s... %s"
msgstr "impossible d'annuler %s... %s"
-#: sequencer.c:628
+#: sequencer.c:629
#, c-format
msgid "could not apply %s... %s"
msgstr "impossible d'appliquer %s... %s"
-#: sequencer.c:664
+#: sequencer.c:665
msgid "empty commit set passed"
msgstr "l'ensemble de commits spécifié est vide"
-#: sequencer.c:672
+#: sequencer.c:673
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s : échec à la lecture de l'index"
-#: sequencer.c:677
+#: sequencer.c:678
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s : échec du rafraîchissement de l'index"
-#: sequencer.c:735
+#: sequencer.c:736
#, c-format
msgid "Cannot %s during a %s"
msgstr "Impossible de %s pendant un %s"
-#: sequencer.c:757
+#: sequencer.c:758
#, c-format
msgid "Could not parse line %d."
msgstr "Impossible d'analyser la ligne %d."
-#: sequencer.c:762
+#: sequencer.c:763
msgid "No commits parsed."
msgstr "Aucun commit analysé."
-#: sequencer.c:775
+#: sequencer.c:776
#, c-format
msgid "Could not open %s"
msgstr "Impossible d'ouvrir %s"
-#: sequencer.c:779
+#: sequencer.c:780
#, c-format
msgid "Could not read %s."
msgstr "Impossible de lire %s."
-#: sequencer.c:786
+#: sequencer.c:787
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr "Feuille d'instruction inutilisable : %s"
-#: sequencer.c:814
+#: sequencer.c:815
#, c-format
msgid "Invalid key: %s"
msgstr "Clé invalide: %s"
-#: sequencer.c:817
+#: sequencer.c:818
#, c-format
msgid "Invalid value for %s: %s"
msgstr "Valeur invalide pour %s : %s"
-#: sequencer.c:829
+#: sequencer.c:830
#, c-format
msgid "Malformed options sheet: %s"
msgstr "Feuille d'options malformée : %s"
-#: sequencer.c:850
+#: sequencer.c:851
msgid "a cherry-pick or revert is already in progress"
msgstr "un picorage ou un retour est déjà en cours"
-#: sequencer.c:851
+#: sequencer.c:852
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\""
-#: sequencer.c:855
+#: sequencer.c:856
#, c-format
msgid "Could not create sequencer directory %s"
msgstr "Impossible de créer le répertoire de séquenceur %s"
-#: sequencer.c:871 sequencer.c:956
+#: sequencer.c:872 sequencer.c:957
#, c-format
msgid "Error wrapping up %s."
msgstr "Erreur lors de l'emballage de %s."
-#: sequencer.c:890 sequencer.c:1024
+#: sequencer.c:891 sequencer.c:1025
msgid "no cherry-pick or revert in progress"
msgstr "aucun picorage ou retour en cours"
-#: sequencer.c:892
+#: sequencer.c:893
msgid "cannot resolve HEAD"
msgstr "impossible de résoudre HEAD"
-#: sequencer.c:894
+#: sequencer.c:895
msgid "cannot abort from a branch yet to be born"
msgstr "impossible d'abandonner depuis une branche non encore créée"
-#: sequencer.c:916 builtin/apply.c:4061
+#: sequencer.c:917 builtin/apply.c:4061
#, c-format
msgid "cannot open %s: %s"
msgstr "impossible d'ouvrir %s : %s"
-#: sequencer.c:919
+#: sequencer.c:920
#, c-format
msgid "cannot read %s: %s"
msgstr "impossible de lire %s : %s"
-#: sequencer.c:920
+#: sequencer.c:921
msgid "unexpected end of file"
msgstr "fin de fichier inattendue"
-#: sequencer.c:926
+#: sequencer.c:927
#, 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:949
+#: sequencer.c:950
#, c-format
msgid "Could not format %s."
msgstr "Impossible de formater %s."
-#: sequencer.c:1092
+#: sequencer.c:1093
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s : impossible de picorer un %s"
-#: sequencer.c:1095
+#: sequencer.c:1096
#, c-format
msgid "%s: bad revision"
msgstr "%s : mauvaise révision"
-#: sequencer.c:1129
+#: sequencer.c:1130
msgid "Can't revert as initial commit"
msgstr "Impossible d'annuler en tant que commit initial"
-#: sequencer.c:1130
+#: sequencer.c:1131
msgid "Can't cherry-pick into empty head"
msgstr "Impossible de picorer vers une HEAD vide"
@@ -1301,261 +1369,354 @@ msgstr ""
"message\n"
"en lançant \"git config advice.objectNameWarning false\""
-#: sha1_name.c:1097
+#: sha1_name.c:1112
msgid "HEAD does not point to a branch"
msgstr "HEAD ne pointe pas sur une branche"
-#: sha1_name.c:1100
+#: sha1_name.c:1115
#, c-format
msgid "No such branch: '%s'"
msgstr "Branche inconnue : '%s'"
-#: sha1_name.c:1102
+#: sha1_name.c:1117
#, c-format
msgid "No upstream configured for branch '%s'"
msgstr "Aucune branche amont configurée pour la branche '%s'"
-#: sha1_name.c:1106
+#: sha1_name.c:1121
#, 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"
-#: wrapper.c:408
+#: 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"
+
+#. Maybe the user already did that, don't error out here
+#: 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
+#. Maybe the user already did that, don't error out here
+#: 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:127
+msgid "could not find .gitmodules in index"
+msgstr "impossible de trouver .gitmodules dans l'index"
+
+#: submodule.c:133
+msgid "reading updated .gitmodules failed"
+msgstr "échec de la lecture du .gitmodules mis à jour"
+
+#: submodule.c:135
+msgid "unable to stat updated .gitmodules"
+msgstr "échec de stat du .gitmodules mis à jour"
+
+#: submodule.c:139
+msgid "unable to remove .gitmodules from index"
+msgstr "suppression du .gitmodules dans l'index impossible"
+
+#: submodule.c:141
+msgid "adding updated .gitmodules failed"
+msgstr "échec de l'ajout du .gitmodules mis à jour"
+
+#: submodule.c:143
+msgid "staging updated .gitmodules failed"
+msgstr "échec de la mise en index du .gitmodules mis à jour"
+
+#: submodule.c:1144 builtin/init-db.c:363
+#, c-format
+msgid "Could not create git link %s"
+msgstr "Impossible de créer le lien git %s"
+
+#: submodule.c:1155
+#, c-format
+msgid "Could not set core.worktree in %s"
+msgstr "Impossible de paramétrer core.worktree dans %s"
+
+#: 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"
+
+#: wrapper.c:422
#, c-format
msgid "unable to access '%s': %s"
msgstr "impossible d'accéder à '%s' : %s"
-#: wrapper.c:429
+#: wrapper.c:443
#, c-format
msgid "unable to access '%s'"
msgstr "impossible d'accéder à '%s'"
-#: wrapper.c:440
+#: wrapper.c:454
#, c-format
msgid "unable to look up current user in the passwd file: %s"
msgstr ""
"impossible de rechercher l'utilisateur actuel dans le fichier de mots de "
"passe : %s"
-#: wrapper.c:441
+#: wrapper.c:455
msgid "no such user"
msgstr "utilisateur inconnu"
-#: wt-status.c:141
+#: wt-status.c:146
msgid "Unmerged paths:"
msgstr "Chemins non fusionnés :"
-#: wt-status.c:168 wt-status.c:195
+#: wt-status.c:173 wt-status.c:200
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (utilisez \"git reset %s <fichier>...\" pour désindexer)"
-#: wt-status.c:170 wt-status.c:197
+#: wt-status.c:175 wt-status.c:202
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (utilisez \"git rm --cached <fichier>...\" pour désindexer)"
-#: wt-status.c:174
+#: wt-status.c:179
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (utilisez \"git add <fichier>...\" pour marquer comme résolu)"
-#: wt-status.c:176 wt-status.c:180
+#: wt-status.c:181 wt-status.c:185
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (utilisez \"git add/rm <fichier>...\" si nécessaire pour marquer comme "
"résolu)"
-#: wt-status.c:178
+#: wt-status.c:183
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)"
-#: wt-status.c:189
+#: wt-status.c:194
msgid "Changes to be committed:"
msgstr "Modifications qui seront validées :"
-#: wt-status.c:207
+#: wt-status.c:212
msgid "Changes not staged for commit:"
msgstr "Modifications qui ne seront pas validées :"
-#: wt-status.c:211
+#: wt-status.c:216
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
" (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)"
-#: wt-status.c:213
+#: wt-status.c:218
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
" (utilisez \"git add/rm <fichier>...\" pour mettre à jour ce qui sera "
"validé)"
-#: wt-status.c:214
+#: wt-status.c:219
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)"
-#: wt-status.c:216
+#: wt-status.c:221
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (valider ou annuler le contenu non suivi ou modifié dans les sous-modules)"
-#: wt-status.c:228
+#: wt-status.c:233
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validé)"
-#: wt-status.c:245
+#: wt-status.c:250
msgid "bug"
msgstr "bogue"
-#: wt-status.c:250
+#: wt-status.c:255
msgid "both deleted:"
msgstr "supprimé des deux côtés :"
-#: wt-status.c:251
+#: wt-status.c:256
msgid "added by us:"
msgstr "ajouté par nous :"
-#: wt-status.c:252
+#: wt-status.c:257
msgid "deleted by them:"
msgstr "supprimé par eux :"
-#: wt-status.c:253
+#: wt-status.c:258
msgid "added by them:"
msgstr "ajouté par eux :"
-#: wt-status.c:254
+#: wt-status.c:259
msgid "deleted by us:"
msgstr "supprimé par nous :"
-#: wt-status.c:255
+#: wt-status.c:260
msgid "both added:"
msgstr "ajouté de deux côtés :"
-#: wt-status.c:256
+#: wt-status.c:261
msgid "both modified:"
msgstr "modifié des deux côtés :"
-#: wt-status.c:286
+#: wt-status.c:291
msgid "new commits, "
msgstr "nouveaux commits, "
-#: wt-status.c:288
+#: wt-status.c:293
msgid "modified content, "
msgstr "contenu modifié, "
-#: wt-status.c:290
+#: wt-status.c:295
msgid "untracked content, "
msgstr "contenu non suivi, "
-#: wt-status.c:307
+#: wt-status.c:312
#, c-format
msgid "new file: %s"
msgstr "nouveau : %s"
-#: wt-status.c:310
+#: wt-status.c:315
#, c-format
msgid "copied: %s -> %s"
msgstr "copié : %s -> %s"
-#: wt-status.c:313
+#: wt-status.c:318
#, c-format
msgid "deleted: %s"
msgstr "supprimé : %s"
-#: wt-status.c:316
+#: wt-status.c:321
#, c-format
msgid "modified: %s"
msgstr "modifié : %s"
-#: wt-status.c:319
+#: wt-status.c:324
#, c-format
msgid "renamed: %s -> %s"
msgstr "renommé : %s -> %s"
-#: wt-status.c:322
+#: wt-status.c:327
#, c-format
msgid "typechange: %s"
msgstr "nv type : %s"
-#: wt-status.c:325
+#: wt-status.c:330
#, c-format
msgid "unknown: %s"
msgstr "inconnu : %s"
-#: wt-status.c:328
+#: wt-status.c:333
#, c-format
msgid "unmerged: %s"
msgstr "non fus. : %s"
-#: wt-status.c:331
+#: wt-status.c:336
#, c-format
msgid "bug: unhandled diff status %c"
msgstr "bogue : état de diff non géré %c"
-#: wt-status.c:803
+#: wt-status.c:703
+msgid "Submodules changed but not updated:"
+msgstr "Sous-modules modifiés mais non mis à jour :"
+
+#: wt-status.c:705
+msgid "Submodule changes to be committed:"
+msgstr "Changements du sous-module à valider :"
+
+#: wt-status.c:848
msgid "You have unmerged paths."
msgstr "Vous avez des chemins non fusionnés."
-#: wt-status.c:806
+#: wt-status.c:851
msgid " (fix conflicts and run \"git commit\")"
msgstr " (réglez les conflits puis lancez \"git commit\")"
-#: wt-status.c:809
+#: wt-status.c:854
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:812
+#: wt-status.c:857
msgid " (use \"git commit\" to conclude merge)"
msgstr " (utilisez \"git commit\" pour terminer la fusion)"
-#: wt-status.c:822
+#: wt-status.c:867
msgid "You are in the middle of an am session."
msgstr "Vous êtes au milieu d'une session am."
-#: wt-status.c:825
+#: wt-status.c:870
msgid "The current patch is empty."
msgstr "Le patch actuel est vide."
-#: wt-status.c:829
+#: wt-status.c:874
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (réglez les conflits puis lancez \"git am --continue\")"
-#: wt-status.c:831
+#: wt-status.c:876
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (utilisez \"git am --skip\" pour sauter ce patch)"
-#: wt-status.c:833
+#: wt-status.c:878
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)"
-#: wt-status.c:893 wt-status.c:910
+#: wt-status.c:938 wt-status.c:955
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'."
-#: wt-status.c:898 wt-status.c:915
+#: wt-status.c:943 wt-status.c:960
msgid "You are currently rebasing."
msgstr "Vous êtes en train de rebaser."
-#: wt-status.c:901
+#: wt-status.c:946
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (réglez les conflits puis lancez \"git rebase --continue\")"
-#: wt-status.c:903
+#: wt-status.c:948
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)"
-#: wt-status.c:905
+#: wt-status.c:950
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (utilisez \"git rebase --abort\" pour extraire la branche d'origine)"
-#: wt-status.c:918
+#: wt-status.c:963
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")"
-#: wt-status.c:922
+#: wt-status.c:967
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -1563,119 +1724,120 @@ msgstr ""
"Vous êtes actuellement en train de fractionner un commit pendant un rebasage "
"de la branche '%s' sur '%s'."
-#: wt-status.c:927
+#: wt-status.c:972
msgid "You are currently splitting a commit during a rebase."
msgstr ""
"Vous êtes actuellement en train de fractionner un commit pendant un rebasage."
-#: wt-status.c:930
+#: wt-status.c:975
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")"
-#: wt-status.c:934
+#: wt-status.c:979
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la "
"branche '%s' sur '%s'."
-#: wt-status.c:939
+#: wt-status.c:984
msgid "You are currently editing a commit during a rebase."
msgstr ""
"Vous êtes actuellement en train d'éditer un commit pendant un rebasage."
-#: wt-status.c:942
+#: wt-status.c:987
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)"
-#: wt-status.c:944
+#: wt-status.c:989
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (utilisez \"git rebase --continue\" quand vous êtes satisfait de vos "
"modifications)"
-#: wt-status.c:954
-msgid "You are currently cherry-picking."
-msgstr "Vous êtes actuellement en train de picorer."
+#: wt-status.c:999
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "Vous êtes actuellement en train de picorer le commit %s."
-#: wt-status.c:958
+#: wt-status.c:1004
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")"
-#: wt-status.c:961
+#: wt-status.c:1007
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")"
-#: wt-status.c:963
+#: wt-status.c:1009
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)"
-#: wt-status.c:972
+#: wt-status.c:1018
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Vous êtes actuellement en train de rétablir le commit %s."
-#: wt-status.c:977
+#: wt-status.c:1023
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (réglez les conflits puis lancez \"git revert --continue\")"
-#: wt-status.c:980
+#: wt-status.c:1026
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")"
-#: wt-status.c:982
+#: wt-status.c:1028
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)"
-#: wt-status.c:993
+#: wt-status.c:1039
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Vous êtes en cours de bissection, depuis la branche '%s'."
-#: wt-status.c:997
+#: wt-status.c:1043
msgid "You are currently bisecting."
msgstr "Vous êtes en cours de bissection."
-#: wt-status.c:1000
+#: wt-status.c:1046
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)"
-#: wt-status.c:1173
+#: wt-status.c:1221
msgid "On branch "
msgstr "Sur la branche "
-#: wt-status.c:1180
+#: wt-status.c:1228
msgid "rebase in progress; onto "
msgstr "rebasage en cours ; sur "
-#: wt-status.c:1187
+#: wt-status.c:1235
msgid "HEAD detached at "
msgstr "HEAD détachée sur "
-#: wt-status.c:1189
+#: wt-status.c:1237
msgid "HEAD detached from "
msgstr "HEAD détachée depuis "
-#: wt-status.c:1192
+#: wt-status.c:1240
msgid "Not currently on any branch."
msgstr "Actuellement sur aucun branche."
-#: wt-status.c:1209
+#: wt-status.c:1257
msgid "Initial commit"
msgstr "Validation initiale"
-#: wt-status.c:1223
+#: wt-status.c:1271
msgid "Untracked files"
msgstr "Fichiers non suivis"
-#: wt-status.c:1225
+#: wt-status.c:1273
msgid "Ignored files"
msgstr "Fichiers ignorés"
-#: wt-status.c:1229
+#: wt-status.c:1277
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -1687,32 +1849,32 @@ msgstr ""
"oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help "
"status')."
-#: wt-status.c:1235
+#: wt-status.c:1283
#, c-format
msgid "Untracked files not listed%s"
msgstr "Fichiers non suivis non affichés%s"
-#: wt-status.c:1237
+#: wt-status.c:1285
msgid " (use -u option to show untracked files)"
msgstr " (utilisez -u pour afficher les fichiers non suivis)"
-#: wt-status.c:1243
+#: wt-status.c:1291
msgid "No changes"
msgstr "Aucune modification"
-#: wt-status.c:1248
+#: wt-status.c:1296
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou "
"\"git commit -a\")\n"
-#: wt-status.c:1251
+#: wt-status.c:1299
#, c-format
msgid "no changes added to commit\n"
msgstr "aucune modification ajoutée à la validation\n"
-#: wt-status.c:1254
+#: wt-status.c:1302
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -1721,56 +1883,61 @@ msgstr ""
"aucune modification ajoutée à la validation mais des fichiers non suivis "
"sont présents (utilisez \"git add\" pour les suivre)\n"
-#: wt-status.c:1257
+#: wt-status.c:1305
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
"aucune modification ajoutée à la validation mais des fichiers non suivis "
"sont présents\n"
-#: wt-status.c:1260
+#: wt-status.c:1308
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les "
"suivre)\n"
-#: wt-status.c:1263 wt-status.c:1268
+#: wt-status.c:1311 wt-status.c:1316
#, c-format
msgid "nothing to commit\n"
msgstr "rien à valider\n"
-#: wt-status.c:1266
+#: wt-status.c:1314
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n"
-#: wt-status.c:1270
+#: wt-status.c:1318
#, c-format
msgid "nothing to commit, working directory clean\n"
msgstr "rien à valider, la copie de travail est propre\n"
-#: wt-status.c:1378
+#: wt-status.c:1427
msgid "HEAD (no branch)"
msgstr "HEAD (aucune branche)"
-#: wt-status.c:1384
+#: wt-status.c:1433
msgid "Initial commit on "
msgstr "Validation initiale sur "
-#: wt-status.c:1399
+# à priori on parle d'une branche ici
+#: wt-status.c:1463
+msgid "gone"
+msgstr "disparue"
+
+#: wt-status.c:1465
msgid "behind "
msgstr "derrière "
-#: wt-status.c:1402 wt-status.c:1405
+#: wt-status.c:1468 wt-status.c:1471
msgid "ahead "
msgstr "devant "
-#: wt-status.c:1407
+#: wt-status.c:1473
msgid ", behind "
msgstr ", derrière "
-#: compat/precompose_utf8.c:58 builtin/clone.c:351
+#: compat/precompose_utf8.c:55 builtin/clone.c:350
#, c-format
msgid "failed to unlink '%s'"
msgstr "échec lors de l'unlink de '%s'"
@@ -1859,7 +2026,7 @@ msgstr ""
msgid "unexpected diff status %c"
msgstr "status de diff inattendu %c"
-#: builtin/add.c:149 builtin/commit.c:252
+#: builtin/add.c:149 builtin/commit.c:260
msgid "updating files failed"
msgstr "échec de la mise à jour des fichiers"
@@ -1868,145 +2035,140 @@ msgstr "échec de la mise à jour des fichiers"
msgid "remove '%s'\n"
msgstr "suppression de '%s'\n"
-#: builtin/add.c:253
+#: builtin/add.c:237
msgid "Unstaged changes after refreshing the index:"
msgstr "Modifications non indexées après rafraîchissement de l'index :"
-#: builtin/add.c:256 builtin/add.c:573 builtin/rm.c:337
-#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr "le chemin '%s' ne correspond à aucun fichier"
-
-#: builtin/add.c:339
+#: builtin/add.c:299
msgid "Could not read the index"
msgstr "Impossible de lire l'index"
-#: builtin/add.c:350
+#: builtin/add.c:310
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Impossible d'ouvrir '%s' en écriture."
-#: builtin/add.c:354
+#: builtin/add.c:314
msgid "Could not write patch"
msgstr "Impossible d'écrire le patch"
-#: builtin/add.c:359
+#: builtin/add.c:319
#, c-format
msgid "Could not stat '%s'"
msgstr "Stat de '%s' impossible"
-#: builtin/add.c:361
+#: builtin/add.c:321
msgid "Empty patch. Aborted."
msgstr "Patch vide. Abandon."
-#: builtin/add.c:367
+#: builtin/add.c:327
#, c-format
msgid "Could not apply '%s'"
msgstr "Impossible d'appliquer '%s'"
-#: builtin/add.c:377
+#: builtin/add.c:337
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n"
-#: builtin/add.c:394 builtin/clean.c:875 builtin/fetch.c:78 builtin/mv.c:63
-#: builtin/prune-packed.c:73 builtin/push.c:451 builtin/remote.c:1253
-#: builtin/rm.c:268
+#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:92 builtin/mv.c:66
+#: builtin/prune-packed.c:73 builtin/push.c:459 builtin/remote.c:1253
+#: builtin/rm.c:269
msgid "dry run"
msgstr "simuler l'action"
-#: builtin/add.c:395 builtin/apply.c:4410 builtin/check-ignore.c:19
-#: builtin/commit.c:1220 builtin/count-objects.c:95 builtin/fsck.c:613
-#: builtin/log.c:1573 builtin/mv.c:62 builtin/read-tree.c:113
+#: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19
+#: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612
+#: builtin/log.c:1592 builtin/mv.c:65 builtin/read-tree.c:113
msgid "be verbose"
msgstr "mode verbeux"
-#: builtin/add.c:397
+#: builtin/add.c:357
msgid "interactive picking"
msgstr "sélection interactive"
-#: builtin/add.c:398 builtin/checkout.c:1073 builtin/reset.c:261
+#: builtin/add.c:358 builtin/checkout.c:1109 builtin/reset.c:272
msgid "select hunks interactively"
msgstr "sélection interactive des sections"
-#: builtin/add.c:399
+#: builtin/add.c:359
msgid "edit current diff and apply"
msgstr "édition du diff actuel et application"
-#: builtin/add.c:400
+#: builtin/add.c:360
msgid "allow adding otherwise ignored files"
msgstr "permettre l'ajout de fichiers ignorés"
-#: builtin/add.c:401
+#: builtin/add.c:361
msgid "update tracked files"
msgstr "mettre à jour les fichiers suivis"
-#: builtin/add.c:402
+#: builtin/add.c:362
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:403
+#: builtin/add.c:363
msgid "add changes from all tracked and untracked files"
msgstr "ajouter les modifications de tous les fichiers suivis et non suivis"
#. takes no arguments
-#: builtin/add.c:406
+#: builtin/add.c:366
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:408
+#: builtin/add.c:368
msgid "don't add, only refresh the index"
msgstr "ne pas ajouter, juste rafraîchir l'index"
-#: builtin/add.c:409
+#: builtin/add.c:369
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:410
+#: builtin/add.c:370
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:432
+#: builtin/add.c:392
#, c-format
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:433
+#: builtin/add.c:393
msgid "no files added"
msgstr "aucun fichier ajouté"
-#: builtin/add.c:439
+#: builtin/add.c:399
msgid "adding files failed"
msgstr "échec de l'ajout de fichiers"
-#: builtin/add.c:478
+#: builtin/add.c:438
msgid "-A and -u are mutually incompatible"
msgstr "-A et -u sont mutuellement incompatibles"
-#: builtin/add.c:496
+#: builtin/add.c:456
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
"L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run"
-#: builtin/add.c:526
+#: builtin/add.c:486
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Rien de spécifié, rien n'a été ajouté.\n"
-#: builtin/add.c:527
+#: builtin/add.c:487
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Vous vouliez sûrement dire 'git add .' ?\n"
-#: builtin/add.c:533 builtin/check-ignore.c:161 builtin/clean.c:919
-#: builtin/commit.c:312 builtin/mv.c:82 builtin/rm.c:297
+#: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919
+#: builtin/commit.c:320 builtin/mv.c:86 builtin/reset.c:224 builtin/rm.c:299
msgid "index file corrupt"
msgstr "fichier d'index corrompu"
-#: builtin/add.c:605 builtin/apply.c:4506 builtin/mv.c:229 builtin/rm.c:432
+#: builtin/add.c:589 builtin/apply.c:4506 builtin/mv.c:259 builtin/rm.c:432
msgid "Unable to write new index file"
msgstr "Impossible d'écrire le nouveau fichier d'index"
@@ -2268,7 +2430,7 @@ msgstr "%s : le patch ne s'applique pas"
msgid "Checking patch %s..."
msgstr "Vérification du patch %s..."
-#: builtin/apply.c:3680 builtin/checkout.c:216 builtin/reset.c:127
+#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:127
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "échec de make_cache_entry pour le chemin '%s'"
@@ -2350,8 +2512,8 @@ msgstr "entrée non reconnue"
msgid "unable to read index file"
msgstr "lecture du fichier d'index impossible"
-#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:91
-#: builtin/fetch.c:63
+#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90
+#: builtin/fetch.c:77
msgid "path"
msgstr "chemin"
@@ -2413,7 +2575,7 @@ msgid "build a temporary index based on embedded index information"
msgstr ""
"construire un index temporaire fondé sur l'information de l'index embarqué"
-#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:462
+#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:452
msgid "paths are separated with NUL character"
msgstr "les chemins sont séparés par un caractère NUL"
@@ -2547,108 +2709,108 @@ msgstr "effectuer 'git bisect next'"
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "mettre à jour BISECT_HEAD au lieu d'extraire le commit actuel"
-#: builtin/blame.c:26
+#: builtin/blame.c:27
msgid "git blame [options] [rev-opts] [rev] [--] file"
msgstr "git blame [options] [options-de-révision] [rev] [--] fichier"
-#: builtin/blame.c:31
+#: builtin/blame.c:32
msgid "[rev-opts] are documented in git-rev-list(1)"
msgstr "[options-de-révision] sont documentés dans git-rev-list(1)"
-#: builtin/blame.c:2276
+#: builtin/blame.c:2248
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:2277
+#: builtin/blame.c:2249
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:2278
+#: builtin/blame.c:2250
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:2279
+#: builtin/blame.c:2251
msgid "Show work cost statistics"
msgstr "Montrer les statistiques de coût d'activité"
-#: builtin/blame.c:2280
+#: builtin/blame.c:2252
msgid "Show output score for blame entries"
msgstr "Montrer le score de sortie pour les éléments de blâme"
-#: builtin/blame.c:2281
+#: builtin/blame.c:2253
msgid "Show original filename (Default: auto)"
msgstr "Montrer les noms de fichier originaux (Défaut : auto)"
-#: builtin/blame.c:2282
+#: builtin/blame.c:2254
msgid "Show original linenumber (Default: off)"
msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)"
-#: builtin/blame.c:2283
+#: builtin/blame.c:2255
msgid "Show in a format designed for machine consumption"
msgstr "Afficher dans un format propice à la consommation par machine"
-#: builtin/blame.c:2284
+#: builtin/blame.c:2256
msgid "Show porcelain format with per-line commit information"
msgstr "Afficher en format porcelaine avec l'information de commit par ligne"
-#: builtin/blame.c:2285
+#: builtin/blame.c:2257
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:2286
+#: builtin/blame.c:2258
msgid "Show raw timestamp (Default: off)"
msgstr "Afficher les horodatages bruts (Défaut : désactivé)"
-#: builtin/blame.c:2287
+#: builtin/blame.c:2259
msgid "Show long commit SHA1 (Default: off)"
msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)"
-#: builtin/blame.c:2288
+#: builtin/blame.c:2260
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:2289
+#: builtin/blame.c:2261
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:2290
+#: builtin/blame.c:2262
msgid "Ignore whitespace differences"
msgstr "Ignorer les différences d'espace"
-#: builtin/blame.c:2291
+#: builtin/blame.c:2263
msgid "Spend extra cycles to find better match"
msgstr ""
"Dépenser des cycles supplémentaires pour trouver une meilleure correspondance"
-#: builtin/blame.c:2292
+#: builtin/blame.c:2264
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:2293
+#: builtin/blame.c:2265
msgid "Use <file>'s contents as the final image"
msgstr "Utiliser le contenu de <fichier> comme image finale"
-#: builtin/blame.c:2294 builtin/blame.c:2295
+#: builtin/blame.c:2266 builtin/blame.c:2267
msgid "score"
msgstr "score"
-#: builtin/blame.c:2294
+#: builtin/blame.c:2266
msgid "Find line copies within and across files"
msgstr "Trouver les copies de ligne dans et entre les fichiers"
-#: builtin/blame.c:2295
+#: builtin/blame.c:2267
msgid "Find line movements within and across files"
msgstr "Trouver les mouvements de ligne dans et entre les fichiers"
-#: builtin/blame.c:2296
+#: builtin/blame.c:2268
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2296
+#: builtin/blame.c:2268
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"
@@ -2753,240 +2915,251 @@ msgstr "Branche %s supprimée (précédemment %s).\n"
msgid "branch '%s' does not point at a commit"
msgstr "la branche '%s' ne pointe pas sur un commit"
+# féminin pour une branche
#: builtin/branch.c:453
#, c-format
+msgid "[%s: gone]"
+msgstr "[%s: disparue]"
+
+#: builtin/branch.c:456
+#, c-format
+msgid "[%s]"
+msgstr "[%s]"
+
+#: builtin/branch.c:459
+#, c-format
msgid "[%s: behind %d]"
msgstr "[%s: en retard de %d]"
-#: builtin/branch.c:455
+#: builtin/branch.c:461
#, c-format
msgid "[behind %d]"
msgstr "[en retard de %d]"
-#: builtin/branch.c:459
+#: builtin/branch.c:465
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s : en avance de %d]"
-#: builtin/branch.c:461
+#: builtin/branch.c:467
#, c-format
msgid "[ahead %d]"
msgstr "[en avance de %d]"
-#: builtin/branch.c:464
+#: builtin/branch.c:470
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s : en avance de %d, en retard de %d]"
-#: builtin/branch.c:467
+#: builtin/branch.c:473
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[en avance de %d, en retard de %d]"
-#: builtin/branch.c:490
+#: builtin/branch.c:496
msgid " **** invalid ref ****"
msgstr " **** référence invalide ****"
-#: builtin/branch.c:582
+#: builtin/branch.c:588
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(aucune branche, rebasage de %s)"
-#: builtin/branch.c:585
+#: builtin/branch.c:591
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(aucune branche, bisect a démarré sur %s)"
-#: builtin/branch.c:588
+#: builtin/branch.c:594
#, c-format
msgid "(detached from %s)"
msgstr "(détaché de %s)"
-#: builtin/branch.c:591
+#: builtin/branch.c:597
msgid "(no branch)"
msgstr "(aucune branche)"
-#: builtin/branch.c:637
+#: builtin/branch.c:643
#, c-format
msgid "object '%s' does not point to a commit"
msgstr "l'objet '%s' ne pointe pas sur un commit"
-#: builtin/branch.c:669
+#: builtin/branch.c:675
msgid "some refs could not be read"
msgstr "des références n'ont pas pu être lues"
-#: builtin/branch.c:682
+#: builtin/branch.c:688
msgid "cannot rename the current branch while not on any."
msgstr "impossible de renommer la branche actuelle, il n'y en a pas."
-#: builtin/branch.c:692
+#: builtin/branch.c:698
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nom de branche invalide : '%s'"
-#: builtin/branch.c:707
+#: builtin/branch.c:713
msgid "Branch rename failed"
msgstr "Échec de renommage de la branche"
-#: builtin/branch.c:711
+#: builtin/branch.c:717
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Renommage d'un branche mal nommée '%s'"
-#: builtin/branch.c:715
+#: builtin/branch.c:721
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !"
-#: builtin/branch.c:722
+#: builtin/branch.c:728
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"La branche est renommée, mais la mise à jour du fichier de configuration a "
"échoué"
-#: builtin/branch.c:737
+#: builtin/branch.c:743
#, c-format
msgid "malformed object name %s"
msgstr "nom d'objet malformé %s"
-#: builtin/branch.c:761
+#: builtin/branch.c:767
#, c-format
msgid "could not write branch description template: %s"
msgstr "impossible d'écrire le modèle de description de branche : %s"
-#: builtin/branch.c:791
+#: builtin/branch.c:797
msgid "Generic options"
msgstr "Options génériques"
-#: builtin/branch.c:793
+#: builtin/branch.c:799
msgid "show hash and subject, give twice for upstream branch"
msgstr "afficher le hachage et le sujet, doublé pour la branche amont"
-#: builtin/branch.c:794
+#: builtin/branch.c:800
msgid "suppress informational messages"
msgstr "supprimer les messages d'information"
-#: builtin/branch.c:795
+#: builtin/branch.c:801
msgid "set up tracking mode (see git-pull(1))"
msgstr "régler le mode de suivi (voir git-pull(1))"
-#: builtin/branch.c:797
+#: builtin/branch.c:803
msgid "change upstream info"
msgstr "modifier l'information amont"
-#: builtin/branch.c:801
+#: builtin/branch.c:807
msgid "use colored output"
msgstr "utiliser la coloration dans la sortie"
-#: builtin/branch.c:802
+#: builtin/branch.c:808
msgid "act on remote-tracking branches"
msgstr "agir sur les branches de suivi distantes"
-#: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832
-#: builtin/branch.c:838 builtin/commit.c:1433 builtin/commit.c:1434
-#: builtin/commit.c:1435 builtin/commit.c:1436 builtin/tag.c:468
+#: builtin/branch.c:811 builtin/branch.c:817 builtin/branch.c:838
+#: builtin/branch.c:844 builtin/commit.c:1460 builtin/commit.c:1461
+#: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468
msgid "commit"
msgstr "commit"
-#: builtin/branch.c:806 builtin/branch.c:812
+#: builtin/branch.c:812 builtin/branch.c:818
msgid "print only branches that contain the commit"
msgstr "afficher seulement les branches qui contiennent le commit"
-#: builtin/branch.c:818
+#: builtin/branch.c:824
msgid "Specific git-branch actions:"
msgstr "Actions spécifiques à git-branch :"
-#: builtin/branch.c:819
+#: builtin/branch.c:825
msgid "list both remote-tracking and local branches"
msgstr "afficher à la fois les branches de suivi et les branches locales"
-#: builtin/branch.c:821
+#: builtin/branch.c:827
msgid "delete fully merged branch"
msgstr "supprimer une branche totalement fusionnée"
-#: builtin/branch.c:822
+#: builtin/branch.c:828
msgid "delete branch (even if not merged)"
msgstr "supprimer une branche (même non fusionnée)"
-#: builtin/branch.c:823
+#: builtin/branch.c:829
msgid "move/rename a branch and its reflog"
msgstr "déplacer/renommer une branche et son reflog"
-#: builtin/branch.c:824
+#: builtin/branch.c:830
msgid "move/rename a branch, even if target exists"
msgstr "déplacer/renommer une branche, même si la cible existe"
-#: builtin/branch.c:825
+#: builtin/branch.c:831
msgid "list branch names"
msgstr "afficher les noms des branches"
-#: builtin/branch.c:826
+#: builtin/branch.c:832
msgid "create the branch's reflog"
msgstr "créer le reflog de la branche"
-#: builtin/branch.c:828
+#: builtin/branch.c:834
msgid "edit the description for the branch"
msgstr "éditer la description de la branche"
-#: builtin/branch.c:829
+#: builtin/branch.c:835
msgid "force creation (when already exists)"
msgstr "forcer la création (même si la cible existe)"
-#: builtin/branch.c:832
+#: builtin/branch.c:838
msgid "print only not merged branches"
msgstr "afficher seulement les branches non fusionnées"
-#: builtin/branch.c:838
+#: builtin/branch.c:844
msgid "print only merged branches"
msgstr "afficher seulement les branches fusionnées"
-#: builtin/branch.c:842
+#: builtin/branch.c:848
msgid "list branches in columns"
msgstr "afficher les branches en colonnes"
-#: builtin/branch.c:855
+#: builtin/branch.c:861
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Échec de résolution de HEAD comme référence valide."
-#: builtin/branch.c:860 builtin/clone.c:630
+#: builtin/branch.c:866 builtin/clone.c:629
msgid "HEAD not found below refs/heads!"
msgstr "HEAD non trouvée sous refs/heads !"
-#: builtin/branch.c:883
+#: builtin/branch.c:890
msgid "--column and --verbose are incompatible"
msgstr "--column et --verbose sont incompatibles"
-#: builtin/branch.c:889 builtin/branch.c:928
+#: builtin/branch.c:896 builtin/branch.c:935
msgid "branch name required"
msgstr "le nom de branche est requis"
-#: builtin/branch.c:904
+#: builtin/branch.c:911
msgid "Cannot give description to detached HEAD"
msgstr "Impossible de décrire une HEAD détachée"
-#: builtin/branch.c:909
+#: builtin/branch.c:916
msgid "cannot edit description of more than one branch"
msgstr "impossible d'éditer la description de plus d'une branche"
-#: builtin/branch.c:916
+#: builtin/branch.c:923
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Aucun commit sur la branche '%s'."
-#: builtin/branch.c:919
+#: builtin/branch.c:926
#, c-format
msgid "No branch named '%s'."
msgstr "Aucune branche nommée '%s'."
-#: builtin/branch.c:934
+#: builtin/branch.c:941
msgid "too many branches for a rename operation"
msgstr "trop de branches pour une opération de renommage"
-#: builtin/branch.c:939
+#: builtin/branch.c:946
msgid "too many branches to set new upstream"
msgstr "trop de branches pour spécifier une branche amont"
-#: builtin/branch.c:943
+#: builtin/branch.c:950
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -2994,41 +3167,41 @@ msgstr ""
"impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur "
"aucune branche."
-#: builtin/branch.c:946 builtin/branch.c:968 builtin/branch.c:990
+#: builtin/branch.c:953 builtin/branch.c:975 builtin/branch.c:997
#, c-format
msgid "no such branch '%s'"
msgstr "pas de branche '%s'"
-#: builtin/branch.c:950
+#: builtin/branch.c:957
#, c-format
msgid "branch '%s' does not exist"
msgstr "la branche '%s' n'existe pas"
-#: builtin/branch.c:962
+#: builtin/branch.c:969
msgid "too many branches to unset upstream"
msgstr "trop de branches pour désactiver un amont"
-#: builtin/branch.c:966
+#: builtin/branch.c:973
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"impossible de désactiver une branche amont de HEAD quand elle ne pointe sur "
"aucune branche."
-#: builtin/branch.c:972
+#: builtin/branch.c:979
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "La branche '%s' n'a aucune information de branche amont"
-#: builtin/branch.c:987
+#: builtin/branch.c:994
msgid "it does not make sense to create 'HEAD' manually"
msgstr "créer manuellement 'HEAD' n'a pas de sens"
-#: builtin/branch.c:993
+#: builtin/branch.c:1000
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
"les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche"
-#: builtin/branch.c:996
+#: builtin/branch.c:1003
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -3037,7 +3210,7 @@ msgstr ""
"l'option --set-upstream est obsolète et va disparaître. Utilisez plutôt --"
"track ou --set-upstream-to\n"
-#: builtin/branch.c:1013
+#: builtin/branch.c:1020
#, c-format
msgid ""
"\n"
@@ -3048,12 +3221,12 @@ msgstr ""
"Si vous vouliez que '%s' suive '%s', faîtes ceci :\n"
"\n"
-#: builtin/branch.c:1014
+#: builtin/branch.c:1021
#, c-format
msgid " git branch -d %s\n"
msgstr " git branch -d %s\n"
-#: builtin/branch.c:1015
+#: builtin/branch.c:1022
#, c-format
msgid " git branch --set-upstream-to %s\n"
msgstr " git branch -set-upstream-to %s\n"
@@ -3071,44 +3244,44 @@ msgstr "La création d'un colis requiert un dépôt."
msgid "Need a repository to unbundle."
msgstr "Le dépaquetage d'un colis requiert un dépôt."
-#: builtin/cat-file.c:285
+#: builtin/cat-file.c:312
msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
msgstr "git cat-file (-t|-s|-e|-p|<type>|--textconv) <objet>"
-#: builtin/cat-file.c:286
+#: builtin/cat-file.c:313
msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
msgstr "git cat-file (--batch|--batch-check) < <liste_d_objets>"
-#: builtin/cat-file.c:323
+#: builtin/cat-file.c:350
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<type> peut être : blob, tree, commit ou tag"
-#: builtin/cat-file.c:324
+#: builtin/cat-file.c:351
msgid "show object type"
msgstr "afficher le type de l'objet"
-#: builtin/cat-file.c:325
+#: builtin/cat-file.c:352
msgid "show object size"
msgstr "afficher la taille de l'objet"
-#: builtin/cat-file.c:327
+#: builtin/cat-file.c:354
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:328
+#: builtin/cat-file.c:355
msgid "pretty-print object's content"
msgstr "afficher avec mise en forme le contenu de l'objet"
-#: builtin/cat-file.c:330
+#: builtin/cat-file.c:357
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:332
+#: builtin/cat-file.c:359
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:335
+#: builtin/cat-file.c:362
msgid "show info about objects fed from the standard input"
msgstr "afficher l'information des objets passés en entrée standard"
@@ -3134,10 +3307,10 @@ msgid "read file names from stdin"
msgstr "lire les noms de fichier depuis l'entrée standard"
#: builtin/check-attr.c:23 builtin/check-ignore.c:24
-msgid "input paths are terminated by a null character"
-msgstr "les chemins en entrée sont terminés par le caractère nul"
+msgid "terminate input and output records by a NUL character"
+msgstr "terminer les enregistrements en entrée et en sortie par un caractère NUL"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1054 builtin/gc.c:177
+#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:259
msgid "suppress progress reporting"
msgstr "supprimer l'état d'avancement"
@@ -3145,27 +3318,31 @@ msgstr "supprimer l'état d'avancement"
msgid "show non-matching input paths"
msgstr "afficher les chemins en entrée qui ne correspondent pas"
-#: builtin/check-ignore.c:143
+#: builtin/check-ignore.c:28
+msgid "ignore index when checking"
+msgstr "ignorer l'index pendant la vérification"
+
+#: builtin/check-ignore.c:154
msgid "cannot specify pathnames with --stdin"
msgstr "impossible de spécifier les chemins avec --stdin"
-#: builtin/check-ignore.c:146
+#: builtin/check-ignore.c:157
msgid "-z only makes sense with --stdin"
msgstr "-z n'a de sens qu'avec l'option --stdin"
-#: builtin/check-ignore.c:148
+#: builtin/check-ignore.c:159
msgid "no path specified"
msgstr "aucun chemin spécifié"
-#: builtin/check-ignore.c:152
+#: builtin/check-ignore.c:163
msgid "--quiet is only valid with a single pathname"
msgstr "--quiet n'est valide qu'avec un seul chemin"
-#: builtin/check-ignore.c:154
+#: builtin/check-ignore.c:165
msgid "cannot have both --quiet and --verbose"
msgstr "impossible d'avoir --quiet et --verbose"
-#: builtin/check-ignore.c:157
+#: builtin/check-ignore.c:168
msgid "--non-matching is only valid with --verbose"
msgstr "--non-matching n'est valide qu'avec --verbose"
@@ -3240,108 +3417,108 @@ msgstr "git checkout [options] <branche>"
msgid "git checkout [options] [<branch>] -- <file>..."
msgstr "git checkout [options] [<branche>] -- <fichier>..."
-#: builtin/checkout.c:117 builtin/checkout.c:150
+#: builtin/checkout.c:114 builtin/checkout.c:147
#, c-format
msgid "path '%s' does not have our version"
msgstr "le chemin '%s' n'a pas notre version"
-#: builtin/checkout.c:119 builtin/checkout.c:152
+#: builtin/checkout.c:116 builtin/checkout.c:149
#, c-format
msgid "path '%s' does not have their version"
msgstr "le chemin '%s' n'a pas leur version"
-#: builtin/checkout.c:135
+#: builtin/checkout.c:132
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "le chemin '%s' n'a aucune des versions nécessaires"
-#: builtin/checkout.c:179
+#: builtin/checkout.c:176
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "le chemin '%s' n'a pas les versions nécessaires"
-#: builtin/checkout.c:196
+#: builtin/checkout.c:193
#, c-format
msgid "path '%s': cannot merge"
msgstr "chemin '%s' : impossible de fusionner"
-#: builtin/checkout.c:213
+#: builtin/checkout.c:210
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Impossible d'ajouter le résultat de fusion pour '%s'"
-#: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243
-#: builtin/checkout.c:246
+#: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238
+#: builtin/checkout.c:241
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins"
-#: builtin/checkout.c:249 builtin/checkout.c:252
+#: builtin/checkout.c:244 builtin/checkout.c:247
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' ne peut pas être utilisé avec %s"
-#: builtin/checkout.c:255
+#: builtin/checkout.c:250
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Impossible de mettre à jour les chemins et basculer sur la branche '%s' en "
"même temps."
-#: builtin/checkout.c:266 builtin/checkout.c:458
+#: builtin/checkout.c:261 builtin/checkout.c:451
msgid "corrupt index file"
msgstr "fichier d'index corrompu"
-#: builtin/checkout.c:329 builtin/checkout.c:336
+#: builtin/checkout.c:322 builtin/checkout.c:329
#, c-format
msgid "path '%s' is unmerged"
msgstr "le chemin '%s' n'est pas fusionné"
-#: builtin/checkout.c:480
+#: builtin/checkout.c:473
msgid "you need to resolve your current index first"
msgstr "vous devez d'abord résoudre votre index courant"
-#: builtin/checkout.c:601
+#: builtin/checkout.c:594
#, c-format
msgid "Can not do reflog for '%s'\n"
msgstr "Impossible de faire un reflog pour '%s'\n"
-#: builtin/checkout.c:639
+#: builtin/checkout.c:632
msgid "HEAD is now at"
msgstr "HEAD est maintenant sur"
-#: builtin/checkout.c:646
+#: builtin/checkout.c:639
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:649
+#: builtin/checkout.c:642
#, c-format
msgid "Already on '%s'\n"
msgstr "Déjà sur '%s'\n"
-#: builtin/checkout.c:653
+#: builtin/checkout.c:646
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Basculement et remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:655 builtin/checkout.c:997
+#: builtin/checkout.c:648 builtin/checkout.c:1033
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Basculement sur la nouvelle branche '%s'\n"
-#: builtin/checkout.c:657
+#: builtin/checkout.c:650
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Basculement sur la branche '%s'\n"
-#: builtin/checkout.c:713
+#: builtin/checkout.c:706
#, c-format
msgid " ... and %d more.\n"
msgstr " ... et %d en plus.\n"
#. The singular version
-#: builtin/checkout.c:719
+#: builtin/checkout.c:712
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -3364,7 +3541,7 @@ msgstr[1] ""
"\n"
"%s\n"
-#: builtin/checkout.c:737
+#: builtin/checkout.c:730
#, c-format
msgid ""
"If you want to keep them by creating a new branch, this may be a good time\n"
@@ -3380,136 +3557,140 @@ msgstr ""
"git branche nouvelle_branche %s\n"
"\n"
-#: builtin/checkout.c:767
+#: builtin/checkout.c:760
msgid "internal error in revision walk"
msgstr "erreur interne lors du parcours des révisions"
-#: builtin/checkout.c:771
+#: builtin/checkout.c:764
msgid "Previous HEAD position was"
msgstr "La position précédente de HEAD était"
-#: builtin/checkout.c:798 builtin/checkout.c:992
+#: builtin/checkout.c:791 builtin/checkout.c:1028
msgid "You are on a branch yet to be born"
msgstr "Vous êtes sur une branche qui doit encore naître"
-#. case (1)
-#: builtin/checkout.c:928
+#: builtin/checkout.c:935
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "une seule référence attendue, %d fournies."
+
+#: builtin/checkout.c:974
#, c-format
msgid "invalid reference: %s"
msgstr "référence invalide : %s"
#. case (1): want a tree
-#: builtin/checkout.c:967
+#: builtin/checkout.c:1003
#, c-format
msgid "reference is not a tree: %s"
msgstr "la référence n'est pas un arbre : %s"
-#: builtin/checkout.c:1006
+#: builtin/checkout.c:1042
msgid "paths cannot be used with switching branches"
msgstr "impossible d'utiliser des chemins avec un basculement de branches"
-#: builtin/checkout.c:1009 builtin/checkout.c:1013
+#: builtin/checkout.c:1045 builtin/checkout.c:1049
#, 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:1017 builtin/checkout.c:1020 builtin/checkout.c:1025
-#: builtin/checkout.c:1028
+#: builtin/checkout.c:1053 builtin/checkout.c:1056 builtin/checkout.c:1061
+#: builtin/checkout.c:1064
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' ne peut pas être utilisé avec '%s'"
-#: builtin/checkout.c:1033
+#: builtin/checkout.c:1069
#, 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:1055 builtin/checkout.c:1057 builtin/clone.c:89
+#: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88
#: builtin/remote.c:169 builtin/remote.c:171
msgid "branch"
msgstr "branche"
-#: builtin/checkout.c:1056
+#: builtin/checkout.c:1092
msgid "create and checkout a new branch"
msgstr "créer et extraire une nouvelle branche"
-#: builtin/checkout.c:1058
+#: builtin/checkout.c:1094
msgid "create/reset and checkout a branch"
msgstr "créer/réinitialiser et extraire une branche"
-#: builtin/checkout.c:1059
+#: builtin/checkout.c:1095
msgid "create reflog for new branch"
msgstr "créer un reflog pour une nouvelle branche"
-#: builtin/checkout.c:1060
+#: builtin/checkout.c:1096
msgid "detach the HEAD at named commit"
msgstr "détacher la HEAD à la validation nommée"
-#: builtin/checkout.c:1061
+#: builtin/checkout.c:1097
msgid "set upstream info for new branch"
msgstr "paramétrer l'information de branche amont pour une nouvelle branche"
-#: builtin/checkout.c:1063
+#: builtin/checkout.c:1099
msgid "new branch"
msgstr "nouvelle branche"
-#: builtin/checkout.c:1063
+#: builtin/checkout.c:1099
msgid "new unparented branch"
msgstr "nouvelle branche sans parent"
-#: builtin/checkout.c:1064
+#: builtin/checkout.c:1100
msgid "checkout our version for unmerged files"
msgstr "extraire notre version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1066
+#: builtin/checkout.c:1102
msgid "checkout their version for unmerged files"
msgstr "extraire leur version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1068
+#: builtin/checkout.c:1104
msgid "force checkout (throw away local modifications)"
msgstr "forcer l'extraction (laisser tomber les modifications locales)"
-#: builtin/checkout.c:1069
+#: builtin/checkout.c:1105
msgid "perform a 3-way merge with the new branch"
msgstr "effectuer une fusion à 3 points avec la nouvelle branche"
-#: builtin/checkout.c:1070 builtin/merge.c:232
+#: builtin/checkout.c:1106 builtin/merge.c:232
msgid "update ignored files (default)"
msgstr "mettre à jour les fichiers ignorés (par défaut)"
-#: builtin/checkout.c:1071 builtin/log.c:1208 parse-options.h:249
+#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:251
msgid "style"
msgstr "style"
-#: builtin/checkout.c:1072
+#: builtin/checkout.c:1108
msgid "conflict style (merge or diff3)"
msgstr "style de conflit (fusion ou diff3)"
-#: builtin/checkout.c:1075
+#: builtin/checkout.c:1111
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:1077
+#: builtin/checkout.c:1113
msgid "second guess 'git checkout no-such-branch'"
msgstr "deuxième chance 'git checkout branche-inexistante'"
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1136
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B et --orphan sont mutuellement exclusifs"
-#: builtin/checkout.c:1118
+#: builtin/checkout.c:1153
msgid "--track needs a branch name"
msgstr "--track requiert un nom de branche"
-#: builtin/checkout.c:1125
+#: builtin/checkout.c:1160
msgid "Missing branch name; try -b"
msgstr "Nom de branche manquant ; essayez -b"
-#: builtin/checkout.c:1160
+#: builtin/checkout.c:1197
msgid "invalid path specification"
msgstr "spécification de chemin invalide"
-#: builtin/checkout.c:1167
+#: builtin/checkout.c:1204
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -3519,12 +3700,12 @@ msgstr ""
"en même temps.\n"
"Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?"
-#: builtin/checkout.c:1172
+#: builtin/checkout.c:1209
#, 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:1176
+#: builtin/checkout.c:1213
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -3532,38 +3713,38 @@ msgstr ""
"git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n"
"de l'extraction de l'index."
-#: builtin/clean.c:25
+#: builtin/clean.c:26
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <motif>] [-x | -X] [--] <chemins>..."
-#: builtin/clean.c:29
+#: builtin/clean.c:30
#, c-format
msgid "Removing %s\n"
msgstr "Suppression de %s\n"
-#: builtin/clean.c:30
+#: builtin/clean.c:31
#, c-format
msgid "Would remove %s\n"
msgstr "Supprimerait %s\n"
-#: builtin/clean.c:31
+#: builtin/clean.c:32
#, c-format
msgid "Skipping repository %s\n"
msgstr "Ignore le dépôt %s\n"
-#: builtin/clean.c:32
+#: builtin/clean.c:33
#, c-format
msgid "Would skip repository %s\n"
msgstr "Ignorerait le dépôt %s\n"
-#: builtin/clean.c:33
+#: builtin/clean.c:34
#, c-format
msgid "failed to remove %s"
msgstr "échec de la suppression de %s"
-#: builtin/clean.c:293
+#: builtin/clean.c:294
msgid ""
"Prompt help:\n"
"1 - select a numbered item\n"
@@ -3575,7 +3756,7 @@ msgstr ""
"foo - sélectionner un élément par un préfixe unique\n"
" - (vide) ne rien sélectionner"
-#: builtin/clean.c:297
+#: builtin/clean.c:298
msgid ""
"Prompt help:\n"
"1 - select a single item\n"
@@ -3595,35 +3776,35 @@ msgstr ""
"* - choisir tous les éléments\n"
" - (vide) terminer la sélection"
-#: builtin/clean.c:515
+#: builtin/clean.c:516
#, c-format
msgid "Huh (%s)?"
msgstr "Hein (%s) ?"
-#: builtin/clean.c:658
+#: builtin/clean.c:659
#, c-format
msgid "Input ignore patterns>> "
msgstr "Entrez les motifs à ignorer>> "
-#: builtin/clean.c:695
+#: builtin/clean.c:696
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s"
-#: builtin/clean.c:716
+#: builtin/clean.c:717
msgid "Select items to delete"
msgstr "Sélectionner les éléments à supprimer"
-#: builtin/clean.c:756
+#: builtin/clean.c:757
#, c-format
msgid "remove %s? "
msgstr "supprimer %s ? "
-#: builtin/clean.c:781
+#: builtin/clean.c:782
msgid "Bye."
msgstr "Au revoir."
-#: builtin/clean.c:789
+#: builtin/clean.c:790
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -3641,21 +3822,21 @@ msgstr ""
"help - cet écran\n"
"? - aide pour la sélection en ligne"
-#: builtin/clean.c:816
+#: builtin/clean.c:817
msgid "*** Commands ***"
msgstr "*** Commandes ***"
-#: builtin/clean.c:817
+#: builtin/clean.c:818
msgid "What now"
msgstr "Et maintenant ?"
-#: builtin/clean.c:825
+#: builtin/clean.c:826
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Supprimerait l'élément suivant :"
msgstr[1] "Supprimerait les éléments suivants :"
-#: builtin/clean.c:842
+#: builtin/clean.c:843
msgid "No more files to clean, exiting."
msgstr "Plus de fichier à nettoyer, sortie."
@@ -3675,8 +3856,8 @@ msgstr "nettoyage interactif"
msgid "remove whole directories"
msgstr "supprimer les répertoires entiers"
-#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:716
-#: builtin/ls-files.c:493 builtin/name-rev.c:315 builtin/show-ref.c:186
+#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718
+#: builtin/ls-files.c:483 builtin/name-rev.c:315 builtin/show-ref.c:185
msgid "pattern"
msgstr "motif"
@@ -3716,8 +3897,8 @@ msgstr ""
msgid "git clone [options] [--] <repo> [<dir>]"
msgstr "git clone [options] [--] <dépôt> [<répertoire>]"
-#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:229
-#: builtin/push.c:462
+#: builtin/clone.c:64 builtin/fetch.c:96 builtin/merge.c:229
+#: builtin/push.c:474
msgid "force progress reporting"
msgstr "forcer l'état d'avancement"
@@ -3729,123 +3910,123 @@ msgstr "ne pas créer d'extraction"
msgid "create a bare repository"
msgstr "créer un dépôt nu"
-#: builtin/clone.c:72
+#: builtin/clone.c:71
msgid "create a mirror repository (implies bare)"
msgstr "créer un dépôt miroir (implique dépôt nu)"
-#: builtin/clone.c:74
+#: builtin/clone.c:73
msgid "to clone from a local repository"
msgstr "pour cloner depuis un dépôt local"
-#: builtin/clone.c:76
+#: builtin/clone.c:75
msgid "don't use local hardlinks, always copy"
msgstr "ne pas utiliser de liens durs locaux, toujours copier"
-#: builtin/clone.c:78
+#: builtin/clone.c:77
msgid "setup as shared repository"
msgstr "régler comme dépôt partagé"
-#: builtin/clone.c:80 builtin/clone.c:82
+#: builtin/clone.c:79 builtin/clone.c:81
msgid "initialize submodules in the clone"
msgstr "initialiser les sous-modules dans le clone"
-#: builtin/clone.c:83 builtin/init-db.c:485
+#: builtin/clone.c:82 builtin/init-db.c:485
msgid "template-directory"
msgstr "répertoire-modèle"
-#: builtin/clone.c:84 builtin/init-db.c:486
+#: builtin/clone.c:83 builtin/init-db.c:486
msgid "directory from which templates will be used"
msgstr "répertoire depuis lequel les modèles vont être utilisés"
-#: builtin/clone.c:86
+#: builtin/clone.c:85
msgid "reference repository"
msgstr "dépôt de référence"
-#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr "nom"
-#: builtin/clone.c:88
+#: builtin/clone.c:87
msgid "use <name> instead of 'origin' to track upstream"
msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont"
-#: builtin/clone.c:90
+#: builtin/clone.c:89
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"
-#: builtin/clone.c:92
+#: builtin/clone.c:91
msgid "path to git-upload-pack on the remote"
msgstr "chemin vers git-upload-pack sur le serveur distant"
-#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:661
+#: builtin/clone.c:92 builtin/fetch.c:97 builtin/grep.c:663
msgid "depth"
msgstr "profondeur"
-#: builtin/clone.c:94
+#: builtin/clone.c:93
msgid "create a shallow clone of that depth"
msgstr "créer un clone superficiel de cette profondeur"
-#: builtin/clone.c:96
+#: builtin/clone.c:95
msgid "clone only one branch, HEAD or --branch"
msgstr "cloner seulement une branche, HEAD ou --branch"
-#: builtin/clone.c:97 builtin/init-db.c:494
+#: builtin/clone.c:96 builtin/init-db.c:494
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:98 builtin/init-db.c:495
+#: builtin/clone.c:97 builtin/init-db.c:495
msgid "separate git dir from working tree"
msgstr "séparer le répertoire git de la copie de travail"
-#: builtin/clone.c:99
+#: builtin/clone.c:98
msgid "key=value"
msgstr "clé=valeur"
-#: builtin/clone.c:100
+#: builtin/clone.c:99
msgid "set config inside the new repository"
msgstr "régler la configuration dans le nouveau dépôt"
-#: builtin/clone.c:253
+#: builtin/clone.c:252
#, 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:316
+#: builtin/clone.c:315
#, c-format
msgid "failed to create directory '%s'"
msgstr "échec de la création du répertoire '%s'"
-#: builtin/clone.c:318 builtin/diff.c:77
+#: builtin/clone.c:317 builtin/diff.c:77
#, c-format
msgid "failed to stat '%s'"
msgstr "échec du stat de '%s'"
-#: builtin/clone.c:320
+#: builtin/clone.c:319
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existe et n'est pas un répertoire"
-#: builtin/clone.c:334
+#: builtin/clone.c:333
#, c-format
msgid "failed to stat %s\n"
msgstr "échec du stat de %s\n"
-#: builtin/clone.c:356
+#: builtin/clone.c:355
#, c-format
msgid "failed to create link '%s'"
msgstr "échec de la création du lien '%s'"
-#: builtin/clone.c:360
+#: builtin/clone.c:359
#, c-format
msgid "failed to copy file to '%s'"
msgstr "échec de la copie vers '%s'"
-#: builtin/clone.c:383
+#: builtin/clone.c:382 builtin/clone.c:559
#, c-format
msgid "done.\n"
msgstr "fait.\n"
-#: builtin/clone.c:396
+#: builtin/clone.c:395
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -3855,108 +4036,103 @@ msgstr ""
"Vous pouvez inspecter ce qui a été extrait avec 'git status'\n"
"et réessayer l'extraction avec 'git checkout -f HEAD'\n"
-#: builtin/clone.c:475
+#: builtin/clone.c:474
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Impossible de trouver la branche distante '%s' à cloner."
-#: builtin/clone.c:555
+#: builtin/clone.c:554
#, c-format
msgid "Checking connectivity... "
msgstr "Vérification de la connectivité... "
-#: builtin/clone.c:558
+#: builtin/clone.c:557
msgid "remote did not send all necessary objects"
msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"
-#: builtin/clone.c:560
-#, c-format
-msgid "done\n"
-msgstr "fait\n"
-
-#: builtin/clone.c:621
+#: builtin/clone.c:620
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:652
+#: builtin/clone.c:651
msgid "unable to checkout working tree"
msgstr "impossible d'extraire la copie de travail"
-#: builtin/clone.c:760
+#: builtin/clone.c:759
msgid "Too many arguments."
msgstr "Trop d'arguments."
-#: builtin/clone.c:764
+#: builtin/clone.c:763
msgid "You must specify a repository to clone."
msgstr "Vous devez spécifier un dépôt à cloner."
-#: builtin/clone.c:775
+#: builtin/clone.c:774
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "les options --bare et --origin %s sont incompatibles."
-#: builtin/clone.c:778
+#: builtin/clone.c:777
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare et --separate-git-dir sont incompatibles."
-#: builtin/clone.c:791
+#: builtin/clone.c:790
#, c-format
msgid "repository '%s' does not exist"
msgstr "le dépôt '%s' n'existe pas"
-#: builtin/clone.c:796
+#: builtin/clone.c:795
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:798
+#: builtin/clone.c:797
msgid "--local is ignored"
msgstr "--local est ignoré"
-#: builtin/clone.c:808
+#: builtin/clone.c:807
#, 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:818
+#: builtin/clone.c:817
#, c-format
msgid "working tree '%s' already exists."
msgstr "la copie de travail '%s' existe déjà."
-#: builtin/clone.c:831 builtin/clone.c:843
+#: builtin/clone.c:830 builtin/clone.c:842
#, 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:834
+#: builtin/clone.c:833
#, 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:853
+#: builtin/clone.c:852
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Clonage dans le dépôt nu '%s'\n"
-#: builtin/clone.c:855
+#: builtin/clone.c:854
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clonage dans '%s'...\n"
-#: builtin/clone.c:890
+#: builtin/clone.c:888
#, c-format
msgid "Don't know how to clone %s"
msgstr "Je ne sais pas cloner %s"
-#: builtin/clone.c:942
+#: builtin/clone.c:939 builtin/clone.c:947
#, 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:949
+#: builtin/clone.c:950
msgid "You appear to have cloned an empty repository."
msgstr "Vous semblez avoir cloné un dépôt vide."
@@ -3992,15 +4168,15 @@ msgstr "Remplissage d'espace entre les colonnes"
msgid "--command must be the first argument"
msgstr "--command doit être le premier argument"
-#: builtin/commit.c:35
+#: builtin/commit.c:36
msgid "git commit [options] [--] <pathspec>..."
msgstr "git commit [options] [--] <spécification-de-chemin>..."
-#: builtin/commit.c:40
+#: builtin/commit.c:41
msgid "git status [options] [--] <pathspec>..."
msgstr "git status [options] [--] <spécification-de-chemin>..."
-#: builtin/commit.c:45
+#: builtin/commit.c:46
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4026,7 +4202,7 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: builtin/commit.c:57
+#: builtin/commit.c:58
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -4037,7 +4213,7 @@ msgstr ""
"vide. Vous pouvez répéter votre commande avec --allow-empty, ou vous pouvez\n"
"supprimer complètement le commit avec \"git reset HEAD^\".\n"
-#: builtin/commit.c:62
+#: builtin/commit.c:63
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -4052,11 +4228,11 @@ msgstr ""
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:69
+#: builtin/commit.c:70
msgid "Otherwise, please use 'git reset'\n"
msgstr "Sinon, veuillez utiliser 'git reset'\n"
-#: builtin/commit.c:72
+#: builtin/commit.c:73
msgid ""
"If you wish to skip this commit, use:\n"
"\n"
@@ -4072,93 +4248,93 @@ msgstr ""
"Puis \"git cherry-pick --continue\" continuera le picorage \n"
"des commits restants.\n"
-#: builtin/commit.c:279
+#: builtin/commit.c:287
msgid "failed to unpack HEAD tree object"
msgstr "échec du dépaquetage de l'objet arbre HEAD"
-#: builtin/commit.c:321
+#: builtin/commit.c:329
msgid "unable to create temporary index"
msgstr "impossible de créer l'index temporaire"
-#: builtin/commit.c:327
+#: builtin/commit.c:335
msgid "interactive add failed"
msgstr "échec de l'ajout interactif"
-#: builtin/commit.c:360 builtin/commit.c:381 builtin/commit.c:431
+#: builtin/commit.c:368 builtin/commit.c:389 builtin/commit.c:439
msgid "unable to write new_index file"
msgstr "impossible d'écrire le fichier new_index"
-#: builtin/commit.c:412
+#: builtin/commit.c:420
msgid "cannot do a partial commit during a merge."
msgstr "impossible de faire une validation partielle pendant une fusion."
-#: builtin/commit.c:414
+#: builtin/commit.c:422
msgid "cannot do a partial commit during a cherry-pick."
msgstr "impossible de faire une validation partielle pendant un picorage."
-#: builtin/commit.c:424
+#: builtin/commit.c:432
msgid "cannot read the index"
msgstr "impossible de lire l'index"
-#: builtin/commit.c:444
+#: builtin/commit.c:452
msgid "unable to write temporary index file"
msgstr "impossible d'écrire le fichier d'index temporaire"
-#: builtin/commit.c:535 builtin/commit.c:541
+#: builtin/commit.c:543 builtin/commit.c:549
#, c-format
msgid "invalid commit: %s"
msgstr "commit invalide : %s"
-#: builtin/commit.c:563
+#: builtin/commit.c:571
msgid "malformed --author parameter"
msgstr "paramètre --author mal formé"
-#: builtin/commit.c:583
+#: builtin/commit.c:591
#, c-format
msgid "Malformed ident string: '%s'"
msgstr "Chaîne ident mal formée : '%s'"
-#: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:982
+#: builtin/commit.c:630 builtin/commit.c:663 builtin/commit.c:1007
#, c-format
msgid "could not lookup commit %s"
msgstr "impossible de rechercher le commit %s"
-#: builtin/commit.c:633 builtin/shortlog.c:271
+#: builtin/commit.c:642 builtin/shortlog.c:273
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(lecture du message de journal depuis l'entrée standard)\n"
-#: builtin/commit.c:635
+#: builtin/commit.c:644
msgid "could not read log from standard input"
msgstr "impossible de lire le journal depuis l'entrée standard"
-#: builtin/commit.c:639
+#: builtin/commit.c:648
#, c-format
msgid "could not read log file '%s'"
msgstr "impossible de lire le fichier de journal '%s'"
-#: builtin/commit.c:645
+#: builtin/commit.c:654
msgid "commit has empty message"
msgstr "le commit a un message vide"
-#: builtin/commit.c:661
+#: builtin/commit.c:670
msgid "could not read MERGE_MSG"
msgstr "impossible de lire MERGE_MSG"
-#: builtin/commit.c:665
+#: builtin/commit.c:674
msgid "could not read SQUASH_MSG"
msgstr "impossible de lire SQUASH_MSG"
-#: builtin/commit.c:669
+#: builtin/commit.c:678
#, c-format
msgid "could not read '%s'"
msgstr "impossible de lire '%s'"
-#: builtin/commit.c:730
+#: builtin/commit.c:749
msgid "could not write commit template"
msgstr "impossible d'écrire le modèle de commit"
-#: builtin/commit.c:741
+#: builtin/commit.c:760
#, c-format
msgid ""
"\n"
@@ -4173,7 +4349,7 @@ msgstr ""
"\t%s\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:746
+#: builtin/commit.c:765
#, c-format
msgid ""
"\n"
@@ -4188,7 +4364,7 @@ msgstr ""
"\t%s\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:758
+#: builtin/commit.c:777
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -4198,7 +4374,7 @@ msgstr ""
"commençant par '%c' seront ignorées, et un message vide abandonne la "
"validation.\n"
-#: builtin/commit.c:763
+#: builtin/commit.c:782
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -4209,142 +4385,142 @@ msgstr ""
"commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n"
"si vous le souhaitez. Un message vide abandonne la validation.\n"
-#: builtin/commit.c:776
+#: builtin/commit.c:795
#, c-format
msgid "%sAuthor: %s"
msgstr "%sAuteur : %s"
-#: builtin/commit.c:783
+#: builtin/commit.c:802
#, c-format
msgid "%sCommitter: %s"
msgstr "%sValidateur : %s"
-#: builtin/commit.c:803
+#: builtin/commit.c:822
msgid "Cannot read index"
msgstr "Impossible de lire l'index"
-#: builtin/commit.c:845
+#: builtin/commit.c:865
msgid "Error building trees"
msgstr "Erreur lors de la construction des arbres"
-#: builtin/commit.c:860 builtin/tag.c:359
+#: builtin/commit.c:880 builtin/tag.c:359
#, 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:957
+#: builtin/commit.c:982
#, c-format
msgid "No existing author found with '%s'"
msgstr "Aucun auteur existant trouvé avec '%s'"
-#: builtin/commit.c:972 builtin/commit.c:1208
+#: builtin/commit.c:997 builtin/commit.c:1237
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode de fichier non suivi invalide '%s'"
-#: builtin/commit.c:1009
+#: builtin/commit.c:1034
msgid "--long and -z are incompatible"
msgstr "--long et -z sont incompatibles"
-#: builtin/commit.c:1039
+#: builtin/commit.c:1064
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:1050
+#: builtin/commit.c:1075
msgid "You have nothing to amend."
msgstr "Il n'y a rien à corriger."
-#: builtin/commit.c:1053
+#: builtin/commit.c:1078
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."
-#: builtin/commit.c:1055
+#: builtin/commit.c:1080
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:1058
+#: builtin/commit.c:1083
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:1068
+#: builtin/commit.c:1093
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:1070
+#: builtin/commit.c:1095
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:1078
+#: builtin/commit.c:1103
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:1095
+#: builtin/commit.c:1120
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:1097
+#: builtin/commit.c:1122
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:1099
+#: builtin/commit.c:1124
msgid "Clever... amending the last one with dirty index."
msgstr "Malin... correction du dernier avec un index sale."
-#: builtin/commit.c:1101
+#: builtin/commit.c:1126
msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..."
-#: builtin/commit.c:1111 builtin/tag.c:575
+#: builtin/commit.c:1136 builtin/tag.c:572
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Mode de nettoyage invalide %s"
-#: builtin/commit.c:1116
+#: builtin/commit.c:1141
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:1222 builtin/commit.c:1455
+#: builtin/commit.c:1251 builtin/commit.c:1482
msgid "show status concisely"
msgstr "afficher le statut avec concision"
-#: builtin/commit.c:1224 builtin/commit.c:1457
+#: builtin/commit.c:1253 builtin/commit.c:1484
msgid "show branch information"
msgstr "afficher l'information de branche"
-#: builtin/commit.c:1226 builtin/commit.c:1459 builtin/push.c:452
+#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:460
msgid "machine-readable output"
msgstr "sortie pour traitement automatique"
-#: builtin/commit.c:1229 builtin/commit.c:1461
+#: builtin/commit.c:1258 builtin/commit.c:1488
msgid "show status in long format (default)"
msgstr "afficher le statut en format long (par défaut)"
-#: builtin/commit.c:1232 builtin/commit.c:1464
+#: builtin/commit.c:1261 builtin/commit.c:1491
msgid "terminate entries with NUL"
msgstr "terminer les éléments par NUL"
-#: builtin/commit.c:1234 builtin/commit.c:1467 builtin/fast-export.c:667
-#: builtin/fast-export.c:670 builtin/tag.c:459
+#: builtin/commit.c:1263 builtin/commit.c:1494 builtin/fast-export.c:674
+#: builtin/fast-export.c:677 builtin/tag.c:459
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1235 builtin/commit.c:1467
+#: builtin/commit.c:1264 builtin/commit.c:1494
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:1238
+#: builtin/commit.c:1267
msgid "show ignored files"
msgstr "afficher les fichiers ignorés"
-#: builtin/commit.c:1239 parse-options.h:154
+#: builtin/commit.c:1268 parse-options.h:156
msgid "when"
msgstr "quand"
-#: builtin/commit.c:1240
+#: builtin/commit.c:1269
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -4352,217 +4528,217 @@ msgstr ""
"ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "
"(tous), dirty (sale), untracked (non suivi). (Défaut : all)"
-#: builtin/commit.c:1242
+#: builtin/commit.c:1271
msgid "list untracked files in columns"
msgstr "afficher les fichiers non suivis en colonnes"
-#: builtin/commit.c:1313
+#: builtin/commit.c:1340
msgid "couldn't look up newly created commit"
msgstr "impossible de retrouver le commit nouvellement créé"
-#: builtin/commit.c:1315
+#: builtin/commit.c:1342
msgid "could not parse newly created commit"
msgstr "impossible d'analyser le commit nouvellement créé"
-#: builtin/commit.c:1356
+#: builtin/commit.c:1383
msgid "detached HEAD"
msgstr "HEAD détachée"
-#: builtin/commit.c:1358
+#: builtin/commit.c:1385
msgid " (root-commit)"
msgstr " (commit racine)"
-#: builtin/commit.c:1425
+#: builtin/commit.c:1452
msgid "suppress summary after successful commit"
msgstr "supprimer le résumé après une validation réussie"
-#: builtin/commit.c:1426
+#: builtin/commit.c:1453
msgid "show diff in commit message template"
msgstr "afficher les diff dans le modèle de message de validation"
-#: builtin/commit.c:1428
+#: builtin/commit.c:1455
msgid "Commit message options"
msgstr "Options du message de validation"
-#: builtin/commit.c:1429 builtin/tag.c:457
+#: builtin/commit.c:1456 builtin/tag.c:457
msgid "read message from file"
msgstr "lire le message depuis un fichier"
-#: builtin/commit.c:1430
+#: builtin/commit.c:1457
msgid "author"
msgstr "auteur"
-#: builtin/commit.c:1430
+#: builtin/commit.c:1457
msgid "override author for commit"
msgstr "remplacer l'auteur pour la validation"
-#: builtin/commit.c:1431 builtin/gc.c:178
+#: builtin/commit.c:1458 builtin/gc.c:260
msgid "date"
msgstr "date"
-#: builtin/commit.c:1431
+#: builtin/commit.c:1458
msgid "override date for commit"
msgstr "remplacer la date pour la validation"
-#: builtin/commit.c:1432 builtin/merge.c:223 builtin/notes.c:405
+#: builtin/commit.c:1459 builtin/merge.c:223 builtin/notes.c:405
#: builtin/notes.c:562 builtin/tag.c:455
msgid "message"
msgstr "message"
-#: builtin/commit.c:1432
+#: builtin/commit.c:1459
msgid "commit message"
msgstr "message de validation"
-#: builtin/commit.c:1433
+#: builtin/commit.c:1460
msgid "reuse and edit message from specified commit"
msgstr "réutiliser et éditer le message du commit spécifié"
-#: builtin/commit.c:1434
+#: builtin/commit.c:1461
msgid "reuse message from specified commit"
msgstr "réutiliser le message du commit spécifié"
-#: builtin/commit.c:1435
+#: builtin/commit.c:1462
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"utiliser un message formaté par autosquash pour corriger le commit spécifié"
-#: builtin/commit.c:1436
+#: builtin/commit.c:1463
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"utiliser un message formaté par autosquash pour compresser le commit spécifié"
-#: builtin/commit.c:1437
+#: builtin/commit.c:1464
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:1438 builtin/log.c:1160 builtin/revert.c:111
+#: builtin/commit.c:1465 builtin/log.c:1180 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "ajouter une entrée Signed-off-by :"
-#: builtin/commit.c:1439
+#: builtin/commit.c:1466
msgid "use specified template file"
msgstr "utiliser le fichier de modèle spécifié"
-#: builtin/commit.c:1440
+#: builtin/commit.c:1467
msgid "force edit of commit"
msgstr "forcer l'édition du commit"
-#: builtin/commit.c:1441
+#: builtin/commit.c:1468
msgid "default"
msgstr "défaut"
-#: builtin/commit.c:1441 builtin/tag.c:460
+#: builtin/commit.c:1468 builtin/tag.c:460
msgid "how to strip spaces and #comments from message"
msgstr "comment éliminer les espaces et les commentaires # du message"
-#: builtin/commit.c:1442
+#: builtin/commit.c:1469
msgid "include status in commit message template"
msgstr "inclure le statut dans le modèle de message de validation"
-#: builtin/commit.c:1443 builtin/merge.c:230 builtin/tag.c:461
+#: builtin/commit.c:1470 builtin/merge.c:230 builtin/tag.c:461
msgid "key id"
msgstr "identifiant de clé"
-#: builtin/commit.c:1444 builtin/merge.c:231
+#: builtin/commit.c:1471 builtin/merge.c:231
msgid "GPG sign commit"
msgstr "signer la validation avec GPG"
#. end commit message options
-#: builtin/commit.c:1447
+#: builtin/commit.c:1474
msgid "Commit contents options"
msgstr "Valider les options des contenus"
-#: builtin/commit.c:1448
+#: builtin/commit.c:1475
msgid "commit all changed files"
msgstr "valider tous les fichiers modifiés"
-#: builtin/commit.c:1449
+#: builtin/commit.c:1476
msgid "add specified files to index for commit"
msgstr "ajouter les fichiers spécifiés à l'index pour la validation"
-#: builtin/commit.c:1450
+#: builtin/commit.c:1477
msgid "interactively add files"
msgstr "ajouter des fichiers en mode interactif"
-#: builtin/commit.c:1451
+#: builtin/commit.c:1478
msgid "interactively add changes"
msgstr "ajouter les modifications en mode interactif"
-#: builtin/commit.c:1452
+#: builtin/commit.c:1479
msgid "commit only specified files"
msgstr "valider seulement les fichiers spécifiés"
-#: builtin/commit.c:1453
+#: builtin/commit.c:1480
msgid "bypass pre-commit hook"
msgstr "éviter d'utiliser le crochet pre-commit"
-#: builtin/commit.c:1454
+#: builtin/commit.c:1481
msgid "show what would be committed"
msgstr "afficher ce qui serait validé"
-#: builtin/commit.c:1465
+#: builtin/commit.c:1492
msgid "amend previous commit"
msgstr "corriger la validation précédente"
-#: builtin/commit.c:1466
+#: builtin/commit.c:1493
msgid "bypass post-rewrite hook"
msgstr "éviter d'utiliser le crochet post-rewrite"
-#: builtin/commit.c:1471
+#: builtin/commit.c:1498
msgid "ok to record an empty change"
msgstr "accepter d'enregistrer une modification vide"
-#: builtin/commit.c:1474
+#: builtin/commit.c:1500
msgid "ok to record a change with an empty message"
msgstr "accepter d'enregistrer une modification avec un message vide"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1529
msgid "could not parse HEAD commit"
msgstr "impossible d'analyser le commit HEAD"
-#: builtin/commit.c:1545 builtin/merge.c:525
+#: builtin/commit.c:1567 builtin/merge.c:525
#, c-format
msgid "could not open '%s' for reading"
msgstr "impossible d'ouvrir '%s' en lecture"
-#: builtin/commit.c:1552
+#: builtin/commit.c:1574
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fichier MERGE_HEAD corrompu (%s)"
-#: builtin/commit.c:1559
+#: builtin/commit.c:1581
msgid "could not read MERGE_MODE"
msgstr "impossible de lire MERGE_MODE"
-#: builtin/commit.c:1578
+#: builtin/commit.c:1600
#, c-format
msgid "could not read commit message: %s"
msgstr "impossible de lire le message de validation : %s"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1614
#, 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:1597
+#: builtin/commit.c:1619
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Abandon de la validation du à un message de validation vide\n"
-#: builtin/commit.c:1612 builtin/merge.c:861 builtin/merge.c:886
+#: builtin/commit.c:1634 builtin/merge.c:861 builtin/merge.c:886
msgid "failed to write commit object"
msgstr "échec de l'écriture de l'objet commit"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1655
msgid "cannot lock HEAD ref"
msgstr "impossible de verrouiller la référence HEAD"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1659
msgid "cannot update HEAD ref"
msgstr "impossible de mettre à jour la référence HEAD"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1670
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full or quota is\n"
@@ -4572,128 +4748,132 @@ msgstr ""
"new_index. Vérifiez que le disque n'est pas plein ou que le quota\n"
"n'a pas été dépassé, puis lancez \"git reset HEAD\" pour réparer."
-#: builtin/config.c:7
+#: builtin/config.c:8
msgid "git config [options]"
msgstr "git config [options]"
-#: builtin/config.c:52
+#: builtin/config.c:54
msgid "Config file location"
msgstr "Emplacement du fichier de configuration"
-#: builtin/config.c:53
+#: builtin/config.c:55
msgid "use global config file"
msgstr "utiliser les fichier de configuration global"
-#: builtin/config.c:54
+#: builtin/config.c:56
msgid "use system config file"
msgstr "utiliser le fichier de configuration du système"
-#: builtin/config.c:55
+#: builtin/config.c:57
msgid "use repository config file"
msgstr "utiliser le fichier de configuration du dépôt"
-#: builtin/config.c:56
+#: builtin/config.c:58
msgid "use given config file"
msgstr "utiliser le fichier de configuration spécifié"
-#: builtin/config.c:57
+#: builtin/config.c:59
msgid "blob-id"
msgstr "blob-id"
-#: builtin/config.c:57
+#: builtin/config.c:59
msgid "read config from given blob object"
msgstr "lire la configuration depuis l'objet blob fourni"
-#: builtin/config.c:58
+#: builtin/config.c:60
msgid "Action"
msgstr "Action"
-#: builtin/config.c:59
+#: builtin/config.c:61
msgid "get value: name [value-regex]"
msgstr "obtenir la valeur : nom [regex-de-valeur]"
-#: builtin/config.c:60
+#: builtin/config.c:62
msgid "get all values: key [value-regex]"
msgstr "obtenir toutes le valeurs : clé [regex-de-valeur]"
-#: builtin/config.c:61
+#: builtin/config.c:63
msgid "get values for regexp: name-regex [value-regex]"
msgstr "obtenir les valeur pour la regexp : regex-de-nom [regex-de-valeur]"
-#: builtin/config.c:62
+#: builtin/config.c:64
+msgid "get value specific for the URL: section[.var] URL"
+msgstr "obtenir la valeur spécifique pour l'URL : section[.var] URL"
+
+#: builtin/config.c:65
msgid "replace all matching variables: name value [value_regex]"
msgstr ""
"remplacer toutes les variables correspondant : nom valeur [regex-de-valeur]"
-#: builtin/config.c:63
+#: builtin/config.c:66
msgid "add a new variable: name value"
msgstr "ajouter une nouvelle variable : nom valeur"
-#: builtin/config.c:64
+#: builtin/config.c:67
msgid "remove a variable: name [value-regex]"
msgstr "supprimer une variable : nom [regex-de-valeur]"
-#: builtin/config.c:65
+#: builtin/config.c:68
msgid "remove all matches: name [value-regex]"
msgstr "supprimer toutes les correspondances nom [regex-de-valeur]"
-#: builtin/config.c:66
+#: builtin/config.c:69
msgid "rename section: old-name new-name"
msgstr "renommer une section : ancien-nom nouveau-nom"
-#: builtin/config.c:67
+#: builtin/config.c:70
msgid "remove a section: name"
msgstr "supprimer une section : nom"
-#: builtin/config.c:68
+#: builtin/config.c:71
msgid "list all"
msgstr "afficher tout"
-#: builtin/config.c:69
+#: builtin/config.c:72
msgid "open an editor"
msgstr "ouvrir un éditeur"
-#: builtin/config.c:70 builtin/config.c:71
+#: builtin/config.c:73 builtin/config.c:74
msgid "slot"
msgstr "emplacement"
-#: builtin/config.c:70
+#: builtin/config.c:73
msgid "find the color configured: [default]"
msgstr "trouver la couleur configurée : [par défaut]"
-#: builtin/config.c:71
+#: builtin/config.c:74
msgid "find the color setting: [stdout-is-tty]"
msgstr "trouver le réglage de la couleur : [stdout-est-tty]"
-#: builtin/config.c:72
+#: builtin/config.c:75
msgid "Type"
msgstr "Type"
-#: builtin/config.c:73
+#: builtin/config.c:76
msgid "value is \"true\" or \"false\""
msgstr "la valeur est \"true\" (vrai) our \"false\" (faux)"
-#: builtin/config.c:74
+#: builtin/config.c:77
msgid "value is decimal number"
msgstr "la valeur est un nombre décimal"
-#: builtin/config.c:75
+#: builtin/config.c:78
msgid "value is --bool or --int"
msgstr "la valeur est --bool ou --int"
-#: builtin/config.c:76
+#: builtin/config.c:79
msgid "value is a path (file or directory name)"
msgstr "la valeur est un chemin (vers un fichier ou un répertoire)"
-#: builtin/config.c:77
+#: builtin/config.c:80
msgid "Other"
msgstr "Autre"
-#: builtin/config.c:78
+#: builtin/config.c:81
msgid "terminate values with NUL byte"
msgstr "terminer les valeurs avec un caractère NUL"
-#: builtin/config.c:79
+#: builtin/config.c:82
msgid "respect include directives on lookup"
msgstr "respecter les directives d'inclusion lors de la recherche"
@@ -4705,7 +4885,7 @@ msgstr "git count-objects [-v] [-H | --human-readable]"
msgid "print sizes in human readable format"
msgstr "affiche les tailles dans un format humainement lisible"
-#: builtin/describe.c:15
+#: builtin/describe.c:16
msgid "git describe [options] <commit-ish>*"
msgstr "git describe [options] <commit ou apparenté>*"
@@ -4843,7 +5023,7 @@ msgstr "--long et --abbrev=0 sont incompatibles"
msgid "No names found, cannot describe anything."
msgstr "aucun nom trouvé, impossible de décrire quoi que ce soit."
-#: builtin/describe.c:481
+#: builtin/describe.c:489
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty est incompatible avec la spécification de commits ou assimilés"
@@ -4880,40 +5060,40 @@ msgstr "objet non géré '%s' spécifié."
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [options-de-liste-de-révisions]"
-#: builtin/fast-export.c:666
+#: builtin/fast-export.c:673
msgid "show progress after <n> objects"
msgstr "afficher la progression après <n> objets"
-#: builtin/fast-export.c:668
+#: builtin/fast-export.c:675
msgid "select handling of signed tags"
msgstr "sélectionner la gestion des étiquettes signées"
-#: builtin/fast-export.c:671
+#: builtin/fast-export.c:678
msgid "select handling of tags that tag filtered objects"
msgstr ""
"sélectionner la gestion des étiquettes qui pointent sur des objets filtrés"
-#: builtin/fast-export.c:674
+#: builtin/fast-export.c:681
msgid "Dump marks to this file"
msgstr "Enregistrer les marques dans ce fichier"
-#: builtin/fast-export.c:676
+#: builtin/fast-export.c:683
msgid "Import marks from this file"
msgstr "importer les marques depuis ce fichier"
-#: builtin/fast-export.c:678
+#: builtin/fast-export.c:685
msgid "Fake a tagger when tags lack one"
msgstr "falsifier un auteur d'étiquette si l'étiquette n'en présente pas"
-#: builtin/fast-export.c:680
+#: builtin/fast-export.c:687
msgid "Output full tree for each commit"
msgstr "Afficher l'arbre complet pour chaque commit"
-#: builtin/fast-export.c:682
+#: builtin/fast-export.c:689
msgid "Use the done feature to terminate the stream"
msgstr "Utiliser la fonction \"done\" pour terminer le flux"
-#: builtin/fast-export.c:683
+#: builtin/fast-export.c:690
msgid "Skip output of blob data"
msgstr "Sauter l'affichage de données de blob"
@@ -4933,146 +5113,146 @@ msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]"
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<options>]"
-#: builtin/fetch.c:60
+#: builtin/fetch.c:74
msgid "fetch from all remotes"
msgstr "récupérer depuis tous le dépôts distants"
-#: builtin/fetch.c:62
+#: builtin/fetch.c:76
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser"
-#: builtin/fetch.c:64
+#: builtin/fetch.c:78
msgid "path to upload pack on remote end"
msgstr "chemin vers lequel télécharger le paquet sur le poste distant"
-#: builtin/fetch.c:65
+#: builtin/fetch.c:79
msgid "force overwrite of local branch"
msgstr "forcer l'écrasement de la branche locale"
-#: builtin/fetch.c:67
+#: builtin/fetch.c:81
msgid "fetch from multiple remotes"
msgstr "récupérer depuis plusieurs dépôts distants"
-#: builtin/fetch.c:69
+#: builtin/fetch.c:83
msgid "fetch all tags and associated objects"
msgstr "récupérer toutes les étiquettes et leurs objets associés"
-#: builtin/fetch.c:71
+#: builtin/fetch.c:85
msgid "do not fetch all tags (--no-tags)"
msgstr "ne pas récupérer toutes les étiquettes (--no-tags)"
-#: builtin/fetch.c:73
+#: builtin/fetch.c:87
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:74
+#: builtin/fetch.c:88
msgid "on-demand"
msgstr "à la demande"
-#: builtin/fetch.c:75
+#: builtin/fetch.c:89
msgid "control recursive fetching of submodules"
msgstr "contrôler la récupération récursive dans les sous-modules"
-#: builtin/fetch.c:79
+#: builtin/fetch.c:93
msgid "keep downloaded pack"
msgstr "conserver le paquet téléchargé"
-#: builtin/fetch.c:81
+#: builtin/fetch.c:95
msgid "allow updating of HEAD ref"
msgstr "permettre la mise à jour de la référence HEAD"
-#: builtin/fetch.c:84
+#: builtin/fetch.c:98
msgid "deepen history of shallow clone"
msgstr "approfondir l'historique d'un clone superficiel"
-#: builtin/fetch.c:86
+#: builtin/fetch.c:100
msgid "convert to a complete repository"
msgstr "convertir en un dépôt complet"
-#: builtin/fetch.c:88 builtin/log.c:1177
+#: builtin/fetch.c:102 builtin/log.c:1197
msgid "dir"
msgstr "dir"
-#: builtin/fetch.c:89
+#: builtin/fetch.c:103
msgid "prepend this to submodule path output"
msgstr "préfixer ceci à la sortie du chemin du sous-module"
-#: builtin/fetch.c:92
+#: builtin/fetch.c:106
msgid "default mode for recursion"
msgstr "mode par défaut pour la récursion"
-#: builtin/fetch.c:220
+#: builtin/fetch.c:236
msgid "Couldn't find remote ref HEAD"
msgstr "impossible de trouver la référence HEAD distante"
-#: builtin/fetch.c:273
+#: builtin/fetch.c:290
#, c-format
msgid "object %s not found"
msgstr "objet %s non trouvé"
-#: builtin/fetch.c:278
+#: builtin/fetch.c:295
msgid "[up to date]"
msgstr "[à jour]"
-#: builtin/fetch.c:292
+#: builtin/fetch.c:309
#, c-format
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr "! %-*s %-*s -> %s (impossible de récupérer la branche actuelle)"
-#: builtin/fetch.c:293 builtin/fetch.c:379
+#: builtin/fetch.c:310 builtin/fetch.c:396
msgid "[rejected]"
msgstr "[rejeté]"
-#: builtin/fetch.c:304
+#: builtin/fetch.c:321
msgid "[tag update]"
msgstr "[mise à jour de l'étiquette]"
-#: builtin/fetch.c:306 builtin/fetch.c:341 builtin/fetch.c:359
+#: builtin/fetch.c:323 builtin/fetch.c:358 builtin/fetch.c:376
msgid " (unable to update local ref)"
msgstr " (impossible de mettre à jour la référence locale)"
-#: builtin/fetch.c:324
+#: builtin/fetch.c:341
msgid "[new tag]"
msgstr "[nouvelle étiquette]"
-#: builtin/fetch.c:327
+#: builtin/fetch.c:344
msgid "[new branch]"
msgstr "[nouvelle branche]"
-#: builtin/fetch.c:330
+#: builtin/fetch.c:347
msgid "[new ref]"
msgstr "[nouvelle référence]"
-#: builtin/fetch.c:375
+#: builtin/fetch.c:392
msgid "unable to update local ref"
msgstr "impossible de mettre à jour la référence locale"
-#: builtin/fetch.c:375
+#: builtin/fetch.c:392
msgid "forced update"
msgstr "mise à jour forcée"
-#: builtin/fetch.c:381
+#: builtin/fetch.c:398
msgid "(non-fast-forward)"
msgstr "(pas d'avance rapide)"
-#: builtin/fetch.c:412 builtin/fetch.c:718
+#: builtin/fetch.c:429 builtin/fetch.c:735
#, c-format
msgid "cannot open %s: %s\n"
msgstr "impossible d'ouvrir %s : %s\n"
-#: builtin/fetch.c:421
+#: builtin/fetch.c:438
#, 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:520
+#: builtin/fetch.c:537
#, c-format
msgid "From %.*s\n"
msgstr "Depuis %.*s\n"
-#: builtin/fetch.c:531
+#: builtin/fetch.c:548
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -5081,55 +5261,55 @@ msgstr ""
"des références locales n'ont pas pu être mises à jour ; essayez de lancer\n"
" 'git remote prune %s' pour supprimer des branches anciennes en conflit"
-#: builtin/fetch.c:581
+#: builtin/fetch.c:598
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s sera en suspens)"
-#: builtin/fetch.c:582
+#: builtin/fetch.c:599
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s est devenu en suspens)"
-#: builtin/fetch.c:589
+#: builtin/fetch.c:606
msgid "[deleted]"
msgstr "[supprimé]"
-#: builtin/fetch.c:590 builtin/remote.c:1055
+#: builtin/fetch.c:607 builtin/remote.c:1055
msgid "(none)"
msgstr "(aucun(e))"
-#: builtin/fetch.c:708
+#: builtin/fetch.c:725
#, 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:742
-#, c-format
-msgid "Don't know how to fetch from %s"
-msgstr "Je ne sais pas récupérer depuis %s"
-
-#: builtin/fetch.c:823
+#: builtin/fetch.c:744
#, 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:826
+#: builtin/fetch.c:747
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "L'option \"%s\" est ignorée pour %s\n"
-#: builtin/fetch.c:928
+#: builtin/fetch.c:801
+#, c-format
+msgid "Don't know how to fetch from %s"
+msgstr "Je ne sais pas récupérer depuis %s"
+
+#: builtin/fetch.c:976
#, c-format
msgid "Fetching %s\n"
msgstr "Récupération de %s\n"
-#: builtin/fetch.c:930 builtin/remote.c:100
+#: builtin/fetch.c:978 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr "Impossible de récupérer %s"
-#: builtin/fetch.c:949
+#: builtin/fetch.c:997
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -5137,32 +5317,32 @@ msgstr ""
"Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n"
"distant depuis lesquels les nouvelles révisions devraient être récupérées."
-#: builtin/fetch.c:969
+#: builtin/fetch.c:1020
msgid "You need to specify a tag name."
msgstr "Vous devez spécifier un nom d'étiquette."
-#: builtin/fetch.c:1015
+#: builtin/fetch.c:1068
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"
-#: builtin/fetch.c:1017
+#: builtin/fetch.c:1070
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:1036
+#: builtin/fetch.c:1089
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all n'accepte pas d'argument de dépôt"
-#: builtin/fetch.c:1038
+#: builtin/fetch.c:1091
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:1049
+#: builtin/fetch.c:1102
#, c-format
msgid "No such remote or remote group: %s"
msgstr "distant ou groupe distant inexistant : %s"
-#: builtin/fetch.c:1057
+#: builtin/fetch.c:1110
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 "
@@ -5173,9 +5353,9 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
msgstr ""
"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <fichier>]"
-#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700
-#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:179
-#: builtin/tag.c:446 parse-options.h:133 parse-options.h:243
+#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702
+#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:178
+#: builtin/tag.c:446 parse-options.h:135 parse-options.h:245
msgid "n"
msgstr "n"
@@ -5199,118 +5379,122 @@ msgstr "utiliser <texte> comme début de message"
msgid "file to read from"
msgstr "fichier d'où lire"
-#: builtin/for-each-ref.c:979
+#: builtin/for-each-ref.c:995
msgid "git for-each-ref [options] [<pattern>]"
msgstr "git for-each-ref [options] [<motif>]"
-#: builtin/for-each-ref.c:994
+#: builtin/for-each-ref.c:1010
msgid "quote placeholders suitably for shells"
msgstr "échapper les champs réservés pour les interpréteurs de commandes"
-#: builtin/for-each-ref.c:996
+#: builtin/for-each-ref.c:1012
msgid "quote placeholders suitably for perl"
msgstr "échapper les champs réservés pour perl"
-#: builtin/for-each-ref.c:998
+#: builtin/for-each-ref.c:1014
msgid "quote placeholders suitably for python"
msgstr "échapper les champs réservés pour python"
-#: builtin/for-each-ref.c:1000
+#: builtin/for-each-ref.c:1016
msgid "quote placeholders suitably for tcl"
msgstr "échapper les champs réservés pour tcl"
-#: builtin/for-each-ref.c:1003
+#: builtin/for-each-ref.c:1019
msgid "show only <n> matched refs"
msgstr "n'afficher que <n> références correspondant"
-#: builtin/for-each-ref.c:1004
+#: builtin/for-each-ref.c:1020
msgid "format"
msgstr "format"
-#: builtin/for-each-ref.c:1004
+#: builtin/for-each-ref.c:1020
msgid "format to use for the output"
msgstr "format à utiliser pour la sortie"
-#: builtin/for-each-ref.c:1005
+#: builtin/for-each-ref.c:1021
msgid "key"
msgstr "clé"
-#: builtin/for-each-ref.c:1006
+#: builtin/for-each-ref.c:1022
msgid "field name to sort on"
msgstr "nom du champ servant à trier"
-#: builtin/fsck.c:608
+#: builtin/fsck.c:607
msgid "git fsck [options] [<object>...]"
msgstr "git fsck [options] [<objet>...]"
-#: builtin/fsck.c:614
+#: builtin/fsck.c:613
msgid "show unreachable objects"
msgstr "afficher les objets inaccessibles"
-#: builtin/fsck.c:615
+#: builtin/fsck.c:614
msgid "show dangling objects"
msgstr "afficher les objets en suspens"
-#: builtin/fsck.c:616
+#: builtin/fsck.c:615
msgid "report tags"
msgstr "afficher les étiquettes"
-#: builtin/fsck.c:617
+#: builtin/fsck.c:616
msgid "report root nodes"
msgstr "signaler les nœuds racines"
-#: builtin/fsck.c:618
+#: builtin/fsck.c:617
msgid "make index objects head nodes"
msgstr "considérer les objets de l'index comme nœuds tête"
# translated from man page
-#: builtin/fsck.c:619
+#: builtin/fsck.c:618
msgid "make reflogs head nodes (default)"
msgstr "considérer les reflogs comme nœuds tête (par défaut)"
-#: builtin/fsck.c:620
+#: builtin/fsck.c:619
msgid "also consider packs and alternate objects"
msgstr "inspecter aussi les objets pack et alternatifs"
-#: builtin/fsck.c:621
+#: builtin/fsck.c:620
msgid "enable more strict checking"
msgstr "activer une vérification plus strict"
-#: builtin/fsck.c:623
+#: builtin/fsck.c:622
msgid "write dangling objects in .git/lost-found"
msgstr "écrire les objets en suspens dans .git/lost-found"
-#: builtin/fsck.c:624 builtin/prune.c:134
+#: builtin/fsck.c:623 builtin/prune.c:134
msgid "show progress"
msgstr "afficher la progression"
-#: builtin/gc.c:22
+#: builtin/gc.c:23
msgid "git gc [options]"
msgstr "git gc [options]"
-#: builtin/gc.c:63
+#: builtin/gc.c:79
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s invalide : '%s'"
-#: builtin/gc.c:90
+#: builtin/gc.c:106
#, c-format
msgid "insanely long object directory %.*s"
msgstr "objet répertoire démentiellement long %.*s"
-#: builtin/gc.c:179
+#: builtin/gc.c:261
msgid "prune unreferenced objects"
msgstr "éliminer les objets non référencés"
-#: builtin/gc.c:181
+#: builtin/gc.c:263
msgid "be more thorough (increased runtime)"
msgstr "être plus consciencieux (durée de traitement allongée)"
-#: builtin/gc.c:182
+#: builtin/gc.c:264
msgid "enable auto-gc mode"
msgstr "activer le mode auto-gc"
-#: builtin/gc.c:222
+#: builtin/gc.c:265
+msgid "force running gc even if there may be another gc running"
+msgstr "forcer le lancement du ramasse-miettes même si un autre ramasse-miettes tourne déjà"
+
+#: builtin/gc.c:305
#, c-format
msgid ""
"Auto packing the repository for optimum performance. You may also\n"
@@ -5321,43 +5505,50 @@ msgstr ""
"lancer \"git gc\" manuellement. Voir \"git help gc\" pour plus "
"d'information.\n"
-#: builtin/gc.c:249
+#. be quiet on --auto
+#: builtin/gc.c:315
+#, c-format
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgstr "un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> (utilisez --force si ce n'est pas le cas)"
+
+#: builtin/gc.c:340
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Il y a trop d'objets seuls inaccessibles ; lancez 'git prune' pour les "
"supprimer."
-#: builtin/grep.c:22
+#: builtin/grep.c:23
msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [options] [-e] <motif> [<révision>...] [[--] <chemin>...]"
-#: builtin/grep.c:217
+#: builtin/grep.c:218
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep : échec de création du fil: %s"
-#: builtin/grep.c:364
+#: builtin/grep.c:365
#, c-format
msgid "Failed to chdir: %s"
msgstr "Échec de chdir: %s"
-#: builtin/grep.c:442 builtin/grep.c:477
+#: builtin/grep.c:443 builtin/grep.c:478
#, c-format
msgid "unable to read tree (%s)"
msgstr "impossible de lire l'arbre (%s)"
-#: builtin/grep.c:492
+#: builtin/grep.c:493
#, 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:550
+#: builtin/grep.c:551
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "l'option '%c' attend un valeur numérique"
-#: builtin/grep.c:567
+#: builtin/grep.c:568
#, c-format
msgid "cannot open '%s'"
msgstr "impossible d'ouvrir '%s'"
@@ -5399,167 +5590,171 @@ msgid "don't match patterns in binary files"
msgstr "ne pas chercher les motifs dans les fichiers binaires"
#: builtin/grep.c:662
+msgid "process binary files with textconv filters"
+msgstr "traiter les fichiers binaires avec les filtres textconv"
+
+#: builtin/grep.c:664
msgid "descend at most <depth> levels"
msgstr "descendre au plus de <profondeur> dans l'arborescence"
-#: builtin/grep.c:666
+#: builtin/grep.c:668
msgid "use extended POSIX regular expressions"
msgstr "utiliser des expressions régulières étendues POSIX"
-#: builtin/grep.c:669
+#: builtin/grep.c:671
msgid "use basic POSIX regular expressions (default)"
msgstr "utiliser des expressions régulières basiques POSIX (par défaut)"
-#: builtin/grep.c:672
+#: builtin/grep.c:674
msgid "interpret patterns as fixed strings"
msgstr "interpréter les motifs comme de chaînes fixes"
-#: builtin/grep.c:675
+#: builtin/grep.c:677
msgid "use Perl-compatible regular expressions"
msgstr "utiliser des expressions régulières compatibles avec Perl"
-#: builtin/grep.c:678
+#: builtin/grep.c:680
msgid "show line numbers"
msgstr "afficher les numéros de ligne"
-#: builtin/grep.c:679
+#: builtin/grep.c:681
msgid "don't show filenames"
msgstr "ne pas pas afficher les noms de fichier"
-#: builtin/grep.c:680
+#: builtin/grep.c:682
msgid "show filenames"
msgstr "afficher les noms de fichier"
-#: builtin/grep.c:682
+#: builtin/grep.c:684
msgid "show filenames relative to top directory"
msgstr "afficher les noms de fichiers relativement au répertoire de base"
-#: builtin/grep.c:684
+#: builtin/grep.c:686
msgid "show only filenames instead of matching lines"
msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant"
-#: builtin/grep.c:686
+#: builtin/grep.c:688
msgid "synonym for --files-with-matches"
msgstr "synonyme pour --files-with-matches"
-#: builtin/grep.c:689
+#: builtin/grep.c:691
msgid "show only the names of files without match"
msgstr "n'afficher que les noms des fichiers sans correspondance"
-#: builtin/grep.c:691
+#: builtin/grep.c:693
msgid "print NUL after filenames"
msgstr "imprimer une caractère NUL après le noms de fichier"
-#: builtin/grep.c:693
+#: builtin/grep.c:695
msgid "show the number of matches instead of matching lines"
msgstr "afficher le nombre de correspondances au lieu des lignes correspondant"
-#: builtin/grep.c:694
+#: builtin/grep.c:696
msgid "highlight matches"
msgstr "mettre en évidence les correspondances"
-#: builtin/grep.c:696
+#: builtin/grep.c:698
msgid "print empty line between matches from different files"
msgstr ""
"imprimer une ligne vide entre les correspondances de fichiers différents"
-#: builtin/grep.c:698
+#: builtin/grep.c:700
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:701
+#: builtin/grep.c:703
msgid "show <n> context lines before and after matches"
msgstr "afficher <n> lignes de contexte avant et après les correspondances"
-#: builtin/grep.c:704
+#: builtin/grep.c:706
msgid "show <n> context lines before matches"
msgstr "afficher <n> lignes de contexte avant les correspondances"
-#: builtin/grep.c:706
+#: builtin/grep.c:708
msgid "show <n> context lines after matches"
msgstr "afficher <n> lignes de contexte après les correspondances"
-#: builtin/grep.c:707
+#: builtin/grep.c:709
msgid "shortcut for -C NUM"
msgstr "raccourci pour -C NUM"
-#: builtin/grep.c:710
+#: builtin/grep.c:712
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:712
+#: builtin/grep.c:714
msgid "show the surrounding function"
msgstr "afficher la fonction contenante"
-#: builtin/grep.c:715
+#: builtin/grep.c:717
msgid "read patterns from file"
msgstr "lire les motifs depuis fichier"
-#: builtin/grep.c:717
+#: builtin/grep.c:719
msgid "match <pattern>"
msgstr "rechercher <motif>"
-#: builtin/grep.c:719
+#: builtin/grep.c:721
msgid "combine patterns specified with -e"
msgstr "combiner les motifs spécifiés par -e"
-#: builtin/grep.c:731
+#: builtin/grep.c:733
msgid "indicate hit with exit status without output"
msgstr ""
"indiquer des correspondances avec le code de sortie mais sans rien afficher"
-#: builtin/grep.c:733
+#: builtin/grep.c:735
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:735
+#: builtin/grep.c:737
msgid "show parse tree for grep expression"
msgstr "afficher l'arbre d'analyse pour le motif grep"
-#: builtin/grep.c:739
+#: builtin/grep.c:741
msgid "pager"
msgstr "pagineur"
-#: builtin/grep.c:739
+#: builtin/grep.c:741
msgid "show matching files in the pager"
msgstr "afficher les fichiers correspondant dans le pagineur"
-#: builtin/grep.c:742
+#: builtin/grep.c:744
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permettre l'appel de grep(1) (ignoré par ce build)"
-#: builtin/grep.c:743 builtin/show-ref.c:188
+#: builtin/grep.c:745 builtin/show-ref.c:187
msgid "show usage"
msgstr "afficher l'usage"
-#: builtin/grep.c:810
+#: builtin/grep.c:812
msgid "no pattern given."
msgstr "aucun motif fourni."
-#: builtin/grep.c:865
+#: builtin/grep.c:870
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:888
+#: builtin/grep.c:893
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:893
+#: builtin/grep.c:898
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:896
+#: builtin/grep.c:901
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:904
+#: builtin/grep.c:909
msgid "both --cached and trees are given."
msgstr "--cached et des arbres sont fournis en même temps."
@@ -5815,8 +6010,8 @@ msgstr "grave incohérence dans la décompression (inflate)"
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "COLLISION SHA1 TROUVÉE AVEC %s !"
-#: builtin/index-pack.c:669 builtin/pack-objects.c:170
-#: builtin/pack-objects.c:262
+#: builtin/index-pack.c:669 builtin/pack-objects.c:171
+#: builtin/pack-objects.c:263
#, c-format
msgid "unable to read %s"
msgstr "impossible de lire %s"
@@ -5845,156 +6040,156 @@ msgstr "Erreur dans l'objet"
msgid "Not all child objects of %s are reachable"
msgstr "Tous les objets enfants de %s ne sont pas accessibles"
-#: builtin/index-pack.c:838 builtin/index-pack.c:868
+#: builtin/index-pack.c:839 builtin/index-pack.c:869
msgid "failed to apply delta"
msgstr "échec d'application du delta"
-#: builtin/index-pack.c:1009
+#: builtin/index-pack.c:1010
msgid "Receiving objects"
msgstr "Réception d'objets"
-#: builtin/index-pack.c:1009
+#: builtin/index-pack.c:1010
msgid "Indexing objects"
msgstr "Indexation d'objets"
-#: builtin/index-pack.c:1035
+#: builtin/index-pack.c:1036
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "le paquet est corrompu (SHA1 ne correspond pas)"
-#: builtin/index-pack.c:1040
+#: builtin/index-pack.c:1041
msgid "cannot fstat packfile"
msgstr "impossible d'obtenir le statut (fstat) du fichier paquet"
-#: builtin/index-pack.c:1043
+#: builtin/index-pack.c:1044
msgid "pack has junk at the end"
msgstr "le paquet est invalide à la fin"
-#: builtin/index-pack.c:1054
+#: builtin/index-pack.c:1055
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "confusion extrême dans parse_pack_objects()"
-#: builtin/index-pack.c:1077
+#: builtin/index-pack.c:1078
msgid "Resolving deltas"
msgstr "Résolution des deltas"
-#: builtin/index-pack.c:1087
+#: builtin/index-pack.c:1088
#, c-format
msgid "unable to create thread: %s"
msgstr "impossible de créer le fil : %s"
-#: builtin/index-pack.c:1129
+#: builtin/index-pack.c:1130
msgid "confusion beyond insanity"
msgstr "confusion extrême"
-#: builtin/index-pack.c:1137
+#: builtin/index-pack.c:1138
#, c-format
msgid "completed with %d local objects"
msgstr "complété avec %d objets locaux"
-#: builtin/index-pack.c:1147
+#: builtin/index-pack.c:1148
#, 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:1151
+#: builtin/index-pack.c:1152
#, 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:1176
+#: builtin/index-pack.c:1177
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "impossible de compresser l'objet ajouté (%d)"
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1256
#, c-format
msgid "local object %s is corrupt"
msgstr "l'objet local %s est corrompu"
-#: builtin/index-pack.c:1279
+#: builtin/index-pack.c:1280
msgid "error while closing pack file"
msgstr "erreur en fermeture du fichier paquet"
-#: builtin/index-pack.c:1292
+#: builtin/index-pack.c:1293
#, c-format
msgid "cannot write keep file '%s'"
msgstr "impossible d'écrire le fichier \"keep\" '%s'"
-#: builtin/index-pack.c:1300
+#: builtin/index-pack.c:1301
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "impossible de fermer le fichier \"keep\" '%s'"
-#: builtin/index-pack.c:1313
+#: builtin/index-pack.c:1314
msgid "cannot store pack file"
msgstr "impossible de stocker le fichier paquet"
-#: builtin/index-pack.c:1324
+#: builtin/index-pack.c:1325
msgid "cannot store index file"
msgstr "impossible de stocker le fichier d'index"
-#: builtin/index-pack.c:1357
+#: builtin/index-pack.c:1358
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "mauvais pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1363
+#: builtin/index-pack.c:1364
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "nombre de fils spécifié invalide (%d)"
-#: builtin/index-pack.c:1367 builtin/index-pack.c:1545
+#: builtin/index-pack.c:1368 builtin/index-pack.c:1546
#, c-format
msgid "no threads support, ignoring %s"
msgstr "pas de support des fils, ignore %s"
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1426
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Impossible d'ouvrir le fichier paquet existant '%s'"
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1428
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Impossible d'ouvrir le fichier paquet d'index existant pour '%s'"
-#: builtin/index-pack.c:1474
+#: builtin/index-pack.c:1475
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "pas un delta : %d objet"
msgstr[1] "pas un delta : %d objets"
-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1482
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "longueur chaînée = %d : %lu objet"
msgstr[1] "longueur chaînée = %d : %lu objets"
-#: builtin/index-pack.c:1509
+#: builtin/index-pack.c:1510
msgid "Cannot come back to cwd"
msgstr "Impossible de revenir au répertoire de travail courant"
-#: builtin/index-pack.c:1557 builtin/index-pack.c:1560
-#: builtin/index-pack.c:1572 builtin/index-pack.c:1576
+#: builtin/index-pack.c:1558 builtin/index-pack.c:1561
+#: builtin/index-pack.c:1573 builtin/index-pack.c:1577
#, c-format
msgid "bad %s"
msgstr "mauvais %s"
-#: builtin/index-pack.c:1590
+#: builtin/index-pack.c:1591
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin ne peut pas être utilisé sans --stdin"
-#: builtin/index-pack.c:1594 builtin/index-pack.c:1604
+#: builtin/index-pack.c:1595 builtin/index-pack.c:1605
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'"
-#: builtin/index-pack.c:1613
+#: builtin/index-pack.c:1614
msgid "--verify with no packfile name given"
msgstr "--verify sans nom de fichier paquet donné"
@@ -6084,11 +6279,6 @@ msgstr "impossible de traiter le fichier de type %d"
msgid "unable to move %s to %s"
msgstr "impossible de déplacer %s vers %s"
-#: builtin/init-db.c:363
-#, c-format
-msgid "Could not create git link %s"
-msgstr "Impossible de créer le lien git %s"
-
#.
#. * TRANSLATORS: The first '%s' is either "Reinitialized
#. * existing" or "Initialized empty", the second " shared" or
@@ -6131,7 +6321,7 @@ msgstr "permissions"
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:493 builtin/prune-packed.c:75
+#: builtin/init-db.c:493 builtin/prune-packed.c:75 builtin/repack.c:155
msgid "be quiet"
msgstr "être silencieux"
@@ -6171,248 +6361,248 @@ msgstr "git log [<options>] [<page de révisions>] [[--] <chemin>...]\n"
msgid " or: git show [options] <object>..."
msgstr " ou : git show [options] <objet>..."
-#: builtin/log.c:124
+#: builtin/log.c:125
msgid "suppress diff output"
msgstr "supprimer la sortie des différences"
-#: builtin/log.c:125
+#: builtin/log.c:126
msgid "show source"
msgstr "afficher la source"
-#: builtin/log.c:126
+#: builtin/log.c:127
msgid "Use mail map file"
msgstr "Utiliser le fichier de correspondance de mail"
-#: builtin/log.c:127
+#: builtin/log.c:128
msgid "decorate options"
msgstr "décorer les options"
-#: builtin/log.c:230
+#: builtin/log.c:231
#, c-format
msgid "Final output: %d %s\n"
msgstr "Sortie finale : %d %s\n"
-#: builtin/log.c:453 builtin/log.c:545
+#: builtin/log.c:473 builtin/log.c:565
#, c-format
msgid "Could not read object %s"
msgstr "Impossible de lire l'objet %s"
-#: builtin/log.c:569
+#: builtin/log.c:589
#, c-format
msgid "Unknown type: %d"
msgstr "Type inconnu : %d"
-#: builtin/log.c:669
+#: builtin/log.c:689
msgid "format.headers without value"
msgstr "format.headers sans valeur"
-#: builtin/log.c:751
+#: builtin/log.c:771
msgid "name of output directory is too long"
msgstr "le nom du répertoire de sortie est trop long"
-#: builtin/log.c:767
+#: builtin/log.c:787
#, c-format
msgid "Cannot open patch file %s"
msgstr "Impossible d'ouvrir le fichier correctif %s"
-#: builtin/log.c:781
+#: builtin/log.c:801
msgid "Need exactly one range."
msgstr "Exactement une plage nécessaire."
-#: builtin/log.c:789
+#: builtin/log.c:809
msgid "Not a range."
msgstr "Pas une plage."
-#: builtin/log.c:891
+#: builtin/log.c:911
msgid "Cover letter needs email format"
msgstr "La lettre de motivation doit être au format e-mail"
-#: builtin/log.c:967
+#: builtin/log.c:987
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to aberrant : %s"
-#: builtin/log.c:995
+#: builtin/log.c:1015
msgid "git format-patch [options] [<since> | <revision range>]"
msgstr "git format-patch [options] [<depuis> | <plage de révisions>]"
-#: builtin/log.c:1040
+#: builtin/log.c:1060
msgid "Two output directories?"
msgstr "Deux répertoires de sortie ?"
-#: builtin/log.c:1155
+#: builtin/log.c:1175
msgid "use [PATCH n/m] even with a single patch"
msgstr "utiliser [PATCH n/m] même avec un patch unique"
-#: builtin/log.c:1158
+#: builtin/log.c:1178
msgid "use [PATCH] even with multiple patches"
msgstr "utiliser [PATCH] même avec des patchs multiples"
-#: builtin/log.c:1162
+#: builtin/log.c:1182
msgid "print patches to standard out"
msgstr "afficher les patchs sur la sortie standard"
-#: builtin/log.c:1164
+#: builtin/log.c:1184
msgid "generate a cover letter"
msgstr "générer une lettre de motivation"
-#: builtin/log.c:1166
+#: builtin/log.c:1186
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:1167
+#: builtin/log.c:1187
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1168
+#: builtin/log.c:1188
msgid "use <sfx> instead of '.patch'"
msgstr "utiliser <sfx> au lieu de '.patch'"
-#: builtin/log.c:1170
+#: builtin/log.c:1190
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:1172
+#: builtin/log.c:1192
msgid "mark the series as Nth re-roll"
msgstr "marquer la série comme une Nième réédition"
-#: builtin/log.c:1174
+#: builtin/log.c:1194
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "utiliser [<préfixe>] au lieu de [PATCH]"
-#: builtin/log.c:1177
+#: builtin/log.c:1197
msgid "store resulting files in <dir>"
msgstr "stocker les fichiers résultats dans <répertoire>"
-#: builtin/log.c:1180
+#: builtin/log.c:1200
msgid "don't strip/add [PATCH]"
msgstr "ne pas retirer/ajouter [PATCH]"
-#: builtin/log.c:1183
+#: builtin/log.c:1203
msgid "don't output binary diffs"
msgstr "ne pas imprimer les diffs binaires"
-#: builtin/log.c:1185
+#: builtin/log.c:1205
msgid "don't include a patch matching a commit upstream"
msgstr "ne pas inclure un patch correspondant à un commit amont"
-#: builtin/log.c:1187
+#: builtin/log.c:1207
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:1189
+#: builtin/log.c:1209
msgid "Messaging"
msgstr "Communication"
-#: builtin/log.c:1190
+#: builtin/log.c:1210
msgid "header"
msgstr "en-tête"
-#: builtin/log.c:1191
+#: builtin/log.c:1211
msgid "add email header"
msgstr "ajouter l'en-tête d'e-mail"
-#: builtin/log.c:1192 builtin/log.c:1194
+#: builtin/log.c:1212 builtin/log.c:1214
msgid "email"
msgstr "e-mail"
-#: builtin/log.c:1192
+#: builtin/log.c:1212
msgid "add To: header"
msgstr "ajouter l'en-tête \"To:\""
-#: builtin/log.c:1194
+#: builtin/log.c:1214
msgid "add Cc: header"
msgstr "ajouter l'en-tête \"Cc:\""
-#: builtin/log.c:1196
+#: builtin/log.c:1216
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1197
+#: builtin/log.c:1217
msgid "set From address to <ident> (or committer ident if absent)"
-msgstr "Renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)"
+msgstr "renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)"
-#: builtin/log.c:1199
+#: builtin/log.c:1219
msgid "message-id"
msgstr "id-message"
-#: builtin/log.c:1200
+#: builtin/log.c:1220
msgid "make first mail a reply to <message-id>"
msgstr "répondre dans le premier message à <id-message>"
-#: builtin/log.c:1201 builtin/log.c:1204
+#: builtin/log.c:1221 builtin/log.c:1224
msgid "boundary"
msgstr "frontière"
-#: builtin/log.c:1202
+#: builtin/log.c:1222
msgid "attach the patch"
msgstr "attacher le patch"
-#: builtin/log.c:1205
+#: builtin/log.c:1225
msgid "inline the patch"
msgstr "patch à l'intérieur"
-#: builtin/log.c:1209
+#: builtin/log.c:1229
msgid "enable message threading, styles: shallow, deep"
msgstr ""
"activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"
-#: builtin/log.c:1211
+#: builtin/log.c:1231
msgid "signature"
msgstr "signature"
-#: builtin/log.c:1212
+#: builtin/log.c:1232
msgid "add a signature"
msgstr "ajouter une signature"
-#: builtin/log.c:1214
+#: builtin/log.c:1233
msgid "don't print the patch filenames"
msgstr "ne pas afficher les noms de fichiers des patchs"
-#: builtin/log.c:1288
+#: builtin/log.c:1307
#, c-format
msgid "invalid ident line: %s"
msgstr "ligne d'identification invalide : %s"
-#: builtin/log.c:1303
+#: builtin/log.c:1322
msgid "-n and -k are mutually exclusive."
msgstr "-n et -k sont mutuellement exclusifs."
-#: builtin/log.c:1305
+#: builtin/log.c:1324
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix et -k sont mutuellement exclusifs."
-#: builtin/log.c:1313
+#: builtin/log.c:1332
msgid "--name-only does not make sense"
msgstr "--name-only n'a pas de sens"
-#: builtin/log.c:1315
+#: builtin/log.c:1334
msgid "--name-status does not make sense"
msgstr "--name-status n'a pas de sens"
-#: builtin/log.c:1317
+#: builtin/log.c:1336
msgid "--check does not make sense"
msgstr "--check n'a pas de sens"
-#: builtin/log.c:1340
+#: builtin/log.c:1359
msgid "standard output, or directory, which one?"
msgstr "sortie standard, ou répertoire, lequel ?"
-#: builtin/log.c:1342
+#: builtin/log.c:1361
#, c-format
msgid "Could not create directory '%s'"
msgstr "Impossible de créer le répertoire '%s'"
-#: builtin/log.c:1490
+#: builtin/log.c:1509
msgid "Failed to create output files"
msgstr "Échec de création des fichiers en sortie"
-#: builtin/log.c:1539
+#: builtin/log.c:1558
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]"
-#: builtin/log.c:1594
+#: builtin/log.c:1613
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -6420,139 +6610,139 @@ msgstr ""
"Impossible de trouver une branche distante suivie, merci de spécifier "
"<branche_amont> manuellement.\n"
-#: builtin/log.c:1607 builtin/log.c:1609 builtin/log.c:1621
+#: builtin/log.c:1626 builtin/log.c:1628 builtin/log.c:1640
#, c-format
msgid "Unknown commit %s"
msgstr "Commit inconnu %s"
-#: builtin/ls-files.c:408
+#: builtin/ls-files.c:398
msgid "git ls-files [options] [<file>...]"
msgstr "git ls-files [options] [<fichier>...]"
-#: builtin/ls-files.c:465
+#: builtin/ls-files.c:455
msgid "identify the file status with tags"
msgstr "identifier le statut de fichier avec les étiquettes"
-#: builtin/ls-files.c:467
+#: builtin/ls-files.c:457
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "utiliser des minuscules pour les fichier 'assumés inchangés'"
-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:459
msgid "show cached files in the output (default)"
msgstr "afficher les fichiers mis en cache dans la sortie (défaut)"
-#: builtin/ls-files.c:471
+#: builtin/ls-files.c:461
msgid "show deleted files in the output"
msgstr "afficher les fichiers supprimés dans la sortie"
-#: builtin/ls-files.c:473
+#: builtin/ls-files.c:463
msgid "show modified files in the output"
msgstr "afficher les fichiers modifiés dans la sortie"
-#: builtin/ls-files.c:475
+#: builtin/ls-files.c:465
msgid "show other files in the output"
msgstr "afficher les autres fichiers dans la sortie"
-#: builtin/ls-files.c:477
+#: builtin/ls-files.c:467
msgid "show ignored files in the output"
msgstr "afficher les fichiers ignorés dans la sortie"
-#: builtin/ls-files.c:480
+#: builtin/ls-files.c:470
msgid "show staged contents' object name in the output"
msgstr "afficher les nom des objets indexés dans la sortie"
-#: builtin/ls-files.c:482
+#: builtin/ls-files.c:472
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:484
+#: builtin/ls-files.c:474
msgid "show 'other' directories' name only"
msgstr "afficher seulement les noms des répertoires 'other'"
-#: builtin/ls-files.c:487
+#: builtin/ls-files.c:477
msgid "don't show empty directories"
msgstr "ne pas afficher les répertoires vides"
-#: builtin/ls-files.c:490
+#: builtin/ls-files.c:480
msgid "show unmerged files in the output"
msgstr "afficher les fichiers non fusionnés dans la sortie"
-#: builtin/ls-files.c:492
+#: builtin/ls-files.c:482
msgid "show resolve-undo information"
msgstr "afficher l'information resolv-undo"
-#: builtin/ls-files.c:494
+#: builtin/ls-files.c:484
msgid "skip files matching pattern"
msgstr "sauter les fichiers correspondant au motif"
-#: builtin/ls-files.c:497
+#: builtin/ls-files.c:487
msgid "exclude patterns are read from <file>"
msgstr "les motifs d'exclusion sont lus depuis <fichier>"
-#: builtin/ls-files.c:500
+#: builtin/ls-files.c:490
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:502
+#: builtin/ls-files.c:492
msgid "add the standard git exclusions"
msgstr "ajouter les exclusions git standard"
-#: builtin/ls-files.c:505
+#: builtin/ls-files.c:495
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:508
+#: builtin/ls-files.c:498
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:509
+#: builtin/ls-files.c:499
msgid "tree-ish"
msgstr "arbre ou apparenté"
-#: builtin/ls-files.c:510
+#: builtin/ls-files.c:500
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:512
+#: builtin/ls-files.c:502
msgid "show debugging data"
msgstr "afficher les données de débogage"
-#: builtin/ls-tree.c:27
+#: builtin/ls-tree.c:28
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr "git ls-tree [<options>] <arbre ou apparenté> [<chemin>...]"
-#: builtin/ls-tree.c:125
+#: builtin/ls-tree.c:126
msgid "only show trees"
msgstr "afficher seulement les arbres"
-#: builtin/ls-tree.c:127
+#: builtin/ls-tree.c:128
msgid "recurse into subtrees"
msgstr "parcourir les sous-arbres"
-#: builtin/ls-tree.c:129
+#: builtin/ls-tree.c:130
msgid "show trees when recursing"
msgstr "afficher les arbres en les parcourant"
-#: builtin/ls-tree.c:132
+#: builtin/ls-tree.c:133
msgid "terminate entries with NUL byte"
msgstr "terminer les éléments avec un octet NUL"
-#: builtin/ls-tree.c:133
+#: builtin/ls-tree.c:134
msgid "include object size"
msgstr "inclure la taille d'objet"
-#: builtin/ls-tree.c:135 builtin/ls-tree.c:137
+#: builtin/ls-tree.c:136 builtin/ls-tree.c:138
msgid "list only filenames"
msgstr "afficher seulement les noms de fichiers"
-#: builtin/ls-tree.c:140
+#: builtin/ls-tree.c:141
msgid "use full path names"
msgstr "utiliser les noms de chemins complets"
-#: builtin/ls-tree.c:142
+#: builtin/ls-tree.c:143
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
"afficher l'arbre entier ; pas seulement le répertoire courant (implique --"
@@ -6631,7 +6821,7 @@ msgstr "abandonner si l'avance rapide n'est pas possible"
msgid "Verify that the named commit has a valid GPG signature"
msgstr "Vérifier que la validation a une signature GPG valide"
-#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:114
+#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:89
msgid "strategy"
msgstr "stratégie"
@@ -7004,76 +7194,85 @@ msgstr "autoriser les objets manquants"
msgid "allow creation of more than one tree"
msgstr "autoriser la création de plus d'un arbre"
-#: builtin/mv.c:14
+#: builtin/mv.c:15
msgid "git mv [options] <source>... <destination>"
msgstr "git mv [options] <source>... <destination>"
-#: builtin/mv.c:64
+#: builtin/mv.c:67
msgid "force move/rename even if target exists"
msgstr "forcer le déplacement/renommage même si la cible existe"
-#: builtin/mv.c:65
+#: builtin/mv.c:68
msgid "skip move/rename errors"
msgstr "sauter les erreurs de déplacement/renommage"
-#: builtin/mv.c:108
+#: builtin/mv.c:113
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Vérification du renommage de '%s' en '%s'\n"
-#: builtin/mv.c:112
+#: builtin/mv.c:117
msgid "bad source"
msgstr "mauvaise source"
-#: builtin/mv.c:115
+#: builtin/mv.c:120
msgid "can not move directory into itself"
msgstr "impossible de déplacer un répertoire dans lui-même"
-#: builtin/mv.c:118
+#: builtin/mv.c:123
msgid "cannot move directory over file"
msgstr "impossible de déplacer un répertoire sur un fichier"
-#: builtin/mv.c:128
+#: builtin/mv.c:129
+#, c-format
+msgid "Huh? Directory %s is in index and no submodule?"
+msgstr "Hein ? Le répertoire %s est dans l'index et pourtant aucun sous-module ?"
+
+#: builtin/mv.c:131 builtin/rm.c:318
+msgid "Please, stage your changes to .gitmodules or stash them to proceed"
+msgstr "Veuillez indexer vos modifications de .gitmodules ou remisez-les pour continuer"
+
+#: builtin/mv.c:147
#, c-format
msgid "Huh? %.*s is in index?"
msgstr "Hein ? %.*s est dans l'index ?"
-#: builtin/mv.c:140
+#: builtin/mv.c:159
msgid "source directory is empty"
msgstr "le répertoire source est vide"
-#: builtin/mv.c:171
+#: builtin/mv.c:191
msgid "not under version control"
msgstr "pas sous le contrôle de version"
-#: builtin/mv.c:173
+#: builtin/mv.c:193
msgid "destination exists"
msgstr "la destination existe"
-#: builtin/mv.c:181
+#: builtin/mv.c:201
#, c-format
msgid "overwriting '%s'"
msgstr "écrasement de '%s'"
-#: builtin/mv.c:184
+#: builtin/mv.c:204
msgid "Cannot overwrite"
msgstr "Impossible d'écraser"
-#: builtin/mv.c:187
+#: builtin/mv.c:207
msgid "multiple sources for the same target"
msgstr "multiples sources pour la même destination"
-#: builtin/mv.c:202
+#: builtin/mv.c:222
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, source=%s, destination=%s"
-#: builtin/mv.c:212
+#: builtin/mv.c:232
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Renommage de %s en %s\n"
-#: builtin/mv.c:215 builtin/remote.c:731
+#: builtin/mv.c:235 builtin/remote.c:731 builtin/repack.c:330
#, c-format
msgid "renaming '%s' failed"
msgstr "le renommage de '%s' a échoué"
@@ -7112,8 +7311,8 @@ msgid "read from stdin"
msgstr "lire depuis l'entrée standard"
#: builtin/name-rev.c:320
-msgid "allow to print `undefined` names"
-msgstr "autoriser l'affichage des noms `non définis`"
+msgid "allow to print `undefined` names (default)"
+msgstr "autoriser l'affichage des noms `non définis` (par défaut)"
#: builtin/name-rev.c:326
msgid "dereference tags in the input (internal use)"
@@ -7268,12 +7467,12 @@ msgstr "impossible d'écrire l'objet note"
msgid "The note contents has been left in %s"
msgstr "Le contenu de la note a été laissé dans %s"
-#: builtin/notes.c:248 builtin/tag.c:540
+#: builtin/notes.c:248 builtin/tag.c:537
#, c-format
msgid "cannot read '%s'"
msgstr "impossible de lire '%s'"
-#: builtin/notes.c:250 builtin/tag.c:543
+#: builtin/notes.c:250 builtin/tag.c:540
#, c-format
msgid "could not open or read '%s'"
msgstr "impossible d'ouvrir ou lire '%s'"
@@ -7281,7 +7480,7 @@ msgstr "impossible d'ouvrir ou lire '%s'"
#: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318
#: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515
#: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637
-#: builtin/notes.c:839 builtin/tag.c:556
+#: builtin/notes.c:839 builtin/tag.c:553
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Impossible de résoudre '%s' comme une référence valide."
@@ -7456,154 +7655,154 @@ 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:183 builtin/pack-objects.c:186
+#: builtin/pack-objects.c:184 builtin/pack-objects.c:187
#, c-format
msgid "deflate error (%d)"
msgstr "erreur de compression (%d)"
-#: builtin/pack-objects.c:2397
+#: builtin/pack-objects.c:2398
#, c-format
msgid "unsupported index version %s"
msgstr "version d'index non supportée %s"
-#: builtin/pack-objects.c:2401
+#: builtin/pack-objects.c:2402
#, c-format
msgid "bad index version '%s'"
msgstr "mauvaise version d'index '%s'"
-#: builtin/pack-objects.c:2424
+#: builtin/pack-objects.c:2425
#, c-format
msgid "option %s does not accept negative form"
msgstr "l'option %s n'accepte pas de valeur négative"
-#: builtin/pack-objects.c:2428
+#: builtin/pack-objects.c:2429
#, c-format
msgid "unable to parse value '%s' for option %s"
msgstr "impossible d'analyser la valeur '%s' pour l'option %s"
-#: builtin/pack-objects.c:2447
+#: builtin/pack-objects.c:2448
msgid "do not show progress meter"
msgstr "ne pas afficher la barre de progression"
-#: builtin/pack-objects.c:2449
+#: builtin/pack-objects.c:2450
msgid "show progress meter"
msgstr "afficher la barre de progression"
-#: builtin/pack-objects.c:2451
+#: builtin/pack-objects.c:2452
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:2454
+#: builtin/pack-objects.c:2455
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:2455
+#: builtin/pack-objects.c:2456
msgid "version[,offset]"
msgstr "version[,offset]"
-#: builtin/pack-objects.c:2456
+#: builtin/pack-objects.c:2457
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:2459
+#: builtin/pack-objects.c:2460
msgid "maximum size of each output pack file"
msgstr "taille maximum de chaque fichier paquet en sortie"
-#: builtin/pack-objects.c:2461
+#: builtin/pack-objects.c:2462
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorer les objets empruntés à un autre magasin d'objets"
-#: builtin/pack-objects.c:2463
+#: builtin/pack-objects.c:2464
msgid "ignore packed objects"
msgstr "ignorer les objets empaquetés"
-#: builtin/pack-objects.c:2465
+#: builtin/pack-objects.c:2466
msgid "limit pack window by objects"
msgstr "limiter la fenêtre d'empaquetage par objets"
-#: builtin/pack-objects.c:2467
+#: builtin/pack-objects.c:2468
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:2469
+#: builtin/pack-objects.c:2470
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:2471
+#: builtin/pack-objects.c:2472
msgid "reuse existing deltas"
msgstr "réutiliser les deltas existants"
-#: builtin/pack-objects.c:2473
+#: builtin/pack-objects.c:2474
msgid "reuse existing objects"
msgstr "réutiliser les objets existants"
-#: builtin/pack-objects.c:2475
+#: builtin/pack-objects.c:2476
msgid "use OFS_DELTA objects"
msgstr "utiliser les objets OFS_DELTA"
-#: builtin/pack-objects.c:2477
+#: builtin/pack-objects.c:2478
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:2479
+#: builtin/pack-objects.c:2480
msgid "do not create an empty pack output"
msgstr "ne pas créer un paquet vide"
-#: builtin/pack-objects.c:2481
+#: builtin/pack-objects.c:2482
msgid "read revision arguments from standard input"
msgstr "lire les paramètres de révision depuis l'entrée standard"
-#: builtin/pack-objects.c:2483
+#: builtin/pack-objects.c:2484
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:2486
+#: builtin/pack-objects.c:2487
msgid "include objects reachable from any reference"
msgstr "inclure les objets accessibles depuis toute référence"
-#: builtin/pack-objects.c:2489
+#: builtin/pack-objects.c:2490
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:2492
+#: builtin/pack-objects.c:2493
msgid "output pack to stdout"
msgstr "afficher l'empaquetage sur la sortie standard"
-#: builtin/pack-objects.c:2494
+#: builtin/pack-objects.c:2495
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:2496
+#: builtin/pack-objects.c:2497
msgid "keep unreachable objects"
msgstr "garder les objets inaccessibles"
-#: builtin/pack-objects.c:2497 parse-options.h:141
+#: builtin/pack-objects.c:2498 parse-options.h:143
msgid "time"
msgstr "heure"
-#: builtin/pack-objects.c:2498
+#: builtin/pack-objects.c:2499
msgid "unpack unreachable objects newer than <time>"
msgstr "dépaqueter les objets inaccessibles plus récents que <heure>"
-#: builtin/pack-objects.c:2501
+#: builtin/pack-objects.c:2502
msgid "create thin packs"
msgstr "créer des paquets légers"
-#: builtin/pack-objects.c:2503
+#: builtin/pack-objects.c:2504
msgid "ignore packs that have companion .keep file"
msgstr "ignorer les paquets qui ont un fichier .keep"
-#: builtin/pack-objects.c:2505
+#: builtin/pack-objects.c:2506
msgid "pack compression level"
msgstr "niveau de compression du paquet"
-#: builtin/pack-objects.c:2507
+#: builtin/pack-objects.c:2508
msgid "do not hide commits by grafts"
msgstr "ne pas cacher les validations par greffes"
@@ -7643,15 +7842,15 @@ msgstr "faire expirer les objets plus vieux que <heure>"
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<options>] [<dépôt> [<spécification-de-référence>...]]"
-#: builtin/push.c:45
+#: builtin/push.c:47
msgid "tag shorthand without <tag>"
msgstr "raccourci d'étiquette sans <étiquette>"
-#: builtin/push.c:64
+#: builtin/push.c:66
msgid "--delete only accepts plain target ref names"
msgstr "--delete accepte seulement des noms entiers de références cibles"
-#: builtin/push.c:99
+#: builtin/push.c:101
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -7660,7 +7859,7 @@ msgstr ""
"Pour choisir l'option de manière permanente, voir push.default dans 'git "
"help config'."
-#: builtin/push.c:102
+#: builtin/push.c:104
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -7685,7 +7884,7 @@ msgstr ""
" git push %s %s\n"
"%s"
-#: builtin/push.c:117
+#: builtin/push.c:119
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -7700,7 +7899,7 @@ msgstr ""
"\n"
" git push %s HEAD:<nom-de-la-branche-amont>\n"
-#: builtin/push.c:131
+#: builtin/push.c:133
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -7714,13 +7913,13 @@ msgstr ""
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:139
+#: builtin/push.c:141
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
"La branche courante %s a de multiples branches amont, impossible de pousser."
-#: builtin/push.c:142
+#: builtin/push.c:144
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -7731,7 +7930,7 @@ msgstr ""
"pas une branche amont de votre branche courante '%s', sans me dire\n"
"quoi pousser pour mettre à jour quelle branche amont."
-#: builtin/push.c:165
+#: builtin/push.c:167
msgid ""
"push.default is unset; its implicit value is changing in\n"
"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
@@ -7765,14 +7964,14 @@ msgstr ""
"'current' au lieu de 'simple' si vous utilisez de temps en temps d'anciennes "
"versions de Git)"
-#: builtin/push.c:225
+#: builtin/push.c:227
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"Vous n'avez pas spécifié de spécifications de référence à pousser, et push."
"default est \"nothing\"."
-#: builtin/push.c:232
+#: builtin/push.c:234
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -7787,7 +7986,7 @@ msgstr ""
"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
"d'information."
-#: builtin/push.c:238
+#: builtin/push.c:240
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. If you did not intend to push that branch, you may want to\n"
@@ -7803,7 +8002,7 @@ msgstr ""
"'push.default' à 'simple', 'current' ou 'upstream' pour pousser seulement la "
"branche courante."
-#: builtin/push.c:244
+#: builtin/push.c:246
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
@@ -7818,7 +8017,7 @@ msgstr ""
"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
"d'information."
-#: builtin/push.c:250
+#: builtin/push.c:252
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
@@ -7836,13 +8035,13 @@ msgstr ""
"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
"d'information."
-#: builtin/push.c:257
+#: builtin/push.c:259
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
"Les mises à jour ont été rejetées car l'étiquette existe déjà dans la "
"branche distante."
-#: builtin/push.c:260
+#: builtin/push.c:262
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
@@ -7854,22 +8053,22 @@ msgstr ""
"pointer\n"
"vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n"
-#: builtin/push.c:320
+#: builtin/push.c:328
#, c-format
msgid "Pushing to %s\n"
msgstr "Poussage vers %s\n"
-#: builtin/push.c:324
+#: builtin/push.c:332
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "impossible de pousser des références vers '%s'"
-#: builtin/push.c:357
+#: builtin/push.c:365
#, c-format
msgid "bad repository '%s'"
msgstr "mauvais dépôt '%s'"
-#: builtin/push.c:358
+#: builtin/push.c:366
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -7891,88 +8090,96 @@ msgstr ""
"\n"
" git push <nom>\n"
-#: builtin/push.c:373
+#: builtin/push.c:381
msgid "--all and --tags are incompatible"
msgstr "--all et --tags sont incompatibles"
-#: builtin/push.c:374
+#: builtin/push.c:382
msgid "--all can't be combined with refspecs"
msgstr "--all ne peut pas être combiné avec des spécifications de référence"
-#: builtin/push.c:379
+#: builtin/push.c:387
msgid "--mirror and --tags are incompatible"
msgstr "--mirror et --tags sont incompatibles"
-#: builtin/push.c:380
+#: builtin/push.c:388
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror ne peut pas être combiné avec des spécifications de référence"
-#: builtin/push.c:385
+#: builtin/push.c:393
msgid "--all and --mirror are incompatible"
msgstr "--all et --mirror sont incompatibles"
-#: builtin/push.c:445
+#: builtin/push.c:453
msgid "repository"
msgstr "dépôt"
-#: builtin/push.c:446
+#: builtin/push.c:454
msgid "push all refs"
msgstr "pousser toutes les références"
-#: builtin/push.c:447
+#: builtin/push.c:455
msgid "mirror all refs"
msgstr "refléter toutes les références"
-#: builtin/push.c:449
+#: builtin/push.c:457
msgid "delete refs"
msgstr "supprimer les références"
-#: builtin/push.c:450
+#: builtin/push.c:458
msgid "push tags (can't be used with --all or --mirror)"
msgstr ""
"pousser les étiquettes (ne peut pas être utilisé avec --all ou --mirror)"
-#: builtin/push.c:453
+#: builtin/push.c:461
msgid "force updates"
msgstr "forcer les mises à jour"
-#: builtin/push.c:454
+#: builtin/push.c:463
+msgid "refname>:<expect"
+msgstr "nom de référence>:<attendu"
+
+#: builtin/push.c:464
+msgid "require old value of ref to be at this value"
+msgstr "exiger que l'ancienne valeur de la référence soit à cette valeur"
+
+#: builtin/push.c:466
msgid "check"
msgstr "check"
-#: builtin/push.c:455
+#: builtin/push.c:467
msgid "control recursive pushing of submodules"
msgstr "contrôler le poussage récursif des sous-modules"
-#: builtin/push.c:457
+#: builtin/push.c:469
msgid "use thin pack"
msgstr "utiliser un empaquetage léger"
-#: builtin/push.c:458 builtin/push.c:459
+#: builtin/push.c:470 builtin/push.c:471
msgid "receive pack program"
msgstr "recevoir le programme d'empaquetage"
-#: builtin/push.c:460
+#: builtin/push.c:472
msgid "set upstream for git pull/status"
msgstr "définir la branche amont pour git pull/status"
-#: builtin/push.c:463
+#: builtin/push.c:475
msgid "prune locally removed refs"
msgstr "éliminer les références locales supprimées"
-#: builtin/push.c:465
+#: builtin/push.c:477
msgid "bypass pre-push hook"
msgstr "éviter d'utiliser le crochet pre-push"
-#: builtin/push.c:466
+#: builtin/push.c:478
msgid "push missing but relevant tags"
msgstr "pousser les étiquettes manquantes mais pertinentes"
-#: builtin/push.c:476
+#: builtin/push.c:488
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete est incompatible avec --all, --mirror et --tags"
-#: builtin/push.c:478
+#: builtin/push.c:490
msgid "--delete doesn't make sense without any refs"
msgstr "--delete n'a pas de sens sans aucune référence"
@@ -8049,14 +8256,14 @@ msgstr "sauter l'application du filtre d'extraction creuse"
#: builtin/read-tree.c:138
msgid "debug unpack-trees"
-msgstr "deboguer unpack-trees"
+msgstr "déboguer unpack-trees"
-#: builtin/reflog.c:500
+#: builtin/reflog.c:499
#, c-format
msgid "%s' for '%s' is not a valid timestamp"
msgstr "%s' pour '%s' n'est pas un horodatage valide"
-#: builtin/reflog.c:616 builtin/reflog.c:621
+#: builtin/reflog.c:615 builtin/reflog.c:620
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "'%s' n'est pas un horodatage valide"
@@ -8081,9 +8288,9 @@ msgstr "git remote rename <ancienne> <nouvelle>"
msgid "git remote remove <name>"
msgstr "git remote remove <nom>"
-#: builtin/remote.c:15 builtin/remote.c:42
-msgid "git remote set-head <name> (-a | -d | <branch>)"
-msgstr "git remote set-head <nom> (-a | -d | <branche>)"
+#: builtin/remote.c:15
+msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
+msgstr "git remote set-head <nom> (-a | --auto | -d | --delete |<branche>)"
#: builtin/remote.c:16
msgid "git remote [-v | --verbose] show [-n] <name>"
@@ -8120,6 +8327,10 @@ msgstr "git remote set-url --delete <nom> <URL>"
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<options>] <nom> <URL>"
+#: builtin/remote.c:42
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branche>)"
+
#: builtin/remote.c:47
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <nom> <branche>..."
@@ -8221,7 +8432,9 @@ msgstr "plus d'un %s"
#: builtin/remote.c:339
#, c-format
msgid "Could not get fetch map for refspec %s"
-msgstr "Impossible d'obtenir une correspondance distante pour la spécification de référence %s"
+msgstr ""
+"Impossible d'obtenir une correspondance distante pour la spécification de "
+"référence %s"
#: builtin/remote.c:440 builtin/remote.c:448
msgid "(matching)"
@@ -8565,6 +8778,67 @@ msgstr "Pas de suppression de toutes les URLs non-push"
msgid "be verbose; must be placed before a subcommand"
msgstr "être verbeux : doit être placé avant une sous-commande"
+#: builtin/repack.c:15
+msgid "git repack [options]"
+msgstr "git repack [options]"
+
+#: builtin/repack.c:143
+msgid "pack everything in a single pack"
+msgstr "empaqueter tout dans un seul paquet"
+
+#: builtin/repack.c:145
+msgid "same as -a, and turn unreachable objects loose"
+msgstr "identique à -a et transformer les objets inaccessibles en suspens"
+
+#: builtin/repack.c:148
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr "supprimer les paquets redondants et lancer git-prune-packed"
+
+#: builtin/repack.c:150
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr "passer --no-reuse-delta à git-pack-objects"
+
+#: builtin/repack.c:152
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr "passer --no-reuse-object à git-pack-objects"
+
+#: builtin/repack.c:154
+msgid "do not run git-update-server-info"
+msgstr "ne pas lancer git update-server-info"
+
+#: builtin/repack.c:157
+msgid "pass --local to git-pack-objects"
+msgstr "passer --local à git-pack-objects"
+
+#: builtin/repack.c:158
+msgid "approxidate"
+msgstr "date approximative"
+
+#: builtin/repack.c:159
+msgid "with -A, do not loosen objects older than this"
+msgstr "avec -A, ne pas suspendre les objets plus vieux que celui-ci"
+
+#: builtin/repack.c:161
+msgid "size of the window used for delta compression"
+msgstr "taille de la fenêtre utilisée pour la compression des deltas"
+
+#: builtin/repack.c:163
+msgid "same as the above, but limit memory size instead of entries count"
+msgstr "idem ci-dessus, mais limiter la taille mémoire au lieu du nombre d'éléments"
+
+#: builtin/repack.c:165
+msgid "limits the maximum delta depth"
+msgstr "limite la profondeur maximale des deltas"
+
+#: builtin/repack.c:167
+msgid "maximum size of each packfile"
+msgstr "taille maximum de chaque fichier paquet"
+
+#: builtin/repack.c:345
+#, c-format
+msgid "removing '%s' failed"
+msgstr "la suppression de '%s' a échoué"
+
#: builtin/replace.c:17
msgid "git replace [-f] <object> <replacement>"
msgstr "git replace [-f] <objet> <remplacement>"
@@ -8577,23 +8851,23 @@ msgstr "git replace -d <objet>..."
msgid "git replace -l [<pattern>]"
msgstr "git replace -l [<motif>]"
-#: builtin/replace.c:121
+#: builtin/replace.c:131
msgid "list replace refs"
msgstr "afficher les références de remplacement"
-#: builtin/replace.c:122
+#: builtin/replace.c:132
msgid "delete replace refs"
msgstr "supprimer les références de remplacement"
-#: builtin/replace.c:123
+#: builtin/replace.c:133
msgid "replace the ref if it exists"
msgstr "remplacer la référence si elle existe"
-#: builtin/rerere.c:11
+#: builtin/rerere.c:12
msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
msgstr "git rerere [clear | forget chemin... | status | remaining | diff | gc]"
-#: builtin/rerere.c:56
+#: builtin/rerere.c:57
msgid "register clean resolutions in index"
msgstr "enregistrer des résolutions propres dans l'index"
@@ -8654,71 +8928,71 @@ msgstr "HEAD est maintenant à %s"
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Impossible de faire un \"reset %s\" au milieu d'une fusion."
-#: builtin/reset.c:251
+#: builtin/reset.c:262
msgid "be quiet, only report errors"
msgstr "être silencieux, afficher seulement les erreurs"
-#: builtin/reset.c:253
+#: builtin/reset.c:264
msgid "reset HEAD and index"
msgstr "réinitialiser HEAD et l'index"
-#: builtin/reset.c:254
+#: builtin/reset.c:265
msgid "reset only HEAD"
msgstr "réinitialiser seulement HEAD"
-#: builtin/reset.c:256 builtin/reset.c:258
+#: builtin/reset.c:267 builtin/reset.c:269
msgid "reset HEAD, index and working tree"
msgstr "réinitialiser HEAD, l'index et la copie de travail"
-#: builtin/reset.c:260
+#: builtin/reset.c:271
msgid "reset HEAD but keep local changes"
msgstr "réinitialiser HEAD mais garder les changements locaux"
-#: builtin/reset.c:278
+#: builtin/reset.c:289
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Échec de résolution de '%s' comme une révision valide."
-#: builtin/reset.c:281 builtin/reset.c:289
+#: builtin/reset.c:292 builtin/reset.c:300
#, c-format
msgid "Could not parse object '%s'."
msgstr "Impossible d'analyser l'objet '%s'."
-#: builtin/reset.c:286
+#: builtin/reset.c:297
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Échec de résolution de '%s' comme un arbre valide."
-#: builtin/reset.c:295
+#: builtin/reset.c:306
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch est incompatible avec --{hard,mixed,soft}"
-#: builtin/reset.c:304
+#: builtin/reset.c:315
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed avec des chemins est obsolète ; utilisez 'git reset -- <paths>' à la "
"place."
-#: builtin/reset.c:306
+#: builtin/reset.c:317
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Impossible de faire un \"%s reset\" avec des chemins."
-#: builtin/reset.c:316
+#: builtin/reset.c:327
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "Le \"%s reset\" n'est pas permis dans un dépôt nu"
-#: builtin/reset.c:336
+#: builtin/reset.c:344
+msgid "Unstaged changes after reset:"
+msgstr "Modifications non indexées après reset :"
+
+#: builtin/reset.c:350
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Impossible de réinitialiser le fichier d'index à la révision '%s'."
-#: builtin/reset.c:342
-msgid "Unstaged changes after reset:"
-msgstr "Modifications non indexées après reset :"
-
-#: builtin/reset.c:347
+#: builtin/reset.c:355
msgid "Could not write new index file."
msgstr "Impossible d'écrire le nouveau fichier d'index."
@@ -8765,84 +9039,84 @@ msgstr "git cherry-pick [options] <commit ou apparenté>..."
msgid "git cherry-pick <subcommand>"
msgstr "git cherry-pick <sous-commande>"
-#: builtin/revert.c:71 builtin/revert.c:94
+#: builtin/revert.c:71
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr "%s : %s ne peut pas être utilisé avec %s"
-#: builtin/revert.c:105
+#: builtin/revert.c:80
msgid "end revert or cherry-pick sequence"
msgstr "mettre fin au retour ou picorage"
-#: builtin/revert.c:106
+#: builtin/revert.c:81
msgid "resume revert or cherry-pick sequence"
msgstr "reprendre le retour ou picorage"
-#: builtin/revert.c:107
+#: builtin/revert.c:82
msgid "cancel revert or cherry-pick sequence"
msgstr "annuler le retour ou picorage"
-#: builtin/revert.c:108
+#: builtin/revert.c:83
msgid "don't automatically commit"
msgstr "ne pas valider automatiquement"
-#: builtin/revert.c:109
+#: builtin/revert.c:84
msgid "edit the commit message"
msgstr "éditer le message de validation"
-#: builtin/revert.c:112
+#: builtin/revert.c:87
msgid "parent number"
msgstr "numéro de parent"
-#: builtin/revert.c:114
+#: builtin/revert.c:89
msgid "merge strategy"
msgstr "stratégie de fusion"
-#: builtin/revert.c:115
+#: builtin/revert.c:90
msgid "option"
msgstr "option"
-#: builtin/revert.c:116
+#: builtin/revert.c:91
msgid "option for merge strategy"
msgstr "option pour la stratégie de fusion"
-#: builtin/revert.c:127
+#: builtin/revert.c:102
msgid "append commit name"
msgstr "ajouter le nom de validation"
-#: builtin/revert.c:128
+#: builtin/revert.c:103
msgid "allow fast-forward"
msgstr "autoriser l'avance rapide"
-#: builtin/revert.c:129
+#: builtin/revert.c:104
msgid "preserve initially empty commits"
msgstr "préserver les validations vides initialement"
-#: builtin/revert.c:130
+#: builtin/revert.c:105
msgid "allow commits with empty messages"
msgstr "autoriser les validations avec des messages vides"
-#: builtin/revert.c:131
+#: builtin/revert.c:106
msgid "keep redundant, empty commits"
msgstr "garder les validations redondantes, vides"
-#: builtin/revert.c:135
+#: builtin/revert.c:110
msgid "program error"
msgstr "erreur du programme"
-#: builtin/revert.c:225
+#: builtin/revert.c:195
msgid "revert failed"
msgstr "revert a échoué"
-#: builtin/revert.c:240
+#: builtin/revert.c:210
msgid "cherry-pick failed"
msgstr "le picorage a échoué"
-#: builtin/rm.c:16
+#: builtin/rm.c:17
msgid "git rm [options] [--] <file>..."
msgstr "git rm [options] [--] <fichier>..."
-#: builtin/rm.c:64
+#: builtin/rm.c:65
msgid ""
"the following submodule (or one of its nested submodules)\n"
"uses a .git directory:"
@@ -8856,7 +9130,7 @@ msgstr[1] ""
"les sous-modules suivants (ou un de ses sous-modules imbriqués)\n"
"utilisent un répertoire .git :"
-#: builtin/rm.c:70
+#: builtin/rm.c:71
msgid ""
"\n"
"(use 'rm -rf' if you really want to remove it including all of its history)"
@@ -8865,7 +9139,7 @@ msgstr ""
"(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout son "
"historique)"
-#: builtin/rm.c:230
+#: builtin/rm.c:231
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
@@ -8879,7 +9153,7 @@ msgstr[1] ""
"les fichiers suivants ont du contenu indexé différent\n"
"du fichier et de HEAD :"
-#: builtin/rm.c:235
+#: builtin/rm.c:236
msgid ""
"\n"
"(use -f to force removal)"
@@ -8887,13 +9161,13 @@ msgstr ""
"\n"
"(utilisez -f pour forcer la suppression)"
-#: builtin/rm.c:239
+#: builtin/rm.c:240
msgid "the following file has changes staged in the index:"
msgid_plural "the following files have changes staged in the index:"
msgstr[0] "le fichier suivant a des changements indexés :"
msgstr[1] "les fichiers suivants ont des changements indexés :"
-#: builtin/rm.c:243 builtin/rm.c:254
+#: builtin/rm.c:244 builtin/rm.c:255
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
@@ -8901,38 +9175,38 @@ msgstr ""
"\n"
"(utilisez --cached pour garder le fichier, ou -f pour forcer la suppression)"
-#: builtin/rm.c:251
+#: builtin/rm.c:252
msgid "the following file has local modifications:"
msgid_plural "the following files have local modifications:"
msgstr[0] "le fichier suivant a des modifications locales :"
msgstr[1] "les fichiers suivants ont des modifications locales :"
-#: builtin/rm.c:269
+#: builtin/rm.c:270
msgid "do not list removed files"
msgstr "ne pas afficher les fichiers supprimés"
-#: builtin/rm.c:270
+#: builtin/rm.c:271
msgid "only remove from the index"
msgstr "supprimer seulement de l'index"
-#: builtin/rm.c:271
+#: builtin/rm.c:272
msgid "override the up-to-date check"
msgstr "outrepasser la vérification des fichiers à jour"
-#: builtin/rm.c:272
+#: builtin/rm.c:273
msgid "allow recursive removal"
msgstr "autoriser la suppression récursive"
-#: builtin/rm.c:274
+#: builtin/rm.c:275
msgid "exit with a zero status even if nothing matched"
msgstr "sortir avec un statut zéro même si rien ne correspondait"
-#: builtin/rm.c:345
+#: builtin/rm.c:336
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "pas de suppression récursive de '%s' sans -r"
-#: builtin/rm.c:384
+#: builtin/rm.c:375
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm : impossible de supprimer %s"
@@ -8946,25 +9220,25 @@ msgstr "git shortlog [<options>] [<intervalle révisions>] [[--] [<chemin>...]]"
msgid "Missing author: %s"
msgstr "Auteur manquant : %s"
-#: builtin/shortlog.c:228
+#: builtin/shortlog.c:230
msgid "sort output according to the number of commits per author"
msgstr "trier la sortie sur le nombre de validations par auteur"
-#: builtin/shortlog.c:230
+#: builtin/shortlog.c:232
msgid "Suppress commit descriptions, only provides commit count"
msgstr ""
"Supprimer les descriptions de validation, fournit seulement le nombre de "
"validations"
-#: builtin/shortlog.c:232
+#: builtin/shortlog.c:234
msgid "Show the email address of each author"
msgstr "Afficher l'adresse e-mail de chaque auteur"
-#: builtin/shortlog.c:233
+#: builtin/shortlog.c:235
msgid "w[,i1[,i2]]"
msgstr "w[,i1[,i2]]"
-#: builtin/shortlog.c:234
+#: builtin/shortlog.c:236
msgid "Linewrap output"
msgstr "Couper les lignes"
@@ -9076,24 +9350,24 @@ msgstr ""
"vérification de référence plus stricte, nécessite un chemin de référence "
"exact"
-#: builtin/show-ref.c:173 builtin/show-ref.c:176
+#: builtin/show-ref.c:173 builtin/show-ref.c:175
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "afficher la référence HEAD, même si elle serait filtrée"
-#: builtin/show-ref.c:178
+#: builtin/show-ref.c:177
msgid "dereference tags into object IDs"
msgstr "déréférencer les étiquettes en IDs d'objet"
-#: builtin/show-ref.c:180
+#: builtin/show-ref.c:179
msgid "only show SHA1 hash using <n> digits"
msgstr "afficher seulement le hachage SHA1 en utilisant <n> chiffres"
-#: builtin/show-ref.c:184
+#: builtin/show-ref.c:183
msgid "do not print results to stdout (useful with --verify)"
msgstr ""
"ne pas afficher les résultats sur la sortie standard (pratique avec --verify)"
-#: builtin/show-ref.c:186
+#: builtin/show-ref.c:185
msgid "show refs from stdin that aren't in local repository"
msgstr ""
"afficher les références de l'entrée standard qui ne sont pas dans le dépôt "
@@ -9120,11 +9394,11 @@ msgstr "supprimer la référence symbolique"
msgid "shorten ref output"
msgstr "raccourcir l'affichage de la référence"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254
msgid "reason"
msgstr "raison"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254
msgid "reason of the update"
msgstr "raison de la mise à jour"
@@ -9290,189 +9564,201 @@ msgstr "afficher seulement les étiquettes qui contiennent la validation"
msgid "print only tags of the object"
msgstr "afficher seulement les étiquettes de l'objet"
-#: builtin/tag.c:504
+#: builtin/tag.c:501
msgid "--column and -n are incompatible"
msgstr "--column et -n sont incompatibles"
-#: builtin/tag.c:521
+#: builtin/tag.c:518
msgid "-n option is only allowed with -l."
msgstr "l'option -n est autorisée seulement avec -l."
-#: builtin/tag.c:523
+#: builtin/tag.c:520
msgid "--contains option is only allowed with -l."
msgstr "l'option --contains est autorisée seulement avec -l."
-#: builtin/tag.c:525
+#: builtin/tag.c:522
msgid "--points-at option is only allowed with -l."
msgstr "l'option --points-at est autorisée seulement avec -l."
-#: builtin/tag.c:533
+#: builtin/tag.c:530
msgid "only one -F or -m option is allowed."
msgstr "une seule option -F ou -m est autorisée."
-#: builtin/tag.c:553
+#: builtin/tag.c:550
msgid "too many params"
msgstr "trop de paramètres"
-#: builtin/tag.c:559
+#: builtin/tag.c:556
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' n'est pas un nom d'étiquette valide."
-#: builtin/tag.c:564
+#: builtin/tag.c:561
#, c-format
msgid "tag '%s' already exists"
msgstr "l'étiquette '%s' existe déjà"
-#: builtin/tag.c:582
+#: builtin/tag.c:579
#, c-format
msgid "%s: cannot lock the ref"
msgstr "%s : impossible de verrouiller la référence"
-#: builtin/tag.c:584
+#: builtin/tag.c:581
#, c-format
msgid "%s: cannot update the ref"
msgstr "%s : impossible de mettre à jour la référence"
-#: builtin/tag.c:586
+#: builtin/tag.c:583
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Étiquette '%s' mise à jour (elle était %s)\n"
-#: builtin/update-index.c:401
+#: builtin/update-index.c:402
msgid "git update-index [options] [--] [<file>...]"
msgstr "git update-index [options] [--] [<fichier>...]"
-#: builtin/update-index.c:718
+#: builtin/update-index.c:720
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:721
+#: builtin/update-index.c:723
msgid "refresh: ignore submodules"
msgstr "rafraîchir : ignorer les sous-modules"
-#: builtin/update-index.c:724
+#: builtin/update-index.c:726
msgid "do not ignore new files"
msgstr "ne pas ignorer les nouveaux fichiers"
-#: builtin/update-index.c:726
+#: builtin/update-index.c:728
msgid "let files replace directories and vice-versa"
msgstr "laisser les fichiers remplacer des répertoires et vice-versa"
-#: builtin/update-index.c:728
+#: builtin/update-index.c:730
msgid "notice files missing from worktree"
msgstr "aviser des fichiers manquants dans la copie de travail"
-#: builtin/update-index.c:730
+#: builtin/update-index.c:732
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:733
+#: builtin/update-index.c:735
msgid "refresh stat information"
msgstr "rafraîchir l'information de stat"
-#: builtin/update-index.c:737
+#: builtin/update-index.c:739
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "comme --refresh, mais en ignorant l'option assume-unchanged"
-#: builtin/update-index.c:741
+#: builtin/update-index.c:743
msgid "<mode> <object> <path>"
msgstr "<mode> <objet> <chemin>"
-#: builtin/update-index.c:742
+#: builtin/update-index.c:744
msgid "add the specified entry to the index"
msgstr "ajouter l'élément spécifié dans l'index"
-#: builtin/update-index.c:746
+#: builtin/update-index.c:748
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/update-index.c:747
+#: builtin/update-index.c:749
msgid "override the executable bit of the listed files"
msgstr "outrepasser le bit exécutable pour les fichiers listés"
-#: builtin/update-index.c:751
+#: builtin/update-index.c:753
msgid "mark files as \"not changing\""
msgstr "marquer les fichiers comme \"non changeants\""
-#: builtin/update-index.c:754
+#: builtin/update-index.c:756
msgid "clear assumed-unchanged bit"
msgstr "mettre à zéro le bit supposé-non-modifié"
-#: builtin/update-index.c:757
+#: builtin/update-index.c:759
msgid "mark files as \"index-only\""
msgstr "marquer les fichiers comme \"index seulement\""
-#: builtin/update-index.c:760
+#: builtin/update-index.c:762
msgid "clear skip-worktree bit"
msgstr "mettre à zéro le bit sauter-la-copie-de travail"
-#: builtin/update-index.c:763
+#: builtin/update-index.c:765
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:765
+#: builtin/update-index.c:767
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:767
+#: builtin/update-index.c:769
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:769
+#: builtin/update-index.c:771
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:773
+#: builtin/update-index.c:775
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:777
+#: builtin/update-index.c:779
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:781
+#: builtin/update-index.c:783
msgid "only update entries that differ from HEAD"
msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD"
-#: builtin/update-index.c:785
+#: builtin/update-index.c:787
msgid "ignore files missing from worktree"
msgstr "ignorer les fichiers manquants dans la copie de travail"
-#: builtin/update-index.c:788
+#: builtin/update-index.c:790
msgid "report actions to standard output"
msgstr "afficher les actions sur la sortie standard"
-#: builtin/update-index.c:790
+#: builtin/update-index.c:792
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus"
-#: builtin/update-index.c:794
+#: builtin/update-index.c:796
msgid "write index in this format"
msgstr "écrire l'index dans ce format"
-#: builtin/update-ref.c:7
+#: builtin/update-ref.c:9
msgid "git update-ref [options] -d <refname> [<oldval>]"
msgstr "git update-ref [options] -d <nomréférence> [<anciennevaleur>]"
-#: builtin/update-ref.c:8
+#: builtin/update-ref.c:10
msgid "git update-ref [options] <refname> <newval> [<oldval>]"
msgstr ""
"git update-ref [options] <nomréférence> <nouvellevaleur> "
"[<anciennevaleur>]"
-#: builtin/update-ref.c:19
+#: builtin/update-ref.c:11
+msgid "git update-ref [options] --stdin [-z]"
+msgstr "git update-ref [options] --stdin [-z]"
+
+#: builtin/update-ref.c:255
msgid "delete the reference"
msgstr "supprimer la référence"
-#: builtin/update-ref.c:21
+#: builtin/update-ref.c:257
msgid "update <refname> not the one it points to"
msgstr "mettre à jour <nomréférence> et non la référence pointée par lui"
+#: builtin/update-ref.c:258
+msgid "stdin has NUL-terminated arguments"
+msgstr "l'entrée standard a des arguments qui se terminent par NUL"
+
+#: builtin/update-ref.c:259
+msgid "read updates from stdin"
+msgstr "lire les mises à jour depuis l'entrée standard"
+
#: builtin/update-server-info.c:6
msgid "git update-server-info [--force]"
msgstr "git update-server-info [--force]"
@@ -9527,33 +9813,33 @@ msgstr ""
"quelques concepts. Voir 'git help <command>' ou 'git help <concept>'\n"
"pour en lire plus à propos d'une commande spécifique ou d'un concept."
-#: parse-options.h:144
+#: parse-options.h:146
msgid "expiry date"
msgstr "date d'expiration"
-#: parse-options.h:159
+#: parse-options.h:161
msgid "no-op (backward compatibility)"
msgstr "sans action (rétrocompatibilité)"
-#: parse-options.h:236
+#: parse-options.h:238
msgid "be more verbose"
msgstr "être plus verbeux"
-#: parse-options.h:238
+#: parse-options.h:240
msgid "be more quiet"
msgstr "être plus silencieux"
-#: parse-options.h:244
+#: parse-options.h:246
msgid "use <n> digits to display SHA-1s"
msgstr "utiliser <n> chiffres pour afficher les SHA-1s"
#: common-cmds.h:8
msgid "Add file contents to the index"
-msgstr "Ajouter le contenu du fichier dans l'index"
+msgstr "Ajouter le contenu de fichiers dans l'index"
#: common-cmds.h:9
msgid "Find by binary search the change that introduced a bug"
-msgstr "Rechercher de manière binaire le changement qui a introduit un bogue"
+msgstr "Trouver par recherche binaire la modification qui a introduit un bogue"
#: common-cmds.h:10
msgid "List, create, or delete branches"
@@ -9569,7 +9855,7 @@ msgstr "Cloner un dépôt dans un nouveau répertoire"
#: common-cmds.h:13
msgid "Record changes to the repository"
-msgstr "Enregistrer les changements dans le dépôt"
+msgstr "Enregistrer les modifications dans le dépôt"
#: common-cmds.h:14
msgid "Show changes between commits, commit and working tree, etc"
@@ -9595,7 +9881,7 @@ msgstr "Afficher l'historique des validations"
#: common-cmds.h:19
msgid "Join two or more development histories together"
-msgstr "Joindre deux ou plusieurs historiques de développement ensemble"
+msgstr "Fusionner deux ou plusieurs historiques de développement ensemble"
#: common-cmds.h:20
msgid "Move or rename a file, a directory, or a symlink"
@@ -9603,7 +9889,7 @@ msgstr "Déplacer ou renommer un fichier, un répertoire, ou un lien symbolique"
#: common-cmds.h:21
msgid "Fetch from and integrate with another repository or a local branch"
-msgstr "Rapatrier et intégrer avec un autre dépôt ou une branche locale"
+msgstr "Rapatrier et intégrer un autre dépôt ou une branche locale"
#: common-cmds.h:22
msgid "Update remote refs along with associated objects"
@@ -9612,7 +9898,7 @@ msgstr "Mettre à jour les références distantes ainsi que les objets associés
#: common-cmds.h:23
msgid "Forward-port local commits to the updated upstream head"
msgstr ""
-"Reporter en avant les validations locales dans la tête en amont mise à jour"
+"Reporter les validations locales sur le sommet mis à jour d'une branche amont"
#: common-cmds.h:24
msgid "Reset current HEAD to the specified state"
@@ -9620,7 +9906,7 @@ msgstr "Réinitialiser la HEAD courante à l'état spécifié"
#: common-cmds.h:25
msgid "Remove files from the working tree and from the index"
-msgstr "Supprimer les fichiers de la copie de travail et de l'index"
+msgstr "Supprimer des fichiers de la copie de travail et de l'index"
#: common-cmds.h:26
msgid "Show various types of objects"
@@ -9991,7 +10277,7 @@ msgstr ""
msgid "Pull is not possible because you have unmerged files."
msgstr "Le pull n'est pas possible car vous avez des fichiers non fusionnés."
-#: git-pull.sh:203
+#: git-pull.sh:223
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 "
@@ -10001,7 +10287,7 @@ msgstr ""
#. The working tree and the index file is still based on the
#. $orig_head commit, but we are merging into $curr_head.
#. First update the working tree to match $curr_head.
-#: git-pull.sh:235
+#: git-pull.sh:255
#, sh-format
msgid ""
"Warning: fetch updated the current branch head.\n"
@@ -10012,11 +10298,11 @@ msgstr ""
"Attention : mise à jour en avance rapide de votre copie de travail\n"
"Attention : depuis la validation $orig_head."
-#: git-pull.sh:260
+#: git-pull.sh:280
msgid "Cannot merge multiple branches into empty head"
msgstr "Impossible de fusionner de multiples branches sur une tête vide"
-#: git-pull.sh:264
+#: git-pull.sh:284
msgid "Cannot rebase onto multiple branches"
msgstr "Impossible de rebaser sur de multiples branches"
@@ -10051,33 +10337,33 @@ msgstr ""
"Vos modifications sont à l'abri dans la remise.\n"
"Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"
-#: git-rebase.sh:190
+#: git-rebase.sh:199
msgid "The pre-rebase hook refused to rebase."
msgstr "Le crochet pre-rebase a refusé de rebaser."
-#: git-rebase.sh:195
+#: git-rebase.sh:204
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "Il semble que git-am soit en cours. Impossible de rebaser."
-#: git-rebase.sh:329
+#: git-rebase.sh:338
msgid "The --exec option must be used with the --interactive option"
msgstr "L'option --exec doit être utilisée avec l'option --interactive"
-#: git-rebase.sh:334
+#: git-rebase.sh:343
msgid "No rebase in progress?"
msgstr "Pas de rebasage en cours ?"
-#: git-rebase.sh:345
+#: git-rebase.sh:354
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"L'action --edit-todo peut seulement être utilisée lors d'un rebasage "
"interactif."
-#: git-rebase.sh:352
+#: git-rebase.sh:361
msgid "Cannot read HEAD"
msgstr "Impossible de lire HEAD"
-#: git-rebase.sh:355
+#: git-rebase.sh:364
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -10085,12 +10371,12 @@ msgstr ""
"Vous devez éditer tous les conflits de fusion et\n"
"les marquer comme résolus avec git add"
-#: git-rebase.sh:373
+#: git-rebase.sh:382
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Impossible de revenir à $head_name"
-#: git-rebase.sh:392
+#: git-rebase.sh:401
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -10103,74 +10389,75 @@ msgid ""
"valuable there."
msgstr ""
"Il semble qu'il y ait déjà un répertoire $state_dir_base, et je me demande\n"
-"si vous n'êtes pas au milieu d'un autre rebasage. Si c'est le cas,\n"
-"merci d'essayer\n"
+"si un autre rebasage n'est pas déjà en cours. Si c'est le cas,\n"
+"essayez\n"
"\t$cmd_live_rebase\n"
-"Si ça n'est pas le cas, merci de\n"
+"Sinon, essayez\n"
"\t$cmd_clear_stale_rebase\n"
"puis relancez-moi à nouveau. Je m'arrête au cas où vous auriez quelque "
"chose\n"
"d'important ici."
-#: git-rebase.sh:437
+#: git-rebase.sh:446
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "invalide $upstream_name en amont"
-#: git-rebase.sh:461
+#: git-rebase.sh:470
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name : il y a plus d'une base de fusion"
-#: git-rebase.sh:464 git-rebase.sh:468
+#: git-rebase.sh:473 git-rebase.sh:477
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name : il n'y a pas de base de fusion"
-#: git-rebase.sh:473
+#: git-rebase.sh:482
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Ne pointe pas sur une validation valide : $onto_name"
-#: git-rebase.sh:496
+#: git-rebase.sh:505
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "fatal : pas de branche : $branch_name"
-#: git-rebase.sh:519
+#: git-rebase.sh:528
msgid "Cannot autostash"
msgstr "Autoremisage impossible"
-#: git-rebase.sh:524
+#: git-rebase.sh:533
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Autoremisage créé : $stash_abbrev"
-#: git-rebase.sh:528
+#: git-rebase.sh:537
msgid "Please commit or stash them."
msgstr "Veuillez les valider ou les remiser."
-#: git-rebase.sh:548
+#: git-rebase.sh:557
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "La branche courante $branch_name est à jour."
-#: git-rebase.sh:552
+#: git-rebase.sh:561
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "La branche courante $branch_name est à jour, rebasage forcé."
-#: git-rebase.sh:563
+#: git-rebase.sh:572
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Changements de $mb sur $onto :"
#. Detach HEAD and reset the tree
-#: git-rebase.sh:572
+#: git-rebase.sh:581
msgid "First, rewinding head to replay your work on top of it..."
-msgstr "Premièrement, retour de head pour rejouer votre travail par-dessus..."
+msgstr ""
+"Premièrement, rembobinons head pour rejouer votre travail par-dessus..."
-#: git-rebase.sh:582
+#: git-rebase.sh:591
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "$branch_name mise à jour en avance rapide sur $onto_name."
@@ -10218,7 +10505,7 @@ msgstr "Impossible de mettre à jour $ref_stash avec $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:241
+#: git-stash.sh:237
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
@@ -10227,98 +10514,85 @@ msgstr ""
"erreur: option inconnue pour 'stash save': $option\n"
" Pour fournir un message, utilisez git stash save -- '$option'"
-#: git-stash.sh:262
+#: git-stash.sh:258
msgid "No local changes to save"
-msgstr "Pas de changements en local à sauver"
-
-#: git-stash.sh:268
-msgid ""
-"The following untracked files would NOT be saved but need to be removed by "
-"stash save:"
-msgstr ""
-"Les fichiers suivants non suivis ne seront PAS sauvés mais doivent être "
-"supprimés par l'état du remisage :"
+msgstr "Pas de modifications locales à sauver"
-#: git-stash.sh:270
-msgid ""
-"Aborting. Consider using either the --force or --include-untracked option."
-msgstr "Abandon. Utilisez l'option --force ou --include-untracked."
-
-#: git-stash.sh:274
+#: git-stash.sh:262
msgid "Cannot initialize stash"
msgstr "Impossible d'initialiser le remisage"
-#: git-stash.sh:278
+#: git-stash.sh:266
msgid "Cannot save the current status"
msgstr "Impossible de sauver le statut courant"
-#: git-stash.sh:296
+#: git-stash.sh:284
msgid "Cannot remove worktree changes"
msgstr "Impossible de supprimer les changements de la copie de travail"
-#: git-stash.sh:395
+#: git-stash.sh:383
msgid "No stash found."
msgstr "Pas de remisage trouvé."
-#: git-stash.sh:402
+#: git-stash.sh:390
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Trop de révisions spécifiées : $REV"
-#: git-stash.sh:408
+#: git-stash.sh:396
#, sh-format
msgid "$reference is not valid reference"
msgstr "$reference n'est pas une référence valide"
-#: git-stash.sh:436
+#: git-stash.sh:424
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' n'est pas une validation de type remisage"
-#: git-stash.sh:447
+#: git-stash.sh:435
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' n'est pas une référence de remisage"
-#: git-stash.sh:455
+#: git-stash.sh:443
msgid "unable to refresh index"
msgstr "impossible de rafraîchir l'index"
-#: git-stash.sh:459
+#: git-stash.sh:447
msgid "Cannot apply a stash in the middle of a merge"
-msgstr "Impossible d'appliquer un remisage au milieu d'une fusion"
+msgstr "Impossible d'appliquer un remisage en cours de fusion"
-#: git-stash.sh:467
+#: git-stash.sh:455
msgid "Conflicts in index. Try without --index."
msgstr "Conflits dans l'index. Essayez sans --index."
-#: git-stash.sh:469
+#: git-stash.sh:457
msgid "Could not save index tree"
msgstr "Impossible de sauver l'arbre d'index"
-#: git-stash.sh:503
+#: git-stash.sh:491
msgid "Cannot unstage modified files"
msgstr "Impossible de désindexer les fichiers modifiés"
-#: git-stash.sh:518
+#: git-stash.sh:506
msgid "Index was not unstashed."
-msgstr "L'index n'a pas été sorti de remise"
+msgstr "L'index n'a pas été sorti de remise."
-#: git-stash.sh:535
+#: git-stash.sh:523
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "${REV} supprimé ($s)"
-#: git-stash.sh:536
+#: git-stash.sh:524
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Impossible de supprimer l'élément de stash"
-#: git-stash.sh:543
+#: git-stash.sh:531
msgid "No branch name specified"
msgstr "Aucune branche spécifiée"
-#: git-stash.sh:615
+#: git-stash.sh:603
msgid "(To restore them type \"git stash apply\")"
msgstr "(Pour les restaurer tapez \"git stash apply\")"
@@ -10604,46 +10878,55 @@ 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"
#. unexpected type
-#: git-submodule.sh:1066
+#: git-submodule.sh:1073
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "mode $mod_dst inattendu"
-#: git-submodule.sh:1086
+#: git-submodule.sh:1093
#, 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:1089
+#: git-submodule.sh:1096
#, 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:1092
+#: git-submodule.sh:1099
#, 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:1117
+#: git-submodule.sh:1124
msgid "blob"
msgstr "blob"
-#: git-submodule.sh:1155
-msgid "Submodules changed but not updated:"
-msgstr "Sous-modules modifiés mais non mis à jour :"
-
-#: git-submodule.sh:1157
-msgid "Submodule changes to be committed:"
-msgstr "Changements du sous-module à valider :"
-
-#: git-submodule.sh:1242
+#: git-submodule.sh:1238
#, 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:1306
+#: git-submodule.sh:1302
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synchronisation de l'URL sous-module pour '$displaypath'"
+
+#~ msgid "input paths are terminated by a null character"
+#~ msgstr "les chemins en entrée sont terminés par le caractère nul"
+
+#~ msgid "done\n"
+#~ msgstr "fait\n"
+
+#~ msgid ""
+#~ "The following untracked files would NOT be saved but need to be removed "
+#~ "by stash save:"
+#~ msgstr ""
+#~ "Les fichiers suivants non suivis ne seront PAS sauvés mais doivent être "
+#~ "supprimés par le remisage :"
+
+#~ msgid ""
+#~ "Aborting. Consider using either the --force or --include-untracked option."
+#~ msgstr "Abandon. Utilisez l'option --force ou --include-untracked."
diff --git a/po/git.pot b/po/git.pot
index c91e19752..58af01a21 100644
--- a/po/git.pot
+++ b/po/git.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2013-08-06 14:10+0800\n"
+"POT-Creation-Date: 2013-11-02 08:06+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"
@@ -52,71 +52,76 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr ""
-#: archive.c:323
+#: archive.c:242 builtin/add.c:240 builtin/add.c:556 builtin/rm.c:328
+#, c-format
+msgid "pathspec '%s' did not match any files"
+msgstr ""
+
+#: archive.c:327
msgid "fmt"
msgstr ""
-#: archive.c:323
+#: archive.c:327
msgid "archive format"
msgstr ""
-#: archive.c:324 builtin/log.c:1173
+#: archive.c:328 builtin/log.c:1193
msgid "prefix"
msgstr ""
-#: archive.c:325
+#: archive.c:329
msgid "prepend prefix to each pathname in the archive"
msgstr ""
-#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2292
-#: builtin/blame.c:2293 builtin/config.c:56 builtin/fast-export.c:673
-#: builtin/fast-export.c:675 builtin/grep.c:714 builtin/hash-object.c:77
-#: builtin/ls-files.c:496 builtin/ls-files.c:499 builtin/notes.c:408
-#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:152
+#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2264
+#: builtin/blame.c:2265 builtin/config.c:58 builtin/fast-export.c:680
+#: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77
+#: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408
+#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154
msgid "file"
msgstr ""
-#: archive.c:327 builtin/archive.c:89
+#: archive.c:331 builtin/archive.c:89
msgid "write the archive to this file"
msgstr ""
-#: archive.c:329
+#: archive.c:333
msgid "read .gitattributes in working directory"
msgstr ""
-#: archive.c:330
+#: archive.c:334
msgid "report archived files on stderr"
msgstr ""
-#: archive.c:331
+#: archive.c:335
msgid "store only"
msgstr ""
-#: archive.c:332
+#: archive.c:336
msgid "compress faster"
msgstr ""
-#: archive.c:340
+#: archive.c:344
msgid "compress better"
msgstr ""
-#: archive.c:343
+#: archive.c:347
msgid "list supported archive formats"
msgstr ""
-#: archive.c:345 builtin/archive.c:90 builtin/clone.c:85
+#: archive.c:349 builtin/archive.c:90 builtin/clone.c:84
msgid "repo"
msgstr ""
-#: archive.c:346 builtin/archive.c:91
+#: archive.c:350 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
-#: archive.c:347 builtin/archive.c:92 builtin/notes.c:487
+#: archive.c:351 builtin/archive.c:92 builtin/notes.c:487
msgid "command"
msgstr ""
-#: archive.c:348 builtin/archive.c:93
+#: archive.c:352 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr ""
@@ -195,17 +200,17 @@ msgstr ""
msgid "Cannot force update the current branch."
msgstr ""
-#: branch.c:216
+#: branch.c:215
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
-#: branch.c:218
+#: branch.c:217
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr ""
-#: branch.c:220
+#: branch.c:219
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -217,26 +222,26 @@ msgid ""
"\"git push -u\" to set the upstream config as you push."
msgstr ""
-#: branch.c:265
+#: branch.c:264
#, c-format
msgid "Not a valid object name: '%s'."
msgstr ""
-#: branch.c:285
+#: branch.c:284
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr ""
-#: branch.c:290
+#: branch.c:289
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr ""
-#: branch.c:296
+#: branch.c:295
msgid "Failed to lock ref for update"
msgstr ""
-#: branch.c:314
+#: branch.c:313
msgid "Failed to write ref"
msgstr ""
@@ -250,7 +255,7 @@ msgstr ""
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:89 builtin/commit.c:697
+#: bundle.c:89 builtin/commit.c:706
#, c-format
msgid "could not open '%s'"
msgstr ""
@@ -259,9 +264,9 @@ msgstr ""
msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: bundle.c:164 sequencer.c:661 sequencer.c:1111 builtin/log.c:331
-#: builtin/log.c:801 builtin/log.c:1399 builtin/log.c:1625 builtin/merge.c:364
-#: builtin/shortlog.c:156
+#: bundle.c:164 sequencer.c:662 sequencer.c:1112 builtin/log.c:332
+#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:364
+#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr ""
@@ -287,7 +292,7 @@ msgstr[1] ""
msgid "rev-list died"
msgstr ""
-#: bundle.c:300 builtin/log.c:1310 builtin/shortlog.c:259
+#: bundle.c:300 builtin/log.c:1329 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
@@ -435,14 +440,14 @@ msgid ""
"%s"
msgstr ""
-#: diff.c:3487
+#: diff.c:3490
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-#: diff.c:3501
+#: diff.c:3504
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr ""
@@ -469,17 +474,17 @@ msgstr ""
msgid "failed writing detached signature to '%s': %s"
msgstr ""
-#: grep.c:1623
+#: grep.c:1695
#, c-format
msgid "'%s': unable to read %s"
msgstr ""
-#: grep.c:1640
+#: grep.c:1712
#, c-format
msgid "'%s': %s"
msgstr ""
-#: grep.c:1651
+#: grep.c:1723
#, c-format
msgid "'%s': short read %s"
msgstr ""
@@ -544,8 +549,8 @@ msgstr ""
msgid "failed to read the cache"
msgstr ""
-#: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566
-#: builtin/clone.c:656
+#: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559
+#: builtin/clone.c:655
msgid "unable to write new index file"
msgstr ""
@@ -594,7 +599,7 @@ msgstr ""
msgid "blob expected for %s '%s'"
msgstr ""
-#: merge-recursive.c:774 builtin/clone.c:312
+#: merge-recursive.c:774 builtin/clone.c:311
#, c-format
msgid "failed to open '%s'"
msgstr ""
@@ -721,7 +726,7 @@ msgstr ""
msgid "Auto-merging %s"
msgstr ""
-#: merge-recursive.c:1634 git-submodule.sh:1118
+#: merge-recursive.c:1634 git-submodule.sh:1125
msgid "submodule"
msgstr ""
@@ -816,58 +821,121 @@ msgstr ""
msgid "Bad %s value: '%s'"
msgstr ""
-#: object.c:204
+#: object.c:202
#, c-format
msgid "unable to parse object: %s"
msgstr ""
-#: parse-options.c:489
+#: parse-options.c:537
msgid "..."
msgstr ""
-#: parse-options.c:507
+#: parse-options.c:555
#, c-format
msgid "usage: %s"
msgstr ""
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:511
+#: parse-options.c:559
#, c-format
msgid " or: %s"
msgstr ""
-#: parse-options.c:514
+#: parse-options.c:562
#, c-format
msgid " %s"
msgstr ""
-#: parse-options.c:548
+#: parse-options.c:596
msgid "-NUM"
msgstr ""
-#: pathspec.c:83
+#: pathspec.c:118
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr ""
+
+#: pathspec.c:128
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr ""
+
+#: pathspec.c:158
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr ""
+
+#: pathspec.c:164
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr ""
+
+#: pathspec.c:168
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr ""
+
+#: pathspec.c:186
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr ""
+
+#: pathspec.c:211
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr ""
+
+#: pathspec.c:222
+#, c-format
+msgid "%s: '%s' is outside repository"
+msgstr ""
+
+#: pathspec.c:278
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr ""
+
+#.
+#. * We may want to substitute "this command" with a command
+#. * name. E.g. when add--interactive dies when running
+#. * "checkout -p"
+#.
+#: pathspec.c:340
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr ""
+
+#: pathspec.c:415
#, c-format
-msgid "Path '%s' is in submodule '%.*s'"
+msgid "pathspec '%s' is beyond a symbolic link"
msgstr ""
-#: pathspec.c:99
+#: remote.c:1833
#, c-format
-msgid "'%s' is beyond a symbolic link"
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr ""
+
+#: remote.c:1837
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr ""
-#: remote.c:1788
+#: remote.c:1840
+#, c-format
+msgid "Your branch is up-to-date with '%s'.\n"
+msgstr ""
+
+#: remote.c:1844
#, 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:1794
+#: remote.c:1850
msgid " (use \"git push\" to publish your local commits)\n"
msgstr ""
-#: remote.c:1797
+#: remote.c:1853
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -875,11 +943,11 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: remote.c:1805
+#: remote.c:1861
msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
-#: remote.c:1808
+#: remote.c:1864
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -890,7 +958,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: remote.c:1818
+#: remote.c:1874
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
@@ -928,7 +996,7 @@ msgid ""
"and commit the result with 'git commit'"
msgstr ""
-#: sequencer.c:245 sequencer.c:869 sequencer.c:952
+#: sequencer.c:245 sequencer.c:870 sequencer.c:953
#, c-format
msgid "Could not write to %s"
msgstr ""
@@ -951,197 +1019,197 @@ msgid "Commit your changes or stash them to proceed."
msgstr ""
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:324
+#: sequencer.c:325
#, c-format
msgid "%s: Unable to write new index file"
msgstr ""
-#: sequencer.c:355
+#: sequencer.c:356
msgid "Could not resolve HEAD commit\n"
msgstr ""
-#: sequencer.c:377
+#: sequencer.c:378
msgid "Unable to update cache tree\n"
msgstr ""
-#: sequencer.c:422
+#: sequencer.c:423
#, c-format
msgid "Could not parse commit %s\n"
msgstr ""
-#: sequencer.c:427
+#: sequencer.c:428
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr ""
-#: sequencer.c:493
+#: sequencer.c:494
msgid "Your index file is unmerged."
msgstr ""
-#: sequencer.c:512
+#: sequencer.c:513
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr ""
-#: sequencer.c:520
+#: sequencer.c:521
#, c-format
msgid "Commit %s does not have parent %d"
msgstr ""
-#: sequencer.c:524
+#: sequencer.c:525
#, c-format
msgid "Mainline was specified but commit %s is not a merge."
msgstr ""
#. TRANSLATORS: The first %s will be "revert" or
#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:537
+#: sequencer.c:538
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: sequencer.c:541
+#: sequencer.c:542
#, c-format
msgid "Cannot get commit message for %s"
msgstr ""
-#: sequencer.c:627
+#: sequencer.c:628
#, c-format
msgid "could not revert %s... %s"
msgstr ""
-#: sequencer.c:628
+#: sequencer.c:629
#, c-format
msgid "could not apply %s... %s"
msgstr ""
-#: sequencer.c:664
+#: sequencer.c:665
msgid "empty commit set passed"
msgstr ""
-#: sequencer.c:672
+#: sequencer.c:673
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
-#: sequencer.c:677
+#: sequencer.c:678
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
-#: sequencer.c:735
+#: sequencer.c:736
#, c-format
msgid "Cannot %s during a %s"
msgstr ""
-#: sequencer.c:757
+#: sequencer.c:758
#, c-format
msgid "Could not parse line %d."
msgstr ""
-#: sequencer.c:762
+#: sequencer.c:763
msgid "No commits parsed."
msgstr ""
-#: sequencer.c:775
+#: sequencer.c:776
#, c-format
msgid "Could not open %s"
msgstr ""
-#: sequencer.c:779
+#: sequencer.c:780
#, c-format
msgid "Could not read %s."
msgstr ""
-#: sequencer.c:786
+#: sequencer.c:787
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr ""
-#: sequencer.c:814
+#: sequencer.c:815
#, c-format
msgid "Invalid key: %s"
msgstr ""
-#: sequencer.c:817
+#: sequencer.c:818
#, c-format
msgid "Invalid value for %s: %s"
msgstr ""
-#: sequencer.c:829
+#: sequencer.c:830
#, c-format
msgid "Malformed options sheet: %s"
msgstr ""
-#: sequencer.c:850
+#: sequencer.c:851
msgid "a cherry-pick or revert is already in progress"
msgstr ""
-#: sequencer.c:851
+#: sequencer.c:852
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr ""
-#: sequencer.c:855
+#: sequencer.c:856
#, c-format
msgid "Could not create sequencer directory %s"
msgstr ""
-#: sequencer.c:871 sequencer.c:956
+#: sequencer.c:872 sequencer.c:957
#, c-format
msgid "Error wrapping up %s."
msgstr ""
-#: sequencer.c:890 sequencer.c:1024
+#: sequencer.c:891 sequencer.c:1025
msgid "no cherry-pick or revert in progress"
msgstr ""
-#: sequencer.c:892
+#: sequencer.c:893
msgid "cannot resolve HEAD"
msgstr ""
-#: sequencer.c:894
+#: sequencer.c:895
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:916 builtin/apply.c:4061
+#: sequencer.c:917 builtin/apply.c:4061
#, c-format
msgid "cannot open %s: %s"
msgstr ""
-#: sequencer.c:919
+#: sequencer.c:920
#, c-format
msgid "cannot read %s: %s"
msgstr ""
-#: sequencer.c:920
+#: sequencer.c:921
msgid "unexpected end of file"
msgstr ""
-#: sequencer.c:926
+#: sequencer.c:927
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: sequencer.c:949
+#: sequencer.c:950
#, c-format
msgid "Could not format %s."
msgstr ""
-#: sequencer.c:1092
+#: sequencer.c:1093
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: sequencer.c:1095
+#: sequencer.c:1096
#, c-format
msgid "%s: bad revision"
msgstr ""
-#: sequencer.c:1129
+#: sequencer.c:1130
msgid "Can't revert as initial commit"
msgstr ""
-#: sequencer.c:1130
+#: sequencer.c:1131
msgid "Can't cherry-pick into empty head"
msgstr ""
@@ -1158,360 +1226,453 @@ msgid ""
"running \"git config advice.objectNameWarning false\""
msgstr ""
-#: sha1_name.c:1097
+#: sha1_name.c:1112
msgid "HEAD does not point to a branch"
msgstr ""
-#: sha1_name.c:1100
+#: sha1_name.c:1115
#, c-format
msgid "No such branch: '%s'"
msgstr ""
-#: sha1_name.c:1102
+#: sha1_name.c:1117
#, c-format
msgid "No upstream configured for branch '%s'"
msgstr ""
-#: sha1_name.c:1106
+#: sha1_name.c:1121
#, c-format
msgid "Upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
-#: wrapper.c:408
+#: submodule.c:64 submodule.c:98
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr ""
+
+#: submodule.c:68 submodule.c:102
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr ""
+
+#. Maybe the user already did that, don't error out here
+#: submodule.c:76
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr ""
+
+#. Maybe the user already did that, don't error out here
+#: submodule.c:109
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr ""
+
+#: submodule.c:127
+msgid "could not find .gitmodules in index"
+msgstr ""
+
+#: submodule.c:133
+msgid "reading updated .gitmodules failed"
+msgstr ""
+
+#: submodule.c:135
+msgid "unable to stat updated .gitmodules"
+msgstr ""
+
+#: submodule.c:139
+msgid "unable to remove .gitmodules from index"
+msgstr ""
+
+#: submodule.c:141
+msgid "adding updated .gitmodules failed"
+msgstr ""
+
+#: submodule.c:143
+msgid "staging updated .gitmodules failed"
+msgstr ""
+
+#: submodule.c:1144 builtin/init-db.c:363
+#, c-format
+msgid "Could not create git link %s"
+msgstr ""
+
+#: submodule.c:1155
+#, c-format
+msgid "Could not set core.worktree in %s"
+msgstr ""
+
+#: urlmatch.c:120
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr ""
+
+#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr ""
+
+#: urlmatch.c:172
+msgid "missing host and scheme is not 'file:'"
+msgstr ""
+
+#: urlmatch.c:189
+msgid "a 'file:' URL may not have a port number"
+msgstr ""
+
+#: urlmatch.c:199
+msgid "invalid characters in host name"
+msgstr ""
+
+#: urlmatch.c:244 urlmatch.c:255
+msgid "invalid port number"
+msgstr ""
+
+#: urlmatch.c:322
+msgid "invalid '..' path segment"
+msgstr ""
+
+#: wrapper.c:422
#, c-format
msgid "unable to access '%s': %s"
msgstr ""
-#: wrapper.c:429
+#: wrapper.c:443
#, c-format
msgid "unable to access '%s'"
msgstr ""
-#: wrapper.c:440
+#: wrapper.c:454
#, c-format
msgid "unable to look up current user in the passwd file: %s"
msgstr ""
-#: wrapper.c:441
+#: wrapper.c:455
msgid "no such user"
msgstr ""
-#: wt-status.c:141
+#: wt-status.c:146
msgid "Unmerged paths:"
msgstr ""
-#: wt-status.c:168 wt-status.c:195
+#: wt-status.c:173 wt-status.c:200
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr ""
-#: wt-status.c:170 wt-status.c:197
+#: wt-status.c:175 wt-status.c:202
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
-#: wt-status.c:174
+#: wt-status.c:179
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:176 wt-status.c:180
+#: wt-status.c:181 wt-status.c:185
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
-#: wt-status.c:178
+#: wt-status.c:183
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:189
+#: wt-status.c:194
msgid "Changes to be committed:"
msgstr ""
-#: wt-status.c:207
+#: wt-status.c:212
msgid "Changes not staged for commit:"
msgstr ""
-#: wt-status.c:211
+#: wt-status.c:216
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
-#: wt-status.c:213
+#: wt-status.c:218
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
-#: wt-status.c:214
+#: wt-status.c:219
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
-#: wt-status.c:216
+#: wt-status.c:221
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-#: wt-status.c:228
+#: wt-status.c:233
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
-#: wt-status.c:245
+#: wt-status.c:250
msgid "bug"
msgstr ""
-#: wt-status.c:250
+#: wt-status.c:255
msgid "both deleted:"
msgstr ""
-#: wt-status.c:251
+#: wt-status.c:256
msgid "added by us:"
msgstr ""
-#: wt-status.c:252
+#: wt-status.c:257
msgid "deleted by them:"
msgstr ""
-#: wt-status.c:253
+#: wt-status.c:258
msgid "added by them:"
msgstr ""
-#: wt-status.c:254
+#: wt-status.c:259
msgid "deleted by us:"
msgstr ""
-#: wt-status.c:255
+#: wt-status.c:260
msgid "both added:"
msgstr ""
-#: wt-status.c:256
+#: wt-status.c:261
msgid "both modified:"
msgstr ""
-#: wt-status.c:286
+#: wt-status.c:291
msgid "new commits, "
msgstr ""
-#: wt-status.c:288
+#: wt-status.c:293
msgid "modified content, "
msgstr ""
-#: wt-status.c:290
+#: wt-status.c:295
msgid "untracked content, "
msgstr ""
-#: wt-status.c:307
+#: wt-status.c:312
#, c-format
msgid "new file: %s"
msgstr ""
-#: wt-status.c:310
+#: wt-status.c:315
#, c-format
msgid "copied: %s -> %s"
msgstr ""
-#: wt-status.c:313
+#: wt-status.c:318
#, c-format
msgid "deleted: %s"
msgstr ""
-#: wt-status.c:316
+#: wt-status.c:321
#, c-format
msgid "modified: %s"
msgstr ""
-#: wt-status.c:319
+#: wt-status.c:324
#, c-format
msgid "renamed: %s -> %s"
msgstr ""
-#: wt-status.c:322
+#: wt-status.c:327
#, c-format
msgid "typechange: %s"
msgstr ""
-#: wt-status.c:325
+#: wt-status.c:330
#, c-format
msgid "unknown: %s"
msgstr ""
-#: wt-status.c:328
+#: wt-status.c:333
#, c-format
msgid "unmerged: %s"
msgstr ""
-#: wt-status.c:331
+#: wt-status.c:336
#, c-format
msgid "bug: unhandled diff status %c"
msgstr ""
-#: wt-status.c:803
+#: wt-status.c:703
+msgid "Submodules changed but not updated:"
+msgstr ""
+
+#: wt-status.c:705
+msgid "Submodule changes to be committed:"
+msgstr ""
+
+#: wt-status.c:848
msgid "You have unmerged paths."
msgstr ""
-#: wt-status.c:806
+#: wt-status.c:851
msgid " (fix conflicts and run \"git commit\")"
msgstr ""
-#: wt-status.c:809
+#: wt-status.c:854
msgid "All conflicts fixed but you are still merging."
msgstr ""
-#: wt-status.c:812
+#: wt-status.c:857
msgid " (use \"git commit\" to conclude merge)"
msgstr ""
-#: wt-status.c:822
+#: wt-status.c:867
msgid "You are in the middle of an am session."
msgstr ""
-#: wt-status.c:825
+#: wt-status.c:870
msgid "The current patch is empty."
msgstr ""
-#: wt-status.c:829
+#: wt-status.c:874
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
-#: wt-status.c:831
+#: wt-status.c:876
msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:833
+#: wt-status.c:878
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
-#: wt-status.c:893 wt-status.c:910
+#: wt-status.c:938 wt-status.c:955
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:898 wt-status.c:915
+#: wt-status.c:943 wt-status.c:960
msgid "You are currently rebasing."
msgstr ""
-#: wt-status.c:901
+#: wt-status.c:946
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:903
+#: wt-status.c:948
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:905
+#: wt-status.c:950
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
-#: wt-status.c:918
+#: wt-status.c:963
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:922
+#: wt-status.c:967
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:927
+#: wt-status.c:972
msgid "You are currently splitting a commit during a rebase."
msgstr ""
-#: wt-status.c:930
+#: wt-status.c:975
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:934
+#: wt-status.c:979
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:939
+#: wt-status.c:984
msgid "You are currently editing a commit during a rebase."
msgstr ""
-#: wt-status.c:942
+#: wt-status.c:987
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
-#: wt-status.c:944
+#: wt-status.c:989
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-#: wt-status.c:954
-msgid "You are currently cherry-picking."
+#: wt-status.c:999
+#, c-format
+msgid "You are currently cherry-picking commit %s."
msgstr ""
-#: wt-status.c:958
+#: wt-status.c:1004
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
-#: wt-status.c:961
+#: wt-status.c:1007
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
-#: wt-status.c:963
+#: wt-status.c:1009
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-#: wt-status.c:972
+#: wt-status.c:1018
#, c-format
msgid "You are currently reverting commit %s."
msgstr ""
-#: wt-status.c:977
+#: wt-status.c:1023
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:980
+#: wt-status.c:1026
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:982
+#: wt-status.c:1028
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
-#: wt-status.c:993
+#: wt-status.c:1039
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
-#: wt-status.c:997
+#: wt-status.c:1043
msgid "You are currently bisecting."
msgstr ""
-#: wt-status.c:1000
+#: wt-status.c:1046
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: wt-status.c:1173
+#: wt-status.c:1221
msgid "On branch "
msgstr ""
-#: wt-status.c:1180
+#: wt-status.c:1228
msgid "rebase in progress; onto "
msgstr ""
-#: wt-status.c:1187
+#: wt-status.c:1235
msgid "HEAD detached at "
msgstr ""
-#: wt-status.c:1189
+#: wt-status.c:1237
msgid "HEAD detached from "
msgstr ""
-#: wt-status.c:1192
+#: wt-status.c:1240
msgid "Not currently on any branch."
msgstr ""
-#: wt-status.c:1209
+#: wt-status.c:1257
msgid "Initial commit"
msgstr ""
-#: wt-status.c:1223
+#: wt-status.c:1271
msgid "Untracked files"
msgstr ""
-#: wt-status.c:1225
+#: wt-status.c:1273
msgid "Ignored files"
msgstr ""
-#: wt-status.c:1229
+#: wt-status.c:1277
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -1519,82 +1680,86 @@ msgid ""
"new files yourself (see 'git help status')."
msgstr ""
-#: wt-status.c:1235
+#: wt-status.c:1283
#, c-format
msgid "Untracked files not listed%s"
msgstr ""
-#: wt-status.c:1237
+#: wt-status.c:1285
msgid " (use -u option to show untracked files)"
msgstr ""
-#: wt-status.c:1243
+#: wt-status.c:1291
msgid "No changes"
msgstr ""
-#: wt-status.c:1248
+#: wt-status.c:1296
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-#: wt-status.c:1251
+#: wt-status.c:1299
#, c-format
msgid "no changes added to commit\n"
msgstr ""
-#: wt-status.c:1254
+#: wt-status.c:1302
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
-#: wt-status.c:1257
+#: wt-status.c:1305
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: wt-status.c:1260
+#: wt-status.c:1308
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: wt-status.c:1263 wt-status.c:1268
+#: wt-status.c:1311 wt-status.c:1316
#, c-format
msgid "nothing to commit\n"
msgstr ""
-#: wt-status.c:1266
+#: wt-status.c:1314
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: wt-status.c:1270
+#: wt-status.c:1318
#, c-format
msgid "nothing to commit, working directory clean\n"
msgstr ""
-#: wt-status.c:1378
+#: wt-status.c:1427
msgid "HEAD (no branch)"
msgstr ""
-#: wt-status.c:1384
+#: wt-status.c:1433
msgid "Initial commit on "
msgstr ""
-#: wt-status.c:1399
+#: wt-status.c:1463
+msgid "gone"
+msgstr ""
+
+#: wt-status.c:1465
msgid "behind "
msgstr ""
-#: wt-status.c:1402 wt-status.c:1405
+#: wt-status.c:1468 wt-status.c:1471
msgid "ahead "
msgstr ""
-#: wt-status.c:1407
+#: wt-status.c:1473
msgid ", behind "
msgstr ""
-#: compat/precompose_utf8.c:58 builtin/clone.c:351
+#: compat/precompose_utf8.c:55 builtin/clone.c:350
#, c-format
msgid "failed to unlink '%s'"
msgstr ""
@@ -1654,7 +1819,7 @@ msgstr ""
msgid "unexpected diff status %c"
msgstr ""
-#: builtin/add.c:149 builtin/commit.c:252
+#: builtin/add.c:149 builtin/commit.c:260
msgid "updating files failed"
msgstr ""
@@ -1663,140 +1828,135 @@ msgstr ""
msgid "remove '%s'\n"
msgstr ""
-#: builtin/add.c:253
+#: builtin/add.c:237
msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/add.c:256 builtin/add.c:573 builtin/rm.c:337
-#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr ""
-
-#: builtin/add.c:339
+#: builtin/add.c:299
msgid "Could not read the index"
msgstr ""
-#: builtin/add.c:350
+#: builtin/add.c:310
#, c-format
msgid "Could not open '%s' for writing."
msgstr ""
-#: builtin/add.c:354
+#: builtin/add.c:314
msgid "Could not write patch"
msgstr ""
-#: builtin/add.c:359
+#: builtin/add.c:319
#, c-format
msgid "Could not stat '%s'"
msgstr ""
-#: builtin/add.c:361
+#: builtin/add.c:321
msgid "Empty patch. Aborted."
msgstr ""
-#: builtin/add.c:367
+#: builtin/add.c:327
#, c-format
msgid "Could not apply '%s'"
msgstr ""
-#: builtin/add.c:377
+#: builtin/add.c:337
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/add.c:394 builtin/clean.c:875 builtin/fetch.c:78 builtin/mv.c:63
-#: builtin/prune-packed.c:73 builtin/push.c:451 builtin/remote.c:1253
-#: builtin/rm.c:268
+#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:92 builtin/mv.c:66
+#: builtin/prune-packed.c:73 builtin/push.c:459 builtin/remote.c:1253
+#: builtin/rm.c:269
msgid "dry run"
msgstr ""
-#: builtin/add.c:395 builtin/apply.c:4410 builtin/check-ignore.c:19
-#: builtin/commit.c:1220 builtin/count-objects.c:95 builtin/fsck.c:613
-#: builtin/log.c:1573 builtin/mv.c:62 builtin/read-tree.c:113
+#: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19
+#: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612
+#: builtin/log.c:1592 builtin/mv.c:65 builtin/read-tree.c:113
msgid "be verbose"
msgstr ""
-#: builtin/add.c:397
+#: builtin/add.c:357
msgid "interactive picking"
msgstr ""
-#: builtin/add.c:398 builtin/checkout.c:1073 builtin/reset.c:261
+#: builtin/add.c:358 builtin/checkout.c:1109 builtin/reset.c:272
msgid "select hunks interactively"
msgstr ""
-#: builtin/add.c:399
+#: builtin/add.c:359
msgid "edit current diff and apply"
msgstr ""
-#: builtin/add.c:400
+#: builtin/add.c:360
msgid "allow adding otherwise ignored files"
msgstr ""
-#: builtin/add.c:401
+#: builtin/add.c:361
msgid "update tracked files"
msgstr ""
-#: builtin/add.c:402
+#: builtin/add.c:362
msgid "record only the fact that the path will be added later"
msgstr ""
-#: builtin/add.c:403
+#: builtin/add.c:363
msgid "add changes from all tracked and untracked files"
msgstr ""
#. takes no arguments
-#: builtin/add.c:406
+#: builtin/add.c:366
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
-#: builtin/add.c:408
+#: builtin/add.c:368
msgid "don't add, only refresh the index"
msgstr ""
-#: builtin/add.c:409
+#: builtin/add.c:369
msgid "just skip files which cannot be added because of errors"
msgstr ""
-#: builtin/add.c:410
+#: builtin/add.c:370
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-#: builtin/add.c:432
+#: builtin/add.c:392
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr ""
-#: builtin/add.c:433
+#: builtin/add.c:393
msgid "no files added"
msgstr ""
-#: builtin/add.c:439
+#: builtin/add.c:399
msgid "adding files failed"
msgstr ""
-#: builtin/add.c:478
+#: builtin/add.c:438
msgid "-A and -u are mutually incompatible"
msgstr ""
-#: builtin/add.c:496
+#: builtin/add.c:456
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
-#: builtin/add.c:526
+#: builtin/add.c:486
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr ""
-#: builtin/add.c:527
+#: builtin/add.c:487
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
-#: builtin/add.c:533 builtin/check-ignore.c:161 builtin/clean.c:919
-#: builtin/commit.c:312 builtin/mv.c:82 builtin/rm.c:297
+#: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919
+#: builtin/commit.c:320 builtin/mv.c:86 builtin/reset.c:224 builtin/rm.c:299
msgid "index file corrupt"
msgstr ""
-#: builtin/add.c:605 builtin/apply.c:4506 builtin/mv.c:229 builtin/rm.c:432
+#: builtin/add.c:589 builtin/apply.c:4506 builtin/mv.c:259 builtin/rm.c:432
msgid "Unable to write new index file"
msgstr ""
@@ -2042,7 +2202,7 @@ msgstr ""
msgid "Checking patch %s..."
msgstr ""
-#: builtin/apply.c:3680 builtin/checkout.c:216 builtin/reset.c:127
+#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:127
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
@@ -2122,8 +2282,8 @@ msgstr ""
msgid "unable to read index file"
msgstr ""
-#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:91
-#: builtin/fetch.c:63
+#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90
+#: builtin/fetch.c:77
msgid "path"
msgstr ""
@@ -2183,7 +2343,7 @@ msgstr ""
msgid "build a temporary index based on embedded index information"
msgstr ""
-#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:462
+#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:452
msgid "paths are separated with NUL character"
msgstr ""
@@ -2313,103 +2473,103 @@ msgstr ""
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr ""
-#: builtin/blame.c:26
+#: builtin/blame.c:27
msgid "git blame [options] [rev-opts] [rev] [--] file"
msgstr ""
-#: builtin/blame.c:31
+#: builtin/blame.c:32
msgid "[rev-opts] are documented in git-rev-list(1)"
msgstr ""
-#: builtin/blame.c:2276
+#: builtin/blame.c:2248
msgid "Show blame entries as we find them, incrementally"
msgstr ""
-#: builtin/blame.c:2277
+#: builtin/blame.c:2249
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
-#: builtin/blame.c:2278
+#: builtin/blame.c:2250
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
-#: builtin/blame.c:2279
+#: builtin/blame.c:2251
msgid "Show work cost statistics"
msgstr ""
-#: builtin/blame.c:2280
+#: builtin/blame.c:2252
msgid "Show output score for blame entries"
msgstr ""
-#: builtin/blame.c:2281
+#: builtin/blame.c:2253
msgid "Show original filename (Default: auto)"
msgstr ""
-#: builtin/blame.c:2282
+#: builtin/blame.c:2254
msgid "Show original linenumber (Default: off)"
msgstr ""
-#: builtin/blame.c:2283
+#: builtin/blame.c:2255
msgid "Show in a format designed for machine consumption"
msgstr ""
-#: builtin/blame.c:2284
+#: builtin/blame.c:2256
msgid "Show porcelain format with per-line commit information"
msgstr ""
-#: builtin/blame.c:2285
+#: builtin/blame.c:2257
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
-#: builtin/blame.c:2286
+#: builtin/blame.c:2258
msgid "Show raw timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:2287
+#: builtin/blame.c:2259
msgid "Show long commit SHA1 (Default: off)"
msgstr ""
-#: builtin/blame.c:2288
+#: builtin/blame.c:2260
msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:2289
+#: builtin/blame.c:2261
msgid "Show author email instead of name (Default: off)"
msgstr ""
-#: builtin/blame.c:2290
+#: builtin/blame.c:2262
msgid "Ignore whitespace differences"
msgstr ""
-#: builtin/blame.c:2291
+#: builtin/blame.c:2263
msgid "Spend extra cycles to find better match"
msgstr ""
-#: builtin/blame.c:2292
+#: builtin/blame.c:2264
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
-#: builtin/blame.c:2293
+#: builtin/blame.c:2265
msgid "Use <file>'s contents as the final image"
msgstr ""
-#: builtin/blame.c:2294 builtin/blame.c:2295
+#: builtin/blame.c:2266 builtin/blame.c:2267
msgid "score"
msgstr ""
-#: builtin/blame.c:2294
+#: builtin/blame.c:2266
msgid "Find line copies within and across files"
msgstr ""
-#: builtin/blame.c:2295
+#: builtin/blame.c:2267
msgid "Find line movements within and across files"
msgstr ""
-#: builtin/blame.c:2296
+#: builtin/blame.c:2268
msgid "n,m"
msgstr ""
-#: builtin/blame.c:2296
+#: builtin/blame.c:2268
msgid "Process only line range n,m, counting from 1"
msgstr ""
@@ -2509,280 +2669,290 @@ msgstr ""
#: builtin/branch.c:453
#, c-format
+msgid "[%s: gone]"
+msgstr ""
+
+#: builtin/branch.c:456
+#, c-format
+msgid "[%s]"
+msgstr ""
+
+#: builtin/branch.c:459
+#, c-format
msgid "[%s: behind %d]"
msgstr ""
-#: builtin/branch.c:455
+#: builtin/branch.c:461
#, c-format
msgid "[behind %d]"
msgstr ""
-#: builtin/branch.c:459
+#: builtin/branch.c:465
#, c-format
msgid "[%s: ahead %d]"
msgstr ""
-#: builtin/branch.c:461
+#: builtin/branch.c:467
#, c-format
msgid "[ahead %d]"
msgstr ""
-#: builtin/branch.c:464
+#: builtin/branch.c:470
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr ""
-#: builtin/branch.c:467
+#: builtin/branch.c:473
#, c-format
msgid "[ahead %d, behind %d]"
msgstr ""
-#: builtin/branch.c:490
+#: builtin/branch.c:496
msgid " **** invalid ref ****"
msgstr ""
-#: builtin/branch.c:582
+#: builtin/branch.c:588
#, c-format
msgid "(no branch, rebasing %s)"
msgstr ""
-#: builtin/branch.c:585
+#: builtin/branch.c:591
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr ""
-#: builtin/branch.c:588
+#: builtin/branch.c:594
#, c-format
msgid "(detached from %s)"
msgstr ""
-#: builtin/branch.c:591
+#: builtin/branch.c:597
msgid "(no branch)"
msgstr ""
-#: builtin/branch.c:637
+#: builtin/branch.c:643
#, c-format
msgid "object '%s' does not point to a commit"
msgstr ""
-#: builtin/branch.c:669
+#: builtin/branch.c:675
msgid "some refs could not be read"
msgstr ""
-#: builtin/branch.c:682
+#: builtin/branch.c:688
msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/branch.c:692
+#: builtin/branch.c:698
#, c-format
msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/branch.c:707
+#: builtin/branch.c:713
msgid "Branch rename failed"
msgstr ""
-#: builtin/branch.c:711
+#: builtin/branch.c:717
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/branch.c:715
+#: builtin/branch.c:721
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
-#: builtin/branch.c:722
+#: builtin/branch.c:728
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:737
+#: builtin/branch.c:743
#, c-format
msgid "malformed object name %s"
msgstr ""
-#: builtin/branch.c:761
+#: builtin/branch.c:767
#, c-format
msgid "could not write branch description template: %s"
msgstr ""
-#: builtin/branch.c:791
+#: builtin/branch.c:797
msgid "Generic options"
msgstr ""
-#: builtin/branch.c:793
+#: builtin/branch.c:799
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
-#: builtin/branch.c:794
+#: builtin/branch.c:800
msgid "suppress informational messages"
msgstr ""
-#: builtin/branch.c:795
+#: builtin/branch.c:801
msgid "set up tracking mode (see git-pull(1))"
msgstr ""
-#: builtin/branch.c:797
+#: builtin/branch.c:803
msgid "change upstream info"
msgstr ""
-#: builtin/branch.c:801
+#: builtin/branch.c:807
msgid "use colored output"
msgstr ""
-#: builtin/branch.c:802
+#: builtin/branch.c:808
msgid "act on remote-tracking branches"
msgstr ""
-#: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832
-#: builtin/branch.c:838 builtin/commit.c:1433 builtin/commit.c:1434
-#: builtin/commit.c:1435 builtin/commit.c:1436 builtin/tag.c:468
+#: builtin/branch.c:811 builtin/branch.c:817 builtin/branch.c:838
+#: builtin/branch.c:844 builtin/commit.c:1460 builtin/commit.c:1461
+#: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468
msgid "commit"
msgstr ""
-#: builtin/branch.c:806 builtin/branch.c:812
+#: builtin/branch.c:812 builtin/branch.c:818
msgid "print only branches that contain the commit"
msgstr ""
-#: builtin/branch.c:818
+#: builtin/branch.c:824
msgid "Specific git-branch actions:"
msgstr ""
-#: builtin/branch.c:819
+#: builtin/branch.c:825
msgid "list both remote-tracking and local branches"
msgstr ""
-#: builtin/branch.c:821
+#: builtin/branch.c:827
msgid "delete fully merged branch"
msgstr ""
-#: builtin/branch.c:822
+#: builtin/branch.c:828
msgid "delete branch (even if not merged)"
msgstr ""
-#: builtin/branch.c:823
+#: builtin/branch.c:829
msgid "move/rename a branch and its reflog"
msgstr ""
-#: builtin/branch.c:824
+#: builtin/branch.c:830
msgid "move/rename a branch, even if target exists"
msgstr ""
-#: builtin/branch.c:825
+#: builtin/branch.c:831
msgid "list branch names"
msgstr ""
-#: builtin/branch.c:826
+#: builtin/branch.c:832
msgid "create the branch's reflog"
msgstr ""
-#: builtin/branch.c:828
+#: builtin/branch.c:834
msgid "edit the description for the branch"
msgstr ""
-#: builtin/branch.c:829
+#: builtin/branch.c:835
msgid "force creation (when already exists)"
msgstr ""
-#: builtin/branch.c:832
+#: builtin/branch.c:838
msgid "print only not merged branches"
msgstr ""
-#: builtin/branch.c:838
+#: builtin/branch.c:844
msgid "print only merged branches"
msgstr ""
-#: builtin/branch.c:842
+#: builtin/branch.c:848
msgid "list branches in columns"
msgstr ""
-#: builtin/branch.c:855
+#: builtin/branch.c:861
msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: builtin/branch.c:860 builtin/clone.c:630
+#: builtin/branch.c:866 builtin/clone.c:629
msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/branch.c:883
+#: builtin/branch.c:890
msgid "--column and --verbose are incompatible"
msgstr ""
-#: builtin/branch.c:889 builtin/branch.c:928
+#: builtin/branch.c:896 builtin/branch.c:935
msgid "branch name required"
msgstr ""
-#: builtin/branch.c:904
+#: builtin/branch.c:911
msgid "Cannot give description to detached HEAD"
msgstr ""
-#: builtin/branch.c:909
+#: builtin/branch.c:916
msgid "cannot edit description of more than one branch"
msgstr ""
-#: builtin/branch.c:916
+#: builtin/branch.c:923
#, c-format
msgid "No commit on branch '%s' yet."
msgstr ""
-#: builtin/branch.c:919
+#: builtin/branch.c:926
#, c-format
msgid "No branch named '%s'."
msgstr ""
-#: builtin/branch.c:934
+#: builtin/branch.c:941
msgid "too many branches for a rename operation"
msgstr ""
-#: builtin/branch.c:939
+#: builtin/branch.c:946
msgid "too many branches to set new upstream"
msgstr ""
-#: builtin/branch.c:943
+#: builtin/branch.c:950
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:946 builtin/branch.c:968 builtin/branch.c:990
+#: builtin/branch.c:953 builtin/branch.c:975 builtin/branch.c:997
#, c-format
msgid "no such branch '%s'"
msgstr ""
-#: builtin/branch.c:950
+#: builtin/branch.c:957
#, c-format
msgid "branch '%s' does not exist"
msgstr ""
-#: builtin/branch.c:962
+#: builtin/branch.c:969
msgid "too many branches to unset upstream"
msgstr ""
-#: builtin/branch.c:966
+#: builtin/branch.c:973
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:972
+#: builtin/branch.c:979
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr ""
-#: builtin/branch.c:987
+#: builtin/branch.c:994
msgid "it does not make sense to create 'HEAD' manually"
msgstr ""
-#: builtin/branch.c:993
+#: builtin/branch.c:1000
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
-#: builtin/branch.c:996
+#: builtin/branch.c:1003
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
"track or --set-upstream-to\n"
msgstr ""
-#: builtin/branch.c:1013
+#: builtin/branch.c:1020
#, c-format
msgid ""
"\n"
@@ -2790,12 +2960,12 @@ msgid ""
"\n"
msgstr ""
-#: builtin/branch.c:1014
+#: builtin/branch.c:1021
#, c-format
msgid " git branch -d %s\n"
msgstr ""
-#: builtin/branch.c:1015
+#: builtin/branch.c:1022
#, c-format
msgid " git branch --set-upstream-to %s\n"
msgstr ""
@@ -2813,43 +2983,43 @@ msgstr ""
msgid "Need a repository to unbundle."
msgstr ""
-#: builtin/cat-file.c:285
+#: builtin/cat-file.c:312
msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
msgstr ""
-#: builtin/cat-file.c:286
+#: builtin/cat-file.c:313
msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
msgstr ""
-#: builtin/cat-file.c:323
+#: builtin/cat-file.c:350
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
-#: builtin/cat-file.c:324
+#: builtin/cat-file.c:351
msgid "show object type"
msgstr ""
-#: builtin/cat-file.c:325
+#: builtin/cat-file.c:352
msgid "show object size"
msgstr ""
-#: builtin/cat-file.c:327
+#: builtin/cat-file.c:354
msgid "exit with zero when there's no error"
msgstr ""
-#: builtin/cat-file.c:328
+#: builtin/cat-file.c:355
msgid "pretty-print object's content"
msgstr ""
-#: builtin/cat-file.c:330
+#: builtin/cat-file.c:357
msgid "for blob objects, run textconv on object's content"
msgstr ""
-#: builtin/cat-file.c:332
+#: builtin/cat-file.c:359
msgid "show info and content of objects fed from the standard input"
msgstr ""
-#: builtin/cat-file.c:335
+#: builtin/cat-file.c:362
msgid "show info about objects fed from the standard input"
msgstr ""
@@ -2874,10 +3044,10 @@ msgid "read file names from stdin"
msgstr ""
#: builtin/check-attr.c:23 builtin/check-ignore.c:24
-msgid "input paths are terminated by a null character"
+msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/check-ignore.c:18 builtin/checkout.c:1054 builtin/gc.c:177
+#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:259
msgid "suppress progress reporting"
msgstr ""
@@ -2885,27 +3055,31 @@ msgstr ""
msgid "show non-matching input paths"
msgstr ""
-#: builtin/check-ignore.c:143
+#: builtin/check-ignore.c:28
+msgid "ignore index when checking"
+msgstr ""
+
+#: builtin/check-ignore.c:154
msgid "cannot specify pathnames with --stdin"
msgstr ""
-#: builtin/check-ignore.c:146
+#: builtin/check-ignore.c:157
msgid "-z only makes sense with --stdin"
msgstr ""
-#: builtin/check-ignore.c:148
+#: builtin/check-ignore.c:159
msgid "no path specified"
msgstr ""
-#: builtin/check-ignore.c:152
+#: builtin/check-ignore.c:163
msgid "--quiet is only valid with a single pathname"
msgstr ""
-#: builtin/check-ignore.c:154
+#: builtin/check-ignore.c:165
msgid "cannot have both --quiet and --verbose"
msgstr ""
-#: builtin/check-ignore.c:157
+#: builtin/check-ignore.c:168
msgid "--non-matching is only valid with --verbose"
msgstr ""
@@ -2978,106 +3152,106 @@ msgstr ""
msgid "git checkout [options] [<branch>] -- <file>..."
msgstr ""
-#: builtin/checkout.c:117 builtin/checkout.c:150
+#: builtin/checkout.c:114 builtin/checkout.c:147
#, c-format
msgid "path '%s' does not have our version"
msgstr ""
-#: builtin/checkout.c:119 builtin/checkout.c:152
+#: builtin/checkout.c:116 builtin/checkout.c:149
#, c-format
msgid "path '%s' does not have their version"
msgstr ""
-#: builtin/checkout.c:135
+#: builtin/checkout.c:132
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr ""
-#: builtin/checkout.c:179
+#: builtin/checkout.c:176
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr ""
-#: builtin/checkout.c:196
+#: builtin/checkout.c:193
#, c-format
msgid "path '%s': cannot merge"
msgstr ""
-#: builtin/checkout.c:213
+#: builtin/checkout.c:210
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr ""
-#: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243
-#: builtin/checkout.c:246
+#: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238
+#: builtin/checkout.c:241
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr ""
-#: builtin/checkout.c:249 builtin/checkout.c:252
+#: builtin/checkout.c:244 builtin/checkout.c:247
#, c-format
msgid "'%s' cannot be used with %s"
msgstr ""
-#: builtin/checkout.c:255
+#: builtin/checkout.c:250
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
-#: builtin/checkout.c:266 builtin/checkout.c:458
+#: builtin/checkout.c:261 builtin/checkout.c:451
msgid "corrupt index file"
msgstr ""
-#: builtin/checkout.c:329 builtin/checkout.c:336
+#: builtin/checkout.c:322 builtin/checkout.c:329
#, c-format
msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/checkout.c:480
+#: builtin/checkout.c:473
msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/checkout.c:601
+#: builtin/checkout.c:594
#, c-format
msgid "Can not do reflog for '%s'\n"
msgstr ""
-#: builtin/checkout.c:639
+#: builtin/checkout.c:632
msgid "HEAD is now at"
msgstr ""
-#: builtin/checkout.c:646
+#: builtin/checkout.c:639
#, c-format
msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:649
+#: builtin/checkout.c:642
#, c-format
msgid "Already on '%s'\n"
msgstr ""
-#: builtin/checkout.c:653
+#: builtin/checkout.c:646
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:655 builtin/checkout.c:997
+#: builtin/checkout.c:648 builtin/checkout.c:1033
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:657
+#: builtin/checkout.c:650
#, c-format
msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:713
+#: builtin/checkout.c:706
#, c-format
msgid " ... and %d more.\n"
msgstr ""
#. The singular version
-#: builtin/checkout.c:719
+#: builtin/checkout.c:712
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -3092,7 +3266,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:737
+#: builtin/checkout.c:730
#, c-format
msgid ""
"If you want to keep them by creating a new branch, this may be a good time\n"
@@ -3102,184 +3276,188 @@ msgid ""
"\n"
msgstr ""
-#: builtin/checkout.c:767
+#: builtin/checkout.c:760
msgid "internal error in revision walk"
msgstr ""
-#: builtin/checkout.c:771
+#: builtin/checkout.c:764
msgid "Previous HEAD position was"
msgstr ""
-#: builtin/checkout.c:798 builtin/checkout.c:992
+#: builtin/checkout.c:791 builtin/checkout.c:1028
msgid "You are on a branch yet to be born"
msgstr ""
-#. case (1)
-#: builtin/checkout.c:928
+#: builtin/checkout.c:935
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr ""
+
+#: builtin/checkout.c:974
#, c-format
msgid "invalid reference: %s"
msgstr ""
#. case (1): want a tree
-#: builtin/checkout.c:967
+#: builtin/checkout.c:1003
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/checkout.c:1006
+#: builtin/checkout.c:1042
msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1009 builtin/checkout.c:1013
+#: builtin/checkout.c:1045 builtin/checkout.c:1049
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1017 builtin/checkout.c:1020 builtin/checkout.c:1025
-#: builtin/checkout.c:1028
+#: builtin/checkout.c:1053 builtin/checkout.c:1056 builtin/checkout.c:1061
+#: builtin/checkout.c:1064
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/checkout.c:1033
+#: builtin/checkout.c:1069
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/checkout.c:1055 builtin/checkout.c:1057 builtin/clone.c:89
+#: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88
#: builtin/remote.c:169 builtin/remote.c:171
msgid "branch"
msgstr ""
-#: builtin/checkout.c:1056
+#: builtin/checkout.c:1092
msgid "create and checkout a new branch"
msgstr ""
-#: builtin/checkout.c:1058
+#: builtin/checkout.c:1094
msgid "create/reset and checkout a branch"
msgstr ""
-#: builtin/checkout.c:1059
+#: builtin/checkout.c:1095
msgid "create reflog for new branch"
msgstr ""
-#: builtin/checkout.c:1060
+#: builtin/checkout.c:1096
msgid "detach the HEAD at named commit"
msgstr ""
-#: builtin/checkout.c:1061
+#: builtin/checkout.c:1097
msgid "set upstream info for new branch"
msgstr ""
-#: builtin/checkout.c:1063
+#: builtin/checkout.c:1099
msgid "new branch"
msgstr ""
-#: builtin/checkout.c:1063
+#: builtin/checkout.c:1099
msgid "new unparented branch"
msgstr ""
-#: builtin/checkout.c:1064
+#: builtin/checkout.c:1100
msgid "checkout our version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1066
+#: builtin/checkout.c:1102
msgid "checkout their version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1068
+#: builtin/checkout.c:1104
msgid "force checkout (throw away local modifications)"
msgstr ""
-#: builtin/checkout.c:1069
+#: builtin/checkout.c:1105
msgid "perform a 3-way merge with the new branch"
msgstr ""
-#: builtin/checkout.c:1070 builtin/merge.c:232
+#: builtin/checkout.c:1106 builtin/merge.c:232
msgid "update ignored files (default)"
msgstr ""
-#: builtin/checkout.c:1071 builtin/log.c:1208 parse-options.h:249
+#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:251
msgid "style"
msgstr ""
-#: builtin/checkout.c:1072
+#: builtin/checkout.c:1108
msgid "conflict style (merge or diff3)"
msgstr ""
-#: builtin/checkout.c:1075
+#: builtin/checkout.c:1111
msgid "do not limit pathspecs to sparse entries only"
msgstr ""
-#: builtin/checkout.c:1077
+#: builtin/checkout.c:1113
msgid "second guess 'git checkout no-such-branch'"
msgstr ""
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1136
msgid "-b, -B and --orphan are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1118
+#: builtin/checkout.c:1153
msgid "--track needs a branch name"
msgstr ""
-#: builtin/checkout.c:1125
+#: builtin/checkout.c:1160
msgid "Missing branch name; try -b"
msgstr ""
-#: builtin/checkout.c:1160
+#: builtin/checkout.c:1197
msgid "invalid path specification"
msgstr ""
-#: builtin/checkout.c:1167
+#: builtin/checkout.c:1204
#, 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:1172
+#: builtin/checkout.c:1209
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/checkout.c:1176
+#: builtin/checkout.c:1213
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
-#: builtin/clean.c:25
+#: builtin/clean.c:26
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
-#: builtin/clean.c:29
+#: builtin/clean.c:30
#, c-format
msgid "Removing %s\n"
msgstr ""
-#: builtin/clean.c:30
+#: builtin/clean.c:31
#, c-format
msgid "Would remove %s\n"
msgstr ""
-#: builtin/clean.c:31
+#: builtin/clean.c:32
#, c-format
msgid "Skipping repository %s\n"
msgstr ""
-#: builtin/clean.c:32
+#: builtin/clean.c:33
#, c-format
msgid "Would skip repository %s\n"
msgstr ""
-#: builtin/clean.c:33
+#: builtin/clean.c:34
#, c-format
msgid "failed to remove %s"
msgstr ""
-#: builtin/clean.c:293
+#: builtin/clean.c:294
msgid ""
"Prompt help:\n"
"1 - select a numbered item\n"
@@ -3287,7 +3465,7 @@ msgid ""
" - (empty) select nothing"
msgstr ""
-#: builtin/clean.c:297
+#: builtin/clean.c:298
msgid ""
"Prompt help:\n"
"1 - select a single item\n"
@@ -3299,35 +3477,35 @@ msgid ""
" - (empty) finish selecting"
msgstr ""
-#: builtin/clean.c:515
+#: builtin/clean.c:516
#, c-format
msgid "Huh (%s)?"
msgstr ""
-#: builtin/clean.c:658
+#: builtin/clean.c:659
#, c-format
msgid "Input ignore patterns>> "
msgstr ""
-#: builtin/clean.c:695
+#: builtin/clean.c:696
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr ""
-#: builtin/clean.c:716
+#: builtin/clean.c:717
msgid "Select items to delete"
msgstr ""
-#: builtin/clean.c:756
+#: builtin/clean.c:757
#, c-format
msgid "remove %s? "
msgstr ""
-#: builtin/clean.c:781
+#: builtin/clean.c:782
msgid "Bye."
msgstr ""
-#: builtin/clean.c:789
+#: builtin/clean.c:790
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -3338,21 +3516,21 @@ msgid ""
"? - help for prompt selection"
msgstr ""
-#: builtin/clean.c:816
+#: builtin/clean.c:817
msgid "*** Commands ***"
msgstr ""
-#: builtin/clean.c:817
+#: builtin/clean.c:818
msgid "What now"
msgstr ""
-#: builtin/clean.c:825
+#: builtin/clean.c:826
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/clean.c:842
+#: builtin/clean.c:843
msgid "No more files to clean, exiting."
msgstr ""
@@ -3372,8 +3550,8 @@ msgstr ""
msgid "remove whole directories"
msgstr ""
-#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:716
-#: builtin/ls-files.c:493 builtin/name-rev.c:315 builtin/show-ref.c:186
+#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718
+#: builtin/ls-files.c:483 builtin/name-rev.c:315 builtin/show-ref.c:185
msgid "pattern"
msgstr ""
@@ -3409,8 +3587,8 @@ msgstr ""
msgid "git clone [options] [--] <repo> [<dir>]"
msgstr ""
-#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:229
-#: builtin/push.c:462
+#: builtin/clone.c:64 builtin/fetch.c:96 builtin/merge.c:229
+#: builtin/push.c:474
msgid "force progress reporting"
msgstr ""
@@ -3422,227 +3600,222 @@ msgstr ""
msgid "create a bare repository"
msgstr ""
-#: builtin/clone.c:72
+#: builtin/clone.c:71
msgid "create a mirror repository (implies bare)"
msgstr ""
-#: builtin/clone.c:74
+#: builtin/clone.c:73
msgid "to clone from a local repository"
msgstr ""
-#: builtin/clone.c:76
+#: builtin/clone.c:75
msgid "don't use local hardlinks, always copy"
msgstr ""
-#: builtin/clone.c:78
+#: builtin/clone.c:77
msgid "setup as shared repository"
msgstr ""
-#: builtin/clone.c:80 builtin/clone.c:82
+#: builtin/clone.c:79 builtin/clone.c:81
msgid "initialize submodules in the clone"
msgstr ""
-#: builtin/clone.c:83 builtin/init-db.c:485
+#: builtin/clone.c:82 builtin/init-db.c:485
msgid "template-directory"
msgstr ""
-#: builtin/clone.c:84 builtin/init-db.c:486
+#: builtin/clone.c:83 builtin/init-db.c:486
msgid "directory from which templates will be used"
msgstr ""
-#: builtin/clone.c:86
+#: builtin/clone.c:85
msgid "reference repository"
msgstr ""
-#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr ""
-#: builtin/clone.c:88
+#: builtin/clone.c:87
msgid "use <name> instead of 'origin' to track upstream"
msgstr ""
-#: builtin/clone.c:90
+#: builtin/clone.c:89
msgid "checkout <branch> instead of the remote's HEAD"
msgstr ""
-#: builtin/clone.c:92
+#: builtin/clone.c:91
msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:661
+#: builtin/clone.c:92 builtin/fetch.c:97 builtin/grep.c:663
msgid "depth"
msgstr ""
-#: builtin/clone.c:94
+#: builtin/clone.c:93
msgid "create a shallow clone of that depth"
msgstr ""
-#: builtin/clone.c:96
+#: builtin/clone.c:95
msgid "clone only one branch, HEAD or --branch"
msgstr ""
-#: builtin/clone.c:97 builtin/init-db.c:494
+#: builtin/clone.c:96 builtin/init-db.c:494
msgid "gitdir"
msgstr ""
-#: builtin/clone.c:98 builtin/init-db.c:495
+#: builtin/clone.c:97 builtin/init-db.c:495
msgid "separate git dir from working tree"
msgstr ""
-#: builtin/clone.c:99
+#: builtin/clone.c:98
msgid "key=value"
msgstr ""
-#: builtin/clone.c:100
+#: builtin/clone.c:99
msgid "set config inside the new repository"
msgstr ""
-#: builtin/clone.c:253
+#: builtin/clone.c:252
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr ""
-#: builtin/clone.c:316
+#: builtin/clone.c:315
#, c-format
msgid "failed to create directory '%s'"
msgstr ""
-#: builtin/clone.c:318 builtin/diff.c:77
+#: builtin/clone.c:317 builtin/diff.c:77
#, c-format
msgid "failed to stat '%s'"
msgstr ""
-#: builtin/clone.c:320
+#: builtin/clone.c:319
#, c-format
msgid "%s exists and is not a directory"
msgstr ""
-#: builtin/clone.c:334
+#: builtin/clone.c:333
#, c-format
msgid "failed to stat %s\n"
msgstr ""
-#: builtin/clone.c:356
+#: builtin/clone.c:355
#, c-format
msgid "failed to create link '%s'"
msgstr ""
-#: builtin/clone.c:360
+#: builtin/clone.c:359
#, c-format
msgid "failed to copy file to '%s'"
msgstr ""
-#: builtin/clone.c:383
+#: builtin/clone.c:382 builtin/clone.c:559
#, c-format
msgid "done.\n"
msgstr ""
-#: builtin/clone.c:396
+#: builtin/clone.c:395
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:475
+#: builtin/clone.c:474
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
-#: builtin/clone.c:555
+#: builtin/clone.c:554
#, c-format
msgid "Checking connectivity... "
msgstr ""
-#: builtin/clone.c:558
+#: builtin/clone.c:557
msgid "remote did not send all necessary objects"
msgstr ""
-#: builtin/clone.c:560
-#, c-format
-msgid "done\n"
-msgstr ""
-
-#: builtin/clone.c:621
+#: builtin/clone.c:620
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-#: builtin/clone.c:652
+#: builtin/clone.c:651
msgid "unable to checkout working tree"
msgstr ""
-#: builtin/clone.c:760
+#: builtin/clone.c:759
msgid "Too many arguments."
msgstr ""
-#: builtin/clone.c:764
+#: builtin/clone.c:763
msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/clone.c:775
+#: builtin/clone.c:774
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/clone.c:778
+#: builtin/clone.c:777
msgid "--bare and --separate-git-dir are incompatible."
msgstr ""
-#: builtin/clone.c:791
+#: builtin/clone.c:790
#, c-format
msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/clone.c:796
+#: builtin/clone.c:795
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:798
+#: builtin/clone.c:797
msgid "--local is ignored"
msgstr ""
-#: builtin/clone.c:808
+#: builtin/clone.c:807
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/clone.c:818
+#: builtin/clone.c:817
#, c-format
msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/clone.c:831 builtin/clone.c:843
+#: builtin/clone.c:830 builtin/clone.c:842
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/clone.c:834
+#: builtin/clone.c:833
#, c-format
msgid "could not create work tree dir '%s'."
msgstr ""
-#: builtin/clone.c:853
+#: builtin/clone.c:852
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/clone.c:855
+#: builtin/clone.c:854
#, c-format
msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/clone.c:890
+#: builtin/clone.c:888
#, c-format
msgid "Don't know how to clone %s"
msgstr ""
-#: builtin/clone.c:942
+#: builtin/clone.c:939 builtin/clone.c:947
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/clone.c:949
+#: builtin/clone.c:950
msgid "You appear to have cloned an empty repository."
msgstr ""
@@ -3678,15 +3851,15 @@ msgstr ""
msgid "--command must be the first argument"
msgstr ""
-#: builtin/commit.c:35
+#: builtin/commit.c:36
msgid "git commit [options] [--] <pathspec>..."
msgstr ""
-#: builtin/commit.c:40
+#: builtin/commit.c:41
msgid "git status [options] [--] <pathspec>..."
msgstr ""
-#: builtin/commit.c:45
+#: builtin/commit.c:46
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -3700,14 +3873,14 @@ msgid ""
" git commit --amend --reset-author\n"
msgstr ""
-#: builtin/commit.c:57
+#: builtin/commit.c:58
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
"remove the commit entirely with \"git reset HEAD^\".\n"
msgstr ""
-#: builtin/commit.c:62
+#: builtin/commit.c:63
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -3716,11 +3889,11 @@ msgid ""
"\n"
msgstr ""
-#: builtin/commit.c:69
+#: builtin/commit.c:70
msgid "Otherwise, please use 'git reset'\n"
msgstr ""
-#: builtin/commit.c:72
+#: builtin/commit.c:73
msgid ""
"If you wish to skip this commit, use:\n"
"\n"
@@ -3730,93 +3903,93 @@ msgid ""
"the remaining commits.\n"
msgstr ""
-#: builtin/commit.c:279
+#: builtin/commit.c:287
msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/commit.c:321
+#: builtin/commit.c:329
msgid "unable to create temporary index"
msgstr ""
-#: builtin/commit.c:327
+#: builtin/commit.c:335
msgid "interactive add failed"
msgstr ""
-#: builtin/commit.c:360 builtin/commit.c:381 builtin/commit.c:431
+#: builtin/commit.c:368 builtin/commit.c:389 builtin/commit.c:439
msgid "unable to write new_index file"
msgstr ""
-#: builtin/commit.c:412
+#: builtin/commit.c:420
msgid "cannot do a partial commit during a merge."
msgstr ""
-#: builtin/commit.c:414
+#: builtin/commit.c:422
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
-#: builtin/commit.c:424
+#: builtin/commit.c:432
msgid "cannot read the index"
msgstr ""
-#: builtin/commit.c:444
+#: builtin/commit.c:452
msgid "unable to write temporary index file"
msgstr ""
-#: builtin/commit.c:535 builtin/commit.c:541
+#: builtin/commit.c:543 builtin/commit.c:549
#, c-format
msgid "invalid commit: %s"
msgstr ""
-#: builtin/commit.c:563
+#: builtin/commit.c:571
msgid "malformed --author parameter"
msgstr ""
-#: builtin/commit.c:583
+#: builtin/commit.c:591
#, c-format
msgid "Malformed ident string: '%s'"
msgstr ""
-#: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:982
+#: builtin/commit.c:630 builtin/commit.c:663 builtin/commit.c:1007
#, c-format
msgid "could not lookup commit %s"
msgstr ""
-#: builtin/commit.c:633 builtin/shortlog.c:271
+#: builtin/commit.c:642 builtin/shortlog.c:273
#, c-format
msgid "(reading log message from standard input)\n"
msgstr ""
-#: builtin/commit.c:635
+#: builtin/commit.c:644
msgid "could not read log from standard input"
msgstr ""
-#: builtin/commit.c:639
+#: builtin/commit.c:648
#, c-format
msgid "could not read log file '%s'"
msgstr ""
-#: builtin/commit.c:645
+#: builtin/commit.c:654
msgid "commit has empty message"
msgstr ""
-#: builtin/commit.c:661
+#: builtin/commit.c:670
msgid "could not read MERGE_MSG"
msgstr ""
-#: builtin/commit.c:665
+#: builtin/commit.c:674
msgid "could not read SQUASH_MSG"
msgstr ""
-#: builtin/commit.c:669
+#: builtin/commit.c:678
#, c-format
msgid "could not read '%s'"
msgstr ""
-#: builtin/commit.c:730
+#: builtin/commit.c:749
msgid "could not write commit template"
msgstr ""
-#: builtin/commit.c:741
+#: builtin/commit.c:760
#, c-format
msgid ""
"\n"
@@ -3826,7 +3999,7 @@ msgid ""
"and try again.\n"
msgstr ""
-#: builtin/commit.c:746
+#: builtin/commit.c:765
#, c-format
msgid ""
"\n"
@@ -3836,14 +4009,14 @@ msgid ""
"and try again.\n"
msgstr ""
-#: builtin/commit.c:758
+#: builtin/commit.c:777
#, 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:763
+#: builtin/commit.c:782
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -3851,478 +4024,482 @@ msgid ""
"An empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:776
+#: builtin/commit.c:795
#, c-format
msgid "%sAuthor: %s"
msgstr ""
-#: builtin/commit.c:783
+#: builtin/commit.c:802
#, c-format
msgid "%sCommitter: %s"
msgstr ""
-#: builtin/commit.c:803
+#: builtin/commit.c:822
msgid "Cannot read index"
msgstr ""
-#: builtin/commit.c:845
+#: builtin/commit.c:865
msgid "Error building trees"
msgstr ""
-#: builtin/commit.c:860 builtin/tag.c:359
+#: builtin/commit.c:880 builtin/tag.c:359
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
-#: builtin/commit.c:957
+#: builtin/commit.c:982
#, c-format
msgid "No existing author found with '%s'"
msgstr ""
-#: builtin/commit.c:972 builtin/commit.c:1208
+#: builtin/commit.c:997 builtin/commit.c:1237
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/commit.c:1009
+#: builtin/commit.c:1034
msgid "--long and -z are incompatible"
msgstr ""
-#: builtin/commit.c:1039
+#: builtin/commit.c:1064
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/commit.c:1050
+#: builtin/commit.c:1075
msgid "You have nothing to amend."
msgstr ""
-#: builtin/commit.c:1053
+#: builtin/commit.c:1078
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/commit.c:1055
+#: builtin/commit.c:1080
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/commit.c:1058
+#: builtin/commit.c:1083
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/commit.c:1068
+#: builtin/commit.c:1093
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/commit.c:1070
+#: builtin/commit.c:1095
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr ""
-#: builtin/commit.c:1078
+#: builtin/commit.c:1103
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/commit.c:1095
+#: builtin/commit.c:1120
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/commit.c:1097
+#: builtin/commit.c:1122
msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/commit.c:1099
+#: builtin/commit.c:1124
msgid "Clever... amending the last one with dirty index."
msgstr ""
-#: builtin/commit.c:1101
+#: builtin/commit.c:1126
msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
msgstr ""
-#: builtin/commit.c:1111 builtin/tag.c:575
+#: builtin/commit.c:1136 builtin/tag.c:572
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
-#: builtin/commit.c:1116
+#: builtin/commit.c:1141
msgid "Paths with -a does not make sense."
msgstr ""
-#: builtin/commit.c:1222 builtin/commit.c:1455
+#: builtin/commit.c:1251 builtin/commit.c:1482
msgid "show status concisely"
msgstr ""
-#: builtin/commit.c:1224 builtin/commit.c:1457
+#: builtin/commit.c:1253 builtin/commit.c:1484
msgid "show branch information"
msgstr ""
-#: builtin/commit.c:1226 builtin/commit.c:1459 builtin/push.c:452
+#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:460
msgid "machine-readable output"
msgstr ""
-#: builtin/commit.c:1229 builtin/commit.c:1461
+#: builtin/commit.c:1258 builtin/commit.c:1488
msgid "show status in long format (default)"
msgstr ""
-#: builtin/commit.c:1232 builtin/commit.c:1464
+#: builtin/commit.c:1261 builtin/commit.c:1491
msgid "terminate entries with NUL"
msgstr ""
-#: builtin/commit.c:1234 builtin/commit.c:1467 builtin/fast-export.c:667
-#: builtin/fast-export.c:670 builtin/tag.c:459
+#: builtin/commit.c:1263 builtin/commit.c:1494 builtin/fast-export.c:674
+#: builtin/fast-export.c:677 builtin/tag.c:459
msgid "mode"
msgstr ""
-#: builtin/commit.c:1235 builtin/commit.c:1467
+#: builtin/commit.c:1264 builtin/commit.c:1494
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#: builtin/commit.c:1238
+#: builtin/commit.c:1267
msgid "show ignored files"
msgstr ""
-#: builtin/commit.c:1239 parse-options.h:154
+#: builtin/commit.c:1268 parse-options.h:156
msgid "when"
msgstr ""
-#: builtin/commit.c:1240
+#: builtin/commit.c:1269
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
-#: builtin/commit.c:1242
+#: builtin/commit.c:1271
msgid "list untracked files in columns"
msgstr ""
-#: builtin/commit.c:1313
+#: builtin/commit.c:1340
msgid "couldn't look up newly created commit"
msgstr ""
-#: builtin/commit.c:1315
+#: builtin/commit.c:1342
msgid "could not parse newly created commit"
msgstr ""
-#: builtin/commit.c:1356
+#: builtin/commit.c:1383
msgid "detached HEAD"
msgstr ""
-#: builtin/commit.c:1358
+#: builtin/commit.c:1385
msgid " (root-commit)"
msgstr ""
-#: builtin/commit.c:1425
+#: builtin/commit.c:1452
msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/commit.c:1426
+#: builtin/commit.c:1453
msgid "show diff in commit message template"
msgstr ""
-#: builtin/commit.c:1428
+#: builtin/commit.c:1455
msgid "Commit message options"
msgstr ""
-#: builtin/commit.c:1429 builtin/tag.c:457
+#: builtin/commit.c:1456 builtin/tag.c:457
msgid "read message from file"
msgstr ""
-#: builtin/commit.c:1430
+#: builtin/commit.c:1457
msgid "author"
msgstr ""
-#: builtin/commit.c:1430
+#: builtin/commit.c:1457
msgid "override author for commit"
msgstr ""
-#: builtin/commit.c:1431 builtin/gc.c:178
+#: builtin/commit.c:1458 builtin/gc.c:260
msgid "date"
msgstr ""
-#: builtin/commit.c:1431
+#: builtin/commit.c:1458
msgid "override date for commit"
msgstr ""
-#: builtin/commit.c:1432 builtin/merge.c:223 builtin/notes.c:405
+#: builtin/commit.c:1459 builtin/merge.c:223 builtin/notes.c:405
#: builtin/notes.c:562 builtin/tag.c:455
msgid "message"
msgstr ""
-#: builtin/commit.c:1432
+#: builtin/commit.c:1459
msgid "commit message"
msgstr ""
-#: builtin/commit.c:1433
+#: builtin/commit.c:1460
msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/commit.c:1434
+#: builtin/commit.c:1461
msgid "reuse message from specified commit"
msgstr ""
-#: builtin/commit.c:1435
+#: builtin/commit.c:1462
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
-#: builtin/commit.c:1436
+#: builtin/commit.c:1463
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/commit.c:1437
+#: builtin/commit.c:1464
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/commit.c:1438 builtin/log.c:1160 builtin/revert.c:111
+#: builtin/commit.c:1465 builtin/log.c:1180 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr ""
-#: builtin/commit.c:1439
+#: builtin/commit.c:1466
msgid "use specified template file"
msgstr ""
-#: builtin/commit.c:1440
+#: builtin/commit.c:1467
msgid "force edit of commit"
msgstr ""
-#: builtin/commit.c:1441
+#: builtin/commit.c:1468
msgid "default"
msgstr ""
-#: builtin/commit.c:1441 builtin/tag.c:460
+#: builtin/commit.c:1468 builtin/tag.c:460
msgid "how to strip spaces and #comments from message"
msgstr ""
-#: builtin/commit.c:1442
+#: builtin/commit.c:1469
msgid "include status in commit message template"
msgstr ""
-#: builtin/commit.c:1443 builtin/merge.c:230 builtin/tag.c:461
+#: builtin/commit.c:1470 builtin/merge.c:230 builtin/tag.c:461
msgid "key id"
msgstr ""
-#: builtin/commit.c:1444 builtin/merge.c:231
+#: builtin/commit.c:1471 builtin/merge.c:231
msgid "GPG sign commit"
msgstr ""
#. end commit message options
-#: builtin/commit.c:1447
+#: builtin/commit.c:1474
msgid "Commit contents options"
msgstr ""
-#: builtin/commit.c:1448
+#: builtin/commit.c:1475
msgid "commit all changed files"
msgstr ""
-#: builtin/commit.c:1449
+#: builtin/commit.c:1476
msgid "add specified files to index for commit"
msgstr ""
-#: builtin/commit.c:1450
+#: builtin/commit.c:1477
msgid "interactively add files"
msgstr ""
-#: builtin/commit.c:1451
+#: builtin/commit.c:1478
msgid "interactively add changes"
msgstr ""
-#: builtin/commit.c:1452
+#: builtin/commit.c:1479
msgid "commit only specified files"
msgstr ""
-#: builtin/commit.c:1453
+#: builtin/commit.c:1480
msgid "bypass pre-commit hook"
msgstr ""
-#: builtin/commit.c:1454
+#: builtin/commit.c:1481
msgid "show what would be committed"
msgstr ""
-#: builtin/commit.c:1465
+#: builtin/commit.c:1492
msgid "amend previous commit"
msgstr ""
-#: builtin/commit.c:1466
+#: builtin/commit.c:1493
msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/commit.c:1471
+#: builtin/commit.c:1498
msgid "ok to record an empty change"
msgstr ""
-#: builtin/commit.c:1474
+#: builtin/commit.c:1500
msgid "ok to record a change with an empty message"
msgstr ""
-#: builtin/commit.c:1507
+#: builtin/commit.c:1529
msgid "could not parse HEAD commit"
msgstr ""
-#: builtin/commit.c:1545 builtin/merge.c:525
+#: builtin/commit.c:1567 builtin/merge.c:525
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
-#: builtin/commit.c:1552
+#: builtin/commit.c:1574
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/commit.c:1559
+#: builtin/commit.c:1581
msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/commit.c:1578
+#: builtin/commit.c:1600
#, c-format
msgid "could not read commit message: %s"
msgstr ""
-#: builtin/commit.c:1592
+#: builtin/commit.c:1614
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/commit.c:1597
+#: builtin/commit.c:1619
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/commit.c:1612 builtin/merge.c:861 builtin/merge.c:886
+#: builtin/commit.c:1634 builtin/merge.c:861 builtin/merge.c:886
msgid "failed to write commit object"
msgstr ""
-#: builtin/commit.c:1633
+#: builtin/commit.c:1655
msgid "cannot lock HEAD ref"
msgstr ""
-#: builtin/commit.c:1637
+#: builtin/commit.c:1659
msgid "cannot update HEAD ref"
msgstr ""
-#: builtin/commit.c:1648
+#: builtin/commit.c:1670
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full or quota is\n"
"not exceeded, and then \"git reset HEAD\" to recover."
msgstr ""
-#: builtin/config.c:7
+#: builtin/config.c:8
msgid "git config [options]"
msgstr ""
-#: builtin/config.c:52
+#: builtin/config.c:54
msgid "Config file location"
msgstr ""
-#: builtin/config.c:53
+#: builtin/config.c:55
msgid "use global config file"
msgstr ""
-#: builtin/config.c:54
+#: builtin/config.c:56
msgid "use system config file"
msgstr ""
-#: builtin/config.c:55
+#: builtin/config.c:57
msgid "use repository config file"
msgstr ""
-#: builtin/config.c:56
+#: builtin/config.c:58
msgid "use given config file"
msgstr ""
-#: builtin/config.c:57
+#: builtin/config.c:59
msgid "blob-id"
msgstr ""
-#: builtin/config.c:57
+#: builtin/config.c:59
msgid "read config from given blob object"
msgstr ""
-#: builtin/config.c:58
+#: builtin/config.c:60
msgid "Action"
msgstr ""
-#: builtin/config.c:59
+#: builtin/config.c:61
msgid "get value: name [value-regex]"
msgstr ""
-#: builtin/config.c:60
+#: builtin/config.c:62
msgid "get all values: key [value-regex]"
msgstr ""
-#: builtin/config.c:61
+#: builtin/config.c:63
msgid "get values for regexp: name-regex [value-regex]"
msgstr ""
-#: builtin/config.c:62
+#: builtin/config.c:64
+msgid "get value specific for the URL: section[.var] URL"
+msgstr ""
+
+#: builtin/config.c:65
msgid "replace all matching variables: name value [value_regex]"
msgstr ""
-#: builtin/config.c:63
+#: builtin/config.c:66
msgid "add a new variable: name value"
msgstr ""
-#: builtin/config.c:64
+#: builtin/config.c:67
msgid "remove a variable: name [value-regex]"
msgstr ""
-#: builtin/config.c:65
+#: builtin/config.c:68
msgid "remove all matches: name [value-regex]"
msgstr ""
-#: builtin/config.c:66
+#: builtin/config.c:69
msgid "rename section: old-name new-name"
msgstr ""
-#: builtin/config.c:67
+#: builtin/config.c:70
msgid "remove a section: name"
msgstr ""
-#: builtin/config.c:68
+#: builtin/config.c:71
msgid "list all"
msgstr ""
-#: builtin/config.c:69
+#: builtin/config.c:72
msgid "open an editor"
msgstr ""
-#: builtin/config.c:70 builtin/config.c:71
+#: builtin/config.c:73 builtin/config.c:74
msgid "slot"
msgstr ""
-#: builtin/config.c:70
+#: builtin/config.c:73
msgid "find the color configured: [default]"
msgstr ""
-#: builtin/config.c:71
+#: builtin/config.c:74
msgid "find the color setting: [stdout-is-tty]"
msgstr ""
-#: builtin/config.c:72
+#: builtin/config.c:75
msgid "Type"
msgstr ""
-#: builtin/config.c:73
+#: builtin/config.c:76
msgid "value is \"true\" or \"false\""
msgstr ""
-#: builtin/config.c:74
+#: builtin/config.c:77
msgid "value is decimal number"
msgstr ""
-#: builtin/config.c:75
+#: builtin/config.c:78
msgid "value is --bool or --int"
msgstr ""
-#: builtin/config.c:76
+#: builtin/config.c:79
msgid "value is a path (file or directory name)"
msgstr ""
-#: builtin/config.c:77
+#: builtin/config.c:80
msgid "Other"
msgstr ""
-#: builtin/config.c:78
+#: builtin/config.c:81
msgid "terminate values with NUL byte"
msgstr ""
-#: builtin/config.c:79
+#: builtin/config.c:82
msgid "respect include directives on lookup"
msgstr ""
@@ -4501,39 +4678,39 @@ msgstr ""
msgid "git fast-export [rev-list-opts]"
msgstr ""
-#: builtin/fast-export.c:666
+#: builtin/fast-export.c:673
msgid "show progress after <n> objects"
msgstr ""
-#: builtin/fast-export.c:668
+#: builtin/fast-export.c:675
msgid "select handling of signed tags"
msgstr ""
-#: builtin/fast-export.c:671
+#: builtin/fast-export.c:678
msgid "select handling of tags that tag filtered objects"
msgstr ""
-#: builtin/fast-export.c:674
+#: builtin/fast-export.c:681
msgid "Dump marks to this file"
msgstr ""
-#: builtin/fast-export.c:676
+#: builtin/fast-export.c:683
msgid "Import marks from this file"
msgstr ""
-#: builtin/fast-export.c:678
+#: builtin/fast-export.c:685
msgid "Fake a tagger when tags lack one"
msgstr ""
-#: builtin/fast-export.c:680
+#: builtin/fast-export.c:687
msgid "Output full tree for each commit"
msgstr ""
-#: builtin/fast-export.c:682
+#: builtin/fast-export.c:689
msgid "Use the done feature to terminate the stream"
msgstr ""
-#: builtin/fast-export.c:683
+#: builtin/fast-export.c:690
msgid "Skip output of blob data"
msgstr ""
@@ -4553,230 +4730,230 @@ msgstr ""
msgid "git fetch --all [<options>]"
msgstr ""
-#: builtin/fetch.c:60
+#: builtin/fetch.c:74
msgid "fetch from all remotes"
msgstr ""
-#: builtin/fetch.c:62
+#: builtin/fetch.c:76
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ""
-#: builtin/fetch.c:64
+#: builtin/fetch.c:78
msgid "path to upload pack on remote end"
msgstr ""
-#: builtin/fetch.c:65
+#: builtin/fetch.c:79
msgid "force overwrite of local branch"
msgstr ""
-#: builtin/fetch.c:67
+#: builtin/fetch.c:81
msgid "fetch from multiple remotes"
msgstr ""
-#: builtin/fetch.c:69
+#: builtin/fetch.c:83
msgid "fetch all tags and associated objects"
msgstr ""
-#: builtin/fetch.c:71
+#: builtin/fetch.c:85
msgid "do not fetch all tags (--no-tags)"
msgstr ""
-#: builtin/fetch.c:73
+#: builtin/fetch.c:87
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
-#: builtin/fetch.c:74
+#: builtin/fetch.c:88
msgid "on-demand"
msgstr ""
-#: builtin/fetch.c:75
+#: builtin/fetch.c:89
msgid "control recursive fetching of submodules"
msgstr ""
-#: builtin/fetch.c:79
+#: builtin/fetch.c:93
msgid "keep downloaded pack"
msgstr ""
-#: builtin/fetch.c:81
+#: builtin/fetch.c:95
msgid "allow updating of HEAD ref"
msgstr ""
-#: builtin/fetch.c:84
+#: builtin/fetch.c:98
msgid "deepen history of shallow clone"
msgstr ""
-#: builtin/fetch.c:86
+#: builtin/fetch.c:100
msgid "convert to a complete repository"
msgstr ""
-#: builtin/fetch.c:88 builtin/log.c:1177
+#: builtin/fetch.c:102 builtin/log.c:1197
msgid "dir"
msgstr ""
-#: builtin/fetch.c:89
+#: builtin/fetch.c:103
msgid "prepend this to submodule path output"
msgstr ""
-#: builtin/fetch.c:92
+#: builtin/fetch.c:106
msgid "default mode for recursion"
msgstr ""
-#: builtin/fetch.c:220
+#: builtin/fetch.c:236
msgid "Couldn't find remote ref HEAD"
msgstr ""
-#: builtin/fetch.c:273
+#: builtin/fetch.c:290
#, c-format
msgid "object %s not found"
msgstr ""
-#: builtin/fetch.c:278
+#: builtin/fetch.c:295
msgid "[up to date]"
msgstr ""
-#: builtin/fetch.c:292
+#: builtin/fetch.c:309
#, c-format
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr ""
-#: builtin/fetch.c:293 builtin/fetch.c:379
+#: builtin/fetch.c:310 builtin/fetch.c:396
msgid "[rejected]"
msgstr ""
-#: builtin/fetch.c:304
+#: builtin/fetch.c:321
msgid "[tag update]"
msgstr ""
-#: builtin/fetch.c:306 builtin/fetch.c:341 builtin/fetch.c:359
+#: builtin/fetch.c:323 builtin/fetch.c:358 builtin/fetch.c:376
msgid " (unable to update local ref)"
msgstr ""
-#: builtin/fetch.c:324
+#: builtin/fetch.c:341
msgid "[new tag]"
msgstr ""
-#: builtin/fetch.c:327
+#: builtin/fetch.c:344
msgid "[new branch]"
msgstr ""
-#: builtin/fetch.c:330
+#: builtin/fetch.c:347
msgid "[new ref]"
msgstr ""
-#: builtin/fetch.c:375
+#: builtin/fetch.c:392
msgid "unable to update local ref"
msgstr ""
-#: builtin/fetch.c:375
+#: builtin/fetch.c:392
msgid "forced update"
msgstr ""
-#: builtin/fetch.c:381
+#: builtin/fetch.c:398
msgid "(non-fast-forward)"
msgstr ""
-#: builtin/fetch.c:412 builtin/fetch.c:718
+#: builtin/fetch.c:429 builtin/fetch.c:735
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: builtin/fetch.c:421
+#: builtin/fetch.c:438
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/fetch.c:520
+#: builtin/fetch.c:537
#, c-format
msgid "From %.*s\n"
msgstr ""
-#: builtin/fetch.c:531
+#: builtin/fetch.c:548
#, 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:581
+#: builtin/fetch.c:598
#, c-format
msgid " (%s will become dangling)"
msgstr ""
-#: builtin/fetch.c:582
+#: builtin/fetch.c:599
#, c-format
msgid " (%s has become dangling)"
msgstr ""
-#: builtin/fetch.c:589
+#: builtin/fetch.c:606
msgid "[deleted]"
msgstr ""
-#: builtin/fetch.c:590 builtin/remote.c:1055
+#: builtin/fetch.c:607 builtin/remote.c:1055
msgid "(none)"
msgstr ""
-#: builtin/fetch.c:708
+#: builtin/fetch.c:725
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/fetch.c:742
+#: builtin/fetch.c:744
#, c-format
-msgid "Don't know how to fetch from %s"
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/fetch.c:823
+#: builtin/fetch.c:747
#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/fetch.c:826
+#: builtin/fetch.c:801
#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
+msgid "Don't know how to fetch from %s"
msgstr ""
-#: builtin/fetch.c:928
+#: builtin/fetch.c:976
#, c-format
msgid "Fetching %s\n"
msgstr ""
-#: builtin/fetch.c:930 builtin/remote.c:100
+#: builtin/fetch.c:978 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr ""
-#: builtin/fetch.c:949
+#: builtin/fetch.c:997
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:969
+#: builtin/fetch.c:1020
msgid "You need to specify a tag name."
msgstr ""
-#: builtin/fetch.c:1015
+#: builtin/fetch.c:1068
msgid "--depth and --unshallow cannot be used together"
msgstr ""
-#: builtin/fetch.c:1017
+#: builtin/fetch.c:1070
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/fetch.c:1036
+#: builtin/fetch.c:1089
msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/fetch.c:1038
+#: builtin/fetch.c:1091
msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/fetch.c:1049
+#: builtin/fetch.c:1102
#, c-format
msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/fetch.c:1057
+#: builtin/fetch.c:1110
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
@@ -4784,9 +4961,9 @@ msgstr ""
msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
msgstr ""
-#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700
-#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:179
-#: builtin/tag.c:446 parse-options.h:133 parse-options.h:243
+#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702
+#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:178
+#: builtin/tag.c:446 parse-options.h:135 parse-options.h:245
msgid "n"
msgstr ""
@@ -4810,158 +4987,169 @@ msgstr ""
msgid "file to read from"
msgstr ""
-#: builtin/for-each-ref.c:979
+#: builtin/for-each-ref.c:995
msgid "git for-each-ref [options] [<pattern>]"
msgstr ""
-#: builtin/for-each-ref.c:994
+#: builtin/for-each-ref.c:1010
msgid "quote placeholders suitably for shells"
msgstr ""
-#: builtin/for-each-ref.c:996
+#: builtin/for-each-ref.c:1012
msgid "quote placeholders suitably for perl"
msgstr ""
-#: builtin/for-each-ref.c:998
+#: builtin/for-each-ref.c:1014
msgid "quote placeholders suitably for python"
msgstr ""
-#: builtin/for-each-ref.c:1000
+#: builtin/for-each-ref.c:1016
msgid "quote placeholders suitably for tcl"
msgstr ""
-#: builtin/for-each-ref.c:1003
+#: builtin/for-each-ref.c:1019
msgid "show only <n> matched refs"
msgstr ""
-#: builtin/for-each-ref.c:1004
+#: builtin/for-each-ref.c:1020
msgid "format"
msgstr ""
-#: builtin/for-each-ref.c:1004
+#: builtin/for-each-ref.c:1020
msgid "format to use for the output"
msgstr ""
-#: builtin/for-each-ref.c:1005
+#: builtin/for-each-ref.c:1021
msgid "key"
msgstr ""
-#: builtin/for-each-ref.c:1006
+#: builtin/for-each-ref.c:1022
msgid "field name to sort on"
msgstr ""
-#: builtin/fsck.c:608
+#: builtin/fsck.c:607
msgid "git fsck [options] [<object>...]"
msgstr ""
-#: builtin/fsck.c:614
+#: builtin/fsck.c:613
msgid "show unreachable objects"
msgstr ""
-#: builtin/fsck.c:615
+#: builtin/fsck.c:614
msgid "show dangling objects"
msgstr ""
-#: builtin/fsck.c:616
+#: builtin/fsck.c:615
msgid "report tags"
msgstr ""
-#: builtin/fsck.c:617
+#: builtin/fsck.c:616
msgid "report root nodes"
msgstr ""
-#: builtin/fsck.c:618
+#: builtin/fsck.c:617
msgid "make index objects head nodes"
msgstr ""
-#: builtin/fsck.c:619
+#: builtin/fsck.c:618
msgid "make reflogs head nodes (default)"
msgstr ""
-#: builtin/fsck.c:620
+#: builtin/fsck.c:619
msgid "also consider packs and alternate objects"
msgstr ""
-#: builtin/fsck.c:621
+#: builtin/fsck.c:620
msgid "enable more strict checking"
msgstr ""
-#: builtin/fsck.c:623
+#: builtin/fsck.c:622
msgid "write dangling objects in .git/lost-found"
msgstr ""
-#: builtin/fsck.c:624 builtin/prune.c:134
+#: builtin/fsck.c:623 builtin/prune.c:134
msgid "show progress"
msgstr ""
-#: builtin/gc.c:22
+#: builtin/gc.c:23
msgid "git gc [options]"
msgstr ""
-#: builtin/gc.c:63
+#: builtin/gc.c:79
#, c-format
msgid "Invalid %s: '%s'"
msgstr ""
-#: builtin/gc.c:90
+#: builtin/gc.c:106
#, c-format
msgid "insanely long object directory %.*s"
msgstr ""
-#: builtin/gc.c:179
+#: builtin/gc.c:261
msgid "prune unreferenced objects"
msgstr ""
-#: builtin/gc.c:181
+#: builtin/gc.c:263
msgid "be more thorough (increased runtime)"
msgstr ""
-#: builtin/gc.c:182
+#: builtin/gc.c:264
msgid "enable auto-gc mode"
msgstr ""
-#: builtin/gc.c:222
+#: builtin/gc.c:265
+msgid "force running gc even if there may be another gc running"
+msgstr ""
+
+#: builtin/gc.c:305
#, c-format
msgid ""
"Auto packing the repository for optimum performance. You may also\n"
"run \"git gc\" manually. See \"git help gc\" for more information.\n"
msgstr ""
-#: builtin/gc.c:249
+#. be quiet on --auto
+#: builtin/gc.c:315
+#, c-format
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgstr ""
+
+#: builtin/gc.c:340
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
-#: builtin/grep.c:22
+#: builtin/grep.c:23
msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr ""
-#: builtin/grep.c:217
+#: builtin/grep.c:218
#, c-format
msgid "grep: failed to create thread: %s"
msgstr ""
-#: builtin/grep.c:364
+#: builtin/grep.c:365
#, c-format
msgid "Failed to chdir: %s"
msgstr ""
-#: builtin/grep.c:442 builtin/grep.c:477
+#: builtin/grep.c:443 builtin/grep.c:478
#, c-format
msgid "unable to read tree (%s)"
msgstr ""
-#: builtin/grep.c:492
+#: builtin/grep.c:493
#, c-format
msgid "unable to grep from object of type %s"
msgstr ""
-#: builtin/grep.c:550
+#: builtin/grep.c:551
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr ""
-#: builtin/grep.c:567
+#: builtin/grep.c:568
#, c-format
msgid "cannot open '%s'"
msgstr ""
@@ -5003,158 +5191,162 @@ msgid "don't match patterns in binary files"
msgstr ""
#: builtin/grep.c:662
+msgid "process binary files with textconv filters"
+msgstr ""
+
+#: builtin/grep.c:664
msgid "descend at most <depth> levels"
msgstr ""
-#: builtin/grep.c:666
+#: builtin/grep.c:668
msgid "use extended POSIX regular expressions"
msgstr ""
-#: builtin/grep.c:669
+#: builtin/grep.c:671
msgid "use basic POSIX regular expressions (default)"
msgstr ""
-#: builtin/grep.c:672
+#: builtin/grep.c:674
msgid "interpret patterns as fixed strings"
msgstr ""
-#: builtin/grep.c:675
+#: builtin/grep.c:677
msgid "use Perl-compatible regular expressions"
msgstr ""
-#: builtin/grep.c:678
+#: builtin/grep.c:680
msgid "show line numbers"
msgstr ""
-#: builtin/grep.c:679
+#: builtin/grep.c:681
msgid "don't show filenames"
msgstr ""
-#: builtin/grep.c:680
+#: builtin/grep.c:682
msgid "show filenames"
msgstr ""
-#: builtin/grep.c:682
+#: builtin/grep.c:684
msgid "show filenames relative to top directory"
msgstr ""
-#: builtin/grep.c:684
+#: builtin/grep.c:686
msgid "show only filenames instead of matching lines"
msgstr ""
-#: builtin/grep.c:686
+#: builtin/grep.c:688
msgid "synonym for --files-with-matches"
msgstr ""
-#: builtin/grep.c:689
+#: builtin/grep.c:691
msgid "show only the names of files without match"
msgstr ""
-#: builtin/grep.c:691
+#: builtin/grep.c:693
msgid "print NUL after filenames"
msgstr ""
-#: builtin/grep.c:693
+#: builtin/grep.c:695
msgid "show the number of matches instead of matching lines"
msgstr ""
-#: builtin/grep.c:694
+#: builtin/grep.c:696
msgid "highlight matches"
msgstr ""
-#: builtin/grep.c:696
+#: builtin/grep.c:698
msgid "print empty line between matches from different files"
msgstr ""
-#: builtin/grep.c:698
+#: builtin/grep.c:700
msgid "show filename only once above matches from same file"
msgstr ""
-#: builtin/grep.c:701
+#: builtin/grep.c:703
msgid "show <n> context lines before and after matches"
msgstr ""
-#: builtin/grep.c:704
+#: builtin/grep.c:706
msgid "show <n> context lines before matches"
msgstr ""
-#: builtin/grep.c:706
+#: builtin/grep.c:708
msgid "show <n> context lines after matches"
msgstr ""
-#: builtin/grep.c:707
+#: builtin/grep.c:709
msgid "shortcut for -C NUM"
msgstr ""
-#: builtin/grep.c:710
+#: builtin/grep.c:712
msgid "show a line with the function name before matches"
msgstr ""
-#: builtin/grep.c:712
+#: builtin/grep.c:714
msgid "show the surrounding function"
msgstr ""
-#: builtin/grep.c:715
+#: builtin/grep.c:717
msgid "read patterns from file"
msgstr ""
-#: builtin/grep.c:717
+#: builtin/grep.c:719
msgid "match <pattern>"
msgstr ""
-#: builtin/grep.c:719
+#: builtin/grep.c:721
msgid "combine patterns specified with -e"
msgstr ""
-#: builtin/grep.c:731
+#: builtin/grep.c:733
msgid "indicate hit with exit status without output"
msgstr ""
-#: builtin/grep.c:733
+#: builtin/grep.c:735
msgid "show only matches from files that match all patterns"
msgstr ""
-#: builtin/grep.c:735
+#: builtin/grep.c:737
msgid "show parse tree for grep expression"
msgstr ""
-#: builtin/grep.c:739
+#: builtin/grep.c:741
msgid "pager"
msgstr ""
-#: builtin/grep.c:739
+#: builtin/grep.c:741
msgid "show matching files in the pager"
msgstr ""
-#: builtin/grep.c:742
+#: builtin/grep.c:744
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
-#: builtin/grep.c:743 builtin/show-ref.c:188
+#: builtin/grep.c:745 builtin/show-ref.c:187
msgid "show usage"
msgstr ""
-#: builtin/grep.c:810
+#: builtin/grep.c:812
msgid "no pattern given."
msgstr ""
-#: builtin/grep.c:865
+#: builtin/grep.c:870
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-#: builtin/grep.c:888
+#: builtin/grep.c:893
msgid "--cached or --untracked cannot be used with --no-index."
msgstr ""
-#: builtin/grep.c:893
+#: builtin/grep.c:898
msgid "--no-index or --untracked cannot be used with revs."
msgstr ""
-#: builtin/grep.c:896
+#: builtin/grep.c:901
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
-#: builtin/grep.c:904
+#: builtin/grep.c:909
msgid "both --cached and trees are given."
msgstr ""
@@ -5403,8 +5595,8 @@ msgstr ""
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
-#: builtin/index-pack.c:669 builtin/pack-objects.c:170
-#: builtin/pack-objects.c:262
+#: builtin/index-pack.c:669 builtin/pack-objects.c:171
+#: builtin/pack-objects.c:263
#, c-format
msgid "unable to read %s"
msgstr ""
@@ -5433,155 +5625,155 @@ msgstr ""
msgid "Not all child objects of %s are reachable"
msgstr ""
-#: builtin/index-pack.c:838 builtin/index-pack.c:868
+#: builtin/index-pack.c:839 builtin/index-pack.c:869
msgid "failed to apply delta"
msgstr ""
-#: builtin/index-pack.c:1009
+#: builtin/index-pack.c:1010
msgid "Receiving objects"
msgstr ""
-#: builtin/index-pack.c:1009
+#: builtin/index-pack.c:1010
msgid "Indexing objects"
msgstr ""
-#: builtin/index-pack.c:1035
+#: builtin/index-pack.c:1036
msgid "pack is corrupted (SHA1 mismatch)"
msgstr ""
-#: builtin/index-pack.c:1040
+#: builtin/index-pack.c:1041
msgid "cannot fstat packfile"
msgstr ""
-#: builtin/index-pack.c:1043
+#: builtin/index-pack.c:1044
msgid "pack has junk at the end"
msgstr ""
-#: builtin/index-pack.c:1054
+#: builtin/index-pack.c:1055
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
-#: builtin/index-pack.c:1077
+#: builtin/index-pack.c:1078
msgid "Resolving deltas"
msgstr ""
-#: builtin/index-pack.c:1087
+#: builtin/index-pack.c:1088
#, c-format
msgid "unable to create thread: %s"
msgstr ""
-#: builtin/index-pack.c:1129
+#: builtin/index-pack.c:1130
msgid "confusion beyond insanity"
msgstr ""
-#: builtin/index-pack.c:1137
+#: builtin/index-pack.c:1138
#, c-format
msgid "completed with %d local objects"
msgstr ""
-#: builtin/index-pack.c:1147
+#: builtin/index-pack.c:1148
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
-#: builtin/index-pack.c:1151
+#: builtin/index-pack.c:1152
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1176
+#: builtin/index-pack.c:1177
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr ""
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1256
#, c-format
msgid "local object %s is corrupt"
msgstr ""
-#: builtin/index-pack.c:1279
+#: builtin/index-pack.c:1280
msgid "error while closing pack file"
msgstr ""
-#: builtin/index-pack.c:1292
+#: builtin/index-pack.c:1293
#, c-format
msgid "cannot write keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:1300
+#: builtin/index-pack.c:1301
#, c-format
msgid "cannot close written keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:1313
+#: builtin/index-pack.c:1314
msgid "cannot store pack file"
msgstr ""
-#: builtin/index-pack.c:1324
+#: builtin/index-pack.c:1325
msgid "cannot store index file"
msgstr ""
-#: builtin/index-pack.c:1357
+#: builtin/index-pack.c:1358
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr ""
-#: builtin/index-pack.c:1363
+#: builtin/index-pack.c:1364
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr ""
-#: builtin/index-pack.c:1367 builtin/index-pack.c:1545
+#: builtin/index-pack.c:1368 builtin/index-pack.c:1546
#, c-format
msgid "no threads support, ignoring %s"
msgstr ""
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1426
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr ""
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1428
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
-#: builtin/index-pack.c:1474
+#: builtin/index-pack.c:1475
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1482
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1509
+#: builtin/index-pack.c:1510
msgid "Cannot come back to cwd"
msgstr ""
-#: builtin/index-pack.c:1557 builtin/index-pack.c:1560
-#: builtin/index-pack.c:1572 builtin/index-pack.c:1576
+#: builtin/index-pack.c:1558 builtin/index-pack.c:1561
+#: builtin/index-pack.c:1573 builtin/index-pack.c:1577
#, c-format
msgid "bad %s"
msgstr ""
-#: builtin/index-pack.c:1590
+#: builtin/index-pack.c:1591
msgid "--fix-thin cannot be used without --stdin"
msgstr ""
-#: builtin/index-pack.c:1594 builtin/index-pack.c:1604
+#: builtin/index-pack.c:1595 builtin/index-pack.c:1605
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr ""
-#: builtin/index-pack.c:1613
+#: builtin/index-pack.c:1614
msgid "--verify with no packfile name given"
msgstr ""
@@ -5670,11 +5862,6 @@ msgstr ""
msgid "unable to move %s to %s"
msgstr ""
-#: builtin/init-db.c:363
-#, c-format
-msgid "Could not create git link %s"
-msgstr ""
-
#.
#. * TRANSLATORS: The first '%s' is either "Reinitialized
#. * existing" or "Initialized empty", the second " shared" or
@@ -5715,7 +5902,7 @@ msgstr ""
msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
-#: builtin/init-db.c:493 builtin/prune-packed.c:75
+#: builtin/init-db.c:493 builtin/prune-packed.c:75 builtin/repack.c:155
msgid "be quiet"
msgstr ""
@@ -5753,381 +5940,381 @@ msgstr ""
msgid " or: git show [options] <object>..."
msgstr ""
-#: builtin/log.c:124
+#: builtin/log.c:125
msgid "suppress diff output"
msgstr ""
-#: builtin/log.c:125
+#: builtin/log.c:126
msgid "show source"
msgstr ""
-#: builtin/log.c:126
+#: builtin/log.c:127
msgid "Use mail map file"
msgstr ""
-#: builtin/log.c:127
+#: builtin/log.c:128
msgid "decorate options"
msgstr ""
-#: builtin/log.c:230
+#: builtin/log.c:231
#, c-format
msgid "Final output: %d %s\n"
msgstr ""
-#: builtin/log.c:453 builtin/log.c:545
+#: builtin/log.c:473 builtin/log.c:565
#, c-format
msgid "Could not read object %s"
msgstr ""
-#: builtin/log.c:569
+#: builtin/log.c:589
#, c-format
msgid "Unknown type: %d"
msgstr ""
-#: builtin/log.c:669
+#: builtin/log.c:689
msgid "format.headers without value"
msgstr ""
-#: builtin/log.c:751
+#: builtin/log.c:771
msgid "name of output directory is too long"
msgstr ""
-#: builtin/log.c:767
+#: builtin/log.c:787
#, c-format
msgid "Cannot open patch file %s"
msgstr ""
-#: builtin/log.c:781
+#: builtin/log.c:801
msgid "Need exactly one range."
msgstr ""
-#: builtin/log.c:789
+#: builtin/log.c:809
msgid "Not a range."
msgstr ""
-#: builtin/log.c:891
+#: builtin/log.c:911
msgid "Cover letter needs email format"
msgstr ""
-#: builtin/log.c:967
+#: builtin/log.c:987
#, c-format
msgid "insane in-reply-to: %s"
msgstr ""
-#: builtin/log.c:995
+#: builtin/log.c:1015
msgid "git format-patch [options] [<since> | <revision range>]"
msgstr ""
-#: builtin/log.c:1040
+#: builtin/log.c:1060
msgid "Two output directories?"
msgstr ""
-#: builtin/log.c:1155
+#: builtin/log.c:1175
msgid "use [PATCH n/m] even with a single patch"
msgstr ""
-#: builtin/log.c:1158
+#: builtin/log.c:1178
msgid "use [PATCH] even with multiple patches"
msgstr ""
-#: builtin/log.c:1162
+#: builtin/log.c:1182
msgid "print patches to standard out"
msgstr ""
-#: builtin/log.c:1164
+#: builtin/log.c:1184
msgid "generate a cover letter"
msgstr ""
-#: builtin/log.c:1166
+#: builtin/log.c:1186
msgid "use simple number sequence for output file names"
msgstr ""
-#: builtin/log.c:1167
+#: builtin/log.c:1187
msgid "sfx"
msgstr ""
-#: builtin/log.c:1168
+#: builtin/log.c:1188
msgid "use <sfx> instead of '.patch'"
msgstr ""
-#: builtin/log.c:1170
+#: builtin/log.c:1190
msgid "start numbering patches at <n> instead of 1"
msgstr ""
-#: builtin/log.c:1172
+#: builtin/log.c:1192
msgid "mark the series as Nth re-roll"
msgstr ""
-#: builtin/log.c:1174
+#: builtin/log.c:1194
msgid "Use [<prefix>] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1177
+#: builtin/log.c:1197
msgid "store resulting files in <dir>"
msgstr ""
-#: builtin/log.c:1180
+#: builtin/log.c:1200
msgid "don't strip/add [PATCH]"
msgstr ""
-#: builtin/log.c:1183
+#: builtin/log.c:1203
msgid "don't output binary diffs"
msgstr ""
-#: builtin/log.c:1185
+#: builtin/log.c:1205
msgid "don't include a patch matching a commit upstream"
msgstr ""
-#: builtin/log.c:1187
+#: builtin/log.c:1207
msgid "show patch format instead of default (patch + stat)"
msgstr ""
-#: builtin/log.c:1189
+#: builtin/log.c:1209
msgid "Messaging"
msgstr ""
-#: builtin/log.c:1190
+#: builtin/log.c:1210
msgid "header"
msgstr ""
-#: builtin/log.c:1191
+#: builtin/log.c:1211
msgid "add email header"
msgstr ""
-#: builtin/log.c:1192 builtin/log.c:1194
+#: builtin/log.c:1212 builtin/log.c:1214
msgid "email"
msgstr ""
-#: builtin/log.c:1192
+#: builtin/log.c:1212
msgid "add To: header"
msgstr ""
-#: builtin/log.c:1194
+#: builtin/log.c:1214
msgid "add Cc: header"
msgstr ""
-#: builtin/log.c:1196
+#: builtin/log.c:1216
msgid "ident"
msgstr ""
-#: builtin/log.c:1197
+#: builtin/log.c:1217
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-#: builtin/log.c:1199
+#: builtin/log.c:1219
msgid "message-id"
msgstr ""
-#: builtin/log.c:1200
+#: builtin/log.c:1220
msgid "make first mail a reply to <message-id>"
msgstr ""
-#: builtin/log.c:1201 builtin/log.c:1204
+#: builtin/log.c:1221 builtin/log.c:1224
msgid "boundary"
msgstr ""
-#: builtin/log.c:1202
+#: builtin/log.c:1222
msgid "attach the patch"
msgstr ""
-#: builtin/log.c:1205
+#: builtin/log.c:1225
msgid "inline the patch"
msgstr ""
-#: builtin/log.c:1209
+#: builtin/log.c:1229
msgid "enable message threading, styles: shallow, deep"
msgstr ""
-#: builtin/log.c:1211
+#: builtin/log.c:1231
msgid "signature"
msgstr ""
-#: builtin/log.c:1212
+#: builtin/log.c:1232
msgid "add a signature"
msgstr ""
-#: builtin/log.c:1214
+#: builtin/log.c:1233
msgid "don't print the patch filenames"
msgstr ""
-#: builtin/log.c:1288
+#: builtin/log.c:1307
#, c-format
msgid "invalid ident line: %s"
msgstr ""
-#: builtin/log.c:1303
+#: builtin/log.c:1322
msgid "-n and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:1305
+#: builtin/log.c:1324
msgid "--subject-prefix and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:1313
+#: builtin/log.c:1332
msgid "--name-only does not make sense"
msgstr ""
-#: builtin/log.c:1315
+#: builtin/log.c:1334
msgid "--name-status does not make sense"
msgstr ""
-#: builtin/log.c:1317
+#: builtin/log.c:1336
msgid "--check does not make sense"
msgstr ""
-#: builtin/log.c:1340
+#: builtin/log.c:1359
msgid "standard output, or directory, which one?"
msgstr ""
-#: builtin/log.c:1342
+#: builtin/log.c:1361
#, c-format
msgid "Could not create directory '%s'"
msgstr ""
-#: builtin/log.c:1490
+#: builtin/log.c:1509
msgid "Failed to create output files"
msgstr ""
-#: builtin/log.c:1539
+#: builtin/log.c:1558
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
-#: builtin/log.c:1594
+#: builtin/log.c:1613
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/log.c:1607 builtin/log.c:1609 builtin/log.c:1621
+#: builtin/log.c:1626 builtin/log.c:1628 builtin/log.c:1640
#, c-format
msgid "Unknown commit %s"
msgstr ""
-#: builtin/ls-files.c:408
+#: builtin/ls-files.c:398
msgid "git ls-files [options] [<file>...]"
msgstr ""
-#: builtin/ls-files.c:465
+#: builtin/ls-files.c:455
msgid "identify the file status with tags"
msgstr ""
-#: builtin/ls-files.c:467
+#: builtin/ls-files.c:457
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:459
msgid "show cached files in the output (default)"
msgstr ""
-#: builtin/ls-files.c:471
+#: builtin/ls-files.c:461
msgid "show deleted files in the output"
msgstr ""
-#: builtin/ls-files.c:473
+#: builtin/ls-files.c:463
msgid "show modified files in the output"
msgstr ""
-#: builtin/ls-files.c:475
+#: builtin/ls-files.c:465
msgid "show other files in the output"
msgstr ""
-#: builtin/ls-files.c:477
+#: builtin/ls-files.c:467
msgid "show ignored files in the output"
msgstr ""
-#: builtin/ls-files.c:480
+#: builtin/ls-files.c:470
msgid "show staged contents' object name in the output"
msgstr ""
-#: builtin/ls-files.c:482
+#: builtin/ls-files.c:472
msgid "show files on the filesystem that need to be removed"
msgstr ""
-#: builtin/ls-files.c:484
+#: builtin/ls-files.c:474
msgid "show 'other' directories' name only"
msgstr ""
-#: builtin/ls-files.c:487
+#: builtin/ls-files.c:477
msgid "don't show empty directories"
msgstr ""
-#: builtin/ls-files.c:490
+#: builtin/ls-files.c:480
msgid "show unmerged files in the output"
msgstr ""
-#: builtin/ls-files.c:492
+#: builtin/ls-files.c:482
msgid "show resolve-undo information"
msgstr ""
-#: builtin/ls-files.c:494
+#: builtin/ls-files.c:484
msgid "skip files matching pattern"
msgstr ""
-#: builtin/ls-files.c:497
+#: builtin/ls-files.c:487
msgid "exclude patterns are read from <file>"
msgstr ""
-#: builtin/ls-files.c:500
+#: builtin/ls-files.c:490
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
-#: builtin/ls-files.c:502
+#: builtin/ls-files.c:492
msgid "add the standard git exclusions"
msgstr ""
-#: builtin/ls-files.c:505
+#: builtin/ls-files.c:495
msgid "make the output relative to the project top directory"
msgstr ""
-#: builtin/ls-files.c:508
+#: builtin/ls-files.c:498
msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
-#: builtin/ls-files.c:509
+#: builtin/ls-files.c:499
msgid "tree-ish"
msgstr ""
-#: builtin/ls-files.c:510
+#: builtin/ls-files.c:500
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
-#: builtin/ls-files.c:512
+#: builtin/ls-files.c:502
msgid "show debugging data"
msgstr ""
-#: builtin/ls-tree.c:27
+#: builtin/ls-tree.c:28
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr ""
-#: builtin/ls-tree.c:125
+#: builtin/ls-tree.c:126
msgid "only show trees"
msgstr ""
-#: builtin/ls-tree.c:127
+#: builtin/ls-tree.c:128
msgid "recurse into subtrees"
msgstr ""
-#: builtin/ls-tree.c:129
+#: builtin/ls-tree.c:130
msgid "show trees when recursing"
msgstr ""
-#: builtin/ls-tree.c:132
+#: builtin/ls-tree.c:133
msgid "terminate entries with NUL byte"
msgstr ""
-#: builtin/ls-tree.c:133
+#: builtin/ls-tree.c:134
msgid "include object size"
msgstr ""
-#: builtin/ls-tree.c:135 builtin/ls-tree.c:137
+#: builtin/ls-tree.c:136 builtin/ls-tree.c:138
msgid "list only filenames"
msgstr ""
-#: builtin/ls-tree.c:140
+#: builtin/ls-tree.c:141
msgid "use full path names"
msgstr ""
-#: builtin/ls-tree.c:142
+#: builtin/ls-tree.c:143
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
@@ -6202,7 +6389,7 @@ msgstr ""
msgid "Verify that the named commit has a valid GPG signature"
msgstr ""
-#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:114
+#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:89
msgid "strategy"
msgstr ""
@@ -6554,76 +6741,85 @@ msgstr ""
msgid "allow creation of more than one tree"
msgstr ""
-#: builtin/mv.c:14
+#: builtin/mv.c:15
msgid "git mv [options] <source>... <destination>"
msgstr ""
-#: builtin/mv.c:64
+#: builtin/mv.c:67
msgid "force move/rename even if target exists"
msgstr ""
-#: builtin/mv.c:65
+#: builtin/mv.c:68
msgid "skip move/rename errors"
msgstr ""
-#: builtin/mv.c:108
+#: builtin/mv.c:113
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr ""
-#: builtin/mv.c:112
+#: builtin/mv.c:117
msgid "bad source"
msgstr ""
-#: builtin/mv.c:115
+#: builtin/mv.c:120
msgid "can not move directory into itself"
msgstr ""
-#: builtin/mv.c:118
+#: builtin/mv.c:123
msgid "cannot move directory over file"
msgstr ""
-#: builtin/mv.c:128
+#: builtin/mv.c:129
+#, c-format
+msgid "Huh? Directory %s is in index and no submodule?"
+msgstr ""
+
+#: builtin/mv.c:131 builtin/rm.c:318
+msgid "Please, stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+
+#: builtin/mv.c:147
#, c-format
msgid "Huh? %.*s is in index?"
msgstr ""
-#: builtin/mv.c:140
+#: builtin/mv.c:159
msgid "source directory is empty"
msgstr ""
-#: builtin/mv.c:171
+#: builtin/mv.c:191
msgid "not under version control"
msgstr ""
-#: builtin/mv.c:173
+#: builtin/mv.c:193
msgid "destination exists"
msgstr ""
-#: builtin/mv.c:181
+#: builtin/mv.c:201
#, c-format
msgid "overwriting '%s'"
msgstr ""
-#: builtin/mv.c:184
+#: builtin/mv.c:204
msgid "Cannot overwrite"
msgstr ""
-#: builtin/mv.c:187
+#: builtin/mv.c:207
msgid "multiple sources for the same target"
msgstr ""
-#: builtin/mv.c:202
+#: builtin/mv.c:222
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr ""
-#: builtin/mv.c:212
+#: builtin/mv.c:232
#, c-format
msgid "Renaming %s to %s\n"
msgstr ""
-#: builtin/mv.c:215 builtin/remote.c:731
+#: builtin/mv.c:235 builtin/remote.c:731 builtin/repack.c:330
#, c-format
msgid "renaming '%s' failed"
msgstr ""
@@ -6661,7 +6857,7 @@ msgid "read from stdin"
msgstr ""
#: builtin/name-rev.c:320
-msgid "allow to print `undefined` names"
+msgid "allow to print `undefined` names (default)"
msgstr ""
#: builtin/name-rev.c:326
@@ -6810,12 +7006,12 @@ msgstr ""
msgid "The note contents has been left in %s"
msgstr ""
-#: builtin/notes.c:248 builtin/tag.c:540
+#: builtin/notes.c:248 builtin/tag.c:537
#, c-format
msgid "cannot read '%s'"
msgstr ""
-#: builtin/notes.c:250 builtin/tag.c:543
+#: builtin/notes.c:250 builtin/tag.c:540
#, c-format
msgid "could not open or read '%s'"
msgstr ""
@@ -6823,7 +7019,7 @@ msgstr ""
#: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318
#: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515
#: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637
-#: builtin/notes.c:839 builtin/tag.c:556
+#: builtin/notes.c:839 builtin/tag.c:553
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
@@ -6986,148 +7182,148 @@ msgstr ""
msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
msgstr ""
-#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
+#: builtin/pack-objects.c:184 builtin/pack-objects.c:187
#, c-format
msgid "deflate error (%d)"
msgstr ""
-#: builtin/pack-objects.c:2397
+#: builtin/pack-objects.c:2398
#, c-format
msgid "unsupported index version %s"
msgstr ""
-#: builtin/pack-objects.c:2401
+#: builtin/pack-objects.c:2402
#, c-format
msgid "bad index version '%s'"
msgstr ""
-#: builtin/pack-objects.c:2424
+#: builtin/pack-objects.c:2425
#, c-format
msgid "option %s does not accept negative form"
msgstr ""
-#: builtin/pack-objects.c:2428
+#: builtin/pack-objects.c:2429
#, c-format
msgid "unable to parse value '%s' for option %s"
msgstr ""
-#: builtin/pack-objects.c:2447
+#: builtin/pack-objects.c:2448
msgid "do not show progress meter"
msgstr ""
-#: builtin/pack-objects.c:2449
+#: builtin/pack-objects.c:2450
msgid "show progress meter"
msgstr ""
-#: builtin/pack-objects.c:2451
+#: builtin/pack-objects.c:2452
msgid "show progress meter during object writing phase"
msgstr ""
-#: builtin/pack-objects.c:2454
+#: builtin/pack-objects.c:2455
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
-#: builtin/pack-objects.c:2455
+#: builtin/pack-objects.c:2456
msgid "version[,offset]"
msgstr ""
-#: builtin/pack-objects.c:2456
+#: builtin/pack-objects.c:2457
msgid "write the pack index file in the specified idx format version"
msgstr ""
-#: builtin/pack-objects.c:2459
+#: builtin/pack-objects.c:2460
msgid "maximum size of each output pack file"
msgstr ""
-#: builtin/pack-objects.c:2461
+#: builtin/pack-objects.c:2462
msgid "ignore borrowed objects from alternate object store"
msgstr ""
-#: builtin/pack-objects.c:2463
+#: builtin/pack-objects.c:2464
msgid "ignore packed objects"
msgstr ""
-#: builtin/pack-objects.c:2465
+#: builtin/pack-objects.c:2466
msgid "limit pack window by objects"
msgstr ""
-#: builtin/pack-objects.c:2467
+#: builtin/pack-objects.c:2468
msgid "limit pack window by memory in addition to object limit"
msgstr ""
-#: builtin/pack-objects.c:2469
+#: builtin/pack-objects.c:2470
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
-#: builtin/pack-objects.c:2471
+#: builtin/pack-objects.c:2472
msgid "reuse existing deltas"
msgstr ""
-#: builtin/pack-objects.c:2473
+#: builtin/pack-objects.c:2474
msgid "reuse existing objects"
msgstr ""
-#: builtin/pack-objects.c:2475
+#: builtin/pack-objects.c:2476
msgid "use OFS_DELTA objects"
msgstr ""
-#: builtin/pack-objects.c:2477
+#: builtin/pack-objects.c:2478
msgid "use threads when searching for best delta matches"
msgstr ""
-#: builtin/pack-objects.c:2479
+#: builtin/pack-objects.c:2480
msgid "do not create an empty pack output"
msgstr ""
-#: builtin/pack-objects.c:2481
+#: builtin/pack-objects.c:2482
msgid "read revision arguments from standard input"
msgstr ""
-#: builtin/pack-objects.c:2483
+#: builtin/pack-objects.c:2484
msgid "limit the objects to those that are not yet packed"
msgstr ""
-#: builtin/pack-objects.c:2486
+#: builtin/pack-objects.c:2487
msgid "include objects reachable from any reference"
msgstr ""
-#: builtin/pack-objects.c:2489
+#: builtin/pack-objects.c:2490
msgid "include objects referred by reflog entries"
msgstr ""
-#: builtin/pack-objects.c:2492
+#: builtin/pack-objects.c:2493
msgid "output pack to stdout"
msgstr ""
-#: builtin/pack-objects.c:2494
+#: builtin/pack-objects.c:2495
msgid "include tag objects that refer to objects to be packed"
msgstr ""
-#: builtin/pack-objects.c:2496
+#: builtin/pack-objects.c:2497
msgid "keep unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:2497 parse-options.h:141
+#: builtin/pack-objects.c:2498 parse-options.h:143
msgid "time"
msgstr ""
-#: builtin/pack-objects.c:2498
+#: builtin/pack-objects.c:2499
msgid "unpack unreachable objects newer than <time>"
msgstr ""
-#: builtin/pack-objects.c:2501
+#: builtin/pack-objects.c:2502
msgid "create thin packs"
msgstr ""
-#: builtin/pack-objects.c:2503
+#: builtin/pack-objects.c:2504
msgid "ignore packs that have companion .keep file"
msgstr ""
-#: builtin/pack-objects.c:2505
+#: builtin/pack-objects.c:2506
msgid "pack compression level"
msgstr ""
-#: builtin/pack-objects.c:2507
+#: builtin/pack-objects.c:2508
msgid "do not hide commits by grafts"
msgstr ""
@@ -7167,21 +7363,21 @@ msgstr ""
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/push.c:45
+#: builtin/push.c:47
msgid "tag shorthand without <tag>"
msgstr ""
-#: builtin/push.c:64
+#: builtin/push.c:66
msgid "--delete only accepts plain target ref names"
msgstr ""
-#: builtin/push.c:99
+#: builtin/push.c:101
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
msgstr ""
-#: builtin/push.c:102
+#: builtin/push.c:104
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -7196,7 +7392,7 @@ msgid ""
"%s"
msgstr ""
-#: builtin/push.c:117
+#: builtin/push.c:119
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -7206,7 +7402,7 @@ msgid ""
" git push %s HEAD:<name-of-remote-branch>\n"
msgstr ""
-#: builtin/push.c:131
+#: builtin/push.c:133
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -7215,12 +7411,12 @@ msgid ""
" git push --set-upstream %s %s\n"
msgstr ""
-#: builtin/push.c:139
+#: builtin/push.c:141
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
-#: builtin/push.c:142
+#: builtin/push.c:144
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -7228,7 +7424,7 @@ msgid ""
"to update which remote branch."
msgstr ""
-#: builtin/push.c:165
+#: builtin/push.c:167
msgid ""
"push.default is unset; its implicit value is changing in\n"
"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
@@ -7246,12 +7442,12 @@ msgid ""
"'current' instead of 'simple' if you sometimes use older versions of Git)"
msgstr ""
-#: builtin/push.c:225
+#: builtin/push.c:227
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
-#: builtin/push.c:232
+#: builtin/push.c:234
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -7259,7 +7455,7 @@ msgid ""
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-#: builtin/push.c:238
+#: builtin/push.c:240
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. If you did not intend to push that branch, you may want to\n"
@@ -7267,7 +7463,7 @@ msgid ""
"to 'simple', 'current' or 'upstream' to push only the current branch."
msgstr ""
-#: builtin/push.c:244
+#: builtin/push.c:246
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
@@ -7275,7 +7471,7 @@ msgid ""
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-#: builtin/push.c:250
+#: builtin/push.c:252
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
@@ -7284,33 +7480,33 @@ msgid ""
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-#: builtin/push.c:257
+#: builtin/push.c:259
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
-#: builtin/push.c:260
+#: builtin/push.c:262
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
"without using the '--force' option.\n"
msgstr ""
-#: builtin/push.c:320
+#: builtin/push.c:328
#, c-format
msgid "Pushing to %s\n"
msgstr ""
-#: builtin/push.c:324
+#: builtin/push.c:332
#, c-format
msgid "failed to push some refs to '%s'"
msgstr ""
-#: builtin/push.c:357
+#: builtin/push.c:365
#, c-format
msgid "bad repository '%s'"
msgstr ""
-#: builtin/push.c:358
+#: builtin/push.c:366
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -7323,87 +7519,95 @@ msgid ""
" git push <name>\n"
msgstr ""
-#: builtin/push.c:373
+#: builtin/push.c:381
msgid "--all and --tags are incompatible"
msgstr ""
-#: builtin/push.c:374
+#: builtin/push.c:382
msgid "--all can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:379
+#: builtin/push.c:387
msgid "--mirror and --tags are incompatible"
msgstr ""
-#: builtin/push.c:380
+#: builtin/push.c:388
msgid "--mirror can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:385
+#: builtin/push.c:393
msgid "--all and --mirror are incompatible"
msgstr ""
-#: builtin/push.c:445
+#: builtin/push.c:453
msgid "repository"
msgstr ""
-#: builtin/push.c:446
+#: builtin/push.c:454
msgid "push all refs"
msgstr ""
-#: builtin/push.c:447
+#: builtin/push.c:455
msgid "mirror all refs"
msgstr ""
-#: builtin/push.c:449
+#: builtin/push.c:457
msgid "delete refs"
msgstr ""
-#: builtin/push.c:450
+#: builtin/push.c:458
msgid "push tags (can't be used with --all or --mirror)"
msgstr ""
-#: builtin/push.c:453
+#: builtin/push.c:461
msgid "force updates"
msgstr ""
-#: builtin/push.c:454
+#: builtin/push.c:463
+msgid "refname>:<expect"
+msgstr ""
+
+#: builtin/push.c:464
+msgid "require old value of ref to be at this value"
+msgstr ""
+
+#: builtin/push.c:466
msgid "check"
msgstr ""
-#: builtin/push.c:455
+#: builtin/push.c:467
msgid "control recursive pushing of submodules"
msgstr ""
-#: builtin/push.c:457
+#: builtin/push.c:469
msgid "use thin pack"
msgstr ""
-#: builtin/push.c:458 builtin/push.c:459
+#: builtin/push.c:470 builtin/push.c:471
msgid "receive pack program"
msgstr ""
-#: builtin/push.c:460
+#: builtin/push.c:472
msgid "set upstream for git pull/status"
msgstr ""
-#: builtin/push.c:463
+#: builtin/push.c:475
msgid "prune locally removed refs"
msgstr ""
-#: builtin/push.c:465
+#: builtin/push.c:477
msgid "bypass pre-push hook"
msgstr ""
-#: builtin/push.c:466
+#: builtin/push.c:478
msgid "push missing but relevant tags"
msgstr ""
-#: builtin/push.c:476
+#: builtin/push.c:488
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
-#: builtin/push.c:478
+#: builtin/push.c:490
msgid "--delete doesn't make sense without any refs"
msgstr ""
@@ -7478,12 +7682,12 @@ msgstr ""
msgid "debug unpack-trees"
msgstr ""
-#: builtin/reflog.c:500
+#: builtin/reflog.c:499
#, c-format
msgid "%s' for '%s' is not a valid timestamp"
msgstr ""
-#: builtin/reflog.c:616 builtin/reflog.c:621
+#: builtin/reflog.c:615 builtin/reflog.c:620
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr ""
@@ -7506,8 +7710,8 @@ msgstr ""
msgid "git remote remove <name>"
msgstr ""
-#: builtin/remote.c:15 builtin/remote.c:42
-msgid "git remote set-head <name> (-a | -d | <branch>)"
+#: builtin/remote.c:15
+msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
msgstr ""
#: builtin/remote.c:16
@@ -7543,6 +7747,10 @@ msgstr ""
msgid "git remote add [<options>] <name> <url>"
msgstr ""
+#: builtin/remote.c:42
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+msgstr ""
+
#: builtin/remote.c:47
msgid "git remote set-branches <name> <branch>..."
msgstr ""
@@ -7970,6 +8178,67 @@ msgstr ""
msgid "be verbose; must be placed before a subcommand"
msgstr ""
+#: builtin/repack.c:15
+msgid "git repack [options]"
+msgstr ""
+
+#: builtin/repack.c:143
+msgid "pack everything in a single pack"
+msgstr ""
+
+#: builtin/repack.c:145
+msgid "same as -a, and turn unreachable objects loose"
+msgstr ""
+
+#: builtin/repack.c:148
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr ""
+
+#: builtin/repack.c:150
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:152
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:154
+msgid "do not run git-update-server-info"
+msgstr ""
+
+#: builtin/repack.c:157
+msgid "pass --local to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:158
+msgid "approxidate"
+msgstr ""
+
+#: builtin/repack.c:159
+msgid "with -A, do not loosen objects older than this"
+msgstr ""
+
+#: builtin/repack.c:161
+msgid "size of the window used for delta compression"
+msgstr ""
+
+#: builtin/repack.c:163
+msgid "same as the above, but limit memory size instead of entries count"
+msgstr ""
+
+#: builtin/repack.c:165
+msgid "limits the maximum delta depth"
+msgstr ""
+
+#: builtin/repack.c:167
+msgid "maximum size of each packfile"
+msgstr ""
+
+#: builtin/repack.c:345
+#, c-format
+msgid "removing '%s' failed"
+msgstr ""
+
#: builtin/replace.c:17
msgid "git replace [-f] <object> <replacement>"
msgstr ""
@@ -7982,23 +8251,23 @@ msgstr ""
msgid "git replace -l [<pattern>]"
msgstr ""
-#: builtin/replace.c:121
+#: builtin/replace.c:131
msgid "list replace refs"
msgstr ""
-#: builtin/replace.c:122
+#: builtin/replace.c:132
msgid "delete replace refs"
msgstr ""
-#: builtin/replace.c:123
+#: builtin/replace.c:133
msgid "replace the ref if it exists"
msgstr ""
-#: builtin/rerere.c:11
+#: builtin/rerere.c:12
msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
msgstr ""
-#: builtin/rerere.c:56
+#: builtin/rerere.c:57
msgid "register clean resolutions in index"
msgstr ""
@@ -8058,69 +8327,69 @@ msgstr ""
msgid "Cannot do a %s reset in the middle of a merge."
msgstr ""
-#: builtin/reset.c:251
+#: builtin/reset.c:262
msgid "be quiet, only report errors"
msgstr ""
-#: builtin/reset.c:253
+#: builtin/reset.c:264
msgid "reset HEAD and index"
msgstr ""
-#: builtin/reset.c:254
+#: builtin/reset.c:265
msgid "reset only HEAD"
msgstr ""
-#: builtin/reset.c:256 builtin/reset.c:258
+#: builtin/reset.c:267 builtin/reset.c:269
msgid "reset HEAD, index and working tree"
msgstr ""
-#: builtin/reset.c:260
+#: builtin/reset.c:271
msgid "reset HEAD but keep local changes"
msgstr ""
-#: builtin/reset.c:278
+#: builtin/reset.c:289
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr ""
-#: builtin/reset.c:281 builtin/reset.c:289
+#: builtin/reset.c:292 builtin/reset.c:300
#, c-format
msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/reset.c:286
+#: builtin/reset.c:297
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr ""
-#: builtin/reset.c:295
+#: builtin/reset.c:306
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr ""
-#: builtin/reset.c:304
+#: builtin/reset.c:315
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
-#: builtin/reset.c:306
+#: builtin/reset.c:317
#, c-format
msgid "Cannot do %s reset with paths."
msgstr ""
-#: builtin/reset.c:316
+#: builtin/reset.c:327
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr ""
-#: builtin/reset.c:336
-#, c-format
-msgid "Could not reset index file to revision '%s'."
+#: builtin/reset.c:344
+msgid "Unstaged changes after reset:"
msgstr ""
-#: builtin/reset.c:342
-msgid "Unstaged changes after reset:"
+#: builtin/reset.c:350
+#, c-format
+msgid "Could not reset index file to revision '%s'."
msgstr ""
-#: builtin/reset.c:347
+#: builtin/reset.c:355
msgid "Could not write new index file."
msgstr ""
@@ -8161,84 +8430,84 @@ msgstr ""
msgid "git cherry-pick <subcommand>"
msgstr ""
-#: builtin/revert.c:71 builtin/revert.c:94
+#: builtin/revert.c:71
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr ""
-#: builtin/revert.c:105
+#: builtin/revert.c:80
msgid "end revert or cherry-pick sequence"
msgstr ""
-#: builtin/revert.c:106
+#: builtin/revert.c:81
msgid "resume revert or cherry-pick sequence"
msgstr ""
-#: builtin/revert.c:107
+#: builtin/revert.c:82
msgid "cancel revert or cherry-pick sequence"
msgstr ""
-#: builtin/revert.c:108
+#: builtin/revert.c:83
msgid "don't automatically commit"
msgstr ""
-#: builtin/revert.c:109
+#: builtin/revert.c:84
msgid "edit the commit message"
msgstr ""
-#: builtin/revert.c:112
+#: builtin/revert.c:87
msgid "parent number"
msgstr ""
-#: builtin/revert.c:114
+#: builtin/revert.c:89
msgid "merge strategy"
msgstr ""
-#: builtin/revert.c:115
+#: builtin/revert.c:90
msgid "option"
msgstr ""
-#: builtin/revert.c:116
+#: builtin/revert.c:91
msgid "option for merge strategy"
msgstr ""
-#: builtin/revert.c:127
+#: builtin/revert.c:102
msgid "append commit name"
msgstr ""
-#: builtin/revert.c:128
+#: builtin/revert.c:103
msgid "allow fast-forward"
msgstr ""
-#: builtin/revert.c:129
+#: builtin/revert.c:104
msgid "preserve initially empty commits"
msgstr ""
-#: builtin/revert.c:130
+#: builtin/revert.c:105
msgid "allow commits with empty messages"
msgstr ""
-#: builtin/revert.c:131
+#: builtin/revert.c:106
msgid "keep redundant, empty commits"
msgstr ""
-#: builtin/revert.c:135
+#: builtin/revert.c:110
msgid "program error"
msgstr ""
-#: builtin/revert.c:225
+#: builtin/revert.c:195
msgid "revert failed"
msgstr ""
-#: builtin/revert.c:240
+#: builtin/revert.c:210
msgid "cherry-pick failed"
msgstr ""
-#: builtin/rm.c:16
+#: builtin/rm.c:17
msgid "git rm [options] [--] <file>..."
msgstr ""
-#: builtin/rm.c:64
+#: builtin/rm.c:65
msgid ""
"the following submodule (or one of its nested submodules)\n"
"uses a .git directory:"
@@ -8248,13 +8517,13 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: builtin/rm.c:70
+#: builtin/rm.c:71
msgid ""
"\n"
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
-#: builtin/rm.c:230
+#: builtin/rm.c:231
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
@@ -8264,56 +8533,56 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: builtin/rm.c:235
+#: builtin/rm.c:236
msgid ""
"\n"
"(use -f to force removal)"
msgstr ""
-#: builtin/rm.c:239
+#: builtin/rm.c:240
msgid "the following file has changes staged in the index:"
msgid_plural "the following files have changes staged in the index:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/rm.c:243 builtin/rm.c:254
+#: builtin/rm.c:244 builtin/rm.c:255
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
msgstr ""
-#: builtin/rm.c:251
+#: builtin/rm.c:252
msgid "the following file has local modifications:"
msgid_plural "the following files have local modifications:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/rm.c:269
+#: builtin/rm.c:270
msgid "do not list removed files"
msgstr ""
-#: builtin/rm.c:270
+#: builtin/rm.c:271
msgid "only remove from the index"
msgstr ""
-#: builtin/rm.c:271
+#: builtin/rm.c:272
msgid "override the up-to-date check"
msgstr ""
-#: builtin/rm.c:272
+#: builtin/rm.c:273
msgid "allow recursive removal"
msgstr ""
-#: builtin/rm.c:274
+#: builtin/rm.c:275
msgid "exit with a zero status even if nothing matched"
msgstr ""
-#: builtin/rm.c:345
+#: builtin/rm.c:336
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr ""
-#: builtin/rm.c:384
+#: builtin/rm.c:375
#, c-format
msgid "git rm: unable to remove %s"
msgstr ""
@@ -8327,23 +8596,23 @@ msgstr ""
msgid "Missing author: %s"
msgstr ""
-#: builtin/shortlog.c:228
+#: builtin/shortlog.c:230
msgid "sort output according to the number of commits per author"
msgstr ""
-#: builtin/shortlog.c:230
+#: builtin/shortlog.c:232
msgid "Suppress commit descriptions, only provides commit count"
msgstr ""
-#: builtin/shortlog.c:232
+#: builtin/shortlog.c:234
msgid "Show the email address of each author"
msgstr ""
-#: builtin/shortlog.c:233
+#: builtin/shortlog.c:235
msgid "w[,i1[,i2]]"
msgstr ""
-#: builtin/shortlog.c:234
+#: builtin/shortlog.c:236
msgid "Linewrap output"
msgstr ""
@@ -8445,23 +8714,23 @@ msgstr ""
msgid "stricter reference checking, requires exact ref path"
msgstr ""
-#: builtin/show-ref.c:173 builtin/show-ref.c:176
+#: builtin/show-ref.c:173 builtin/show-ref.c:175
msgid "show the HEAD reference, even if it would be filtered out"
msgstr ""
-#: builtin/show-ref.c:178
+#: builtin/show-ref.c:177
msgid "dereference tags into object IDs"
msgstr ""
-#: builtin/show-ref.c:180
+#: builtin/show-ref.c:179
msgid "only show SHA1 hash using <n> digits"
msgstr ""
-#: builtin/show-ref.c:184
+#: builtin/show-ref.c:183
msgid "do not print results to stdout (useful with --verify)"
msgstr ""
-#: builtin/show-ref.c:186
+#: builtin/show-ref.c:185
msgid "show refs from stdin that aren't in local repository"
msgstr ""
@@ -8485,11 +8754,11 @@ msgstr ""
msgid "shorten ref output"
msgstr ""
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254
msgid "reason"
msgstr ""
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254
msgid "reason of the update"
msgstr ""
@@ -8644,183 +8913,195 @@ msgstr ""
msgid "print only tags of the object"
msgstr ""
-#: builtin/tag.c:504
+#: builtin/tag.c:501
msgid "--column and -n are incompatible"
msgstr ""
-#: builtin/tag.c:521
+#: builtin/tag.c:518
msgid "-n option is only allowed with -l."
msgstr ""
-#: builtin/tag.c:523
+#: builtin/tag.c:520
msgid "--contains option is only allowed with -l."
msgstr ""
-#: builtin/tag.c:525
+#: builtin/tag.c:522
msgid "--points-at option is only allowed with -l."
msgstr ""
-#: builtin/tag.c:533
+#: builtin/tag.c:530
msgid "only one -F or -m option is allowed."
msgstr ""
-#: builtin/tag.c:553
+#: builtin/tag.c:550
msgid "too many params"
msgstr ""
-#: builtin/tag.c:559
+#: builtin/tag.c:556
#, c-format
msgid "'%s' is not a valid tag name."
msgstr ""
-#: builtin/tag.c:564
+#: builtin/tag.c:561
#, c-format
msgid "tag '%s' already exists"
msgstr ""
-#: builtin/tag.c:582
+#: builtin/tag.c:579
#, c-format
msgid "%s: cannot lock the ref"
msgstr ""
-#: builtin/tag.c:584
+#: builtin/tag.c:581
#, c-format
msgid "%s: cannot update the ref"
msgstr ""
-#: builtin/tag.c:586
+#: builtin/tag.c:583
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr ""
-#: builtin/update-index.c:401
+#: builtin/update-index.c:402
msgid "git update-index [options] [--] [<file>...]"
msgstr ""
-#: builtin/update-index.c:718
+#: builtin/update-index.c:720
msgid "continue refresh even when index needs update"
msgstr ""
-#: builtin/update-index.c:721
+#: builtin/update-index.c:723
msgid "refresh: ignore submodules"
msgstr ""
-#: builtin/update-index.c:724
+#: builtin/update-index.c:726
msgid "do not ignore new files"
msgstr ""
-#: builtin/update-index.c:726
+#: builtin/update-index.c:728
msgid "let files replace directories and vice-versa"
msgstr ""
-#: builtin/update-index.c:728
+#: builtin/update-index.c:730
msgid "notice files missing from worktree"
msgstr ""
-#: builtin/update-index.c:730
+#: builtin/update-index.c:732
msgid "refresh even if index contains unmerged entries"
msgstr ""
-#: builtin/update-index.c:733
+#: builtin/update-index.c:735
msgid "refresh stat information"
msgstr ""
-#: builtin/update-index.c:737
+#: builtin/update-index.c:739
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
-#: builtin/update-index.c:741
+#: builtin/update-index.c:743
msgid "<mode> <object> <path>"
msgstr ""
-#: builtin/update-index.c:742
+#: builtin/update-index.c:744
msgid "add the specified entry to the index"
msgstr ""
-#: builtin/update-index.c:746
+#: builtin/update-index.c:748
msgid "(+/-)x"
msgstr ""
-#: builtin/update-index.c:747
+#: builtin/update-index.c:749
msgid "override the executable bit of the listed files"
msgstr ""
-#: builtin/update-index.c:751
+#: builtin/update-index.c:753
msgid "mark files as \"not changing\""
msgstr ""
-#: builtin/update-index.c:754
+#: builtin/update-index.c:756
msgid "clear assumed-unchanged bit"
msgstr ""
-#: builtin/update-index.c:757
+#: builtin/update-index.c:759
msgid "mark files as \"index-only\""
msgstr ""
-#: builtin/update-index.c:760
+#: builtin/update-index.c:762
msgid "clear skip-worktree bit"
msgstr ""
-#: builtin/update-index.c:763
+#: builtin/update-index.c:765
msgid "add to index only; do not add content to object database"
msgstr ""
-#: builtin/update-index.c:765
+#: builtin/update-index.c:767
msgid "remove named paths even if present in worktree"
msgstr ""
-#: builtin/update-index.c:767
+#: builtin/update-index.c:769
msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
-#: builtin/update-index.c:769
+#: builtin/update-index.c:771
msgid "read list of paths to be updated from standard input"
msgstr ""
-#: builtin/update-index.c:773
+#: builtin/update-index.c:775
msgid "add entries from standard input to the index"
msgstr ""
-#: builtin/update-index.c:777
+#: builtin/update-index.c:779
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
-#: builtin/update-index.c:781
+#: builtin/update-index.c:783
msgid "only update entries that differ from HEAD"
msgstr ""
-#: builtin/update-index.c:785
+#: builtin/update-index.c:787
msgid "ignore files missing from worktree"
msgstr ""
-#: builtin/update-index.c:788
+#: builtin/update-index.c:790
msgid "report actions to standard output"
msgstr ""
-#: builtin/update-index.c:790
+#: builtin/update-index.c:792
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
-#: builtin/update-index.c:794
+#: builtin/update-index.c:796
msgid "write index in this format"
msgstr ""
-#: builtin/update-ref.c:7
+#: builtin/update-ref.c:9
msgid "git update-ref [options] -d <refname> [<oldval>]"
msgstr ""
-#: builtin/update-ref.c:8
+#: builtin/update-ref.c:10
msgid "git update-ref [options] <refname> <newval> [<oldval>]"
msgstr ""
-#: builtin/update-ref.c:19
+#: builtin/update-ref.c:11
+msgid "git update-ref [options] --stdin [-z]"
+msgstr ""
+
+#: builtin/update-ref.c:255
msgid "delete the reference"
msgstr ""
-#: builtin/update-ref.c:21
+#: builtin/update-ref.c:257
msgid "update <refname> not the one it points to"
msgstr ""
+#: builtin/update-ref.c:258
+msgid "stdin has NUL-terminated arguments"
+msgstr ""
+
+#: builtin/update-ref.c:259
+msgid "read updates from stdin"
+msgstr ""
+
#: builtin/update-server-info.c:6
msgid "git update-server-info [--force]"
msgstr ""
@@ -8872,23 +9153,23 @@ msgid ""
"to read about a specific subcommand or concept."
msgstr ""
-#: parse-options.h:144
+#: parse-options.h:146
msgid "expiry date"
msgstr ""
-#: parse-options.h:159
+#: parse-options.h:161
msgid "no-op (backward compatibility)"
msgstr ""
-#: parse-options.h:236
+#: parse-options.h:238
msgid "be more verbose"
msgstr ""
-#: parse-options.h:238
+#: parse-options.h:240
msgid "be more quiet"
msgstr ""
-#: parse-options.h:244
+#: parse-options.h:246
msgid "use <n> digits to display SHA-1s"
msgstr ""
@@ -9284,7 +9565,7 @@ msgstr ""
msgid "Pull is not possible because you have unmerged files."
msgstr ""
-#: git-pull.sh:203
+#: git-pull.sh:223
msgid "updating an unborn branch with changes added to the index"
msgstr ""
@@ -9292,7 +9573,7 @@ msgstr ""
#. The working tree and the index file is still based on the
#. $orig_head commit, but we are merging into $curr_head.
#. First update the working tree to match $curr_head.
-#: git-pull.sh:235
+#: git-pull.sh:255
#, sh-format
msgid ""
"Warning: fetch updated the current branch head.\n"
@@ -9300,11 +9581,11 @@ msgid ""
"Warning: commit $orig_head."
msgstr ""
-#: git-pull.sh:260
+#: git-pull.sh:280
msgid "Cannot merge multiple branches into empty head"
msgstr ""
-#: git-pull.sh:264
+#: git-pull.sh:284
msgid "Cannot rebase onto multiple branches"
msgstr ""
@@ -9332,42 +9613,42 @@ msgid ""
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-#: git-rebase.sh:190
+#: git-rebase.sh:199
msgid "The pre-rebase hook refused to rebase."
msgstr ""
-#: git-rebase.sh:195
+#: git-rebase.sh:204
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr ""
-#: git-rebase.sh:329
+#: git-rebase.sh:338
msgid "The --exec option must be used with the --interactive option"
msgstr ""
-#: git-rebase.sh:334
+#: git-rebase.sh:343
msgid "No rebase in progress?"
msgstr ""
-#: git-rebase.sh:345
+#: git-rebase.sh:354
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
-#: git-rebase.sh:352
+#: git-rebase.sh:361
msgid "Cannot read HEAD"
msgstr ""
-#: git-rebase.sh:355
+#: git-rebase.sh:364
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr ""
-#: git-rebase.sh:373
+#: git-rebase.sh:382
#, sh-format
msgid "Could not move back to $head_name"
msgstr ""
-#: git-rebase.sh:392
+#: git-rebase.sh:401
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -9380,65 +9661,65 @@ msgid ""
"valuable there."
msgstr ""
-#: git-rebase.sh:437
+#: git-rebase.sh:446
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr ""
-#: git-rebase.sh:461
+#: git-rebase.sh:470
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr ""
-#: git-rebase.sh:464 git-rebase.sh:468
+#: git-rebase.sh:473 git-rebase.sh:477
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr ""
-#: git-rebase.sh:473
+#: git-rebase.sh:482
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr ""
-#: git-rebase.sh:496
+#: git-rebase.sh:505
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr ""
-#: git-rebase.sh:519
+#: git-rebase.sh:528
msgid "Cannot autostash"
msgstr ""
-#: git-rebase.sh:524
+#: git-rebase.sh:533
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr ""
-#: git-rebase.sh:528
+#: git-rebase.sh:537
msgid "Please commit or stash them."
msgstr ""
-#: git-rebase.sh:548
+#: git-rebase.sh:557
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr ""
-#: git-rebase.sh:552
+#: git-rebase.sh:561
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
-#: git-rebase.sh:563
+#: git-rebase.sh:572
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr ""
#. Detach HEAD and reset the tree
-#: git-rebase.sh:572
+#: git-rebase.sh:581
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
-#: git-rebase.sh:582
+#: git-rebase.sh:591
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr ""
@@ -9486,103 +9767,92 @@ msgstr ""
#. $ git stash save --blah-blah 2>&1 | head -n 2
#. error: unknown option for 'stash save': --blah-blah
#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:241
+#: git-stash.sh:237
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
" To provide a message, use git stash save -- '$option'"
msgstr ""
-#: git-stash.sh:262
+#: git-stash.sh:258
msgid "No local changes to save"
msgstr ""
-#: git-stash.sh:268
-msgid ""
-"The following untracked files would NOT be saved but need to be removed by "
-"stash save:"
-msgstr ""
-
-#: git-stash.sh:270
-msgid ""
-"Aborting. Consider using either the --force or --include-untracked option."
-msgstr ""
-
-#: git-stash.sh:274
+#: git-stash.sh:262
msgid "Cannot initialize stash"
msgstr ""
-#: git-stash.sh:278
+#: git-stash.sh:266
msgid "Cannot save the current status"
msgstr ""
-#: git-stash.sh:296
+#: git-stash.sh:284
msgid "Cannot remove worktree changes"
msgstr ""
-#: git-stash.sh:395
+#: git-stash.sh:383
msgid "No stash found."
msgstr ""
-#: git-stash.sh:402
+#: git-stash.sh:390
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr ""
-#: git-stash.sh:408
+#: git-stash.sh:396
#, sh-format
msgid "$reference is not valid reference"
msgstr ""
-#: git-stash.sh:436
+#: git-stash.sh:424
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr ""
-#: git-stash.sh:447
+#: git-stash.sh:435
#, sh-format
msgid "'$args' is not a stash reference"
msgstr ""
-#: git-stash.sh:455
+#: git-stash.sh:443
msgid "unable to refresh index"
msgstr ""
-#: git-stash.sh:459
+#: git-stash.sh:447
msgid "Cannot apply a stash in the middle of a merge"
msgstr ""
-#: git-stash.sh:467
+#: git-stash.sh:455
msgid "Conflicts in index. Try without --index."
msgstr ""
-#: git-stash.sh:469
+#: git-stash.sh:457
msgid "Could not save index tree"
msgstr ""
-#: git-stash.sh:503
+#: git-stash.sh:491
msgid "Cannot unstage modified files"
msgstr ""
-#: git-stash.sh:518
+#: git-stash.sh:506
msgid "Index was not unstashed."
msgstr ""
-#: git-stash.sh:535
+#: git-stash.sh:523
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr ""
-#: git-stash.sh:536
+#: git-stash.sh:524
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr ""
-#: git-stash.sh:543
+#: git-stash.sh:531
msgid "No branch name specified"
msgstr ""
-#: git-stash.sh:615
+#: git-stash.sh:603
msgid "(To restore them type \"git stash apply\")"
msgstr ""
@@ -9828,44 +10098,36 @@ msgid "The --cached option cannot be used with the --files option"
msgstr ""
#. unexpected type
-#: git-submodule.sh:1066
+#: git-submodule.sh:1073
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
-#: git-submodule.sh:1086
+#: git-submodule.sh:1093
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
-#: git-submodule.sh:1089
+#: git-submodule.sh:1096
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
-#: git-submodule.sh:1092
+#: git-submodule.sh:1099
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
-#: git-submodule.sh:1117
+#: git-submodule.sh:1124
msgid "blob"
msgstr ""
-#: git-submodule.sh:1155
-msgid "Submodules changed but not updated:"
-msgstr ""
-
-#: git-submodule.sh:1157
-msgid "Submodule changes to be committed:"
-msgstr ""
-
-#: git-submodule.sh:1242
+#: git-submodule.sh:1238
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:1306
+#: git-submodule.sh:1302
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr ""
diff --git a/po/sv.po b/po/sv.po
index dcf579b8d..50cc8cbe1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: git 1.8.4\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2013-08-06 14:10+0800\n"
-"PO-Revision-Date: 2013-08-06 12:37+0100\n"
+"POT-Creation-Date: 2013-11-02 08:06+0800\n"
+"PO-Revision-Date: 2013-11-09 19:02+0100\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
@@ -57,71 +57,76 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"
-#: archive.c:323
+#: archive.c:242 builtin/add.c:240 builtin/add.c:556 builtin/rm.c:328
+#, c-format
+msgid "pathspec '%s' did not match any files"
+msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"
+
+#: archive.c:327
msgid "fmt"
msgstr "fmt"
-#: archive.c:323
+#: archive.c:327
msgid "archive format"
msgstr "arkivformat"
-#: archive.c:324 builtin/log.c:1173
+#: archive.c:328 builtin/log.c:1193
msgid "prefix"
msgstr "prefix"
-#: archive.c:325
+#: archive.c:329
msgid "prepend prefix to each pathname in the archive"
msgstr "lägg till prefix till varje sökväg i arkivet"
-#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2292
-#: builtin/blame.c:2293 builtin/config.c:56 builtin/fast-export.c:673
-#: builtin/fast-export.c:675 builtin/grep.c:714 builtin/hash-object.c:77
-#: builtin/ls-files.c:496 builtin/ls-files.c:499 builtin/notes.c:408
-#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:152
+#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2264
+#: builtin/blame.c:2265 builtin/config.c:58 builtin/fast-export.c:680
+#: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77
+#: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408
+#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154
msgid "file"
msgstr "fil"
-#: archive.c:327 builtin/archive.c:89
+#: archive.c:331 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "skriv arkivet till filen"
-#: archive.c:329
+#: archive.c:333
msgid "read .gitattributes in working directory"
msgstr "läs .gitattributes i arbetskatalogen"
-#: archive.c:330
+#: archive.c:334
msgid "report archived files on stderr"
msgstr "rapportera arkiverade filer på standard fel"
-#: archive.c:331
+#: archive.c:335
msgid "store only"
msgstr "endast spara"
-#: archive.c:332
+#: archive.c:336
msgid "compress faster"
msgstr "komprimera snabbare"
-#: archive.c:340
+#: archive.c:344
msgid "compress better"
msgstr "komprimera bättre"
-#: archive.c:343
+#: archive.c:347
msgid "list supported archive formats"
msgstr "visa understödda arkivformat"
-#: archive.c:345 builtin/archive.c:90 builtin/clone.c:85
+#: archive.c:349 builtin/archive.c:90 builtin/clone.c:84
msgid "repo"
msgstr "arkiv"
-#: archive.c:346 builtin/archive.c:91
+#: archive.c:350 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "hämta arkivet från fjärrarkivet <arkiv>"
-#: archive.c:347 builtin/archive.c:92 builtin/notes.c:487
+#: archive.c:351 builtin/archive.c:92 builtin/notes.c:487
msgid "command"
msgstr "kommando"
-#: archive.c:348 builtin/archive.c:93
+#: archive.c:352 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"
@@ -204,17 +209,17 @@ msgstr "Det finns redan en gren som heter \"%s\""
msgid "Cannot force update the current branch."
msgstr "Kan inte tvinga uppdatering av aktuell gren."
-#: branch.c:216
+#: branch.c:215
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr "Kan inte ställa in spårning; startpunkten \"%s\" är inte en gren."
-#: branch.c:218
+#: branch.c:217
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "den efterfrågade uppströmsgrenen \"%s\" finns inte"
-#: branch.c:220
+#: branch.c:219
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -234,26 +239,26 @@ msgstr ""
"spåra dess fjärrmotsvarighet kan du använda \"git push -u\"\n"
"för att ställa in uppströmskonfigurationen när du sänder in."
-#: branch.c:265
+#: branch.c:264
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "Objektnamnet är inte giltigt: \"%s\"."
-#: branch.c:285
+#: branch.c:284
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "Objektnamnet är tvetydigt: \"%s\"."
-#: branch.c:290
+#: branch.c:289
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "Avgreningspunkten är inte giltig: \"%s\""
-#: branch.c:296
+#: branch.c:295
msgid "Failed to lock ref for update"
msgstr "Misslyckades låsa referens för uppdatering"
-#: branch.c:314
+#: branch.c:313
msgid "Failed to write ref"
msgstr "Misslyckades skriva referens"
@@ -267,7 +272,7 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil"
msgid "unrecognized header: %s%s (%d)"
msgstr "okänt huvud: %s%s (%d)"
-#: bundle.c:89 builtin/commit.c:697
+#: bundle.c:89 builtin/commit.c:706
#, c-format
msgid "could not open '%s'"
msgstr "kunde inte öppna \"%s\""
@@ -276,9 +281,9 @@ msgstr "kunde inte öppna \"%s\""
msgid "Repository lacks these prerequisite commits:"
msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
-#: bundle.c:164 sequencer.c:661 sequencer.c:1111 builtin/log.c:331
-#: builtin/log.c:801 builtin/log.c:1399 builtin/log.c:1625 builtin/merge.c:364
-#: builtin/shortlog.c:156
+#: bundle.c:164 sequencer.c:662 sequencer.c:1112 builtin/log.c:332
+#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:364
+#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr "misslyckades skapa revisionstraversering"
@@ -304,7 +309,7 @@ msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:"
msgid "rev-list died"
msgstr "rev-list dog"
-#: bundle.c:300 builtin/log.c:1310 builtin/shortlog.c:259
+#: bundle.c:300 builtin/log.c:1329 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr "okänt argument: %s"
@@ -454,7 +459,7 @@ msgstr ""
"Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
"%s"
-#: diff.c:3487
+#: diff.c:3490
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -463,7 +468,7 @@ msgstr ""
"Misslyckades tolka argument till flaggan --dirstat/-X;\n"
"%s"
-#: diff.c:3501
+#: diff.c:3504
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\""
@@ -490,17 +495,17 @@ msgstr "kunde inte skapa temporära filen \"%s\": %s"
msgid "failed writing detached signature to '%s': %s"
msgstr "misslyckades skriva fristående signatur till \"%s\": %s"
-#: grep.c:1623
+#: grep.c:1695
#, c-format
msgid "'%s': unable to read %s"
msgstr "\"%s\" kunde inte läsa %s"
-#: grep.c:1640
+#: grep.c:1712
#, c-format
msgid "'%s': %s"
msgstr "\"%s\": %s"
-#: grep.c:1651
+#: grep.c:1723
#, c-format
msgid "'%s': short read %s"
msgstr "\"%s\": kort läsning %s"
@@ -573,8 +578,8 @@ msgstr "%s: %s - %s"
msgid "failed to read the cache"
msgstr "misslyckads läsa cachen"
-#: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566
-#: builtin/clone.c:656
+#: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559
+#: builtin/clone.c:655
msgid "unable to write new index file"
msgstr "kunde inte skriva ny indexfil"
@@ -623,7 +628,7 @@ msgstr "kan inte läsa objektet %s: \"%s\""
msgid "blob expected for %s '%s'"
msgstr "blob förväntades för %s \"%s\""
-#: merge-recursive.c:774 builtin/clone.c:312
+#: merge-recursive.c:774 builtin/clone.c:311
#, c-format
msgid "failed to open '%s'"
msgstr "misslyckades öppna \"%s\""
@@ -757,7 +762,7 @@ msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
msgid "Auto-merging %s"
msgstr "Slår ihop %s automatiskt"
-#: merge-recursive.c:1634 git-submodule.sh:1118
+#: merge-recursive.c:1634 git-submodule.sh:1125
msgid "submodule"
msgstr "undermodul"
@@ -853,58 +858,124 @@ msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)"
msgid "Bad %s value: '%s'"
msgstr "Felaktigt värde på %s: \"%s\""
-#: object.c:204
+#: object.c:202
#, c-format
msgid "unable to parse object: %s"
msgstr "kunde inte tolka objektet: %s"
-#: parse-options.c:489
+#: parse-options.c:537
msgid "..."
msgstr "..."
-#: parse-options.c:507
+#: parse-options.c:555
#, c-format
msgid "usage: %s"
msgstr "användning: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:511
+#: parse-options.c:559
#, c-format
msgid " or: %s"
msgstr " eller: %s"
-#: parse-options.c:514
+#: parse-options.c:562
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:548
+#: parse-options.c:596
msgid "-NUM"
msgstr "-TAL"
-#: pathspec.c:83
+#: pathspec.c:118
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr ""
+"de globala sökvägsinställningarna \"glob\" och \"noglob\" är inkompatibla"
+
+#: pathspec.c:128
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr ""
+"den globala sökvägsinställningen \"literal\" är inkompatibel med alla andra "
+"globala sökvägsinställningar"
+
+#: pathspec.c:158
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "ogiltig parameter för sökvägsuttrycket för \"prefix\""
+
+#: pathspec.c:164
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "felaktigt sökvägsuttryck \"%.*s\" i \"%s\""
+
+#: pathspec.c:168
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "\")\" saknas i slutet av sökvägsuttrycket för \"%s\""
+
+#: pathspec.c:186
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "Tecknet \"%c\" i sökvägsuttrycket i \"%s\" har inte implementerats"
+
+#: pathspec.c:211
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s: \"literal\" och \"glob\" är inkompatibla"
+
+#: pathspec.c:222
+#, c-format
+msgid "%s: '%s' is outside repository"
+msgstr "%s: \"%s\" är utanför arkivet"
+
+#: pathspec.c:278
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""
+
+#.
+#. * We may want to substitute "this command" with a command
+#. * name. E.g. when add--interactive dies when running
+#. * "checkout -p"
+#.
+#: pathspec.c:340
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr "%s: sökvägsuttrycket hanteras inte av det här kommandot: %s"
+
+#: pathspec.c:415
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk"
+
+#: remote.c:1833
#, c-format
-msgid "Path '%s' is in submodule '%.*s'"
-msgstr "Sökvägen \"%s\" är i undermodulen \"%.*s\""
+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"
-#: pathspec.c:99
+#: remote.c:1837
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n"
+
+#: remote.c:1840
#, c-format
-msgid "'%s' is beyond a symbolic link"
-msgstr "\"%s\" är på andra sidan av en symbolisk länk"
+msgid "Your branch is up-to-date with '%s'.\n"
+msgstr "Din gren är à jour med \"%s\".\n"
-#: remote.c:1788
+#: remote.c:1844
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Din gren ligger före \"%s\" med %d incheckning.\n"
msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n"
-#: remote.c:1794
+#: remote.c:1850
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:1797
+#: remote.c:1853
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -914,11 +985,11 @@ msgstr[0] ""
msgstr[1] ""
"Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n"
-#: remote.c:1805
+#: remote.c:1861
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:1808
+#: remote.c:1864
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -933,7 +1004,7 @@ msgstr[1] ""
"Din gren och \"%s\" har divergerat,\n"
"och har %d respektive %d olika incheckningar.\n"
-#: remote.c:1818
+#: remote.c:1874
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"
@@ -976,7 +1047,7 @@ msgstr ""
"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"
"och checka in resultatet med \"git commit\""
-#: sequencer.c:245 sequencer.c:869 sequencer.c:952
+#: sequencer.c:245 sequencer.c:870 sequencer.c:953
#, c-format
msgid "Could not write to %s"
msgstr "Kunde inte skriva till %s"
@@ -999,197 +1070,197 @@ msgid "Commit your changes or stash them to proceed."
msgstr "Checka in dina ändringar eller använd \"stash\" för att fortsätta."
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:324
+#: sequencer.c:325
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Kunde inte skriva ny indexfil"
-#: sequencer.c:355
+#: sequencer.c:356
msgid "Could not resolve HEAD commit\n"
msgstr "Kunde inte bestämma HEAD:s incheckning\n"
-#: sequencer.c:377
+#: sequencer.c:378
msgid "Unable to update cache tree\n"
msgstr "Kan inte uppdatera cacheträd\n"
-#: sequencer.c:422
+#: sequencer.c:423
#, c-format
msgid "Could not parse commit %s\n"
msgstr "Kunde inte tolka incheckningen %s\n"
-#: sequencer.c:427
+#: sequencer.c:428
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr "Kunde inte tolka föräldraincheckningen %s\n"
-#: sequencer.c:493
+#: sequencer.c:494
msgid "Your index file is unmerged."
msgstr "Din indexfil har inte slagits ihop."
-#: sequencer.c:512
+#: sequencer.c:513
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr "Incheckning %s är en sammanslagning, men flaggan -m angavs inte."
-#: sequencer.c:520
+#: sequencer.c:521
#, c-format
msgid "Commit %s does not have parent %d"
msgstr "Incheckning %s har inte förälder %d"
-#: sequencer.c:524
+#: sequencer.c:525
#, c-format
msgid "Mainline was specified but commit %s is not a merge."
msgstr "Huvudlinje angavs, men incheckningen %s är inte en sammanslagning"
#. TRANSLATORS: The first %s will be "revert" or
#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:537
+#: sequencer.c:538
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: kan inte tolka föräldraincheckningen %s"
-#: sequencer.c:541
+#: sequencer.c:542
#, c-format
msgid "Cannot get commit message for %s"
msgstr "Kan inte hämta incheckningsmeddelande för %s"
-#: sequencer.c:627
+#: sequencer.c:628
#, c-format
msgid "could not revert %s... %s"
msgstr "kunde inte ångra %s... %s"
-#: sequencer.c:628
+#: sequencer.c:629
#, c-format
msgid "could not apply %s... %s"
msgstr "kunde inte tillämpa %s... %s"
-#: sequencer.c:664
+#: sequencer.c:665
msgid "empty commit set passed"
msgstr "den angivna uppsättningen incheckningar är tom"
-#: sequencer.c:672
+#: sequencer.c:673
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: misslyckades läsa indexet"
-#: sequencer.c:677
+#: sequencer.c:678
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: misslyckades uppdatera indexet"
-#: sequencer.c:735
+#: sequencer.c:736
#, c-format
msgid "Cannot %s during a %s"
msgstr "kan inte %s under en %s"
-#: sequencer.c:757
+#: sequencer.c:758
#, c-format
msgid "Could not parse line %d."
msgstr "Kan inte tolka rad %d."
-#: sequencer.c:762
+#: sequencer.c:763
msgid "No commits parsed."
msgstr "Inga incheckningar lästes."
-#: sequencer.c:775
+#: sequencer.c:776
#, c-format
msgid "Could not open %s"
msgstr "Kunde inte öppna %s"
-#: sequencer.c:779
+#: sequencer.c:780
#, c-format
msgid "Could not read %s."
msgstr "kunde inte läsa %s."
-#: sequencer.c:786
+#: sequencer.c:787
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr "Oanvändbart manus: %s"
-#: sequencer.c:814
+#: sequencer.c:815
#, c-format
msgid "Invalid key: %s"
msgstr "Felaktig nyckel: %s"
-#: sequencer.c:817
+#: sequencer.c:818
#, c-format
msgid "Invalid value for %s: %s"
msgstr "Felaktigt värde för %s: %s"
-#: sequencer.c:829
+#: sequencer.c:830
#, c-format
msgid "Malformed options sheet: %s"
msgstr "Trasigt manus: %s"
-#: sequencer.c:850
+#: sequencer.c:851
msgid "a cherry-pick or revert is already in progress"
msgstr "en \"cherry-pick\" eller \"revert\" pågår redan"
-#: sequencer.c:851
+#: sequencer.c:852
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:855
+#: sequencer.c:856
#, c-format
msgid "Could not create sequencer directory %s"
msgstr "Kunde inte skapa \"sequencer\"-katalogen \"%s\""
-#: sequencer.c:871 sequencer.c:956
+#: sequencer.c:872 sequencer.c:957
#, c-format
msgid "Error wrapping up %s."
msgstr "Fel vid ombrytning av %s."
-#: sequencer.c:890 sequencer.c:1024
+#: sequencer.c:891 sequencer.c:1025
msgid "no cherry-pick or revert in progress"
msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
-#: sequencer.c:892
+#: sequencer.c:893
msgid "cannot resolve HEAD"
msgstr "kan inte bestämma HEAD"
-#: sequencer.c:894
+#: sequencer.c:895
msgid "cannot abort from a branch yet to be born"
msgstr "kan inte avbryta från en gren som ännu inte är född"
-#: sequencer.c:916 builtin/apply.c:4061
+#: sequencer.c:917 builtin/apply.c:4061
#, c-format
msgid "cannot open %s: %s"
msgstr "kan inte öppna %s: %s"
-#: sequencer.c:919
+#: sequencer.c:920
#, c-format
msgid "cannot read %s: %s"
msgstr "kan inte läsa %s: %s"
-#: sequencer.c:920
+#: sequencer.c:921
msgid "unexpected end of file"
msgstr "oväntat filslut"
-#: sequencer.c:926
+#: sequencer.c:927
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig"
-#: sequencer.c:949
+#: sequencer.c:950
#, c-format
msgid "Could not format %s."
msgstr "Kunde inte formatera %s."
-#: sequencer.c:1092
+#: sequencer.c:1093
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\""
-#: sequencer.c:1095
+#: sequencer.c:1096
#, c-format
msgid "%s: bad revision"
msgstr "%s: felaktig revision"
-#: sequencer.c:1129
+#: sequencer.c:1130
msgid "Can't revert as initial commit"
msgstr "Kan inte ångra som första incheckning"
-#: sequencer.c:1130
+#: sequencer.c:1131
msgid "Can't cherry-pick into empty head"
msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud"
@@ -1215,256 +1286,350 @@ msgstr ""
"Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n"
"genom att köra \"git config advice.objectNameWarning false\""
-#: sha1_name.c:1097
+#: sha1_name.c:1112
msgid "HEAD does not point to a branch"
msgstr "HEAD pekar inte på en gren"
-#: sha1_name.c:1100
+#: sha1_name.c:1115
#, c-format
msgid "No such branch: '%s'"
msgstr "Okänd gren: \"%s\""
-#: sha1_name.c:1102
+#: sha1_name.c:1117
#, c-format
msgid "No upstream configured for branch '%s'"
msgstr "Ingen standarduppström angiven för grenen \"%s\""
-#: sha1_name.c:1106
+#: sha1_name.c:1121
#, 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"
-#: wrapper.c:408
+#: 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"
+
+#: 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"
+
+#. Maybe the user already did that, don't error out here
+#: submodule.c:76
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "Kunde inte uppdatera .gitmodules-posten %s"
+
+#. Maybe the user already did that, don't error out here
+#: submodule.c:109
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "Kunde inte ta bort .gitmodules-posten för %s"
+
+#: submodule.c:127
+msgid "could not find .gitmodules in index"
+msgstr "kunde inte hitta .gitmodules i indexet"
+
+#: submodule.c:133
+msgid "reading updated .gitmodules failed"
+msgstr "misslyckades läsa uppdaterad .gitmodules"
+
+#: submodule.c:135
+msgid "unable to stat updated .gitmodules"
+msgstr "kan inte ta status på uppdaterad .gitmodules"
+
+#: submodule.c:139
+msgid "unable to remove .gitmodules from index"
+msgstr "kan inte ta bort .gitmodules från indexet"
+
+#: submodule.c:141
+msgid "adding updated .gitmodules failed"
+msgstr "misslyckades lägga till uppdaterad .gitmodules"
+
+#: submodule.c:143
+msgid "staging updated .gitmodules failed"
+msgstr "misslyckades köa uppdaterad .gitmodules"
+
+#: submodule.c:1144 builtin/init-db.c:363
+#, c-format
+msgid "Could not create git link %s"
+msgstr "Kunde inte skapa gitlänk %s"
+
+#: submodule.c:1155
+#, c-format
+msgid "Could not set core.worktree in %s"
+msgstr "Kunde inte sätta core.worktree i %s"
+
+#: urlmatch.c:120
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "ogiltig URL-schemanamn eller saknat \"://\"-suffix"
+
+#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "ogiltig %XX-teckensekvens"
+
+#: urlmatch.c:172
+msgid "missing host and scheme is not 'file:'"
+msgstr "värd saknas och schemat är inte \"file:\""
+
+#: 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"
+
+#: urlmatch.c:244 urlmatch.c:255
+msgid "invalid port number"
+msgstr "felaktigt portnummer"
+
+#: urlmatch.c:322
+msgid "invalid '..' path segment"
+msgstr "felaktit \"..\"-sökvägssegment"
+
+#: wrapper.c:422
#, c-format
msgid "unable to access '%s': %s"
msgstr "kan inte komma åt \"%s\": %s"
-#: wrapper.c:429
+#: wrapper.c:443
#, c-format
msgid "unable to access '%s'"
msgstr "kan inte komma åt \"%s\""
-#: wrapper.c:440
+#: wrapper.c:454
#, c-format
msgid "unable to look up current user in the passwd file: %s"
msgstr "kan inte slå upp aktuell användare i passwd-filen: %s"
-#: wrapper.c:441
+#: wrapper.c:455
msgid "no such user"
msgstr "okänd användare"
-#: wt-status.c:141
+#: wt-status.c:146
msgid "Unmerged paths:"
msgstr "Ej sammanslagna sökvägar:"
-#: wt-status.c:168 wt-status.c:195
+#: wt-status.c:173 wt-status.c:200
#, 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:170 wt-status.c:197
+#: wt-status.c:175 wt-status.c:202
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:174
+#: wt-status.c:179
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (använd \"git add <fil>...\" för att ange lösning)"
-#: wt-status.c:176 wt-status.c:180
+#: wt-status.c:181 wt-status.c:185
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)"
-#: wt-status.c:178
+#: wt-status.c:183
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (använd \"git rm <fil>...\" för att ange lösning)"
-#: wt-status.c:189
+#: wt-status.c:194
msgid "Changes to be committed:"
msgstr "Ändringar att checka in:"
-#: wt-status.c:207
+#: wt-status.c:212
msgid "Changes not staged for commit:"
msgstr "Ändringar ej i incheckningskön:"
-#: wt-status.c:211
+#: wt-status.c:216
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)"
-#: wt-status.c:213
+#: wt-status.c:218
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)"
-#: wt-status.c:214
+#: wt-status.c:219
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)"
-#: wt-status.c:216
+#: wt-status.c:221
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)"
-#: wt-status.c:228
+#: wt-status.c:233
#, 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:245
+#: wt-status.c:250
msgid "bug"
msgstr "programfel"
-#: wt-status.c:250
+#: wt-status.c:255
msgid "both deleted:"
msgstr "borttaget av bägge:"
-#: wt-status.c:251
+#: wt-status.c:256
msgid "added by us:"
msgstr "tillagt av oss:"
-#: wt-status.c:252
+#: wt-status.c:257
msgid "deleted by them:"
msgstr "borttaget av dem:"
-#: wt-status.c:253
+#: wt-status.c:258
msgid "added by them:"
msgstr "tillagt av dem:"
-#: wt-status.c:254
+#: wt-status.c:259
msgid "deleted by us:"
msgstr "borttaget av oss:"
-#: wt-status.c:255
+#: wt-status.c:260
msgid "both added:"
msgstr "tillagt av bägge:"
-#: wt-status.c:256
+#: wt-status.c:261
msgid "both modified:"
msgstr "ändrat av bägge:"
-#: wt-status.c:286
+#: wt-status.c:291
msgid "new commits, "
msgstr "nya incheckningar, "
-#: wt-status.c:288
+#: wt-status.c:293
msgid "modified content, "
msgstr "ändrat innehåll, "
-#: wt-status.c:290
+#: wt-status.c:295
msgid "untracked content, "
msgstr "ospårat innehåll, "
-#: wt-status.c:307
+#: wt-status.c:312
#, c-format
msgid "new file: %s"
msgstr "ny fil: %s"
-#: wt-status.c:310
+#: wt-status.c:315
#, c-format
msgid "copied: %s -> %s"
msgstr "kopierad: %s -> %s"
-#: wt-status.c:313
+#: wt-status.c:318
#, c-format
msgid "deleted: %s"
msgstr "borttagen: %s"
-#: wt-status.c:316
+#: wt-status.c:321
#, c-format
msgid "modified: %s"
msgstr "ändrad: %s"
-#: wt-status.c:319
+#: wt-status.c:324
#, c-format
msgid "renamed: %s -> %s"
msgstr "namnbyte: %s -> %s"
-#: wt-status.c:322
+#: wt-status.c:327
#, c-format
msgid "typechange: %s"
msgstr "typbyte: %s"
-#: wt-status.c:325
+#: wt-status.c:330
#, c-format
msgid "unknown: %s"
msgstr "okänd: %s"
-#: wt-status.c:328
+#: wt-status.c:333
#, c-format
msgid "unmerged: %s"
msgstr "osammansl.: %s"
-#: wt-status.c:331
+#: wt-status.c:336
#, c-format
msgid "bug: unhandled diff status %c"
msgstr "programfel: diff-status %c ej hanterad"
-#: wt-status.c:803
+#: wt-status.c:703
+msgid "Submodules changed but not updated:"
+msgstr "Undermoduler ändrade men inte uppdaterade:"
+
+#: wt-status.c:705
+msgid "Submodule changes to be committed:"
+msgstr "Undermodulers ändringar att checka in:"
+
+#: wt-status.c:848
msgid "You have unmerged paths."
msgstr "Du har ej sammanslagna sökvägar."
-#: wt-status.c:806
+#: wt-status.c:851
msgid " (fix conflicts and run \"git commit\")"
msgstr " (rätta konflikter och kör \"git commit\")"
-#: wt-status.c:809
+#: wt-status.c:854
msgid "All conflicts fixed but you are still merging."
msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning."
-#: wt-status.c:812
+#: wt-status.c:857
msgid " (use \"git commit\" to conclude merge)"
msgstr " (använd \"git commit\" för att slutföra sammanslagningen)"
-#: wt-status.c:822
+#: wt-status.c:867
msgid "You are in the middle of an am session."
msgstr "Du är i mitten av en körning av \"git am\"."
-#: wt-status.c:825
+#: wt-status.c:870
msgid "The current patch is empty."
msgstr "Aktuell patch är tom."
-#: wt-status.c:829
+#: wt-status.c:874
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (rätta konflikter och kör sedan \"git am --continue\")"
-#: wt-status.c:831
+#: wt-status.c:876
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (använd \"git am --skip\" för att hoppa över patchen)"
-#: wt-status.c:833
+#: wt-status.c:878
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)"
-#: wt-status.c:893 wt-status.c:910
+#: wt-status.c:938 wt-status.c:955
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"."
-#: wt-status.c:898 wt-status.c:915
+#: wt-status.c:943 wt-status.c:960
msgid "You are currently rebasing."
msgstr "Du håller på med en ombasering."
-#: wt-status.c:901
+#: wt-status.c:946
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")"
-#: wt-status.c:903
+#: wt-status.c:948
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)"
-#: wt-status.c:905
+#: wt-status.c:950
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)"
-#: wt-status.c:918
+#: wt-status.c:963
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (alla konflikter rättade: kör \"git rebase --continue\")"
-#: wt-status.c:922
+#: wt-status.c:967
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -1472,117 +1637,118 @@ msgstr ""
"Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" "
"ovanpå \"%s\"."
-#: wt-status.c:927
+#: wt-status.c:972
msgid "You are currently splitting a commit during a rebase."
msgstr "Du håller på att dela upp en incheckning i en ombasering."
-#: wt-status.c:930
+#: wt-status.c:975
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")"
-#: wt-status.c:934
+#: wt-status.c:979
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" "
"ovanpå \"%s\"."
-#: wt-status.c:939
+#: wt-status.c:984
msgid "You are currently editing a commit during a rebase."
msgstr "Du håller på att redigera en incheckning under en ombasering."
-#: wt-status.c:942
+#: wt-status.c:987
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
" (använd \"git commit --amend\" för att lägga till på aktuell incheckning)"
-#: wt-status.c:944
+#: wt-status.c:989
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)"
-#: wt-status.c:954
-msgid "You are currently cherry-picking."
-msgstr "Du håller på med en \"cherry-pick\"."
+#: wt-status.c:999
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s."
-#: wt-status.c:958
+#: wt-status.c:1004
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")"
-#: wt-status.c:961
+#: wt-status.c:1007
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")"
-#: wt-status.c:963
+#: wt-status.c:1009
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-"
"operationen)"
-#: wt-status.c:972
+#: wt-status.c:1018
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Du håller på med att ångra incheckningen %s."
-#: wt-status.c:977
+#: wt-status.c:1023
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (rätta konflikter och kör sedan \"git revert --continue\")"
-#: wt-status.c:980
+#: wt-status.c:1026
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (alla konflikter rättade: kör \"git revert --continue\")"
-#: wt-status.c:982
+#: wt-status.c:1028
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)"
-#: wt-status.c:993
+#: wt-status.c:1039
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"."
-#: wt-status.c:997
+#: wt-status.c:1043
msgid "You are currently bisecting."
msgstr "Du håller på med en \"bisect\"."
-#: wt-status.c:1000
+#: wt-status.c:1046
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
" (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)"
-#: wt-status.c:1173
+#: wt-status.c:1221
msgid "On branch "
msgstr "På grenen "
-#: wt-status.c:1180
+#: wt-status.c:1228
msgid "rebase in progress; onto "
msgstr "ombasering pågår; ovanpå"
-#: wt-status.c:1187
+#: wt-status.c:1235
msgid "HEAD detached at "
msgstr "HEAD frånkopplad vid "
-#: wt-status.c:1189
+#: wt-status.c:1237
msgid "HEAD detached from "
msgstr "HEAD frånkopplad från "
-#: wt-status.c:1192
+#: wt-status.c:1240
msgid "Not currently on any branch."
msgstr "Inte på någon gren för närvarande."
-#: wt-status.c:1209
+#: wt-status.c:1257
msgid "Initial commit"
msgstr "Första incheckning"
-#: wt-status.c:1223
+#: wt-status.c:1271
msgid "Untracked files"
msgstr "Ospårade filer"
-#: wt-status.c:1225
+#: wt-status.c:1273
msgid "Ignored files"
msgstr "Ignorerade filer"
-#: wt-status.c:1229
+#: wt-status.c:1277
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -1594,32 +1760,32 @@ msgstr ""
"lägga till nya filer själv (se \"git help status\")."
# %s är nästa sträng eller tom.
-#: wt-status.c:1235
+#: wt-status.c:1283
#, c-format
msgid "Untracked files not listed%s"
msgstr "Ospårade filer visas ej%s"
-#: wt-status.c:1237
+#: wt-status.c:1285
msgid " (use -u option to show untracked files)"
msgstr " (använd flaggan -u för att visa ospårade filer)"
-#: wt-status.c:1243
+#: wt-status.c:1291
msgid "No changes"
msgstr "Inga ändringar"
-#: wt-status.c:1248
+#: wt-status.c:1296
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a"
"\")\n"
-#: wt-status.c:1251
+#: wt-status.c:1299
#, c-format
msgid "no changes added to commit\n"
msgstr "inga ändringar att checka in\n"
-#: wt-status.c:1254
+#: wt-status.c:1302
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -1628,52 +1794,56 @@ msgstr ""
"inget köat för incheckning, men ospårade filer finns (spåra med \"git add"
"\")\n"
-#: wt-status.c:1257
+#: wt-status.c:1305
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "inget köat för incheckning, men ospårade filer finns\n"
-#: wt-status.c:1260
+#: wt-status.c:1308
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n"
-#: wt-status.c:1263 wt-status.c:1268
+#: wt-status.c:1311 wt-status.c:1316
#, c-format
msgid "nothing to commit\n"
msgstr "inget att checka in\n"
-#: wt-status.c:1266
+#: wt-status.c:1314
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "inget att checka in (använd -u för att visa ospårade filer)\n"
-#: wt-status.c:1270
+#: wt-status.c:1318
#, c-format
msgid "nothing to commit, working directory clean\n"
msgstr "inget att checka in, arbetskatalogen ren\n"
-#: wt-status.c:1378
+#: wt-status.c:1427
msgid "HEAD (no branch)"
msgstr "HEAD (ingen gren)"
-#: wt-status.c:1384
+#: wt-status.c:1433
msgid "Initial commit on "
msgstr "Första incheckning på "
-#: wt-status.c:1399
+#: wt-status.c:1463
+msgid "gone"
+msgstr "försvunnen"
+
+#: wt-status.c:1465
msgid "behind "
msgstr "efter "
-#: wt-status.c:1402 wt-status.c:1405
+#: wt-status.c:1468 wt-status.c:1471
msgid "ahead "
msgstr "före "
-#: wt-status.c:1407
+#: wt-status.c:1473
msgid ", behind "
msgstr ", efter "
-#: compat/precompose_utf8.c:58 builtin/clone.c:351
+#: compat/precompose_utf8.c:55 builtin/clone.c:350
#, c-format
msgid "failed to unlink '%s'"
msgstr "misslyckades ta bort länken \"%s\""
@@ -1759,7 +1929,7 @@ msgstr ""
msgid "unexpected diff status %c"
msgstr "diff-status %c förväntades inte"
-#: builtin/add.c:149 builtin/commit.c:252
+#: builtin/add.c:149 builtin/commit.c:260
msgid "updating files failed"
msgstr "misslyckades uppdatera filer"
@@ -1768,140 +1938,135 @@ msgstr "misslyckades uppdatera filer"
msgid "remove '%s'\n"
msgstr "ta bort \"%s\"\n"
-#: builtin/add.c:253
+#: builtin/add.c:237
msgid "Unstaged changes after refreshing the index:"
msgstr "Ospårade ändringar efter att ha uppdaterat indexet:"
-#: builtin/add.c:256 builtin/add.c:573 builtin/rm.c:337
-#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"
-
-#: builtin/add.c:339
+#: builtin/add.c:299
msgid "Could not read the index"
msgstr "Kunde inte läsa indexet"
-#: builtin/add.c:350
+#: builtin/add.c:310
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Kunde inte öppna \"%s\" för skrivning"
-#: builtin/add.c:354
+#: builtin/add.c:314
msgid "Could not write patch"
msgstr "Kunde inte skriva patch"
-#: builtin/add.c:359
+#: builtin/add.c:319
#, c-format
msgid "Could not stat '%s'"
msgstr "Kunde inte ta status på \"%s\""
-#: builtin/add.c:361
+#: builtin/add.c:321
msgid "Empty patch. Aborted."
msgstr "Tom patch. Avbryter."
-#: builtin/add.c:367
+#: builtin/add.c:327
#, c-format
msgid "Could not apply '%s'"
msgstr "Kunde inte tillämpa \"%s\""
-#: builtin/add.c:377
+#: builtin/add.c:337
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"
-#: builtin/add.c:394 builtin/clean.c:875 builtin/fetch.c:78 builtin/mv.c:63
-#: builtin/prune-packed.c:73 builtin/push.c:451 builtin/remote.c:1253
-#: builtin/rm.c:268
+#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:92 builtin/mv.c:66
+#: builtin/prune-packed.c:73 builtin/push.c:459 builtin/remote.c:1253
+#: builtin/rm.c:269
msgid "dry run"
msgstr "testkörning"
-#: builtin/add.c:395 builtin/apply.c:4410 builtin/check-ignore.c:19
-#: builtin/commit.c:1220 builtin/count-objects.c:95 builtin/fsck.c:613
-#: builtin/log.c:1573 builtin/mv.c:62 builtin/read-tree.c:113
+#: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19
+#: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612
+#: builtin/log.c:1592 builtin/mv.c:65 builtin/read-tree.c:113
msgid "be verbose"
msgstr "var pratsam"
-#: builtin/add.c:397
+#: builtin/add.c:357
msgid "interactive picking"
msgstr "plocka interaktivt"
-#: builtin/add.c:398 builtin/checkout.c:1073 builtin/reset.c:261
+#: builtin/add.c:358 builtin/checkout.c:1109 builtin/reset.c:272
msgid "select hunks interactively"
msgstr "välj stycken interaktivt"
-#: builtin/add.c:399
+#: builtin/add.c:359
msgid "edit current diff and apply"
msgstr "redigera aktuell diff och applicera"
-#: builtin/add.c:400
+#: builtin/add.c:360
msgid "allow adding otherwise ignored files"
msgstr "tillåt lägga till annars ignorerade filer"
-#: builtin/add.c:401
+#: builtin/add.c:361
msgid "update tracked files"
msgstr "uppdatera spårade filer"
-#: builtin/add.c:402
+#: builtin/add.c:362
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:403
+#: builtin/add.c:363
msgid "add changes from all tracked and untracked files"
msgstr "lägg till ändringar från alla spårade och ospårade filer"
#. takes no arguments
-#: builtin/add.c:406
+#: builtin/add.c:366
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:408
+#: builtin/add.c:368
msgid "don't add, only refresh the index"
msgstr "lägg inte till, uppdatera endast indexet"
-#: builtin/add.c:409
+#: builtin/add.c:369
msgid "just skip files which cannot be added because of errors"
msgstr "hoppa bara över filer som inte kan läggas till på grund av fel"
-#: builtin/add.c:410
+#: builtin/add.c:370
msgid "check if - even missing - files are ignored in dry run"
msgstr "se om - även saknade - filer ignoreras i testkörning"
-#: builtin/add.c:432
+#: builtin/add.c:392
#, 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"
-#: builtin/add.c:433
+#: builtin/add.c:393
msgid "no files added"
msgstr "inga filer har lagts till"
-#: builtin/add.c:439
+#: builtin/add.c:399
msgid "adding files failed"
msgstr "misslyckades lägga till filer"
-#: builtin/add.c:478
+#: builtin/add.c:438
msgid "-A and -u are mutually incompatible"
msgstr "-A och -u är ömsesidigt inkompatibla"
-#: builtin/add.c:496
+#: builtin/add.c:456
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run"
-#: builtin/add.c:526
+#: builtin/add.c:486
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Inget angivet, inget tillagt.\n"
-#: builtin/add.c:527
+#: builtin/add.c:487
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Kanske menade du att skriva \"git add .\"?\n"
-#: builtin/add.c:533 builtin/check-ignore.c:161 builtin/clean.c:919
-#: builtin/commit.c:312 builtin/mv.c:82 builtin/rm.c:297
+#: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919
+#: builtin/commit.c:320 builtin/mv.c:86 builtin/reset.c:224 builtin/rm.c:299
msgid "index file corrupt"
msgstr "indexfilen trasig"
-#: builtin/add.c:605 builtin/apply.c:4506 builtin/mv.c:229 builtin/rm.c:432
+#: builtin/add.c:589 builtin/apply.c:4506 builtin/mv.c:259 builtin/rm.c:432
msgid "Unable to write new index file"
msgstr "Kunde inte skriva ny indexfil"
@@ -2154,7 +2319,7 @@ msgstr "%s: patchen kan inte tillämpas"
msgid "Checking patch %s..."
msgstr "Kontrollerar patchen %s..."
-#: builtin/apply.c:3680 builtin/checkout.c:216 builtin/reset.c:127
+#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:127
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
@@ -2234,8 +2399,8 @@ msgstr "indata känns inte igen"
msgid "unable to read index file"
msgstr "kan inte läsa indexfilen"
-#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:91
-#: builtin/fetch.c:63
+#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90
+#: builtin/fetch.c:77
msgid "path"
msgstr "sökväg"
@@ -2295,7 +2460,7 @@ msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas"
msgid "build a temporary index based on embedded index information"
msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
-#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:462
+#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:452
msgid "paths are separated with NUL character"
msgstr "sökvägar avdelas med NUL-tecken"
@@ -2425,103 +2590,103 @@ msgstr "utför 'git bisect next'"
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning"
-#: builtin/blame.c:26
+#: builtin/blame.c:27
msgid "git blame [options] [rev-opts] [rev] [--] file"
msgstr "git blame [flaggor] [rev-flaggor] [rev] [--] fil"
-#: builtin/blame.c:31
+#: builtin/blame.c:32
msgid "[rev-opts] are documented in git-rev-list(1)"
msgstr "[rev-flaggor] dokumenteras i git-rev-list(1)"
-#: builtin/blame.c:2276
+#: builtin/blame.c:2248
msgid "Show blame entries as we find them, incrementally"
msgstr "Visa klandringsposter när vi hittar dem, interaktivt"
-#: builtin/blame.c:2277
+#: builtin/blame.c:2249
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)"
-#: builtin/blame.c:2278
+#: builtin/blame.c:2250
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Behandla inte rotincheckningar som gränser (Standard: av)"
-#: builtin/blame.c:2279
+#: builtin/blame.c:2251
msgid "Show work cost statistics"
msgstr "Visa statistik över arbetskostnad"
-#: builtin/blame.c:2280
+#: builtin/blame.c:2252
msgid "Show output score for blame entries"
msgstr "Visa utdatapoäng för klandringsposter"
-#: builtin/blame.c:2281
+#: builtin/blame.c:2253
msgid "Show original filename (Default: auto)"
msgstr "Visa originalfilnamn (Standard: auto)"
-#: builtin/blame.c:2282
+#: builtin/blame.c:2254
msgid "Show original linenumber (Default: off)"
msgstr "Visa ursprungligt radnummer (Standard: av)"
-#: builtin/blame.c:2283
+#: builtin/blame.c:2255
msgid "Show in a format designed for machine consumption"
msgstr "Visa i ett format avsett för maskinkonsumtion"
-#: builtin/blame.c:2284
+#: builtin/blame.c:2256
msgid "Show porcelain format with per-line commit information"
msgstr "Visa porslinsformat med per-rad-incheckningsinformation"
-#: builtin/blame.c:2285
+#: builtin/blame.c:2257
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:2286
+#: builtin/blame.c:2258
msgid "Show raw timestamp (Default: off)"
msgstr "Visa rå tidsstämpel (Standard: av)"
-#: builtin/blame.c:2287
+#: builtin/blame.c:2259
msgid "Show long commit SHA1 (Default: off)"
msgstr "Visa lång inchecknings-SHA1 (Standard: av)"
-#: builtin/blame.c:2288
+#: builtin/blame.c:2260
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)"
-#: builtin/blame.c:2289
+#: builtin/blame.c:2261
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:2290
+#: builtin/blame.c:2262
msgid "Ignore whitespace differences"
msgstr "Ignorera ändringar i blanksteg"
-#: builtin/blame.c:2291
+#: builtin/blame.c:2263
msgid "Spend extra cycles to find better match"
msgstr "Slösa extra cykler med att hitta bättre träff"
-#: builtin/blame.c:2292
+#: builtin/blame.c:2264
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:2293
+#: builtin/blame.c:2265
msgid "Use <file>'s contents as the final image"
msgstr "Använd <fil>s innehåll som slutgiltig bild"
-#: builtin/blame.c:2294 builtin/blame.c:2295
+#: builtin/blame.c:2266 builtin/blame.c:2267
msgid "score"
msgstr "poäng"
-#: builtin/blame.c:2294
+#: builtin/blame.c:2266
msgid "Find line copies within and across files"
msgstr "Hitta kopierade rader inuti och mellan filer"
-#: builtin/blame.c:2295
+#: builtin/blame.c:2267
msgid "Find line movements within and across files"
msgstr "Hitta flyttade rader inuti och mellan filer"
-#: builtin/blame.c:2296
+#: builtin/blame.c:2268
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2296
+#: builtin/blame.c:2268
msgid "Process only line range n,m, counting from 1"
msgstr "Behandla endast radintervallet n,m, med början på 1"
@@ -2627,278 +2792,288 @@ msgstr "grenen \"%s\" pekar inte på en incheckning"
#: builtin/branch.c:453
#, c-format
+msgid "[%s: gone]"
+msgstr "[%s: försvunnen]"
+
+#: builtin/branch.c:456
+#, c-format
+msgid "[%s]"
+msgstr "[%s]"
+
+#: builtin/branch.c:459
+#, c-format
msgid "[%s: behind %d]"
msgstr "[%s: bakom %d] "
-#: builtin/branch.c:455
+#: builtin/branch.c:461
#, c-format
msgid "[behind %d]"
msgstr "[bakom %d] "
-#: builtin/branch.c:459
+#: builtin/branch.c:465
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s: före %d] "
-#: builtin/branch.c:461
+#: builtin/branch.c:467
#, c-format
msgid "[ahead %d]"
msgstr "[före %d] "
-#: builtin/branch.c:464
+#: builtin/branch.c:470
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s: före %d, bakom %d] "
-#: builtin/branch.c:467
+#: builtin/branch.c:473
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[före %d, bakom %d] "
-#: builtin/branch.c:490
+#: builtin/branch.c:496
msgid " **** invalid ref ****"
msgstr " **** ogiltig ref ****"
-#: builtin/branch.c:582
+#: builtin/branch.c:588
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(ingen gren, ombaserar %s)"
-#: builtin/branch.c:585
+#: builtin/branch.c:591
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(ingen gren, \"bisect\" startad på %s)"
-#: builtin/branch.c:588
+#: builtin/branch.c:594
#, c-format
msgid "(detached from %s)"
msgstr "(frånkopplad från %s)"
-#: builtin/branch.c:591
+#: builtin/branch.c:597
msgid "(no branch)"
msgstr "(ingen gren)"
-#: builtin/branch.c:637
+#: builtin/branch.c:643
#, c-format
msgid "object '%s' does not point to a commit"
msgstr "objektet \"%s\" pekar på en incheckning"
-#: builtin/branch.c:669
+#: builtin/branch.c:675
msgid "some refs could not be read"
msgstr "vissa referenser kunde inte läsas"
-#: builtin/branch.c:682
+#: builtin/branch.c:688
msgid "cannot rename the current branch while not on any."
msgstr ""
"kunde inte byta namn på aktuell gren när du inte befinner dig på någon."
-#: builtin/branch.c:692
+#: builtin/branch.c:698
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Felaktigt namn på gren: \"%s\""
-#: builtin/branch.c:707
+#: builtin/branch.c:713
msgid "Branch rename failed"
msgstr "Misslyckades byta namn på gren"
-#: builtin/branch.c:711
+#: builtin/branch.c:717
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""
-#: builtin/branch.c:715
+#: builtin/branch.c:721
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!"
-#: builtin/branch.c:722
+#: builtin/branch.c:728
msgid "Branch is renamed, but update of config-file failed"
msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"
-#: builtin/branch.c:737
+#: builtin/branch.c:743
#, c-format
msgid "malformed object name %s"
msgstr "felformat objektnamn %s"
-#: builtin/branch.c:761
+#: builtin/branch.c:767
#, c-format
msgid "could not write branch description template: %s"
msgstr "kunde inte skriva grenbeskrivningsmall: %s"
-#: builtin/branch.c:791
+#: builtin/branch.c:797
msgid "Generic options"
msgstr "Allmänna flaggor"
-#: builtin/branch.c:793
+#: builtin/branch.c:799
msgid "show hash and subject, give twice for upstream branch"
msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren"
-#: builtin/branch.c:794
+#: builtin/branch.c:800
msgid "suppress informational messages"
msgstr "undertryck informationsmeddelanden"
-#: builtin/branch.c:795
+#: builtin/branch.c:801
msgid "set up tracking mode (see git-pull(1))"
msgstr "ställ in spårningsläge (se git-pull(1))"
-#: builtin/branch.c:797
+#: builtin/branch.c:803
msgid "change upstream info"
msgstr "ändra uppströmsinformation"
-#: builtin/branch.c:801
+#: builtin/branch.c:807
msgid "use colored output"
msgstr "använd färgad utdata"
-#: builtin/branch.c:802
+#: builtin/branch.c:808
msgid "act on remote-tracking branches"
msgstr "arbeta på fjärrspårande grenar"
-#: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832
-#: builtin/branch.c:838 builtin/commit.c:1433 builtin/commit.c:1434
-#: builtin/commit.c:1435 builtin/commit.c:1436 builtin/tag.c:468
+#: builtin/branch.c:811 builtin/branch.c:817 builtin/branch.c:838
+#: builtin/branch.c:844 builtin/commit.c:1460 builtin/commit.c:1461
+#: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468
msgid "commit"
msgstr "incheckning"
-#: builtin/branch.c:806 builtin/branch.c:812
+#: builtin/branch.c:812 builtin/branch.c:818
msgid "print only branches that contain the commit"
msgstr "visa endast grenar som innehåller incheckningen"
-#: builtin/branch.c:818
+#: builtin/branch.c:824
msgid "Specific git-branch actions:"
msgstr "Specifika git-branch-åtgärder:"
-#: builtin/branch.c:819
+#: builtin/branch.c:825
msgid "list both remote-tracking and local branches"
msgstr "visa både fjärrspårande och lokala grenar"
-#: builtin/branch.c:821
+#: builtin/branch.c:827
msgid "delete fully merged branch"
msgstr "ta bort helt sammanslagen gren"
-#: builtin/branch.c:822
+#: builtin/branch.c:828
msgid "delete branch (even if not merged)"
msgstr "ta bort gren (även om inte helt sammanslagen)"
-#: builtin/branch.c:823
+#: builtin/branch.c:829
msgid "move/rename a branch and its reflog"
msgstr "flytta/ta bort en gren och dess reflogg"
-#: builtin/branch.c:824
+#: builtin/branch.c:830
msgid "move/rename a branch, even if target exists"
msgstr "flytta/ta bort en gren, även om målet finns"
-#: builtin/branch.c:825
+#: builtin/branch.c:831
msgid "list branch names"
msgstr "lista namn på grenar"
-#: builtin/branch.c:826
+#: builtin/branch.c:832
msgid "create the branch's reflog"
msgstr "skapa grenens reflogg"
-#: builtin/branch.c:828
+#: builtin/branch.c:834
msgid "edit the description for the branch"
msgstr "redigera beskrivning för grenen"
-#: builtin/branch.c:829
+#: builtin/branch.c:835
msgid "force creation (when already exists)"
msgstr "tvinga skapande (när den redan finns)"
-#: builtin/branch.c:832
+#: builtin/branch.c:838
msgid "print only not merged branches"
msgstr "visa endast ej sammanslagna grenar"
-#: builtin/branch.c:838
+#: builtin/branch.c:844
msgid "print only merged branches"
msgstr "visa endast sammanslagna grenar"
-#: builtin/branch.c:842
+#: builtin/branch.c:848
msgid "list branches in columns"
msgstr "visa grenar i spalter"
-#: builtin/branch.c:855
+#: builtin/branch.c:861
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Misslyckades slå upp HEAD som giltig referens"
-#: builtin/branch.c:860 builtin/clone.c:630
+#: builtin/branch.c:866 builtin/clone.c:629
msgid "HEAD not found below refs/heads!"
msgstr "HEAD hittades inte under refs/heads!"
-#: builtin/branch.c:883
+#: builtin/branch.c:890
msgid "--column and --verbose are incompatible"
msgstr "--column och --verbose är inkompatibla"
-#: builtin/branch.c:889 builtin/branch.c:928
+#: builtin/branch.c:896 builtin/branch.c:935
msgid "branch name required"
msgstr "grennamn krävs"
-#: builtin/branch.c:904
+#: builtin/branch.c:911
msgid "Cannot give description to detached HEAD"
msgstr "Kan inte beskriva frånkopplad HEAD"
-#: builtin/branch.c:909
+#: builtin/branch.c:916
msgid "cannot edit description of more than one branch"
msgstr "kan inte redigera beskrivning för mer än en gren"
-#: builtin/branch.c:916
+#: builtin/branch.c:923
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Inga incheckningar på grenen \"%s\" ännu"
-#: builtin/branch.c:919
+#: builtin/branch.c:926
#, c-format
msgid "No branch named '%s'."
msgstr "Ingen gren vid namnet \"%s\"."
-#: builtin/branch.c:934
+#: builtin/branch.c:941
msgid "too many branches for a rename operation"
msgstr "för många grenar för namnbyte"
-#: builtin/branch.c:939
+#: builtin/branch.c:946
msgid "too many branches to set new upstream"
msgstr "för många grenar för att byta uppström"
-#: builtin/branch.c:943
+#: builtin/branch.c:950
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
"kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren."
-#: builtin/branch.c:946 builtin/branch.c:968 builtin/branch.c:990
+#: builtin/branch.c:953 builtin/branch.c:975 builtin/branch.c:997
#, c-format
msgid "no such branch '%s'"
msgstr "okänd gren \"%s\""
-#: builtin/branch.c:950
+#: builtin/branch.c:957
#, c-format
msgid "branch '%s' does not exist"
msgstr "grenen \"%s\" finns inte"
-#: builtin/branch.c:962
+#: builtin/branch.c:969
msgid "too many branches to unset upstream"
msgstr "för många grenar för att ta bort uppström"
-#: builtin/branch.c:966
+#: builtin/branch.c:973
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren."
-#: builtin/branch.c:972
+#: builtin/branch.c:979
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Grenen \"%s\" har ingen uppströmsinformation"
-#: builtin/branch.c:987
+#: builtin/branch.c:994
msgid "it does not make sense to create 'HEAD' manually"
msgstr "kan inte skapa \"HEAD\" manuellt"
-#: builtin/branch.c:993
+#: builtin/branch.c:1000
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
"flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett "
"grennamn"
-#: builtin/branch.c:996
+#: builtin/branch.c:1003
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -2907,7 +3082,7 @@ msgstr ""
"Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track "
"eller --set-upstream-to\n"
-#: builtin/branch.c:1013
+#: builtin/branch.c:1020
#, c-format
msgid ""
"\n"
@@ -2918,12 +3093,12 @@ msgstr ""
"Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n"
"\n"
-#: builtin/branch.c:1014
+#: builtin/branch.c:1021
#, c-format
msgid " git branch -d %s\n"
msgstr " git branch -d %s\n"
-#: builtin/branch.c:1015
+#: builtin/branch.c:1022
#, c-format
msgid " git branch --set-upstream-to %s\n"
msgstr " git branch --set-upstream-to %s\n"
@@ -2941,43 +3116,43 @@ msgstr "Behöver ett arkiv för att skapa ett paket (bundle)."
msgid "Need a repository to unbundle."
msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)."
-#: builtin/cat-file.c:285
+#: builtin/cat-file.c:312
msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
msgstr "git cat-file (-t|-s|-e|-p|<typ>|--textconv) <objekt>"
-#: builtin/cat-file.c:286
+#: builtin/cat-file.c:313
msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
msgstr "git cat-file (--batch|--batch-check) < <objektlista>"
-#: builtin/cat-file.c:323
+#: builtin/cat-file.c:350
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<typ> kan vara en av: blob, tree, commit, tag"
-#: builtin/cat-file.c:324
+#: builtin/cat-file.c:351
msgid "show object type"
msgstr "visa objekttyp"
-#: builtin/cat-file.c:325
+#: builtin/cat-file.c:352
msgid "show object size"
msgstr "visa objektstorlek"
-#: builtin/cat-file.c:327
+#: builtin/cat-file.c:354
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:328
+#: builtin/cat-file.c:355
msgid "pretty-print object's content"
msgstr "visa objektets innehåll snyggt"
-#: builtin/cat-file.c:330
+#: builtin/cat-file.c:357
msgid "for blob objects, run textconv on object's content"
msgstr "för blob-objekt, kör textconv på objektets innehåll"
-#: builtin/cat-file.c:332
+#: builtin/cat-file.c:359
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:335
+#: builtin/cat-file.c:362
msgid "show info about objects fed from the standard input"
msgstr "visa information för objekt som listas på standard in"
@@ -3002,10 +3177,10 @@ msgid "read file names from stdin"
msgstr "läs filnamn från standard in"
#: builtin/check-attr.c:23 builtin/check-ignore.c:24
-msgid "input paths are terminated by a null character"
-msgstr "sökvägar avdelas med null-tecken"
+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:1054 builtin/gc.c:177
+#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:259
msgid "suppress progress reporting"
msgstr "undertryck förloppsrapportering"
@@ -3013,27 +3188,31 @@ msgstr "undertryck förloppsrapportering"
msgid "show non-matching input paths"
msgstr "visa indatasökvägar som inte träffas"
-#: builtin/check-ignore.c:143
+#: builtin/check-ignore.c:28
+msgid "ignore index when checking"
+msgstr "ignorera index vid kontroll"
+
+#: builtin/check-ignore.c:154
msgid "cannot specify pathnames with --stdin"
msgstr "kan inte ange sökvägsnamn med --stdin"
-#: builtin/check-ignore.c:146
+#: builtin/check-ignore.c:157
msgid "-z only makes sense with --stdin"
msgstr "-z kan endast användas tillsammans med --stdin"
-#: builtin/check-ignore.c:148
+#: builtin/check-ignore.c:159
msgid "no path specified"
msgstr "ingen sökväg angavs"
-#: builtin/check-ignore.c:152
+#: builtin/check-ignore.c:163
msgid "--quiet is only valid with a single pathname"
msgstr "--quiet kan endast användas med ett enkelt sökvägsnamn"
-#: builtin/check-ignore.c:154
+#: builtin/check-ignore.c:165
msgid "cannot have both --quiet and --verbose"
msgstr "kan inte använda både --quiet och --verbose"
-#: builtin/check-ignore.c:157
+#: builtin/check-ignore.c:168
msgid "--non-matching is only valid with --verbose"
msgstr "--non-matching är endast giltig med --verbose"
@@ -3106,106 +3285,106 @@ msgstr "git checkout [flaggor] <gren>"
msgid "git checkout [options] [<branch>] -- <file>..."
msgstr "git checkout [flaggor] [<gren>] -- <fil>..."
-#: builtin/checkout.c:117 builtin/checkout.c:150
+#: builtin/checkout.c:114 builtin/checkout.c:147
#, c-format
msgid "path '%s' does not have our version"
msgstr "sökvägen \"%s\" har inte vår version"
-#: builtin/checkout.c:119 builtin/checkout.c:152
+#: builtin/checkout.c:116 builtin/checkout.c:149
#, c-format
msgid "path '%s' does not have their version"
msgstr "sökvägen \"%s\" har inte deras version"
-#: builtin/checkout.c:135
+#: builtin/checkout.c:132
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner"
-#: builtin/checkout.c:179
+#: builtin/checkout.c:176
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner"
-#: builtin/checkout.c:196
+#: builtin/checkout.c:193
#, c-format
msgid "path '%s': cannot merge"
msgstr "sökväg \"%s\": kan inte slå ihop"
-#: builtin/checkout.c:213
+#: builtin/checkout.c:210
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""
-#: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243
-#: builtin/checkout.c:246
+#: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238
+#: builtin/checkout.c:241
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar"
-#: builtin/checkout.c:249 builtin/checkout.c:252
+#: builtin/checkout.c:244 builtin/checkout.c:247
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "\"%s\" kan inte användas med %s"
-#: builtin/checkout.c:255
+#: builtin/checkout.c:250
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt."
-#: builtin/checkout.c:266 builtin/checkout.c:458
+#: builtin/checkout.c:261 builtin/checkout.c:451
msgid "corrupt index file"
msgstr "indexfilen är trasig"
-#: builtin/checkout.c:329 builtin/checkout.c:336
+#: builtin/checkout.c:322 builtin/checkout.c:329
#, c-format
msgid "path '%s' is unmerged"
msgstr "sökvägen \"%s\" har inte slagits ihop"
-#: builtin/checkout.c:480
+#: builtin/checkout.c:473
msgid "you need to resolve your current index first"
msgstr "du måste lösa ditt befintliga index först"
-#: builtin/checkout.c:601
+#: builtin/checkout.c:594
#, c-format
msgid "Can not do reflog for '%s'\n"
msgstr "Kan inte skapa referenslog för \"%s\"\n"
-#: builtin/checkout.c:639
+#: builtin/checkout.c:632
msgid "HEAD is now at"
msgstr "HEAD är nu på"
-#: builtin/checkout.c:646
+#: builtin/checkout.c:639
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Återställ gren \"%s\"\n"
-#: builtin/checkout.c:649
+#: builtin/checkout.c:642
#, c-format
msgid "Already on '%s'\n"
msgstr "Redan på \"%s\"\n"
-#: builtin/checkout.c:653
+#: builtin/checkout.c:646
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Växlade till och nollställde grenen \"%s\"\n"
-#: builtin/checkout.c:655 builtin/checkout.c:997
+#: builtin/checkout.c:648 builtin/checkout.c:1033
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Växlade till en ny gren \"%s\"\n"
-#: builtin/checkout.c:657
+#: builtin/checkout.c:650
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Växlade till grenen \"%s\"\n"
-#: builtin/checkout.c:713
+#: builtin/checkout.c:706
#, c-format
msgid " ... and %d more.\n"
msgstr " ... och %d till.\n"
#. The singular version
-#: builtin/checkout.c:719
+#: builtin/checkout.c:712
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -3228,7 +3407,7 @@ msgstr[1] ""
"\n"
"%s\n"
-#: builtin/checkout.c:737
+#: builtin/checkout.c:730
#, c-format
msgid ""
"If you want to keep them by creating a new branch, this may be a good time\n"
@@ -3243,136 +3422,140 @@ msgstr ""
" git branch nytt_grennamn %s\n"
"\n"
-#: builtin/checkout.c:767
+#: builtin/checkout.c:760
msgid "internal error in revision walk"
msgstr "internt fel vid genomgång av revisioner (revision walk)"
-#: builtin/checkout.c:771
+#: builtin/checkout.c:764
msgid "Previous HEAD position was"
msgstr "Tidigare position för HEAD var"
-#: builtin/checkout.c:798 builtin/checkout.c:992
+#: builtin/checkout.c:791 builtin/checkout.c:1028
msgid "You are on a branch yet to be born"
msgstr "Du är på en gren som ännu inte är född"
-#. case (1)
-#: builtin/checkout.c:928
+#: builtin/checkout.c:935
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "endast en referens förväntades, %d gavs."
+
+#: builtin/checkout.c:974
#, c-format
msgid "invalid reference: %s"
msgstr "felaktig referens: %s"
#. case (1): want a tree
-#: builtin/checkout.c:967
+#: builtin/checkout.c:1003
#, c-format
msgid "reference is not a tree: %s"
msgstr "referensen är inte ett träd: %s"
-#: builtin/checkout.c:1006
+#: builtin/checkout.c:1042
msgid "paths cannot be used with switching branches"
msgstr "sökvägar kan inte användas vid byte av gren"
-#: builtin/checkout.c:1009 builtin/checkout.c:1013
+#: builtin/checkout.c:1045 builtin/checkout.c:1049
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "\"%s\" kan inte användas vid byte av gren"
-#: builtin/checkout.c:1017 builtin/checkout.c:1020 builtin/checkout.c:1025
-#: builtin/checkout.c:1028
+#: builtin/checkout.c:1053 builtin/checkout.c:1056 builtin/checkout.c:1061
+#: builtin/checkout.c:1064
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "\"%s\" kan inte användas med \"%s\""
-#: builtin/checkout.c:1033
+#: builtin/checkout.c:1069
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Kan inte växla gren till icke-incheckningen \"%s\""
-#: builtin/checkout.c:1055 builtin/checkout.c:1057 builtin/clone.c:89
+#: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88
#: builtin/remote.c:169 builtin/remote.c:171
msgid "branch"
msgstr "gren"
-#: builtin/checkout.c:1056
+#: builtin/checkout.c:1092
msgid "create and checkout a new branch"
msgstr "skapa och checka ut en ny gren"
-#: builtin/checkout.c:1058
+#: builtin/checkout.c:1094
msgid "create/reset and checkout a branch"
msgstr "skapa/nollställ och checka ut en gren"
-#: builtin/checkout.c:1059
+#: builtin/checkout.c:1095
msgid "create reflog for new branch"
msgstr "skapa reflogg för ny gren"
-#: builtin/checkout.c:1060
+#: builtin/checkout.c:1096
msgid "detach the HEAD at named commit"
msgstr "koppla från HEAD vid namngiven incheckning"
-#: builtin/checkout.c:1061
+#: builtin/checkout.c:1097
msgid "set upstream info for new branch"
msgstr "sätt uppströmsinformation för ny gren"
-#: builtin/checkout.c:1063
+#: builtin/checkout.c:1099
msgid "new branch"
msgstr "ny gren"
-#: builtin/checkout.c:1063
+#: builtin/checkout.c:1099
msgid "new unparented branch"
msgstr "ny gren utan förälder"
-#: builtin/checkout.c:1064
+#: builtin/checkout.c:1100
msgid "checkout our version for unmerged files"
msgstr "checka ut vår version för ej sammanslagna filer"
-#: builtin/checkout.c:1066
+#: builtin/checkout.c:1102
msgid "checkout their version for unmerged files"
msgstr "checka ut deras version för ej sammanslagna filer"
-#: builtin/checkout.c:1068
+#: builtin/checkout.c:1104
msgid "force checkout (throw away local modifications)"
msgstr "tvinga utcheckning (kasta bort lokala ändringar)"
-#: builtin/checkout.c:1069
+#: builtin/checkout.c:1105
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:1070 builtin/merge.c:232
+#: builtin/checkout.c:1106 builtin/merge.c:232
msgid "update ignored files (default)"
msgstr "uppdatera ignorerade filer (standard)"
-#: builtin/checkout.c:1071 builtin/log.c:1208 parse-options.h:249
+#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:251
msgid "style"
msgstr "stil"
-#: builtin/checkout.c:1072
+#: builtin/checkout.c:1108
msgid "conflict style (merge or diff3)"
msgstr "konfliktstil (merge eller diff3)"
-#: builtin/checkout.c:1075
+#: builtin/checkout.c:1111
msgid "do not limit pathspecs to sparse entries only"
msgstr "begränsa inte sökvägar till endast glesa poster"
-#: builtin/checkout.c:1077
+#: builtin/checkout.c:1113
msgid "second guess 'git checkout no-such-branch'"
msgstr "förutspå \"git checkout gren-saknas\""
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1136
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B och --orphan är ömsesidigt uteslutande"
-#: builtin/checkout.c:1118
+#: builtin/checkout.c:1153
msgid "--track needs a branch name"
msgstr "--track behöver ett namn på en gren"
-#: builtin/checkout.c:1125
+#: builtin/checkout.c:1160
msgid "Missing branch name; try -b"
msgstr "Grennamn saknas; försök med -b"
-#: builtin/checkout.c:1160
+#: builtin/checkout.c:1197
msgid "invalid path specification"
msgstr "felaktig sökvägsangivelse"
-#: builtin/checkout.c:1167
+#: builtin/checkout.c:1204
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -3381,12 +3564,12 @@ msgstr ""
"Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt.\n"
"Ville du checka ut \"%s\" som inte kan lösas som en utcheckning?"
-#: builtin/checkout.c:1172
+#: builtin/checkout.c:1209
#, 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:1176
+#: builtin/checkout.c:1213
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -3394,39 +3577,39 @@ msgstr ""
"git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n"
"du checkar ut från indexet."
-#: builtin/clean.c:25
+#: builtin/clean.c:26
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <mönster>] [-x | -X] [--] "
"<sökvägar>..."
-#: builtin/clean.c:29
+#: builtin/clean.c:30
#, c-format
msgid "Removing %s\n"
msgstr "Tar bort %s\n"
-#: builtin/clean.c:30
+#: builtin/clean.c:31
#, c-format
msgid "Would remove %s\n"
msgstr "Skulle ta bort %s\n"
-#: builtin/clean.c:31
+#: builtin/clean.c:32
#, c-format
msgid "Skipping repository %s\n"
msgstr "Hoppar över arkivet %s\n"
-#: builtin/clean.c:32
+#: builtin/clean.c:33
#, c-format
msgid "Would skip repository %s\n"
msgstr "Skulle hoppa över arkivet %s\n"
-#: builtin/clean.c:33
+#: builtin/clean.c:34
#, c-format
msgid "failed to remove %s"
msgstr "misslyckades ta bort %s"
-#: builtin/clean.c:293
+#: builtin/clean.c:294
msgid ""
"Prompt help:\n"
"1 - select a numbered item\n"
@@ -3438,7 +3621,7 @@ msgstr ""
"foo - markera post baserad på unikt prefix\n"
" - (tomt) markera ingenting"
-#: builtin/clean.c:297
+#: builtin/clean.c:298
msgid ""
"Prompt help:\n"
"1 - select a single item\n"
@@ -3458,35 +3641,35 @@ msgstr ""
"* - välj alla poster\n"
" - (tomt) avsluta markering"
-#: builtin/clean.c:515
+#: builtin/clean.c:516
#, c-format
msgid "Huh (%s)?"
msgstr "Vadå (%s)?"
-#: builtin/clean.c:658
+#: builtin/clean.c:659
#, c-format
msgid "Input ignore patterns>> "
msgstr "Ange ignoreringsmönster>>"
-#: builtin/clean.c:695
+#: builtin/clean.c:696
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "VARNING: Hittar inte poster som motsvarar: %s"
-#: builtin/clean.c:716
+#: builtin/clean.c:717
msgid "Select items to delete"
msgstr "Välj poster att ta bort"
-#: builtin/clean.c:756
+#: builtin/clean.c:757
#, c-format
msgid "remove %s? "
msgstr "ta bort %s?"
-#: builtin/clean.c:781
+#: builtin/clean.c:782
msgid "Bye."
msgstr "Hej då."
-#: builtin/clean.c:789
+#: builtin/clean.c:790
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -3504,21 +3687,21 @@ msgstr ""
"help - denna skärm\n"
"? - hjälp för kommandoval"
-#: builtin/clean.c:816
+#: builtin/clean.c:817
msgid "*** Commands ***"
msgstr "*** Kommandon ***"
-#: builtin/clean.c:817
+#: builtin/clean.c:818
msgid "What now"
msgstr "Vad nu"
-#: builtin/clean.c:825
+#: builtin/clean.c:826
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Skulle ta bort följande post:"
msgstr[1] "Skulle ta bort följande poster:"
-#: builtin/clean.c:842
+#: builtin/clean.c:843
msgid "No more files to clean, exiting."
msgstr "Inga fler filer att städa, avslutar."
@@ -3538,8 +3721,8 @@ msgstr "städa interaktivt"
msgid "remove whole directories"
msgstr "ta bort hela kataloger"
-#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:716
-#: builtin/ls-files.c:493 builtin/name-rev.c:315 builtin/show-ref.c:186
+#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718
+#: builtin/ls-files.c:483 builtin/name-rev.c:315 builtin/show-ref.c:185
msgid "pattern"
msgstr "mönster"
@@ -3579,8 +3762,8 @@ msgstr ""
msgid "git clone [options] [--] <repo> [<dir>]"
msgstr "git clone [flaggor] [--] <arkiv> [<kat>]"
-#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:229
-#: builtin/push.c:462
+#: builtin/clone.c:64 builtin/fetch.c:96 builtin/merge.c:229
+#: builtin/push.c:474
msgid "force progress reporting"
msgstr "tvinga förloppsrapportering"
@@ -3592,123 +3775,123 @@ msgstr "skapa inte någon utcheckning"
msgid "create a bare repository"
msgstr "skapa ett naket (\"bare\") arkiv"
-#: builtin/clone.c:72
+#: builtin/clone.c:71
msgid "create a mirror repository (implies bare)"
msgstr "skapa ett spegelarkiv (implicerar \"bare\")"
-#: builtin/clone.c:74
+#: builtin/clone.c:73
msgid "to clone from a local repository"
msgstr "för att klona från ett lokalt arkiv"
-#: builtin/clone.c:76
+#: builtin/clone.c:75
msgid "don't use local hardlinks, always copy"
msgstr "skapa inte lokala hårda länkar, kopiera alltid"
-#: builtin/clone.c:78
+#: builtin/clone.c:77
msgid "setup as shared repository"
msgstr "skapa som ett delat arkiv"
-#: builtin/clone.c:80 builtin/clone.c:82
+#: builtin/clone.c:79 builtin/clone.c:81
msgid "initialize submodules in the clone"
msgstr "initiera undermoduler i klonen"
-#: builtin/clone.c:83 builtin/init-db.c:485
+#: builtin/clone.c:82 builtin/init-db.c:485
msgid "template-directory"
msgstr "mallkatalog"
-#: builtin/clone.c:84 builtin/init-db.c:486
+#: builtin/clone.c:83 builtin/init-db.c:486
msgid "directory from which templates will be used"
msgstr "katalog att använda mallar från"
-#: builtin/clone.c:86
+#: builtin/clone.c:85
msgid "reference repository"
msgstr "referensarkiv"
-#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr "namn"
-#: builtin/clone.c:88
+#: builtin/clone.c:87
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:90
+#: builtin/clone.c:89
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "checka ut <gren> istället för fjärrens HEAD"
-#: builtin/clone.c:92
+#: builtin/clone.c:91
msgid "path to git-upload-pack on the remote"
msgstr "sökväg till git-upload-pack på fjärren"
-#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:661
+#: builtin/clone.c:92 builtin/fetch.c:97 builtin/grep.c:663
msgid "depth"
msgstr "djup"
-#: builtin/clone.c:94
+#: builtin/clone.c:93
msgid "create a shallow clone of that depth"
msgstr "skapa en grund klon på detta djup"
-#: builtin/clone.c:96
+#: builtin/clone.c:95
msgid "clone only one branch, HEAD or --branch"
msgstr "klona endast en gren, HEAD eller --branch"
-#: builtin/clone.c:97 builtin/init-db.c:494
+#: builtin/clone.c:96 builtin/init-db.c:494
msgid "gitdir"
msgstr "gitkat"
-#: builtin/clone.c:98 builtin/init-db.c:495
+#: builtin/clone.c:97 builtin/init-db.c:495
msgid "separate git dir from working tree"
msgstr "separera gitkatalogen från arbetskatalogen"
-#: builtin/clone.c:99
+#: builtin/clone.c:98
msgid "key=value"
msgstr "nyckel=värde"
-#: builtin/clone.c:100
+#: builtin/clone.c:99
msgid "set config inside the new repository"
msgstr "ställ in konfiguration i det nya arkivet"
-#: builtin/clone.c:253
+#: builtin/clone.c:252
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."
-#: builtin/clone.c:316
+#: builtin/clone.c:315
#, c-format
msgid "failed to create directory '%s'"
msgstr "misslyckades skapa katalogen \"%s\""
-#: builtin/clone.c:318 builtin/diff.c:77
+#: builtin/clone.c:317 builtin/diff.c:77
#, c-format
msgid "failed to stat '%s'"
msgstr "misslyckades ta status på \"%s\""
-#: builtin/clone.c:320
+#: builtin/clone.c:319
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s finns och är ingen katalog"
-#: builtin/clone.c:334
+#: builtin/clone.c:333
#, c-format
msgid "failed to stat %s\n"
msgstr "misslyckades ta status på %s\n"
-#: builtin/clone.c:356
+#: builtin/clone.c:355
#, c-format
msgid "failed to create link '%s'"
msgstr "misslyckades skapa länken \"%s\""
-#: builtin/clone.c:360
+#: builtin/clone.c:359
#, c-format
msgid "failed to copy file to '%s'"
msgstr "misslyckades kopiera filen till \"%s\""
-#: builtin/clone.c:383
+#: builtin/clone.c:382 builtin/clone.c:559
#, c-format
msgid "done.\n"
msgstr "klart.\n"
-#: builtin/clone.c:396
+#: builtin/clone.c:395
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -3718,105 +3901,100 @@ msgstr ""
"Du kan inspektera det som checkades ut med \"git status\"\n"
"och försöka checka ut igen med \"git checkout -f HEAD\"\n"
-#: builtin/clone.c:475
+#: builtin/clone.c:474
#, 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:555
+#: builtin/clone.c:554
#, c-format
msgid "Checking connectivity... "
msgstr "Kontrollerar anslutning..."
-#: builtin/clone.c:558
+#: builtin/clone.c:557
msgid "remote did not send all necessary objects"
msgstr "fjärren sände inte alla nödvändiga objekt"
-#: builtin/clone.c:560
-#, c-format
-msgid "done\n"
-msgstr "klart\n"
-
-#: builtin/clone.c:621
+#: builtin/clone.c:620
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:652
+#: builtin/clone.c:651
msgid "unable to checkout working tree"
msgstr "kunde inte checka ut arbetskatalogen"
-#: builtin/clone.c:760
+#: builtin/clone.c:759
msgid "Too many arguments."
msgstr "För många argument."
-#: builtin/clone.c:764
+#: builtin/clone.c:763
msgid "You must specify a repository to clone."
msgstr "Du måste ange ett arkiv att klona."
-#: builtin/clone.c:775
+#: builtin/clone.c:774
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "flaggorna --bare och --origin %s är inkompatibla."
-#: builtin/clone.c:778
+#: builtin/clone.c:777
msgid "--bare and --separate-git-dir are incompatible."
msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
-#: builtin/clone.c:791
+#: builtin/clone.c:790
#, c-format
msgid "repository '%s' does not exist"
msgstr "arkivet \"%s\" finns inte"
-#: builtin/clone.c:796
+#: builtin/clone.c:795
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth ignoreras i lokala kloningar; använd file:// istället"
-#: builtin/clone.c:798
+#: builtin/clone.c:797
msgid "--local is ignored"
msgstr "--local ignoreras"
-#: builtin/clone.c:808
+#: builtin/clone.c:807
#, 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:818
+#: builtin/clone.c:817
#, c-format
msgid "working tree '%s' already exists."
msgstr "arbetsträdet \"%s\" finns redan."
-#: builtin/clone.c:831 builtin/clone.c:843
+#: builtin/clone.c:830 builtin/clone.c:842
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "kunde inte skapa inledande kataloger för \"%s\""
-#: builtin/clone.c:834
+#: builtin/clone.c:833
#, c-format
msgid "could not create work tree dir '%s'."
msgstr "kunde inte skapa arbetskatalogen \"%s\""
-#: builtin/clone.c:853
+#: builtin/clone.c:852
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klonar till ett naket arkiv \"%s\"...\n"
-#: builtin/clone.c:855
+#: builtin/clone.c:854
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klonar till \"%s\"...\n"
-#: builtin/clone.c:890
+#: builtin/clone.c:888
#, c-format
msgid "Don't know how to clone %s"
msgstr "Vet inte hur man klonar %s"
-#: builtin/clone.c:942
+#: builtin/clone.c:939 builtin/clone.c:947
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"
-#: builtin/clone.c:949
+#: builtin/clone.c:950
msgid "You appear to have cloned an empty repository."
msgstr "Du verkar ha klonat ett tomt arkiv."
@@ -3852,15 +4030,15 @@ msgstr "Spaltfyllnad mellan spalter"
msgid "--command must be the first argument"
msgstr "--command måste vara första argument"
-#: builtin/commit.c:35
+#: builtin/commit.c:36
msgid "git commit [options] [--] <pathspec>..."
msgstr "git commit [flaggor] [--] <sökväg>..."
-#: builtin/commit.c:40
+#: builtin/commit.c:41
msgid "git status [options] [--] <pathspec>..."
msgstr "git status [flaggor] [--] <sökväg>..."
-#: builtin/commit.c:45
+#: builtin/commit.c:46
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -3885,7 +4063,7 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: builtin/commit.c:57
+#: builtin/commit.c:58
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -3895,7 +4073,7 @@ msgstr ""
"blir den tom. Du kan köra kommandot på nytt med --allow-empty, eller\n"
"så kan du ta bort incheckningen helt med \"git reset HEAD^\".\n"
-#: builtin/commit.c:62
+#: builtin/commit.c:63
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -3909,11 +4087,11 @@ msgstr ""
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:69
+#: builtin/commit.c:70
msgid "Otherwise, please use 'git reset'\n"
msgstr "Använd annars \"git reset\"\n"
-#: builtin/commit.c:72
+#: builtin/commit.c:73
msgid ""
"If you wish to skip this commit, use:\n"
"\n"
@@ -3929,93 +4107,93 @@ msgstr ""
"\"git cherry-pick --continue\" kommer därefter att återuppta\n"
"cherry-pick för återstående incheckningar.\n"
-#: builtin/commit.c:279
+#: builtin/commit.c:287
msgid "failed to unpack HEAD tree object"
msgstr "misslyckades packa upp HEAD:s trädobjekt"
-#: builtin/commit.c:321
+#: builtin/commit.c:329
msgid "unable to create temporary index"
msgstr "kunde inte skapa temporär indexfil"
-#: builtin/commit.c:327
+#: builtin/commit.c:335
msgid "interactive add failed"
msgstr "interaktiv tilläggning misslyckades"
-#: builtin/commit.c:360 builtin/commit.c:381 builtin/commit.c:431
+#: builtin/commit.c:368 builtin/commit.c:389 builtin/commit.c:439
msgid "unable to write new_index file"
msgstr "kunde inte skriva filen new_index"
-#: builtin/commit.c:412
+#: builtin/commit.c:420
msgid "cannot do a partial commit during a merge."
msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
-#: builtin/commit.c:414
+#: builtin/commit.c:422
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:424
+#: builtin/commit.c:432
msgid "cannot read the index"
msgstr "kan inte läsa indexet"
-#: builtin/commit.c:444
+#: builtin/commit.c:452
msgid "unable to write temporary index file"
msgstr "kunde inte skriva temporär indexfil"
-#: builtin/commit.c:535 builtin/commit.c:541
+#: builtin/commit.c:543 builtin/commit.c:549
#, c-format
msgid "invalid commit: %s"
msgstr "felaktig incheckning: %s"
-#: builtin/commit.c:563
+#: builtin/commit.c:571
msgid "malformed --author parameter"
msgstr "felformad \"--author\"-flagga"
-#: builtin/commit.c:583
+#: builtin/commit.c:591
#, c-format
msgid "Malformed ident string: '%s'"
msgstr "Felaktig indragningssträng: \"%s\""
-#: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:982
+#: builtin/commit.c:630 builtin/commit.c:663 builtin/commit.c:1007
#, c-format
msgid "could not lookup commit %s"
msgstr "kunde inte slå upp incheckningen %s"
-#: builtin/commit.c:633 builtin/shortlog.c:271
+#: builtin/commit.c:642 builtin/shortlog.c:273
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(läser loggmeddelande från standard in)\n"
-#: builtin/commit.c:635
+#: builtin/commit.c:644
msgid "could not read log from standard input"
msgstr "kunde inte läsa logg från standard in"
-#: builtin/commit.c:639
+#: builtin/commit.c:648
#, c-format
msgid "could not read log file '%s'"
msgstr "kunde inte läsa loggfilen \"%s\""
-#: builtin/commit.c:645
+#: builtin/commit.c:654
msgid "commit has empty message"
msgstr "incheckningen har ett tomt meddelande"
-#: builtin/commit.c:661
+#: builtin/commit.c:670
msgid "could not read MERGE_MSG"
msgstr "kunde inte läsa MERGE_MSG"
-#: builtin/commit.c:665
+#: builtin/commit.c:674
msgid "could not read SQUASH_MSG"
msgstr "kunde inte läsa SQUASH_MSG"
-#: builtin/commit.c:669
+#: builtin/commit.c:678
#, c-format
msgid "could not read '%s'"
msgstr "kunde inte läsa \"%s\""
-#: builtin/commit.c:730
+#: builtin/commit.c:749
msgid "could not write commit template"
msgstr "kunde inte skriva incheckningsmall"
-#: builtin/commit.c:741
+#: builtin/commit.c:760
#, c-format
msgid ""
"\n"
@@ -4030,7 +4208,7 @@ msgstr ""
"\t%s\n"
"och försöker igen.\n"
-#: builtin/commit.c:746
+#: builtin/commit.c:765
#, c-format
msgid ""
"\n"
@@ -4045,7 +4223,7 @@ msgstr ""
"\t%s\n"
"och försöker igen.\n"
-#: builtin/commit.c:758
+#: builtin/commit.c:777
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -4055,7 +4233,7 @@ msgstr ""
"med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "
"incheckningen.\n"
-#: builtin/commit.c:763
+#: builtin/commit.c:782
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -4066,139 +4244,139 @@ msgstr ""
"med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n"
"Ett tomt meddelande avbryter incheckningen.\n"
-#: builtin/commit.c:776
+#: builtin/commit.c:795
#, c-format
msgid "%sAuthor: %s"
msgstr "%sFörfattare: %s"
-#: builtin/commit.c:783
+#: builtin/commit.c:802
#, c-format
msgid "%sCommitter: %s"
msgstr "%sIncheckare: %s"
-#: builtin/commit.c:803
+#: builtin/commit.c:822
msgid "Cannot read index"
msgstr "Kan inte läsa indexet"
-#: builtin/commit.c:845
+#: builtin/commit.c:865
msgid "Error building trees"
msgstr "Fel vid byggande av träd"
-#: builtin/commit.c:860 builtin/tag.c:359
+#: builtin/commit.c:880 builtin/tag.c:359
#, 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:957
+#: builtin/commit.c:982
#, c-format
msgid "No existing author found with '%s'"
msgstr "Hittade ingen befintlig författare med \"%s\""
-#: builtin/commit.c:972 builtin/commit.c:1208
+#: builtin/commit.c:997 builtin/commit.c:1237
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ogiltigt läge för ospårade filer: \"%s\""
-#: builtin/commit.c:1009
+#: builtin/commit.c:1034
msgid "--long and -z are incompatible"
msgstr "--long och -z är inkompatibla"
-#: builtin/commit.c:1039
+#: builtin/commit.c:1064
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:1050
+#: builtin/commit.c:1075
msgid "You have nothing to amend."
msgstr "Du har inget att utöka."
-#: builtin/commit.c:1053
+#: builtin/commit.c:1078
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:1055
+#: builtin/commit.c:1080
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:1058
+#: builtin/commit.c:1083
msgid "Options --squash and --fixup cannot be used together"
msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"
-#: builtin/commit.c:1068
+#: builtin/commit.c:1093
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:1070
+#: builtin/commit.c:1095
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:1078
+#: builtin/commit.c:1103
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:1095
+#: builtin/commit.c:1120
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:1097
+#: builtin/commit.c:1122
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:1099
+#: builtin/commit.c:1124
msgid "Clever... amending the last one with dirty index."
msgstr "Smart... utöka den senaste med smutsigt index."
-#: builtin/commit.c:1101
+#: builtin/commit.c:1126
msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..."
-#: builtin/commit.c:1111 builtin/tag.c:575
+#: builtin/commit.c:1136 builtin/tag.c:572
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Felaktigt städningsläge %s"
-#: builtin/commit.c:1116
+#: builtin/commit.c:1141
msgid "Paths with -a does not make sense."
msgstr "Kan inte ange sökvägar med -a."
-#: builtin/commit.c:1222 builtin/commit.c:1455
+#: builtin/commit.c:1251 builtin/commit.c:1482
msgid "show status concisely"
msgstr "visa koncis status"
-#: builtin/commit.c:1224 builtin/commit.c:1457
+#: builtin/commit.c:1253 builtin/commit.c:1484
msgid "show branch information"
msgstr "visa information om gren"
-#: builtin/commit.c:1226 builtin/commit.c:1459 builtin/push.c:452
+#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:460
msgid "machine-readable output"
msgstr "maskinläsbar utdata"
-#: builtin/commit.c:1229 builtin/commit.c:1461
+#: builtin/commit.c:1258 builtin/commit.c:1488
msgid "show status in long format (default)"
msgstr "visa status i långt format (standard)"
-#: builtin/commit.c:1232 builtin/commit.c:1464
+#: builtin/commit.c:1261 builtin/commit.c:1491
msgid "terminate entries with NUL"
msgstr "terminera poster med NUL"
-#: builtin/commit.c:1234 builtin/commit.c:1467 builtin/fast-export.c:667
-#: builtin/fast-export.c:670 builtin/tag.c:459
+#: builtin/commit.c:1263 builtin/commit.c:1494 builtin/fast-export.c:674
+#: builtin/fast-export.c:677 builtin/tag.c:459
msgid "mode"
msgstr "läge"
-#: builtin/commit.c:1235 builtin/commit.c:1467
+#: builtin/commit.c:1264 builtin/commit.c:1494
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:1238
+#: builtin/commit.c:1267
msgid "show ignored files"
msgstr "visa ignorerade filer"
-#: builtin/commit.c:1239 parse-options.h:154
+#: builtin/commit.c:1268 parse-options.h:156
msgid "when"
msgstr "när"
-#: builtin/commit.c:1240
+#: builtin/commit.c:1269
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -4206,217 +4384,217 @@ msgstr ""
"ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "
"(Default: all)"
-#: builtin/commit.c:1242
+#: builtin/commit.c:1271
msgid "list untracked files in columns"
msgstr "visa ospårade filer i spalter"
-#: builtin/commit.c:1313
+#: builtin/commit.c:1340
msgid "couldn't look up newly created commit"
msgstr "kunde inte slå upp en precis skapad incheckning"
-#: builtin/commit.c:1315
+#: builtin/commit.c:1342
msgid "could not parse newly created commit"
msgstr "kunde inte tolka en precis skapad incheckning"
-#: builtin/commit.c:1356
+#: builtin/commit.c:1383
msgid "detached HEAD"
msgstr "frånkopplad HEAD"
-#: builtin/commit.c:1358
+#: builtin/commit.c:1385
msgid " (root-commit)"
msgstr " (rotincheckning)"
-#: builtin/commit.c:1425
+#: builtin/commit.c:1452
msgid "suppress summary after successful commit"
msgstr "undertryck sammanfattning efter framgångsrik incheckning"
-#: builtin/commit.c:1426
+#: builtin/commit.c:1453
msgid "show diff in commit message template"
msgstr "visa diff i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1428
+#: builtin/commit.c:1455
msgid "Commit message options"
msgstr "Alternativ för incheckningsmeddelande"
-#: builtin/commit.c:1429 builtin/tag.c:457
+#: builtin/commit.c:1456 builtin/tag.c:457
msgid "read message from file"
msgstr "läs meddelande från fil"
-#: builtin/commit.c:1430
+#: builtin/commit.c:1457
msgid "author"
msgstr "författare"
-#: builtin/commit.c:1430
+#: builtin/commit.c:1457
msgid "override author for commit"
msgstr "överstyr författare för incheckningen"
-#: builtin/commit.c:1431 builtin/gc.c:178
+#: builtin/commit.c:1458 builtin/gc.c:260
msgid "date"
msgstr "datum"
-#: builtin/commit.c:1431
+#: builtin/commit.c:1458
msgid "override date for commit"
msgstr "överstyr datum för inchecknignen"
-#: builtin/commit.c:1432 builtin/merge.c:223 builtin/notes.c:405
+#: builtin/commit.c:1459 builtin/merge.c:223 builtin/notes.c:405
#: builtin/notes.c:562 builtin/tag.c:455
msgid "message"
msgstr "meddelande"
-#: builtin/commit.c:1432
+#: builtin/commit.c:1459
msgid "commit message"
msgstr "incheckningsmeddelande"
-#: builtin/commit.c:1433
+#: builtin/commit.c:1460
msgid "reuse and edit message from specified commit"
msgstr "återanvänd och redigera meddelande från angiven incheckning"
-#: builtin/commit.c:1434
+#: builtin/commit.c:1461
msgid "reuse message from specified commit"
msgstr "återanvänd meddelande från angiven incheckning"
-#: builtin/commit.c:1435
+#: builtin/commit.c:1462
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"använd autosquash-formaterat meddelande för att fixa angiven incheckning"
-#: builtin/commit.c:1436
+#: builtin/commit.c:1463
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:1437
+#: builtin/commit.c:1464
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:1438 builtin/log.c:1160 builtin/revert.c:111
+#: builtin/commit.c:1465 builtin/log.c:1180 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "lägg till Signed-off-by:"
-#: builtin/commit.c:1439
+#: builtin/commit.c:1466
msgid "use specified template file"
msgstr "använd angiven mallfil"
-#: builtin/commit.c:1440
+#: builtin/commit.c:1467
msgid "force edit of commit"
msgstr "tvinga redigering av incheckning"
-#: builtin/commit.c:1441
+#: builtin/commit.c:1468
msgid "default"
msgstr "standard"
-#: builtin/commit.c:1441 builtin/tag.c:460
+#: builtin/commit.c:1468 builtin/tag.c:460
msgid "how to strip spaces and #comments from message"
msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"
-#: builtin/commit.c:1442
+#: builtin/commit.c:1469
msgid "include status in commit message template"
msgstr "inkludera status i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1443 builtin/merge.c:230 builtin/tag.c:461
+#: builtin/commit.c:1470 builtin/merge.c:230 builtin/tag.c:461
msgid "key id"
msgstr "nyckel-id"
-#: builtin/commit.c:1444 builtin/merge.c:231
+#: builtin/commit.c:1471 builtin/merge.c:231
msgid "GPG sign commit"
msgstr "GPG-signera incheckning"
#. end commit message options
-#: builtin/commit.c:1447
+#: builtin/commit.c:1474
msgid "Commit contents options"
msgstr "Alternativ för incheckningens innehåll"
-#: builtin/commit.c:1448
+#: builtin/commit.c:1475
msgid "commit all changed files"
msgstr "checka in alla ändrade filer"
-#: builtin/commit.c:1449
+#: builtin/commit.c:1476
msgid "add specified files to index for commit"
msgstr "lägg till angivna filer till indexet för incheckning"
-#: builtin/commit.c:1450
+#: builtin/commit.c:1477
msgid "interactively add files"
msgstr "lägg till filer interaktivt"
-#: builtin/commit.c:1451
+#: builtin/commit.c:1478
msgid "interactively add changes"
msgstr "lägg till ändringar interaktivt"
-#: builtin/commit.c:1452
+#: builtin/commit.c:1479
msgid "commit only specified files"
msgstr "checka endast in angivna filer"
-#: builtin/commit.c:1453
+#: builtin/commit.c:1480
msgid "bypass pre-commit hook"
msgstr "förbigå pre-commit-krok"
-#: builtin/commit.c:1454
+#: builtin/commit.c:1481
msgid "show what would be committed"
msgstr "visa vad som skulle checkas in"
-#: builtin/commit.c:1465
+#: builtin/commit.c:1492
msgid "amend previous commit"
msgstr "lägg till föregående incheckning"
-#: builtin/commit.c:1466
+#: builtin/commit.c:1493
msgid "bypass post-rewrite hook"
msgstr "förbigå post-rewrite-krok"
-#: builtin/commit.c:1471
+#: builtin/commit.c:1498
msgid "ok to record an empty change"
msgstr "ok att registrera en tom ändring"
-#: builtin/commit.c:1474
+#: builtin/commit.c:1500
msgid "ok to record a change with an empty message"
msgstr "ok att registrera en ändring med tomt meddelande"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1529
msgid "could not parse HEAD commit"
msgstr "kunde inte tolka HEAD:s incheckning"
-#: builtin/commit.c:1545 builtin/merge.c:525
+#: builtin/commit.c:1567 builtin/merge.c:525
#, c-format
msgid "could not open '%s' for reading"
msgstr "kunde inte öppna \"%s\" för läsning"
-#: builtin/commit.c:1552
+#: builtin/commit.c:1574
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Trasig MERGE_HEAD-fil (%s)"
-#: builtin/commit.c:1559
+#: builtin/commit.c:1581
msgid "could not read MERGE_MODE"
msgstr "kunde inte läsa MERGE_MODE"
-#: builtin/commit.c:1578
+#: builtin/commit.c:1600
#, c-format
msgid "could not read commit message: %s"
msgstr "kunde inte läsa incheckningsmeddelande: %s"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1614
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1619
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"
-#: builtin/commit.c:1612 builtin/merge.c:861 builtin/merge.c:886
+#: builtin/commit.c:1634 builtin/merge.c:861 builtin/merge.c:886
msgid "failed to write commit object"
msgstr "kunde inte skriva incheckningsobjekt"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1655
msgid "cannot lock HEAD ref"
msgstr "kunde inte låsa HEAD-referens"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1659
msgid "cannot update HEAD ref"
msgstr "kunde inte uppdatera HEAD-referens"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1670
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full or quota is\n"
@@ -4427,127 +4605,131 @@ msgstr ""
"att kvoten inte har överskridits, och kör sedan\n"
"\"git reset HEAD\" för att återställa."
-#: builtin/config.c:7
+#: builtin/config.c:8
msgid "git config [options]"
msgstr "git config [flaggor]"
-#: builtin/config.c:52
+#: builtin/config.c:54
msgid "Config file location"
msgstr "Konfigurationsfilens plats"
-#: builtin/config.c:53
+#: builtin/config.c:55
msgid "use global config file"
msgstr "använd global konfigurationsfil"
-#: builtin/config.c:54
+#: builtin/config.c:56
msgid "use system config file"
msgstr "använd systemets konfigurationsfil"
-#: builtin/config.c:55
+#: builtin/config.c:57
msgid "use repository config file"
msgstr "använd arkivets konfigurationsfil"
-#: builtin/config.c:56
+#: builtin/config.c:58
msgid "use given config file"
msgstr "använd angiven konfigurationsil"
-#: builtin/config.c:57
+#: builtin/config.c:59
msgid "blob-id"
msgstr "blob-id"
-#: builtin/config.c:57
+#: builtin/config.c:59
msgid "read config from given blob object"
msgstr "läs konfiguration från givet blob-objekt"
-#: builtin/config.c:58
+#: builtin/config.c:60
msgid "Action"
msgstr "Åtgärd"
-#: builtin/config.c:59
+#: builtin/config.c:61
msgid "get value: name [value-regex]"
msgstr "hämta värde: namn [värde-reguttr]"
-#: builtin/config.c:60
+#: builtin/config.c:62
msgid "get all values: key [value-regex]"
msgstr "hämta alla värden: nyckel [värde-reguttr]"
-#: builtin/config.c:61
+#: builtin/config.c:63
msgid "get values for regexp: name-regex [value-regex]"
msgstr "hämta värden för reguttr: namn-reguttr [värde-reguttr]"
-#: builtin/config.c:62
+#: builtin/config.c:64
+msgid "get value specific for the URL: section[.var] URL"
+msgstr "hämta värde specifikt URL:en: sektion[.var] URL"
+
+#: builtin/config.c:65
msgid "replace all matching variables: name value [value_regex]"
msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]"
-#: builtin/config.c:63
+#: builtin/config.c:66
msgid "add a new variable: name value"
msgstr "lägg till en ny variabel: namn värde"
-#: builtin/config.c:64
+#: builtin/config.c:67
msgid "remove a variable: name [value-regex]"
msgstr "ta bort en variabel: namn [värde-reguttr]"
-#: builtin/config.c:65
+#: builtin/config.c:68
msgid "remove all matches: name [value-regex]"
msgstr "ta bort alla träffar: namn [värde-reguttr]"
-#: builtin/config.c:66
+#: builtin/config.c:69
msgid "rename section: old-name new-name"
msgstr "byt namn på sektion: gammalt-namn nytt-namn"
-#: builtin/config.c:67
+#: builtin/config.c:70
msgid "remove a section: name"
msgstr "ta bort en sektion: namn"
-#: builtin/config.c:68
+#: builtin/config.c:71
msgid "list all"
msgstr "visa alla"
-#: builtin/config.c:69
+#: builtin/config.c:72
msgid "open an editor"
msgstr "öppna textredigeringsprogram"
-#: builtin/config.c:70 builtin/config.c:71
+#: builtin/config.c:73 builtin/config.c:74
msgid "slot"
msgstr "plats"
-#: builtin/config.c:70
+#: builtin/config.c:73
msgid "find the color configured: [default]"
msgstr "hitta den inställda färgen: [default]"
-#: builtin/config.c:71
+#: builtin/config.c:74
msgid "find the color setting: [stdout-is-tty]"
msgstr "hitta färginställningen: [stdout-is-tty]"
-#: builtin/config.c:72
+#: builtin/config.c:75
msgid "Type"
msgstr "Typ"
-#: builtin/config.c:73
+#: builtin/config.c:76
msgid "value is \"true\" or \"false\""
msgstr "värdet är \"true\" eller \"false\""
-#: builtin/config.c:74
+#: builtin/config.c:77
msgid "value is decimal number"
msgstr "värdet är ett decimalt tal"
-#: builtin/config.c:75
+#: builtin/config.c:78
msgid "value is --bool or --int"
msgstr "värdet är --bool eller --int"
-#: builtin/config.c:76
+#: builtin/config.c:79
msgid "value is a path (file or directory name)"
msgstr "värdet är en sökväg (fil- eller katalognamn)"
-#: builtin/config.c:77
+#: builtin/config.c:80
msgid "Other"
msgstr "Andra"
-#: builtin/config.c:78
+#: builtin/config.c:81
msgid "terminate values with NUL byte"
msgstr "terminera värden med NUL-byte"
-#: builtin/config.c:79
+#: builtin/config.c:82
msgid "respect include directives on lookup"
msgstr "respektera inkluderingsdirektiv vid uppslag"
@@ -4732,39 +4914,39 @@ msgstr "ej hanterat objekt \"%s\" angavs."
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-flaggor]"
-#: builtin/fast-export.c:666
+#: builtin/fast-export.c:673
msgid "show progress after <n> objects"
msgstr "visa förlopp efter <n> objekt"
-#: builtin/fast-export.c:668
+#: builtin/fast-export.c:675
msgid "select handling of signed tags"
msgstr "välj hantering av signerade taggar"
-#: builtin/fast-export.c:671
+#: builtin/fast-export.c:678
msgid "select handling of tags that tag filtered objects"
msgstr "välj hantering av taggar som har taggfiltrerade objekt"
-#: builtin/fast-export.c:674
+#: builtin/fast-export.c:681
msgid "Dump marks to this file"
msgstr "Dump märken till filen"
-#: builtin/fast-export.c:676
+#: builtin/fast-export.c:683
msgid "Import marks from this file"
msgstr "Importera märken från filen"
-#: builtin/fast-export.c:678
+#: builtin/fast-export.c:685
msgid "Fake a tagger when tags lack one"
msgstr "Fejka taggare när taggen saknar en"
-#: builtin/fast-export.c:680
+#: builtin/fast-export.c:687
msgid "Output full tree for each commit"
msgstr "Skriv ut hela trädet för varje incheckning"
-#: builtin/fast-export.c:682
+#: builtin/fast-export.c:689
msgid "Use the done feature to terminate the stream"
msgstr "Använd done-funktionen för att avsluta strömmen"
-#: builtin/fast-export.c:683
+#: builtin/fast-export.c:690
msgid "Skip output of blob data"
msgstr "Hoppa över skrivning av blob-data"
@@ -4784,144 +4966,144 @@ msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]"
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<flaggor>]"
-#: builtin/fetch.c:60
+#: builtin/fetch.c:74
msgid "fetch from all remotes"
msgstr "hämta från alla fjärrar"
-#: builtin/fetch.c:62
+#: builtin/fetch.c:76
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:64
+#: builtin/fetch.c:78
msgid "path to upload pack on remote end"
msgstr "sökväg till upload pack på fjärren"
-#: builtin/fetch.c:65
+#: builtin/fetch.c:79
msgid "force overwrite of local branch"
msgstr "tvinga överskrivning av lokal gren"
-#: builtin/fetch.c:67
+#: builtin/fetch.c:81
msgid "fetch from multiple remotes"
msgstr "hämta från flera fjärrar"
-#: builtin/fetch.c:69
+#: builtin/fetch.c:83
msgid "fetch all tags and associated objects"
msgstr "hämta alla taggar och associerade objekt"
-#: builtin/fetch.c:71
+#: builtin/fetch.c:85
msgid "do not fetch all tags (--no-tags)"
msgstr "hämta inte alla taggar (--no-tags)"
-#: builtin/fetch.c:73
+#: builtin/fetch.c:87
msgid "prune remote-tracking branches no longer on remote"
msgstr "rensa fjärrspårande grenar ej längre på fjärren"
-#: builtin/fetch.c:74
+#: builtin/fetch.c:88
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:75
+#: builtin/fetch.c:89
msgid "control recursive fetching of submodules"
msgstr "styr rekursiv hämtning av undermoduler"
-#: builtin/fetch.c:79
+#: builtin/fetch.c:93
msgid "keep downloaded pack"
msgstr "behåll hämtade paket"
-#: builtin/fetch.c:81
+#: builtin/fetch.c:95
msgid "allow updating of HEAD ref"
msgstr "tillåt uppdatering av HEAD-referens"
-#: builtin/fetch.c:84
+#: builtin/fetch.c:98
msgid "deepen history of shallow clone"
msgstr "fördjupa historik för grund klon"
-#: builtin/fetch.c:86
+#: builtin/fetch.c:100
msgid "convert to a complete repository"
msgstr "konvertera till komplett arkiv"
-#: builtin/fetch.c:88 builtin/log.c:1177
+#: builtin/fetch.c:102 builtin/log.c:1197
msgid "dir"
msgstr "kat"
-#: builtin/fetch.c:89
+#: builtin/fetch.c:103
msgid "prepend this to submodule path output"
msgstr "lägg till i början av undermodulens sökvägsutdata"
-#: builtin/fetch.c:92
+#: builtin/fetch.c:106
msgid "default mode for recursion"
msgstr "standardläge för rekursion"
-#: builtin/fetch.c:220
+#: builtin/fetch.c:236
msgid "Couldn't find remote ref HEAD"
msgstr "Kunde inte hitta fjärr-referensen HEAD"
-#: builtin/fetch.c:273
+#: builtin/fetch.c:290
#, c-format
msgid "object %s not found"
msgstr "objektet %s hittades inte"
-#: builtin/fetch.c:278
+#: builtin/fetch.c:295
msgid "[up to date]"
msgstr "[àjour]"
-#: builtin/fetch.c:292
+#: builtin/fetch.c:309
#, c-format
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr "! %-*s %-*s -> %s (kan inte hämta i aktuell gren)"
-#: builtin/fetch.c:293 builtin/fetch.c:379
+#: builtin/fetch.c:310 builtin/fetch.c:396
msgid "[rejected]"
msgstr "[refuserad]"
-#: builtin/fetch.c:304
+#: builtin/fetch.c:321
msgid "[tag update]"
msgstr "[uppdaterad tagg]"
-#: builtin/fetch.c:306 builtin/fetch.c:341 builtin/fetch.c:359
+#: builtin/fetch.c:323 builtin/fetch.c:358 builtin/fetch.c:376
msgid " (unable to update local ref)"
msgstr " (kunde inte uppdatera lokal ref)"
-#: builtin/fetch.c:324
+#: builtin/fetch.c:341
msgid "[new tag]"
msgstr "[ny tagg]"
-#: builtin/fetch.c:327
+#: builtin/fetch.c:344
msgid "[new branch]"
msgstr "[ny gren]"
-#: builtin/fetch.c:330
+#: builtin/fetch.c:347
msgid "[new ref]"
msgstr "[ny ref]"
-#: builtin/fetch.c:375
+#: builtin/fetch.c:392
msgid "unable to update local ref"
msgstr "kunde inte uppdatera lokal ref"
-#: builtin/fetch.c:375
+#: builtin/fetch.c:392
msgid "forced update"
msgstr "tvingad uppdatering"
-#: builtin/fetch.c:381
+#: builtin/fetch.c:398
msgid "(non-fast-forward)"
msgstr "(ej snabbspolad)"
-#: builtin/fetch.c:412 builtin/fetch.c:718
+#: builtin/fetch.c:429 builtin/fetch.c:735
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kan inte öppna %s: %s\n"
-#: builtin/fetch.c:421
+#: builtin/fetch.c:438
#, 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:520
+#: builtin/fetch.c:537
#, c-format
msgid "From %.*s\n"
msgstr "Från %.*s\n"
-#: builtin/fetch.c:531
+#: builtin/fetch.c:548
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -4930,55 +5112,55 @@ msgstr ""
"vissa lokala referenser kunde inte uppdateras; testa att köra\n"
" \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt"
-#: builtin/fetch.c:581
+#: builtin/fetch.c:598
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s kommer bli dinglande)"
-#: builtin/fetch.c:582
+#: builtin/fetch.c:599
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s har blivit dinglande)"
-#: builtin/fetch.c:589
+#: builtin/fetch.c:606
msgid "[deleted]"
msgstr "[borttagen]"
-#: builtin/fetch.c:590 builtin/remote.c:1055
+#: builtin/fetch.c:607 builtin/remote.c:1055
msgid "(none)"
msgstr "(ingen)"
-#: builtin/fetch.c:708
+#: builtin/fetch.c:725
#, 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:742
-#, c-format
-msgid "Don't know how to fetch from %s"
-msgstr "Vet inte hur man hämtar från %s"
-
-#: builtin/fetch.c:823
+#: builtin/fetch.c:744
#, 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:826
+#: builtin/fetch.c:747
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Flaggan \"%s\" ignoreras för %s\n"
-#: builtin/fetch.c:928
+#: builtin/fetch.c:801
+#, c-format
+msgid "Don't know how to fetch from %s"
+msgstr "Vet inte hur man hämtar från %s"
+
+#: builtin/fetch.c:976
#, c-format
msgid "Fetching %s\n"
msgstr "Hämtar %s\n"
-#: builtin/fetch.c:930 builtin/remote.c:100
+#: builtin/fetch.c:978 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr "Kunde inte hämta %s"
-#: builtin/fetch.c:949
+#: builtin/fetch.c:997
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -4986,32 +5168,32 @@ msgstr ""
"Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"
"fjärrarkiv som nya incheckningar skall hämtas från."
-#: builtin/fetch.c:969
+#: builtin/fetch.c:1020
msgid "You need to specify a tag name."
msgstr "Du måste ange namnet på en tagg."
-#: builtin/fetch.c:1015
+#: builtin/fetch.c:1068
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth och --unshallow kan inte användas samtidigt"
-#: builtin/fetch.c:1017
+#: builtin/fetch.c:1070
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow kan inte användas på ett komplett arkiv"
-#: builtin/fetch.c:1036
+#: builtin/fetch.c:1089
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all tar inte namnet på ett arkiv som argument"
-#: builtin/fetch.c:1038
+#: builtin/fetch.c:1091
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kan inte anges med referensspecifikationer"
-#: builtin/fetch.c:1049
+#: builtin/fetch.c:1102
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Fjärren eller fjärrgruppen finns inte: %s"
-#: builtin/fetch.c:1057
+#: builtin/fetch.c:1110
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Kan inte hämta från grupp och ange referensspecifikationer"
@@ -5020,9 +5202,9 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
msgstr ""
"git fmt-merge-msg [-m <meddelande>] [--log[=<n>]|--no-log] [--file <fil>]"
-#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700
-#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:179
-#: builtin/tag.c:446 parse-options.h:133 parse-options.h:243
+#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702
+#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:178
+#: builtin/tag.c:446 parse-options.h:135 parse-options.h:245
msgid "n"
msgstr "n"
@@ -5046,117 +5228,121 @@ msgstr "inled meddelande med <text>"
msgid "file to read from"
msgstr "fil att läsa från"
-#: builtin/for-each-ref.c:979
+#: builtin/for-each-ref.c:995
msgid "git for-each-ref [options] [<pattern>]"
msgstr "git for-each-ref [flaggor] [<mönster>]"
-#: builtin/for-each-ref.c:994
+#: builtin/for-each-ref.c:1010
msgid "quote placeholders suitably for shells"
msgstr "citera platshållare passande för skal"
-#: builtin/for-each-ref.c:996
+#: builtin/for-each-ref.c:1012
msgid "quote placeholders suitably for perl"
msgstr "citera platshållare passande för perl"
-#: builtin/for-each-ref.c:998
+#: builtin/for-each-ref.c:1014
msgid "quote placeholders suitably for python"
msgstr "citera platshållare passande för python"
-#: builtin/for-each-ref.c:1000
+#: builtin/for-each-ref.c:1016
msgid "quote placeholders suitably for tcl"
msgstr "citera platshållare passande för tcl"
-#: builtin/for-each-ref.c:1003
+#: builtin/for-each-ref.c:1019
msgid "show only <n> matched refs"
msgstr "visa endast <n> träffade refs"
-#: builtin/for-each-ref.c:1004
+#: builtin/for-each-ref.c:1020
msgid "format"
msgstr "format"
-#: builtin/for-each-ref.c:1004
+#: builtin/for-each-ref.c:1020
msgid "format to use for the output"
msgstr "format att använda för utdata"
-#: builtin/for-each-ref.c:1005
+#: builtin/for-each-ref.c:1021
msgid "key"
msgstr "nyckel"
-#: builtin/for-each-ref.c:1006
+#: builtin/for-each-ref.c:1022
msgid "field name to sort on"
msgstr "fältnamn att sortera på"
-#: builtin/fsck.c:608
+#: builtin/fsck.c:607
msgid "git fsck [options] [<object>...]"
msgstr "git fsck [flaggor] [<objekt>...]"
-#: builtin/fsck.c:614
+#: builtin/fsck.c:613
msgid "show unreachable objects"
msgstr "visa onåbara objekt"
-#: builtin/fsck.c:615
+#: builtin/fsck.c:614
msgid "show dangling objects"
msgstr "visa dinglande objekt"
-#: builtin/fsck.c:616
+#: builtin/fsck.c:615
msgid "report tags"
msgstr "rapportera taggar"
-#: builtin/fsck.c:617
+#: builtin/fsck.c:616
msgid "report root nodes"
msgstr "rapportera rotnoder"
-#: builtin/fsck.c:618
+#: builtin/fsck.c:617
msgid "make index objects head nodes"
msgstr "gör indexojekt till huvudnoder"
-#: builtin/fsck.c:619
+#: builtin/fsck.c:618
msgid "make reflogs head nodes (default)"
msgstr "gör refloggar till huvudnoder (standard)"
-#: builtin/fsck.c:620
+#: builtin/fsck.c:619
msgid "also consider packs and alternate objects"
msgstr "ta även hänsyn till paket och alternativa objekt"
-#: builtin/fsck.c:621
+#: builtin/fsck.c:620
msgid "enable more strict checking"
msgstr "aktivera striktare kontroll"
-#: builtin/fsck.c:623
+#: builtin/fsck.c:622
msgid "write dangling objects in .git/lost-found"
msgstr "skriv dinglande objekt i .git/lost-found"
-#: builtin/fsck.c:624 builtin/prune.c:134
+#: builtin/fsck.c:623 builtin/prune.c:134
msgid "show progress"
msgstr "visa förlopp"
-#: builtin/gc.c:22
+#: builtin/gc.c:23
msgid "git gc [options]"
msgstr "git gc [flaggor]"
-#: builtin/gc.c:63
+#: builtin/gc.c:79
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Felaktigt %s: \"%s\""
-#: builtin/gc.c:90
+#: builtin/gc.c:106
#, c-format
msgid "insanely long object directory %.*s"
msgstr "tokigt lång objektkatalog %.*s"
-#: builtin/gc.c:179
+#: builtin/gc.c:261
msgid "prune unreferenced objects"
msgstr "rensa ej refererade objekt"
-#: builtin/gc.c:181
+#: builtin/gc.c:263
msgid "be more thorough (increased runtime)"
msgstr "var mer grundlig (ökar körtiden)"
-#: builtin/gc.c:182
+#: builtin/gc.c:264
msgid "enable auto-gc mode"
msgstr "aktivera auto-gc-läge"
-#: builtin/gc.c:222
+#: builtin/gc.c:265
+msgid "force running gc even if there may be another gc running"
+msgstr "tvinga gc-körning även om en annan gc kanske körs"
+
+#: builtin/gc.c:305
#, c-format
msgid ""
"Auto packing the repository for optimum performance. You may also\n"
@@ -5165,43 +5351,52 @@ msgstr ""
"Packar arkivet automatiskt för optimal prestanda. Du kan även\n"
"köra \"git gc\" manuellt. Se \"git help gc\" för mer information.\n"
-#: builtin/gc.c:249
+#. be quiet on --auto
+#: builtin/gc.c:315
+#, c-format
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgstr ""
+"gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte "
+"är fallet)"
+
+#: builtin/gc.c:340
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Det finns för många onåbara lösa objekt; kör \"git prune\" för att ta bort "
"dem."
-#: builtin/grep.c:22
+#: builtin/grep.c:23
msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [flaggor] [-e] <mönster> [<rev>...] [[--] <sökväg>...]"
-#: builtin/grep.c:217
+#: builtin/grep.c:218
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: misslyckades skapa tråd. %s"
-#: builtin/grep.c:364
+#: builtin/grep.c:365
#, c-format
msgid "Failed to chdir: %s"
msgstr "Kunde inte byta katalog (chdir): %s"
-#: builtin/grep.c:442 builtin/grep.c:477
+#: builtin/grep.c:443 builtin/grep.c:478
#, c-format
msgid "unable to read tree (%s)"
msgstr "kunde inte läsa träd (%s)"
-#: builtin/grep.c:492
+#: builtin/grep.c:493
#, c-format
msgid "unable to grep from object of type %s"
msgstr "Kunde inte \"grep\" från objekt av typen %s"
-#: builtin/grep.c:550
+#: builtin/grep.c:551
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "flaggan \"%c\" antar ett numeriskt värde"
-#: builtin/grep.c:567
+#: builtin/grep.c:568
#, c-format
msgid "cannot open '%s'"
msgstr "kan inte öppna \"%s\""
@@ -5243,158 +5438,162 @@ msgid "don't match patterns in binary files"
msgstr "träffa inte mönster i binärfiler"
#: builtin/grep.c:662
+msgid "process binary files with textconv filters"
+msgstr "hantera binärfiler med textconv-filter"
+
+#: builtin/grep.c:664
msgid "descend at most <depth> levels"
msgstr "gå som mest ned <djup> nivåer"
-#: builtin/grep.c:666
+#: builtin/grep.c:668
msgid "use extended POSIX regular expressions"
msgstr "använd utökade POSIX-reguljära uttryck"
-#: builtin/grep.c:669
+#: builtin/grep.c:671
msgid "use basic POSIX regular expressions (default)"
msgstr "använd grundläggande POSIX-reguljära uttryck (standard)"
-#: builtin/grep.c:672
+#: builtin/grep.c:674
msgid "interpret patterns as fixed strings"
msgstr "tolka mönster som fixerade strängar"
-#: builtin/grep.c:675
+#: builtin/grep.c:677
msgid "use Perl-compatible regular expressions"
msgstr "använd Perlkompatibla reguljära uttryck"
-#: builtin/grep.c:678
+#: builtin/grep.c:680
msgid "show line numbers"
msgstr "visa radnummer"
-#: builtin/grep.c:679
+#: builtin/grep.c:681
msgid "don't show filenames"
msgstr "visa inte filnamn"
-#: builtin/grep.c:680
+#: builtin/grep.c:682
msgid "show filenames"
msgstr "visa filnamn"
-#: builtin/grep.c:682
+#: builtin/grep.c:684
msgid "show filenames relative to top directory"
msgstr "visa filnamn relativa till toppkatalogen"
-#: builtin/grep.c:684
+#: builtin/grep.c:686
msgid "show only filenames instead of matching lines"
msgstr "visa endast filnamn istället för träffade rader"
-#: builtin/grep.c:686
+#: builtin/grep.c:688
msgid "synonym for --files-with-matches"
msgstr "synonym för --files-with-matches"
-#: builtin/grep.c:689
+#: builtin/grep.c:691
msgid "show only the names of files without match"
msgstr "visa endast namn på filer utan träffar"
-#: builtin/grep.c:691
+#: builtin/grep.c:693
msgid "print NUL after filenames"
msgstr "skriv NUL efter filnamn"
-#: builtin/grep.c:693
+#: builtin/grep.c:695
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:694
+#: builtin/grep.c:696
msgid "highlight matches"
msgstr "ljusmarkera träffar"
-#: builtin/grep.c:696
+#: builtin/grep.c:698
msgid "print empty line between matches from different files"
msgstr "skriv tomma rader mellan träffar från olika filer"
-#: builtin/grep.c:698
+#: builtin/grep.c:700
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:701
+#: builtin/grep.c:703
msgid "show <n> context lines before and after matches"
msgstr "visa <n> rader sammanhang före och efter träffar"
-#: builtin/grep.c:704
+#: builtin/grep.c:706
msgid "show <n> context lines before matches"
msgstr "visa <n> rader sammanhang före träffar"
-#: builtin/grep.c:706
+#: builtin/grep.c:708
msgid "show <n> context lines after matches"
msgstr "visa <n> rader sammanhang efter träffar"
-#: builtin/grep.c:707
+#: builtin/grep.c:709
msgid "shortcut for -C NUM"
msgstr "genväg för -C NUM"
-#: builtin/grep.c:710
+#: builtin/grep.c:712
msgid "show a line with the function name before matches"
msgstr "visa en rad med funktionsnamnet före träffen"
-#: builtin/grep.c:712
+#: builtin/grep.c:714
msgid "show the surrounding function"
msgstr "visa den omkringliggande funktionen"
-#: builtin/grep.c:715
+#: builtin/grep.c:717
msgid "read patterns from file"
msgstr "läs mönster från fil"
-#: builtin/grep.c:717
+#: builtin/grep.c:719
msgid "match <pattern>"
msgstr "träffa <mönster>"
-#: builtin/grep.c:719
+#: builtin/grep.c:721
msgid "combine patterns specified with -e"
msgstr "kombinera mönster som anges med -e"
-#: builtin/grep.c:731
+#: builtin/grep.c:733
msgid "indicate hit with exit status without output"
msgstr "ange träff med slutstatuskod utan utdata"
-#: builtin/grep.c:733
+#: builtin/grep.c:735
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:735
+#: builtin/grep.c:737
msgid "show parse tree for grep expression"
msgstr "visa analysträd för grep-uttryck"
-#: builtin/grep.c:739
+#: builtin/grep.c:741
msgid "pager"
msgstr "bläddrare"
-#: builtin/grep.c:739
+#: builtin/grep.c:741
msgid "show matching files in the pager"
msgstr "visa träffade filer i filbläddraren"
-#: builtin/grep.c:742
+#: builtin/grep.c:744
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"
-#: builtin/grep.c:743 builtin/show-ref.c:188
+#: builtin/grep.c:745 builtin/show-ref.c:187
msgid "show usage"
msgstr "visa användning"
-#: builtin/grep.c:810
+#: builtin/grep.c:812
msgid "no pattern given."
msgstr "inget mönster angavs."
-#: builtin/grep.c:865
+#: builtin/grep.c:870
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"
-#: builtin/grep.c:888
+#: builtin/grep.c:893
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached och --untracked kan inte användas med --no-index."
-#: builtin/grep.c:893
+#: builtin/grep.c:898
msgid "--no-index or --untracked cannot be used with revs."
msgstr "--no-index och --untracked kan inte användas med revisioner."
-#: builtin/grep.c:896
+#: builtin/grep.c:901
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:904
+#: builtin/grep.c:909
msgid "both --cached and trees are given."
msgstr "både --cached och träd angavs."
@@ -5649,8 +5848,8 @@ msgstr "allvarlig inflate-inkonsekvens"
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"
-#: builtin/index-pack.c:669 builtin/pack-objects.c:170
-#: builtin/pack-objects.c:262
+#: builtin/index-pack.c:669 builtin/pack-objects.c:171
+#: builtin/pack-objects.c:263
#, c-format
msgid "unable to read %s"
msgstr "kunde inte läsa %s"
@@ -5679,155 +5878,155 @@ msgstr "Fel i objekt"
msgid "Not all child objects of %s are reachable"
msgstr "Inte alla barnobjekt för %s kan nås"
-#: builtin/index-pack.c:838 builtin/index-pack.c:868
+#: builtin/index-pack.c:839 builtin/index-pack.c:869
msgid "failed to apply delta"
msgstr "misslyckades tillämpa delta"
-#: builtin/index-pack.c:1009
+#: builtin/index-pack.c:1010
msgid "Receiving objects"
msgstr "Tar emot objekt"
-#: builtin/index-pack.c:1009
+#: builtin/index-pack.c:1010
msgid "Indexing objects"
msgstr "Skapar index för objekt"
-#: builtin/index-pack.c:1035
+#: builtin/index-pack.c:1036
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "paketet är trasigt (SHA1 stämmer inte)"
-#: builtin/index-pack.c:1040
+#: builtin/index-pack.c:1041
msgid "cannot fstat packfile"
msgstr "kan inte utföra \"fstat\" på paketfil"
-#: builtin/index-pack.c:1043
+#: builtin/index-pack.c:1044
msgid "pack has junk at the end"
msgstr "paket har skräp i slutet"
-#: builtin/index-pack.c:1054
+#: builtin/index-pack.c:1055
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "förvirrad bortom vanvett i parse_pack_objects()"
-#: builtin/index-pack.c:1077
+#: builtin/index-pack.c:1078
msgid "Resolving deltas"
msgstr "Analyserar delta"
-#: builtin/index-pack.c:1087
+#: builtin/index-pack.c:1088
#, c-format
msgid "unable to create thread: %s"
msgstr "kunde inte skapa tråd: %s"
-#: builtin/index-pack.c:1129
+#: builtin/index-pack.c:1130
msgid "confusion beyond insanity"
msgstr "förvirrad bortom vanvett"
-#: builtin/index-pack.c:1137
+#: builtin/index-pack.c:1138
#, c-format
msgid "completed with %d local objects"
msgstr "slutfördes med %d lokala objekt"
-#: builtin/index-pack.c:1147
+#: builtin/index-pack.c:1148
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Oväntad svanschecksumma för %s (trasig disk?)"
-#: builtin/index-pack.c:1151
+#: builtin/index-pack.c:1152
#, 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:1176
+#: builtin/index-pack.c:1177
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1256
#, c-format
msgid "local object %s is corrupt"
msgstr "lokalt objekt %s är trasigt"
-#: builtin/index-pack.c:1279
+#: builtin/index-pack.c:1280
msgid "error while closing pack file"
msgstr "fel vid stängning av paketfil"
-#: builtin/index-pack.c:1292
+#: builtin/index-pack.c:1293
#, c-format
msgid "cannot write keep file '%s'"
msgstr "kan inte ta skriva \"keep\"-fil \"%s\""
-#: builtin/index-pack.c:1300
+#: builtin/index-pack.c:1301
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "akn inte stänga skriven \"keep\"-fil \"%s\""
-#: builtin/index-pack.c:1313
+#: builtin/index-pack.c:1314
msgid "cannot store pack file"
msgstr "kan inte spara paketfil"
-#: builtin/index-pack.c:1324
+#: builtin/index-pack.c:1325
msgid "cannot store index file"
msgstr "kan inte spara indexfil"
-#: builtin/index-pack.c:1357
+#: builtin/index-pack.c:1358
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "felaktig pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1363
+#: builtin/index-pack.c:1364
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "felaktigt antal trådar angivet (%d)"
-#: builtin/index-pack.c:1367 builtin/index-pack.c:1545
+#: builtin/index-pack.c:1368 builtin/index-pack.c:1546
#, c-format
msgid "no threads support, ignoring %s"
msgstr "trådstöd saknas, ignorerar %s"
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1426
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Kan inte öppna befintlig paketfil \"%s\""
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1428
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Kan inte öppna befintligt paket-idx-fil för \"%s\""
-#: builtin/index-pack.c:1474
+#: builtin/index-pack.c:1475
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "icke-delta: %d objekt"
msgstr[1] "icke-delta: %d objekt"
-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1482
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "kedjelängd = %d: %lu objekt"
msgstr[1] "kedjelängd = %d: %lu objekt"
-#: builtin/index-pack.c:1509
+#: builtin/index-pack.c:1510
msgid "Cannot come back to cwd"
msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"
-#: builtin/index-pack.c:1557 builtin/index-pack.c:1560
-#: builtin/index-pack.c:1572 builtin/index-pack.c:1576
+#: builtin/index-pack.c:1558 builtin/index-pack.c:1561
+#: builtin/index-pack.c:1573 builtin/index-pack.c:1577
#, c-format
msgid "bad %s"
msgstr "felaktig %s"
-#: builtin/index-pack.c:1590
+#: builtin/index-pack.c:1591
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin kan inte användas med --stdin"
-#: builtin/index-pack.c:1594 builtin/index-pack.c:1604
+#: builtin/index-pack.c:1595 builtin/index-pack.c:1605
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""
-#: builtin/index-pack.c:1613
+#: builtin/index-pack.c:1614
msgid "--verify with no packfile name given"
msgstr "--verify angavs utan paketfilnamn"
@@ -5916,11 +6115,6 @@ msgstr "kan inte hantera filtyp %d"
msgid "unable to move %s to %s"
msgstr "kan inte flytta %s till %s"
-#: builtin/init-db.c:363
-#, c-format
-msgid "Could not create git link %s"
-msgstr "Kunde inte skapa gitlänk %s"
-
#.
#. * TRANSLATORS: The first '%s' is either "Reinitialized
#. * existing" or "Initialized empty", the second " shared" or
@@ -5963,7 +6157,7 @@ msgstr "behörigheter"
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:493 builtin/prune-packed.c:75
+#: builtin/init-db.c:493 builtin/prune-packed.c:75 builtin/repack.c:155
msgid "be quiet"
msgstr "var tyst"
@@ -6003,381 +6197,381 @@ msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]\n"
msgid " or: git show [options] <object>..."
msgstr " eller: git show [flaggor] <objekt>..."
-#: builtin/log.c:124
+#: builtin/log.c:125
msgid "suppress diff output"
msgstr "undertryck diff-utdata"
-#: builtin/log.c:125
+#: builtin/log.c:126
msgid "show source"
msgstr "visa källkod"
-#: builtin/log.c:126
+#: builtin/log.c:127
msgid "Use mail map file"
msgstr "Använd e-postmappningsfil"
-#: builtin/log.c:127
+#: builtin/log.c:128
msgid "decorate options"
msgstr "dekoreringsflaggor"
-#: builtin/log.c:230
+#: builtin/log.c:231
#, c-format
msgid "Final output: %d %s\n"
msgstr "Slututdata: %d %s\n"
-#: builtin/log.c:453 builtin/log.c:545
+#: builtin/log.c:473 builtin/log.c:565
#, c-format
msgid "Could not read object %s"
msgstr "Kunde inte läsa objektet %s"
-#: builtin/log.c:569
+#: builtin/log.c:589
#, c-format
msgid "Unknown type: %d"
msgstr "Okänd typ: %d"
-#: builtin/log.c:669
+#: builtin/log.c:689
msgid "format.headers without value"
msgstr "format.headers utan värde"
-#: builtin/log.c:751
+#: builtin/log.c:771
msgid "name of output directory is too long"
msgstr "namnet på utdatakatalogen är för långt"
-#: builtin/log.c:767
+#: builtin/log.c:787
#, c-format
msgid "Cannot open patch file %s"
msgstr "Kan inte öppna patchfilen %s"
-#: builtin/log.c:781
+#: builtin/log.c:801
msgid "Need exactly one range."
msgstr "Behöver precis ett intervall."
-#: builtin/log.c:789
+#: builtin/log.c:809
msgid "Not a range."
msgstr "Inte ett intervall."
-#: builtin/log.c:891
+#: builtin/log.c:911
msgid "Cover letter needs email format"
msgstr "Omslagsbrevet behöver e-postformat"
-#: builtin/log.c:967
+#: builtin/log.c:987
#, c-format
msgid "insane in-reply-to: %s"
msgstr "tokigt in-reply-to: %s"
-#: builtin/log.c:995
+#: builtin/log.c:1015
msgid "git format-patch [options] [<since> | <revision range>]"
msgstr "git format-patch [flaggor] [<sedan> | <revisionsintervall>]"
-#: builtin/log.c:1040
+#: builtin/log.c:1060
msgid "Two output directories?"
msgstr "Två utdatakataloger?"
-#: builtin/log.c:1155
+#: builtin/log.c:1175
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:1158
+#: builtin/log.c:1178
msgid "use [PATCH] even with multiple patches"
msgstr "använd [PATCH] även för flera patchar"
-#: builtin/log.c:1162
+#: builtin/log.c:1182
msgid "print patches to standard out"
msgstr "skriv patcharna på stnadard ut"
-#: builtin/log.c:1164
+#: builtin/log.c:1184
msgid "generate a cover letter"
msgstr "generera ett följebrev"
-#: builtin/log.c:1166
+#: builtin/log.c:1186
msgid "use simple number sequence for output file names"
msgstr "använd enkel nummersekvens för utdatafilnamn"
-#: builtin/log.c:1167
+#: builtin/log.c:1187
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1168
+#: builtin/log.c:1188
msgid "use <sfx> instead of '.patch'"
msgstr "använd <sfx> istället för \".patch\""
-#: builtin/log.c:1170
+#: builtin/log.c:1190
msgid "start numbering patches at <n> instead of 1"
msgstr "börja numrera patchar på <n> istället för 1"
-#: builtin/log.c:1172
+#: builtin/log.c:1192
msgid "mark the series as Nth re-roll"
msgstr "markera serien som N:te försök"
-#: builtin/log.c:1174
+#: builtin/log.c:1194
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Använd [<prefix>] istället för [PATCH]"
-#: builtin/log.c:1177
+#: builtin/log.c:1197
msgid "store resulting files in <dir>"
msgstr "spara filerna i <katalog>"
-#: builtin/log.c:1180
+#: builtin/log.c:1200
msgid "don't strip/add [PATCH]"
msgstr "ta inte bort eller lägg till [PATCH]"
-#: builtin/log.c:1183
+#: builtin/log.c:1203
msgid "don't output binary diffs"
msgstr "skriv inte binära diffar"
-#: builtin/log.c:1185
+#: builtin/log.c:1205
msgid "don't include a patch matching a commit upstream"
msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"
-#: builtin/log.c:1187
+#: builtin/log.c:1207
msgid "show patch format instead of default (patch + stat)"
msgstr "visa patchformat istället för standard (patch + stat)"
-#: builtin/log.c:1189
+#: builtin/log.c:1209
msgid "Messaging"
msgstr "E-post"
-#: builtin/log.c:1190
+#: builtin/log.c:1210
msgid "header"
msgstr "huvud"
-#: builtin/log.c:1191
+#: builtin/log.c:1211
msgid "add email header"
msgstr "lägg till e-posthuvud"
-#: builtin/log.c:1192 builtin/log.c:1194
+#: builtin/log.c:1212 builtin/log.c:1214
msgid "email"
msgstr "epost"
-#: builtin/log.c:1192
+#: builtin/log.c:1212
msgid "add To: header"
msgstr "Lägg till mottagarhuvud (\"To:\")"
-#: builtin/log.c:1194
+#: builtin/log.c:1214
msgid "add Cc: header"
msgstr "Lägg till kopiehuvud (\"Cc:\")"
-#: builtin/log.c:1196
+#: builtin/log.c:1216
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1197
+#: builtin/log.c:1217
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:1199
+#: builtin/log.c:1219
msgid "message-id"
msgstr "meddelande-id"
-#: builtin/log.c:1200
+#: builtin/log.c:1220
msgid "make first mail a reply to <message-id>"
msgstr "Gör det första brevet ett svar till <meddelande-id>"
-#: builtin/log.c:1201 builtin/log.c:1204
+#: builtin/log.c:1221 builtin/log.c:1224
msgid "boundary"
msgstr "gräns"
-#: builtin/log.c:1202
+#: builtin/log.c:1222
msgid "attach the patch"
msgstr "bifoga patchen"
-#: builtin/log.c:1205
+#: builtin/log.c:1225
msgid "inline the patch"
msgstr "gör patchen ett inline-objekt"
-#: builtin/log.c:1209
+#: builtin/log.c:1229
msgid "enable message threading, styles: shallow, deep"
msgstr "aktivera brevtrådning, typer: shallow, deep"
-#: builtin/log.c:1211
+#: builtin/log.c:1231
msgid "signature"
msgstr "signatur"
-#: builtin/log.c:1212
+#: builtin/log.c:1232
msgid "add a signature"
msgstr "lägg till signatur"
-#: builtin/log.c:1214
+#: builtin/log.c:1233
msgid "don't print the patch filenames"
msgstr "visa inte filnamn för patchar"
-#: builtin/log.c:1288
+#: builtin/log.c:1307
#, c-format
msgid "invalid ident line: %s"
msgstr "ogiltig ident-rad: %s"
-#: builtin/log.c:1303
+#: builtin/log.c:1322
msgid "-n and -k are mutually exclusive."
msgstr "-n och -k kan inte användas samtidigt."
-#: builtin/log.c:1305
+#: builtin/log.c:1324
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix och -k kan inte användas samtidigt."
-#: builtin/log.c:1313
+#: builtin/log.c:1332
msgid "--name-only does not make sense"
msgstr "kan inte använda --name-only"
-#: builtin/log.c:1315
+#: builtin/log.c:1334
msgid "--name-status does not make sense"
msgstr "kan inte använda --name-status"
-#: builtin/log.c:1317
+#: builtin/log.c:1336
msgid "--check does not make sense"
msgstr "kan inte använda --check"
-#: builtin/log.c:1340
+#: builtin/log.c:1359
msgid "standard output, or directory, which one?"
msgstr "standard ut, eller katalog, vilken skall det vara?"
-#: builtin/log.c:1342
+#: builtin/log.c:1361
#, c-format
msgid "Could not create directory '%s'"
msgstr "Kunde inte skapa katalogen \"%s\""
-#: builtin/log.c:1490
+#: builtin/log.c:1509
msgid "Failed to create output files"
msgstr "Misslyckades skapa utdatafiler"
-#: builtin/log.c:1539
+#: builtin/log.c:1558
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"
-#: builtin/log.c:1594
+#: builtin/log.c:1613
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"
-#: builtin/log.c:1607 builtin/log.c:1609 builtin/log.c:1621
+#: builtin/log.c:1626 builtin/log.c:1628 builtin/log.c:1640
#, c-format
msgid "Unknown commit %s"
msgstr "Okänd incheckning %s"
-#: builtin/ls-files.c:408
+#: builtin/ls-files.c:398
msgid "git ls-files [options] [<file>...]"
msgstr "git ls-files [flaggor] [<fil>...]"
-#: builtin/ls-files.c:465
+#: builtin/ls-files.c:455
msgid "identify the file status with tags"
msgstr "identifiera filstatus med taggar"
-#: builtin/ls-files.c:467
+#: builtin/ls-files.c:457
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:469
+#: builtin/ls-files.c:459
msgid "show cached files in the output (default)"
msgstr "visa cachade filer i utdata (standard)"
-#: builtin/ls-files.c:471
+#: builtin/ls-files.c:461
msgid "show deleted files in the output"
msgstr "visa borttagna filer i utdata"
-#: builtin/ls-files.c:473
+#: builtin/ls-files.c:463
msgid "show modified files in the output"
msgstr "visa modifierade filer i utdata"
-#: builtin/ls-files.c:475
+#: builtin/ls-files.c:465
msgid "show other files in the output"
msgstr "visa andra filer i utdata"
-#: builtin/ls-files.c:477
+#: builtin/ls-files.c:467
msgid "show ignored files in the output"
msgstr "visa ignorerade filer i utdata"
-#: builtin/ls-files.c:480
+#: builtin/ls-files.c:470
msgid "show staged contents' object name in the output"
msgstr "visa köat innehålls objektnamn i utdata"
-#: builtin/ls-files.c:482
+#: builtin/ls-files.c:472
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:484
+#: builtin/ls-files.c:474
msgid "show 'other' directories' name only"
msgstr "visa endast namn för \"andra\" kataloger"
-#: builtin/ls-files.c:487
+#: builtin/ls-files.c:477
msgid "don't show empty directories"
msgstr "visa inte tomma kataloger"
-#: builtin/ls-files.c:490
+#: builtin/ls-files.c:480
msgid "show unmerged files in the output"
msgstr "visa ej sammanslagna filer i utdata"
-#: builtin/ls-files.c:492
+#: builtin/ls-files.c:482
msgid "show resolve-undo information"
msgstr "visa \"resolve-undo\"-information"
-#: builtin/ls-files.c:494
+#: builtin/ls-files.c:484
msgid "skip files matching pattern"
msgstr "hoppa över filer som motsvarar mönster"
-#: builtin/ls-files.c:497
+#: builtin/ls-files.c:487
msgid "exclude patterns are read from <file>"
msgstr "exkludera mönster som läses från <fil>"
-#: builtin/ls-files.c:500
+#: builtin/ls-files.c:490
msgid "read additional per-directory exclude patterns in <file>"
msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>"
-#: builtin/ls-files.c:502
+#: builtin/ls-files.c:492
msgid "add the standard git exclusions"
msgstr "lägg till git:s standardexkluderingar"
-#: builtin/ls-files.c:505
+#: builtin/ls-files.c:495
msgid "make the output relative to the project top directory"
msgstr "gör utdata relativ till projektets toppkatalog"
-#: builtin/ls-files.c:508
+#: builtin/ls-files.c:498
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:509
+#: builtin/ls-files.c:499
msgid "tree-ish"
msgstr "träd-igt"
-#: builtin/ls-files.c:510
+#: builtin/ls-files.c:500
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:512
+#: builtin/ls-files.c:502
msgid "show debugging data"
msgstr "visa felsökningsutdata"
-#: builtin/ls-tree.c:27
+#: builtin/ls-tree.c:28
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr "git ls-tree [<flaggor>] <träd-igt> [<sökväg>...]"
-#: builtin/ls-tree.c:125
+#: builtin/ls-tree.c:126
msgid "only show trees"
msgstr "visa endast träd"
-#: builtin/ls-tree.c:127
+#: builtin/ls-tree.c:128
msgid "recurse into subtrees"
msgstr "rekursera ner i underträd"
-#: builtin/ls-tree.c:129
+#: builtin/ls-tree.c:130
msgid "show trees when recursing"
msgstr "visa träd medan rekursering"
-#: builtin/ls-tree.c:132
+#: builtin/ls-tree.c:133
msgid "terminate entries with NUL byte"
msgstr "terminera poster med NUL-byte"
-#: builtin/ls-tree.c:133
+#: builtin/ls-tree.c:134
msgid "include object size"
msgstr "inkludera objektstorlek"
-#: builtin/ls-tree.c:135 builtin/ls-tree.c:137
+#: builtin/ls-tree.c:136 builtin/ls-tree.c:138
msgid "list only filenames"
msgstr "visa endast filnamn"
-#: builtin/ls-tree.c:140
+#: builtin/ls-tree.c:141
msgid "use full path names"
msgstr "använd fullständiga sökvägsnamn"
-#: builtin/ls-tree.c:142
+#: builtin/ls-tree.c:143
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)"
@@ -6453,7 +6647,7 @@ msgstr "avbryt om snabbspolning inte är möjlig"
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:219 builtin/notes.c:738 builtin/revert.c:114
+#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:89
msgid "strategy"
msgstr "strategi"
@@ -6822,76 +7016,86 @@ msgstr "tillåt saknade objekt"
msgid "allow creation of more than one tree"
msgstr "tillåt skapa mer än ett träd"
-#: builtin/mv.c:14
+#: builtin/mv.c:15
msgid "git mv [options] <source>... <destination>"
msgstr "git mv [flaggor] <källa>... <mål>"
-#: builtin/mv.c:64
+#: builtin/mv.c:67
msgid "force move/rename even if target exists"
msgstr "tvinga flytta/ändra namn även om målet finns"
-#: builtin/mv.c:65
+#: builtin/mv.c:68
msgid "skip move/rename errors"
msgstr "hoppa över fel vid flytt/namnändring"
-#: builtin/mv.c:108
+#: builtin/mv.c:113
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n"
-#: builtin/mv.c:112
+#: builtin/mv.c:117
msgid "bad source"
msgstr "felaktig källa"
-#: builtin/mv.c:115
+#: builtin/mv.c:120
msgid "can not move directory into itself"
msgstr "kan inte flytta katalog till sig själv"
-#: builtin/mv.c:118
+#: builtin/mv.c:123
msgid "cannot move directory over file"
msgstr "kan inte flytta katalog över fil"
-#: builtin/mv.c:128
+#: builtin/mv.c:129
+#, c-format
+msgid "Huh? Directory %s is in index and no submodule?"
+msgstr "Vad? Katalogen %s är i indexet och inte en undermodul?"
+
+#: builtin/mv.c:131 builtin/rm.c:318
+msgid "Please, stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+"Köa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta"
+
+#: builtin/mv.c:147
#, c-format
msgid "Huh? %.*s is in index?"
msgstr "Vad? %.*s är i indexet?"
-#: builtin/mv.c:140
+#: builtin/mv.c:159
msgid "source directory is empty"
msgstr "källkatalogen är tom"
-#: builtin/mv.c:171
+#: builtin/mv.c:191
msgid "not under version control"
msgstr "inte versionshanterad"
-#: builtin/mv.c:173
+#: builtin/mv.c:193
msgid "destination exists"
msgstr "destinationen finns"
-#: builtin/mv.c:181
+#: builtin/mv.c:201
#, c-format
msgid "overwriting '%s'"
msgstr "skriver över \"%s\""
-#: builtin/mv.c:184
+#: builtin/mv.c:204
msgid "Cannot overwrite"
msgstr "Kan inte skriva över"
-#: builtin/mv.c:187
+#: builtin/mv.c:207
msgid "multiple sources for the same target"
msgstr "flera källor för samma mål"
-#: builtin/mv.c:202
+#: builtin/mv.c:222
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, källa=%s, mål=%s"
-#: builtin/mv.c:212
+#: builtin/mv.c:232
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Byter namn på %s till %s\n"
-#: builtin/mv.c:215 builtin/remote.c:731
+#: builtin/mv.c:235 builtin/remote.c:731 builtin/repack.c:330
#, c-format
msgid "renaming '%s' failed"
msgstr "misslyckades byta namn på \"%s\""
@@ -6929,8 +7133,8 @@ msgid "read from stdin"
msgstr "läs från standard in"
#: builtin/name-rev.c:320
-msgid "allow to print `undefined` names"
-msgstr "tillåt att skriva \"odefinierade\" namn"
+msgid "allow to print `undefined` names (default)"
+msgstr "tillåt att skriva \"odefinierade\" namn (standard)"
#: builtin/name-rev.c:326
msgid "dereference tags in the input (internal use)"
@@ -7085,12 +7289,12 @@ msgstr "kunde inte skriva anteckningsobjekt"
msgid "The note contents has been left in %s"
msgstr "Anteckningens innehåll har lämnats kvar i %s"
-#: builtin/notes.c:248 builtin/tag.c:540
+#: builtin/notes.c:248 builtin/tag.c:537
#, c-format
msgid "cannot read '%s'"
msgstr "kunde inte läsa \"%s\""
-#: builtin/notes.c:250 builtin/tag.c:543
+#: builtin/notes.c:250 builtin/tag.c:540
#, c-format
msgid "could not open or read '%s'"
msgstr "kunde inte öppna eller läsa \"%s\""
@@ -7098,7 +7302,7 @@ msgstr "kunde inte öppna eller läsa \"%s\""
#: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318
#: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515
#: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637
-#: builtin/notes.c:839 builtin/tag.c:556
+#: builtin/notes.c:839 builtin/tag.c:553
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Kunde inte slå upp \"%s\" som en giltig referens."
@@ -7271,148 +7475,148 @@ msgstr "git pack-objects --stdout [flaggor...] [< reflista | < objektlista]"
msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
msgstr "git pack-objects [flaggor...] basnamn [< reflista | < objektlista]"
-#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
+#: builtin/pack-objects.c:184 builtin/pack-objects.c:187
#, c-format
msgid "deflate error (%d)"
msgstr "fel i deflate (%d)"
-#: builtin/pack-objects.c:2397
+#: builtin/pack-objects.c:2398
#, c-format
msgid "unsupported index version %s"
msgstr "indexversionen %s stöds ej"
-#: builtin/pack-objects.c:2401
+#: builtin/pack-objects.c:2402
#, c-format
msgid "bad index version '%s'"
msgstr "felaktig indexversion \"%s\""
-#: builtin/pack-objects.c:2424
+#: builtin/pack-objects.c:2425
#, c-format
msgid "option %s does not accept negative form"
msgstr "flaggan %s godtar inte negativ form"
-#: builtin/pack-objects.c:2428
+#: builtin/pack-objects.c:2429
#, c-format
msgid "unable to parse value '%s' for option %s"
msgstr "kunde inte tolka värdet \"%s\" för flaggan %s"
-#: builtin/pack-objects.c:2447
+#: builtin/pack-objects.c:2448
msgid "do not show progress meter"
msgstr "visa inte förloppsindikator"
-#: builtin/pack-objects.c:2449
+#: builtin/pack-objects.c:2450
msgid "show progress meter"
msgstr "visa förloppsindikator"
-#: builtin/pack-objects.c:2451
+#: builtin/pack-objects.c:2452
msgid "show progress meter during object writing phase"
msgstr "visa förloppsindikator under objektskrivningsfasen"
-#: builtin/pack-objects.c:2454
+#: builtin/pack-objects.c:2455
msgid "similar to --all-progress when progress meter is shown"
msgstr "som --all-progress när förloppsmätaren visas"
-#: builtin/pack-objects.c:2455
+#: builtin/pack-objects.c:2456
msgid "version[,offset]"
msgstr "version[,offset]"
-#: builtin/pack-objects.c:2456
+#: builtin/pack-objects.c:2457
msgid "write the pack index file in the specified idx format version"
msgstr "skriv paketindexfilen i angiven indexformatversion"
-#: builtin/pack-objects.c:2459
+#: builtin/pack-objects.c:2460
msgid "maximum size of each output pack file"
msgstr "maximal storlek på varje utdatapaketfil"
-#: builtin/pack-objects.c:2461
+#: builtin/pack-objects.c:2462
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorera lånade objekt från alternativa objektlager"
-#: builtin/pack-objects.c:2463
+#: builtin/pack-objects.c:2464
msgid "ignore packed objects"
msgstr "ignorera packade objekt"
-#: builtin/pack-objects.c:2465
+#: builtin/pack-objects.c:2466
msgid "limit pack window by objects"
msgstr "begränsa paketfönster efter objekt"
-#: builtin/pack-objects.c:2467
+#: builtin/pack-objects.c:2468
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:2469
+#: builtin/pack-objects.c:2470
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:2471
+#: builtin/pack-objects.c:2472
msgid "reuse existing deltas"
msgstr "återanvänd befintliga delta"
-#: builtin/pack-objects.c:2473
+#: builtin/pack-objects.c:2474
msgid "reuse existing objects"
msgstr "återanvänd befintliga objekt"
-#: builtin/pack-objects.c:2475
+#: builtin/pack-objects.c:2476
msgid "use OFS_DELTA objects"
msgstr "använd OFS_DELTA-objekt"
-#: builtin/pack-objects.c:2477
+#: builtin/pack-objects.c:2478
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:2479
+#: builtin/pack-objects.c:2480
msgid "do not create an empty pack output"
msgstr "försök inte skapa tom paketutdata"
-#: builtin/pack-objects.c:2481
+#: builtin/pack-objects.c:2482
msgid "read revision arguments from standard input"
msgstr "läs revisionsargument från standard in"
-#: builtin/pack-objects.c:2483
+#: builtin/pack-objects.c:2484
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:2486
+#: builtin/pack-objects.c:2487
msgid "include objects reachable from any reference"
msgstr "inkludera objekt som kan nås från någon referens"
-#: builtin/pack-objects.c:2489
+#: builtin/pack-objects.c:2490
msgid "include objects referred by reflog entries"
msgstr "inkludera objekt som refereras från referensloggposter"
-#: builtin/pack-objects.c:2492
+#: builtin/pack-objects.c:2493
msgid "output pack to stdout"
msgstr "skriv paket på standard ut"
-#: builtin/pack-objects.c:2494
+#: builtin/pack-objects.c:2495
msgid "include tag objects that refer to objects to be packed"
msgstr "inkludera taggobjekt som refererar objekt som skall packas"
-#: builtin/pack-objects.c:2496
+#: builtin/pack-objects.c:2497
msgid "keep unreachable objects"
msgstr "behåll onåbara objekt"
-#: builtin/pack-objects.c:2497 parse-options.h:141
+#: builtin/pack-objects.c:2498 parse-options.h:143
msgid "time"
msgstr "tid"
-#: builtin/pack-objects.c:2498
+#: builtin/pack-objects.c:2499
msgid "unpack unreachable objects newer than <time>"
msgstr "packa upp onåbara objekt nyare än <tid>"
-#: builtin/pack-objects.c:2501
+#: builtin/pack-objects.c:2502
msgid "create thin packs"
msgstr "skapa tunna paket"
-#: builtin/pack-objects.c:2503
+#: builtin/pack-objects.c:2504
msgid "ignore packs that have companion .keep file"
msgstr "ignorera paket som har tillhörande .keep-fil"
-#: builtin/pack-objects.c:2505
+#: builtin/pack-objects.c:2506
msgid "pack compression level"
msgstr "komprimeringsgrad för paket"
-#: builtin/pack-objects.c:2507
+#: builtin/pack-objects.c:2508
msgid "do not hide commits by grafts"
msgstr "göm inte incheckningar med ympningar (\"grafts\")"
@@ -7452,15 +7656,15 @@ msgstr "låt tid gå ut för objekt äldre än <tid>"
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<flaggor>] [<arkiv> [<refspec>...]]"
-#: builtin/push.c:45
+#: builtin/push.c:47
msgid "tag shorthand without <tag>"
msgstr "taggförkortning utan <tagg>"
-#: builtin/push.c:64
+#: builtin/push.c:66
msgid "--delete only accepts plain target ref names"
msgstr "--delete godtar endast enkla målreferensnamn"
-#: builtin/push.c:99
+#: builtin/push.c:101
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -7469,7 +7673,7 @@ msgstr ""
"För att välja ett av alternativen permanent, se push.default i \"git help "
"config\"."
-#: builtin/push.c:102
+#: builtin/push.c:104
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -7494,7 +7698,7 @@ msgstr ""
" git push %s %s\n"
"%s"
-#: builtin/push.c:117
+#: builtin/push.c:119
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -7509,7 +7713,7 @@ msgstr ""
"\n"
" git push %s HEAD:<namn-på-fjärrgren>\n"
-#: builtin/push.c:131
+#: builtin/push.c:133
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -7522,12 +7726,12 @@ msgstr ""
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:139
+#: builtin/push.c:141
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr "Den aktuella grenen %s har flera uppströmsgrenar, vägrar sända."
-#: builtin/push.c:142
+#: builtin/push.c:144
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -7538,7 +7742,7 @@ msgstr ""
"aktuella grenen \"%s\", utan att tala om för mig vad som\n"
"skall sändas för att uppdatera fjärrgrenen."
-#: builtin/push.c:165
+#: builtin/push.c:167
msgid ""
"push.default is unset; its implicit value is changing in\n"
"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
@@ -7572,14 +7776,14 @@ msgstr ""
"liknande läget \"current\" istället för \"simple\" om du ibland använder\n"
"äldre versioner av Git.)"
-#: builtin/push.c:225
+#: builtin/push.c:227
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"Du angav inga referensspecifikationer att sända, och push.default är "
"\"nothing\"."
-#: builtin/push.c:232
+#: builtin/push.c:234
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -7591,7 +7795,7 @@ msgstr ""
"\"git pull ....\") innan du sänder igen.\n"
"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."
-#: builtin/push.c:238
+#: builtin/push.c:240
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. If you did not intend to push that branch, you may want to\n"
@@ -7605,7 +7809,7 @@ msgstr ""
"endast\n"
"sända aktuell gren."
-#: builtin/push.c:244
+#: builtin/push.c:246
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
@@ -7617,7 +7821,7 @@ msgstr ""
"\"git pull ...\") innan du sänder igen.\n"
"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."
-#: builtin/push.c:250
+#: builtin/push.c:252
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
@@ -7631,11 +7835,11 @@ msgstr ""
"(t.ex. \"git pull ...\") innan du sänder igen.\n"
"Se avsnittet \"Note about fast-forwards\" i \"git push --help\" för detaljer."
-#: builtin/push.c:257
+#: builtin/push.c:259
msgid "Updates were rejected because the tag already exists in the remote."
msgstr "Uppdateringarna avvisades eftersom taggen redan finns på fjärren."
-#: builtin/push.c:260
+#: builtin/push.c:262
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
@@ -7646,22 +7850,22 @@ msgstr ""
"pekar på något som inte är en incheckning, utan att använda flaggan\n"
"\"--force\".\n"
-#: builtin/push.c:320
+#: builtin/push.c:328
#, c-format
msgid "Pushing to %s\n"
msgstr "Sänder till %s\n"
-#: builtin/push.c:324
+#: builtin/push.c:332
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "misslyckades sända vissa referenser till \"%s\""
-#: builtin/push.c:357
+#: builtin/push.c:365
#, c-format
msgid "bad repository '%s'"
msgstr "felaktigt arkiv \"%s\""
-#: builtin/push.c:358
+#: builtin/push.c:366
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -7682,87 +7886,95 @@ msgstr ""
"\n"
" git push <namn>\n"
-#: builtin/push.c:373
+#: builtin/push.c:381
msgid "--all and --tags are incompatible"
msgstr "--all och --tags är inkompatibla"
-#: builtin/push.c:374
+#: builtin/push.c:382
msgid "--all can't be combined with refspecs"
msgstr "--all kan inte kombineras med referensspecifikationer"
-#: builtin/push.c:379
+#: builtin/push.c:387
msgid "--mirror and --tags are incompatible"
msgstr "--mirror och --tags är inkompatibla"
-#: builtin/push.c:380
+#: builtin/push.c:388
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror kan inte kombineras med referensspecifikationer"
-#: builtin/push.c:385
+#: builtin/push.c:393
msgid "--all and --mirror are incompatible"
msgstr "--all och --mirror är inkompatibla"
-#: builtin/push.c:445
+#: builtin/push.c:453
msgid "repository"
msgstr "arkiv"
-#: builtin/push.c:446
+#: builtin/push.c:454
msgid "push all refs"
msgstr "sänd alla referenser"
-#: builtin/push.c:447
+#: builtin/push.c:455
msgid "mirror all refs"
msgstr "spegla alla referenser"
-#: builtin/push.c:449
+#: builtin/push.c:457
msgid "delete refs"
msgstr "ta bort referenser"
-#: builtin/push.c:450
+#: builtin/push.c:458
msgid "push tags (can't be used with --all or --mirror)"
msgstr "sänd taggar (kan inte användas med --all eller --mirror)"
-#: builtin/push.c:453
+#: builtin/push.c:461
msgid "force updates"
msgstr "tvinga uppdateringar"
-#: builtin/push.c:454
+#: builtin/push.c:463
+msgid "refname>:<expect"
+msgstr "refnamn>:<förvänta"
+
+#: builtin/push.c:464
+msgid "require old value of ref to be at this value"
+msgstr "kräv att ref:s tidigare värde är detta"
+
+#: builtin/push.c:466
msgid "check"
msgstr "kontrollera"
-#: builtin/push.c:455
+#: builtin/push.c:467
msgid "control recursive pushing of submodules"
msgstr "styr rekursiv insändning av undermoduler"
-#: builtin/push.c:457
+#: builtin/push.c:469
msgid "use thin pack"
msgstr "använd tunna paket"
-#: builtin/push.c:458 builtin/push.c:459
+#: builtin/push.c:470 builtin/push.c:471
msgid "receive pack program"
msgstr "program för att ta emot paket"
-#: builtin/push.c:460
+#: builtin/push.c:472
msgid "set upstream for git pull/status"
msgstr "ställ in uppström för git pull/status"
-#: builtin/push.c:463
+#: builtin/push.c:475
msgid "prune locally removed refs"
msgstr "ta bort lokalt borttagna referenser"
-#: builtin/push.c:465
+#: builtin/push.c:477
msgid "bypass pre-push hook"
msgstr "förbigå pre-push-krok"
-#: builtin/push.c:466
+#: builtin/push.c:478
msgid "push missing but relevant tags"
msgstr "sänd in saknade men relevanta taggar"
-#: builtin/push.c:476
+#: builtin/push.c:488
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete är imkompatibel med --all, --mirror och --tags"
-#: builtin/push.c:478
+#: builtin/push.c:490
msgid "--delete doesn't make sense without any refs"
msgstr "--delete kan inte användas utan referenser"
@@ -7840,12 +8052,12 @@ msgstr "hoppa över att applicera filter för gles utcheckning"
msgid "debug unpack-trees"
msgstr "felsök unpack-trees"
-#: builtin/reflog.c:500
+#: builtin/reflog.c:499
#, c-format
msgid "%s' for '%s' is not a valid timestamp"
msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel"
-#: builtin/reflog.c:616 builtin/reflog.c:621
+#: builtin/reflog.c:615 builtin/reflog.c:620
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "\"%s\" är inte en giltig tidsstämpel"
@@ -7870,9 +8082,9 @@ msgstr "git remote rename <gammal> <ny>"
msgid "git remote remove <name>"
msgstr "git remote remove <namn>"
-#: builtin/remote.c:15 builtin/remote.c:42
-msgid "git remote set-head <name> (-a | -d | <branch>)"
-msgstr "git remote set-head <namn> (-a | -d | <gren>)"
+#: builtin/remote.c:15
+msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
+msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)"
#: builtin/remote.c:16
msgid "git remote [-v | --verbose] show [-n] <name>"
@@ -7908,6 +8120,10 @@ msgstr "git remote set-url --delete <namn> <url>"
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<flaggor>] <namn> <url>"
+#: builtin/remote.c:42
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)"
+
#: builtin/remote.c:47
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <namn> <gren>..."
@@ -8344,6 +8560,67 @@ msgstr "Kommer inte ta bort alla icke-sänd-URL:er"
msgid "be verbose; must be placed before a subcommand"
msgstr "var pratsam; måste skrivas före ett underkommando"
+#: builtin/repack.c:15
+msgid "git repack [options]"
+msgstr "git repack [flaggor]"
+
+#: builtin/repack.c:143
+msgid "pack everything in a single pack"
+msgstr "packa allt i ett enda paket"
+
+#: builtin/repack.c:145
+msgid "same as -a, and turn unreachable objects loose"
+msgstr "samma som -a, och gör onåbara objekt lösa"
+
+#: builtin/repack.c:148
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr "ta bort överflödiga paket, och kör git-prune-packed"
+
+#: builtin/repack.c:150
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr "sänd --no-reuse-delta till git-pack-objects"
+
+#: builtin/repack.c:152
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr "sänd --no-reuse-object till git-pack-objects"
+
+#: builtin/repack.c:154
+msgid "do not run git-update-server-info"
+msgstr "kör inte git-update-server-info"
+
+#: builtin/repack.c:157
+msgid "pass --local to git-pack-objects"
+msgstr "sänd --local till git-pack-objects"
+
+#: builtin/repack.c:158
+msgid "approxidate"
+msgstr "cirkadatum"
+
+#: builtin/repack.c:159
+msgid "with -A, do not loosen objects older than this"
+msgstr "med -A, lös inte upp objekt äldre än detta"
+
+#: builtin/repack.c:161
+msgid "size of the window used for delta compression"
+msgstr "storlek på fönster använt för deltakomprimering"
+
+#: builtin/repack.c:163
+msgid "same as the above, but limit memory size instead of entries count"
+msgstr "samma som ovan, men begränsa minnesstorleken istället för postantal"
+
+#: builtin/repack.c:165
+msgid "limits the maximum delta depth"
+msgstr "begränsa maximalt deltadjup"
+
+#: builtin/repack.c:167
+msgid "maximum size of each packfile"
+msgstr "maximal storlek på varje paketfil"
+
+#: builtin/repack.c:345
+#, c-format
+msgid "removing '%s' failed"
+msgstr "misslyckades ta bort \"%s\""
+
#: builtin/replace.c:17
msgid "git replace [-f] <object> <replacement>"
msgstr "git replace [-f] <objekt> <ersättning>"
@@ -8356,23 +8633,23 @@ msgstr "git replace -d <objekt>..."
msgid "git replace -l [<pattern>]"
msgstr "git replace -l [<mönster>]"
-#: builtin/replace.c:121
+#: builtin/replace.c:131
msgid "list replace refs"
msgstr "visa ersättningsreferenser"
-#: builtin/replace.c:122
+#: builtin/replace.c:132
msgid "delete replace refs"
msgstr "ta bort ersättningsreferenser"
-#: builtin/replace.c:123
+#: builtin/replace.c:133
msgid "replace the ref if it exists"
msgstr "ersätt referensen om den finns"
-#: builtin/rerere.c:11
+#: builtin/rerere.c:12
msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]"
-#: builtin/rerere.c:56
+#: builtin/rerere.c:57
msgid "register clean resolutions in index"
msgstr "registrera rena lösningar i indexet"
@@ -8433,70 +8710,70 @@ msgstr "HEAD är nu på %s"
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning."
-#: builtin/reset.c:251
+#: builtin/reset.c:262
msgid "be quiet, only report errors"
msgstr "var tyst, rapportera endast fel"
-#: builtin/reset.c:253
+#: builtin/reset.c:264
msgid "reset HEAD and index"
msgstr "återställ HEAD och index"
-#: builtin/reset.c:254
+#: builtin/reset.c:265
msgid "reset only HEAD"
msgstr "återställ endast HEAD"
-#: builtin/reset.c:256 builtin/reset.c:258
+#: builtin/reset.c:267 builtin/reset.c:269
msgid "reset HEAD, index and working tree"
msgstr "återställ HEAD, index och arbetskatalog"
-#: builtin/reset.c:260
+#: builtin/reset.c:271
msgid "reset HEAD but keep local changes"
msgstr "återställ HEAD men behåll lokala ändringar"
-#: builtin/reset.c:278
+#: builtin/reset.c:289
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Kunde inte slå upp \"%s\" som en giltig revision."
-#: builtin/reset.c:281 builtin/reset.c:289
+#: builtin/reset.c:292 builtin/reset.c:300
#, c-format
msgid "Could not parse object '%s'."
msgstr "Kan inte tolka objektet \"%s\""
-#: builtin/reset.c:286
+#: builtin/reset.c:297
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Kunde inte slå upp \"%s\" som ett giltigt träd."
-#: builtin/reset.c:295
+#: builtin/reset.c:306
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch är inkompatibel med --{hard,mixed,soft}"
-#: builtin/reset.c:304
+#: builtin/reset.c:315
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed rekommenderas inte med sökvägar; använd \"git reset -- <sökvägar>\"."
-#: builtin/reset.c:306
+#: builtin/reset.c:317
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Kan inte göra %s återställning med sökvägar."
-#: builtin/reset.c:316
+#: builtin/reset.c:327
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "%s återställning tillåts inte i ett naket arkiv"
-#: builtin/reset.c:336
+#: builtin/reset.c:344
+msgid "Unstaged changes after reset:"
+msgstr "Oköade ändringar efter återställning:"
+
+#: builtin/reset.c:350
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Kunde inte återställa indexfilen till versionen \"%s\"."
-#: builtin/reset.c:342
-msgid "Unstaged changes after reset:"
-msgstr "Oköade ändringar efter återställning:"
-
-#: builtin/reset.c:347
+#: builtin/reset.c:355
msgid "Could not write new index file."
msgstr "Kunde inte skriva ny indexfil."
@@ -8543,84 +8820,84 @@ msgstr "git cherry-pick [flaggor] <incheckning-igt>..."
msgid "git cherry-pick <subcommand>"
msgstr "git cherry-pick <underkommando>"
-#: builtin/revert.c:71 builtin/revert.c:94
+#: builtin/revert.c:71
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr "%s: %s kan inte användas med %s"
-#: builtin/revert.c:105
+#: builtin/revert.c:80
msgid "end revert or cherry-pick sequence"
msgstr "avsluta revert- eller cherry-pick-sekvens"
-#: builtin/revert.c:106
+#: builtin/revert.c:81
msgid "resume revert or cherry-pick sequence"
msgstr "återuppta revert- eller cherry-pick-sekvens"
-#: builtin/revert.c:107
+#: builtin/revert.c:82
msgid "cancel revert or cherry-pick sequence"
msgstr "avbryt revert- eller cherry-pick-sekvens"
-#: builtin/revert.c:108
+#: builtin/revert.c:83
msgid "don't automatically commit"
msgstr "checka inte in automatiskt"
-#: builtin/revert.c:109
+#: builtin/revert.c:84
msgid "edit the commit message"
msgstr "redigera incheckningsmeddelandet"
-#: builtin/revert.c:112
+#: builtin/revert.c:87
msgid "parent number"
msgstr "nummer på förälder"
-#: builtin/revert.c:114
+#: builtin/revert.c:89
msgid "merge strategy"
msgstr "sammanslagninsstrategi"
-#: builtin/revert.c:115
+#: builtin/revert.c:90
msgid "option"
msgstr "alternativ"
-#: builtin/revert.c:116
+#: builtin/revert.c:91
msgid "option for merge strategy"
msgstr "alternativ för sammanslagningsstrategi"
-#: builtin/revert.c:127
+#: builtin/revert.c:102
msgid "append commit name"
msgstr "lägg till incheckningsnamn"
-#: builtin/revert.c:128
+#: builtin/revert.c:103
msgid "allow fast-forward"
msgstr "tillåt snabbspolning"
-#: builtin/revert.c:129
+#: builtin/revert.c:104
msgid "preserve initially empty commits"
msgstr "behåll incheckningar som börjar som tomma"
-#: builtin/revert.c:130
+#: builtin/revert.c:105
msgid "allow commits with empty messages"
msgstr "tillåt incheckningar med tomt meddelande"
-#: builtin/revert.c:131
+#: builtin/revert.c:106
msgid "keep redundant, empty commits"
msgstr "behåll redundanta, tomma incheckningar"
-#: builtin/revert.c:135
+#: builtin/revert.c:110
msgid "program error"
msgstr "programfel"
-#: builtin/revert.c:225
+#: builtin/revert.c:195
msgid "revert failed"
msgstr "\"revert\" misslyckades"
-#: builtin/revert.c:240
+#: builtin/revert.c:210
msgid "cherry-pick failed"
msgstr "\"cherry-pick\" misslyckades"
-#: builtin/rm.c:16
+#: builtin/rm.c:17
msgid "git rm [options] [--] <file>..."
msgstr "git rm [flaggor] [--] <fil>..."
-#: builtin/rm.c:64
+#: builtin/rm.c:65
msgid ""
"the following submodule (or one of its nested submodules)\n"
"uses a .git directory:"
@@ -8634,7 +8911,7 @@ msgstr[1] ""
"följande undermoduler (eller en av deras nästlade undermoduler)\n"
"använder en .git-katalog:"
-#: builtin/rm.c:70
+#: builtin/rm.c:71
msgid ""
"\n"
"(use 'rm -rf' if you really want to remove it including all of its history)"
@@ -8642,7 +8919,7 @@ msgstr ""
"\n"
"(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)"
-#: builtin/rm.c:230
+#: builtin/rm.c:231
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
@@ -8654,7 +8931,7 @@ msgstr[0] ""
msgstr[1] ""
"följande filer har köat innehåll som skiljer sig både från filen och HEAD:"
-#: builtin/rm.c:235
+#: builtin/rm.c:236
msgid ""
"\n"
"(use -f to force removal)"
@@ -8662,13 +8939,13 @@ msgstr ""
"\n"
"(använd -f för att tvinga borttagning)"
-#: builtin/rm.c:239
+#: builtin/rm.c:240
msgid "the following file has changes staged in the index:"
msgid_plural "the following files have changes staged in the index:"
msgstr[0] "följande fil har ändringar köade i indexet:"
msgstr[1] "följande filer har ändringar köade i indexet:"
-#: builtin/rm.c:243 builtin/rm.c:254
+#: builtin/rm.c:244 builtin/rm.c:255
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
@@ -8676,38 +8953,38 @@ msgstr ""
"\n"
"(använd --cached för att behålla filen eller -f för att tvinga borttagning)"
-#: builtin/rm.c:251
+#: builtin/rm.c:252
msgid "the following file has local modifications:"
msgid_plural "the following files have local modifications:"
msgstr[0] "följande fil har lokala ändringar:"
msgstr[1] "följande filer har lokala ändringar:"
-#: builtin/rm.c:269
+#: builtin/rm.c:270
msgid "do not list removed files"
msgstr "lista inte borttagna filer"
-#: builtin/rm.c:270
+#: builtin/rm.c:271
msgid "only remove from the index"
msgstr "ta bara bort från indexet"
-#: builtin/rm.c:271
+#: builtin/rm.c:272
msgid "override the up-to-date check"
msgstr "överstyr àjour-testet"
-#: builtin/rm.c:272
+#: builtin/rm.c:273
msgid "allow recursive removal"
msgstr "tillåt rekursiv borttagning"
-#: builtin/rm.c:274
+#: builtin/rm.c:275
msgid "exit with a zero status even if nothing matched"
msgstr "avsluta med nollstatus även om inget träffades"
-#: builtin/rm.c:345
+#: builtin/rm.c:336
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "tar inte bort \"%s\" rekursivt utan -r"
-#: builtin/rm.c:384
+#: builtin/rm.c:375
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: kan inte ta bort %s"
@@ -8721,23 +8998,23 @@ msgstr "git shortlog [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"
msgid "Missing author: %s"
msgstr "Författare saknas: %s"
-#: builtin/shortlog.c:228
+#: builtin/shortlog.c:230
msgid "sort output according to the number of commits per author"
msgstr "sortera utdata enligt antal incheckningar per författare"
-#: builtin/shortlog.c:230
+#: builtin/shortlog.c:232
msgid "Suppress commit descriptions, only provides commit count"
msgstr "Undertryck beskrivningar, visa bara antal incheckningar"
-#: builtin/shortlog.c:232
+#: builtin/shortlog.c:234
msgid "Show the email address of each author"
msgstr "Visa e-postadress för varje författare"
-#: builtin/shortlog.c:233
+#: builtin/shortlog.c:235
msgid "w[,i1[,i2]]"
msgstr "w[,i1[,i2]]"
-#: builtin/shortlog.c:234
+#: builtin/shortlog.c:236
msgid "Linewrap output"
msgstr "Radbryt utdata"
@@ -8845,23 +9122,23 @@ msgstr "visa endast huvuden (kan kombineras med taggar)"
msgid "stricter reference checking, requires exact ref path"
msgstr "striktare referenskontroll, kräver exakt referenssökväg"
-#: builtin/show-ref.c:173 builtin/show-ref.c:176
+#: builtin/show-ref.c:173 builtin/show-ref.c:175
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "visa HEAD-refrens, även när den skulle filtreras ut"
-#: builtin/show-ref.c:178
+#: builtin/show-ref.c:177
msgid "dereference tags into object IDs"
msgstr "avreferera taggar till objekt-id"
-#: builtin/show-ref.c:180
+#: builtin/show-ref.c:179
msgid "only show SHA1 hash using <n> digits"
msgstr "visa SHA1-hash endast med <n> siffror"
-#: builtin/show-ref.c:184
+#: builtin/show-ref.c:183
msgid "do not print results to stdout (useful with --verify)"
msgstr "visa inte resultat på standard ut (användbart med --verify)"
-#: builtin/show-ref.c:186
+#: builtin/show-ref.c:185
msgid "show refs from stdin that aren't in local repository"
msgstr "visa referenser från standard in som inte finns i lokalt arkiv"
@@ -8886,11 +9163,11 @@ msgstr "ta bort symbolisk referens"
msgid "shorten ref output"
msgstr "förkorta ref-utdata"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254
msgid "reason"
msgstr "skäl"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254
msgid "reason of the update"
msgstr "skäl till uppdateringen"
@@ -9055,183 +9332,195 @@ msgstr "visa endast taggar som innehåller incheckningen"
msgid "print only tags of the object"
msgstr "visa endast taggar för objektet"
-#: builtin/tag.c:504
+#: builtin/tag.c:501
msgid "--column and -n are incompatible"
msgstr "--column och -n är inkompatibla"
-#: builtin/tag.c:521
+#: builtin/tag.c:518
msgid "-n option is only allowed with -l."
msgstr "Flaggan -n är endast tillåten tillsammans med -l."
-#: builtin/tag.c:523
+#: builtin/tag.c:520
msgid "--contains option is only allowed with -l."
msgstr "Flaggan --contains är endast tillåten tillsammans med -l"
-#: builtin/tag.c:525
+#: builtin/tag.c:522
msgid "--points-at option is only allowed with -l."
msgstr "Flaggan --points-at är endast tillåten tillsammans med -l."
-#: builtin/tag.c:533
+#: builtin/tag.c:530
msgid "only one -F or -m option is allowed."
msgstr "endast en av flaggorna -F eller -m tillåts."
-#: builtin/tag.c:553
+#: builtin/tag.c:550
msgid "too many params"
msgstr "för många parametrar"
-#: builtin/tag.c:559
+#: builtin/tag.c:556
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "\"%s\" är inte ett giltigt taggnamn."
-#: builtin/tag.c:564
+#: builtin/tag.c:561
#, c-format
msgid "tag '%s' already exists"
msgstr "taggen \"%s\" finns redan"
-#: builtin/tag.c:582
+#: builtin/tag.c:579
#, c-format
msgid "%s: cannot lock the ref"
msgstr "%s: kan inte låsa referensen"
-#: builtin/tag.c:584
+#: builtin/tag.c:581
#, c-format
msgid "%s: cannot update the ref"
msgstr "%s: kan inte uppdatera referensen"
-#: builtin/tag.c:586
+#: builtin/tag.c:583
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Uppdaterad tagg \"%s\" (var %s)\n"
-#: builtin/update-index.c:401
+#: builtin/update-index.c:402
msgid "git update-index [options] [--] [<file>...]"
msgstr "git update-index [flaggor] [--] [<fil>...]"
-#: builtin/update-index.c:718
+#: builtin/update-index.c:720
msgid "continue refresh even when index needs update"
msgstr "fortsätt uppdatera även när index inte är àjour"
-#: builtin/update-index.c:721
+#: builtin/update-index.c:723
msgid "refresh: ignore submodules"
msgstr "refresh: ignorera undermoduler"
-#: builtin/update-index.c:724
+#: builtin/update-index.c:726
msgid "do not ignore new files"
msgstr "ignorera inte nya filer"
-#: builtin/update-index.c:726
+#: builtin/update-index.c:728
msgid "let files replace directories and vice-versa"
msgstr "låt filer ersätta kataloger och omvänt"
-#: builtin/update-index.c:728
+#: builtin/update-index.c:730
msgid "notice files missing from worktree"
msgstr "lägg märke till filer som saknas i arbetskatalogen"
-#: builtin/update-index.c:730
+#: builtin/update-index.c:732
msgid "refresh even if index contains unmerged entries"
msgstr "uppdatera även om indexet innehåller ej sammanslagna poster"
-#: builtin/update-index.c:733
+#: builtin/update-index.c:735
msgid "refresh stat information"
msgstr "uppdatera statusinformation"
-#: builtin/update-index.c:737
+#: builtin/update-index.c:739
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "som --refresh, men ignorera assume-unchanged-inställning"
-#: builtin/update-index.c:741
+#: builtin/update-index.c:743
msgid "<mode> <object> <path>"
msgstr "<läge> <objekt> <sökväg>"
-#: builtin/update-index.c:742
+#: builtin/update-index.c:744
msgid "add the specified entry to the index"
msgstr "lägg till angiven post i indexet"
-#: builtin/update-index.c:746
+#: builtin/update-index.c:748
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/update-index.c:747
+#: builtin/update-index.c:749
msgid "override the executable bit of the listed files"
msgstr "överstyr exekveringsbiten för angivna filer"
-#: builtin/update-index.c:751
+#: builtin/update-index.c:753
msgid "mark files as \"not changing\""
msgstr "markera filer som \"ändras inte\""
-#: builtin/update-index.c:754
+#: builtin/update-index.c:756
msgid "clear assumed-unchanged bit"
msgstr "rensa \"assume-unchanged\"-biten"
-#: builtin/update-index.c:757
+#: builtin/update-index.c:759
msgid "mark files as \"index-only\""
msgstr "markera filer som \"endast index\""
-#: builtin/update-index.c:760
+#: builtin/update-index.c:762
msgid "clear skip-worktree bit"
msgstr "töm \"skip-worktree\"-biten"
-#: builtin/update-index.c:763
+#: builtin/update-index.c:765
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:765
+#: builtin/update-index.c:767
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:767
+#: builtin/update-index.c:769
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "med --stdin: indatarader termineras med null-byte"
-#: builtin/update-index.c:769
+#: builtin/update-index.c:771
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:773
+#: builtin/update-index.c:775
msgid "add entries from standard input to the index"
msgstr "lägg poster från från standard in till indexet"
-#: builtin/update-index.c:777
+#: builtin/update-index.c:779
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:781
+#: builtin/update-index.c:783
msgid "only update entries that differ from HEAD"
msgstr "uppdatera endast poster som skiljer sig från HEAD"
-#: builtin/update-index.c:785
+#: builtin/update-index.c:787
msgid "ignore files missing from worktree"
msgstr "ignorera filer som saknas i arbetskatalogen"
-#: builtin/update-index.c:788
+#: builtin/update-index.c:790
msgid "report actions to standard output"
msgstr "raportera åtgärder på standard ut"
-#: builtin/update-index.c:790
+#: builtin/update-index.c:792
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(för porslin) glöm sparade olösta konflikter"
-#: builtin/update-index.c:794
+#: builtin/update-index.c:796
msgid "write index in this format"
msgstr "skriv index i detta format"
-#: builtin/update-ref.c:7
+#: builtin/update-ref.c:9
msgid "git update-ref [options] -d <refname> [<oldval>]"
msgstr "git update-ref [flaggor] -d <refnamn> [<gammaltvärde>]"
-#: builtin/update-ref.c:8
+#: builtin/update-ref.c:10
msgid "git update-ref [options] <refname> <newval> [<oldval>]"
msgstr "git update-ref [flaggor] <refnamn> <gammaltvärde> [<nyttvärde>]"
-#: builtin/update-ref.c:19
+#: builtin/update-ref.c:11
+msgid "git update-ref [options] --stdin [-z]"
+msgstr "git update-ref [flaggor] --stdin [-z]"
+
+#: builtin/update-ref.c:255
msgid "delete the reference"
msgstr "ta bort referensen"
-#: builtin/update-ref.c:21
+#: builtin/update-ref.c:257
msgid "update <refname> not the one it points to"
msgstr "uppdatera <refnamn> inte det den pekar på"
+#: builtin/update-ref.c:258
+msgid "stdin has NUL-terminated arguments"
+msgstr "standard in har NUL-terminerade argument"
+
+#: builtin/update-ref.c:259
+msgid "read updates from stdin"
+msgstr "läs uppdateringar från standard in"
+
#: builtin/update-server-info.c:6
msgid "git update-server-info [--force]"
msgstr "git update-server-info [--force]"
@@ -9286,23 +9575,23 @@ msgstr ""
"några konceptvägledningar. Se \"git help <kommando>\" eller \"git help\n"
"<koncept>\" för att läsa mer om specifika underkommandon och koncept."
-#: parse-options.h:144
+#: parse-options.h:146
msgid "expiry date"
msgstr "giltig till"
-#: parse-options.h:159
+#: parse-options.h:161
msgid "no-op (backward compatibility)"
msgstr "ingen funktion (bakåtkompatibilitet)"
-#: parse-options.h:236
+#: parse-options.h:238
msgid "be more verbose"
msgstr "var mer pratsam"
-#: parse-options.h:238
+#: parse-options.h:240
msgid "be more quiet"
msgstr "var mer tyst"
-#: parse-options.h:244
+#: parse-options.h:246
msgid "use <n> digits to display SHA-1s"
msgstr "använd <n> siffror för att visa SHA-1:or"
@@ -9438,7 +9727,7 @@ msgstr ""
#: git-am.sh:163
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-"Faller tillbaka på att pacha grundversionen och trevägssammanslagning..."
+"Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."
#: git-am.sh:179
msgid "Failed to merge in the changes."
@@ -9740,7 +10029,7 @@ msgstr ""
msgid "Pull is not possible because you have unmerged files."
msgstr "Du kan inte göra en \"pull\" då du har ändringar som inte checkats in."
-#: git-pull.sh:203
+#: git-pull.sh:223
msgid "updating an unborn branch with changes added to the index"
msgstr "uppdaterar en ofödd gren med ändringar som lagts till i indexet"
@@ -9748,7 +10037,7 @@ msgstr "uppdaterar en ofödd gren med ändringar som lagts till i indexet"
#. The working tree and the index file is still based on the
#. $orig_head commit, but we are merging into $curr_head.
#. First update the working tree to match $curr_head.
-#: git-pull.sh:235
+#: git-pull.sh:255
#, sh-format
msgid ""
"Warning: fetch updated the current branch head.\n"
@@ -9759,11 +10048,11 @@ msgstr ""
"Varning: snabbspolar din arbetskatalog från\n"
"Varning: incheckningen $orig_head."
-#: git-pull.sh:260
+#: git-pull.sh:280
msgid "Cannot merge multiple branches into empty head"
msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."
-#: git-pull.sh:264
+#: git-pull.sh:284
msgid "Cannot rebase onto multiple branches"
msgstr "Kan inte utföra en \"rebase\" ovanpå flera grenar"
@@ -9797,31 +10086,31 @@ msgstr ""
"Dina ändringar är säkra i stashen.\n"
"Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n"
-#: git-rebase.sh:190
+#: git-rebase.sh:199
msgid "The pre-rebase hook refused to rebase."
msgstr "Kroken pre-rebase vägrade ombaseringen."
-#: git-rebase.sh:195
+#: git-rebase.sh:204
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "Det verkar som en git-am körs. Kan inte ombasera."
-#: git-rebase.sh:329
+#: git-rebase.sh:338
msgid "The --exec option must be used with the --interactive option"
msgstr "Flaggan --exec måste användas tillsammans med flaggan --interactive"
-#: git-rebase.sh:334
+#: git-rebase.sh:343
msgid "No rebase in progress?"
msgstr "Ingen ombasering pågår?"
-#: git-rebase.sh:345
+#: git-rebase.sh:354
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering."
-#: git-rebase.sh:352
+#: git-rebase.sh:361
msgid "Cannot read HEAD"
msgstr "Kan inte läsa HEAD"
-#: git-rebase.sh:355
+#: git-rebase.sh:364
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -9829,12 +10118,12 @@ msgstr ""
"Du måste redigera alla sammanslagningskonflikter och\n"
"därefter markera dem som lösta med git add"
-#: git-rebase.sh:373
+#: git-rebase.sh:382
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Kunde inte flytta tillbaka till $head_name"
-#: git-rebase.sh:392
+#: git-rebase.sh:401
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -9855,66 +10144,66 @@ msgstr ""
"och kör programmet igen. Jag avslutar ifall du fortfarande har\n"
"något av värde där."
-#: git-rebase.sh:437
+#: git-rebase.sh:446
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "ogiltig uppström $upstream_name"
-#: git-rebase.sh:461
+#: git-rebase.sh:470
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: mer än en sammanslagningsbas finns"
-#: git-rebase.sh:464 git-rebase.sh:468
+#: git-rebase.sh:473 git-rebase.sh:477
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: ingen sammanslagningsbas finns"
-#: git-rebase.sh:473
+#: git-rebase.sh:482
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Peka på en giltig incheckning: $onto_name"
-#: git-rebase.sh:496
+#: git-rebase.sh:505
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "ödesdigert: ingen sådan gren: $branch_name"
-#: git-rebase.sh:519
+#: git-rebase.sh:528
msgid "Cannot autostash"
msgstr "Kan inte utföra \"autostash\""
-#: git-rebase.sh:524
+#: git-rebase.sh:533
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Skapade autostash: $stash_abbrev"
-#: git-rebase.sh:528
+#: git-rebase.sh:537
msgid "Please commit or stash them."
msgstr "Checka in eller använd \"stash\" på dem."
-#: git-rebase.sh:548
+#: git-rebase.sh:557
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "Aktuell gren $branch_name är à jour."
-#: git-rebase.sh:552
+#: git-rebase.sh:561
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad."
-#: git-rebase.sh:563
+#: git-rebase.sh:572
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Ändringar från $mb till $onto:"
#. Detach HEAD and reset the tree
-#: git-rebase.sh:572
+#: git-rebase.sh:581
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..."
-#: git-rebase.sh:582
+#: git-rebase.sh:591
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "Snabbspolade $branch_name till $onto_name."
@@ -9962,7 +10251,7 @@ msgstr "Kan inte uppdatera $ref_stash med $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:241
+#: git-stash.sh:237
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
@@ -9971,100 +10260,85 @@ msgstr ""
"fel: felaktig flagga för \"stash save\": $option\n"
" För att ange ett meddelande, använd git stash save -- \"$option\""
-#: git-stash.sh:262
+#: git-stash.sh:258
msgid "No local changes to save"
msgstr "Inga lokala ändringar att spara"
-#: git-stash.sh:268
-msgid ""
-"The following untracked files would NOT be saved but need to be removed by "
-"stash save:"
-msgstr ""
-"Följande ospårade ändringar skulle INTE sparas utan måste tas bort med "
-"\"stash save\":"
-
-#: git-stash.sh:270
-msgid ""
-"Aborting. Consider using either the --force or --include-untracked option."
-msgstr ""
-"Avbryter. Överväg att använda antingen flaggan --force eller --include-"
-"untracked."
-
-#: git-stash.sh:274
+#: git-stash.sh:262
msgid "Cannot initialize stash"
msgstr "Kan inte initiera \"stash\""
-#: git-stash.sh:278
+#: git-stash.sh:266
msgid "Cannot save the current status"
msgstr "Kan inte spara aktuell status"
-#: git-stash.sh:296
+#: git-stash.sh:284
msgid "Cannot remove worktree changes"
msgstr "Kan inte ta bort ändringar i arbetskatalogen"
-#: git-stash.sh:395
+#: git-stash.sh:383
msgid "No stash found."
msgstr "Ingen \"stash\" hittades."
-#: git-stash.sh:402
+#: git-stash.sh:390
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "För många revisioner angivna: $REV"
-#: git-stash.sh:408
+#: git-stash.sh:396
#, sh-format
msgid "$reference is not valid reference"
msgstr "$reference är inte en giltig referens."
-#: git-stash.sh:436
+#: git-stash.sh:424
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "\"$args\" är inte en \"stash\"-liknande incheckning"
-#: git-stash.sh:447
+#: git-stash.sh:435
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "\"$args\" är inte en \"stash\"-referens"
-#: git-stash.sh:455
+#: git-stash.sh:443
msgid "unable to refresh index"
msgstr "kan inte uppdatera indexet"
-#: git-stash.sh:459
+#: git-stash.sh:447
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:467
+#: git-stash.sh:455
msgid "Conflicts in index. Try without --index."
msgstr "Konflikter i indexet. Testa utan --index."
-#: git-stash.sh:469
+#: git-stash.sh:457
msgid "Could not save index tree"
msgstr "Kunde inte spara indexträd"
-#: git-stash.sh:503
+#: git-stash.sh:491
msgid "Cannot unstage modified files"
msgstr "Kan inte ta bort ändrade filer ur kön"
-#: git-stash.sh:518
+#: git-stash.sh:506
msgid "Index was not unstashed."
msgstr "Indexet har inte tagits ur kön."
-#: git-stash.sh:535
+#: git-stash.sh:523
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Kastade ${REV} ($s)"
-#: git-stash.sh:536
+#: git-stash.sh:524
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Kunde inte kasta \"stash\"-post"
-#: git-stash.sh:543
+#: git-stash.sh:531
msgid "No branch name specified"
msgstr "Inget grennamn angavs"
-#: git-stash.sh:615
+#: git-stash.sh:603
msgid "(To restore them type \"git stash apply\")"
msgstr "(För att återställa dem, skriv \"git stash apply\")"
@@ -10333,50 +10607,61 @@ msgid "The --cached option cannot be used with the --files option"
msgstr "Flaggan --cached kan inte användas med flaggan --files"
#. unexpected type
-#: git-submodule.sh:1066
+#: git-submodule.sh:1073
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "oväntat läge $mod_dst"
-#: git-submodule.sh:1086
+#: git-submodule.sh:1093
#, 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:1089
+#: git-submodule.sh:1096
#, 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:1092
+#: git-submodule.sh:1099
#, 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:1117
+#: git-submodule.sh:1124
msgid "blob"
msgstr "blob"
-#: git-submodule.sh:1155
-msgid "Submodules changed but not updated:"
-msgstr "Undermoduler ändrade men inte uppdaterade:"
-
-#: git-submodule.sh:1157
-msgid "Submodule changes to be committed:"
-msgstr "Undermodulers ändringar att checka in:"
-
-#: git-submodule.sh:1242
+#: git-submodule.sh:1238
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""
-#: git-submodule.sh:1306
+#: git-submodule.sh:1302
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synkroniserar undermodul-url för \"$displaypath\""
+#~ msgid "input paths are terminated by a null character"
+#~ msgstr "sökvägar avdelas med null-tecken"
+
+#~ msgid "done\n"
+#~ msgstr "klart\n"
+
+#~ msgid ""
+#~ "The following untracked files would NOT be saved but need to be removed "
+#~ "by stash save:"
+#~ msgstr ""
+#~ "Följande ospårade ändringar skulle INTE sparas utan måste tas bort med "
+#~ "\"stash save\":"
+
+#~ msgid ""
+#~ "Aborting. Consider using either the --force or --include-untracked option."
+#~ msgstr ""
+#~ "Avbryter. Överväg att använda antingen flaggan --force eller --include-"
+#~ "untracked."
+
#~ msgid " (fix conflicts and then run \"git am --resolved\")"
#~ msgstr " (rätta konflikter och kör sedan \"git am --resolved\")"
@@ -10498,9 +10783,6 @@ msgstr "Synkroniserar undermodul-url för \"$displaypath\""
#~ msgid "-B cannot be used with -b"
#~ msgstr "-B kan inte användas med -b"
-#~ msgid "--patch is incompatible with all other options"
-#~ msgstr "--patch är inkompatibel med alla andra flaggor"
-
#~ msgid "--detach cannot be used with -b/-B/--orphan"
#~ msgstr "--detcah kan inte användas med -b/-B/--orphan"
diff --git a/po/vi.po b/po/vi.po
index 11b491279..05420eb47 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,14 +1,15 @@
# Vietnamese translation for GIT-CORE.
+# Bản dịch tiếng Việt dành cho GIT-CORE.
# This file is distributed under the same license as the git-core package.
# First translated by Trần Ngọc Quân <vnwildman@gmail.com>, 2012-2013.
# Nguyễn Thái Ngọc Duy <pclouds@gmail.com>, 2012.
#
msgid ""
msgstr ""
-"Project-Id-Version: git-v1.8.4-rc1-22-gb8ecf23\n"
+"Project-Id-Version: git-v1.8.5-rc0-24-g727b957\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2013-08-06 14:10+0800\n"
-"PO-Revision-Date: 2013-08-06 14:28+0700\n"
+"POT-Creation-Date: 2013-11-02 08:06+0800\n"
+"PO-Revision-Date: 2013-11-02 13:15+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
"Language: vi\n"
@@ -24,7 +25,7 @@ msgstr ""
#: advice.c:57
#, c-format
msgid "hint: %.*s\n"
-msgstr "gợi ý: %.*s\n"
+msgstr "tìm thấy: %.*s\n"
#.
#. * Message used both when 'git commit' fails and when
@@ -61,71 +62,76 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <kho> [--exec <lệnh>] --list"
-#: archive.c:323
+#: archive.c:242 builtin/add.c:240 builtin/add.c:556 builtin/rm.c:328
+#, c-format
+msgid "pathspec '%s' did not match any files"
+msgstr "đặc tả đường dẫn “%s” không khớp với bất kỳ tập tin nào"
+
+#: archive.c:327
msgid "fmt"
msgstr "fmt"
-#: archive.c:323
+#: archive.c:327
msgid "archive format"
msgstr "định dạng lưu trữ"
-#: archive.c:324 builtin/log.c:1173
+#: archive.c:328 builtin/log.c:1193
msgid "prefix"
msgstr "tiền tố"
-#: archive.c:325
+#: archive.c:329
msgid "prepend prefix to each pathname in the archive"
msgstr "nối thêm tiền tố vào từng đường dẫn tập tin trong kho lưu"
-#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2292
-#: builtin/blame.c:2293 builtin/config.c:56 builtin/fast-export.c:673
-#: builtin/fast-export.c:675 builtin/grep.c:714 builtin/hash-object.c:77
-#: builtin/ls-files.c:496 builtin/ls-files.c:499 builtin/notes.c:408
-#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:152
+#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2264
+#: builtin/blame.c:2265 builtin/config.c:58 builtin/fast-export.c:680
+#: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77
+#: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408
+#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154
msgid "file"
msgstr "tập-tin"
-#: archive.c:327 builtin/archive.c:89
+#: archive.c:331 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:329
+#: archive.c:333
msgid "read .gitattributes in working directory"
msgstr "đọc .gitattributes trong thư mục làm việc"
-#: archive.c:330
+#: archive.c:334
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:331
+#: archive.c:335
msgid "store only"
msgstr "chỉ lưu (không nén)"
-#: archive.c:332
+#: archive.c:336
msgid "compress faster"
msgstr "nén nhanh hơn"
-#: archive.c:340
+#: archive.c:344
msgid "compress better"
msgstr "nén nhỏ hơn"
-#: archive.c:343
+#: archive.c:347
msgid "list supported archive formats"
msgstr "liệt kê các kiểu nén được hỗ trợ"
-#: archive.c:345 builtin/archive.c:90 builtin/clone.c:85
+#: archive.c:349 builtin/archive.c:90 builtin/clone.c:84
msgid "repo"
msgstr "kho"
-#: archive.c:346 builtin/archive.c:91
+#: archive.c:350 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "nhận kho lưu từ kho chứa <kho> trên máy chủ"
-#: archive.c:347 builtin/archive.c:92 builtin/notes.c:487
+#: archive.c:351 builtin/archive.c:92 builtin/notes.c:487
msgid "command"
msgstr "lệnh"
-#: archive.c:348 builtin/archive.c:93
+#: archive.c:352 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ủ"
@@ -208,19 +214,19 @@ msgstr "Đã có nhánh mang tên “%s”."
msgid "Cannot force update the current branch."
msgstr "Không thể ép buộc cập nhật nhánh hiện hành."
-#: branch.c:216
+#: branch.c:215
#, 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 vết; điểm bắt đầu “%s” không phải là một "
"nhánh."
-#: branch.c:218
+#: branch.c:217
#, c-format
msgid "the requested upstream branch '%s' does not exist"
-msgstr "nhánh dòng ngược đã yêu cầu “%s” chưa sẵn có"
+msgstr "nhánh thượng nguồn đã yêu cầu “%s” chưa sẵn có"
-#: branch.c:220
+#: branch.c:219
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -232,34 +238,34 @@ msgid ""
"\"git push -u\" to set the upstream config as you push."
msgstr ""
"\n"
-"Nếu bạn có ý định trên cơ sở công việc của bạn trên nhánh dòng ngược\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 push lênh một nhánh nội bộ mới cái mà\n"
+"Nếu bạn có ý định push 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 dòng ngược bạn muốn push."
+"\"git push -u\" để đặt cấu hình thượng nguồn bạn muốn push."
-#: branch.c:265
+#: branch.c:264
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "Không phải tên đối tượng hợp lệ: “%s”."
-#: branch.c:285
+#: branch.c:284
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "Tên đối tượng chưa rõ ràng: “%s”."
-#: branch.c:290
+#: branch.c:289
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "Nhánh không hợp lệ: “%s”."
-#: branch.c:296
+#: branch.c:295
msgid "Failed to lock ref for update"
msgstr "Gặp lỗi khi khóa tham chiếu (ref) để cập nhật"
-#: branch.c:314
+#: branch.c:313
msgid "Failed to write ref"
msgstr "Gặp lỗi khi ghi tham chiếu (ref)"
@@ -273,7 +279,7 @@ msgstr "“%s” không giống như tập tin v2 bundle (định dạng dump c
msgid "unrecognized header: %s%s (%d)"
msgstr "phần đầu (header) không được thừa nhận: %s%s (%d)"
-#: bundle.c:89 builtin/commit.c:697
+#: bundle.c:89 builtin/commit.c:706
#, c-format
msgid "could not open '%s'"
msgstr "không thể mở “%s”"
@@ -282,9 +288,9 @@ msgstr "không thể mở “%s”"
msgid "Repository lacks these prerequisite commits:"
msgstr "Kho chứa thiếu những lần chuyển giao (commit) cần trước hết này:"
-#: bundle.c:164 sequencer.c:661 sequencer.c:1111 builtin/log.c:331
-#: builtin/log.c:801 builtin/log.c:1399 builtin/log.c:1625 builtin/merge.c:364
-#: builtin/shortlog.c:156
+#: bundle.c:164 sequencer.c:662 sequencer.c:1112 builtin/log.c:332
+#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:364
+#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr "cài đặt việc di chuyển qua các điểm xét duyệt gặp lỗi"
@@ -310,7 +316,7 @@ msgstr[1] "Lệnh bundle yêu cầu %d tham chiếu (refs) này:"
msgid "rev-list died"
msgstr "rev-list đã chết"
-#: bundle.c:300 builtin/log.c:1310 builtin/shortlog.c:259
+#: bundle.c:300 builtin/log.c:1329 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr "đối số không được thừa nhận: %s"
@@ -460,7 +466,7 @@ msgstr ""
"Tìm thấy các lỗi trong biến cấu hình “diff.dirstat”:\n"
"%s"
-#: diff.c:3487
+#: diff.c:3490
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -469,7 +475,7 @@ msgstr ""
"Gặp lỗi khi phân tích đối số tùy chọn --dirstat/-X:\n"
"%s"
-#: diff.c:3501
+#: diff.c:3504
#, 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”"
@@ -496,17 +502,17 @@ msgstr "không thể tạo tập tin tạm thời “%s”: %s"
msgid "failed writing detached signature to '%s': %s"
msgstr "gặp lỗi khi ghi chữ ký đính kèm vào “%s”: %s"
-#: grep.c:1623
+#: grep.c:1695
#, c-format
msgid "'%s': unable to read %s"
msgstr "“%s”: không thể đọc %s"
-#: grep.c:1640
+#: grep.c:1712
#, c-format
msgid "'%s': %s"
msgstr "“%s”: %s"
-#: grep.c:1651
+#: grep.c:1723
#, c-format
msgid "'%s': short read %s"
msgstr "“%s”: đọc ngắn %s"
@@ -577,10 +583,10 @@ msgstr "%s: %s - %s"
#: merge.c:56
msgid "failed to read the cache"
-msgstr "gặp lỗi khi đọc bộ nhớ tạm"
+msgstr "gặp lỗi khi đọc bộ nhớ đệm"
-#: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566
-#: builtin/clone.c:656
+#: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559
+#: builtin/clone.c:655
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"
@@ -629,7 +635,7 @@ msgstr "không thể đọc đối tượng %s “%s”"
msgid "blob expected for %s '%s'"
msgstr "đối tượng blob được mong đợi cho %s “%s”"
-#: merge-recursive.c:774 builtin/clone.c:312
+#: merge-recursive.c:774 builtin/clone.c:311
#, c-format
msgid "failed to open '%s'"
msgstr "gặp lỗi khi mở “%s”"
@@ -637,7 +643,7 @@ msgstr "gặp lỗi khi mở “%s”"
#: merge-recursive.c:782
#, c-format
msgid "failed to symlink '%s'"
-msgstr "gặp lỗi khi tạo liên kết tượng trưng (symlink) “%s”"
+msgstr "gặp lỗi khi tạo liên kết mềm (symlink) “%s”"
#: merge-recursive.c:785
#, c-format
@@ -764,7 +770,7 @@ msgstr "Đã bỏ qua %s (đã có sẵn lần hòa trộn này)"
msgid "Auto-merging %s"
msgstr "Tự-động-hòa-trộn %s"
-#: merge-recursive.c:1634 git-submodule.sh:1118
+#: merge-recursive.c:1634 git-submodule.sh:1125
msgid "submodule"
msgstr "mô-đun-con"
@@ -863,58 +869,125 @@ msgstr "Từ chối ghi đè ghi chú trong %s (nằm ngoài của refs/notes/)"
msgid "Bad %s value: '%s'"
msgstr "Giá trị %s sai: “%s”"
-#: object.c:204
+#: object.c:202
#, c-format
msgid "unable to parse object: %s"
msgstr "không thể phân tích đối tượng: “%s”"
-#: parse-options.c:489
+#: parse-options.c:537
msgid "..."
msgstr "..."
-#: parse-options.c:507
+#: parse-options.c:555
#, c-format
msgid "usage: %s"
msgstr "cách dùng: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:511
+#: parse-options.c:559
#, c-format
msgid " or: %s"
msgstr " hoặc: %s"
-#: parse-options.c:514
+#: parse-options.c:562
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:548
+#: parse-options.c:596
msgid "-NUM"
msgstr "-SỐ"
-#: pathspec.c:83
+#: pathspec.c:118
+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:128
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr ""
+"cài đặt đặc tả đường dẫn “literal” toàn cục là xung khắc với các cài đặt đặc "
+"tả đường dẫn toàn cục khác"
+
+#: pathspec.c:158
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "tham số không hợp lệ cho “tiền tố” màu nhiệm đặc tả đường đẫn"
+
+#: pathspec.c:164
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "Số màu nhiệm đặc tả đường dẫn không hợp lệ “%.*s” trong “%s”"
+
+#: pathspec.c:168
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "Thiếu “)” tại cuối của số màu nhiệm đặc tả đường dẫn trong “%s”"
+
+#: pathspec.c:186
#, c-format
-msgid "Path '%s' is in submodule '%.*s'"
-msgstr "Đường dẫn “%s” thì ở trong mô-đun-con “%.*s”"
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "Chưa viết mã cho số màu nhiệm đặc tả đường dẫn “%c” trong “%s”"
+
+#: pathspec.c:211
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s: “literal” và “glob” xung khắc nhau"
+
+#: pathspec.c:222
+#, c-format
+msgid "%s: '%s' is outside repository"
+msgstr "%s: “%s” ngoài một kho chứa"
+
+#: pathspec.c:278
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "Đặc tả đường dẫn “%s” thì ở trong mô-đun-con “%.*s”"
+
+#.
+#. * We may want to substitute "this command" with a command
+#. * name. E.g. when add--interactive dies when running
+#. * "checkout -p"
+#.
+#: pathspec.c:340
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr "%s: số mầu nhiệm đặc tả đường dẫn chưa được hỗ trợ bởi lệnh này: %s"
+
+#: pathspec.c:415
+#, 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"
+
+#: remote.c:1833
+#, 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"
-#: pathspec.c:99
+#: remote.c:1837
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr " (dùng \" git branch --unset-upstream\" để sửa)\n"
+
+#: remote.c:1840
#, c-format
-msgid "'%s' is beyond a symbolic link"
-msgstr "“%s” nằm ngoài một liên kết tượng trưng"
+msgid "Your branch is up-to-date with '%s'.\n"
+msgstr "Nhánh của bạn đã cập nhật với “%s”.\n"
-#: remote.c:1788
+#: remote.c:1844
#, 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 là đầu của “%s” bởi %d lần chuyển giao (commit).\n"
msgstr[1] "Nhánh của bạn là đầu của “%s” bởi %d lần chuyển giao (commit).\n"
-#: remote.c:1794
+#: remote.c:1850
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:1797
+#: remote.c:1853
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -926,11 +999,11 @@ msgstr[1] ""
"Nhánh của bạn thì ở đằng sau “%s” bởi %d lần chuyển giao (commit), và có thể "
"được fast-forward.\n"
-#: remote.c:1805
+#: remote.c:1861
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (dùng \"git pull\" để cập nhật nhánh nội bộ của bạn)\n"
-#: remote.c:1808
+#: remote.c:1864
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -946,7 +1019,7 @@ msgstr[1] ""
"Your branch and “%s” have diverged,\n"
"and have %d and %d different commit each, respectively.\n"
-#: remote.c:1818
+#: remote.c:1874
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
" (dùng \"git pull\" để hòa trộn nhánh trên máy chủ vào trong nhánh của "
@@ -991,7 +1064,7 @@ msgstr ""
"với lệnh “git add <đường_dẫn>” hoặc “git rm <đường_dẫn>”\n"
"và chuyển giao (commit) kết quả bằng lệnh “git commit”"
-#: sequencer.c:245 sequencer.c:869 sequencer.c:952
+#: sequencer.c:245 sequencer.c:870 sequencer.c:953
#, c-format
msgid "Could not write to %s"
msgstr "Không thể ghi vào %s"
@@ -1014,46 +1087,46 @@ msgid "Commit your changes or stash them to proceed."
msgstr "Chuyển giao (commit) các thay đổi của bạn hay stash chúng để xử lý."
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:324
+#: sequencer.c:325
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Không thể ghi tập tin lưu bảng mục lục mới"
-#: sequencer.c:355
+#: sequencer.c:356
msgid "Could not resolve HEAD commit\n"
msgstr "Không thể phân giải commit (lần chuyển giao) HEAD\n"
-#: sequencer.c:377
+#: sequencer.c:378
msgid "Unable to update cache tree\n"
msgstr "Không thể cập nhật cây bộ nhớ đệm\n"
-#: sequencer.c:422
+#: sequencer.c:423
#, c-format
msgid "Could not parse commit %s\n"
msgstr "Không thể phân tích commit (lần chuyển giao) %s\n"
-#: sequencer.c:427
+#: sequencer.c:428
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr "Không thể phân tích commit (lần chuyển giao) cha mẹ %s\n"
-#: sequencer.c:493
+#: sequencer.c:494
msgid "Your index file is unmerged."
msgstr "Tập tin lưu mục lục của bạn không được hòa trộn."
-#: sequencer.c:512
+#: sequencer.c:513
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr ""
"Lần chuyển giao (commit) %s là một lần hòa trộn nhưng không đưa ra tùy chọn -"
"m."
-#: sequencer.c:520
+#: sequencer.c:521
#, c-format
msgid "Commit %s does not have parent %d"
msgstr "Lần chuyển giao (commit) %s không có cha mẹ %d"
-#: sequencer.c:524
+#: sequencer.c:525
#, c-format
msgid "Mainline was specified but commit %s is not a merge."
msgstr ""
@@ -1062,153 +1135,153 @@ msgstr ""
#. TRANSLATORS: The first %s will be "revert" or
#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:537
+#: sequencer.c:538
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: không thể phân tích lần chuyển giao mẹ của %s"
-#: sequencer.c:541
+#: sequencer.c:542
#, c-format
msgid "Cannot get commit message for %s"
msgstr "Không thể lấy thông điệp lần chuyển giao (commit) cho %s"
-#: sequencer.c:627
+#: sequencer.c:628
#, c-format
msgid "could not revert %s... %s"
msgstr "không thể revert %s... %s"
-#: sequencer.c:628
+#: sequencer.c:629
#, c-format
msgid "could not apply %s... %s"
msgstr "không thể apply (áp dụng miếng vá) %s... %s"
-#: sequencer.c:664
+#: sequencer.c:665
msgid "empty commit set passed"
msgstr "lần chuyển giao (commit) trống rỗng đặt là hợp quy cách"
-#: sequencer.c:672
+#: sequencer.c:673
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: gặp lỗi đọc bảng mục lục"
-#: sequencer.c:677
+#: sequencer.c:678
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: gặp lỗi khi làm tươi mới bảng mục lục"
-#: sequencer.c:735
+#: sequencer.c:736
#, c-format
msgid "Cannot %s during a %s"
msgstr "Không thể %s trong khi %s"
-#: sequencer.c:757
+#: sequencer.c:758
#, c-format
msgid "Could not parse line %d."
msgstr "Không phân tích được dòng %d."
-#: sequencer.c:762
+#: sequencer.c:763
msgid "No commits parsed."
msgstr "Không có lần chuyển giao (commit) nào được phân tích."
-#: sequencer.c:775
+#: sequencer.c:776
#, c-format
msgid "Could not open %s"
msgstr "Không thể mở %s"
-#: sequencer.c:779
+#: sequencer.c:780
#, c-format
msgid "Could not read %s."
msgstr "Không thể đọc %s."
-#: sequencer.c:786
+#: sequencer.c:787
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr "Bảng chỉ thị không thể dùng được: %s"
-#: sequencer.c:814
+#: sequencer.c:815
#, c-format
msgid "Invalid key: %s"
msgstr "Khóa không đúng: %s"
-#: sequencer.c:817
+#: sequencer.c:818
#, c-format
msgid "Invalid value for %s: %s"
msgstr "Giá trị không hợp lệ %s: %s"
-#: sequencer.c:829
+#: sequencer.c:830
#, c-format
msgid "Malformed options sheet: %s"
msgstr "Bảng tùy chọn dị hình: %s"
-#: sequencer.c:850
+#: sequencer.c:851
msgid "a cherry-pick or revert is already in progress"
msgstr "một thao tác cherry-pick hoặc revert đang được thực hiện"
-#: sequencer.c:851
+#: sequencer.c:852
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "hãy thử \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:855
+#: sequencer.c:856
#, c-format
msgid "Could not create sequencer directory %s"
msgstr "Không thể tạo thư mục xếp dãy %s"
-#: sequencer.c:871 sequencer.c:956
+#: sequencer.c:872 sequencer.c:957
#, c-format
msgid "Error wrapping up %s."
msgstr "Lỗi bao bọc %s."
-#: sequencer.c:890 sequencer.c:1024
+#: sequencer.c:891 sequencer.c:1025
msgid "no cherry-pick or revert in progress"
msgstr "không cherry-pick hay revert trong tiến trình"
-#: sequencer.c:892
+#: sequencer.c:893
msgid "cannot resolve HEAD"
msgstr "không thể phân giải HEAD"
-#: sequencer.c:894
+#: sequencer.c:895
msgid "cannot abort from a branch yet to be born"
msgstr "không thể hủy bỏ từ một nhánh mà nó còn chưa được tạo ra"
-#: sequencer.c:916 builtin/apply.c:4061
+#: sequencer.c:917 builtin/apply.c:4061
#, c-format
msgid "cannot open %s: %s"
msgstr "không thể mở %s: %s"
-#: sequencer.c:919
+#: sequencer.c:920
#, c-format
msgid "cannot read %s: %s"
msgstr "không thể đọc %s: %s"
-#: sequencer.c:920
+#: sequencer.c:921
msgid "unexpected end of file"
msgstr "kết thúc tập tin đột xuất"
-#: sequencer.c:926
+#: sequencer.c:927
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "tập tin HEAD “pre-cherry-pick” đã lưu “%s” bị hỏng"
-#: sequencer.c:949
+#: sequencer.c:950
#, c-format
msgid "Could not format %s."
msgstr "Không thể định dạng %s."
-#: sequencer.c:1092
+#: sequencer.c:1093
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: không thể cherry-pick một %s"
-#: sequencer.c:1095
+#: sequencer.c:1096
#, c-format
msgid "%s: bad revision"
msgstr "%s: điểm xét duyệt sai"
-#: sequencer.c:1129
+#: sequencer.c:1130
msgid "Can't revert as initial commit"
msgstr "Không thể revert một lần chuyển giao (commit) khởi tạo"
-#: sequencer.c:1130
+#: sequencer.c:1131
msgid "Can't cherry-pick into empty head"
msgstr "Không thể cherry-pick vào một đầu (head) trống rỗng"
@@ -1236,265 +1309,359 @@ msgstr ""
"này\n"
"bằng cách chạy lệnh \"git config advice.objectNameWarning false\""
-#: sha1_name.c:1097
+#: sha1_name.c:1112
msgid "HEAD does not point to a branch"
msgstr "HEAD không chỉ đến một nhánh nào cả"
-#: sha1_name.c:1100
+#: sha1_name.c:1115
#, c-format
msgid "No such branch: '%s'"
msgstr "Không có nhánh nào như thế: “%s”"
-#: sha1_name.c:1102
+#: sha1_name.c:1117
#, c-format
msgid "No upstream configured for branch '%s'"
msgstr "Không có thượng nguồn (upstream) được cấu hình cho nhánh “%s”"
-#: sha1_name.c:1106
+#: sha1_name.c:1121
#, c-format
msgid "Upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
"Nhánh thượng nguồn (upstream) “%s” không được lưu lại như là một nhánh "
"“remote-tracking”"
-#: wrapper.c:408
+#: 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"
+
+#: 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"
+
+#. Maybe the user already did that, don't error out here
+#: submodule.c:76
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "Không thể cập nhật mục .gitmodules %s"
+
+#. Maybe the user already did that, don't error out here
+#: 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"
+
+#: submodule.c:127
+msgid "could not find .gitmodules in index"
+msgstr "không tìm thấy .gitmodules trong bảng mục lục"
+
+#: submodule.c:133
+msgid "reading updated .gitmodules failed"
+msgstr "gặp lỗi khi đọc cập nhật .gitmodules"
+
+#: submodule.c:135
+msgid "unable to stat updated .gitmodules"
+msgstr "không thể lấy thống kê .gitmodules đã cập nhật"
+
+#: submodule.c:139
+msgid "unable to remove .gitmodules from index"
+msgstr "không thể gỡ bỏ .gitmodules từ mục lục"
+
+#: submodule.c:141
+msgid "adding updated .gitmodules failed"
+msgstr "gặp lỗi khi thêm .gitmodules đã cập nhật"
+
+#: submodule.c:143
+msgid "staging updated .gitmodules failed"
+msgstr "gặp lỗi khi tổ chức .gitmodules đã cập nhật"
+
+#: submodule.c:1144 builtin/init-db.c:363
+#, c-format
+msgid "Could not create git link %s"
+msgstr "Không thể tạo liên kết git “%s”"
+
+#: submodule.c:1155
+#, c-format
+msgid "Could not set core.worktree in %s"
+msgstr "Không thể đặt cây thư mục làm việc “core.worktree” trong “%s”."
+
+#: urlmatch.c:120
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "tên lược đồ URL không hợp lệ hay thiếu hậu tố “://”"
+
+#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "thoát chuỗi %XX không hợp lệ"
+
+#: 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:”"
+
+#: 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"
+
+#: 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"
+
+#: urlmatch.c:244 urlmatch.c:255
+msgid "invalid port number"
+msgstr "tên cổng không hợp lệ"
+
+#: urlmatch.c:322
+msgid "invalid '..' path segment"
+msgstr "đoạn đường dẫn “..” không hợp lệ"
+
+#: wrapper.c:422
#, c-format
msgid "unable to access '%s': %s"
msgstr "không thể truy cập “%s”: %s"
-#: wrapper.c:429
+#: wrapper.c:443
#, c-format
msgid "unable to access '%s'"
msgstr "không thể truy cập “%s”"
-#: wrapper.c:440
+#: wrapper.c:454
#, c-format
msgid "unable to look up current user in the passwd file: %s"
msgstr "không tìm thấy người dùng hiện tại trong tập tin passwd: %s"
-#: wrapper.c:441
+#: wrapper.c:455
msgid "no such user"
msgstr "không có người dùng như vậy"
-#: wt-status.c:141
+#: wt-status.c:146
msgid "Unmerged paths:"
msgstr "Những đường dẫn chưa được hòa trộn:"
-#: wt-status.c:168 wt-status.c:195
+#: wt-status.c:173 wt-status.c:200
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (dùng \"git reset %s <tập-tin>...\" để bỏ một stage (trạng thái))"
-#: wt-status.c:170 wt-status.c:197
+#: wt-status.c:175 wt-status.c:202
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (dùng \"git rm --cached <tập-tin>...\" để bỏ trạng thái (stage))"
-#: wt-status.c:174
+#: wt-status.c:179
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (dùng \"git add <tập-tin>...\" để đánh dấu là cần giải quyết)"
-#: wt-status.c:176 wt-status.c:180
+#: wt-status.c:181 wt-status.c:185
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (dùng \"git add/rm <tập-tin>...\" như là một cách thích hợp để đánh dấu "
"là cần được giải quyết)"
-#: wt-status.c:178
+#: wt-status.c:183
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (dùng \"git rm <tập-tin>...\" để đánh dấu là cần giải quyết)"
-#: wt-status.c:189
+#: wt-status.c:194
msgid "Changes to be committed:"
msgstr "Những thay đổi sẽ được chuyển giao:"
-#: wt-status.c:207
+#: wt-status.c:212
msgid "Changes not staged for commit:"
msgstr ""
"Các thay đổi không được đặt trạng thái (stage) cho lần chuyển giao (commit):"
-#: wt-status.c:211
+#: wt-status.c:216
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ì cần chuyển giao "
"(commit))"
-#: wt-status.c:213
+#: wt-status.c:218
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
" (dùng \"git add/rm <tập-tin>...\" để cập nhật những gì sẽ được chuyển giao)"
-#: wt-status.c:214
+#: wt-status.c:219
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
" (dùng \"git checkout -- <tập-tin>...\" để bỏ thay đổi trong thư mục làm "
"việc)"
-#: wt-status.c:216
+#: wt-status.c:221
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (chuyển giao (commit) hoặc là loại bỏ các nội dung không-bị-theo-vết hay "
"đã bị chỉnh sửa trong mô-đun-con)"
-#: wt-status.c:228
+#: wt-status.c:233
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (dùng \"git %s <tập-tin>...\" để thêm vào những gì cần chuyển giao "
"(commit))"
-#: wt-status.c:245
+#: wt-status.c:250
msgid "bug"
msgstr "lỗi"
-#: wt-status.c:250
+#: wt-status.c:255
msgid "both deleted:"
msgstr "bị xóa bởi cả hai:"
-#: wt-status.c:251
+#: wt-status.c:256
msgid "added by us:"
msgstr "được thêm vào bởi chúng ta:"
-#: wt-status.c:252
+#: wt-status.c:257
msgid "deleted by them:"
msgstr "bị xóa đi bởi họ:"
-#: wt-status.c:253
+#: wt-status.c:258
msgid "added by them:"
msgstr "được thêm vào bởi họ:"
-#: wt-status.c:254
+#: wt-status.c:259
msgid "deleted by us:"
msgstr "bị xóa bởi chúng ta:"
-#: wt-status.c:255
+#: wt-status.c:260
msgid "both added:"
msgstr "được thêm vào bởi cả hai:"
-#: wt-status.c:256
+#: wt-status.c:261
msgid "both modified:"
msgstr "bị sửa bởi cả hai:"
-#: wt-status.c:286
+#: wt-status.c:291
msgid "new commits, "
msgstr "lần chuyển giao (commit) mới, "
-#: wt-status.c:288
+#: wt-status.c:293
msgid "modified content, "
msgstr "nội dung bị sửa đổi, "
-#: wt-status.c:290
+#: wt-status.c:295
msgid "untracked content, "
msgstr "nội dung chưa được theo dõi, "
-#: wt-status.c:307
+#: wt-status.c:312
#, c-format
msgid "new file: %s"
msgstr "tập tin mới: %s"
-#: wt-status.c:310
+#: wt-status.c:315
#, c-format
msgid "copied: %s -> %s"
-msgstr "đã sao chép: %s -> %s"
+msgstr "đã sao chép: %s -> %s"
-#: wt-status.c:313
+#: wt-status.c:318
#, c-format
msgid "deleted: %s"
-msgstr "đã xóa: %s"
+msgstr "đã xóa: %s"
-#: wt-status.c:316
+#: wt-status.c:321
#, c-format
msgid "modified: %s"
-msgstr "đã sửa đổi: %s"
+msgstr "đã sửa đổi: %s"
-#: wt-status.c:319
+#: wt-status.c:324
#, c-format
msgid "renamed: %s -> %s"
msgstr "đã đổi tên: %s -> %s"
-#: wt-status.c:322
+#: wt-status.c:327
#, c-format
msgid "typechange: %s"
-msgstr "đổi-kiểu: %s"
+msgstr "đổi-kiểu: %s"
-#: wt-status.c:325
+#: wt-status.c:330
#, c-format
msgid "unknown: %s"
msgstr "không hiểu: %s"
-#: wt-status.c:328
+#: wt-status.c:333
#, c-format
msgid "unmerged: %s"
-msgstr "chưa hòa trộn: %s"
+msgstr "chưa hòa trộn: %s"
-#: wt-status.c:331
+#: wt-status.c:336
#, c-format
msgid "bug: unhandled diff status %c"
msgstr "lỗi: không lấy được trạng thái lệnh diff %c"
-#: wt-status.c:803
+#: wt-status.c:703
+msgid "Submodules changed but not updated:"
+msgstr "Những mô-đun-con đã bị thay đổi nhưng chưa được cập nhật:"
+
+#: wt-status.c:705
+msgid "Submodule changes to be committed:"
+msgstr "Những mô-đun-con thay đổi đã được chuyển giao (commit):"
+
+#: wt-status.c:848
msgid "You have unmerged paths."
msgstr "Bạn có những đường dẫn chưa được hòa trộn."
-#: wt-status.c:806
+#: wt-status.c:851
msgid " (fix conflicts and run \"git commit\")"
msgstr " (sửa các xung đột sau đó chạy \"git commit\")"
-#: wt-status.c:809
+#: wt-status.c:854
msgid "All conflicts fixed but you are still merging."
msgstr "Tất cả các xung đột đã được giải quyết nhưng bạn vẫn đang hòa trộn."
-#: wt-status.c:812
+#: wt-status.c:857
msgid " (use \"git commit\" to conclude merge)"
msgstr " (dùng \"git commit\" để hoàn tất việc hòa trộn)"
-#: wt-status.c:822
+#: wt-status.c:867
msgid "You are in the middle of an am session."
msgstr "Bạn đang ở giữa của một phiên “am”."
-#: wt-status.c:825
+#: wt-status.c:870
msgid "The current patch is empty."
msgstr "Miếng vá hiện tại bị trống rỗng."
-#: wt-status.c:829
+#: wt-status.c:874
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (sửa các xung đột và sau đó chạy lệnh \"git am --continue\")"
-#: wt-status.c:831
+#: wt-status.c:876
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (dùng \"git am --skip\" để bỏ qua miếng vá này)"
-#: wt-status.c:833
+#: wt-status.c:878
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (dùng \"git am --abort\" để phục hồi lại nhánh nguyên thủy)"
-#: wt-status.c:893 wt-status.c:910
+#: wt-status.c:938 wt-status.c:955
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Bạn hiện nay đang thực hiện việc rebase nhánh “%s” trên “%s”."
-#: wt-status.c:898 wt-status.c:915
+#: wt-status.c:943 wt-status.c:960
msgid "You are currently rebasing."
msgstr "Bạn hiện nay đang thực hiện việc rebase (tái cấu trúc)."
-#: wt-status.c:901
+#: wt-status.c:946
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (sửa các xung đột và sau đó chạy lệnh \"git rebase --continue\")"
-#: wt-status.c:903
+#: wt-status.c:948
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (dùng \"git rebase --skip\" để bỏ qua lần vá này)"
-#: wt-status.c:905
+#: wt-status.c:950
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (dùng \"git rebase --abort\" để check-out nhánh nguyên thủy)"
-#: wt-status.c:918
+#: wt-status.c:963
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
" (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git rebase --continue\")"
-#: wt-status.c:922
+#: wt-status.c:967
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -1502,126 +1669,127 @@ msgstr ""
"Bạn hiện nay đang thực hiện việc chia tách một lần chuyển giao (commit) "
"trong khi đang rebase nhánh “%s” trên “%s”."
-#: wt-status.c:927
+#: wt-status.c:972
msgid "You are currently splitting a commit during a rebase."
msgstr ""
"Bạn hiện tại đang cắt đôi một lần chuyển giao trong khi đang thực hiện việc "
"rebase."
-#: wt-status.c:930
+#: wt-status.c:975
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 \"git rebase --continue"
"\")"
-#: wt-status.c:934
+#: wt-status.c:979
#, 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 (commit) trong "
"khi đang rebase nhánh “%s” trên “%s”."
-#: wt-status.c:939
+#: wt-status.c:984
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:942
+#: wt-status.c:987
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
" (dùng \"git commit --amend\" để tu bổ lần chuyển giao (commit) hiện tại)"
-#: wt-status.c:944
+#: wt-status.c:989
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (dùng \"git rebase --continue\" một khi bạn cảm thấy hài lòng về những "
"thay đổi của mình)"
-#: wt-status.c:954
-msgid "You are currently cherry-picking."
-msgstr "Bạn hiện nay đang thực hiện việc cherry-pick."
+#: wt-status.c:999
+#, 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:958
+#: wt-status.c:1004
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
" (sửa các xung đột và sau đó chạy lệnh \"git cherry-pick --continue\")"
-#: wt-status.c:961
+#: wt-status.c:1007
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git cherry-pick --"
"continue\")"
-#: wt-status.c:963
+#: wt-status.c:1009
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " (dùng \"git cherry-pick --abort\" để hủy bỏ thao tác cherry-pick)"
-#: wt-status.c:972
+#: wt-status.c:1018
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Bạn hiện nay đang thực hiện thao tác revert lần chuyển giao “%s”."
-#: wt-status.c:977
+#: wt-status.c:1023
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:980
+#: wt-status.c:1026
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
" (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git revert --continue\")"
-#: wt-status.c:982
+#: wt-status.c:1028
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (dùng \"git revert --abort\" để hủy bỏ thao tác revert)"
-#: wt-status.c:993
+#: wt-status.c:1039
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
"Bạn hiện nay đang thực hiện thao tác di chuyển nửa bước (bisect), bắt đầu từ "
"nhánh “%s”."
-#: wt-status.c:997
+#: wt-status.c:1043
msgid "You are currently bisecting."
-msgstr "Bạn hiện tại đang thực hiện việc bisect (chia đôi)."
+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:1000
+#: wt-status.c:1046
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:1173
+#: wt-status.c:1221
msgid "On branch "
msgstr "Trên nhánh "
-#: wt-status.c:1180
+#: wt-status.c:1228
msgid "rebase in progress; onto "
-msgstr "rebase đang được thực hiện: lên trên"
+msgstr "rebase đang được thực hiện: lên trên "
-#: wt-status.c:1187
+#: wt-status.c:1235
msgid "HEAD detached at "
-msgstr "HEAD được tách rời tại"
+msgstr "HEAD được tách rời tại "
-#: wt-status.c:1189
+#: wt-status.c:1237
msgid "HEAD detached from "
msgstr "HEAD được tách rời từ"
-#: wt-status.c:1192
+#: wt-status.c:1240
msgid "Not currently on any branch."
msgstr "Hiện tại chẳng ở nhánh nào cả."
-#: wt-status.c:1209
+#: wt-status.c:1257
msgid "Initial commit"
msgstr "Lần chuyển giao (commit) khởi đầu"
-#: wt-status.c:1223
+#: wt-status.c:1271
msgid "Untracked files"
msgstr "Những tập tin chưa được theo dõi"
-#: wt-status.c:1225
+#: wt-status.c:1273
msgid "Ignored files"
msgstr "Những tập tin bị lờ đi"
-#: wt-status.c:1229
+#: wt-status.c:1277
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -1633,32 +1801,32 @@ msgstr ""
"có lẽ làm nó nhanh hơn, nhưng bạn phải cẩn thận đừng quên mình phải\n"
"tự thêm các tập tin mới (xem “git help status”.."
-#: wt-status.c:1235
+#: wt-status.c:1283
#, c-format
msgid "Untracked files not listed%s"
msgstr "Những tập tin không bị theo vết không được liệt kê ra %s"
-#: wt-status.c:1237
+#: wt-status.c:1285
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:1243
+#: wt-status.c:1291
msgid "No changes"
msgstr "Không có thay đổi nào"
-#: wt-status.c:1248
+#: wt-status.c:1296
#, 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 commit (dùng \"git add\" và/hoặc \"git "
"commit -a\")\n"
-#: wt-status.c:1251
+#: wt-status.c:1299
#, c-format
msgid "no changes added to commit\n"
msgstr "không có thay đổi nào được thêm vào lần chuyển giao (commit)\n"
-#: wt-status.c:1254
+#: wt-status.c:1302
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -1667,58 +1835,62 @@ msgstr ""
"không có gì được thêm vào lần chuyển giao (commit) nhưng có những tập tin "
"không được theo dấu vết hiện diện (dùng \"git add\" để đưa vào theo dõi)\n"
-#: wt-status.c:1257
+#: wt-status.c:1305
#, 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 (commit) nhưng có những tập tin "
"không được theo dấu vết hiện diện\n"
-#: wt-status.c:1260
+#: wt-status.c:1308
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
" không có gì để commit (tạo/sao-chép các tập tin và dùng \"git add\" để theo "
"dõi dấu vết)\n"
-#: wt-status.c:1263 wt-status.c:1268
+#: wt-status.c:1311 wt-status.c:1316
#, c-format
msgid "nothing to commit\n"
msgstr "không có gì để chuyển giao (commit)\n"
-#: wt-status.c:1266
+#: wt-status.c:1314
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"không có gì để chuyển giao (commit) (dùng -u để bỏ các tập tin cần theo dấu "
"vết)\n"
-#: wt-status.c:1270
+#: wt-status.c:1318
#, c-format
msgid "nothing to commit, working directory clean\n"
msgstr "không có gì để chuyển giao (commit), thư mục làm việc sạch sẽ\n"
-#: wt-status.c:1378
+#: wt-status.c:1427
msgid "HEAD (no branch)"
msgstr "HEAD (không nhánh)"
-#: wt-status.c:1384
+#: wt-status.c:1433
msgid "Initial commit on "
msgstr "Lần chuyển giao (commit) khởi tạo trên "
-#: wt-status.c:1399
+#: wt-status.c:1463
+msgid "gone"
+msgstr "đã ra đi"
+
+#: wt-status.c:1465
msgid "behind "
msgstr "đằng sau "
-#: wt-status.c:1402 wt-status.c:1405
+#: wt-status.c:1468 wt-status.c:1471
msgid "ahead "
msgstr "phía trước "
-#: wt-status.c:1407
+#: wt-status.c:1473
msgid ", behind "
msgstr ", đằng sau "
-#: compat/precompose_utf8.c:58 builtin/clone.c:351
+#: compat/precompose_utf8.c:55 builtin/clone.c:350
#, c-format
msgid "failed to unlink '%s'"
msgstr "bỏ liên kết (unlink) %s không thành công"
@@ -1806,7 +1978,7 @@ msgstr ""
msgid "unexpected diff status %c"
msgstr "trạng thái lệnh diff không như mong đợi %c"
-#: builtin/add.c:149 builtin/commit.c:252
+#: builtin/add.c:149 builtin/commit.c:260
msgid "updating files failed"
msgstr "Cập nhật tập tin gặp lỗi"
@@ -1815,147 +1987,142 @@ msgstr "Cập nhật tập tin gặp lỗi"
msgid "remove '%s'\n"
msgstr "gỡ bỏ “%s”\n"
-#: builtin/add.c:253
+#: builtin/add.c:237
msgid "Unstaged changes after refreshing the index:"
msgstr ""
"Các thay đổi không được lưu trạng thái sau khi làm tươi mới lại bảng mục lục:"
-#: builtin/add.c:256 builtin/add.c:573 builtin/rm.c:337
-#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr "pathspec “%s” không khớp với bất kỳ tập tin nào"
-
-#: builtin/add.c:339
+#: builtin/add.c:299
msgid "Could not read the index"
msgstr "Không thể đọc bảng mục lục"
-#: builtin/add.c:350
+#: builtin/add.c:310
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Không thể mở “%s” để ghi."
-#: builtin/add.c:354
+#: builtin/add.c:314
msgid "Could not write patch"
msgstr "Không thể ghi ra miếng vá"
-#: builtin/add.c:359
+#: builtin/add.c:319
#, c-format
msgid "Could not stat '%s'"
msgstr "không thể lấy trạng thái về “%s”"
-#: builtin/add.c:361
+#: builtin/add.c:321
msgid "Empty patch. Aborted."
msgstr "Miếng vá trống rỗng. Đã bỏ qua."
-#: builtin/add.c:367
+#: builtin/add.c:327
#, c-format
msgid "Could not apply '%s'"
msgstr "Không thể apply (áp dụng miếng vá) “%s”"
-#: builtin/add.c:377
+#: builtin/add.c:337
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Các đường dẫn theo sau đây sẽ bị lờ đi bởi một trong các tập tin .gitignore "
"của bạn:\n"
-#: builtin/add.c:394 builtin/clean.c:875 builtin/fetch.c:78 builtin/mv.c:63
-#: builtin/prune-packed.c:73 builtin/push.c:451 builtin/remote.c:1253
-#: builtin/rm.c:268
+#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:92 builtin/mv.c:66
+#: builtin/prune-packed.c:73 builtin/push.c:459 builtin/remote.c:1253
+#: builtin/rm.c:269
msgid "dry run"
msgstr "chạy thử"
-#: builtin/add.c:395 builtin/apply.c:4410 builtin/check-ignore.c:19
-#: builtin/commit.c:1220 builtin/count-objects.c:95 builtin/fsck.c:613
-#: builtin/log.c:1573 builtin/mv.c:62 builtin/read-tree.c:113
+#: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19
+#: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612
+#: builtin/log.c:1592 builtin/mv.c:65 builtin/read-tree.c:113
msgid "be verbose"
msgstr "chi tiết"
-#: builtin/add.c:397
+#: builtin/add.c:357
msgid "interactive picking"
msgstr "sửa bằng cách tương tác"
-#: builtin/add.c:398 builtin/checkout.c:1073 builtin/reset.c:261
+#: builtin/add.c:358 builtin/checkout.c:1109 builtin/reset.c:272
msgid "select hunks interactively"
msgstr "chọn “hunks” một cách tương tác"
-#: builtin/add.c:399
+#: builtin/add.c:359
msgid "edit current diff and apply"
msgstr "sửa diff hiện nay và áp dụng nó"
-#: builtin/add.c:400
+#: builtin/add.c:360
msgid "allow adding otherwise ignored files"
msgstr "cho phép thêm các tập tin bị bỏ qua khác"
-#: builtin/add.c:401
+#: builtin/add.c:361
msgid "update tracked files"
msgstr "cập nhật các tập tin được theo vết"
-#: builtin/add.c:402
+#: builtin/add.c:362
msgid "record only the fact that the path will be added later"
msgstr "chỉ ghi lại sự việc mà đường dẫn sẽ được thêm vào sau"
-#: builtin/add.c:403
+#: builtin/add.c:363
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"
#. takes no arguments
-#: builtin/add.c:406
+#: builtin/add.c:366
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
"lờ đi các đường dẫn bị gỡ bỏ trong cây thư mục làm việc (giống với --no-all)"
-#: builtin/add.c:408
+#: builtin/add.c:368
msgid "don't add, only refresh the index"
msgstr "không thêm, chỉ làm tươi mới bảng mục lục"
-#: builtin/add.c:409
+#: builtin/add.c:369
msgid "just skip files which cannot be added because of errors"
msgstr "chie bỏ qua những tập tin mà nó không thể được thêm vào bởi vì gặp lỗi"
-#: builtin/add.c:410
+#: builtin/add.c:370
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
"kiểm tra xem - thậm chí thiếu - tập tin bị bỏ qua trong quá trình chạy thử"
-#: builtin/add.c:432
+#: builtin/add.c:392
#, 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"
-#: builtin/add.c:433
+#: builtin/add.c:393
msgid "no files added"
msgstr "chưa có tập tin nào được thêm vào"
-#: builtin/add.c:439
+#: builtin/add.c:399
msgid "adding files failed"
msgstr "thêm tập tin gặp lỗi"
-#: builtin/add.c:478
+#: builtin/add.c:438
msgid "-A and -u are mutually incompatible"
msgstr "-A và -u xung khắc nhau"
-#: builtin/add.c:496
+#: builtin/add.c:456
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "Tùy chọn --ignore-missing chỉ có thể được dùng cùng với --dry-run"
-#: builtin/add.c:526
+#: builtin/add.c:486
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Không có gì được chỉ ra, không có gì được thêm vào.\n"
-#: builtin/add.c:527
+#: builtin/add.c:487
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Có lẽ bạn muốn là “git add .” phải không?\n"
-#: builtin/add.c:533 builtin/check-ignore.c:161 builtin/clean.c:919
-#: builtin/commit.c:312 builtin/mv.c:82 builtin/rm.c:297
+#: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919
+#: builtin/commit.c:320 builtin/mv.c:86 builtin/reset.c:224 builtin/rm.c:299
msgid "index file corrupt"
msgstr "tập tin ghi bảng mục lục bị hỏng"
-#: builtin/add.c:605 builtin/apply.c:4506 builtin/mv.c:229 builtin/rm.c:432
+#: builtin/add.c:589 builtin/apply.c:4506 builtin/mv.c:259 builtin/rm.c:432
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"
@@ -2211,7 +2378,7 @@ msgstr "%s: miếng vá không được áp dụng"
msgid "Checking patch %s..."
msgstr "Đang kiểm tra miếng vá %s..."
-#: builtin/apply.c:3680 builtin/checkout.c:216 builtin/reset.c:127
+#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:127
#, 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”"
@@ -2239,7 +2406,7 @@ msgstr "không thể tạo “backing store” cho tập tin được tạo mớ
#: builtin/apply.c:3863 builtin/apply.c:3971
#, c-format
msgid "unable to add cache entry for %s"
-msgstr "không thể thêm mục nhớ tạm cho %s"
+msgstr "không thể thêm mục nhớ đệm cho %s"
#: builtin/apply.c:3896
#, c-format
@@ -2271,7 +2438,7 @@ msgstr[1] "Đang áp dụng miếng vá %%s với %d lần từ chối..."
#: builtin/apply.c:4053
#, c-format
msgid "truncating .rej filename to %.*s.rej"
-msgstr "đang cắt cụt tên tập tin .rej thành %.*s.rej"
+msgstr "đang cắt ngắn tên tập tin .rej thành %.*s.rej"
#: builtin/apply.c:4074
#, c-format
@@ -2291,8 +2458,8 @@ msgstr "không thừa nhận đầu vào"
msgid "unable to read index file"
msgstr "không thể đọc tập tin lưu bảng mục lục"
-#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:91
-#: builtin/fetch.c:63
+#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90
+#: builtin/fetch.c:77
msgid "path"
msgstr "đường-dẫn"
@@ -2356,7 +2523,7 @@ msgid "build a temporary index based on embedded index information"
msgstr ""
"xây dựng bảng mục lục tạm thời trên cơ sở thông tin bảng mục lục được nhúng"
-#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:462
+#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:452
msgid "paths are separated with NUL character"
msgstr "các đường dẫn bị ngăn cách bởi ký tự NULL"
@@ -2455,7 +2622,7 @@ msgstr "git archive: Máy chủ không có địa chỉ URL"
#: builtin/archive.c:58
msgid "git archive: expected ACK/NAK, got EOF"
-msgstr "git archive: mong đợi ACK/NAK, nhận EOF"
+msgstr "git archive: cần ACK/NAK, nhưng lại nhận được EOF"
#: builtin/archive.c:61
#, c-format
@@ -2473,7 +2640,7 @@ msgstr "git archive: lỗi giao thức"
#: builtin/archive.c:68
msgid "git archive: expected a flush"
-msgstr "git archive: đã mong chờ một flush"
+msgstr "git archive: cần một flush (đẩy dữ liệu lên đĩa)"
#: builtin/bisect--helper.c:7
msgid "git bisect--helper --next-all [--no-checkout]"
@@ -2489,105 +2656,105 @@ msgstr ""
"cập nhật BISECT_HEAD thay vì lấy ra (checking out) lần chuyển giao (commit) "
"hiện hành"
-#: builtin/blame.c:26
+#: builtin/blame.c:27
msgid "git blame [options] [rev-opts] [rev] [--] file"
msgstr "git blame [các-tùy-chọn] [rev-opts] [rev] [--] tập-tin"
-#: builtin/blame.c:31
+#: builtin/blame.c:32
msgid "[rev-opts] are documented in git-rev-list(1)"
msgstr "[rev-opts] được mô tả trong git-rev-list(1)"
-#: builtin/blame.c:2276
+#: builtin/blame.c:2248
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:2277
+#: builtin/blame.c:2249
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:2278
+#: builtin/blame.c:2250
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:2279
+#: builtin/blame.c:2251
msgid "Show work cost statistics"
msgstr "Hiển thị thống kê công sức làm việc"
-#: builtin/blame.c:2280
+#: builtin/blame.c:2252
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:2281
+#: builtin/blame.c:2253
msgid "Show original filename (Default: auto)"
msgstr "Hiển thị tên tập tin gốc (Mặc định: auto)"
-#: builtin/blame.c:2282
+#: builtin/blame.c:2254
msgid "Show original linenumber (Default: off)"
msgstr "Hiển thị số dòng gốc (Mặc định: off)"
-#: builtin/blame.c:2283
+#: builtin/blame.c:2255
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:2284
+#: builtin/blame.c:2256
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:2285
+#: builtin/blame.c:2257
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "Dùng cùng chế độ xuất ra vóigit-annotate (Mặc định: off)"
-#: builtin/blame.c:2286
+#: builtin/blame.c:2258
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:2287
+#: builtin/blame.c:2259
msgid "Show long commit SHA1 (Default: off)"
msgstr "Hiển thị SHA1 của lần chuyển giao (commit) dạng dài (Mặc định: off)"
-#: builtin/blame.c:2288
+#: builtin/blame.c:2260
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:2289
+#: builtin/blame.c:2261
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:2290
+#: builtin/blame.c:2262
msgid "Ignore whitespace differences"
msgstr "Bỏ qua các khác biệt do khoảng trắng gây ra"
-#: builtin/blame.c:2291
+#: builtin/blame.c:2263
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:2292
+#: builtin/blame.c:2264
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:2293
+#: builtin/blame.c:2265
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:2294 builtin/blame.c:2295
+#: builtin/blame.c:2266 builtin/blame.c:2267
msgid "score"
msgstr "điểm số"
-#: builtin/blame.c:2294
+#: builtin/blame.c:2266
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:2295
+#: builtin/blame.c:2267
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:2296
+#: builtin/blame.c:2268
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2296
+#: builtin/blame.c:2268
msgid "Process only line range n,m, counting from 1"
msgstr "Xử lý chỉ dòng vùng n,m, tính từ 1"
@@ -2674,7 +2841,7 @@ msgstr "Gặp lỗi khi đang xóa nhánh trên máy chủ “%s”"
#: builtin/branch.c:256
#, c-format
msgid "Error deleting branch '%s'"
-msgstr "Lỗi khi xoá bỏ nhánh “%s”"
+msgstr "Gặp lỗi khi xoá bỏ nhánh “%s”"
#: builtin/branch.c:263
#, c-format
@@ -2693,279 +2860,289 @@ msgstr "nhánh “%s” không chỉ đến một lần chuyển giao (commit) n
#: builtin/branch.c:453
#, c-format
+msgid "[%s: gone]"
+msgstr "[%s: đã ra đi]"
+
+#: builtin/branch.c:456
+#, c-format
+msgid "[%s]"
+msgstr "[%s]"
+
+#: builtin/branch.c:459
+#, c-format
msgid "[%s: behind %d]"
msgstr "[%s: đằng sau %d]"
-#: builtin/branch.c:455
+#: builtin/branch.c:461
#, c-format
msgid "[behind %d]"
msgstr "[đằng sau %d]"
-#: builtin/branch.c:459
+#: builtin/branch.c:465
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s: phía trước %d]"
-#: builtin/branch.c:461
+#: builtin/branch.c:467
#, c-format
msgid "[ahead %d]"
msgstr "[phía trước %d]"
-#: builtin/branch.c:464
+#: builtin/branch.c:470
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s: trước %d, sau %d]"
-#: builtin/branch.c:467
+#: builtin/branch.c:473
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[trước %d, sau %d]"
-#: builtin/branch.c:490
+#: builtin/branch.c:496
msgid " **** invalid ref ****"
msgstr " **** tham chiếu sai ****"
-#: builtin/branch.c:582
+#: builtin/branch.c:588
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(không nhánh, đang rebase %s)"
-#: builtin/branch.c:585
+#: builtin/branch.c:591
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(không nhánh, bisect được bắt đầu tại %s)"
-#: builtin/branch.c:588
+#: builtin/branch.c:594
#, c-format
msgid "(detached from %s)"
msgstr "(được tách rời từ %s)"
-#: builtin/branch.c:591
+#: builtin/branch.c:597
msgid "(no branch)"
msgstr "(không nhánh)"
-#: builtin/branch.c:637
+#: builtin/branch.c:643
#, c-format
msgid "object '%s' does not point to a commit"
msgstr "đối tượng “%s” không chỉ đến một lần chuyển giao (commit) nào cả"
-#: builtin/branch.c:669
+#: builtin/branch.c:675
msgid "some refs could not be read"
msgstr "một số tham chiếu đã không thể đọc được"
-#: builtin/branch.c:682
+#: builtin/branch.c:688
msgid "cannot rename the current branch while not on any."
msgstr "không thể đổi tên nhánh hiện hành trong khi nó chẳng ở đâu cả."
-#: builtin/branch.c:692
+#: builtin/branch.c:698
#, c-format
msgid "Invalid branch name: '%s'"
-msgstr "Sai tên nhánh: “%s”"
+msgstr "Tên nhánh không hợp lệ: “%s”"
-#: builtin/branch.c:707
+#: builtin/branch.c:713
msgid "Branch rename failed"
-msgstr "Đổi tên nhánh gặp lỗi"
+msgstr "Gặp lỗi khi đổi tên nhánh"
-#: builtin/branch.c:711
+#: builtin/branch.c:717
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Đã đổi tên nhánh khuyết danh “%s” đi"
-#: builtin/branch.c:715
+#: builtin/branch.c:721
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Nhánh bị đổi tên thành %s, nhưng HEAD lại không được cập nhật!"
-#: builtin/branch.c:722
+#: builtin/branch.c:728
msgid "Branch is renamed, but update of config-file failed"
msgstr "Nhánh bị đổi tên, nhưng cập nhật tập tin cấu hình gặp lỗi"
-#: builtin/branch.c:737
+#: builtin/branch.c:743
#, c-format
msgid "malformed object name %s"
msgstr "tên đối tượng dị hình %s"
-#: builtin/branch.c:761
+#: builtin/branch.c:767
#, c-format
msgid "could not write branch description template: %s"
msgstr "không thể ghi vào mẫu mô tả nhánh: %s"
-#: builtin/branch.c:791
+#: builtin/branch.c:797
msgid "Generic options"
msgstr "Tùy chọn chung"
-#: builtin/branch.c:793
+#: builtin/branch.c:799
msgid "show hash and subject, give twice for upstream branch"
msgstr "hiển thị mã băm và chủ đề, đưa ra hai lần cho nhánh thượng nguồn"
-#: builtin/branch.c:794
+#: builtin/branch.c:800
msgid "suppress informational messages"
msgstr "Thu hồi các thông điệp thông tin"
-#: builtin/branch.c:795
+#: builtin/branch.c:801
msgid "set up tracking mode (see git-pull(1))"
msgstr "cài đặt chế độ theo vết (xem git-pull(1))"
-#: builtin/branch.c:797
+#: builtin/branch.c:803
msgid "change upstream info"
msgstr "thay đổi thông tin thượng nguồn (upstream)"
-#: builtin/branch.c:801
+#: builtin/branch.c:807
msgid "use colored output"
msgstr "sử dụng kết xuất có tô màu"
-#: builtin/branch.c:802
+#: builtin/branch.c:808
msgid "act on remote-tracking branches"
msgstr "thao tác trên nhánh “remote-tracking”"
-#: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832
-#: builtin/branch.c:838 builtin/commit.c:1433 builtin/commit.c:1434
-#: builtin/commit.c:1435 builtin/commit.c:1436 builtin/tag.c:468
+#: builtin/branch.c:811 builtin/branch.c:817 builtin/branch.c:838
+#: builtin/branch.c:844 builtin/commit.c:1460 builtin/commit.c:1461
+#: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468
msgid "commit"
msgstr "commit"
-#: builtin/branch.c:806 builtin/branch.c:812
+#: builtin/branch.c:812 builtin/branch.c:818
msgid "print only branches that contain the commit"
msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao"
-#: builtin/branch.c:818
+#: builtin/branch.c:824
msgid "Specific git-branch actions:"
msgstr "Hành động git-branch:"
-#: builtin/branch.c:819
+#: builtin/branch.c:825
msgid "list both remote-tracking and local branches"
msgstr "liệt kê cả nhánh “remote-tracking” và nội bộ"
-#: builtin/branch.c:821
+#: builtin/branch.c:827
msgid "delete fully merged branch"
msgstr "xóa một cách đầy đủ nhánh đã hòa trộn"
-#: builtin/branch.c:822
+#: builtin/branch.c:828
msgid "delete branch (even if not merged)"
msgstr "xoá nhánh (cho dù là chưa được hòa trộn)"
-#: builtin/branch.c:823
+#: builtin/branch.c:829
msgid "move/rename a branch and its reflog"
msgstr "di chuyển hay đổi tên một nhánh và reflog của nó"
-#: builtin/branch.c:824
+#: builtin/branch.c:830
msgid "move/rename a branch, even if target exists"
msgstr "di chuyển hoặc đổi tên một nhánh, thậm chí cả khi đích đã có sẵn"
-#: builtin/branch.c:825
+#: builtin/branch.c:831
msgid "list branch names"
msgstr "liệt kê các tên nhánh"
-#: builtin/branch.c:826
+#: builtin/branch.c:832
msgid "create the branch's reflog"
msgstr "tạo reflog của nhánh"
-#: builtin/branch.c:828
+#: builtin/branch.c:834
msgid "edit the description for the branch"
msgstr "sửa mô tả cho nhánh"
-#: builtin/branch.c:829
+#: builtin/branch.c:835
msgid "force creation (when already exists)"
msgstr "ép buộc tạo (khi đã sẵn tồn tại rồi)"
-#: builtin/branch.c:832
+#: builtin/branch.c:838
msgid "print only not merged branches"
msgstr "chỉ hiển thị các nhánh chưa được hòa trộn"
-#: builtin/branch.c:838
+#: builtin/branch.c:844
msgid "print only merged branches"
msgstr "chỉ hiển thị các nhánh được hòa trộn"
-#: builtin/branch.c:842
+#: builtin/branch.c:848
msgid "list branches in columns"
msgstr "liệt kê các nhánh trong các cột"
-#: builtin/branch.c:855
+#: builtin/branch.c:861
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 (ref) hợp lệ."
-#: builtin/branch.c:860 builtin/clone.c:630
+#: builtin/branch.c:866 builtin/clone.c:629
msgid "HEAD not found below refs/heads!"
msgstr "không tìm thấy HEAD ở dưới refs/heads!"
-#: builtin/branch.c:883
+#: builtin/branch.c:890
msgid "--column and --verbose are incompatible"
msgstr "--column và --verbose xung khắc nhau"
-#: builtin/branch.c:889 builtin/branch.c:928
+#: builtin/branch.c:896 builtin/branch.c:935
msgid "branch name required"
msgstr "cần tên nhánh"
-#: builtin/branch.c:904
+#: builtin/branch.c:911
msgid "Cannot give description to detached HEAD"
msgstr "Không thể đưa ra mô tả HEAD đã tách rời"
-#: builtin/branch.c:909
+#: builtin/branch.c:916
msgid "cannot edit description of more than one branch"
msgstr "không thể sửa mô tả cho nhiều hơn một nhánh"
-#: builtin/branch.c:916
+#: builtin/branch.c:923
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Vẫn chưa chuyển giao trên nhánh “%s”."
-#: builtin/branch.c:919
+#: builtin/branch.c:926
#, c-format
msgid "No branch named '%s'."
msgstr "Không có nhánh nào có tên “%s”."
-#: builtin/branch.c:934
+#: builtin/branch.c:941
msgid "too many branches for a rename operation"
msgstr "quá nhiều nhánh dành cho thao tác đổi tên"
-#: builtin/branch.c:939
+#: builtin/branch.c:946
msgid "too many branches to set new upstream"
-msgstr "quá nhiều nhánh được đặt cho dòng ngược (upstream) mới"
+msgstr "quá nhiều nhánh được đặt cho thượng nguồn (upstream) mới"
-#: builtin/branch.c:943
+#: builtin/branch.c:950
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
-"không thể đặt dòng ngược (upstream) của HEAD thành %s khi mà nó chẳng chỉ "
+"không thể đặt thượng nguồn (upstream) của HEAD thành %s khi mà nó chẳng chỉ "
"đến nhánh nào cả."
-#: builtin/branch.c:946 builtin/branch.c:968 builtin/branch.c:990
+#: builtin/branch.c:953 builtin/branch.c:975 builtin/branch.c:997
#, c-format
msgid "no such branch '%s'"
msgstr "không có nhánh nào như thế “%s”"
-#: builtin/branch.c:950
+#: builtin/branch.c:957
#, c-format
msgid "branch '%s' does not exist"
msgstr "nhánh “%s” chưa sẵn có"
-#: builtin/branch.c:962
+#: builtin/branch.c:969
msgid "too many branches to unset upstream"
msgstr "quá nhiều nhánh để bỏ đặt ngược dòng (upstream)"
-#: builtin/branch.c:966
+#: builtin/branch.c:973
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"không thể bỏ đặt ngược dòng (upstream) của HEAD không chỉ đến một nhánh nào "
"cả."
-#: builtin/branch.c:972
+#: builtin/branch.c:979
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Nhánh “%s” không có thông tin thượng nguồn (upstream)"
-#: builtin/branch.c:987
+#: builtin/branch.c:994
msgid "it does not make sense to create 'HEAD' manually"
msgstr "không hợp lý khi tạo “HEAD” thủ công "
-#: builtin/branch.c:993
+#: builtin/branch.c:1000
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
"hai tùy chọn -a và -r áp dụng cho lệnh “git branch” không hợp lý đối với tên "
"nhánh"
-#: builtin/branch.c:996
+#: builtin/branch.c:1003
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -2974,7 +3151,7 @@ msgstr ""
"Cờ --set-upstream bị phản đối và sẽ bị xóa bỏ. Nên dùng --track hoặc --set-"
"upstream-to\n"
-#: builtin/branch.c:1013
+#: builtin/branch.c:1020
#, c-format
msgid ""
"\n"
@@ -2985,12 +3162,12 @@ msgstr ""
"Nếu bạn muốn “%s” theo dõi “%s”, thực hiện lệnh sau:\n"
"\n"
-#: builtin/branch.c:1014
+#: builtin/branch.c:1021
#, c-format
msgid " git branch -d %s\n"
msgstr " git branch -d %s\n"
-#: builtin/branch.c:1015
+#: builtin/branch.c:1022
#, c-format
msgid " git branch --set-upstream-to %s\n"
msgstr " git branch --set-upstream-to %s\n"
@@ -3008,44 +3185,44 @@ msgstr "Cần một kho chứa để mà tạo một bundle."
msgid "Need a repository to unbundle."
msgstr "Cần một kho chứa để mà bung một bundle."
-#: builtin/cat-file.c:285
+#: builtin/cat-file.c:312
msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
msgstr "git cat-file (-t|-s|-e|-p|<kiểu>|--textconv) <đối tượng>"
-#: builtin/cat-file.c:286
+#: builtin/cat-file.c:313
msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
msgstr "git cat-file (--batch|--batch-check) < <danh-sách-đối-tượng>"
-#: builtin/cat-file.c:323
+#: builtin/cat-file.c:350
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<kiểu> là một trong số: blob, tree, commit, tag"
-#: builtin/cat-file.c:324
+#: builtin/cat-file.c:351
msgid "show object type"
msgstr "hiển thị kiểu đối tượng"
-#: builtin/cat-file.c:325
+#: builtin/cat-file.c:352
msgid "show object size"
msgstr "hiển thị kích thước đối tượng"
-#: builtin/cat-file.c:327
+#: builtin/cat-file.c:354
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:328
+#: builtin/cat-file.c:355
msgid "pretty-print object's content"
msgstr "in nội dung đối tượng dạng dễ đọc"
-#: builtin/cat-file.c:330
+#: builtin/cat-file.c:357
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:332
+#: builtin/cat-file.c:359
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:335
+#: builtin/cat-file.c:362
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"
@@ -3071,10 +3248,10 @@ msgid "read file names from stdin"
msgstr "đọc tên tập tin từ đầu vào tiêu chuẩn"
#: builtin/check-attr.c:23 builtin/check-ignore.c:24
-msgid "input paths are terminated by a null character"
-msgstr "các đường dẫn được ngăn cách bởi ký tự null"
+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:1054 builtin/gc.c:177
+#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:259
msgid "suppress progress reporting"
msgstr "chặn các báo cáo tiến trình hoạt động"
@@ -3082,27 +3259,31 @@ msgstr "chặn các báo cáo tiến trình hoạt động"
msgid "show non-matching input paths"
msgstr "hiển thị những đường dẫn đầu vào không khớp với mẫu"
-#: builtin/check-ignore.c:143
+#: builtin/check-ignore.c:28
+msgid "ignore index when checking"
+msgstr "bỏ qua mục lục khi kiểm tra"
+
+#: builtin/check-ignore.c:154
msgid "cannot specify pathnames with --stdin"
msgstr "không thể chỉ định các tên đường dẫn với --stdin"
-#: builtin/check-ignore.c:146
+#: builtin/check-ignore.c:157
msgid "-z only makes sense with --stdin"
msgstr "-z chỉ hợp lý với --stdin"
-#: builtin/check-ignore.c:148
+#: builtin/check-ignore.c:159
msgid "no path specified"
-msgstr "chưa ghi rõ đường dẫn"
+msgstr "chưa chỉ ra đường dẫn"
-#: builtin/check-ignore.c:152
+#: builtin/check-ignore.c:163
msgid "--quiet is only valid with a single pathname"
msgstr "--quiet chỉ hợp lệ với tên đường dẫn đơn"
-#: builtin/check-ignore.c:154
+#: builtin/check-ignore.c:165
msgid "cannot have both --quiet and --verbose"
msgstr "không thể dùng cả hai tùy chọn --quiet và --verbose"
-#: builtin/check-ignore.c:157
+#: builtin/check-ignore.c:168
msgid "--non-matching is only valid with --verbose"
msgstr "tùy-chọn --non-matching chỉ hợp lệ khi dùng với --verbose"
@@ -3176,107 +3357,107 @@ msgstr "git checkout [các-tùy-chọn] <nhánh>"
msgid "git checkout [options] [<branch>] -- <file>..."
msgstr "git checkout [các-tùy-chọn] [<nhánh>] -- <tập-tin>..."
-#: builtin/checkout.c:117 builtin/checkout.c:150
+#: builtin/checkout.c:114 builtin/checkout.c:147
#, c-format
msgid "path '%s' does not have our version"
msgstr "đường dẫn “%s” không có các phiên bản của chúng ta"
-#: builtin/checkout.c:119 builtin/checkout.c:152
+#: builtin/checkout.c:116 builtin/checkout.c:149
#, c-format
msgid "path '%s' does not have their version"
msgstr "đường dẫn “%s” không có các phiên bản của chúng"
-#: builtin/checkout.c:135
+#: builtin/checkout.c:132
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "đường dẫn “%s” không có tất cả các phiên bản cần thiết"
-#: builtin/checkout.c:179
+#: builtin/checkout.c:176
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "đường dẫn “%s” không có các phiên bản cần thiết"
-#: builtin/checkout.c:196
+#: builtin/checkout.c:193
#, c-format
msgid "path '%s': cannot merge"
msgstr "đường dẫn “%s”: không thể hòa trộn"
-#: builtin/checkout.c:213
+#: builtin/checkout.c:210
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Không thể thêm kết quả hòa trộn cho “%s”"
-#: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243
-#: builtin/checkout.c:246
+#: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238
+#: builtin/checkout.c:241
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "“%s” không thể được sử dụng với các đường dẫn cập nhật"
-#: builtin/checkout.c:249 builtin/checkout.c:252
+#: builtin/checkout.c:244 builtin/checkout.c:247
#, c-format
msgid "'%s' cannot be used with %s"
-msgstr "“%s” không thể được sử dụng với %s"
+msgstr "“%s” không thể được dùng cùng với %s"
-#: builtin/checkout.c:255
+#: builtin/checkout.c:250
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Không thể cập nhật các đường dẫn và chuyển đến nhánh “%s” cùng một lúc."
-#: builtin/checkout.c:266 builtin/checkout.c:458
+#: builtin/checkout.c:261 builtin/checkout.c:451
msgid "corrupt index file"
msgstr "tập tin ghi bảng mục lục bị hỏng"
-#: builtin/checkout.c:329 builtin/checkout.c:336
+#: builtin/checkout.c:322 builtin/checkout.c:329
#, c-format
msgid "path '%s' is unmerged"
msgstr "đường dẫn “%s” không được hòa trộn"
-#: builtin/checkout.c:480
+#: builtin/checkout.c:473
msgid "you need to resolve your current index first"
msgstr "bạn cần phải phân giải bảng mục lục hiện tại của bạn trước đã"
-#: builtin/checkout.c:601
+#: builtin/checkout.c:594
#, c-format
msgid "Can not do reflog for '%s'\n"
msgstr "Không thể thực hiện reflog cho “%s”\n"
-#: builtin/checkout.c:639
+#: builtin/checkout.c:632
msgid "HEAD is now at"
msgstr "HEAD hiện giờ tại"
-#: builtin/checkout.c:646
+#: builtin/checkout.c:639
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Đặt lại nhánh “%s”\n"
-#: builtin/checkout.c:649
+#: builtin/checkout.c:642
#, c-format
msgid "Already on '%s'\n"
msgstr "Đã sẵn sàng trên “%s”\n"
-#: builtin/checkout.c:653
+#: builtin/checkout.c:646
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Đã chuyển tới và reset nhánh “%s”\n"
-#: builtin/checkout.c:655 builtin/checkout.c:997
+#: builtin/checkout.c:648 builtin/checkout.c:1033
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Đã chuyển đến nhánh mới “%s”\n"
-#: builtin/checkout.c:657
+#: builtin/checkout.c:650
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Đã chuyển đến nhánh “%s”\n"
-#: builtin/checkout.c:713
+#: builtin/checkout.c:706
#, c-format
msgid " ... and %d more.\n"
msgstr " ... và nhiều hơn %d.\n"
#. The singular version
-#: builtin/checkout.c:719
+#: builtin/checkout.c:712
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -3301,7 +3482,7 @@ msgstr[1] ""
"\n"
"%s\n"
-#: builtin/checkout.c:737
+#: builtin/checkout.c:730
#, c-format
msgid ""
"If you want to keep them by creating a new branch, this may be a good time\n"
@@ -3317,138 +3498,142 @@ msgstr ""
" git branch tên_nhánh_mới %s\n"
"\n"
-#: builtin/checkout.c:767
+#: builtin/checkout.c:760
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:771
+#: builtin/checkout.c:764
msgid "Previous HEAD position was"
msgstr "Vị trí kế trước của HEAD là"
-#: builtin/checkout.c:798 builtin/checkout.c:992
+#: builtin/checkout.c:791 builtin/checkout.c:1028
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"
-#. case (1)
-#: builtin/checkout.c:928
+#: builtin/checkout.c:935
+#, 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:974
#, c-format
msgid "invalid reference: %s"
msgstr "tham chiếu sai: %s"
#. case (1): want a tree
-#: builtin/checkout.c:967
+#: builtin/checkout.c:1003
#, c-format
msgid "reference is not a tree: %s"
msgstr "tham chiếu không phải là một cây (tree):%s"
-#: builtin/checkout.c:1006
+#: builtin/checkout.c:1042
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:1009 builtin/checkout.c:1013
+#: builtin/checkout.c:1045 builtin/checkout.c:1049
#, 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:1017 builtin/checkout.c:1020 builtin/checkout.c:1025
-#: builtin/checkout.c:1028
+#: builtin/checkout.c:1053 builtin/checkout.c:1056 builtin/checkout.c:1061
+#: builtin/checkout.c:1064
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "“%s” không thể được sử dụng với “%s”"
-#: builtin/checkout.c:1033
+#: builtin/checkout.c:1069
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Không thể chuyển nhánh đến một non-commit “%s”"
-#: builtin/checkout.c:1055 builtin/checkout.c:1057 builtin/clone.c:89
+#: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88
#: builtin/remote.c:169 builtin/remote.c:171
msgid "branch"
msgstr "nhánh"
-#: builtin/checkout.c:1056
+#: builtin/checkout.c:1092
msgid "create and checkout a new branch"
msgstr "tạo và checkout một nhánh mới"
-#: builtin/checkout.c:1058
+#: builtin/checkout.c:1094
msgid "create/reset and checkout a branch"
msgstr "create/reset và checkout một nhánh"
-#: builtin/checkout.c:1059
+#: builtin/checkout.c:1095
msgid "create reflog for new branch"
msgstr "tạo reflog cho nhánh mới"
-#: builtin/checkout.c:1060
+#: builtin/checkout.c:1096
msgid "detach the HEAD at named commit"
msgstr "rời bỏ HEAD tại lần chuyển giao danh nghĩa"
-#: builtin/checkout.c:1061
+#: builtin/checkout.c:1097
msgid "set upstream info for new branch"
msgstr "đặt thông tin thượng nguồn (upstream) cho nhánh mới"
-#: builtin/checkout.c:1063
+#: builtin/checkout.c:1099
msgid "new branch"
msgstr "nhánh mới"
-#: builtin/checkout.c:1063
+#: builtin/checkout.c:1099
msgid "new unparented branch"
msgstr "nhánh mồ côi mới"
-#: builtin/checkout.c:1064
+#: builtin/checkout.c:1100
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:1066
+#: builtin/checkout.c:1102
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:1068
+#: builtin/checkout.c:1104
msgid "force checkout (throw away local modifications)"
msgstr "ép buộc lấy ra (checkout) (bỏ đi những thay đổi nội bộ)"
-#: builtin/checkout.c:1069
+#: builtin/checkout.c:1105
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:1070 builtin/merge.c:232
+#: builtin/checkout.c:1106 builtin/merge.c:232
msgid "update ignored files (default)"
msgstr "cập nhật các tập tin bị bỏ qua (mặc định)"
-#: builtin/checkout.c:1071 builtin/log.c:1208 parse-options.h:249
+#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:251
msgid "style"
msgstr "kiểu"
-#: builtin/checkout.c:1072
+#: builtin/checkout.c:1108
msgid "conflict style (merge or diff3)"
msgstr "xung đột kiểu (hòa trộn hay diff3)"
-#: builtin/checkout.c:1075
+#: builtin/checkout.c:1111
msgid "do not limit pathspecs to sparse entries only"
msgstr "không giới hạn pathspecs chỉ thành các mục thưa thớt"
-#: builtin/checkout.c:1077
+#: builtin/checkout.c:1113
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:1101
+#: builtin/checkout.c:1136
msgid "-b, -B and --orphan are mutually exclusive"
-msgstr "Tùy chọn -b|-B và --orphan loại từ lẫn nhau"
+msgstr "Tùy chọn -b, -B và --orphan loại từ lẫn nhau"
-#: builtin/checkout.c:1118
+#: builtin/checkout.c:1153
msgid "--track needs a branch name"
msgstr "--track cần tên một nhánh"
-#: builtin/checkout.c:1125
+#: builtin/checkout.c:1160
msgid "Missing branch name; try -b"
msgstr "Thiếu tên nhánh; hãy thử -b"
-#: builtin/checkout.c:1160
+#: builtin/checkout.c:1197
msgid "invalid path specification"
msgstr "đường dẫn đã cho không hợp lệ"
-#: builtin/checkout.c:1167
+#: builtin/checkout.c:1204
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -3458,12 +3643,12 @@ msgstr ""
"Bạn đã có ý định checkout “%s” cái mà không thể được phân giải như là lần "
"chuyển giao (commit)?"
-#: builtin/checkout.c:1172
+#: builtin/checkout.c:1209
#, 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:1176
+#: builtin/checkout.c:1213
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -3471,38 +3656,38 @@ msgstr ""
"git checkout: --ours/--theirs, --force và --merge là xung khắc với nhau khi\n"
"checkout bảng mục lục (index)."
-#: builtin/clean.c:25
+#: builtin/clean.c:26
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <mẫu>] [-x | -X] [--] <đường-dẫn>..."
-#: builtin/clean.c:29
+#: builtin/clean.c:30
#, c-format
msgid "Removing %s\n"
msgstr "Đang gỡ bỏ %s\n"
-#: builtin/clean.c:30
+#: builtin/clean.c:31
#, c-format
msgid "Would remove %s\n"
msgstr "Có thể gỡ bỏ %s\n"
-#: builtin/clean.c:31
+#: builtin/clean.c:32
#, c-format
msgid "Skipping repository %s\n"
msgstr "Đang bỏ qua kho chứa %s\n"
-#: builtin/clean.c:32
+#: builtin/clean.c:33
#, c-format
msgid "Would skip repository %s\n"
msgstr "Nên bỏ qua kho chứa %s\n"
-#: builtin/clean.c:33
+#: builtin/clean.c:34
#, c-format
msgid "failed to remove %s"
msgstr "gặp lỗi khi gỡ bỏ %s"
-#: builtin/clean.c:293
+#: builtin/clean.c:294
msgid ""
"Prompt help:\n"
"1 - select a numbered item\n"
@@ -3514,7 +3699,7 @@ msgstr ""
"foo - chọn mục trên cơ sở tiền tố duy nhất\n"
" - (trống rỗng) không chọn gì cả"
-#: builtin/clean.c:297
+#: builtin/clean.c:298
msgid ""
"Prompt help:\n"
"1 - select a single item\n"
@@ -3534,35 +3719,35 @@ msgstr ""
"* - chọn tất\n"
" - (trống rỗng) kết thúc việc chọn"
-#: builtin/clean.c:515
+#: builtin/clean.c:516
#, c-format
msgid "Huh (%s)?"
msgstr "Hả (%s)?"
-#: builtin/clean.c:658
+#: builtin/clean.c:659
#, c-format
msgid "Input ignore patterns>> "
msgstr "Mẫu để lọc các tập tin cần lờ đi đầu vào>>"
-#: builtin/clean.c:695
+#: builtin/clean.c:696
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "CẢNH BÁO: Không tìm thấy các mục được khớp bởi: %s"
-#: builtin/clean.c:716
+#: builtin/clean.c:717
msgid "Select items to delete"
msgstr "Chọn mục muốn xóa"
-#: builtin/clean.c:756
+#: builtin/clean.c:757
#, c-format
msgid "remove %s? "
msgstr "gỡ bỏ “%s”?"
-#: builtin/clean.c:781
+#: builtin/clean.c:782
msgid "Bye."
msgstr "Tạm biệt."
-#: builtin/clean.c:789
+#: builtin/clean.c:790
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -3580,21 +3765,21 @@ msgstr ""
"help - hiển thị chính trợ giúp này\n"
"? - trợ giúp dành cho chọn bằng cách nhắc"
-#: builtin/clean.c:816
+#: builtin/clean.c:817
msgid "*** Commands ***"
msgstr "*** Lệnh ***"
-#: builtin/clean.c:817
+#: builtin/clean.c:818
msgid "What now"
msgstr "Giờ thì sao"
-#: builtin/clean.c:825
+#: builtin/clean.c:826
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Có muốn gỡ bỏ mục sau đây không:"
msgstr[1] "Có muốn gỡ bỏ các mục sau đây không:"
-#: builtin/clean.c:842
+#: builtin/clean.c:843
msgid "No more files to clean, exiting."
msgstr "Không còn tập-tin nào để dọn dẹp, đang thoát ra."
@@ -3614,8 +3799,8 @@ msgstr "sửa bằng cách tương tác"
msgid "remove whole directories"
msgstr "gỡ bỏ toàn bộ thư mục"
-#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:716
-#: builtin/ls-files.c:493 builtin/name-rev.c:315 builtin/show-ref.c:186
+#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718
+#: builtin/ls-files.c:483 builtin/name-rev.c:315 builtin/show-ref.c:185
msgid "pattern"
msgstr "mẫu"
@@ -3655,8 +3840,8 @@ msgstr ""
msgid "git clone [options] [--] <repo> [<dir>]"
msgstr "git clone [các-tùy-chọn] [--] <kho> [<t.mục>]"
-#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:229
-#: builtin/push.c:462
+#: builtin/clone.c:64 builtin/fetch.c:96 builtin/merge.c:229
+#: builtin/push.c:474
msgid "force progress reporting"
msgstr "ép buộc báo cáo tiến trình"
@@ -3666,125 +3851,125 @@ msgstr "không tạo một checkout"
#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488
msgid "create a bare repository"
-msgstr "tạo kho chứa bare"
+msgstr "tạo kho thuần (bare)"
-#: builtin/clone.c:72
+#: builtin/clone.c:71
msgid "create a mirror repository (implies bare)"
msgstr "tạo kho bản sao (mirror) (ngụ ý là bare)"
-#: builtin/clone.c:74
+#: builtin/clone.c:73
msgid "to clone from a local repository"
msgstr "để nhân bản từ kho nội bộ"
-#: builtin/clone.c:76
+#: builtin/clone.c:75
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:78
+#: builtin/clone.c:77
msgid "setup as shared repository"
msgstr "cài đặt đây là kho chia sẻ"
-#: builtin/clone.c:80 builtin/clone.c:82
+#: builtin/clone.c:79 builtin/clone.c:81
msgid "initialize submodules in the clone"
msgstr "khởi tạo mô-đun-con trong bản sao"
-#: builtin/clone.c:83 builtin/init-db.c:485
+#: builtin/clone.c:82 builtin/init-db.c:485
msgid "template-directory"
msgstr "thư-mục-tạm"
-#: builtin/clone.c:84 builtin/init-db.c:486
+#: builtin/clone.c:83 builtin/init-db.c:486
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:86
+#: builtin/clone.c:85
msgid "reference repository"
msgstr "kho tham chiếu"
-#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr "tên"
-#: builtin/clone.c:88
+#: builtin/clone.c:87
msgid "use <name> instead of 'origin' to track upstream"
msgstr "dùng <tên> thay vì “origin” để theo dõi thượng nguồn (uptream)"
-#: builtin/clone.c:90
+#: builtin/clone.c:89
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "lấy ra nhánh (checkout <nhánh>) thay vì HEAD của máy chủ"
-#: builtin/clone.c:92
+#: builtin/clone.c:91
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:93 builtin/fetch.c:83 builtin/grep.c:661
+#: builtin/clone.c:92 builtin/fetch.c:97 builtin/grep.c:663
msgid "depth"
msgstr "độ sâu"
-#: builtin/clone.c:94
+#: builtin/clone.c:93
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:96
+#: builtin/clone.c:95
msgid "clone only one branch, HEAD or --branch"
msgstr "nhân bản (clone) chỉ một nhánh, HEAD hoặc --branch"
-#: builtin/clone.c:97 builtin/init-db.c:494
+#: builtin/clone.c:96 builtin/init-db.c:494
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:98 builtin/init-db.c:495
+#: builtin/clone.c:97 builtin/init-db.c:495
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:99
+#: builtin/clone.c:98
msgid "key=value"
msgstr "khóa=giá trị"
-#: builtin/clone.c:100
+#: builtin/clone.c:99
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:253
+#: builtin/clone.c:252
#, 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:316
+#: builtin/clone.c:315
#, c-format
msgid "failed to create directory '%s'"
msgstr "tạo thư mục \"%s\" gặp lỗi"
-#: builtin/clone.c:318 builtin/diff.c:77
+#: builtin/clone.c:317 builtin/diff.c:77
#, c-format
msgid "failed to stat '%s'"
msgstr "gặp lỗi stat (lấy trạng thái về) “%s”"
-#: builtin/clone.c:320
+#: builtin/clone.c:319
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s tồn tại nhưng không phải là một thư mục"
-#: builtin/clone.c:334
+#: builtin/clone.c:333
#, c-format
msgid "failed to stat %s\n"
msgstr "lỗi stat (lấy trạng thái về) %s\n"
-#: builtin/clone.c:356
+#: builtin/clone.c:355
#, 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:360
+#: builtin/clone.c:359
#, c-format
msgid "failed to copy file to '%s'"
msgstr "gặp lỗi khi chép tập tin tới “%s”"
-#: builtin/clone.c:383
+#: builtin/clone.c:382 builtin/clone.c:559
#, c-format
msgid "done.\n"
msgstr "hoàn tất.\n"
-#: builtin/clone.c:396
+#: builtin/clone.c:395
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -3794,104 +3979,99 @@ msgstr ""
"Bạn kiểm tra kỹ xem cái gì được lấy ra bằng lệnh “git status”\n"
"và thử checkout với lệnh “git checkout -f HEAD”\n"
-#: builtin/clone.c:475
+#: builtin/clone.c:474
#, 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:555
+#: builtin/clone.c:554
#, c-format
msgid "Checking connectivity... "
msgstr "Đang kiểm tra kết nối..."
-#: builtin/clone.c:558
+#: builtin/clone.c:557
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:560
-#, c-format
-msgid "done\n"
-msgstr "xong.\n"
-
-#: builtin/clone.c:621
+#: builtin/clone.c:620
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ể checkout.\n"
-#: builtin/clone.c:652
+#: builtin/clone.c:651
msgid "unable to checkout working tree"
msgstr "không thể lấy ra (checkout) cây làm việc"
-#: builtin/clone.c:760
+#: builtin/clone.c:759
msgid "Too many arguments."
msgstr "Có quá nhiều đối số."
-#: builtin/clone.c:764
+#: builtin/clone.c:763
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:775
+#: builtin/clone.c:774
#, 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:778
+#: builtin/clone.c:777
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:791
+#: builtin/clone.c:790
#, c-format
msgid "repository '%s' does not exist"
msgstr "kho chứa “%s” chưa tồn tại"
-#: builtin/clone.c:796
+#: builtin/clone.c:795
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:798
+#: builtin/clone.c:797
msgid "--local is ignored"
msgstr "--local bị lờ đi"
-#: builtin/clone.c:808
+#: builtin/clone.c:807
#, 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:818
+#: builtin/clone.c:817
#, 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:831 builtin/clone.c:843
+#: builtin/clone.c:830 builtin/clone.c:842
#, 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:834
+#: builtin/clone.c:833
#, 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:853
+#: builtin/clone.c:852
#, 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:855
+#: builtin/clone.c:854
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Đang nhân bản thành “%s”...\n"
-#: builtin/clone.c:890
+#: builtin/clone.c:888
#, 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:942
+#: builtin/clone.c:939 builtin/clone.c:947
#, 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 (upstream) %s"
-#: builtin/clone.c:949
+#: builtin/clone.c:950
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."
@@ -3913,11 +4093,11 @@ msgstr "Độ rộng tối đa"
#: builtin/column.c:30
msgid "Padding space on left border"
-msgstr "Chèn thêm khoảng trống vào bờ bên trái"
+msgstr "Chèn thêm khoảng trống vào bên trái"
#: builtin/column.c:31
msgid "Padding space on right border"
-msgstr "Chèn thêm khoảng trắng vào tiếp giáp bên phải"
+msgstr "Chèn thêm khoảng trắng vào bên phải"
#: builtin/column.c:32
msgid "Padding space between columns"
@@ -3927,15 +4107,15 @@ msgstr "Chèn thêm khoảng trắng giữa các cột"
msgid "--command must be the first argument"
msgstr "--command phải là đối số đầu tiên"
-#: builtin/commit.c:35
+#: builtin/commit.c:36
msgid "git commit [options] [--] <pathspec>..."
msgstr "git commit [các-tùy-chọn] [--] <pathspec>..."
-#: builtin/commit.c:40
+#: builtin/commit.c:41
msgid "git status [options] [--] <pathspec>..."
msgstr "git status [các-tùy-chọn] [--] <pathspec>..."
-#: builtin/commit.c:45
+#: builtin/commit.c:46
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -3959,11 +4139,11 @@ msgstr ""
" git config --global user.email you@example.com\n"
"\n"
"Sau khi thực hiện xong, bạn có thể sửa chữa định danh được sử dụng cho lần "
-"chuyển giao (commit) này với lệnh:\n"
+"chuyển giao này với lệnh:\n"
"\n"
" git commit --amend --reset-author\n"
-#: builtin/commit.c:57
+#: builtin/commit.c:58
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -3976,7 +4156,7 @@ msgstr ""
"hoặc là bạn gỡ bỏ các lần chuyển giao một cách hoàn toàn bằng lệnh:\n"
"\"git reset HEAD^\".\n"
-#: builtin/commit.c:62
+#: builtin/commit.c:63
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -3991,11 +4171,11 @@ msgstr ""
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:69
+#: builtin/commit.c:70
msgid "Otherwise, please use 'git reset'\n"
msgstr "Nếu không được thì dùng lệnh \"git reset\"\n"
-#: builtin/commit.c:72
+#: builtin/commit.c:73
msgid ""
"If you wish to skip this commit, use:\n"
"\n"
@@ -4011,97 +4191,97 @@ msgstr ""
"Thế thì \"git cherry-pick --continue\" sẽ phục hồi lại việc cherry-pick\n"
"những lần chuyển giao còn lại.\n"
-#: builtin/commit.c:279
+#: builtin/commit.c:287
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:321
+#: builtin/commit.c:329
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:327
+#: builtin/commit.c:335
msgid "interactive add failed"
msgstr "việc thêm tương tác gặp lỗi"
-#: builtin/commit.c:360 builtin/commit.c:381 builtin/commit.c:431
+#: builtin/commit.c:368 builtin/commit.c:389 builtin/commit.c:439
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:412
+#: builtin/commit.c:420
msgid "cannot do a partial commit during a merge."
msgstr ""
"không thể thực hiện việc chuyển giao (commit) cục bộ trong khi đang được hòa "
"trộn."
-#: builtin/commit.c:414
+#: builtin/commit.c:422
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
"không thể thực hiện việc chuyển giao (commit) bộ phận trong khi đang cherry-"
"pick."
-#: builtin/commit.c:424
+#: builtin/commit.c:432
msgid "cannot read the index"
msgstr "không đọc được bảng mục lục"
-#: builtin/commit.c:444
+#: builtin/commit.c:452
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:535 builtin/commit.c:541
+#: builtin/commit.c:543 builtin/commit.c:549
#, c-format
msgid "invalid commit: %s"
msgstr "lần chuyển giao (commit) không hợp lệ: %s"
-#: builtin/commit.c:563
+#: builtin/commit.c:571
msgid "malformed --author parameter"
msgstr "đối số --author bị dị hình"
-#: builtin/commit.c:583
+#: builtin/commit.c:591
#, c-format
msgid "Malformed ident string: '%s'"
msgstr "Chuỗi thụt lề đầu dòng dị hình: “%s”"
-#: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:982
+#: builtin/commit.c:630 builtin/commit.c:663 builtin/commit.c:1007
#, 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:633 builtin/shortlog.c:271
+#: builtin/commit.c:642 builtin/shortlog.c:273
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(đang đọc thông điệp nhật ký từ đầu vào tiêu chuẩn)\n"
-#: builtin/commit.c:635
+#: builtin/commit.c:644
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:639
+#: builtin/commit.c:648
#, c-format
msgid "could not read log file '%s'"
msgstr "không đọc được tệp nhật ký “%s”"
-#: builtin/commit.c:645
+#: builtin/commit.c:654
msgid "commit has empty message"
msgstr "lần chuyển giao (commit) có ghi chú trống rỗng"
-#: builtin/commit.c:661
+#: builtin/commit.c:670
msgid "could not read MERGE_MSG"
msgstr "không thể đọc MERGE_MSG"
-#: builtin/commit.c:665
+#: builtin/commit.c:674
msgid "could not read SQUASH_MSG"
msgstr "không thể đọc SQUASH_MSG"
-#: builtin/commit.c:669
+#: builtin/commit.c:678
#, c-format
msgid "could not read '%s'"
msgstr "Không thể đọc “%s”."
-#: builtin/commit.c:730
+#: builtin/commit.c:749
msgid "could not write commit template"
msgstr "không thể ghi mẫu commit"
-#: builtin/commit.c:741
+#: builtin/commit.c:760
#, c-format
msgid ""
"\n"
@@ -4116,7 +4296,7 @@ msgstr ""
"\t%s\n"
"và thử lại.\n"
-#: builtin/commit.c:746
+#: builtin/commit.c:765
#, c-format
msgid ""
"\n"
@@ -4131,7 +4311,7 @@ msgstr ""
"\t%s\n"
"và thử lại.\n"
-#: builtin/commit.c:758
+#: builtin/commit.c:777
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -4142,7 +4322,7 @@ msgstr ""
"bắt đầu bằng “%c” sẽ được bỏ qua, nếu phần chú thích rỗng sẽ hủy bỏ lần "
"chuyển giao (commit).\n"
-#: builtin/commit.c:763
+#: builtin/commit.c:782
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -4154,148 +4334,148 @@ msgstr ""
"bắt đầu bằng “%c” sẽ được bỏ qua; bạn có thể xóa chúng đi nếu muốn thế.\n"
"Phần chú thích này nếu trống rỗng sẽ hủy bỏ lần chuyển giao (commit).\n"
-#: builtin/commit.c:776
+#: builtin/commit.c:795
#, c-format
msgid "%sAuthor: %s"
msgstr "%sTác giả: %s"
-#: builtin/commit.c:783
+#: builtin/commit.c:802
#, c-format
msgid "%sCommitter: %s"
msgstr "%sNgười chuyển giao (commit): %s"
-#: builtin/commit.c:803
+#: builtin/commit.c:822
msgid "Cannot read index"
msgstr "không đọc được bảng mục lục"
-#: builtin/commit.c:845
+#: builtin/commit.c:865
msgid "Error building trees"
msgstr "Gặp lỗi khi xây dựng cây"
-#: builtin/commit.c:860 builtin/tag.c:359
+#: builtin/commit.c:880 builtin/tag.c:359
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
-msgstr "Xin hãy áp dụng thông điệp sử dụng hoặc là tùy chọn -m hoặc là -F.\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:957
+#: builtin/commit.c:982
#, c-format
msgid "No existing author found with '%s'"
msgstr "Không tìm thấy tác giả có sẵn với “%s”"
-#: builtin/commit.c:972 builtin/commit.c:1208
+#: builtin/commit.c:997 builtin/commit.c:1237
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Chế độ cho các tập tin không bị theo vết không hợp lệ “%s”"
-#: builtin/commit.c:1009
+#: builtin/commit.c:1034
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:1039
+#: builtin/commit.c:1064
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:1050
+#: builtin/commit.c:1075
msgid "You have nothing to amend."
msgstr "Không có gì để amend (tu bổ) cả."
-#: builtin/commit.c:1053
+#: builtin/commit.c:1078
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 amend (tu bổ)."
-#: builtin/commit.c:1055
+#: builtin/commit.c:1080
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 amend (tu "
"bổ)."
-#: builtin/commit.c:1058
+#: builtin/commit.c:1083
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:1068
+#: builtin/commit.c:1093
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Chỉ một tùy chọn trong số -c/-C/-F/--fixup được sử dụng"
-#: builtin/commit.c:1070
+#: builtin/commit.c:1095
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:1078
+#: builtin/commit.c:1103
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:1095
+#: builtin/commit.c:1120
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:1097
+#: builtin/commit.c:1122
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:1099
+#: builtin/commit.c:1124
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 phi nghĩa."
+msgstr "Giỏi... tu bổ cái cuối với bảng mục lục bẩn."
-#: builtin/commit.c:1101
+#: builtin/commit.c:1126
msgid "Explicit paths specified without -i nor -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; đang "
"giả định --only những-đường-dẫn..."
-#: builtin/commit.c:1111 builtin/tag.c:575
+#: builtin/commit.c:1136 builtin/tag.c:572
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Chế độ dọn dẹp không hợp lệ %s"
-#: builtin/commit.c:1116
+#: builtin/commit.c:1141
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:1222 builtin/commit.c:1455
+#: builtin/commit.c:1251 builtin/commit.c:1482
msgid "show status concisely"
msgstr "hiển thị trạng thái ở dạng súc tích"
-#: builtin/commit.c:1224 builtin/commit.c:1457
+#: builtin/commit.c:1253 builtin/commit.c:1484
msgid "show branch information"
msgstr "hiển thị thông tin nhánh"
-#: builtin/commit.c:1226 builtin/commit.c:1459 builtin/push.c:452
+#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:460
msgid "machine-readable output"
msgstr "kết xuất dạng máy-có-thể-đọc"
-#: builtin/commit.c:1229 builtin/commit.c:1461
+#: builtin/commit.c:1258 builtin/commit.c:1488
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:1232 builtin/commit.c:1464
+#: builtin/commit.c:1261 builtin/commit.c:1491
msgid "terminate entries with NUL"
msgstr "chấm dứt các mục bằng NUL"
-#: builtin/commit.c:1234 builtin/commit.c:1467 builtin/fast-export.c:667
-#: builtin/fast-export.c:670 builtin/tag.c:459
+#: builtin/commit.c:1263 builtin/commit.c:1494 builtin/fast-export.c:674
+#: builtin/fast-export.c:677 builtin/tag.c:459
msgid "mode"
msgstr "chế độ"
-#: builtin/commit.c:1235 builtin/commit.c:1467
+#: builtin/commit.c:1264 builtin/commit.c:1494
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:1238
+#: builtin/commit.c:1267
msgid "show ignored files"
msgstr "hiển thị các tập tin ẩn"
-#: builtin/commit.c:1239 parse-options.h:154
+#: builtin/commit.c:1268 parse-options.h:156
msgid "when"
msgstr "khi"
-#: builtin/commit.c:1240
+#: builtin/commit.c:1269
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -4303,223 +4483,223 @@ msgstr ""
"bỏ qua các thay đổi trong mô-đun-con, tùy chọn khi: all, dirty, untracked. "
"(Mặc định: all)"
-#: builtin/commit.c:1242
+#: builtin/commit.c:1271
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:1313
+#: builtin/commit.c:1340
msgid "couldn't look up newly created commit"
msgstr "không thể tìm thấy lần chuyển giao (commit) mới hơn đã được tạo"
-#: builtin/commit.c:1315
+#: builtin/commit.c:1342
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:1356
+#: builtin/commit.c:1383
msgid "detached HEAD"
msgstr "đã rời khỏi HEAD"
-#: builtin/commit.c:1358
+#: builtin/commit.c:1385
msgid " (root-commit)"
msgstr " (root-commit)"
-#: builtin/commit.c:1425
+#: builtin/commit.c:1452
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:1426
+#: builtin/commit.c:1453
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:1428
+#: builtin/commit.c:1455
msgid "Commit message options"
msgstr "Các tùy chọn ghi chú commit"
-#: builtin/commit.c:1429 builtin/tag.c:457
+#: builtin/commit.c:1456 builtin/tag.c:457
msgid "read message from file"
msgstr "đọc chú thích từ tập tin"
-#: builtin/commit.c:1430
+#: builtin/commit.c:1457
msgid "author"
msgstr "tác giả"
-#: builtin/commit.c:1430
+#: builtin/commit.c:1457
msgid "override author for commit"
msgstr "ghi đè tác giả cho commit"
-#: builtin/commit.c:1431 builtin/gc.c:178
+#: builtin/commit.c:1458 builtin/gc.c:260
msgid "date"
msgstr "ngày tháng"
-#: builtin/commit.c:1431
+#: builtin/commit.c:1458
msgid "override date for commit"
msgstr "ghi đè ngày tháng cho commit"
-#: builtin/commit.c:1432 builtin/merge.c:223 builtin/notes.c:405
+#: builtin/commit.c:1459 builtin/merge.c:223 builtin/notes.c:405
#: builtin/notes.c:562 builtin/tag.c:455
msgid "message"
msgstr "thông điệp"
-#: builtin/commit.c:1432
+#: builtin/commit.c:1459
msgid "commit message"
msgstr "chú thích của lần commit"
-#: builtin/commit.c:1433
+#: builtin/commit.c:1460
msgid "reuse and edit message from specified commit"
msgstr ""
"dùng lại các ghi chú từ lần chuyển giao (commit) đã cho nhưng có cho sửa chữa"
-#: builtin/commit.c:1434
+#: builtin/commit.c:1461
msgid "reuse message from specified commit"
msgstr "dùng lại các ghi chú từ lần chuyển giao (commit) đã cho"
-#: builtin/commit.c:1435
+#: builtin/commit.c:1462
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:1436
+#: builtin/commit.c:1463
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:1437
+#: builtin/commit.c:1464
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:1438 builtin/log.c:1160 builtin/revert.c:111
+#: builtin/commit.c:1465 builtin/log.c:1180 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "thêm dòng Signed-off-by:"
-#: builtin/commit.c:1439
+#: builtin/commit.c:1466
msgid "use specified template file"
msgstr "sử dụng tập tin mẫu đã cho"
-#: builtin/commit.c:1440
+#: builtin/commit.c:1467
msgid "force edit of commit"
msgstr "ép buộc sửa lần commit"
-#: builtin/commit.c:1441
+#: builtin/commit.c:1468
msgid "default"
msgstr "mặc định"
-#: builtin/commit.c:1441 builtin/tag.c:460
+#: builtin/commit.c:1468 builtin/tag.c:460
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:1442
+#: builtin/commit.c:1469
msgid "include status in commit message template"
msgstr "bao gồm các trạng thái ghi mẫu ghi chú chuyển giao (commit)"
-#: builtin/commit.c:1443 builtin/merge.c:230 builtin/tag.c:461
+#: builtin/commit.c:1470 builtin/merge.c:230 builtin/tag.c:461
msgid "key id"
msgstr "id khóa"
-#: builtin/commit.c:1444 builtin/merge.c:231
+#: builtin/commit.c:1471 builtin/merge.c:231
msgid "GPG sign commit"
msgstr "ký lần commit dùng GPG"
#. end commit message options
-#: builtin/commit.c:1447
+#: builtin/commit.c:1474
msgid "Commit contents options"
msgstr "Các tùy nội dung ghi chú commit"
-#: builtin/commit.c:1448
+#: builtin/commit.c:1475
msgid "commit all changed files"
msgstr "chuyển giao tất cả các tập tin có thay đổi"
-#: builtin/commit.c:1449
+#: builtin/commit.c:1476
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 (commit)"
-#: builtin/commit.c:1450
+#: builtin/commit.c:1477
msgid "interactively add files"
msgstr "thêm các tập-tin bằng tương tác"
-#: builtin/commit.c:1451
+#: builtin/commit.c:1478
msgid "interactively add changes"
msgstr "thêm các thay đổi bằng tương tác"
-#: builtin/commit.c:1452
+#: builtin/commit.c:1479
msgid "commit only specified files"
msgstr "chỉ chuyển giao các tập tin đã chỉ ra"
-#: builtin/commit.c:1453
+#: builtin/commit.c:1480
msgid "bypass pre-commit hook"
msgstr "vòng qua móc (hook) pre-commit"
-#: builtin/commit.c:1454
+#: builtin/commit.c:1481
msgid "show what would be committed"
msgstr "hiển thị xem cái gì có thể được chuyển giao"
-#: builtin/commit.c:1465
+#: builtin/commit.c:1492
msgid "amend previous commit"
msgstr "tu bổ (amend) lần commit trước"
-#: builtin/commit.c:1466
+#: builtin/commit.c:1493
msgid "bypass post-rewrite hook"
msgstr "vòng qua móc (hook) post-rewrite"
-#: builtin/commit.c:1471
+#: builtin/commit.c:1498
msgid "ok to record an empty change"
msgstr "ok để ghi lại một thay đổi trống rỗng"
-#: builtin/commit.c:1474
+#: builtin/commit.c:1500
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:1507
+#: builtin/commit.c:1529
msgid "could not parse HEAD commit"
msgstr "không thể phân tích commit (lần chuyển giao) HEAD"
-#: builtin/commit.c:1545 builtin/merge.c:525
+#: builtin/commit.c:1567 builtin/merge.c:525
#, c-format
msgid "could not open '%s' for reading"
msgstr "không thể mở “%s” để đọc"
-#: builtin/commit.c:1552
+#: builtin/commit.c:1574
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Tập tin MERGE_HEAD sai hỏng (%s)"
-#: builtin/commit.c:1559
+#: builtin/commit.c:1581
msgid "could not read MERGE_MODE"
msgstr "không thể đọc MERGE_MODE"
-#: builtin/commit.c:1578
+#: builtin/commit.c:1600
#, c-format
msgid "could not read commit message: %s"
msgstr "không thể đọc thông điệp (message) commit (lần chuyển giao): %s"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1614
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
"Đang bỏ qua việc chuyển giao (commit); bạn đã không biên soạn thông điệp "
"(message).\n"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1619
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr ""
"Đang bỏ qua lần chuyển giao (commit) bởi vì thông điệp của nó trống rỗng.\n"
-#: builtin/commit.c:1612 builtin/merge.c:861 builtin/merge.c:886
+#: builtin/commit.c:1634 builtin/merge.c:861 builtin/merge.c:886
msgid "failed to write commit object"
msgstr "gặp lỗi khi ghi đối tượng chuyển giao (commit)"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1655
msgid "cannot lock HEAD ref"
msgstr "không thể khóa HEAD ref (tham chiếu)"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1659
msgid "cannot update HEAD ref"
msgstr "không thể cập nhật ref (tham chiếu) HEAD"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1670
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full or quota is\n"
@@ -4530,127 +4710,131 @@ msgstr ""
"hay quota (hạn nghạch đĩa cứng) bị vượt quá, và sau đó \"git reset HEAD\" để "
"khắc phục."
-#: builtin/config.c:7
+#: builtin/config.c:8
msgid "git config [options]"
msgstr "git config [các-tùy-chọn]"
-#: builtin/config.c:52
+#: builtin/config.c:54
msgid "Config file location"
msgstr "Vị trí tập tin cấu hình"
-#: builtin/config.c:53
+#: builtin/config.c:55
msgid "use global config file"
msgstr "đặt tập tin cấu hình cần toàn cục"
-#: builtin/config.c:54
+#: builtin/config.c:56
msgid "use system config file"
msgstr "sử dụng tập tin cấu hình hệ thống"
-#: builtin/config.c:55
+#: builtin/config.c:57
msgid "use repository config file"
msgstr "dùng tập tin cấu hình của kho"
-#: builtin/config.c:56
+#: builtin/config.c:58
msgid "use given config file"
msgstr "sử dụng tập tin cấu hình đã cho"
-#: builtin/config.c:57
+#: builtin/config.c:59
msgid "blob-id"
msgstr "blob-id"
-#: builtin/config.c:57
+#: builtin/config.c:59
msgid "read config from given blob object"
msgstr "đọc cấu hình từ đối tượng blob đã cho"
-#: builtin/config.c:58
+#: builtin/config.c:60
msgid "Action"
msgstr "Hành động"
-#: builtin/config.c:59
+#: builtin/config.c:61
msgid "get value: name [value-regex]"
msgstr "lấy giá-trị: tên [value-regex]"
-#: builtin/config.c:60
+#: builtin/config.c:62
msgid "get all values: key [value-regex]"
msgstr "lấy tất cả giá-trị: khóa [value-regex]"
-#: builtin/config.c:61
+#: builtin/config.c:63
msgid "get values for regexp: name-regex [value-regex]"
msgstr "lấy giá trị cho regexp: name-regex [value-regex]"
-#: builtin/config.c:62
+#: builtin/config.c:64
+msgid "get value specific for the URL: section[.var] URL"
+msgstr "lấy đặc tả giá trị cho URL: phần[.biến] URL"
+
+#: builtin/config.c:65
msgid "replace all matching variables: name value [value_regex]"
msgstr "thay thế tất cả các biến khớp mẫu: tên giá-trị [value_regex]"
-#: builtin/config.c:63
+#: builtin/config.c:66
msgid "add a new variable: name value"
msgstr "thêm biến mới: tên giá-trị"
-#: builtin/config.c:64
+#: builtin/config.c:67
msgid "remove a variable: name [value-regex]"
msgstr "gỡ bỏ biến: tên [value-regex]"
-#: builtin/config.c:65
+#: builtin/config.c:68
msgid "remove all matches: name [value-regex]"
msgstr "gỡ bỏ mọi cái khớp: tên [value-regex]"
-#: builtin/config.c:66
+#: builtin/config.c:69
msgid "rename section: old-name new-name"
msgstr "đổi tên chương: tên-cũ tên-mới"
-#: builtin/config.c:67
+#: builtin/config.c:70
msgid "remove a section: name"
msgstr "gỡ bỏ chương: tên"
-#: builtin/config.c:68
+#: builtin/config.c:71
msgid "list all"
msgstr "liệt kê tất"
-#: builtin/config.c:69
+#: builtin/config.c:72
msgid "open an editor"
msgstr "mở một trình biên soạn"
-#: builtin/config.c:70 builtin/config.c:71
+#: builtin/config.c:73 builtin/config.c:74
msgid "slot"
msgstr "khe"
-#: builtin/config.c:70
+#: builtin/config.c:73
msgid "find the color configured: [default]"
msgstr "tìm cấu hình màu sắc: [mặc định]"
-#: builtin/config.c:71
+#: builtin/config.c:74
msgid "find the color setting: [stdout-is-tty]"
msgstr "tìm các cài đặt về màu sắc: [stdout-là-tty]"
-#: builtin/config.c:72
+#: builtin/config.c:75
msgid "Type"
msgstr "Kiểu"
-#: builtin/config.c:73
+#: builtin/config.c:76
msgid "value is \"true\" or \"false\""
msgstr "giá trị là \"true\" hoặc \"false\""
-#: builtin/config.c:74
+#: builtin/config.c:77
msgid "value is decimal number"
msgstr "giá trị ở dạng số thập phân"
-#: builtin/config.c:75
+#: builtin/config.c:78
msgid "value is --bool or --int"
msgstr "giá trị là --bool hoặc --int"
-#: builtin/config.c:76
+#: builtin/config.c:79
msgid "value is a path (file or directory name)"
msgstr "giá trị là đường dẫn (tên tập tin hay thư mục)"
-#: builtin/config.c:77
+#: builtin/config.c:80
msgid "Other"
msgstr "Khác"
-#: builtin/config.c:78
+#: builtin/config.c:81
msgid "terminate values with NUL byte"
msgstr "chấm dứt giá trị với byte NUL"
-#: builtin/config.c:79
+#: builtin/config.c:82
msgid "respect include directives on lookup"
msgstr "tôn trọng kể cà các hướng trong tìm kiếm"
@@ -4800,17 +4984,17 @@ msgstr "Không tìm thấy các tên, không thể mô tả gì cả."
#: builtin/describe.c:489
msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty là xung khắc với các tùy chọn dành cho chuyển giao (commit)"
+msgstr "--dirty là xung khắc với các tùy chọn commit-ish"
#: builtin/diff.c:79
#, c-format
msgid "'%s': not a regular file or symlink"
-msgstr "“%s”: không phải tập tin bình thường hay liên kết tượng trưng"
+msgstr "“%s”: không phải tập tin bình thường hay liên kết mềm"
#: builtin/diff.c:230
#, c-format
msgid "invalid option: %s"
-msgstr "tùy chọn sai: %s"
+msgstr "tùy chọn không hợp lệ: %s"
#: builtin/diff.c:307
msgid "Not a git repository"
@@ -4835,39 +5019,39 @@ msgstr "đã cho đối tượng không thể nắm giữ “%s”."
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:666
+#: builtin/fast-export.c:673
msgid "show progress after <n> objects"
msgstr "hiển thị tiến triển sau <n> đối tượng"
-#: builtin/fast-export.c:668
+#: builtin/fast-export.c:675
msgid "select handling of signed tags"
msgstr "chọn điều khiển của thẻ đã ký"
-#: builtin/fast-export.c:671
+#: builtin/fast-export.c:678
msgid "select handling of tags that tag filtered objects"
msgstr "chọn sự xử lý của các thẻ, cái mà đánh thẻ các đối tượng được lọc ra"
-#: builtin/fast-export.c:674
+#: builtin/fast-export.c:681
msgid "Dump marks to this file"
msgstr "Đổ các đánh dấu này vào tập-tin"
-#: builtin/fast-export.c:676
+#: builtin/fast-export.c:683
msgid "Import marks from this file"
msgstr "nhập vào đánh dấu từ tập tin này"
-#: builtin/fast-export.c:678
+#: builtin/fast-export.c:685
msgid "Fake a tagger when tags lack one"
msgstr "Làm giả một cái thẻ khi thẻ bị thiếu một cái"
-#: builtin/fast-export.c:680
+#: builtin/fast-export.c:687
msgid "Output full tree for each commit"
msgstr "Xuất ra toàn bộ cây cho mỗi lần chuyển giao"
-#: builtin/fast-export.c:682
+#: builtin/fast-export.c:689
msgid "Use the done feature to terminate the stream"
msgstr "Sử dụng tính năng done để chấm dứt luồng dữ liệu"
-#: builtin/fast-export.c:683
+#: builtin/fast-export.c:690
msgid "Skip output of blob data"
msgstr "Bỏ qua kết xuất của dữ liệu blob"
@@ -4887,146 +5071,146 @@ msgstr "git fetch --multiple [<các-tùy-chọn>] [(<kho> | <nhóm>)...]"
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<các-tùy-chọn>]"
-#: builtin/fetch.c:60
+#: builtin/fetch.c:74
msgid "fetch from all remotes"
msgstr "lấy về từ tất cả các máy chủ"
-#: builtin/fetch.c:62
+#: builtin/fetch.c:76
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:64
+#: builtin/fetch.c:78
msgid "path to upload pack on remote end"
msgstr "đường dẫn đến gói (pack) tải lên trên máy chủ cuối"
-#: builtin/fetch.c:65
+#: builtin/fetch.c:79
msgid "force overwrite of local branch"
msgstr "ép buộc ghi đè lên nhánh nội bộ"
-#: builtin/fetch.c:67
+#: builtin/fetch.c:81
msgid "fetch from multiple remotes"
msgstr "lấy từ nhiều máy chủ cùng lúc"
-#: builtin/fetch.c:69
+#: builtin/fetch.c:83
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:71
+#: builtin/fetch.c:85
msgid "do not fetch all tags (--no-tags)"
msgstr "không lấy tất cả các thẻ (--no-tags)"
-#: builtin/fetch.c:73
+#: builtin/fetch.c:87
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:74
+#: builtin/fetch.c:88
msgid "on-demand"
msgstr "khi-cần"
-#: builtin/fetch.c:75
+#: builtin/fetch.c:89
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:79
+#: builtin/fetch.c:93
msgid "keep downloaded pack"
msgstr "giữ các gói đã tải về"
-#: builtin/fetch.c:81
+#: builtin/fetch.c:95
msgid "allow updating of HEAD ref"
msgstr "cho phép cập nhật th.chiếu HEAD"
-#: builtin/fetch.c:84
+#: builtin/fetch.c:98
msgid "deepen history of shallow clone"
msgstr "làm sâu hơn lịch sử của bản sao"
-#: builtin/fetch.c:86
+#: builtin/fetch.c:100
msgid "convert to a complete repository"
msgstr "chuyển đổi hoàn toàn sang kho git"
-#: builtin/fetch.c:88 builtin/log.c:1177
+#: builtin/fetch.c:102 builtin/log.c:1197
msgid "dir"
msgstr "tmục"
-#: builtin/fetch.c:89
+#: builtin/fetch.c:103
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:92
+#: builtin/fetch.c:106
msgid "default mode for recursion"
msgstr "chế độ mặc định cho đệ qui"
-#: builtin/fetch.c:220
+#: builtin/fetch.c:236
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:273
+#: builtin/fetch.c:290
#, c-format
msgid "object %s not found"
msgstr "Không tìm thấy đối tượng %s"
-#: builtin/fetch.c:278
+#: builtin/fetch.c:295
msgid "[up to date]"
msgstr "[đã cập nhật]"
-#: builtin/fetch.c:292
+#: builtin/fetch.c:309
#, c-format
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr "! %-*s %-*s -> %s (không thể fetch (lấy) về nhánh hiện hành)"
-#: builtin/fetch.c:293 builtin/fetch.c:379
+#: builtin/fetch.c:310 builtin/fetch.c:396
msgid "[rejected]"
msgstr "[Bị từ chối]"
-#: builtin/fetch.c:304
+#: builtin/fetch.c:321
msgid "[tag update]"
msgstr "[cập nhật thẻ]"
-#: builtin/fetch.c:306 builtin/fetch.c:341 builtin/fetch.c:359
+#: builtin/fetch.c:323 builtin/fetch.c:358 builtin/fetch.c:376
msgid " (unable to update local ref)"
msgstr " (không thể cập nhật tham chiếu (ref) nội bộ)"
-#: builtin/fetch.c:324
+#: builtin/fetch.c:341
msgid "[new tag]"
msgstr "[thẻ mới]"
-#: builtin/fetch.c:327
+#: builtin/fetch.c:344
msgid "[new branch]"
msgstr "[nhánh mới]"
-#: builtin/fetch.c:330
+#: builtin/fetch.c:347
msgid "[new ref]"
msgstr "[ref (tham chiếu) mới]"
-#: builtin/fetch.c:375
+#: builtin/fetch.c:392
msgid "unable to update local ref"
msgstr "không thể cập nhật tham chiếu (ref) nội bộ"
-#: builtin/fetch.c:375
+#: builtin/fetch.c:392
msgid "forced update"
msgstr "cưỡng bức cập nhật"
-#: builtin/fetch.c:381
+#: builtin/fetch.c:398
msgid "(non-fast-forward)"
msgstr "(non-fast-forward)"
-#: builtin/fetch.c:412 builtin/fetch.c:718
+#: builtin/fetch.c:429 builtin/fetch.c:735
#, c-format
msgid "cannot open %s: %s\n"
msgstr "không thể mở %s: %s\n"
-#: builtin/fetch.c:421
+#: builtin/fetch.c:438
#, 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:520
+#: builtin/fetch.c:537
#, c-format
msgid "From %.*s\n"
msgstr "Từ %.*s\n"
-#: builtin/fetch.c:531
+#: builtin/fetch.c:548
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -5035,57 +5219,57 @@ msgstr ""
"một số tham chiếu (refs) 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:581
+#: builtin/fetch.c:598
#, 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:582
+#: builtin/fetch.c:599
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s đã trở thành không đầu (không được quản lý))"
-#: builtin/fetch.c:589
+#: builtin/fetch.c:606
msgid "[deleted]"
msgstr "[đã xóa]"
-#: builtin/fetch.c:590 builtin/remote.c:1055
+#: builtin/fetch.c:607 builtin/remote.c:1055
msgid "(none)"
msgstr "(không)"
-#: builtin/fetch.c:708
+#: builtin/fetch.c:725
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
"Từ chối việc lấy (fetch) 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:742
-#, 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:823
+#: builtin/fetch.c:744
#, 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:826
+#: builtin/fetch.c:747
#, 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:928
+#: builtin/fetch.c:801
+#, 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:976
#, c-format
msgid "Fetching %s\n"
msgstr "Đang lấy về %s\n"
-#: builtin/fetch.c:930 builtin/remote.c:100
+#: builtin/fetch.c:978 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr "không thể lấy về %s"
-#: builtin/fetch.c:949
+#: builtin/fetch.c:997
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -5093,32 +5277,32 @@ msgstr ""
"Chưa chỉ ra kho chứa máy chủ. Xin hãy chỉ định hoặc là URL hoặc\n"
"tên máy chủ từ cái mà những điểm xét duyệt mới có thể được fetch (lấy về)."
-#: builtin/fetch.c:969
+#: builtin/fetch.c:1020
msgid "You need to specify a tag name."
msgstr "Bạn phải định rõ tên thẻ."
-#: builtin/fetch.c:1015
+#: builtin/fetch.c:1068
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:1017
+#: builtin/fetch.c:1070
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:1036
+#: builtin/fetch.c:1089
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:1038
+#: builtin/fetch.c:1091
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:1049
+#: builtin/fetch.c:1102
#, 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:1057
+#: builtin/fetch.c:1110
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ý"
@@ -5127,9 +5311,9 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
msgstr ""
"git fmt-merge-msg [-m <thông điệp>] [--log[=<n>]|--no-log] [--file <tập-tin>]"
-#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700
-#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:179
-#: builtin/tag.c:446 parse-options.h:133 parse-options.h:243
+#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702
+#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:178
+#: builtin/tag.c:446 parse-options.h:135 parse-options.h:245
msgid "n"
msgstr "n"
@@ -5153,117 +5337,121 @@ msgstr "dùng <văn bản thường> để bắt đầu ghi chú"
msgid "file to read from"
msgstr "tập tin để đọc dữ liệu từ đó"
-#: builtin/for-each-ref.c:979
+#: builtin/for-each-ref.c:995
msgid "git for-each-ref [options] [<pattern>]"
msgstr "git for-each-ref [các-tùy-chọn] [<mẫu>]"
-#: builtin/for-each-ref.c:994
+#: builtin/for-each-ref.c:1010
msgid "quote placeholders suitably for shells"
msgstr "trích dẫn để phù hợp cho hệ vỏ (shell)"
-#: builtin/for-each-ref.c:996
+#: builtin/for-each-ref.c:1012
msgid "quote placeholders suitably for perl"
msgstr "trích dẫn để phù hợp cho perl"
-#: builtin/for-each-ref.c:998
+#: builtin/for-each-ref.c:1014
msgid "quote placeholders suitably for python"
msgstr "trích dẫn để phù hợp cho python"
-#: builtin/for-each-ref.c:1000
+#: builtin/for-each-ref.c:1016
msgid "quote placeholders suitably for tcl"
msgstr "trích dẫn để phù hợp cho tcl"
-#: builtin/for-each-ref.c:1003
+#: builtin/for-each-ref.c:1019
msgid "show only <n> matched refs"
msgstr "hiển thị chỉ <n> tham chiếu khớp"
-#: builtin/for-each-ref.c:1004
+#: builtin/for-each-ref.c:1020
msgid "format"
msgstr "định dạng"
-#: builtin/for-each-ref.c:1004
+#: builtin/for-each-ref.c:1020
msgid "format to use for the output"
msgstr "định dạng sẽ dùng cho đầu ra"
-#: builtin/for-each-ref.c:1005
+#: builtin/for-each-ref.c:1021
msgid "key"
msgstr "khóa"
-#: builtin/for-each-ref.c:1006
+#: builtin/for-each-ref.c:1022
msgid "field name to sort on"
msgstr "tên trường cần sắp xếp"
-#: builtin/fsck.c:608
+#: builtin/fsck.c:607
msgid "git fsck [options] [<object>...]"
msgstr "git fsck [các-tùy-chọn] [<đối-tượng>...]"
-#: builtin/fsck.c:614
+#: builtin/fsck.c:613
msgid "show unreachable objects"
msgstr "hiển thị các đối tượng không thể đọc được"
-#: builtin/fsck.c:615
+#: builtin/fsck.c:614
msgid "show dangling objects"
msgstr "hiển thị các đối tượng không được quản lý"
-#: builtin/fsck.c:616
+#: builtin/fsck.c:615
msgid "report tags"
msgstr "báo cáo các thẻ"
-#: builtin/fsck.c:617
+#: builtin/fsck.c:616
msgid "report root nodes"
msgstr "báo cáo node gốc"
-#: builtin/fsck.c:618
+#: builtin/fsck.c:617
msgid "make index objects head nodes"
msgstr "tạo “ index objects head nodes”"
-#: builtin/fsck.c:619
+#: builtin/fsck.c:618
msgid "make reflogs head nodes (default)"
msgstr "tạo reflogs head nodes (mặc định)"
-#: builtin/fsck.c:620
+#: builtin/fsck.c:619
msgid "also consider packs and alternate objects"
msgstr "cũng cân nhắc đến các đối tượng gói và thay thế"
-#: builtin/fsck.c:621
+#: builtin/fsck.c:620
msgid "enable more strict checking"
msgstr "cho phép kiểm tra hạn chế hơn"
-#: builtin/fsck.c:623
+#: builtin/fsck.c:622
msgid "write dangling objects in .git/lost-found"
msgstr "ghi các đối tượng không được quản lý trong .git/lost-found"
-#: builtin/fsck.c:624 builtin/prune.c:134
+#: builtin/fsck.c:623 builtin/prune.c:134
msgid "show progress"
msgstr "hiển thị quá trình"
-#: builtin/gc.c:22
+#: builtin/gc.c:23
msgid "git gc [options]"
msgstr "git gc [các-tùy-chọn]"
-#: builtin/gc.c:63
+#: builtin/gc.c:79
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s không hợp lệ: “%s”"
-#: builtin/gc.c:90
+#: builtin/gc.c:106
#, c-format
msgid "insanely long object directory %.*s"
msgstr "thư mục đối tượng dài một cách điên rồ %.*s"
-#: builtin/gc.c:179
+#: builtin/gc.c:261
msgid "prune unreferenced objects"
msgstr "xóa bỏ các đối tượng không được tham chiếu"
-#: builtin/gc.c:181
+#: builtin/gc.c:263
msgid "be more thorough (increased runtime)"
msgstr "cẩn thận hơn nữa (tăng thời gian chạy)"
-#: builtin/gc.c:182
+#: builtin/gc.c:264
msgid "enable auto-gc mode"
msgstr "bật chế độ auto-gc"
-#: builtin/gc.c:222
+#: builtin/gc.c:265
+msgid "force running gc even if there may be another gc running"
+msgstr "buộc gc chạy ngay cả khi có tiến trình gc khác đang chạy"
+
+#: builtin/gc.c:305
#, c-format
msgid ""
"Auto packing the repository for optimum performance. You may also\n"
@@ -5273,43 +5461,52 @@ msgstr ""
"chạy lệnh \"git gc\" một cách thủ công. Hãy xem \"git help gc\" để biết thêm "
"chi tiết.\n"
-#: builtin/gc.c:249
+#. be quiet on --auto
+#: builtin/gc.c:315
+#, c-format
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgstr ""
+"gc đang được thực hiện trên máy “%s” pid %<PRIuMAX> (dùng --force nếu không "
+"phải thế)"
+
+#: builtin/gc.c:340
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Có quá nhiều đối tượng tự do không được dùng đến; hãy chạy lệnh “git prune” "
"để xóa bỏ chúng đi."
-#: builtin/grep.c:22
+#: builtin/grep.c:23
msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [các-tùy-chọn] [-e] <mẫu> [<rev>...] [[--] <đường-dẫn>...]"
-#: builtin/grep.c:217
+#: builtin/grep.c:218
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: gặp lỗi tạo tuyến (thread): %s"
-#: builtin/grep.c:364
+#: builtin/grep.c:365
#, c-format
msgid "Failed to chdir: %s"
msgstr "Gặp lỗi với lệnh chdir: %s"
-#: builtin/grep.c:442 builtin/grep.c:477
+#: builtin/grep.c:443 builtin/grep.c:478
#, c-format
msgid "unable to read tree (%s)"
msgstr "không thể đọc cây (%s)"
-#: builtin/grep.c:492
+#: builtin/grep.c:493
#, 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:550
+#: builtin/grep.c:551
#, 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:567
+#: builtin/grep.c:568
#, c-format
msgid "cannot open '%s'"
msgstr "không mở được “%s”"
@@ -5351,161 +5548,165 @@ 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:662
+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:664
msgid "descend at most <depth> levels"
msgstr "giảm xuống ít nhất mức <sâu>"
-#: builtin/grep.c:666
+#: builtin/grep.c:668
msgid "use extended POSIX regular expressions"
msgstr "dùng biểu thức chính qui POSIX có mở rộng"
-#: builtin/grep.c:669
+#: builtin/grep.c:671
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:672
+#: builtin/grep.c:674
msgid "interpret patterns as fixed strings"
msgstr "diễn dịch các mẫu như là chuỗi cố định"
-#: builtin/grep.c:675
+#: builtin/grep.c:677
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:678
+#: builtin/grep.c:680
msgid "show line numbers"
msgstr "hiển thị số của dòng"
-#: builtin/grep.c:679
+#: builtin/grep.c:681
msgid "don't show filenames"
msgstr "không hiển thị tên tập tin"
-#: builtin/grep.c:680
+#: builtin/grep.c:682
msgid "show filenames"
msgstr "hiển thị các tên tập tin"
-#: builtin/grep.c:682
+#: builtin/grep.c:684
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:684
+#: builtin/grep.c:686
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:686
+#: builtin/grep.c:688
msgid "synonym for --files-with-matches"
msgstr "đồng nghĩa với --files-with-matches"
-#: builtin/grep.c:689
+#: builtin/grep.c:691
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:691
+#: builtin/grep.c:693
msgid "print NUL after filenames"
msgstr "thêm NUL vào sau tên tập tin"
-#: builtin/grep.c:693
+#: builtin/grep.c:695
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:694
+#: builtin/grep.c:696
msgid "highlight matches"
msgstr "tô sáng cái khớp"
-#: builtin/grep.c:696
+#: builtin/grep.c:698
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:698
+#: builtin/grep.c:700
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:701
+#: builtin/grep.c:703
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:704
+#: builtin/grep.c:706
msgid "show <n> context lines before matches"
msgstr "hiển thị <n> dòng nội dung trước khớp"
-#: builtin/grep.c:706
+#: builtin/grep.c:708
msgid "show <n> context lines after matches"
msgstr "hiển thị <n> dòng nội dung sau khớp"
-#: builtin/grep.c:707
+#: builtin/grep.c:709
msgid "shortcut for -C NUM"
msgstr "Dạng tắt cho -C SỐ"
-#: builtin/grep.c:710
+#: builtin/grep.c:712
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:712
+#: builtin/grep.c:714
msgid "show the surrounding function"
msgstr "hiển thị hàm bao quanh"
-#: builtin/grep.c:715
+#: builtin/grep.c:717
msgid "read patterns from file"
msgstr "đọc mẫu từ tập-tin"
-#: builtin/grep.c:717
+#: builtin/grep.c:719
msgid "match <pattern>"
msgstr "match <mẫu>"
-#: builtin/grep.c:719
+#: builtin/grep.c:721
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:731
+#: builtin/grep.c:733
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:733
+#: builtin/grep.c:735
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:735
+#: builtin/grep.c:737
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:739
+#: builtin/grep.c:741
msgid "pager"
msgstr "trang giấy"
-#: builtin/grep.c:739
+#: builtin/grep.c:741
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:742
+#: builtin/grep.c:744
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:743 builtin/show-ref.c:188
+#: builtin/grep.c:745 builtin/show-ref.c:187
msgid "show usage"
msgstr "hiển thị cách dùng"
-#: builtin/grep.c:810
+#: builtin/grep.c:812
msgid "no pattern given."
msgstr "chưa chỉ ra mẫu."
-#: builtin/grep.c:865
+#: builtin/grep.c:870
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:888
+#: builtin/grep.c:893
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:893
+#: builtin/grep.c:898
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:896
+#: builtin/grep.c:901
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:904
+#: builtin/grep.c:909
msgid "both --cached and trees are given."
msgstr "cả hai --cached và các cây phải được chỉ ra."
@@ -5658,7 +5859,7 @@ msgstr "Các chỉ dẫn chung về cách dùng Git là:\n"
#: builtin/help.c:460 builtin/help.c:476
#, c-format
msgid "usage: %s%s"
-msgstr "cách sử dụng: %s%s"
+msgstr "cách dùng: %s%s"
#: builtin/help.c:492
#, c-format
@@ -5760,8 +5961,8 @@ msgstr "sự mâu thuẫn xả nén nghiêm trọng"
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SỰ VA CHẠM SHA1 ĐÃ XẢY RA VỚI %s!"
-#: builtin/index-pack.c:669 builtin/pack-objects.c:170
-#: builtin/pack-objects.c:262
+#: builtin/index-pack.c:669 builtin/pack-objects.c:171
+#: builtin/pack-objects.c:263
#, c-format
msgid "unable to read %s"
msgstr "không thể đọc %s"
@@ -5790,155 +5991,155 @@ msgstr "Lỗi trong đối tượng"
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:838 builtin/index-pack.c:868
+#: builtin/index-pack.c:839 builtin/index-pack.c:869
msgid "failed to apply delta"
msgstr "gặp lỗi khi áp dụng delta"
-#: builtin/index-pack.c:1009
+#: builtin/index-pack.c:1010
msgid "Receiving objects"
msgstr "Đang nhận về các đối tượng"
-#: builtin/index-pack.c:1009
+#: builtin/index-pack.c:1010
msgid "Indexing objects"
msgstr "Các đối tượng bảng mục lục"
-#: builtin/index-pack.c:1035
+#: builtin/index-pack.c:1036
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "pack bị sai hỏng (SHA1 không khớp)"
-#: builtin/index-pack.c:1040
+#: builtin/index-pack.c:1041
msgid "cannot fstat packfile"
msgstr "không thể fstat packfile"
-#: builtin/index-pack.c:1043
+#: builtin/index-pack.c:1044
msgid "pack has junk at the end"
msgstr "pack có phần thừa ở cuối"
-#: builtin/index-pack.c:1054
+#: builtin/index-pack.c:1055
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:1077
+#: builtin/index-pack.c:1078
msgid "Resolving deltas"
msgstr "Đang phân giải các delta"
-#: builtin/index-pack.c:1087
+#: builtin/index-pack.c:1088
#, c-format
msgid "unable to create thread: %s"
msgstr "không thể tạo tuyến: %s"
-#: builtin/index-pack.c:1129
+#: builtin/index-pack.c:1130
msgid "confusion beyond insanity"
msgstr "lộn xộn hơn cả điên rồ"
-#: builtin/index-pack.c:1137
+#: builtin/index-pack.c:1138
#, c-format
msgid "completed with %d local objects"
msgstr "đầy đủ với %d đối tượng nội bộ"
-#: builtin/index-pack.c:1147
+#: builtin/index-pack.c:1148
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Tổng kiểm tra tail không như mong đợi cho %s (đĩa hỏng?)"
-#: builtin/index-pack.c:1151
+#: builtin/index-pack.c:1152
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "pack có %d delta chưa được giải quyết"
msgstr[1] "pack có %d delta chưa được giải quyết"
-#: builtin/index-pack.c:1176
+#: builtin/index-pack.c:1177
#, c-format
msgid "unable to deflate appended object (%d)"
-msgstr "không thể xả đối tượng nối thêm (%d)"
+msgstr "không thể xả nén đối tượng nối thêm (%d)"
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1256
#, c-format
msgid "local object %s is corrupt"
msgstr "đối tượng nội bộ %s bị hỏng"
-#: builtin/index-pack.c:1279
+#: builtin/index-pack.c:1280
msgid "error while closing pack file"
-msgstr "gặp lỗi trong khi đóng tập tin pack"
+msgstr "gặp lỗi trong khi đóng tập tin gói (pack)"
-#: builtin/index-pack.c:1292
+#: builtin/index-pack.c:1293
#, c-format
msgid "cannot write keep file '%s'"
msgstr "không thể ghi tập tin giữ lại “%s”"
-#: builtin/index-pack.c:1300
+#: builtin/index-pack.c:1301
#, 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:1313
+#: builtin/index-pack.c:1314
msgid "cannot store pack file"
msgstr "không thể lưu tập tin pack"
-#: builtin/index-pack.c:1324
+#: builtin/index-pack.c:1325
msgid "cannot store index file"
msgstr "không thể lưu trữ tập tin ghi mục lục"
-#: builtin/index-pack.c:1357
+#: builtin/index-pack.c:1358
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "sai pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1363
+#: builtin/index-pack.c:1364
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "số tuyến chỉ ra không hợp lệ (%d)"
-#: builtin/index-pack.c:1367 builtin/index-pack.c:1545
+#: builtin/index-pack.c:1368 builtin/index-pack.c:1546
#, c-format
msgid "no threads support, ignoring %s"
msgstr "không hỗ trợ đa tuyến, bỏ qua %s"
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1426
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Không thể mở tập tin pack đã sẵn có “%s”"
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1428
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Không thể mở tập tin “pack idx” cho “%s”"
-#: builtin/index-pack.c:1474
+#: builtin/index-pack.c:1475
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "không delta: %d đối tượng"
msgstr[1] "không delta: %d đối tượng"
-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1482
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "chiều dài xích = %d: %lu đối tượng"
msgstr[1] "chiều dài xích = %d: %lu đối tượng"
-#: builtin/index-pack.c:1509
+#: builtin/index-pack.c:1510
msgid "Cannot come back to cwd"
msgstr "Không thể quay lại cwd"
-#: builtin/index-pack.c:1557 builtin/index-pack.c:1560
-#: builtin/index-pack.c:1572 builtin/index-pack.c:1576
+#: builtin/index-pack.c:1558 builtin/index-pack.c:1561
+#: builtin/index-pack.c:1573 builtin/index-pack.c:1577
#, c-format
msgid "bad %s"
msgstr "%s sai"
-#: builtin/index-pack.c:1590
+#: builtin/index-pack.c:1591
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:1594 builtin/index-pack.c:1604
+#: builtin/index-pack.c:1595 builtin/index-pack.c:1605
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "tên tập tin packfile “%s” không được kết thúc bằng đuôi “.pack”"
-#: builtin/index-pack.c:1613
+#: builtin/index-pack.c:1614
msgid "--verify with no packfile name given"
msgstr "dùng tùy chọn --verify mà không đưa ra tên packfile"
@@ -6027,11 +6228,6 @@ msgstr "không thể nắm (handle) tập tin kiểu %d"
msgid "unable to move %s to %s"
msgstr "không di chuyển được %s vào %s"
-#: builtin/init-db.c:363
-#, c-format
-msgid "Could not create git link %s"
-msgstr "Không thể tạo liên kết git “%s”"
-
#.
#. * TRANSLATORS: The first '%s' is either "Reinitialized
#. * existing" or "Initialized empty", the second " shared" or
@@ -6060,8 +6256,8 @@ msgstr "không nói chuyện được với lệnh cwd"
#: builtin/init-db.c:467
msgid ""
-"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared"
-"[=<permissions>]] [directory]"
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [directory]"
msgstr ""
"git init [-q | --quiet] [--bare] [--template=<thư-mục-tạm>] [--shared[=<các-"
"quyền>]] [thư-mục]"
@@ -6074,7 +6270,7 @@ msgstr "các quyền"
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:493 builtin/prune-packed.c:75
+#: builtin/init-db.c:493 builtin/prune-packed.c:75 builtin/repack.c:155
msgid "be quiet"
msgstr "im lặng"
@@ -6114,247 +6310,247 @@ msgstr "git log [<các-tùy-chọn>] [<vùng xem xét>] [[--] <đường-dẫn>.
msgid " or: git show [options] <object>..."
msgstr " hay: git show [các-tùy-chọn] <đối-tượng>..."
-#: builtin/log.c:124
+#: builtin/log.c:125
msgid "suppress diff output"
msgstr "chặn mọi kết xuất từ diff"
-#: builtin/log.c:125
+#: builtin/log.c:126
msgid "show source"
msgstr "hiển thị mã nguồn"
-#: builtin/log.c:126
+#: builtin/log.c:127
msgid "Use mail map file"
msgstr "Sử dụng tập tin ánh xạ thư"
-#: builtin/log.c:127
+#: builtin/log.c:128
msgid "decorate options"
msgstr "các tùy chọn trang trí"
-#: builtin/log.c:230
+#: builtin/log.c:231
#, c-format
msgid "Final output: %d %s\n"
msgstr "Kết xuất cuối cùng: %d %s\n"
-#: builtin/log.c:453 builtin/log.c:545
+#: builtin/log.c:473 builtin/log.c:565
#, c-format
msgid "Could not read object %s"
msgstr "Không thể đọc đối tượng %s"
-#: builtin/log.c:569
+#: builtin/log.c:589
#, c-format
msgid "Unknown type: %d"
msgstr "Không nhận ra kiểu: %d"
-#: builtin/log.c:669
+#: builtin/log.c:689
msgid "format.headers without value"
msgstr "format.headers không có giá trị cụ thể"
-#: builtin/log.c:751
+#: builtin/log.c:771
msgid "name of output directory is too long"
msgstr "tên của thư mục kết xuất quá dài"
-#: builtin/log.c:767
+#: builtin/log.c:787
#, c-format
msgid "Cannot open patch file %s"
msgstr "Không thể mở tập tin miếng vá: %s"
-#: builtin/log.c:781
+#: builtin/log.c:801
msgid "Need exactly one range."
msgstr "Cần chính xác một vùng."
-#: builtin/log.c:789
+#: builtin/log.c:809
msgid "Not a range."
msgstr "Không phải là một vùng."
-#: builtin/log.c:891
+#: builtin/log.c:911
msgid "Cover letter needs email format"
msgstr "”Cover letter” cần cho định dạng thư"
-#: builtin/log.c:967
+#: builtin/log.c:987
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to điên rồ: %s"
-#: builtin/log.c:995
+#: builtin/log.c:1015
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:1040
+#: builtin/log.c:1060
msgid "Two output directories?"
msgstr "Hai thư mục kết xuất?"
-#: builtin/log.c:1155
+#: builtin/log.c:1175
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:1158
+#: builtin/log.c:1178
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:1162
+#: builtin/log.c:1182
msgid "print patches to standard out"
msgstr "hiển thị miếng vá ra đầu ra chuẩn"
-#: builtin/log.c:1164
+#: builtin/log.c:1184
msgid "generate a cover letter"
msgstr "tạo bì thư"
-#: builtin/log.c:1166
+#: builtin/log.c:1186
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:1167
+#: builtin/log.c:1187
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1168
+#: builtin/log.c:1188
msgid "use <sfx> instead of '.patch'"
msgstr "sử dụng <sfx> thay cho “.patch”"
-#: builtin/log.c:1170
+#: builtin/log.c:1190
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:1172
+#: builtin/log.c:1192
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:1174
+#: builtin/log.c:1194
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Dùng [<tiền-tố>] thay cho [VÁ]"
-#: builtin/log.c:1177
+#: builtin/log.c:1197
msgid "store resulting files in <dir>"
msgstr "lưu các tập tin kết quả trong <t.mục>"
-#: builtin/log.c:1180
+#: builtin/log.c:1200
msgid "don't strip/add [PATCH]"
msgstr "không strip/add [VÁ]"
-#: builtin/log.c:1183
+#: builtin/log.c:1203
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:1185
+#: builtin/log.c:1205
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:1187
+#: builtin/log.c:1207
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:1189
+#: builtin/log.c:1209
msgid "Messaging"
msgstr "Lời nhắn"
-#: builtin/log.c:1190
+#: builtin/log.c:1210
msgid "header"
msgstr "đầu đề thư"
-#: builtin/log.c:1191
+#: builtin/log.c:1211
msgid "add email header"
msgstr "thêm đầu đề thư"
-#: builtin/log.c:1192 builtin/log.c:1194
+#: builtin/log.c:1212 builtin/log.c:1214
msgid "email"
msgstr "thư điện tử"
-#: builtin/log.c:1192
+#: builtin/log.c:1212
msgid "add To: header"
msgstr "thêm To: đầu đề thư"
-#: builtin/log.c:1194
+#: builtin/log.c:1214
msgid "add Cc: header"
msgstr "thêm Cc: đầu đề thư"
-#: builtin/log.c:1196
+#: builtin/log.c:1216
msgid "ident"
msgstr "thụt lề"
-#: builtin/log.c:1197
+#: builtin/log.c:1217
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)"
+"đặ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:1199
+#: builtin/log.c:1219
msgid "message-id"
msgstr "message-id"
-#: builtin/log.c:1200
+#: builtin/log.c:1220
msgid "make first mail a reply to <message-id>"
msgstr "dùng thư đầu tiên để trả lời <message-id>"
-#: builtin/log.c:1201 builtin/log.c:1204
+#: builtin/log.c:1221 builtin/log.c:1224
msgid "boundary"
msgstr "ranh giới"
-#: builtin/log.c:1202
+#: builtin/log.c:1222
msgid "attach the patch"
msgstr "đính kèm miếng vá"
-#: builtin/log.c:1205
+#: builtin/log.c:1225
msgid "inline the patch"
msgstr "dùng miếng vá làm nội dung"
-#: builtin/log.c:1209
+#: builtin/log.c:1229
msgid "enable message threading, styles: shallow, deep"
msgstr "cho phép luồng lời nhắn, kiểu: “shallow”, “deep”"
-#: builtin/log.c:1211
+#: builtin/log.c:1231
msgid "signature"
msgstr "chữ ký"
-#: builtin/log.c:1212
+#: builtin/log.c:1232
msgid "add a signature"
msgstr "thêm chữ ký"
-#: builtin/log.c:1214
+#: builtin/log.c:1233
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:1288
+#: builtin/log.c:1307
#, c-format
msgid "invalid ident line: %s"
msgstr "dòng thụt lề không hợp lệ: %s"
-#: builtin/log.c:1303
+#: builtin/log.c:1322
msgid "-n and -k are mutually exclusive."
msgstr "-n và -k loại từ lẫn nhau."
-#: builtin/log.c:1305
+#: builtin/log.c:1324
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix và -k xung khắc nhau."
-#: builtin/log.c:1313
+#: builtin/log.c:1332
msgid "--name-only does not make sense"
msgstr "--name-only không hợp lý"
-#: builtin/log.c:1315
+#: builtin/log.c:1334
msgid "--name-status does not make sense"
msgstr "--name-status không hợp lý"
-#: builtin/log.c:1317
+#: builtin/log.c:1336
msgid "--check does not make sense"
msgstr "--check không hợp lý"
-#: builtin/log.c:1340
+#: builtin/log.c:1359
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:1342
+#: builtin/log.c:1361
#, c-format
msgid "Could not create directory '%s'"
msgstr "Không thể tạo thư mục “%s”"
-#: builtin/log.c:1490
+#: builtin/log.c:1509
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:1539
+#: builtin/log.c:1558
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<thượng-nguồn> [<head> [<giới-hạn>]]]"
-#: builtin/log.c:1594
+#: builtin/log.c:1613
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -6362,139 +6558,139 @@ msgstr ""
"Không tìm thấy nhánh mạng bị theo vết, hãy chỉ định <thượng-nguồn> một cách "
"thủ công.\n"
-#: builtin/log.c:1607 builtin/log.c:1609 builtin/log.c:1621
+#: builtin/log.c:1626 builtin/log.c:1628 builtin/log.c:1640
#, c-format
msgid "Unknown commit %s"
msgstr "Không hiểu lần chuyển giao (commit) %s"
-#: builtin/ls-files.c:408
+#: builtin/ls-files.c:398
msgid "git ls-files [options] [<file>...]"
msgstr "git ls-files [các-tùy-chọn] [<tập-tin>...]"
-#: builtin/ls-files.c:465
+#: builtin/ls-files.c:455
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:467
+#: builtin/ls-files.c:457
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:469
+#: builtin/ls-files.c:459
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:471
+#: builtin/ls-files.c:461
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:473
+#: builtin/ls-files.c:463
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:475
+#: builtin/ls-files.c:465
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:477
+#: builtin/ls-files.c:467
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:480
+#: builtin/ls-files.c:470
msgid "show staged contents' object name in the output"
msgstr "hiển thị tên đối tượng của nội dung được lưu trạng thái ở kết xuất"
-#: builtin/ls-files.c:482
+#: builtin/ls-files.c:472
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:484
+#: builtin/ls-files.c:474
msgid "show 'other' directories' name only"
msgstr "chỉ hiển thị tên của các thư mục “khác”"
-#: builtin/ls-files.c:487
+#: builtin/ls-files.c:477
msgid "don't show empty directories"
msgstr "không hiển thị thư mục rỗng"
-#: builtin/ls-files.c:490
+#: builtin/ls-files.c:480
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:492
+#: builtin/ls-files.c:482
msgid "show resolve-undo information"
msgstr "hiển thị thông tin resolve-undo"
-#: builtin/ls-files.c:494
+#: builtin/ls-files.c:484
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:497
+#: builtin/ls-files.c:487
msgid "exclude patterns are read from <file>"
msgstr "mẫu loại trừ được đọc từ <tập tin>"
-#: builtin/ls-files.c:500
+#: builtin/ls-files.c:490
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:502
+#: builtin/ls-files.c:492
msgid "add the standard git exclusions"
msgstr "thêm loại trừ tiêu chuẩn kiểu git"
-#: builtin/ls-files.c:505
+#: builtin/ls-files.c:495
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:508
+#: builtin/ls-files.c:498
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:509
+#: builtin/ls-files.c:499
msgid "tree-ish"
msgstr "tree-ish"
-#: builtin/ls-files.c:510
+#: builtin/ls-files.c:500
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:512
+#: builtin/ls-files.c:502
msgid "show debugging data"
msgstr "hiển thị dữ liệu gỡ lỗi"
-#: builtin/ls-tree.c:27
+#: builtin/ls-tree.c:28
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr "git ls-tree [<các-tùy-chọn>] <tree-ish> [<đường-dẫn>...]"
-#: builtin/ls-tree.c:125
+#: builtin/ls-tree.c:126
msgid "only show trees"
msgstr "chỉ hiển thị các tree"
-#: builtin/ls-tree.c:127
+#: builtin/ls-tree.c:128
msgid "recurse into subtrees"
msgstr "đệ quy vào các thư mục con"
-#: builtin/ls-tree.c:129
+#: builtin/ls-tree.c:130
msgid "show trees when recursing"
msgstr "hiển thị cây khi đệ quy"
-#: builtin/ls-tree.c:132
+#: builtin/ls-tree.c:133
msgid "terminate entries with NUL byte"
msgstr "chấm dứt mục tin với byte NUL"
-#: builtin/ls-tree.c:133
+#: builtin/ls-tree.c:134
msgid "include object size"
msgstr "gồm cả kích thước đối tượng"
-#: builtin/ls-tree.c:135 builtin/ls-tree.c:137
+#: builtin/ls-tree.c:136 builtin/ls-tree.c:138
msgid "list only filenames"
msgstr "chỉ liệt kê tên tập tin"
-#: builtin/ls-tree.c:140
+#: builtin/ls-tree.c:141
msgid "use full path names"
msgstr "dùng tên đường dẫn đầy đủ"
-#: builtin/ls-tree.c:142
+#: builtin/ls-tree.c:143
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr "liệt kê cây mục tin; không chỉ thư mục hiện hành (ngụ ý --full-name)"
@@ -6569,7 +6765,7 @@ msgstr "bỏ qua nếu fast-forward không thể được"
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:219 builtin/notes.c:738 builtin/revert.c:114
+#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:89
msgid "strategy"
msgstr "chiến lược"
@@ -6950,76 +7146,87 @@ msgstr "cho phép thiếu đối tượng"
msgid "allow creation of more than one tree"
msgstr "cho phép tạo nhiều hơn một cây"
-#: builtin/mv.c:14
+#: builtin/mv.c:15
msgid "git mv [options] <source>... <destination>"
msgstr "git mv [các-tùy-chọn] <nguồn>... <đích>"
-#: builtin/mv.c:64
+#: builtin/mv.c:67
msgid "force move/rename even if target exists"
msgstr "ép buộc di chuyển hay đổi tên thậm chí cả khi đích đã tồn tại"
-#: builtin/mv.c:65
+#: builtin/mv.c:68
msgid "skip move/rename errors"
msgstr "bỏ qua các lỗi liên quan đến di chuyển, đổi tên"
-#: builtin/mv.c:108
+#: builtin/mv.c:113
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Đang kiểm tra việc đổi tên của “%s” thành “%s”\n"
-#: builtin/mv.c:112
+#: builtin/mv.c:117
msgid "bad source"
msgstr "nguồn sai"
-#: builtin/mv.c:115
+#: builtin/mv.c:120
msgid "can not move directory into itself"
msgstr "không thể di chuyển một thư mục vào trong chính nó được"
-#: builtin/mv.c:118
+#: builtin/mv.c:123
msgid "cannot move directory over file"
msgstr "không di chuyển được thư mục thông qua tập tin"
-#: builtin/mv.c:128
+#: builtin/mv.c:129
+#, c-format
+msgid "Huh? Directory %s is in index and no submodule?"
+msgstr "Hả? Thư mục “%s” trong chỉ mục và không mô-đun con?"
+
+#: builtin/mv.c:131 builtin/rm.c:318
+msgid "Please, stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+"Hãy lưu các thay đổi của bạn vào “.gitmodules” hay ghi vào vùng nhớ tạm "
+"(stash) chúng để xử lý"
+
+#: builtin/mv.c:147
#, c-format
msgid "Huh? %.*s is in index?"
msgstr "Hả? %.*s trong bảng mục lục à?"
-#: builtin/mv.c:140
+#: builtin/mv.c:159
msgid "source directory is empty"
msgstr "thư mục nguồn là trống rỗng"
-#: builtin/mv.c:171
+#: builtin/mv.c:191
msgid "not under version control"
msgstr "không nằm dưới sự quản lý mã nguồn"
-#: builtin/mv.c:173
+#: builtin/mv.c:193
msgid "destination exists"
msgstr "đích đã tồn tại sẵn rồi"
-#: builtin/mv.c:181
+#: builtin/mv.c:201
#, c-format
msgid "overwriting '%s'"
msgstr "đang ghi đè lên “%s”"
-#: builtin/mv.c:184
+#: builtin/mv.c:204
msgid "Cannot overwrite"
msgstr "Không thể ghi đè"
-#: builtin/mv.c:187
+#: builtin/mv.c:207
msgid "multiple sources for the same target"
msgstr "Nhiều nguồn cho cùng một đích"
-#: builtin/mv.c:202
+#: builtin/mv.c:222
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, nguồn=%s, đích=%s"
-#: builtin/mv.c:212
+#: builtin/mv.c:232
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Đổi tên %s thành %s\n"
-#: builtin/mv.c:215 builtin/remote.c:731
+#: builtin/mv.c:235 builtin/remote.c:731 builtin/repack.c:330
#, c-format
msgid "renaming '%s' failed"
msgstr "đổi tên %s gặp lỗi"
@@ -7058,8 +7265,8 @@ msgid "read from stdin"
msgstr "đọc từ đầu vào tiêu chuẩn"
#: builtin/name-rev.c:320
-msgid "allow to print `undefined` names"
-msgstr "cho phép hiển thị các tên “chưa định nghĩa“"
+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:326
msgid "dereference tags in the input (internal use)"
@@ -7213,12 +7420,12 @@ msgstr "không thể ghi đối tượng ghi chú (note)"
msgid "The note contents has been left in %s"
msgstr "Nội dung ghi chú còn lại %s"
-#: builtin/notes.c:248 builtin/tag.c:540
+#: builtin/notes.c:248 builtin/tag.c:537
#, c-format
msgid "cannot read '%s'"
msgstr "không thể đọc “%s”"
-#: builtin/notes.c:250 builtin/tag.c:543
+#: builtin/notes.c:250 builtin/tag.c:540
#, c-format
msgid "could not open or read '%s'"
msgstr "không thể mở hay đọc “%s”"
@@ -7226,7 +7433,7 @@ msgstr "không thể mở hay đọc “%s”"
#: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318
#: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515
#: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637
-#: builtin/notes.c:839 builtin/tag.c:556
+#: builtin/notes.c:839 builtin/tag.c:553
#, 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 (ref) hợp lệ."
@@ -7239,7 +7446,7 @@ msgstr "Gặp lỗi khi đọc đối tượng “%s”."
#: builtin/notes.c:312
#, c-format
msgid "Malformed input line: '%s'."
-msgstr "Dòng nhập vào dị hình: “%s”."
+msgstr "Dòng đầu vào dị hình: “%s”."
#: builtin/notes.c:327
#, c-format
@@ -7403,149 +7610,149 @@ 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:183 builtin/pack-objects.c:186
+#: builtin/pack-objects.c:184 builtin/pack-objects.c:187
#, c-format
msgid "deflate error (%d)"
msgstr "lỗi giải nén (%d)"
-#: builtin/pack-objects.c:2397
+#: builtin/pack-objects.c:2398
#, 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:2401
+#: builtin/pack-objects.c:2402
#, c-format
msgid "bad index version '%s'"
msgstr "phiên bản mục lục sai “%s”"
-#: builtin/pack-objects.c:2424
+#: builtin/pack-objects.c:2425
#, c-format
msgid "option %s does not accept negative form"
msgstr "tùy chọn %s không chấp nhận dạng thức âm"
-#: builtin/pack-objects.c:2428
+#: builtin/pack-objects.c:2429
#, c-format
msgid "unable to parse value '%s' for option %s"
msgstr "không thể phân tích giá trị “%s” cho tùy chọn %s"
-#: builtin/pack-objects.c:2447
+#: builtin/pack-objects.c:2448
msgid "do not show progress meter"
msgstr "không hiển thị bộ đo tiến trình"
-#: builtin/pack-objects.c:2449
+#: builtin/pack-objects.c:2450
msgid "show progress meter"
msgstr "hiển thị bộ đo tiến trình"
-#: builtin/pack-objects.c:2451
+#: builtin/pack-objects.c:2452
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:2454
+#: builtin/pack-objects.c:2455
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:2455
+#: builtin/pack-objects.c:2456
msgid "version[,offset]"
msgstr "phiên bản[,offset]"
-#: builtin/pack-objects.c:2456
+#: builtin/pack-objects.c:2457
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:2459
+#: builtin/pack-objects.c:2460
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:2461
+#: builtin/pack-objects.c:2462
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:2463
+#: builtin/pack-objects.c:2464
msgid "ignore packed objects"
msgstr "bỏ qua các đối tượng đóng gói"
-#: builtin/pack-objects.c:2465
+#: builtin/pack-objects.c:2466
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:2467
+#: builtin/pack-objects.c:2468
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:2469
+#: builtin/pack-objects.c:2470
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:2471
+#: builtin/pack-objects.c:2472
msgid "reuse existing deltas"
msgstr "dùng lại các delta sẵn có"
-#: builtin/pack-objects.c:2473
+#: builtin/pack-objects.c:2474
msgid "reuse existing objects"
msgstr "dùng lại các đối tượng sẵn có"
-#: builtin/pack-objects.c:2475
+#: builtin/pack-objects.c:2476
msgid "use OFS_DELTA objects"
msgstr "dùng các đối tượng OFS_DELTA"
-#: builtin/pack-objects.c:2477
+#: builtin/pack-objects.c:2478
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:2479
+#: builtin/pack-objects.c:2480
msgid "do not create an empty pack output"
msgstr "không thể tạo kết xuất gói (pack) trống rỗng"
-#: builtin/pack-objects.c:2481
+#: builtin/pack-objects.c:2482
msgid "read revision arguments from standard input"
msgstr " đọc tham số “revision” từ thiết bị nhập chuẩn"
-#: builtin/pack-objects.c:2483
+#: builtin/pack-objects.c:2484
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:2486
+#: builtin/pack-objects.c:2487
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:2489
+#: builtin/pack-objects.c:2490
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:2492
+#: builtin/pack-objects.c:2493
msgid "output pack to stdout"
msgstr "xuất gói ra đầu ra tiêu chuẩn"
-#: builtin/pack-objects.c:2494
+#: builtin/pack-objects.c:2495
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:2496
+#: builtin/pack-objects.c:2497
msgid "keep unreachable objects"
msgstr "giữ lại các đối tượng không thể đọc được"
-#: builtin/pack-objects.c:2497 parse-options.h:141
+#: builtin/pack-objects.c:2498 parse-options.h:143
msgid "time"
msgstr "thời-gian"
-#: builtin/pack-objects.c:2498
+#: builtin/pack-objects.c:2499
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:2501
+#: builtin/pack-objects.c:2502
msgid "create thin packs"
msgstr "tạo gói nhẹ"
-#: builtin/pack-objects.c:2503
+#: builtin/pack-objects.c:2504
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:2505
+#: builtin/pack-objects.c:2506
msgid "pack compression level"
msgstr "mức nén gói"
-#: builtin/pack-objects.c:2507
+#: builtin/pack-objects.c:2508
msgid "do not hide commits by grafts"
msgstr "không ẩn các lần chuyển giao bởi “grafts”"
@@ -7585,15 +7792,15 @@ msgstr "các đối tượng hết hạn cũ hơn khoảng <thời gian>"
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<các-tùy-chọn>] [<kho-chứa> [<refspec>...]]"
-#: builtin/push.c:45
+#: builtin/push.c:47
msgid "tag shorthand without <tag>"
msgstr "dùng tốc ký tag không có <thẻ>"
-#: builtin/push.c:64
+#: builtin/push.c:66
msgid "--delete only accepts plain target ref names"
msgstr "--delete chỉ chấp nhận các tên tham chiếu (ref) dạng thường"
-#: builtin/push.c:99
+#: builtin/push.c:101
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -7602,7 +7809,7 @@ msgstr ""
"Để chọn mỗi tùy chọn một cách cố định, xem push.default trong “git help "
"config”."
-#: builtin/push.c:102
+#: builtin/push.c:104
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -7627,7 +7834,7 @@ msgstr ""
" git push %s %s\n"
"%s"
-#: builtin/push.c:117
+#: builtin/push.c:119
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -7642,7 +7849,7 @@ msgstr ""
"\n"
" git push %s HEAD:<tên-của-nhánh-máy-chủ>\n"
-#: builtin/push.c:131
+#: builtin/push.c:133
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -7656,12 +7863,12 @@ msgstr ""
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:139
+#: builtin/push.c:141
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr "Nhánh hiện tại %s có đa nhánh thượng nguồn (upstream), từ chối push."
-#: builtin/push.c:142
+#: builtin/push.c:144
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -7673,7 +7880,7 @@ msgstr ""
"nhánh hiện tại “%s” của bạn, mà không báo cho tôi biết là cái gì được push\n"
"để cập nhật nhánh máy chủ nào."
-#: builtin/push.c:165
+#: builtin/push.c:167
msgid ""
"push.default is unset; its implicit value is changing in\n"
"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
@@ -7706,14 +7913,14 @@ msgstr ""
"tự\n"
"“current” thay vì “simple” nếu bạn thỉnh thoảng phải sử dụng bản Git cũ)"
-#: builtin/push.c:225
+#: builtin/push.c:227
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"Bạn đã không chỉ ra một refspecs nào để push, và push.default là \"không là "
"gì cả\"."
-#: builtin/push.c:232
+#: builtin/push.c:234
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -7727,7 +7934,7 @@ msgstr ""
"Xem “Note about fast-forwards” từ lệnh “git push --help” để có thông tin chi "
"tiết."
-#: builtin/push.c:238
+#: builtin/push.c:240
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. If you did not intend to push that branch, you may want to\n"
@@ -7742,7 +7949,7 @@ msgstr ""
"thành “simple”, “current” hoặc “upstream” để chỉ push nhánh hiện hành mà "
"thôi."
-#: builtin/push.c:244
+#: builtin/push.c:246
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
@@ -7756,7 +7963,7 @@ msgstr ""
"Xem “Note about fast-forwards” từ lệnh “git push --help” để có thông tin chi "
"tiết."
-#: builtin/push.c:250
+#: builtin/push.c:252
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
@@ -7771,11 +7978,11 @@ msgstr ""
"Xem “Note about fast-forwards” từ lệnh “git push --help” để có thông tin chi "
"tiết."
-#: builtin/push.c:257
+#: builtin/push.c:259
msgid "Updates were rejected because the tag already exists in the remote."
msgstr "Việc cập nhật bị từ chối bởi vì thẻ đã sẵn có từ trước trên máy chủ."
-#: builtin/push.c:260
+#: builtin/push.c:262
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
@@ -7787,22 +7994,22 @@ msgstr ""
"tượng\n"
"không phải chuyển giao, mà không sử dụng tùy chọn “--force”.\n"
-#: builtin/push.c:320
+#: builtin/push.c:328
#, c-format
msgid "Pushing to %s\n"
msgstr "Đang push (đẩy) lên %s\n"
-#: builtin/push.c:324
+#: builtin/push.c:332
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "gặp lỗi khi push (đẩy lên) một số tham chiếu (ref) đến “%s”"
-#: builtin/push.c:357
+#: builtin/push.c:365
#, c-format
msgid "bad repository '%s'"
msgstr "repository (kho) sai “%s”"
-#: builtin/push.c:358
+#: builtin/push.c:366
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -7823,88 +8030,96 @@ msgstr ""
"\n"
" git push <tên>\n"
-#: builtin/push.c:373
+#: builtin/push.c:381
msgid "--all and --tags are incompatible"
msgstr "--all và --tags xung khắc nhau"
-#: builtin/push.c:374
+#: builtin/push.c:382
msgid "--all can't be combined with refspecs"
-msgstr "--all không thể được tổ hợp cùng với refspecs"
+msgstr "--all không thể được tổ hợp cùng với đặc tả đường dẫn"
-#: builtin/push.c:379
+#: builtin/push.c:387
msgid "--mirror and --tags are incompatible"
msgstr "--mirror và --tags xung khắc nhau"
-#: builtin/push.c:380
+#: builtin/push.c:388
msgid "--mirror can't be combined with refspecs"
-msgstr "--mirror không thể được tổ hợp cùng với refspecs"
+msgstr "--mirror không thể được tổ hợp cùng với đặc tả đường dẫn"
-#: builtin/push.c:385
+#: builtin/push.c:393
msgid "--all and --mirror are incompatible"
msgstr "--all và --mirror xung khắc nhau"
-#: builtin/push.c:445
+#: builtin/push.c:453
msgid "repository"
msgstr "kho"
-#: builtin/push.c:446
+#: builtin/push.c:454
msgid "push all refs"
msgstr "push tất cả refs"
-#: builtin/push.c:447
+#: builtin/push.c:455
msgid "mirror all refs"
-msgstr "mirror tất cả refs"
+msgstr "mirror tất cả các tham chiếu"
-#: builtin/push.c:449
+#: builtin/push.c:457
msgid "delete refs"
msgstr "xóa refs"
-#: builtin/push.c:450
+#: builtin/push.c:458
msgid "push tags (can't be used with --all or --mirror)"
msgstr ""
"các thẻ push (không thể sử dụng cùng với các tùy chọn --all hay --mirror)"
-#: builtin/push.c:453
+#: builtin/push.c:461
msgid "force updates"
msgstr "ép buộc cập nhật"
-#: builtin/push.c:454
+#: builtin/push.c:463
+msgid "refname>:<expect"
+msgstr "tên-tham-chiếu>:<cần"
+
+#: builtin/push.c:464
+msgid "require old value of ref to be at this value"
+msgstr "yêu cầu giá-trị cũ của tham chiếu thì là giá-trị này"
+
+#: builtin/push.c:466
msgid "check"
msgstr "kiểm tra"
-#: builtin/push.c:455
+#: builtin/push.c:467
msgid "control recursive pushing of submodules"
msgstr "điều khiển việc đẩy lên (push) đệ qui của mô-đun-con"
-#: builtin/push.c:457
+#: builtin/push.c:469
msgid "use thin pack"
msgstr "tạo gói nhẹ"
-#: builtin/push.c:458 builtin/push.c:459
+#: builtin/push.c:470 builtin/push.c:471
msgid "receive pack program"
msgstr "nhận về chương trình pack"
-#: builtin/push.c:460
+#: builtin/push.c:472
msgid "set upstream for git pull/status"
msgstr "đặt thượng nguồn (upstream) cho git pull/status"
-#: builtin/push.c:463
+#: builtin/push.c:475
msgid "prune locally removed refs"
msgstr "prune (cắt cụt) những tham chiếu (refs) bị gỡ bỏ"
-#: builtin/push.c:465
+#: builtin/push.c:477
msgid "bypass pre-push hook"
msgstr "vòng qua “pre-push hook”"
-#: builtin/push.c:466
+#: builtin/push.c:478
msgid "push missing but relevant tags"
msgstr "push bị trượt nhưng các thẻ thích hợp"
-#: builtin/push.c:476
+#: builtin/push.c:488
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete là xung khắc với các tùy chọn --all, --mirror và --tags"
-#: builtin/push.c:478
+#: builtin/push.c:490
msgid "--delete doesn't make sense without any refs"
msgstr "--delete không hợp lý nếu không có bất kỳ tham chiếu (refs) nào"
@@ -7982,14 +8197,14 @@ msgstr "bỏ qua áp dụng bộ lọc lấy ra (checkout) thưa thớt"
#: builtin/read-tree.c:138
msgid "debug unpack-trees"
-msgstr "gỡ lỗi unpack-trees"
+msgstr "gỡ lỗi “unpack-trees”"
-#: builtin/reflog.c:500
+#: builtin/reflog.c:499
#, c-format
msgid "%s' for '%s' is not a valid timestamp"
-msgstr "%s' cho '%s' không phải là dấu thời gian hợp lệ"
+msgstr "giá trị %s dành cho “%s” không phải là dấu thời gian hợp lệ"
-#: builtin/reflog.c:616 builtin/reflog.c:621
+#: builtin/reflog.c:615 builtin/reflog.c:620
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "“%s” không phải là dấu thời gian hợp lệ"
@@ -8014,9 +8229,9 @@ msgstr "git remote rename <tên-cũ> <tên-mới>"
msgid "git remote remove <name>"
msgstr "git remote remove <tên>"
-#: builtin/remote.c:15 builtin/remote.c:42
-msgid "git remote set-head <name> (-a | -d | <branch>)"
-msgstr "git remote set-head <tên> (-a | -d | <nhánh>)"
+#: builtin/remote.c:15
+msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
+msgstr "git remote set-head <tên> (-a | --auto | -d | --delete | <nhánh>)"
#: builtin/remote.c:16
msgid "git remote [-v | --verbose] show [-n] <name>"
@@ -8052,6 +8267,10 @@ msgstr "git remote set-url --delete <tên> <url>"
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<các-tùy-chọn>] <tên> <url>"
+#: builtin/remote.c:42
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+msgstr "git remote set-head <tên> (-a | --auto | -d | --delete | <nhánh>)"
+
#: builtin/remote.c:47
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <tên> <nhánh>..."
@@ -8150,7 +8369,7 @@ msgstr "nhiều hơn một %s"
#: builtin/remote.c:339
#, c-format
msgid "Could not get fetch map for refspec %s"
-msgstr "Không thể lấy ánh xạ (map) fetch cho refspec %s"
+msgstr "Không thể lấy ánh xạ (map) fetch cho đặc tả tham chiếu %s"
#: builtin/remote.c:440 builtin/remote.c:448
msgid "(matching)"
@@ -8242,7 +8461,7 @@ msgstr " được theo vết"
#: builtin/remote.c:948
msgid " stale (use 'git remote prune' to remove)"
-msgstr " cũ (dùng “git remote prune” để gỡ bỏ)"
+msgstr " cũ rích (dùng “git remote prune” để gỡ bỏ)"
#: builtin/remote.c:950
msgid " ???"
@@ -8490,6 +8709,67 @@ msgstr "Sẽ không xóa những địa chỉ URL không-push"
msgid "be verbose; must be placed before a subcommand"
msgstr "chi tiết; phải được đặt trước một lệnh-con"
+#: builtin/repack.c:15
+msgid "git repack [options]"
+msgstr "git repack [các-tùy-chọn]"
+
+#: builtin/repack.c:143
+msgid "pack everything in a single pack"
+msgstr "đóng gói mọi thứ trong một gói đơn"
+
+#: builtin/repack.c:145
+msgid "same as -a, and turn unreachable objects loose"
+msgstr "giống với -a, và chỉnh sửa các đối tượng không đọc được thiếu sót"
+
+#: builtin/repack.c:148
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr "xóa bỏ các gói dư thừa, và chạy git-prune-packed"
+
+#: builtin/repack.c:150
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr "chuyển --no-reuse-delta cho git-pack-objects"
+
+#: builtin/repack.c:152
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr "chuyển --no-reuse-object cho git-pack-objects"
+
+#: builtin/repack.c:154
+msgid "do not run git-update-server-info"
+msgstr "không chạy git-update-server-info"
+
+#: builtin/repack.c:157
+msgid "pass --local to git-pack-objects"
+msgstr "chuyển --local cho git-pack-objects"
+
+#: builtin/repack.c:158
+msgid "approxidate"
+msgstr "ngày ước tính"
+
+#: builtin/repack.c:159
+msgid "with -A, do not loosen objects older than this"
+msgstr "với -A, các đối tượng cũ hơn khoảng thời gian này thì không bị mất"
+
+#: builtin/repack.c:161
+msgid "size of the window used for delta compression"
+msgstr "kích thước cửa sổ được dùng cho nén “delta”"
+
+#: builtin/repack.c:163
+msgid "same as the above, but limit memory size instead of entries count"
+msgstr "giống như trên, nhưng giới hạn kích thước bộ nhớ hay vì số lượng"
+
+#: builtin/repack.c:165
+msgid "limits the maximum delta depth"
+msgstr "giới hạn độ sâu tối đa của “delta”"
+
+#: builtin/repack.c:167
+msgid "maximum size of each packfile"
+msgstr "kcíh thước tối đa cho từng tập tin gói"
+
+#: builtin/repack.c:345
+#, c-format
+msgid "removing '%s' failed"
+msgstr "gặp lỗi khi xóa bỏ “%s”"
+
#: builtin/replace.c:17
msgid "git replace [-f] <object> <replacement>"
msgstr "git replace [-f] <đối-tượng> <thay-thế>"
@@ -8502,23 +8782,23 @@ msgstr "git replace -d <đối tượng>..."
msgid "git replace -l [<pattern>]"
msgstr "git replace -l [<mẫu>]"
-#: builtin/replace.c:121
+#: builtin/replace.c:131
msgid "list replace refs"
msgstr "liệt kê các refs thay thế"
-#: builtin/replace.c:122
+#: builtin/replace.c:132
msgid "delete replace refs"
msgstr "xóa tham chiếu (refs) thay thế"
-#: builtin/replace.c:123
+#: builtin/replace.c:133
msgid "replace the ref if it exists"
msgstr "thay thế tham chiếu (ref) nếu nó đã sẵn có"
-#: builtin/rerere.c:11
+#: builtin/rerere.c:12
msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]"
-#: builtin/rerere.c:56
+#: builtin/rerere.c:57
msgid "register clean resolutions in index"
msgstr "sổ ghi dọn sạch các phân giải trong bản mục lục"
@@ -8579,71 +8859,71 @@ msgstr "HEAD hiện giờ tại %s"
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Không thể thực hiện một %s reset ở giữa của quá trình hòa trộn."
-#: builtin/reset.c:251
+#: builtin/reset.c:262
msgid "be quiet, only report errors"
msgstr "làm việc ở chế độ im lặng, chỉ hiển thị khi có lỗi"
-#: builtin/reset.c:253
+#: builtin/reset.c:264
msgid "reset HEAD and index"
msgstr "đặt lại (reset) HEAD và bảng mục lục"
-#: builtin/reset.c:254
+#: builtin/reset.c:265
msgid "reset only HEAD"
msgstr "chỉ đặt lại (reset) HEAD"
-#: builtin/reset.c:256 builtin/reset.c:258
+#: builtin/reset.c:267 builtin/reset.c:269
msgid "reset HEAD, index and working tree"
msgstr "đặt lại HEAD, bảng mục lục và cây làm việc"
-#: builtin/reset.c:260
+#: builtin/reset.c:271
msgid "reset HEAD but keep local changes"
msgstr "đặt lại HEAD nhưng giữ lại các thay đổi nội bộ"
-#: builtin/reset.c:278
+#: builtin/reset.c:289
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Gặp lỗi khi phân giải “%s” như là điểm xét duyệt hợp lệ."
-#: builtin/reset.c:281 builtin/reset.c:289
+#: builtin/reset.c:292 builtin/reset.c:300
#, c-format
msgid "Could not parse object '%s'."
msgstr "không thể phân tích đối tượng “%s”."
-#: builtin/reset.c:286
+#: builtin/reset.c:297
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Gặp lỗi khi phân giải “%s” như là một cây (tree) hợp lệ."
-#: builtin/reset.c:295
+#: builtin/reset.c:306
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch xung khắc với --{hard,mixed,soft}"
-#: builtin/reset.c:304
+#: builtin/reset.c:315
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed với các đường dẫn không còn dùng nữa; hãy thay thế bằng lệnh “git "
"reset -- <đường_dẫn>”."
-#: builtin/reset.c:306
+#: builtin/reset.c:317
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Không thể thực hiện lệnh %s reset với các đường dẫn."
-#: builtin/reset.c:316
+#: builtin/reset.c:327
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "%s reset không được phép trên kho bare (trên máy chủ)"
-#: builtin/reset.c:336
+#: builtin/reset.c:344
+msgid "Unstaged changes after reset:"
+msgstr "Những thay đổi bị bỏ trạng thái (stage) sau khi reset:"
+
+#: builtin/reset.c:350
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Không thể đặt lại (reset) bảng mục lục thành điểm xét duyệt “%s”."
-#: builtin/reset.c:342
-msgid "Unstaged changes after reset:"
-msgstr "Những thay đổi bị bỏ trạng thái (stage) sau khi reset:"
-
-#: builtin/reset.c:347
+#: builtin/reset.c:355
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."
@@ -8689,84 +8969,84 @@ msgstr "git cherry-pick [các-tùy-chọn] <commit-ish>..."
msgid "git cherry-pick <subcommand>"
msgstr "git cherry-pick <lệnh-con>"
-#: builtin/revert.c:71 builtin/revert.c:94
+#: builtin/revert.c:71
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr "%s: %s không thể được sử dụng với %s"
-#: builtin/revert.c:105
+#: builtin/revert.c:80
msgid "end revert or cherry-pick sequence"
msgstr "kết thúc cherry-pick hay revert liên tiếp nhau"
-#: builtin/revert.c:106
+#: builtin/revert.c:81
msgid "resume revert or cherry-pick sequence"
msgstr "phục hồi lại cherry-pick hay revert liên tiếp nhau"
-#: builtin/revert.c:107
+#: builtin/revert.c:82
msgid "cancel revert or cherry-pick sequence"
msgstr "không cherry-pick hay revert liên tiếp nhau"
-#: builtin/revert.c:108
+#: builtin/revert.c:83
msgid "don't automatically commit"
msgstr "không commit một cách tự động."
-#: builtin/revert.c:109
+#: builtin/revert.c:84
msgid "edit the commit message"
msgstr "sửa lại chú thích cho commit"
-#: builtin/revert.c:112
+#: builtin/revert.c:87
msgid "parent number"
msgstr "số của cha mẹ"
-#: builtin/revert.c:114
+#: builtin/revert.c:89
msgid "merge strategy"
msgstr "chiến lược hòa trộn"
-#: builtin/revert.c:115
+#: builtin/revert.c:90
msgid "option"
msgstr "tùy chọn"
-#: builtin/revert.c:116
+#: builtin/revert.c:91
msgid "option for merge strategy"
msgstr "tùy chọn cho chiến lược hòa trộn"
-#: builtin/revert.c:127
+#: builtin/revert.c:102
msgid "append commit name"
msgstr "nối thêm tên lần chuyển giao (commit)"
-#: builtin/revert.c:128
+#: builtin/revert.c:103
msgid "allow fast-forward"
msgstr "cho phép fast-forward"
-#: builtin/revert.c:129
+#: builtin/revert.c:104
msgid "preserve initially empty commits"
msgstr "cấm khởi tạo lần chuyển giao trống rỗng"
-#: builtin/revert.c:130
+#: builtin/revert.c:105
msgid "allow commits with empty messages"
msgstr "chấp nhận chuyển giao (commit) mà không ghi chú gì"
-#: builtin/revert.c:131
+#: builtin/revert.c:106
msgid "keep redundant, empty commits"
msgstr "giữ lại các lần chuyển giao dư thừa, rỗng"
-#: builtin/revert.c:135
+#: builtin/revert.c:110
msgid "program error"
msgstr "lỗi chương trình"
-#: builtin/revert.c:225
+#: builtin/revert.c:195
msgid "revert failed"
msgstr "revert gặp lỗi"
-#: builtin/revert.c:240
+#: builtin/revert.c:210
msgid "cherry-pick failed"
msgstr "cherry-pick gặp lỗi"
-#: builtin/rm.c:16
+#: builtin/rm.c:17
msgid "git rm [options] [--] <file>..."
msgstr "git rm [các-tùy-chọn] [--] <tập-tin>..."
-#: builtin/rm.c:64
+#: builtin/rm.c:65
msgid ""
"the following submodule (or one of its nested submodules)\n"
"uses a .git directory:"
@@ -8780,7 +9060,7 @@ msgstr[1] ""
"các mô-đun-con sau đây (hay một trong số mô-đun-con bên trong của nó)\n"
"dùng một thư mục .git:"
-#: builtin/rm.c:70
+#: builtin/rm.c:71
msgid ""
"\n"
"(use 'rm -rf' if you really want to remove it including all of its history)"
@@ -8789,7 +9069,7 @@ msgstr ""
"(dùng /\"rm -rf/\" nếu bạn thực sự muốn gỡ bỏ nó cùng với tất cả lịch sử của "
"chúng)"
-#: builtin/rm.c:230
+#: builtin/rm.c:231
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
@@ -8803,7 +9083,7 @@ msgstr[1] ""
"các tập tin sau đây có trạng thái khác biệt nội dung từ cả tập tin\n"
"và cả HEAD:"
-#: builtin/rm.c:235
+#: builtin/rm.c:236
msgid ""
"\n"
"(use -f to force removal)"
@@ -8811,13 +9091,13 @@ msgstr ""
"\n"
"(dùng -f để buộc gỡ bỏ)"
-#: builtin/rm.c:239
+#: builtin/rm.c:240
msgid "the following file has changes staged in the index:"
msgid_plural "the following files have changes staged in the index:"
msgstr[0] "tập tin sau đây có thay đổi trạng thái trong bảng mục lục:"
msgstr[1] "các tập tin sau đây có thay đổi trạng thái trong bảng mục lục:"
-#: builtin/rm.c:243 builtin/rm.c:254
+#: builtin/rm.c:244 builtin/rm.c:255
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
@@ -8825,38 +9105,38 @@ msgstr ""
"\n"
"(dùng tùy chọn --cached để giữ tập tin, hoặc -f để ép buộc gỡ bỏ)"
-#: builtin/rm.c:251
+#: builtin/rm.c:252
msgid "the following file has local modifications:"
msgid_plural "the following files have local modifications:"
msgstr[0] "tập tin sau đây có những thay đổi nội bộ:"
msgstr[1] "những tập tin sau đây có những thay đổi nội bộ:"
-#: builtin/rm.c:269
+#: builtin/rm.c:270
msgid "do not list removed files"
msgstr "không liệt kê các tập tin đã gỡ bỏ"
-#: builtin/rm.c:270
+#: builtin/rm.c:271
msgid "only remove from the index"
msgstr "chỉ gỡ bỏ từ mục lục"
-#: builtin/rm.c:271
+#: builtin/rm.c:272
msgid "override the up-to-date check"
msgstr "ghi đè lên kiểm tra cập nhật"
-#: builtin/rm.c:272
+#: builtin/rm.c:273
msgid "allow recursive removal"
msgstr "cho phép gỡ bỏ đệ qui"
-#: builtin/rm.c:274
+#: builtin/rm.c:275
msgid "exit with a zero status even if nothing matched"
msgstr "thoát ra với trạng thái khác không thậm chí nếu không có gì khớp"
-#: builtin/rm.c:345
+#: builtin/rm.c:336
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "không thể gỡ bỏ “%s” một cách đệ qui mà không có tùy chọn -r"
-#: builtin/rm.c:384
+#: builtin/rm.c:375
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: không thể gỡ bỏ %s"
@@ -8870,23 +9150,23 @@ msgstr "git shortlog [các-tùy-chọn] [<vùng-xét-duyệt>] [[--] [<đường
msgid "Missing author: %s"
msgstr "Thiếu tên tác giả: %s"
-#: builtin/shortlog.c:228
+#: builtin/shortlog.c:230
msgid "sort output according to the number of commits per author"
msgstr "sắp xếp kết xuất tuân theo số lượng chuyển giao trên mỗi tác giả"
-#: builtin/shortlog.c:230
+#: builtin/shortlog.c:232
msgid "Suppress commit descriptions, only provides commit count"
msgstr "Chặn mọi mô tả lần chuyển giao, chỉ đưa ra số lượng lần chuyển giao"
-#: builtin/shortlog.c:232
+#: builtin/shortlog.c:234
msgid "Show the email address of each author"
msgstr "Hiển thị thư điện tử cho từng tác giả"
-#: builtin/shortlog.c:233
+#: builtin/shortlog.c:235
msgid "w[,i1[,i2]]"
msgstr "w[,i1[,i2]]"
-#: builtin/shortlog.c:234
+#: builtin/shortlog.c:236
msgid "Linewrap output"
msgstr "Ngắt dòng khi quá dài"
@@ -8972,11 +9252,11 @@ msgstr "hiển thị <n> các mục “ref-log” gần nhất kể từ nền (
#: builtin/show-ref.c:10
msgid ""
-"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash"
-"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
+"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
msgstr ""
-"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash"
-"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [mẫu*] "
+"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [mẫu*] "
#: builtin/show-ref.c:11
msgid "git show-ref --exclude-existing[=pattern] < ref-list"
@@ -8996,24 +9276,24 @@ msgstr ""
"việc kiểm tra tham chiếu chính xác, đòi hỏi chính xác đường dẫn tham chiếu "
"(ref)"
-#: builtin/show-ref.c:173 builtin/show-ref.c:176
+#: builtin/show-ref.c:173 builtin/show-ref.c:175
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "hiển thị tham chiếu HEAD, ngay cả khi nó đã được lọc ra"
-#: builtin/show-ref.c:178
+#: builtin/show-ref.c:177
msgid "dereference tags into object IDs"
msgstr "bãi bỏ tham chiếu các thẻ thành ra các ID đối tượng"
-#: builtin/show-ref.c:180
+#: builtin/show-ref.c:179
msgid "only show SHA1 hash using <n> digits"
msgstr "chỉ hiển thị mã băm SHA1 sử dụng <n> chữ số"
-#: builtin/show-ref.c:184
+#: builtin/show-ref.c:183
msgid "do not print results to stdout (useful with --verify)"
msgstr ""
"không hiển thị kết quả ra đầu ra chuẩn (stdout) (chỉ hữu dụng với --verify)"
-#: builtin/show-ref.c:186
+#: builtin/show-ref.c:185
msgid "show refs from stdin that aren't in local repository"
msgstr ""
"hiển thị các tham chiếu (refs) từ đầu vào tiêu chuẩn (stdin) cái mà không ở "
@@ -9040,11 +9320,11 @@ msgstr "xóa tham chiếu (ref) tượng trưng"
msgid "shorten ref output"
msgstr "làm ngắn kết xuất ref (tham chiếu)"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254
msgid "reason"
msgstr "lý do"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254
msgid "reason of the update"
msgstr "lý do cập nhật"
@@ -9209,187 +9489,199 @@ msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao"
msgid "print only tags of the object"
msgstr "chỉ hiển thị các thẻ của đối tượng"
-#: builtin/tag.c:504
+#: builtin/tag.c:501
msgid "--column and -n are incompatible"
msgstr "--column và -n xung khắc nhau"
-#: builtin/tag.c:521
+#: builtin/tag.c:518
msgid "-n option is only allowed with -l."
msgstr "tùy chọn -n chỉ cho phép dùng với -l."
-#: builtin/tag.c:523
+#: builtin/tag.c:520
msgid "--contains option is only allowed with -l."
msgstr "tùy chọn --contains chỉ cho phép dùng với -l."
-#: builtin/tag.c:525
+#: builtin/tag.c:522
msgid "--points-at option is only allowed with -l."
msgstr "tùy chọn --points-at chỉ cho phép dùng với -l."
-#: builtin/tag.c:533
+#: builtin/tag.c:530
msgid "only one -F or -m option is allowed."
msgstr "chỉ có một tùy chọn -F hoặc -m là được phép."
-#: builtin/tag.c:553
+#: builtin/tag.c:550
msgid "too many params"
msgstr "quá nhiều đối số"
-#: builtin/tag.c:559
+#: builtin/tag.c:556
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "“%s” không phải thẻ hợp lệ."
-#: builtin/tag.c:564
+#: builtin/tag.c:561
#, c-format
msgid "tag '%s' already exists"
msgstr "Thẻ “%s” đã tồn tại rồi"
-#: builtin/tag.c:582
+#: builtin/tag.c:579
#, c-format
msgid "%s: cannot lock the ref"
msgstr "%s: không thể khóa ref (tham chiếu)"
-#: builtin/tag.c:584
+#: builtin/tag.c:581
#, c-format
msgid "%s: cannot update the ref"
msgstr "%s: không thể cập nhật ref (tham chiếu)"
-#: builtin/tag.c:586
+#: builtin/tag.c:583
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Đã cập nhật thẻ “%s” (trước là %s)\n"
-#: builtin/update-index.c:401
+#: builtin/update-index.c:402
msgid "git update-index [options] [--] [<file>...]"
msgstr "git update-index [các-tùy-chọn] [<tập-tin>...]"
-#: builtin/update-index.c:718
+#: builtin/update-index.c:720
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:721
+#: builtin/update-index.c:723
msgid "refresh: ignore submodules"
msgstr "refresh: lờ đi mô-đun-con"
-#: builtin/update-index.c:724
+#: builtin/update-index.c:726
msgid "do not ignore new files"
msgstr "không bỏ qua các tập tin mới tạo"
-#: builtin/update-index.c:726
+#: builtin/update-index.c:728
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:728
+#: builtin/update-index.c:730
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:730
+#: builtin/update-index.c:732
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:733
+#: builtin/update-index.c:735
msgid "refresh stat information"
msgstr "lấy lại thông tin thống kê"
-#: builtin/update-index.c:737
+#: builtin/update-index.c:739
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:741
+#: builtin/update-index.c:743
msgid "<mode> <object> <path>"
msgstr "<mode> <đối tượng> <đường dẫn>"
-#: builtin/update-index.c:742
+#: builtin/update-index.c:744
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:746
+#: builtin/update-index.c:748
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/update-index.c:747
+#: builtin/update-index.c:749
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/update-index.c:751
+#: builtin/update-index.c:753
msgid "mark files as \"not changing\""
msgstr "Đánh dấu các tập tin là \"không thay đổi\""
-#: builtin/update-index.c:754
+#: builtin/update-index.c:756
msgid "clear assumed-unchanged bit"
msgstr "xóa bít assumed-unchanged"
-#: builtin/update-index.c:757
+#: builtin/update-index.c:759
msgid "mark files as \"index-only\""
msgstr "đánh dấu các tập tin là “chỉ-đọc”"
-#: builtin/update-index.c:760
+#: builtin/update-index.c:762
msgid "clear skip-worktree bit"
msgstr "xóa bít skip-worktree"
-#: builtin/update-index.c:763
+#: builtin/update-index.c:765
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:765
+#: builtin/update-index.c:767
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:767
+#: builtin/update-index.c:769
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:769
+#: builtin/update-index.c:771
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:773
+#: builtin/update-index.c:775
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:777
+#: builtin/update-index.c:779
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:781
+#: builtin/update-index.c:783
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:785
+#: builtin/update-index.c:787
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:788
+#: builtin/update-index.c:790
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:790
+#: builtin/update-index.c:792
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:794
+#: builtin/update-index.c:796
msgid "write index in this format"
msgstr "ghi mục lục ở định dạng này"
-#: builtin/update-ref.c:7
+#: builtin/update-ref.c:9
msgid "git update-ref [options] -d <refname> [<oldval>]"
msgstr "git update-ref [các-tùy-chọn] -d <refname> [<biến-cũ>]"
-#: builtin/update-ref.c:8
+#: builtin/update-ref.c:10
msgid "git update-ref [options] <refname> <newval> [<oldval>]"
msgstr "git update-ref [các-tùy-chọn] <refname> <biến-mới> [<biến-cũ>]"
-#: builtin/update-ref.c:19
+#: builtin/update-ref.c:11
+msgid "git update-ref [options] --stdin [-z]"
+msgstr "git update-ref [các-tùy-chọn] --stdin [-z]"
+
+#: builtin/update-ref.c:255
msgid "delete the reference"
msgstr "xóa tham chiếu"
-#: builtin/update-ref.c:21
+#: builtin/update-ref.c:257
msgid "update <refname> not the one it points to"
msgstr "cập nhật <tên-tham-chiếu> không phải cái nó chỉ tới"
+#: builtin/update-ref.c:258
+msgid "stdin has NUL-terminated arguments"
+msgstr "đầu vào tiêu chuẩn có các đối số được chấm dứt bởi NUL"
+
+#: builtin/update-ref.c:259
+msgid "read updates from stdin"
+msgstr "đọc cập nhật từ đầu vào tiêu chuẩn"
+
#: builtin/update-server-info.c:6
msgid "git update-server-info [--force]"
msgstr "git update-server-info [--force]"
@@ -9444,23 +9736,23 @@ msgstr ""
"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ể."
-#: parse-options.h:144
+#: parse-options.h:146
msgid "expiry date"
msgstr "ngày hết hạn"
-#: parse-options.h:159
+#: parse-options.h:161
msgid "no-op (backward compatibility)"
msgstr "no-op (tương thích ngược)"
-#: parse-options.h:236
+#: parse-options.h:238
msgid "be more verbose"
msgstr "chi tiết hơn nữa"
-#: parse-options.h:238
+#: parse-options.h:240
msgid "be more quiet"
msgstr "im lặng hơn nữa"
-#: parse-options.h:244
+#: parse-options.h:246
msgid "use <n> digits to display SHA-1s"
msgstr "sử dụng <n> chữ số để hiển thị SHA-1s"
@@ -9669,7 +9961,7 @@ msgstr ""
#: git-am.sh:725
msgid "Patch does not have a valid e-mail address."
-msgstr "Miếng vá không có địa chỉ e-mail hợp lệ."
+msgstr "Miếng vá không có địa chỉ thư điện tử hợp lệ."
#: git-am.sh:772
msgid "cannot be interactive without stdin connected to a terminal."
@@ -9686,8 +9978,8 @@ msgstr "Thân của lần chuyển giao (commit) là:"
#: git-am.sh:783
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
msgstr ""
-"Áp dụng? đồng ý [y]/không [n]/chỉnh sửa [e]/hiển thị miếng [v]á/đồng ý tất "
-"cả [a] "
+"Áp dụng? đồng ý [y]/khô[n]g/chỉnh sửa [e]/hiển thị miếng [v]á/đồng ý tất cả "
+"[a] "
#: git-am.sh:819
#, sh-format
@@ -9720,7 +10012,7 @@ msgstr "Không thay đổi gì cả -- Miếng vá đã được áp dụng rồ
#: git-am.sh:874
#, sh-format
msgid "Patch failed at $msgnum $FIRSTLINE"
-msgstr "Vá gặp lỗi tại $msgnum $FIRSTLINE"
+msgstr "Gặp lỗi khi vá tại $msgnum $FIRSTLINE"
#: git-am.sh:877
#, sh-format
@@ -9910,7 +10202,7 @@ msgid "Pull is not possible because you have unmerged files."
msgstr ""
"Full là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
-#: git-pull.sh:203
+#: git-pull.sh:223
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 "
@@ -9920,7 +10212,7 @@ msgstr ""
#. The working tree and the index file is still based on the
#. $orig_head commit, but we are merging into $curr_head.
#. First update the working tree to match $curr_head.
-#: git-pull.sh:235
+#: git-pull.sh:255
#, sh-format
msgid ""
"Warning: fetch updated the current branch head.\n"
@@ -9931,11 +10223,11 @@ msgstr ""
"Cảnh báo: đang fast-forward cây làm việc của bạn từ\n"
"Cảnh báo: commit $orig_head."
-#: git-pull.sh:260
+#: git-pull.sh:280
msgid "Cannot merge multiple branches into empty head"
msgstr "Không thể hòa trộn nhiều nhánh và trong một head trống rỗng"
-#: git-pull.sh:264
+#: git-pull.sh:284
msgid "Cannot rebase onto multiple branches"
msgstr "Không thể thực hiện lệnh rebase (cơ cấu lại) trên nhiều nhánh"
@@ -9972,35 +10264,35 @@ msgstr ""
"Bạn có thể chạy lệnh \"git stash pop\" hay \"git stash drop\" bất kỳ lúc "
"nào.\n"
-#: git-rebase.sh:190
+#: git-rebase.sh:199
msgid "The pre-rebase hook refused to rebase."
msgstr "Móc (hook) pre-rebase từ chối rebase."
-#: git-rebase.sh:195
+#: git-rebase.sh:204
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr ""
"Hình như đang trong quá trình thực hiện lệnh git-am. Không thể chạy lệnh "
"rebase."
-#: git-rebase.sh:329
+#: git-rebase.sh:338
msgid "The --exec option must be used with the --interactive option"
msgstr "Tùy chọn --exec phải được sử dụng cùng với tùy chọn --interactive"
-#: git-rebase.sh:334
+#: git-rebase.sh:343
msgid "No rebase in progress?"
msgstr "Không có tiến trình rebase nào phải không?"
-#: git-rebase.sh:345
+#: git-rebase.sh:354
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"Hành động “--edit-todo” chỉ có thể dùng trong quá trình “rebase” (sửa lịch "
"sử) tương tác."
-#: git-rebase.sh:352
+#: git-rebase.sh:361
msgid "Cannot read HEAD"
msgstr "Không thể đọc HEAD"
-#: git-rebase.sh:355
+#: git-rebase.sh:364
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -10008,12 +10300,12 @@ msgstr ""
"Bạn phải sửa tất cả các lần hòa trộn xung đột và sau\n"
"đó đánh dấu chúng là cần xử lý sử dụng lệnh git add"
-#: git-rebase.sh:373
+#: git-rebase.sh:382
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Không thể quay trở lại $head_name"
-#: git-rebase.sh:392
+#: git-rebase.sh:401
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -10036,66 +10328,66 @@ msgstr ""
"\n"
"TÔI: là lệnh bạn vừa gọi!"
-#: git-rebase.sh:437
+#: git-rebase.sh:446
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "thượng nguồn không hợp lệ $upstream_name"
-#: git-rebase.sh:461
+#: git-rebase.sh:470
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: ở đây có nhiều hơn một nền móng hòa trộn"
-#: git-rebase.sh:464 git-rebase.sh:468
+#: git-rebase.sh:473 git-rebase.sh:477
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: ở đây không có nền móng hòa trộn nào"
-#: git-rebase.sh:473
+#: git-rebase.sh:482
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Không chỉ đến một lần chuyển giao (commit) không hợp lệ: $onto_name"
-#: git-rebase.sh:496
+#: git-rebase.sh:505
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "nghiêm trọng: không có nhánh như thế: $branch_name"
-#: git-rebase.sh:519
+#: git-rebase.sh:528
msgid "Cannot autostash"
msgstr "Không thể autostash"
-#: git-rebase.sh:524
+#: git-rebase.sh:533
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Đã tạo autostash: $stash_abbrev"
-#: git-rebase.sh:528
+#: git-rebase.sh:537
msgid "Please commit or stash them."
msgstr "Xin hãy commit hoặc tạm cất (stash) chúng."
-#: git-rebase.sh:548
+#: git-rebase.sh:557
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "Nhánh hiện tại $branch_name đã được cập nhật rồi."
-#: git-rebase.sh:552
+#: git-rebase.sh:561
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "Nhánh hiện tại $branch_name đã được cập nhật rồi, lệnh rebase ép buộc."
-#: git-rebase.sh:563
+#: git-rebase.sh:572
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Thay đổi từ $mb thành $onto:"
#. Detach HEAD and reset the tree
-#: git-rebase.sh:572
+#: git-rebase.sh:581
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Trước tiên, di chuyển head để xem lại các công việc trên đỉnh của nó..."
-#: git-rebase.sh:582
+#: git-rebase.sh:591
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "Fast-forward $branch_name thành $onto_name."
@@ -10144,7 +10436,7 @@ msgstr "Không thể cập nhật $ref_stash với $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:241
+#: git-stash.sh:237
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
@@ -10154,99 +10446,85 @@ msgstr ""
" Để dùng thông điệp có chứa -- ở đầu, sử dụng git stash save -- \"$option"
"\""
-#: git-stash.sh:262
+#: git-stash.sh:258
msgid "No local changes to save"
msgstr "Không có thay đổi nội bộ nào được ghi lại"
-#: git-stash.sh:268
-msgid ""
-"The following untracked files would NOT be saved but need to be removed by "
-"stash save:"
-msgstr ""
-"Các tập tin chưa được theo dõi sau đây KHÔNG được ghi lại nhưng cần được gỡ "
-"bỏ bởi việc ghi lại stash:"
-
-#: git-stash.sh:270
-msgid ""
-"Aborting. Consider using either the --force or --include-untracked option."
-msgstr ""
-"Bãi bỏ. Cân nhắc dùng một trong hai tùy chọn --force và --include-untracked."
-
-#: git-stash.sh:274
+#: git-stash.sh:262
msgid "Cannot initialize stash"
msgstr "Không thể khởi tạo stash"
-#: git-stash.sh:278
+#: git-stash.sh:266
msgid "Cannot save the current status"
msgstr "Không thể ghi lại trạng thái hiện hành"
-#: git-stash.sh:296
+#: git-stash.sh:284
msgid "Cannot remove worktree changes"
msgstr "Không thể gỡ bỏ các thay đổi cây-làm-việc"
-#: git-stash.sh:395
+#: git-stash.sh:383
msgid "No stash found."
msgstr "Không tìm thấy stash nào."
-#: git-stash.sh:402
+#: git-stash.sh:390
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Chỉ ra quá nhiều điểm xét duyệt: $REV"
-#: git-stash.sh:408
+#: git-stash.sh:396
#, sh-format
msgid "$reference is not valid reference"
msgstr "$reference không phải là tham chiếu hợp lệ"
-#: git-stash.sh:436
+#: git-stash.sh:424
#, sh-format
msgid "'$args' is not a stash-like commit"
-msgstr "”$args” không phải là lần chuyển giao (commit) giống-stash"
+msgstr "”$args” không phải là lần chuyển giao (commit) kiểu-stash"
-#: git-stash.sh:447
+#: git-stash.sh:435
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "”$args” không phải tham chiếu đến stash"
-#: git-stash.sh:455
+#: git-stash.sh:443
msgid "unable to refresh index"
msgstr "không thể làm tươi mới bảng mục lục"
-#: git-stash.sh:459
+#: git-stash.sh:447
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:467
+#: git-stash.sh:455
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:469
+#: git-stash.sh:457
msgid "Could not save index tree"
msgstr "Không thể ghi lại cây chỉ mục"
-#: git-stash.sh:503
+#: git-stash.sh:491
msgid "Cannot unstage modified files"
msgstr "Không thể bỏ trạng thía của các tập tin đã được sửa chữa"
-#: git-stash.sh:518
+#: git-stash.sh:506
msgid "Index was not unstashed."
msgstr "Bảng mục lục đã không được bỏ stash."
-#: git-stash.sh:535
+#: git-stash.sh:523
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Đã xóa ${REV} ($s)"
-#: git-stash.sh:536
+#: git-stash.sh:524
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Không thể xóa bỏ mục stash"
-#: git-stash.sh:543
+#: git-stash.sh:531
msgid "No branch name specified"
msgstr "Chưa chỉ ra tên của nhánh"
-#: git-stash.sh:615
+#: git-stash.sh:603
msgid "(To restore them type \"git stash apply\")"
msgstr "(Để phục hồi lại chúng hãy gõ \"git stash apply\")"
@@ -10424,7 +10702,7 @@ msgstr ""
#: git-submodule.sh:683
#, sh-format
msgid "Cleared directory '$displaypath'"
-msgstr "Đã tạo thư mục '$displaypath'"
+msgstr "Đã tạo thư mục “$displaypath”"
#: git-submodule.sh:684
#, sh-format
@@ -10521,52 +10799,63 @@ 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"
#. unexpected type
-#: git-submodule.sh:1066
+#: git-submodule.sh:1073
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "chế độ không như mong chờ $mod_dst"
-#: git-submodule.sh:1086
+#: git-submodule.sh:1093
#, 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 (commit) $sha1_src"
-#: git-submodule.sh:1089
+#: git-submodule.sh:1096
#, 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 (commit) $sha1_dst"
-#: git-submodule.sh:1092
+#: git-submodule.sh:1099
#, 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 (commit) "
"$sha1_src và $sha1_dst"
-#: git-submodule.sh:1117
+#: git-submodule.sh:1124
msgid "blob"
msgstr "blob"
-#: git-submodule.sh:1155
-msgid "Submodules changed but not updated:"
-msgstr "Những mô-đun-con đã bị thay đổi nhưng chưa được cập nhật:"
-
-#: git-submodule.sh:1157
-msgid "Submodule changes to be committed:"
-msgstr "Những mô-đun-con thay đổi đã được chuyển giao (commit):"
-
-#: git-submodule.sh:1242
+#: git-submodule.sh:1238
#, 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:1306
+#: git-submodule.sh:1302
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Url Mô-đun-con đồng bộ hóa cho “$displaypath”"
+#~ msgid "done\n"
+#~ msgstr "xong\n"
+
+#~ msgid "input paths are terminated by a null character"
+#~ msgstr "các đường dẫn được ngăn cách bởi ký tự null"
+
+#~ msgid ""
+#~ "The following untracked files would NOT be saved but need to be removed "
+#~ "by stash save:"
+#~ msgstr ""
+#~ "Các tập tin chưa được theo dõi sau đây KHÔNG được ghi lại nhưng cần được "
+#~ "gỡ bỏ bởi việc ghi lại stash:"
+
+#~ msgid ""
+#~ "Aborting. Consider using either the --force or --include-untracked option."
+#~ msgstr ""
+#~ "Bãi bỏ. Cân nhắc dùng một trong hai tùy chọn --force và --include-"
+#~ "untracked."
+
#~ msgid " (fix conflicts and then run \"git am --resolved\")"
#~ msgstr " (sửa các xung đột và sau đó chạy lệnh \"git am --resolved\")"
@@ -10688,9 +10977,6 @@ msgstr "Url Mô-đun-con đồng bộ hóa cho “$displaypath”"
#~ msgid "-B cannot be used with -b"
#~ msgstr "tùy chọn -B không thể dùng -b"
-#~ msgid "--patch is incompatible with all other options"
-#~ msgstr "--patch xung khắc với tất cả các tùy chọn khác"
-
#~ msgid "--detach cannot be used with -b/-B/--orphan"
#~ msgstr "--detach không thể được sử dụng với tùy chọn -b/-B/--orphan"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1a042af11..b701086e3 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2013-08-06 14:10+0800\n"
-"PO-Revision-Date: 2013-08-06 14:45+0800\n"
+"POT-Creation-Date: 2013-11-02 08:06+0800\n"
+"PO-Revision-Date: 2013-11-02 08:14+0800\n"
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/gotgit/git/>\n"
"Language: zh_CN\n"
@@ -60,71 +60,76 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <版本库> [--exec <命令>] --list"
-#: archive.c:323
+#: archive.c:242 builtin/add.c:240 builtin/add.c:556 builtin/rm.c:328
+#, c-format
+msgid "pathspec '%s' did not match any files"
+msgstr "路径规则 '%s' 未匹配任何文件"
+
+#: archive.c:327
msgid "fmt"
msgstr "格式"
-#: archive.c:323
+#: archive.c:327
msgid "archive format"
msgstr "归档格式"
-#: archive.c:324 builtin/log.c:1173
+#: archive.c:328 builtin/log.c:1193
msgid "prefix"
msgstr "前缀"
-#: archive.c:325
+#: archive.c:329
msgid "prepend prefix to each pathname in the archive"
msgstr "为归档中每个路径名加上前缀"
-#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2292
-#: builtin/blame.c:2293 builtin/config.c:56 builtin/fast-export.c:673
-#: builtin/fast-export.c:675 builtin/grep.c:714 builtin/hash-object.c:77
-#: builtin/ls-files.c:496 builtin/ls-files.c:499 builtin/notes.c:408
-#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:152
+#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2264
+#: builtin/blame.c:2265 builtin/config.c:58 builtin/fast-export.c:680
+#: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77
+#: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408
+#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154
msgid "file"
msgstr "文件"
-#: archive.c:327 builtin/archive.c:89
+#: archive.c:331 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "归档写入此文件"
-#: archive.c:329
+#: archive.c:333
msgid "read .gitattributes in working directory"
msgstr "读取工作区中的 .gitattributes"
-#: archive.c:330
+#: archive.c:334
msgid "report archived files on stderr"
msgstr "在标准错误上报告归档文件"
-#: archive.c:331
+#: archive.c:335
msgid "store only"
msgstr "只存储"
-#: archive.c:332
+#: archive.c:336
msgid "compress faster"
msgstr "压缩速度更快"
-#: archive.c:340
+#: archive.c:344
msgid "compress better"
msgstr "压缩效果更好"
-#: archive.c:343
+#: archive.c:347
msgid "list supported archive formats"
msgstr "列出支持的归档格式"
-#: archive.c:345 builtin/archive.c:90 builtin/clone.c:85
+#: archive.c:349 builtin/archive.c:90 builtin/clone.c:84
msgid "repo"
msgstr "版本库"
-#: archive.c:346 builtin/archive.c:91
+#: archive.c:350 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "从远程版本库（<版本库>）提取归档文件"
-#: archive.c:347 builtin/archive.c:92 builtin/notes.c:487
+#: archive.c:351 builtin/archive.c:92 builtin/notes.c:487
msgid "command"
msgstr "命令"
-#: archive.c:348 builtin/archive.c:93
+#: archive.c:352 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "远程 git-upload-archive 命令的路径"
@@ -205,17 +210,17 @@ msgstr "一个分支名 '%s' 已经存在。"
msgid "Cannot force update the current branch."
msgstr "无法强制更新当前分支。"
-#: branch.c:216
+#: branch.c:215
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支。"
-#: branch.c:218
+#: branch.c:217
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "请求的上游分支 '%s' 不存在"
-#: branch.c:220
+#: branch.c:219
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -233,26 +238,26 @@ msgstr ""
"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n"
"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
-#: branch.c:265
+#: branch.c:264
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "不是一个有效的对象名：'%s'。"
-#: branch.c:285
+#: branch.c:284
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "歧义的对象名：'%s'。"
-#: branch.c:290
+#: branch.c:289
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "无效的分支点：'%s'。"
-#: branch.c:296
+#: branch.c:295
msgid "Failed to lock ref for update"
msgstr "无法为更新锁定引用"
-#: branch.c:314
+#: branch.c:313
msgid "Failed to write ref"
msgstr "不能写引用"
@@ -266,7 +271,7 @@ msgstr "'%s' 不像是一个 v2 版本的包文件"
msgid "unrecognized header: %s%s (%d)"
msgstr "未能识别的包头：%s%s (%d)"
-#: bundle.c:89 builtin/commit.c:697
+#: bundle.c:89 builtin/commit.c:706
#, c-format
msgid "could not open '%s'"
msgstr "不能打开 '%s'"
@@ -275,9 +280,9 @@ msgstr "不能打开 '%s'"
msgid "Repository lacks these prerequisite commits:"
msgstr "版本库缺少这些必备的提交："
-#: bundle.c:164 sequencer.c:661 sequencer.c:1111 builtin/log.c:331
-#: builtin/log.c:801 builtin/log.c:1399 builtin/log.c:1625 builtin/merge.c:364
-#: builtin/shortlog.c:156
+#: bundle.c:164 sequencer.c:662 sequencer.c:1112 builtin/log.c:332
+#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:364
+#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr "版本遍历设置失败"
@@ -303,7 +308,7 @@ msgstr[1] "这个包需要 %d 个引用："
msgid "rev-list died"
msgstr "rev-list 终止"
-#: bundle.c:300 builtin/log.c:1310 builtin/shortlog.c:259
+#: bundle.c:300 builtin/log.c:1329 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr "未能识别的参数：%s"
@@ -455,7 +460,7 @@ msgstr ""
"发现配置变量 'diff.dirstat' 中的错误：\n"
"%s"
-#: diff.c:3487
+#: diff.c:3490
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -464,7 +469,7 @@ msgstr ""
"无法解析 --dirstat/-X 选项的参数：\n"
"%s"
-#: diff.c:3501
+#: diff.c:3504
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "无法解析 --submodule 选项的参数：'%s'"
@@ -491,17 +496,17 @@ msgstr "不能创建临时文件 '%s'：%s"
msgid "failed writing detached signature to '%s': %s"
msgstr "无法将分离式签名写入 '%s'：%s"
-#: grep.c:1623
+#: grep.c:1695
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s'：无法读取 %s"
-#: grep.c:1640
+#: grep.c:1712
#, c-format
msgid "'%s': %s"
msgstr "'%s'：%s"
-#: grep.c:1651
+#: grep.c:1723
#, c-format
msgid "'%s': short read %s"
msgstr "'%s'：读取不完整 %s"
@@ -574,8 +579,8 @@ msgstr "%s：%s - %s"
msgid "failed to read the cache"
msgstr "无法读取缓存"
-#: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566
-#: builtin/clone.c:656
+#: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559
+#: builtin/clone.c:655
msgid "unable to write new index file"
msgstr "无法写新的索引文件"
@@ -624,7 +629,7 @@ msgstr "不能读取对象 %s '%s'"
msgid "blob expected for %s '%s'"
msgstr "%s '%s' 应为数据（blob）对象"
-#: merge-recursive.c:774 builtin/clone.c:312
+#: merge-recursive.c:774 builtin/clone.c:311
#, c-format
msgid "failed to open '%s'"
msgstr "无法打开 '%s'"
@@ -759,7 +764,7 @@ msgstr "略过 %s（已经做过相同合并）"
msgid "Auto-merging %s"
msgstr "自动合并 %s"
-#: merge-recursive.c:1634 git-submodule.sh:1118
+#: merge-recursive.c:1634 git-submodule.sh:1125
msgid "submodule"
msgstr "子模组"
@@ -854,59 +859,122 @@ msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"
msgid "Bad %s value: '%s'"
msgstr "坏的 %s 值：'%s'"
-#: object.c:204
+#: object.c:202
#, c-format
msgid "unable to parse object: %s"
msgstr "不能解析对象：%s"
-#: parse-options.c:489
+#: parse-options.c:537
msgid "..."
msgstr "..."
-#: parse-options.c:507
+#: parse-options.c:555
#, c-format
msgid "usage: %s"
msgstr "用法：%s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:511
+#: parse-options.c:559
#, c-format
msgid " or: %s"
msgstr " 或：%s"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: parse-options.c:514
+#: parse-options.c:562
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:548
+#: parse-options.c:596
msgid "-NUM"
msgstr "-数字"
-#: pathspec.c:83
+#: pathspec.c:118
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr "全局的 'glob' 和 'noglob' 路径规则设置不兼容"
+
+#: pathspec.c:128
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr "全局的 'literal' 路径规则设置和其它的全局路径规则设置不兼容"
+
+#: pathspec.c:158
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "路径规则包含无效的神奇前缀"
+
+#: pathspec.c:164
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "在路径规则 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
+
+#: pathspec.c:168
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "路径规则 '%s' 的神奇前缀结尾少了一个 ')'"
+
+#: pathspec.c:186
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "路径规则 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
+
+#: pathspec.c:211
#, c-format
-msgid "Path '%s' is in submodule '%.*s'"
-msgstr "路径 '%s' 属于模组 '%.*s'"
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s：'literal' 和 'glob' 不兼容"
-#: pathspec.c:99
+#: pathspec.c:222
#, c-format
-msgid "'%s' is beyond a symbolic link"
-msgstr "'%s' 位于符号链接中"
+msgid "%s: '%s' is outside repository"
+msgstr "%s：'%s' 在版本库之外"
-#: remote.c:1788
+#: pathspec.c:278
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "路径规则 '%s' 在子模组 '%.*s' 中"
+
+#.
+#. * We may want to substitute "this command" with a command
+#. * name. E.g. when add--interactive dies when running
+#. * "checkout -p"
+#.
+#: pathspec.c:340
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr "%s：路径规则神奇前缀不被此命令支持：%s"
+
+#: pathspec.c:415
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "路径规则 '%s' 位于符号链接中"
+
+#: remote.c:1833
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"
+
+#: remote.c:1837
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"
+
+#: remote.c:1840
+#, c-format
+msgid "Your branch is up-to-date with '%s'.\n"
+msgstr "您的分支与上游分支 '%s' 一致。\n"
+
+#: remote.c:1844
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
-#: remote.c:1794
+#: remote.c:1850
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " （使用 \"git push\" 来发布您的本地提交）\n"
-#: remote.c:1797
+#: remote.c:1853
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -915,11 +983,11 @@ msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
# 译者：注意保持前导空格
-#: remote.c:1805
+#: remote.c:1861
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " （使用 \"git pull\" 来更新您的本地分支）\n"
-#: remote.c:1808
+#: remote.c:1864
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -935,7 +1003,7 @@ msgstr[1] ""
"并且分别有 %d 和 %d 处不同的提交。\n"
# 译者：注意保持前导空格
-#: remote.c:1818
+#: remote.c:1874
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " （使用 \"git pull\" 来合并远程分支）\n"
@@ -977,7 +1045,7 @@ msgstr ""
"冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n"
"对修正后的文件做标记，然后用 'git commit' 提交"
-#: sequencer.c:245 sequencer.c:869 sequencer.c:952
+#: sequencer.c:245 sequencer.c:870 sequencer.c:953
#, c-format
msgid "Could not write to %s"
msgstr "不能写入 %s"
@@ -1000,197 +1068,197 @@ msgid "Commit your changes or stash them to proceed."
msgstr "提交您的修改或保存进度后再继续。"
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:324
+#: sequencer.c:325
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s：无法写入新索引文件"
-#: sequencer.c:355
+#: sequencer.c:356
msgid "Could not resolve HEAD commit\n"
msgstr "不能解析 HEAD 提交\n"
-#: sequencer.c:377
+#: sequencer.c:378
msgid "Unable to update cache tree\n"
msgstr "不能更新缓存\n"
-#: sequencer.c:422
+#: sequencer.c:423
#, c-format
msgid "Could not parse commit %s\n"
msgstr "不能解析提交 %s\n"
-#: sequencer.c:427
+#: sequencer.c:428
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr "不能解析父提交 %s\n"
-#: sequencer.c:493
+#: sequencer.c:494
msgid "Your index file is unmerged."
msgstr "您的索引文件未完成合并。"
-#: sequencer.c:512
+#: sequencer.c:513
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
-#: sequencer.c:520
+#: sequencer.c:521
#, c-format
msgid "Commit %s does not have parent %d"
msgstr "提交 %s 没有父提交 %d"
-#: sequencer.c:524
+#: sequencer.c:525
#, c-format
msgid "Mainline was specified but commit %s is not a merge."
msgstr "指定了主线但提交 %s 不是一个合并。"
#. TRANSLATORS: The first %s will be "revert" or
#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:537
+#: sequencer.c:538
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s：不能解析父提交 %s"
-#: sequencer.c:541
+#: sequencer.c:542
#, c-format
msgid "Cannot get commit message for %s"
msgstr "不能得到 %s 的提交说明"
-#: sequencer.c:627
+#: sequencer.c:628
#, c-format
msgid "could not revert %s... %s"
msgstr "不能还原 %s... %s"
-#: sequencer.c:628
+#: sequencer.c:629
#, c-format
msgid "could not apply %s... %s"
msgstr "不能应用 %s... %s"
-#: sequencer.c:664
+#: sequencer.c:665
msgid "empty commit set passed"
msgstr "提供了空的提交集"
-#: sequencer.c:672
+#: sequencer.c:673
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s：无法读取索引"
-#: sequencer.c:677
+#: sequencer.c:678
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s：无法刷新索引"
-#: sequencer.c:735
+#: sequencer.c:736
#, c-format
msgid "Cannot %s during a %s"
msgstr "无法 %s 在一个 %s 过程中"
-#: sequencer.c:757
+#: sequencer.c:758
#, c-format
msgid "Could not parse line %d."
msgstr "不能解析第 %d 行。"
-#: sequencer.c:762
+#: sequencer.c:763
msgid "No commits parsed."
msgstr "没有提交被解析。"
-#: sequencer.c:775
+#: sequencer.c:776
#, c-format
msgid "Could not open %s"
msgstr "不能打开 %s"
-#: sequencer.c:779
+#: sequencer.c:780
#, c-format
msgid "Could not read %s."
msgstr "不能读取 %s。"
-#: sequencer.c:786
+#: sequencer.c:787
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr "无用的指令表单：%s"
-#: sequencer.c:814
+#: sequencer.c:815
#, c-format
msgid "Invalid key: %s"
msgstr "无效键名：%s"
-#: sequencer.c:817
+#: sequencer.c:818
#, c-format
msgid "Invalid value for %s: %s"
msgstr "%s 的值无效：%s"
-#: sequencer.c:829
+#: sequencer.c:830
#, c-format
msgid "Malformed options sheet: %s"
msgstr "非法的选项表单：%s"
-#: sequencer.c:850
+#: sequencer.c:851
msgid "a cherry-pick or revert is already in progress"
msgstr "一个拣选或还原操作已在进行"
-#: sequencer.c:851
+#: sequencer.c:852
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:855
+#: sequencer.c:856
#, c-format
msgid "Could not create sequencer directory %s"
msgstr "不能创建序列目录 %s"
-#: sequencer.c:871 sequencer.c:956
+#: sequencer.c:872 sequencer.c:957
#, c-format
msgid "Error wrapping up %s."
msgstr "错误收尾 %s。"
-#: sequencer.c:890 sequencer.c:1024
+#: sequencer.c:891 sequencer.c:1025
msgid "no cherry-pick or revert in progress"
msgstr "拣选或还原操作并未进行"
-#: sequencer.c:892
+#: sequencer.c:893
msgid "cannot resolve HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:894
+#: sequencer.c:895
msgid "cannot abort from a branch yet to be born"
msgstr "不能从尚未建立的分支终止"
-#: sequencer.c:916 builtin/apply.c:4061
+#: sequencer.c:917 builtin/apply.c:4061
#, c-format
msgid "cannot open %s: %s"
msgstr "不能打开 %s：%s"
-#: sequencer.c:919
+#: sequencer.c:920
#, c-format
msgid "cannot read %s: %s"
msgstr "不能读取 %s：%s"
-#: sequencer.c:920
+#: sequencer.c:921
msgid "unexpected end of file"
msgstr "意外的文件结束"
-#: sequencer.c:926
+#: sequencer.c:927
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
-#: sequencer.c:949
+#: sequencer.c:950
#, c-format
msgid "Could not format %s."
msgstr "不能格式化 %s。"
-#: sequencer.c:1092
+#: sequencer.c:1093
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s：不能拣选一个%s"
-#: sequencer.c:1095
+#: sequencer.c:1096
#, c-format
msgid "%s: bad revision"
msgstr "%s：错误的版本"
-#: sequencer.c:1129
+#: sequencer.c:1130
msgid "Can't revert as initial commit"
msgstr "不能作为初始提交还原"
-#: sequencer.c:1130
+#: sequencer.c:1131
msgid "Can't cherry-pick into empty head"
msgstr "不能拣选到空分支"
@@ -1215,400 +1283,493 @@ msgstr ""
"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
"命令关闭本消息通知。"
-#: sha1_name.c:1097
+#: sha1_name.c:1112
msgid "HEAD does not point to a branch"
msgstr "HEAD 没有指向一个分支"
-#: sha1_name.c:1100
+#: sha1_name.c:1115
#, c-format
msgid "No such branch: '%s'"
msgstr "没有此分支：'%s'"
-#: sha1_name.c:1102
+#: sha1_name.c:1117
#, c-format
msgid "No upstream configured for branch '%s'"
msgstr "尚未给分支 '%s' 设置上游"
-#: sha1_name.c:1106
+#: sha1_name.c:1121
#, c-format
msgid "Upstream branch '%s' not stored as a remote-tracking branch"
msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
-#: wrapper.c:408
+#: 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 的小节"
+
+#. Maybe the user already did that, don't error out here
+#: submodule.c:76
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "不能更新 .gitmodules 条目 %s"
+
+#. Maybe the user already did that, don't error out here
+#: submodule.c:109
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "无法移除 %s 的 .gitmodules 条目"
+
+#: submodule.c:127
+msgid "could not find .gitmodules in index"
+msgstr "无法在索引中找到 .gitmodules"
+
+#: submodule.c:133
+msgid "reading updated .gitmodules failed"
+msgstr "读取更新后的 .gitmodules 失败"
+
+#: submodule.c:135
+msgid "unable to stat updated .gitmodules"
+msgstr "不能枚举更新后的 .gitmodules"
+
+#: submodule.c:139
+msgid "unable to remove .gitmodules from index"
+msgstr "不能从索引中移除 .gitmodules"
+
+#: submodule.c:141
+msgid "adding updated .gitmodules failed"
+msgstr "添加更新后的 .gitmodules 失败"
+
+#: submodule.c:143
+msgid "staging updated .gitmodules failed"
+msgstr "将更新后 .gitmodules 添加暂存区失败"
+
+#: submodule.c:1144 builtin/init-db.c:363
+#, c-format
+msgid "Could not create git link %s"
+msgstr "不能创建 git link %s"
+
+#: submodule.c:1155
+#, c-format
+msgid "Could not set core.worktree in %s"
+msgstr "不能在 %s 中设置 core.worktree"
+
+#: 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 "缺失主机名且URL方案不是 'file:'"
+
+#: urlmatch.c:189
+msgid "a 'file:' URL may not have a port number"
+msgstr "一个 'file:' URL 不应该包含端口号"
+
+#: urlmatch.c:199
+msgid "invalid characters in host name"
+msgstr "主机名中包含无效的字符"
+
+#: urlmatch.c:244 urlmatch.c:255
+msgid "invalid port number"
+msgstr "无效的端口号"
+
+#: urlmatch.c:322
+msgid "invalid '..' path segment"
+msgstr "无效的 '..' 路径片段"
+
+#: wrapper.c:422
#, c-format
msgid "unable to access '%s': %s"
msgstr "不能访问 '%s'：%s"
-#: wrapper.c:429
+#: wrapper.c:443
#, c-format
msgid "unable to access '%s'"
msgstr "不能访问 '%s'"
-#: wrapper.c:440
+#: wrapper.c:454
#, c-format
msgid "unable to look up current user in the passwd file: %s"
msgstr "无法在口令文件中查询到当前用户：%s"
-#: wrapper.c:441
+#: wrapper.c:455
msgid "no such user"
msgstr "无此用户"
-#: wt-status.c:141
+#: wt-status.c:146
msgid "Unmerged paths:"
msgstr "未合并的路径："
# 译者：注意保持前导空格
-#: wt-status.c:168 wt-status.c:195
+#: wt-status.c:173 wt-status.c:200
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " （使用 \"git reset %s <file>...\" 撤出暂存区）"
# 译者：注意保持前导空格
-#: wt-status.c:170 wt-status.c:197
+#: wt-status.c:175 wt-status.c:202
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " （使用 \"git rm --cached <file>...\" 撤出暂存区）"
# 译者：注意保持前导空格
-#: wt-status.c:174
+#: wt-status.c:179
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " （使用 \"git add <file>...\" 标记解决方案）"
# 译者：注意保持前导空格
-#: wt-status.c:176 wt-status.c:180
+#: wt-status.c:181 wt-status.c:185
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr " （酌情使用 \"git add/rm <file>...\" 标记解决方案）"
# 译者：注意保持前导空格
-#: wt-status.c:178
+#: wt-status.c:183
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " （使用 \"git rm <file>...\" 标记解决方案）"
-#: wt-status.c:189
+#: wt-status.c:194
msgid "Changes to be committed:"
msgstr "要提交的变更："
-#: wt-status.c:207
+#: wt-status.c:212
msgid "Changes not staged for commit:"
msgstr "尚未暂存以备提交的变更："
# 译者：注意保持前导空格
-#: wt-status.c:211
+#: wt-status.c:216
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr " （使用 \"git add <file>...\" 更新要提交的内容）"
# 译者：注意保持前导空格
-#: wt-status.c:213
+#: wt-status.c:218
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr " （使用 \"git add/rm <file>...\" 更新要提交的内容）"
# 译者：注意保持前导空格
-#: wt-status.c:214
+#: wt-status.c:219
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr " （使用 \"git checkout -- <file>...\" 丢弃工作区的改动）"
# 译者：注意保持前导空格
-#: wt-status.c:216
+#: wt-status.c:221
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr " （提交或丢弃子模组中未跟踪或修改的内容）"
# 译者：注意保持前导空格
-#: wt-status.c:228
+#: wt-status.c:233
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr " （使用 \"git %s <file>...\" 以包含要提交的内容）"
-#: wt-status.c:245
+#: wt-status.c:250
msgid "bug"
msgstr "bug"
-#: wt-status.c:250
+#: wt-status.c:255
msgid "both deleted:"
msgstr "双方删除："
-#: wt-status.c:251
+#: wt-status.c:256
msgid "added by us:"
msgstr "由我们添加："
-#: wt-status.c:252
+#: wt-status.c:257
msgid "deleted by them:"
msgstr "由他们删除："
-#: wt-status.c:253
+#: wt-status.c:258
msgid "added by them:"
msgstr "由他们添加："
-#: wt-status.c:254
+#: wt-status.c:259
msgid "deleted by us:"
msgstr "由我们删除："
-#: wt-status.c:255
+#: wt-status.c:260
msgid "both added:"
msgstr "双方添加："
-#: wt-status.c:256
+#: wt-status.c:261
msgid "both modified:"
msgstr "双方修改："
# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:286
+#: wt-status.c:291
msgid "new commits, "
msgstr "新提交, "
# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:288
+#: wt-status.c:293
msgid "modified content, "
msgstr "修改的内容, "
# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:290
+#: wt-status.c:295
msgid "untracked content, "
msgstr "未跟踪的内容, "
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: wt-status.c:307
+#: wt-status.c:312
#, c-format
msgid "new file: %s"
msgstr "新文件： %s"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: wt-status.c:310
+#: wt-status.c:315
#, c-format
msgid "copied: %s -> %s"
msgstr "拷贝： %s -> %s"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: wt-status.c:313
+#: wt-status.c:318
#, c-format
msgid "deleted: %s"
msgstr "删除： %s"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: wt-status.c:316
+#: wt-status.c:321
#, c-format
msgid "modified: %s"
msgstr "修改： %s"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: wt-status.c:319
+#: wt-status.c:324
#, c-format
msgid "renamed: %s -> %s"
msgstr "重命名： %s -> %s"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: wt-status.c:322
+#: wt-status.c:327
#, c-format
msgid "typechange: %s"
msgstr "类型变更： %s"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: wt-status.c:325
+#: wt-status.c:330
#, c-format
msgid "unknown: %s"
msgstr "未知： %s"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: wt-status.c:328
+#: wt-status.c:333
#, c-format
msgid "unmerged: %s"
msgstr "未合并： %s"
-#: wt-status.c:331
+#: wt-status.c:336
#, c-format
msgid "bug: unhandled diff status %c"
msgstr "bug：未处理的差异状态 %c"
-#: wt-status.c:803
+#: wt-status.c:703
+msgid "Submodules changed but not updated:"
+msgstr "子模组已修改但尚未更新："
+
+#: wt-status.c:705
+msgid "Submodule changes to be committed:"
+msgstr "要提交的子模组变更："
+
+#: wt-status.c:848
msgid "You have unmerged paths."
msgstr "您有尚未合并的路径。"
# 译者：注意保持前导空格
-#: wt-status.c:806
+#: wt-status.c:851
msgid " (fix conflicts and run \"git commit\")"
msgstr " （解决冲突并运行 \"git commit\"）"
-#: wt-status.c:809
+#: wt-status.c:854
msgid "All conflicts fixed but you are still merging."
msgstr "所有冲突已解决但您仍处于合并中。"
# 译者：注意保持前导空格
-#: wt-status.c:812
+#: wt-status.c:857
msgid " (use \"git commit\" to conclude merge)"
msgstr " （使用 \"git commit\" 结束合并）"
-#: wt-status.c:822
+#: wt-status.c:867
msgid "You are in the middle of an am session."
msgstr "您正处于一个 am 过程中。"
-#: wt-status.c:825
+#: wt-status.c:870
msgid "The current patch is empty."
msgstr "当前的补丁为空。"
# 译者：注意保持前导空格
-#: wt-status.c:829
+#: wt-status.c:874
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " （解决冲突，然后运行 \"git am --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:831
+#: wt-status.c:876
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " （使用 \"git am --skip\" 跳过此补丁）"
# 译者：注意保持前导空格
-#: wt-status.c:833
+#: wt-status.c:878
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " （使用 \"git am --abort\" 恢复原有分支）"
-#: wt-status.c:893 wt-status.c:910
+#: wt-status.c:938 wt-status.c:955
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "您正在将分支 '%s' 变基到 '%s'。"
-#: wt-status.c:898 wt-status.c:915
+#: wt-status.c:943 wt-status.c:960
msgid "You are currently rebasing."
msgstr "您正在变基。"
# 译者：注意保持前导空格
-#: wt-status.c:901
+#: wt-status.c:946
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " （解决冲突，然后运行 \"git rebase --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:903
+#: wt-status.c:948
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " （使用 \"git rebase --skip\" 跳过此补丁）"
# 译者：注意保持前导空格
-#: wt-status.c:905
+#: wt-status.c:950
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " （使用 \"git rebase --abort\" 以检出原有分支）"
# 译者：注意保持前导空格
-#: wt-status.c:918
+#: wt-status.c:963
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）"
-#: wt-status.c:922
+#: wt-status.c:967
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr "您正在将分支 '%s' 变基到 '%s' 过程中拆分一个提交。"
-#: wt-status.c:927
+#: wt-status.c:972
msgid "You are currently splitting a commit during a rebase."
msgstr "您正在变基过程中拆分一个提交。"
# 译者：注意保持前导空格
-#: wt-status.c:930
+#: wt-status.c:975
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"
-#: wt-status.c:934
+#: wt-status.c:979
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr "您正在将分支 '%s' 变基到 '%s' 过程中编辑一个提交。"
-#: wt-status.c:939
+#: wt-status.c:984
msgid "You are currently editing a commit during a rebase."
msgstr "您正在变基过程中编辑一个提交。"
# 译者：注意保持前导空格
-#: wt-status.c:942
+#: wt-status.c:987
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " （使用 \"git commit --amend\" 修补当前提交）"
# 译者：注意保持前导空格
-#: wt-status.c:944
+#: wt-status.c:989
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"
-#: wt-status.c:954
-msgid "You are currently cherry-picking."
-msgstr "您正在做拣选操作。"
+#: wt-status.c:999
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "您正在做拣选提交 %s。"
# 译者：注意保持前导空格
-#: wt-status.c:958
+#: wt-status.c:1004
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:961
+#: wt-status.c:1007
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:963
+#: wt-status.c:1009
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）"
-#: wt-status.c:972
+#: wt-status.c:1018
#, c-format
msgid "You are currently reverting commit %s."
msgstr "您正在反转提交 %s 。"
# 译者：注意保持前导空格
-#: wt-status.c:977
+#: wt-status.c:1023
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " （解决冲突并运行 \"git revert --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:980
+#: wt-status.c:1026
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " （所有冲突已解决：运行 \"git revert --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:982
+#: wt-status.c:1028
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）"
-#: wt-status.c:993
+#: wt-status.c:1039
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "您正在从分支 '%s' 开始做二分查找。"
-#: wt-status.c:997
+#: wt-status.c:1043
msgid "You are currently bisecting."
msgstr "您正在做二分查找。"
# 译者：注意保持前导空格
-#: wt-status.c:1000
+#: wt-status.c:1046
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " （使用 \"git bisect reset\" 以回到原有分支）"
-#: wt-status.c:1173
+#: wt-status.c:1221
msgid "On branch "
msgstr "位于分支 "
-#: wt-status.c:1180
+#: wt-status.c:1228
msgid "rebase in progress; onto "
msgstr "变基正在进行中；至 "
-#: wt-status.c:1187
+#: wt-status.c:1235
msgid "HEAD detached at "
msgstr "头指针分离于 "
-#: wt-status.c:1189
+#: wt-status.c:1237
msgid "HEAD detached from "
msgstr "头指针分离自 "
-#: wt-status.c:1192
+#: wt-status.c:1240
msgid "Not currently on any branch."
msgstr "当前不在任何分支上。"
-#: wt-status.c:1209
+#: wt-status.c:1257
msgid "Initial commit"
msgstr "初始提交"
-#: wt-status.c:1223
+#: wt-status.c:1271
msgid "Untracked files"
msgstr "未跟踪的文件"
-#: wt-status.c:1225
+#: wt-status.c:1273
msgid "Ignored files"
msgstr "忽略的文件"
-#: wt-status.c:1229
+#: wt-status.c:1277
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -1618,97 +1779,101 @@ msgstr ""
"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"
"但您需要小心不要忘了添加新文件（参见 'git help status'）。"
-#: wt-status.c:1235
+#: wt-status.c:1283
#, c-format
msgid "Untracked files not listed%s"
msgstr "未跟踪的文件没有列出%s"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1237
+#: wt-status.c:1285
msgid " (use -u option to show untracked files)"
msgstr "（使用 -u 参数显示未跟踪的文件）"
-#: wt-status.c:1243
+#: wt-status.c:1291
msgid "No changes"
msgstr "没有修改"
-#: wt-status.c:1248
+#: wt-status.c:1296
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"
-#: wt-status.c:1251
+#: wt-status.c:1299
#, c-format
msgid "no changes added to commit\n"
msgstr "修改尚未加入提交\n"
-#: wt-status.c:1254
+#: wt-status.c:1302
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"
-#: wt-status.c:1257
+#: wt-status.c:1305
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "提交为空，但是存在尚未跟踪的文件\n"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1260
+#: wt-status.c:1308
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"
-#: wt-status.c:1263 wt-status.c:1268
+#: wt-status.c:1311 wt-status.c:1316
#, c-format
msgid "nothing to commit\n"
msgstr "无文件要提交\n"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1266
+#: wt-status.c:1314
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1270
+#: wt-status.c:1318
#, c-format
msgid "nothing to commit, working directory clean\n"
msgstr "无文件要提交，干净的工作区\n"
-#: wt-status.c:1378
+#: wt-status.c:1427
msgid "HEAD (no branch)"
msgstr "HEAD（非分支）"
# 译者：注意保持句尾空格
-#: wt-status.c:1384
+#: wt-status.c:1433
msgid "Initial commit on "
msgstr "初始提交于 "
+#: wt-status.c:1463
+msgid "gone"
+msgstr "丢失"
+
# 译者：注意保持句尾空格
-#: wt-status.c:1399
+#: wt-status.c:1465
msgid "behind "
msgstr "落后 "
# 译者：注意保持句尾空格
-#: wt-status.c:1402 wt-status.c:1405
+#: wt-status.c:1468 wt-status.c:1471
msgid "ahead "
msgstr "领先 "
# 译者：注意保持句尾空格
-#: wt-status.c:1407
+#: wt-status.c:1473
msgid ", behind "
msgstr "，落后 "
-#: compat/precompose_utf8.c:58 builtin/clone.c:351
+#: compat/precompose_utf8.c:55 builtin/clone.c:350
#, c-format
msgid "failed to unlink '%s'"
msgstr "无法删除 '%s'"
#: builtin/add.c:20
msgid "git add [options] [--] <pathspec>..."
-msgstr "git add [选项] [--] <路径匹配>..."
+msgstr "git add [选项] [--] <路径规则>..."
# 译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短
#.
@@ -1774,10 +1939,10 @@ msgstr ""
"像本地工作区移除的路径 '%s'\n"
"在此版本的 Git 中被忽略。\n"
"\n"
-"* 'git add --ignore-removal <pathspec>'，是当前版本的默认操作，\n"
+"* 'git add --ignore-removal <路径规则>'，是当前版本的默认操作，\n"
" 忽略您本地工作区中移除的文件。\n"
"\n"
-"* 'git add --all <pathspec>' 将让您同时对删除操作进行记录。\n"
+"* 'git add --all <路径规则>' 将让您同时对删除操作进行记录。\n"
"\n"
"运行 'git status' 来检查您本地工作区中移除的路径。\n"
@@ -1786,7 +1951,7 @@ msgstr ""
msgid "unexpected diff status %c"
msgstr "意外的差异状态 %c"
-#: builtin/add.c:149 builtin/commit.c:252
+#: builtin/add.c:149 builtin/commit.c:260
msgid "updating files failed"
msgstr "更新文件失败"
@@ -1795,140 +1960,135 @@ msgstr "更新文件失败"
msgid "remove '%s'\n"
msgstr "删除 '%s'\n"
-#: builtin/add.c:253
+#: builtin/add.c:237
msgid "Unstaged changes after refreshing the index:"
msgstr "刷新索引之后尚未被暂存的变更："
-#: builtin/add.c:256 builtin/add.c:573 builtin/rm.c:337
-#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr "路径 '%s' 未匹配任何文件"
-
-#: builtin/add.c:339
+#: builtin/add.c:299
msgid "Could not read the index"
msgstr "不能读取索引"
-#: builtin/add.c:350
+#: builtin/add.c:310
#, c-format
msgid "Could not open '%s' for writing."
msgstr "不能打开 '%s' 以写入。"
-#: builtin/add.c:354
+#: builtin/add.c:314
msgid "Could not write patch"
msgstr "不能生成补丁"
-#: builtin/add.c:359
+#: builtin/add.c:319
#, c-format
msgid "Could not stat '%s'"
msgstr "不能查看文件状态 '%s'"
-#: builtin/add.c:361
+#: builtin/add.c:321
msgid "Empty patch. Aborted."
msgstr "空补丁。异常终止。"
-#: builtin/add.c:367
+#: builtin/add.c:327
#, c-format
msgid "Could not apply '%s'"
msgstr "不能应用 '%s'"
-#: builtin/add.c:377
+#: builtin/add.c:337
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
-#: builtin/add.c:394 builtin/clean.c:875 builtin/fetch.c:78 builtin/mv.c:63
-#: builtin/prune-packed.c:73 builtin/push.c:451 builtin/remote.c:1253
-#: builtin/rm.c:268
+#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:92 builtin/mv.c:66
+#: builtin/prune-packed.c:73 builtin/push.c:459 builtin/remote.c:1253
+#: builtin/rm.c:269
msgid "dry run"
msgstr "演习"
-#: builtin/add.c:395 builtin/apply.c:4410 builtin/check-ignore.c:19
-#: builtin/commit.c:1220 builtin/count-objects.c:95 builtin/fsck.c:613
-#: builtin/log.c:1573 builtin/mv.c:62 builtin/read-tree.c:113
+#: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19
+#: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612
+#: builtin/log.c:1592 builtin/mv.c:65 builtin/read-tree.c:113
msgid "be verbose"
msgstr "冗长输出"
-#: builtin/add.c:397
+#: builtin/add.c:357
msgid "interactive picking"
msgstr "交互式拣选"
-#: builtin/add.c:398 builtin/checkout.c:1073 builtin/reset.c:261
+#: builtin/add.c:358 builtin/checkout.c:1109 builtin/reset.c:272
msgid "select hunks interactively"
msgstr "交互式挑选数据块"
-#: builtin/add.c:399
+#: builtin/add.c:359
msgid "edit current diff and apply"
msgstr "编辑当前差异并应用"
-#: builtin/add.c:400
+#: builtin/add.c:360
msgid "allow adding otherwise ignored files"
msgstr "允许添加忽略的文件"
-#: builtin/add.c:401
+#: builtin/add.c:361
msgid "update tracked files"
msgstr "更新已跟踪的文件"
-#: builtin/add.c:402
+#: builtin/add.c:362
msgid "record only the fact that the path will be added later"
msgstr "只记录，该路径稍后再添加"
-#: builtin/add.c:403
+#: builtin/add.c:363
msgid "add changes from all tracked and untracked files"
msgstr "添加所有改变的已跟踪文件和未跟踪文件"
#. takes no arguments
-#: builtin/add.c:406
+#: builtin/add.c:366
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "忽略工作区中移除的路径（和 --no-all 相同）"
-#: builtin/add.c:408
+#: builtin/add.c:368
msgid "don't add, only refresh the index"
msgstr "不添加，只刷新索引"
-#: builtin/add.c:409
+#: builtin/add.c:369
msgid "just skip files which cannot be added because of errors"
msgstr "跳过因出错不能添加的文件"
-#: builtin/add.c:410
+#: builtin/add.c:370
msgid "check if - even missing - files are ignored in dry run"
msgstr "检查在演习模式下文件（即使不存在）是否被忽略"
-#: builtin/add.c:432
+#: builtin/add.c:392
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "使用 -f 参数如果您确实要添加它们。\n"
-#: builtin/add.c:433
+#: builtin/add.c:393
msgid "no files added"
msgstr "没有文件被添加"
-#: builtin/add.c:439
+#: builtin/add.c:399
msgid "adding files failed"
msgstr "添加文件失败"
-#: builtin/add.c:478
+#: builtin/add.c:438
msgid "-A and -u are mutually incompatible"
msgstr "-A 和 -u 选项互斥"
-#: builtin/add.c:496
+#: builtin/add.c:456
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
-#: builtin/add.c:526
+#: builtin/add.c:486
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "没有指定文件，也没有文件被添加。\n"
-#: builtin/add.c:527
+#: builtin/add.c:487
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "也许您想要执行 'git add .'？\n"
-#: builtin/add.c:533 builtin/check-ignore.c:161 builtin/clean.c:919
-#: builtin/commit.c:312 builtin/mv.c:82 builtin/rm.c:297
+#: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919
+#: builtin/commit.c:320 builtin/mv.c:86 builtin/reset.c:224 builtin/rm.c:299
msgid "index file corrupt"
msgstr "索引文件损坏"
-#: builtin/add.c:605 builtin/apply.c:4506 builtin/mv.c:229 builtin/rm.c:432
+#: builtin/add.c:589 builtin/apply.c:4506 builtin/mv.c:259 builtin/rm.c:432
msgid "Unable to write new index file"
msgstr "无法写入新索引文件"
@@ -2176,7 +2336,7 @@ msgstr "%s：补丁未应用"
msgid "Checking patch %s..."
msgstr "检查补丁 %s..."
-#: builtin/apply.c:3680 builtin/checkout.c:216 builtin/reset.c:127
+#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:127
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
@@ -2256,8 +2416,8 @@ msgstr "未能识别的输入"
msgid "unable to read index file"
msgstr "无法读取索引文件"
-#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:91
-#: builtin/fetch.c:63
+#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90
+#: builtin/fetch.c:77
msgid "path"
msgstr "路径"
@@ -2317,7 +2477,7 @@ msgstr "如果一个补丁不能应用则尝试三路合并"
msgid "build a temporary index based on embedded index information"
msgstr "创建一个临时索引基于嵌入的索引信息"
-#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:462
+#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:452
msgid "paths are separated with NUL character"
msgstr "路径以 NUL 字符分隔"
@@ -2447,103 +2607,103 @@ msgstr "执行 'git bisect next'"
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "更新 BISECT_HEAD 而非检出当前提交"
-#: builtin/blame.c:26
+#: builtin/blame.c:27
msgid "git blame [options] [rev-opts] [rev] [--] file"
msgstr "git blame [选项] [版本选项] [版本] [--] 文件"
-#: builtin/blame.c:31
+#: builtin/blame.c:32
msgid "[rev-opts] are documented in git-rev-list(1)"
msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中"
-#: builtin/blame.c:2276
+#: builtin/blame.c:2248
msgid "Show blame entries as we find them, incrementally"
msgstr "增量式地显示发现的 blame 条目"
-#: builtin/blame.c:2277
+#: builtin/blame.c:2249
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "边界提交显示空的 SHA-1（默认：关闭）"
-#: builtin/blame.c:2278
+#: builtin/blame.c:2250
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "不把根提交作为边界（默认：关闭）"
-#: builtin/blame.c:2279
+#: builtin/blame.c:2251
msgid "Show work cost statistics"
msgstr "显示命令消耗统计"
-#: builtin/blame.c:2280
+#: builtin/blame.c:2252
msgid "Show output score for blame entries"
msgstr "显示判断 blame 条目位移的得分诊断信息"
-#: builtin/blame.c:2281
+#: builtin/blame.c:2253
msgid "Show original filename (Default: auto)"
msgstr "显示原始文件名（默认：自动）"
-#: builtin/blame.c:2282
+#: builtin/blame.c:2254
msgid "Show original linenumber (Default: off)"
msgstr "显示原始的行号（默认：关闭）"
-#: builtin/blame.c:2283
+#: builtin/blame.c:2255
msgid "Show in a format designed for machine consumption"
msgstr "显示为一个适合机器读取的格式"
-#: builtin/blame.c:2284
+#: builtin/blame.c:2256
msgid "Show porcelain format with per-line commit information"
msgstr "为每一行显示机器适用的提交信息"
-#: builtin/blame.c:2285
+#: builtin/blame.c:2257
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）"
-#: builtin/blame.c:2286
+#: builtin/blame.c:2258
msgid "Show raw timestamp (Default: off)"
msgstr "显示原始时间戳（默认：关闭）"
-#: builtin/blame.c:2287
+#: builtin/blame.c:2259
msgid "Show long commit SHA1 (Default: off)"
msgstr "显示长的SHA1提交号（默认：关闭）"
-#: builtin/blame.c:2288
+#: builtin/blame.c:2260
msgid "Suppress author name and timestamp (Default: off)"
msgstr "隐藏作者名字和时间戳（默认：关闭）"
-#: builtin/blame.c:2289
+#: builtin/blame.c:2261
msgid "Show author email instead of name (Default: off)"
msgstr "显示作者的邮箱而不是名字（默认：关闭）"
-#: builtin/blame.c:2290
+#: builtin/blame.c:2262
msgid "Ignore whitespace differences"
msgstr "忽略空白差异"
-#: builtin/blame.c:2291
+#: builtin/blame.c:2263
msgid "Spend extra cycles to find better match"
msgstr "花费额外的循环来找到更好的匹配"
-#: builtin/blame.c:2292
+#: builtin/blame.c:2264
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list"
-#: builtin/blame.c:2293
+#: builtin/blame.c:2265
msgid "Use <file>'s contents as the final image"
msgstr "使用 <file> 的内容作为最终的图片"
-#: builtin/blame.c:2294 builtin/blame.c:2295
+#: builtin/blame.c:2266 builtin/blame.c:2267
msgid "score"
msgstr "得分"
-#: builtin/blame.c:2294
+#: builtin/blame.c:2266
msgid "Find line copies within and across files"
msgstr "找到文件内及跨文件的行拷贝"
-#: builtin/blame.c:2295
+#: builtin/blame.c:2267
msgid "Find line movements within and across files"
msgstr "找到文件内及跨文件的行移动"
-#: builtin/blame.c:2296
+#: builtin/blame.c:2268
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2296
+#: builtin/blame.c:2268
msgid "Process only line range n,m, counting from 1"
msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"
@@ -2651,273 +2811,283 @@ msgstr "分支 '%s' 未指向一个提交"
#: builtin/branch.c:453
#, c-format
+msgid "[%s: gone]"
+msgstr "[%s: 丢失]"
+
+#: builtin/branch.c:456
+#, c-format
+msgid "[%s]"
+msgstr "[%s]"
+
+#: builtin/branch.c:459
+#, c-format
msgid "[%s: behind %d]"
msgstr "[%s：落后 %d]"
-#: builtin/branch.c:455
+#: builtin/branch.c:461
#, c-format
msgid "[behind %d]"
msgstr "[落后 %d]"
-#: builtin/branch.c:459
+#: builtin/branch.c:465
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s：领先 %d]"
-#: builtin/branch.c:461
+#: builtin/branch.c:467
#, c-format
msgid "[ahead %d]"
msgstr "[领先 %d]"
-#: builtin/branch.c:464
+#: builtin/branch.c:470
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s：领先 %d，落后 %d]"
-#: builtin/branch.c:467
+#: builtin/branch.c:473
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[领先 %d，落后 %d]"
-#: builtin/branch.c:490
+#: builtin/branch.c:496
msgid " **** invalid ref ****"
msgstr " **** 无效引用 ****"
-#: builtin/branch.c:582
+#: builtin/branch.c:588
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "（非分支，正变基 %s）"
-#: builtin/branch.c:585
+#: builtin/branch.c:591
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "（非分支，二分查找开始于 %s）"
-#: builtin/branch.c:588
+#: builtin/branch.c:594
#, c-format
msgid "(detached from %s)"
msgstr "（分离自 %s）"
-#: builtin/branch.c:591
+#: builtin/branch.c:597
msgid "(no branch)"
msgstr "（非分支）"
-#: builtin/branch.c:637
+#: builtin/branch.c:643
#, c-format
msgid "object '%s' does not point to a commit"
msgstr "对象 '%s' 没有指向一个提交"
-#: builtin/branch.c:669
+#: builtin/branch.c:675
msgid "some refs could not be read"
msgstr "一些引用不能读取"
-#: builtin/branch.c:682
+#: builtin/branch.c:688
msgid "cannot rename the current branch while not on any."
msgstr "无法重命名当前分支因为不处于任何分支上。"
-#: builtin/branch.c:692
+#: builtin/branch.c:698
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "无效的分支名：'%s'"
-#: builtin/branch.c:707
+#: builtin/branch.c:713
msgid "Branch rename failed"
msgstr "分支重命名失败"
-#: builtin/branch.c:711
+#: builtin/branch.c:717
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "重命名掉一个错误命名的旧分支 '%s'"
-#: builtin/branch.c:715
+#: builtin/branch.c:721
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "分支重命名为 %s，但 HEAD 没有更新！"
-#: builtin/branch.c:722
+#: builtin/branch.c:728
msgid "Branch is renamed, but update of config-file failed"
msgstr "分支被重命名，但更新 config 文件失败"
-#: builtin/branch.c:737
+#: builtin/branch.c:743
#, c-format
msgid "malformed object name %s"
msgstr "非法的对象名 %s"
-#: builtin/branch.c:761
+#: builtin/branch.c:767
#, c-format
msgid "could not write branch description template: %s"
msgstr "不能写分支描述模版：%s"
-#: builtin/branch.c:791
+#: builtin/branch.c:797
msgid "Generic options"
msgstr "通用选项"
-#: builtin/branch.c:793
+#: builtin/branch.c:799
msgid "show hash and subject, give twice for upstream branch"
msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"
-#: builtin/branch.c:794
+#: builtin/branch.c:800
msgid "suppress informational messages"
msgstr "不显示信息"
-#: builtin/branch.c:795
+#: builtin/branch.c:801
msgid "set up tracking mode (see git-pull(1))"
msgstr "设置跟踪模式（参见 git-pull(1)）"
-#: builtin/branch.c:797
+#: builtin/branch.c:803
msgid "change upstream info"
msgstr "改变上游信息"
-#: builtin/branch.c:801
+#: builtin/branch.c:807
msgid "use colored output"
msgstr "使用彩色输出"
-#: builtin/branch.c:802
+#: builtin/branch.c:808
msgid "act on remote-tracking branches"
msgstr "作用于远程跟踪分支"
-#: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832
-#: builtin/branch.c:838 builtin/commit.c:1433 builtin/commit.c:1434
-#: builtin/commit.c:1435 builtin/commit.c:1436 builtin/tag.c:468
+#: builtin/branch.c:811 builtin/branch.c:817 builtin/branch.c:838
+#: builtin/branch.c:844 builtin/commit.c:1460 builtin/commit.c:1461
+#: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468
msgid "commit"
msgstr "提交"
-#: builtin/branch.c:806 builtin/branch.c:812
+#: builtin/branch.c:812 builtin/branch.c:818
msgid "print only branches that contain the commit"
msgstr "只打印包含该提交的分支"
-#: builtin/branch.c:818
+#: builtin/branch.c:824
msgid "Specific git-branch actions:"
msgstr "具体的 git-branch 动作："
-#: builtin/branch.c:819
+#: builtin/branch.c:825
msgid "list both remote-tracking and local branches"
msgstr "列出远程跟踪及本地分支"
-#: builtin/branch.c:821
+#: builtin/branch.c:827
msgid "delete fully merged branch"
msgstr "删除完全合并的分支"
-#: builtin/branch.c:822
+#: builtin/branch.c:828
msgid "delete branch (even if not merged)"
msgstr "删除分支（即使没有合并）"
-#: builtin/branch.c:823
+#: builtin/branch.c:829
msgid "move/rename a branch and its reflog"
msgstr "移动/重命名一个分支，以及它的引用日志"
-#: builtin/branch.c:824
+#: builtin/branch.c:830
msgid "move/rename a branch, even if target exists"
msgstr "移动/重命名一个分支，即使目标已存在"
-#: builtin/branch.c:825
+#: builtin/branch.c:831
msgid "list branch names"
msgstr "列出分支名"
-#: builtin/branch.c:826
+#: builtin/branch.c:832
msgid "create the branch's reflog"
msgstr "创建分支的引用日志"
-#: builtin/branch.c:828
+#: builtin/branch.c:834
msgid "edit the description for the branch"
msgstr "标记分支的描述"
-#: builtin/branch.c:829
+#: builtin/branch.c:835
msgid "force creation (when already exists)"
msgstr "强制创建（当已经存在）"
-#: builtin/branch.c:832
+#: builtin/branch.c:838
msgid "print only not merged branches"
msgstr "只打印没有合并的分支"
-#: builtin/branch.c:838
+#: builtin/branch.c:844
msgid "print only merged branches"
msgstr "只打印合并的分支"
-#: builtin/branch.c:842
+#: builtin/branch.c:848
msgid "list branches in columns"
msgstr "以列的方式显示分支"
-#: builtin/branch.c:855
+#: builtin/branch.c:861
msgid "Failed to resolve HEAD as a valid ref."
msgstr "无法将 HEAD 解析为有效引用。"
-#: builtin/branch.c:860 builtin/clone.c:630
+#: builtin/branch.c:866 builtin/clone.c:629
msgid "HEAD not found below refs/heads!"
msgstr "HEAD 没有位于 /refs/heads 之下！"
-#: builtin/branch.c:883
+#: builtin/branch.c:890
msgid "--column and --verbose are incompatible"
msgstr "--column 和 --verbose 不兼容"
-#: builtin/branch.c:889 builtin/branch.c:928
+#: builtin/branch.c:896 builtin/branch.c:935
msgid "branch name required"
msgstr "必须提供分支名"
-#: builtin/branch.c:904
+#: builtin/branch.c:911
msgid "Cannot give description to detached HEAD"
msgstr "不能向分离头指针提供描述"
-#: builtin/branch.c:909
+#: builtin/branch.c:916
msgid "cannot edit description of more than one branch"
msgstr "不能为一个以上的分支编辑描述"
-#: builtin/branch.c:916
+#: builtin/branch.c:923
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "分支 '%s' 尚无提交。"
-#: builtin/branch.c:919
+#: builtin/branch.c:926
#, c-format
msgid "No branch named '%s'."
msgstr "没有分支 '%s'。"
-#: builtin/branch.c:934
+#: builtin/branch.c:941
msgid "too many branches for a rename operation"
msgstr "为重命名操作提供了太多的分支名"
-#: builtin/branch.c:939
+#: builtin/branch.c:946
msgid "too many branches to set new upstream"
msgstr "为设置新上游提供了太多的分支名"
-#: builtin/branch.c:943
+#: builtin/branch.c:950
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。"
-#: builtin/branch.c:946 builtin/branch.c:968 builtin/branch.c:990
+#: builtin/branch.c:953 builtin/branch.c:975 builtin/branch.c:997
#, c-format
msgid "no such branch '%s'"
msgstr "没有此分支 '%s'"
-#: builtin/branch.c:950
+#: builtin/branch.c:957
#, c-format
msgid "branch '%s' does not exist"
msgstr "分支 '%s' 不存在"
-#: builtin/branch.c:962
+#: builtin/branch.c:969
msgid "too many branches to unset upstream"
msgstr "为取消上游设置操作提供了太多的分支名"
-#: builtin/branch.c:966
+#: builtin/branch.c:973
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
-#: builtin/branch.c:972
+#: builtin/branch.c:979
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "分支 '%s' 没有上游信息"
-#: builtin/branch.c:987
+#: builtin/branch.c:994
msgid "it does not make sense to create 'HEAD' manually"
msgstr "手工创建 'HEAD' 没有意义"
-#: builtin/branch.c:993
+#: builtin/branch.c:1000
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
-#: builtin/branch.c:996
+#: builtin/branch.c:1003
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -2925,7 +3095,7 @@ msgid ""
msgstr ""
"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
-#: builtin/branch.c:1013
+#: builtin/branch.c:1020
#, c-format
msgid ""
"\n"
@@ -2936,12 +3106,12 @@ msgstr ""
"如果你想用 '%s' 跟踪 '%s', 这么做：\n"
"\n"
-#: builtin/branch.c:1014
+#: builtin/branch.c:1021
#, c-format
msgid " git branch -d %s\n"
msgstr " git branch -d %s\n"
-#: builtin/branch.c:1015
+#: builtin/branch.c:1022
#, c-format
msgid " git branch --set-upstream-to %s\n"
msgstr " git branch --set-upstream-to %s\n"
@@ -2959,43 +3129,43 @@ msgstr "需要一个版本库来创建包。"
msgid "Need a repository to unbundle."
msgstr "需要一个版本库来解包。"
-#: builtin/cat-file.c:285
+#: builtin/cat-file.c:312
msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"
-#: builtin/cat-file.c:286
+#: builtin/cat-file.c:313
msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
msgstr "git cat-file (--batch|--batch-check) < <对象列表>"
-#: builtin/cat-file.c:323
+#: builtin/cat-file.c:350
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<类型> 可以是其中之一：blob、tree、commit、tag"
-#: builtin/cat-file.c:324
+#: builtin/cat-file.c:351
msgid "show object type"
msgstr "显示对象类型"
-#: builtin/cat-file.c:325
+#: builtin/cat-file.c:352
msgid "show object size"
msgstr "显示对象大小"
-#: builtin/cat-file.c:327
+#: builtin/cat-file.c:354
msgid "exit with zero when there's no error"
msgstr "当没有错误时退出并返回零"
-#: builtin/cat-file.c:328
+#: builtin/cat-file.c:355
msgid "pretty-print object's content"
msgstr "美观地打印对象的内容"
-#: builtin/cat-file.c:330
+#: builtin/cat-file.c:357
msgid "for blob objects, run textconv on object's content"
msgstr "对于数据（blob）对象，对其内容执行 textconv"
-#: builtin/cat-file.c:332
+#: builtin/cat-file.c:359
msgid "show info and content of objects fed from the standard input"
msgstr "显示从标准输入提供的对象的信息和内容"
-#: builtin/cat-file.c:335
+#: builtin/cat-file.c:362
msgid "show info about objects fed from the standard input"
msgstr "显示从标准输入提供的对象的信息"
@@ -3020,10 +3190,10 @@ msgid "read file names from stdin"
msgstr "从标准输入读出文件名"
#: builtin/check-attr.c:23 builtin/check-ignore.c:24
-msgid "input paths are terminated by a null character"
-msgstr "输入路径以null字符终止"
+msgid "terminate input and output records by a NUL character"
+msgstr "输入和输出的记录使用 NUL 字符终结"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1054 builtin/gc.c:177
+#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:259
msgid "suppress progress reporting"
msgstr "不显示进度报告"
@@ -3031,27 +3201,31 @@ msgstr "不显示进度报告"
msgid "show non-matching input paths"
msgstr "显示未匹配的输入路径"
-#: builtin/check-ignore.c:143
+#: builtin/check-ignore.c:28
+msgid "ignore index when checking"
+msgstr "检查时忽略索引"
+
+#: builtin/check-ignore.c:154
msgid "cannot specify pathnames with --stdin"
msgstr "不能同时提供路径及 --stdin 参数"
-#: builtin/check-ignore.c:146
+#: builtin/check-ignore.c:157
msgid "-z only makes sense with --stdin"
msgstr "-z 需要和 --stdin 参数共用才有意义"
-#: builtin/check-ignore.c:148
+#: builtin/check-ignore.c:159
msgid "no path specified"
msgstr "未指定路径"
-#: builtin/check-ignore.c:152
+#: builtin/check-ignore.c:163
msgid "--quiet is only valid with a single pathname"
msgstr "参数 --quiet 只在提供一个路径名时有效"
-#: builtin/check-ignore.c:154
+#: builtin/check-ignore.c:165
msgid "cannot have both --quiet and --verbose"
msgstr "不能同时提供 --quiet 和 --verbose 参数"
-#: builtin/check-ignore.c:157
+#: builtin/check-ignore.c:168
msgid "--non-matching is only valid with --verbose"
msgstr "--non-matching 选项只在使用 --verbose 时有效"
@@ -3124,107 +3298,107 @@ msgstr "git checkout [选项] <分支>"
msgid "git checkout [options] [<branch>] -- <file>..."
msgstr "git checkout [选项] [<分支>] -- <文件>..."
-#: builtin/checkout.c:117 builtin/checkout.c:150
+#: builtin/checkout.c:114 builtin/checkout.c:147
#, c-format
msgid "path '%s' does not have our version"
msgstr "路径 '%s' 没有我们的版本"
-#: builtin/checkout.c:119 builtin/checkout.c:152
+#: builtin/checkout.c:116 builtin/checkout.c:149
#, c-format
msgid "path '%s' does not have their version"
msgstr "路径 '%s' 没有他们的版本"
-#: builtin/checkout.c:135
+#: builtin/checkout.c:132
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "路径 '%s' 没有全部必须的版本"
-#: builtin/checkout.c:179
+#: builtin/checkout.c:176
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "路径 '%s' 没有必须的版本"
-#: builtin/checkout.c:196
+#: builtin/checkout.c:193
#, c-format
msgid "path '%s': cannot merge"
msgstr "path '%s'：无法合并"
-#: builtin/checkout.c:213
+#: builtin/checkout.c:210
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "无法为 '%s' 添加合并结果"
-#: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243
-#: builtin/checkout.c:246
+#: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238
+#: builtin/checkout.c:241
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' 不能在更新路径时使用"
-#: builtin/checkout.c:249 builtin/checkout.c:252
+#: builtin/checkout.c:244 builtin/checkout.c:247
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' 不能和 %s 同时使用"
-#: builtin/checkout.c:255
+#: builtin/checkout.c:250
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "不能同时更新路径并切换到分支'%s'。"
-#: builtin/checkout.c:266 builtin/checkout.c:458
+#: builtin/checkout.c:261 builtin/checkout.c:451
msgid "corrupt index file"
msgstr "损坏的索引文件"
-#: builtin/checkout.c:329 builtin/checkout.c:336
+#: builtin/checkout.c:322 builtin/checkout.c:329
#, c-format
msgid "path '%s' is unmerged"
msgstr "路径 '%s' 未合并"
-#: builtin/checkout.c:480
+#: builtin/checkout.c:473
msgid "you need to resolve your current index first"
msgstr "您需要先解决当前索引的冲突"
-#: builtin/checkout.c:601
+#: builtin/checkout.c:594
#, c-format
msgid "Can not do reflog for '%s'\n"
msgstr "不能对 '%s' 执行 reflog 操作\n"
-#: builtin/checkout.c:639
+#: builtin/checkout.c:632
msgid "HEAD is now at"
msgstr "HEAD 目前位于"
-#: builtin/checkout.c:646
+#: builtin/checkout.c:639
#, c-format
msgid "Reset branch '%s'\n"
msgstr "重置分支 '%s'\n"
-#: builtin/checkout.c:649
+#: builtin/checkout.c:642
#, c-format
msgid "Already on '%s'\n"
msgstr "已经位于 '%s'\n"
-#: builtin/checkout.c:653
+#: builtin/checkout.c:646
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "切换并重置分支 '%s'\n"
-#: builtin/checkout.c:655 builtin/checkout.c:997
+#: builtin/checkout.c:648 builtin/checkout.c:1033
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "切换到一个新分支 '%s'\n"
-#: builtin/checkout.c:657
+#: builtin/checkout.c:650
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "切换到分支 '%s'\n"
# 译者：注意保持前导空格
-#: builtin/checkout.c:713
+#: builtin/checkout.c:706
#, c-format
msgid " ... and %d more.\n"
msgstr " ... 及其它 %d 个。\n"
#. The singular version
-#: builtin/checkout.c:719
+#: builtin/checkout.c:712
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -3245,7 +3419,7 @@ msgstr[1] ""
"\n"
"%s\n"
-#: builtin/checkout.c:737
+#: builtin/checkout.c:730
#, c-format
msgid ""
"If you want to keep them by creating a new branch, this may be a good time\n"
@@ -3260,136 +3434,140 @@ msgstr ""
" git branch new_branch_name %s\n"
"\n"
-#: builtin/checkout.c:767
+#: builtin/checkout.c:760
msgid "internal error in revision walk"
msgstr "在版本遍历时遇到内部错误"
-#: builtin/checkout.c:771
+#: builtin/checkout.c:764
msgid "Previous HEAD position was"
msgstr "之前的 HEAD 位置是"
-#: builtin/checkout.c:798 builtin/checkout.c:992
+#: builtin/checkout.c:791 builtin/checkout.c:1028
msgid "You are on a branch yet to be born"
msgstr "您位于一个尚未初始化的分支"
-#. case (1)
-#: builtin/checkout.c:928
+#: builtin/checkout.c:935
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "只要一个引用，却给出了 %d 个"
+
+#: builtin/checkout.c:974
#, c-format
msgid "invalid reference: %s"
msgstr "无效引用：%s"
#. case (1): want a tree
-#: builtin/checkout.c:967
+#: builtin/checkout.c:1003
#, c-format
msgid "reference is not a tree: %s"
msgstr "引用不是一个树：%s"
-#: builtin/checkout.c:1006
+#: builtin/checkout.c:1042
msgid "paths cannot be used with switching branches"
msgstr "路径不能和切换分支同时使用"
-#: builtin/checkout.c:1009 builtin/checkout.c:1013
+#: builtin/checkout.c:1045 builtin/checkout.c:1049
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' 不能和切换分支同时使用"
-#: builtin/checkout.c:1017 builtin/checkout.c:1020 builtin/checkout.c:1025
-#: builtin/checkout.c:1028
+#: builtin/checkout.c:1053 builtin/checkout.c:1056 builtin/checkout.c:1061
+#: builtin/checkout.c:1064
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' 不能和 '%s' 同时使用"
-#: builtin/checkout.c:1033
+#: builtin/checkout.c:1069
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "不能切换分支到一个非提交 '%s'"
-#: builtin/checkout.c:1055 builtin/checkout.c:1057 builtin/clone.c:89
+#: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88
#: builtin/remote.c:169 builtin/remote.c:171
msgid "branch"
msgstr "分支"
-#: builtin/checkout.c:1056
+#: builtin/checkout.c:1092
msgid "create and checkout a new branch"
msgstr "创建并检出一个新的分支"
-#: builtin/checkout.c:1058
+#: builtin/checkout.c:1094
msgid "create/reset and checkout a branch"
msgstr "创建/重置并检出一个分支"
-#: builtin/checkout.c:1059
+#: builtin/checkout.c:1095
msgid "create reflog for new branch"
msgstr "为新的分支创建引用日志"
-#: builtin/checkout.c:1060
+#: builtin/checkout.c:1096
msgid "detach the HEAD at named commit"
msgstr "成为指向该提交的分离头指针"
-#: builtin/checkout.c:1061
+#: builtin/checkout.c:1097
msgid "set upstream info for new branch"
msgstr "为新的分支设置上游信息"
-#: builtin/checkout.c:1063
+#: builtin/checkout.c:1099
msgid "new branch"
msgstr "新分支"
-#: builtin/checkout.c:1063
+#: builtin/checkout.c:1099
msgid "new unparented branch"
msgstr "新的没有父提交的分支"
-#: builtin/checkout.c:1064
+#: builtin/checkout.c:1100
msgid "checkout our version for unmerged files"
msgstr "对尚未合并的文件检出我们的版本"
-#: builtin/checkout.c:1066
+#: builtin/checkout.c:1102
msgid "checkout their version for unmerged files"
msgstr "对尚未合并的文件检出他们的版本"
-#: builtin/checkout.c:1068
+#: builtin/checkout.c:1104
msgid "force checkout (throw away local modifications)"
msgstr "强制检出（丢弃本地修改）"
-#: builtin/checkout.c:1069
+#: builtin/checkout.c:1105
msgid "perform a 3-way merge with the new branch"
msgstr "和新的分支执行三路合并"
-#: builtin/checkout.c:1070 builtin/merge.c:232
+#: builtin/checkout.c:1106 builtin/merge.c:232
msgid "update ignored files (default)"
msgstr "更新忽略的文件（默认）"
-#: builtin/checkout.c:1071 builtin/log.c:1208 parse-options.h:249
+#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:251
msgid "style"
msgstr "风格"
-#: builtin/checkout.c:1072
+#: builtin/checkout.c:1108
msgid "conflict style (merge or diff3)"
msgstr "冲突输出风格（merge 或 diff3）"
-#: builtin/checkout.c:1075
+#: builtin/checkout.c:1111
msgid "do not limit pathspecs to sparse entries only"
msgstr "对路径不做稀疏检出的限制"
-#: builtin/checkout.c:1077
+#: builtin/checkout.c:1113
msgid "second guess 'git checkout no-such-branch'"
msgstr "再者猜测'git checkout no-such-branch'"
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1136
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b、-B 和 --orphan 是互斥的"
-#: builtin/checkout.c:1118
+#: builtin/checkout.c:1153
msgid "--track needs a branch name"
msgstr "--track 需要一个分支名"
-#: builtin/checkout.c:1125
+#: builtin/checkout.c:1160
msgid "Missing branch name; try -b"
msgstr "缺少分支名；尝试 -b"
-#: builtin/checkout.c:1160
+#: builtin/checkout.c:1197
msgid "invalid path specification"
msgstr "无效的路径规格"
-#: builtin/checkout.c:1167
+#: builtin/checkout.c:1204
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -3398,50 +3576,50 @@ msgstr ""
"不能同时更新路径并切换到分支'%s'。\n"
"您是想要检出 '%s' 但其未能解析为提交么？"
-#: builtin/checkout.c:1172
+#: builtin/checkout.c:1209
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout：--detach 不能接收路径参数 '%s'"
-#: builtin/checkout.c:1176
+#: builtin/checkout.c:1213
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
"git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。"
-#: builtin/clean.c:25
+#: builtin/clean.c:26
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
-#: builtin/clean.c:29
+#: builtin/clean.c:30
#, c-format
msgid "Removing %s\n"
msgstr "正删除 %s\n"
-#: builtin/clean.c:30
+#: builtin/clean.c:31
#, c-format
msgid "Would remove %s\n"
msgstr "将删除 %s\n"
-#: builtin/clean.c:31
+#: builtin/clean.c:32
#, c-format
msgid "Skipping repository %s\n"
msgstr "忽略版本库 %s\n"
-#: builtin/clean.c:32
+#: builtin/clean.c:33
#, c-format
msgid "Would skip repository %s\n"
msgstr "将忽略版本库 %s\n"
-#: builtin/clean.c:33
+#: builtin/clean.c:34
#, c-format
msgid "failed to remove %s"
msgstr "无法删除 %s"
-#: builtin/clean.c:293
+#: builtin/clean.c:294
msgid ""
"Prompt help:\n"
"1 - select a numbered item\n"
@@ -3453,7 +3631,7 @@ msgstr ""
"foo - 通过标题选择一个选项\n"
" - （空）什么也不选择"
-#: builtin/clean.c:297
+#: builtin/clean.c:298
msgid ""
"Prompt help:\n"
"1 - select a single item\n"
@@ -3473,35 +3651,35 @@ msgstr ""
"* - 选择所有选项\n"
" - （空）结束选择"
-#: builtin/clean.c:515
+#: builtin/clean.c:516
#, c-format
msgid "Huh (%s)?"
msgstr "嗯（%s）？"
-#: builtin/clean.c:658
+#: builtin/clean.c:659
#, c-format
msgid "Input ignore patterns>> "
msgstr "输入模版以排除条目>> "
-#: builtin/clean.c:695
+#: builtin/clean.c:696
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "警告：无法找到和 %s 匹配的条目"
-#: builtin/clean.c:716
+#: builtin/clean.c:717
msgid "Select items to delete"
msgstr "选择要删除的条目"
-#: builtin/clean.c:756
+#: builtin/clean.c:757
#, c-format
msgid "remove %s? "
msgstr "删除 %s？"
-#: builtin/clean.c:781
+#: builtin/clean.c:782
msgid "Bye."
msgstr "再见。"
-#: builtin/clean.c:789
+#: builtin/clean.c:790
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -3519,21 +3697,21 @@ msgstr ""
"help - 显示本帮助\n"
"? - 显示如何在提示符下选择的帮助"
-#: builtin/clean.c:816
+#: builtin/clean.c:817
msgid "*** Commands ***"
msgstr "*** 命令 ***"
-#: builtin/clean.c:817
+#: builtin/clean.c:818
msgid "What now"
msgstr "请选择"
-#: builtin/clean.c:825
+#: builtin/clean.c:826
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "将删除如下条目："
msgstr[1] "将删除如下条目："
-#: builtin/clean.c:842
+#: builtin/clean.c:843
msgid "No more files to clean, exiting."
msgstr "没有要清理的文件，退出。"
@@ -3553,8 +3731,8 @@ msgstr "交互式清除"
msgid "remove whole directories"
msgstr "删除整个目录"
-#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:716
-#: builtin/ls-files.c:493 builtin/name-rev.c:315 builtin/show-ref.c:186
+#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718
+#: builtin/ls-files.c:483 builtin/name-rev.c:315 builtin/show-ref.c:185
msgid "pattern"
msgstr "模式"
@@ -3592,8 +3770,8 @@ msgstr ""
msgid "git clone [options] [--] <repo> [<dir>]"
msgstr "git clone [选项] [--] <版本库> [<路径>]"
-#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:229
-#: builtin/push.c:462
+#: builtin/clone.c:64 builtin/fetch.c:96 builtin/merge.c:229
+#: builtin/push.c:474
msgid "force progress reporting"
msgstr "强制显示进度报告"
@@ -3605,123 +3783,123 @@ msgstr "不创建一个检出"
msgid "create a bare repository"
msgstr "创建一个裸版本库"
-#: builtin/clone.c:72
+#: builtin/clone.c:71
msgid "create a mirror repository (implies bare)"
msgstr "创建一个镜像版本库（也是裸版本库）"
-#: builtin/clone.c:74
+#: builtin/clone.c:73
msgid "to clone from a local repository"
msgstr "从本地版本库克隆"
-#: builtin/clone.c:76
+#: builtin/clone.c:75
msgid "don't use local hardlinks, always copy"
msgstr "不使用本地硬链接，始终复制"
-#: builtin/clone.c:78
+#: builtin/clone.c:77
msgid "setup as shared repository"
msgstr "设置为共享版本库"
-#: builtin/clone.c:80 builtin/clone.c:82
+#: builtin/clone.c:79 builtin/clone.c:81
msgid "initialize submodules in the clone"
msgstr "在克隆时初始化子模组"
-#: builtin/clone.c:83 builtin/init-db.c:485
+#: builtin/clone.c:82 builtin/init-db.c:485
msgid "template-directory"
msgstr "模板目录"
-#: builtin/clone.c:84 builtin/init-db.c:486
+#: builtin/clone.c:83 builtin/init-db.c:486
msgid "directory from which templates will be used"
msgstr "模板目录将被使用"
-#: builtin/clone.c:86
+#: builtin/clone.c:85
msgid "reference repository"
msgstr "引用版本库"
-#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr "名称"
-#: builtin/clone.c:88
+#: builtin/clone.c:87
msgid "use <name> instead of 'origin' to track upstream"
msgstr "使用<名称>而不是 'origin' 去跟踪上游"
-#: builtin/clone.c:90
+#: builtin/clone.c:89
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "检出<分支>而不是远程HEAD"
-#: builtin/clone.c:92
+#: builtin/clone.c:91
msgid "path to git-upload-pack on the remote"
msgstr "远程 git-upload-pack 路径"
-#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:661
+#: builtin/clone.c:92 builtin/fetch.c:97 builtin/grep.c:663
msgid "depth"
msgstr "深度"
-#: builtin/clone.c:94
+#: builtin/clone.c:93
msgid "create a shallow clone of that depth"
msgstr "创建一个指定深度的浅克隆"
-#: builtin/clone.c:96
+#: builtin/clone.c:95
msgid "clone only one branch, HEAD or --branch"
msgstr "只克隆一个分支、HEAD 或 --branch"
-#: builtin/clone.c:97 builtin/init-db.c:494
+#: builtin/clone.c:96 builtin/init-db.c:494
msgid "gitdir"
msgstr "git目录"
-#: builtin/clone.c:98 builtin/init-db.c:495
+#: builtin/clone.c:97 builtin/init-db.c:495
msgid "separate git dir from working tree"
msgstr "git目录和工作区分离"
-#: builtin/clone.c:99
+#: builtin/clone.c:98
msgid "key=value"
msgstr "key=value"
-#: builtin/clone.c:100
+#: builtin/clone.c:99
msgid "set config inside the new repository"
msgstr "在新版本库中设置配置信息"
-#: builtin/clone.c:253
+#: builtin/clone.c:252
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "引用版本库 '%s' 不是一个本地版本库。"
-#: builtin/clone.c:316
+#: builtin/clone.c:315
#, c-format
msgid "failed to create directory '%s'"
msgstr "无法创建目录 '%s'"
-#: builtin/clone.c:318 builtin/diff.c:77
+#: builtin/clone.c:317 builtin/diff.c:77
#, c-format
msgid "failed to stat '%s'"
msgstr "无法枚举 '%s' 状态"
-#: builtin/clone.c:320
+#: builtin/clone.c:319
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s 存在且不是一个目录"
-#: builtin/clone.c:334
+#: builtin/clone.c:333
#, c-format
msgid "failed to stat %s\n"
msgstr "无法枚举 %s 状态\n"
-#: builtin/clone.c:356
+#: builtin/clone.c:355
#, c-format
msgid "failed to create link '%s'"
msgstr "无法创建链接 '%s'"
-#: builtin/clone.c:360
+#: builtin/clone.c:359
#, c-format
msgid "failed to copy file to '%s'"
msgstr "无法拷贝文件至 '%s'"
-#: builtin/clone.c:383
+#: builtin/clone.c:382 builtin/clone.c:559
#, c-format
msgid "done.\n"
msgstr "完成。\n"
-#: builtin/clone.c:396
+#: builtin/clone.c:395
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -3731,104 +3909,99 @@ msgstr ""
"您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"
"'git checkout -f HEAD' 重试\n"
-#: builtin/clone.c:475
+#: builtin/clone.c:474
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "不能发现要克隆的远程分支 %s。"
-#: builtin/clone.c:555
+#: builtin/clone.c:554
#, c-format
msgid "Checking connectivity... "
msgstr "检查连接... "
-#: builtin/clone.c:558
+#: builtin/clone.c:557
msgid "remote did not send all necessary objects"
msgstr "远程没有发送所有必须的对象"
-#: builtin/clone.c:560
-#, c-format
-msgid "done\n"
-msgstr "完成\n"
-
-#: builtin/clone.c:621
+#: builtin/clone.c:620
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
-#: builtin/clone.c:652
+#: builtin/clone.c:651
msgid "unable to checkout working tree"
msgstr "不能检出工作区"
-#: builtin/clone.c:760
+#: builtin/clone.c:759
msgid "Too many arguments."
msgstr "太多参数。"
-#: builtin/clone.c:764
+#: builtin/clone.c:763
msgid "You must specify a repository to clone."
msgstr "您必须指定一个版本库来克隆。"
-#: builtin/clone.c:775
+#: builtin/clone.c:774
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare 和 --origin %s 选项不兼容。"
-#: builtin/clone.c:778
+#: builtin/clone.c:777
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare 和 --separate-git-dir 选项不兼容。"
-#: builtin/clone.c:791
+#: builtin/clone.c:790
#, c-format
msgid "repository '%s' does not exist"
msgstr "版本库 '%s' 不存在"
-#: builtin/clone.c:796
+#: builtin/clone.c:795
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"
-#: builtin/clone.c:798
+#: builtin/clone.c:797
msgid "--local is ignored"
msgstr "--local 被忽略"
-#: builtin/clone.c:808
+#: builtin/clone.c:807
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
-#: builtin/clone.c:818
+#: builtin/clone.c:817
#, c-format
msgid "working tree '%s' already exists."
msgstr "工作区 '%s' 已经存在。"
-#: builtin/clone.c:831 builtin/clone.c:843
+#: builtin/clone.c:830 builtin/clone.c:842
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "不能为 '%s' 创建先导目录"
-#: builtin/clone.c:834
+#: builtin/clone.c:833
#, c-format
msgid "could not create work tree dir '%s'."
msgstr "不能为 '%s' 创建工作区目录。"
-#: builtin/clone.c:853
+#: builtin/clone.c:852
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "克隆到裸版本库 '%s'...\n"
-#: builtin/clone.c:855
+#: builtin/clone.c:854
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "正克隆到 '%s'...\n"
-#: builtin/clone.c:890
+#: builtin/clone.c:888
#, c-format
msgid "Don't know how to clone %s"
msgstr "不知道如何克隆 %s"
-#: builtin/clone.c:942
+#: builtin/clone.c:939 builtin/clone.c:947
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "远程分支 %s 在上游 %s 未发现"
-#: builtin/clone.c:949
+#: builtin/clone.c:950
msgid "You appear to have cloned an empty repository."
msgstr "您似乎克隆了一个空版本库。"
@@ -3864,15 +4037,15 @@ msgstr "两列之间的填充空间"
msgid "--command must be the first argument"
msgstr "--command 必须是第一个参数"
-#: builtin/commit.c:35
+#: builtin/commit.c:36
msgid "git commit [options] [--] <pathspec>..."
-msgstr "git commit [选项] [--] <路径匹配>..."
+msgstr "git commit [选项] [--] <路径规则>..."
-#: builtin/commit.c:40
+#: builtin/commit.c:41
msgid "git status [options] [--] <pathspec>..."
-msgstr "git status [选项] [--] <路径匹配>..."
+msgstr "git status [选项] [--] <路径规则>..."
-#: builtin/commit.c:45
+#: builtin/commit.c:46
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -3895,7 +4068,7 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: builtin/commit.c:57
+#: builtin/commit.c:58
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -3904,7 +4077,7 @@ msgstr ""
"您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n"
"--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
-#: builtin/commit.c:62
+#: builtin/commit.c:63
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -3918,11 +4091,11 @@ msgstr ""
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:69
+#: builtin/commit.c:70
msgid "Otherwise, please use 'git reset'\n"
msgstr "否则，请使用命令 'git reset'\n"
-#: builtin/commit.c:72
+#: builtin/commit.c:73
msgid ""
"If you wish to skip this commit, use:\n"
"\n"
@@ -3938,93 +4111,93 @@ msgstr ""
"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
"操作。\n"
-#: builtin/commit.c:279
+#: builtin/commit.c:287
msgid "failed to unpack HEAD tree object"
msgstr "无法解包 HEAD 树对象"
-#: builtin/commit.c:321
+#: builtin/commit.c:329
msgid "unable to create temporary index"
msgstr "不能创建临时索引"
-#: builtin/commit.c:327
+#: builtin/commit.c:335
msgid "interactive add failed"
msgstr "交互式添加失败"
-#: builtin/commit.c:360 builtin/commit.c:381 builtin/commit.c:431
+#: builtin/commit.c:368 builtin/commit.c:389 builtin/commit.c:439
msgid "unable to write new_index file"
msgstr "无法写 new_index 文件"
-#: builtin/commit.c:412
+#: builtin/commit.c:420
msgid "cannot do a partial commit during a merge."
msgstr "在合并过程中不能做部分提交。"
-#: builtin/commit.c:414
+#: builtin/commit.c:422
msgid "cannot do a partial commit during a cherry-pick."
msgstr "在拣选过程中不能做部分提交。"
-#: builtin/commit.c:424
+#: builtin/commit.c:432
msgid "cannot read the index"
msgstr "无法读取索引"
-#: builtin/commit.c:444
+#: builtin/commit.c:452
msgid "unable to write temporary index file"
msgstr "无法写临时索引文件"
-#: builtin/commit.c:535 builtin/commit.c:541
+#: builtin/commit.c:543 builtin/commit.c:549
#, c-format
msgid "invalid commit: %s"
msgstr "无效的提交：%s"
-#: builtin/commit.c:563
+#: builtin/commit.c:571
msgid "malformed --author parameter"
msgstr "非法的 --author 参数"
-#: builtin/commit.c:583
+#: builtin/commit.c:591
#, c-format
msgid "Malformed ident string: '%s'"
msgstr "非法的身份字符串：'%s'"
-#: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:982
+#: builtin/commit.c:630 builtin/commit.c:663 builtin/commit.c:1007
#, c-format
msgid "could not lookup commit %s"
msgstr "不能查询提交 %s"
-#: builtin/commit.c:633 builtin/shortlog.c:271
+#: builtin/commit.c:642 builtin/shortlog.c:273
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "（正从标准输入中读取日志信息）\n"
-#: builtin/commit.c:635
+#: builtin/commit.c:644
msgid "could not read log from standard input"
msgstr "不能从标准输入中读取日志信息"
-#: builtin/commit.c:639
+#: builtin/commit.c:648
#, c-format
msgid "could not read log file '%s'"
msgstr "不能读取日志文件 '%s'"
-#: builtin/commit.c:645
+#: builtin/commit.c:654
msgid "commit has empty message"
msgstr "提交说明为空"
-#: builtin/commit.c:661
+#: builtin/commit.c:670
msgid "could not read MERGE_MSG"
msgstr "不能读取 MERGE_MSG"
-#: builtin/commit.c:665
+#: builtin/commit.c:674
msgid "could not read SQUASH_MSG"
msgstr "不能读取 SQUASH_MSG"
-#: builtin/commit.c:669
+#: builtin/commit.c:678
#, c-format
msgid "could not read '%s'"
msgstr "不能读取 '%s'"
-#: builtin/commit.c:730
+#: builtin/commit.c:749
msgid "could not write commit template"
msgstr "不能写提交模版"
-#: builtin/commit.c:741
+#: builtin/commit.c:760
#, c-format
msgid ""
"\n"
@@ -4038,7 +4211,7 @@ msgstr ""
"\t%s\n"
"然后重试。\n"
-#: builtin/commit.c:746
+#: builtin/commit.c:765
#, c-format
msgid ""
"\n"
@@ -4052,7 +4225,7 @@ msgstr ""
"\t%s\n"
"然后重试。\n"
-#: builtin/commit.c:758
+#: builtin/commit.c:777
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -4061,7 +4234,7 @@ msgstr ""
"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"
"说明将会终止提交。\n"
-#: builtin/commit.c:763
+#: builtin/commit.c:782
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -4072,355 +4245,355 @@ msgstr ""
"也可以删除它们。一个空的提交说明将会终止提交。\n"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:776
+#: builtin/commit.c:795
#, c-format
msgid "%sAuthor: %s"
msgstr "%s作者： %s"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:783
+#: builtin/commit.c:802
#, c-format
msgid "%sCommitter: %s"
msgstr "%s提交者： %s"
-#: builtin/commit.c:803
+#: builtin/commit.c:822
msgid "Cannot read index"
msgstr "无法读取索引"
-#: builtin/commit.c:845
+#: builtin/commit.c:865
msgid "Error building trees"
msgstr "无法创建树对象"
-#: builtin/commit.c:860 builtin/tag.c:359
+#: builtin/commit.c:880 builtin/tag.c:359
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
-#: builtin/commit.c:957
+#: builtin/commit.c:982
#, c-format
msgid "No existing author found with '%s'"
msgstr "没有找到匹配 '%s' 的作者"
-#: builtin/commit.c:972 builtin/commit.c:1208
+#: builtin/commit.c:997 builtin/commit.c:1237
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "无效的未追踪文件参数 '%s'"
-#: builtin/commit.c:1009
+#: builtin/commit.c:1034
msgid "--long and -z are incompatible"
msgstr "--long 和 -z 选项不兼容"
-#: builtin/commit.c:1039
+#: builtin/commit.c:1064
msgid "Using both --reset-author and --author does not make sense"
msgstr "同时使用 --reset-author 和 --author 没有意义"
-#: builtin/commit.c:1050
+#: builtin/commit.c:1075
msgid "You have nothing to amend."
msgstr "您没有可修补的提交。"
-#: builtin/commit.c:1053
+#: builtin/commit.c:1078
msgid "You are in the middle of a merge -- cannot amend."
msgstr "您正处于一个合并过程中 -- 无法修补提交。"
-#: builtin/commit.c:1055
+#: builtin/commit.c:1080
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
-#: builtin/commit.c:1058
+#: builtin/commit.c:1083
msgid "Options --squash and --fixup cannot be used together"
msgstr "选项 --squash 和 --fixup 不能同时使用"
-#: builtin/commit.c:1068
+#: builtin/commit.c:1093
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
-#: builtin/commit.c:1070
+#: builtin/commit.c:1095
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
-#: builtin/commit.c:1078
+#: builtin/commit.c:1103
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
-#: builtin/commit.c:1095
+#: builtin/commit.c:1120
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
-#: builtin/commit.c:1097
+#: builtin/commit.c:1122
msgid "No paths with --include/--only does not make sense."
msgstr "参数 --include/--only 不跟路径没有意义。"
-#: builtin/commit.c:1099
+#: builtin/commit.c:1124
msgid "Clever... amending the last one with dirty index."
msgstr "聪明... 在索引不干净下修补最后的提交。"
-#: builtin/commit.c:1101
+#: builtin/commit.c:1126
msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
msgstr "指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths..."
-#: builtin/commit.c:1111 builtin/tag.c:575
+#: builtin/commit.c:1136 builtin/tag.c:572
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "无效的清理模式 %s"
-#: builtin/commit.c:1116
+#: builtin/commit.c:1141
msgid "Paths with -a does not make sense."
msgstr "路径和 -a 选项同时使用没有意义。"
-#: builtin/commit.c:1222 builtin/commit.c:1455
+#: builtin/commit.c:1251 builtin/commit.c:1482
msgid "show status concisely"
msgstr "以简洁的格式显示状态"
-#: builtin/commit.c:1224 builtin/commit.c:1457
+#: builtin/commit.c:1253 builtin/commit.c:1484
msgid "show branch information"
msgstr "显示分支信息"
-#: builtin/commit.c:1226 builtin/commit.c:1459 builtin/push.c:452
+#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:460
msgid "machine-readable output"
msgstr "机器可读的输出"
-#: builtin/commit.c:1229 builtin/commit.c:1461
+#: builtin/commit.c:1258 builtin/commit.c:1488
msgid "show status in long format (default)"
msgstr "以长格式显示状态（默认）"
-#: builtin/commit.c:1232 builtin/commit.c:1464
+#: builtin/commit.c:1261 builtin/commit.c:1491
msgid "terminate entries with NUL"
msgstr "条目以NUL字符结尾"
-#: builtin/commit.c:1234 builtin/commit.c:1467 builtin/fast-export.c:667
-#: builtin/fast-export.c:670 builtin/tag.c:459
+#: builtin/commit.c:1263 builtin/commit.c:1494 builtin/fast-export.c:674
+#: builtin/fast-export.c:677 builtin/tag.c:459
msgid "mode"
msgstr "模式"
-#: builtin/commit.c:1235 builtin/commit.c:1467
+#: builtin/commit.c:1264 builtin/commit.c:1494
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"
-#: builtin/commit.c:1238
+#: builtin/commit.c:1267
msgid "show ignored files"
msgstr "显示忽略的文件"
-#: builtin/commit.c:1239 parse-options.h:154
+#: builtin/commit.c:1268 parse-options.h:156
msgid "when"
msgstr "何时"
-#: builtin/commit.c:1240
+#: builtin/commit.c:1269
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
"忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"
-#: builtin/commit.c:1242
+#: builtin/commit.c:1271
msgid "list untracked files in columns"
msgstr "以列的方式显示未跟踪的文件"
-#: builtin/commit.c:1313
+#: builtin/commit.c:1340
msgid "couldn't look up newly created commit"
msgstr "无法找到新创建的提交"
-#: builtin/commit.c:1315
+#: builtin/commit.c:1342
msgid "could not parse newly created commit"
msgstr "不能解析新创建的提交"
-#: builtin/commit.c:1356
+#: builtin/commit.c:1383
msgid "detached HEAD"
msgstr "分离头指针"
# 译者：中文字符串拼接，可删除前导空格
-#: builtin/commit.c:1358
+#: builtin/commit.c:1385
msgid " (root-commit)"
msgstr "（根提交）"
-#: builtin/commit.c:1425
+#: builtin/commit.c:1452
msgid "suppress summary after successful commit"
msgstr "提交成功后不显示概述信息"
-#: builtin/commit.c:1426
+#: builtin/commit.c:1453
msgid "show diff in commit message template"
msgstr "在提交说明模板里显示差异"
-#: builtin/commit.c:1428
+#: builtin/commit.c:1455
msgid "Commit message options"
msgstr "提交说明选项"
-#: builtin/commit.c:1429 builtin/tag.c:457
+#: builtin/commit.c:1456 builtin/tag.c:457
msgid "read message from file"
msgstr "从文件中读取提交说明"
-#: builtin/commit.c:1430
+#: builtin/commit.c:1457
msgid "author"
msgstr "作者"
-#: builtin/commit.c:1430
+#: builtin/commit.c:1457
msgid "override author for commit"
msgstr "提交时覆盖作者"
-#: builtin/commit.c:1431 builtin/gc.c:178
+#: builtin/commit.c:1458 builtin/gc.c:260
msgid "date"
msgstr "日期"
-#: builtin/commit.c:1431
+#: builtin/commit.c:1458
msgid "override date for commit"
msgstr "提交时覆盖日期"
-#: builtin/commit.c:1432 builtin/merge.c:223 builtin/notes.c:405
+#: builtin/commit.c:1459 builtin/merge.c:223 builtin/notes.c:405
#: builtin/notes.c:562 builtin/tag.c:455
msgid "message"
msgstr "说明"
-#: builtin/commit.c:1432
+#: builtin/commit.c:1459
msgid "commit message"
msgstr "提交说明"
-#: builtin/commit.c:1433
+#: builtin/commit.c:1460
msgid "reuse and edit message from specified commit"
msgstr "重用并编辑指定提交的提交说明"
-#: builtin/commit.c:1434
+#: builtin/commit.c:1461
msgid "reuse message from specified commit"
msgstr "重用指定提交的提交说明"
-#: builtin/commit.c:1435
+#: builtin/commit.c:1462
msgid "use autosquash formatted message to fixup specified commit"
msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
-#: builtin/commit.c:1436
+#: builtin/commit.c:1463
msgid "use autosquash formatted message to squash specified commit"
msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
-#: builtin/commit.c:1437
+#: builtin/commit.c:1464
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"
-#: builtin/commit.c:1438 builtin/log.c:1160 builtin/revert.c:111
+#: builtin/commit.c:1465 builtin/log.c:1180 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "添加 Signed-off-by: 签名"
-#: builtin/commit.c:1439
+#: builtin/commit.c:1466
msgid "use specified template file"
msgstr "使用指定的模板文件"
-#: builtin/commit.c:1440
+#: builtin/commit.c:1467
msgid "force edit of commit"
msgstr "强制编辑提交"
# 译者：可选值，不能翻译（或是原文中笔误，应为 mode）
-#: builtin/commit.c:1441
+#: builtin/commit.c:1468
msgid "default"
msgstr "default"
-#: builtin/commit.c:1441 builtin/tag.c:460
+#: builtin/commit.c:1468 builtin/tag.c:460
msgid "how to strip spaces and #comments from message"
msgstr "设置如何删除提交说明里的空格和#注释"
-#: builtin/commit.c:1442
+#: builtin/commit.c:1469
msgid "include status in commit message template"
msgstr "在提交说明模板里包含状态信息"
-#: builtin/commit.c:1443 builtin/merge.c:230 builtin/tag.c:461
+#: builtin/commit.c:1470 builtin/merge.c:230 builtin/tag.c:461
msgid "key id"
msgstr "key id"
-#: builtin/commit.c:1444 builtin/merge.c:231
+#: builtin/commit.c:1471 builtin/merge.c:231
msgid "GPG sign commit"
msgstr "GPG 提交签名"
#. end commit message options
-#: builtin/commit.c:1447
+#: builtin/commit.c:1474
msgid "Commit contents options"
msgstr "提交内容选项"
-#: builtin/commit.c:1448
+#: builtin/commit.c:1475
msgid "commit all changed files"
msgstr "提交所有改动的文件"
-#: builtin/commit.c:1449
+#: builtin/commit.c:1476
msgid "add specified files to index for commit"
msgstr "添加指定的文件到索引区等待提交"
-#: builtin/commit.c:1450
+#: builtin/commit.c:1477
msgid "interactively add files"
msgstr "交互式添加文件"
-#: builtin/commit.c:1451
+#: builtin/commit.c:1478
msgid "interactively add changes"
msgstr "交互式添加变更"
-#: builtin/commit.c:1452
+#: builtin/commit.c:1479
msgid "commit only specified files"
msgstr "只提交指定的文件"
-#: builtin/commit.c:1453
+#: builtin/commit.c:1480
msgid "bypass pre-commit hook"
msgstr "绕过 pre-commit 钩子"
-#: builtin/commit.c:1454
+#: builtin/commit.c:1481
msgid "show what would be committed"
msgstr "显示将要提交的内容"
-#: builtin/commit.c:1465
+#: builtin/commit.c:1492
msgid "amend previous commit"
msgstr "修改先前的提交"
-#: builtin/commit.c:1466
+#: builtin/commit.c:1493
msgid "bypass post-rewrite hook"
msgstr "绕过 post-rewrite 钩子"
-#: builtin/commit.c:1471
+#: builtin/commit.c:1498
msgid "ok to record an empty change"
msgstr "允许一个空提交"
-#: builtin/commit.c:1474
+#: builtin/commit.c:1500
msgid "ok to record a change with an empty message"
msgstr "允许空的提交说明"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1529
msgid "could not parse HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: builtin/commit.c:1545 builtin/merge.c:525
+#: builtin/commit.c:1567 builtin/merge.c:525
#, c-format
msgid "could not open '%s' for reading"
msgstr "不能为读入打开 '%s'"
-#: builtin/commit.c:1552
+#: builtin/commit.c:1574
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "损坏的 MERGE_HEAD 文件（%s）"
-#: builtin/commit.c:1559
+#: builtin/commit.c:1581
msgid "could not read MERGE_MODE"
msgstr "不能读取 MERGE_MODE"
-#: builtin/commit.c:1578
+#: builtin/commit.c:1600
#, c-format
msgid "could not read commit message: %s"
msgstr "不能读取提交说明：%s"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1614
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "终止提交；您未更改来自模版的提交说明。\n"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1619
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "终止提交因为提交说明为空。\n"
-#: builtin/commit.c:1612 builtin/merge.c:861 builtin/merge.c:886
+#: builtin/commit.c:1634 builtin/merge.c:861 builtin/merge.c:886
msgid "failed to write commit object"
msgstr "无法写提交对象"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1655
msgid "cannot lock HEAD ref"
msgstr "无法锁定 HEAD 引用"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1659
msgid "cannot update HEAD ref"
msgstr "无法更新 HEAD 引用"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1670
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full or quota is\n"
@@ -4429,127 +4602,131 @@ msgstr ""
"版本库已更新，但无法写 new_index 文件。检查是否磁盘已满\n"
"或磁盘配额已耗尽，然后执行 \"git reset HEAD\" 恢复。"
-#: builtin/config.c:7
+#: builtin/config.c:8
msgid "git config [options]"
msgstr "git config [选项]"
-#: builtin/config.c:52
+#: builtin/config.c:54
msgid "Config file location"
msgstr "配置文件位置"
-#: builtin/config.c:53
+#: builtin/config.c:55
msgid "use global config file"
msgstr "使用全局配置文件"
-#: builtin/config.c:54
+#: builtin/config.c:56
msgid "use system config file"
msgstr "使用系统级配置文件"
-#: builtin/config.c:55
+#: builtin/config.c:57
msgid "use repository config file"
msgstr "使用版本库级配置文件"
-#: builtin/config.c:56
+#: builtin/config.c:58
msgid "use given config file"
msgstr "使用指定的配置文件"
-#: builtin/config.c:57
+#: builtin/config.c:59
msgid "blob-id"
msgstr "数据对象ID"
-#: builtin/config.c:57
+#: builtin/config.c:59
msgid "read config from given blob object"
msgstr "从给定的数据对象读取配置"
-#: builtin/config.c:58
+#: builtin/config.c:60
msgid "Action"
msgstr "操作"
-#: builtin/config.c:59
+#: builtin/config.c:61
msgid "get value: name [value-regex]"
msgstr "获取值：name [value-regex]"
-#: builtin/config.c:60
+#: builtin/config.c:62
msgid "get all values: key [value-regex]"
msgstr "获得所有的值：key [value-regex]"
-#: builtin/config.c:61
+#: builtin/config.c:63
msgid "get values for regexp: name-regex [value-regex]"
msgstr "根据正则表达式获得值：name-regex [value-regex]"
-#: builtin/config.c:62
+#: builtin/config.c:64
+msgid "get value specific for the URL: section[.var] URL"
+msgstr "获得 URL 取值：section[.var] URL"
+
+#: builtin/config.c:65
msgid "replace all matching variables: name value [value_regex]"
msgstr "替换所有匹配的变量：name value [value_regex]"
-#: builtin/config.c:63
+#: builtin/config.c:66
msgid "add a new variable: name value"
msgstr "添加一个新的变量：name value"
-#: builtin/config.c:64
+#: builtin/config.c:67
msgid "remove a variable: name [value-regex]"
msgstr "删除一个变量：name [value-regex]"
-#: builtin/config.c:65
+#: builtin/config.c:68
msgid "remove all matches: name [value-regex]"
msgstr "删除所有匹配项：name [value-regex]"
-#: builtin/config.c:66
+#: builtin/config.c:69
msgid "rename section: old-name new-name"
msgstr "重命名小节：old-name new-name"
-#: builtin/config.c:67
+#: builtin/config.c:70
msgid "remove a section: name"
msgstr "删除一个小节：name"
-#: builtin/config.c:68
+#: builtin/config.c:71
msgid "list all"
msgstr "列出所有"
-#: builtin/config.c:69
+#: builtin/config.c:72
msgid "open an editor"
msgstr "打开一个编辑器"
-#: builtin/config.c:70 builtin/config.c:71
+#: builtin/config.c:73 builtin/config.c:74
msgid "slot"
msgstr "slot"
-#: builtin/config.c:70
+#: builtin/config.c:73
msgid "find the color configured: [default]"
msgstr "找到配置的颜色：[默认]"
-#: builtin/config.c:71
+#: builtin/config.c:74
msgid "find the color setting: [stdout-is-tty]"
msgstr "找到颜色设置：[stdout-is-tty]"
-#: builtin/config.c:72
+#: builtin/config.c:75
msgid "Type"
msgstr "类型"
-#: builtin/config.c:73
+#: builtin/config.c:76
msgid "value is \"true\" or \"false\""
msgstr "值是 \"true\" 或 \"false\""
-#: builtin/config.c:74
+#: builtin/config.c:77
msgid "value is decimal number"
msgstr "值是十进制数"
-#: builtin/config.c:75
+#: builtin/config.c:78
msgid "value is --bool or --int"
msgstr "值是 --bool or --int"
-#: builtin/config.c:76
+#: builtin/config.c:79
msgid "value is a path (file or directory name)"
msgstr "值是一个路径（文件或目录名）"
-#: builtin/config.c:77
+#: builtin/config.c:80
msgid "Other"
msgstr "其它"
-#: builtin/config.c:78
+#: builtin/config.c:81
msgid "terminate values with NUL byte"
msgstr "终止值是NUL字节"
-#: builtin/config.c:79
+#: builtin/config.c:82
msgid "respect include directives on lookup"
msgstr "查询时参照 include 指令递归查找"
@@ -4734,45 +4911,45 @@ msgstr "提供了无法处理的对象 '%s'。"
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:666
+#: builtin/fast-export.c:673
msgid "show progress after <n> objects"
msgstr "在 <n> 个对象之后显示进度"
-#: builtin/fast-export.c:668
+#: builtin/fast-export.c:675
msgid "select handling of signed tags"
msgstr "选择如何处理签名 tags"
-#: builtin/fast-export.c:671
+#: builtin/fast-export.c:678
msgid "select handling of tags that tag filtered objects"
msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
-#: builtin/fast-export.c:674
+#: builtin/fast-export.c:681
msgid "Dump marks to this file"
msgstr "把标记存储到这个文件"
-#: builtin/fast-export.c:676
+#: builtin/fast-export.c:683
msgid "Import marks from this file"
msgstr "从这个文件导入标记"
-#: builtin/fast-export.c:678
+#: builtin/fast-export.c:685
msgid "Fake a tagger when tags lack one"
msgstr "当 tags 缺少标记者字段时，假装提供一个"
-#: builtin/fast-export.c:680
+#: builtin/fast-export.c:687
msgid "Output full tree for each commit"
msgstr "每次提交都输出整个树"
-#: builtin/fast-export.c:682
+#: builtin/fast-export.c:689
msgid "Use the done feature to terminate the stream"
msgstr "使用 done 功能来终止流"
-#: builtin/fast-export.c:683
+#: builtin/fast-export.c:690
msgid "Skip output of blob data"
msgstr "跳过数据对象的输出"
#: builtin/fetch.c:20
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
-msgstr "git fetch [<选项>] [<版本库> [<引用表达式>...]]"
+msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]"
#: builtin/fetch.c:21
msgid "git fetch [<options>] <group>"
@@ -4786,146 +4963,146 @@ msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<选项>]"
-#: builtin/fetch.c:60
+#: builtin/fetch.c:74
msgid "fetch from all remotes"
msgstr "从所有的远程抓取"
-#: builtin/fetch.c:62
+#: builtin/fetch.c:76
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
-#: builtin/fetch.c:64
+#: builtin/fetch.c:78
msgid "path to upload pack on remote end"
msgstr "上传包到远程的路径"
-#: builtin/fetch.c:65
+#: builtin/fetch.c:79
msgid "force overwrite of local branch"
msgstr "强制覆盖本地分支"
-#: builtin/fetch.c:67
+#: builtin/fetch.c:81
msgid "fetch from multiple remotes"
msgstr "从多个远程抓取"
-#: builtin/fetch.c:69
+#: builtin/fetch.c:83
msgid "fetch all tags and associated objects"
msgstr "抓取所有的 tags 和关联对象"
-#: builtin/fetch.c:71
+#: builtin/fetch.c:85
msgid "do not fetch all tags (--no-tags)"
msgstr "不抓取任何 tags (--no-tags)"
-#: builtin/fetch.c:73
+#: builtin/fetch.c:87
msgid "prune remote-tracking branches no longer on remote"
msgstr "清除远程已经不存在的分支的跟踪分支"
# 译者：可选值，不能翻译
-#: builtin/fetch.c:74
+#: builtin/fetch.c:88
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:75
+#: builtin/fetch.c:89
msgid "control recursive fetching of submodules"
msgstr "控制子模组的递归抓取"
-#: builtin/fetch.c:79
+#: builtin/fetch.c:93
msgid "keep downloaded pack"
msgstr "保持下载包"
-#: builtin/fetch.c:81
+#: builtin/fetch.c:95
msgid "allow updating of HEAD ref"
msgstr "允许更新 HEAD 引用"
-#: builtin/fetch.c:84
+#: builtin/fetch.c:98
msgid "deepen history of shallow clone"
msgstr "深化浅克隆的历史"
-#: builtin/fetch.c:86
+#: builtin/fetch.c:100
msgid "convert to a complete repository"
msgstr "转换为一个完整的版本库"
-#: builtin/fetch.c:88 builtin/log.c:1177
+#: builtin/fetch.c:102 builtin/log.c:1197
msgid "dir"
msgstr "目录"
-#: builtin/fetch.c:89
+#: builtin/fetch.c:103
msgid "prepend this to submodule path output"
msgstr "在子模组路径输出的前面加上此目录"
-#: builtin/fetch.c:92
+#: builtin/fetch.c:106
msgid "default mode for recursion"
msgstr "递归的默认模式"
-#: builtin/fetch.c:220
+#: builtin/fetch.c:236
msgid "Couldn't find remote ref HEAD"
msgstr "无法发现远程 HEAD 引用"
-#: builtin/fetch.c:273
+#: builtin/fetch.c:290
#, c-format
msgid "object %s not found"
msgstr "对象 %s 未发现"
-#: builtin/fetch.c:278
+#: builtin/fetch.c:295
msgid "[up to date]"
msgstr "[最新]"
-#: builtin/fetch.c:292
+#: builtin/fetch.c:309
#, c-format
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr "! %-*s %-*s -> %s （在当前分支下不能获取）"
-#: builtin/fetch.c:293 builtin/fetch.c:379
+#: builtin/fetch.c:310 builtin/fetch.c:396
msgid "[rejected]"
msgstr "[已拒绝]"
-#: builtin/fetch.c:304
+#: builtin/fetch.c:321
msgid "[tag update]"
msgstr "[tag更新]"
# 译者：注意保持前导空格
-#: builtin/fetch.c:306 builtin/fetch.c:341 builtin/fetch.c:359
+#: builtin/fetch.c:323 builtin/fetch.c:358 builtin/fetch.c:376
msgid " (unable to update local ref)"
msgstr " （不能更新本地引用）"
-#: builtin/fetch.c:324
+#: builtin/fetch.c:341
msgid "[new tag]"
msgstr "[新tag]"
-#: builtin/fetch.c:327
+#: builtin/fetch.c:344
msgid "[new branch]"
msgstr "[新分支]"
-#: builtin/fetch.c:330
+#: builtin/fetch.c:347
msgid "[new ref]"
msgstr "[新引用]"
-#: builtin/fetch.c:375
+#: builtin/fetch.c:392
msgid "unable to update local ref"
msgstr "不能更新本地引用"
-#: builtin/fetch.c:375
+#: builtin/fetch.c:392
msgid "forced update"
msgstr "强制更新"
-#: builtin/fetch.c:381
+#: builtin/fetch.c:398
msgid "(non-fast-forward)"
msgstr "（非快进式）"
-#: builtin/fetch.c:412 builtin/fetch.c:718
+#: builtin/fetch.c:429 builtin/fetch.c:735
#, c-format
msgid "cannot open %s: %s\n"
msgstr "无法打开 %s：%s\n"
-#: builtin/fetch.c:421
+#: builtin/fetch.c:438
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s 未发送所有必须的对象\n"
-#: builtin/fetch.c:520
+#: builtin/fetch.c:537
#, c-format
msgid "From %.*s\n"
msgstr "来自 %.*s\n"
-#: builtin/fetch.c:531
+#: builtin/fetch.c:548
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -4935,98 +5112,98 @@ msgstr ""
" 'git remote prune %s' 来删除旧的、有冲突的分支"
# 译者：注意保持前导空格
-#: builtin/fetch.c:581
+#: builtin/fetch.c:598
#, c-format
msgid " (%s will become dangling)"
msgstr " （%s 将成为摇摆状态）"
# 译者：注意保持前导空格
-#: builtin/fetch.c:582
+#: builtin/fetch.c:599
#, c-format
msgid " (%s has become dangling)"
msgstr " （%s 已成为摇摆状态）"
-#: builtin/fetch.c:589
+#: builtin/fetch.c:606
msgid "[deleted]"
msgstr "[已删除]"
-#: builtin/fetch.c:590 builtin/remote.c:1055
+#: builtin/fetch.c:607 builtin/remote.c:1055
msgid "(none)"
msgstr "（无）"
-#: builtin/fetch.c:708
+#: builtin/fetch.c:725
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "拒绝获取到非裸版本库的当前分支 %s"
-#: builtin/fetch.c:742
-#, c-format
-msgid "Don't know how to fetch from %s"
-msgstr "不知道如何从 %s 获取"
-
-#: builtin/fetch.c:823
+#: builtin/fetch.c:744
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
-#: builtin/fetch.c:826
+#: builtin/fetch.c:747
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "选项 \"%s\" 为 %s 所忽略\n"
-#: builtin/fetch.c:928
+#: builtin/fetch.c:801
+#, c-format
+msgid "Don't know how to fetch from %s"
+msgstr "不知道如何从 %s 获取"
+
+#: builtin/fetch.c:976
#, c-format
msgid "Fetching %s\n"
msgstr "正在获取 %s\n"
-#: builtin/fetch.c:930 builtin/remote.c:100
+#: builtin/fetch.c:978 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr "不能获取 %s"
-#: builtin/fetch.c:949
+#: builtin/fetch.c:997
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:969
+#: builtin/fetch.c:1020
msgid "You need to specify a tag name."
msgstr "您需要指定一个 tag 名称。"
-#: builtin/fetch.c:1015
+#: builtin/fetch.c:1068
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth 和 --unshallow 不能同时使用"
-#: builtin/fetch.c:1017
+#: builtin/fetch.c:1070
msgid "--unshallow on a complete repository does not make sense"
msgstr "对于一个完整的版本库，参数 --unshallow 没有意义"
-#: builtin/fetch.c:1036
+#: builtin/fetch.c:1089
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all 不能带一个版本库参数"
-#: builtin/fetch.c:1038
+#: builtin/fetch.c:1091
msgid "fetch --all does not make sense with refspecs"
-msgstr "fetch --all 带引用表达式没有任何意义"
+msgstr "fetch --all 带引用规则没有任何意义"
-#: builtin/fetch.c:1049
+#: builtin/fetch.c:1102
#, c-format
msgid "No such remote or remote group: %s"
msgstr "没有这样的远程或远程组：%s"
-#: builtin/fetch.c:1057
+#: builtin/fetch.c:1110
msgid "Fetching a group and specifying refspecs does not make sense"
-msgstr "获取组并指定引用表达式没有意义"
+msgstr "获取组并指定引用规则没有意义"
#: builtin/fmt-merge-msg.c:13
msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
msgstr ""
"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
-#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700
-#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:179
-#: builtin/tag.c:446 parse-options.h:133 parse-options.h:243
+#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702
+#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:178
+#: builtin/tag.c:446 parse-options.h:135 parse-options.h:245
msgid "n"
msgstr "n"
@@ -5050,117 +5227,121 @@ msgstr "使用 <文本> 作为提交说明的开始"
msgid "file to read from"
msgstr "从文件中读取"
-#: builtin/for-each-ref.c:979
+#: builtin/for-each-ref.c:995
msgid "git for-each-ref [options] [<pattern>]"
msgstr "git for-each-ref [选项] [<模式>]"
-#: builtin/for-each-ref.c:994
+#: builtin/for-each-ref.c:1010
msgid "quote placeholders suitably for shells"
msgstr "引用占位符适用于 shells"
-#: builtin/for-each-ref.c:996
+#: builtin/for-each-ref.c:1012
msgid "quote placeholders suitably for perl"
msgstr "引用占位符适用于 perl"
-#: builtin/for-each-ref.c:998
+#: builtin/for-each-ref.c:1014
msgid "quote placeholders suitably for python"
msgstr "引用占位符适用于 python"
-#: builtin/for-each-ref.c:1000
+#: builtin/for-each-ref.c:1016
msgid "quote placeholders suitably for tcl"
msgstr "引用占位符适用于 tcl"
-#: builtin/for-each-ref.c:1003
+#: builtin/for-each-ref.c:1019
msgid "show only <n> matched refs"
msgstr "只显示 <n> 个匹配的引用"
-#: builtin/for-each-ref.c:1004
+#: builtin/for-each-ref.c:1020
msgid "format"
msgstr "格式"
-#: builtin/for-each-ref.c:1004
+#: builtin/for-each-ref.c:1020
msgid "format to use for the output"
msgstr "输出格式"
-#: builtin/for-each-ref.c:1005
+#: builtin/for-each-ref.c:1021
msgid "key"
msgstr "key"
-#: builtin/for-each-ref.c:1006
+#: builtin/for-each-ref.c:1022
msgid "field name to sort on"
msgstr "排序的字段名"
-#: builtin/fsck.c:608
+#: builtin/fsck.c:607
msgid "git fsck [options] [<object>...]"
msgstr "git fsck [选项] [<对象>...]"
-#: builtin/fsck.c:614
+#: builtin/fsck.c:613
msgid "show unreachable objects"
msgstr "显示不可达的对象"
-#: builtin/fsck.c:615
+#: builtin/fsck.c:614
msgid "show dangling objects"
msgstr "显示摇摆的对象"
-#: builtin/fsck.c:616
+#: builtin/fsck.c:615
msgid "report tags"
msgstr "报告 tags"
-#: builtin/fsck.c:617
+#: builtin/fsck.c:616
msgid "report root nodes"
msgstr "报告根节点"
-#: builtin/fsck.c:618
+#: builtin/fsck.c:617
msgid "make index objects head nodes"
msgstr "将索引亦作为检查的头节点"
-#: builtin/fsck.c:619
+#: builtin/fsck.c:618
msgid "make reflogs head nodes (default)"
msgstr "将引用日志作为检查的头节点（默认）"
-#: builtin/fsck.c:620
+#: builtin/fsck.c:619
msgid "also consider packs and alternate objects"
msgstr "也考虑包和备用对象"
-#: builtin/fsck.c:621
+#: builtin/fsck.c:620
msgid "enable more strict checking"
msgstr "启用更严格的检查"
-#: builtin/fsck.c:623
+#: builtin/fsck.c:622
msgid "write dangling objects in .git/lost-found"
msgstr "将摇摆对象写入 .git/lost-found 中"
-#: builtin/fsck.c:624 builtin/prune.c:134
+#: builtin/fsck.c:623 builtin/prune.c:134
msgid "show progress"
msgstr "显示进度"
-#: builtin/gc.c:22
+#: builtin/gc.c:23
msgid "git gc [options]"
msgstr "git gc [选项]"
-#: builtin/gc.c:63
+#: builtin/gc.c:79
#, c-format
msgid "Invalid %s: '%s'"
msgstr "无效的 %s：'%s'"
-#: builtin/gc.c:90
+#: builtin/gc.c:106
#, c-format
msgid "insanely long object directory %.*s"
msgstr "不正常的长对象目录 %.*s"
-#: builtin/gc.c:179
+#: builtin/gc.c:261
msgid "prune unreferenced objects"
msgstr "清除未引用的对象"
-#: builtin/gc.c:181
+#: builtin/gc.c:263
msgid "be more thorough (increased runtime)"
msgstr "更彻底（增加运行时间）"
-#: builtin/gc.c:182
+#: builtin/gc.c:264
msgid "enable auto-gc mode"
msgstr "启用自动垃圾回收模式"
-#: builtin/gc.c:222
+#: builtin/gc.c:265
+msgid "force running gc even if there may be another gc running"
+msgstr "强制执行 gc 即使另外一个 gc 正在执行"
+
+#: builtin/gc.c:305
#, c-format
msgid ""
"Auto packing the repository for optimum performance. You may also\n"
@@ -5169,41 +5350,49 @@ msgstr ""
"自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
"参见 \"git help gc\" 以获取更多信息。\n"
-#: builtin/gc.c:249
+#. be quiet on --auto
+#: builtin/gc.c:315
+#, c-format
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgstr ""
+"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> （如果不是，使用 --force）"
+
+#: builtin/gc.c:340
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
-#: builtin/grep.c:22
+#: builtin/grep.c:23
msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]"
-#: builtin/grep.c:217
+#: builtin/grep.c:218
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep：无法创建线程：%s"
-#: builtin/grep.c:364
+#: builtin/grep.c:365
#, c-format
msgid "Failed to chdir: %s"
msgstr "无法切换目录：%s"
-#: builtin/grep.c:442 builtin/grep.c:477
+#: builtin/grep.c:443 builtin/grep.c:478
#, c-format
msgid "unable to read tree (%s)"
msgstr "无法读取树（%s）"
-#: builtin/grep.c:492
+#: builtin/grep.c:493
#, c-format
msgid "unable to grep from object of type %s"
msgstr "无法抓取来自于 %s 类型的对象"
-#: builtin/grep.c:550
+#: builtin/grep.c:551
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "开关 `%c' 期望一个数字值"
-#: builtin/grep.c:567
+#: builtin/grep.c:568
#, c-format
msgid "cannot open '%s'"
msgstr "不能打开 '%s'"
@@ -5246,158 +5435,162 @@ msgid "don't match patterns in binary files"
msgstr "不在二进制文件中匹配模式"
#: builtin/grep.c:662
+msgid "process binary files with textconv filters"
+msgstr "用 textconv 过滤器处理二进制文件"
+
+#: builtin/grep.c:664
msgid "descend at most <depth> levels"
msgstr "最多以指定的深度向下寻找"
-#: builtin/grep.c:666
+#: builtin/grep.c:668
msgid "use extended POSIX regular expressions"
msgstr "使用扩展的 POSIX 正则表达式"
-#: builtin/grep.c:669
+#: builtin/grep.c:671
msgid "use basic POSIX regular expressions (default)"
msgstr "使用基本的 POSIX 正则表达式（默认）"
-#: builtin/grep.c:672
+#: builtin/grep.c:674
msgid "interpret patterns as fixed strings"
msgstr "把模式解析为固定的字符串"
-#: builtin/grep.c:675
+#: builtin/grep.c:677
msgid "use Perl-compatible regular expressions"
msgstr "使用 Perl 兼容的正则表达式"
-#: builtin/grep.c:678
+#: builtin/grep.c:680
msgid "show line numbers"
msgstr "显示行号"
-#: builtin/grep.c:679
+#: builtin/grep.c:681
msgid "don't show filenames"
msgstr "不显示文件名"
-#: builtin/grep.c:680
+#: builtin/grep.c:682
msgid "show filenames"
msgstr "显示文件名"
-#: builtin/grep.c:682
+#: builtin/grep.c:684
msgid "show filenames relative to top directory"
msgstr "显示相对于顶级目录的文件名"
-#: builtin/grep.c:684
+#: builtin/grep.c:686
msgid "show only filenames instead of matching lines"
msgstr "只显示文件名而不显示匹配的行"
-#: builtin/grep.c:686
+#: builtin/grep.c:688
msgid "synonym for --files-with-matches"
msgstr "和 --files-with-matches 同义"
-#: builtin/grep.c:689
+#: builtin/grep.c:691
msgid "show only the names of files without match"
msgstr "只显示未匹配的文件名"
-#: builtin/grep.c:691
+#: builtin/grep.c:693
msgid "print NUL after filenames"
msgstr "在文件名后输出 NUL 字符"
-#: builtin/grep.c:693
+#: builtin/grep.c:695
msgid "show the number of matches instead of matching lines"
msgstr "显示总匹配行数，而不显示匹配的行"
-#: builtin/grep.c:694
+#: builtin/grep.c:696
msgid "highlight matches"
msgstr "高亮显示匹配项"
-#: builtin/grep.c:696
+#: builtin/grep.c:698
msgid "print empty line between matches from different files"
msgstr "在不同文件的匹配项之间打印空行"
-#: builtin/grep.c:698
+#: builtin/grep.c:700
msgid "show filename only once above matches from same file"
msgstr "只在同一文件的匹配项的上面显示一次文件名"
-#: builtin/grep.c:701
+#: builtin/grep.c:703
msgid "show <n> context lines before and after matches"
msgstr "显示匹配项前后的 <n> 行上下文"
-#: builtin/grep.c:704
+#: builtin/grep.c:706
msgid "show <n> context lines before matches"
msgstr "显示匹配项前 <n> 行上下文"
-#: builtin/grep.c:706
+#: builtin/grep.c:708
msgid "show <n> context lines after matches"
msgstr "显示匹配项后 <n> 行上下文"
-#: builtin/grep.c:707
+#: builtin/grep.c:709
msgid "shortcut for -C NUM"
msgstr "快捷键 -C 数字"
-#: builtin/grep.c:710
+#: builtin/grep.c:712
msgid "show a line with the function name before matches"
msgstr "在匹配的前面显示一行函数名"
-#: builtin/grep.c:712
+#: builtin/grep.c:714
msgid "show the surrounding function"
msgstr "显示所在函数的前后内容"
-#: builtin/grep.c:715
+#: builtin/grep.c:717
msgid "read patterns from file"
msgstr "从文件读取模式"
-#: builtin/grep.c:717
+#: builtin/grep.c:719
msgid "match <pattern>"
msgstr "匹配 <模式>"
-#: builtin/grep.c:719
+#: builtin/grep.c:721
msgid "combine patterns specified with -e"
msgstr "组合用 -e 参数设定的模式"
-#: builtin/grep.c:731
+#: builtin/grep.c:733
msgid "indicate hit with exit status without output"
msgstr "不输出，而用退出码标识命中状态"
-#: builtin/grep.c:733
+#: builtin/grep.c:735
msgid "show only matches from files that match all patterns"
msgstr "只显示匹配所有模式的文件中的匹配"
-#: builtin/grep.c:735
+#: builtin/grep.c:737
msgid "show parse tree for grep expression"
msgstr "显示 grep 表达式的解析树"
-#: builtin/grep.c:739
+#: builtin/grep.c:741
msgid "pager"
msgstr "分页"
-#: builtin/grep.c:739
+#: builtin/grep.c:741
msgid "show matching files in the pager"
msgstr "分页显示匹配的文件"
-#: builtin/grep.c:742
+#: builtin/grep.c:744
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "允许调用 grep(1)（本次构建忽略）"
-#: builtin/grep.c:743 builtin/show-ref.c:188
+#: builtin/grep.c:745 builtin/show-ref.c:187
msgid "show usage"
msgstr "显示用法"
-#: builtin/grep.c:810
+#: builtin/grep.c:812
msgid "no pattern given."
msgstr "未提供模式匹配。"
-#: builtin/grep.c:865
+#: builtin/grep.c:870
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager 仅用于工作区"
-#: builtin/grep.c:888
+#: builtin/grep.c:893
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
-#: builtin/grep.c:893
+#: builtin/grep.c:898
msgid "--no-index or --untracked cannot be used with revs."
msgstr "--no-index 或 --untracked 不能和版本同时使用。"
-#: builtin/grep.c:896
+#: builtin/grep.c:901
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
-#: builtin/grep.c:904
+#: builtin/grep.c:909
msgid "both --cached and trees are given."
msgstr "同时给出了 --cached 和树对象。"
@@ -5652,8 +5845,8 @@ msgstr "解压缩严重的不一致"
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "发现 %s 出现 SHA1 冲突！"
-#: builtin/index-pack.c:669 builtin/pack-objects.c:170
-#: builtin/pack-objects.c:262
+#: builtin/index-pack.c:669 builtin/pack-objects.c:171
+#: builtin/pack-objects.c:263
#, c-format
msgid "unable to read %s"
msgstr "不能读 %s"
@@ -5682,155 +5875,155 @@ msgstr "对象中出错"
msgid "Not all child objects of %s are reachable"
msgstr "%s 的所有子对象并非都可达"
-#: builtin/index-pack.c:838 builtin/index-pack.c:868
+#: builtin/index-pack.c:839 builtin/index-pack.c:869
msgid "failed to apply delta"
msgstr "无法应用 delta"
-#: builtin/index-pack.c:1009
+#: builtin/index-pack.c:1010
msgid "Receiving objects"
msgstr "接收对象中"
-#: builtin/index-pack.c:1009
+#: builtin/index-pack.c:1010
msgid "Indexing objects"
msgstr "索引对象中"
-#: builtin/index-pack.c:1035
+#: builtin/index-pack.c:1036
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "包冲突（SHA1 不匹配）"
-#: builtin/index-pack.c:1040
+#: builtin/index-pack.c:1041
msgid "cannot fstat packfile"
msgstr "不能枚举包文件状态"
-#: builtin/index-pack.c:1043
+#: builtin/index-pack.c:1044
msgid "pack has junk at the end"
msgstr "包的结尾有垃圾数据"
-#: builtin/index-pack.c:1054
+#: builtin/index-pack.c:1055
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "parse_pack_objects() 中遇到不可理喻的问题"
-#: builtin/index-pack.c:1077
+#: builtin/index-pack.c:1078
msgid "Resolving deltas"
msgstr "处理 delta 中"
-#: builtin/index-pack.c:1087
+#: builtin/index-pack.c:1088
#, c-format
msgid "unable to create thread: %s"
msgstr "不能创建线程：%s"
-#: builtin/index-pack.c:1129
+#: builtin/index-pack.c:1130
msgid "confusion beyond insanity"
msgstr "不可理喻"
-#: builtin/index-pack.c:1137
+#: builtin/index-pack.c:1138
#, c-format
msgid "completed with %d local objects"
msgstr "完成 %d 个本地对象"
-#: builtin/index-pack.c:1147
+#: builtin/index-pack.c:1148
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）"
-#: builtin/index-pack.c:1151
+#: builtin/index-pack.c:1152
#, 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:1176
+#: builtin/index-pack.c:1177
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "不能压缩附加对象（%d）"
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1256
#, c-format
msgid "local object %s is corrupt"
msgstr "本地对象 %s 已损坏"
-#: builtin/index-pack.c:1279
+#: builtin/index-pack.c:1280
msgid "error while closing pack file"
msgstr "关闭包文件时出错"
-#: builtin/index-pack.c:1292
+#: builtin/index-pack.c:1293
#, c-format
msgid "cannot write keep file '%s'"
msgstr "无法写保留文件 '%s'"
-#: builtin/index-pack.c:1300
+#: builtin/index-pack.c:1301
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "无法关闭保留文件 '%s'"
-#: builtin/index-pack.c:1313
+#: builtin/index-pack.c:1314
msgid "cannot store pack file"
msgstr "无法存储包文件"
-#: builtin/index-pack.c:1324
+#: builtin/index-pack.c:1325
msgid "cannot store index file"
msgstr "无法存储索引文件"
-#: builtin/index-pack.c:1357
+#: builtin/index-pack.c:1358
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "坏的 pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1363
+#: builtin/index-pack.c:1364
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "指定的线程数无效（%d）"
-#: builtin/index-pack.c:1367 builtin/index-pack.c:1545
+#: builtin/index-pack.c:1368 builtin/index-pack.c:1546
#, c-format
msgid "no threads support, ignoring %s"
msgstr "没有线程支持，忽略 %s"
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1426
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "无法打开现存包文件 '%s'"
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1428
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "无法为 %s 打开包索引文件"
-#: builtin/index-pack.c:1474
+#: builtin/index-pack.c:1475
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "非 delta：%d 个对象"
msgstr[1] "非 delta：%d 个对象"
-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1482
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "链长 = %d: %lu 对象"
msgstr[1] "链长 = %d: %lu 对象"
-#: builtin/index-pack.c:1509
+#: builtin/index-pack.c:1510
msgid "Cannot come back to cwd"
msgstr "无法返回当前工作目录"
-#: builtin/index-pack.c:1557 builtin/index-pack.c:1560
-#: builtin/index-pack.c:1572 builtin/index-pack.c:1576
+#: builtin/index-pack.c:1558 builtin/index-pack.c:1561
+#: builtin/index-pack.c:1573 builtin/index-pack.c:1577
#, c-format
msgid "bad %s"
msgstr "错误选项 %s"
-#: builtin/index-pack.c:1590
+#: builtin/index-pack.c:1591
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin 不能和 --stdin 同时使用"
-#: builtin/index-pack.c:1594 builtin/index-pack.c:1604
+#: builtin/index-pack.c:1595 builtin/index-pack.c:1605
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "包名 '%s' 没有以 '.pack' 结尾"
-#: builtin/index-pack.c:1613
+#: builtin/index-pack.c:1614
msgid "--verify with no packfile name given"
msgstr "--verify 没有提供包名参数"
@@ -5919,11 +6112,6 @@ msgstr "不能处理 %d 类型的文件"
msgid "unable to move %s to %s"
msgstr "不能移动 %s 至 %s"
-#: builtin/init-db.c:363
-#, c-format
-msgid "Could not create git link %s"
-msgstr "不能创建 git link %s"
-
#.
#. * TRANSLATORS: The first '%s' is either "Reinitialized
#. * existing" or "Initialized empty", the second " shared" or
@@ -5967,7 +6155,7 @@ msgstr "权限"
msgid "specify that the git repository is to be shared amongst several users"
msgstr "指定 git 版本库是多个用户之间共享的"
-#: builtin/init-db.c:493 builtin/prune-packed.c:75
+#: builtin/init-db.c:493 builtin/prune-packed.c:75 builtin/repack.c:155
msgid "be quiet"
msgstr "保持安静"
@@ -6007,381 +6195,381 @@ msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]\n"
msgid " or: git show [options] <object>..."
msgstr " 或者：git show [选项] <对象>..."
-#: builtin/log.c:124
+#: builtin/log.c:125
msgid "suppress diff output"
msgstr "不显示差异输出"
-#: builtin/log.c:125
+#: builtin/log.c:126
msgid "show source"
msgstr "显示源"
-#: builtin/log.c:126
+#: builtin/log.c:127
msgid "Use mail map file"
msgstr "使用邮件映射文件"
-#: builtin/log.c:127
+#: builtin/log.c:128
msgid "decorate options"
msgstr "修饰选项"
-#: builtin/log.c:230
+#: builtin/log.c:231
#, c-format
msgid "Final output: %d %s\n"
msgstr "最终输出：%d %s\n"
-#: builtin/log.c:453 builtin/log.c:545
+#: builtin/log.c:473 builtin/log.c:565
#, c-format
msgid "Could not read object %s"
msgstr "不能读取对象 %s"
-#: builtin/log.c:569
+#: builtin/log.c:589
#, c-format
msgid "Unknown type: %d"
msgstr "未知类型：%d"
-#: builtin/log.c:669
+#: builtin/log.c:689
msgid "format.headers without value"
msgstr "format.headers 没有值"
-#: builtin/log.c:751
+#: builtin/log.c:771
msgid "name of output directory is too long"
msgstr "输出目录名太长"
-#: builtin/log.c:767
+#: builtin/log.c:787
#, c-format
msgid "Cannot open patch file %s"
msgstr "无法打开补丁文件 %s"
-#: builtin/log.c:781
+#: builtin/log.c:801
msgid "Need exactly one range."
msgstr "只需要一个范围。"
-#: builtin/log.c:789
+#: builtin/log.c:809
msgid "Not a range."
msgstr "不是一个范围。"
-#: builtin/log.c:891
+#: builtin/log.c:911
msgid "Cover letter needs email format"
msgstr "信封需要邮件地址格式"
-#: builtin/log.c:967
+#: builtin/log.c:987
#, c-format
msgid "insane in-reply-to: %s"
msgstr "不正常的 in-reply-to：%s"
-#: builtin/log.c:995
+#: builtin/log.c:1015
msgid "git format-patch [options] [<since> | <revision range>]"
msgstr "git format-patch [选项] [<从> | <修订集范围>]"
-#: builtin/log.c:1040
+#: builtin/log.c:1060
msgid "Two output directories?"
msgstr "两个输出目录？"
-#: builtin/log.c:1155
+#: builtin/log.c:1175
msgid "use [PATCH n/m] even with a single patch"
msgstr "使用 [PATCH n/m]，即使只有一个补丁"
-#: builtin/log.c:1158
+#: builtin/log.c:1178
msgid "use [PATCH] even with multiple patches"
msgstr "使用 [PATCH]，即使有多个补丁"
-#: builtin/log.c:1162
+#: builtin/log.c:1182
msgid "print patches to standard out"
msgstr "打印补丁到标准输出"
-#: builtin/log.c:1164
+#: builtin/log.c:1184
msgid "generate a cover letter"
msgstr "生成一封附信"
-#: builtin/log.c:1166
+#: builtin/log.c:1186
msgid "use simple number sequence for output file names"
msgstr "使用简单的数字序列作为输出文件名"
-#: builtin/log.c:1167
+#: builtin/log.c:1187
msgid "sfx"
msgstr "后缀"
-#: builtin/log.c:1168
+#: builtin/log.c:1188
msgid "use <sfx> instead of '.patch'"
msgstr "使用 <后缀> 代替 '.patch'"
-#: builtin/log.c:1170
+#: builtin/log.c:1190
msgid "start numbering patches at <n> instead of 1"
msgstr "补丁以 <n> 开始编号，而不是1"
-#: builtin/log.c:1172
+#: builtin/log.c:1192
msgid "mark the series as Nth re-roll"
msgstr "标记补丁系列是第几次重制"
-#: builtin/log.c:1174
+#: builtin/log.c:1194
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "使用 [<前缀>] 代替 [PATCH]"
-#: builtin/log.c:1177
+#: builtin/log.c:1197
msgid "store resulting files in <dir>"
msgstr "把结果文件存储在 <dir>"
-#: builtin/log.c:1180
+#: builtin/log.c:1200
msgid "don't strip/add [PATCH]"
msgstr "不删除/添加 [PATCH]"
-#: builtin/log.c:1183
+#: builtin/log.c:1203
msgid "don't output binary diffs"
msgstr "不输出二进制差异"
-#: builtin/log.c:1185
+#: builtin/log.c:1205
msgid "don't include a patch matching a commit upstream"
msgstr "不包含已在上游提交中的补丁"
-#: builtin/log.c:1187
+#: builtin/log.c:1207
msgid "show patch format instead of default (patch + stat)"
msgstr "显示纯补丁格式而非默认的（补丁+状态）"
-#: builtin/log.c:1189
+#: builtin/log.c:1209
msgid "Messaging"
msgstr "邮件发送"
-#: builtin/log.c:1190
+#: builtin/log.c:1210
msgid "header"
msgstr "header"
-#: builtin/log.c:1191
+#: builtin/log.c:1211
msgid "add email header"
msgstr "添加邮件头"
-#: builtin/log.c:1192 builtin/log.c:1194
+#: builtin/log.c:1212 builtin/log.c:1214
msgid "email"
msgstr "邮件地址"
-#: builtin/log.c:1192
+#: builtin/log.c:1212
msgid "add To: header"
msgstr "添加收件人"
-#: builtin/log.c:1194
+#: builtin/log.c:1214
msgid "add Cc: header"
msgstr "添加抄送"
-#: builtin/log.c:1196
+#: builtin/log.c:1216
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1197
+#: builtin/log.c:1217
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "设置 From 地址为 <ident>（如若不提供，用提交者ID做为地址）"
-#: builtin/log.c:1199
+#: builtin/log.c:1219
msgid "message-id"
msgstr "message-id"
-#: builtin/log.c:1200
+#: builtin/log.c:1220
msgid "make first mail a reply to <message-id>"
msgstr "使第一封邮件作为对 <message-id> 的回复"
-#: builtin/log.c:1201 builtin/log.c:1204
+#: builtin/log.c:1221 builtin/log.c:1224
msgid "boundary"
msgstr "边界"
-#: builtin/log.c:1202
+#: builtin/log.c:1222
msgid "attach the patch"
msgstr "附件方式添加补丁"
-#: builtin/log.c:1205
+#: builtin/log.c:1225
msgid "inline the patch"
msgstr "内联显示补丁"
-#: builtin/log.c:1209
+#: builtin/log.c:1229
msgid "enable message threading, styles: shallow, deep"
msgstr "启用邮件线索，风格：浅，深"
-#: builtin/log.c:1211
+#: builtin/log.c:1231
msgid "signature"
msgstr "签名"
-#: builtin/log.c:1212
+#: builtin/log.c:1232
msgid "add a signature"
msgstr "添加一个签名"
-#: builtin/log.c:1214
+#: builtin/log.c:1233
msgid "don't print the patch filenames"
msgstr "不要打印补丁文件名"
-#: builtin/log.c:1288
+#: builtin/log.c:1307
#, c-format
msgid "invalid ident line: %s"
msgstr "包含无效的身份标识：%s"
-#: builtin/log.c:1303
+#: builtin/log.c:1322
msgid "-n and -k are mutually exclusive."
msgstr "-n 和 -k 互斥。"
-#: builtin/log.c:1305
+#: builtin/log.c:1324
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix 和 -k 互斥。"
-#: builtin/log.c:1313
+#: builtin/log.c:1332
msgid "--name-only does not make sense"
msgstr "--name-only 无意义"
-#: builtin/log.c:1315
+#: builtin/log.c:1334
msgid "--name-status does not make sense"
msgstr "--name-status 无意义"
-#: builtin/log.c:1317
+#: builtin/log.c:1336
msgid "--check does not make sense"
msgstr "--check 无意义"
-#: builtin/log.c:1340
+#: builtin/log.c:1359
msgid "standard output, or directory, which one?"
msgstr "标准输出或目录，哪一个？"
-#: builtin/log.c:1342
+#: builtin/log.c:1361
#, c-format
msgid "Could not create directory '%s'"
msgstr "不能创建目录 '%s'"
-#: builtin/log.c:1490
+#: builtin/log.c:1509
msgid "Failed to create output files"
msgstr "无法创建输出文件"
-#: builtin/log.c:1539
+#: builtin/log.c:1558
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
-#: builtin/log.c:1594
+#: builtin/log.c:1613
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n"
-#: builtin/log.c:1607 builtin/log.c:1609 builtin/log.c:1621
+#: builtin/log.c:1626 builtin/log.c:1628 builtin/log.c:1640
#, c-format
msgid "Unknown commit %s"
msgstr "未知提交 %s"
-#: builtin/ls-files.c:408
+#: builtin/ls-files.c:398
msgid "git ls-files [options] [<file>...]"
msgstr "git ls-files [选项] [<文件>...]"
-#: builtin/ls-files.c:465
+#: builtin/ls-files.c:455
msgid "identify the file status with tags"
msgstr "用标签标识文件的状态"
-#: builtin/ls-files.c:467
+#: builtin/ls-files.c:457
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "使用小写字母表示 '假设未改变的' 文件"
-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:459
msgid "show cached files in the output (default)"
msgstr "显示缓存的文件（默认）"
-#: builtin/ls-files.c:471
+#: builtin/ls-files.c:461
msgid "show deleted files in the output"
msgstr "显示已删除的文件"
-#: builtin/ls-files.c:473
+#: builtin/ls-files.c:463
msgid "show modified files in the output"
msgstr "显示已修改的文件"
-#: builtin/ls-files.c:475
+#: builtin/ls-files.c:465
msgid "show other files in the output"
msgstr "显示其它文件"
-#: builtin/ls-files.c:477
+#: builtin/ls-files.c:467
msgid "show ignored files in the output"
msgstr "显示忽略的文件"
-#: builtin/ls-files.c:480
+#: builtin/ls-files.c:470
msgid "show staged contents' object name in the output"
msgstr "显示暂存区内容的对象名称"
-#: builtin/ls-files.c:482
+#: builtin/ls-files.c:472
msgid "show files on the filesystem that need to be removed"
msgstr "显示文件系统需要删除的文件"
-#: builtin/ls-files.c:484
+#: builtin/ls-files.c:474
msgid "show 'other' directories' name only"
msgstr "只显示“其他”目录的名称"
-#: builtin/ls-files.c:487
+#: builtin/ls-files.c:477
msgid "don't show empty directories"
msgstr "不显示空目录"
-#: builtin/ls-files.c:490
+#: builtin/ls-files.c:480
msgid "show unmerged files in the output"
msgstr "显示未合并的文件"
-#: builtin/ls-files.c:492
+#: builtin/ls-files.c:482
msgid "show resolve-undo information"
msgstr "显示 resolve-undo 信息"
-#: builtin/ls-files.c:494
+#: builtin/ls-files.c:484
msgid "skip files matching pattern"
msgstr "匹配排除文件的模式"
-#: builtin/ls-files.c:497
+#: builtin/ls-files.c:487
msgid "exclude patterns are read from <file>"
msgstr "从 <文件> 中读取排除模式"
-#: builtin/ls-files.c:500
+#: builtin/ls-files.c:490
msgid "read additional per-directory exclude patterns in <file>"
msgstr "从 <文件> 读取额外的每个目录的排除模式"
-#: builtin/ls-files.c:502
+#: builtin/ls-files.c:492
msgid "add the standard git exclusions"
msgstr "添加标准的 git 排除"
-#: builtin/ls-files.c:505
+#: builtin/ls-files.c:495
msgid "make the output relative to the project top directory"
msgstr "显示相对于顶级目录的文件名"
-#: builtin/ls-files.c:508
+#: builtin/ls-files.c:498
msgid "if any <file> is not in the index, treat this as an error"
msgstr "如果任何 <文件> 都不在索引区，视为错误"
-#: builtin/ls-files.c:509
+#: builtin/ls-files.c:499
msgid "tree-ish"
msgstr "树或提交"
-#: builtin/ls-files.c:510
+#: builtin/ls-files.c:500
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
-#: builtin/ls-files.c:512
+#: builtin/ls-files.c:502
msgid "show debugging data"
msgstr "显示调试数据"
-#: builtin/ls-tree.c:27
+#: builtin/ls-tree.c:28
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
-#: builtin/ls-tree.c:125
+#: builtin/ls-tree.c:126
msgid "only show trees"
msgstr "只显示树"
-#: builtin/ls-tree.c:127
+#: builtin/ls-tree.c:128
msgid "recurse into subtrees"
msgstr "递归到子树"
-#: builtin/ls-tree.c:129
+#: builtin/ls-tree.c:130
msgid "show trees when recursing"
msgstr "当递归时显示树"
-#: builtin/ls-tree.c:132
+#: builtin/ls-tree.c:133
msgid "terminate entries with NUL byte"
msgstr "条目以NUL字符终止"
-#: builtin/ls-tree.c:133
+#: builtin/ls-tree.c:134
msgid "include object size"
msgstr "包括对象大小"
-#: builtin/ls-tree.c:135 builtin/ls-tree.c:137
+#: builtin/ls-tree.c:136 builtin/ls-tree.c:138
msgid "list only filenames"
msgstr "只列出文件名"
-#: builtin/ls-tree.c:140
+#: builtin/ls-tree.c:141
msgid "use full path names"
msgstr "使用文件的全路径"
-#: builtin/ls-tree.c:142
+#: builtin/ls-tree.c:143
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr "列出整个树；不仅仅当前目录（隐含 --full-name）"
@@ -6456,7 +6644,7 @@ msgstr "如果不能快进就放弃合并"
msgid "Verify that the named commit has a valid GPG signature"
msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
-#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:114
+#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:89
msgid "strategy"
msgstr "策略"
@@ -6818,76 +7006,85 @@ msgstr "允许丢失的对象"
msgid "allow creation of more than one tree"
msgstr "允许创建一个以上的树"
-#: builtin/mv.c:14
+#: builtin/mv.c:15
msgid "git mv [options] <source>... <destination>"
msgstr "git mv [选项] <源>... <目标>"
-#: builtin/mv.c:64
+#: builtin/mv.c:67
msgid "force move/rename even if target exists"
msgstr "强制移动/重命令，即使目标存在"
-#: builtin/mv.c:65
+#: builtin/mv.c:68
msgid "skip move/rename errors"
msgstr "跳过移动/重命名错误"
-#: builtin/mv.c:108
+#: builtin/mv.c:113
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "检查 '%s' 到 '%s' 的重命名\n"
-#: builtin/mv.c:112
+#: builtin/mv.c:117
msgid "bad source"
msgstr "坏的源"
-#: builtin/mv.c:115
+#: builtin/mv.c:120
msgid "can not move directory into itself"
msgstr "不能将目录移动到自身"
-#: builtin/mv.c:118
+#: builtin/mv.c:123
msgid "cannot move directory over file"
msgstr "不能将目录移动到文件"
-#: builtin/mv.c:128
+#: builtin/mv.c:129
+#, c-format
+msgid "Huh? Directory %s is in index and no submodule?"
+msgstr "嗯？目录 %s 在索引中并且不是子模组？"
+
+#: builtin/mv.c:131 builtin/rm.c:318
+msgid "Please, stage your changes to .gitmodules or stash them to proceed"
+msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
+
+#: builtin/mv.c:147
#, c-format
msgid "Huh? %.*s is in index?"
msgstr "嗯？%.*s 在索引中？"
-#: builtin/mv.c:140
+#: builtin/mv.c:159
msgid "source directory is empty"
msgstr "源目录为空"
-#: builtin/mv.c:171
+#: builtin/mv.c:191
msgid "not under version control"
msgstr "不在版本控制之下"
-#: builtin/mv.c:173
+#: builtin/mv.c:193
msgid "destination exists"
msgstr "目标已存在"
-#: builtin/mv.c:181
+#: builtin/mv.c:201
#, c-format
msgid "overwriting '%s'"
msgstr "覆盖 '%s'"
-#: builtin/mv.c:184
+#: builtin/mv.c:204
msgid "Cannot overwrite"
msgstr "不能覆盖"
-#: builtin/mv.c:187
+#: builtin/mv.c:207
msgid "multiple sources for the same target"
msgstr "同一目标具有多个源"
-#: builtin/mv.c:202
+#: builtin/mv.c:222
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s，源=%s，目标=%s"
-#: builtin/mv.c:212
+#: builtin/mv.c:232
#, c-format
msgid "Renaming %s to %s\n"
msgstr "重命名 %s 至 %s\n"
-#: builtin/mv.c:215 builtin/remote.c:731
+#: builtin/mv.c:235 builtin/remote.c:731 builtin/repack.c:330
#, c-format
msgid "renaming '%s' failed"
msgstr "重命名 '%s' 失败"
@@ -6925,8 +7122,8 @@ msgid "read from stdin"
msgstr "从标准输入读取"
#: builtin/name-rev.c:320
-msgid "allow to print `undefined` names"
-msgstr "允许打印 `未定义` 的名称"
+msgid "allow to print `undefined` names (default)"
+msgstr "允许打印 `未定义` 的名称（默认）"
#: builtin/name-rev.c:326
msgid "dereference tags in the input (internal use)"
@@ -7078,12 +7275,12 @@ msgstr "不能写注解对象"
msgid "The note contents has been left in %s"
msgstr "注解内容被留在文件 %s 中"
-#: builtin/notes.c:248 builtin/tag.c:540
+#: builtin/notes.c:248 builtin/tag.c:537
#, c-format
msgid "cannot read '%s'"
msgstr "不能读取 '%s'"
-#: builtin/notes.c:250 builtin/tag.c:543
+#: builtin/notes.c:250 builtin/tag.c:540
#, c-format
msgid "could not open or read '%s'"
msgstr "不能打开或读取 '%s'"
@@ -7091,7 +7288,7 @@ msgstr "不能打开或读取 '%s'"
#: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318
#: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515
#: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637
-#: builtin/notes.c:839 builtin/tag.c:556
+#: builtin/notes.c:839 builtin/tag.c:553
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "无法解析 '%s' 为一个有效引用。"
@@ -7256,148 +7453,148 @@ msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
-#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
+#: builtin/pack-objects.c:184 builtin/pack-objects.c:187
#, c-format
msgid "deflate error (%d)"
msgstr "压缩错误 (%d)"
-#: builtin/pack-objects.c:2397
+#: builtin/pack-objects.c:2398
#, c-format
msgid "unsupported index version %s"
msgstr "不支持的索引版本 %s"
-#: builtin/pack-objects.c:2401
+#: builtin/pack-objects.c:2402
#, c-format
msgid "bad index version '%s'"
msgstr "坏的索引版本 '%s'"
-#: builtin/pack-objects.c:2424
+#: builtin/pack-objects.c:2425
#, c-format
msgid "option %s does not accept negative form"
msgstr "选项 %s 不接受否定格式"
-#: builtin/pack-objects.c:2428
+#: builtin/pack-objects.c:2429
#, c-format
msgid "unable to parse value '%s' for option %s"
msgstr "不能解析选项 %1$s 的值 '%2$s'"
-#: builtin/pack-objects.c:2447
+#: builtin/pack-objects.c:2448
msgid "do not show progress meter"
msgstr "不显示进度表"
-#: builtin/pack-objects.c:2449
+#: builtin/pack-objects.c:2450
msgid "show progress meter"
msgstr "显示进度表"
-#: builtin/pack-objects.c:2451
+#: builtin/pack-objects.c:2452
msgid "show progress meter during object writing phase"
msgstr "在对象写入阶段显示进度表"
-#: builtin/pack-objects.c:2454
+#: builtin/pack-objects.c:2455
msgid "similar to --all-progress when progress meter is shown"
msgstr "当进度表显示时类似于 --all-progress"
-#: builtin/pack-objects.c:2455
+#: builtin/pack-objects.c:2456
msgid "version[,offset]"
msgstr "版本[,偏移]"
-#: builtin/pack-objects.c:2456
+#: builtin/pack-objects.c:2457
msgid "write the pack index file in the specified idx format version"
msgstr "用指定的 idx 格式版本来写包索引文件"
-#: builtin/pack-objects.c:2459
+#: builtin/pack-objects.c:2460
msgid "maximum size of each output pack file"
msgstr "每个输出包的最大尺寸"
-#: builtin/pack-objects.c:2461
+#: builtin/pack-objects.c:2462
msgid "ignore borrowed objects from alternate object store"
msgstr "忽略从替代对象存储里借用对象"
-#: builtin/pack-objects.c:2463
+#: builtin/pack-objects.c:2464
msgid "ignore packed objects"
msgstr "忽略包对象"
-#: builtin/pack-objects.c:2465
+#: builtin/pack-objects.c:2466
msgid "limit pack window by objects"
msgstr "限制打包窗口的对象数"
-#: builtin/pack-objects.c:2467
+#: builtin/pack-objects.c:2468
msgid "limit pack window by memory in addition to object limit"
msgstr "除对象数量限制外设置打包窗口的内存限制"
-#: builtin/pack-objects.c:2469
+#: builtin/pack-objects.c:2470
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "打包允许的 delta 链的最大长度"
-#: builtin/pack-objects.c:2471
+#: builtin/pack-objects.c:2472
msgid "reuse existing deltas"
msgstr "重用已存在的 deltas"
-#: builtin/pack-objects.c:2473
+#: builtin/pack-objects.c:2474
msgid "reuse existing objects"
msgstr "重用已存在的对象"
-#: builtin/pack-objects.c:2475
+#: builtin/pack-objects.c:2476
msgid "use OFS_DELTA objects"
msgstr "使用 OFS_DELTA 对象"
-#: builtin/pack-objects.c:2477
+#: builtin/pack-objects.c:2478
msgid "use threads when searching for best delta matches"
msgstr "使用线程查询最佳 delta 匹配"
-#: builtin/pack-objects.c:2479
+#: builtin/pack-objects.c:2480
msgid "do not create an empty pack output"
msgstr "不创建空的包输出"
-#: builtin/pack-objects.c:2481
+#: builtin/pack-objects.c:2482
msgid "read revision arguments from standard input"
msgstr "从标准输入读取修订号参数"
-#: builtin/pack-objects.c:2483
+#: builtin/pack-objects.c:2484
msgid "limit the objects to those that are not yet packed"
msgstr "限制那些尚未打包的对象"
-#: builtin/pack-objects.c:2486
+#: builtin/pack-objects.c:2487
msgid "include objects reachable from any reference"
msgstr "包括可以从任何引用访问到的对象"
-#: builtin/pack-objects.c:2489
+#: builtin/pack-objects.c:2490
msgid "include objects referred by reflog entries"
msgstr "包括被引用日志引用到的对象"
-#: builtin/pack-objects.c:2492
+#: builtin/pack-objects.c:2493
msgid "output pack to stdout"
msgstr "输出包到标准输出"
-#: builtin/pack-objects.c:2494
+#: builtin/pack-objects.c:2495
msgid "include tag objects that refer to objects to be packed"
msgstr "包括引用了打包对象的 tag"
-#: builtin/pack-objects.c:2496
+#: builtin/pack-objects.c:2497
msgid "keep unreachable objects"
msgstr "维持不可达的对象"
-#: builtin/pack-objects.c:2497 parse-options.h:141
+#: builtin/pack-objects.c:2498 parse-options.h:143
msgid "time"
msgstr "时间"
-#: builtin/pack-objects.c:2498
+#: builtin/pack-objects.c:2499
msgid "unpack unreachable objects newer than <time>"
msgstr "将比给定 <时间> 新的无法访问的对象解包"
-#: builtin/pack-objects.c:2501
+#: builtin/pack-objects.c:2502
msgid "create thin packs"
msgstr "创建精简包"
-#: builtin/pack-objects.c:2503
+#: builtin/pack-objects.c:2504
msgid "ignore packs that have companion .keep file"
msgstr "忽略配有 .keep 文件的包"
-#: builtin/pack-objects.c:2505
+#: builtin/pack-objects.c:2506
msgid "pack compression level"
msgstr "打包压缩级别"
-#: builtin/pack-objects.c:2507
+#: builtin/pack-objects.c:2508
msgid "do not hide commits by grafts"
msgstr "不隐藏移植覆盖的提交"
@@ -7435,17 +7632,17 @@ msgstr "使早于给定时间的对象过期"
#: builtin/push.c:14
msgid "git push [<options>] [<repository> [<refspec>...]]"
-msgstr "git push [<选项>] [<版本库> [<引用表达式>...]]"
+msgstr "git push [<选项>] [<版本库> [<引用规则>...]]"
-#: builtin/push.c:45
+#: builtin/push.c:47
msgid "tag shorthand without <tag>"
msgstr "tag 简写没有跟 <tag> 参数"
-#: builtin/push.c:64
+#: builtin/push.c:66
msgid "--delete only accepts plain target ref names"
msgstr "--delete 只接受简单的目标引用名"
-#: builtin/push.c:99
+#: builtin/push.c:101
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -7453,7 +7650,7 @@ msgstr ""
"\n"
"为了永久地选择任一选项，参见 'git help config' 中的 push.default。"
-#: builtin/push.c:102
+#: builtin/push.c:104
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -7477,7 +7674,7 @@ msgstr ""
" git push %s %s\n"
"%s"
-#: builtin/push.c:117
+#: builtin/push.c:119
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -7491,7 +7688,7 @@ msgstr ""
"\n"
" git push %s HEAD:<name-of-remote-branch>\n"
-#: builtin/push.c:131
+#: builtin/push.c:133
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -7504,12 +7701,12 @@ msgstr ""
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:139
+#: builtin/push.c:141
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr "当前分支 %s 有多个上游分支，拒绝推送。"
-#: builtin/push.c:142
+#: builtin/push.c:144
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -7520,7 +7717,7 @@ msgstr ""
"而没有告诉我要推送什么、更新哪个远程分支。"
# 译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短
-#: builtin/push.c:165
+#: builtin/push.c:167
msgid ""
"push.default is unset; its implicit value is changing in\n"
"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
@@ -7537,9 +7734,8 @@ msgid ""
"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
"'current' instead of 'simple' if you sometimes use older versions of Git)"
msgstr ""
-"push.default 未设置，它的默认值将会在 Git 2.0 由 'matching'\n"
-"修改为 'simple'。若要不再显示本信息并在其默认值改变后维持当前使用习惯，\n"
-"进行如下设置：\n"
+"push.default 未设置，它的默认值将在 Git 2.0 由 'matching'\n"
+"改变为 'simple'。若要不再显示本信息并保持传统习惯，进行如下设置：\n"
"\n"
" git config --global push.default matching\n"
"\n"
@@ -7549,14 +7745,14 @@ msgstr ""
"\n"
"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
"（'simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git，\n"
-"为保持兼容，请用 'current' 代替 'simple' 模式）"
+"为保持兼容，请用 'current' 代替 'simple'）"
-#: builtin/push.c:225
+#: builtin/push.c:227
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr "您没有为推送指定任何引用表达式，并且 push.default 为 \"nothing\"。"
+msgstr "您没有为推送指定任何引用规则，并且 push.default 为 \"nothing\"。"
-#: builtin/push.c:232
+#: builtin/push.c:234
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -7567,7 +7763,7 @@ msgstr ""
"再次推送前，先与远程变更合并（如 'git pull ...'）。详见\n"
"'git push --help' 中的 'Note about fast-forwards' 小节。"
-#: builtin/push.c:238
+#: builtin/push.c:240
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. If you did not intend to push that branch, you may want to\n"
@@ -7579,7 +7775,7 @@ msgstr ""
"配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n"
"以便只推送当前分支。"
-#: builtin/push.c:244
+#: builtin/push.c:246
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
@@ -7590,7 +7786,7 @@ msgstr ""
"检出该分支并整合远程变更（如 'git pull ...'），然后再推送。详见\n"
"'git push --help' 中的 'Note about fast-forwards' 小节。"
-#: builtin/push.c:250
+#: builtin/push.c:252
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
@@ -7603,11 +7799,11 @@ msgstr ""
"（如 'git pull ...'）。\n"
"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
-#: builtin/push.c:257
+#: builtin/push.c:259
msgid "Updates were rejected because the tag already exists in the remote."
msgstr "更新被拒绝因为 tag 在远程已经存在。"
-#: builtin/push.c:260
+#: builtin/push.c:262
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
@@ -7616,22 +7812,22 @@ msgstr ""
"如果不使用 '--force' 参数，您不能更新一个指向非提交对象的远程引用，\n"
"也不能更新远程引用让其指向一个非提交对象。\n"
-#: builtin/push.c:320
+#: builtin/push.c:328
#, c-format
msgid "Pushing to %s\n"
msgstr "推送到 %s\n"
-#: builtin/push.c:324
+#: builtin/push.c:332
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "无法推送一些引用到 '%s'"
-#: builtin/push.c:357
+#: builtin/push.c:365
#, c-format
msgid "bad repository '%s'"
msgstr "坏的版本库 '%s'"
-#: builtin/push.c:358
+#: builtin/push.c:366
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -7652,87 +7848,95 @@ msgstr ""
"\n"
" git push <name>\n"
-#: builtin/push.c:373
+#: builtin/push.c:381
msgid "--all and --tags are incompatible"
msgstr "--all 和 --tags 不兼容"
-#: builtin/push.c:374
+#: builtin/push.c:382
msgid "--all can't be combined with refspecs"
-msgstr "--all 不能和引用表达式同时使用"
+msgstr "--all 不能和引用规则同时使用"
-#: builtin/push.c:379
+#: builtin/push.c:387
msgid "--mirror and --tags are incompatible"
msgstr "--mirror 和 --tags 不兼容"
-#: builtin/push.c:380
+#: builtin/push.c:388
msgid "--mirror can't be combined with refspecs"
-msgstr "--mirror 不能和引用表达式同时使用"
+msgstr "--mirror 不能和引用规则同时使用"
-#: builtin/push.c:385
+#: builtin/push.c:393
msgid "--all and --mirror are incompatible"
msgstr "--all 和 --mirror 不兼容"
-#: builtin/push.c:445
+#: builtin/push.c:453
msgid "repository"
msgstr "版本库"
-#: builtin/push.c:446
+#: builtin/push.c:454
msgid "push all refs"
msgstr "推送所有引用"
-#: builtin/push.c:447
+#: builtin/push.c:455
msgid "mirror all refs"
msgstr "镜像所有引用"
-#: builtin/push.c:449
+#: builtin/push.c:457
msgid "delete refs"
msgstr "删除引用"
-#: builtin/push.c:450
+#: builtin/push.c:458
msgid "push tags (can't be used with --all or --mirror)"
msgstr "推送 tags（不能使用 --all or --mirror）"
-#: builtin/push.c:453
+#: builtin/push.c:461
msgid "force updates"
msgstr "强制更新"
-#: builtin/push.c:454
+#: builtin/push.c:463
+msgid "refname>:<expect"
+msgstr "引用名>:<期望值"
+
+#: builtin/push.c:464
+msgid "require old value of ref to be at this value"
+msgstr "要求引用旧的取值为设定值"
+
+#: builtin/push.c:466
msgid "check"
msgstr "检查"
-#: builtin/push.c:455
+#: builtin/push.c:467
msgid "control recursive pushing of submodules"
msgstr "控制子模组的递归推送"
-#: builtin/push.c:457
+#: builtin/push.c:469
msgid "use thin pack"
msgstr "使用精简打包"
-#: builtin/push.c:458 builtin/push.c:459
+#: builtin/push.c:470 builtin/push.c:471
msgid "receive pack program"
msgstr "接收包程序"
-#: builtin/push.c:460
+#: builtin/push.c:472
msgid "set upstream for git pull/status"
msgstr "设置 git pull/status 的上游"
-#: builtin/push.c:463
+#: builtin/push.c:475
msgid "prune locally removed refs"
msgstr "清除本地删除的引用"
-#: builtin/push.c:465
+#: builtin/push.c:477
msgid "bypass pre-push hook"
msgstr "绕过 pre-push 钩子"
-#: builtin/push.c:466
+#: builtin/push.c:478
msgid "push missing but relevant tags"
msgstr "推送缺失的有关的 tags"
-#: builtin/push.c:476
+#: builtin/push.c:488
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
-#: builtin/push.c:478
+#: builtin/push.c:490
msgid "--delete doesn't make sense without any refs"
msgstr "--delete 未接任何引用没有意义"
@@ -7810,12 +8014,12 @@ msgstr "跳过应用稀疏检出过滤器"
msgid "debug unpack-trees"
msgstr "调试 unpack-trees"
-#: builtin/reflog.c:500
+#: builtin/reflog.c:499
#, c-format
msgid "%s' for '%s' is not a valid timestamp"
msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
-#: builtin/reflog.c:616 builtin/reflog.c:621
+#: builtin/reflog.c:615 builtin/reflog.c:620
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "'%s' 不是一个有效的时间戳"
@@ -7840,9 +8044,9 @@ msgstr "git remote rename <旧名称> <新名称>"
msgid "git remote remove <name>"
msgstr "git remote remove <名称>"
-#: builtin/remote.c:15 builtin/remote.c:42
-msgid "git remote set-head <name> (-a | -d | <branch>)"
-msgstr "git remote set-head <名称> (-a | -d | <分支>)"
+#: builtin/remote.c:15
+msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
+msgstr "git remote set-head <名称> (-a | --auto | -d | --delete |<分支>)"
#: builtin/remote.c:16
msgid "git remote [-v | --verbose] show [-n] <name>"
@@ -7877,6 +8081,10 @@ msgstr "git remote set-url --delete <名称> <地址>"
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<选项>] <名称> <地址>"
+#: builtin/remote.c:42
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
+
#: builtin/remote.c:47
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <名称> <分支>..."
@@ -7974,7 +8182,7 @@ msgstr "多于一个 %s"
#: builtin/remote.c:339
#, c-format
msgid "Could not get fetch map for refspec %s"
-msgstr "无法得到引用表达式 %s 的获取列表"
+msgstr "无法得到引用规则 %s 的获取列表"
#: builtin/remote.c:440 builtin/remote.c:448
msgid "(matching)"
@@ -8011,7 +8219,7 @@ msgid ""
"\t%s\n"
"\tPlease update the configuration manually if necessary."
msgstr ""
-"没有更新非默认的获取引用表达式\n"
+"没有更新非默认的获取引用规则\n"
"\t%s\n"
"\t如果必要请手动更新配置。"
@@ -8312,6 +8520,67 @@ msgstr "将不会删除所有非推送URL地址"
msgid "be verbose; must be placed before a subcommand"
msgstr "冗长输出；必须置于子命令之前"
+#: builtin/repack.c:15
+msgid "git repack [options]"
+msgstr "git repack [选项]"
+
+#: builtin/repack.c:143
+msgid "pack everything in a single pack"
+msgstr "所有内容打包到一个包文件中"
+
+#: builtin/repack.c:145
+msgid "same as -a, and turn unreachable objects loose"
+msgstr "和 -a 相同，并将不可达的对象设为松散对象"
+
+#: builtin/repack.c:148
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr "删除多余的包，运行 git-prune-packed"
+
+#: builtin/repack.c:150
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
+
+#: builtin/repack.c:152
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
+
+#: builtin/repack.c:154
+msgid "do not run git-update-server-info"
+msgstr "不运行 git-update-server-info"
+
+#: builtin/repack.c:157
+msgid "pass --local to git-pack-objects"
+msgstr "向 git-pack-objects 传递参数 --local"
+
+#: builtin/repack.c:158
+msgid "approxidate"
+msgstr "近似日期"
+
+#: builtin/repack.c:159
+msgid "with -A, do not loosen objects older than this"
+msgstr "使用 -A，不要将早于给定时间的对象过期"
+
+#: builtin/repack.c:161
+msgid "size of the window used for delta compression"
+msgstr "用于增量压缩的窗口值"
+
+#: builtin/repack.c:163
+msgid "same as the above, but limit memory size instead of entries count"
+msgstr "和上面的相似，但限制内存大小而非条目数"
+
+#: builtin/repack.c:165
+msgid "limits the maximum delta depth"
+msgstr "限制最大增量深度"
+
+#: builtin/repack.c:167
+msgid "maximum size of each packfile"
+msgstr "每个包的最大尺寸"
+
+#: builtin/repack.c:345
+#, c-format
+msgid "removing '%s' failed"
+msgstr "删除 '%s' 失败"
+
#: builtin/replace.c:17
msgid "git replace [-f] <object> <replacement>"
msgstr "git replace [-f] <对象> <替换物>"
@@ -8324,23 +8593,23 @@ msgstr "git replace -d <对象>..."
msgid "git replace -l [<pattern>]"
msgstr "git replace -l [<模式>]"
-#: builtin/replace.c:121
+#: builtin/replace.c:131
msgid "list replace refs"
msgstr "列出替换的引用"
-#: builtin/replace.c:122
+#: builtin/replace.c:132
msgid "delete replace refs"
msgstr "删除替换的引用"
-#: builtin/replace.c:123
+#: builtin/replace.c:133
msgid "replace the ref if it exists"
msgstr "如果存在则替换引用"
-#: builtin/rerere.c:11
+#: builtin/rerere.c:12
msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]"
-#: builtin/rerere.c:56
+#: builtin/rerere.c:57
msgid "register clean resolutions in index"
msgstr "在索引中注册干净的解决方案"
@@ -8401,71 +8670,71 @@ msgstr "HEAD 现在位于 %s"
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "在合并过程中不能做%s重置操作。"
-#: builtin/reset.c:251
+#: builtin/reset.c:262
msgid "be quiet, only report errors"
msgstr "安静模式，只报告错误"
-#: builtin/reset.c:253
+#: builtin/reset.c:264
msgid "reset HEAD and index"
msgstr "重置 HEAD 和索引"
-#: builtin/reset.c:254
+#: builtin/reset.c:265
msgid "reset only HEAD"
msgstr "只重置 HEAD"
-#: builtin/reset.c:256 builtin/reset.c:258
+#: builtin/reset.c:267 builtin/reset.c:269
msgid "reset HEAD, index and working tree"
msgstr "重置 HEAD、索引和工作区"
-#: builtin/reset.c:260
+#: builtin/reset.c:271
msgid "reset HEAD but keep local changes"
msgstr "重置 HEAD 但保存本地变更"
-#: builtin/reset.c:278
+#: builtin/reset.c:289
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "无法将 '%s' 解析为一个有效的版本。"
-#: builtin/reset.c:281 builtin/reset.c:289
+#: builtin/reset.c:292 builtin/reset.c:300
#, c-format
msgid "Could not parse object '%s'."
msgstr "不能解析对象 '%s'。"
-#: builtin/reset.c:286
+#: builtin/reset.c:297
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "无法将 '%s' 解析为一个有效的树对象。"
-#: builtin/reset.c:295
+#: builtin/reset.c:306
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
-#: builtin/reset.c:304
+#: builtin/reset.c:315
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr "--mixed 带路径已弃用，而是用 'git reset -- <paths>'。"
# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:306
+#: builtin/reset.c:317
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "不能带路径进行%s重置。"
# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:316
+#: builtin/reset.c:327
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "不能对裸版本库进行%s重置"
-#: builtin/reset.c:336
+#: builtin/reset.c:344
+msgid "Unstaged changes after reset:"
+msgstr "重置后撤出暂存区的变更："
+
+#: builtin/reset.c:350
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "不能重置索引文件至版本 '%s'。"
-#: builtin/reset.c:342
-msgid "Unstaged changes after reset:"
-msgstr "重置后撤出暂存区的变更："
-
-#: builtin/reset.c:347
+#: builtin/reset.c:355
msgid "Could not write new index file."
msgstr "不能写入新的索引文件。"
@@ -8490,8 +8759,8 @@ msgid ""
"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
msgstr ""
"git rev-parse --parseopt [选项] -- [<参数>...]\n"
-" 或者：git rev-parse --sq-quote [<选项>...]\n"
-" 或者：git rev-parse [options] [<选项>...]\n"
+" 或者：git rev-parse --sq-quote [<参数>...]\n"
+" 或者：git rev-parse [选项] [<参数>...]\n"
"\n"
"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
@@ -8511,84 +8780,84 @@ msgstr "git cherry-pick [选项] <提交号>..."
msgid "git cherry-pick <subcommand>"
msgstr "git cherry-pick <子命令>"
-#: builtin/revert.c:71 builtin/revert.c:94
+#: builtin/revert.c:71
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr "%s：%s 不能和 %s 同时使用"
-#: builtin/revert.c:105
+#: builtin/revert.c:80
msgid "end revert or cherry-pick sequence"
msgstr "终止反转或拣选操作"
-#: builtin/revert.c:106
+#: builtin/revert.c:81
msgid "resume revert or cherry-pick sequence"
msgstr "继续反转或拣选操作"
-#: builtin/revert.c:107
+#: builtin/revert.c:82
msgid "cancel revert or cherry-pick sequence"
msgstr "取消反转或拣选操作"
-#: builtin/revert.c:108
+#: builtin/revert.c:83
msgid "don't automatically commit"
msgstr "不要自动提交"
-#: builtin/revert.c:109
+#: builtin/revert.c:84
msgid "edit the commit message"
msgstr "编辑提交说明"
-#: builtin/revert.c:112
+#: builtin/revert.c:87
msgid "parent number"
msgstr "父编号"
-#: builtin/revert.c:114
+#: builtin/revert.c:89
msgid "merge strategy"
msgstr "合并策略"
-#: builtin/revert.c:115
+#: builtin/revert.c:90
msgid "option"
msgstr "选项"
-#: builtin/revert.c:116
+#: builtin/revert.c:91
msgid "option for merge strategy"
msgstr "合并策略的选项"
-#: builtin/revert.c:127
+#: builtin/revert.c:102
msgid "append commit name"
msgstr "追加提交名称"
-#: builtin/revert.c:128
+#: builtin/revert.c:103
msgid "allow fast-forward"
msgstr "允许快进式"
-#: builtin/revert.c:129
+#: builtin/revert.c:104
msgid "preserve initially empty commits"
msgstr "保留初始化的空提交"
-#: builtin/revert.c:130
+#: builtin/revert.c:105
msgid "allow commits with empty messages"
msgstr "允许提交说明为空"
-#: builtin/revert.c:131
+#: builtin/revert.c:106
msgid "keep redundant, empty commits"
msgstr "保持多余的、空的提交"
-#: builtin/revert.c:135
+#: builtin/revert.c:110
msgid "program error"
msgstr "程序错误"
-#: builtin/revert.c:225
+#: builtin/revert.c:195
msgid "revert failed"
msgstr "还原失败"
-#: builtin/revert.c:240
+#: builtin/revert.c:210
msgid "cherry-pick failed"
msgstr "拣选失败"
-#: builtin/rm.c:16
+#: builtin/rm.c:17
msgid "git rm [options] [--] <file>..."
msgstr "git rm [选项] [--] <文件>..."
-#: builtin/rm.c:64
+#: builtin/rm.c:65
msgid ""
"the following submodule (or one of its nested submodules)\n"
"uses a .git directory:"
@@ -8598,7 +8867,7 @@ msgid_plural ""
msgstr[0] "如下子模组（或一个其嵌套子模组）使用了一个 .git 目录："
msgstr[1] "如下子模组（或一个其嵌套子模组）使用了一个 .git 目录："
-#: builtin/rm.c:70
+#: builtin/rm.c:71
msgid ""
"\n"
"(use 'rm -rf' if you really want to remove it including all of its history)"
@@ -8606,7 +8875,7 @@ msgstr ""
"\n"
"（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）"
-#: builtin/rm.c:230
+#: builtin/rm.c:231
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
@@ -8616,7 +8885,7 @@ msgid_plural ""
msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样："
msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样："
-#: builtin/rm.c:235
+#: builtin/rm.c:236
msgid ""
"\n"
"(use -f to force removal)"
@@ -8624,13 +8893,13 @@ msgstr ""
"\n"
"（使用 -f 强制删除）"
-#: builtin/rm.c:239
+#: builtin/rm.c:240
msgid "the following file has changes staged in the index:"
msgid_plural "the following files have changes staged in the index:"
msgstr[0] "如下文件相对索引区的内容有修改"
msgstr[1] "如下文件相对索引区的内容有修改"
-#: builtin/rm.c:243 builtin/rm.c:254
+#: builtin/rm.c:244 builtin/rm.c:255
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
@@ -8638,38 +8907,38 @@ msgstr ""
"\n"
"（使用 --cached 保留本地文件，或用 -f 强制删除）"
-#: builtin/rm.c:251
+#: builtin/rm.c:252
msgid "the following file has local modifications:"
msgid_plural "the following files have local modifications:"
msgstr[0] "如下文件有本地修改："
msgstr[1] "如下文件有本地修改："
-#: builtin/rm.c:269
+#: builtin/rm.c:270
msgid "do not list removed files"
msgstr "不列出删除的文件"
-#: builtin/rm.c:270
+#: builtin/rm.c:271
msgid "only remove from the index"
msgstr "只从索引区删除"
-#: builtin/rm.c:271
+#: builtin/rm.c:272
msgid "override the up-to-date check"
msgstr "忽略文件更新状态检查"
-#: builtin/rm.c:272
+#: builtin/rm.c:273
msgid "allow recursive removal"
msgstr "允许递归删除"
-#: builtin/rm.c:274
+#: builtin/rm.c:275
msgid "exit with a zero status even if nothing matched"
msgstr "即使没有匹配，也以零状态退出"
-#: builtin/rm.c:345
+#: builtin/rm.c:336
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "未提供 -r 选项不会递归删除 '%s'"
-#: builtin/rm.c:384
+#: builtin/rm.c:375
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm：不能删除 %s"
@@ -8683,23 +8952,23 @@ msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
msgid "Missing author: %s"
msgstr "缺少作者：%s"
-#: builtin/shortlog.c:228
+#: builtin/shortlog.c:230
msgid "sort output according to the number of commits per author"
msgstr "根据每个作者的提交数量排序"
-#: builtin/shortlog.c:230
+#: builtin/shortlog.c:232
msgid "Suppress commit descriptions, only provides commit count"
msgstr "隐藏提交说明，只提供提交数量"
-#: builtin/shortlog.c:232
+#: builtin/shortlog.c:234
msgid "Show the email address of each author"
msgstr "显示每个作者的电子邮件地址"
-#: builtin/shortlog.c:233
+#: builtin/shortlog.c:235
msgid "w[,i1[,i2]]"
msgstr "w[,i1[,i2]]"
-#: builtin/shortlog.c:234
+#: builtin/shortlog.c:236
msgid "Linewrap output"
msgstr "折行输出"
@@ -8807,23 +9076,23 @@ msgstr "只显示头（可以和 tags 共用）"
msgid "stricter reference checking, requires exact ref path"
msgstr "更严格的引用检测，需要精确的引用路径"
-#: builtin/show-ref.c:173 builtin/show-ref.c:176
+#: builtin/show-ref.c:173 builtin/show-ref.c:175
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "显示 HEAD 引用，即使被过滤掉"
-#: builtin/show-ref.c:178
+#: builtin/show-ref.c:177
msgid "dereference tags into object IDs"
msgstr "转换 tags 到对象ID"
-#: builtin/show-ref.c:180
+#: builtin/show-ref.c:179
msgid "only show SHA1 hash using <n> digits"
msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
-#: builtin/show-ref.c:184
+#: builtin/show-ref.c:183
msgid "do not print results to stdout (useful with --verify)"
msgstr "不打印结果到标准输出（例如与 --verify 参数共用）"
-#: builtin/show-ref.c:186
+#: builtin/show-ref.c:185
msgid "show refs from stdin that aren't in local repository"
msgstr "显示从标准输入中读入的不在本地版本库中的引用"
@@ -8847,11 +9116,11 @@ msgstr "删除符号引用"
msgid "shorten ref output"
msgstr "简短的引用输出"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254
msgid "reason"
msgstr "原因"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254
msgid "reason of the update"
msgstr "更新的原因"
@@ -9014,183 +9283,195 @@ msgstr "只打印包含提交的tags"
msgid "print only tags of the object"
msgstr "只打印tags对象"
-#: builtin/tag.c:504
+#: builtin/tag.c:501
msgid "--column and -n are incompatible"
msgstr "--column 和 -n 不兼容"
-#: builtin/tag.c:521
+#: builtin/tag.c:518
msgid "-n option is only allowed with -l."
msgstr "-n 选项只允许和 -l 同时使用。"
-#: builtin/tag.c:523
+#: builtin/tag.c:520
msgid "--contains option is only allowed with -l."
msgstr "--contains 选项只允许和 -l 同时使用。"
-#: builtin/tag.c:525
+#: builtin/tag.c:522
msgid "--points-at option is only allowed with -l."
msgstr "--points-at 选项只允许和 -l 同时使用。"
-#: builtin/tag.c:533
+#: builtin/tag.c:530
msgid "only one -F or -m option is allowed."
msgstr "只允许一个 -F 或 -m 选项。"
-#: builtin/tag.c:553
+#: builtin/tag.c:550
msgid "too many params"
msgstr "太多参数"
-#: builtin/tag.c:559
+#: builtin/tag.c:556
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' 不是一个有效的tag名称。"
-#: builtin/tag.c:564
+#: builtin/tag.c:561
#, c-format
msgid "tag '%s' already exists"
msgstr "tag '%s' 已存在"
-#: builtin/tag.c:582
+#: builtin/tag.c:579
#, c-format
msgid "%s: cannot lock the ref"
msgstr "%s：不能锁定引用"
-#: builtin/tag.c:584
+#: builtin/tag.c:581
#, c-format
msgid "%s: cannot update the ref"
msgstr "%s：不能更新引用"
-#: builtin/tag.c:586
+#: builtin/tag.c:583
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "已更新tag '%s'（曾为 %s）\n"
-#: builtin/update-index.c:401
+#: builtin/update-index.c:402
msgid "git update-index [options] [--] [<file>...]"
msgstr "git update-index [选项] [--] [<文件>...]"
-#: builtin/update-index.c:718
+#: builtin/update-index.c:720
msgid "continue refresh even when index needs update"
msgstr "当索引需要更新时继续刷新"
-#: builtin/update-index.c:721
+#: builtin/update-index.c:723
msgid "refresh: ignore submodules"
msgstr "刷新：忽略子模组"
-#: builtin/update-index.c:724
+#: builtin/update-index.c:726
msgid "do not ignore new files"
msgstr "不忽略新的文件"
-#: builtin/update-index.c:726
+#: builtin/update-index.c:728
msgid "let files replace directories and vice-versa"
msgstr "让文件替换目录（反之亦然）"
-#: builtin/update-index.c:728
+#: builtin/update-index.c:730
msgid "notice files missing from worktree"
msgstr "通知文件从工作区丢失"
-#: builtin/update-index.c:730
+#: builtin/update-index.c:732
msgid "refresh even if index contains unmerged entries"
msgstr "即使索引区包含未合并的条目也执行刷新"
-#: builtin/update-index.c:733
+#: builtin/update-index.c:735
msgid "refresh stat information"
msgstr "刷新统计信息"
-#: builtin/update-index.c:737
+#: builtin/update-index.c:739
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置"
-#: builtin/update-index.c:741
+#: builtin/update-index.c:743
msgid "<mode> <object> <path>"
msgstr "<mode> <object> <path>"
-#: builtin/update-index.c:742
+#: builtin/update-index.c:744
msgid "add the specified entry to the index"
msgstr "添加指定的条目到索引区"
-#: builtin/update-index.c:746
+#: builtin/update-index.c:748
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/update-index.c:747
+#: builtin/update-index.c:749
msgid "override the executable bit of the listed files"
msgstr "覆盖列表里文件的可执行位"
-#: builtin/update-index.c:751
+#: builtin/update-index.c:753
msgid "mark files as \"not changing\""
msgstr "把文件标记为 \"没有变更\""
-#: builtin/update-index.c:754
+#: builtin/update-index.c:756
msgid "clear assumed-unchanged bit"
msgstr "清除 assumed-unchanged 位"
-#: builtin/update-index.c:757
+#: builtin/update-index.c:759
msgid "mark files as \"index-only\""
msgstr "把文件标记为 \"仅索引\""
-#: builtin/update-index.c:760
+#: builtin/update-index.c:762
msgid "clear skip-worktree bit"
msgstr "清除 skip-worktree 位"
-#: builtin/update-index.c:763
+#: builtin/update-index.c:765
msgid "add to index only; do not add content to object database"
msgstr "只添加到索引区；不添加对象到对象库"
-#: builtin/update-index.c:765
+#: builtin/update-index.c:767
msgid "remove named paths even if present in worktree"
msgstr "即使存在工作区里，也删除路径"
-#: builtin/update-index.c:767
+#: builtin/update-index.c:769
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "携带 --stdin：输入的行以 null 字符终止"
-#: builtin/update-index.c:769
+#: builtin/update-index.c:771
msgid "read list of paths to be updated from standard input"
msgstr "从标准输入中读取需要更新的路径列表"
-#: builtin/update-index.c:773
+#: builtin/update-index.c:775
msgid "add entries from standard input to the index"
msgstr "从标准输入添加条目到索引区"
-#: builtin/update-index.c:777
+#: builtin/update-index.c:779
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "为指定文件重新生成第2和第3暂存区"
-#: builtin/update-index.c:781
+#: builtin/update-index.c:783
msgid "only update entries that differ from HEAD"
msgstr "只更新与 HEAD 不同的条目"
-#: builtin/update-index.c:785
+#: builtin/update-index.c:787
msgid "ignore files missing from worktree"
msgstr "忽略工作区丢失的文件"
-#: builtin/update-index.c:788
+#: builtin/update-index.c:790
msgid "report actions to standard output"
msgstr "在标准输出显示操作"
-#: builtin/update-index.c:790
+#: builtin/update-index.c:792
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(for porcelains) 忘记保存的未解决的冲突"
-#: builtin/update-index.c:794
+#: builtin/update-index.c:796
msgid "write index in this format"
msgstr "以这种格式写入索引区"
-#: builtin/update-ref.c:7
+#: builtin/update-ref.c:9
msgid "git update-ref [options] -d <refname> [<oldval>]"
-msgstr "git update-ref [options] -d <引用名> [<旧值>]"
+msgstr "git update-ref [选项] -d <引用名> [<旧值>]"
-#: builtin/update-ref.c:8
+#: builtin/update-ref.c:10
msgid "git update-ref [options] <refname> <newval> [<oldval>]"
-msgstr "git update-ref [options] <引用名> <新值> [<旧值>]"
+msgstr "git update-ref [选项] <引用名> <新值> [<旧值>]"
+
+#: builtin/update-ref.c:11
+msgid "git update-ref [options] --stdin [-z]"
+msgstr "git update-ref [选项] --stdin [-z]"
-#: builtin/update-ref.c:19
+#: builtin/update-ref.c:255
msgid "delete the reference"
msgstr "删除引用"
-#: builtin/update-ref.c:21
+#: builtin/update-ref.c:257
msgid "update <refname> not the one it points to"
msgstr "更新 <引用名> 本身而不是它指向的引用"
+#: builtin/update-ref.c:258
+msgid "stdin has NUL-terminated arguments"
+msgstr "标准输入有以 NUL 字符终止的参数"
+
+#: builtin/update-ref.c:259
+msgid "read updates from stdin"
+msgstr "从标准输入读取更新"
+
#: builtin/update-server-info.c:6
msgid "git update-server-info [--force]"
msgstr "git update-server-info [--force]"
@@ -9244,23 +9525,23 @@ msgstr ""
"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些指南。参见\n"
"'git help <命令>' 或 'git help <指南>' 来查看给定的子命令帮助或指南。"
-#: parse-options.h:144
+#: parse-options.h:146
msgid "expiry date"
msgstr "逾期日期"
-#: parse-options.h:159
+#: parse-options.h:161
msgid "no-op (backward compatibility)"
msgstr "空操作（向后兼容）"
-#: parse-options.h:236
+#: parse-options.h:238
msgid "be more verbose"
msgstr "更加详细"
-#: parse-options.h:238
+#: parse-options.h:240
msgid "be more quiet"
msgstr "更加安静"
-#: parse-options.h:244
+#: parse-options.h:246
msgid "use <n> digits to display SHA-1s"
msgstr "用 <n> 位数字显示 SHA-1 哈希值"
@@ -9690,7 +9971,7 @@ msgstr ""
msgid "Pull is not possible because you have unmerged files."
msgstr "Pull 不可用，因为您尚有未合并的文件。"
-#: git-pull.sh:203
+#: git-pull.sh:223
msgid "updating an unborn branch with changes added to the index"
msgstr "更新尚未诞生的分支，变更添加至索引"
@@ -9698,7 +9979,7 @@ msgstr "更新尚未诞生的分支，变更添加至索引"
#. The working tree and the index file is still based on the
#. $orig_head commit, but we are merging into $curr_head.
#. First update the working tree to match $curr_head.
-#: git-pull.sh:235
+#: git-pull.sh:255
#, sh-format
msgid ""
"Warning: fetch updated the current branch head.\n"
@@ -9708,11 +9989,11 @@ msgstr ""
"警告：fetch 更新了当前的分支。您的工作区\n"
"警告：从原提交 $orig_head 快进。"
-#: git-pull.sh:260
+#: git-pull.sh:280
msgid "Cannot merge multiple branches into empty head"
msgstr "无法将多个分支合并到空分支"
-#: git-pull.sh:264
+#: git-pull.sh:284
msgid "Cannot rebase onto multiple branches"
msgstr "无法变基到多个分支"
@@ -9746,31 +10027,31 @@ msgstr ""
"您的修改安全地保存在 stash 中。\n"
"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
-#: git-rebase.sh:190
+#: git-rebase.sh:199
msgid "The pre-rebase hook refused to rebase."
msgstr "钩子 pre-rebase 拒绝变基。"
-#: git-rebase.sh:195
+#: git-rebase.sh:204
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
-#: git-rebase.sh:329
+#: git-rebase.sh:338
msgid "The --exec option must be used with the --interactive option"
msgstr "选项 --exec 必须和选项 --interactive 同时使用"
-#: git-rebase.sh:334
+#: git-rebase.sh:343
msgid "No rebase in progress?"
msgstr "没有正在进行的变基？"
-#: git-rebase.sh:345
+#: git-rebase.sh:354
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
-#: git-rebase.sh:352
+#: git-rebase.sh:361
msgid "Cannot read HEAD"
msgstr "不能读取 HEAD"
-#: git-rebase.sh:355
+#: git-rebase.sh:364
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -9778,12 +10059,12 @@ msgstr ""
"您必须编辑所有的合并冲突，然后通过 git add\n"
"命令将它们标记为已解决"
-#: git-rebase.sh:373
+#: git-rebase.sh:382
#, sh-format
msgid "Could not move back to $head_name"
msgstr "无法移回 $head_name"
-#: git-rebase.sh:392
+#: git-rebase.sh:401
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -9802,65 +10083,65 @@ msgstr ""
"\t$cmd_clear_stale_rebase\n"
"然后再重新执行变基。为避免您丢失重要数据，我已经停止当前操作。"
-#: git-rebase.sh:437
+#: git-rebase.sh:446
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "无效的上游 $upstream_name"
-#: git-rebase.sh:461
+#: git-rebase.sh:470
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: 有一个以上的合并基准"
-#: git-rebase.sh:464 git-rebase.sh:468
+#: git-rebase.sh:473 git-rebase.sh:477
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: 没有合并基准"
-#: git-rebase.sh:473
+#: git-rebase.sh:482
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "没有指向一个有效的提交：$onto_name"
-#: git-rebase.sh:496
+#: git-rebase.sh:505
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "严重错误：无此分支：$branch_name"
-#: git-rebase.sh:519
+#: git-rebase.sh:528
msgid "Cannot autostash"
msgstr "无法 autostash"
-#: git-rebase.sh:524
+#: git-rebase.sh:533
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "创建了 autostash: $stash_abbrev"
-#: git-rebase.sh:528
+#: git-rebase.sh:537
msgid "Please commit or stash them."
msgstr "请提交或为它们保存进度。"
-#: git-rebase.sh:548
+#: git-rebase.sh:557
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "当前分支 $branch_name 是最新的。"
-#: git-rebase.sh:552
+#: git-rebase.sh:561
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "当前分支 $branch_name 是最新的，强制变基。"
-#: git-rebase.sh:563
+#: git-rebase.sh:572
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "变更从 $mb 到 $onto："
#. Detach HEAD and reset the tree
-#: git-rebase.sh:572
+#: git-rebase.sh:581
msgid "First, rewinding head to replay your work on top of it..."
msgstr "首先，重置头指针以便在上面重放您的工作..."
-#: git-rebase.sh:582
+#: git-rebase.sh:591
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "快进 $branch_name 至 $onto_name。"
@@ -9908,7 +10189,7 @@ msgstr "无法用 $w_commit 更新 $ref_stash"
#. $ git stash save --blah-blah 2>&1 | head -n 2
#. error: unknown option for 'stash save': --blah-blah
#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:241
+#: git-stash.sh:237
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
@@ -9917,96 +10198,85 @@ msgstr ""
"错误：'stash save' 的未知选项：$option\n"
" 要提供一个描述信息，使用 git stash save -- '$option'"
-#: git-stash.sh:262
+#: git-stash.sh:258
msgid "No local changes to save"
msgstr "没有要保存的本地修改"
-#: git-stash.sh:268
-msgid ""
-"The following untracked files would NOT be saved but need to be removed by "
-"stash save:"
-msgstr "如下未跟踪文件将不会被保存但是将会因为进度保存而需要被删除："
-
-#: git-stash.sh:270
-msgid ""
-"Aborting. Consider using either the --force or --include-untracked option."
-msgstr "终止。考虑使用 --force 或者 --include-untracked 选项。"
-
-#: git-stash.sh:274
+#: git-stash.sh:262
msgid "Cannot initialize stash"
msgstr "无法初始化 stash"
-#: git-stash.sh:278
+#: git-stash.sh:266
msgid "Cannot save the current status"
msgstr "无法保存当前状态"
-#: git-stash.sh:296
+#: git-stash.sh:284
msgid "Cannot remove worktree changes"
msgstr "无法删除工作区变更"
-#: git-stash.sh:395
+#: git-stash.sh:383
msgid "No stash found."
msgstr "未发现 stash。"
-#: git-stash.sh:402
+#: git-stash.sh:390
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "指定了太多的版本：$REV"
-#: git-stash.sh:408
+#: git-stash.sh:396
#, sh-format
msgid "$reference is not valid reference"
msgstr "$reference 不是有效的引用"
-#: git-stash.sh:436
+#: git-stash.sh:424
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' 不是 stash 样提交"
-#: git-stash.sh:447
+#: git-stash.sh:435
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' 不是一个 stash 引用"
-#: git-stash.sh:455
+#: git-stash.sh:443
msgid "unable to refresh index"
msgstr "无法刷新索引"
-#: git-stash.sh:459
+#: git-stash.sh:447
msgid "Cannot apply a stash in the middle of a merge"
msgstr "无法在合并过程中恢复进度"
-#: git-stash.sh:467
+#: git-stash.sh:455
msgid "Conflicts in index. Try without --index."
msgstr "索引中有冲突。尝试不使用 --index。"
-#: git-stash.sh:469
+#: git-stash.sh:457
msgid "Could not save index tree"
msgstr "不能保存索引树"
-#: git-stash.sh:503
+#: git-stash.sh:491
msgid "Cannot unstage modified files"
msgstr "无法还原修改的文件"
-#: git-stash.sh:518
+#: git-stash.sh:506
msgid "Index was not unstashed."
msgstr "索引的进度没有被恢复。"
-#: git-stash.sh:535
+#: git-stash.sh:523
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "丢弃了 ${REV} ($s)"
-#: git-stash.sh:536
+#: git-stash.sh:524
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}：不能丢弃进度条目"
-#: git-stash.sh:543
+#: git-stash.sh:531
msgid "No branch name specified"
msgstr "未指定分支名"
-#: git-stash.sh:615
+#: git-stash.sh:603
msgid "(To restore them type \"git stash apply\")"
msgstr "（为恢复数据输入 \"git stash apply\"）"
@@ -10257,51 +10527,58 @@ msgid "The --cached option cannot be used with the --files option"
msgstr "选项 --cached 不能和选项 --files 同时使用"
#. unexpected type
-#: git-submodule.sh:1066
+#: git-submodule.sh:1073
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "意外的模式 $mod_dst"
# 译者：注意保持前导空格
-#: git-submodule.sh:1086
+#: git-submodule.sh:1093
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " 警告：$display_name 未包含提交 $sha1_src"
# 译者：注意保持前导空格
-#: git-submodule.sh:1089
+#: git-submodule.sh:1096
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " 警告：$display_name 未包含提交 $sha1_dst"
# 译者：注意保持前导空格
-#: git-submodule.sh:1092
+#: git-submodule.sh:1099
#, 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:1117
+#: git-submodule.sh:1124
msgid "blob"
msgstr "数据对象"
-#: git-submodule.sh:1155
-msgid "Submodules changed but not updated:"
-msgstr "子模组已修改但尚未更新："
-
-#: git-submodule.sh:1157
-msgid "Submodule changes to be committed:"
-msgstr "要提交的子模组变更："
-
-#: git-submodule.sh:1242
+#: git-submodule.sh:1238
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "无法递归进子模组路径 '$sm_path'"
-#: git-submodule.sh:1306
+#: git-submodule.sh:1302
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "为 '$displaypath' 同步子模组 url"
+#~ msgid "done\n"
+#~ msgstr "完成\n"
+
+#~ msgid "input paths are terminated by a null character"
+#~ msgstr "输入路径以null字符终止"
+
+#~ msgid ""
+#~ "The following untracked files would NOT be saved but need to be removed "
+#~ "by stash save:"
+#~ msgstr "如下未跟踪文件将不会被保存但是将会因为进度保存而需要被删除："
+
+#~ msgid ""
+#~ "Aborting. Consider using either the --force or --include-untracked option."
+#~ msgstr "终止。考虑使用 --force 或者 --include-untracked 选项。"
+
#~ msgid ""
#~ "the following submodule (or one of its nested submodule)\n"
#~ "uses a .git directory:"
@@ -10311,39 +10588,6 @@ msgstr "为 '$displaypath' 同步子模组 url"
#~ msgstr[0] "如下子模组（或一个其嵌套的子模组）使用了一个 .git 目录："
#~ msgstr[1] "如下子模组（或一个其嵌套的子模组）使用了一个 .git 目录："
-#~ msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
-#~ msgstr "无法修改未合并的 .gitmodules，先解决合并冲突"
-
-#~ msgid "Could not find section in .gitmodules where path=%s"
-#~ msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
-
-#~ msgid "Could not update .gitmodules entry %s"
-#~ msgstr "不能更新 .gitmodules 条目 %s"
-
-#~ msgid "Could not remove .gitmodules entry for %s"
-#~ msgstr "无法移除 %s 的 .gitmodules 条目"
-
-#~ msgid "could not find .gitmodules in index"
-#~ msgstr "无法在索引中找到 .gitmodules"
-
-#~ msgid "reading updated .gitmodules failed"
-#~ msgstr "读取更新后的 .gitmodules 失败"
-
-#~ msgid "unable to stat updated .gitmodules"
-#~ msgstr "不能枚举更新后的 .gitmodules"
-
-#~ msgid "unable to remove .gitmodules from index"
-#~ msgstr "不能从索引中移除 .gitmodules"
-
-#~ msgid "adding updated .gitmodules failed"
-#~ msgstr "添加更新后的 .gitmodules 失败"
-
-#~ msgid "staging updated .gitmodules failed"
-#~ msgstr "将更新后 .gitmodules 添加暂存区失败"
-
-#~ msgid "Could not set core.worktree in %s"
-#~ msgstr "不能在 %s 中设置 core.worktree"
-
# 译者：注意保持前导空格
#~ msgid " (fix conflicts and then run \"git am --resolved\")"
#~ msgstr " （解决冲突，然后运行 \"git am --resolved\"）"
@@ -10358,9 +10602,6 @@ msgstr "为 '$displaypath' 同步子模组 url"
#~ msgid "You cannot combine --no-ff with --ff-only."
#~ msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
-#~ msgid "Huh? Directory %s is in index and no submodule?"
-#~ msgstr "嗯？目录 %s 在索引中并且不是子模组？"
-
#~ msgid ""
#~ "submodule '%s' (or one of its nested submodules) uses a .git directory\n"
#~ "(use 'rm -rf' if you really want to remove it including all of its "
@@ -10479,9 +10720,6 @@ msgstr "为 '$displaypath' 同步子模组 url"
#~ msgid "-B cannot be used with -b"
#~ msgstr "-B 不能和 -b 同时使用"
-#~ msgid "--patch is incompatible with all other options"
-#~ msgstr "--patch 选项和其他选项不兼容"
-
#~ msgid "--detach cannot be used with -b/-B/--orphan"
#~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
diff --git a/revision.c b/revision.c
index 956040c8c..a8adb3fc8 100644
--- a/revision.c
+++ b/revision.c
@@ -1372,8 +1372,8 @@ static void prepare_show_merge(struct rev_info *revs)
i++;
}
free_pathspec(&revs->prune_data);
- parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC,
- PATHSPEC_PREFER_FULL, "", prune);
+ parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
+ PATHSPEC_PREFER_FULL | PATHSPEC_LITERAL_PATH, "", prune);
revs->limited = 1;
}
diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh
index ba26cfe92..7ac8fd06c 100755
--- a/t/t6040-tracking-info.sh
+++ b/t/t6040-tracking-info.sh
@@ -39,12 +39,14 @@ test_expect_success setup '
advance h
'
-script='s/^..\(b.\)[ 0-9a-f]*\[\([^]]*\)\].*/\1 \2/p'
+script='s/^..\(b.\) *[0-9a-f]* \(.*\)$/\1 \2/p'
cat >expect <<\EOF
-b1 ahead 1, behind 1
-b2 ahead 1, behind 1
-b3 behind 1
-b4 ahead 2
+b1 [ahead 1, behind 1] d
+b2 [ahead 1, behind 1] d
+b3 [behind 1] b
+b4 [ahead 2] f
+b5 g
+b6 c
EOF
test_expect_success 'branch -v' '
@@ -57,12 +59,12 @@ test_expect_success 'branch -v' '
'
cat >expect <<\EOF
-b1 origin/master: ahead 1, behind 1
-b2 origin/master: ahead 1, behind 1
-b3 origin/master: behind 1
-b4 origin/master: ahead 2
-b5 brokenbase: gone
-b6 origin/master
+b1 [origin/master: ahead 1, behind 1] d
+b2 [origin/master: ahead 1, behind 1] d
+b3 [origin/master: behind 1] b
+b4 [origin/master: ahead 2] f
+b5 [brokenbase: gone] g
+b6 [origin/master] c
EOF
test_expect_success 'branch -vv' '
diff --git a/t/t6130-pathspec-noglob.sh b/t/t6130-pathspec-noglob.sh
index ea00d71e7..658353277 100755
--- a/t/t6130-pathspec-noglob.sh
+++ b/t/t6130-pathspec-noglob.sh
@@ -108,6 +108,13 @@ test_expect_success 'no-glob environment variable works' '
test_cmp expect actual
'
+test_expect_success 'blame takes global pathspec flags' '
+ git --literal-pathspecs blame -- foo &&
+ git --icase-pathspecs blame -- foo &&
+ git --glob-pathspecs blame -- foo &&
+ git --noglob-pathspecs blame -- foo
+'
+
test_expect_success 'setup xxx/bar' '
mkdir xxx &&
test_commit xxx xxx/bar
diff --git a/tree-diff.c b/tree-diff.c
index ccf9d7c8f..456660c7a 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -254,7 +254,9 @@ static void try_to_follow_renames(struct tree_desc *t1, struct tree_desc *t2, co
path[0] = p->one->path;
path[1] = NULL;
free_pathspec(&opt->pathspec);
- parse_pathspec(&opt->pathspec, PATHSPEC_ALL_MAGIC, 0, "", path);
+ parse_pathspec(&opt->pathspec,
+ PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
+ PATHSPEC_LITERAL_PATH, "", path);
/*
* The caller expects us to return a set of vanilla
diff --git a/upload-pack.c b/upload-pack.c
index 43342ac16..c989a737f 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -753,7 +753,6 @@ static void upload_pack(void)
struct string_list symref = STRING_LIST_INIT_DUP;
head_ref_namespaced(find_symref, &symref);
- for_each_namespaced_ref(find_symref, &symref);
if (advertise_refs || !stateless_rpc) {
reset_timeout();
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-06 18:54:25 +0000