summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/RelNotes/1.8.5.6.txt34
-rw-r--r--Documentation/RelNotes/1.9.5.txt34
-rw-r--r--Documentation/RelNotes/2.0.5.txt34
-rw-r--r--Documentation/RelNotes/2.1.4.txt34
-rw-r--r--Documentation/RelNotes/2.2.0.txt138
-rw-r--r--Documentation/RelNotes/2.2.1.txt34
-rw-r--r--Documentation/RelNotes/2.3.0.txt74
-rw-r--r--Documentation/SubmittingPatches5
-rw-r--r--Documentation/config.txt20
-rw-r--r--Documentation/git-am.txt11
-rw-r--r--Documentation/git-commit.txt5
-rw-r--r--Documentation/git-fast-export.txt4
-rw-r--r--Documentation/git-fast-import.txt4
-rw-r--r--Documentation/git-mailinfo.txt5
-rw-r--r--Documentation/git-notes.txt12
-rw-r--r--Documentation/git-push.txt2
-rw-r--r--Documentation/git-remote-ext.txt4
-rw-r--r--Documentation/git-remote-fd.txt4
-rw-r--r--Documentation/git-send-email.txt10
-rw-r--r--Documentation/git.txt44
-rw-r--r--Documentation/gitremote-helpers.txt6
-rw-r--r--Documentation/gittutorial-2.txt23
-rw-r--r--Documentation/gittutorial.txt19
-rw-r--r--Documentation/technical/api-string-list.txt4
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile14
l---------RelNotes2
-rw-r--r--builtin/add.c2
-rw-r--r--builtin/apply.c4
-rw-r--r--builtin/checkout.c18
-rw-r--r--builtin/commit.c28
-rw-r--r--builtin/config.c34
-rw-r--r--builtin/help.c9
-rw-r--r--builtin/init-db.c20
-rw-r--r--builtin/mailinfo.c22
-rw-r--r--builtin/merge.c22
-rw-r--r--builtin/notes.c258
-rw-r--r--builtin/push.c10
-rw-r--r--builtin/receive-pack.c4
-rw-r--r--builtin/remote.c69
-rw-r--r--builtin/repack.c49
-rw-r--r--cache.h3
-rw-r--r--commit.c46
-rw-r--r--commit.h3
-rw-r--r--compat/mingw.c2
-rw-r--r--config.c14
-rw-r--r--config.mak.uname3
-rw-r--r--connect.c17
-rw-r--r--contrib/completion/git-completion.bash4
-rwxr-xr-xcontrib/diff-highlight/diff-highlight4
-rw-r--r--csum-file.h11
-rw-r--r--environment.c10
-rw-r--r--exec_cmd.c7
-rw-r--r--exec_cmd.h2
-rw-r--r--fsck.c5
-rwxr-xr-xgit-am.sh21
-rw-r--r--git-compat-util.h3
-rwxr-xr-xgit-difftool--helper.sh2
-rw-r--r--git-mergetool--lib.sh19
-rwxr-xr-xgit-mergetool.sh16
-rwxr-xr-xgit-send-email.perl61
-rw-r--r--git-sh-setup.sh2
-rw-r--r--git.c27
-rwxr-xr-xgitweb/gitweb.perl6
-rw-r--r--mergetools/diffmerge1
-rw-r--r--mergetools/emerge1
-rw-r--r--mergetools/kdiff31
-rw-r--r--notes.c5
-rw-r--r--pack-bitmap-write.c8
-rw-r--r--pack-bitmap.c22
-rw-r--r--pack-bitmap.h6
-rw-r--r--path.c33
-rw-r--r--po/bg.po3269
-rw-r--r--po/ca.po4577
-rw-r--r--po/de.po4396
-rw-r--r--po/fr.po3235
-rw-r--r--po/git.pot3125
-rw-r--r--po/sv.po3225
-rw-r--r--po/vi.po3326
-rw-r--r--po/zh_CN.po3219
-rw-r--r--read-cache.c10
-rw-r--r--refs.c48
-rw-r--r--refs.h10
-rw-r--r--remote.c6
-rw-r--r--run-command.c4
-rw-r--r--sequencer.c34
-rw-r--r--sequencer.h1
-rw-r--r--sha1_file.c2
-rw-r--r--sha1_name.c2
-rw-r--r--string-list.c4
-rw-r--r--string-list.h2
-rw-r--r--t/README3
-rwxr-xr-xt/t0001-init.sh7
-rwxr-xr-xt/t0090-cache-tree.sh2
-rwxr-xr-xt/t1014-read-tree-confusing.sh62
-rwxr-xr-xt/t1410-reflog.sh36
-rwxr-xr-xt/t1450-fsck.sh65
-rwxr-xr-xt/t2022-checkout-paths.sh17
-rwxr-xr-xt/t3301-notes.sh1341
-rwxr-xr-xt/t3507-cherry-pick-conflict.sh42
-rwxr-xr-xt/t3700-add.sh8
-rwxr-xr-xt/t4026-color.sh8
-rwxr-xr-xt/t4150-am.sh23
-rwxr-xr-xt/t5000-tar-tree.sh2
-rwxr-xr-xt/t5100-mailinfo.sh4
-rw-r--r--t/t5100/info0012--message-id5
-rw-r--r--t/t5100/msg0012--message-id8
-rw-r--r--t/t5100/patch0012--message-id30
-rwxr-xr-xt/t5528-push-default.sh32
-rwxr-xr-xt/t5705-clone-2gb.sh2
-rwxr-xr-xt/t7513-interpret-trailers.sh34
-rwxr-xr-xt/t7800-difftool.sh5
-rwxr-xr-xt/t9001-send-email.sh157
-rwxr-xr-xt/t9603-cvsimport-patchsets.sh2
-rwxr-xr-xt/t9604-cvsimport-timestamps.sh4
-rw-r--r--t/test-lib.sh6
-rw-r--r--trailer.c49
-rw-r--r--unpack-trees.c12
-rw-r--r--utf8.c64
-rw-r--r--utf8.h8
-rw-r--r--wt-status.c17
121 files changed, 17523 insertions, 14523 deletions
diff --git a/Documentation/RelNotes/1.8.5.6.txt b/Documentation/RelNotes/1.8.5.6.txt
new file mode 100644
index 0000000..92ff92b
--- /dev/null
+++ b/Documentation/RelNotes/1.8.5.6.txt
@@ -0,0 +1,34 @@
+Git v1.8.5.6 Release Notes
+==========================
+
+Fixes since v1.8.5.5
+--------------------
+
+ * We used to allow committing a path ".Git/config" with Git that is
+ running on a case sensitive filesystem, but an attempt to check out
+ such a path with Git that runs on a case insensitive filesystem
+ would have clobbered ".git/config", which is definitely not what
+ the user would have expected. Git now prevents you from tracking
+ a path with ".Git" (in any case combination) as a path component.
+
+ * On Windows, certain path components that are different from ".git"
+ are mapped to ".git", e.g. "git~1/config" is treated as if it were
+ ".git/config". HFS+ has a similar issue, where certain unicode
+ codepoints are ignored, e.g. ".g\u200cit/config" is treated as if
+ it were ".git/config". Pathnames with these potential issues are
+ rejected on the affected systems. Git on systems that are not
+ affected by this issue (e.g. Linux) can also be configured to
+ reject them to ensure cross platform interoperability of the hosted
+ projects.
+
+ * "git fsck" notices a tree object that records such a path that can
+ be confused with ".git", and with receive.fsckObjects configuration
+ set to true, an attempt to "git push" such a tree object will be
+ rejected. Such a path may not be a problem on a well behaving
+ filesystem but in order to protect those on HFS+ and on case
+ insensitive filesystems, this check is enabled on all platforms.
+
+A big "thanks!" for bringing this issue to us goes to our friends in
+the Mercurial land, namely, Matt Mackall and Augie Fackler.
+
+Also contains typofixes, documentation updates and trivial code clean-ups.
diff --git a/Documentation/RelNotes/1.9.5.txt b/Documentation/RelNotes/1.9.5.txt
new file mode 100644
index 0000000..8d6ac0c
--- /dev/null
+++ b/Documentation/RelNotes/1.9.5.txt
@@ -0,0 +1,34 @@
+Git v1.9.5 Release Notes
+========================
+
+Fixes since v1.9.4
+------------------
+
+ * We used to allow committing a path ".Git/config" with Git that is
+ running on a case sensitive filesystem, but an attempt to check out
+ such a path with Git that runs on a case insensitive filesystem
+ would have clobbered ".git/config", which is definitely not what
+ the user would have expected. Git now prevents you from tracking
+ a path with ".Git" (in any case combination) as a path component.
+
+ * On Windows, certain path components that are different from ".git"
+ are mapped to ".git", e.g. "git~1/config" is treated as if it were
+ ".git/config". HFS+ has a similar issue, where certain unicode
+ codepoints are ignored, e.g. ".g\u200cit/config" is treated as if
+ it were ".git/config". Pathnames with these potential issues are
+ rejected on the affected systems. Git on systems that are not
+ affected by this issue (e.g. Linux) can also be configured to
+ reject them to ensure cross platform interoperability of the hosted
+ projects.
+
+ * "git fsck" notices a tree object that records such a path that can
+ be confused with ".git", and with receive.fsckObjects configuration
+ set to true, an attempt to "git push" such a tree object will be
+ rejected. Such a path may not be a problem on a well behaving
+ filesystem but in order to protect those on HFS+ and on case
+ insensitive filesystems, this check is enabled on all platforms.
+
+A big "thanks!" for bringing this issue to us goes to our friends in
+the Mercurial land, namely, Matt Mackall and Augie Fackler.
+
+Also contains typofixes, documentation updates and trivial code clean-ups.
diff --git a/Documentation/RelNotes/2.0.5.txt b/Documentation/RelNotes/2.0.5.txt
new file mode 100644
index 0000000..3a16f69
--- /dev/null
+++ b/Documentation/RelNotes/2.0.5.txt
@@ -0,0 +1,34 @@
+Git v2.0.5 Release Notes
+========================
+
+Fixes since v2.0.4
+------------------
+
+ * We used to allow committing a path ".Git/config" with Git that is
+ running on a case sensitive filesystem, but an attempt to check out
+ such a path with Git that runs on a case insensitive filesystem
+ would have clobbered ".git/config", which is definitely not what
+ the user would have expected. Git now prevents you from tracking
+ a path with ".Git" (in any case combination) as a path component.
+
+ * On Windows, certain path components that are different from ".git"
+ are mapped to ".git", e.g. "git~1/config" is treated as if it were
+ ".git/config". HFS+ has a similar issue, where certain unicode
+ codepoints are ignored, e.g. ".g\u200cit/config" is treated as if
+ it were ".git/config". Pathnames with these potential issues are
+ rejected on the affected systems. Git on systems that are not
+ affected by this issue (e.g. Linux) can also be configured to
+ reject them to ensure cross platform interoperability of the hosted
+ projects.
+
+ * "git fsck" notices a tree object that records such a path that can
+ be confused with ".git", and with receive.fsckObjects configuration
+ set to true, an attempt to "git push" such a tree object will be
+ rejected. Such a path may not be a problem on a well behaving
+ filesystem but in order to protect those on HFS+ and on case
+ insensitive filesystems, this check is enabled on all platforms.
+
+A big "thanks!" for bringing this issue to us goes to our friends in
+the Mercurial land, namely, Matt Mackall and Augie Fackler.
+
+Also contains typofixes, documentation updates and trivial code clean-ups.
diff --git a/Documentation/RelNotes/2.1.4.txt b/Documentation/RelNotes/2.1.4.txt
new file mode 100644
index 0000000..d16e5f0
--- /dev/null
+++ b/Documentation/RelNotes/2.1.4.txt
@@ -0,0 +1,34 @@
+Git v2.1.4 Release Notes
+========================
+
+Fixes since v2.1.3
+------------------
+
+ * We used to allow committing a path ".Git/config" with Git that is
+ running on a case sensitive filesystem, but an attempt to check out
+ such a path with Git that runs on a case insensitive filesystem
+ would have clobbered ".git/config", which is definitely not what
+ the user would have expected. Git now prevents you from tracking
+ a path with ".Git" (in any case combination) as a path component.
+
+ * On Windows, certain path components that are different from ".git"
+ are mapped to ".git", e.g. "git~1/config" is treated as if it were
+ ".git/config". HFS+ has a similar issue, where certain unicode
+ codepoints are ignored, e.g. ".g\u200cit/config" is treated as if
+ it were ".git/config". Pathnames with these potential issues are
+ rejected on the affected systems. Git on systems that are not
+ affected by this issue (e.g. Linux) can also be configured to
+ reject them to ensure cross platform interoperability of the hosted
+ projects.
+
+ * "git fsck" notices a tree object that records such a path that can
+ be confused with ".git", and with receive.fsckObjects configuration
+ set to true, an attempt to "git push" such a tree object will be
+ rejected. Such a path may not be a problem on a well behaving
+ filesystem but in order to protect those on HFS+ and on case
+ insensitive filesystems, this check is enabled on all platforms.
+
+A big "thanks!" for bringing this issue to us goes to our friends in
+the Mercurial land, namely, Matt Mackall and Augie Fackler.
+
+Also contains typofixes, documentation updates and trivial code clean-ups.
diff --git a/Documentation/RelNotes/2.2.0.txt b/Documentation/RelNotes/2.2.0.txt
index a5c3381..e98ecbc 100644
--- a/Documentation/RelNotes/2.2.0.txt
+++ b/Documentation/RelNotes/2.2.0.txt
@@ -9,71 +9,72 @@ Ports
* Building on older MacOS X systems automatically sets
the necessary NO_APPLE_COMMON_CRYPTO build-time option.
- * The support to build with NO_PTHREADS has been resurrected.
+ * Building with NO_PTHREADS has been resurrected.
- * Compilation options has been updated a bit to support z/OS port
- better.
+ * Compilation options have been updated a bit to better support the
+ z/OS port.
UI, Workflows & Features
- * "git archive" learned to filter what gets archived with pathspec.
+ * "git archive" learned to filter what gets archived with a pathspec.
* "git config --edit --global" starts from a skeletal per-user
configuration file contents, instead of a total blank, when the
- user does not already have any. This immediately reduces the
- need for a later "Have you forgotten setting core.user?" and we
- can add more to the template as we gain more experience.
+ user does not already have any global config. This immediately
+ reduces the need to later ask "Have you forgotten to set
+ core.user?", and we can add more to the template as we gain
+ more experience.
* "git stash list -p" used to be almost always a no-op because each
stash entry is represented as a merge commit. It learned to show
the difference between the base commit version and the working tree
- version, which is in line with what "git show" gives.
+ version, which is in line with what "git stash show" gives.
* Sometimes users want to report a bug they experience on their
repository, but they are not at liberty to share the contents of
the repository. "fast-export" was taught an "--anonymize" option
- to replace blob contents, names of people and paths and log
+ to replace blob contents, names of people, paths and log
messages with bland and simple strings to help them.
* "git difftool" learned an option to stop feeding paths to the
diff backend when it exits with a non-zero status.
- * "git grep" allows to paint (or not paint) partial matches on
+ * "git grep" learned to paint (or not paint) partial matches on
context lines when showing "grep -C<num>" output in color.
- * "log --date=iso" uses a slight variant of ISO 8601 format that is
- made more human readable. A new "--date=iso-strict" option gives
- datetime output that is more strictly conformant.
+ * "log --date=iso" uses a slight variant of the ISO 8601 format that is
+ more human readable. A new "--date=iso-strict" option gives
+ datetime output that conforms more strictly.
* The logic "git prune" uses is more resilient against various corner
cases.
* A broken reimplementation of Git could write an invalid index that
- records both stage #0 and higher stage entries for the same path.
+ records both stage #0 and higher-stage entries for the same path.
We now notice and reject such an index, as there is no sensible
fallback (we do not know if the broken tool wanted to resolve and
- forgot to remove higher stage entries, or if it wanted to unresolve
- and forgot to remove the stage#0 entry).
+ forgot to remove the higher-stage entries, or if it wanted to unresolve
+ and forgot to remove the stage #0 entry).
- * The temporary files "git mergetool" uses are named to avoid too
+ * The temporary files "git mergetool" uses are renamed to avoid too
many dots in them (e.g. a temporary file for "hello.c" used to be
named e.g. "hello.BASE.4321.c" but now uses underscore instead,
- e.g. "hello_BASE_4321.c").
+ e.g. "hello_BASE_4321.c", to allow us to have multiple variants).
- * The temporary files "git mergetools" uses can be placed in a newly
+ * The temporary files "git mergetool" uses can be placed in a newly
created temporary directory, instead of the current directory, by
setting the mergetool.writeToTemp configuration variable.
* "git mergetool" understands "--tool bc" now, as version 4 of
BeyondCompare can be driven the same way as its version 3 and it
- feels awkward to say "--tool bc3".
+ feels awkward to say "--tool bc3" to run version 4.
* The "pre-receive" and "post-receive" hooks are no longer required
to consume their input fully (not following this requirement used
to result in intermittent errors in "git push").
- * The pretty-format specifier "%d", which expanded to " (tagname)"
+ * The pretty-format specifier "%d", which expands to " (tagname)"
for a tagged commit, gained a cousin "%D" that just gives the
"tagname" without frills.
@@ -86,17 +87,17 @@ UI, Workflows & Features
without having to "trust" the server.
* "git interpret-trailers" is a new filter to programmatically edit
- the tail end of the commit log messages.
+ the tail end of the commit log messages, e.g. "Signed-off-by:".
* "git help everyday" shows the "Everyday Git in 20 commands or so"
- document, whose contents have been updated to more modern Git
- practice.
+ document, whose contents have been updated to match more modern
+ Git practice.
- * On the "git svn" front, work to reduce memory consumption and
- to improve handling of mergeinfo progresses.
+ * On the "git svn" front, work progresses to reduce memory consumption and
+ to improve handling of mergeinfo.
-Performance, Internal Implementation, etc.
+Performance, Internal Implementation, Development Support etc.
* The API to manipulate the "refs" has been restructured to make it
more transactional, with the eventual goal to allow all-or-none
@@ -106,34 +107,34 @@ Performance, Internal Implementation, etc.
* The lockfile API and its users have been cleaned up.
* We no longer attempt to keep track of individual dependencies to
- the header files in the build procedure, relying on automated
+ the header files in the build procedure, relying instead on automated
dependency generation support from modern compilers.
* In tests, we have been using NOT_{MINGW,CYGWIN} test prerequisites
long before negated prerequisites e.g. !MINGW were invented.
The former has been converted to the latter to avoid confusion.
- * Looking up remotes configuration in a repository with very many
- remotes defined has been optimized.
+ * Optimized looking up a remote's configuration in a repository with very many
+ remotes defined.
* There are cases where you lock and open to write a file, close it
- to show the updated contents to external processes, and then have
- to update the file again while still holding the lock, but the
- lockfile API lacked support for such an access pattern.
+ to show the updated contents to an external processes, and then have
+ to update the file again while still holding the lock; now the
+ lockfile API has support for such an access pattern.
* The API to allocate the structure to keep track of commit
decoration has been updated to make it less cumbersome to use.
* An in-core caching layer to let us avoid reading the same
- configuration files number of times has been added. A few commands
+ configuration files several times has been added. A few commands
have been converted to use this subsystem.
* Various code paths have been cleaned up and simplified by using
- "strbuf", "starts_with()", and "skip_prefix()" APIs more.
+ the "strbuf", "starts_with()", and "skip_prefix()" APIs more.
* A few codepaths that died when large blobs that would not fit in
core are involved in their operation have been taught to punt
- instead, by e.g. marking too large a blob as not to be diffed.
+ instead, by e.g. marking a too-large blob as not to be diffed.
* A few more code paths in "commit" and "checkout" have been taught
to repopulate the cache-tree in the index, to help speed up later
@@ -141,7 +142,7 @@ Performance, Internal Implementation, etc.
"status").
* A common programming mistake to assign the same short option name
- to two separate options is detected by parse_options() API to help
+ to two separate options is detected by the parse_options() API to help
developers.
* The code path to write out the packed-refs file has been optimized,
@@ -153,7 +154,7 @@ Performance, Internal Implementation, etc.
especially matters in a repository with a large number of existing
refs.
- * "git fsck" was taught to check contents of tag objects a bit more.
+ * "git fsck" was taught to check the contents of tag objects a bit more.
* "git hash-object" was taught a "--literally" option to help
debugging.
@@ -162,16 +163,17 @@ Performance, Internal Implementation, etc.
original before feeding the filter. Instead, stream the file
contents directly to the filter and process its output.
- * The scripts in the test suite can be run with "-x" option to show
- a shell-trace of each command run in them.
+ * The scripts in the test suite can be run with the "-x" option to show
+ a shell-trace of each command they run.
* The "run-command" API learned to manage the argv and environment
- array for child process, alleviating the need for the callers to
+ arrays for child process, alleviating the need for the callers to
allocate and deallocate them.
* Some people use AsciiDoctor, instead of AsciiDoc, to format our
- documentation set; the documentation has been adjusted, as
- AsciiDoctor is pickier than AsciiDoc in its input mark-up.
+ documentation set; the documentation has been adjusted to be usable
+ by both, as AsciiDoctor is pickier than AsciiDoc about its input
+ mark-up.
Also contains various documentation updates and code clean-ups.
@@ -189,21 +191,21 @@ notes for details).
format", which was counterintuitive.
* "git -c section.var command" and "git -c section.var= command"
- should pass the configuration differently (the former should be a
+ should pass the configuration value differently (the former should be a
boolean true, the latter should be an empty string).
* Applying a patch not generated by Git in a subdirectory used to
- check the whitespace breakage using the attributes for incorrect
+ check for whitespace breakage using the attributes of incorrect
paths. Also whitespace checks were performed even for paths
- excluded via "git apply --exclude=<path>" mechanism.
+ excluded via the "git apply --exclude=<path>" mechanism.
- * "git bundle create" with date-range specification were meant to
+ * "git bundle create" with a date-range specification was meant to
exclude tags outside the range, but it didn't.
- * "git add x" where x that used to be a directory has become a
+ * "git add x" where x used to be a directory and is now a
symbolic link to a directory misbehaved.
- * The prompt script checked $GIT_DIR/ref/stash file to see if there
+ * The prompt script checked the $GIT_DIR/ref/stash file to see if there
is a stash, which was a no-no.
* Pack-protocol documentation had a minor typo.
@@ -217,7 +219,7 @@ notes for details).
(merge 107efbe rs/daemon-fixes later to maint).
* With sufficiently long refnames, "git fast-import" could have
- overflown an on-stack buffer.
+ overflowed an on-stack buffer.
* After "pack-refs --prune" packed refs at the top-level, it failed
to prune them.
@@ -232,8 +234,8 @@ notes for details).
to first check out <branch>.
(merge 95c6826 so/rebase-doc later to maint).
- * "git push" over HTTP transport had an artificial limit on number of
- refs that can be pushed imposed by the command line length.
+ * "git push" over HTTP transport had an artificial limit on the number of
+ refs that can be pushed, imposed by the command line length.
(merge 26be19b jk/send-pack-many-refspecs later to maint).
* When receiving an invalid pack stream that records the same object
@@ -248,19 +250,19 @@ notes for details).
detached HEAD as a starting point to traverse objects still in use.
(merge c40fdd0 mk/reachable-protect-detached-head later to maint).
- * "git config --add section.var val" used to lose existing
- section.var whose value was an empty string.
+ * "git config --add section.var val" when section.var already has an
+ empty-string value used to lose the empty-string value.
(merge c1063be ta/config-add-to-empty-or-true-fix later to maint).
* "git fsck" failed to report that it found corrupt objects via its
exit status in some cases.
(merge 30d1038 jk/fsck-exit-code-fix later to maint).
- * Use of "--verbose" option used to break "git branch --merged".
+ * Use of the "--verbose" option used to break "git branch --merged".
(merge 12994dd jk/maint-branch-verbose-merged later to maint).
- * Some MUAs mangled a line in a message that begins with "From " to
- ">From " when writing to a mailbox file and feeding such an input
+ * Some MUAs mangle a line in a message that begins with "From " to
+ ">From " when writing to a mailbox file, and feeding such an input
to "git am" used to lose such a line.
(merge 85de86a jk/mbox-from-line later to maint).
@@ -273,8 +275,8 @@ notes for details).
coding guidelines.
(merge 1c4b660 da/include-compat-util-first-in-c later to maint).
- * t7004 test, which tried to run Git with small stack space, has been
- updated to give a bit larger stack to avoid false breakage on some
+ * The t7004 test, which tried to run Git with small stack space, has been
+ updated to use a bit larger stack to avoid false breakage on some
platforms.
(merge b9a1907 sk/tag-contains-wo-recursion later to maint).
@@ -287,11 +289,25 @@ notes for details).
CGI.pm as of 4.04; use CGI::start_from instead.
(merge 4750f4b rm/gitweb-start-form later to maint).
- * Newer versions of 'meld' breaks the auto-detection we use to see if
+ * Newer versions of 'meld' break the auto-detection we use to see if
they are new enough to support the `--output` option.
(merge b12d045 da/mergetool-meld later to maint).
- * "git pack-objects" forgot to disable the codepath to generate
+ * "git pack-objects" forgot to disable the codepath to generate the
object reachability bitmap when it needs to split the resulting
pack.
(merge 2113471 jk/pack-objects-no-bitmap-when-splitting later to maint).
+
+ * The code to use cache-tree trusted the on-disk data too much and
+ fell into an infinite loop upon seeing an incorrectly recorded
+ index file.
+ (merge 729dbbd jk/cache-tree-protect-from-broken-libgit2 later to maint).
+
+ * "git fetch" into a repository where branch B was deleted earlier,
+ back when it had reflog enabled, and then branch B/C is fetched
+ into it without reflog enabled, which is arguably an unlikely
+ corner case, unnecessarily failed.
+ (merge aae828b jk/fetch-reflog-df-conflict later to maint).
+
+ * "git log --first-parent -L..." used to crash.
+ (merge a8787c5 tm/line-log-first-parent later to maint).
diff --git a/Documentation/RelNotes/2.2.1.txt b/Documentation/RelNotes/2.2.1.txt
new file mode 100644
index 0000000..d5a3cd9
--- /dev/null
+++ b/Documentation/RelNotes/2.2.1.txt
@@ -0,0 +1,34 @@
+Git v2.2.1 Release Notes
+========================
+
+Fixes since v2.2
+----------------
+
+ * We used to allow committing a path ".Git/config" with Git that is
+ running on a case sensitive filesystem, but an attempt to check out
+ such a path with Git that runs on a case insensitive filesystem
+ would have clobbered ".git/config", which is definitely not what
+ the user would have expected. Git now prevents you from tracking
+ a path with ".Git" (in any case combination) as a path component.
+
+ * On Windows, certain path components that are different from ".git"
+ are mapped to ".git", e.g. "git~1/config" is treated as if it were
+ ".git/config". HFS+ has a similar issue, where certain unicode
+ codepoints are ignored, e.g. ".g\u200cit/config" is treated as if
+ it were ".git/config". Pathnames with these potential issues are
+ rejected on the affected systems. Git on systems that are not
+ affected by this issue (e.g. Linux) can also be configured to
+ reject them to ensure cross platform interoperability of the hosted
+ projects.
+
+ * "git fsck" notices a tree object that records such a path that can
+ be confused with ".git", and with receive.fsckObjects configuration
+ set to true, an attempt to "git push" such a tree object will be
+ rejected. Such a path may not be a problem on a well behaving
+ filesystem but in order to protect those on HFS+ and on case
+ insensitive filesystems, this check is enabled on all platforms.
+
+A big "thanks!" for bringing this issue to us goes to our friends in
+the Mercurial land, namely, Matt Mackall and Augie Fackler.
+
+Also contains typofixes, documentation updates and trivial code clean-ups.
diff --git a/Documentation/RelNotes/2.3.0.txt b/Documentation/RelNotes/2.3.0.txt
new file mode 100644
index 0000000..880c062
--- /dev/null
+++ b/Documentation/RelNotes/2.3.0.txt
@@ -0,0 +1,74 @@
+Git v2.3 Release Notes
+======================
+
+Updates since v2.2
+------------------
+
+Ports
+
+ *
+
+UI, Workflows & Features
+
+ * It was cumbersome to use "GIT_SSH" mechanism when the user wanted
+ to pass an extra set of arguments to the underlying ssh. A new
+ environment variable GIT_SSH_COMMAND can be used for this.
+
+ * A request to store an empty note via "git notes" meant to remove
+ note from the object but with --allow-empty we will store a
+ (surprise!) note that is empty.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ *
+
+
+Also contains various documentation updates and code clean-ups.
+
+
+Fixes since v2.2
+----------------
+
+Unless otherwise noted, all the fixes since v2.2 in the maintenance
+track are contained in this release (see the maintenance releases'
+notes for details).
+
+ * "git checkout $treeish $path", when $path in the index and the
+ working tree already matched what is in $treeish at the $path,
+ still overwrote the $path unnecessarily.
+ (merge c5326bd jk/checkout-from-tree later to maint).
+
+ * "git config --get-color" did not parse its command line arguments
+ carefully.
+ (merge cb35722 jk/colors-fix later to maint).
+
+ * open() emulated on Windows platforms did not give EISDIR upon
+ an attempt to open a directory for writing.
+ (merge ba6fad0 js/windows-open-eisdir-error later to maint).
+
+ * A few code paths used abs() when they should have used labs() on
+ long integers.
+ (merge 83915ba rs/maint-config-use-labs later to maint).
+ (merge 31a8aa1 rs/receive-pack-use-labs later to maint).
+
+ * "gitweb" used to depend on a behaviour recent CGI.pm deprecated.
+ (merge 13dbf46 jk/gitweb-with-newer-cgi-multi-param later to maint).
+
+ * "git init" (hence "git clone") initialized the per-repository
+ configuration file .git/config with x-bit by mistake.
+ (merge 1f32ecf mh/config-flip-xbit-back-after-checking later to maint).
+
+ * Git 2.0 was supposed to make the "simple" mode for the default of
+ "git push", but it didn't.
+ (merge 00a6fa0 jk/push-simple later to maint).
+
+ * "Everyday" document had a broken link.
+ (merge 366c8d4 po/everyday-doc later to maint).
+
+ * A few test fixes.
+ (merge 880ef58 jk/no-perl-tests later to maint).
+
+ * The build procedure did not bother fixing perl and python scripts
+ when NO_PERL and NO_PYTHON build-time configuration changed.
+ (merge ca2051d jk/rebuild-perl-scripts-with-no-perl-seting-change later to maint).
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index e6d46ed..e3c942e 100644
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -57,7 +57,8 @@ change, the approach taken by the change, and if relevant how this
differs substantially from the prior version, are all good things
to have.
-Make sure that you have tests for the bug you are fixing.
+Make sure that you have tests for the bug you are fixing. See
+t/README for guidance.
When adding a new feature, make sure that you have new tests to show
the feature triggers the new behaviour when it should, and to show the
@@ -337,7 +338,7 @@ suggests to the contributors:
spend their time to improve your patch. Go back to step (2).
(4) The list forms consensus that the last round of your patch is
- good. Send it to the list and cc the maintainer.
+ good. Send it to the maintainer and cc the list.
(5) A topic branch is created with the patch and is merged to 'next',
and cooked further and eventually graduates to 'master'.
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 6a4c19e..ac781a4 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -246,6 +246,17 @@ core.precomposeunicode::
When false, file names are handled fully transparent by Git,
which is backward compatible with older versions of Git.
+core.protectHFS::
+ If set to true, do not allow checkout of paths that would
+ be considered equivalent to `.git` on an HFS+ filesystem.
+ Defaults to `true` on Mac OS, and `false` elsewhere.
+
+core.protectNTFS::
+ If set to true, do not allow checkout of paths that would
+ cause problems with the NTFS filesystem, e.g. conflict with
+ 8.3 "short" names.
+ Defaults to `true` on Windows, and `false` elsewhere.
+
core.trustctime::
If false, the ctime differences between the index and the
working tree are ignored; useful when the inode change time
@@ -683,7 +694,7 @@ alias.*::
confusion and troubles with script usage, aliases that
hide existing Git commands are ignored. Arguments are split by
spaces, the usual shell quoting and escaping is supported.
- quote pair and a backslash can be used to quote them.
+ A quote pair or a backslash can be used to quote them.
+
If the alias expansion is prefixed with an exclamation point,
it will be treated as a shell command. For example, defining
@@ -839,6 +850,10 @@ accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`,
`blink` and `reverse`. The first color given is the foreground; the
second is the background. The position of the attribute, if any,
doesn't matter.
++
+Colors (foreground and background) may also be given as numbers between
+0 and 255; these use ANSI 256-color mode (but note that not all
+terminals may support this).
color.diff::
Whether to use ANSI escape sequences to add color to patches.
@@ -2310,6 +2325,7 @@ sendemail.smtpserverport::
sendemail.smtpserveroption::
sendemail.smtpuser::
sendemail.thread::
+sendemail.transferencoding::
sendemail.validate::
See linkgit:git-send-email[1] for description.
@@ -2346,7 +2362,7 @@ status.showUntrackedFiles::
files which are not currently tracked by Git. Directories which
contain only untracked files, are shown with the directory name
only. Showing untracked files means that Git needs to lstat() all
- all the files in the whole repository, which might be slow on some
+ the files in the whole repository, which might be slow on some
systems. So, this variable controls how the commands displays
the untracked files. Possible values are:
+
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 9adce37..cfb74bc 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -57,6 +57,17 @@ OPTIONS
--no-scissors::
Ignore scissors lines (see linkgit:git-mailinfo[1]).
+-m::
+--message-id::
+ Pass the `-m` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]),
+ so that the Message-ID header is added to the commit message.
+ The `am.messageid` configuration variable can be used to specify
+ the default behaviour.
+
+--no-message-id::
+ Do not add the Message-ID header to the commit message.
+ `no-message-id` is useful to override `am.messageid`.
+
-q::
--quiet::
Be quiet. Only print error messages.
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 0bbc8f5..1e74b75 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -250,9 +250,10 @@ FROM UPSTREAM REBASE" section in linkgit:git-rebase[1].)
-o::
--only::
- Make a commit only from the paths specified on the
+ Make a commit by taking the updated working tree contents
+ of the paths specified on the
command line, disregarding any contents that have been
- staged so far. This is the default mode of operation of
+ staged for other paths. This is the default mode of operation of
'git commit' if any paths are given on the command line,
in which case this option can be omitted.
If this option is specified together with '--amend', then
diff --git a/Documentation/git-fast-export.txt b/Documentation/git-fast-export.txt
index dbe9a46..929e496 100644
--- a/Documentation/git-fast-export.txt
+++ b/Documentation/git-fast-export.txt
@@ -209,6 +209,10 @@ Since 'git fast-import' cannot tag trees, you will not be
able to export the linux.git repository completely, as it contains
a tag referencing a tree instead of a commit.
+SEE ALSO
+--------
+linkgit:git-fast-import[1]
+
GIT
---
Part of the linkgit:git[1] suite
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index 377eeaa..f71fb01 100644
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -1441,6 +1441,10 @@ operator can use this facility to peek at the objects and refs from an
import in progress, at the cost of some added running time and worse
compression.
+SEE ALSO
+--------
+linkgit:git-fast-export[1]
+
GIT
---
Part of the linkgit:git[1] suite
diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt
index 164a3c6..0947084 100644
--- a/Documentation/git-mailinfo.txt
+++ b/Documentation/git-mailinfo.txt
@@ -66,6 +66,11 @@ conversion, even with this flag.
-n::
Disable all charset re-coding of the metadata.
+-m::
+--message-id::
+ Copy the Message-ID header at the end of the commit message. This
+ is useful in order to associate commits with mailing list discussions.
+
--scissors::
Remove everything in body before a scissors line. A line that
mainly consists of scissors (either ">8" or "8<") and perforation
diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt
index 310f0a5..851518d 100644
--- a/Documentation/git-notes.txt
+++ b/Documentation/git-notes.txt
@@ -9,10 +9,10 @@ SYNOPSIS
--------
[verse]
'git notes' [list [<object>]]
-'git notes' add [-f] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]
+'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]
'git notes' copy [-f] ( --stdin | <from-object> <to-object> )
-'git notes' append [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]
-'git notes' edit [<object>]
+'git notes' append [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]
+'git notes' edit [--allow-empty] [<object>]
'git notes' show [<object>]
'git notes' merge [-v | -q] [-s <strategy> ] <notes-ref>
'git notes' merge --commit [-v | -q]
@@ -155,6 +155,10 @@ OPTIONS
Like '-C', but with '-c' the editor is invoked, so that
the user can further edit the note message.
+--allow-empty::
+ Allow an empty note object to be stored. The default behavior is
+ to automatically remove empty notes.
+
--ref <ref>::
Manipulate the notes tree in <ref>. This overrides
'GIT_NOTES_REF' and the "core.notesRef" configuration. The ref
@@ -287,7 +291,7 @@ arbitrary files using 'git hash-object':
------------
$ cc *.c
$ blob=$(git hash-object -w a.out)
-$ git notes --ref=built add -C "$blob" HEAD
+$ git notes --ref=built add --allow-empty -C "$blob" HEAD
------------
(You cannot simply use `git notes --ref=built add -F a.out HEAD`
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 21b3f29..b17283a 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -34,7 +34,7 @@ When the command line does not specify what to push with `<refspec>...`
arguments or `--all`, `--mirror`, `--tags` options, the command finds
the default `<refspec>` by consulting `remote.*.push` configuration,
and if it is not found, honors `push.default` configuration to decide
-what to push (See gitlink:git-config[1] for the meaning of `push.default`).
+what to push (See linkgit:git-config[1] for the meaning of `push.default`).
OPTIONS[[OPTIONS]]
diff --git a/Documentation/git-remote-ext.txt b/Documentation/git-remote-ext.txt
index cd0bb77..b25d0b5 100644
--- a/Documentation/git-remote-ext.txt
+++ b/Documentation/git-remote-ext.txt
@@ -116,6 +116,10 @@ begins with `ext::`. Examples:
determined by the helper using environment variables (see
above).
+SEE ALSO
+--------
+linkgit:gitremote-helpers[1]
+
GIT
---
Part of the linkgit:git[1] suite
diff --git a/Documentation/git-remote-fd.txt b/Documentation/git-remote-fd.txt
index bcd3766..e700baf 100644
--- a/Documentation/git-remote-fd.txt
+++ b/Documentation/git-remote-fd.txt
@@ -50,6 +50,10 @@ EXAMPLES
`git push fd::7,8/bar master`::
Same as above.
+SEE ALSO
+--------
+linkgit:gitremote-helpers[1]
+
GIT
---
Part of the linkgit:git[1] suite
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index a60776e..a9efa5c 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -131,6 +131,16 @@ Note that no attempts whatsoever are made to validate the encoding.
Specify encoding of compose message. Default is the value of the
'sendemail.composeencoding'; if that is unspecified, UTF-8 is assumed.
+--transfer-encoding=(7bit|8bit|quoted-printable|base64)::
+ Specify the transfer encoding to be used to send the message over SMTP.
+ 7bit will fail upon encountering a non-ASCII message. quoted-printable
+ can be useful when the repository contains files that contain carriage
+ returns, but makes the raw patch email file (as saved from a MUA) much
+ harder to inspect manually. base64 is even more fool proof, but also
+ even more opaque. Default is the value of the 'sendemail.transferEncoding'
+ configuration value; if that is unspecified, git will use 8bit and not
+ add a Content-Transfer-Encoding header.
+
Sending
~~~~~~~
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 9202010..73dc0ad 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,35 +43,45 @@ unreleased) version of Git, that is available from the 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
-* link:v2.1.3/git.html[documentation for release 2.1.3]
+* link:v2.2.1/git.html[documentation for release 2.2.1]
* release notes for
+ link:RelNotes/2.2.1.txt[2.2.1],
+ link:RelNotes/2.2.0.txt[2.2].
+
+* link:v2.1.4/git.html[documentation for release 2.1.4]
+
+* release notes for
+ link:RelNotes/2.1.4.txt[2.1.4],
link:RelNotes/2.1.3.txt[2.1.3],
link:RelNotes/2.1.2.txt[2.1.2],
link:RelNotes/2.1.1.txt[2.1.1],
link:RelNotes/2.1.0.txt[2.1].
-* link:v2.0.4/git.html[documentation for release 2.0.4]
+* link:v2.0.5/git.html[documentation for release 2.0.5]
* release notes for
+ link:RelNotes/2.0.5.txt[2.0.5],
link:RelNotes/2.0.4.txt[2.0.4],
link:RelNotes/2.0.3.txt[2.0.3],
link:RelNotes/2.0.2.txt[2.0.2],
link:RelNotes/2.0.1.txt[2.0.1],
link:RelNotes/2.0.0.txt[2.0.0].
-* link:v1.9.4/git.html[documentation for release 1.9.4]
+* link:v1.9.5/git.html[documentation for release 1.9.5]
* release notes for
+ link:RelNotes/1.9.5.txt[1.9.5],
link:RelNotes/1.9.4.txt[1.9.4],
link:RelNotes/1.9.3.txt[1.9.3],
link:RelNotes/1.9.2.txt[1.9.2],
link:RelNotes/1.9.1.txt[1.9.1],
link:RelNotes/1.9.0.txt[1.9.0].
-* link:v1.8.5.5/git.html[documentation for release 1.8.5.5]
+* link:v1.8.5.6/git.html[documentation for release 1.8.5.6]
* release notes for
+ link:RelNotes/1.8.5.6.txt[1.8.5.6],
link:RelNotes/1.8.5.5.txt[1.8.5.5],
link:RelNotes/1.8.5.4.txt[1.8.5.4],
link:RelNotes/1.8.5.3.txt[1.8.5.3],
@@ -876,19 +886,21 @@ other
and the `core.editor` option in linkgit:git-config[1].
'GIT_SSH'::
- If this environment variable is set then 'git fetch'
- and 'git push' will use this command instead
- of 'ssh' when they need to connect to a remote system.
- The '$GIT_SSH' command will be given exactly two or
- four arguments: the 'username@host' (or just 'host')
- from the URL and the shell command to execute on that
- remote system, optionally preceded by '-p' (literally) and
- the 'port' from the URL when it specifies something other
- than the default SSH port.
+'GIT_SSH_COMMAND'::
+ If either of these environment variables is set then 'git fetch'
+ and 'git push' will use the specified command instead of 'ssh'
+ when they need to connect to a remote system.
+ The command will be given exactly two or four arguments: the
+ 'username@host' (or just 'host') from the URL and the shell
+ command to execute on that remote system, optionally preceded by
+ '-p' (literally) and the 'port' from the URL when it specifies
+ something other than the default SSH port.
+
-To pass options to the program that you want to list in GIT_SSH
-you will need to wrap the program and options into a shell script,
-then set GIT_SSH to refer to the shell script.
+`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted
+by the shell, which allows additional arguments to be included.
+`$GIT_SSH` on the other hand must be just the path to a program
+(which can be a wrapper shell script, if additional arguments are
+needed).
+
Usually it is easier to configure any desired options through your
personal `.ssh/config` file. Please consult your ssh documentation
diff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.txt
index 64f7ad2..8edf72c 100644
--- a/Documentation/gitremote-helpers.txt
+++ b/Documentation/gitremote-helpers.txt
@@ -452,8 +452,14 @@ SEE ALSO
--------
linkgit:git-remote[1]
+linkgit:git-remote-ext[1]
+
+linkgit:git-remote-fd[1]
+
linkgit:git-remote-testgit[1]
+linkgit:git-fast-import[1]
+
GIT
---
Part of the linkgit:git[1] suite
diff --git a/Documentation/gittutorial-2.txt b/Documentation/gittutorial-2.txt
index f6fbf81..30d2119 100644
--- a/Documentation/gittutorial-2.txt
+++ b/Documentation/gittutorial-2.txt
@@ -368,17 +368,18 @@ situation:
------------------------------------------------
$ git status
-# On branch master
-# Changes to be committed:
-# (use "git reset HEAD <file>..." to unstage)
-#
-# new file: closing.txt
-#
-# Changes not staged for commit:
-# (use "git add <file>..." to update what will be committed)
-#
-# modified: file.txt
-#
+On branch master
+Changes to be committed:
+ (use "git reset HEAD <file>..." to unstage)
+
+ new file: closing.txt
+
+Changes not staged for commit:
+ (use "git add <file>..." to update what will be committed)
+ (use "git checkout -- <file>..." to discard changes in working directory)
+
+ modified: file.txt
+
------------------------------------------------
Since the current state of closing.txt is cached in the index file,
diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt
index af9f709..b00c67d 100644
--- a/Documentation/gittutorial.txt
+++ b/Documentation/gittutorial.txt
@@ -3,7 +3,7 @@ gittutorial(7)
NAME
----
-gittutorial - A tutorial introduction to Git (for version 1.5.1 or newer)
+gittutorial - A tutorial introduction to Git
SYNOPSIS
--------
@@ -107,14 +107,15 @@ summary of the situation with 'git status':
------------------------------------------------
$ git status
-# On branch master
-# Changes to be committed:
-# (use "git reset HEAD <file>..." to unstage)
-#
-# modified: file1
-# modified: file2
-# modified: file3
-#
+On branch master
+Changes to be committed:
+Your branch is up-to-date with 'origin/master'.
+ (use "git reset HEAD <file>..." to unstage)
+
+ modified: file1
+ modified: file2
+ modified: file3
+
------------------------------------------------
If you need to make any further adjustments, do so now, and then add any
diff --git a/Documentation/technical/api-string-list.txt b/Documentation/technical/api-string-list.txt
index d51a657..c08402b 100644
--- a/Documentation/technical/api-string-list.txt
+++ b/Documentation/technical/api-string-list.txt
@@ -29,7 +29,7 @@ member (you need this if you add things later) and you should set the
`unsorted_string_list_has_string` and get it from the list using
`string_list_lookup` for sorted lists.
-. Can sort an unsorted list using `sort_string_list`.
+. Can sort an unsorted list using `string_list_sort`.
. Can remove duplicate items from a sorted list using
`string_list_remove_duplicates`.
@@ -146,7 +146,7 @@ write `string_list_insert(...)->util = ...;`.
ownership of a malloc()ed string to a `string_list` that has
`strdup_string` set.
-`sort_string_list`::
+`string_list_sort`::
Sort the list's entries by string value in `strcmp()` order.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 7db860f..53dd6b3 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.2.0-rc1
+DEF_VER=v2.2.0.GIT
LF='
'
diff --git a/Makefile b/Makefile
index 827006b..7482a4d 100644
--- a/Makefile
+++ b/Makefile
@@ -1662,7 +1662,7 @@ GIT-SCRIPT-DEFINES: FORCE
fi
-$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh GIT-SCRIPT-DEFINES
+$(SCRIPT_SH_GEN) : % : %.sh GIT-SCRIPT-DEFINES
$(QUIET_GEN)$(cmd_munge_script) && \
chmod +x $@+ && \
mv $@+ $@
@@ -1676,8 +1676,11 @@ git.res: git.rc GIT-VERSION-FILE
$(join -DMAJOR= -DMINOR=, $(wordlist 1,2,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \
-DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@
+# This makes sure we depend on the NO_PERL setting itself.
+$(SCRIPT_PERL_GEN): GIT-BUILD-OPTIONS
+
ifndef NO_PERL
-$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
+$(SCRIPT_PERL_GEN): perl/perl.mak
perl/perl.mak: perl/PM.stamp
@@ -1690,7 +1693,7 @@ perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL
$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ)
-$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE
+$(SCRIPT_PERL_GEN): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE
$(QUIET_GEN)$(RM) $@ $@+ && \
INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
INSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \
@@ -1724,7 +1727,7 @@ git-instaweb: git-instaweb.sh gitweb GIT-SCRIPT-DEFINES
chmod +x $@+ && \
mv $@+ $@
else # NO_PERL
-$(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : unimplemented.sh
+$(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh
$(QUIET_GEN)$(RM) $@ $@+ && \
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
-e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
@@ -1733,6 +1736,9 @@ $(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : unimplemented.sh
mv $@+ $@
endif # NO_PERL
+# This makes sure we depend on the NO_PYTHON setting itself.
+$(SCRIPT_PYTHON_GEN): GIT-BUILD-OPTIONS
+
ifndef NO_PYTHON
$(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
$(SCRIPT_PYTHON_GEN): % : %.py
diff --git a/RelNotes b/RelNotes
index c473b35..9257c74 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.2.0.txt \ No newline at end of file
+Documentation/RelNotes/2.3.0.txt \ No newline at end of file
diff --git a/builtin/add.c b/builtin/add.c
index ae6d3e2..1074e32 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -284,7 +284,7 @@ static int add_files(struct dir_struct *dir, int flags)
for (i = 0; i < dir->ignored_nr; i++)
fprintf(stderr, "%s\n", dir->ignored[i]->name);
fprintf(stderr, _("Use -f if you really want to add them.\n"));
- die(_("no files added"));
+ exit_status = 1;
}
for (i = 0; i < dir->nr; i++)
diff --git a/builtin/apply.c b/builtin/apply.c
index 6696ea4..0aad912 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -3728,7 +3728,7 @@ static void build_fake_ancestor(struct patch *list, const char *filename)
if (!preimage_sha1_in_gitlink_patch(patch, sha1))
; /* ok, the textual part looks sane */
else
- die("sha1 information is lacking or useless for submoule %s",
+ die("sha1 information is lacking or useless for submodule %s",
name);
} else if (!get_sha1_blob(patch->old_sha1_prefix, sha1)) {
; /* ok */
@@ -4180,7 +4180,7 @@ static int write_out_results(struct patch *list)
if (cpath.nr) {
struct string_list_item *item;
- sort_string_list(&cpath);
+ string_list_sort(&cpath);
for_each_string_list_item(item, &cpath)
fprintf(stderr, "U %s\n", item->string);
string_list_clear(&cpath, 0);
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 5410dac..5a78758 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -67,6 +67,7 @@ static int update_some(const unsigned char *sha1, const char *base, int baselen,
{
int len;
struct cache_entry *ce;
+ int pos;
if (S_ISDIR(mode))
return READ_TREE_RECURSIVE;
@@ -79,6 +80,23 @@ static int update_some(const unsigned char *sha1, const char *base, int baselen,
ce->ce_flags = create_ce_flags(0) | CE_UPDATE;
ce->ce_namelen = len;
ce->ce_mode = create_ce_mode(mode);
+
+ /*
+ * If the entry is the same as the current index, we can leave the old
+ * entry in place. Whether it is UPTODATE or not, checkout_entry will
+ * do the right thing.
+ */
+ pos = cache_name_pos(ce->name, ce->ce_namelen);
+ if (pos >= 0) {
+ struct cache_entry *old = active_cache[pos];
+ if (ce->ce_mode == old->ce_mode &&
+ !hashcmp(ce->sha1, old->sha1)) {
+ old->ce_flags |= CE_UPDATE;
+ free(ce);
+ return 0;
+ }
+ }
+
add_cache_entry(ce, ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE);
return 0;
}
diff --git a/builtin/commit.c b/builtin/commit.c
index e108c53..cda74e9 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -800,32 +800,8 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
if (clean_message_contents)
stripspace(&sb, 0);
- if (signoff) {
- /*
- * See if we have a Conflicts: block at the end. If yes, count
- * its size, so we can ignore it.
- */
- int ignore_footer = 0;
- int i, eol, previous = 0;
- const char *nl;
-
- for (i = 0; i < sb.len; i++) {
- nl = memchr(sb.buf + i, '\n', sb.len - i);
- if (nl)
- eol = nl - sb.buf;
- else
- eol = sb.len;
- if (starts_with(sb.buf + previous, "\nConflicts:\n")) {
- ignore_footer = sb.len - previous;
- break;
- }
- while (i < eol)
- i++;
- previous = eol;
- }
-
- append_signoff(&sb, ignore_footer, 0);
- }
+ if (signoff)
+ append_signoff(&sb, ignore_non_trailer(&sb), 0);
if (fwrite(sb.buf, 1, sb.len, s->fp) < sb.len)
die_errno(_("could not write commit template"));
diff --git a/builtin/config.c b/builtin/config.c
index 8cc2604..15a7bea 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -69,8 +69,8 @@ static struct option builtin_config_options[] = {
OPT_BIT(0, "remove-section", &actions, N_("remove a section: name"), ACTION_REMOVE_SECTION),
OPT_BIT('l', "list", &actions, N_("list all"), ACTION_LIST),
OPT_BIT('e', "edit", &actions, N_("open an editor"), ACTION_EDIT),
- OPT_STRING(0, "get-color", &get_color_slot, N_("slot"), N_("find the color configured: [default]")),
- OPT_STRING(0, "get-colorbool", &get_colorbool_slot, N_("slot"), N_("find the color setting: [stdout-is-tty]")),
+ OPT_BIT(0, "get-color", &actions, N_("find the color configured: slot [default]"), ACTION_GET_COLOR),
+ OPT_BIT(0, "get-colorbool", &actions, N_("find the color setting: slot [stdout-is-tty]"), ACTION_GET_COLORBOOL),
OPT_GROUP(N_("Type")),
OPT_BIT(0, "bool", &types, N_("value is \"true\" or \"false\""), TYPE_BOOL),
OPT_BIT(0, "int", &types, N_("value is decimal number"), TYPE_INT),
@@ -303,8 +303,9 @@ static int git_get_color_config(const char *var, const char *value, void *cb)
return 0;
}
-static void get_color(const char *def_color)
+static void get_color(const char *var, const char *def_color)
{
+ get_color_slot = var;
get_color_found = 0;
parsed_color[0] = '\0';
git_config_with_options(git_get_color_config, NULL,
@@ -333,8 +334,9 @@ static int git_get_colorbool_config(const char *var, const char *value,
return 0;
}
-static int get_colorbool(int print)
+static int get_colorbool(const char *var, int print)
{
+ get_colorbool_slot = var;
get_colorbool_found = -1;
get_diff_color_found = -1;
get_color_ui_found = -1;
@@ -532,12 +534,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
usage_with_options(builtin_config_usage, builtin_config_options);
}
- if (get_color_slot)
- actions |= ACTION_GET_COLOR;
- if (get_colorbool_slot)
- actions |= ACTION_GET_COLORBOOL;
-
- if ((get_color_slot || get_colorbool_slot) && types) {
+ if ((actions & (ACTION_GET_COLOR|ACTION_GET_COLORBOOL)) && types) {
error("--get-color and variable type are incoherent");
usage_with_options(builtin_config_usage, builtin_config_options);
}
@@ -568,8 +565,8 @@ int cmd_config(int argc, const char **argv, const char *prefix)
}
}
else if (actions == ACTION_EDIT) {
- const char *config_file = given_config_source.file ?
- given_config_source.file : git_path("config");
+ char *config_file;
+
check_argc(argc, 0, 0);
if (!given_config_source.file && nongit)
die("not in a git directory");
@@ -578,6 +575,8 @@ int cmd_config(int argc, const char **argv, const char *prefix)
if (given_config_source.blob)
die("editing blobs is not supported");
git_config(git_default_config, NULL);
+ config_file = xstrdup(given_config_source.file ?
+ given_config_source.file : git_path("config"));
if (use_global_config) {
int fd = open(config_file, O_CREAT | O_EXCL | O_WRONLY, 0666);
if (fd) {
@@ -590,6 +589,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
die_errno(_("cannot create configuration file %s"), config_file);
}
launch_editor(config_file, NULL, NULL);
+ free(config_file);
}
else if (actions == ACTION_SET) {
int ret;
@@ -683,12 +683,14 @@ int cmd_config(int argc, const char **argv, const char *prefix)
die("No such section!");
}
else if (actions == ACTION_GET_COLOR) {
- get_color(argv[0]);
+ check_argc(argc, 1, 2);
+ get_color(argv[0], argv[1]);
}
else if (actions == ACTION_GET_COLORBOOL) {
- if (argc == 1)
- color_stdout_is_tty = git_config_bool("command line", argv[0]);
- return get_colorbool(argc != 0);
+ check_argc(argc, 1, 2);
+ if (argc == 2)
+ color_stdout_is_tty = git_config_bool("command line", argv[1]);
+ return get_colorbool(argv[0], argc == 2);
}
return 0;
diff --git a/builtin/help.c b/builtin/help.c
index b3c818e..e78c135 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -321,16 +321,18 @@ static void setup_man_path(void)
{
struct strbuf new_path = STRBUF_INIT;
const char *old_path = getenv("MANPATH");
+ char *git_man_path = system_path(GIT_MAN_PATH);
/* We should always put ':' after our path. If there is no
* old_path, the ':' at the end will let 'man' to try
* system-wide paths after ours to find the manual page. If
* there is old_path, we need ':' as delimiter. */
- strbuf_addstr(&new_path, system_path(GIT_MAN_PATH));
+ strbuf_addstr(&new_path, git_man_path);
strbuf_addch(&new_path, ':');
if (old_path)
strbuf_addstr(&new_path, old_path);
+ free(git_man_path);
setenv("MANPATH", new_path.buf, 1);
strbuf_release(&new_path);
@@ -380,8 +382,10 @@ static void show_info_page(const char *git_cmd)
static void get_html_page_path(struct strbuf *page_path, const char *page)
{
struct stat st;
+ char *to_free = NULL;
+
if (!html_path)
- html_path = system_path(GIT_HTML_PATH);
+ html_path = to_free = system_path(GIT_HTML_PATH);
/* Check that we have a git documentation directory. */
if (!strstr(html_path, "://")) {
@@ -392,6 +396,7 @@ static void get_html_page_path(struct strbuf *page_path, const char *page)
strbuf_init(page_path, 0);
strbuf_addf(page_path, "%s/%s.html", html_path, page);
+ free(to_free);
}
/*
diff --git a/builtin/init-db.c b/builtin/init-db.c
index 587a505..9966522 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -119,15 +119,18 @@ static void copy_templates(const char *template_dir)
DIR *dir;
const char *git_dir = get_git_dir();
int len = strlen(git_dir);
+ char *to_free = NULL;
if (!template_dir)
template_dir = getenv(TEMPLATE_DIR_ENVIRONMENT);
if (!template_dir)
template_dir = init_db_template_dir;
if (!template_dir)
- template_dir = system_path(DEFAULT_GIT_TEMPLATE_DIR);
- if (!template_dir[0])
+ template_dir = to_free = system_path(DEFAULT_GIT_TEMPLATE_DIR);
+ if (!template_dir[0]) {
+ free(to_free);
return;
+ }
template_len = strlen(template_dir);
if (PATH_MAX <= (template_len+strlen("/config")))
die(_("insanely long template path %s"), template_dir);
@@ -139,7 +142,7 @@ static void copy_templates(const char *template_dir)
dir = opendir(template_path);
if (!dir) {
warning(_("templates not found %s"), template_dir);
- return;
+ goto free_return;
}
/* Make sure that template is from the correct vintage */
@@ -155,8 +158,7 @@ static void copy_templates(const char *template_dir)
"a wrong format version %d from '%s'"),
repository_format_version,
template_dir);
- closedir(dir);
- return;
+ goto close_free_return;
}
memcpy(path, git_dir, len);
@@ -166,7 +168,10 @@ static void copy_templates(const char *template_dir)
copy_templates_1(path, len,
template_path, template_len,
dir);
+close_free_return:
closedir(dir);
+free_return:
+ free(to_free);
}
static int git_init_db_config(const char *k, const char *v, void *cb)
@@ -254,7 +259,10 @@ static int create_default_files(const char *template_path)
struct stat st2;
filemode = (!chmod(path, st1.st_mode ^ S_IXUSR) &&
!lstat(path, &st2) &&
- st1.st_mode != st2.st_mode);
+ st1.st_mode != st2.st_mode &&
+ !chmod(path, st1.st_mode));
+ if (filemode && !reinit && (st1.st_mode & S_IXUSR))
+ filemode = 0;
}
git_config_set("core.filemode", filemode ? "true" : "false");
diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c
index 6a14d29..c8a47c1 100644
--- a/builtin/mailinfo.c
+++ b/builtin/mailinfo.c
@@ -15,6 +15,7 @@ static const char *metainfo_charset;
static struct strbuf line = STRBUF_INIT;
static struct strbuf name = STRBUF_INIT;
static struct strbuf email = STRBUF_INIT;
+static char *message_id;
static enum {
TE_DONTCARE, TE_QP, TE_BASE64
@@ -24,6 +25,7 @@ static struct strbuf charset = STRBUF_INIT;
static int patch_lines;
static struct strbuf **p_hdr_data, **s_hdr_data;
static int use_scissors;
+static int add_message_id;
static int use_inbody_headers = 1;
#define MAX_HDR_PARSED 10
@@ -198,6 +200,12 @@ static void handle_content_type(struct strbuf *line)
}
}
+static void handle_message_id(const struct strbuf *line)
+{
+ if (add_message_id)
+ message_id = strdup(line->buf);
+}
+
static void handle_content_transfer_encoding(const struct strbuf *line)
{
if (strcasestr(line->buf, "base64"))
@@ -342,6 +350,14 @@ static int check_header(const struct strbuf *line,
ret = 1;
goto check_header_out;
}
+ if (cmp_header(line, "Message-Id")) {
+ len = strlen("Message-Id: ");
+ strbuf_add(&sb, line->buf + len, line->len - len);
+ decode_header(&sb);
+ handle_message_id(&sb);
+ ret = 1;
+ goto check_header_out;
+ }
/* for inbody stuff */
if (starts_with(line->buf, ">From") && isspace(line->buf[5])) {
@@ -816,6 +832,8 @@ static int handle_commit_msg(struct strbuf *line)
}
if (patchbreak(line)) {
+ if (message_id)
+ fprintf(cmitmsg, "Message-Id: %s\n", message_id);
fclose(cmitmsg);
cmitmsg = NULL;
return 1;
@@ -1013,7 +1031,7 @@ static int git_mailinfo_config(const char *var, const char *value, void *unused)
}
static const char mailinfo_usage[] =
- "git mailinfo [-k|-b] [-u | --encoding=<encoding> | -n] [--scissors | --no-scissors] msg patch < mail >info";
+ "git mailinfo [-k|-b] [-m | --message-id] [-u | --encoding=<encoding> | -n] [--scissors | --no-scissors] msg patch < mail >info";
int cmd_mailinfo(int argc, const char **argv, const char *prefix)
{
@@ -1032,6 +1050,8 @@ int cmd_mailinfo(int argc, const char **argv, const char *prefix)
keep_subject = 1;
else if (!strcmp(argv[1], "-b"))
keep_non_patch_brackets_in_subject = 1;
+ else if (!strcmp(argv[1], "-m") || !strcmp(argv[1], "--message-id"))
+ add_message_id = 1;
else if (!strcmp(argv[1], "-u"))
metainfo_charset = def_charset;
else if (!strcmp(argv[1], "-n"))
diff --git a/builtin/merge.c b/builtin/merge.c
index bebbe5b..215d485 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -29,6 +29,7 @@
#include "remote.h"
#include "fmt-merge-msg.h"
#include "gpg-interface.h"
+#include "sequencer.h"
#define DEFAULT_TWOHEAD (1<<0)
#define DEFAULT_OCTOPUS (1<<1)
@@ -880,28 +881,19 @@ static int finish_automerge(struct commit *head,
return 0;
}
-static int suggest_conflicts(int renormalizing)
+static int suggest_conflicts(void)
{
const char *filename;
FILE *fp;
- int pos;
+ struct strbuf msgbuf = STRBUF_INIT;
filename = git_path("MERGE_MSG");
fp = fopen(filename, "a");
if (!fp)
die_errno(_("Could not open '%s' for writing"), filename);
- fprintf(fp, "\nConflicts:\n");
- for (pos = 0; pos < active_nr; pos++) {
- const struct cache_entry *ce = active_cache[pos];
-
- if (ce_stage(ce)) {
- fprintf(fp, "\t%s\n", ce->name);
- while (pos + 1 < active_nr &&
- !strcmp(ce->name,
- active_cache[pos + 1]->name))
- pos++;
- }
- }
+
+ append_conflicts_hint(&msgbuf);
+ fputs(msgbuf.buf, fp);
fclose(fp);
rerere(allow_rerere_auto);
printf(_("Automatic merge failed; "
@@ -1550,7 +1542,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
fprintf(stderr, _("Automatic merge went well; "
"stopped before committing as requested\n"));
else
- ret = suggest_conflicts(option_renormalize);
+ ret = suggest_conflicts();
done:
free(branch_to_free);
diff --git a/builtin/notes.c b/builtin/notes.c
index 68b6cd8..a9f37d0 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -22,10 +22,10 @@
static const char * const git_notes_usage[] = {
N_("git notes [--ref <notes_ref>] [list [<object>]]"),
- N_("git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) <object>] [<object>]"),
+ N_("git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> | (-c | -C) <object>] [<object>]"),
N_("git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"),
- N_("git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) <object>] [<object>]"),
- N_("git notes [--ref <notes_ref>] edit [<object>]"),
+ N_("git notes [--ref <notes_ref>] append [--allow-empty] [-m <msg> | -F <file> | (-c | -C) <object>] [<object>]"),
+ N_("git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]"),
N_("git notes [--ref <notes_ref>] show [<object>]"),
N_("git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"),
N_("git notes merge --commit [-v | -q]"),
@@ -92,12 +92,22 @@ static const char * const git_notes_get_ref_usage[] = {
static const char note_template[] =
"\nWrite/edit the notes for the following object:\n";
-struct msg_arg {
+struct note_data {
int given;
int use_editor;
+ char *edit_path;
struct strbuf buf;
};
+static void free_note_data(struct note_data *d)
+{
+ if (d->edit_path) {
+ unlink_or_warn(d->edit_path);
+ free(d->edit_path);
+ }
+ strbuf_release(&d->buf);
+}
+
static int list_each_note(const unsigned char *object_sha1,
const unsigned char *note_sha1, char *note_path,
void *cb_data)
@@ -106,7 +116,7 @@ static int list_each_note(const unsigned char *object_sha1,
return 0;
}
-static void write_note_data(int fd, const unsigned char *sha1)
+static void copy_obj_to_fd(int fd, const unsigned char *sha1)
{
unsigned long size;
enum object_type type;
@@ -149,26 +159,23 @@ static void write_commented_object(int fd, const unsigned char *object)
sha1_to_hex(object));
}
-static void create_note(const unsigned char *object, struct msg_arg *msg,
- int append_only, const unsigned char *prev,
- unsigned char *result)
+static void prepare_note_data(const unsigned char *object, struct note_data *d,
+ const unsigned char *old_note)
{
- char *path = NULL;
-
- if (msg->use_editor || !msg->given) {
+ if (d->use_editor || !d->given) {
int fd;
struct strbuf buf = STRBUF_INIT;
/* write the template message before editing: */
- path = git_pathdup("NOTES_EDITMSG");
- fd = open(path, O_CREAT | O_TRUNC | O_WRONLY, 0600);
+ d->edit_path = git_pathdup("NOTES_EDITMSG");
+ fd = open(d->edit_path, O_CREAT | O_TRUNC | O_WRONLY, 0600);
if (fd < 0)
- die_errno(_("could not create file '%s'"), path);
+ die_errno(_("could not create file '%s'"), d->edit_path);
- if (msg->given)
- write_or_die(fd, msg->buf.buf, msg->buf.len);
- else if (prev && !append_only)
- write_note_data(fd, prev);
+ if (d->given)
+ write_or_die(fd, d->buf.buf, d->buf.len);
+ else if (old_note)
+ copy_obj_to_fd(fd, old_note);
strbuf_addch(&buf, '\n');
strbuf_add_commented_lines(&buf, note_template, strlen(note_template));
@@ -179,94 +186,71 @@ static void create_note(const unsigned char *object, struct msg_arg *msg,
close(fd);
strbuf_release(&buf);
- strbuf_reset(&(msg->buf));
-
- if (launch_editor(path, &(msg->buf), NULL)) {
- die(_("Please supply the note contents using either -m" \
- " or -F option"));
- }
- stripspace(&(msg->buf), 1);
- }
-
- if (prev && append_only) {
- /* Append buf to previous note contents */
- unsigned long size;
- enum object_type type;
- char *prev_buf = read_sha1_file(prev, &type, &size);
+ strbuf_reset(&d->buf);
- strbuf_grow(&(msg->buf), size + 1);
- if (msg->buf.len && prev_buf && size)
- strbuf_insert(&(msg->buf), 0, "\n", 1);
- if (prev_buf && size)
- strbuf_insert(&(msg->buf), 0, prev_buf, size);
- free(prev_buf);
- }
-
- if (!msg->buf.len) {
- fprintf(stderr, _("Removing note for object %s\n"),
- sha1_to_hex(object));
- hashclr(result);
- } else {
- if (write_sha1_file(msg->buf.buf, msg->buf.len, blob_type, result)) {
- error(_("unable to write note object"));
- if (path)
- error(_("The note contents have been left in %s"),
- path);
- exit(128);
+ if (launch_editor(d->edit_path, &d->buf, NULL)) {
+ die(_("Please supply the note contents using either -m or -F option"));
}
+ stripspace(&d->buf, 1);
}
+}
- if (path) {
- unlink_or_warn(path);
- free(path);
+static void write_note_data(struct note_data *d, unsigned char *sha1)
+{
+ if (write_sha1_file(d->buf.buf, d->buf.len, blob_type, sha1)) {
+ error(_("unable to write note object"));
+ if (d->edit_path)
+ error(_("The note contents have been left in %s"),
+ d->edit_path);
+ exit(128);
}
}
static int parse_msg_arg(const struct option *opt, const char *arg, int unset)
{
- struct msg_arg *msg = opt->value;
+ struct note_data *d = opt->value;
- strbuf_grow(&(msg->buf), strlen(arg) + 2);
- if (msg->buf.len)
- strbuf_addch(&(msg->buf), '\n');
- strbuf_addstr(&(msg->buf), arg);
- stripspace(&(msg->buf), 0);
+ strbuf_grow(&d->buf, strlen(arg) + 2);
+ if (d->buf.len)
+ strbuf_addch(&d->buf, '\n');
+ strbuf_addstr(&d->buf, arg);
+ stripspace(&d->buf, 0);
- msg->given = 1;
+ d->given = 1;
return 0;
}
static int parse_file_arg(const struct option *opt, const char *arg, int unset)
{
- struct msg_arg *msg = opt->value;
+ struct note_data *d = opt->value;
- if (msg->buf.len)
- strbuf_addch(&(msg->buf), '\n');
+ if (d->buf.len)
+ strbuf_addch(&d->buf, '\n');
if (!strcmp(arg, "-")) {
- if (strbuf_read(&(msg->buf), 0, 1024) < 0)
+ if (strbuf_read(&d->buf, 0, 1024) < 0)
die_errno(_("cannot read '%s'"), arg);
- } else if (strbuf_read_file(&(msg->buf), arg, 1024) < 0)
+ } else if (strbuf_read_file(&d->buf, arg, 1024) < 0)
die_errno(_("could not open or read '%s'"), arg);
- stripspace(&(msg->buf), 0);
+ stripspace(&d->buf, 0);
- msg->given = 1;
+ d->given = 1;
return 0;
}
static int parse_reuse_arg(const struct option *opt, const char *arg, int unset)
{
- struct msg_arg *msg = opt->value;
+ struct note_data *d = opt->value;
char *buf;
unsigned char object[20];
enum object_type type;
unsigned long len;
- if (msg->buf.len)
- strbuf_addch(&(msg->buf), '\n');
+ if (d->buf.len)
+ strbuf_addch(&d->buf, '\n');
if (get_sha1(arg, object))
die(_("Failed to resolve '%s' as a valid ref."), arg);
- if (!(buf = read_sha1_file(object, &type, &len)) || !len) {
+ if (!(buf = read_sha1_file(object, &type, &len))) {
free(buf);
die(_("Failed to read object '%s'."), arg);
}
@@ -274,17 +258,17 @@ static int parse_reuse_arg(const struct option *opt, const char *arg, int unset)
free(buf);
die(_("Cannot read note data from non-blob object '%s'."), arg);
}
- strbuf_add(&(msg->buf), buf, len);
+ strbuf_add(&d->buf, buf, len);
free(buf);
- msg->given = 1;
+ d->given = 1;
return 0;
}
static int parse_reedit_arg(const struct option *opt, const char *arg, int unset)
{
- struct msg_arg *msg = opt->value;
- msg->use_editor = 1;
+ struct note_data *d = opt->value;
+ d->use_editor = 1;
return parse_reuse_arg(opt, arg, unset);
}
@@ -397,26 +381,27 @@ static int append_edit(int argc, const char **argv, const char *prefix);
static int add(int argc, const char **argv, const char *prefix)
{
- int retval = 0, force = 0;
+ int force = 0, allow_empty = 0;
const char *object_ref;
struct notes_tree *t;
unsigned char object[20], new_note[20];
- char logmsg[100];
const unsigned char *note;
- struct msg_arg msg = { 0, 0, STRBUF_INIT };
+ struct note_data d = { 0, 0, NULL, STRBUF_INIT };
struct option options[] = {
- { OPTION_CALLBACK, 'm', "message", &msg, N_("message"),
+ { OPTION_CALLBACK, 'm', "message", &d, N_("message"),
N_("note contents as a string"), PARSE_OPT_NONEG,
parse_msg_arg},
- { OPTION_CALLBACK, 'F', "file", &msg, N_("file"),
+ { OPTION_CALLBACK, 'F', "file", &d, N_("file"),
N_("note contents in a file"), PARSE_OPT_NONEG,
parse_file_arg},
- { OPTION_CALLBACK, 'c', "reedit-message", &msg, N_("object"),
+ { OPTION_CALLBACK, 'c', "reedit-message", &d, N_("object"),
N_("reuse and edit specified note object"), PARSE_OPT_NONEG,
parse_reedit_arg},
- { OPTION_CALLBACK, 'C', "reuse-message", &msg, N_("object"),
+ { OPTION_CALLBACK, 'C', "reuse-message", &d, N_("object"),
N_("reuse specified note object"), PARSE_OPT_NONEG,
parse_reuse_arg},
+ OPT_BOOL(0, "allow-empty", &allow_empty,
+ N_("allow storing empty note")),
OPT__FORCE(&force, N_("replace existing notes")),
OPT_END()
};
@@ -439,41 +424,44 @@ static int add(int argc, const char **argv, const char *prefix)
if (note) {
if (!force) {
- if (!msg.given) {
- /*
- * Redirect to "edit" subcommand.
- *
- * We only end up here if none of -m/-F/-c/-C
- * or -f are given. The original args are
- * therefore still in argv[0-1].
- */
- argv[0] = "edit";
- free_notes(t);
- return append_edit(argc, argv, prefix);
+ free_notes(t);
+ if (d.given) {
+ free_note_data(&d);
+ return error(_("Cannot add notes. "
+ "Found existing notes for object %s. "
+ "Use '-f' to overwrite existing notes"),
+ sha1_to_hex(object));
}
- retval = error(_("Cannot add notes. Found existing notes "
- "for object %s. Use '-f' to overwrite "
- "existing notes"), sha1_to_hex(object));
- goto out;
+ /*
+ * Redirect to "edit" subcommand.
+ *
+ * We only end up here if none of -m/-F/-c/-C or -f are
+ * given. The original args are therefore still in
+ * argv[0-1].
+ */
+ argv[0] = "edit";
+ return append_edit(argc, argv, prefix);
}
fprintf(stderr, _("Overwriting existing notes for object %s\n"),
sha1_to_hex(object));
}
- create_note(object, &msg, 0, note, new_note);
-
- if (is_null_sha1(new_note))
+ prepare_note_data(object, &d, note);
+ if (d.buf.len || allow_empty) {
+ write_note_data(&d, new_note);
+ if (add_note(t, object, new_note, combine_notes_overwrite))
+ die("BUG: combine_notes_overwrite failed");
+ commit_notes(t, "Notes added by 'git notes add'");
+ } else {
+ fprintf(stderr, _("Removing note for object %s\n"),
+ sha1_to_hex(object));
remove_note(t, object);
- else if (add_note(t, object, new_note, combine_notes_overwrite))
- die("BUG: combine_notes_overwrite failed");
+ commit_notes(t, "Notes removed by 'git notes add'");
+ }
- snprintf(logmsg, sizeof(logmsg), "Notes %s by 'git notes %s'",
- is_null_sha1(new_note) ? "removed" : "added", "add");
- commit_notes(t, logmsg);
-out:
+ free_note_data(&d);
free_notes(t);
- strbuf_release(&(msg.buf));
- return retval;
+ return 0;
}
static int copy(int argc, const char **argv, const char *prefix)
@@ -554,26 +542,29 @@ out:
static int append_edit(int argc, const char **argv, const char *prefix)
{
+ int allow_empty = 0;
const char *object_ref;
struct notes_tree *t;
unsigned char object[20], new_note[20];
const unsigned char *note;
char logmsg[100];
const char * const *usage;
- struct msg_arg msg = { 0, 0, STRBUF_INIT };
+ struct note_data d = { 0, 0, NULL, STRBUF_INIT };
struct option options[] = {
- { OPTION_CALLBACK, 'm', "message", &msg, N_("message"),
+ { OPTION_CALLBACK, 'm', "message", &d, N_("message"),
N_("note contents as a string"), PARSE_OPT_NONEG,
parse_msg_arg},
- { OPTION_CALLBACK, 'F', "file", &msg, N_("file"),
+ { OPTION_CALLBACK, 'F', "file", &d, N_("file"),
N_("note contents in a file"), PARSE_OPT_NONEG,
parse_file_arg},
- { OPTION_CALLBACK, 'c', "reedit-message", &msg, N_("object"),
+ { OPTION_CALLBACK, 'c', "reedit-message", &d, N_("object"),
N_("reuse and edit specified note object"), PARSE_OPT_NONEG,
parse_reedit_arg},
- { OPTION_CALLBACK, 'C', "reuse-message", &msg, N_("object"),
+ { OPTION_CALLBACK, 'C', "reuse-message", &d, N_("object"),
N_("reuse specified note object"), PARSE_OPT_NONEG,
parse_reuse_arg},
+ OPT_BOOL(0, "allow-empty", &allow_empty,
+ N_("allow storing empty note")),
OPT_END()
};
int edit = !strcmp(argv[0], "edit");
@@ -587,7 +578,7 @@ static int append_edit(int argc, const char **argv, const char *prefix)
usage_with_options(usage, options);
}
- if (msg.given && edit)
+ if (d.given && edit)
fprintf(stderr, _("The -m/-F/-c/-C options have been deprecated "
"for the 'edit' subcommand.\n"
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"));
@@ -600,18 +591,39 @@ static int append_edit(int argc, const char **argv, const char *prefix)
t = init_notes_check(argv[0]);
note = get_note(t, object);
- create_note(object, &msg, !edit, note, new_note);
+ prepare_note_data(object, &d, edit ? note : NULL);
- if (is_null_sha1(new_note))
- remove_note(t, object);
- else if (add_note(t, object, new_note, combine_notes_overwrite))
- die("BUG: combine_notes_overwrite failed");
+ if (note && !edit) {
+ /* Append buf to previous note contents */
+ unsigned long size;
+ enum object_type type;
+ char *prev_buf = read_sha1_file(note, &type, &size);
+
+ strbuf_grow(&d.buf, size + 1);
+ if (d.buf.len && prev_buf && size)
+ strbuf_insert(&d.buf, 0, "\n", 1);
+ if (prev_buf && size)
+ strbuf_insert(&d.buf, 0, prev_buf, size);
+ free(prev_buf);
+ }
- snprintf(logmsg, sizeof(logmsg), "Notes %s by 'git notes %s'",
- is_null_sha1(new_note) ? "removed" : "added", argv[0]);
+ if (d.buf.len || allow_empty) {
+ write_note_data(&d, new_note);
+ if (add_note(t, object, new_note, combine_notes_overwrite))
+ die("BUG: combine_notes_overwrite failed");
+ snprintf(logmsg, sizeof(logmsg), "Notes added by 'git notes %s'",
+ argv[0]);
+ } else {
+ fprintf(stderr, _("Removing note for object %s\n"),
+ sha1_to_hex(object));
+ remove_note(t, object);
+ snprintf(logmsg, sizeof(logmsg), "Notes removed by 'git notes %s'",
+ argv[0]);
+ }
commit_notes(t, logmsg);
+
+ free_note_data(&d);
free_notes(t);
- strbuf_release(&(msg.buf));
return 0;
}
diff --git a/builtin/push.c b/builtin/push.c
index a076b19..12f5e69 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -161,7 +161,7 @@ static const char message_detached_head_die[] =
" git push %s HEAD:<name-of-remote-branch>\n");
static void setup_push_upstream(struct remote *remote, struct branch *branch,
- int triangular)
+ int triangular, int simple)
{
struct strbuf refspec = STRBUF_INIT;
@@ -184,7 +184,7 @@ static void setup_push_upstream(struct remote *remote, struct branch *branch,
"to update which remote branch."),
remote->name, branch->name);
- if (push_default == PUSH_DEFAULT_SIMPLE) {
+ if (simple) {
/* Additional safety */
if (strcmp(branch->refname, branch->merge[0]->src))
die_push_simple(branch, remote);
@@ -257,11 +257,11 @@ static void setup_default_push_refspecs(struct remote *remote)
if (triangular)
setup_push_current(remote, branch);
else
- setup_push_upstream(remote, branch, triangular);
+ setup_push_upstream(remote, branch, triangular, 1);
break;
case PUSH_DEFAULT_UPSTREAM:
- setup_push_upstream(remote, branch, triangular);
+ setup_push_upstream(remote, branch, triangular, 0);
break;
case PUSH_DEFAULT_CURRENT:
@@ -503,7 +503,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
0, CAS_OPT_NAME, &cas, N_("refname>:<expect"),
N_("require old value of ref to be at this value"),
PARSE_OPT_OPTARG, parseopt_push_cas_option },
- { OPTION_CALLBACK, 0, "recurse-submodules", &flags, N_("check"),
+ { OPTION_CALLBACK, 0, "recurse-submodules", &flags, "check|on-demand",
N_("control recursive pushing of submodules"),
PARSE_OPT_OPTARG, option_parse_recurse_submodules },
OPT_BOOL( 0 , "thin", &thin, N_("use thin pack")),
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index c047418..8266c1f 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -434,7 +434,7 @@ static const char *check_nonce(const char *buf, size_t len)
nonce_stamp_slop = (long)ostamp - (long)stamp;
if (nonce_stamp_slop_limit &&
- abs(nonce_stamp_slop) <= nonce_stamp_slop_limit) {
+ labs(nonce_stamp_slop) <= nonce_stamp_slop_limit) {
/*
* Pretend as if the received nonce (which passes the
* HMAC check, so it is not a forged by third-party)
@@ -1053,7 +1053,7 @@ static void check_aliased_updates(struct command *commands)
string_list_append(&ref_list, cmd->ref_name);
item->util = (void *)cmd;
}
- sort_string_list(&ref_list);
+ string_list_sort(&ref_list);
for (cmd = commands; cmd; cmd = cmd->next) {
if (!cmd->error_string)
diff --git a/builtin/remote.c b/builtin/remote.c
index 7f28f92..46ecfd9 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -352,9 +352,9 @@ static int get_ref_states(const struct ref *remote_refs, struct ref_states *stat
free_refs(stale_refs);
free_refs(fetch_map);
- sort_string_list(&states->new);
- sort_string_list(&states->tracked);
- sort_string_list(&states->stale);
+ string_list_sort(&states->new);
+ string_list_sort(&states->tracked);
+ string_list_sort(&states->stale);
return 0;
}
@@ -750,16 +750,11 @@ static int mv(int argc, const char **argv)
static int remove_branches(struct string_list *branches)
{
struct strbuf err = STRBUF_INIT;
- const char **branch_names;
int i, result = 0;
- branch_names = xmalloc(branches->nr * sizeof(*branch_names));
- for (i = 0; i < branches->nr; i++)
- branch_names[i] = branches->items[i].string;
- if (repack_without_refs(branch_names, branches->nr, &err))
+ if (repack_without_refs(branches, &err))
result |= error("%s", err.buf);
strbuf_release(&err);
- free(branch_names);
for (i = 0; i < branches->nr; i++) {
struct string_list_item *item = branches->items + i;
@@ -914,7 +909,7 @@ static int get_remote_ref_states(const char *name,
get_push_ref_states(remote_refs, states);
} else {
for_each_ref(append_ref_to_tracked_list, states);
- sort_string_list(&states->tracked);
+ string_list_sort(&states->tracked);
get_push_ref_states_noquery(states);
}
@@ -1133,7 +1128,7 @@ static int show_all(void)
if (!result) {
int i;
- sort_string_list(&list);
+ string_list_sort(&list);
for (i = 0; i < list.nr; i++) {
struct string_list_item *item = list.items + i;
if (verbose)
@@ -1314,10 +1309,10 @@ static int set_head(int argc, const char **argv)
static int prune_remote(const char *remote, int dry_run)
{
- int result = 0, i;
+ int result = 0;
struct ref_states states;
- struct string_list delete_refs_list = STRING_LIST_INIT_NODUP;
- const char **delete_refs;
+ struct string_list refs_to_prune = STRING_LIST_INIT_NODUP;
+ struct string_list_item *item;
const char *dangling_msg = dry_run
? _(" %s will become dangling!")
: _(" %s has become dangling!");
@@ -1325,30 +1320,30 @@ static int prune_remote(const char *remote, int dry_run)
memset(&states, 0, sizeof(states));
get_remote_ref_states(remote, &states, GET_REF_STATES);
- if (states.stale.nr) {
- printf_ln(_("Pruning %s"), remote);
- printf_ln(_("URL: %s"),
- states.remote->url_nr
- ? states.remote->url[0]
- : _("(no URL)"));
-
- delete_refs = xmalloc(states.stale.nr * sizeof(*delete_refs));
- for (i = 0; i < states.stale.nr; i++)
- delete_refs[i] = states.stale.items[i].util;
- if (!dry_run) {
- struct strbuf err = STRBUF_INIT;
- if (repack_without_refs(delete_refs, states.stale.nr,
- &err))
- result |= error("%s", err.buf);
- strbuf_release(&err);
- }
- free(delete_refs);
+ if (!states.stale.nr) {
+ free_remote_ref_states(&states);
+ return 0;
}
- for (i = 0; i < states.stale.nr; i++) {
- const char *refname = states.stale.items[i].util;
+ printf_ln(_("Pruning %s"), remote);
+ printf_ln(_("URL: %s"),
+ states.remote->url_nr
+ ? states.remote->url[0]
+ : _("(no URL)"));
+
+ for_each_string_list_item(item, &states.stale)
+ string_list_append(&refs_to_prune, item->util);
+ string_list_sort(&refs_to_prune);
+
+ if (!dry_run) {
+ struct strbuf err = STRBUF_INIT;
+ if (repack_without_refs(&refs_to_prune, &err))
+ result |= error("%s", err.buf);
+ strbuf_release(&err);
+ }
- string_list_insert(&delete_refs_list, refname);
+ for_each_string_list_item(item, &states.stale) {
+ const char *refname = item->util;
if (!dry_run)
result |= delete_ref(refname, NULL, 0);
@@ -1361,9 +1356,9 @@ static int prune_remote(const char *remote, int dry_run)
abbrev_ref(refname, "refs/remotes/"));
}
- warn_dangling_symrefs(stdout, dangling_msg, &delete_refs_list);
- string_list_clear(&delete_refs_list, 0);
+ warn_dangling_symrefs(stdout, dangling_msg, &refs_to_prune);
+ string_list_clear(&refs_to_prune, 0);
free_remote_ref_states(&states);
return result;
}
diff --git a/builtin/repack.c b/builtin/repack.c
index 2845620..3f852f3 100644
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -135,7 +135,6 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
};
struct child_process cmd = CHILD_PROCESS_INIT;
struct string_list_item *item;
- struct argv_array cmd_args = ARGV_ARRAY_INIT;
struct string_list names = STRING_LIST_INIT_DUP;
struct string_list rollback = STRING_LIST_INIT_NODUP;
struct string_list existing_packs = STRING_LIST_INIT_DUP;
@@ -202,56 +201,55 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
sigchain_push_common(remove_pack_on_signal);
- argv_array_push(&cmd_args, "pack-objects");
- argv_array_push(&cmd_args, "--keep-true-parents");
+ argv_array_push(&cmd.args, "pack-objects");
+ argv_array_push(&cmd.args, "--keep-true-parents");
if (!pack_kept_objects)
- argv_array_push(&cmd_args, "--honor-pack-keep");
- argv_array_push(&cmd_args, "--non-empty");
- argv_array_push(&cmd_args, "--all");
- argv_array_push(&cmd_args, "--reflog");
- argv_array_push(&cmd_args, "--indexed-objects");
+ argv_array_push(&cmd.args, "--honor-pack-keep");
+ argv_array_push(&cmd.args, "--non-empty");
+ argv_array_push(&cmd.args, "--all");
+ argv_array_push(&cmd.args, "--reflog");
+ argv_array_push(&cmd.args, "--indexed-objects");
if (window)
- argv_array_pushf(&cmd_args, "--window=%s", window);
+ argv_array_pushf(&cmd.args, "--window=%s", window);
if (window_memory)
- argv_array_pushf(&cmd_args, "--window-memory=%s", window_memory);
+ argv_array_pushf(&cmd.args, "--window-memory=%s", window_memory);
if (depth)
- argv_array_pushf(&cmd_args, "--depth=%s", depth);
+ argv_array_pushf(&cmd.args, "--depth=%s", depth);
if (max_pack_size)
- argv_array_pushf(&cmd_args, "--max-pack-size=%s", max_pack_size);
+ argv_array_pushf(&cmd.args, "--max-pack-size=%s", max_pack_size);
if (no_reuse_delta)
- argv_array_pushf(&cmd_args, "--no-reuse-delta");
+ argv_array_pushf(&cmd.args, "--no-reuse-delta");
if (no_reuse_object)
- argv_array_pushf(&cmd_args, "--no-reuse-object");
+ argv_array_pushf(&cmd.args, "--no-reuse-object");
if (write_bitmaps)
- argv_array_push(&cmd_args, "--write-bitmap-index");
+ argv_array_push(&cmd.args, "--write-bitmap-index");
if (pack_everything & ALL_INTO_ONE) {
get_non_kept_pack_filenames(&existing_packs);
if (existing_packs.nr && delete_redundant) {
if (unpack_unreachable)
- argv_array_pushf(&cmd_args,
+ argv_array_pushf(&cmd.args,
"--unpack-unreachable=%s",
unpack_unreachable);
else if (pack_everything & LOOSEN_UNREACHABLE)
- argv_array_push(&cmd_args,
+ argv_array_push(&cmd.args,
"--unpack-unreachable");
}
} else {
- argv_array_push(&cmd_args, "--unpacked");
- argv_array_push(&cmd_args, "--incremental");
+ argv_array_push(&cmd.args, "--unpacked");
+ argv_array_push(&cmd.args, "--incremental");
}
if (local)
- argv_array_push(&cmd_args, "--local");
+ argv_array_push(&cmd.args, "--local");
if (quiet)
- argv_array_push(&cmd_args, "--quiet");
+ argv_array_push(&cmd.args, "--quiet");
if (delta_base_offset)
- argv_array_push(&cmd_args, "--delta-base-offset");
+ argv_array_push(&cmd.args, "--delta-base-offset");
- argv_array_push(&cmd_args, packtmp);
+ argv_array_push(&cmd.args, packtmp);
- cmd.argv = cmd_args.argv;
cmd.git_cmd = 1;
cmd.out = -1;
cmd.no_stdin = 1;
@@ -270,7 +268,6 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
ret = finish_command(&cmd);
if (ret)
return ret;
- argv_array_clear(&cmd_args);
if (!names.nr && !quiet)
printf("Nothing new to pack.\n");
@@ -379,7 +376,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
if (delete_redundant) {
int opts = 0;
- sort_string_list(&names);
+ string_list_sort(&names);
for_each_string_list_item(item, &existing_packs) {
char *sha1;
size_t len = strlen(item->string);
diff --git a/cache.h b/cache.h
index 99ed096..22b7b81 100644
--- a/cache.h
+++ b/cache.h
@@ -617,6 +617,8 @@ extern int fsync_object_files;
extern int core_preload_index;
extern int core_apply_sparse_checkout;
extern int precomposed_unicode;
+extern int protect_hfs;
+extern int protect_ntfs;
/*
* The character that begins a commented line in user-editable file
@@ -831,6 +833,7 @@ int normalize_path_copy(char *dst, const char *src);
int longest_ancestor_length(const char *path, struct string_list *prefixes);
char *strip_path_suffix(const char *path, const char *suffix);
int daemon_avoid_alias(const char *path);
+extern int is_ntfs_dotgit(const char *name);
/* object replacement */
#define LOOKUP_REPLACE_OBJECT 1
diff --git a/commit.c b/commit.c
index 19cf8f9..a54cb9a 100644
--- a/commit.c
+++ b/commit.c
@@ -1640,3 +1640,49 @@ const char *find_commit_header(const char *msg, const char *key, size_t *out_len
}
return NULL;
}
+
+/*
+ * Inspect sb and determine the true "end" of the log message, in
+ * order to find where to put a new Signed-off-by: line. Ignored are
+ * trailing comment lines and blank lines, and also the traditional
+ * "Conflicts:" block that is not commented out, so that we can use
+ * "git commit -s --amend" on an existing commit that forgot to remove
+ * it.
+ *
+ * Returns the number of bytes from the tail to ignore, to be fed as
+ * the second parameter to append_signoff().
+ */
+int ignore_non_trailer(struct strbuf *sb)
+{
+ int boc = 0;
+ int bol = 0;
+ int in_old_conflicts_block = 0;
+
+ while (bol < sb->len) {
+ char *next_line;
+
+ if (!(next_line = memchr(sb->buf + bol, '\n', sb->len - bol)))
+ next_line = sb->buf + sb->len;
+ else
+ next_line++;
+
+ if (sb->buf[bol] == comment_line_char || sb->buf[bol] == '\n') {
+ /* is this the first of the run of comments? */
+ if (!boc)
+ boc = bol;
+ /* otherwise, it is just continuing */
+ } else if (starts_with(sb->buf + bol, "Conflicts:\n")) {
+ in_old_conflicts_block = 1;
+ if (!boc)
+ boc = bol;
+ } else if (in_old_conflicts_block && sb->buf[bol] == '\t') {
+ ; /* a pathname in the conflicts block */
+ } else if (boc) {
+ /* the previous was not trailing comment */
+ boc = 0;
+ in_old_conflicts_block = 0;
+ }
+ bol = next_line - sb->buf;
+ }
+ return boc ? sb->len - boc : 0;
+}
diff --git a/commit.h b/commit.h
index bc68ccb..cd35ac1 100644
--- a/commit.h
+++ b/commit.h
@@ -337,6 +337,9 @@ extern void free_commit_extra_headers(struct commit_extra_header *extra);
extern const char *find_commit_header(const char *msg, const char *key,
size_t *out_len);
+/* Find the end of the log message, the right place for a new trailer. */
+extern int ignore_non_trailer(struct strbuf *sb);
+
typedef void (*each_mergetag_fn)(struct commit *commit, struct commit_extra_header *extra,
void *cb_data);
diff --git a/compat/mingw.c b/compat/mingw.c
index c5c37e5..70f3191 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -312,7 +312,7 @@ int mingw_open (const char *filename, int oflags, ...)
return -1;
fd = _wopen(wfilename, oflags, mode);
- if (fd < 0 && (oflags & O_CREAT) && errno == EACCES) {
+ if (fd < 0 && (oflags & O_ACCMODE) != O_RDONLY && errno == EACCES) {
DWORD attrs = GetFileAttributesW(wfilename);
if (attrs != INVALID_FILE_ATTRIBUTES && (attrs & FILE_ATTRIBUTE_DIRECTORY))
errno = EISDIR;
diff --git a/config.c b/config.c
index 15a2983..752e2e2 100644
--- a/config.c
+++ b/config.c
@@ -506,9 +506,9 @@ static int git_parse_signed(const char *value, intmax_t *ret, intmax_t max)
errno = EINVAL;
return 0;
}
- uval = abs(val);
+ uval = labs(val);
uval *= factor;
- if (uval > max || abs(val) > uval) {
+ if (uval > max || labs(val) > uval) {
errno = ERANGE;
return 0;
}
@@ -896,6 +896,16 @@ static int git_default_core_config(const char *var, const char *value)
return 0;
}
+ if (!strcmp(var, "core.protecthfs")) {
+ protect_hfs = git_config_bool(var, value);
+ return 0;
+ }
+
+ if (!strcmp(var, "core.protectntfs")) {
+ protect_ntfs = git_config_bool(var, value);
+ return 0;
+ }
+
/* Add other config variables here and to Documentation/config.txt. */
return 0;
}
diff --git a/config.mak.uname b/config.mak.uname
index a2f380f..f3c93f2 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -105,6 +105,7 @@ ifeq ($(uname_S),Darwin)
HAVE_DEV_TTY = YesPlease
COMPAT_OBJS += compat/precompose_utf8.o
BASIC_CFLAGS += -DPRECOMPOSE_UNICODE
+ BASIC_CFLAGS += -DPROTECT_HFS_DEFAULT=1
endif
ifeq ($(uname_S),SunOS)
NEEDS_SOCKET = YesPlease
@@ -373,6 +374,7 @@ ifeq ($(uname_S),Windows)
EXTLIBS = user32.lib advapi32.lib shell32.lib wininet.lib ws2_32.lib invalidcontinue.obj
PTHREAD_LIBS =
lib =
+ BASIC_CFLAGS += -DPROTECT_NTFS_DEFAULT=1
ifndef DEBUG
BASIC_CFLAGS += -GL -Os -MD
BASIC_LDFLAGS += -LTCG
@@ -514,6 +516,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
COMPAT_OBJS += compat/mingw.o compat/winansi.o \
compat/win32/pthread.o compat/win32/syslog.o \
compat/win32/dirent.o
+ BASIC_CFLAGS += -DPROTECT_NTFS_DEFAULT=1
BASIC_LDFLAGS += -Wl,--large-address-aware
EXTLIBS += -lws2_32
GITLIBS += git.res
diff --git a/connect.c b/connect.c
index d47d0ec..062e133 100644
--- a/connect.c
+++ b/connect.c
@@ -93,7 +93,7 @@ static void annotate_refs_with_symref_info(struct ref *ref)
parse_one_symref_info(&symref, val, len);
feature_list = val + 1;
}
- sort_string_list(&symref);
+ string_list_sort(&symref);
for (; ref; ref = ref->next) {
struct string_list_item *item;
@@ -700,14 +700,23 @@ struct child_process *git_connect(int fd[2], const char *url,
conn->in = conn->out = -1;
if (protocol == PROTO_SSH) {
- const char *ssh = getenv("GIT_SSH");
- int putty = ssh && strcasestr(ssh, "plink");
+ const char *ssh;
+ int putty;
char *ssh_host = hostandport;
const char *port = NULL;
get_host_and_port(&ssh_host, &port);
port = get_port_numeric(port);
- if (!ssh) ssh = "ssh";
+ ssh = getenv("GIT_SSH_COMMAND");
+ if (ssh) {
+ conn->use_shell = 1;
+ putty = 0;
+ } else {
+ ssh = getenv("GIT_SSH");
+ if (!ssh)
+ ssh = "ssh";
+ putty = !!strcasestr(ssh, "plink");
+ }
argv_array_push(&conn->args, ssh);
if (putty && !strcasestr(ssh, "tortoiseplink"))
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 2fece98..b154f70 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1875,6 +1875,10 @@ _git_config ()
__gitcomp "$__git_send_email_suppresscc_options"
return
;;
+ sendemail.transferencoding)
+ __gitcomp "7bit 8bit quoted-printable base64"
+ return
+ ;;
--get|--get-all|--unset|--unset-all)
__gitcomp_nl "$(__git_config_get_set_variables)"
return
diff --git a/contrib/diff-highlight/diff-highlight b/contrib/diff-highlight/diff-highlight
index c4404d4..69a652e 100755
--- a/contrib/diff-highlight/diff-highlight
+++ b/contrib/diff-highlight/diff-highlight
@@ -14,6 +14,10 @@ my @removed;
my @added;
my $in_hunk;
+# Some scripts may not realize that SIGPIPE is being ignored when launching the
+# pager--for instance scripts written in Python.
+$SIG{PIPE} = 'DEFAULT';
+
while (<>) {
if (!$in_hunk) {
print;
diff --git a/csum-file.h b/csum-file.h
index bb543d5..7530927 100644
--- a/csum-file.h
+++ b/csum-file.h
@@ -39,4 +39,15 @@ extern void sha1flush(struct sha1file *f);
extern void crc32_begin(struct sha1file *);
extern uint32_t crc32_end(struct sha1file *);
+static inline void sha1write_u8(struct sha1file *f, uint8_t data)
+{
+ sha1write(f, &data, sizeof(data));
+}
+
+static inline void sha1write_be32(struct sha1file *f, uint32_t data)
+{
+ data = htonl(data);
+ sha1write(f, &data, sizeof(data));
+}
+
#endif
diff --git a/environment.c b/environment.c
index 565f652..1ade5c9 100644
--- a/environment.c
+++ b/environment.c
@@ -64,6 +64,16 @@ int precomposed_unicode = -1; /* see probe_utf8_pathname_composition() */
struct startup_info *startup_info;
unsigned long pack_size_limit_cfg;
+#ifndef PROTECT_HFS_DEFAULT
+#define PROTECT_HFS_DEFAULT 0
+#endif
+int protect_hfs = PROTECT_HFS_DEFAULT;
+
+#ifndef PROTECT_NTFS_DEFAULT
+#define PROTECT_NTFS_DEFAULT 0
+#endif
+int protect_ntfs = PROTECT_NTFS_DEFAULT;
+
/*
* The character that begins a commented line in user-editable file
* that is subject to stripspace.
diff --git a/exec_cmd.c b/exec_cmd.c
index 698e752..8ab37b5 100644
--- a/exec_cmd.c
+++ b/exec_cmd.c
@@ -6,7 +6,7 @@
static const char *argv_exec_path;
static const char *argv0_path;
-const char *system_path(const char *path)
+char *system_path(const char *path)
{
#ifdef RUNTIME_PREFIX
static const char *prefix;
@@ -16,7 +16,7 @@ const char *system_path(const char *path)
struct strbuf d = STRBUF_INIT;
if (is_absolute_path(path))
- return path;
+ return xstrdup(path);
#ifdef RUNTIME_PREFIX
assert(argv0_path);
@@ -34,8 +34,7 @@ const char *system_path(const char *path)
#endif
strbuf_addf(&d, "%s/%s", prefix, path);
- path = strbuf_detach(&d, NULL);
- return path;
+ return strbuf_detach(&d, NULL);
}
const char *git_extract_argv0_path(const char *argv0)
diff --git a/exec_cmd.h b/exec_cmd.h
index e4c9702..93b0c02 100644
--- a/exec_cmd.h
+++ b/exec_cmd.h
@@ -9,6 +9,6 @@ extern const char **prepare_git_cmd(const char **argv);
extern int execv_git_cmd(const char **argv); /* NULL terminated */
LAST_ARG_MUST_BE_NULL
extern int execl_git_cmd(const char *cmd, ...);
-extern const char *system_path(const char *path);
+extern char *system_path(const char *path);
#endif /* GIT_EXEC_CMD_H */
diff --git a/fsck.c b/fsck.c
index 2fffa43..0324194 100644
--- a/fsck.c
+++ b/fsck.c
@@ -7,6 +7,7 @@
#include "tag.h"
#include "fsck.h"
#include "refs.h"
+#include "utf8.h"
static int fsck_walk_tree(struct tree *tree, fsck_walk_func walk, void *data)
{
@@ -171,7 +172,9 @@ static int fsck_tree(struct tree *item, int strict, fsck_error error_func)
has_empty_name |= !*name;
has_dot |= !strcmp(name, ".");
has_dotdot |= !strcmp(name, "..");
- has_dotgit |= !strcmp(name, ".git");
+ has_dotgit |= (!strcmp(name, ".git") ||
+ is_hfs_dotgit(name) ||
+ is_ntfs_dotgit(name));
has_zero_pad |= *(char *)desc.buffer == '0';
update_tree_entry(&desc);
diff --git a/git-am.sh b/git-am.sh
index ee61a77..a67d0f9 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -17,6 +17,7 @@ s,signoff add a Signed-off-by line to the commit message
u,utf8 recode into utf8 (default)
k,keep pass -k flag to git-mailinfo
keep-non-patch pass -b flag to git-mailinfo
+m,message-id pass -m flag to git-mailinfo
keep-cr pass --keep-cr flag to git-mailsplit for mbox format
no-keep-cr do not pass --keep-cr flag to git-mailsplit independent of am.keepcr
c,scissors strip everything before a scissors line
@@ -371,13 +372,18 @@ split_patches () {
prec=4
dotest="$GIT_DIR/rebase-apply"
sign= utf8=t keep= keepcr= skip= interactive= resolved= rebasing= abort=
-resolvemsg= resume= scissors= no_inbody_headers=
+messageid= resolvemsg= resume= scissors= no_inbody_headers=
git_apply_opt=
committer_date_is_author_date=
ignore_date=
allow_rerere_autoupdate=
gpg_sign_opt=
+if test "$(git config --bool --get am.messageid)" = true
+then
+ messageid=t
+fi
+
if test "$(git config --bool --get am.keepcr)" = true
then
keepcr=t
@@ -400,6 +406,10 @@ it will be removed. Please do not use it anymore."
utf8=t ;; # this is now default
--no-utf8)
utf8= ;;
+ -m|--message-id)
+ messageid=t ;;
+ --no-message-id)
+ messageid=f ;;
-k|--keep)
keep=t ;;
--keep-non-patch)
@@ -567,6 +577,7 @@ Use \"git am --abort\" to remove it.")"
echo "$sign" >"$dotest/sign"
echo "$utf8" >"$dotest/utf8"
echo "$keep" >"$dotest/keep"
+ echo "$messageid" >"$dotest/messageid"
echo "$scissors" >"$dotest/scissors"
echo "$no_inbody_headers" >"$dotest/no_inbody_headers"
echo "$GIT_QUIET" >"$dotest/quiet"
@@ -621,6 +632,12 @@ b)
*)
keep= ;;
esac
+case "$(cat "$dotest/messageid")" in
+t)
+ messageid=-m ;;
+f)
+ messageid= ;;
+esac
case "$(cat "$dotest/scissors")" in
t)
scissors=--scissors ;;
@@ -692,7 +709,7 @@ do
get_author_ident_from_commit "$commit" >"$dotest/author-script"
git diff-tree --root --binary --full-index "$commit" >"$dotest/patch"
else
- git mailinfo $keep $no_inbody_headers $scissors $utf8 "$dotest/msg" "$dotest/patch" \
+ git mailinfo $keep $no_inbody_headers $messageid $scissors $utf8 "$dotest/msg" "$dotest/patch" \
<"$dotest/$msgnum" >"$dotest/info" ||
stop_here $this
diff --git a/git-compat-util.h b/git-compat-util.h
index 400e921..cef2691 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -75,7 +75,8 @@
# endif
#elif !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__USLC__) && \
!defined(_M_UNIX) && !defined(__sgi) && !defined(__DragonFly__) && \
- !defined(__TANDEM) && !defined(__QNX__) && !defined(__MirBSD__)
+ !defined(__TANDEM) && !defined(__QNX__) && !defined(__MirBSD__) && \
+ !defined(__CYGWIN__)
#define _XOPEN_SOURCE 600 /* glibc2 and AIX 5.3L need 500, OpenBSD needs 600 for S_ISLNK() */
#define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */
#endif
diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
index d4fb6df..2b11b1d 100755
--- a/git-difftool--helper.sh
+++ b/git-difftool--helper.sh
@@ -94,3 +94,5 @@ else
shift 7
done
fi
+
+exit 0
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index a40d3df..fe61e89 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -92,7 +92,7 @@ translate_merge_tool_path () {
check_unchanged () {
if test "$MERGED" -nt "$BACKUP"
then
- status=0
+ return 0
else
while true
do
@@ -100,8 +100,8 @@ check_unchanged () {
printf "Was the merge successful? [y/n] "
read answer || return 1
case "$answer" in
- y*|Y*) status=0; break ;;
- n*|N*) status=1; break ;;
+ y*|Y*) return 0 ;;
+ n*|N*) return 1 ;;
esac
done
fi
@@ -119,8 +119,6 @@ setup_user_tool () {
diff_cmd () {
( eval $merge_tool_cmd )
- status=$?
- return $status
}
merge_cmd () {
@@ -130,13 +128,10 @@ setup_user_tool () {
then
touch "$BACKUP"
( eval $merge_tool_cmd )
- status=$?
check_unchanged
else
( eval $merge_tool_cmd )
- status=$?
fi
- return $status
}
}
@@ -153,13 +148,11 @@ setup_tool () {
}
diff_cmd () {
- status=1
- return $status
+ return 1
}
merge_cmd () {
- status=1
- return $status
+ return 1
}
translate_merge_tool_path () {
@@ -210,7 +203,6 @@ run_merge_tool () {
merge_tool_path=$(get_merge_tool_path "$1") || exit
base_present="$2"
- status=0
# Bring tool-specific functions into scope
setup_tool "$1" || return 1
@@ -221,7 +213,6 @@ run_merge_tool () {
else
run_diff_cmd "$1"
fi
- return $status
}
# Run a either a configured or built-in diff tool
diff --git a/git-mergetool.sh b/git-mergetool.sh
index ff050e5..d20581c 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -426,8 +426,6 @@ fi
merge_keep_backup="$(git config --bool mergetool.keepBackup || echo true)"
merge_keep_temporaries="$(git config --bool mergetool.keepTemporaries || echo false)"
-last_status=0
-rollup_status=0
files=
if test $# -eq 0
@@ -455,19 +453,15 @@ printf "%s\n" "$files"
IFS='
'
+rc=0
for i in $files
do
- if test $last_status -ne 0
- then
- prompt_after_failed_merge || exit 1
- fi
printf "\n"
- merge_file "$i"
- last_status=$?
- if test $last_status -ne 0
+ if ! merge_file "$i"
then
- rollup_status=1
+ rc=1
+ prompt_after_failed_merge || exit 1
fi
done
-exit $rollup_status
+exit $rc
diff --git a/git-send-email.perl b/git-send-email.perl
index 9949db0..82c6fea 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -58,6 +58,7 @@ git send-email [options] <file | directory | rev-list options >
--compose * Open an editor for introduction.
--compose-encoding <str> * Encoding to assume for introduction.
--8bit-encoding <str> * Encoding to assume 8bit mails if undeclared
+ --transfer-encoding <str> * Transfer encoding to use (quoted-printable, 8bit, base64)
Sending:
--envelope-sender <str> * Email envelope sender.
@@ -206,6 +207,7 @@ my ($validate, $confirm);
my (@suppress_cc);
my ($auto_8bit_encoding);
my ($compose_encoding);
+my ($target_xfer_encoding);
my ($debug_net_smtp) = 0; # Net::SMTP, see send_message()
@@ -242,6 +244,7 @@ my %config_settings = (
"from" => \$sender,
"assume8bitencoding" => \$auto_8bit_encoding,
"composeencoding" => \$compose_encoding,
+ "transferencoding" => \$target_xfer_encoding,
);
my %config_path_settings = (
@@ -314,6 +317,7 @@ my $rc = GetOptions("h" => \$help,
"envelope-sender=s" => \$envelope_sender,
"thread!" => \$thread,
"validate!" => \$validate,
+ "transfer-encoding=s" => \$target_xfer_encoding,
"format-patch!" => \$format_patch,
"8bit-encoding=s" => \$auto_8bit_encoding,
"compose-encoding=s" => \$compose_encoding,
@@ -1324,6 +1328,8 @@ foreach my $t (@files) {
my $author_encoding;
my $has_content_type;
my $body_encoding;
+ my $xfer_encoding;
+ my $has_mime_version;
@to = ();
@cc = ();
@xh = ();
@@ -1394,9 +1400,16 @@ foreach my $t (@files) {
}
push @xh, $_;
}
+ elsif (/^MIME-Version/i) {
+ $has_mime_version = 1;
+ push @xh, $_;
+ }
elsif (/^Message-Id: (.*)/i) {
$message_id = $1;
}
+ elsif (/^Content-Transfer-Encoding: (.*)/i) {
+ $xfer_encoding = $1 if not defined $xfer_encoding;
+ }
elsif (!/^Date:\s/i && /^[-A-Za-z]+:\s+\S/) {
push @xh, $_;
}
@@ -1444,10 +1457,9 @@ foreach my $t (@files) {
if defined $cc_cmd && !$suppress_cc{'cccmd'};
if ($broken_encoding{$t} && !$has_content_type) {
+ $xfer_encoding = '8bit' if not defined $xfer_encoding;
$has_content_type = 1;
- push @xh, "MIME-Version: 1.0",
- "Content-Type: text/plain; charset=$auto_8bit_encoding",
- "Content-Transfer-Encoding: 8bit";
+ push @xh, "Content-Type: text/plain; charset=$auto_8bit_encoding";
$body_encoding = $auto_8bit_encoding;
}
@@ -1467,14 +1479,25 @@ foreach my $t (@files) {
}
}
else {
+ $xfer_encoding = '8bit' if not defined $xfer_encoding;
$has_content_type = 1;
push @xh,
- 'MIME-Version: 1.0',
- "Content-Type: text/plain; charset=$author_encoding",
- 'Content-Transfer-Encoding: 8bit';
+ "Content-Type: text/plain; charset=$author_encoding";
}
}
}
+ if (defined $target_xfer_encoding) {
+ $xfer_encoding = '8bit' if not defined $xfer_encoding;
+ $message = apply_transfer_encoding(
+ $message, $xfer_encoding, $target_xfer_encoding);
+ $xfer_encoding = $target_xfer_encoding;
+ }
+ if (defined $xfer_encoding) {
+ push @xh, "Content-Transfer-Encoding: $xfer_encoding";
+ }
+ if (defined $xfer_encoding or $has_content_type) {
+ unshift @xh, 'MIME-Version: 1.0' unless $has_mime_version;
+ }
$needs_confirm = (
$confirm eq "always" or
@@ -1543,6 +1566,32 @@ sub cleanup_compose_files {
$smtp->quit if $smtp;
+sub apply_transfer_encoding {
+ my $message = shift;
+ my $from = shift;
+ my $to = shift;
+
+ return $message if ($from eq $to and $from ne '7bit');
+
+ require MIME::QuotedPrint;
+ require MIME::Base64;
+
+ $message = MIME::QuotedPrint::decode($message)
+ if ($from eq 'quoted-printable');
+ $message = MIME::Base64::decode($message)
+ if ($from eq 'base64');
+
+ die "cannot send message as 7bit"
+ if ($to eq '7bit' and $message =~ /[^[:ascii:]]/);
+ return $message
+ if ($to eq '7bit' or $to eq '8bit');
+ return MIME::QuotedPrint::encode($message, "\n", 0)
+ if ($to eq 'quoted-printable');
+ return MIME::Base64::encode($message, "\n")
+ if ($to eq 'base64');
+ die "invalid transfer encoding";
+}
+
sub unique_email_list {
my %seen;
my @emails;
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index d968760..c42c6e6 100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -81,7 +81,7 @@ if test -n "$OPTIONS_SPEC"; then
echo exit $?
)"
else
- dashless=$(basename "$0" | sed -e 's/-/ /')
+ dashless=$(basename -- "$0" | sed -e 's/-/ /')
usage() {
die "usage: $dashless $USAGE"
}
diff --git a/git.c b/git.c
index 18fbf79..82d7a1c 100644
--- a/git.c
+++ b/git.c
@@ -487,15 +487,20 @@ static struct cmd_struct commands[] = {
{ "write-tree", cmd_write_tree, RUN_SETUP },
};
-int is_builtin(const char *s)
+static struct cmd_struct *get_builtin(const char *s)
{
int i;
for (i = 0; i < ARRAY_SIZE(commands); i++) {
- struct cmd_struct *p = commands+i;
+ struct cmd_struct *p = commands + i;
if (!strcmp(s, p->cmd))
- return 1;
+ return p;
}
- return 0;
+ return NULL;
+}
+
+int is_builtin(const char *s)
+{
+ return !!get_builtin(s);
}
static void handle_builtin(int argc, const char **argv)
@@ -503,6 +508,7 @@ static void handle_builtin(int argc, const char **argv)
const char *cmd = argv[0];
int i;
static const char ext[] = STRIP_EXTENSION;
+ struct cmd_struct *builtin;
if (sizeof(ext) > 1) {
i = strlen(argv[0]) - strlen(ext);
@@ -519,15 +525,12 @@ static void handle_builtin(int argc, const char **argv)
argv[0] = cmd = "help";
}
- for (i = 0; i < ARRAY_SIZE(commands); i++) {
- struct cmd_struct *p = commands+i;
- if (strcmp(p->cmd, cmd))
- continue;
- if (saved_environment && (p->option & NO_SETUP)) {
+ builtin = get_builtin(cmd);
+ if (builtin) {
+ if (saved_environment && (builtin->option & NO_SETUP))
restore_env();
- break;
- }
- exit(run_builtin(p, argc, argv));
+ else
+ exit(run_builtin(builtin, argc, argv));
}
}
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index ccf7516..7a5b23a 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -20,6 +20,10 @@ use File::Basename qw(basename);
use Time::HiRes qw(gettimeofday tv_interval);
binmode STDOUT, ':utf8';
+if (!defined($CGI::VERSION) || $CGI::VERSION < 4.08) {
+ eval 'sub CGI::multi_param { CGI::param(@_) }'
+}
+
our $t0 = [ gettimeofday() ];
our $number_of_git_cmds = 0;
@@ -871,7 +875,7 @@ sub evaluate_query_params {
while (my ($name, $symbol) = each %cgi_param_mapping) {
if ($symbol eq 'opt') {
- $input_params{$name} = [ map { decode_utf8($_) } $cgi->param($symbol) ];
+ $input_params{$name} = [ map { decode_utf8($_) } $cgi->multi_param($symbol) ];
} else {
$input_params{$name} = decode_utf8($cgi->param($symbol));
}
diff --git a/mergetools/diffmerge b/mergetools/diffmerge
index 85ac720..f138cb4 100644
--- a/mergetools/diffmerge
+++ b/mergetools/diffmerge
@@ -11,5 +11,4 @@ merge_cmd () {
"$merge_tool_path" --merge \
--result="$MERGED" "$LOCAL" "$REMOTE"
fi
- status=$?
}
diff --git a/mergetools/emerge b/mergetools/emerge
index f96d9e5..7b895fd 100644
--- a/mergetools/emerge
+++ b/mergetools/emerge
@@ -15,7 +15,6 @@ merge_cmd () {
"$LOCAL" "$REMOTE" \
"$(basename "$MERGED")"
fi
- status=$?
}
translate_merge_tool_path() {
diff --git a/mergetools/kdiff3 b/mergetools/kdiff3
index a30034f..793d129 100644
--- a/mergetools/kdiff3
+++ b/mergetools/kdiff3
@@ -20,5 +20,4 @@ merge_cmd () {
-o "$MERGED" "$LOCAL" "$REMOTE" \
>/dev/null 2>&1
fi
- status=$?
}
diff --git a/notes.c b/notes.c
index 5fe691d..c763a21 100644
--- a/notes.c
+++ b/notes.c
@@ -902,7 +902,7 @@ int combine_notes_cat_sort_uniq(unsigned char *cur_sha1,
if (string_list_add_note_lines(&sort_uniq_list, new_sha1))
goto out;
string_list_remove_empty_items(&sort_uniq_list, 0);
- sort_string_list(&sort_uniq_list);
+ string_list_sort(&sort_uniq_list);
string_list_remove_duplicates(&sort_uniq_list, 0);
/* create a new blob object from sort_uniq_list */
@@ -1218,8 +1218,7 @@ static void format_note(struct notes_tree *t, const unsigned char *object_sha1,
if (!sha1)
return;
- if (!(msg = read_sha1_file(sha1, &type, &msglen)) || !msglen ||
- type != OBJ_BLOB) {
+ if (!(msg = read_sha1_file(sha1, &type, &msglen)) || type != OBJ_BLOB) {
free(msg);
return;
}
diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c
index 8029ae3..c05d138 100644
--- a/pack-bitmap-write.c
+++ b/pack-bitmap-write.c
@@ -472,7 +472,6 @@ static void write_selected_commits_v1(struct sha1file *f,
for (i = 0; i < writer.selected_nr; ++i) {
struct bitmapped_commit *stored = &writer.selected[i];
- struct bitmap_disk_entry on_disk;
int commit_pos =
sha1_pos(stored->commit->object.sha1, index, index_nr, sha1_access);
@@ -480,11 +479,10 @@ static void write_selected_commits_v1(struct sha1file *f,
if (commit_pos < 0)
die("BUG: trying to write commit not in index");
- on_disk.object_pos = htonl(commit_pos);
- on_disk.xor_offset = stored->xor_offset;
- on_disk.flags = stored->flags;
+ sha1write_be32(f, commit_pos);
+ sha1write_u8(f, stored->xor_offset);
+ sha1write_u8(f, stored->flags);
- sha1write(f, &on_disk, sizeof(on_disk));
dump_bitmap(f, stored->write_as);
}
}
diff --git a/pack-bitmap.c b/pack-bitmap.c
index a1f3c0d..6a81841 100644
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -197,13 +197,24 @@ static struct stored_bitmap *store_bitmap(struct bitmap_index *index,
return stored;
}
+static inline uint32_t read_be32(const unsigned char *buffer, size_t *pos)
+{
+ uint32_t result = get_be32(buffer + *pos);
+ (*pos) += sizeof(result);
+ return result;
+}
+
+static inline uint8_t read_u8(const unsigned char *buffer, size_t *pos)
+{
+ return buffer[(*pos)++];
+}
+
static int load_bitmap_entries_v1(struct bitmap_index *index)
{
static const size_t MAX_XOR_OFFSET = 160;
uint32_t i;
struct stored_bitmap **recent_bitmaps;
- struct bitmap_disk_entry *entry;
recent_bitmaps = xcalloc(MAX_XOR_OFFSET, sizeof(struct stored_bitmap));
@@ -214,15 +225,12 @@ static int load_bitmap_entries_v1(struct bitmap_index *index)
uint32_t commit_idx_pos;
const unsigned char *sha1;
- entry = (struct bitmap_disk_entry *)(index->map + index->map_pos);
- index->map_pos += sizeof(struct bitmap_disk_entry);
+ commit_idx_pos = read_be32(index->map, &index->map_pos);
+ xor_offset = read_u8(index->map, &index->map_pos);
+ flags = read_u8(index->map, &index->map_pos);
- commit_idx_pos = ntohl(entry->object_pos);
sha1 = nth_packed_object_sha1(index->pack, commit_idx_pos);
- xor_offset = (int)entry->xor_offset;
- flags = (int)entry->flags;
-
bitmap = read_bitmap_1(index);
if (!bitmap)
return -1;
diff --git a/pack-bitmap.h b/pack-bitmap.h
index 8b7f4e9..487600b 100644
--- a/pack-bitmap.h
+++ b/pack-bitmap.h
@@ -5,12 +5,6 @@
#include "khash.h"
#include "pack-objects.h"
-struct bitmap_disk_entry {
- uint32_t object_pos;
- uint8_t xor_offset;
- uint8_t flags;
-} __attribute__((packed));
-
struct bitmap_disk_header {
char magic[4];
uint16_t version;
diff --git a/path.c b/path.c
index f68df0c..e608993 100644
--- a/path.c
+++ b/path.c
@@ -823,3 +823,36 @@ int daemon_avoid_alias(const char *p)
}
}
}
+
+static int only_spaces_and_periods(const char *path, size_t len, size_t skip)
+{
+ if (len < skip)
+ return 0;
+ len -= skip;
+ path += skip;
+ while (len-- > 0) {
+ char c = *(path++);
+ if (c != ' ' && c != '.')
+ return 0;
+ }
+ return 1;
+}
+
+int is_ntfs_dotgit(const char *name)
+{
+ int len;
+
+ for (len = 0; ; len++)
+ if (!name[len] || name[len] == '\\' || is_dir_sep(name[len])) {
+ if (only_spaces_and_periods(name, len, 4) &&
+ !strncasecmp(name, ".git", 4))
+ return 1;
+ if (only_spaces_and_periods(name, len, 5) &&
+ !strncasecmp(name, "git~1", 5))
+ return 1;
+ if (name[len] != '\\')
+ return 0;
+ name += len + 1;
+ len = -1;
+ }
+}
diff --git a/po/bg.po b/po/bg.po
index ef97185..ccdd11e 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -54,7 +54,8 @@
# porcelain команди от потребителско ниво
# pack [noun] пакетен файл - fixme in glossary
# mainline базово подаване - при cherry-pick на merge - към коя версия да се изчислява разликата
-#
+# token лексема
+# trailer епилог/завършек на съобщение
# ----
# FAILED to parse неуспешен анализ на... -> неразпозната стойност на
# blob обект BLOB
@@ -129,8 +130,8 @@ msgid ""
msgstr ""
"Project-Id-Version: git master\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2014-08-04 14:48+0800\n"
-"PO-Revision-Date: 2014-08-03 13:01+0300\n"
+"POT-Creation-Date: 2014-11-20 09:42+0800\n"
+"PO-Revision-Date: 2014-11-20 16:09+0800\n"
"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
"Language: bg\n"
@@ -148,106 +149,104 @@ msgstr "Подсказка: %.*s\n"
#: advice.c:88
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
-"as appropriate to mark resolution and make a commit, or use\n"
-"'git commit -a'."
+"as appropriate to mark resolution and make a commit."
msgstr ""
"Редактирайте ги в работното дърво, и тогава ползвайте „git add/rm ФАЙЛ“\n"
-"за да отбележите коригирането им и ги подадете или просто ползвайте:\n"
-"„git commit -a“"
+"за да отбележите коригирането им. След това извършете подаването."
-#: archive.c:10
+#: archive.c:11
msgid "git archive [options] <tree-ish> [<path>...]"
msgstr "git archive [ОПЦИЯ…] УКАЗАТЕЛ_КЪМ_ДЪРВО [ПЪТ…]"
-#: archive.c:11
+#: archive.c:12
msgid "git archive --list"
msgstr "git archive --list"
-#: archive.c:12
+#: archive.c:13
msgid ""
"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
msgstr ""
"git archive --remote ХРАНИЛИЩЕ [--exec КОМАНДА] [ОПЦИЯ…] УКАЗАТЕЛ_КЪМ_ДЪРВО "
"[ПЪТ…]"
-#: archive.c:13
+#: archive.c:14
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote ХРАНИЛИЩЕ [--exec КОМАНДА] --list"
-#: archive.c:243 builtin/add.c:136 builtin/add.c:427 builtin/rm.c:328
+#: archive.c:334 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "пътят „%s“ не съвпада с никой файл"
-#: archive.c:328
+#: archive.c:419
msgid "fmt"
msgstr "ФОРМАТ"
-#: archive.c:328
+#: archive.c:419
msgid "archive format"
msgstr "ФОРМАТ на архива"
-#: archive.c:329 builtin/log.c:1201
+#: archive.c:420 builtin/log.c:1204
msgid "prefix"
msgstr "префикс"
-#: archive.c:330
+#: archive.c:421
msgid "prepend prefix to each pathname in the archive"
msgstr "добавяне на този префикс към всеки път в архива"
-#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2517
-#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:709
-#: builtin/fast-export.c:711 builtin/grep.c:712 builtin/hash-object.c:77
-#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412
-#: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151
+#: archive.c:422 builtin/archive.c:88 builtin/blame.c:2517
+#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986
+#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101
+#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:411
+#: builtin/notes.c:568 builtin/read-tree.c:109 parse-options.h:151
msgid "file"
msgstr "файл"
-#: archive.c:332 builtin/archive.c:89
+#: archive.c:423 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "запазване на архива в този файл"
-#: archive.c:334
+#: archive.c:425
msgid "read .gitattributes in working directory"
msgstr "изчитане на „.gitattributes“ в работната директория"
-#: archive.c:335
+#: archive.c:426
msgid "report archived files on stderr"
msgstr "извеждане на архивираните файлове на стандартната грешка"
-#: archive.c:336
+#: archive.c:427
msgid "store only"
msgstr "само съхранение без компресиране"
-#: archive.c:337
+#: archive.c:428
msgid "compress faster"
msgstr "бързо компресиране"
-#: archive.c:345
+#: archive.c:436
msgid "compress better"
msgstr "добро компресиране"
-#: archive.c:348
+#: archive.c:439
msgid "list supported archive formats"
msgstr "извеждане на списъка с поддържаните формати"
-#: archive.c:350 builtin/archive.c:90 builtin/clone.c:84
+#: archive.c:441 builtin/archive.c:90 builtin/clone.c:85
msgid "repo"
msgstr "хранилище"
-#: archive.c:351 builtin/archive.c:91
+#: archive.c:442 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "изтегляне на архива от отдалеченото ХРАНИЛИЩЕ"
-#: archive.c:352 builtin/archive.c:92 builtin/notes.c:491
+#: archive.c:443 builtin/archive.c:92 builtin/notes.c:490
msgid "command"
msgstr "команда"
-#: archive.c:353 builtin/archive.c:93
+#: archive.c:444 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "път към отдалечената команда „git-upload-archive“"
-#: attr.c:259
+#: attr.c:258
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -309,31 +308,31 @@ msgstr "Клонът „%s“ ще следи локалния указател
msgid "Not tracking: ambiguous information for ref %s"
msgstr "Няма следене: двусмислена информация за указателя „%s“"
-#: branch.c:178
+#: branch.c:162
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "„%s“ не е позволено име за клон."
-#: branch.c:183
+#: branch.c:167
#, c-format
msgid "A branch named '%s' already exists."
msgstr "Вече съществува клон с име „%s“."
-#: branch.c:191
+#: branch.c:175
msgid "Cannot force update the current branch."
msgstr "Текущият клон не може да бъде принудително обновен."
-#: branch.c:211
+#: branch.c:195
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr "Зададените настройки за следенето са грешни — началото „%s“ не е клон."
-#: branch.c:213
+#: branch.c:197
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "заявеният отдалечен клон „%s“ не съществува"
-#: branch.c:215
+#: branch.c:199
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -352,111 +351,109 @@ msgstr ""
"може да използвате „git push -u“, за да настроите към кой клон да се "
"изтласква."
-#: branch.c:260
+#: branch.c:243
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "Неправилно име на обект: „%s“"
-#: branch.c:280
+#: branch.c:263
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "Двусмислено име на обект: „%s“"
-#: branch.c:285
+#: branch.c:268
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "Неправилно място за начало на клон: „%s“"
-#: branch.c:291
-msgid "Failed to lock ref for update"
-msgstr "Указателят не може да бъде заключен, за да бъде обновен"
-
-#: branch.c:309
-msgid "Failed to write ref"
-msgstr "Указателят не може да бъде записан"
-
-#: bundle.c:33
+#: bundle.c:34
#, c-format
msgid "'%s' does not look like a v2 bundle file"
msgstr "Файлът „%s“ не изглежда да е пратка на git версия 2"
-#: bundle.c:60
+#: bundle.c:61
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr "непозната заглавна част: %s%s (%d)"
-#: bundle.c:86 builtin/commit.c:755
+#: bundle.c:87 builtin/commit.c:788
#, c-format
msgid "could not open '%s'"
msgstr "„%s“ не може да се отвори"
-#: bundle.c:138
+#: bundle.c:139
msgid "Repository lacks these prerequisite commits:"
msgstr "В хранилището липсват следните необходими подавания:"
-#: bundle.c:162 sequencer.c:630 sequencer.c:1085 builtin/log.c:330
-#: builtin/log.c:821 builtin/log.c:1428 builtin/log.c:1665 builtin/merge.c:357
+#: bundle.c:163 sequencer.c:641 sequencer.c:1096 builtin/blame.c:2706
+#: builtin/branch.c:652 builtin/commit.c:1085 builtin/log.c:330
+#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:357
#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr "неуспешно настройване на обхождането на версиите"
-#: bundle.c:184
+#: bundle.c:185
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "Пратката съдържа следния указател:"
msgstr[1] "Пратката съдържа следните %d указатели:"
-#: bundle.c:191
+#: bundle.c:192
msgid "The bundle records a complete history."
msgstr "Пратката съдържа пълна история."
-#: bundle.c:193
+#: bundle.c:194
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "Пратката изисква следния указател:"
msgstr[1] "Пратката изисква следните %d указатели:"
+#: bundle.c:251
+msgid "Could not spawn pack-objects"
+msgstr "Командата „git pack-objects“ не може да бъде стартирана"
+
+# FIXME better message
+#: bundle.c:269
+msgid "pack-objects died"
+msgstr "Командата „git pack-objects“ не завърши успешно"
+
# FIXME better message
-#: bundle.c:289
+#: bundle.c:309
msgid "rev-list died"
msgstr "Командата „git rev-list“ не завърши успешно"
-#: bundle.c:295 builtin/log.c:1339 builtin/shortlog.c:261
-#, c-format
-msgid "unrecognized argument: %s"
-msgstr "непознат аргумент: %s"
-
-#: bundle.c:330
+#: bundle.c:358
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
"указателят „%s“ не е бил включен поради опциите зададени на „git rev-list“"
-#: bundle.c:375
+#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "непознат аргумент: %s"
+
+#: bundle.c:444
msgid "Refusing to create empty bundle."
msgstr "Създаването на празна пратка е невъзможно."
-#: bundle.c:390
-msgid "Could not spawn pack-objects"
-msgstr "Командата „git pack-objects“ не може да бъде стартирана"
-
-# FIXME better message
-#: bundle.c:408
-msgid "pack-objects died"
-msgstr "Командата „git pack-objects“ не завърши успешно"
-
-#: bundle.c:411
+#: bundle.c:454
#, c-format
msgid "cannot create '%s'"
msgstr "Файлът „%s“ не може да бъде създаден"
# FIXME better message
-#: bundle.c:433
+#: bundle.c:475
msgid "index-pack died"
msgstr "Командата „git index-pack“ не завърши успешно"
+#: color.c:157
+#, c-format
+msgid "invalid color value: %.*s"
+msgstr "неправилна стойност за цвят: %.*s"
+
#: commit.c:40
#, c-format
msgid "could not parse %s"
@@ -471,16 +468,70 @@ msgstr "%s %s не е подаване!"
msgid "memory exhausted"
msgstr "паметта свърши"
-#: connected.c:70
+#: config.c:469 config.c:471
+#, c-format
+msgid "bad config file line %d in %s"
+msgstr "неправилен ред %d в „%s“"
+
+#: config.c:587
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr ""
+"неправилна числова стойност „%s“ за настройката „%s“ в раздела „%s“: %s"
+
+#: config.c:589
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "неправилна числова стойност „%s“ за настройката „%s“: %s"
+
+#: config.c:674
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr "домашната папка на потребителя не може да бъде открита: „%s“"
+
+#: config.c:752 config.c:763
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "неправилно ниво на компресиране: %d"
+
+#: config.c:885
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "неправилен режим за създаването на обекти: %s"
+
+#: config.c:1201
+msgid "unable to parse command-line config"
+msgstr "неправилни настройки от командния ред"
+
+#: config.c:1262
+msgid "unknown error occured while reading the configuration files"
+msgstr "неочаквана грешка при изчитането на конфигурационните файлове"
+
+#: config.c:1586
+#, c-format
+msgid "unable to parse '%s' from command-line config"
+msgstr "неразпозната стойност „%s“ от командния ред"
+
+#: config.c:1588
+#, c-format
+msgid "bad config variable '%s' in file '%s' at line %d"
+msgstr "неправилна настройка „%s“ във файла „%s“ на ред №%d"
+
+#: config.c:1647
+#, c-format
+msgid "%s has multiple values"
+msgstr "зададени са няколко стойности за „%s“"
+
+#: connected.c:69
msgid "Could not run 'git rev-list'"
msgstr "Командата „git rev-list“ не може да бъде изпълнена."
-#: connected.c:90
+#: connected.c:89
#, c-format
msgid "failed write to rev-list: %s"
msgstr "неуспешен запис на списъка с версиите: %s"
-#: connected.c:98
+#: connected.c:97
#, c-format
msgid "failed to close rev-list's stdin: %s"
msgstr "стандартният вход на списъка с версиите не може да бъде затворен: %s"
@@ -558,7 +609,7 @@ msgstr[1] "преди %lu години"
msgid "failed to read orderfile '%s'"
msgstr "файлът с подредбата на съответствията „%s“ не може да бъде прочетен"
-#: diffcore-rename.c:514
+#: diffcore-rename.c:516
msgid "Performing inexact rename detection"
msgstr "Търсене на преименувания на обекти съчетани с промени"
@@ -579,7 +630,7 @@ msgstr " Непознат параметър „%s“ за статистика
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Непозната стойност „%s“ за настройката „diff.submodule“"
-#: diff.c:267
+#: diff.c:266
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -588,17 +639,17 @@ msgstr ""
"Грешки в настройката „diff.dirstat“:\n"
"%s"
-#: diff.c:2934
+#: diff.c:2957
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
"външната програма за разлики завърши неуспешно. Спиране на работата при „%s“"
-#: diff.c:3329
+#: diff.c:3352
msgid "--follow requires exactly one pathspec"
msgstr "Опцията „--follow“ изисква точно един път"
-#: diff.c:3492
+#: diff.c:3515
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -607,44 +658,44 @@ msgstr ""
"Неразпознат параметър към опцията „--dirstat/-X“:\n"
"%s"
-#: diff.c:3506
+#: diff.c:3529
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Неразпознат параметър към опцията „--submodule“: „%s“"
-#: gpg-interface.c:73 gpg-interface.c:145
+#: gpg-interface.c:129 gpg-interface.c:200
msgid "could not run gpg."
msgstr "Програмата „gpg“ не може да бъде стартирана."
-#: gpg-interface.c:85
+#: gpg-interface.c:141
msgid "gpg did not accept the data"
msgstr "Програмата „gpg“ не прие подадените данни."
-#: gpg-interface.c:96
+#: gpg-interface.c:152
msgid "gpg failed to sign the data"
msgstr "Програмата „gpg“ не подписа данните."
-#: gpg-interface.c:129
+#: gpg-interface.c:185
#, c-format
msgid "could not create temporary file '%s': %s"
msgstr "Програмата „gpg“ не успя да създаде временния файл „%s“: %s"
-#: gpg-interface.c:132
+#: gpg-interface.c:188
#, c-format
msgid "failed writing detached signature to '%s': %s"
msgstr "Програмата „gpg“ не успя да запише самостоятелния подпис към „%s“: %s"
-#: grep.c:1703
+#: grep.c:1718
#, c-format
msgid "'%s': unable to read %s"
msgstr "„%s“: файлът сочен от „%s“ не може да бъде прочетен"
-#: grep.c:1720
+#: grep.c:1735
#, c-format
msgid "'%s': %s"
msgstr "„%s“: „%s“"
-#: grep.c:1731
+#: grep.c:1746
#, c-format
msgid "'%s': short read %s"
msgstr "„%s“: изчитането на „%s“ върна по-малко байтове от заявените"
@@ -716,90 +767,98 @@ msgstr[1] ""
msgid "%s: %s - %s"
msgstr "%s: %s — %s"
-#: merge.c:40
+#: lockfile.c:275
+msgid "BUG: reopen a lockfile that is still open"
+msgstr "ГРЕШКА В GIT: преотваряне на файл-ключалка"
+
+#: lockfile.c:277
+msgid "BUG: reopen a lockfile that has been committed"
+msgstr "ГРЕШКА В GIT: преотваряне на файл-ключалка, който е подаден"
+
+#: merge.c:41
msgid "failed to read the cache"
msgstr "кешът не може да бъде прочетен"
-#: merge.c:93 builtin/checkout.c:356 builtin/checkout.c:556
-#: builtin/clone.c:661
+#: merge.c:94 builtin/checkout.c:356 builtin/checkout.c:562
+#: builtin/clone.c:659
msgid "unable to write new index file"
msgstr "неуспешно записване на новия индекс"
-#: merge-recursive.c:190
+#: merge-recursive.c:189
#, c-format
msgid "(bad commit)\n"
msgstr "(лошо подаване)\n"
-#: merge-recursive.c:210
+#: merge-recursive.c:209
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr "неуспешно изпълнение на „addinfo_cache“ за пътя „%s“"
-#: merge-recursive.c:271
+#: merge-recursive.c:270
msgid "error building trees"
msgstr "грешка при изграждане на дърветата"
-#: merge-recursive.c:692
+#: merge-recursive.c:691
#, c-format
msgid "failed to create path '%s'%s"
msgstr "грешка при създаването на пътя „%s“%s"
-#: merge-recursive.c:703
+#: merge-recursive.c:702
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Изтриване на „%s“, за да се освободи място за поддиректория\n"
# FIXME better message
-#: merge-recursive.c:717 merge-recursive.c:738
+#: merge-recursive.c:716 merge-recursive.c:737
msgid ": perhaps a D/F conflict?"
msgstr ": възможно е да има конфликт директория/файл."
-#: merge-recursive.c:728
+#: merge-recursive.c:727
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr ""
"преустановяване на действието, за да не се изтрие неследеният файл „%s“"
-#: merge-recursive.c:768
+#: merge-recursive.c:767
#, c-format
msgid "cannot read object %s '%s'"
msgstr "обектът „%s“ (%s) не може да бъде прочетен"
-#: merge-recursive.c:770
+#: merge-recursive.c:769
#, c-format
msgid "blob expected for %s '%s'"
msgstr "обектът „%s“ (%s) се очакваше да е BLOB, а не е"
-#: merge-recursive.c:793 builtin/clone.c:317
+#: merge-recursive.c:792 builtin/clone.c:318
#, c-format
msgid "failed to open '%s'"
msgstr "директорията „%s“ не може да бъде отворена"
-#: merge-recursive.c:801
+#: merge-recursive.c:800
#, c-format
msgid "failed to symlink '%s'"
msgstr "неуспешно създаване на символната връзка „%s“"
-#: merge-recursive.c:804
+#: merge-recursive.c:803
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr ""
"не е ясно какво да се прави с обекта „%2$s“ (%3$s) с права за достъп „%1$06o“"
-#: merge-recursive.c:942
+#: merge-recursive.c:941
msgid "Failed to execute internal merge"
msgstr "Неуспешно вътрешно сливане"
-#: merge-recursive.c:946
+#: merge-recursive.c:945
#, c-format
msgid "Unable to add %s to database"
msgstr "„%s“ не може да се добави в базата с данни"
-#: merge-recursive.c:962
+#: merge-recursive.c:961
msgid "unsupported object type in the tree"
msgstr "в дървото има неподдържан вид обект"
-#: merge-recursive.c:1037 merge-recursive.c:1051
+#: merge-recursive.c:1036 merge-recursive.c:1050
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -808,7 +867,7 @@ msgstr ""
"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ "
"е оставена в дървото."
-#: merge-recursive.c:1043 merge-recursive.c:1056
+#: merge-recursive.c:1042 merge-recursive.c:1055
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -817,20 +876,20 @@ msgstr ""
"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ "
"е оставена в дървото: %s."
-#: merge-recursive.c:1097
+#: merge-recursive.c:1096
msgid "rename"
msgstr "преименуване"
-#: merge-recursive.c:1097
+#: merge-recursive.c:1096
msgid "renamed"
msgstr "преименуван"
-#: merge-recursive.c:1153
+#: merge-recursive.c:1152
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "„%s“ е директория в „%s“, затова се добавя като „%s“"
-#: merge-recursive.c:1175
+#: merge-recursive.c:1174
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -839,149 +898,151 @@ msgstr ""
"КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
"„%s“, а „%s“ е преименуван на „%s“ в „%s“/%s."
-#: merge-recursive.c:1180
+#: merge-recursive.c:1179
msgid " (left unresolved)"
msgstr " (некоригиран конфликт)"
-#: merge-recursive.c:1234
+#: merge-recursive.c:1233
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
"„%s“, а „%s“ е преименуван на „%s“ в „%s“"
-#: merge-recursive.c:1264
+#: merge-recursive.c:1263
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "Преименуване на „%s“ на „%s“, а „%s“ на „%s“"
-#: merge-recursive.c:1463
+#: merge-recursive.c:1462
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
"КОНФЛИКТ (преименуване/добавяне): „%s“ е преименуван на „%s“ в клон „%s“, а "
"„%s“ е добавен в „%s“"
-#: merge-recursive.c:1473
+#: merge-recursive.c:1472
#, c-format
msgid "Adding merged %s"
msgstr "Добавяне на слетия „%s“"
-#: merge-recursive.c:1478 merge-recursive.c:1676
+#: merge-recursive.c:1477 merge-recursive.c:1675
#, c-format
msgid "Adding as %s instead"
msgstr "Добавяне като „%s“"
-#: merge-recursive.c:1529
+#: merge-recursive.c:1528
#, c-format
msgid "cannot read object %s"
msgstr "обектът „%s“ не може да се прочете"
-#: merge-recursive.c:1532
+#: merge-recursive.c:1531
#, c-format
msgid "object %s is not a blob"
msgstr "обектът „%s“ не е BLOB"
-#: merge-recursive.c:1580
+#: merge-recursive.c:1579
msgid "modify"
msgstr "промяна"
-#: merge-recursive.c:1580
+#: merge-recursive.c:1579
msgid "modified"
msgstr "променен"
-#: merge-recursive.c:1590
+#: merge-recursive.c:1589
msgid "content"
msgstr "съдържание"
-#: merge-recursive.c:1597
+#: merge-recursive.c:1596
msgid "add/add"
msgstr "добавяне/добавяне"
-#: merge-recursive.c:1631
+#: merge-recursive.c:1630
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Прескачане на „%s“ (слетият резултат е идентичен със сегашния)"
-#: merge-recursive.c:1645
+#: merge-recursive.c:1644
#, c-format
msgid "Auto-merging %s"
msgstr "Автоматично сливане на „%s“"
-#: merge-recursive.c:1649 git-submodule.sh:1150
+#: merge-recursive.c:1648 git-submodule.sh:1150
msgid "submodule"
msgstr "ПОДМОДУЛ"
-#: merge-recursive.c:1650
+#: merge-recursive.c:1649
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "КОНФЛИКТ (%s): Конфликт при сливане на „%s“"
-#: merge-recursive.c:1740
+#: merge-recursive.c:1735
#, c-format
msgid "Removing %s"
msgstr "Изтриване на „%s“"
-#: merge-recursive.c:1765
+#: merge-recursive.c:1760
msgid "file/directory"
msgstr "файл/директория"
-#: merge-recursive.c:1771
+#: merge-recursive.c:1766
msgid "directory/file"
msgstr "директория/файл"
-#: merge-recursive.c:1776
+#: merge-recursive.c:1771
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"КОНФЛИКТ (%s): Съществува директория на име „%s“ в „%s“. Добавяне на „%s“ "
"като „%s“"
-#: merge-recursive.c:1786
+#: merge-recursive.c:1781
#, c-format
msgid "Adding %s"
msgstr "Добавяне на „%s“"
-#: merge-recursive.c:1803
+#: merge-recursive.c:1798
msgid "Fatal merge failure, shouldn't happen."
msgstr "Фатална грешка при сливане, а такава не трябва да възниква!"
-#: merge-recursive.c:1822
+#: merge-recursive.c:1817
msgid "Already up-to-date!"
msgstr "Вече е обновено!"
-#: merge-recursive.c:1831
+#: merge-recursive.c:1826
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "неуспешно сливане на дърветата „%s“ и „%s“"
# FIXME message
-#: merge-recursive.c:1861
+#: merge-recursive.c:1856
#, c-format
msgid "Unprocessed path??? %s"
-msgstr "Пътят „%s“ не е обработен, това е грешка в Git."
+msgstr ""
+"Пътят „%s“ не е обработен, това е грешка в Git, докладвайте я на "
+"разработчиците, като пратите е-писмо на адрес: „git@vger.kernel.org“."
-#: merge-recursive.c:1906
+#: merge-recursive.c:1901
msgid "Merging:"
msgstr "Сливане:"
-#: merge-recursive.c:1919
+#: merge-recursive.c:1914
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "открит е %u общ предшественик:"
msgstr[1] "открити са %u общи предшественици:"
-#: merge-recursive.c:1956
+#: merge-recursive.c:1951
msgid "merge returned no commit"
msgstr "сливането не върна подаване"
-#: merge-recursive.c:2013
+#: merge-recursive.c:2008
#, c-format
msgid "Could not parse object '%s'"
msgstr "Неуспешен анализ на обекта „%s“"
-#: merge-recursive.c:2024 builtin/merge.c:666
+#: merge-recursive.c:2019 builtin/merge.c:666
msgid "Unable to write index."
msgstr "Индексът не може да бъде прочетен"
@@ -1008,33 +1069,33 @@ msgstr ""
msgid "Bad %s value: '%s'"
msgstr "Зададена е лоша стойност на променливата „%s“: „%s“"
-#: object.c:234
+#: object.c:241
#, c-format
msgid "unable to parse object: %s"
msgstr "обектът „%s“ не може да бъде анализиран"
-#: parse-options.c:534
+#: parse-options.c:546
msgid "..."
msgstr "…"
-#: parse-options.c:552
+#: parse-options.c:564
#, c-format
msgid "usage: %s"
msgstr "употреба: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:556
+#: parse-options.c:568
#, c-format
msgid " or: %s"
msgstr " или: %s"
-#: parse-options.c:559
+#: parse-options.c:571
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:593
+#: parse-options.c:605
msgid "-NUM"
msgstr "-ЧИСЛО"
@@ -1102,11 +1163,15 @@ msgstr ""
"Нищо не се изключва от шаблоните за изключване.\n"
"Това често се случва, ако сте забравили да добавите „:/“ или „.“."
+#: pretty.c:968
+msgid "unable to parse --pretty format"
+msgstr "аргументът към опцията „--pretty“ не може да се анализира"
+
#: progress.c:225
msgid "done"
msgstr "действието завърши"
-#: read-cache.c:1260
+#: read-cache.c:1261
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -1115,7 +1180,7 @@ msgstr ""
"Зададена е неправилна стойност на настройката „index.version“.\n"
"Ще се ползва версия %i"
-#: read-cache.c:1270
+#: read-cache.c:1271
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -1125,51 +1190,51 @@ msgstr ""
"„GIT_INDEX_VERSION“.\n"
"Ще се ползва версия %i"
-#: remote.c:753
+#: remote.c:782
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Невъзможно е да се доставят едновременно и „%s“, и „%s“ към „%s“"
-#: remote.c:757
+#: remote.c:786
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "„%s“ обикновено следи „%s“, а не „%s“"
-#: remote.c:761
+#: remote.c:790
#, c-format
msgid "%s tracks both %s and %s"
msgstr "„%s“ следи както „%s“, така и „%s“"
-#: remote.c:769
+#: remote.c:798
msgid "Internal error"
msgstr "Вътрешна грешка"
-#: remote.c:1943
+#: remote.c:1968
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Този клон следи „%s“, но следеният клон е изтрит.\n"
-#: remote.c:1947
+#: remote.c:1972
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (за да коригирате това, използвайте „git branch --unset-upstream“)\n"
-#: remote.c:1950
+#: remote.c:1975
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "Клонът е актуализиран към „%s“.\n"
-#: remote.c:1954
+#: remote.c:1979
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Клонът ви е с %2$d подаване пред „%1$s“.\n"
msgstr[1] "Клонът ви е с %2$d подавания пред „%1$s“.\n"
-#: remote.c:1960
+#: remote.c:1985
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (публикувайте локалните си промени чрез „git push“)\n"
-#: remote.c:1963
+#: remote.c:1988
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -1179,11 +1244,11 @@ msgstr[0] ""
msgstr[1] ""
"Клонът ви е с %2$d подавания след „%1$s“ и може да бъде тривиално слят.\n"
-#: remote.c:1971
+#: remote.c:1996
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (обновете локалния си клон чрез „git pull“)\n"
-#: remote.c:1974
+#: remote.c:1999
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1198,33 +1263,41 @@ msgstr[1] ""
"Текущият клон се е отделил от „%s“,\n"
"двата имат съответно по %d и %d несъвпадащи подавания.\n"
-#: remote.c:1984
+#: remote.c:2009
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (слейте отдалечения клон в локалния чрез „git pull“)\n"
-#: run-command.c:80
+#: run-command.c:87
msgid "open /dev/null failed"
msgstr "неуспешно отваряне на „/dev/null“"
-#: run-command.c:82
+#: run-command.c:89
#, c-format
msgid "dup2(%d,%d) failed"
msgstr "неуспешно изпълнение на dup2(%d,%d)"
-#: sequencer.c:171 builtin/merge.c:782 builtin/merge.c:893
-#: builtin/merge.c:1003 builtin/merge.c:1013
+#: send-pack.c:265
+msgid "failed to sign the push certificate"
+msgstr "сертификатът за изтласкване не може да бъде подписан"
+
+#: send-pack.c:322
+msgid "the receiving end does not support --signed push"
+msgstr "отсрещната страна не поддържа изтласкване с опцията „--signed“"
+
+#: sequencer.c:172 builtin/merge.c:781 builtin/merge.c:892
+#: builtin/merge.c:1002 builtin/merge.c:1012
#, c-format
msgid "Could not open '%s' for writing"
msgstr "„%s“ не може да бъде отворен за запис"
-#: sequencer.c:173 builtin/merge.c:343 builtin/merge.c:785
-#: builtin/merge.c:1005 builtin/merge.c:1018
+#: sequencer.c:174 builtin/merge.c:343 builtin/merge.c:784
+#: builtin/merge.c:1004 builtin/merge.c:1017
#, c-format
msgid "Could not write to '%s'"
msgstr "„%s“ не може да бъде записан"
# FIXME git add <path…> for consistence
-#: sequencer.c:194
+#: sequencer.c:195
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -1232,7 +1305,7 @@ msgstr ""
"след коригирането на конфликтите, отбележете съответните\n"
"пътища с „git add ПЪТ…“ или „git rm ПЪТ…“."
-#: sequencer.c:197
+#: sequencer.c:198
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -1243,236 +1316,232 @@ msgstr ""
"подайте резултата с командата „git commit'“."
# FIXME - must be the same as Could not write to '%s' above
-#: sequencer.c:210 sequencer.c:841 sequencer.c:924
+#: sequencer.c:211 sequencer.c:852 sequencer.c:935
#, c-format
msgid "Could not write to %s"
msgstr "„%s“ не може да бъде записан"
# FIXME wrap up as ffinishing the work on, in fact, full stop at end for consistency with below
-#: sequencer.c:213
+#: sequencer.c:214
#, c-format
msgid "Error wrapping up %s"
msgstr "Обработката на „%s“ не завърши успешно."
-#: sequencer.c:228
+#: sequencer.c:229
msgid "Your local changes would be overwritten by cherry-pick."
msgstr "Локалните ви промени ще бъдат презаписани при отбирането на подавания."
-#: sequencer.c:230
+#: sequencer.c:231
msgid "Your local changes would be overwritten by revert."
msgstr "Локалните ви промени ще бъдат презаписани при отмяната на подавания."
-#: sequencer.c:233
+#: sequencer.c:234
msgid "Commit your changes or stash them to proceed."
msgstr "Подайте или скатайте промените, за да продължите"
-#: sequencer.c:250
-msgid "Failed to lock HEAD during fast_forward_to"
-msgstr "Указателят „HEAD“ не може да бъде заключен при тривиално сливане"
-
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:293
+#: sequencer.c:304
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: новият индекс не може да бъде запазен"
-#: sequencer.c:324
+#: sequencer.c:335
msgid "Could not resolve HEAD commit\n"
msgstr "Подаването сочено от указателя „HEAD“ не може да бъде открито\n"
-#: sequencer.c:344
+#: sequencer.c:355
msgid "Unable to update cache tree\n"
msgstr "Дървото на кеша не може да бъде обновено\n"
-#: sequencer.c:391
+#: sequencer.c:402
#, c-format
msgid "Could not parse commit %s\n"
msgstr "Подаването „%s“ не може да бъде анализирано\n"
-#: sequencer.c:396
+#: sequencer.c:407
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr "Родителското подаване „%s“ не може да бъде анализирано\n"
-#: sequencer.c:462
+#: sequencer.c:473
msgid "Your index file is unmerged."
msgstr "Индексът не е слят."
-#: sequencer.c:481
+#: sequencer.c:492
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr "Подаването „%s“ е сливане, но не е дадена опцията „-m“"
-#: sequencer.c:489
+#: sequencer.c:500
#, c-format
msgid "Commit %s does not have parent %d"
msgstr "Подаването „%s“ няма родител %d"
-#: sequencer.c:493
+#: sequencer.c:504
#, 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:506
+#: sequencer.c:517
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: неразпозната стойност за родителското подаване „%s“"
-#: sequencer.c:510
+#: sequencer.c:521
#, c-format
msgid "Cannot get commit message for %s"
msgstr "Неуспешно извличане на съобщението за подаване на „%s“"
-#: sequencer.c:596
+#: sequencer.c:607
#, c-format
msgid "could not revert %s... %s"
msgstr "подаването „%s“… не може да бъде отменено: „%s“"
-#: sequencer.c:597
+#: sequencer.c:608
#, c-format
msgid "could not apply %s... %s"
msgstr "подаването „%s“… не може да бъде приложено: „%s“"
-#: sequencer.c:633
+#: sequencer.c:644
msgid "empty commit set passed"
msgstr "зададено е празно множество от подавания"
-#: sequencer.c:641
+#: sequencer.c:652
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: неуспешно изчитане на индекса"
-#: sequencer.c:645
+#: sequencer.c:656
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: неуспешно обновяване на индекса"
-#: sequencer.c:705
+#: sequencer.c:716
#, c-format
msgid "Cannot %s during a %s"
msgstr "По време на „%1$s“ не може да се извърши „%2$s“"
-#: sequencer.c:727
+#: sequencer.c:738
#, c-format
msgid "Could not parse line %d."
msgstr "%d-ят ред не може да се анализира."
-#: sequencer.c:732
+#: sequencer.c:743
msgid "No commits parsed."
msgstr "Никое от подаванията не може да се разпознае."
# FIXME Could not open %s. - full stop for consistence with next message
-#: sequencer.c:745
+#: sequencer.c:756
#, c-format
msgid "Could not open %s"
msgstr "„%s“ не може да се прочете."
-#: sequencer.c:749
+#: sequencer.c:760
#, c-format
msgid "Could not read %s."
msgstr "„%s“ не може да се отвори."
-#: sequencer.c:756
+#: sequencer.c:767
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr "Файлът с описание на предстоящите действия — „%s“ не може да се ползва"
-#: sequencer.c:786
+#: sequencer.c:797
#, c-format
msgid "Invalid key: %s"
msgstr "Неправилен ключ: „%s“"
-#: sequencer.c:789
+#: sequencer.c:800
#, c-format
msgid "Invalid value for %s: %s"
msgstr "Неправилна стойност за „%s“: „%s“"
-#: sequencer.c:801
+#: sequencer.c:812
#, c-format
msgid "Malformed options sheet: %s"
msgstr "Неправилно съдържание на файла с опции: „%s“"
-#: sequencer.c:822
+#: sequencer.c:833
msgid "a cherry-pick or revert is already in progress"
msgstr ""
"в момента вече се извършва отбиране на подавания или пребазиране на клона"
-#: sequencer.c:823
+#: sequencer.c:834
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "използвайте „git cherry-pick (--continue | --quit | --abort)“"
-#: sequencer.c:827
+#: sequencer.c:838
#, c-format
msgid "Could not create sequencer directory %s"
msgstr "Директорията за секвенсора „%s“ не може да бъде създадена"
-#: sequencer.c:843 sequencer.c:928
+#: sequencer.c:854 sequencer.c:939
#, c-format
msgid "Error wrapping up %s."
msgstr "Обработката на „%s“ не завърши успешно."
-#: sequencer.c:862 sequencer.c:998
+#: sequencer.c:873 sequencer.c:1009
msgid "no cherry-pick or revert in progress"
msgstr ""
"в момента не се извършва отбиране на подавания или пребазиране на клона"
-#: sequencer.c:864
+#: sequencer.c:875
msgid "cannot resolve HEAD"
msgstr "Подаването сочено от указателя „HEAD“ не може да бъде открито"
-#: sequencer.c:866
+#: sequencer.c:877
msgid "cannot abort from a branch yet to be born"
msgstr ""
"действието не може да бъде преустановено, когато сте на клон, който тепърва "
"предстои да бъде създаден"
-#: sequencer.c:888 builtin/apply.c:4062
+#: sequencer.c:899 builtin/apply.c:4128
#, c-format
msgid "cannot open %s: %s"
msgstr "файлът „%s“ не може да бъде отворен: %s"
-#: sequencer.c:891
+#: sequencer.c:902
#, c-format
msgid "cannot read %s: %s"
msgstr "файлът „%s“ не може да бъде прочетен: %s"
-#: sequencer.c:892
+#: sequencer.c:903
msgid "unexpected end of file"
msgstr "неочакван край на файл"
-#: sequencer.c:898
+#: sequencer.c:909
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
"запазеният преди започването на отбирането файл за указателя „HEAD“ — „%s“ е "
"повреден"
-#: sequencer.c:921
+#: sequencer.c:932
#, c-format
msgid "Could not format %s."
msgstr "Файлът „%s“ не може да се форматира по подходящия начин."
-#: sequencer.c:1066
+#: sequencer.c:1077
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: не може да се отбере „%s“"
-#: sequencer.c:1069
+#: sequencer.c:1080
#, c-format
msgid "%s: bad revision"
msgstr "%s: неправилна версия"
-#: sequencer.c:1103
+#: sequencer.c:1114
msgid "Can't revert as initial commit"
msgstr "Първоначалното подаване не може да бъде отменено"
-#: sequencer.c:1104
+#: sequencer.c:1115
msgid "Can't cherry-pick into empty head"
msgstr "При празен връх не могат да се отбират подавания"
-#: sha1_name.c:439
+#: sha1_name.c:440
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -1496,21 +1565,21 @@ msgstr ""
"спрете това съобщение като изпълните командата:\n"
"„git config advice.objectNameWarning false“"
-#: sha1_name.c:1060
+#: sha1_name.c:1068
msgid "HEAD does not point to a branch"
msgstr "Указателят „HEAD“ не сочи към клон"
-#: sha1_name.c:1063
+#: sha1_name.c:1071
#, c-format
msgid "No such branch: '%s'"
msgstr "Не съществува клон на име „%s“"
-#: sha1_name.c:1065
+#: sha1_name.c:1073
#, c-format
msgid "No upstream configured for branch '%s'"
msgstr "Не е зададен клон-източник за клона „%s“"
-#: sha1_name.c:1069
+#: sha1_name.c:1077
#, c-format
msgid "Upstream branch '%s' not stored as a remote-tracking branch"
msgstr "Клонът-източник „%s“ не е съхранен като следящ клон"
@@ -1540,16 +1609,41 @@ msgstr "Записът „%s“ във файла „.gitmodules“ не мож
msgid "staging updated .gitmodules failed"
msgstr "неуспешно добавяне на променения файл „.gitmodules“ в индекса"
-#: submodule.c:1118 builtin/init-db.c:363
+#: submodule.c:1111 builtin/init-db.c:363
#, c-format
msgid "Could not create git link %s"
msgstr "Връзката в Git „%s“ не може да бъде създадена"
-#: submodule.c:1129
+#: submodule.c:1122
#, c-format
msgid "Could not set core.worktree in %s"
msgstr "Настройката „core.worktree“ не може да се зададе в „%s“"
+#: trailer.c:499 trailer.c:503 trailer.c:507 trailer.c:561 trailer.c:565
+#: trailer.c:569
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr "неправилна стойност „%s“ за настройката „%s“"
+
+#: trailer.c:551 trailer.c:556 builtin/remote.c:288
+#, c-format
+msgid "more than one %s"
+msgstr "стойността „%s“ се повтаря в настройките"
+
+#: trailer.c:589
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "празна завършваща лексема в епилога „%.*s“"
+
+#: trailer.c:709
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "входният файл „%s“ не може да бъде прочетен"
+
+#: trailer.c:712
+msgid "could not read from stdin"
+msgstr "от стандартния вход не може да се чете"
+
#: unpack-trees.c:202
msgid "Checking out files"
msgstr "Изтегляне на файлове"
@@ -1583,25 +1677,29 @@ msgstr "неправилен номер на порт"
msgid "invalid '..' path segment"
msgstr "неправилна част от пътя „..“"
-#: wrapper.c:460
+#: wrapper.c:509
#, c-format
msgid "unable to access '%s': %s"
msgstr "няма достъп до „%s“: %s"
-#: wrapper.c:481
+#: wrapper.c:530
#, c-format
msgid "unable to access '%s'"
msgstr "няма достъп до „%s“"
-#: wrapper.c:492
+#: wrapper.c:541
#, c-format
msgid "unable to look up current user in the passwd file: %s"
msgstr "текущият потребител не може да бъде открит във файла „/etc/passwd“: %s"
-#: wrapper.c:493
+#: wrapper.c:542
msgid "no such user"
msgstr "такъв потребител не съществува"
+#: wrapper.c:550
+msgid "unable to get current working directory"
+msgstr "текущата работна директория е недостъпна"
+
#: wt-status.c:150
msgid "Unmerged paths:"
msgstr "Неслети пътища:"
@@ -1751,15 +1849,15 @@ msgstr "неследено съдържание, "
msgid "bug: unhandled diff status %c"
msgstr "грешка: състоянието на промяната „%c“ не може да бъде обработено"
-#: wt-status.c:764
+#: wt-status.c:761
msgid "Submodules changed but not updated:"
msgstr "Подмодулите са променени, но не са обновени:"
-#: wt-status.c:766
+#: wt-status.c:763
msgid "Submodule changes to be committed:"
msgstr "Промени в подмодулите за подаване:"
-#: wt-status.c:845
+#: wt-status.c:842
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
@@ -1767,193 +1865,193 @@ msgstr ""
"Не променяйте горния ред.\n"
"Всичко отдолу ще бъде изтрито."
-#: wt-status.c:936
+#: wt-status.c:933
msgid "You have unmerged paths."
msgstr "Някои пътища не са слети."
-#: wt-status.c:939
+#: wt-status.c:936
msgid " (fix conflicts and run \"git commit\")"
msgstr " (коригирайте конфликтите и изпълнете „git commit“)"
-#: wt-status.c:942
+#: wt-status.c:939
msgid "All conflicts fixed but you are still merging."
msgstr "Всички конфликти са решени, но продължавате сливането."
-#: wt-status.c:945
+#: wt-status.c:942
msgid " (use \"git commit\" to conclude merge)"
msgstr " (използвайте „git commit“, за да завършите сливането)"
-#: wt-status.c:955
+#: wt-status.c:952
msgid "You are in the middle of an am session."
msgstr "В момента прилагате поредица от кръпки чрез „git am“."
-#: wt-status.c:958
+#: wt-status.c:955
msgid "The current patch is empty."
msgstr "Текущата кръпка е празна."
-#: wt-status.c:962
+#: wt-status.c:959
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (коригирайте конфликтите и изпълнете „git am --continue“)"
-#: wt-status.c:964
+#: wt-status.c:961
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (използвайте „git am --skip“, за да пропуснете тази кръпка)"
-#: wt-status.c:966
+#: wt-status.c:963
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
" (използвайте „git am --abort“, за да възстановите първоначалния клон)"
-#: wt-status.c:1026 wt-status.c:1043
+#: wt-status.c:1023 wt-status.c:1040
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "В момента пребазирате клона „%s“ върху „%s“."
-#: wt-status.c:1031 wt-status.c:1048
+#: wt-status.c:1028 wt-status.c:1045
msgid "You are currently rebasing."
msgstr "В момента пребазирате."
-#: wt-status.c:1034
+#: wt-status.c:1031
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (коригирайте конфликтите и използвайте „git rebase --continue“)"
-#: wt-status.c:1036
+#: wt-status.c:1033
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (използвайте „git rebase --skip“, за да пропуснете тази кръпка)"
-#: wt-status.c:1038
+#: wt-status.c:1035
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
" (използвайте „git rebase --abort“, за да възстановите първоначалния клон)"
-#: wt-status.c:1051
+#: wt-status.c:1048
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (всички конфликти са коригирани: изпълнете „git rebase --continue“)"
-#: wt-status.c:1055
+#: wt-status.c:1052
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr "В момента разделяте подаване докато пребазирате клона „%s“ върху „%s“."
-#: wt-status.c:1060
+#: wt-status.c:1057
msgid "You are currently splitting a commit during a rebase."
msgstr "В момента разделяте подаване докато пребазирате."
-#: wt-status.c:1063
+#: wt-status.c:1060
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (След като работното ви дърво стане чисто, използвайте „git rebase --"
"continue“)"
-#: wt-status.c:1067
+#: wt-status.c:1064
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"В момента редактирате подаване докато пребазирате клона „%s“ върху „%s“."
-#: wt-status.c:1072
+#: wt-status.c:1069
msgid "You are currently editing a commit during a rebase."
msgstr "В момента редактирате подаване докато пребазирате."
-#: wt-status.c:1075
+#: wt-status.c:1072
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
" (използвайте „git commit --amend“, за да редактирате текущото подаване)"
-#: wt-status.c:1077
+#: wt-status.c:1074
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (използвайте „git rebase --continue“, след като завършите промените си)"
-#: wt-status.c:1087
+#: wt-status.c:1084
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "В момента отбирате подаването „%s“."
-#: wt-status.c:1092
+#: wt-status.c:1089
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (коригирайте конфликтите и изпълнете „git cherry-pick --continue“)"
-#: wt-status.c:1095
+#: wt-status.c:1092
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (всички конфликти са коригирани, изпълнете „git cherry-pick --continue“)"
-#: wt-status.c:1097
+#: wt-status.c:1094
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (използвайте „git cherry-pick --abort“, за да отмените всички действия с "
"отбиране)"
-#: wt-status.c:1106
+#: wt-status.c:1103
#, c-format
msgid "You are currently reverting commit %s."
msgstr "В момента отменяте подаване „%s“."
-#: wt-status.c:1111
+#: wt-status.c:1108
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (коригирайте конфликтите и изпълнете „git revert --continue“)"
-#: wt-status.c:1114
+#: wt-status.c:1111
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (всички конфликти са коригирани, изпълнете „git revert --continue“)"
-#: wt-status.c:1116
+#: wt-status.c:1113
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
" (използвайте „git revert --abort“, за да преустановите отмяната на "
"подаване)"
-#: wt-status.c:1127
+#: wt-status.c:1124
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "В момента търсите двоично, като сте стартирали от клон „%s“."
-#: wt-status.c:1131
+#: wt-status.c:1128
msgid "You are currently bisecting."
msgstr "В момента търсите двоично."
-#: wt-status.c:1134
+#: wt-status.c:1131
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
" (използвайте „git bisect reset“, за да се върнете към първоначалното "
"състояние и клон)"
-#: wt-status.c:1309
+#: wt-status.c:1306
msgid "On branch "
msgstr "На клон "
-#: wt-status.c:1316
+#: wt-status.c:1313
msgid "rebase in progress; onto "
msgstr "извършвате пребазиране върху "
-#: wt-status.c:1323
+#: wt-status.c:1320
msgid "HEAD detached at "
msgstr "Указателят „HEAD“ не е свързан и е при подаване "
-#: wt-status.c:1325
+#: wt-status.c:1322
msgid "HEAD detached from "
msgstr "Указателят „HEAD“ не е свързан и е отделѐн от "
-#: wt-status.c:1328
+#: wt-status.c:1325
msgid "Not currently on any branch."
msgstr "Извън всички клони."
-#: wt-status.c:1345
+#: wt-status.c:1342
msgid "Initial commit"
msgstr "Първоначално подаване"
-#: wt-status.c:1359
+#: wt-status.c:1356
msgid "Untracked files"
msgstr "Неследени файлове"
-#: wt-status.c:1361
+#: wt-status.c:1358
msgid "Ignored files"
msgstr "Игнорирани файлове"
-#: wt-status.c:1365
+#: wt-status.c:1362
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -1965,32 +2063,32 @@ msgstr ""
"изпълнението, но не трябва да забравяте ръчно да добавяте новите файлове.\n"
"За повече подробности погледнете „git status help“."
-#: wt-status.c:1371
+#: wt-status.c:1368
#, c-format
msgid "Untracked files not listed%s"
msgstr "Неследените файлове не са изведени%s"
-#: wt-status.c:1373
+#: wt-status.c:1370
msgid " (use -u option to show untracked files)"
msgstr " (използвайте опцията „-u“, за да изведете неследените файлове)"
-#: wt-status.c:1379
+#: wt-status.c:1376
msgid "No changes"
msgstr "Няма промени"
-#: wt-status.c:1384
+#: wt-status.c:1381
#, 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:1387
+#: wt-status.c:1384
#, c-format
msgid "no changes added to commit\n"
msgstr "към индекса за подаване не са добавени промени\n"
-#: wt-status.c:1390
+#: wt-status.c:1387
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -1999,97 +2097,97 @@ msgstr ""
"към индекса за подаване не са добавени промени, но има нови файлове "
"(използвайте „git add“, за да започне тяхното следене)\n"
-#: wt-status.c:1393
+#: wt-status.c:1390
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "към индекса за подаване не са добавени промени, но има нови файлове\n"
-#: wt-status.c:1396
+#: wt-status.c:1393
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"липсват каквито и да е промени (създайте или копирайте файлове и използвайте "
"„git add“, за да започне тяхното следене)\n"
-#: wt-status.c:1399 wt-status.c:1404
+#: wt-status.c:1396 wt-status.c:1401
#, c-format
msgid "nothing to commit\n"
msgstr "липсват каквито и да е промени\n"
-#: wt-status.c:1402
+#: wt-status.c:1399
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"липсват каквито и да е промени (използвайте опцията „-u“, за да се изведат и "
"неследените файлове)\n"
-#: wt-status.c:1406
+#: wt-status.c:1403
#, c-format
msgid "nothing to commit, working directory clean\n"
msgstr "липсват каквито и да е промени, работното дърво е чисто\n"
-#: wt-status.c:1515
+#: wt-status.c:1512
msgid "HEAD (no branch)"
msgstr "HEAD (извън клон)"
-#: wt-status.c:1521
+#: wt-status.c:1518
msgid "Initial commit on "
msgstr "Първоначално подаване на клон"
-#: wt-status.c:1553
+#: wt-status.c:1550
msgid "gone"
msgstr "изтрит"
-#: wt-status.c:1555 wt-status.c:1563
+#: wt-status.c:1552 wt-status.c:1560
msgid "behind "
msgstr "назад с "
-#: compat/precompose_utf8.c:55 builtin/clone.c:356
+#: compat/precompose_utf8.c:55 builtin/clone.c:357
#, c-format
msgid "failed to unlink '%s'"
msgstr "неуспешно изтриване на „%s“"
-#: builtin/add.c:21
+#: builtin/add.c:22
msgid "git add [options] [--] <pathspec>..."
msgstr "git add [ОПЦИЯ…] [--] ПЪТ…"
-#: builtin/add.c:64
+#: builtin/add.c:65
#, c-format
msgid "unexpected diff status %c"
msgstr "неочакван изходен код при генериране на разлика: %c"
-#: builtin/add.c:69 builtin/commit.c:261
+#: builtin/add.c:70 builtin/commit.c:275
msgid "updating files failed"
msgstr "неуспешно обновяване на файловете"
-#: builtin/add.c:79
+#: builtin/add.c:80
#, c-format
msgid "remove '%s'\n"
msgstr "изтриване на „%s“\n"
-#: builtin/add.c:133
+#: builtin/add.c:134
msgid "Unstaged changes after refreshing the index:"
msgstr "Промени, които и след обновяването на индекса не са добавени към него:"
-#: builtin/add.c:193 builtin/rev-parse.c:781
+#: builtin/add.c:194 builtin/rev-parse.c:785
msgid "Could not read the index"
msgstr "Индексът не може да бъде прочетен"
-#: builtin/add.c:204
+#: builtin/add.c:205
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Файлът „%s“ не може да бъде отворен за запис."
-#: builtin/add.c:208
+#: builtin/add.c:209
msgid "Could not write patch"
msgstr "Кръпката не може да бъде записана"
-#: builtin/add.c:213
+#: builtin/add.c:214
#, c-format
msgid "Could not stat '%s'"
msgstr "Не може да се получи информация чрез „stat“ за файла „%s“"
-#: builtin/add.c:215
+#: builtin/add.c:216
msgid "Empty patch. Aborted."
msgstr "Празна кръпка, преустановяване на действието."
@@ -2103,15 +2201,15 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Следните пътища ще бъдат игнорирани според някой от файловете „.gitignore“:\n"
-#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:70
-#: builtin/prune-packed.c:77 builtin/push.c:488 builtin/remote.c:1367
+#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110
+#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1375
#: builtin/rm.c:269
msgid "dry run"
msgstr "пробно изпълнeние"
-#: builtin/add.c:249 builtin/apply.c:4411 builtin/check-ignore.c:19
-#: builtin/commit.c:1328 builtin/count-objects.c:95 builtin/fsck.c:606
-#: builtin/log.c:1613 builtin/mv.c:69 builtin/read-tree.c:113
+#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19
+#: builtin/commit.c:1362 builtin/count-objects.c:63 builtin/fsck.c:608
+#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
msgid "be verbose"
msgstr "повече подробности"
@@ -2119,7 +2217,7 @@ msgstr "повече подробности"
msgid "interactive picking"
msgstr "интерактивно отбиране на промени"
-#: builtin/add.c:252 builtin/checkout.c:1102 builtin/reset.c:285
+#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "интерактивен избор на парчета код"
@@ -2196,82 +2294,82 @@ msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Вероятно искахте да използвате „git add .“?\n"
#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919
-#: builtin/commit.c:319 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299
+#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299
msgid "index file corrupt"
msgstr "файлът с индекса е повреден"
-#: builtin/add.c:446 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:431
+#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431
msgid "Unable to write new index file"
msgstr "Новият индекс не може да бъде записан"
-#: builtin/apply.c:57
+#: builtin/apply.c:58
msgid "git apply [options] [<patch>...]"
msgstr "git apply [ОПЦИЯ…] [КРЪПКА…]"
-#: builtin/apply.c:110
+#: builtin/apply.c:111
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "непозната опция за знаците за интервали „%s“"
-#: builtin/apply.c:125
+#: builtin/apply.c:126
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "непозната опция за игнориране на знаците за интервали „%s“"
-#: builtin/apply.c:825
+#: builtin/apply.c:826
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Регулярният израз за времето „%s“ не може за бъде компилиран"
-#: builtin/apply.c:834
+#: builtin/apply.c:835
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "Регулярният израз върна %d при подадена последователност „%s“ на входа"
-#: builtin/apply.c:915
+#: builtin/apply.c:916
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "Липсва име на файл на ред %d от кръпката"
-#: builtin/apply.c:947
+#: builtin/apply.c:948
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: лош изход от командата „git-diff“ — на ред %2$d се очакваше „/dev/"
"null“, а бе получен „%1$s“"
-#: builtin/apply.c:951
+#: builtin/apply.c:952
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply: лош изход от командата „git-diff“ — на ред %d бе получено "
"неправилно име на нов файл"
-#: builtin/apply.c:952
+#: builtin/apply.c:953
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply: лош изход от командата „git-diff“ — на ред %d бе получено "
"неправилно име на стар файл"
-#: builtin/apply.c:959
+#: builtin/apply.c:960
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
"git apply: лош изход от командата „git-diff“ — на ред %d се очакваше „/dev/"
"null“"
-#: builtin/apply.c:1422
+#: builtin/apply.c:1423
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "при повторното преброяване бе получен неочакван ред: „%.*s“"
-#: builtin/apply.c:1479
+#: builtin/apply.c:1480
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "част от кръпка без заглавна част на ред %d: %.*s"
-#: builtin/apply.c:1496
+#: builtin/apply.c:1497
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -2286,66 +2384,66 @@ msgstr[1] ""
"След съкращаването на първите %d части от компонентите на пътя, в заглавната "
"част на „git diff“ липсва информация за име на файл (ред: %d)"
-#: builtin/apply.c:1656
+#: builtin/apply.c:1657
msgid "new file depends on old contents"
msgstr "новият файл зависи от старото съдържание на файла"
-#: builtin/apply.c:1658
+#: builtin/apply.c:1659
msgid "deleted file still has contents"
msgstr "изтритият файл не е празен"
-#: builtin/apply.c:1684
+#: builtin/apply.c:1685
#, c-format
msgid "corrupt patch at line %d"
msgstr "грешка в кръпката на ред %d"
-#: builtin/apply.c:1720
+#: builtin/apply.c:1721
#, c-format
msgid "new file %s depends on old contents"
msgstr "новият файл „%s“ зависи от старото съдържание на файла"
-#: builtin/apply.c:1722
+#: builtin/apply.c:1723
#, c-format
msgid "deleted file %s still has contents"
msgstr "изтритият файл „%s“ не е празен"
# FIXME - double **??
-#: builtin/apply.c:1725
+#: builtin/apply.c:1726
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "●● предупреждение: файлът „%s“ вече е празен, но не е изтрит"
-#: builtin/apply.c:1871
+#: builtin/apply.c:1872
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "грешка в двоичната кръпка на ред %d: %.*s"
-#: builtin/apply.c:1900
+#: builtin/apply.c:1901
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "неразпозната двоичната кръпка на ред %d"
-#: builtin/apply.c:1986
+#: builtin/apply.c:2052
#, c-format
msgid "patch with only garbage at line %d"
msgstr "кръпката е с изцяло повредени данни на ред %d"
-#: builtin/apply.c:2076
+#: builtin/apply.c:2142
#, c-format
msgid "unable to read symlink %s"
msgstr "символната връзка „%s“ не може да бъде прочетена"
-#: builtin/apply.c:2080
+#: builtin/apply.c:2146
#, c-format
msgid "unable to open or read %s"
msgstr "файлът „%s“ не може да бъде отворен или прочетен"
-#: builtin/apply.c:2688
+#: builtin/apply.c:2754
#, c-format
msgid "invalid start of line: '%c'"
msgstr "неправилно начало на ред: „%c“"
-#: builtin/apply.c:2806
+#: builtin/apply.c:2872
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -2354,13 +2452,13 @@ msgstr[0] ""
msgstr[1] ""
"%d-то парче код бе успешно приложено на ред %d (отместване от %d реда)."
-#: builtin/apply.c:2818
+#: builtin/apply.c:2884
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
"Контекстът е намален на (%ld/%ld) за прилагането на парчето код на ред %d"
-#: builtin/apply.c:2824
+#: builtin/apply.c:2890
#, c-format
msgid ""
"while searching for:\n"
@@ -2369,326 +2467,326 @@ msgstr ""
"при търсене за:\n"
"%.*s"
-#: builtin/apply.c:2843
+#: builtin/apply.c:2909
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "липсват данните за двоичната кръпка за „%s“"
-#: builtin/apply.c:2944
+#: builtin/apply.c:3010
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "двоичната кръпка не може да бъде приложена върху „%s“"
-#: builtin/apply.c:2950
+#: builtin/apply.c:3016
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"двоичната кръпка за „%s“ води до неправилни резултати (очакваше се SHA1: "
"„%s“, а бе получено: „%s“)"
-#: builtin/apply.c:2971
+#: builtin/apply.c:3037
#, c-format
msgid "patch failed: %s:%ld"
msgstr "неуспешно прилагане на кръпка: „%s:%ld“"
-#: builtin/apply.c:3095
+#: builtin/apply.c:3161
#, c-format
msgid "cannot checkout %s"
msgstr "„%s“ не може да се изтегли"
-#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194
+#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260
#, c-format
msgid "read of %s failed"
msgstr "неуспешно прочитане на „%s“"
-#: builtin/apply.c:3174 builtin/apply.c:3396
+#: builtin/apply.c:3240 builtin/apply.c:3462
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "обектът с път „%s“ е преименуван или изтрит"
-#: builtin/apply.c:3255 builtin/apply.c:3410
+#: builtin/apply.c:3321 builtin/apply.c:3476
#, c-format
msgid "%s: does not exist in index"
msgstr "„%s“ не съществува в индекса"
-#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424
+#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490
#, c-format
msgid "%s: %s"
msgstr "„%s“: %s"
-#: builtin/apply.c:3264 builtin/apply.c:3418
+#: builtin/apply.c:3330 builtin/apply.c:3484
#, c-format
msgid "%s: does not match index"
msgstr "„%s“ не съответства на индекса"
-#: builtin/apply.c:3366
+#: builtin/apply.c:3432
msgid "removal patch leaves file contents"
msgstr "изтриващата кръпка оставя файла непразен"
-#: builtin/apply.c:3435
+#: builtin/apply.c:3501
#, c-format
msgid "%s: wrong type"
msgstr "„%s“: неправилен вид"
-#: builtin/apply.c:3437
+#: builtin/apply.c:3503
#, c-format
msgid "%s has type %o, expected %o"
msgstr "„%s“ е от вид „%o“, а се очакваше „%o“"
-#: builtin/apply.c:3538
+#: builtin/apply.c:3604
#, c-format
msgid "%s: already exists in index"
msgstr "„%s“: вече съществува в индекса"
-#: builtin/apply.c:3541
+#: builtin/apply.c:3607
#, c-format
msgid "%s: already exists in working directory"
msgstr "„%s“: вече съществува в работната директория"
-#: builtin/apply.c:3561
+#: builtin/apply.c:3627
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "новите права за достъп (%o) на „%s“ не съвпадат със старите (%o)"
-#: builtin/apply.c:3566
+#: builtin/apply.c:3632
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
"новите права за достъп (%o) на „%s“ не съвпадат със старите (%o) на „%s“"
-#: builtin/apply.c:3574
+#: builtin/apply.c:3640
#, c-format
msgid "%s: patch does not apply"
msgstr "Кръпката „%s“ не може да бъде приложена"
-#: builtin/apply.c:3587
+#: builtin/apply.c:3653
#, c-format
msgid "Checking patch %s..."
msgstr "Проверяване на кръпката „%s“…"
-#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134
+#: builtin/apply.c:3746 builtin/checkout.c:213 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "неуспешно създаване на запис в кеша чрез „make_cache_entry“ за „%s“"
-#: builtin/apply.c:3823
+#: builtin/apply.c:3889
#, c-format
msgid "unable to remove %s from index"
msgstr "„%s“ не може да се извади от индекса"
-#: builtin/apply.c:3852
+#: builtin/apply.c:3918
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "повредена кръпка за модула „%s“"
-#: builtin/apply.c:3856
+#: builtin/apply.c:3922
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
"не може да се получи информация чрез „stat“ за новосъздадения файл „%s“"
-#: builtin/apply.c:3861
+#: builtin/apply.c:3927
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"не може да се за създаде мястото за съхранение на новосъздадения файл „%s“"
-#: builtin/apply.c:3864 builtin/apply.c:3972
+#: builtin/apply.c:3930 builtin/apply.c:4038
#, c-format
msgid "unable to add cache entry for %s"
msgstr "не може да се добави запис в кеша за „%s“"
-#: builtin/apply.c:3897
+#: builtin/apply.c:3963
#, c-format
msgid "closing file '%s'"
msgstr "затваряне на файла „%s“"
-#: builtin/apply.c:3946
+#: builtin/apply.c:4012
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "файлът „%s“ не може да се запише с режим на достъп „%o“"
-#: builtin/apply.c:4033
+#: builtin/apply.c:4099
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Кръпката „%s“ бе приложена чисто."
-#: builtin/apply.c:4041
+#: builtin/apply.c:4107
msgid "internal error"
msgstr "вътрешна грешка"
-#: builtin/apply.c:4044
+#: builtin/apply.c:4110
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Прилагане на кръпката „%%s“ с %d отхвърлено парче…"
msgstr[1] "Прилагане на кръпката „%%s“ с %d отхвърлени парчета…"
-#: builtin/apply.c:4054
+#: builtin/apply.c:4120
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "съкращаване на името на файла с отхвърлените парчета на „ %.*s.rej“"
-#: builtin/apply.c:4075
+#: builtin/apply.c:4141
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "%d-то парче бе успешно приложено."
-#: builtin/apply.c:4078
+#: builtin/apply.c:4144
#, c-format
msgid "Rejected hunk #%d."
msgstr "%d-то парче бе отхвърлено."
-#: builtin/apply.c:4228
+#: builtin/apply.c:4234
msgid "unrecognized input"
msgstr "непознат вход"
-#: builtin/apply.c:4239
+#: builtin/apply.c:4245
msgid "unable to read index file"
msgstr "индексът не може да бъде записан"
-#: builtin/apply.c:4358 builtin/apply.c:4361 builtin/clone.c:90
+#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:91
#: builtin/fetch.c:93
msgid "path"
msgstr "път"
-#: builtin/apply.c:4359
+#: builtin/apply.c:4363
msgid "don't apply changes matching the given path"
msgstr "без прилагане на промените напасващи на дадения път"
-#: builtin/apply.c:4362
+#: builtin/apply.c:4366
msgid "apply changes matching the given path"
msgstr "прилагане на промените напасващи на дадения път"
-#: builtin/apply.c:4364
+#: builtin/apply.c:4368
msgid "num"
msgstr "БРОЙ"
-#: builtin/apply.c:4365
+#: builtin/apply.c:4369
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "премахване на този БРОЙ водещи елементи от пътищата в разликата"
-#: builtin/apply.c:4368
+#: builtin/apply.c:4372
msgid "ignore additions made by the patch"
msgstr "игнориране на редовете добавени от тази кръпка"
-#: builtin/apply.c:4370
+#: builtin/apply.c:4374
msgid "instead of applying the patch, output diffstat for the input"
msgstr "извеждане на статистика на промените без прилагане на кръпката"
-#: builtin/apply.c:4374
+#: builtin/apply.c:4378
msgid "show number of added and deleted lines in decimal notation"
msgstr "извеждане на броя на добавените и изтритите редове"
-#: builtin/apply.c:4376
+#: builtin/apply.c:4380
msgid "instead of applying the patch, output a summary for the input"
msgstr "извеждане на статистика на входните данни без прилагане на кръпката"
-#: builtin/apply.c:4378
+#: builtin/apply.c:4382
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "проверка дали кръпката може да се приложи, без действително прилагане"
-#: builtin/apply.c:4380
+#: builtin/apply.c:4384
msgid "make sure the patch is applicable to the current index"
msgstr "проверка дали кръпката може да бъде приложена към текущия индекс"
-#: builtin/apply.c:4382
+#: builtin/apply.c:4386
msgid "apply a patch without touching the working tree"
msgstr "прилагане на кръпката без промяна на работното дърво"
-#: builtin/apply.c:4384
+#: builtin/apply.c:4388
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
"кръпката да бъде приложена. Опцията се комбинира с „--check“/„--stat“/„--"
"summary“"
-#: builtin/apply.c:4386
+#: builtin/apply.c:4390
msgid "attempt three-way merge if a patch does not apply"
msgstr "пробване с тройно сливане, ако кръпката не може да се приложи директно"
-#: builtin/apply.c:4388
+#: builtin/apply.c:4392
msgid "build a temporary index based on embedded index information"
msgstr ""
"създаване на временен индекс на база на включената информация за индекса"
-#: builtin/apply.c:4390 builtin/checkout-index.c:198 builtin/ls-files.c:455
+#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455
msgid "paths are separated with NUL character"
msgstr "разделяне на пътищата с нулевия знак „NUL“"
-#: builtin/apply.c:4393
+#: builtin/apply.c:4397
msgid "ensure at least <n> lines of context match"
msgstr "да се осигури контекст от поне такъв БРОЙ съвпадащи редове"
-#: builtin/apply.c:4394
+#: builtin/apply.c:4398
msgid "action"
msgstr "действие"
-#: builtin/apply.c:4395
+#: builtin/apply.c:4399
msgid "detect new or modified lines that have whitespace errors"
msgstr "засичане на нови или променени редове с грешки в знаците за интервали"
-#: builtin/apply.c:4398 builtin/apply.c:4401
+#: builtin/apply.c:4402 builtin/apply.c:4405
msgid "ignore changes in whitespace when finding context"
msgstr ""
"игнориране на промените в знаците за интервали при откриване на контекста"
-#: builtin/apply.c:4404
+#: builtin/apply.c:4408
msgid "apply the patch in reverse"
msgstr "прилагане на кръпката в обратна посока"
-#: builtin/apply.c:4406
+#: builtin/apply.c:4410
msgid "don't expect at least one line of context"
msgstr "без изискване на дори и един ред контекст"
-#: builtin/apply.c:4408
+#: builtin/apply.c:4412
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "оставяне на отхвърлените парчета във файлове с разширение „.rej“"
-#: builtin/apply.c:4410
+#: builtin/apply.c:4414
msgid "allow overlapping hunks"
msgstr "позволяване на застъпващи се парчета"
-#: builtin/apply.c:4413
+#: builtin/apply.c:4417
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "пренебрегване на неправилно липсващ знак за нов ред в края на файл"
-#: builtin/apply.c:4416
+#: builtin/apply.c:4420
msgid "do not trust the line counts in the hunk headers"
msgstr "без доверяване на номерата на редовете в заглавните части на парчетата"
-#: builtin/apply.c:4418
+#: builtin/apply.c:4422
msgid "root"
msgstr "НАЧАЛНА_ДИРЕКТОРИЯ"
-#: builtin/apply.c:4419
+#: builtin/apply.c:4423
msgid "prepend <root> to all filenames"
msgstr "добавяне на тази НАЧАЛНА_ДИРЕКТОРИЯ към имената на всички файлове"
-#: builtin/apply.c:4441
+#: builtin/apply.c:4445
msgid "--3way outside a repository"
msgstr "като „--3way“, но извън хранилище"
-#: builtin/apply.c:4449
+#: builtin/apply.c:4453
msgid "--index outside a repository"
msgstr "като „--index“, но извън хранилище"
-#: builtin/apply.c:4452
+#: builtin/apply.c:4456
msgid "--cached outside a repository"
msgstr "като „--cached“, но извън хранилище"
-#: builtin/apply.c:4468
+#: builtin/apply.c:4472
#, c-format
msgid "can't open patch '%s'"
msgstr "кръпката „%s“ не може да бъде отворена"
-#: builtin/apply.c:4482
+#: builtin/apply.c:4486
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "пренебрегната е %d грешка в знаците за интервали"
msgstr[1] "пренебрегнати са %d грешки в знаците за интервали"
-#: builtin/apply.c:4488 builtin/apply.c:4498
+#: builtin/apply.c:4492 builtin/apply.c:4502
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
@@ -2868,7 +2966,7 @@ msgstr ""
#. takes 22 places, is the longest among various forms of
#. relative timestamps, but your language may need more or
#. fewer display columns.
-#: builtin/blame.c:2599
+#: builtin/blame.c:2602
msgid "4 years, 11 months ago"
msgstr "преди 4 години и 11 месеца"
@@ -2888,7 +2986,7 @@ msgstr "git branch [ОПЦИЯ…] [-r] (-d | -D) ИМЕ_НА_КЛОН…"
msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
msgstr "git branch [ОПЦИЯ…] (-m | -M) [СТАР_КЛОН] НОВ_КЛОН"
-#: builtin/branch.c:150
+#: builtin/branch.c:152
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -2897,7 +2995,7 @@ msgstr ""
"изтриване на клона „%s“, който е слят към „%s“,\n"
" но още не е слят към върха „HEAD“."
-#: builtin/branch.c:154
+#: builtin/branch.c:156
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -2906,12 +3004,12 @@ msgstr ""
"отказване на изтриване на клона „%s“, който не е слят към\n"
" „%s“, но е слят към върха „HEAD“."
-#: builtin/branch.c:168
+#: builtin/branch.c:170
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Обектът-подаване за „%s“ не може да бъде открит"
-#: builtin/branch.c:172
+#: builtin/branch.c:174
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -2920,305 +3018,305 @@ msgstr ""
"Клонът „%s“ не е слят напълно. Ако сте сигурни, че искате\n"
"да го изтриете, изпълнете „git branch -D %s“."
-#: builtin/branch.c:185
+#: builtin/branch.c:187
msgid "Update of config-file failed"
msgstr "Неуспешно обновяване на конфигурационния файл"
-#: builtin/branch.c:213
+#: builtin/branch.c:215
msgid "cannot use -a with -d"
msgstr "Опцията „-a“ е несъвместима с опцията „-d“"
-#: builtin/branch.c:219
+#: builtin/branch.c:221
msgid "Couldn't look up commit object for HEAD"
msgstr "Обектът-подаване, сочен от указателя „HEAD“, не може да бъде открит"
-#: builtin/branch.c:227
+#: builtin/branch.c:229
#, c-format
msgid "Cannot delete the branch '%s' which you are currently on."
msgstr "Не можете да изтриете клона „%s“, защото в момента е текущ."
-#: builtin/branch.c:240
+#: builtin/branch.c:245
#, c-format
msgid "remote branch '%s' not found."
msgstr "отдалеченият клон „%s“ не може да бъде открит."
-#: builtin/branch.c:241
+#: builtin/branch.c:246
#, c-format
msgid "branch '%s' not found."
msgstr "клонът „%s“ не може да бъде открит."
-#: builtin/branch.c:255
+#: builtin/branch.c:260
#, c-format
msgid "Error deleting remote branch '%s'"
msgstr "Грешка при изтриването на отдалечения клон „%s“"
-#: builtin/branch.c:256
+#: builtin/branch.c:261
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Грешка при изтриването на клона „%s“"
-#: builtin/branch.c:263
+#: builtin/branch.c:268
#, c-format
msgid "Deleted remote branch %s (was %s).\n"
msgstr "Изтрит отдалечен клон „%s“ (той сочеше към „%s“).\n"
-#: builtin/branch.c:264
+#: builtin/branch.c:269
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Изтрит клон „%s“ (той сочеше към „%s“).\n"
-#: builtin/branch.c:366
+#: builtin/branch.c:370
#, c-format
msgid "branch '%s' does not point at a commit"
msgstr "клонът „%s“ не сочи към подаване"
-#: builtin/branch.c:454
+#: builtin/branch.c:459
#, c-format
msgid "[%s: gone]"
msgstr "[%s: изтрит]"
-#: builtin/branch.c:459
+#: builtin/branch.c:464
#, c-format
msgid "[%s]"
msgstr "[%s]"
-#: builtin/branch.c:464
+#: builtin/branch.c:469
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s: назад с %d]"
-#: builtin/branch.c:466
+#: builtin/branch.c:471
#, c-format
msgid "[behind %d]"
msgstr "[назад с %d]"
-#: builtin/branch.c:470
+#: builtin/branch.c:475
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s: напред с %d]"
-#: builtin/branch.c:472
+#: builtin/branch.c:477
#, c-format
msgid "[ahead %d]"
msgstr "[напред с %d]"
-#: builtin/branch.c:475
+#: builtin/branch.c:480
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s: напред с %d, назад с %d]"
-#: builtin/branch.c:478
+#: builtin/branch.c:483
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[напред с %d, назад с %d]"
# FIXME ** how many??
-#: builtin/branch.c:502
+#: builtin/branch.c:496
msgid " **** invalid ref ****"
msgstr " ●●●● неправилен указател ●●●●"
-#: builtin/branch.c:594
+#: builtin/branch.c:587
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(извън клон, пребазиране на „%s“)"
-#: builtin/branch.c:597
+#: builtin/branch.c:590
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(извън клон, двоично търсене от „%s“)"
-#: builtin/branch.c:600
+#: builtin/branch.c:593
#, c-format
msgid "(detached from %s)"
msgstr "(състояние, несвързано към „%s“)"
-#: builtin/branch.c:603
+#: builtin/branch.c:596
msgid "(no branch)"
msgstr "(извън клон)"
-#: builtin/branch.c:649
+#: builtin/branch.c:643
#, c-format
msgid "object '%s' does not point to a commit"
msgstr "обектът „%s“ не сочи към подаване"
-#: builtin/branch.c:681
+#: builtin/branch.c:691
msgid "some refs could not be read"
msgstr "някои указатели не могат да бъдат прочетени"
-#: builtin/branch.c:694
+#: builtin/branch.c:704
msgid "cannot rename the current branch while not on any."
msgstr ""
"не можете да преименувате текущия клон, защото сте извън който и да е клон"
-#: builtin/branch.c:704
+#: builtin/branch.c:714
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Неправилно име на клон: „%s“"
-#: builtin/branch.c:719
+#: builtin/branch.c:729
msgid "Branch rename failed"
msgstr "Неуспешно преименуване на клон"
-#: builtin/branch.c:723
+#: builtin/branch.c:733
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "На клона с неправилно име „%s“ е дадено служебно име"
-#: builtin/branch.c:727
+#: builtin/branch.c:737
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Клонът е преименуван на „%s“, но указателят „HEAD“ не е обновен"
-#: builtin/branch.c:734
+#: builtin/branch.c:744
msgid "Branch is renamed, but update of config-file failed"
msgstr "Клонът е преименуван, но конфигурационният файл не е обновен"
-#: builtin/branch.c:749
+#: builtin/branch.c:759
#, c-format
msgid "malformed object name %s"
msgstr "неправилно име на обект „%s“"
-#: builtin/branch.c:773
+#: builtin/branch.c:783
#, c-format
msgid "could not write branch description template: %s"
msgstr "шаблонът за описание на клон не бе записан: „%s“"
-#: builtin/branch.c:803
+#: builtin/branch.c:813
msgid "Generic options"
msgstr "Общи настройки"
-#: builtin/branch.c:805
+#: builtin/branch.c:815
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
"извеждане на хеша и темата. Повтарянето на опцията прибавя отдалечените клони"
-#: builtin/branch.c:806
+#: builtin/branch.c:816
msgid "suppress informational messages"
msgstr "без информационни съобщения"
-#: builtin/branch.c:807
+#: builtin/branch.c:817
msgid "set up tracking mode (see git-pull(1))"
msgstr "задаване на режима на следене (виж git-pull(1))"
-#: builtin/branch.c:809
+#: builtin/branch.c:819
msgid "change upstream info"
msgstr "смяна на следения клон"
-#: builtin/branch.c:813
+#: builtin/branch.c:823
msgid "use colored output"
msgstr "цветен изход"
-#: builtin/branch.c:814
+#: builtin/branch.c:824
msgid "act on remote-tracking branches"
msgstr "действие върху следящите клони"
-#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844
-#: builtin/branch.c:850 builtin/commit.c:1573 builtin/commit.c:1574
-#: builtin/commit.c:1575 builtin/commit.c:1576 builtin/tag.c:615
-#: builtin/tag.c:621
+#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854
+#: builtin/branch.c:860 builtin/commit.c:1622 builtin/commit.c:1623
+#: builtin/commit.c:1624 builtin/commit.c:1625 builtin/tag.c:616
+#: builtin/tag.c:622
msgid "commit"
msgstr "подаване"
-#: builtin/branch.c:818 builtin/branch.c:824
+#: builtin/branch.c:828 builtin/branch.c:834
msgid "print only branches that contain the commit"
msgstr "извеждане само на клоните, които съдържат това подаване"
-#: builtin/branch.c:830
+#: builtin/branch.c:840
msgid "Specific git-branch actions:"
msgstr "Специални действия на „git-branch“:"
-#: builtin/branch.c:831
+#: builtin/branch.c:841
msgid "list both remote-tracking and local branches"
msgstr "извеждане както на следящите, така и на локалните клони"
-#: builtin/branch.c:833
+#: builtin/branch.c:843
msgid "delete fully merged branch"
msgstr "изтриване на клони, които са напълно слети"
-#: builtin/branch.c:834
+#: builtin/branch.c:844
msgid "delete branch (even if not merged)"
msgstr "изтриване и на клони, които не са напълно слети"
-#: builtin/branch.c:835
+#: builtin/branch.c:845
msgid "move/rename a branch and its reflog"
msgstr ""
"преместване/преименуване на клон и принадлежащият му журнал на указателите"
-#: builtin/branch.c:836
+#: builtin/branch.c:846
msgid "move/rename a branch, even if target exists"
msgstr "преместване/преименуване на клон, дори ако има вече клон с такова име"
-#: builtin/branch.c:837
+#: builtin/branch.c:847
msgid "list branch names"
msgstr "извеждане на имената на клоните"
-#: builtin/branch.c:838
+#: builtin/branch.c:848
msgid "create the branch's reflog"
msgstr "създаване на журнала на указателите на клона"
-#: builtin/branch.c:840
+#: builtin/branch.c:850
msgid "edit the description for the branch"
msgstr "редактиране на описанието на клона"
-#: builtin/branch.c:841
+#: builtin/branch.c:851
msgid "force creation (when already exists)"
msgstr "принудително създаване, дори ако съществува клон с такова име"
-#: builtin/branch.c:844
+#: builtin/branch.c:854
msgid "print only not merged branches"
msgstr "извеждане само на неслетите клони"
-#: builtin/branch.c:850
+#: builtin/branch.c:860
msgid "print only merged branches"
msgstr "извеждане само на слетите клони"
-#: builtin/branch.c:854
+#: builtin/branch.c:864
msgid "list branches in columns"
msgstr "извеждане по колони"
-#: builtin/branch.c:867
+#: builtin/branch.c:877
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Не може да се открие към какво сочи указателят „HEAD“"
-#: builtin/branch.c:872 builtin/clone.c:636
+#: builtin/branch.c:881 builtin/clone.c:634
msgid "HEAD not found below refs/heads!"
msgstr "В директорията „refs/heads“ липсва файл „HEAD“"
-#: builtin/branch.c:896
+#: builtin/branch.c:903
msgid "--column and --verbose are incompatible"
msgstr "Опциите „--column“ и „--verbose“ са несъвместими"
-#: builtin/branch.c:902 builtin/branch.c:941
+#: builtin/branch.c:909 builtin/branch.c:948
msgid "branch name required"
msgstr "Необходимо е име на клон"
-#: builtin/branch.c:917
+#: builtin/branch.c:924
msgid "Cannot give description to detached HEAD"
msgstr "Не може да зададете описание на „HEAD“ извън клон"
-#: builtin/branch.c:922
+#: builtin/branch.c:929
msgid "cannot edit description of more than one branch"
msgstr "Не може да редактирате описанието на повече от един клон едновременно"
-#: builtin/branch.c:929
+#: builtin/branch.c:936
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "В клона „%s“ все още няма подавания."
-#: builtin/branch.c:932
+#: builtin/branch.c:939
#, c-format
msgid "No branch named '%s'."
msgstr "Липсва клон на име „%s“."
-#: builtin/branch.c:947
+#: builtin/branch.c:954
msgid "too many branches for a rename operation"
msgstr "Прекалено много клони за преименуване"
-#: builtin/branch.c:952
+#: builtin/branch.c:959
msgid "too many branches to set new upstream"
msgstr "Прекалено много клони за задаване на следене"
-#: builtin/branch.c:956
+#: builtin/branch.c:963
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -3226,39 +3324,39 @@ msgstr ""
"Следеното от „HEAD“ не може да се зададе да е „%s“, защото то не сочи към "
"никой клон."
-#: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002
+#: builtin/branch.c:966 builtin/branch.c:988 builtin/branch.c:1009
#, c-format
msgid "no such branch '%s'"
msgstr "Няма клон на име „%s“."
-#: builtin/branch.c:963
+#: builtin/branch.c:970
#, c-format
msgid "branch '%s' does not exist"
msgstr "Не съществува клон на име „%s“."
-#: builtin/branch.c:975
+#: builtin/branch.c:982
msgid "too many branches to unset upstream"
msgstr "Прекалено много клони за махане на следене"
-#: builtin/branch.c:979
+#: builtin/branch.c:986
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"Следеното от „HEAD“ не може да махне, защото то не сочи към никой клон."
-#: builtin/branch.c:985
+#: builtin/branch.c:992
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Няма информация клонът „%s“ да следи някой друг"
-#: builtin/branch.c:999
+#: builtin/branch.c:1006
msgid "it does not make sense to create 'HEAD' manually"
msgstr "Няма никакъв смисъл ръчно да създавате „HEAD“."
-#: builtin/branch.c:1005
+#: builtin/branch.c:1012
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr "Опциите „-a“ и „-r“ на „git branch“ са несъвместими с име на клон"
-#: builtin/branch.c:1008
+#: builtin/branch.c:1015
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -3267,7 +3365,7 @@ msgstr ""
"Опцията „--set-upstream“ вече е остаряла и предстои да бъде махната. "
"Използвайте „--track“ или „--set-upstream-to“\n"
-#: builtin/branch.c:1025
+#: builtin/branch.c:1032
#, c-format
msgid ""
"\n"
@@ -3278,12 +3376,12 @@ msgstr ""
"За да накарате „%s“ да следи „%s“, изпълнете следната команда:\n"
"\n"
-#: builtin/branch.c:1026
+#: builtin/branch.c:1033
#, c-format
msgid " git branch -d %s\n"
msgstr " git branch -d %s\n"
-#: builtin/branch.c:1027
+#: builtin/branch.c:1034
#, c-format
msgid " git branch --set-upstream-to %s\n"
msgstr " git branch --set-upstream-to %s\n"
@@ -3301,48 +3399,48 @@ msgstr "За създаването на пратка е необходимо х
msgid "Need a repository to unbundle."
msgstr "За приемането на пратка е необходимо хранилище."
-#: builtin/cat-file.c:331
+#: builtin/cat-file.c:332
msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
msgstr "git cat-file (-t|-s|-e|-p|ВИД|--textconv) ОБЕКТ"
-#: builtin/cat-file.c:332
+#: builtin/cat-file.c:333
msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
msgstr "git cat-file (--batch|--batch-check) < СПИСЪК_С_ОБЕКТИ"
-#: builtin/cat-file.c:369
+#: builtin/cat-file.c:370
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
"ВИДът може да е: „blob“ (обект BLOB), „tree“ (дърво), „commit“ (подаване), "
"„tag“ (етикет)"
-#: builtin/cat-file.c:370
+#: builtin/cat-file.c:371
msgid "show object type"
msgstr "извеждане на вида на обект"
-#: builtin/cat-file.c:371
+#: builtin/cat-file.c:372
msgid "show object size"
msgstr "извеждане на размера на обект"
-#: builtin/cat-file.c:373
+#: builtin/cat-file.c:374
msgid "exit with zero when there's no error"
msgstr "изход с 0, когато няма грешка"
-#: builtin/cat-file.c:374
+#: builtin/cat-file.c:375
msgid "pretty-print object's content"
msgstr "форматирано извеждане на съдържанието на обекта"
-#: builtin/cat-file.c:376
+#: builtin/cat-file.c:377
msgid "for blob objects, run textconv on object's content"
msgstr ""
"да се стартира програмата зададена в настройката „textconv“ за преобразуване "
"на съдържанието на обекта"
-#: builtin/cat-file.c:378
+#: builtin/cat-file.c:379
msgid "show info and content of objects fed from the standard input"
msgstr ""
"извеждане на информация и съдържание на обектите подадени на стандартния вход"
-#: builtin/cat-file.c:381
+#: builtin/cat-file.c:382
msgid "show info about objects fed from the standard input"
msgstr "извеждане на информация за обектите подадени на стандартния вход"
@@ -3362,7 +3460,7 @@ msgstr "извеждане на всички атрибути, зададени
msgid "use .gitattributes only from the index"
msgstr "използване на файла „.gitattributes“ само от индекса"
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75
+#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
msgid "read file names from stdin"
msgstr "изчитане на имената на файловете от стандартния вход"
@@ -3370,7 +3468,7 @@ msgstr "изчитане на имената на файловете от ста
msgid "terminate input and output records by a NUL character"
msgstr "разделяне на входните и изходните записи с нулевия знак „NUL“"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1083 builtin/gc.c:285
+#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:274
msgid "suppress progress reporting"
msgstr "без показване на напредъка"
@@ -3541,46 +3639,46 @@ msgstr "пътят „%s“ не е слят"
msgid "you need to resolve your current index first"
msgstr "първо трябва да коригирате индекса си"
-#: builtin/checkout.c:591
+#: builtin/checkout.c:597
#, c-format
msgid "Can not do reflog for '%s'\n"
msgstr "Журналът на указателите за „%s“ не може да бъде създаден\n"
-#: builtin/checkout.c:629
+#: builtin/checkout.c:635
msgid "HEAD is now at"
msgstr "Указателят „HEAD“ в момента сочи към"
-#: builtin/checkout.c:636
+#: builtin/checkout.c:642
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Зануляване на клона „%s“\n"
-#: builtin/checkout.c:639
+#: builtin/checkout.c:645
#, c-format
msgid "Already on '%s'\n"
msgstr "Вече сте на „%s“\n"
-#: builtin/checkout.c:643
+#: builtin/checkout.c:649
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Преминаване към клона „%s“ и зануляване на промените\n"
-#: builtin/checkout.c:645 builtin/checkout.c:1026
+#: builtin/checkout.c:651 builtin/checkout.c:1032
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Преминахте към новия клон „%s“\n"
-#: builtin/checkout.c:647
+#: builtin/checkout.c:653
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Преминахте към клона „%s“\n"
-#: builtin/checkout.c:699
+#: builtin/checkout.c:705
#, c-format
msgid " ... and %d more.\n"
msgstr "… и още %d.\n"
-#: builtin/checkout.c:705
+#: builtin/checkout.c:711
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -3602,7 +3700,7 @@ msgstr[1] ""
"\n"
"%s\n"
-#: builtin/checkout.c:723
+#: builtin/checkout.c:729
#, c-format
msgid ""
"If you want to keep them by creating a new branch, this may be a good time\n"
@@ -3617,143 +3715,143 @@ msgstr ""
" git branch ИМЕ_НА_НОВИЯ_КЛОН %s\n"
"\n"
-#: builtin/checkout.c:753
+#: builtin/checkout.c:759
msgid "internal error in revision walk"
msgstr "вътрешна грешка при обхождането на версиите"
-#: builtin/checkout.c:757
+#: builtin/checkout.c:763
msgid "Previous HEAD position was"
msgstr "Преди това „HEAD“ сочеше към"
-#: builtin/checkout.c:784 builtin/checkout.c:1021
+#: builtin/checkout.c:790 builtin/checkout.c:1027
msgid "You are on a branch yet to be born"
msgstr "В момента сте на клон, който предстои да бъде създаден"
-#: builtin/checkout.c:928
+#: builtin/checkout.c:934
#, c-format
msgid "only one reference expected, %d given."
msgstr "очакваше се един указател, а сте подали %d."
-#: builtin/checkout.c:967
+#: builtin/checkout.c:973
#, c-format
msgid "invalid reference: %s"
msgstr "неправилен указател: %s"
-#: builtin/checkout.c:996
+#: builtin/checkout.c:1002
#, c-format
msgid "reference is not a tree: %s"
msgstr "указателят не сочи към обект-дърво: %s"
-#: builtin/checkout.c:1035
+#: builtin/checkout.c:1041
msgid "paths cannot be used with switching branches"
msgstr "задаването на път е несъвместимо с преминаването от един клон към друг"
-#: builtin/checkout.c:1038 builtin/checkout.c:1042
+#: builtin/checkout.c:1044 builtin/checkout.c:1048
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "опцията „%s“ е несъвместима с преминаването от един клон към друг"
-#: builtin/checkout.c:1046 builtin/checkout.c:1049 builtin/checkout.c:1054
-#: builtin/checkout.c:1057
+#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060
+#: builtin/checkout.c:1063
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "опцията „%s“ е несъвместима с „%s“"
-#: builtin/checkout.c:1062
+#: builtin/checkout.c:1068
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
"За да преминете към клон, подайте указател, който сочи към подаване. „%s“ не "
"е такъв"
-#: builtin/checkout.c:1084 builtin/checkout.c:1086 builtin/clone.c:88
+#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:89
#: builtin/remote.c:159 builtin/remote.c:161
msgid "branch"
msgstr "клон"
-#: builtin/checkout.c:1085
+#: builtin/checkout.c:1091
msgid "create and checkout a new branch"
msgstr "създаване и преминаване към нов клон"
-#: builtin/checkout.c:1087
+#: builtin/checkout.c:1093
msgid "create/reset and checkout a branch"
msgstr "създаване/зануляване на клон и преминаване към него"
-#: builtin/checkout.c:1088
+#: builtin/checkout.c:1094
msgid "create reflog for new branch"
msgstr "създаване на журнал на указателите за нов клон"
-#: builtin/checkout.c:1089
+#: builtin/checkout.c:1095
msgid "detach the HEAD at named commit"
msgstr "отделяне на указателя „HEAD“ към указаното подаване"
-#: builtin/checkout.c:1090
+#: builtin/checkout.c:1096
msgid "set upstream info for new branch"
msgstr "задаване на кой клон бива следен при създаването на новия клон"
-#: builtin/checkout.c:1092
+#: builtin/checkout.c:1098
msgid "new-branch"
msgstr "НОВ_КЛОН"
-#: builtin/checkout.c:1092
+#: builtin/checkout.c:1098
msgid "new unparented branch"
msgstr "нов клон без родител"
-#: builtin/checkout.c:1093
+#: builtin/checkout.c:1099
msgid "checkout our version for unmerged files"
msgstr "изтегляне на вашата версия на неслетите файлове"
-#: builtin/checkout.c:1095
+#: builtin/checkout.c:1101
msgid "checkout their version for unmerged files"
msgstr "изтегляне на чуждата версия на неслетите файлове"
-#: builtin/checkout.c:1097
+#: builtin/checkout.c:1103
msgid "force checkout (throw away local modifications)"
msgstr "принудително изтегляне (вашите промени ще бъдат занулени)"
-#: builtin/checkout.c:1098
+#: builtin/checkout.c:1104
msgid "perform a 3-way merge with the new branch"
msgstr "извършване на тройно сливане с новия клон"
-#: builtin/checkout.c:1099 builtin/merge.c:225
+#: builtin/checkout.c:1105 builtin/merge.c:226
msgid "update ignored files (default)"
msgstr "обновяване на игнорираните файлове (стандартно)"
-#: builtin/checkout.c:1100 builtin/log.c:1236 parse-options.h:245
+#: builtin/checkout.c:1106 builtin/log.c:1239 parse-options.h:245
msgid "style"
msgstr "стил"
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1107
msgid "conflict style (merge or diff3)"
msgstr "действие при конфликт (сливане или тройна разлика)"
-#: builtin/checkout.c:1104
+#: builtin/checkout.c:1110
msgid "do not limit pathspecs to sparse entries only"
msgstr "без ограничаване на изброените пътища само до частично изтеглените"
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1112
msgid "second guess 'git checkout no-such-branch'"
msgstr ""
"последващ опит за отгатване след неуспешен опит с „git checkout no-such-"
"branch“"
-#: builtin/checkout.c:1129
+#: builtin/checkout.c:1135
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "Опциите „-b“, „-B“ и „--orphan“ са несъвместими една с друга"
-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1152
msgid "--track needs a branch name"
msgstr "опцията „--track“ изисква име на клон"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1157
msgid "Missing branch name; try -b"
msgstr "Липсва име на клон, използвайте опцията „-b“"
-#: builtin/checkout.c:1190
+#: builtin/checkout.c:1194
msgid "invalid path specification"
msgstr "указан е неправилен път"
-#: builtin/checkout.c:1197
+#: builtin/checkout.c:1201
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -3762,12 +3860,12 @@ msgstr ""
"Не можете едновременно да обновявате пътища и да преминете към клона „%s“.\n"
"Дали не искате да изтеглите „%s“, който не сочи към подаване?"
-#: builtin/checkout.c:1202
+#: builtin/checkout.c:1206
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: опцията „--detach“ не приема аргумент-път „%s“"
-#: builtin/checkout.c:1206
+#: builtin/checkout.c:1210
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -3841,7 +3939,7 @@ msgstr ""
#: builtin/clean.c:517
#, c-format
msgid "Huh (%s)?"
-msgstr "Неправилен избор (%s)"
+msgstr "Неправилен избор (%s). Изберете отново."
# FIXME - should we use >> or sth else
#: builtin/clean.c:659
@@ -3922,7 +4020,7 @@ msgstr "интерактивно изтриване"
msgid "remove whole directories"
msgstr "изтриване на цели директории"
-#: builtin/clean.c:880 builtin/describe.c:406 builtin/grep.c:714
+#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714
#: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185
msgid "pattern"
msgstr "шаблон"
@@ -3960,148 +4058,148 @@ msgstr ""
"което изисква някоя от опциите „-i“, „-n“ или „-f“. Няма да се извърши "
"изчистване"
-#: builtin/clone.c:36
+#: builtin/clone.c:37
msgid "git clone [options] [--] <repo> [<dir>]"
msgstr "git clone [ОПЦИЯ…] [--] ХРАНИЛИЩЕ [ДИРЕКТОРИЯ]"
-#: builtin/clone.c:64 builtin/fetch.c:112 builtin/merge.c:222
-#: builtin/push.c:503
+#: builtin/clone.c:65 builtin/fetch.c:112 builtin/merge.c:223
+#: builtin/push.c:514
msgid "force progress reporting"
msgstr "извеждане на напредъка"
-#: builtin/clone.c:66
+#: builtin/clone.c:67
msgid "don't create a checkout"
msgstr "без създаване на работно дърво"
-#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486
+#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488
msgid "create a bare repository"
msgstr "създаване на голо хранилище"
-#: builtin/clone.c:71
+#: builtin/clone.c:72
msgid "create a mirror repository (implies bare)"
msgstr ""
"създаване на хранилище-огледало (включва опцията „--bare“ за голо хранилище)"
-#: builtin/clone.c:73
+#: builtin/clone.c:74
msgid "to clone from a local repository"
msgstr "клониране от локално хранилище"
-#: builtin/clone.c:75
+#: builtin/clone.c:76
msgid "don't use local hardlinks, always copy"
msgstr "без твърди връзки, файловете винаги да се копират"
-#: builtin/clone.c:77
+#: builtin/clone.c:78
msgid "setup as shared repository"
msgstr "настройване за споделено хранилище"
-#: builtin/clone.c:79 builtin/clone.c:81
+#: builtin/clone.c:80 builtin/clone.c:82
msgid "initialize submodules in the clone"
msgstr "инициализиране на подмодулите при това клониране"
-#: builtin/clone.c:82 builtin/init-db.c:483
+#: builtin/clone.c:83 builtin/init-db.c:485
msgid "template-directory"
msgstr "директория с шаблони"
-#: builtin/clone.c:83 builtin/init-db.c:484
+#: builtin/clone.c:84 builtin/init-db.c:486
msgid "directory from which templates will be used"
msgstr "директория, която съдържа шаблоните, които да се ползват"
-#: builtin/clone.c:85
+#: builtin/clone.c:86
msgid "reference repository"
msgstr "еталонно хранилище"
-#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr "ИМЕ"
-#: builtin/clone.c:87
+#: builtin/clone.c:88
msgid "use <name> instead of 'origin' to track upstream"
msgstr "използване на това ИМЕ вместо „origin“ при проследяване на клони"
-#: builtin/clone.c:89
+#: builtin/clone.c:90
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "изтегляне на този КЛОН, а не соченият от отдалечения указател „HEAD“"
-#: builtin/clone.c:91
+#: builtin/clone.c:92
msgid "path to git-upload-pack on the remote"
msgstr "път към командата „git-upload-pack“ на отдалеченото хранилище"
-#: builtin/clone.c:92 builtin/fetch.c:113 builtin/grep.c:659
+#: builtin/clone.c:93 builtin/fetch.c:113 builtin/grep.c:659
msgid "depth"
msgstr "ДЪЛБОЧИНА"
-#: builtin/clone.c:93
+#: builtin/clone.c:94
msgid "create a shallow clone of that depth"
msgstr "плитко клониране до тази ДЪЛБОЧИНА"
-#: builtin/clone.c:95
+#: builtin/clone.c:96
msgid "clone only one branch, HEAD or --branch"
msgstr ""
"клониране само на един клон — или сочения от отдалечения „HEAD“, или изрично "
"зададения с „--branch“"
-#: builtin/clone.c:96 builtin/init-db.c:492
+#: builtin/clone.c:97 builtin/init-db.c:494
msgid "gitdir"
msgstr "СЛУЖЕБНА_ДИРЕКТОРИЯ"
-#: builtin/clone.c:97 builtin/init-db.c:493
+#: builtin/clone.c:98 builtin/init-db.c:495
msgid "separate git dir from working tree"
msgstr "отделна СЛУЖЕБНА_ДИРЕКТОРИЯ за git извън работното дърво"
-#: builtin/clone.c:98
+#: builtin/clone.c:99
msgid "key=value"
msgstr "КЛЮЧ=СТОЙНОСТ"
-#: builtin/clone.c:99
+#: builtin/clone.c:100
msgid "set config inside the new repository"
msgstr "задаване на настройките на новото хранилище"
-#: builtin/clone.c:252
+#: builtin/clone.c:253
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "еталонното хранилище „%s“ не е локално"
-#: builtin/clone.c:256
+#: builtin/clone.c:257
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "еталонното хранилище „%s“ е плитко"
-#: builtin/clone.c:259
+#: builtin/clone.c:260
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "еталонното хранилище „%s“ е с присаждане"
-#: builtin/clone.c:321
+#: builtin/clone.c:322
#, c-format
msgid "failed to create directory '%s'"
msgstr "директорията „%s“ не може да бъде създадена"
-#: builtin/clone.c:323 builtin/diff.c:83
+#: builtin/clone.c:324 builtin/diff.c:84
#, c-format
msgid "failed to stat '%s'"
msgstr "не може да бъде получена информация чрез „stat“ за „%s“"
-#: builtin/clone.c:325
+#: builtin/clone.c:326
#, c-format
msgid "%s exists and is not a directory"
msgstr "„%s“ съществува и не е директория"
-#: builtin/clone.c:339
+#: builtin/clone.c:340
#, c-format
msgid "failed to stat %s\n"
msgstr "не може да бъде получена информация чрез „stat“ за „%s“\n"
-#: builtin/clone.c:361
+#: builtin/clone.c:362
#, c-format
msgid "failed to create link '%s'"
msgstr "връзката „%s“ не може да бъде създадена"
-#: builtin/clone.c:365
+#: builtin/clone.c:366
#, c-format
msgid "failed to copy file to '%s'"
msgstr "файлът не може да бъде копиран като „%s“"
-#: builtin/clone.c:388 builtin/clone.c:565
+#: builtin/clone.c:389 builtin/clone.c:563
#, c-format
msgid "done.\n"
msgstr "действието завърши.\n"
@@ -4117,7 +4215,7 @@ msgstr ""
"клон в момента са изтеглени с командата „git status“. Можете да\n"
"завършите изтеглянето на клона с командата „git checkout -f HEAD“.\n"
-#: builtin/clone.c:480
+#: builtin/clone.c:478
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
@@ -4125,107 +4223,107 @@ msgstr ""
"и който следва да бъде изтеглен, не съществува."
# FIXME translator note that the space at end is necesssary
-#: builtin/clone.c:560
+#: builtin/clone.c:558
#, c-format
msgid "Checking connectivity... "
msgstr "Проверка на връзката… "
-#: builtin/clone.c:563
+#: builtin/clone.c:561
msgid "remote did not send all necessary objects"
msgstr "отдалеченото хранилище не изпрати всички необходими обекти."
-#: builtin/clone.c:627
+#: builtin/clone.c:625
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"указателят „HEAD“ от отдалеченото хранилище сочи към нещо,\n"
"което не съществува. Не може да се изтегли определен клон.\n"
-#: builtin/clone.c:658
+#: builtin/clone.c:656
msgid "unable to checkout working tree"
msgstr "работното дърво не може да бъде подготвено"
-#: builtin/clone.c:768
+#: builtin/clone.c:765
msgid "Too many arguments."
msgstr "Прекалено много аргументи."
-#: builtin/clone.c:772
+#: builtin/clone.c:769
msgid "You must specify a repository to clone."
msgstr "Трябва да укажете кое хранилище искате да клонирате."
-#: builtin/clone.c:783
+#: builtin/clone.c:780
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "опциите „--bare“ и „--origin %s“ са несъвместими."
-#: builtin/clone.c:786
+#: builtin/clone.c:783
msgid "--bare and --separate-git-dir are incompatible."
msgstr "опциите „--bare“ и „--separate-git-dir“ са несъвместими."
-#: builtin/clone.c:799
+#: builtin/clone.c:796
#, c-format
msgid "repository '%s' does not exist"
msgstr "не съществува хранилище „%s“"
-#: builtin/clone.c:805 builtin/fetch.c:1143
+#: builtin/clone.c:802 builtin/fetch.c:1155
#, c-format
msgid "depth %s is not a positive number"
msgstr "дълбочината трябва да е положително цяло число, а не „%s“"
-#: builtin/clone.c:815
+#: builtin/clone.c:812
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "целевият път „%s“ съществува и не е празна директория."
-#: builtin/clone.c:825
+#: builtin/clone.c:822
#, c-format
msgid "working tree '%s' already exists."
msgstr "в „%s“ вече съществува работно дърво."
-#: builtin/clone.c:838 builtin/clone.c:850
+#: builtin/clone.c:835 builtin/clone.c:847
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "родителските директории на „%s“ не могат да бъдат създадени"
-#: builtin/clone.c:841
+#: builtin/clone.c:838
#, c-format
msgid "could not create work tree dir '%s'."
msgstr "работното дърво в „%s“ не може да бъде създадено."
-#: builtin/clone.c:860
+#: builtin/clone.c:857
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Клониране и създаване на голо хранилище в „%s“…\n"
-#: builtin/clone.c:862
+#: builtin/clone.c:859
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Клониране и създаване на хранилище в „%s“…\n"
-#: builtin/clone.c:898
+#: builtin/clone.c:895
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опцията „--depth“ се игнорира. Ползвайте схемата "
"„file://“."
-#: builtin/clone.c:901
+#: builtin/clone.c:898
msgid "source repository is shallow, ignoring --local"
msgstr "клонираното хранилище е плитко, затова опцията „--local“ се игнорира"
-#: builtin/clone.c:906
+#: builtin/clone.c:903
msgid "--local is ignored"
msgstr "опцията „--local“ се игнорира"
-#: builtin/clone.c:910
+#: builtin/clone.c:907
#, c-format
msgid "Don't know how to clone %s"
msgstr "Не се поддържа клониране на връзки от вида „%s“ "
-#: builtin/clone.c:961 builtin/clone.c:969
+#: builtin/clone.c:958 builtin/clone.c:966
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Отдалеченият клон „%s“ липсва в клонираното хранилище „%s“"
-#: builtin/clone.c:972
+#: builtin/clone.c:969
msgid "You appear to have cloned an empty repository."
msgstr "Изглежда клонирахте празно хранилище."
@@ -4261,15 +4359,43 @@ msgstr "Поле в знаци между колоните"
msgid "--command must be the first argument"
msgstr "опцията „--command“ трябва да е първият аргумент"
-#: builtin/commit.c:36
+#: builtin/commit.c:37
msgid "git commit [options] [--] <pathspec>..."
msgstr "git commit [ОПЦИЯ…] [--] ПЪТ…"
-#: builtin/commit.c:41
+#: builtin/commit.c:42
msgid "git status [options] [--] <pathspec>..."
msgstr "git status [ОПЦИЯ…] [--] ПЪТ…"
-#: builtin/commit.c:46
+#: builtin/commit.c:47
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+" git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+" git commit --amend --reset-author\n"
+msgstr ""
+"Името и адресът за е-поща са настроени автоматично на базата на името на\n"
+"потребителя и името на машината. Проверете дали са верни. Можете да спрете\n"
+"това съобщение като изрично зададете стойностите. Изпълнете следната "
+"команда\n"
+"и следвайте инструкциите в текстовия ви редактор, за да редактирате\n"
+"конфигурационния файл:\n"
+"\n"
+" git config --global --edit\n"
+"\n"
+"След като направите това, можете да коригирате информацията за автора на\n"
+"текущото подаване чрез:\n"
+"\n"
+" git commit --amend --reset-author\n"
+
+#: builtin/commit.c:60
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4294,7 +4420,7 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: builtin/commit.c:58
+#: builtin/commit.c:72
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"
@@ -4306,7 +4432,7 @@ msgstr ""
"с опцията „--allow-empty“, или да го изтриете от историята с командата:\n"
"„git reset HEAD^“.\n"
-#: builtin/commit.c:63
+#: builtin/commit.c:77
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -4321,11 +4447,11 @@ msgstr ""
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:70
+#: builtin/commit.c:84
msgid "Otherwise, please use 'git reset'\n"
msgstr "В противен случай използвайте командата „git reset“\n"
-#: builtin/commit.c:73
+#: builtin/commit.c:87
msgid ""
"If you wish to skip this commit, use:\n"
"\n"
@@ -4341,58 +4467,75 @@ msgstr ""
"Чрез командата „git cherry-pick --continue“ ще продължите отбирането на\n"
"останалите подавания.\n"
-#: builtin/commit.c:288
+#: builtin/commit.c:302
msgid "failed to unpack HEAD tree object"
-msgstr "неуспешно изваждана на върховото дърво (HEAD tree object) от пакет"
+msgstr "върховото дърво (HEAD tree object) не може да бъде извадено от пакет"
-#: builtin/commit.c:328
+#: builtin/commit.c:342
msgid "unable to create temporary index"
-msgstr "неуспешно създаване на временен индекс"
+msgstr "временният индекс не може да бъде създаден"
-#: builtin/commit.c:334
+#: builtin/commit.c:348
msgid "interactive add failed"
msgstr "неуспешно интерактивно добавяне"
-#: builtin/commit.c:366 builtin/commit.c:387 builtin/commit.c:435
+#: builtin/commit.c:359
+msgid "unable to write index file"
+msgstr "индексът не може да бъде записан"
+
+#: builtin/commit.c:361
+msgid "unable to update temporary index"
+msgstr "временният индекс не може да бъде обновен"
+
+#: builtin/commit.c:363
+msgid "Failed to update main cache tree"
+msgstr "Дървото на основния кеш не може да бъде обновено"
+
+#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461
msgid "unable to write new_index file"
-msgstr "неуспешен запис на новия индекс"
+msgstr "новият индекс не може да бъде записан"
-#: builtin/commit.c:418
+#: builtin/commit.c:443
msgid "cannot do a partial commit during a merge."
msgstr "по време на сливане не може да се извърши частично подаване."
-#: builtin/commit.c:420
+#: builtin/commit.c:445
msgid "cannot do a partial commit during a cherry-pick."
msgstr "по време на отбиране не може да се извърши частично подаване."
-#: builtin/commit.c:429
+#: builtin/commit.c:454
msgid "cannot read the index"
msgstr "индексът не може да бъде прочетен"
-#: builtin/commit.c:447
+#: builtin/commit.c:473
msgid "unable to write temporary index file"
msgstr "временният индекс не може да бъде записан"
-#: builtin/commit.c:557 builtin/commit.c:563
+#: builtin/commit.c:592
+#, c-format
+msgid "commit '%s' lacks author header"
+msgstr "заглавната част за автор в подаването „%s“ липсва"
+
+#: builtin/commit.c:594
#, c-format
-msgid "invalid commit: %s"
-msgstr "неправилно подаване: %s"
+msgid "commit '%s' has malformed author line"
+msgstr "заглавната част за автор в подаването „%s“ е неправилна"
-#: builtin/commit.c:585
+#: builtin/commit.c:613
msgid "malformed --author parameter"
msgstr "неправилен параметър към опцията „--author“"
-#: builtin/commit.c:592
+#: builtin/commit.c:621
#, c-format
msgid "invalid date format: %s"
msgstr "неправилен формат на дата: %s"
-#: builtin/commit.c:609
+#: builtin/commit.c:642
#, c-format
msgid "Malformed ident string: '%s'"
msgstr "Неправилен низ за идентичност: „%s“"
-#: builtin/commit.c:642
+#: builtin/commit.c:675
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -4400,44 +4543,44 @@ msgstr ""
"не може да се избере знак за коментар — в текущото съобщение за подаване са "
"използвани всички подобни знаци"
-#: builtin/commit.c:679 builtin/commit.c:712 builtin/commit.c:1086
+#: builtin/commit.c:712 builtin/commit.c:745 builtin/commit.c:1120
#, c-format
msgid "could not lookup commit %s"
msgstr "следното подаване не може да бъде открито: %s"
-#: builtin/commit.c:691 builtin/shortlog.c:273
+#: builtin/commit.c:724 builtin/shortlog.c:273
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(изчитане на съобщението за подаване от стандартния вход)\n"
-#: builtin/commit.c:693
+#: builtin/commit.c:726
msgid "could not read log from standard input"
msgstr "съобщението за подаване не бе прочетено стандартния вход"
-#: builtin/commit.c:697
+#: builtin/commit.c:730
#, c-format
msgid "could not read log file '%s'"
msgstr "файлът със съобщението за подаване „%s“ не може да бъде прочетен"
-#: builtin/commit.c:719
+#: builtin/commit.c:752
msgid "could not read MERGE_MSG"
msgstr "съобщението за сливане MERGE_MSG не може да бъде прочетено"
-#: builtin/commit.c:723
+#: builtin/commit.c:756
msgid "could not read SQUASH_MSG"
msgstr "съобщението за смачкване SQUASH_MSG не може да бъде прочетено"
-#: builtin/commit.c:727
+#: builtin/commit.c:760
#, c-format
msgid "could not read '%s'"
msgstr "файлът „%s“ не може да бъде прочетен"
-#: builtin/commit.c:798
+#: builtin/commit.c:831
msgid "could not write commit template"
msgstr "шаблонът за подаване не може да бъде запазен"
# FIXME
-#: builtin/commit.c:816
+#: builtin/commit.c:849
#, c-format
msgid ""
"\n"
@@ -4453,7 +4596,7 @@ msgstr ""
"и опитайте отново.\n"
# FIXME
-#: builtin/commit.c:821
+#: builtin/commit.c:854
#, c-format
msgid ""
"\n"
@@ -4469,7 +4612,7 @@ msgstr ""
" %s\n"
"и опитайте отново.\n"
-#: builtin/commit.c:834
+#: builtin/commit.c:867
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -4478,7 +4621,7 @@ msgstr ""
"Въведете съобщението за подаване на промените. Редовете, които започват\n"
"с „%c“, ще бъдат пропуснати, а празно съобщение преустановява подаването.\n"
-#: builtin/commit.c:841
+#: builtin/commit.c:874
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -4489,155 +4632,158 @@ msgstr ""
"с „%c“, също ще бъдат включени — може да ги изтриете вие. Празно \n"
"съобщение преустановява подаването.\n"
-#: builtin/commit.c:855
+#: builtin/commit.c:888
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sАвтор: %.*s <%.*s>"
-#: builtin/commit.c:863
+#: builtin/commit.c:896
#, c-format
msgid "%sDate: %s"
msgstr "%sДата: %s"
-#: builtin/commit.c:870
+#: builtin/commit.c:903
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sПодаващ: %.*s <%.*s>"
-#: builtin/commit.c:888
+#: builtin/commit.c:921
msgid "Cannot read index"
msgstr "Индексът не може да бъде прочетен"
-#: builtin/commit.c:945
+#: builtin/commit.c:978
msgid "Error building trees"
msgstr "Грешка при изграждане на дърветата"
-#: builtin/commit.c:960 builtin/tag.c:495
+#: builtin/commit.c:993 builtin/tag.c:495
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Подайте съобщението с някоя от опциите „-m“ или „-F“.\n"
-#: builtin/commit.c:1061
+#: builtin/commit.c:1095
#, c-format
msgid "No existing author found with '%s'"
msgstr "Не е открит автор с име „%s“."
-#: builtin/commit.c:1076 builtin/commit.c:1316
+#: builtin/commit.c:1110 builtin/commit.c:1350
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Неправилна стойност за неследените файлове: „%s“"
-#: builtin/commit.c:1113
+#: builtin/commit.c:1147
msgid "--long and -z are incompatible"
msgstr "Опциите „--long“ и „-z“ са несъвместими."
-#: builtin/commit.c:1143
+#: builtin/commit.c:1177
msgid "Using both --reset-author and --author does not make sense"
msgstr "Опциите „--reset-author“ и „--author“ са несъвместими."
-#: builtin/commit.c:1152
+#: builtin/commit.c:1186
msgid "You have nothing to amend."
msgstr "Няма какво да бъде поправено."
-#: builtin/commit.c:1155
+#: builtin/commit.c:1189
msgid "You are in the middle of a merge -- cannot amend."
msgstr "В момента се извършва сливане, не можете да поправяте."
-#: builtin/commit.c:1157
+#: builtin/commit.c:1191
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "В момента се извършва отбиране на подаване, не можете да поправяте."
-#: builtin/commit.c:1160
+#: builtin/commit.c:1194
msgid "Options --squash and --fixup cannot be used together"
msgstr "Опциите „--squash“ и „--fixup“ са несъвместими."
-#: builtin/commit.c:1170
+#: builtin/commit.c:1204
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Опциите „-c“, „-C“, „-F“ и „--fixup““ са несъвместими."
-#: builtin/commit.c:1172
+#: builtin/commit.c:1206
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "Опцията „-m“ е несъвместима с „-c“, „-C“, „-F“ и „--fixup“."
-#: builtin/commit.c:1180
+#: builtin/commit.c:1214
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
"Опцията „--reset-author“ може да се използва само заедно с „-C“, „-c“ или\n"
"„--amend“."
-#: builtin/commit.c:1197
+#: builtin/commit.c:1231
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Опциите „--include“, „--only“, „--all“, „--interactive“ и „--patch“ са\n"
"несъвместими."
-#: builtin/commit.c:1199
+#: builtin/commit.c:1233
msgid "No paths with --include/--only does not make sense."
msgstr "Опциите „--include“ и „--only“ изискват аргументи."
# FIXME bad message
-#: builtin/commit.c:1201
+#: builtin/commit.c:1235
msgid "Clever... amending the last one with dirty index."
msgstr ""
-"Поправяте последното подаване докато индексът има проблеми. Това е лоша идея."
+"Чудесно сте се сетили как да поправите съобщението на последното подаване "
+"при\n"
+"променен индекс. Споделете и с друг потребител трика с „git commit --amend -"
+"o“."
-#: builtin/commit.c:1203
+#: builtin/commit.c:1237
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr ""
"Зададени са изрични пътища без опциите „-i“ или „-o“. Приема се, че все едно "
"сте\n"
"ползвали опцията „--only“ с ПЪТища…"
-#: builtin/commit.c:1215 builtin/tag.c:727
+#: builtin/commit.c:1249 builtin/tag.c:728
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Несъществуващ режим на изчистване „%s“"
-#: builtin/commit.c:1220
+#: builtin/commit.c:1254
msgid "Paths with -a does not make sense."
msgstr "Опцията „-a“ е несъвместима със задаването на пътища."
-#: builtin/commit.c:1330 builtin/commit.c:1595
+#: builtin/commit.c:1364 builtin/commit.c:1644
msgid "show status concisely"
msgstr "кратка информация за състоянието"
-#: builtin/commit.c:1332 builtin/commit.c:1597
+#: builtin/commit.c:1366 builtin/commit.c:1646
msgid "show branch information"
msgstr "информация за клоните"
-#: builtin/commit.c:1334 builtin/commit.c:1599 builtin/push.c:489
+#: builtin/commit.c:1368 builtin/commit.c:1648 builtin/push.c:500
msgid "machine-readable output"
msgstr "формат на изхода за четене от програма"
-#: builtin/commit.c:1337 builtin/commit.c:1601
+#: builtin/commit.c:1371 builtin/commit.c:1650
msgid "show status in long format (default)"
msgstr "подробна информация за състоянието (стандартно)"
-#: builtin/commit.c:1340 builtin/commit.c:1604
+#: builtin/commit.c:1374 builtin/commit.c:1653
msgid "terminate entries with NUL"
msgstr "разделяне на елементите с нулевия знак „NUL“"
-#: builtin/commit.c:1342 builtin/commit.c:1607 builtin/fast-export.c:703
-#: builtin/fast-export.c:706 builtin/tag.c:602
+#: builtin/commit.c:1376 builtin/commit.c:1656 builtin/fast-export.c:980
+#: builtin/fast-export.c:983 builtin/tag.c:603
msgid "mode"
msgstr "режим"
-#: builtin/commit.c:1343 builtin/commit.c:1607
+#: builtin/commit.c:1377 builtin/commit.c:1656
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"извеждане на неследените файлове. Възможните режими са „all“ (подробна\n"
"информация), „normal“ (кратка информация), „no“ (без неследените файлове).\n"
"Стандартният режим е: „all“."
-#: builtin/commit.c:1346
+#: builtin/commit.c:1380
msgid "show ignored files"
msgstr "извеждане на игнорираните файлове"
-#: builtin/commit.c:1347 parse-options.h:153
+#: builtin/commit.c:1381 parse-options.h:153
msgid "when"
msgstr "кога"
-#: builtin/commit.c:1348
+#: builtin/commit.c:1382
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -4646,224 +4792,216 @@ msgstr ""
"една от\n"
"„all“ (всички), „dirty“ (тези с неподадени промени), „untracked“ (неследени)"
-#: builtin/commit.c:1350
+#: builtin/commit.c:1384
msgid "list untracked files in columns"
msgstr "извеждане на неследените файлове в колони"
-#: builtin/commit.c:1419
+#: builtin/commit.c:1471
msgid "couldn't look up newly created commit"
msgstr "току що създаденото подаване не може да бъде открито"
-#: builtin/commit.c:1421
+#: builtin/commit.c:1473
msgid "could not parse newly created commit"
msgstr "току що създаденото подаване не може да бъде анализирано"
-#: builtin/commit.c:1469
+#: builtin/commit.c:1518
msgid "detached HEAD"
msgstr "несвързан връх „HEAD“"
-#: builtin/commit.c:1471
+#: builtin/commit.c:1521
msgid " (root-commit)"
msgstr " (начално подаване)"
-#: builtin/commit.c:1565
+#: builtin/commit.c:1614
msgid "suppress summary after successful commit"
msgstr "без информация след успешно подаване"
-#: builtin/commit.c:1566
+#: builtin/commit.c:1615
msgid "show diff in commit message template"
msgstr "добавяне на разликата към шаблона за съобщението при подаване"
-#: builtin/commit.c:1568
+#: builtin/commit.c:1617
msgid "Commit message options"
msgstr "Опции за съобщението при подаване"
-#: builtin/commit.c:1569 builtin/tag.c:600
+#: builtin/commit.c:1618 builtin/tag.c:601
msgid "read message from file"
msgstr "взимане на съобщението от файл"
-#: builtin/commit.c:1570
+#: builtin/commit.c:1619
msgid "author"
msgstr "автор"
-#: builtin/commit.c:1570
+#: builtin/commit.c:1619
msgid "override author for commit"
msgstr "задаване на автор за подаването"
-#: builtin/commit.c:1571 builtin/gc.c:286
+#: builtin/commit.c:1620 builtin/gc.c:275
msgid "date"
msgstr "дата"
-#: builtin/commit.c:1571
+#: builtin/commit.c:1620
msgid "override date for commit"
msgstr "задаване на дата за подаването"
-#: builtin/commit.c:1572 builtin/merge.c:216 builtin/notes.c:409
-#: builtin/notes.c:566 builtin/tag.c:598
+#: builtin/commit.c:1621 builtin/merge.c:217 builtin/notes.c:408
+#: builtin/notes.c:565 builtin/tag.c:599
msgid "message"
msgstr "съобщение"
-#: builtin/commit.c:1572
+#: builtin/commit.c:1621
msgid "commit message"
msgstr "съобщение при подаване"
-#: builtin/commit.c:1573
+#: builtin/commit.c:1622
msgid "reuse and edit message from specified commit"
msgstr "преизползване и редактиране на съобщението от указаното подаване"
-#: builtin/commit.c:1574
+#: builtin/commit.c:1623
msgid "reuse message from specified commit"
msgstr "преизползване на съобщението от указаното подаване"
-#: builtin/commit.c:1575
+#: builtin/commit.c:1624
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"използване на автоматичното съобщение при смачкване за вкарване на "
"указаното\n"
"подаване в предното без следа"
-#: builtin/commit.c:1576
+#: builtin/commit.c:1625
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"използване на автоматичното съобщение при смачкване за смачкване на "
"указаното\n"
"подаване в предното"
-#: builtin/commit.c:1577
+#: builtin/commit.c:1626
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
"смяна на автора да съвпада с подаващия (използва се с „-C“/„-c“/„--amend“)"
-#: builtin/commit.c:1578 builtin/log.c:1188 builtin/revert.c:86
+#: builtin/commit.c:1627 builtin/log.c:1191 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "добавяне на поле за подпис — „Signed-off-by:“"
-#: builtin/commit.c:1579
+#: builtin/commit.c:1628
msgid "use specified template file"
msgstr "използване на указания шаблонен файл"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1629
msgid "force edit of commit"
msgstr "редактиране на подаване"
-#: builtin/commit.c:1581
+#: builtin/commit.c:1630
msgid "default"
msgstr "стандартно"
-#: builtin/commit.c:1581 builtin/tag.c:603
+#: builtin/commit.c:1630 builtin/tag.c:604
msgid "how to strip spaces and #comments from message"
msgstr "кои празни знаци и #коментари да се махат от съобщенията"
-#: builtin/commit.c:1582
+#: builtin/commit.c:1631
msgid "include status in commit message template"
msgstr "вмъкване на състоянието в шаблона за съобщението при подаване"
-#: builtin/commit.c:1583 builtin/merge.c:223 builtin/revert.c:92
-#: builtin/tag.c:604
+#: builtin/commit.c:1632 builtin/merge.c:224 builtin/revert.c:92
+#: builtin/tag.c:605
msgid "key-id"
msgstr "ИДЕНТИФИКАТОР_НА_КЛЮЧ"
-#: builtin/commit.c:1584 builtin/merge.c:224 builtin/revert.c:93
+#: builtin/commit.c:1633 builtin/merge.c:225 builtin/revert.c:93
msgid "GPG sign commit"
msgstr "подписване на подаването с GPG"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1636
msgid "Commit contents options"
msgstr "Опции за избор на файлове при подаване"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1637
msgid "commit all changed files"
msgstr "подаване на всички променени файлове"
-#: builtin/commit.c:1589
+#: builtin/commit.c:1638
msgid "add specified files to index for commit"
msgstr "добавяне на указаните файлове към индекса за подаване"
-#: builtin/commit.c:1590
+#: builtin/commit.c:1639
msgid "interactively add files"
msgstr "интерактивно добавяне на файлове"
-#: builtin/commit.c:1591
+#: builtin/commit.c:1640
msgid "interactively add changes"
msgstr "интерактивно добавяне на промени"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1641
msgid "commit only specified files"
msgstr "подаване само на указаните файлове"
-#: builtin/commit.c:1593
+#: builtin/commit.c:1642
msgid "bypass pre-commit hook"
msgstr "без изпълнение на куката преди подаване (pre-commit)"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1643
msgid "show what would be committed"
msgstr "отпечатване на това, което би било подадено"
-#: builtin/commit.c:1605
+#: builtin/commit.c:1654
msgid "amend previous commit"
msgstr "поправяне на предишното подаване"
-#: builtin/commit.c:1606
+#: builtin/commit.c:1655
msgid "bypass post-rewrite hook"
msgstr "без изпълнение на куката след презаписване (post-rewrite)"
-#: builtin/commit.c:1611
+#: builtin/commit.c:1660
msgid "ok to record an empty change"
msgstr "позволяване на празни подавания"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1662
msgid "ok to record a change with an empty message"
msgstr "позволяване на подавания с празни съобщения"
-#: builtin/commit.c:1641
+#: builtin/commit.c:1691
msgid "could not parse HEAD commit"
msgstr "върховото подаване „HEAD“ не може да бъде прочетено"
-#: builtin/commit.c:1680 builtin/merge.c:518
+#: builtin/commit.c:1730 builtin/merge.c:518
#, c-format
msgid "could not open '%s' for reading"
msgstr "файлът не може да бъде прочетен: „%s“"
-#: builtin/commit.c:1687
+#: builtin/commit.c:1737
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Повреден файл за върха за сливането „MERGE_HEAD“ (%s)"
-#: builtin/commit.c:1694
+#: builtin/commit.c:1744
msgid "could not read MERGE_MODE"
msgstr "режимът на сливане „MERGE_MODE“ не може да бъде прочетен"
-#: builtin/commit.c:1713
+#: builtin/commit.c:1763
#, c-format
msgid "could not read commit message: %s"
msgstr "съобщението за подаване не може да бъде прочетено: %s"
-#: builtin/commit.c:1724
+#: builtin/commit.c:1774
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Неизвършване на подаване поради нередактирано съобщение.\n"
-#: builtin/commit.c:1729
+#: builtin/commit.c:1779
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Неизвършване на подаване поради празно съобщение.\n"
-#: builtin/commit.c:1744 builtin/merge.c:851 builtin/merge.c:876
+#: builtin/commit.c:1794 builtin/merge.c:850 builtin/merge.c:875
msgid "failed to write commit object"
msgstr "обектът за подаването не може да бъде записан"
-#: builtin/commit.c:1756
-msgid "cannot lock HEAD ref"
-msgstr "указателят към върха „HEAD“ не може да бъде заключен"
-
-#: builtin/commit.c:1769
-msgid "cannot update HEAD ref"
-msgstr "указателят към върха „HEAD“ не може да бъде обновен"
-
-#: builtin/commit.c:1780
+#: builtin/commit.c:1827
msgid ""
"Repository has been updated, but unable to write\n"
-"new_index file. Check that disk is not full or quota is\n"
+"new_index file. Check that disk is not full and quota is\n"
"not exceeded, and then \"git reset HEAD\" to recover."
msgstr ""
"Хранилището е обновено, но новият файл за индекс „new_index“\n"
@@ -5004,64 +5142,88 @@ msgstr "разделяне на стойностите с нулевия зна
msgid "respect include directives on lookup"
msgstr "при търсене да се уважат и директивите за включване"
-#: builtin/count-objects.c:82
+#: builtin/config.c:315
+msgid "unable to parse default color value"
+msgstr "неразпозната стойност на стандартния цвят"
+
+#: builtin/config.c:455
+#, c-format
+msgid ""
+"# This is Git's per-user configuration file.\n"
+"[core]\n"
+"# Please adapt and uncomment the following lines:\n"
+"#\tuser = %s\n"
+"#\temail = %s\n"
+msgstr ""
+"# Това е потребителският ви конфигурационен файл за Git.\n"
+"[core]\n"
+"# Проверете и разкоментирайте следните два реда:\n"
+"#\tuser = %s\n"
+"#\temail = %s\n"
+
+#: builtin/config.c:590
+#, c-format
+msgid "cannot create configuration file %s"
+msgstr "конфигурационният файл „%s“ не може да бъде създаден"
+
+#: builtin/count-objects.c:55
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:97
+#: builtin/count-objects.c:65
msgid "print sizes in human readable format"
msgstr "извеждане на размерите на обектите във формат лесно четим от хора"
# FIXME ... instead of *???
-#: builtin/describe.c:16
+#: builtin/describe.c:17
msgid "git describe [options] <commit-ish>*"
msgstr "git describe [ОПЦИЯ…] УКАЗАТЕЛ_КЪМ_ПОДАВАНЕ…"
-#: builtin/describe.c:17
+#: builtin/describe.c:18
msgid "git describe [options] --dirty"
msgstr "git describe [ОПЦИЯ…] --dirty"
-#: builtin/describe.c:216
+#: builtin/describe.c:217
#, c-format
msgid "annotated tag %s not available"
msgstr "не съществува анотиран етикет „%s“"
-#: builtin/describe.c:220
+#: builtin/describe.c:221
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "в анотирания етикет „%s“ липсва вградено име"
-#: builtin/describe.c:222
+#: builtin/describe.c:223
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "етикетът „%s“ тук е всъщност „%s“"
-#: builtin/describe.c:249
+#: builtin/describe.c:250 builtin/log.c:452
#, c-format
msgid "Not a valid object name %s"
msgstr "Неправилно име на обект „%s“"
-#: builtin/describe.c:252
+#: builtin/describe.c:253
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "„%s“ е неправилен обект „%s“"
-#: builtin/describe.c:269
+#: builtin/describe.c:270
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "никой етикет не напасва точно „%s“"
-#: builtin/describe.c:271
+#: builtin/describe.c:272
#, c-format
msgid "searching to describe %s\n"
msgstr "търсене за описание на „%s“\n"
-#: builtin/describe.c:318
+#: builtin/describe.c:319
#, c-format
msgid "finished search at %s\n"
msgstr "търсенето приключи при „%s“\n"
-#: builtin/describe.c:345
+#: builtin/describe.c:346
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -5070,7 +5232,7 @@ msgstr ""
"Никой анотиран етикет не описва „%s“.\n"
"Съществуват и неанотирани етикети. Пробвайте с опцията „--tags“."
-#: builtin/describe.c:349
+#: builtin/describe.c:350
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -5080,12 +5242,12 @@ msgstr ""
"Пробвайте с опцията „--always“ или създайте етикети."
# FIXME - plural
-#: builtin/describe.c:370
+#: builtin/describe.c:371
#, c-format
msgid "traversed %lu commits\n"
msgstr "претърсени са %lu подавания\n"
-#: builtin/describe.c:373
+#: builtin/describe.c:374
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -5094,145 +5256,149 @@ msgstr ""
"открити са над %i етикета, изведени са последните %i,\n"
"търсенето бе прекратено при „%s“.\n"
-#: builtin/describe.c:395
+#: builtin/describe.c:396
msgid "find the tag that comes after the commit"
msgstr "откриване на етикета, който следва подаване"
-#: builtin/describe.c:396
+#: builtin/describe.c:397
msgid "debug search strategy on stderr"
msgstr ""
"извеждане на информация за трасиране на стратегията за търсене на "
"стандартната грешка"
-#: builtin/describe.c:397
+#: builtin/describe.c:398
msgid "use any ref"
msgstr "използване на произволен указател"
-#: builtin/describe.c:398
+#: builtin/describe.c:399
msgid "use any tag, even unannotated"
msgstr "използване на всеки етикет — включително и неанотираните"
-#: builtin/describe.c:399
+#: builtin/describe.c:400
msgid "always use long format"
msgstr "винаги да се ползва дългият формат"
-#: builtin/describe.c:400
+#: builtin/describe.c:401
msgid "only follow first parent"
msgstr "проследяване само на първия родител"
-#: builtin/describe.c:403
+#: builtin/describe.c:404
msgid "only output exact matches"
msgstr "извеждане само на точните съвпадения"
-#: builtin/describe.c:405
+#: builtin/describe.c:406
msgid "consider <n> most recent tags (default: 10)"
msgstr "да се търси само в този БРОЙ последни етикети (стандартно: 10)"
-#: builtin/describe.c:407
+#: builtin/describe.c:408
msgid "only consider tags matching <pattern>"
msgstr "да се търси само измежду етикетите напасващи този ШАБЛОН"
-#: builtin/describe.c:409 builtin/name-rev.c:318
+#: builtin/describe.c:410 builtin/name-rev.c:318
msgid "show abbreviated commit object as fallback"
msgstr "извеждане на съкратено име на обект като резервен вариант"
-#: builtin/describe.c:410
+#: builtin/describe.c:411
msgid "mark"
msgstr "МАРКЕР"
-#: builtin/describe.c:411
+#: builtin/describe.c:412
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "добавяне на такъв МАРКЕР на работното дърво (стандартно е „-dirty“)"
-#: builtin/describe.c:429
+#: builtin/describe.c:430
msgid "--long is incompatible with --abbrev=0"
msgstr "Опциите „--long“ и „--abbrev=0“ са несъвместими"
-#: builtin/describe.c:455
+#: builtin/describe.c:456
msgid "No names found, cannot describe anything."
msgstr "Не са открити имена — нищо не може да бъде описано."
-#: builtin/describe.c:475
+#: builtin/describe.c:476
msgid "--dirty is incompatible with commit-ishes"
msgstr "опцията „--dirty“ е несъвместима с указател към подаване"
-#: builtin/diff.c:85
+#: builtin/diff.c:86
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr "„%s“: не е нито обикновен файл, нито символна връзка"
-#: builtin/diff.c:236
+#: builtin/diff.c:237
#, c-format
msgid "invalid option: %s"
msgstr "неправилна опция: %s"
-#: builtin/diff.c:357
+#: builtin/diff.c:358
msgid "Not a git repository"
msgstr "Не е хранилище на Git"
-#: builtin/diff.c:400
+#: builtin/diff.c:401
#, c-format
msgid "invalid object '%s' given."
msgstr "зададен е неправилен обект „%s“."
-#: builtin/diff.c:409
+#: builtin/diff.c:410
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "зададени са повече от 2 обекта: „%s“"
-#: builtin/diff.c:416
+#: builtin/diff.c:417
#, c-format
msgid "unhandled object '%s' given."
msgstr "зададен е неподдържан обект „%s“."
-#: builtin/fast-export.c:23
+#: builtin/fast-export.c:24
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [ОПЦИИ_ЗА_СПИСЪКА_С_ВЕРСИИ]"
-#: builtin/fast-export.c:702
+#: builtin/fast-export.c:979
msgid "show progress after <n> objects"
msgstr "Съобщение за напредъка на всеки такъв БРОЙ обекта"
-#: builtin/fast-export.c:704
+#: builtin/fast-export.c:981
msgid "select handling of signed tags"
msgstr "Как да се обработват подписаните етикети"
-#: builtin/fast-export.c:707
+#: builtin/fast-export.c:984
msgid "select handling of tags that tag filtered objects"
msgstr "Как да се обработват етикетите на филтрираните обекти"
-#: builtin/fast-export.c:710
+#: builtin/fast-export.c:987
msgid "Dump marks to this file"
msgstr "Запазване на маркерите в този файл"
-#: builtin/fast-export.c:712
+#: builtin/fast-export.c:989
msgid "Import marks from this file"
msgstr "Внасяне на маркерите от този файл"
-#: builtin/fast-export.c:714
+#: builtin/fast-export.c:991
msgid "Fake a tagger when tags lack one"
msgstr "Да се използва изкуствено име на човек при липса на задаващ етикета"
-#: builtin/fast-export.c:716
+#: builtin/fast-export.c:993
msgid "Output full tree for each commit"
msgstr "Извеждане на цялото дърво за всяко подаване"
-#: builtin/fast-export.c:718
+#: builtin/fast-export.c:995
msgid "Use the done feature to terminate the stream"
msgstr "Използване на маркер за завършване на потока"
-#: builtin/fast-export.c:719
+#: builtin/fast-export.c:996
msgid "Skip output of blob data"
msgstr "Без извеждане на съдържанието на обектите BLOB"
-#: builtin/fast-export.c:720
+#: builtin/fast-export.c:997
msgid "refspec"
msgstr "указател на версия"
-#: builtin/fast-export.c:721
+#: builtin/fast-export.c:998
msgid "Apply refspec to exported refs"
msgstr "Прилагане на указателя на версия към изнесените указатели"
+#: builtin/fast-export.c:999
+msgid "anonymize output"
+msgstr "анонимизиране на извежданата информация"
+
#: builtin/fetch.c:20
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ…]]"
@@ -5305,7 +5471,7 @@ msgstr "задълбочаване на историята на плитко х
msgid "convert to a complete repository"
msgstr "превръщане в пълно хранилище"
-#: builtin/fetch.c:118 builtin/log.c:1205
+#: builtin/fetch.c:118 builtin/log.c:1208
msgid "dir"
msgstr "директория"
@@ -5333,80 +5499,80 @@ msgstr "указване на картата с указатели за дост
msgid "Couldn't find remote ref HEAD"
msgstr "Указателят „HEAD“ в отдалеченото хранилище не може да бъде открит"
-#: builtin/fetch.c:440
+#: builtin/fetch.c:454
#, c-format
msgid "object %s not found"
msgstr "обектът „%s“ липсва"
-#: builtin/fetch.c:445
+#: builtin/fetch.c:459
msgid "[up to date]"
msgstr "[актуализиран]"
-#: builtin/fetch.c:459
+#: builtin/fetch.c:473
#, c-format
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr "! %-*s %-*s → %s (в текущия клон не може да се доставя)"
-#: builtin/fetch.c:460 builtin/fetch.c:546
+#: builtin/fetch.c:474 builtin/fetch.c:560
msgid "[rejected]"
msgstr "[отхвърлен]"
-#: builtin/fetch.c:471
+#: builtin/fetch.c:485
msgid "[tag update]"
msgstr "[обновяване на етикетите]"
-#: builtin/fetch.c:473 builtin/fetch.c:508 builtin/fetch.c:526
+#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540
msgid " (unable to update local ref)"
msgstr " (локалните указатели не могат да бъдат обновени)"
-#: builtin/fetch.c:491
+#: builtin/fetch.c:505
msgid "[new tag]"
msgstr "[нов етикет]"
-#: builtin/fetch.c:494
+#: builtin/fetch.c:508
msgid "[new branch]"
msgstr "[нов клон]"
-#: builtin/fetch.c:497
+#: builtin/fetch.c:511
msgid "[new ref]"
msgstr "[нов указател]"
-#: builtin/fetch.c:542
+#: builtin/fetch.c:556
msgid "unable to update local ref"
msgstr "локален указател не може да бъде обновен"
-#: builtin/fetch.c:542
+#: builtin/fetch.c:556
msgid "forced update"
msgstr "принудително обновяване"
-#: builtin/fetch.c:548
+#: builtin/fetch.c:562
msgid "(non-fast-forward)"
msgstr "(сливането не е тривиално)"
-#: builtin/fetch.c:581 builtin/fetch.c:814
+#: builtin/fetch.c:595 builtin/fetch.c:828
#, c-format
msgid "cannot open %s: %s\n"
msgstr "файлът „%s“ не може да бъде отворен: %s\n"
-#: builtin/fetch.c:590
+#: builtin/fetch.c:604
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "хранилището „%s“ не изпрати всички необходими обекти\n"
-#: builtin/fetch.c:608
+#: builtin/fetch.c:622
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"отхвърляне на върха „%s“, защото плитките хранилища не могат да бъдат "
"обновявани"
-#: builtin/fetch.c:696 builtin/fetch.c:779
+#: builtin/fetch.c:710 builtin/fetch.c:793
#, c-format
msgid "From %.*s\n"
msgstr "От %.*s\n"
# FIXME - is the space necessary
-#: builtin/fetch.c:707
+#: builtin/fetch.c:721
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -5416,55 +5582,55 @@ msgstr ""
"„git remote prune %s“, за да премахнете остарелите клони, които\n"
"предизвикват конфликта"
-#: builtin/fetch.c:759
+#: builtin/fetch.c:773
#, c-format
msgid " (%s will become dangling)"
msgstr " (обектът „%s“ ще се окаже извън клон)"
-#: builtin/fetch.c:760
+#: builtin/fetch.c:774
#, c-format
msgid " (%s has become dangling)"
msgstr " (обектът „%s“ вече е извън клон)"
-#: builtin/fetch.c:784
+#: builtin/fetch.c:798
msgid "[deleted]"
msgstr "[изтрит]"
-#: builtin/fetch.c:785 builtin/remote.c:1059
+#: builtin/fetch.c:799 builtin/remote.c:1063
msgid "(none)"
msgstr "(нищо)"
-#: builtin/fetch.c:804
+#: builtin/fetch.c:818
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Не може да изтегляте в текущия клон „%s“ на хранилище, което не е голо"
-#: builtin/fetch.c:823
+#: builtin/fetch.c:837
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Стойността „%2$s“ за опцията „%1$s“ не е съвместима с „%3$s“"
-#: builtin/fetch.c:826
+#: builtin/fetch.c:840
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Опцията „%s“ се игнорира при „%s“\n"
-#: builtin/fetch.c:882
+#: builtin/fetch.c:896
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Не се поддържа доставяне от „%s“"
-#: builtin/fetch.c:1044
+#: builtin/fetch.c:1058
#, c-format
msgid "Fetching %s\n"
msgstr "Доставяне на „%s“\n"
-#: builtin/fetch.c:1046 builtin/remote.c:90
+#: builtin/fetch.c:1060 builtin/remote.c:90
#, c-format
msgid "Could not fetch %s"
msgstr "„%s“ не може да се достави"
-#: builtin/fetch.c:1064
+#: builtin/fetch.c:1078
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -5472,33 +5638,33 @@ msgstr ""
"Не сте указали отдалечено хранилище. Задайте или адрес, или име\n"
"на отдалечено хранилище, откъдето да се доставят новите версии."
-#: builtin/fetch.c:1087
+#: builtin/fetch.c:1101
msgid "You need to specify a tag name."
msgstr "Трябва да укажете име на етикет."
-#: builtin/fetch.c:1131
+#: builtin/fetch.c:1143
msgid "--depth and --unshallow cannot be used together"
msgstr "опциите „--depth“ и „--unshallow“ са несъвместими"
-#: builtin/fetch.c:1133
+#: builtin/fetch.c:1145
msgid "--unshallow on a complete repository does not make sense"
msgstr "не можете да използвате опцията „--unshallow“ върху пълно хранилище"
-#: builtin/fetch.c:1156
+#: builtin/fetch.c:1168
msgid "fetch --all does not take a repository argument"
msgstr "към „git fetch --all“ не можете да добавите аргумент — хранилище"
-#: builtin/fetch.c:1158
+#: builtin/fetch.c:1170
msgid "fetch --all does not make sense with refspecs"
msgstr ""
"към „git fetch --all“ не можете да добавите аргумент — указател на версия"
-#: builtin/fetch.c:1169
+#: builtin/fetch.c:1181
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Няма нито отдалечено хранилище, нито група от хранилища на име „%s“"
-#: builtin/fetch.c:1177
+#: builtin/fetch.c:1189
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Указването на група и указването на версия са несъвместими"
@@ -5507,8 +5673,8 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
msgstr "git fmt-merge-msg [-m СЪОБЩЕНИЕ] [--log[=БРОЙ]|--no-log] [--file ФАЙЛ]"
#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:698
-#: builtin/merge.c:196 builtin/repack.c:179 builtin/repack.c:183
-#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:589
+#: builtin/merge.c:197 builtin/repack.c:179 builtin/repack.c:183
+#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:590
#: parse-options.h:132 parse-options.h:239
msgid "n"
msgstr "БРОЙ"
@@ -5535,100 +5701,104 @@ msgstr "за начало на съобщението да се ползва Т
msgid "file to read from"
msgstr "файл, от който да се чете"
-#: builtin/for-each-ref.c:1051
+#: builtin/for-each-ref.c:676
+msgid "unable to parse format"
+msgstr "форматът не може да бъде анализиран"
+
+#: builtin/for-each-ref.c:1057
msgid "git for-each-ref [options] [<pattern>]"
msgstr "git for-each-ref [ОПЦИЯ…] [ШАБЛОН]"
-#: builtin/for-each-ref.c:1066
+#: builtin/for-each-ref.c:1072
msgid "quote placeholders suitably for shells"
msgstr "цитиране подходящо за командни интерпретатори на обвивката"
-#: builtin/for-each-ref.c:1068
+#: builtin/for-each-ref.c:1074
msgid "quote placeholders suitably for perl"
msgstr "цитиране подходящо за perl"
-#: builtin/for-each-ref.c:1070
+#: builtin/for-each-ref.c:1076
msgid "quote placeholders suitably for python"
msgstr "цитиране подходящо за python"
-#: builtin/for-each-ref.c:1072
+#: builtin/for-each-ref.c:1078
msgid "quote placeholders suitably for tcl"
msgstr "цитиране подходящо за tcl"
-#: builtin/for-each-ref.c:1075
+#: builtin/for-each-ref.c:1081
msgid "show only <n> matched refs"
msgstr "извеждане само на този БРОЙ напаснати указатели"
-#: builtin/for-each-ref.c:1076 builtin/replace.c:435
+#: builtin/for-each-ref.c:1082 builtin/replace.c:438
msgid "format"
msgstr "ФОРМАТ"
-#: builtin/for-each-ref.c:1076
+#: builtin/for-each-ref.c:1082
msgid "format to use for the output"
msgstr "ФОРМАТ за изхода"
-#: builtin/for-each-ref.c:1077
+#: builtin/for-each-ref.c:1083
msgid "key"
msgstr "ключ"
-#: builtin/for-each-ref.c:1078
+#: builtin/for-each-ref.c:1084
msgid "field name to sort on"
msgstr "име на полето, по което да е подредбата"
-#: builtin/fsck.c:147 builtin/prune.c:172
+#: builtin/fsck.c:147 builtin/prune.c:136
msgid "Checking connectivity"
msgstr "Проверка на връзката"
-#: builtin/fsck.c:538
+#: builtin/fsck.c:540
msgid "Checking object directories"
msgstr "Проверка на директориите с обекти"
-#: builtin/fsck.c:601
+#: builtin/fsck.c:603
msgid "git fsck [options] [<object>...]"
msgstr "git fsck [ОПЦИЯ…] [ОБЕКТ…]"
-#: builtin/fsck.c:607
+#: builtin/fsck.c:609
msgid "show unreachable objects"
msgstr "показване на недостижимите обекти"
-#: builtin/fsck.c:608
+#: builtin/fsck.c:610
msgid "show dangling objects"
msgstr "показване на обектите извън клоните"
-#: builtin/fsck.c:609
+#: builtin/fsck.c:611
msgid "report tags"
msgstr "показване на етикетите"
-#: builtin/fsck.c:610
+#: builtin/fsck.c:612
msgid "report root nodes"
msgstr "показване на кореновите възли"
-#: builtin/fsck.c:611
+#: builtin/fsck.c:613
msgid "make index objects head nodes"
msgstr "задаване на обекти от индекса да са коренови"
# FIXME bad message
-#: builtin/fsck.c:612
+#: builtin/fsck.c:614
msgid "make reflogs head nodes (default)"
msgstr "проследяване на указателите от журнала като глави (стандартно)"
-#: builtin/fsck.c:613
+#: builtin/fsck.c:615
msgid "also consider packs and alternate objects"
msgstr "допълнително да се проверяват пакетите и алтернативните обекти"
-#: builtin/fsck.c:614
+#: builtin/fsck.c:616
msgid "enable more strict checking"
msgstr "по-строги проверки"
-#: builtin/fsck.c:616
+#: builtin/fsck.c:618
msgid "write dangling objects in .git/lost-found"
msgstr "запазване на обектите извън клоните в директорията „.git/lost-found“"
-#: builtin/fsck.c:617 builtin/prune.c:144
+#: builtin/fsck.c:619 builtin/prune.c:108
msgid "show progress"
msgstr "показване на напредъка"
-#: builtin/fsck.c:667
+#: builtin/fsck.c:669
msgid "Checking objects"
msgstr "Проверка на обектите"
@@ -5637,53 +5807,53 @@ msgstr "Проверка на обектите"
msgid "git gc [options]"
msgstr "git gc [ОПЦИЯ…]"
-#: builtin/gc.c:91
+#: builtin/gc.c:79
#, c-format
-msgid "Invalid %s: '%s'"
-msgstr "Неправилна стойност за „%s“: „%s“"
+msgid "Invalid gc.pruneexpire: '%s'"
+msgstr "Неправилна стойност за настройката „gc.pruneexpire“: %s"
-#: builtin/gc.c:118
+#: builtin/gc.c:107
#, c-format
msgid "insanely long object directory %.*s"
msgstr "прекалено дълга директория с обекти „%.*s“"
-#: builtin/gc.c:287
+#: builtin/gc.c:276
msgid "prune unreferenced objects"
msgstr "окастряне на обектите, към които нищо не сочи"
-#: builtin/gc.c:289
+#: builtin/gc.c:278
msgid "be more thorough (increased runtime)"
msgstr "изчерпателно търсене на боклука (за сметка на повече време работа)"
-#: builtin/gc.c:290
+#: builtin/gc.c:279
msgid "enable auto-gc mode"
msgstr "включване на автоматичното събиране на боклука (auto-gc)"
-#: builtin/gc.c:291
+#: builtin/gc.c:280
msgid "force running gc even if there may be another gc running"
msgstr ""
"изрично стартиране на събирането на боклука, дори и ако вече работи друго "
"събиране"
-#: builtin/gc.c:332
+#: builtin/gc.c:321
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Автоматично пакетиране на заден фон на хранилището за по-добра "
"производителност.\n"
-#: builtin/gc.c:334
+#: builtin/gc.c:323
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Автоматично пакетиране на хранилището за по-добра производителност.\n"
-#: builtin/gc.c:335
+#: builtin/gc.c:324
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
"Вижте ръководството за повече информация как да изпълните „git help gc“.\n"
-#: builtin/gc.c:353
+#: builtin/gc.c:342
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -5692,7 +5862,7 @@ msgstr ""
"процеса: %<PRIuMAX> (ако сте сигурни, че това не е вярно, това използвайте\n"
"опцията „--force“)"
-#: builtin/gc.c:375
+#: builtin/gc.c:364
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
@@ -5940,7 +6110,7 @@ msgstr ""
msgid "both --cached and trees are given."
msgstr "опцията „--cached“ е несъвместима със задаване на дърво."
-#: builtin/hash-object.c:60
+#: builtin/hash-object.c:82
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
"<file>..."
@@ -5948,31 +6118,38 @@ msgstr ""
"git hash-object [-t ВИД] [-w] [--path=ФАЙЛ|--no-filters] [--stdin] [--] ФАЙЛ…"
# FIXME - list of paths or path...
-#: builtin/hash-object.c:61
+#: builtin/hash-object.c:83
msgid "git hash-object --stdin-paths < <list-of-paths>"
msgstr "git hash-object --stdin-paths < ПЪТ…"
-#: builtin/hash-object.c:72 builtin/tag.c:609
+#: builtin/hash-object.c:94 builtin/tag.c:610
msgid "type"
msgstr "ВИД"
-#: builtin/hash-object.c:72
+#: builtin/hash-object.c:94
msgid "object type"
msgstr "вид на обекта"
-#: builtin/hash-object.c:73
+#: builtin/hash-object.c:95
msgid "write the object into the object database"
msgstr "записване на обекта в базата от данни за обектите"
-#: builtin/hash-object.c:74
+#: builtin/hash-object.c:97
msgid "read the object from stdin"
msgstr "изчитане на обекта от стандартния вход"
-#: builtin/hash-object.c:76
+#: builtin/hash-object.c:99
msgid "store file as is without filters"
msgstr "запазване на файла както е — без филтри"
-#: builtin/hash-object.c:77
+#: builtin/hash-object.c:100
+msgid ""
+"just hash any random garbage to create corrupt objects for debugging Git"
+msgstr ""
+"създаване и хеширане на произволни данни за повредени обекти за трасиране на "
+"Git"
+
+#: builtin/hash-object.c:101
msgid "process file as it were from this path"
msgstr "обработване на файла все едно е с този път"
@@ -6005,25 +6182,25 @@ msgstr "git help [--all] [--guides] [--man|--web|--info] [КОМАНДА]"
msgid "unrecognized help format '%s'"
msgstr "непознат формат на помощта „%s“"
-#: builtin/help.c:92
+#: builtin/help.c:91
msgid "Failed to start emacsclient."
msgstr "Неуспешно стартиране на „emacsclient“."
-#: builtin/help.c:105
+#: builtin/help.c:104
msgid "Failed to parse emacsclient version."
msgstr "Версията на „emacsclient“ не може да се анализира."
-#: builtin/help.c:113
+#: builtin/help.c:112
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "Прекалено стара версия на „emacsclient“ — %d (< 22)."
-#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176
+#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
#, c-format
msgid "failed to exec '%s': %s"
msgstr "неуспешно изпълнение на „%s“: %s"
-#: builtin/help.c:216
+#: builtin/help.c:215
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -6032,7 +6209,7 @@ msgstr ""
"„%s“: път към неподдържана програма за преглед на\n"
" ръководството. Вместо нея пробвайте „man.<tool>.cmd“."
-#: builtin/help.c:228
+#: builtin/help.c:227
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -6041,25 +6218,29 @@ msgstr ""
"„%s“: команда за поддържана програма за преглед на\n"
" ръководството. Вместо нея пробвайте „man.<tool>.path“."
-#: builtin/help.c:353
+#: builtin/help.c:352
#, c-format
msgid "'%s': unknown man viewer."
msgstr "„%s“: непозната програма за преглед на ръководството."
-#: builtin/help.c:370
+#: builtin/help.c:369
msgid "no man viewer handled the request"
msgstr "никоя програма за преглед на ръководство не успя да обработи заявката"
-#: builtin/help.c:378
+#: builtin/help.c:377
msgid "no info viewer handled the request"
msgstr ""
"никоя програма за преглед на информационните страници не успя да обработи "
"заявката"
-#: builtin/help.c:424
+#: builtin/help.c:423
msgid "Defining attributes per path"
msgstr "Указване на атрибути към път"
+#: builtin/help.c:424
+msgid "Everyday Git With 20 Commands Or So"
+msgstr "Ежедневието в Git в рамките на 20-ина команди"
+
#: builtin/help.c:425
msgid "A Git glossary"
msgstr "Речник с термините на Git"
@@ -6099,275 +6280,281 @@ msgid "`git %s' is aliased to `%s'"
msgstr "„git %s“ е синоним на „%s“"
# FIXME merge with next?
-#: builtin/index-pack.c:145
+#: builtin/index-pack.c:150
#, c-format
msgid "unable to open %s"
msgstr "обектът „%s“ не може да бъде отворен"
-#: builtin/index-pack.c:191
+#: builtin/index-pack.c:200
#, c-format
msgid "object type mismatch at %s"
msgstr "неправилен вид на обекта „%s“"
-#: builtin/index-pack.c:211
+#: builtin/index-pack.c:220
#, c-format
msgid "did not receive expected object %s"
msgstr "очакваният обект „%s“ не бе получен"
-#: builtin/index-pack.c:214
+#: builtin/index-pack.c:223
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "неправилен вид на обекта „%s“: очакваше се „%s“, а бе получен „%s“"
-#: builtin/index-pack.c:256
+#: builtin/index-pack.c:265
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "не може да се запълни %d байт"
msgstr[1] "не може да се запълнят %d байта"
-#: builtin/index-pack.c:266
+#: builtin/index-pack.c:275
msgid "early EOF"
msgstr "неочакван край на файл"
-#: builtin/index-pack.c:267
+#: builtin/index-pack.c:276
msgid "read error on input"
msgstr "грешка при четене на входните данни"
-#: builtin/index-pack.c:279
+#: builtin/index-pack.c:288
msgid "used more bytes than were available"
msgstr "използвани са повече от наличните байтове"
-#: builtin/index-pack.c:286
+#: builtin/index-pack.c:295
msgid "pack too large for current definition of off_t"
msgstr "пакетният файл е прекалено голям за текущата стойност на типа „off_t“"
-#: builtin/index-pack.c:302
+#: builtin/index-pack.c:311
#, c-format
msgid "unable to create '%s'"
msgstr "пакетният файл „%s“ не може да бъде създаден"
-#: builtin/index-pack.c:307
+#: builtin/index-pack.c:316
#, c-format
msgid "cannot open packfile '%s'"
msgstr "пакетният файл „%s“ не може да бъде отворен"
-#: builtin/index-pack.c:321
+#: builtin/index-pack.c:330
msgid "pack signature mismatch"
msgstr "несъответствие в подписа към пакетния файл"
-#: builtin/index-pack.c:323
+#: builtin/index-pack.c:332
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "не се поддържа пакетиране вeрсия „%<PRIu32>“"
-#: builtin/index-pack.c:341
+#: builtin/index-pack.c:350
#, c-format
msgid "pack has bad object at offset %lu: %s"
msgstr "повреден обект в пакетния файл при отместване %lu: %s"
-#: builtin/index-pack.c:462
+#: builtin/index-pack.c:471
#, c-format
msgid "inflate returned %d"
msgstr "декомпресирането с „inflate“ върна %d"
-#: builtin/index-pack.c:511
+#: builtin/index-pack.c:520
msgid "offset value overflow for delta base object"
msgstr "стойността на отместването за обекта-разлика води до препълване"
-#: builtin/index-pack.c:519
+#: builtin/index-pack.c:528
msgid "delta base offset is out of bound"
msgstr "стойността на отместването за обекта-разлика е извън диапазона"
-#: builtin/index-pack.c:527
+#: builtin/index-pack.c:536
#, c-format
msgid "unknown object type %d"
msgstr "непознат вид обект %d"
-#: builtin/index-pack.c:558
+#: builtin/index-pack.c:567
msgid "cannot pread pack file"
msgstr "пакетният файл не може да бъде прочетен"
-#: builtin/index-pack.c:560
+#: builtin/index-pack.c:569
#, c-format
msgid "premature end of pack file, %lu byte missing"
msgid_plural "premature end of pack file, %lu bytes missing"
msgstr[0] "неочакван край на файл, липсва %lu байт"
msgstr[1] "неочакван край на файл, липсват %lu байта"
-#: builtin/index-pack.c:586
+#: builtin/index-pack.c:595
msgid "serious inflate inconsistency"
msgstr "сериозна грешка при декомпресиране с „inflate“"
-#: builtin/index-pack.c:677 builtin/index-pack.c:683 builtin/index-pack.c:706
-#: builtin/index-pack.c:740 builtin/index-pack.c:749
+#: builtin/index-pack.c:686 builtin/index-pack.c:692 builtin/index-pack.c:715
+#: builtin/index-pack.c:749 builtin/index-pack.c:758
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
"СЪВПАДЕНИЕ НА СТОЙНОСТИТЕ ЗА СУМИТЕ ЗА SHA1: „%s“ НА ДВА РАЗЛИЧНИ ОБЕКТА!"
# FIXME merge with next?
-#: builtin/index-pack.c:680 builtin/pack-objects.c:162
-#: builtin/pack-objects.c:254
+#: builtin/index-pack.c:689 builtin/pack-objects.c:164
+#: builtin/pack-objects.c:256
#, c-format
msgid "unable to read %s"
msgstr "обектът „%s“ не може да бъде прочетен"
-#: builtin/index-pack.c:746
+#: builtin/index-pack.c:755
#, c-format
msgid "cannot read existing object %s"
msgstr "съществуващият обект „%s“ не може да бъде прочетен"
-#: builtin/index-pack.c:760
+#: builtin/index-pack.c:769
#, c-format
msgid "invalid blob object %s"
msgstr "неправилен обект BLOB „%s“"
# FIXME perhaps invalid object
-#: builtin/index-pack.c:774
+#: builtin/index-pack.c:783
#, c-format
msgid "invalid %s"
msgstr "неправилен обект „%s“"
-#: builtin/index-pack.c:777
+#: builtin/index-pack.c:787
msgid "Error in object"
msgstr "Грешка в обекта"
-#: builtin/index-pack.c:779
+#: builtin/index-pack.c:789
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Някои обекти, наследници на „%s“, не могат да бъдат достигнати"
-#: builtin/index-pack.c:851 builtin/index-pack.c:881
+#: builtin/index-pack.c:861 builtin/index-pack.c:890
msgid "failed to apply delta"
msgstr "разликата не може да бъде приложена"
-#: builtin/index-pack.c:1022
+#: builtin/index-pack.c:1055
msgid "Receiving objects"
msgstr "Получаване на обекти"
-#: builtin/index-pack.c:1022
+#: builtin/index-pack.c:1055
msgid "Indexing objects"
msgstr "Индексиране на обекти"
-#: builtin/index-pack.c:1048
+#: builtin/index-pack.c:1081
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "пакетният файл е повреден (нееднакви суми по SHA1)"
-#: builtin/index-pack.c:1053
+#: builtin/index-pack.c:1086
msgid "cannot fstat packfile"
msgstr "не може да се получи информация за пакетния файл с „fstat“"
-#: builtin/index-pack.c:1056
+#: builtin/index-pack.c:1089
msgid "pack has junk at the end"
msgstr "в края на пакетния файл има повредени данни"
# FIXME WTF message
-#: builtin/index-pack.c:1067
+#: builtin/index-pack.c:1100
msgid "confusion beyond insanity in parse_pack_objects()"
-msgstr "катастрофална грешка във функцията „parse_pack_objects“"
+msgstr ""
+"фатална грешка във функцията „parse_pack_objects“. Това е грешка в Git, "
+"докладвайте я на разработчиците, като пратите е-писмо на адрес: „git@vger."
+"kernel.org“."
-#: builtin/index-pack.c:1090
+#: builtin/index-pack.c:1123
msgid "Resolving deltas"
msgstr "Откриване на съответните разлики"
-#: builtin/index-pack.c:1100
+#: builtin/index-pack.c:1133
#, c-format
msgid "unable to create thread: %s"
msgstr "не може да се създаде нишка: %s"
# FIXME WTF message
-#: builtin/index-pack.c:1142
+#: builtin/index-pack.c:1175
msgid "confusion beyond insanity"
-msgstr "катастрофална грешка"
+msgstr ""
+"фатална грешка във функцията „conclude_pack“. Това е грешка в Git, "
+"докладвайте я на разработчиците, като пратите е-писмо на адрес: „git@vger."
+"kernel.org“."
-#: builtin/index-pack.c:1150
+#: builtin/index-pack.c:1181
#, c-format
msgid "completed with %d local objects"
msgstr "действието завърши с %d локални обекта"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1191
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
"Неочаквана последваща сума за грешки за „%s“ (причината може да е грешка в "
"диска)"
-#: builtin/index-pack.c:1164
+#: builtin/index-pack.c:1195
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "в пакета има %d ненапасваща разлика"
msgstr[1] "в пакета има %d ненапасващи разлики"
-#: builtin/index-pack.c:1189
+#: builtin/index-pack.c:1220
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "добавеният обект не може да се компресира с „deflate“: %d"
-#: builtin/index-pack.c:1268
+#: builtin/index-pack.c:1299
#, c-format
msgid "local object %s is corrupt"
msgstr "локалният обект „%s“ е повреден"
-#: builtin/index-pack.c:1292
+#: builtin/index-pack.c:1323
msgid "error while closing pack file"
msgstr "грешка при затварянето на пакетния файл"
-#: builtin/index-pack.c:1305
+#: builtin/index-pack.c:1336
#, c-format
msgid "cannot write keep file '%s'"
msgstr ""
"грешка при записването на файла „%s“, осигуряващ запазване на директория"
-#: builtin/index-pack.c:1313
+#: builtin/index-pack.c:1344
#, c-format
msgid "cannot close written keep file '%s'"
msgstr ""
"грешка при затварянето на записания файл „%s“, осигуряващ запазване на "
"директория"
-#: builtin/index-pack.c:1326
+#: builtin/index-pack.c:1357
msgid "cannot store pack file"
msgstr "пакетният файл не може да бъде запазен"
-#: builtin/index-pack.c:1337
+#: builtin/index-pack.c:1368
msgid "cannot store index file"
msgstr "файлът за индекса не може да бъде съхранен"
-#: builtin/index-pack.c:1370
+#: builtin/index-pack.c:1401
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "зададена е неправилна версия пакетиране: „pack.indexversion=%<PRIu32>“"
-#: builtin/index-pack.c:1376
+#: builtin/index-pack.c:1407
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "зададен е неправилен брой нишки: %d"
-#: builtin/index-pack.c:1380 builtin/index-pack.c:1559
+#: builtin/index-pack.c:1411 builtin/index-pack.c:1590
#, c-format
msgid "no threads support, ignoring %s"
msgstr "липсва поддръжка за нишки. „%s“ ще се пренебрегне"
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1469
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Съществуващият пакетен файл „%s“ не може да бъде отворен"
-#: builtin/index-pack.c:1440
+#: builtin/index-pack.c:1471
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Съществуващият индекс за пакетния файл „%s“ не може да бъде отворен"
-#: builtin/index-pack.c:1487
+#: builtin/index-pack.c:1518
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "%d обект не е разлика"
msgstr[1] "%d обекта не са разлика"
-#: builtin/index-pack.c:1494
+#: builtin/index-pack.c:1525
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
@@ -6375,26 +6562,26 @@ msgstr[0] "дължината на веригата е %d: %lu обект"
msgstr[1] "дължината на веригата е %d: %lu обекта"
# FIXME it is not the cwd it is the previous cwd
-#: builtin/index-pack.c:1523
+#: builtin/index-pack.c:1554
msgid "Cannot come back to cwd"
msgstr "Процесът не може да се върне към предишната работна директория"
-#: builtin/index-pack.c:1571 builtin/index-pack.c:1574
-#: builtin/index-pack.c:1586 builtin/index-pack.c:1590
+#: builtin/index-pack.c:1602 builtin/index-pack.c:1605
+#: builtin/index-pack.c:1617 builtin/index-pack.c:1621
#, c-format
msgid "bad %s"
msgstr "неправилна стойност „%s“"
-#: builtin/index-pack.c:1604
+#: builtin/index-pack.c:1635
msgid "--fix-thin cannot be used without --stdin"
msgstr "опцията „--fix-thin“ изисква „--stdin“"
-#: builtin/index-pack.c:1608 builtin/index-pack.c:1617
+#: builtin/index-pack.c:1639 builtin/index-pack.c:1648
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "името на пакетния файл „%s“ не завършва на „.pack“"
-#: builtin/index-pack.c:1625
+#: builtin/index-pack.c:1656
msgid "--verify with no packfile name given"
msgstr "опцията „--verify“ изисква име на пакетен файл"
@@ -6507,11 +6694,7 @@ msgstr "Инициализирано празно"
msgid " shared"
msgstr ", споделено"
-#: builtin/init-db.c:439
-msgid "cannot tell cwd"
-msgstr "текущата директория не може да бъде определена"
-
-#: builtin/init-db.c:465
+#: builtin/init-db.c:467
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [directory]"
@@ -6519,31 +6702,31 @@ msgstr ""
"git init [-q | --quiet] [--bare] [--template=ДИРЕКТОРИЯ_С_ШАБЛОНИ] [--"
"shared[=ПРАВА]] [ДИРЕКТОРИЯ]"
-#: builtin/init-db.c:488
+#: builtin/init-db.c:490
msgid "permissions"
msgstr "права"
-#: builtin/init-db.c:489
+#: builtin/init-db.c:491
msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
"указване, че хранилището на Git ще бъде споделено от повече от един "
"потребител"
-#: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:172
+#: builtin/init-db.c:493 builtin/prune-packed.c:57 builtin/repack.c:172
msgid "be quiet"
msgstr "без извеждане на информация"
-#: builtin/init-db.c:523 builtin/init-db.c:528
+#: builtin/init-db.c:525 builtin/init-db.c:530
#, c-format
msgid "cannot mkdir %s"
msgstr "директорията „%s“ не може да бъде създадена"
-#: builtin/init-db.c:532
+#: builtin/init-db.c:534
#, c-format
msgid "cannot chdir to %s"
msgstr "не може да се влезе в директорията „%s“"
-#: builtin/init-db.c:554
+#: builtin/init-db.c:555
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -6552,15 +6735,31 @@ msgstr ""
"%s (или --work-tree=ДИРЕКТОРИЯ) изисква указването на %s (или --git-"
"dir=ДИРЕКТОРИЯ)"
-#: builtin/init-db.c:578
-msgid "Cannot access current working directory"
-msgstr "Текущата работна директория е недостъпна"
-
-#: builtin/init-db.c:585
+#: builtin/init-db.c:583
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Работното дърво в „%s“ е недостъпно"
+#: builtin/interpret-trailers.c:15
+msgid ""
+"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
+"[<file>...]"
+msgstr ""
+"git interpret-trailers [--trim-empty] [(--trailer ЛЕКСЕМА[(=|:)СТОЙНОСТ])…] "
+"[ФАЙЛ…]"
+
+#: builtin/interpret-trailers.c:25
+msgid "trim empty trailers"
+msgstr "изчистване на празните епилози"
+
+#: builtin/interpret-trailers.c:26
+msgid "trailer"
+msgstr "епилог"
+
+#: builtin/interpret-trailers.c:27
+msgid "trailer(s) to add"
+msgstr "епилог(зи) за добавяне"
+
#: builtin/log.c:41
msgid "git log [<options>] [<revision range>] [[--] <path>...]\n"
msgstr "git log [ОПЦИЯ…] [ДИАПАЗОН_НА_ВЕРСИИТЕ] [[--] ПЪТ…]\n"
@@ -6569,6 +6768,11 @@ msgstr "git log [ОПЦИЯ…] [ДИАПАЗОН_НА_ВЕРСИИТЕ] [[--]
msgid " or: git show [options] <object>..."
msgstr " или: git show [ОПЦИЯ…] ОБЕКТ…"
+#: builtin/log.c:81
+#, c-format
+msgid "invalid --decorate option: %s"
+msgstr "неправилна опция „--decorate“: %s"
+
#: builtin/log.c:127
msgid "suppress diff output"
msgstr "без извеждане на разликите"
@@ -6587,250 +6791,260 @@ msgstr ""
msgid "decorate options"
msgstr "настройки на форма̀та на извежданата информация"
+#: builtin/log.c:133
+msgid "Process line range n,m in file, counting from 1"
+msgstr ""
+"Обработване само на редовете във файла в интервала от n до m включително. "
+"Броенето започва от 1"
+
#: builtin/log.c:229
#, c-format
msgid "Final output: %d %s\n"
msgstr "Резултат: %d %s\n"
-#: builtin/log.c:470 builtin/log.c:562
+#: builtin/log.c:458
+#, c-format
+msgid "git show %s: bad file"
+msgstr "git show %s: повреден файл"
+
+#: builtin/log.c:472 builtin/log.c:564
#, c-format
msgid "Could not read object %s"
msgstr "Обектът не може да бъде прочетен: %s"
-#: builtin/log.c:586
+#: builtin/log.c:588
#, c-format
msgid "Unknown type: %d"
msgstr "Неизвестен вид: %d"
-#: builtin/log.c:687
+#: builtin/log.c:689
msgid "format.headers without value"
msgstr "не е зададена стойност на „format.headers“"
-#: builtin/log.c:771
+#: builtin/log.c:773
msgid "name of output directory is too long"
msgstr "прекалено дълго име на директорията за изходната информация"
-#: builtin/log.c:787
+#: builtin/log.c:789
#, c-format
msgid "Cannot open patch file %s"
msgstr "Файлът-кръпка „%s“ не може да бъде отворен"
-#: builtin/log.c:801
+#: builtin/log.c:803
msgid "Need exactly one range."
msgstr "Трябва да зададете точно един диапазон."
-#: builtin/log.c:809
+#: builtin/log.c:811
msgid "Not a range."
msgstr "Не е диапазон."
-#: builtin/log.c:916
+#: builtin/log.c:919
msgid "Cover letter needs email format"
msgstr "Придружаващото писмо трябва да е форматирано като е-писмо"
# FIXME bad wording insanely
-#: builtin/log.c:995
+#: builtin/log.c:998
#, c-format
msgid "insane in-reply-to: %s"
-msgstr "неправилен формат на заглавната част за отговор „in-reply-to“: %s"
+msgstr "неправилен формат на заглавната част за отговор „in-reply-to“: %s"
-#: builtin/log.c:1023
+#: builtin/log.c:1026
msgid "git format-patch [options] [<since> | <revision range>]"
msgstr "git format-patch [ОПЦИЯ…] [ОТ | ДИАПАЗОН_НА_ВЕРСИИТЕ]"
# FIXME message WTF why ask it
-#: builtin/log.c:1068
+#: builtin/log.c:1071
msgid "Two output directories?"
-msgstr ""
-"Можете да укажете максимум една директория за изход, а сте задали поне две."
+msgstr "Можете да укажете максимум една директория за изход."
-#: builtin/log.c:1183
+#: builtin/log.c:1186
msgid "use [PATCH n/m] even with a single patch"
msgstr "номерация „[PATCH n/m]“ дори и при единствена кръпка"
-#: builtin/log.c:1186
+#: builtin/log.c:1189
msgid "use [PATCH] even with multiple patches"
msgstr "номерация „[PATCH]“ дори и при множество кръпки"
-#: builtin/log.c:1190
+#: builtin/log.c:1193
msgid "print patches to standard out"
msgstr "извеждане на кръпките на стандартния изход"
-#: builtin/log.c:1192
+#: builtin/log.c:1195
msgid "generate a cover letter"
msgstr "създаване на придружаващо писмо"
-#: builtin/log.c:1194
+#: builtin/log.c:1197
msgid "use simple number sequence for output file names"
msgstr "проста числова последователност за имената на файловете-кръпки"
-#: builtin/log.c:1195
+#: builtin/log.c:1198
msgid "sfx"
msgstr "ЗНАЦИ"
-#: builtin/log.c:1196
+#: builtin/log.c:1199
msgid "use <sfx> instead of '.patch'"
msgstr "използване на тези ЗНАЦИ за суфикс вместо „.patch“"
-#: builtin/log.c:1198
+#: builtin/log.c:1201
msgid "start numbering patches at <n> instead of 1"
msgstr "номерирането на кръпките да започва от този БРОЙ, а не с 1"
-#: builtin/log.c:1200
+#: builtin/log.c:1203
msgid "mark the series as Nth re-roll"
msgstr "отбелязване, че това е N-тата поредна редакция на поредицата от кръпки"
-#: builtin/log.c:1202
+#: builtin/log.c:1205
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Използване на този „[ПРЕФИКС]“ вместо „[PATCH]“"
-#: builtin/log.c:1205
+#: builtin/log.c:1208
msgid "store resulting files in <dir>"
msgstr "запазване на изходните файлове в тази ДИРЕКТОРИЯ"
-#: builtin/log.c:1208
+#: builtin/log.c:1211
msgid "don't strip/add [PATCH]"
msgstr "без добавяне/махане на префикса „[PATCH]“"
-#: builtin/log.c:1211
+#: builtin/log.c:1214
msgid "don't output binary diffs"
msgstr "без извеждане на разлики между двоични файлове"
-#: builtin/log.c:1213
+#: builtin/log.c:1216
msgid "don't include a patch matching a commit upstream"
msgstr "да не се включват кръпки, които присъстват в следения клон"
-#: builtin/log.c:1215
+#: builtin/log.c:1218
msgid "show patch format instead of default (patch + stat)"
msgstr ""
"извеждане във формат за кръпки, а на в стандартния (кръпка и статистика)"
-#: builtin/log.c:1217
+#: builtin/log.c:1220
msgid "Messaging"
msgstr "Опции при изпращане"
-#: builtin/log.c:1218
+#: builtin/log.c:1221
msgid "header"
msgstr "ЗАГЛАВНА_ЧАСТ"
-#: builtin/log.c:1219
+#: builtin/log.c:1222
msgid "add email header"
msgstr "добавяне на тази ЗАГЛАВНА_ЧАСТ"
-#: builtin/log.c:1220 builtin/log.c:1222
+#: builtin/log.c:1223 builtin/log.c:1225
msgid "email"
msgstr "Е-ПОЩА"
-#: builtin/log.c:1220
+#: builtin/log.c:1223
msgid "add To: header"
msgstr "добавяне на заглавна част „To:“ (до)"
-#: builtin/log.c:1222
+#: builtin/log.c:1225
msgid "add Cc: header"
msgstr "добавяне на заглавна част „Cc:“ (и до)"
-#: builtin/log.c:1224
+#: builtin/log.c:1227
msgid "ident"
msgstr "ИДЕНТИЧНОСТ"
-#: builtin/log.c:1225
+#: builtin/log.c:1228
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"задаване на адреса в заглавната част „From“ да е тази ИДЕНТИЧНОСТ. Ако не е "
"зададена такава, се взима адреса на подаващия"
-#: builtin/log.c:1227
+#: builtin/log.c:1230
msgid "message-id"
msgstr "ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ"
-#: builtin/log.c:1228
+#: builtin/log.c:1231
msgid "make first mail a reply to <message-id>"
msgstr ""
"първото съобщение да е в отговор на е-писмото с този "
"ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ"
-#: builtin/log.c:1229 builtin/log.c:1232
+#: builtin/log.c:1232 builtin/log.c:1235
msgid "boundary"
msgstr "граница"
-#: builtin/log.c:1230
+#: builtin/log.c:1233
msgid "attach the patch"
msgstr "прикрепяне на кръпката"
-#: builtin/log.c:1233
+#: builtin/log.c:1236
msgid "inline the patch"
msgstr "включване на кръпката в текста на писмата"
-#: builtin/log.c:1237
+#: builtin/log.c:1240
msgid "enable message threading, styles: shallow, deep"
msgstr ""
"използване на нишки за съобщенията. Стилът е „shallow“ (плитък) или "
"„deep“ (дълбок)"
-#: builtin/log.c:1239
+#: builtin/log.c:1242
msgid "signature"
msgstr "подпис"
-#: builtin/log.c:1240
+#: builtin/log.c:1243
msgid "add a signature"
msgstr "добавяне на поле за подпис"
-#: builtin/log.c:1242
+#: builtin/log.c:1245
msgid "add a signature from a file"
msgstr "добавяне на подпис от файл"
-#: builtin/log.c:1243
+#: builtin/log.c:1246
msgid "don't print the patch filenames"
msgstr "без извеждане на имената на кръпките"
-#: builtin/log.c:1317
+#: builtin/log.c:1320
#, c-format
msgid "invalid ident line: %s"
msgstr "грешна идентичност: %s"
-#: builtin/log.c:1332
+#: builtin/log.c:1335
msgid "-n and -k are mutually exclusive."
msgstr "опциите „-n“ и „-k“ са несъвместими."
-#: builtin/log.c:1334
+#: builtin/log.c:1337
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "опциите „--subject-prefix“ и „-k“ са несъвместими."
-#: builtin/log.c:1342
+#: builtin/log.c:1345
msgid "--name-only does not make sense"
msgstr "опцията „--name-only“ е несъвместима с генерирането на кръпки"
-#: builtin/log.c:1344
+#: builtin/log.c:1347
msgid "--name-status does not make sense"
msgstr "опцията „--name-status“ е несъвместима с генерирането на кръпки"
-#: builtin/log.c:1346
+#: builtin/log.c:1349
msgid "--check does not make sense"
msgstr "опцията „--check“ е несъвместима с генерирането на кръпки"
-#: builtin/log.c:1369
+#: builtin/log.c:1372
msgid "standard output, or directory, which one?"
msgstr ""
"изходът може да или стандартният, или да е в директория, но не и двете."
-#: builtin/log.c:1371
+#: builtin/log.c:1374
#, c-format
msgid "Could not create directory '%s'"
msgstr "Директорията „%s“ не може да бъде създадена"
-#: builtin/log.c:1468
+#: builtin/log.c:1472
#, c-format
msgid "unable to read signature file '%s'"
msgstr "файлът „%s“ с подпис не може да бъде прочетен"
-#: builtin/log.c:1531
+#: builtin/log.c:1535
msgid "Failed to create output files"
msgstr "Изходните файлове не могат да бъдат създадени"
-#: builtin/log.c:1579
+#: builtin/log.c:1583
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [ОТДАЛЕЧЕН_КЛОН [ВРЪХ [ПРЕДЕЛ]]]"
-#: builtin/log.c:1634
+#: builtin/log.c:1638
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -6838,7 +7052,7 @@ msgstr ""
"Следеният отдалечен клон не бе открит, затова изрично задайте "
"ОТДАЛЕЧЕН_КЛОН.\n"
-#: builtin/log.c:1647 builtin/log.c:1649 builtin/log.c:1661
+#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665
#, c-format
msgid "Unknown commit %s"
msgstr "Непознато подаване „%s“"
@@ -6884,8 +7098,8 @@ msgid "show files on the filesystem that need to be removed"
msgstr "извеждане на файловете, които трябва да бъдат изтрити"
#: builtin/ls-files.c:477
-msgid "show 'other' directories' name only"
-msgstr "извеждане само на името на другите директории"
+msgid "show 'other' directories' names only"
+msgstr "извеждане само на името на другите (неследените) директории"
#: builtin/ls-files.c:480
msgid "don't show empty directories"
@@ -6976,101 +7190,101 @@ msgstr ""
"извеждане на цялото дърво, не само на текущата директория (включва опцията "
"„--full-name“)"
-#: builtin/merge.c:43
+#: builtin/merge.c:44
msgid "git merge [options] [<commit>...]"
msgstr "git merge [ОПЦИЯ…] [ПОДАВАНЕ…]"
-#: builtin/merge.c:44
+#: builtin/merge.c:45
msgid "git merge [options] <msg> HEAD <commit>"
msgstr "git merge [ОПЦИЯ…] СЪОБЩЕНИЕ HEAD ПОДАВАНЕ"
-#: builtin/merge.c:45
+#: builtin/merge.c:46
msgid "git merge --abort"
msgstr "git merge --abort"
# FIXME -m rather than just m
-#: builtin/merge.c:98
+#: builtin/merge.c:99
msgid "switch `m' requires a value"
msgstr "опцията „-m“ изисква стойност"
-#: builtin/merge.c:135
+#: builtin/merge.c:136
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Няма такава стратегия за сливане: „%s“.\n"
-#: builtin/merge.c:136
+#: builtin/merge.c:137
#, c-format
msgid "Available strategies are:"
msgstr "Наличните стратегии са:"
-#: builtin/merge.c:141
+#: builtin/merge.c:142
#, c-format
msgid "Available custom strategies are:"
msgstr "Допълнителните стратегии са:"
-#: builtin/merge.c:191
+#: builtin/merge.c:192
msgid "do not show a diffstat at the end of the merge"
msgstr "без извеждане на статистиката след завършване на сливане"
-#: builtin/merge.c:194
+#: builtin/merge.c:195
msgid "show a diffstat at the end of the merge"
msgstr "извеждане на статистиката след завършване на сливане"
-#: builtin/merge.c:195
+#: builtin/merge.c:196
msgid "(synonym to --stat)"
msgstr "(синоним на „--stat“)"
-#: builtin/merge.c:197
+#: builtin/merge.c:198
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"добавяне (на максимум такъв БРОЙ) записи от съкратения журнал в съобщението "
"за подаване"
-#: builtin/merge.c:200
+#: builtin/merge.c:201
msgid "create a single commit instead of doing a merge"
msgstr "създаване на едно подаване вместо извършване на сливане"
-#: builtin/merge.c:202
+#: builtin/merge.c:203
msgid "perform a commit if the merge succeeds (default)"
msgstr "извършване на подаване при успешно сливане (стандартно действие)"
-#: builtin/merge.c:204
+#: builtin/merge.c:205
msgid "edit message before committing"
msgstr "редактиране на съобщението преди подаване"
-#: builtin/merge.c:205
+#: builtin/merge.c:206
msgid "allow fast-forward (default)"
msgstr "позволяване на тривиално сливане (стандартно действие)"
-#: builtin/merge.c:207
+#: builtin/merge.c:208
msgid "abort if fast-forward is not possible"
msgstr "преустановяване, ако сливането не е тривиално"
-#: builtin/merge.c:211
+#: builtin/merge.c:212
msgid "Verify that the named commit has a valid GPG signature"
msgstr "Проверка, че именуваното подаване е с правилен подпис на GPG"
-#: builtin/merge.c:212 builtin/notes.c:742 builtin/revert.c:89
+#: builtin/merge.c:213 builtin/notes.c:741 builtin/revert.c:89
msgid "strategy"
msgstr "стратегия"
-#: builtin/merge.c:213
+#: builtin/merge.c:214
msgid "merge strategy to use"
msgstr "стратегия за сливане, която да се ползва"
-#: builtin/merge.c:214
+#: builtin/merge.c:215
msgid "option=value"
msgstr "опция=стойност"
-#: builtin/merge.c:215
+#: builtin/merge.c:216
msgid "option for selected merge strategy"
msgstr "опция за избраната стратегия за сливане"
-#: builtin/merge.c:217
+#: builtin/merge.c:218
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "съобщение при подаването със сливане (при нетривиални сливания)"
-#: builtin/merge.c:221
+#: builtin/merge.c:222
msgid "abort the current in-progress merge"
msgstr "преустановяване на текущото сливане"
@@ -7128,33 +7342,33 @@ msgstr "Неправилен низ за настройката „branch.%s.mer
msgid "git write-tree failed to write a tree"
msgstr "Командата „git write-tree“ не успя да запише обект-дърво"
-#: builtin/merge.c:678
+#: builtin/merge.c:677
msgid "Not handling anything other than two heads merge."
msgstr "Поддържа се само сливане на точно две истории."
-#: builtin/merge.c:692
+#: builtin/merge.c:691
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Непозната опция за рекурсивното сливане „merge-recursive“: „-X%s“"
-#: builtin/merge.c:705
+#: builtin/merge.c:704
#, c-format
msgid "unable to write %s"
msgstr "„%s“ не може да бъде записан"
-#: builtin/merge.c:794
+#: builtin/merge.c:793
#, c-format
msgid "Could not read from '%s'"
msgstr "От „%s“ не може да се чете"
-#: builtin/merge.c:803
+#: builtin/merge.c:802
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Сливането няма да бъде подадено. За завършването му и подаването му "
"използвайте командата „git commit“.\n"
-#: builtin/merge.c:809
+#: builtin/merge.c:808
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -7169,174 +7383,174 @@ msgstr ""
"Редовете, които започват с „%c“ ще бъдат пропуснати, а празно съобщение\n"
"преустановява подаването.\n"
-#: builtin/merge.c:833
+#: builtin/merge.c:832
msgid "Empty commit message."
msgstr "Празно съобщение при подаване."
# FIXME - WTF is wonderful.
-#: builtin/merge.c:845
+#: builtin/merge.c:844
#, c-format
msgid "Wonderful.\n"
-msgstr "Чудесно.\n"
+msgstr "Първият етап на тривиалното сливане завърши.\n"
-#: builtin/merge.c:908
+#: builtin/merge.c:907
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "Неуспешно сливане — коригирайте конфликтите и подайте резултата.\n"
-#: builtin/merge.c:924
+#: builtin/merge.c:923
#, c-format
msgid "'%s' is not a commit"
msgstr "„%s“ не е подаване"
-#: builtin/merge.c:965
+#: builtin/merge.c:964
msgid "No current branch."
msgstr "Няма текущ клон."
-#: builtin/merge.c:967
+#: builtin/merge.c:966
msgid "No remote for the current branch."
msgstr "Текущият клон не следи никой."
-#: builtin/merge.c:969
+#: builtin/merge.c:968
msgid "No default upstream defined for the current branch."
msgstr "Текущият клон не следи никой клон."
-#: builtin/merge.c:974
+#: builtin/merge.c:973
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Никой клон не следи клона „%s“ от хранилището „%s“"
-#: builtin/merge.c:1130
+#: builtin/merge.c:1129
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
"Не може да преустановите сливане, защото в момента не се извършва такова "
"(липсва указател „MERGE_HEAD“)."
-#: builtin/merge.c:1146 git-pull.sh:31
+#: builtin/merge.c:1145
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you can merge."
+"Please, commit your changes before you merge."
msgstr ""
"Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува).\n"
"Подайте промените си, преди да започнете ново сливане."
-#: builtin/merge.c:1149 git-pull.sh:34
+#: builtin/merge.c:1148 git-pull.sh:34
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува)."
-#: builtin/merge.c:1153
+#: builtin/merge.c:1152
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you can merge."
+"Please, commit your changes before you merge."
msgstr ""
"Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n"
"съществува). Подайте промените си, преди да започнете ново сливане."
-#: builtin/merge.c:1156
+#: builtin/merge.c:1155
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
"Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n"
"съществува)."
-#: builtin/merge.c:1165
+#: builtin/merge.c:1164
msgid "You cannot combine --squash with --no-ff."
msgstr "Опцията „--squash“ е несъвместима с „--no-ff“."
-#: builtin/merge.c:1174
+#: builtin/merge.c:1173
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
"Не е указано подаване и настройката „merge.defaultToUpstream“ не е зададена."
-#: builtin/merge.c:1206
+#: builtin/merge.c:1205
msgid "Can merge only exactly one commit into empty head"
msgstr "Можете да слеете точно едно подаване във връх без история"
-#: builtin/merge.c:1209
+#: builtin/merge.c:1208
msgid "Squash commit into empty head not supported yet"
msgstr "Подаване със смачкване във връх без история все още не се поддържа"
-#: builtin/merge.c:1211
+#: builtin/merge.c:1210
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
"Понеже върхът е без история, всички сливания са тривиални, не може да се "
"извърши нетривиално сливане изисквано от опцията „--no-ff“"
-#: builtin/merge.c:1216
+#: builtin/merge.c:1215
#, c-format
msgid "%s - not something we can merge"
msgstr "„%s“ — не е нещо, което може да се слее"
-#: builtin/merge.c:1267
+#: builtin/merge.c:1266
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Подаването „%s“ е с недоверен подпис от GPG, който твърди, че е на „%s“."
-#: builtin/merge.c:1270
+#: builtin/merge.c:1269
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
"Подаването „%s“ е с неправилен подпис от GPG, който твърди, че е на „%s“."
-#: builtin/merge.c:1273
+#: builtin/merge.c:1272
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Подаването „%s“ е без подпис от GPG."
-#: builtin/merge.c:1276
+#: builtin/merge.c:1275
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Подаването „%s“ е с коректен подпис от GPG на „%s“.\n"
-#: builtin/merge.c:1357
+#: builtin/merge.c:1356
#, c-format
msgid "Updating %s..%s\n"
msgstr "Обновяване „%s..%s“\n"
-#: builtin/merge.c:1396
+#: builtin/merge.c:1395
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Проба с най-тривиалното сливане в рамките на индекса…\n"
# FIXME WTF message
-#: builtin/merge.c:1403
+#: builtin/merge.c:1402
#, c-format
msgid "Nope.\n"
-msgstr "Неуспех.\n"
+msgstr "Неуспешно сливане.\n"
-#: builtin/merge.c:1435
+#: builtin/merge.c:1434
msgid "Not possible to fast-forward, aborting."
msgstr ""
"Не може да се извърши тривиално сливане, преустановяване на действието."
-#: builtin/merge.c:1458 builtin/merge.c:1537
+#: builtin/merge.c:1457 builtin/merge.c:1536
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Привеждане на дървото към първоначалното…\n"
-#: builtin/merge.c:1462
+#: builtin/merge.c:1461
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Пробване със стратегията за сливане „%s“…\n"
-#: builtin/merge.c:1528
+#: builtin/merge.c:1527
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Никоя стратегия за сливане не може да извърши сливането.\n"
-#: builtin/merge.c:1530
+#: builtin/merge.c:1529
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Неуспешно сливане със стратегия „%s“.\n"
-#: builtin/merge.c:1539
+#: builtin/merge.c:1538
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
"Ползва се стратегията „%s“, която ще подготви дървото за коригиране на "
"ръка.\n"
-#: builtin/merge.c:1551
+#: builtin/merge.c:1550
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -7444,89 +7658,94 @@ msgstr "разрешаване на създаването на повече о
msgid "git mv [options] <source>... <destination>"
msgstr "git mv [ОПЦИЯ…] ОБЕКТ… ЦЕЛ"
+# FIXME message<
+#: builtin/mv.c:69
+#, c-format
+msgid "Directory %s is in index and no submodule?"
+msgstr "Директорията „%s“ е в индекса, но не е подмодул"
+
#: builtin/mv.c:71
+msgid "Please stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+"За да продължите, или вкарайте промените по файла „.gitmodules“ в индекса,\n"
+"или ги скатайте"
+
+# FIXME message
+#: builtin/mv.c:89
+#, c-format
+msgid "%.*s is in index"
+msgstr "„%.*s“ вече е в индекса"
+
+#: builtin/mv.c:111
msgid "force move/rename even if target exists"
msgstr "принудително преместване/преименуване дори целта да съществува"
-#: builtin/mv.c:72
+#: builtin/mv.c:112
msgid "skip move/rename errors"
msgstr "прескачане на грешките при преместване/преименуване"
-#: builtin/mv.c:122
+#: builtin/mv.c:151
+#, c-format
+msgid "destination '%s' is not a directory"
+msgstr "целта „%s“ съществува и не е директория"
+
+#: builtin/mv.c:162
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Проверка на преименуването на обект от „%s“ на „%s“\n"
-#: builtin/mv.c:126
+#: builtin/mv.c:166
msgid "bad source"
msgstr "неправилен обект"
-#: builtin/mv.c:129
+#: builtin/mv.c:169
msgid "can not move directory into itself"
msgstr "директория не може да се премести в себе си"
-#: builtin/mv.c:132
+#: builtin/mv.c:172
msgid "cannot move directory over file"
msgstr "директория не може да се премести върху файл"
-# FIXME message<
-#: builtin/mv.c:138
-#, c-format
-msgid "Huh? Directory %s is in index and no submodule?"
-msgstr "Директорията „%s“ е в индекса, но не е подмодул"
-
-#: builtin/mv.c:140 builtin/rm.c:318
-msgid "Please, stage your changes to .gitmodules or stash them to proceed"
-msgstr ""
-"За да продължите, или вкарайте промените по файла „.gitmodules“ в индекса,\n"
-"или ги скатайте"
-
-# FIXME message
-#: builtin/mv.c:156
-#, c-format
-msgid "Huh? %.*s is in index?"
-msgstr "„%.*s“ вече е в индекса"
-
-#: builtin/mv.c:169
+#: builtin/mv.c:181
msgid "source directory is empty"
msgstr "първоначалната директория е празна"
-#: builtin/mv.c:205
+#: builtin/mv.c:206
msgid "not under version control"
msgstr "не е под контрола на Git"
-#: builtin/mv.c:208
+#: builtin/mv.c:209
msgid "destination exists"
msgstr "целта съществува"
-#: builtin/mv.c:216
+#: builtin/mv.c:217
#, c-format
msgid "overwriting '%s'"
msgstr "презаписване на „%s“"
-#: builtin/mv.c:219
+#: builtin/mv.c:220
msgid "Cannot overwrite"
msgstr "Презаписването е невъзможно"
-#: builtin/mv.c:222
+#: builtin/mv.c:223
msgid "multiple sources for the same target"
msgstr "множество източници за една цел"
-#: builtin/mv.c:224
+#: builtin/mv.c:225
msgid "destination directory does not exist"
msgstr "целевата директория не съществува"
-#: builtin/mv.c:244
+#: builtin/mv.c:232
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, обект: „%s“, цел: „%s“"
-#: builtin/mv.c:254
+#: builtin/mv.c:253
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Преименуване на „%s“ на „%s“\n"
-#: builtin/mv.c:257 builtin/remote.c:725 builtin/repack.c:358
+#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:358
#, c-format
msgid "renaming '%s' failed"
msgstr "неуспешно преименуване на „%s“"
@@ -7686,119 +7905,119 @@ msgstr "git notes prune [ОПЦИЯ…]"
msgid "git notes get-ref"
msgstr "git notes get-ref"
-#: builtin/notes.c:137
+#: builtin/notes.c:136
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr "действието „show“ не може да се изпълни за обект „%s“"
-#: builtin/notes.c:141
+#: builtin/notes.c:140
msgid "could not read 'show' output"
msgstr "изведената информация от действието „show“ не може да се прочете"
-#: builtin/notes.c:149
+#: builtin/notes.c:148
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr "действието „show“ не може да се завърши за обект „%s“"
-#: builtin/notes.c:167 builtin/tag.c:477
+#: builtin/notes.c:166 builtin/tag.c:477
#, c-format
msgid "could not create file '%s'"
msgstr "файлът „%s“ не може да бъде създаден"
-#: builtin/notes.c:186
+#: builtin/notes.c:185
msgid "Please supply the note contents using either -m or -F option"
msgstr "Задайте съдържанието на бележката с някоя от опциите „-m“ или „-F“"
-#: builtin/notes.c:207 builtin/notes.c:848
+#: builtin/notes.c:206 builtin/notes.c:847
#, c-format
msgid "Removing note for object %s\n"
msgstr "Изтриване на бележката за обекта „%s“\n"
-#: builtin/notes.c:212
+#: builtin/notes.c:211
msgid "unable to write note object"
msgstr "обектът-бележка не може да бъде записан"
-#: builtin/notes.c:214
+#: builtin/notes.c:213
#, c-format
-msgid "The note contents has been left in %s"
+msgid "The note contents have been left in %s"
msgstr "Съдържанието на бележката е във файла „%s“"
-#: builtin/notes.c:248 builtin/tag.c:692
+#: builtin/notes.c:247 builtin/tag.c:693
#, c-format
msgid "cannot read '%s'"
msgstr "файлът „%s“ не може да бъде прочетен"
-#: builtin/notes.c:250 builtin/tag.c:695
+#: builtin/notes.c:249 builtin/tag.c:696
#, c-format
msgid "could not open or read '%s'"
msgstr "файлът „%s“ не може да бъде отворен или прочетен"
-#: builtin/notes.c:269 builtin/notes.c:320 builtin/notes.c:322
-#: builtin/notes.c:382 builtin/notes.c:436 builtin/notes.c:519
-#: builtin/notes.c:524 builtin/notes.c:599 builtin/notes.c:641
-#: builtin/notes.c:843 builtin/tag.c:708
+#: builtin/notes.c:268 builtin/notes.c:319 builtin/notes.c:321
+#: builtin/notes.c:381 builtin/notes.c:435 builtin/notes.c:518
+#: builtin/notes.c:523 builtin/notes.c:598 builtin/notes.c:640
+#: builtin/notes.c:842 builtin/tag.c:709
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Не може да се открие към какво сочи „%s“."
-#: builtin/notes.c:272
+#: builtin/notes.c:271
#, c-format
msgid "Failed to read object '%s'."
msgstr "Обектът „%s“ не може да бъде прочетен."
-#: builtin/notes.c:276
+#: builtin/notes.c:275
#, c-format
msgid "Cannot read note data from non-blob object '%s'."
msgstr ""
"Съдържанието на бележка не може да се вземе от обект, който не е BLOB: „%s“."
-#: builtin/notes.c:316
+#: builtin/notes.c:315
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Даденият входен ред е с неправилен формат: „%s“."
-#: builtin/notes.c:331
+#: builtin/notes.c:330
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Бележката не може да се копира от „%s“ към „%s“"
-#: builtin/notes.c:375 builtin/notes.c:429 builtin/notes.c:502
-#: builtin/notes.c:514 builtin/notes.c:587 builtin/notes.c:634
-#: builtin/notes.c:908
+#: builtin/notes.c:374 builtin/notes.c:428 builtin/notes.c:501
+#: builtin/notes.c:513 builtin/notes.c:586 builtin/notes.c:633
+#: builtin/notes.c:907
msgid "too many parameters"
msgstr "прекалено много параметри"
-#: builtin/notes.c:388 builtin/notes.c:647
+#: builtin/notes.c:387 builtin/notes.c:646
#, c-format
msgid "No note found for object %s."
msgstr "Няма бележки за обекта „%s“."
-#: builtin/notes.c:410 builtin/notes.c:567
+#: builtin/notes.c:409 builtin/notes.c:566
msgid "note contents as a string"
msgstr "низ, който е съдържанието на бележката"
-#: builtin/notes.c:413 builtin/notes.c:570
+#: builtin/notes.c:412 builtin/notes.c:569
msgid "note contents in a file"
msgstr "файл със съдържанието на бележката"
-#: builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:572
-#: builtin/notes.c:575 builtin/tag.c:627
+#: builtin/notes.c:414 builtin/notes.c:417 builtin/notes.c:571
+#: builtin/notes.c:574 builtin/tag.c:628
msgid "object"
msgstr "обект"
-#: builtin/notes.c:416 builtin/notes.c:573
+#: builtin/notes.c:415 builtin/notes.c:572
msgid "reuse and edit specified note object"
msgstr "преизползване и редактиране на указания обект-бележка"
-#: builtin/notes.c:419 builtin/notes.c:576
+#: builtin/notes.c:418 builtin/notes.c:575
msgid "reuse specified note object"
msgstr "преизползване на указания обект-бележка"
-#: builtin/notes.c:421 builtin/notes.c:489
+#: builtin/notes.c:420 builtin/notes.c:488
msgid "replace existing notes"
msgstr "замяна на съществуващите бележки"
-#: builtin/notes.c:455
+#: builtin/notes.c:454
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -7807,27 +8026,27 @@ msgstr ""
"Не може да се добави бележка, защото такава вече съществува за обекта „%s“. "
"Използвайте опцията „-f“, за да презапишете съществуващи бележки."
-#: builtin/notes.c:460 builtin/notes.c:537
+#: builtin/notes.c:459 builtin/notes.c:536
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Презаписване на съществуващите бележки за обекта „%s“\n"
-#: builtin/notes.c:490
+#: builtin/notes.c:489
msgid "read objects from stdin"
msgstr "изчитане на обектите от стандартния вход"
# FIXME imporve message
-#: builtin/notes.c:492
+#: builtin/notes.c:491
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"зареждане на настройките за КОМАНДАта, която презаписва подавания (включва "
"опцията „--stdin“)"
-#: builtin/notes.c:510
+#: builtin/notes.c:509
msgid "too few parameters"
msgstr "прекалено малко параметри"
-#: builtin/notes.c:531
+#: builtin/notes.c:530
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -7836,14 +8055,14 @@ msgstr ""
"Не може да се копира бележка, защото такава вече съществува за обекта „%s“. "
"Използвайте опцията „-f“, за да презапишете съществуващи бележки."
-#: builtin/notes.c:543
+#: builtin/notes.c:542
#, c-format
msgid "Missing notes on source object %s. Cannot copy."
msgstr ""
"Не може да се копира бележка, която не съществува — няма бележки за обекта-"
"източник „%s“."
-#: builtin/notes.c:592
+#: builtin/notes.c:591
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -7854,15 +8073,15 @@ msgstr ""
"Вместо това ги използвайте с командата „add“: „git notes add -f -m/-F/-c/-"
"C“.\n"
-#: builtin/notes.c:739
+#: builtin/notes.c:738
msgid "General options"
msgstr "Общи опции"
-#: builtin/notes.c:741
+#: builtin/notes.c:740
msgid "Merge options"
msgstr "Опции при сливане"
-#: builtin/notes.c:743
+#: builtin/notes.c:742
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -7872,242 +8091,246 @@ msgstr ""
"„union“ (обединяване), „cat_sort_uniq“ (обединяване, подреждане, уникални "
"резултати)"
-#: builtin/notes.c:745
+#: builtin/notes.c:744
msgid "Committing unmerged notes"
msgstr "Подаване на неслети бележки"
-#: builtin/notes.c:747
+#: builtin/notes.c:746
msgid "finalize notes merge by committing unmerged notes"
msgstr "завършване на сливането чрез подаване на неслети бележки"
-#: builtin/notes.c:749
+#: builtin/notes.c:748
msgid "Aborting notes merge resolution"
msgstr "Преустановяване на корекцията при сливането на бележки"
-#: builtin/notes.c:751
+#: builtin/notes.c:750
msgid "abort notes merge"
msgstr "преустановяване на сливането на бележки"
-#: builtin/notes.c:846
+#: builtin/notes.c:845
#, c-format
msgid "Object %s has no note\n"
msgstr "Няма бележки за обекта „%s“\n"
-#: builtin/notes.c:858
+#: builtin/notes.c:857
msgid "attempt to remove non-existent note is not an error"
msgstr "опитът за изтриването на несъществуваща бележка не се счита за грешка"
-#: builtin/notes.c:861
+#: builtin/notes.c:860
msgid "read object names from the standard input"
msgstr "изчитане на имената на обектите от стандартния вход"
-#: builtin/notes.c:942
+#: builtin/notes.c:941
msgid "notes-ref"
msgstr "УКАЗАТЕЛ_ЗА_БЕЛЕЖКА"
-#: builtin/notes.c:943
+#: builtin/notes.c:942
msgid "use notes from <notes_ref>"
msgstr "да се използва бележката сочена от този УКАЗАТЕЛ_ЗА_БЕЛЕЖКА"
-#: builtin/notes.c:978 builtin/remote.c:1616
+#: builtin/notes.c:977 builtin/remote.c:1624
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Непозната подкоманда: %s"
-#: builtin/pack-objects.c:25
+#: builtin/pack-objects.c:28
msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
msgstr ""
"git pack-objects --stdout [ОПЦИЯ…] [< СПИСЪК_С_ВЕРСИИ | < СПИСЪК_С_ОБЕКТИ]"
# FIXME [options] vs [options...]
-#: builtin/pack-objects.c:26
+#: builtin/pack-objects.c:29
msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
msgstr ""
"git pack-objects [ОПЦИЯ…] ПРЕФИКС_НА_ИМЕТО [< СПИСЪК_С_ВЕРСИИ | < "
"СПИСЪК_С_ОБЕКТИ]"
-#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
+#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
#, c-format
msgid "deflate error (%d)"
msgstr "грешка при декомпресиране с „deflate“ (%d)"
-#: builtin/pack-objects.c:771
+#: builtin/pack-objects.c:773
msgid "Writing objects"
msgstr "Записване на обектите"
-#: builtin/pack-objects.c:1012
+#: builtin/pack-objects.c:1015
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"изключване на записването на битовата маска, защото някои обекти няма да се "
"пакетират"
-#: builtin/pack-objects.c:2174
+#: builtin/pack-objects.c:2175
msgid "Compressing objects"
msgstr "Компресиране на обектите"
-#: builtin/pack-objects.c:2526
+#: builtin/pack-objects.c:2572
#, c-format
msgid "unsupported index version %s"
msgstr "неподдържана версия на индекса „%s“"
-#: builtin/pack-objects.c:2530
+#: builtin/pack-objects.c:2576
#, c-format
msgid "bad index version '%s'"
msgstr "неправилна версия на индекса „%s“"
-#: builtin/pack-objects.c:2553
+#: builtin/pack-objects.c:2599
#, c-format
msgid "option %s does not accept negative form"
msgstr "опцията „%s“ не притежава отрицателна версия"
-#: builtin/pack-objects.c:2557
+#: builtin/pack-objects.c:2603
#, c-format
msgid "unable to parse value '%s' for option %s"
msgstr "неразпозната стойност „%s“ за опцията „%s“"
-#: builtin/pack-objects.c:2576
+#: builtin/pack-objects.c:2622
msgid "do not show progress meter"
msgstr "без извеждане на напредъка"
-#: builtin/pack-objects.c:2578
+#: builtin/pack-objects.c:2624
msgid "show progress meter"
msgstr "извеждане на напредъка"
-#: builtin/pack-objects.c:2580
+#: builtin/pack-objects.c:2626
msgid "show progress meter during object writing phase"
msgstr "извеждане на напредъка във фазата на запазване на обектите"
-#: builtin/pack-objects.c:2583
+#: builtin/pack-objects.c:2629
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
"същото действие като опцията „--all-progress“ при извеждането на напредъка"
-#: builtin/pack-objects.c:2584
+#: builtin/pack-objects.c:2630
msgid "version[,offset]"
msgstr "ВЕРСИЯ[,ОТМЕСТВАНЕ]"
-#: builtin/pack-objects.c:2585
+#: builtin/pack-objects.c:2631
msgid "write the pack index file in the specified idx format version"
msgstr ""
"запазване на индекса на пакетните файлове във форма̀та с указаната версия"
-#: builtin/pack-objects.c:2588
+#: builtin/pack-objects.c:2634
msgid "maximum size of each output pack file"
msgstr "максимален размер на всеки пакетен файл"
-#: builtin/pack-objects.c:2590
+#: builtin/pack-objects.c:2636
msgid "ignore borrowed objects from alternate object store"
msgstr "игнориране на обектите заети от други хранилища на обекти"
-#: builtin/pack-objects.c:2592
+#: builtin/pack-objects.c:2638
msgid "ignore packed objects"
msgstr "игнориране на пакетираните обекти"
-#: builtin/pack-objects.c:2594
+#: builtin/pack-objects.c:2640
msgid "limit pack window by objects"
msgstr "ограничаване на прозореца за пакетиране по брой обекти"
-#: builtin/pack-objects.c:2596
+#: builtin/pack-objects.c:2642
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"ограничаване на прозореца за пакетиране и по памет освен по брой обекти"
-#: builtin/pack-objects.c:2598
+#: builtin/pack-objects.c:2644
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
"максимална дължина на веригата от разлики, която е позволена в пакетния файл"
-#: builtin/pack-objects.c:2600
+#: builtin/pack-objects.c:2646
msgid "reuse existing deltas"
msgstr "преизползване на съществуващите разлики"
-#: builtin/pack-objects.c:2602
+#: builtin/pack-objects.c:2648
msgid "reuse existing objects"
msgstr "преизползване на съществуващите обекти"
-#: builtin/pack-objects.c:2604
+#: builtin/pack-objects.c:2650
msgid "use OFS_DELTA objects"
msgstr "използване на обекти „OFS_DELTA“"
-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2652
msgid "use threads when searching for best delta matches"
msgstr ""
"стартиране на нишки за претърсване на най-добрите съвпадения на разликите"
-#: builtin/pack-objects.c:2608
+#: builtin/pack-objects.c:2654
msgid "do not create an empty pack output"
msgstr "без създаване на празен пакетен файл"
-#: builtin/pack-objects.c:2610
+#: builtin/pack-objects.c:2656
msgid "read revision arguments from standard input"
msgstr "изчитане на версиите от стандартния вход"
-#: builtin/pack-objects.c:2612
+#: builtin/pack-objects.c:2658
msgid "limit the objects to those that are not yet packed"
msgstr "ограничаване до все още непакетираните обекти"
-#: builtin/pack-objects.c:2615
+#: builtin/pack-objects.c:2661
msgid "include objects reachable from any reference"
msgstr ""
"включване на всички обекти, които могат да се достигнат от произволен "
"указател"
-#: builtin/pack-objects.c:2618
+#: builtin/pack-objects.c:2664
msgid "include objects referred by reflog entries"
msgstr "включване и на обектите сочени от записите в журнала на указателите"
-#: builtin/pack-objects.c:2621
+#: builtin/pack-objects.c:2667
+msgid "include objects referred to by the index"
+msgstr "включване и на обектите сочени от индекса"
+
+#: builtin/pack-objects.c:2670
msgid "output pack to stdout"
msgstr "извеждане на пакета на стандартния изход"
-#: builtin/pack-objects.c:2623
+#: builtin/pack-objects.c:2672
msgid "include tag objects that refer to objects to be packed"
msgstr ""
"включване и на обектите-етикети, които сочат към обектите, които ще бъдат "
"пакетирани"
-#: builtin/pack-objects.c:2625
+#: builtin/pack-objects.c:2674
msgid "keep unreachable objects"
msgstr "запазване на недостижимите обекти"
-#: builtin/pack-objects.c:2626 parse-options.h:140
+#: builtin/pack-objects.c:2675 parse-options.h:140
msgid "time"
msgstr "ВРЕМЕ"
-#: builtin/pack-objects.c:2627
+#: builtin/pack-objects.c:2676
msgid "unpack unreachable objects newer than <time>"
msgstr "разпакетиране на недостижимите обекти, които са по-нови от това ВРЕМЕ"
-#: builtin/pack-objects.c:2630
+#: builtin/pack-objects.c:2679
msgid "create thin packs"
msgstr "създаване на съкратени пакети"
-#: builtin/pack-objects.c:2632
+#: builtin/pack-objects.c:2681
msgid "ignore packs that have companion .keep file"
msgstr "игнориране на пакетите, които са придружени от файл „.keep“"
-#: builtin/pack-objects.c:2634
+#: builtin/pack-objects.c:2683
msgid "pack compression level"
msgstr "ниво на компресиране при пакетиране"
-#: builtin/pack-objects.c:2636
+#: builtin/pack-objects.c:2685
msgid "do not hide commits by grafts"
msgstr ""
"извеждане на всички родители — дори и тези, които нормално са скрити при "
"присажданията"
-#: builtin/pack-objects.c:2638
+#: builtin/pack-objects.c:2687
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"използване на съществуващи индекси на база битови маски за ускоряване на "
"преброяването на обектите"
-#: builtin/pack-objects.c:2640
+#: builtin/pack-objects.c:2689
msgid "write a bitmap index together with the pack index"
msgstr ""
"запазване и на индекс на база побитова маска, заедно с индекса за пакета"
-#: builtin/pack-objects.c:2719
+#: builtin/pack-objects.c:2778
msgid "Counting objects"
msgstr "Преброяване на обектите"
@@ -8127,7 +8350,7 @@ msgstr "окастряне на недостижимите указатели (
msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"
-#: builtin/prune-packed.c:49
+#: builtin/prune-packed.c:40
msgid "Removing duplicate objects"
msgstr "Изтриване на повтарящите се обекти"
@@ -8135,15 +8358,15 @@ msgstr "Изтриване на повтарящите се обекти"
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire ВРЕМЕ] [--] [ВРЪХ…]"
-#: builtin/prune.c:142
+#: builtin/prune.c:106
msgid "do not remove, show only"
msgstr "само извеждане без действително окастряне"
-#: builtin/prune.c:143
+#: builtin/prune.c:107
msgid "report pruned objects"
msgstr "информация за окастрените обекти"
-#: builtin/prune.c:146
+#: builtin/prune.c:110
msgid "expire objects older than <time>"
msgstr "окастряне на обектите по-стари от това ВРЕМЕ"
@@ -8420,83 +8643,83 @@ msgstr "опцията „--mirror“ е несъвместима с указв
msgid "--all and --mirror are incompatible"
msgstr "опциите „--all“ и „--mirror“ са несъвместими"
-#: builtin/push.c:482
+#: builtin/push.c:493
msgid "repository"
msgstr "хранилище"
-#: builtin/push.c:483
+#: builtin/push.c:494
msgid "push all refs"
msgstr "изтласкване на всички указатели"
-#: builtin/push.c:484
+#: builtin/push.c:495
msgid "mirror all refs"
msgstr "огледално копие на всички указатели"
-#: builtin/push.c:486
+#: builtin/push.c:497
msgid "delete refs"
msgstr "изтриване на указателите"
-#: builtin/push.c:487
+#: builtin/push.c:498
msgid "push tags (can't be used with --all or --mirror)"
msgstr "изтласкване на етикетите (несъвместимо с опциите „--all“ и „--mirror“)"
-#: builtin/push.c:490
+#: builtin/push.c:501
msgid "force updates"
msgstr "принудително обновяване"
# FIXME double check this
-#: builtin/push.c:492
+#: builtin/push.c:503
msgid "refname>:<expect"
msgstr "УКАЗАТЕЛ>:<ОЧАКВАНА_СТОЙНОСТ"
-#: builtin/push.c:493
+#: builtin/push.c:504
msgid "require old value of ref to be at this value"
msgstr "УКАЗАТЕЛят трябва първоначално да е с тази ОЧАКВАНА_СТОЙНОСТ"
-#: builtin/push.c:495
-msgid "check"
-msgstr "проверка"
-
-#: builtin/push.c:496
+#: builtin/push.c:507
msgid "control recursive pushing of submodules"
msgstr "управление на рекурсивното изтласкване на подмодулите"
-#: builtin/push.c:498
+#: builtin/push.c:509
msgid "use thin pack"
msgstr "използване на съкратени пакети"
-#: builtin/push.c:499 builtin/push.c:500
+#: builtin/push.c:510 builtin/push.c:511
msgid "receive pack program"
msgstr "програма за получаването на пакети"
-#: builtin/push.c:501
+#: builtin/push.c:512
msgid "set upstream for git pull/status"
msgstr "задаване на отдалеченото хранилище за командите „git pull/status“"
-#: builtin/push.c:504
+#: builtin/push.c:515
msgid "prune locally removed refs"
msgstr "окастряне на указателите, които са премахнати от локалното хранилище"
-#: builtin/push.c:506
+#: builtin/push.c:517
msgid "bypass pre-push hook"
msgstr "без изпълнение на куката преди изтласкване (pre-push)"
-#: builtin/push.c:507
+#: builtin/push.c:518
msgid "push missing but relevant tags"
msgstr ""
"изтласкване на липсващите в отдалеченото хранилище, но свързани с текущото "
"изтласкване, етикети"
-#: builtin/push.c:517
+#: builtin/push.c:520
+msgid "GPG sign the push"
+msgstr "подписване на изтласкването с GPG"
+
+#: builtin/push.c:529
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
"опцията „--delete“ е несъвместима с опциите „--all“, „--mirror“ и „--tags“"
-#: builtin/push.c:519
+#: builtin/push.c:531
msgid "--delete doesn't make sense without any refs"
msgstr "опцията „--delete“ изисква поне един указател на версия"
-#: builtin/read-tree.c:36
+#: builtin/read-tree.c:37
msgid ""
"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
@@ -8507,67 +8730,67 @@ msgstr ""
"checkout] [--index-output=ФАЙЛ] (--empty | УКАЗАТЕЛ_КЪМ_ДЪРВО_1 "
"[УКАЗАТЕЛ_КЪМ_ДЪРВО_2 [УКАЗАТЕЛ_КЪМ_ДЪРВО_3]])"
-#: builtin/read-tree.c:109
+#: builtin/read-tree.c:110
msgid "write resulting index to <file>"
msgstr "запазване на индекса в този ФАЙЛ"
-#: builtin/read-tree.c:112
+#: builtin/read-tree.c:113
msgid "only empty the index"
msgstr "само зануляване на индекса"
-#: builtin/read-tree.c:114
+#: builtin/read-tree.c:115
msgid "Merging"
msgstr "Сливане"
-#: builtin/read-tree.c:116
+#: builtin/read-tree.c:117
msgid "perform a merge in addition to a read"
msgstr "да се извърши и сливане след освен изчитането"
-#: builtin/read-tree.c:118
+#: builtin/read-tree.c:119
msgid "3-way merge if no file level merging required"
msgstr "тройно сливане, ако не се налага пофайлово сливане"
-#: builtin/read-tree.c:120
+#: builtin/read-tree.c:121
msgid "3-way merge in presence of adds and removes"
msgstr "тройно сливане при добавяне на добавяне и изтриване на файлове"
-#: builtin/read-tree.c:122
+#: builtin/read-tree.c:123
msgid "same as -m, but discard unmerged entries"
msgstr "същото като опцията „-m“, но неслетите обекти се пренебрегват"
-#: builtin/read-tree.c:123
+#: builtin/read-tree.c:124
msgid "<subdirectory>/"
msgstr "ПОДДИРЕКТОРИЯ/"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:125
msgid "read the tree into the index under <subdirectory>/"
msgstr "изчитане на дървото към индекса като да е в тази ПОДДИРЕКТОРИЯ/"
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:128
msgid "update working tree with merge result"
msgstr "обновяване на работното дърво с резултата от сливането"
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:130
msgid "gitignore"
msgstr "ФАЙЛ_С_ИЗКЛЮЧЕНИЯ"
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:131
msgid "allow explicitly ignored files to be overwritten"
msgstr "позволяване на презаписването на изрично пренебрегваните файлове"
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:134
msgid "don't check the working tree after merging"
msgstr "без проверка на работното дърво след сливането"
-#: builtin/read-tree.c:134
+#: builtin/read-tree.c:135
msgid "don't update the index or the work tree"
msgstr "без обновяване и на индекса, и на работното дърво"
-#: builtin/read-tree.c:136
+#: builtin/read-tree.c:137
msgid "skip applying sparse checkout filter"
msgstr "без прилагане на филтъра за частично изтегляне"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:139
msgid "debug unpack-trees"
msgstr "изчистване на грешки в командата „unpack-trees“"
@@ -8724,12 +8947,12 @@ msgstr ""
"указването на следени клони е смислено само за отдалечени хранилища, от "
"които се доставя"
-#: builtin/remote.c:185 builtin/remote.c:640
+#: builtin/remote.c:185 builtin/remote.c:641
#, c-format
msgid "remote %s already exists."
msgstr "вече съществува отдалечено хранилище с име „%s“."
-#: builtin/remote.c:189 builtin/remote.c:644
+#: builtin/remote.c:189 builtin/remote.c:645
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "„%s“ е неправилно име за отдалечено хранилище"
@@ -8739,11 +8962,6 @@ msgstr "„%s“ е неправилно име за отдалечено хра
msgid "Could not setup master '%s'"
msgstr "Основният клон „%s“ не може да бъде настроен"
-#: builtin/remote.c:288
-#, c-format
-msgid "more than one %s"
-msgstr "повече от едно отдалечено хранилище на име „%s“"
-
#: builtin/remote.c:333
#, c-format
msgid "Could not get fetch map for refspec %s"
@@ -8757,28 +8975,28 @@ msgstr "(съвпадащи)"
msgid "(delete)"
msgstr "(за изтриване)"
-#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601
+#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602
#, c-format
msgid "Could not append '%s' to '%s'"
msgstr "„%s“ не може да се добави към „%s“"
-#: builtin/remote.c:633 builtin/remote.c:794 builtin/remote.c:894
+#: builtin/remote.c:634 builtin/remote.c:798 builtin/remote.c:898
#, c-format
msgid "No such remote: %s"
msgstr "Такова отдалечено хранилище няма: %s"
-#: builtin/remote.c:650
+#: builtin/remote.c:651
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Разделът „%s“ в настройките не може да бъде преименуван на „%s“"
-#: builtin/remote.c:656 builtin/remote.c:846
+#: builtin/remote.c:657 builtin/remote.c:850
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Разделът „%s“ в настройките не може да бъде изтрит"
# FIXME tabulator
-#: builtin/remote.c:671
+#: builtin/remote.c:672
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -8789,32 +9007,32 @@ msgstr ""
" %s\n"
" Променете настройките ръчно, ако е необходимо."
-#: builtin/remote.c:677
+#: builtin/remote.c:678
#, c-format
msgid "Could not append '%s'"
msgstr "Разделът „%s“ не може да бъде добавен в настройките"
-#: builtin/remote.c:688
+#: builtin/remote.c:689
#, c-format
msgid "Could not set '%s'"
msgstr "Разделът „%s“ не може да бъде зададен в настройките"
-#: builtin/remote.c:710
+#: builtin/remote.c:711
#, c-format
msgid "deleting '%s' failed"
msgstr "неуспешно изтриване на „%s“"
-#: builtin/remote.c:744
+#: builtin/remote.c:745
#, c-format
msgid "creating '%s' failed"
msgstr "неуспешно създаване на „%s“"
-#: builtin/remote.c:765
+#: builtin/remote.c:769
#, c-format
msgid "Could not remove branch %s"
msgstr "Клонът „%s“ не може да бъде изтрит"
-#: builtin/remote.c:832
+#: builtin/remote.c:836
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -8828,125 +9046,125 @@ msgstr[1] ""
"Бележка: Няколко клона извън йерархията „refs/remotes/“ не бяха изтрити.\n"
"Изтрийте ги чрез командата:"
-#: builtin/remote.c:947
+#: builtin/remote.c:951
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " нов (следващото доставяне ще го разположи в „remotes/%s“)"
-#: builtin/remote.c:950
+#: builtin/remote.c:954
msgid " tracked"
msgstr " следен"
-#: builtin/remote.c:952
+#: builtin/remote.c:956
msgid " stale (use 'git remote prune' to remove)"
msgstr " стар (изтрийте чрез „git remote prune“)"
# FIXME
-#: builtin/remote.c:954
+#: builtin/remote.c:958
msgid " ???"
-msgstr " неясно"
+msgstr " неясно състояние"
# CHECK
-#: builtin/remote.c:995
+#: builtin/remote.c:999
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
"неправилен клон за сливане „%s“. Невъзможно е да пребазирате върху повече от "
"1 клон"
-#: builtin/remote.c:1002
+#: builtin/remote.c:1006
#, c-format
msgid "rebases onto remote %s"
msgstr "пребазиране върху отдалечения клон „%s“"
-#: builtin/remote.c:1005
+#: builtin/remote.c:1009
#, c-format
msgid " merges with remote %s"
msgstr " сливане с отдалечения клон „%s“"
-#: builtin/remote.c:1006
+#: builtin/remote.c:1010
msgid " and with remote"
msgstr " и с отдалечения клон"
-#: builtin/remote.c:1008
+#: builtin/remote.c:1012
#, c-format
msgid "merges with remote %s"
msgstr "сливане с отдалечения клон „%s“"
-#: builtin/remote.c:1009
+#: builtin/remote.c:1013
msgid " and with remote"
msgstr " и с отдалечения клон"
-#: builtin/remote.c:1055
+#: builtin/remote.c:1059
msgid "create"
msgstr "създаден"
-#: builtin/remote.c:1058
+#: builtin/remote.c:1062
msgid "delete"
msgstr "изтрит"
-#: builtin/remote.c:1062
+#: builtin/remote.c:1066
msgid "up to date"
msgstr "актуален"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1069
msgid "fast-forwardable"
msgstr "може да се слее тривиално"
-#: builtin/remote.c:1068
+#: builtin/remote.c:1072
msgid "local out of date"
msgstr "локалният е изостанал"
-#: builtin/remote.c:1075
+#: builtin/remote.c:1079
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s принудително изтласква към %-*s (%s)"
-#: builtin/remote.c:1078
+#: builtin/remote.c:1082
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s изтласква към %-*s (%s)"
-#: builtin/remote.c:1082
+#: builtin/remote.c:1086
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s принудително изтласква към %s"
-#: builtin/remote.c:1085
+#: builtin/remote.c:1089
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s изтласква към %s"
-#: builtin/remote.c:1153
+#: builtin/remote.c:1157
msgid "do not query remotes"
msgstr "без заявки към отдалечените хранилища"
-#: builtin/remote.c:1180
+#: builtin/remote.c:1184
#, c-format
msgid "* remote %s"
msgstr "● отдалечено хранилище „%s“"
-#: builtin/remote.c:1181
+#: builtin/remote.c:1185
#, c-format
msgid " Fetch URL: %s"
msgstr " Адрес за доставяне: %s"
-#: builtin/remote.c:1182 builtin/remote.c:1329
+#: builtin/remote.c:1186 builtin/remote.c:1333
msgid "(no URL)"
msgstr "(без адрес)"
# FIXME spaces betwen Push and URL
-#: builtin/remote.c:1191 builtin/remote.c:1193
+#: builtin/remote.c:1195 builtin/remote.c:1197
#, c-format
msgid " Push URL: %s"
msgstr " Адрес за изтласкване: %s"
-#: builtin/remote.c:1195 builtin/remote.c:1197 builtin/remote.c:1199
+#: builtin/remote.c:1199 builtin/remote.c:1201 builtin/remote.c:1203
#, c-format
msgid " HEAD branch: %s"
msgstr " клон сочен от HEAD: %s"
-#: builtin/remote.c:1201
+#: builtin/remote.c:1205
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -8955,146 +9173,146 @@ msgstr ""
"хранилище е\n"
" нееднозначен и е някой от следните):\n"
-#: builtin/remote.c:1213
+#: builtin/remote.c:1217
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Отдалечен клон:%s"
msgstr[1] " Отдалечени клони:%s"
-#: builtin/remote.c:1216 builtin/remote.c:1243
+#: builtin/remote.c:1220 builtin/remote.c:1247
msgid " (status not queried)"
msgstr " (състоянието не бе проверено)"
-#: builtin/remote.c:1225
+#: builtin/remote.c:1229
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Локален клон настроен за издърпване чрез „git pull“:"
msgstr[1] " Локални клони настроени за издърпване чрез „git pull“:"
-#: builtin/remote.c:1233
+#: builtin/remote.c:1237
msgid " Local refs will be mirrored by 'git push'"
msgstr " Локалните указатели ще бъдат пренесени чрез „ push“"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1244
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Локалният указател, настроен за „git push“%s:"
msgstr[1] " Локалните указатели, настроени за „git push“%s:"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1265
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "задаване на refs/remotes/ИМЕ/HEAD според отдалеченото хранилище"
-#: builtin/remote.c:1263
+#: builtin/remote.c:1267
msgid "delete refs/remotes/<name>/HEAD"
msgstr "изтриване на refs/remotes/ИМЕ/HEAD"
-#: builtin/remote.c:1278
+#: builtin/remote.c:1282
msgid "Cannot determine remote HEAD"
msgstr "Не може да се установи отдалеченият връх"
-#: builtin/remote.c:1280
+#: builtin/remote.c:1284
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
"Множество клони с върхове. Изберете изрично някой от тях чрез командата:"
-#: builtin/remote.c:1290
+#: builtin/remote.c:1294
#, c-format
msgid "Could not delete %s"
msgstr "„%s“ не може да бъде изтрит"
-#: builtin/remote.c:1298
+#: builtin/remote.c:1302
#, c-format
msgid "Not a valid ref: %s"
msgstr "Неправилен указател: %s"
-#: builtin/remote.c:1300
+#: builtin/remote.c:1304
#, c-format
msgid "Could not setup %s"
msgstr "„%s“ не може да се настрои"
-#: builtin/remote.c:1318
+#: builtin/remote.c:1322
#, c-format
msgid " %s will become dangling!"
msgstr "„%s“ ще се превърне в обект извън клоните!"
-#: builtin/remote.c:1319
+#: builtin/remote.c:1323
#, c-format
msgid " %s has become dangling!"
msgstr "„%s“ се превърна в обект извън клоните!"
-#: builtin/remote.c:1325
+#: builtin/remote.c:1329
#, c-format
msgid "Pruning %s"
msgstr "Окастряне на „%s“"
-#: builtin/remote.c:1326
+#: builtin/remote.c:1330
#, c-format
msgid "URL: %s"
msgstr "адрес: %s"
-#: builtin/remote.c:1349
+#: builtin/remote.c:1357
#, c-format
msgid " * [would prune] %s"
msgstr " ● [ще бъде окастрено] %s"
-#: builtin/remote.c:1352
+#: builtin/remote.c:1360
#, c-format
msgid " * [pruned] %s"
msgstr " ● [окастрено] %s"
-#: builtin/remote.c:1397
+#: builtin/remote.c:1405
msgid "prune remotes after fetching"
msgstr "окастряне на огледалата на отдалечените хранилища след доставяне"
-#: builtin/remote.c:1463 builtin/remote.c:1537
+#: builtin/remote.c:1471 builtin/remote.c:1545
#, c-format
msgid "No such remote '%s'"
msgstr "Няма отдалечено хранилище на име „%s“"
-#: builtin/remote.c:1483
+#: builtin/remote.c:1491
msgid "add branch"
msgstr "добавяне на клон"
-#: builtin/remote.c:1490
+#: builtin/remote.c:1498
msgid "no remote specified"
msgstr "не е указано отдалечено хранилище"
-#: builtin/remote.c:1512
+#: builtin/remote.c:1520
msgid "manipulate push URLs"
msgstr "промяна на адресите за изтласкване"
-#: builtin/remote.c:1514
+#: builtin/remote.c:1522
msgid "add URL"
msgstr "добавяне на адреси"
-#: builtin/remote.c:1516
+#: builtin/remote.c:1524
msgid "delete URLs"
msgstr "изтриване на адреси"
# FIXME message - incompatible
-#: builtin/remote.c:1523
+#: builtin/remote.c:1531
msgid "--add --delete doesn't make sense"
msgstr "опциите „--add“ и „--delete“ са несъвместими"
-#: builtin/remote.c:1563
+#: builtin/remote.c:1571
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Неправилен (стар) формат за адрес: %s"
-#: builtin/remote.c:1571
+#: builtin/remote.c:1579
#, c-format
msgid "No such URL found: %s"
msgstr "Такъв адрес не е открит: %s"
# FIXME CHECK MEANING
-#: builtin/remote.c:1573
+#: builtin/remote.c:1581
msgid "Will not delete all non-push URLs"
msgstr "Никой от адресите, които не са за изтласкване, няма да се изтрие"
-#: builtin/remote.c:1587
+#: builtin/remote.c:1595
msgid "be verbose; must be placed before a subcommand"
msgstr "повече подробности. Поставя се пред подкоманда"
@@ -9200,22 +9418,22 @@ msgstr "git replace -d ОБЕКТ…"
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=ФОРМАТ] [-l [ШАБЛОН]]"
-#: builtin/replace.c:322 builtin/replace.c:360 builtin/replace.c:388
+#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
#, c-format
msgid "Not a valid object name: '%s'"
msgstr "Неправилно име на обект: „%s“"
-#: builtin/replace.c:352
+#: builtin/replace.c:355
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "етикетът при сливане в подаването „%s“ e неправилен"
-#: builtin/replace.c:354
+#: builtin/replace.c:357
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "етикетът при сливане в подаването „%s“ e неправилен"
-#: builtin/replace.c:365
+#: builtin/replace.c:368
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -9224,45 +9442,45 @@ msgstr ""
"Първоначалното подаване „%s“ съдържа етикета при сливане „%s“, който е "
"изхвърлен, затова използвайте опцията „--edit“, а не „--graft“."
-#: builtin/replace.c:398
+#: builtin/replace.c:401
#, c-format
msgid "the original commit '%s' has a gpg signature."
msgstr "Първоначалното подаване „%s“ е с подпис на GPG."
-#: builtin/replace.c:399
+#: builtin/replace.c:402
msgid "the signature will be removed in the replacement commit!"
msgstr "Подписът ще бъде премахнат в заменящото подаване!"
-#: builtin/replace.c:405
+#: builtin/replace.c:408
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "заменящото подаване за „%s“ не може да бъде записано"
-#: builtin/replace.c:429
+#: builtin/replace.c:432
msgid "list replace refs"
msgstr "извеждане на списъка с указателите за замяна"
-#: builtin/replace.c:430
+#: builtin/replace.c:433
msgid "delete replace refs"
msgstr "изтриване на указателите за замяна"
-#: builtin/replace.c:431
+#: builtin/replace.c:434
msgid "edit existing object"
msgstr "редактиране на съществуващ обект"
-#: builtin/replace.c:432
+#: builtin/replace.c:435
msgid "change a commit's parents"
msgstr "смяна на родителите на подаване"
-#: builtin/replace.c:433
+#: builtin/replace.c:436
msgid "replace the ref if it exists"
msgstr "замяна на указателя, ако съществува"
-#: builtin/replace.c:434
+#: builtin/replace.c:437
msgid "do not pretty-print contents for --edit"
msgstr "без форматирано извеждане на съдържанието — за опцията „--edit“"
-#: builtin/replace.c:435
+#: builtin/replace.c:438
msgid "use this format"
msgstr "използване на този ФОРМАТ"
@@ -9274,160 +9492,160 @@ msgstr "git rerere [clear | forget ПЪТ… | status | remaining | diff | gc]"
msgid "register clean resolutions in index"
msgstr "регистриране на чисти корекции на конфликти в индекса"
-#: builtin/reset.c:25
+#: builtin/reset.c:26
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [ПОДАВАНЕ]"
-#: builtin/reset.c:26
+#: builtin/reset.c:27
msgid "git reset [-q] <tree-ish> [--] <paths>..."
msgstr "git reset [-q] УКАЗАТЕЛ_КЪМ_ДЪРВО [--] ПЪТИЩА…"
-#: builtin/reset.c:27
+#: builtin/reset.c:28
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgstr "git reset --patch [УКАЗАТЕЛ_КЪМ_ДЪРВО] [--] [ПЪТИЩА…]"
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "mixed"
msgstr "смесено (mixed)"
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "soft"
msgstr "меко (soft)"
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "hard"
msgstr "пълно (hard)"
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "merge"
msgstr "слято (merge)"
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "keep"
msgstr "запазващо (keep)"
-#: builtin/reset.c:73
+#: builtin/reset.c:74
msgid "You do not have a valid HEAD."
msgstr "Указателят „HEAD“ е повреден."
-#: builtin/reset.c:75
+#: builtin/reset.c:76
msgid "Failed to find tree of HEAD."
msgstr "Дървото, сочено от указателя „HEAD“, не може да бъде открито."
-#: builtin/reset.c:81
+#: builtin/reset.c:82
#, c-format
msgid "Failed to find tree of %s."
msgstr "Дървото, сочено от „%s“, не може да бъде открито."
-#: builtin/reset.c:99
+#: builtin/reset.c:100
#, c-format
msgid "HEAD is now at %s"
msgstr "Указателят „HEAD“ сочи към „%s“"
-#: builtin/reset.c:182
+#: builtin/reset.c:183
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Не може да се извърши %s зануляване по време на сливане."
-#: builtin/reset.c:275
+#: builtin/reset.c:276
msgid "be quiet, only report errors"
msgstr "по-малко подробности, да се извеждат само грешките"
-#: builtin/reset.c:277
+#: builtin/reset.c:278
msgid "reset HEAD and index"
msgstr "индекса и указателя „HEAD“, без работното дърво"
-#: builtin/reset.c:278
+#: builtin/reset.c:279
msgid "reset only HEAD"
msgstr "само указателя „HEAD“, без индекса и работното дърво"
# FIXME vs man page
-#: builtin/reset.c:280 builtin/reset.c:282
+#: builtin/reset.c:281 builtin/reset.c:283
msgid "reset HEAD, index and working tree"
msgstr "указателя „HEAD“, индекса и работното дърво"
# FIXME vs man page
-#: builtin/reset.c:284
+#: builtin/reset.c:285
msgid "reset HEAD but keep local changes"
msgstr "зануляване на указателя „HEAD“, но запазване на локалните промени"
-#: builtin/reset.c:287
+#: builtin/reset.c:288
msgid "record only the fact that removed paths will be added later"
msgstr ""
"отбелязване само на факта, че изтритите пътища ще бъдат добавени по-късно"
-#: builtin/reset.c:304
+#: builtin/reset.c:305
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Стойността „%s“ не е разпозната като съществуваща версия."
-#: builtin/reset.c:307 builtin/reset.c:315
+#: builtin/reset.c:308 builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "„%s“ не е разпознат като обект."
-#: builtin/reset.c:312
+#: builtin/reset.c:313
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "„%s“ не е разпознат като дърво."
-#: builtin/reset.c:321
+#: builtin/reset.c:322
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr ""
"опцията „--patch“ е несъвместима с всяка от опциите „--hard/--mixed/--soft“"
-#: builtin/reset.c:330
+#: builtin/reset.c:331
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"опцията „--mixed“ не бива да се използва заедно с пътища. Вместо това "
"изпълнете „git reset -- ПЪТ…“."
-#: builtin/reset.c:332
+#: builtin/reset.c:333
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Не може да извършите %s зануляване, когато сте задали ПЪТ."
-#: builtin/reset.c:342
+#: builtin/reset.c:343
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "В голо хранилище не може да извършите %s зануляване"
-#: builtin/reset.c:346
+#: builtin/reset.c:347
msgid "-N can only be used with --mixed"
msgstr "Опцията „-N“ е съвместима само с „--mixed“"
-#: builtin/reset.c:363
+#: builtin/reset.c:364
msgid "Unstaged changes after reset:"
msgstr "Промени извън индекса след зануляването:"
-#: builtin/reset.c:369
+#: builtin/reset.c:370
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Индексът не може да бъде занулен към версия „%s“."
-#: builtin/reset.c:373
+#: builtin/reset.c:374
msgid "Could not write new index file."
msgstr "Новият индекс не може да бъде записан."
-#: builtin/rev-parse.c:360
+#: builtin/rev-parse.c:361
msgid "git rev-parse --parseopt [options] -- [<args>...]"
msgstr "git rev-parse --parseopt [ОПЦИЯ…] -- [АРГУМЕНТИ…]"
-#: builtin/rev-parse.c:365
+#: builtin/rev-parse.c:366
msgid "keep the `--` passed as an arg"
msgstr "зададеният низ „--“ да се тълкува като аргумент"
-#: builtin/rev-parse.c:367
+#: builtin/rev-parse.c:368
msgid "stop parsing after the first non-option argument"
msgstr "спиране на анализа след първия аргумент, който не е опция"
-#: builtin/rev-parse.c:370
+#: builtin/rev-parse.c:371
msgid "output in stuck long form"
msgstr "изход в дългия формат"
-#: builtin/rev-parse.c:498
+#: builtin/rev-parse.c:499
msgid ""
"git rev-parse --parseopt [options] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -9540,7 +9758,7 @@ msgid ""
"the following submodule (or one of its nested submodules)\n"
"uses a .git directory:"
msgid_plural ""
-"the following submodules (or one of its nested submodules)\n"
+"the following submodules (or one of their nested submodules)\n"
"use a .git directory:"
msgstr[0] ""
"следният подмодул или някой от неговите подмодули използват директория на "
@@ -9626,6 +9844,12 @@ msgstr ""
"изходният код да е 0, дори ако никой файл нe e напаснал с шаблона за "
"изтриване"
+#: builtin/rm.c:318
+msgid "Please, stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+"За да продължите, или вкарайте промените по файла „.gitmodules“ в индекса,\n"
+"или ги скатайте"
+
#: builtin/rm.c:336
#, c-format
msgid "not removing '%s' recursively without -r"
@@ -9820,11 +10044,11 @@ msgstr "изтриване на символен указател"
msgid "shorten ref output"
msgstr "кратка информация за указателя"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason"
msgstr "причина"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason of the update"
msgstr "причина за обновяването"
@@ -9951,246 +10175,236 @@ msgstr "опцията „--points-at“ изисква аргумент-обе
msgid "malformed object name '%s'"
msgstr "неправилно име на обект „%s“"
-#: builtin/tag.c:588
+#: builtin/tag.c:589
msgid "list tag names"
msgstr "извеждане на имената на етикетите"
-#: builtin/tag.c:590
+#: builtin/tag.c:591
msgid "print <n> lines of each tag message"
msgstr "извеждане на този БРОЙ редове от всяко съобщение за етикет"
-#: builtin/tag.c:592
+#: builtin/tag.c:593
msgid "delete tags"
msgstr "изтриване на етикети"
-#: builtin/tag.c:593
+#: builtin/tag.c:594
msgid "verify tags"
msgstr "проверка на етикети"
-#: builtin/tag.c:595
+#: builtin/tag.c:596
msgid "Tag creation options"
msgstr "Опции при създаването на етикети"
-#: builtin/tag.c:597
+#: builtin/tag.c:598
msgid "annotated tag, needs a message"
msgstr "анотирането на етикети изисква съобщение"
-#: builtin/tag.c:599
+#: builtin/tag.c:600
msgid "tag message"
msgstr "съобщение за етикет"
-#: builtin/tag.c:601
+#: builtin/tag.c:602
msgid "annotated and GPG-signed tag"
msgstr "анотиран етикет с подпис по GPG"
-#: builtin/tag.c:605
+#: builtin/tag.c:606
msgid "use another key to sign the tag"
msgstr "използване на друг ключ за подписването на етикет"
-#: builtin/tag.c:606
+#: builtin/tag.c:607
msgid "replace the tag if exists"
msgstr "замяна на етикета, ако съществува"
-#: builtin/tag.c:607
+#: builtin/tag.c:608
msgid "show tag list in columns"
msgstr "извеждане на списъка на етикетите по колони"
-#: builtin/tag.c:609
+#: builtin/tag.c:610
msgid "sort tags"
msgstr "подреждане на етикетите"
-#: builtin/tag.c:613
+#: builtin/tag.c:614
msgid "Tag listing options"
msgstr "Опции за извеждането на етикети"
-#: builtin/tag.c:616 builtin/tag.c:622
+#: builtin/tag.c:617 builtin/tag.c:623
msgid "print only tags that contain the commit"
msgstr "извеждане само на етикетите, които съдържат подаването"
-#: builtin/tag.c:628
+#: builtin/tag.c:629
msgid "print only tags of the object"
msgstr "извеждане само на етикетите на обекта"
-#: builtin/tag.c:654
+#: builtin/tag.c:655
msgid "--column and -n are incompatible"
msgstr "Опциите „--column“ и „-n“ са несъвместими"
-#: builtin/tag.c:666
+#: builtin/tag.c:667
msgid "--sort and -n are incompatible"
msgstr "Опциите „--long“ и „-n“ са несъвместими"
-#: builtin/tag.c:673
+#: builtin/tag.c:674
msgid "-n option is only allowed with -l."
msgstr "Опцията „-n“ изисква опцията „-l“."
-#: builtin/tag.c:675
+#: builtin/tag.c:676
msgid "--contains option is only allowed with -l."
msgstr "Опцията „-contains“ изисква опцията „-l“."
-#: builtin/tag.c:677
+#: builtin/tag.c:678
msgid "--points-at option is only allowed with -l."
msgstr "Опцията „-points-at“ изисква опцията „-l“."
# FIXME message pattern
-#: builtin/tag.c:685
+#: builtin/tag.c:686
msgid "only one -F or -m option is allowed."
msgstr "Опциите „-F“ и „-m“ са несъвместими."
-#: builtin/tag.c:705
+#: builtin/tag.c:706
msgid "too many params"
msgstr "Прекалено много аргументи"
-#: builtin/tag.c:711
+#: builtin/tag.c:712
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "„%s“ е неправилно име за етикет."
-#: builtin/tag.c:716
+#: builtin/tag.c:717
#, c-format
msgid "tag '%s' already exists"
msgstr "етикетът „%s“ вече съществува"
-#: builtin/tag.c:734
-#, c-format
-msgid "%s: cannot lock the ref"
-msgstr "указателят „%s“ не може да бъде заключен"
-
-#: builtin/tag.c:736
-#, c-format
-msgid "%s: cannot update the ref"
-msgstr "указателят „%s“ не може да бъде обновен"
-
-#: builtin/tag.c:738
+#: builtin/tag.c:741
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Обновен етикет „%s“ (бе „%s“)\n"
-#: builtin/unpack-objects.c:483
+#: builtin/unpack-objects.c:489
msgid "Unpacking objects"
msgstr "Разпакетиране на обектите"
-#: builtin/update-index.c:402
+#: builtin/update-index.c:403
msgid "git update-index [options] [--] [<file>...]"
msgstr "git update-index [ОПЦИЯ…] [--] [ФАЙЛ…]"
-#: builtin/update-index.c:755
+#: builtin/update-index.c:756
msgid "continue refresh even when index needs update"
msgstr ""
"продължаване с обновяването, дори когато индексът трябва да бъде обновен"
-#: builtin/update-index.c:758
+#: builtin/update-index.c:759
msgid "refresh: ignore submodules"
msgstr "подмодулите да се игнорират при обновяването"
-#: builtin/update-index.c:761
+#: builtin/update-index.c:762
msgid "do not ignore new files"
msgstr "новите файлове да не се игнорират"
-#: builtin/update-index.c:763
+#: builtin/update-index.c:764
msgid "let files replace directories and vice-versa"
msgstr "файлове да могат да заменят директории и обратно"
-#: builtin/update-index.c:765
+#: builtin/update-index.c:766
msgid "notice files missing from worktree"
msgstr "предупреждаване при липсващи в работното дърво файлове"
-#: builtin/update-index.c:767
+#: builtin/update-index.c:768
msgid "refresh even if index contains unmerged entries"
msgstr "обновяване дори и индексът да съдържа неслети обекти"
-#: builtin/update-index.c:770
+#: builtin/update-index.c:771
msgid "refresh stat information"
msgstr "обновяване на информацията от функцията „stat“"
-#: builtin/update-index.c:774
+#: builtin/update-index.c:775
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
"като опцията „--refresh“, но да се проверят и обектите, които са били приети "
"за непроменени"
-#: builtin/update-index.c:778
+#: builtin/update-index.c:779
msgid "<mode>,<object>,<path>"
msgstr "РЕЖИМ,ОБЕКТ,ПЪТ"
-#: builtin/update-index.c:779
+#: builtin/update-index.c:780
msgid "add the specified entry to the index"
msgstr "добавяне на изброените обекти към индекса"
-#: builtin/update-index.c:783
+#: builtin/update-index.c:784
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/update-index.c:784
+#: builtin/update-index.c:785
msgid "override the executable bit of the listed files"
msgstr "изрично задаване на стойността на флага дали файлът е изпълним"
-#: builtin/update-index.c:788
+#: builtin/update-index.c:789
msgid "mark files as \"not changing\""
msgstr "задаване на флаг, че файлът не се променя"
-#: builtin/update-index.c:791
+#: builtin/update-index.c:792
msgid "clear assumed-unchanged bit"
msgstr "изчистване на флага, че файлът не се променя"
-#: builtin/update-index.c:794
+#: builtin/update-index.c:795
msgid "mark files as \"index-only\""
msgstr "задаване на флаг, че файловете са само за индекса"
-#: builtin/update-index.c:797
+#: builtin/update-index.c:798
msgid "clear skip-worktree bit"
msgstr "изчистване на флага, че файловете са само за индекса"
-#: builtin/update-index.c:800
+#: builtin/update-index.c:801
msgid "add to index only; do not add content to object database"
msgstr "добавяне само към индекса без добавяне към базата от данни за обектите"
-#: builtin/update-index.c:802
+#: builtin/update-index.c:803
msgid "remove named paths even if present in worktree"
msgstr "изтриване на указаните пътища, дори и да съществуват в работното дърво"
-#: builtin/update-index.c:804
+#: builtin/update-index.c:805
msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
"при комбиниране с опцията „--stdin“ — входните редове са разделени с нулевия "
"байт"
-#: builtin/update-index.c:806
+#: builtin/update-index.c:807
msgid "read list of paths to be updated from standard input"
msgstr "изчитане на списъка с пътища за обновяване от стандартния вход"
-#: builtin/update-index.c:810
+#: builtin/update-index.c:811
msgid "add entries from standard input to the index"
msgstr "добавяне на елементите от стандартния вход към индекса"
-#: builtin/update-index.c:814
+#: builtin/update-index.c:815
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
"възстановяване на състоянието преди сливане или нужда от обновяване за "
"изброените пътища"
-#: builtin/update-index.c:818
+#: builtin/update-index.c:819
msgid "only update entries that differ from HEAD"
msgstr "добавяне само на съдържанието, което се различава от това в „HEAD“"
-#: builtin/update-index.c:822
+#: builtin/update-index.c:823
msgid "ignore files missing from worktree"
msgstr "игнориране на файловете, които липсват в работното дърво"
-#: builtin/update-index.c:825
+#: builtin/update-index.c:826
msgid "report actions to standard output"
msgstr "извеждане на действията на стандартния изход"
-#: builtin/update-index.c:827
+#: builtin/update-index.c:828
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
"забравяне на записаната информация за неразрешени конфликти — за командите "
"от потребителско ниво"
-#: builtin/update-index.c:831
+#: builtin/update-index.c:832
msgid "write index in this format"
msgstr "записване на индекса в този формат"
-#: builtin/update-index.c:833
+#: builtin/update-index.c:834
msgid "enable or disable split index"
msgstr "включване или изключване на разделянето на индекса"
@@ -10207,21 +10421,21 @@ msgstr "git update-ref [ОПЦИЯ…] ИМЕ_НА_УКАЗАТЕЛ НОВА_С
msgid "git update-ref [options] --stdin [-z]"
msgstr "git update-ref [ОПЦИЯ…] --stdin [-z]"
-#: builtin/update-ref.c:350
+#: builtin/update-ref.c:363
msgid "delete the reference"
msgstr "изтриване на указателя"
-#: builtin/update-ref.c:352
+#: builtin/update-ref.c:365
msgid "update <refname> not the one it points to"
msgstr "обновяване на ИМЕто_НА_УКАЗАТЕЛя, а не това, към което сочи"
-#: builtin/update-ref.c:353
+#: builtin/update-ref.c:366
msgid "stdin has NUL-terminated arguments"
msgstr ""
"някои от елементите подадени на стандартния вход завършват с нулевия знак "
"„NUL“"
-#: builtin/update-ref.c:354
+#: builtin/update-ref.c:367
msgid "read updates from stdin"
msgstr "изчитане на указателите от стандартния вход"
@@ -10241,15 +10455,15 @@ msgstr "git verify-tag [-v|--verbose] ПОДАВАНЕ…"
msgid "print commit contents"
msgstr "извеждане на съдържанието на подаването"
-#: builtin/verify-pack.c:55
+#: builtin/verify-pack.c:54
msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] ПАКЕТ…"
-#: builtin/verify-pack.c:65
+#: builtin/verify-pack.c:64
msgid "verbose"
msgstr "извеждане на подробна информация"
-#: builtin/verify-pack.c:67
+#: builtin/verify-pack.c:66
msgid "show statistics only"
msgstr "извеждане само на статистиката"
@@ -10277,9 +10491,13 @@ msgstr "запис на обект-дърво за поддиректорият
msgid "only useful for debugging"
msgstr "само за изчистване на грешки"
+#: credential-cache--daemon.c:267
+msgid "print debugging messages to stderr"
+msgstr "извеждане на съобщенията за трасиране на стандартната грешка"
+
#: git.c:17
msgid ""
-"'git help -a' and 'git help -g' lists available subcommands and some\n"
+"'git help -a' and 'git help -g' list available subcommands and some\n"
"concept guides. See 'git help <command>' or 'git help <concept>'\n"
"to read about a specific subcommand or concept."
msgstr ""
@@ -10289,27 +10507,6 @@ msgstr ""
"за\n"
"някое определено ПОНЯТИЕ използвайте „git help ПОНЯТИЕ“."
-#: parse-options.h:143
-msgid "expiry-date"
-msgstr "период на валидност/запазване"
-
-#: parse-options.h:158
-msgid "no-op (backward compatibility)"
-msgstr "нулева операция (за съвместимост с предишни версии)"
-
-#: parse-options.h:232
-msgid "be more verbose"
-msgstr "повече подробности"
-
-#: parse-options.h:234
-msgid "be more quiet"
-msgstr "по-малко подробности"
-
-# FIXME SHA-1 -> SHA1
-#: parse-options.h:240
-msgid "use <n> digits to display SHA-1s"
-msgstr "да се показват такъв БРОЙ цифри от сумите по SHA1"
-
#: common-cmds.h:8
msgid "Add file contents to the index"
msgstr "Добавяне на съдържанието на файла към индекса"
@@ -10396,6 +10593,33 @@ msgstr "Извеждане на състоянието на работното
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "Извеждане, създаване, изтриване, проверка на етикети подписани с GPG"
+#: parse-options.h:143
+msgid "expiry-date"
+msgstr "период на валидност/запазване"
+
+#: parse-options.h:158
+msgid "no-op (backward compatibility)"
+msgstr "нулева операция (за съвместимост с предишни версии)"
+
+#: parse-options.h:232
+msgid "be more verbose"
+msgstr "повече подробности"
+
+#: parse-options.h:234
+msgid "be more quiet"
+msgstr "по-малко подробности"
+
+# FIXME SHA-1 -> SHA1
+#: parse-options.h:240
+msgid "use <n> digits to display SHA-1s"
+msgstr "да се показват такъв БРОЙ цифри от сумите по SHA1"
+
+#: rerere.h:27
+msgid "update the index with reused conflict resolution if possible"
+msgstr ""
+"при възможност преизползване на решението на конфликта за обновяване на "
+"индекса"
+
#: git-am.sh:52
msgid "You need to set your committer info first"
msgstr "Първо трябва да зададете информация за себе си"
@@ -10672,22 +10896,22 @@ msgstr "Да се продължи ли? „Y“ — ДА, „n“ — не"
# FIXME me?
#: git-bisect.sh:289
msgid ""
-"You need to give me at least one good and one bad revisions.\n"
+"You need to give me at least one good and one bad revision.\n"
"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
msgstr ""
-"Трябва да зададете поне една добра и една лоша версия. Това може да се\n"
-"направи съответно и чрез командите „git bisect bad“ и „git bisect good“."
+"Трябва да зададете поне една добра и една лоша версия. (Това може да се\n"
+"направи съответно и чрез командите „git bisect bad“ и „git bisect good“.)"
# FIXME me
#: git-bisect.sh:292
msgid ""
"You need to start by \"git bisect start\".\n"
-"You then need to give me at least one good and one bad revisions.\n"
+"You then need to give me at least one good and one bad revision.\n"
"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
msgstr ""
"Трябва да започнете двоичното търсене чрез командата „git bisect start“.\n"
-"трябва да зададете поне една добра и една лоша версия. Това може да се\n"
-"направи съответно и чрез командите „git bisect bad“ и „git bisect good“."
+"трябва да зададете поне една добра и една лоша версия. (Това може да се\n"
+"направи съответно и чрез командите „git bisect bad“ и „git bisect good“.)"
#: git-bisect.sh:363 git-bisect.sh:490
msgid "We are not bisecting."
@@ -10761,21 +10985,28 @@ msgstr "успешно двоично търсене"
msgid ""
"Pull is not possible because you have unmerged files.\n"
"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
-"as appropriate to mark resolution, or use 'git commit -a'."
+"as appropriate to mark resolution and make a commit."
msgstr ""
"Невъзможно е да издърпвате в момента, защото някои файлове не са слети. "
"Трябва\n"
"да ги прегледате, коригирате, ако е необходимо и да ги добавите или извадите "
"от\n"
-"индекса с командата „git add/rm ФАЙЛ“. Ако всичко е наред, можете да "
-"ползвате и\n"
-"командата „git commit -a“."
+"индекса с командата „git add/rm ФАЙЛ“, след което трябва да подадете "
+"промените."
#: git-pull.sh:25
msgid "Pull is not possible because you have unmerged files."
msgstr ""
"Невъзможно е да издърпвате в момента, защото някои файлове не са слети."
+#: git-pull.sh:31
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you can merge."
+msgstr ""
+"Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува).\n"
+"Подайте промените си, преди да започнете ново сливане."
+
#: git-pull.sh:245
msgid "updating an unborn branch with changes added to the index"
msgstr "обновяване на все още несъздаден клон с промените от индекса"
@@ -11041,7 +11272,7 @@ msgstr "Указани са прекалено много версии: „$REV
#: git-stash.sh:397
#, sh-format
-msgid "$reference is not valid reference"
+msgid "$reference is not a valid reference"
msgstr "Указателят „$reference“ е грешен"
#: git-stash.sh:425
@@ -11090,11 +11321,11 @@ msgstr "Изтрито е скатаното „${REV}“ ($s)"
msgid "${REV}: Could not drop stash entry"
msgstr "Скатаното „${REV}“ не може да бъде изтрито"
-#: git-stash.sh:538
+#: git-stash.sh:539
msgid "No branch name specified"
msgstr "Не е указано име на клон"
-#: git-stash.sh:610
+#: git-stash.sh:611
msgid "(To restore them type \"git stash apply\")"
msgstr "(За да ги възстановите, изпълнете командата „git stash apply“)"
@@ -11417,3 +11648,33 @@ msgstr "Неуспешна обработка на поддиректориит
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Синхронизиране на адреса за пътя към подмодул „$displaypath“"
+
+#~ msgid "Failed to lock ref for update"
+#~ msgstr "Указателят не може да бъде заключен, за да бъде обновен"
+
+#~ msgid "Failed to write ref"
+#~ msgstr "Указателят не може да бъде записан"
+
+#~ msgid "Failed to lock HEAD during fast_forward_to"
+#~ msgstr "Указателят „HEAD“ не може да бъде заключен при тривиално сливане"
+
+#~ msgid "invalid commit: %s"
+#~ msgstr "неправилно подаване: %s"
+
+#~ msgid "cannot lock HEAD ref"
+#~ msgstr "указателят към върха „HEAD“ не може да бъде заключен"
+
+#~ msgid "cannot update HEAD ref"
+#~ msgstr "указателят към върха „HEAD“ не може да бъде обновен"
+
+#~ msgid "Invalid %s: '%s'"
+#~ msgstr "Неправилна стойност за „%s“: „%s“"
+
+#~ msgid "cannot tell cwd"
+#~ msgstr "текущата директория не може да бъде определена"
+
+#~ msgid "%s: cannot lock the ref"
+#~ msgstr "указателят „%s“ не може да бъде заключен"
+
+#~ msgid "%s: cannot update the ref"
+#~ msgstr "указателят „%s“ не може да бъде обновен"
diff --git a/po/ca.po b/po/ca.po
index ee77dca..1fea047 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2014-08-04 14:48+0800\n"
-"PO-Revision-Date: 2014-08-22 20:10-0700\n"
+"POT-Creation-Date: 2014-11-20 09:42+0800\n"
+"PO-Revision-Date: 2014-11-20 16:10+0800\n"
"Last-Translator: Alex Henrie <alexhenrie24@gmail.com>\n"
"Language-Team: Catalan\n"
"Language: ca\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.6.10\n"
#: advice.c:55
#, c-format
@@ -26,193 +26,191 @@ msgstr "indirecta: %.*s\n"
#: advice.c:88
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
-"as appropriate to mark resolution and make a commit, or use\n"
-"'git commit -a'."
+"as appropriate to mark resolution and make a commit."
msgstr ""
-"Arregleu-los en l'arbre de treball, i després utilitzeu\n"
-"'git add/rm <fitxer>' segons sigui apropiat per marcar la\n"
-"resolució i feu una comissió, o utilitzeu 'git commit -a'."
+"Arregleu-los en l'arbre de treball, i després useu\n"
+"'git add/rm <fitxer>' segons sigui apropiat per a marcar la\n"
+"resolució i feu una comissió."
-#: archive.c:10
+#: archive.c:11
msgid "git archive [options] <tree-ish> [<path>...]"
msgstr "git archive [opcions] <arbre> [<ruta>...]"
-#: archive.c:11
+#: archive.c:12
msgid "git archive --list"
msgstr "git archive --list"
-#: archive.c:12
+#: archive.c:13
msgid ""
"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
msgstr ""
-"git archive --remote <repositori> [--exec <ordre>] [opcions] <arbre> "
-"[<ruta>...]"
+"git archive --remote <dipòsit> [--exec <ordre>] [opcions] <arbre> [<ruta>...]"
-#: archive.c:13
+#: archive.c:14
msgid "git archive --remote <repo> [--exec <cmd>] --list"
-msgstr "git archive --remote <repositori> [--exec <ordre>] --list"
+msgstr "git archive --remote <dipòsit> [--exec <ordre>] --list"
-#: archive.c:243 builtin/add.c:136 builtin/add.c:427 builtin/rm.c:328
+#: archive.c:334 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "L'especificació de ruta '%s' no ha concordat amb cap fitxer"
-#: archive.c:328
+#: archive.c:419
msgid "fmt"
msgstr "format"
-#: archive.c:328
+#: archive.c:419
msgid "archive format"
msgstr "format d'arxiu"
-#: archive.c:329 builtin/log.c:1201
+#: archive.c:420 builtin/log.c:1204
msgid "prefix"
msgstr "prefix"
-#: archive.c:330
+#: archive.c:421
msgid "prepend prefix to each pathname in the archive"
msgstr "anteposa el prefix a cada nom de ruta en l'arxiu"
-#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2517
-#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:709
-#: builtin/fast-export.c:711 builtin/grep.c:712 builtin/hash-object.c:77
-#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412
-#: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151
+#: archive.c:422 builtin/archive.c:88 builtin/blame.c:2517
+#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986
+#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101
+#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:411
+#: builtin/notes.c:568 builtin/read-tree.c:109 parse-options.h:151
msgid "file"
msgstr "fitxer"
-#: archive.c:332 builtin/archive.c:89
+#: archive.c:423 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "escriu l'arxiu a aquest fitxer"
-#: archive.c:334
+#: archive.c:425
msgid "read .gitattributes in working directory"
msgstr "llegeix .gitattributes en el directori de treball"
-#: archive.c:335
+#: archive.c:426
msgid "report archived files on stderr"
msgstr "informa de fitxers arxivats en stderr"
-#: archive.c:336
+#: archive.c:427
msgid "store only"
msgstr "només emmagatzemar"
-#: archive.c:337
+#: archive.c:428
msgid "compress faster"
msgstr "comprimeix més ràpid"
-#: archive.c:345
+#: archive.c:436
msgid "compress better"
msgstr "comprimeix millor"
-#: archive.c:348
+#: archive.c:439
msgid "list supported archive formats"
msgstr "allista els formats d'arxiu suportats"
-#: archive.c:350 builtin/archive.c:90 builtin/clone.c:84
+#: archive.c:441 builtin/archive.c:90 builtin/clone.c:85
msgid "repo"
-msgstr "repositori"
+msgstr "dipòsit"
-#: archive.c:351 builtin/archive.c:91
+#: archive.c:442 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
-msgstr "recupera l'arxiu del repositori remot <repositori>"
+msgstr "recupera l'arxiu del dipòsit remot <dipòsit>"
-#: archive.c:352 builtin/archive.c:92 builtin/notes.c:491
+#: archive.c:443 builtin/archive.c:92 builtin/notes.c:490
msgid "command"
msgstr "ordre"
-#: archive.c:353 builtin/archive.c:93
+#: archive.c:444 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "ruta a l'ordre git-upload-archive remot"
-#: attr.c:259
+#: attr.c:258
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr ""
"Els patrons negatius s'ignoren en els atributes de git\n"
-"Utilitzeu '\\!' per exclamació capdavantera literal."
+"Useu '\\!' per exclamació capdavantera literal."
#: branch.c:60
#, c-format
msgid "Not setting branch %s as its own upstream."
-msgstr "No establint la rama %s com la seva pròpia font."
+msgstr "No establint la rama %s com a la seva pròpia font."
#: branch.c:83
#, c-format
msgid "Branch %s set up to track remote branch %s from %s by rebasing."
msgstr ""
-"La rama %s està configurada per seguir la rama remota %s de %s per rebasar."
+"La rama %s està configurada per a seguir la rama remota %s de %s per rebasar."
#: branch.c:84
#, c-format
msgid "Branch %s set up to track remote branch %s from %s."
-msgstr "La rama %s està configurada per seguir la rama remota %s de %s."
+msgstr "La rama %s està configurada per a seguir la rama remota %s de %s."
#: branch.c:88
#, c-format
msgid "Branch %s set up to track local branch %s by rebasing."
-msgstr "La rama %s està configurada per seguir la rama local %s per rebasar."
+msgstr "La rama %s està configurada per a seguir la rama local %s per rebasar."
#: branch.c:89
#, c-format
msgid "Branch %s set up to track local branch %s."
-msgstr "La rama %s està configurada per seguir la rama local %s."
+msgstr "La rama %s està configurada per a seguir la rama local %s."
#: branch.c:94
#, c-format
msgid "Branch %s set up to track remote ref %s by rebasing."
msgstr ""
-"La rama %s està configurada per seguir la referència remota %s per rebasar."
+"La rama %s està configurada per a seguir la referència remota %s per rebasar."
#: branch.c:95
#, c-format
msgid "Branch %s set up to track remote ref %s."
-msgstr "La rama %s està configurada per seguir la referència remota %s."
+msgstr "La rama %s està configurada per a seguir la referència remota %s."
#: branch.c:99
#, c-format
msgid "Branch %s set up to track local ref %s by rebasing."
msgstr ""
-"La rama %s està configurada per seguir la referència local %s per rebasar."
+"La rama %s està configurada per a seguir la referència local %s per rebasar."
#: branch.c:100
#, c-format
msgid "Branch %s set up to track local ref %s."
-msgstr "La rama %s està configurada per seguir la referència local %s."
+msgstr "La rama %s està configurada per a seguir la referència local %s."
#: branch.c:133
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr "No seguint: informació ambigua per a la referència %s"
-#: branch.c:178
+#: branch.c:162
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "'%s' no és un nom de rama vàlid."
-#: branch.c:183
+#: branch.c:167
#, c-format
msgid "A branch named '%s' already exists."
msgstr "Una rama amb nom '%s' ja existeix."
-#: branch.c:191
+#: branch.c:175
msgid "Cannot force update the current branch."
msgstr "No es pot actualitzar la rama actual a la força."
-#: branch.c:211
+#: branch.c:195
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
-"No es pot configurar la informació de seguimiento; el punt inicial '%s' no "
-"és una rama."
+"No es pot configurar la informació de seguiment; el punt inicial '%s' no és "
+"una rama."
-#: branch.c:213
+#: branch.c:197
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "la rama font demanada '%s' no existeix"
-#: branch.c:215
+#: branch.c:199
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -226,114 +224,112 @@ msgstr ""
"\n"
"Si planeu basar el teu treball en una rama font que ja\n"
"existeix al remot, pot que necessiteu executar\n"
-"\"git fetch\" per obtenir-la.\n"
+"\"git fetch\" per a obtenir-la.\n"
"\n"
"Si planeu pujar una rama local nova que seguirà la seva\n"
-"contrapart remota, pot que voleu utilitzar\n"
+"contrapart remota, pot que voleu usar\n"
"\"git push -u\" per establir la configuració font mentre\n"
"pugeu."
-#: branch.c:260
+#: branch.c:243
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "No és un nom d'objecte vàlid: '%s'."
-#: branch.c:280
+#: branch.c:263
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "Nom d'objecte ambigu: '%s'."
-#: branch.c:285
+#: branch.c:268
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "No és un punt de ramificació vàlid: '%s'."
-#: branch.c:291
-msgid "Failed to lock ref for update"
-msgstr "S'ha fallat al bloquejar la referència per actualització"
-
-#: branch.c:309
-msgid "Failed to write ref"
-msgstr "S'ha fallat al escriure la referència"
-
-#: bundle.c:33
+#: bundle.c:34
#, c-format
msgid "'%s' does not look like a v2 bundle file"
msgstr "'%s' no sembla a un fitxer d'embolic v2"
-#: bundle.c:60
+#: bundle.c:61
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr "capçalera no reconeguda: %s%s (%d)"
-#: bundle.c:86 builtin/commit.c:755
+#: bundle.c:87 builtin/commit.c:788
#, c-format
msgid "could not open '%s'"
msgstr "no s'ha pogut obrir '%s'"
-#: bundle.c:138
+#: bundle.c:139
msgid "Repository lacks these prerequisite commits:"
-msgstr "Al repositori manquen aquestes comissions prerequisits:"
+msgstr "Al dipòsit li manquen aquestes comissions prerequisits:"
-#: bundle.c:162 sequencer.c:630 sequencer.c:1085 builtin/log.c:330
-#: builtin/log.c:821 builtin/log.c:1428 builtin/log.c:1665 builtin/merge.c:357
+#: bundle.c:163 sequencer.c:641 sequencer.c:1096 builtin/blame.c:2706
+#: builtin/branch.c:652 builtin/commit.c:1085 builtin/log.c:330
+#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:357
#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr "la configuració del passeig per revisions ha fallat"
-#: bundle.c:184
+#: bundle.c:185
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "L'embolic conté aquesta referència:"
msgstr[1] "L'embolic conté aquestes %d referències:"
-#: bundle.c:191
+#: bundle.c:192
msgid "The bundle records a complete history."
msgstr "L'embolic registra una història completa."
-#: bundle.c:193
+#: bundle.c:194
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "L'embolic requereix aquesta referència:"
msgstr[1] "L'embolic requereix aquestes %d referències:"
-#: bundle.c:289
+#: bundle.c:251
+msgid "Could not spawn pack-objects"
+msgstr "No s'ha pogut executar el pack-objects"
+
+#: bundle.c:269
+msgid "pack-objects died"
+msgstr "El pack-objects s'ha mort"
+
+#: bundle.c:309
msgid "rev-list died"
msgstr "El rev-list s'ha mort"
-#: bundle.c:295 builtin/log.c:1339 builtin/shortlog.c:261
+#: bundle.c:358
#, c-format
-msgid "unrecognized argument: %s"
-msgstr "paràmetre no reconegut: %s"
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr "les opcions de la llista de revisions exclouen la referència '%s'"
-#: bundle.c:330
+#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
#, c-format
-msgid "ref '%s' is excluded by the rev-list options"
-msgstr "la referència '%s' s'exclou per les opcions de rev-list"
+msgid "unrecognized argument: %s"
+msgstr "paràmetre no reconegut: %s"
-#: bundle.c:375
+#: bundle.c:444
msgid "Refusing to create empty bundle."
msgstr "Refusant crear un embolic buit."
-#: bundle.c:390
-msgid "Could not spawn pack-objects"
-msgstr "No s'ha pogut executar el pack-objects"
-
-#: bundle.c:408
-msgid "pack-objects died"
-msgstr "El pack-objects s'ha mort"
-
-#: bundle.c:411
+#: bundle.c:454
#, c-format
msgid "cannot create '%s'"
msgstr "no es pot crear '%s'"
-#: bundle.c:433
+#: bundle.c:475
msgid "index-pack died"
msgstr "L'index-pack s'ha mort"
+#: color.c:157
+#, c-format
+msgid "invalid color value: %.*s"
+msgstr "valor de color invàlid: %.*s"
+
#: commit.c:40
#, c-format
msgid "could not parse %s"
@@ -348,19 +344,73 @@ msgstr "%s %s no és una comissió!"
msgid "memory exhausted"
msgstr "memòria esgotada"
-#: connected.c:70
+#: config.c:469 config.c:471
+#, c-format
+msgid "bad config file line %d in %s"
+msgstr "línia de fitxer de configuració dolenta %d en %s"
+
+#: config.c:587
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr "valor de configuració numèrica dolent '%s' per '%s' en %s: %s"
+
+#: config.c:589
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "valor de configuració numèrica dolent '%s' per '%s': %s"
+
+#: config.c:674
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr "s'ha fallat en expandir el directori d'usuari en '%s'"
+
+#: config.c:752 config.c:763
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "nivell de compressió de zlib dolent %d"
+
+#: config.c:885
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "mode de creació d'objecte invàlid: %s"
+
+#: config.c:1201
+msgid "unable to parse command-line config"
+msgstr "incapaç de analitzar la configuració de la línia d'ordres"
+
+#: config.c:1262
+msgid "unknown error occured while reading the configuration files"
+msgstr ""
+"s'ha ocorregut un error desconegut en llegir els fitxers de configuració"
+
+#: config.c:1586
+#, c-format
+msgid "unable to parse '%s' from command-line config"
+msgstr "incapaç d'analitzar '%s' de la configuració de la línia d'ordres"
+
+#: config.c:1588
+#, c-format
+msgid "bad config variable '%s' in file '%s' at line %d"
+msgstr "variable de configuració dolent '%s' en el fitxer '%s' a la línia %d"
+
+#: config.c:1647
+#, c-format
+msgid "%s has multiple values"
+msgstr "%s té múltiples valors"
+
+#: connected.c:69
msgid "Could not run 'git rev-list'"
msgstr "No s'ha pogut executar 'git rev-list'"
-#: connected.c:90
+#: connected.c:89
#, c-format
msgid "failed write to rev-list: %s"
msgstr "escriptura fallada al rev-list: %s"
-#: connected.c:98
+#: connected.c:97
#, c-format
msgid "failed to close rev-list's stdin: %s"
-msgstr "s'ha fallat al tancar el stdin del rev-list: %s"
+msgstr "s'ha fallat en tancar l'stdin del rev-list: %s"
#: date.c:95
msgid "in the future"
@@ -433,16 +483,16 @@ msgstr[1] "fa %lu anys"
#: diffcore-order.c:24
#, c-format
msgid "failed to read orderfile '%s'"
-msgstr "s'ha fallat al llegir el fitxer d'ordres '%s'"
+msgstr "s'ha fallat en llegir el fitxer d'ordres '%s'"
-#: diffcore-rename.c:514
+#: diffcore-rename.c:516
msgid "Performing inexact rename detection"
-msgstr "Realitzant detecció inexacte de canvi de nom"
+msgstr "Realitzant detecció inexacte de canvis de nom"
#: diff.c:114
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
-msgstr " S'ha fallat al analitzar el percentatge limitant de dirstat '%s'\n"
+msgstr " S'ha fallat en analitzar el percentatge limitant de dirstat '%s'\n"
#: diff.c:119
#, c-format
@@ -455,7 +505,7 @@ msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
"Valor desconegut del variable de configuració de 'diff.submodule': '%s'"
-#: diff.c:267
+#: diff.c:266
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -464,65 +514,65 @@ msgstr ""
"Errors trobat en el variable de configuració 'diff.dirstat':\n"
"%s"
-#: diff.c:2934
+#: diff.c:2957
#, c-format
msgid "external diff died, stopping at %s"
msgstr "El diff external s'ha mort, aturant a %s"
-#: diff.c:3329
+#: diff.c:3352
msgid "--follow requires exactly one pathspec"
msgstr "--follow requereix exactament una especificació de ruta"
-#: diff.c:3492
+#: diff.c:3515
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-"S'ha fallat al analitzar el paràmetre d'opció de --dirstat/-X:\n"
+"S'ha fallat en analitzar el paràmetre d'opció de --dirstat/-X:\n"
"%s"
-#: diff.c:3506
+#: diff.c:3529
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
-msgstr "S'ha fallat al analitzar el paràmetre d'opció de --submodule: %s"
+msgstr "S'ha fallat en analitzar el paràmetre d'opció de --submodule: %s"
-#: gpg-interface.c:73 gpg-interface.c:145
+#: gpg-interface.c:129 gpg-interface.c:200
msgid "could not run gpg."
msgstr "no s'ha pogut executar el gpg."
-#: gpg-interface.c:85
+#: gpg-interface.c:141
msgid "gpg did not accept the data"
msgstr "El gpg no ha acceptat les dades"
-#: gpg-interface.c:96
+#: gpg-interface.c:152
msgid "gpg failed to sign the data"
-msgstr "gpg ha fallat al firmar les dades"
+msgstr "gpg ha fallat en firmar les dades"
-#: gpg-interface.c:129
+#: gpg-interface.c:185
#, c-format
msgid "could not create temporary file '%s': %s"
msgstr "no s'ha pogut crear el fitxer temporal '%s': %s"
-#: gpg-interface.c:132
+#: gpg-interface.c:188
#, c-format
msgid "failed writing detached signature to '%s': %s"
-msgstr "s'ha fallat al escriure la firma separada a '%s': %s"
+msgstr "s'ha fallat en escriure la firma separada a '%s': %s"
-#: grep.c:1703
+#: grep.c:1718
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': incapaç de llegir %s"
-#: grep.c:1720
+#: grep.c:1735
#, c-format
msgid "'%s': %s"
msgstr "'%s': %s"
-#: grep.c:1731
+#: grep.c:1746
#, c-format
msgid "'%s': short read %s"
-msgstr "'%s': lectura corta %s"
+msgstr "'%s': lectura curta %s"
#: help.c:207
#, c-format
@@ -535,7 +585,7 @@ msgstr "ordres de git disponibles d'altres llocs en la vostra $PATH"
#: help.c:230
msgid "The most commonly used git commands are:"
-msgstr "Els ordres de git més freqüentment utilitzats són:"
+msgstr "Els ordres de git més freqüentment usats són:"
#: help.c:289
#, c-format
@@ -588,87 +638,95 @@ msgstr[1] ""
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: merge.c:40
+#: lockfile.c:275
+msgid "BUG: reopen a lockfile that is still open"
+msgstr "BUG: reobrir un fitxer de bloqueig que encara està obert"
+
+#: lockfile.c:277
+msgid "BUG: reopen a lockfile that has been committed"
+msgstr "BUG: reobrir un fitxer de bloqueig que s'ha comès"
+
+#: merge.c:41
msgid "failed to read the cache"
-msgstr "s'ha fallat al llegir la memòria cau"
+msgstr "s'ha fallat en llegir la memòria cau"
-#: merge.c:93 builtin/checkout.c:356 builtin/checkout.c:556
-#: builtin/clone.c:661
+#: merge.c:94 builtin/checkout.c:356 builtin/checkout.c:562
+#: builtin/clone.c:659
msgid "unable to write new index file"
-msgstr "incapaç d'escriure un nou fitxer d'índex"
+msgstr "incapaç d'escriure un fitxer d'índex nou"
-#: merge-recursive.c:190
+#: merge-recursive.c:189
#, c-format
msgid "(bad commit)\n"
msgstr "(comissió dolenta)\n"
-#: merge-recursive.c:210
+#: merge-recursive.c:209
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr "addinfo_cache ha fallat per a la ruta '%s'"
-#: merge-recursive.c:271
+#: merge-recursive.c:270
msgid "error building trees"
-msgstr "error al construir arbres"
+msgstr "error en construir arbres"
-#: merge-recursive.c:692
+#: merge-recursive.c:691
#, c-format
msgid "failed to create path '%s'%s"
-msgstr "s'ha fallat al crear la ruta '%s' %s"
+msgstr "s'ha fallat en crear la ruta '%s' %s"
-#: merge-recursive.c:703
+#: merge-recursive.c:702
#, c-format
msgid "Removing %s to make room for subdirectory\n"
-msgstr "Traient %s per fer espai per al subdirectori\n"
+msgstr "Traient %s per a fer espai per al subdirectori\n"
-#: merge-recursive.c:717 merge-recursive.c:738
+#: merge-recursive.c:716 merge-recursive.c:737
msgid ": perhaps a D/F conflict?"
msgstr ": potser un conflicte D/F?"
-#: merge-recursive.c:728
+#: merge-recursive.c:727
#, c-format
msgid "refusing to lose untracked file at '%s'"
-msgstr "refusant perdre el fitxer seguit a '%s'"
+msgstr "refusant perdre el fitxer no seguit a '%s'"
-#: merge-recursive.c:768
+#: merge-recursive.c:767
#, c-format
msgid "cannot read object %s '%s'"
msgstr "no es pot llegir l'objecte %s '%s'"
-#: merge-recursive.c:770
+#: merge-recursive.c:769
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob esperat per a %s '%s'"
-#: merge-recursive.c:793 builtin/clone.c:317
+#: merge-recursive.c:792 builtin/clone.c:318
#, c-format
msgid "failed to open '%s'"
-msgstr "s'ha fallat al obrir '%s'"
+msgstr "s'ha fallat en obrir '%s'"
-#: merge-recursive.c:801
+#: merge-recursive.c:800
#, c-format
msgid "failed to symlink '%s'"
-msgstr "s'ha fallat al fer l'enllaç simbòlic '%s'"
+msgstr "s'ha fallat en fer l'enllaç simbòlic '%s'"
-#: merge-recursive.c:804
+#: merge-recursive.c:803
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "no es sap què fer amb %06o %s '%s'"
-#: merge-recursive.c:942
+#: merge-recursive.c:941
msgid "Failed to execute internal merge"
-msgstr "S'ha fallat al executar la fusió interna"
+msgstr "S'ha fallat en executar la fusió interna"
-#: merge-recursive.c:946
+#: merge-recursive.c:945
#, c-format
msgid "Unable to add %s to database"
-msgstr "Incapaç d'afegir %s al base de dades"
+msgstr "Incapaç d'afegir %s a la base de dades"
-#: merge-recursive.c:962
+#: merge-recursive.c:961
msgid "unsupported object type in the tree"
msgstr "tipus d'objecte no suportat en l'arbre"
-#: merge-recursive.c:1037 merge-recursive.c:1051
+#: merge-recursive.c:1036 merge-recursive.c:1050
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -677,7 +735,7 @@ msgstr ""
"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "
"s'ha deixat en l'arbre."
-#: merge-recursive.c:1043 merge-recursive.c:1056
+#: merge-recursive.c:1042 merge-recursive.c:1055
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -686,20 +744,20 @@ msgstr ""
"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "
"s'ha deixat en l'arbre a %s."
-#: merge-recursive.c:1097
+#: merge-recursive.c:1096
msgid "rename"
msgstr "canvia de nom"
-#: merge-recursive.c:1097
+#: merge-recursive.c:1096
msgid "renamed"
msgstr "canviat de nom"
-#: merge-recursive.c:1153
+#: merge-recursive.c:1152
#, c-format
msgid "%s is a directory in %s adding as %s instead"
-msgstr "%s és un directori en %s; afegint com %s en lloc"
+msgstr "%s és un directori en %s; afegint com a %s en lloc"
-#: merge-recursive.c:1175
+#: merge-recursive.c:1174
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -708,151 +766,152 @@ msgstr ""
"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom \"%s\"->\"%s\" en la "
"rama \"%s\" canvi de nom \"%s\"->\"%s\" en \"%s\"%s"
-#: merge-recursive.c:1180
+#: merge-recursive.c:1179
msgid " (left unresolved)"
msgstr " (deixat sense resolució)"
-#: merge-recursive.c:1234
+#: merge-recursive.c:1233
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de "
"nom %s->%s en %s"
-#: merge-recursive.c:1264
+#: merge-recursive.c:1263
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "Canviant el nom de %s a %s i %s a %s en lloc"
-#: merge-recursive.c:1463
+#: merge-recursive.c:1462
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
"CONFLICTE (supressió/afegiment): Canvi de nom %s->%s en %s. %s afegit en %s"
-#: merge-recursive.c:1473
+#: merge-recursive.c:1472
#, c-format
msgid "Adding merged %s"
msgstr "Afegint %s fusionat"
-#: merge-recursive.c:1478 merge-recursive.c:1676
+#: merge-recursive.c:1477 merge-recursive.c:1675
#, c-format
msgid "Adding as %s instead"
-msgstr "Afegint com %s en lloc"
+msgstr "Afegint com a %s en lloc"
-#: merge-recursive.c:1529
+#: merge-recursive.c:1528
#, c-format
msgid "cannot read object %s"
msgstr "no es pot llegir l'objecte %s"
-#: merge-recursive.c:1532
+#: merge-recursive.c:1531
#, c-format
msgid "object %s is not a blob"
msgstr "L'objecte %s no és un blob"
-#: merge-recursive.c:1580
+#: merge-recursive.c:1579
msgid "modify"
msgstr "modifica"
-#: merge-recursive.c:1580
+#: merge-recursive.c:1579
msgid "modified"
msgstr "modificat"
-#: merge-recursive.c:1590
+#: merge-recursive.c:1589
msgid "content"
msgstr "contingut"
-#: merge-recursive.c:1597
+#: merge-recursive.c:1596
msgid "add/add"
-msgstr "afegeix/afegeix"
+msgstr "afegiment/afegiment"
-#: merge-recursive.c:1631
+#: merge-recursive.c:1630
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s saltat (el fusionat és igual a l'existent)"
-#: merge-recursive.c:1645
+#: merge-recursive.c:1644
#, c-format
msgid "Auto-merging %s"
msgstr "Autofusionant %s"
-#: merge-recursive.c:1649 git-submodule.sh:1150
+#: merge-recursive.c:1648 git-submodule.sh:1150
msgid "submodule"
msgstr "submòdul"
-#: merge-recursive.c:1650
+#: merge-recursive.c:1649
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLICTE (%s): Conflicte de fusió en %s"
-#: merge-recursive.c:1740
+#: merge-recursive.c:1735
#, c-format
msgid "Removing %s"
msgstr "Traient %s"
-#: merge-recursive.c:1765
+#: merge-recursive.c:1760
msgid "file/directory"
msgstr "fitxer/directori"
-#: merge-recursive.c:1771
+#: merge-recursive.c:1766
msgid "directory/file"
msgstr "directori/fitxer"
-#: merge-recursive.c:1776
+#: merge-recursive.c:1771
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
-msgstr "CONFLICTE (%s=: Hi ha un directori amb nom %s en %s. Afegint %s com %s"
+msgstr ""
+"CONFLICTE (%s=: Hi ha un directori amb nom %s en %s. Afegint %s com a %s"
-#: merge-recursive.c:1786
+#: merge-recursive.c:1781
#, c-format
msgid "Adding %s"
msgstr "Afegint %s"
-#: merge-recursive.c:1803
+#: merge-recursive.c:1798
msgid "Fatal merge failure, shouldn't happen."
msgstr "Fallat de fusió fatal; això no ha de passar."
-#: merge-recursive.c:1822
+#: merge-recursive.c:1817
msgid "Already up-to-date!"
-msgstr "Ja actualitzat!"
+msgstr "Ja al dia!"
-#: merge-recursive.c:1831
+#: merge-recursive.c:1826
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "la fusió dels arbres %s i %s ha fallat"
-#: merge-recursive.c:1861
+#: merge-recursive.c:1856
#, c-format
msgid "Unprocessed path??? %s"
msgstr "Ruta no processat??? %s"
-#: merge-recursive.c:1906
+#: merge-recursive.c:1901
msgid "Merging:"
msgstr "Fusionant:"
-#: merge-recursive.c:1919
+#: merge-recursive.c:1914
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
-msgstr[0] "%u avantpassat trobat:"
-msgstr[1] "%u avantpassats trobats:"
+msgstr[0] "s'ha trobat %u avantpassat:"
+msgstr[1] "s'han trobat %u avantpassats:"
-#: merge-recursive.c:1956
+#: merge-recursive.c:1951
msgid "merge returned no commit"
msgstr "la fusió no ha retornat cap comissió"
-#: merge-recursive.c:2013
+#: merge-recursive.c:2008
#, c-format
msgid "Could not parse object '%s'"
msgstr "No s'ha pogut analitzar l'objecte '%s'"
-#: merge-recursive.c:2024 builtin/merge.c:666
+#: merge-recursive.c:2019 builtin/merge.c:666
msgid "Unable to write index."
msgstr "Incapaç d'escriure l'índex."
#: notes-utils.c:41
msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr "No es pot cometre un arbre de notes no inicialitzat/no referenciat"
+msgstr "No es pot cometre un arbre de notes no inicialitzat / no referenciat"
#: notes-utils.c:83
#, c-format
@@ -871,33 +930,33 @@ msgstr "Refusant reescriure les notes en %s (fora de refs/notes/)"
msgid "Bad %s value: '%s'"
msgstr "Valor dolent de %s: '%s'"
-#: object.c:234
+#: object.c:241
#, c-format
msgid "unable to parse object: %s"
msgstr "incapaç d'analitzar l'objecte: %s"
-#: parse-options.c:534
+#: parse-options.c:546
msgid "..."
msgstr "..."
-#: parse-options.c:552
+#: parse-options.c:564
#, c-format
msgid "usage: %s"
msgstr "ús: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:556
+#: parse-options.c:568
#, c-format
msgid " or: %s"
msgstr " o: %s"
-#: parse-options.c:559
+#: parse-options.c:571
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:593
+#: parse-options.c:605
msgid "-NUM"
msgstr "-NUM"
@@ -942,12 +1001,12 @@ msgstr "%s: 'literal' i 'glob' són incompatibles"
#: pathspec.c:241
#, c-format
msgid "%s: '%s' is outside repository"
-msgstr "%s: '%s' està fora del repositori"
+msgstr "%s: '%s' és fora del dipòsit"
#: pathspec.c:291
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "L'especificació '%s' està en el submòdul '%.*s'"
+msgstr "L'especificació '%s' és en el submòdul '%.*s'"
#: pathspec.c:353
#, c-format
@@ -957,84 +1016,87 @@ msgstr "%s: aquest ordre no suporta la màgica d'especificació de ruta: %s"
#: pathspec.c:432
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
-msgstr "l'especificació de ruta '%s' està més allà d'un enllaç simbòlic"
+msgstr "l'especificació de ruta '%s' és més allà d'un enllaç simbòlic"
#: pathspec.c:441
msgid ""
"There is nothing to exclude from by :(exclude) patterns.\n"
"Perhaps you forgot to add either ':/' or '.' ?"
msgstr ""
-"No hi ha res que excloure per patrons :(exclusió).\n"
+"No hi ha res a excloure per patrons :(exclusió).\n"
"Potser heu oblidat afegir o ':/' o '.' ?"
+#: pretty.c:968
+msgid "unable to parse --pretty format"
+msgstr "incapaç d'analitzar el format --pretty"
+
#: progress.c:225
msgid "done"
msgstr "fet"
-#: read-cache.c:1260
+#: read-cache.c:1261
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Using version %i"
msgstr ""
"index.version establert, però el valor és invàlid.\n"
-"Utilitzant la versió %i"
+"Usant la versió %i"
-#: read-cache.c:1270
+#: read-cache.c:1271
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"Using version %i"
msgstr ""
"GIT_INDEX_VERSION establert, però el valor és invàlid.\n"
-"Utilitzant la versió %i"
+"Usant la versió %i"
-#: remote.c:753
+#: remote.c:782
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "No és pot obtenir ambdós %s i %s a %s"
-#: remote.c:757
+#: remote.c:786
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s generalment segueix %s, no %s"
-#: remote.c:761
+#: remote.c:790
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s segueix ambdós %s i %s"
-#: remote.c:769
+#: remote.c:798
msgid "Internal error"
msgstr "Error intern"
-#: remote.c:1943
+#: remote.c:1968
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
-msgstr "La teva rama està basada en '%s', però la font no està.\n"
+msgstr "La teva rama està basada en '%s', però la font no és.\n"
-#: remote.c:1947
+#: remote.c:1972
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr " (utilitzeu \"git branch --unset-upstream\" per arreglar)\n"
+msgstr " (useu \"git branch --unset-upstream\" per a arreglar)\n"
-#: remote.c:1950
+#: remote.c:1975
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
-msgstr "La vostra rama està actualitzada amb '%s'.\n"
+msgstr "La vostra rama està al dia amb '%s'.\n"
-#: remote.c:1954
+#: remote.c:1979
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "La vostra rama està davant de '%s' per %d comissions.\n"
msgstr[1] "La vostra rama està davant de '%s' per %d comissions.\n"
-#: remote.c:1960
+#: remote.c:1985
msgid " (use \"git push\" to publish your local commits)\n"
-msgstr ""
-" (utilitzeu \"git push\" per publicar els vostres comissions locals)\n"
+msgstr " (useu \"git push\" per a publicar les vostres comissions locals)\n"
-#: remote.c:1963
+#: remote.c:1988
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -1046,11 +1108,11 @@ msgstr[1] ""
"La vostra rama està darrere de '%s' per %d comissions, i pot avançar-se "
"ràpidament.\n"
-#: remote.c:1971
+#: remote.c:1996
msgid " (use \"git pull\" to update your local branch)\n"
-msgstr " (utilitzeu \"git pull\" per actualitzar la vostra rama local)\n"
+msgstr " (useu \"git pull\" per a actualitzar la vostra rama local)\n"
-#: remote.c:1974
+#: remote.c:1999
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1065,114 +1127,118 @@ msgstr[1] ""
"La vostra rama i '%s' s'han divergit,\n"
"i tenen %d i %d comissions distintes cada una, respectivament.\n"
-#: remote.c:1984
+#: remote.c:2009
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr " (utilitzeu \"git pull\" per fusionar la rama remota a la vostra)\n"
+msgstr " (useu \"git pull\" per a fusionar la rama remota a la vostra)\n"
-#: run-command.c:80
+#: run-command.c:87
msgid "open /dev/null failed"
-msgstr "s'ha fallat al obrir /dev/null"
+msgstr "s'ha fallat en obrir /dev/null"
-#: run-command.c:82
+#: run-command.c:89
#, c-format
msgid "dup2(%d,%d) failed"
-msgstr "dup2(%d,%d) s'ha fallat"
+msgstr "dup2(%d,%d) ha fallat"
-#: sequencer.c:171 builtin/merge.c:782 builtin/merge.c:893
-#: builtin/merge.c:1003 builtin/merge.c:1013
+#: send-pack.c:265
+msgid "failed to sign the push certificate"
+msgstr "s'ha fallat en firmar el certificat de pujada"
+
+#: send-pack.c:322
+msgid "the receiving end does not support --signed push"
+msgstr "el destí rebent no suporta el pujar --signed"
+
+#: sequencer.c:172 builtin/merge.c:781 builtin/merge.c:892
+#: builtin/merge.c:1002 builtin/merge.c:1012
#, c-format
msgid "Could not open '%s' for writing"
msgstr "No s'ha pogut obrir '%s' per a escriptura"
-#: sequencer.c:173 builtin/merge.c:343 builtin/merge.c:785
-#: builtin/merge.c:1005 builtin/merge.c:1018
+#: sequencer.c:174 builtin/merge.c:343 builtin/merge.c:784
+#: builtin/merge.c:1004 builtin/merge.c:1017
#, c-format
msgid "Could not write to '%s'"
msgstr "No s'ha pogut escriure al '%s'"
-#: sequencer.c:194
+#: sequencer.c:195
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
"després de resoldre els conflictes, marqueu les rutes\n"
-"corregides amb 'git add <paths>' o 'git rm <paths>'"
+"corregides amb 'git add <rutes>' o 'git rm <rutes>'"
-#: sequencer.c:197
+#: sequencer.c:198
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"and commit the result with 'git commit'"
msgstr ""
"després de resoldre els conflictes, marqueu les rutes\n"
-"corregides amb 'git add <paths>' o 'git rm <paths>'\n"
+"corregides amb 'git add <rutes>' o 'git rm <rutes>'\n"
"i cometeu el resultat amb 'git commit'"
-#: sequencer.c:210 sequencer.c:841 sequencer.c:924
+#: sequencer.c:211 sequencer.c:852 sequencer.c:935
#, c-format
msgid "Could not write to %s"
msgstr "No s'ha pogut escriure a %s"
-#: sequencer.c:213
+#: sequencer.c:214
#, c-format
msgid "Error wrapping up %s"
-msgstr "Error terminant %s"
+msgstr "Error en terminar %s"
-#: sequencer.c:228
+#: sequencer.c:229
msgid "Your local changes would be overwritten by cherry-pick."
msgstr "Els vostres canvis locals es sobreescriurien pel recull de cireres."
-#: sequencer.c:230
+#: sequencer.c:231
msgid "Your local changes would be overwritten by revert."
msgstr "Els vostres canvis locals es sobreescriurien per la reversió."
-#: sequencer.c:233
+#: sequencer.c:234
msgid "Commit your changes or stash them to proceed."
-msgstr "Cometeu els vostres canvis o emmagatzemeu-los per procedir."
-
-#: sequencer.c:250
-msgid "Failed to lock HEAD during fast_forward_to"
-msgstr "S'ha fallat al bloquejar HEAD durant fast_forward_to"
+msgstr "Cometeu els vostres canvis o emmagatzemeu-los per a procedir."
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:293
+#: sequencer.c:304
#, c-format
msgid "%s: Unable to write new index file"
-msgstr "%s: Incapaç d'escriure un nou fitxer d'índex"
+msgstr "%s: Incapaç d'escriure un fitxer d'índex nou"
-#: sequencer.c:324
+#: sequencer.c:335
msgid "Could not resolve HEAD commit\n"
msgstr "No s'ha pogut resoldre la comissió HEAD\n"
-#: sequencer.c:344
+#: sequencer.c:355
msgid "Unable to update cache tree\n"
msgstr "Incapaç d'actualitzar l'arbre cau\n"
-#: sequencer.c:391
+#: sequencer.c:402
#, c-format
msgid "Could not parse commit %s\n"
msgstr "No s'ha pogut analitzar la comissió %s\n"
-#: sequencer.c:396
+#: sequencer.c:407
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr "No s'ha pogut analitzar la comissió pare %s\n"
-#: sequencer.c:462
+#: sequencer.c:473
msgid "Your index file is unmerged."
msgstr "El vostre fitxer d'índex està sense fusionar."
-#: sequencer.c:481
+#: sequencer.c:492
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr "La comissió %s és una fusió però cap opció -m s'ha donat."
-#: sequencer.c:489
+#: sequencer.c:500
#, c-format
msgid "Commit %s does not have parent %d"
msgstr "La comissió %s no té pare %d"
-#: sequencer.c:493
+#: sequencer.c:504
#, c-format
msgid "Mainline was specified but commit %s is not a merge."
msgstr ""
@@ -1180,158 +1246,158 @@ msgstr ""
#. TRANSLATORS: The first %s will be "revert" or
#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:506
+#: sequencer.c:517
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: no es pot analitzar la comissió pare %s"
-#: sequencer.c:510
+#: sequencer.c:521
#, c-format
msgid "Cannot get commit message for %s"
msgstr "No es pot obtenir el missatge de comissió de %s"
-#: sequencer.c:596
+#: sequencer.c:607
#, c-format
msgid "could not revert %s... %s"
-msgstr "no s'ha pogut revertir %s... %s"
+msgstr "no s'ha pogut revertir %s...%s"
-#: sequencer.c:597
+#: sequencer.c:608
#, c-format
msgid "could not apply %s... %s"
-msgstr "no s'ha pogut aplicar %s... %s"
+msgstr "no s'ha pogut aplicar %s...%s"
-#: sequencer.c:633
+#: sequencer.c:644
msgid "empty commit set passed"
msgstr "conjunt de comissions buit passat"
-#: sequencer.c:641
+#: sequencer.c:652
#, c-format
msgid "git %s: failed to read the index"
-msgstr "git %s: s'ha fallat al llegir l'índex"
+msgstr "git %s: s'ha fallat en llegir l'índex"
-#: sequencer.c:645
+#: sequencer.c:656
#, c-format
msgid "git %s: failed to refresh the index"
-msgstr "git %s: s'ha fallat al actualitzar l'índex"
+msgstr "git %s: s'ha fallat en actualitzar l'índex"
-#: sequencer.c:705
+#: sequencer.c:716
#, c-format
msgid "Cannot %s during a %s"
msgstr "No es pot %s durant un %s"
-#: sequencer.c:727
+#: sequencer.c:738
#, c-format
msgid "Could not parse line %d."
msgstr "No s'ha pogut analitzar la línia %d."
-#: sequencer.c:732
+#: sequencer.c:743
msgid "No commits parsed."
msgstr "Cap comissió analitzada."
-#: sequencer.c:745
+#: sequencer.c:756
#, c-format
msgid "Could not open %s"
msgstr "No s'ha pogut obrir %s"
-#: sequencer.c:749
+#: sequencer.c:760
#, c-format
msgid "Could not read %s."
msgstr "No s'ha pogut llegir %s."
-#: sequencer.c:756
+#: sequencer.c:767
#, c-format
msgid "Unusable instruction sheet: %s"
-msgstr "Full d'instruccions inutilitzable: %s"
+msgstr "Full d'instruccions inusable: %s"
-#: sequencer.c:786
+#: sequencer.c:797
#, c-format
msgid "Invalid key: %s"
msgstr "Clau invàlid: %s"
-#: sequencer.c:789
+#: sequencer.c:800
#, c-format
msgid "Invalid value for %s: %s"
msgstr "Valor invàlid per a %s: %s"
-#: sequencer.c:801
+#: sequencer.c:812
#, c-format
msgid "Malformed options sheet: %s"
msgstr "Full d'opcions malformat: %s"
-#: sequencer.c:822
+#: sequencer.c:833
msgid "a cherry-pick or revert is already in progress"
msgstr "un recull de cireres o una reversió ja està en curs"
-#: sequencer.c:823
+#: sequencer.c:834
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:827
+#: sequencer.c:838
#, c-format
msgid "Could not create sequencer directory %s"
msgstr "No s'ha pogut crear el directori de seqüenciador %s"
-#: sequencer.c:843 sequencer.c:928
+#: sequencer.c:854 sequencer.c:939
#, c-format
msgid "Error wrapping up %s."
-msgstr "Error al terminar %s."
+msgstr "Error en terminar %s."
-#: sequencer.c:862 sequencer.c:998
+#: sequencer.c:873 sequencer.c:1009
msgid "no cherry-pick or revert in progress"
-msgstr "cap recull de cireres o reversió en curs"
+msgstr "ni recull de cireres ni una reversió està en curs"
-#: sequencer.c:864
+#: sequencer.c:875
msgid "cannot resolve HEAD"
msgstr "no es pot resoldre HEAD"
-#: sequencer.c:866
+#: sequencer.c:877
msgid "cannot abort from a branch yet to be born"
msgstr "no es pot avortar des d'una rama que encara ha de nàixer"
-#: sequencer.c:888 builtin/apply.c:4062
+#: sequencer.c:899 builtin/apply.c:4128
#, c-format
msgid "cannot open %s: %s"
msgstr "no es pot obrir %s: %s"
-#: sequencer.c:891
+#: sequencer.c:902
#, c-format
msgid "cannot read %s: %s"
msgstr "no es pot llegir %s: %s"
-#: sequencer.c:892
+#: sequencer.c:903
msgid "unexpected end of file"
msgstr "fin de fitxer inesperat"
-#: sequencer.c:898
+#: sequencer.c:909
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
"el fitxer HEAD emmagatzemat abans del recull de cirers '%s' és corrupte"
-#: sequencer.c:921
+#: sequencer.c:932
#, c-format
msgid "Could not format %s."
msgstr "No s'ha pogut formatar %s."
-#: sequencer.c:1066
+#: sequencer.c:1077
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: no es pot recollir com cirera un %s"
-#: sequencer.c:1069
+#: sequencer.c:1080
#, c-format
msgid "%s: bad revision"
msgstr "%s: revisió dolenta"
-#: sequencer.c:1103
+#: sequencer.c:1114
msgid "Can't revert as initial commit"
-msgstr "No es pot revertir com comissió inicial"
+msgstr "No es pot revertir com a comissió inicial"
-#: sequencer.c:1104
+#: sequencer.c:1115
msgid "Can't cherry-pick into empty head"
msgstr "No es pot recollir cireres en un cap buit"
-#: sha1_name.c:439
+#: sha1_name.c:440
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -1355,24 +1421,24 @@ msgstr ""
"suprimiu-les. Desactiva aquest missatge per executar\n"
"\"git config advice.objectNameWarning false\""
-#: sha1_name.c:1060
+#: sha1_name.c:1068
msgid "HEAD does not point to a branch"
msgstr "HEAD no assenyala cap rama"
-#: sha1_name.c:1063
+#: sha1_name.c:1071
#, c-format
msgid "No such branch: '%s'"
-msgstr "Cap rama així: '%s'"
+msgstr "No hi ha tal rama: '%s'"
-#: sha1_name.c:1065
+#: sha1_name.c:1073
#, c-format
msgid "No upstream configured for branch '%s'"
msgstr "Cap font configurada per a la rama '%s'"
-#: sha1_name.c:1069
+#: sha1_name.c:1077
#, c-format
msgid "Upstream branch '%s' not stored as a remote-tracking branch"
-msgstr "La rama font '%s' no s'emmagatzema com rama que segueixi al remot"
+msgstr "La rama font '%s' no s'emmagatzema com a rama que segueixi al remot"
#: submodule.c:64 submodule.c:98
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
@@ -1399,23 +1465,48 @@ msgstr "No s'ha pogut treure l'entrada de .gitmodules per a %s"
msgid "staging updated .gitmodules failed"
msgstr "L'allistament del .gitmodules actualitzat ha fallat"
-#: submodule.c:1118 builtin/init-db.c:363
+#: submodule.c:1111 builtin/init-db.c:363
#, c-format
msgid "Could not create git link %s"
msgstr "No s'ha pogut crear l'enllaç de git %s"
-#: submodule.c:1129
+#: submodule.c:1122
#, c-format
msgid "Could not set core.worktree in %s"
msgstr "No s'ha pogut establir core.worktree en %s"
+#: trailer.c:499 trailer.c:503 trailer.c:507 trailer.c:561 trailer.c:565
+#: trailer.c:569
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr "valor desconegut '%s' per a la clau '%s'"
+
+#: trailer.c:551 trailer.c:556 builtin/remote.c:288
+#, c-format
+msgid "more than one %s"
+msgstr "més d'un %s"
+
+#: trailer.c:589
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "fitxa de remolc buida en el remolc '%.*s'"
+
+#: trailer.c:709
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "no s'ha pogut llegir el fitxer d'entrada '%s'"
+
+#: trailer.c:712
+msgid "could not read from stdin"
+msgstr "No s'ha pogut llegir des d'stdin"
+
#: unpack-trees.c:202
msgid "Checking out files"
msgstr "Agafant fitxers"
#: urlmatch.c:120
msgid "invalid URL scheme name or missing '://' suffix"
-msgstr "esquema d'URL invàlida o manca el sufix '://'"
+msgstr "l'esquema d'URL és invàlida o li manca el sufix '://'"
#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
#, c-format
@@ -1428,11 +1519,11 @@ msgstr "manca l'host i l'esquema no és 'file:'"
#: urlmatch.c:189
msgid "a 'file:' URL may not have a port number"
-msgstr "un URL 'file:' no pot tenir un número de port"
+msgstr "un URL 'file:' no pot tenir número de port"
#: urlmatch.c:199
msgid "invalid characters in host name"
-msgstr "caràcters invàlids en nom de host"
+msgstr "hi ha caràcters invàlids en el nom de host"
#: urlmatch.c:244 urlmatch.c:255
msgid "invalid port number"
@@ -1442,24 +1533,28 @@ msgstr "número de port invàlid"
msgid "invalid '..' path segment"
msgstr "segment de ruta '..' invàlid"
-#: wrapper.c:460
+#: wrapper.c:509
#, c-format
msgid "unable to access '%s': %s"
msgstr "incapaç d'accedir a '%s': %s"
-#: wrapper.c:481
+#: wrapper.c:530
#, c-format
msgid "unable to access '%s'"
msgstr "incapaç d'accedir a '%s'"
-#: wrapper.c:492
+#: wrapper.c:541
#, c-format
msgid "unable to look up current user in the passwd file: %s"
msgstr "incapaç de trobar l'usuari actual en el fitxer passwd: %s"
-#: wrapper.c:493
+#: wrapper.c:542
msgid "no such user"
-msgstr "cap usuari així"
+msgstr "no hi ha tal usuari"
+
+#: wrapper.c:550
+msgid "unable to get current working directory"
+msgstr "incapaç d'obtenir el directori de treball actual"
#: wt-status.c:150
msgid "Unmerged paths:"
@@ -1468,29 +1563,29 @@ msgstr "Rutes sense fusionar:"
#: wt-status.c:177 wt-status.c:204
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr " (utilitzeu \"git reset %s <fitxer>...\" per desallistar)"
+msgstr " (useu \"git reset %s <fitxer>...\" per a desallistar)"
#: wt-status.c:179 wt-status.c:206
msgid " (use \"git rm --cached <file>...\" to unstage)"
-msgstr " (utilitzeu \"git rm --cached <fitxer>...\" per desallistar)"
+msgstr " (useu \"git rm --cached <fitxer>...\" per a desallistar)"
#: wt-status.c:183
msgid " (use \"git add <file>...\" to mark resolution)"
-msgstr " (utilitzeu \"git add <file>...\" per senyalar resolució)"
+msgstr " (useu \"git add <fitxer>...\" per a senyalar resolució)"
#: wt-status.c:185 wt-status.c:189
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
-" (utilitzeu \"git add/rm <file>...\" segons sigui apropiat per senyalar "
+" (useu \"git add/rm <fitxer>...\" segons sigui apropiat per a senyalar "
"resolució)"
#: wt-status.c:187
msgid " (use \"git rm <file>...\" to mark resolution)"
-msgstr " (utilitzeu \"git rm <file>...\" per senyalar resolució)"
+msgstr " (useu \"git rm <fitxer>...\" per a senyalar resolució)"
#: wt-status.c:198
msgid "Changes to be committed:"
-msgstr "Canvis que cometre:"
+msgstr "Canvis a cometre:"
#: wt-status.c:216
msgid "Changes not staged for commit:"
@@ -1498,17 +1593,17 @@ msgstr "Canvis no allistats per a cometre:"
#: wt-status.c:220
msgid " (use \"git add <file>...\" to update what will be committed)"
-msgstr " (utilitzeu \"git add <file>...\" per actualitzar què es cometrà)"
+msgstr " (useu \"git add <fitxer>...\" per a actualitzar què es cometrà)"
#: wt-status.c:222
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
-msgstr " (utilitzeu \"git add/rm <file>...\" per actualitzar què es cometrà)"
+msgstr " (useu \"git add/rm <fitxer>...\" per a actualitzar què es cometrà)"
#: wt-status.c:223
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
-" (utilitzeu \"git checkout -- <file>...\" per descartar els canvis en el "
+" (useu \"git checkout -- <fitxer>...\" per a descartar els canvis en el "
"directori de treball)"
#: wt-status.c:225
@@ -1519,7 +1614,7 @@ msgstr ""
#: wt-status.c:237
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
-msgstr " (utilitzeu \"git %s <file>...\" per incloure en què es cometrà)"
+msgstr " (useu \"git %s <fitxer>...\" per a incloure-ho en què es cometrà)"
#: wt-status.c:252
msgid "both deleted:"
@@ -1531,11 +1626,11 @@ msgstr "afegit per nosaltres:"
#: wt-status.c:256
msgid "deleted by them:"
-msgstr "suprimit per ells:"
+msgstr "suprimit pels:"
#: wt-status.c:258
msgid "added by them:"
-msgstr "afegit per ells:"
+msgstr "afegit pels:"
#: wt-status.c:260
msgid "deleted by us:"
@@ -1603,206 +1698,207 @@ msgstr "contingut no seguit, "
msgid "bug: unhandled diff status %c"
msgstr "bug: estat de diferència no manejat %c"
-#: wt-status.c:764
+#: wt-status.c:761
msgid "Submodules changed but not updated:"
msgstr "Submòduls canviats però no actualitzats:"
-#: wt-status.c:766
+#: wt-status.c:763
msgid "Submodule changes to be committed:"
-msgstr "Canvis de submòdul que cometre:"
+msgstr "Canvis de submòdul a cometre:"
-#: wt-status.c:845
+#: wt-status.c:842
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
msgstr ""
-"No toquis la línia amunt.\n"
+"No toqueu la línia amunt.\n"
"Tot a baix es traurà."
-#: wt-status.c:936
+#: wt-status.c:933
msgid "You have unmerged paths."
msgstr "Teniu rutes sense fusionar."
-#: wt-status.c:939
+#: wt-status.c:936
msgid " (fix conflicts and run \"git commit\")"
msgstr " (arregleu els conflictes i executeu \"git commit\")"
-#: wt-status.c:942
+#: wt-status.c:939
msgid "All conflicts fixed but you are still merging."
-msgstr "Tots els conflictes arreglats però encara esteu fusionant."
+msgstr "Tots els conflictes estan arreglats però encara esteu fusionant."
-#: wt-status.c:945
+#: wt-status.c:942
msgid " (use \"git commit\" to conclude merge)"
-msgstr " (utilitzeu \"git commit\" per concloure la fusió)"
+msgstr " (useu \"git commit\" per a concloure la fusió)"
-#: wt-status.c:955
+#: wt-status.c:952
msgid "You are in the middle of an am session."
msgstr "Esteu en el medi d'una sessió am."
-#: wt-status.c:958
+#: wt-status.c:955
msgid "The current patch is empty."
msgstr "El pedaç actual està buit."
-#: wt-status.c:962
+#: wt-status.c:959
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (arregleu els conflictes i després executeu \"git am --continue\")"
-#: wt-status.c:964
+#: wt-status.c:961
msgid " (use \"git am --skip\" to skip this patch)"
-msgstr " (utilitzeu \"git am --skip\" per saltar aquest pedaç)"
+msgstr " (useu \"git am --skip\" per a saltar aquest pedaç)"
-#: wt-status.c:966
+#: wt-status.c:963
msgid " (use \"git am --abort\" to restore the original branch)"
-msgstr " (utilitzeu \"git am --abort\" per restaurar la rama original)"
+msgstr " (useu \"git am --abort\" per a restaurar la rama original)"
-#: wt-status.c:1026 wt-status.c:1043
+#: wt-status.c:1023 wt-status.c:1040
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Actualment esteu rebasant la rama '%s' en '%s'."
-#: wt-status.c:1031 wt-status.c:1048
+#: wt-status.c:1028 wt-status.c:1045
msgid "You are currently rebasing."
msgstr "Actualment esteu rebasant."
-#: wt-status.c:1034
+#: wt-status.c:1031
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
" (arregleu els conflictes i després executeu \"git rebase --continue\")"
-#: wt-status.c:1036
+#: wt-status.c:1033
msgid " (use \"git rebase --skip\" to skip this patch)"
-msgstr " (utlitizeu \"git rebase --skip\" per saltar aquest pedaç)"
+msgstr " (useu \"git rebase --skip\" per a saltar aquest pedaç)"
-#: wt-status.c:1038
+#: wt-status.c:1035
msgid " (use \"git rebase --abort\" to check out the original branch)"
-msgstr " (utilitzeu \"git rebase --abort\" per agafar la rama original)"
+msgstr " (useu \"git rebase --abort\" per a agafar la rama original)"
-#: wt-status.c:1051
+#: wt-status.c:1048
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (tots els conflictes arreglats: executeu \"git rebase --continue\")"
-#: wt-status.c:1055
+#: wt-status.c:1052
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Actualment esteu dividint una comissió mentre rebasant la rama '%s' en '%s'."
-#: wt-status.c:1060
+#: wt-status.c:1057
msgid "You are currently splitting a commit during a rebase."
-msgstr "Actualment esteu dividint una comissió durant un rebase."
+msgstr "Actualment esteu dividint una comissió durant una rebase."
-#: wt-status.c:1063
+#: wt-status.c:1060
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Una vegada que el vostre directori de treball sigui net, executeu \"git "
"rebase --continue\")"
-#: wt-status.c:1067
+#: wt-status.c:1064
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Actualment esteu editant una comissió mentre rebasant la rama '%s' en '%s'."
-#: wt-status.c:1072
+#: wt-status.c:1069
msgid "You are currently editing a commit during a rebase."
-msgstr "Actualment esteu editant una comissió durant un rebase."
+msgstr "Actualment esteu editant una comissió durant una rebase."
-#: wt-status.c:1075
+#: wt-status.c:1072
msgid " (use \"git commit --amend\" to amend the current commit)"
-msgstr " (utilitzeu \"git commit --amend\" per esmenar la comissió actual)"
+msgstr " (useu \"git commit --amend\" per a esmenar la comissió actual)"
-#: wt-status.c:1077
+#: wt-status.c:1074
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-" (utilitzeu \"git rebase --continue\" una vegada que sigueu satisfet amb "
-"els vostres canvis)"
+" (useu \"git rebase --continue\" una vegada que esteu satisfet amb els "
+"vostres canvis)"
-#: wt-status.c:1087
+#: wt-status.c:1084
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Actualment esteu recollint com cirera la comissió %s."
-#: wt-status.c:1092
+#: wt-status.c:1089
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (arregleu els conflictes i executeu \"git cherry-pick --continue\")"
-#: wt-status.c:1095
+#: wt-status.c:1092
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (tots els conflictes arreglats: executeu \"git cherry-pick --continue\")"
-#: wt-status.c:1097
+#: wt-status.c:1094
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-" (utilitzeu \"git cherry-pick --abort\" per cancel·lar l'operació de recull "
-"de cireres)"
+" (useu \"git cherry-pick --abort\" per a cancel·lar l'operació de recull de "
+"cireres)"
-#: wt-status.c:1106
+#: wt-status.c:1103
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Actualment esteu revertint la comissió %s."
-#: wt-status.c:1111
+#: wt-status.c:1108
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (arregleu els conflictes i executeu \"git revert --continue\")"
-#: wt-status.c:1114
+#: wt-status.c:1111
msgid " (all conflicts fixed: run \"git revert --continue\")"
-msgstr " (tots els conflictes arreglats: executeu \"git revert --continue\")"
+msgstr ""
+" (tots els conflictes estan arreglats: executeu \"git revert --continue\")"
-#: wt-status.c:1116
+#: wt-status.c:1113
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
-" (utilitzeu \"git revert --abort\" per cancel·lar l'operació de reversió)"
+" (useu \"git revert --abort\" per a cancel·lar l'operació de reversió)"
-#: wt-status.c:1127
+#: wt-status.c:1124
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Actualment esteu bisecant, heu començat des de la rama '%s'."
-#: wt-status.c:1131
+#: wt-status.c:1128
msgid "You are currently bisecting."
msgstr "Actualment esteu bisecant."
-#: wt-status.c:1134
+#: wt-status.c:1131
msgid " (use \"git bisect reset\" to get back to the original branch)"
-msgstr " (utilitzeu \"git bisect reset\" per tornar a la rama original)"
+msgstr " (useu \"git bisect reset\" per a tornar a la rama original)"
-#: wt-status.c:1309
+#: wt-status.c:1306
msgid "On branch "
msgstr "En la rama "
-#: wt-status.c:1316
+#: wt-status.c:1313
msgid "rebase in progress; onto "
msgstr "rebase en progrés; en "
-#: wt-status.c:1323
+#: wt-status.c:1320
msgid "HEAD detached at "
msgstr "HEAD separat a"
-#: wt-status.c:1325
+#: wt-status.c:1322
msgid "HEAD detached from "
msgstr "HEAD separat de"
-#: wt-status.c:1328
+#: wt-status.c:1325
msgid "Not currently on any branch."
msgstr "Actualment no en cap rama."
-#: wt-status.c:1345
+#: wt-status.c:1342
msgid "Initial commit"
msgstr "Comissió inicial"
-#: wt-status.c:1359
+#: wt-status.c:1356
msgid "Untracked files"
msgstr "Fitxers no seguits"
-#: wt-status.c:1361
+#: wt-status.c:1358
msgid "Ignored files"
msgstr "Fitxers ignorats"
-#: wt-status.c:1365
+#: wt-status.c:1362
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -1814,130 +1910,131 @@ msgstr ""
"oblidar afegir fitxers nous per vós mateix (veu\n"
"'git help status')."
-#: wt-status.c:1371
+#: wt-status.c:1368
#, c-format
msgid "Untracked files not listed%s"
-msgstr "Fitxers no seguits no llistats%s"
+msgstr "Els fitxers no seguits no estan llistats%s"
-#: wt-status.c:1373
+#: wt-status.c:1370
msgid " (use -u option to show untracked files)"
-msgstr " (utilitzeu l'opció -u per mostrar fitxers no seguits)"
+msgstr " (useu l'opció -u per a mostrar els fitxers no seguits)"
-#: wt-status.c:1379
+#: wt-status.c:1376
msgid "No changes"
msgstr "Sense canvis"
-#: wt-status.c:1384
+#: wt-status.c:1381
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-"cap canvi afegit que cometre (afegeix \"git add\" o \"git commit -a\")\n"
+"no hi ha canvis afegits a cometre (useu \"git add\" o \"git commit -a\")\n"
-#: wt-status.c:1387
+#: wt-status.c:1384
#, c-format
msgid "no changes added to commit\n"
-msgstr "cap canvi afegit que cometre\n"
+msgstr "no hi ha canvis afegits a cometre\n"
-#: wt-status.c:1390
+#: wt-status.c:1387
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
-"res afegit que cometre però fitxers no seguits estan presents (utilitzeu "
-"\"git add\" per seguir-los)\n"
+"no hi ha res afegit a cometre però fitxers no seguits estan presents (useu "
+"\"git add\" per a seguir-los)\n"
-#: wt-status.c:1393
+#: wt-status.c:1390
#, c-format
msgid "nothing added to commit but untracked files present\n"
-msgstr "res afegit que cometre però fitxers no seguits estan presents\n"
+msgstr "no hi ha res afegit a cometre però fitxers no seguits estan presents\n"
-#: wt-status.c:1396
+#: wt-status.c:1393
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-"res que cometre (creeu/copieu fitxers i utilitzeu \"git add\" per seguir-"
+"no hi ha res a cometre (creeu/copieu fitxers i useu \"git add\" per a seguir-"
"los)\n"
-#: wt-status.c:1399 wt-status.c:1404
+#: wt-status.c:1396 wt-status.c:1401
#, c-format
msgid "nothing to commit\n"
-msgstr "res que cometre\n"
+msgstr "no hi ha res a cometre\n"
-#: wt-status.c:1402
+#: wt-status.c:1399
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
-msgstr "res que cometre (utilitzeu -u per mostrar fitxers no seguits)\n"
+msgstr ""
+"no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n"
-#: wt-status.c:1406
+#: wt-status.c:1403
#, c-format
msgid "nothing to commit, working directory clean\n"
-msgstr "res que cometre, directori de treball net\n"
+msgstr "no hi ha res a cometre, directori de treball net\n"
-#: wt-status.c:1515
+#: wt-status.c:1512
msgid "HEAD (no branch)"
msgstr "HEAD (sense rama)"
-#: wt-status.c:1521
+#: wt-status.c:1518
msgid "Initial commit on "
msgstr "Comissió inicial en "
-#: wt-status.c:1553
+#: wt-status.c:1550
msgid "gone"
-msgstr "no està"
+msgstr "no és"
-#: wt-status.c:1555 wt-status.c:1563
+#: wt-status.c:1552 wt-status.c:1560
msgid "behind "
msgstr "darrere "
-#: compat/precompose_utf8.c:55 builtin/clone.c:356
+#: compat/precompose_utf8.c:55 builtin/clone.c:357
#, c-format
msgid "failed to unlink '%s'"
-msgstr "s'ha fallat al desenllaçar '%s'"
+msgstr "s'ha fallat en desenllaçar '%s'"
-#: builtin/add.c:21
+#: builtin/add.c:22
msgid "git add [options] [--] <pathspec>..."
msgstr "git add [opcions] [--] <especificació-de-ruta>..."
-#: builtin/add.c:64
+#: builtin/add.c:65
#, c-format
msgid "unexpected diff status %c"
msgstr "estat de diff inesperat %c"
-#: builtin/add.c:69 builtin/commit.c:261
+#: builtin/add.c:70 builtin/commit.c:275
msgid "updating files failed"
-msgstr "s'ha fallat al actualitzar els fitxers"
+msgstr "s'ha fallat en actualitzar els fitxers"
-#: builtin/add.c:79
+#: builtin/add.c:80
#, c-format
msgid "remove '%s'\n"
msgstr "treu '%s'\n"
-#: builtin/add.c:133
+#: builtin/add.c:134
msgid "Unstaged changes after refreshing the index:"
msgstr "Canvis no allistats després d'actualitzar l'índex:"
-#: builtin/add.c:193 builtin/rev-parse.c:781
+#: builtin/add.c:194 builtin/rev-parse.c:785
msgid "Could not read the index"
msgstr "No s'ha pogut llegir l'índex"
-#: builtin/add.c:204
+#: builtin/add.c:205
#, c-format
msgid "Could not open '%s' for writing."
msgstr "No s'ha pogut obrir '%s' per a escriptura."
-#: builtin/add.c:208
+#: builtin/add.c:209
msgid "Could not write patch"
msgstr "No s'ha pogut escriure el pedaç"
-#: builtin/add.c:213
+#: builtin/add.c:214
#, c-format
msgid "Could not stat '%s'"
msgstr "No s'ha pogut fer stat a '%s'"
-#: builtin/add.c:215
+#: builtin/add.c:216
msgid "Empty patch. Aborted."
-msgstr "Pedaç buit. Avortat."
+msgstr "El pedaç és buit. Avortat."
#: builtin/add.c:221
#, c-format
@@ -1948,15 +2045,15 @@ msgstr "No s'ha pogut aplicar '%s'"
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "Les rutes següents s'ignoren per un dels vostres fitxers .gitignore:\n"
-#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:70
-#: builtin/prune-packed.c:77 builtin/push.c:488 builtin/remote.c:1367
+#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110
+#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1375
#: builtin/rm.c:269
msgid "dry run"
msgstr "marxa en sec"
-#: builtin/add.c:249 builtin/apply.c:4411 builtin/check-ignore.c:19
-#: builtin/commit.c:1328 builtin/count-objects.c:95 builtin/fsck.c:606
-#: builtin/log.c:1613 builtin/mv.c:69 builtin/read-tree.c:113
+#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19
+#: builtin/commit.c:1362 builtin/count-objects.c:63 builtin/fsck.c:608
+#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
msgid "be verbose"
msgstr "sigues verbós"
@@ -1964,13 +2061,13 @@ msgstr "sigues verbós"
msgid "interactive picking"
msgstr "recull interactiu"
-#: builtin/add.c:252 builtin/checkout.c:1102 builtin/reset.c:285
+#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "selecciona els trossos interactivament"
#: builtin/add.c:253
msgid "edit current diff and apply"
-msgstr "edita la diferència actual i aplica"
+msgstr "edita la diferència actual i aplica'l"
#: builtin/add.c:254
msgid "allow adding otherwise ignored files"
@@ -2003,12 +2100,12 @@ msgstr "només salta els fitxers que no es poden afegir a causa d'errors"
#: builtin/add.c:264
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-"comproveu si els fitxers - encara els mancants - s'ignoran en marxa en sec"
+"comproveu si els fitxers - encara els mancants - s'ignoren en marxa en sec"
#: builtin/add.c:286
#, c-format
msgid "Use -f if you really want to add them.\n"
-msgstr "Utilitzeu -f si realment els voleu afegir.\n"
+msgstr "Useu -f si realment els voleu afegir.\n"
#: builtin/add.c:287
msgid "no files added"
@@ -2024,7 +2121,7 @@ msgstr "-A i -u són mutualment incompatibles"
#: builtin/add.c:336
msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "L'opció --ignore-missing només es pot utilitzar junt amb --dry-run"
+msgstr "L'opció --ignore-missing només es pot usar junt amb --dry-run"
#: builtin/add.c:357
#, c-format
@@ -2037,77 +2134,77 @@ msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Potser volíeu dir 'git add .'?\n"
#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919
-#: builtin/commit.c:319 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299
+#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299
msgid "index file corrupt"
msgstr "fitxer d'índex malmès"
-#: builtin/add.c:446 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:431
+#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431
msgid "Unable to write new index file"
-msgstr "Incapaç d'escriure un nou fitxer d'índex"
+msgstr "Incapaç d'escriure un fitxer d'índex nou"
-#: builtin/apply.c:57
+#: builtin/apply.c:58
msgid "git apply [options] [<patch>...]"
msgstr "git apply [opcions] [<pedaç>...]"
-#: builtin/apply.c:110
+#: builtin/apply.c:111
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "opció d'espai en blanc '%s' no reconeguda"
-#: builtin/apply.c:125
+#: builtin/apply.c:126
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "opció d'ignoral d'espai en blanc '%s' no reconeguda"
-#: builtin/apply.c:825
+#: builtin/apply.c:826
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "No es pot preparar l'expressió regular de marca de temps %s"
-#: builtin/apply.c:834
+#: builtin/apply.c:835
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec ha retornat %d per l'entrada: %s"
-#: builtin/apply.c:915
+#: builtin/apply.c:916
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "incapaç de trobar el nom de fitxer en el pedaç a la línia %d"
-#: builtin/apply.c:947
+#: builtin/apply.c:948
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: git-diff dolent - /dev/null esperat, %s rebut en la línia %d"
-#: builtin/apply.c:951
+#: builtin/apply.c:952
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply: git-diff dolent - nom de fitxer nou inconsistent en la línia %d"
-#: builtin/apply.c:952
+#: builtin/apply.c:953
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply: git-diff dolent - nom de fitxer antic inconsistent en la línia %d"
-#: builtin/apply.c:959
+#: builtin/apply.c:960
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: git-diff dolent - /dev/null esperat en la línia %d"
-#: builtin/apply.c:1422
+#: builtin/apply.c:1423
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recompte: línia inesperada: %.*s"
-#: builtin/apply.c:1479
+#: builtin/apply.c:1480
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "fragment de pedaç sense capçalera a la línia %d: %.*s"
-#: builtin/apply.c:1496
+#: builtin/apply.c:1497
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -2116,83 +2213,83 @@ msgid_plural ""
"git diff header lacks filename information when removing %d leading pathname "
"components (line %d)"
msgstr[0] ""
-"a la capçalera de git diff li manca informació de nom de fitxer al treure %d "
+"a la capçalera de git diff li manca informació de nom de fitxer en treure %d "
"component de nom de ruta inicial (línia %d)"
msgstr[1] ""
-"a la capçalera de git diff li manca informació de nom de fitxer al treure %d "
+"a la capçalera de git diff li manca informació de nom de fitxer en treure %d "
"components de nom de ruta inicial (línia %d)"
-#: builtin/apply.c:1656
+#: builtin/apply.c:1657
msgid "new file depends on old contents"
msgstr "el fitxer nou depèn dels continguts antics"
-#: builtin/apply.c:1658
+#: builtin/apply.c:1659
msgid "deleted file still has contents"
msgstr "el fitxer suprimit encara té continguts"
-#: builtin/apply.c:1684
+#: builtin/apply.c:1685
#, c-format
msgid "corrupt patch at line %d"
-msgstr "pedaç malmès a la línia %d"
+msgstr "el pedaç és malmès a la línia %d"
-#: builtin/apply.c:1720
+#: builtin/apply.c:1721
#, c-format
msgid "new file %s depends on old contents"
msgstr "el fitxer nou %s depèn dels continguts antics"
-#: builtin/apply.c:1722
+#: builtin/apply.c:1723
#, c-format
msgid "deleted file %s still has contents"
msgstr "el fitxer suprimit %s encara té continguts"
-#: builtin/apply.c:1725
+#: builtin/apply.c:1726
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** avís: el fitxer %s es buida però no es suprimeix"
-#: builtin/apply.c:1871
+#: builtin/apply.c:1872
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "pedaç binari malmès a la línia %d: %.*s"
-#: builtin/apply.c:1900
+#: builtin/apply.c:1901
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "pedaç binari no reconegut a la línia %d"
-#: builtin/apply.c:1986
+#: builtin/apply.c:2052
#, c-format
msgid "patch with only garbage at line %d"
msgstr "pedaç amb només escombraries a la línia %d"
-#: builtin/apply.c:2076
+#: builtin/apply.c:2142
#, c-format
msgid "unable to read symlink %s"
msgstr "incapaç de llegir l'enllaç simbòlic %s"
-#: builtin/apply.c:2080
+#: builtin/apply.c:2146
#, c-format
msgid "unable to open or read %s"
msgstr "incapaç d'obrir o llegir %s"
-#: builtin/apply.c:2688
+#: builtin/apply.c:2754
#, c-format
msgid "invalid start of line: '%c'"
msgstr "inici de línia no vàlid: '%c'"
-#: builtin/apply.c:2806
+#: builtin/apply.c:2872
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "El tros #%d ha tingut éxit a %d (desplaçament %d línia)."
msgstr[1] "El tros #%d ha tingut éxit a %d (desplaçament %d línies)."
-#: builtin/apply.c:2818
+#: builtin/apply.c:2884
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
-msgstr "Context reduït a (%ld/%ld) per a aplicar el fragment a %d"
+msgstr "El context s'ha reduït a (%ld/%ld) per a aplicar el fragment a %d"
-#: builtin/apply.c:2824
+#: builtin/apply.c:2890
#, c-format
msgid ""
"while searching for:\n"
@@ -2201,322 +2298,323 @@ msgstr ""
"mentre cercant:\n"
"%.*s"
-#: builtin/apply.c:2843
+#: builtin/apply.c:2909
#, c-format
msgid "missing binary patch data for '%s'"
-msgstr "manca els dades de pedaç binari de '%s'"
+msgstr "manquen els dades de pedaç binari de '%s'"
-#: builtin/apply.c:2944
+#: builtin/apply.c:3010
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "el pedaç binari no s'aplica a '%s'"
-#: builtin/apply.c:2950
+#: builtin/apply.c:3016
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"el pedaç binari a '%s' crea un resultat incorrecte (esperant %s, %s rebut)"
-#: builtin/apply.c:2971
+#: builtin/apply.c:3037
#, c-format
msgid "patch failed: %s:%ld"
msgstr "el pedaç ha fallat: %s:%ld"
-#: builtin/apply.c:3095
+#: builtin/apply.c:3161
#, c-format
msgid "cannot checkout %s"
msgstr "no es pot agafar %s"
-#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194
+#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260
#, c-format
msgid "read of %s failed"
msgstr "la lectura de %s ha fallat"
-#: builtin/apply.c:3174 builtin/apply.c:3396
+#: builtin/apply.c:3240 builtin/apply.c:3462
#, c-format
msgid "path %s has been renamed/deleted"
-msgstr "la ruta %s s'ha canviat de nom/suprimit"
+msgstr "la ruta %s s'ha canviat de nom / s'ha suprimit"
-#: builtin/apply.c:3255 builtin/apply.c:3410
+#: builtin/apply.c:3321 builtin/apply.c:3476
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: no existeix en l'índex"
-#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424
+#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: builtin/apply.c:3264 builtin/apply.c:3418
+#: builtin/apply.c:3330 builtin/apply.c:3484
#, c-format
msgid "%s: does not match index"
msgstr "%s: no coincideix amb l'índex"
-#: builtin/apply.c:3366
+#: builtin/apply.c:3432
msgid "removal patch leaves file contents"
msgstr "el pedaç de treta deixa els continguts dels fitxers"
-#: builtin/apply.c:3435
+#: builtin/apply.c:3501
#, c-format
msgid "%s: wrong type"
msgstr "%s: tipus erroni"
-#: builtin/apply.c:3437
+#: builtin/apply.c:3503
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s és del tipus %o, %o esperat"
-#: builtin/apply.c:3538
+#: builtin/apply.c:3604
#, c-format
msgid "%s: already exists in index"
msgstr "%s: ja existeix en l'índex"
-#: builtin/apply.c:3541
+#: builtin/apply.c:3607
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: ja existeix en el directori de treball"
-#: builtin/apply.c:3561
+#: builtin/apply.c:3627
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o)"
-#: builtin/apply.c:3566
+#: builtin/apply.c:3632
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o) de %s"
-#: builtin/apply.c:3574
+#: builtin/apply.c:3640
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: el pedaç no aplica"
-#: builtin/apply.c:3587
+#: builtin/apply.c:3653
#, c-format
msgid "Checking patch %s..."
msgstr "Comprovant el pedaç %s..."
-#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134
+#: builtin/apply.c:3746 builtin/checkout.c:213 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry ha fallat per a la ruta '%s'"
-#: builtin/apply.c:3823
+#: builtin/apply.c:3889
#, c-format
msgid "unable to remove %s from index"
msgstr "incapaç de treure %s de l'índex"
-#: builtin/apply.c:3852
+#: builtin/apply.c:3918
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "pedaç corrupte per al submòdul %s"
-#: builtin/apply.c:3856
+#: builtin/apply.c:3922
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "incapaç de fer stat al fitxer novament creat '%s'"
-#: builtin/apply.c:3861
+#: builtin/apply.c:3927
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"incapaç de crear un magatzem de recolzament per al fitxer novament creat %s"
-#: builtin/apply.c:3864 builtin/apply.c:3972
+#: builtin/apply.c:3930 builtin/apply.c:4038
#, c-format
msgid "unable to add cache entry for %s"
msgstr "incapaç d'afegir una entrada de cau per a %s"
-#: builtin/apply.c:3897
+#: builtin/apply.c:3963
#, c-format
msgid "closing file '%s'"
msgstr "tancant el fitxer '%s'"
-#: builtin/apply.c:3946
+#: builtin/apply.c:4012
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "incapaç d'escriure el fitxer '%s' mode %o"
-#: builtin/apply.c:4033
+#: builtin/apply.c:4099
#, c-format
msgid "Applied patch %s cleanly."
msgstr "El pedaç %s s'ha aplicat netament."
-#: builtin/apply.c:4041
+#: builtin/apply.c:4107
msgid "internal error"
msgstr "error intern"
-#: builtin/apply.c:4044
+#: builtin/apply.c:4110
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Aplicant el pedaç %%s amb %d rebuig"
msgstr[1] "Aplicant el pedaç %%s amb %d rebuitjos"
-#: builtin/apply.c:4054
+#: builtin/apply.c:4120
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "truncant el nom del fitxer .rej a %.*s.rej"
-#: builtin/apply.c:4075
+#: builtin/apply.c:4141
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "El tros #%d s'ha aplicat netament."
-#: builtin/apply.c:4078
+#: builtin/apply.c:4144
#, c-format
msgid "Rejected hunk #%d."
msgstr "S'ha rebutjat el tros #%d."
-#: builtin/apply.c:4228
+#: builtin/apply.c:4234
msgid "unrecognized input"
msgstr "entrada no reconegut"
-#: builtin/apply.c:4239
+#: builtin/apply.c:4245
msgid "unable to read index file"
msgstr "incapaç de llegir el fitxer d'índex"
-#: builtin/apply.c:4358 builtin/apply.c:4361 builtin/clone.c:90
+#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:91
#: builtin/fetch.c:93
msgid "path"
msgstr "ruta"
-#: builtin/apply.c:4359
+#: builtin/apply.c:4363
msgid "don't apply changes matching the given path"
-msgstr "no apliquis canvis que coincideixen amb la ruta donada"
+msgstr "no apliquis els canvis que coincideixin amb la ruta donada"
-#: builtin/apply.c:4362
+#: builtin/apply.c:4366
msgid "apply changes matching the given path"
-msgstr "aplica els canvis que coincideixen amb la ruta donada"
+msgstr "aplica els canvis que coincideixin amb la ruta donada"
-#: builtin/apply.c:4364
+#: builtin/apply.c:4368
msgid "num"
msgstr "número"
-#: builtin/apply.c:4365
+#: builtin/apply.c:4369
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
"treu <nombre> barres obliqües inicials de les rutes de diferència "
"tradicionals"
-#: builtin/apply.c:4368
+#: builtin/apply.c:4372
msgid "ignore additions made by the patch"
msgstr "ignora afegiments fets pel pedaç"
-#: builtin/apply.c:4370
+#: builtin/apply.c:4374
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
"en lloc d'aplicar el pedaç, emet les estadístiques de diferència de l'entrada"
-#: builtin/apply.c:4374
+#: builtin/apply.c:4378
msgid "show number of added and deleted lines in decimal notation"
msgstr "mostra el nombre de línies afegides i suprimides en notació decimal"
-#: builtin/apply.c:4376
+#: builtin/apply.c:4380
msgid "instead of applying the patch, output a summary for the input"
msgstr "en lloc d'aplicar el pedaç, emet un resum de l'entrada"
-#: builtin/apply.c:4378
+#: builtin/apply.c:4382
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "en lloc d'aplicar el pedaç, veges si el pedaç és aplicable"
-#: builtin/apply.c:4380
+#: builtin/apply.c:4384
msgid "make sure the patch is applicable to the current index"
msgstr "assegura que el pedaç sigui aplicable a l'índex actual"
-#: builtin/apply.c:4382
+#: builtin/apply.c:4386
msgid "apply a patch without touching the working tree"
msgstr "aplica un pedaç sense tocar l'arbre de treball"
-#: builtin/apply.c:4384
+#: builtin/apply.c:4388
msgid "also apply the patch (use with --stat/--summary/--check)"
-msgstr "aplica el pedaç també (utilitzeu amb --stat/--summary/--check)"
+msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)"
-#: builtin/apply.c:4386
+#: builtin/apply.c:4390
msgid "attempt three-way merge if a patch does not apply"
msgstr "intenta una fusió de tres vies si el pedaç no s'aplica"
-#: builtin/apply.c:4388
+#: builtin/apply.c:4392
msgid "build a temporary index based on embedded index information"
msgstr "construeix un índex temporal basat en la informació d'índex incrustada"
-#: builtin/apply.c:4390 builtin/checkout-index.c:198 builtin/ls-files.c:455
+#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455
msgid "paths are separated with NUL character"
msgstr "rutes es separen amb el caràcter NUL"
-#: builtin/apply.c:4393
+#: builtin/apply.c:4397
msgid "ensure at least <n> lines of context match"
msgstr "assegura que almenys <n> línies de context coincideixin"
-#: builtin/apply.c:4394
+#: builtin/apply.c:4398
msgid "action"
msgstr "acció"
-#: builtin/apply.c:4395
+#: builtin/apply.c:4399
msgid "detect new or modified lines that have whitespace errors"
-msgstr "detecta línies noves o modificades que tenen errors d'espai en blanc"
+msgstr ""
+"detecta les línies noves o modificades que tinguin errors d'espai en blanc"
-#: builtin/apply.c:4398 builtin/apply.c:4401
+#: builtin/apply.c:4402 builtin/apply.c:4405
msgid "ignore changes in whitespace when finding context"
msgstr "ignora els canvis d'espai en blanc al cercar context"
-#: builtin/apply.c:4404
+#: builtin/apply.c:4408
msgid "apply the patch in reverse"
msgstr "aplica el pedaç al revés"
-#: builtin/apply.c:4406
+#: builtin/apply.c:4410
msgid "don't expect at least one line of context"
msgstr "no esperis almenys una línia de context"
-#: builtin/apply.c:4408
+#: builtin/apply.c:4412
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "deixa els trossos rebutjats en fitxers *.reg coresspondents"
-#: builtin/apply.c:4410
+#: builtin/apply.c:4414
msgid "allow overlapping hunks"
msgstr "permet trossos encavalcants"
-#: builtin/apply.c:4413
+#: builtin/apply.c:4417
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "tolera una línia nova incorrectament detectada al final del fitxer"
-#: builtin/apply.c:4416
+#: builtin/apply.c:4420
msgid "do not trust the line counts in the hunk headers"
msgstr "no confiïs en els recomptes de línia en les capçaleres dels trossos"
-#: builtin/apply.c:4418
+#: builtin/apply.c:4422
msgid "root"
msgstr "arrel"
-#: builtin/apply.c:4419
+#: builtin/apply.c:4423
msgid "prepend <root> to all filenames"
msgstr "anteposa <arrel> a tots els noms de fitxer"
-#: builtin/apply.c:4441
+#: builtin/apply.c:4445
msgid "--3way outside a repository"
-msgstr "--3way fora d'un repositori"
+msgstr "--3way fora d'un dipòsit"
-#: builtin/apply.c:4449
+#: builtin/apply.c:4453
msgid "--index outside a repository"
-msgstr "--index fora d'un repositori"
+msgstr "--index fora d'un dipòsit"
-#: builtin/apply.c:4452
+#: builtin/apply.c:4456
msgid "--cached outside a repository"
-msgstr "--cached fora d'un repositori"
+msgstr "--cached fora d'un dipòsit"
-#: builtin/apply.c:4468
+#: builtin/apply.c:4472
#, c-format
msgid "can't open patch '%s'"
msgstr "no es pot obrir el pedaç '%s'"
-#: builtin/apply.c:4482
+#: builtin/apply.c:4486
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "%d error d'espai en blanc omès"
msgstr[1] "%d errors d'espai en blanc omesos"
-#: builtin/apply.c:4488 builtin/apply.c:4498
+#: builtin/apply.c:4492 builtin/apply.c:4502
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
@@ -2576,7 +2674,7 @@ msgstr "git blame [opcions] [opcions-de-revisió] [revisió] [--] fitxer"
#: builtin/blame.c:35
msgid "[rev-opts] are documented in git-rev-list(1)"
-msgstr "les [opcions-de-revisió] estàn documentades en git-rev-list(1)"
+msgstr "les [opcions-de-revisió] estan documentades en git-rev-list(1)"
#: builtin/blame.c:2501
msgid "Show blame entries as we find them, incrementally"
@@ -2584,11 +2682,13 @@ msgstr "Mostra les entrades de culpa mentre les trobem, incrementalment"
#: builtin/blame.c:2502
msgid "Show blank SHA-1 for boundary commits (Default: off)"
-msgstr "Mostra SHA-1 blanc en comissions de frontera (Per defecte: desactivat)"
+msgstr ""
+"Mostra un SHA-1 blanc peles comissions de frontera (Per defecte: desactivat)"
#: builtin/blame.c:2503
msgid "Do not treat root commits as boundaries (Default: off)"
-msgstr "No tractis les comissions d'arrel com límits (Per defecte: desactivat)"
+msgstr ""
+"No tractis les comissions d'arrel com a límits (Per defecte: desactivat)"
#: builtin/blame.c:2504
msgid "Show work cost statistics"
@@ -2617,7 +2717,7 @@ msgstr "Mostra el format de porcellana amb informació de comissió per línia"
#: builtin/blame.c:2510
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
-"Utilitza el mateix mode de sortida que git-annotate (Per defecte: desactivat)"
+"Usa el mateix mode de sortida que git-annotate (Per defecte: desactivat)"
#: builtin/blame.c:2511
msgid "Show raw timestamp (Default: off)"
@@ -2647,11 +2747,11 @@ msgstr "Gasta cicles extres per a trobar una coincidència millora"
#: builtin/blame.c:2517
msgid "Use revisions from <file> instead of calling git-rev-list"
-msgstr "Utilitza les revisions de <file> en lloc d'invocar git-rev-list"
+msgstr "Usa les revisions de <fitxer> en lloc d'invocar git-rev-list"
#: builtin/blame.c:2518
msgid "Use <file>'s contents as the final image"
-msgstr "Utilitza els continguts de <file> com l'imatge final"
+msgstr "Usa els continguts de <fitxer> com a la imatge final"
#: builtin/blame.c:2519 builtin/blame.c:2520
msgid "score"
@@ -2659,11 +2759,11 @@ msgstr "puntuació"
#: builtin/blame.c:2519
msgid "Find line copies within and across files"
-msgstr "Troba còpies de línia dins i a través de fitxers"
+msgstr "Troba còpies de línia dins i a través dels fitxers"
#: builtin/blame.c:2520
msgid "Find line movements within and across files"
-msgstr "Troba moviments de línia dins i a través de fitxers"
+msgstr "Troba moviments de línia dins i a través dels fitxers"
#: builtin/blame.c:2521
msgid "n,m"
@@ -2671,7 +2771,7 @@ msgstr "n,m"
#: builtin/blame.c:2521
msgid "Process only line range n,m, counting from 1"
-msgstr "Processa només el rang de línies n,m, contant des de 1"
+msgstr "Processa només el rang de línies n,m, comptant des de 1"
#. TRANSLATORS: This string is used to tell us the maximum
#. display width for a relative timestamp in "git blame"
@@ -2679,7 +2779,7 @@ msgstr "Processa només el rang de línies n,m, contant des de 1"
#. takes 22 places, is the longest among various forms of
#. relative timestamps, but your language may need more or
#. fewer display columns.
-#: builtin/blame.c:2599
+#: builtin/blame.c:2602
msgid "4 years, 11 months ago"
msgstr "fa 4 anys, 11 mesos"
@@ -2699,17 +2799,17 @@ msgstr "git branch [opcions] [-r] (-d | -D) <nom-de-rama>..."
msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
msgstr "git branch [opcions] (-m | -M) [<rama-antiga>] <rama-nova>"
-#: builtin/branch.c:150
+#: builtin/branch.c:152
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr ""
"suprimint la rama '%s' que s'ha fusionat a\n"
-" '%s', però encara no fusionat a\n"
-" HEAD."
+" '%s', però encara no s'ha fusionat\n"
+" a HEAD."
-#: builtin/branch.c:154
+#: builtin/branch.c:156
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -2719,12 +2819,12 @@ msgstr ""
" fusionat a '%s', encara que està fusionat\n"
" a HEAD."
-#: builtin/branch.c:168
+#: builtin/branch.c:170
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "No s'ha pogut trobar l'objecte de comissió de '%s'"
-#: builtin/branch.c:172
+#: builtin/branch.c:174
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -2733,350 +2833,351 @@ msgstr ""
"La rama '%s' no està totalment fusionada.\n"
"Si esteu segur que la voleu suprimir, executeu 'git branch -D %s'."
-#: builtin/branch.c:185
+#: builtin/branch.c:187
msgid "Update of config-file failed"
msgstr "L'actualització del fitxer de configuració ha fallat"
-#: builtin/branch.c:213
+#: builtin/branch.c:215
msgid "cannot use -a with -d"
-msgstr "no es pot utilitzar -a amb -d"
+msgstr "no es pot usar -a amb -d"
-#: builtin/branch.c:219
+#: builtin/branch.c:221
msgid "Couldn't look up commit object for HEAD"
msgstr "No s'ha pogut trobar l'objecte de comissió de HEAD"
-#: builtin/branch.c:227
+#: builtin/branch.c:229
#, c-format
msgid "Cannot delete the branch '%s' which you are currently on."
msgstr "No es pot suprimir la rama '%s' en que esteu actualment."
-#: builtin/branch.c:240
+#: builtin/branch.c:245
#, c-format
msgid "remote branch '%s' not found."
-msgstr "rama remota '%s' no trobada."
+msgstr "no s'ha trobat la rama remota '%s'."
-#: builtin/branch.c:241
+#: builtin/branch.c:246
#, c-format
msgid "branch '%s' not found."
-msgstr "rama '%s' no trobada"
+msgstr "no s'ha trobat la rama '%s'."
-#: builtin/branch.c:255
+#: builtin/branch.c:260
#, c-format
msgid "Error deleting remote branch '%s'"
-msgstr "Error al suprimir la rama remota '%s'"
+msgstr "Error en suprimir la rama remota '%s'"
-#: builtin/branch.c:256
+#: builtin/branch.c:261
#, c-format
msgid "Error deleting branch '%s'"
-msgstr "Error al suprimir la rama '%s'"
+msgstr "Error en suprimir la rama '%s'"
-#: builtin/branch.c:263
+#: builtin/branch.c:268
#, c-format
msgid "Deleted remote branch %s (was %s).\n"
msgstr "S'ha suprimit la rama remota %s (ha estat %s).\n"
-#: builtin/branch.c:264
+#: builtin/branch.c:269
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "S'ha suprimit la rama %s (ha estat %s).\n"
-#: builtin/branch.c:366
+#: builtin/branch.c:370
#, c-format
msgid "branch '%s' does not point at a commit"
msgstr "la rama '%s' no assenyala una comissió"
-#: builtin/branch.c:454
+#: builtin/branch.c:459
#, c-format
msgid "[%s: gone]"
-msgstr "[%s: no està]"
+msgstr "[%s: no és]"
-#: builtin/branch.c:459
+#: builtin/branch.c:464
#, c-format
msgid "[%s]"
msgstr "[%s]"
-#: builtin/branch.c:464
+#: builtin/branch.c:469
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s: darrere per %d]"
-#: builtin/branch.c:466
+#: builtin/branch.c:471
#, c-format
msgid "[behind %d]"
msgstr "[darrere de %d]"
-#: builtin/branch.c:470
+#: builtin/branch.c:475
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s: davant per %d]"
-#: builtin/branch.c:472
+#: builtin/branch.c:477
#, c-format
msgid "[ahead %d]"
-msgstr "[davant per %d]"
+msgstr "[davant de %d]"
-#: builtin/branch.c:475
+#: builtin/branch.c:480
#, c-format
msgid "[%s: ahead %d, behind %d]"
-msgstr "[%s: davant %d, darrere %d]"
+msgstr "[%s: davant per %d, darrere per %d]"
-#: builtin/branch.c:478
+#: builtin/branch.c:483
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[davant %d, darrere %d]"
-#: builtin/branch.c:502
+#: builtin/branch.c:496
msgid " **** invalid ref ****"
msgstr " **** referència invàlida ****"
-#: builtin/branch.c:594
+#: builtin/branch.c:587
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(cap rama, rebasant %s)"
-#: builtin/branch.c:597
+#: builtin/branch.c:590
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(cap rama, bisecció començada en %s)"
-#: builtin/branch.c:600
+#: builtin/branch.c:593
#, c-format
msgid "(detached from %s)"
msgstr "(separat de %s)"
-#: builtin/branch.c:603
+#: builtin/branch.c:596
msgid "(no branch)"
msgstr "(cap rama)"
-#: builtin/branch.c:649
+#: builtin/branch.c:643
#, c-format
msgid "object '%s' does not point to a commit"
msgstr "l'objecte '%s' no assenyala cap comissió"
-#: builtin/branch.c:681
+#: builtin/branch.c:691
msgid "some refs could not be read"
-msgstr "algunes referències no s'han pogut llegir"
+msgstr "no s'han pogut llegir algunes referències"
-#: builtin/branch.c:694
+#: builtin/branch.c:704
msgid "cannot rename the current branch while not on any."
-msgstr "no es pot canviar el nom de la rama actual mentre no estar en ninguna."
+msgstr ""
+"no es pot canviar el nom de la rama actual mentre no estant en ninguna."
-#: builtin/branch.c:704
+#: builtin/branch.c:714
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nom de rama invàlid: '%s'"
-#: builtin/branch.c:719
+#: builtin/branch.c:729
msgid "Branch rename failed"
msgstr "El canvi de nom de rama ha fallat"
-#: builtin/branch.c:723
+#: builtin/branch.c:733
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "S'ha canviat el nom de la rama malanomenada '%s'"
-#: builtin/branch.c:727
+#: builtin/branch.c:737
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "S'ha canviat el nom de la rama a %s, però HEAD no està actualitzat!"
-#: builtin/branch.c:734
+#: builtin/branch.c:744
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"La ramà està canviada de nom, però l'actualització del fitxer de "
"configuració ha fallat"
-#: builtin/branch.c:749
+#: builtin/branch.c:759
#, c-format
msgid "malformed object name %s"
msgstr "nom d'objecte %s malformat"
-#: builtin/branch.c:773
+#: builtin/branch.c:783
#, c-format
msgid "could not write branch description template: %s"
msgstr "no s'ha pogut escriure la plantilla de descripció de rama: %s"
-#: builtin/branch.c:803
+#: builtin/branch.c:813
msgid "Generic options"
msgstr "Opcions genèriques"
-#: builtin/branch.c:805
+#: builtin/branch.c:815
msgid "show hash and subject, give twice for upstream branch"
msgstr "mostra el hash i el tema, doneu dos vegades per la rama font"
-#: builtin/branch.c:806
+#: builtin/branch.c:816
msgid "suppress informational messages"
msgstr "omet els missatges informatius"
-#: builtin/branch.c:807
+#: builtin/branch.c:817
msgid "set up tracking mode (see git-pull(1))"
msgstr "configura el mode de seguiment (veu git-pull(1))"
-#: builtin/branch.c:809
+#: builtin/branch.c:819
msgid "change upstream info"
msgstr "canvia la informació de font"
-#: builtin/branch.c:813
+#: builtin/branch.c:823
msgid "use colored output"
-msgstr "utilitza sortida colorada"
+msgstr "usa sortida colorada"
-#: builtin/branch.c:814
+#: builtin/branch.c:824
msgid "act on remote-tracking branches"
msgstr "actua en rames amb seguiment remot"
-#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844
-#: builtin/branch.c:850 builtin/commit.c:1573 builtin/commit.c:1574
-#: builtin/commit.c:1575 builtin/commit.c:1576 builtin/tag.c:615
-#: builtin/tag.c:621
+#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854
+#: builtin/branch.c:860 builtin/commit.c:1622 builtin/commit.c:1623
+#: builtin/commit.c:1624 builtin/commit.c:1625 builtin/tag.c:616
+#: builtin/tag.c:622
msgid "commit"
msgstr "comissió"
-#: builtin/branch.c:818 builtin/branch.c:824
+#: builtin/branch.c:828 builtin/branch.c:834
msgid "print only branches that contain the commit"
msgstr "imprimeix només les rames que continguin la comissió"
-#: builtin/branch.c:830
+#: builtin/branch.c:840
msgid "Specific git-branch actions:"
msgstr "Accions de git-branch específiques:"
-#: builtin/branch.c:831
+#: builtin/branch.c:841
msgid "list both remote-tracking and local branches"
msgstr "llista ambdós les rames amb seguiment remot i les locals"
-#: builtin/branch.c:833
+#: builtin/branch.c:843
msgid "delete fully merged branch"
-msgstr "suprimeix la rama si completament fusionada"
+msgstr "suprimeix la rama si és completament fusionada"
-#: builtin/branch.c:834
+#: builtin/branch.c:844
msgid "delete branch (even if not merged)"
msgstr "suprimeix la rama (encara que no estigui fusionada)"
-#: builtin/branch.c:835
+#: builtin/branch.c:845
msgid "move/rename a branch and its reflog"
msgstr "mou/canvia de nom una rama i el seu registre de referència"
-#: builtin/branch.c:836
+#: builtin/branch.c:846
msgid "move/rename a branch, even if target exists"
msgstr "mou/canvia de nom una rama, encara que el destí existeixi"
-#: builtin/branch.c:837
+#: builtin/branch.c:847
msgid "list branch names"
msgstr "llista els noms de rama"
-#: builtin/branch.c:838
+#: builtin/branch.c:848
msgid "create the branch's reflog"
msgstr "crea el registre de referència de la rama"
-#: builtin/branch.c:840
+#: builtin/branch.c:850
msgid "edit the description for the branch"
msgstr "edita la descripció de la rama"
-#: builtin/branch.c:841
+#: builtin/branch.c:851
msgid "force creation (when already exists)"
msgstr "força creació (quan ja existeix)"
-#: builtin/branch.c:844
+#: builtin/branch.c:854
msgid "print only not merged branches"
msgstr "imprimeix només les rames sense fusionar"
-#: builtin/branch.c:850
+#: builtin/branch.c:860
msgid "print only merged branches"
msgstr "imprimeix només les rames fusionades"
-#: builtin/branch.c:854
+#: builtin/branch.c:864
msgid "list branches in columns"
msgstr "llista les rames en columnes"
-#: builtin/branch.c:867
+#: builtin/branch.c:877
msgid "Failed to resolve HEAD as a valid ref."
-msgstr "S'ha fallat al resoldre HEAD com referència vàlida."
+msgstr "S'ha fallat en resoldre HEAD com a referència vàlida."
-#: builtin/branch.c:872 builtin/clone.c:636
+#: builtin/branch.c:881 builtin/clone.c:634
msgid "HEAD not found below refs/heads!"
msgstr "HEAD no trobat baix refs/heads!"
-#: builtin/branch.c:896
+#: builtin/branch.c:903
msgid "--column and --verbose are incompatible"
msgstr "--column i --verbose són incompatibles"
-#: builtin/branch.c:902 builtin/branch.c:941
+#: builtin/branch.c:909 builtin/branch.c:948
msgid "branch name required"
msgstr "cal el nom de rama"
-#: builtin/branch.c:917
+#: builtin/branch.c:924
msgid "Cannot give description to detached HEAD"
msgstr "No es pot donar descripció a un HEAD separat"
-#: builtin/branch.c:922
+#: builtin/branch.c:929
msgid "cannot edit description of more than one branch"
msgstr "no es pot editar la descripció de més d'una rama"
-#: builtin/branch.c:929
+#: builtin/branch.c:936
#, c-format
msgid "No commit on branch '%s' yet."
-msgstr "Encara cap comissió en la rama '%s'."
+msgstr "Encara no hi ha comissió en la rama '%s'."
-#: builtin/branch.c:932
+#: builtin/branch.c:939
#, c-format
msgid "No branch named '%s'."
-msgstr "Cap rama amb nom '%s'."
+msgstr "No hi ha rama amb nom '%s'."
-#: builtin/branch.c:947
+#: builtin/branch.c:954
msgid "too many branches for a rename operation"
-msgstr "massa rames per a una operació de canvi de nom"
+msgstr "hi ha massa rames per a una operació de canvi de nom"
-#: builtin/branch.c:952
+#: builtin/branch.c:959
msgid "too many branches to set new upstream"
-msgstr "massa rames per a establir una nova font"
+msgstr "hi ha massa rames per a establir una nova font"
-#: builtin/branch.c:956
+#: builtin/branch.c:963
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
-"no s'ha pogut establir la font de HEAD com %s quan no assenyala cap rama."
+"no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap rama."
-#: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002
+#: builtin/branch.c:966 builtin/branch.c:988 builtin/branch.c:1009
#, c-format
msgid "no such branch '%s'"
-msgstr "cap rama així '%s'"
+msgstr "no hi ha tal rama '%s'"
-#: builtin/branch.c:963
+#: builtin/branch.c:970
#, c-format
msgid "branch '%s' does not exist"
msgstr "la rama '%s' no existeix"
-#: builtin/branch.c:975
+#: builtin/branch.c:982
msgid "too many branches to unset upstream"
-msgstr "massa rames per a desestablir la font"
+msgstr "hi ha massa rames per a desestablir la font"
-#: builtin/branch.c:979
+#: builtin/branch.c:986
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "no s'ha pogut desestablir la font de HEAD quan no assenyala cap rama."
-#: builtin/branch.c:985
+#: builtin/branch.c:992
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "La rama '%s' no té informació de font"
-#: builtin/branch.c:999
+#: builtin/branch.c:1006
msgid "it does not make sense to create 'HEAD' manually"
msgstr "no té sentit crear 'HEAD' manualment"
-#: builtin/branch.c:1005
+#: builtin/branch.c:1012
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr "les opcions -a i -r a 'git branch' no tenen sentit amb un nom de rama"
-#: builtin/branch.c:1008
+#: builtin/branch.c:1015
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
"track or --set-upstream-to\n"
msgstr ""
-"La bandera --set-upstream està desaprovada i es traurà. Considereu utilitzar "
-"--track o --set-upstream-to\n"
+"La bandera --set-upstream està desaprovada i es traurà. Considereu usar --"
+"track o --set-upstream-to\n"
-#: builtin/branch.c:1025
+#: builtin/branch.c:1032
#, c-format
msgid ""
"\n"
@@ -3087,12 +3188,12 @@ msgstr ""
"Si volíeu fer '%s' seguir '%s', feu això:\n"
"\n"
-#: builtin/branch.c:1026
+#: builtin/branch.c:1033
#, c-format
msgid " git branch -d %s\n"
msgstr " git branch -d %s\n"
-#: builtin/branch.c:1027
+#: builtin/branch.c:1034
#, c-format
msgid " git branch --set-upstream-to %s\n"
msgstr " git branch --set-upstream-to %s\n"
@@ -3104,50 +3205,50 @@ msgstr "%s està bé\n"
#: builtin/bundle.c:56
msgid "Need a repository to create a bundle."
-msgstr "Cal un repositori per fer un embolic."
+msgstr "Cal un dipòsit per a fer un embolic."
#: builtin/bundle.c:60
msgid "Need a repository to unbundle."
-msgstr "Cal un repositori per desembolicar."
+msgstr "Cal un dipòsit per a desembolicar."
-#: builtin/cat-file.c:331
+#: builtin/cat-file.c:332
msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
msgstr "git cat-file (-t|-s|-e|-p|<tipus>|--textconv) <objecte>"
-#: builtin/cat-file.c:332
+#: builtin/cat-file.c:333
msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
msgstr "git cat-file (--batch|--batch-check) < <llista_de_objectes>"
-#: builtin/cat-file.c:369
+#: builtin/cat-file.c:370
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<tipus> pot ser un de: blob, tree, commit, tag"
-#: builtin/cat-file.c:370
+#: builtin/cat-file.c:371
msgid "show object type"
msgstr "mostra el tipus de l'objecte"
-#: builtin/cat-file.c:371
+#: builtin/cat-file.c:372
msgid "show object size"
msgstr "mostra la mida de l'objecte"
-#: builtin/cat-file.c:373
+#: builtin/cat-file.c:374
msgid "exit with zero when there's no error"
msgstr "surt amb zero quan no hi ha error"
-#: builtin/cat-file.c:374
+#: builtin/cat-file.c:375
msgid "pretty-print object's content"
msgstr "imprimeix bellament el contingut de l'objecte "
-#: builtin/cat-file.c:376
+#: builtin/cat-file.c:377
msgid "for blob objects, run textconv on object's content"
msgstr "en els objectes de blob, executa textconv en el contingut de l'objecte"
-#: builtin/cat-file.c:378
+#: builtin/cat-file.c:379
msgid "show info and content of objects fed from the standard input"
msgstr ""
"mostra la informació i contingut dels objectes rebuts de l'entrada estàndard"
-#: builtin/cat-file.c:381
+#: builtin/cat-file.c:382
msgid "show info about objects fed from the standard input"
msgstr "mostra informació sobre els objectes rebuts de l'entrada estàndard"
@@ -3166,23 +3267,23 @@ msgstr "informa de tots els atributs establerts en el fitxer"
#: builtin/check-attr.c:20
msgid "use .gitattributes only from the index"
-msgstr "utilitza .gitattributes només des de l'índex"
+msgstr "usa .gitattributes només des de l'índex"
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75
+#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
msgid "read file names from stdin"
-msgstr "llegeix els noms de fitxer de stdin"
+msgstr "llegeix els noms de fitxer d'stdin"
#: builtin/check-attr.c:23 builtin/check-ignore.c:24
msgid "terminate input and output records by a NUL character"
msgstr "termina els registres d'entrada i de salida per un caràcter NUL"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1083 builtin/gc.c:285
+#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:274
msgid "suppress progress reporting"
msgstr "omet el reportatge de progrés"
#: builtin/check-ignore.c:26
msgid "show non-matching input paths"
-msgstr "mostra les rutes d'entrada que no coincideixen"
+msgstr "mostra les rutes d'entrada que no coincideixin"
#: builtin/check-ignore.c:28
msgid "ignore index when checking"
@@ -3218,7 +3319,7 @@ msgstr "git check-mailmap [opcions] <contacte>..."
#: builtin/check-mailmap.c:13
msgid "also read contacts from stdin"
-msgstr "també llegeix els contactes des de stdin"
+msgstr "també llegeix els contactes des d'stdin"
#: builtin/check-mailmap.c:24
#, c-format
@@ -3227,7 +3328,7 @@ msgstr "incapaç d'analitzar el contacte: %s"
#: builtin/check-mailmap.c:47
msgid "no contacts specified"
-msgstr "cap contacte especificat"
+msgstr "no hi ha contactes especificats"
#: builtin/checkout-index.c:126
msgid "git checkout-index [options] [--] [<file>...]"
@@ -3315,12 +3416,12 @@ msgstr "Incapaç d'afegir el resultat de fusió per a '%s'"
#: builtin/checkout.c:240
#, c-format
msgid "'%s' cannot be used with updating paths"
-msgstr "'%s' no es pot utilitzar al actualitzar rutes"
+msgstr "'%s' no es pot usar amb actualització de rutes"
#: builtin/checkout.c:243 builtin/checkout.c:246
#, c-format
msgid "'%s' cannot be used with %s"
-msgstr "'%s' no es pot utilitzar amb %s"
+msgstr "'%s' no es pot usar amb %s"
#: builtin/checkout.c:249
#, c-format
@@ -3340,46 +3441,46 @@ msgstr "la ruta '%s' està sense fusionar"
msgid "you need to resolve your current index first"
msgstr "heu de resoldre el vostre índex actual primer"
-#: builtin/checkout.c:591
+#: builtin/checkout.c:597
#, c-format
msgid "Can not do reflog for '%s'\n"
msgstr "No es pot fer reflog per a '%s'\n"
-#: builtin/checkout.c:629
+#: builtin/checkout.c:635
msgid "HEAD is now at"
msgstr "HEAD ara està a"
-#: builtin/checkout.c:636
+#: builtin/checkout.c:642
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Restableix la rama '%s'\n"
-#: builtin/checkout.c:639
+#: builtin/checkout.c:645
#, c-format
msgid "Already on '%s'\n"
msgstr "Ja en '%s'\n"
-#: builtin/checkout.c:643
+#: builtin/checkout.c:649
#, c-format
msgid "Switched to and reset branch '%s'\n"
-msgstr "Rama '%s' agafat i restablit\n"
+msgstr "S'ha agafat i restablert la rama '%s'\n"
-#: builtin/checkout.c:645 builtin/checkout.c:1026
+#: builtin/checkout.c:651 builtin/checkout.c:1032
#, c-format
msgid "Switched to a new branch '%s'\n"
-msgstr "Rama nova '%s' agafada\n"
+msgstr "S'ha agafat la rama nova '%s'\n"
-#: builtin/checkout.c:647
+#: builtin/checkout.c:653
#, c-format
msgid "Switched to branch '%s'\n"
-msgstr "Rama '%s' agafada\n"
+msgstr "S'ha agafat la rama '%s'\n"
-#: builtin/checkout.c:699
+#: builtin/checkout.c:705
#, c-format
msgid " ... and %d more.\n"
msgstr " ... i %d més.\n"
-#: builtin/checkout.c:705
+#: builtin/checkout.c:711
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -3402,7 +3503,7 @@ msgstr[1] ""
"\n"
"%s\n"
-#: builtin/checkout.c:723
+#: builtin/checkout.c:729
#, c-format
msgid ""
"If you want to keep them by creating a new branch, this may be a good time\n"
@@ -3411,159 +3512,159 @@ msgid ""
" git branch new_branch_name %s\n"
"\n"
msgstr ""
-"Si els voleu retenir per crear una rama nova, ara pot ser una hora bona\n"
-"per fer això amb:\n"
+"Si els voleu retenir per a crear una rama nova, ara pot ser una hora bona\n"
+"per a fer això amb:\n"
"\n"
" git branch new_branch_name %s\n"
"\n"
-#: builtin/checkout.c:753
+#: builtin/checkout.c:759
msgid "internal error in revision walk"
msgstr "error intern en el passeig per revisions"
-#: builtin/checkout.c:757
+#: builtin/checkout.c:763
msgid "Previous HEAD position was"
msgstr "La posició de HEAD anterior ha estat"
-#: builtin/checkout.c:784 builtin/checkout.c:1021
+#: builtin/checkout.c:790 builtin/checkout.c:1027
msgid "You are on a branch yet to be born"
-msgstr "Esteu en una rama que encara ha de naixer"
+msgstr "Esteu en una rama que encara ha de nàixer"
-#: builtin/checkout.c:928
+#: builtin/checkout.c:934
#, c-format
msgid "only one reference expected, %d given."
msgstr "només una referència esperada, %d donades."
-#: builtin/checkout.c:967
+#: builtin/checkout.c:973
#, c-format
msgid "invalid reference: %s"
msgstr "referència invàlida: %s"
-#: builtin/checkout.c:996
+#: builtin/checkout.c:1002
#, c-format
msgid "reference is not a tree: %s"
msgstr "la referéncia no és un arbre: %s"
-#: builtin/checkout.c:1035
+#: builtin/checkout.c:1041
msgid "paths cannot be used with switching branches"
-msgstr "les rutes no es poden utilitzar amb canvi de rama"
+msgstr "les rutes no es poden usar amb canvi de rama"
-#: builtin/checkout.c:1038 builtin/checkout.c:1042
+#: builtin/checkout.c:1044 builtin/checkout.c:1048
#, c-format
msgid "'%s' cannot be used with switching branches"
-msgstr "'%s' no es pot utilitzar amb canvi de rama"
+msgstr "'%s' no es pot usar amb canvi de rama"
-#: builtin/checkout.c:1046 builtin/checkout.c:1049 builtin/checkout.c:1054
-#: builtin/checkout.c:1057
+#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060
+#: builtin/checkout.c:1063
#, c-format
msgid "'%s' cannot be used with '%s'"
-msgstr "'%s' no es pot utilitzar amb '%s'"
+msgstr "'%s' no es pot usar amb '%s'"
-#: builtin/checkout.c:1062
+#: builtin/checkout.c:1068
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "No es pot canviar la rama a un no comissió '%s'"
-#: builtin/checkout.c:1084 builtin/checkout.c:1086 builtin/clone.c:88
+#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:89
#: builtin/remote.c:159 builtin/remote.c:161
msgid "branch"
msgstr "rama"
-#: builtin/checkout.c:1085
+#: builtin/checkout.c:1091
msgid "create and checkout a new branch"
msgstr "crea i agafa una rama nova"
-#: builtin/checkout.c:1087
+#: builtin/checkout.c:1093
msgid "create/reset and checkout a branch"
msgstr "crea/restableix i agafa una rama"
-#: builtin/checkout.c:1088
+#: builtin/checkout.c:1094
msgid "create reflog for new branch"
-msgstr "Crea un registre de referència per a la rama nova"
+msgstr "crea un registre de referència per a la rama nova"
-#: builtin/checkout.c:1089
+#: builtin/checkout.c:1095
msgid "detach the HEAD at named commit"
msgstr "separa el HEAD a la comissió anomenada"
-#: builtin/checkout.c:1090
+#: builtin/checkout.c:1096
msgid "set upstream info for new branch"
msgstr "estableix la informació de font de la rama nova"
-#: builtin/checkout.c:1092
+#: builtin/checkout.c:1098
msgid "new-branch"
-msgstr "nova-rama"
+msgstr "rama-nova"
-#: builtin/checkout.c:1092
+#: builtin/checkout.c:1098
msgid "new unparented branch"
-msgstr "nova rama sense pares"
+msgstr "rama nova sense pares"
-#: builtin/checkout.c:1093
+#: builtin/checkout.c:1099
msgid "checkout our version for unmerged files"
-msgstr "agafa la versió nostra de fitxers sense fusionar"
+msgstr "agafa la versió nostra dels fitxers sense fusionar"
-#: builtin/checkout.c:1095
+#: builtin/checkout.c:1101
msgid "checkout their version for unmerged files"
-msgstr "agafa la versió seva de fitxers sense fusionar"
+msgstr "agafa la versió seva dels fitxers sense fusionar"
-#: builtin/checkout.c:1097
+#: builtin/checkout.c:1103
msgid "force checkout (throw away local modifications)"
msgstr "agafa a la força (descarta qualsevulles modificacions locals)"
-#: builtin/checkout.c:1098
+#: builtin/checkout.c:1104
msgid "perform a 3-way merge with the new branch"
msgstr "realitza una fusió de 3 vies amb la rama nova"
-#: builtin/checkout.c:1099 builtin/merge.c:225
+#: builtin/checkout.c:1105 builtin/merge.c:226
msgid "update ignored files (default)"
msgstr "actualitza els fitxers ignorats (per defecte)"
-#: builtin/checkout.c:1100 builtin/log.c:1236 parse-options.h:245
+#: builtin/checkout.c:1106 builtin/log.c:1239 parse-options.h:245
msgid "style"
msgstr "estil"
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1107
msgid "conflict style (merge or diff3)"
msgstr "estil de conflicte (fusió o diff3)"
-#: builtin/checkout.c:1104
+#: builtin/checkout.c:1110
msgid "do not limit pathspecs to sparse entries only"
msgstr "no limitis les especificacions de ruta a entrades escasses només"
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1112
msgid "second guess 'git checkout no-such-branch'"
msgstr "dubta 'git checkout cap-rama-així'"
-#: builtin/checkout.c:1129
+#: builtin/checkout.c:1135
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B i --orphan són mutualment exclusius"
-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1152
msgid "--track needs a branch name"
msgstr "--track necessita un nom de rama"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1157
msgid "Missing branch name; try -b"
msgstr "Manca el nom de rama; proveu -b"
-#: builtin/checkout.c:1190
+#: builtin/checkout.c:1194
msgid "invalid path specification"
msgstr "especificació de ruta invàlida"
-#: builtin/checkout.c:1197
+#: builtin/checkout.c:1201
#, 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 ""
"No es pot actualitzar rames i canviar a la rama '%s' a la vegada.\n"
-"Volíeu agafar '%s' la qual no es pot resoldre com comissió?"
+"Volíeu agafar '%s' la qual no es pot resoldre com a comissió?"
-#: builtin/checkout.c:1202
+#: builtin/checkout.c:1206
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach no accepta un paràmetre de ruta '%s'"
-#: builtin/checkout.c:1206
+#: builtin/checkout.c:1210
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -3590,17 +3691,17 @@ msgstr "Trauria %s\n"
#: builtin/clean.c:32
#, c-format
msgid "Skipping repository %s\n"
-msgstr "Saltant el repositori %s\n"
+msgstr "Saltant el dipòsit %s\n"
#: builtin/clean.c:33
#, c-format
msgid "Would skip repository %s\n"
-msgstr "Saltaria el repositori %s\n"
+msgstr "Saltaria el dipòsit %s\n"
#: builtin/clean.c:34
#, c-format
msgid "failed to remove %s"
-msgstr "s'ha fallat al treure %s"
+msgstr "s'ha fallat en treure %s"
#: builtin/clean.c:295
msgid ""
@@ -3642,16 +3743,16 @@ msgstr "Perdó (%s)?"
#: builtin/clean.c:659
#, c-format
msgid "Input ignore patterns>> "
-msgstr "Introduïu patrons que ignorar>> "
+msgstr "Introduïu els patrons a ignorar>> "
#: builtin/clean.c:696
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
-msgstr "AVÍS: No es pot trobar ítems que coincideixen amb: %s"
+msgstr "AVÍS: No es pot trobar ítems que coincideixin amb: %s"
#: builtin/clean.c:717
msgid "Select items to delete"
-msgstr "Selecciona els ítems que suprimir"
+msgstr "Selecciona els ítems a suprimir"
#: builtin/clean.c:757
#, c-format
@@ -3674,11 +3775,11 @@ msgid ""
msgstr ""
"clean - comença a netejar\n"
"filter by pattern - exclou ítems de supressió\n"
-"select by numbers - selecciona ítems que suprimir per números\n"
-"ask each - confirma cada supressió (com a \"rm -i\")\n"
+"select by numbers - selecciona ítems a suprimir per números\n"
+"ask each - confirma cada supressió (com \"rm -i\")\n"
"quit - deixa de netejar\n"
"help - aquesta pantalla\n"
-"? - ajuda per selecció de l'avís"
+"? - ajuda de selecció de l'avís"
#: builtin/clean.c:817
msgid "*** Commands ***"
@@ -3696,7 +3797,7 @@ msgstr[1] "Trauria els ítems següents:"
#: builtin/clean.c:843
msgid "No more files to clean, exiting."
-msgstr "No hi ha més fitxers que netejar; sortint."
+msgstr "No hi ha més fitxers a netejar; sortint."
#: builtin/clean.c:874
msgid "do not print names of files removed"
@@ -3714,14 +3815,14 @@ msgstr "neteja interactiva"
msgid "remove whole directories"
msgstr "treu directoris enters"
-#: builtin/clean.c:880 builtin/describe.c:406 builtin/grep.c:714
+#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714
#: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185
msgid "pattern"
msgstr "patró"
#: builtin/clean.c:881
msgid "add <pattern> to ignore rules"
-msgstr "afegiu <patró> per ignorar les regles"
+msgstr "afegiu <patró> per a ignorar les regles"
#: builtin/clean.c:882
msgid "remove ignored files, too"
@@ -3733,163 +3834,163 @@ msgstr "treu només els fitxers ignorats"
#: builtin/clean.c:902
msgid "-x and -X cannot be used together"
-msgstr "-x i -X no es poden utilitzar junts"
+msgstr "-x i -X no es poden usar junts"
#: builtin/clean.c:906
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
msgstr ""
-"clean.requireForce estaberta a veritat i ni -i, -n ni -f donat; refusant "
-"netejar"
+"clean.requireForce està establerta a veritat i ni -i, -n ni -f s'ha donat; "
+"refusant netejar"
#: builtin/clean.c:909
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
msgstr ""
-"clean.requireForce és per defecte veritat i ni -i, -n ni -f donat; refusant "
-"netejar"
+"clean.requireForce és per defecte veritat i ni -i, -n ni -f s'ha donat; "
+"refusant netejar"
-#: builtin/clone.c:36
+#: builtin/clone.c:37
msgid "git clone [options] [--] <repo> [<dir>]"
-msgstr "git clone [opcions] [--] <repositori> [<directori>]"
+msgstr "git clone [opcions] [--] <dipòsit> [<directori>]"
-#: builtin/clone.c:64 builtin/fetch.c:112 builtin/merge.c:222
-#: builtin/push.c:503
+#: builtin/clone.c:65 builtin/fetch.c:112 builtin/merge.c:223
+#: builtin/push.c:514
msgid "force progress reporting"
msgstr "força l'informe de progrés"
-#: builtin/clone.c:66
+#: builtin/clone.c:67
msgid "don't create a checkout"
msgstr "no fes una agafada"
-#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486
+#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488
msgid "create a bare repository"
-msgstr "crea un repositori nu"
+msgstr "crea un dipòsit nu"
-#: builtin/clone.c:71
+#: builtin/clone.c:72
msgid "create a mirror repository (implies bare)"
-msgstr "crea un repositori reflectit (implica nu)"
+msgstr "crea un dipòsit reflectit (implica bare)"
-#: builtin/clone.c:73
+#: builtin/clone.c:74
msgid "to clone from a local repository"
-msgstr "per a clonar des d'un repositori local"
+msgstr "per a clonar des d'un dipòsit local"
-#: builtin/clone.c:75
+#: builtin/clone.c:76
msgid "don't use local hardlinks, always copy"
-msgstr "no utilitzeu enllaços durs locals, sempre copia"
+msgstr "no usis enllaços durs locals, sempre copia"
-#: builtin/clone.c:77
+#: builtin/clone.c:78
msgid "setup as shared repository"
-msgstr "configura com repositori compartit"
+msgstr "configura com a dipòsit compartit"
-#: builtin/clone.c:79 builtin/clone.c:81
+#: builtin/clone.c:80 builtin/clone.c:82
msgid "initialize submodules in the clone"
msgstr "initialitza els submòduls en el clon"
-#: builtin/clone.c:82 builtin/init-db.c:483
+#: builtin/clone.c:83 builtin/init-db.c:485
msgid "template-directory"
msgstr "directori-de-plantilla"
-#: builtin/clone.c:83 builtin/init-db.c:484
+#: builtin/clone.c:84 builtin/init-db.c:486
msgid "directory from which templates will be used"
-msgstr "directori del qual les plantilles s'utilitzaran"
+msgstr "directori del qual les plantilles s'usaran"
-#: builtin/clone.c:85
+#: builtin/clone.c:86
msgid "reference repository"
-msgstr "repositori de referència"
+msgstr "dipòsit de referència"
-#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr "nom"
-#: builtin/clone.c:87
+#: builtin/clone.c:88
msgid "use <name> instead of 'origin' to track upstream"
-msgstr "utilitza <nom> en lloc de 'origin' per seguir la font"
+msgstr "usa <nom> en lloc de 'origin' per a seguir la font"
-#: builtin/clone.c:89
+#: builtin/clone.c:90
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "agafa <rama> en lloc del HEAD del remot"
-#: builtin/clone.c:91
+#: builtin/clone.c:92
msgid "path to git-upload-pack on the remote"
msgstr "ruta a git-upload-pack en el remot"
-#: builtin/clone.c:92 builtin/fetch.c:113 builtin/grep.c:659
+#: builtin/clone.c:93 builtin/fetch.c:113 builtin/grep.c:659
msgid "depth"
msgstr "profunditat"
-#: builtin/clone.c:93
+#: builtin/clone.c:94
msgid "create a shallow clone of that depth"
msgstr "crea un clon superficial de tal profunditat"
-#: builtin/clone.c:95
+#: builtin/clone.c:96
msgid "clone only one branch, HEAD or --branch"
-msgstr "cona només una rama, HEAD o --branch"
+msgstr "clona només una rama, HEAD o --branch"
-#: builtin/clone.c:96 builtin/init-db.c:492
+#: builtin/clone.c:97 builtin/init-db.c:494
msgid "gitdir"
msgstr "directori de git"
-#: builtin/clone.c:97 builtin/init-db.c:493
+#: builtin/clone.c:98 builtin/init-db.c:495
msgid "separate git dir from working tree"
msgstr "separa el directori de git de l'arbre de treball"
-#: builtin/clone.c:98
+#: builtin/clone.c:99
msgid "key=value"
msgstr "calu=valor"
-#: builtin/clone.c:99
+#: builtin/clone.c:100
msgid "set config inside the new repository"
-msgstr "estableix la configuració dins del repositori nou"
+msgstr "estableix la configuració dins del dipòsit nou"
-#: builtin/clone.c:252
+#: builtin/clone.c:253
#, c-format
msgid "reference repository '%s' is not a local repository."
-msgstr "el repositori de referència '%s' no és un repositori local."
+msgstr "el dipòsit de referència '%s' no és un dipòsit local."
-#: builtin/clone.c:256
+#: builtin/clone.c:257
#, c-format
msgid "reference repository '%s' is shallow"
-msgstr "el repositori de referència '%s' és superficial"
+msgstr "el dipòsit de referència '%s' és superficial"
-#: builtin/clone.c:259
+#: builtin/clone.c:260
#, c-format
msgid "reference repository '%s' is grafted"
-msgstr "el repositori de referència '%s' és empeltat"
+msgstr "el dipòsit de referència '%s' és empeltat"
-#: builtin/clone.c:321
+#: builtin/clone.c:322
#, c-format
msgid "failed to create directory '%s'"
-msgstr "s'ha fallat al crear el directori '%s'"
+msgstr "s'ha fallat en crear el directori '%s'"
-#: builtin/clone.c:323 builtin/diff.c:83
+#: builtin/clone.c:324 builtin/diff.c:84
#, c-format
msgid "failed to stat '%s'"
-msgstr "s'ha fallat al fer stat a '%s'"
+msgstr "s'ha fallat en fer stat a '%s'"
-#: builtin/clone.c:325
+#: builtin/clone.c:326
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existeix i no és un directori"
-#: builtin/clone.c:339
+#: builtin/clone.c:340
#, c-format
msgid "failed to stat %s\n"
-msgstr "s'ha fallat al fer stat a '%s'\n"
+msgstr "s'ha fallat en fer stat a '%s'\n"
-#: builtin/clone.c:361
+#: builtin/clone.c:362
#, c-format
msgid "failed to create link '%s'"
-msgstr "s'ha fallat al crear l'enllaç '%s'"
+msgstr "s'ha fallat en crear l'enllaç '%s'"
-#: builtin/clone.c:365
+#: builtin/clone.c:366
#, c-format
msgid "failed to copy file to '%s'"
-msgstr "s'ha fallat al copiar el fitxer a '%s'"
+msgstr "s'ha fallat en copiar el fitxer a '%s'"
-#: builtin/clone.c:388 builtin/clone.c:565
+#: builtin/clone.c:389 builtin/clone.c:563
#, c-format
msgid "done.\n"
msgstr "fet.\n"
@@ -3900,116 +4001,116 @@ msgid ""
"You can inspect what was checked out with 'git status'\n"
"and retry the checkout with 'git checkout -f HEAD'\n"
msgstr ""
-"La clonació ha tingut éxit, però l'agafada ha fallat.\n"
+"La clonació ha tingut èxit, però l'agafada ha fallat.\n"
"Podeu inspeccionar què s'ha agafat amb 'git status' i\n"
-"reintentar l'agafada amb 'git checkout -f HEAD'\n"
+"tornar a intentar l'agafada amb 'git checkout -f HEAD'\n"
-#: builtin/clone.c:480
+#: builtin/clone.c:478
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "No s'ha pogut trobar la rama remota %s per a clonar."
-#: builtin/clone.c:560
+#: builtin/clone.c:558
#, c-format
msgid "Checking connectivity... "
msgstr "Provant connectivitat... "
-#: builtin/clone.c:563
+#: builtin/clone.c:561
msgid "remote did not send all necessary objects"
msgstr "el remot no ha enviat tots els objectes necessaris"
-#: builtin/clone.c:627
+#: builtin/clone.c:625
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"el HEAD remot es refereix a una referència que no existeix; incapaç "
"d'agafar.\n"
-#: builtin/clone.c:658
+#: builtin/clone.c:656
msgid "unable to checkout working tree"
msgstr "incapaç d'agafar l'arbre de treball"
-#: builtin/clone.c:768
+#: builtin/clone.c:765
msgid "Too many arguments."
-msgstr "Massa paràmetres."
+msgstr "Hi ha massa paràmetres."
-#: builtin/clone.c:772
+#: builtin/clone.c:769
msgid "You must specify a repository to clone."
-msgstr "Heu d'especificar un repositori que clonar."
+msgstr "Heu d'especificar un dipòsit per a clonar."
-#: builtin/clone.c:783
+#: builtin/clone.c:780
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "les opcions --bare i --origin %s són incompatibles."
-#: builtin/clone.c:786
+#: builtin/clone.c:783
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare i --separate-git-dir són incompatibles."
-#: builtin/clone.c:799
+#: builtin/clone.c:796
#, c-format
msgid "repository '%s' does not exist"
-msgstr "el repositori '%s' no existeix"
+msgstr "el dipòsit '%s' no existeix"
-#: builtin/clone.c:805 builtin/fetch.c:1143
+#: builtin/clone.c:802 builtin/fetch.c:1155
#, c-format
msgid "depth %s is not a positive number"
msgstr "la profunditat %s no és nombre positiu"
-#: builtin/clone.c:815
+#: builtin/clone.c:812
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "la ruta destí '%s' ja existeix i no és un directori buit."
-#: builtin/clone.c:825
+#: builtin/clone.c:822
#, c-format
msgid "working tree '%s' already exists."
msgstr "l'arbre de treball '%s' ja existeix."
-#: builtin/clone.c:838 builtin/clone.c:850
+#: builtin/clone.c:835 builtin/clone.c:847
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "no s'ha pogut crear els directoris inicials de '%s'"
-#: builtin/clone.c:841
+#: builtin/clone.c:838
#, c-format
msgid "could not create work tree dir '%s'."
msgstr "no s'ha pogut crear el directori d'arbre de treball '%s'."
-#: builtin/clone.c:860
+#: builtin/clone.c:857
#, c-format
msgid "Cloning into bare repository '%s'...\n"
-msgstr "Clonant al repositori nu '%s'...\n"
+msgstr "Clonant al dipòsit nu '%s'...\n"
-#: builtin/clone.c:862
+#: builtin/clone.c:859
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clonant a '%s'...\n"
-#: builtin/clone.c:898
+#: builtin/clone.c:895
msgid "--depth is ignored in local clones; use file:// instead."
-msgstr "--depth s'ignora en clons locals; utilitzeu file:// en lloc."
+msgstr "--depth s'ignora en els clons locals; useu file:// en lloc."
-#: builtin/clone.c:901
+#: builtin/clone.c:898
msgid "source repository is shallow, ignoring --local"
-msgstr "el repositori font és superficial, ignorant --local"
+msgstr "el dipòsit font és superficial, ignorant --local"
-#: builtin/clone.c:906
+#: builtin/clone.c:903
msgid "--local is ignored"
msgstr "--local s'ignora"
-#: builtin/clone.c:910
+#: builtin/clone.c:907
#, c-format
msgid "Don't know how to clone %s"
msgstr "No es sap com clonar %s"
-#: builtin/clone.c:961 builtin/clone.c:969
+#: builtin/clone.c:958 builtin/clone.c:966
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "La rama remota %s no es troba en la font %s"
-#: builtin/clone.c:972
+#: builtin/clone.c:969
msgid "You appear to have cloned an empty repository."
-msgstr "Sembla que heu clonat un repositori buit."
+msgstr "Sembla que heu clonat un dipòsit buit."
#: builtin/column.c:9
msgid "git column [options]"
@@ -4021,7 +4122,7 @@ msgstr "cerca els variables de configuració"
#: builtin/column.c:27 builtin/column.c:28
msgid "layout to use"
-msgstr "pla que utilitzar"
+msgstr "pla a usar"
#: builtin/column.c:29
msgid "Maximum width"
@@ -4043,15 +4144,42 @@ msgstr "Espai d'encoixinada entre columnes"
msgid "--command must be the first argument"
msgstr "--command ha de ser el primer paràmetre"
-#: builtin/commit.c:36
+#: builtin/commit.c:37
msgid "git commit [options] [--] <pathspec>..."
msgstr "git commit [opcions] [--] <especificació-de-ruta>..."
-#: builtin/commit.c:41
+#: builtin/commit.c:42
msgid "git status [options] [--] <pathspec>..."
msgstr "git status [opcions] [--] <especificació-de-ruta>..."
-#: builtin/commit.c:46
+#: builtin/commit.c:47
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+" git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+" git commit --amend --reset-author\n"
+msgstr ""
+"S'han configurat el vostre nom i adreça de correu electrònic\n"
+"automàticament basats en el vostre nom d'usuari i nom de host. Si us\n"
+"plau, comproveu que siguin correctes. Podeu suprimir aquest missatge\n"
+"per establir-los explícitament. Executeu l'ordre següent i seguiu les\n"
+"instruccions en el vostre editor per editar el vostre fitxer de\n"
+"configuració:\n"
+"\n"
+" git config --global --edit\n"
+"Després de fer això, podeu arreglar la identitat usada per a aquesta\n"
+"comissió amb:\n"
+"\n"
+" git commit --amend --reset-author\n"
+
+#: builtin/commit.c:60
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4072,12 +4200,12 @@ msgstr ""
" git config --global user.name \"El Vostre Nom\"\n"
" git config --global user.email tu@example.com\n"
"\n"
-"Després de fer això, podeu arreglar la identitat utilitzada per a\n"
-"aquesta comissió amb:\n"
+"Després de fer això, podeu arreglar la identitat usada per a aquesta\n"
+"comissió amb:\n"
"\n"
" git commit --amend --reset-author\n"
-#: builtin/commit.c:58
+#: builtin/commit.c:72
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"
@@ -4087,7 +4215,7 @@ msgstr ""
"buida. Podeu repetir el vostre ordre amb --allow-empty, o podeu\n"
"treure la comissió per complet amb \"git reset HEAD^\".\n"
-#: builtin/commit.c:63
+#: builtin/commit.c:77
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -4097,16 +4225,16 @@ msgid ""
msgstr ""
"El recull de cireres previ ja està buit, possiblement a causa de resolució "
"de conflicte.\n"
-"Si el voleu cometre de totes maneres, utilitzeu:\n"
+"Si el voleu cometre de totes maneres, useu:\n"
"\n"
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:70
+#: builtin/commit.c:84
msgid "Otherwise, please use 'git reset'\n"
-msgstr "D'altra manera, si us plau, utilitzeu 'git reset'\n"
+msgstr "D'altra manera, si us plau, useu 'git reset'\n"
-#: builtin/commit.c:73
+#: builtin/commit.c:87
msgid ""
"If you wish to skip this commit, use:\n"
"\n"
@@ -4115,109 +4243,126 @@ msgid ""
"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
"the remaining commits.\n"
msgstr ""
-"Si voleu saltar aquesta comissió, utilitzeu:\n"
+"Si voleu saltar aquesta comissió, useu:\n"
"\n"
" git reset\n"
"\n"
"Llavors \"git cherry-pick --continue\" reprendrà recollint\n"
"com cireres les comissions restants.\n"
-#: builtin/commit.c:288
+#: builtin/commit.c:302
msgid "failed to unpack HEAD tree object"
-msgstr "s'ha fallat al desempaquetar l'objecte d'arbre HEAD"
+msgstr "s'ha fallat en desempaquetar l'objecte d'arbre HEAD"
-#: builtin/commit.c:328
+#: builtin/commit.c:342
msgid "unable to create temporary index"
msgstr "incapaç de crear un índex temporal"
-#: builtin/commit.c:334
+#: builtin/commit.c:348
msgid "interactive add failed"
msgstr "l'afegiment interactiu ha fallat"
-#: builtin/commit.c:366 builtin/commit.c:387 builtin/commit.c:435
+#: builtin/commit.c:359
+msgid "unable to write index file"
+msgstr "incapaç d'escriure el fitxer d'índex"
+
+#: builtin/commit.c:361
+msgid "unable to update temporary index"
+msgstr "incapaç de actualitzar l'índex temporal"
+
+#: builtin/commit.c:363
+msgid "Failed to update main cache tree"
+msgstr "S'ha fallat en actualitzar l'arbre principal de memòria cau"
+
+#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461
msgid "unable to write new_index file"
msgstr "incapaç d'escriure el fitxer new_index"
-#: builtin/commit.c:418
+#: builtin/commit.c:443
msgid "cannot do a partial commit during a merge."
msgstr "no es pot fer una comissió parcial durant una fusió."
-#: builtin/commit.c:420
+#: builtin/commit.c:445
msgid "cannot do a partial commit during a cherry-pick."
msgstr "no es pot fer una comissió parcial durant un recull de cireres."
-#: builtin/commit.c:429
+#: builtin/commit.c:454
msgid "cannot read the index"
msgstr "no es pot llegir l'índex"
-#: builtin/commit.c:447
+#: builtin/commit.c:473
msgid "unable to write temporary index file"
msgstr "incapaç d'escriure un fitxer d'índex temporal"
-#: builtin/commit.c:557 builtin/commit.c:563
+#: builtin/commit.c:592
+#, c-format
+msgid "commit '%s' lacks author header"
+msgstr "a la comissió '%s' li manca la capçalera d'autor"
+
+#: builtin/commit.c:594
#, c-format
-msgid "invalid commit: %s"
-msgstr "comissió invàlida: %s"
+msgid "commit '%s' has malformed author line"
+msgstr "la comissió '%s' té una línia d'autor malformada"
-#: builtin/commit.c:585
+#: builtin/commit.c:613
msgid "malformed --author parameter"
msgstr "paràmetre --author malformat"
-#: builtin/commit.c:592
+#: builtin/commit.c:621
#, c-format
msgid "invalid date format: %s"
msgstr "format de data invàlid: %s"
-#: builtin/commit.c:609
+#: builtin/commit.c:642
#, c-format
msgid "Malformed ident string: '%s'"
msgstr "Cadena d'identificació malformada: '%s'"
-#: builtin/commit.c:642
+#: builtin/commit.c:675
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr ""
"incapaç de seleccionar un caràcter de comentari que\n"
-"no sigui utilitzat en el missatge de comissió actual"
+"no sigui usat en el missatge de comissió actual"
-#: builtin/commit.c:679 builtin/commit.c:712 builtin/commit.c:1086
+#: builtin/commit.c:712 builtin/commit.c:745 builtin/commit.c:1120
#, c-format
msgid "could not lookup commit %s"
msgstr "no s'ha pogut trobar la comissió %s"
-#: builtin/commit.c:691 builtin/shortlog.c:273
+#: builtin/commit.c:724 builtin/shortlog.c:273
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(llegint el missatge de registre de l'entrada estàndard)\n"
-#: builtin/commit.c:693
+#: builtin/commit.c:726
msgid "could not read log from standard input"
msgstr "no s'ha pogut llegir de l'entrada estàndard"
-#: builtin/commit.c:697
+#: builtin/commit.c:730
#, c-format
msgid "could not read log file '%s'"
msgstr "no s'ha pogut llegir el fitxer de registre '%s'"
-#: builtin/commit.c:719
+#: builtin/commit.c:752
msgid "could not read MERGE_MSG"
msgstr "no s'ha pogut llegir MERGE_MSG"
-#: builtin/commit.c:723
+#: builtin/commit.c:756
msgid "could not read SQUASH_MSG"
msgstr "no s'ha pogur llegir SQUASH_MSG"
-#: builtin/commit.c:727
+#: builtin/commit.c:760
#, c-format
msgid "could not read '%s'"
msgstr "no s'ha pogut llegir '%s'"
-#: builtin/commit.c:798
+#: builtin/commit.c:831
msgid "could not write commit template"
msgstr "no s'ha pogut escriure la plantilla de comissió"
-#: builtin/commit.c:816
+#: builtin/commit.c:849
#, c-format
msgid ""
"\n"
@@ -4232,7 +4377,7 @@ msgstr ""
"\t%s\n"
"i intenteu de nou.\n"
-#: builtin/commit.c:821
+#: builtin/commit.c:854
#, c-format
msgid ""
"\n"
@@ -4247,7 +4392,7 @@ msgstr ""
"\t%s\n"
"i intenteu de nou.\n"
-#: builtin/commit.c:834
+#: builtin/commit.c:867
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -4257,7 +4402,7 @@ msgstr ""
"S'ignoraran les línies començant amb '%c', i un missatge de\n"
"comissió buit avorta la comissió.\n"
-#: builtin/commit.c:841
+#: builtin/commit.c:874
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -4268,148 +4413,146 @@ msgstr ""
"Es retindran les línies començants amb '%c'; podeu treure'ls per vós\n"
"mateix si voleu. Un missatge buit avorta la comissió.\n"
-#: builtin/commit.c:855
+#: builtin/commit.c:888
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:863
+#: builtin/commit.c:896
#, c-format
msgid "%sDate: %s"
msgstr "%sData: %s"
-#: builtin/commit.c:870
+#: builtin/commit.c:903
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sComitent: %.*s <%.*s>"
-#: builtin/commit.c:888
+#: builtin/commit.c:921
msgid "Cannot read index"
msgstr "No es pot llegir l'índex"
-#: builtin/commit.c:945
+#: builtin/commit.c:978
msgid "Error building trees"
-msgstr "Error al construir arbres"
+msgstr "Error en construir arbres"
-#: builtin/commit.c:960 builtin/tag.c:495
+#: builtin/commit.c:993 builtin/tag.c:495
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
-msgstr ""
-"Si us plau, proveïu el missatge utilitzant l'opció o -m o l'opció -F.\n"
+msgstr "Si us plau, proveïu el missatge per usar o l'opció -m o l'opció -F.\n"
-#: builtin/commit.c:1061
+#: builtin/commit.c:1095
#, c-format
msgid "No existing author found with '%s'"
msgstr "Cap autor existent trobat amb '%s'"
-#: builtin/commit.c:1076 builtin/commit.c:1316
+#: builtin/commit.c:1110 builtin/commit.c:1350
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode de fitxers no seguits invàlid '%s'"
-#: builtin/commit.c:1113
+#: builtin/commit.c:1147
msgid "--long and -z are incompatible"
msgstr "--long i -z són incompatibles"
-#: builtin/commit.c:1143
+#: builtin/commit.c:1177
msgid "Using both --reset-author and --author does not make sense"
-msgstr "Utilitzar ambdós --reset-author i --author no té sentit"
+msgstr "Usar ambdós --reset-author i --author no té sentit"
-#: builtin/commit.c:1152
+#: builtin/commit.c:1186
msgid "You have nothing to amend."
-msgstr "No teniu res que esmenar."
+msgstr "No teniu res a esmenar."
-#: builtin/commit.c:1155
+#: builtin/commit.c:1189
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Esteu en el medi d'una fusió -- no es pot esmenar."
-#: builtin/commit.c:1157
+#: builtin/commit.c:1191
msgid "You are in the middle of a cherry-pick -- cannot amend."
-msgstr "Esteu en el medi d'una cherry-pick -- no es pot esmenar."
+msgstr "Esteu en el medi d'un recull de cireres -- no es pot esmenar."
-#: builtin/commit.c:1160
+#: builtin/commit.c:1194
msgid "Options --squash and --fixup cannot be used together"
-msgstr "Les opcions --squash i --fixup no es poden utilitzar junts"
+msgstr "Les opcions --squash i --fixup no es poden usar junts"
-#: builtin/commit.c:1170
+#: builtin/commit.c:1204
msgid "Only one of -c/-C/-F/--fixup can be used."
-msgstr "Només un de -c/-C/-F/--fixup es pot utilitzar."
+msgstr "Només un de -c/-C/-F/--fixup es pot usar."
-#: builtin/commit.c:1172
+#: builtin/commit.c:1206
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "L'opció -m no es pot combinar amb -c/-C/-F/--fixup."
-#: builtin/commit.c:1180
+#: builtin/commit.c:1214
msgid "--reset-author can be used only with -C, -c or --amend."
-msgstr "--reset-author només es pot utilitzar amb -C, -c o --amend."
+msgstr "--reset-author només es pot usar amb -C, -c o --amend."
-#: builtin/commit.c:1197
+#: builtin/commit.c:1231
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
-msgstr ""
-"Només un de --include/--only/--all/--interactive/--patch es pot utilitzar."
+msgstr "Només un de --include/--only/--all/--interactive/--patch es pot usar."
-#: builtin/commit.c:1199
+#: builtin/commit.c:1233
msgid "No paths with --include/--only does not make sense."
msgstr "--include/--only no té sentit sense ruta."
-#: builtin/commit.c:1201
+#: builtin/commit.c:1235
msgid "Clever... amending the last one with dirty index."
-msgstr "Intel·ligent... esmenant el últim amb índex brut"
+msgstr "Intel·ligent...esmenant el últim amb índex brut."
-#: builtin/commit.c:1203
+#: builtin/commit.c:1237
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr ""
-"Rutes explícites especificades sense -i o -o; presumint rutes --only..."
+"S'han especificat rutes explícites sense -i o -o; presumint rutes --only..."
-#: builtin/commit.c:1215 builtin/tag.c:727
+#: builtin/commit.c:1249 builtin/tag.c:728
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Mode de neteja invàlid %s"
-#: builtin/commit.c:1220
+#: builtin/commit.c:1254
msgid "Paths with -a does not make sense."
msgstr "-a no té sentit amb rutes."
-#: builtin/commit.c:1330 builtin/commit.c:1595
+#: builtin/commit.c:1364 builtin/commit.c:1644
msgid "show status concisely"
msgstr "mostra l'estat concisament"
-#: builtin/commit.c:1332 builtin/commit.c:1597
+#: builtin/commit.c:1366 builtin/commit.c:1646
msgid "show branch information"
msgstr "mostra la informació de rama"
-#: builtin/commit.c:1334 builtin/commit.c:1599 builtin/push.c:489
+#: builtin/commit.c:1368 builtin/commit.c:1648 builtin/push.c:500
msgid "machine-readable output"
msgstr "sortida llegible per màquina"
-#: builtin/commit.c:1337 builtin/commit.c:1601
+#: builtin/commit.c:1371 builtin/commit.c:1650
msgid "show status in long format (default)"
msgstr "mostra l'estat en format llarg (per defecte)"
-#: builtin/commit.c:1340 builtin/commit.c:1604
+#: builtin/commit.c:1374 builtin/commit.c:1653
msgid "terminate entries with NUL"
msgstr "termina les entrades amb NUL"
-#: builtin/commit.c:1342 builtin/commit.c:1607 builtin/fast-export.c:703
-#: builtin/fast-export.c:706 builtin/tag.c:602
+#: builtin/commit.c:1376 builtin/commit.c:1656 builtin/fast-export.c:980
+#: builtin/fast-export.c:983 builtin/tag.c:603
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1343 builtin/commit.c:1607
+#: builtin/commit.c:1377 builtin/commit.c:1656
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"mostra els fitxers no seguits, modes opcional: all, normal, no. (Per "
"defecte: all)"
-#: builtin/commit.c:1346
+#: builtin/commit.c:1380
msgid "show ignored files"
msgstr "mostra els fitxers ignorats"
-#: builtin/commit.c:1347 parse-options.h:153
+#: builtin/commit.c:1381 parse-options.h:153
msgid "when"
msgstr "quan"
-#: builtin/commit.c:1348
+#: builtin/commit.c:1382
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -4417,227 +4560,219 @@ msgstr ""
"ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per "
"defecte: all)"
-#: builtin/commit.c:1350
+#: builtin/commit.c:1384
msgid "list untracked files in columns"
msgstr "mostra els fitxers no seguits en columnes"
-#: builtin/commit.c:1419
+#: builtin/commit.c:1471
msgid "couldn't look up newly created commit"
msgstr "no s'ha pogut trobar la comissió novament creat"
-#: builtin/commit.c:1421
+#: builtin/commit.c:1473
msgid "could not parse newly created commit"
msgstr "no s'ha pogut analitzar la comissió novament creat"
-#: builtin/commit.c:1469
+#: builtin/commit.c:1518
msgid "detached HEAD"
msgstr "HEAD separat"
-#: builtin/commit.c:1471
+#: builtin/commit.c:1521
msgid " (root-commit)"
msgstr " (comissió d'arrel)"
-#: builtin/commit.c:1565
+#: builtin/commit.c:1614
msgid "suppress summary after successful commit"
msgstr "omet el resum després d'una comissió reexita"
-#: builtin/commit.c:1566
+#: builtin/commit.c:1615
msgid "show diff in commit message template"
msgstr "mostra la diferència en la plantilla de missatge de comissió"
-#: builtin/commit.c:1568
+#: builtin/commit.c:1617
msgid "Commit message options"
msgstr "Opcions de missatge de comissió"
-#: builtin/commit.c:1569 builtin/tag.c:600
+#: builtin/commit.c:1618 builtin/tag.c:601
msgid "read message from file"
msgstr "llegiu el missatge des d'un fitxer"
-#: builtin/commit.c:1570
+#: builtin/commit.c:1619
msgid "author"
msgstr "autor"
-#: builtin/commit.c:1570
+#: builtin/commit.c:1619
msgid "override author for commit"
msgstr "autor corregit de la comissió"
-#: builtin/commit.c:1571 builtin/gc.c:286
+#: builtin/commit.c:1620 builtin/gc.c:275
msgid "date"
msgstr "data"
-#: builtin/commit.c:1571
+#: builtin/commit.c:1620
msgid "override date for commit"
msgstr "data corregida de la comissió"
-#: builtin/commit.c:1572 builtin/merge.c:216 builtin/notes.c:409
-#: builtin/notes.c:566 builtin/tag.c:598
+#: builtin/commit.c:1621 builtin/merge.c:217 builtin/notes.c:408
+#: builtin/notes.c:565 builtin/tag.c:599
msgid "message"
msgstr "missatge"
-#: builtin/commit.c:1572
+#: builtin/commit.c:1621
msgid "commit message"
msgstr "missatge de comissió"
-#: builtin/commit.c:1573
+#: builtin/commit.c:1622
msgid "reuse and edit message from specified commit"
-msgstr "reutilitza i edit el missatge de la comissió especificada"
+msgstr "reusa i edita el missatge de la comissió especificada"
-#: builtin/commit.c:1574
+#: builtin/commit.c:1623
msgid "reuse message from specified commit"
-msgstr "reutilitza el missatge de la comissió especificada"
+msgstr "reusa el missatge de la comissió especificada"
-#: builtin/commit.c:1575
+#: builtin/commit.c:1624
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
-"utilitza el missatge formatat d'aixafada automàtica per arreglar la comissió "
+"usa el missatge formatat d'aixafada automàtica per a arreglar la comissió "
"especificada"
-#: builtin/commit.c:1576
+#: builtin/commit.c:1625
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-"utilitza el missatge formatat d'aixafada automàtica per aixafar la comissió "
+"usa el missatge formatat d'aixafada automàtica per a aixafar la comissió "
"especificada"
-#: builtin/commit.c:1577
+#: builtin/commit.c:1626
msgid "the commit is authored by me now (used with -C/-c/--amend)"
-msgstr "l'autor de la comissió ja sóc jo (utilitzat amb -C/-c/--amend)"
+msgstr "l'autor de la comissió ja sóc jo (usat amb -C/-c/--amend)"
-#: builtin/commit.c:1578 builtin/log.c:1188 builtin/revert.c:86
+#: builtin/commit.c:1627 builtin/log.c:1191 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "afegeix Signed-off-by:"
-#: builtin/commit.c:1579
+#: builtin/commit.c:1628
msgid "use specified template file"
-msgstr "utilitza el fitxer de plantilla especificat"
+msgstr "usa el fitxer de plantilla especificat"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1629
msgid "force edit of commit"
-msgstr "edició de la comissió a la força"
+msgstr "força l'edició de la comissió"
-#: builtin/commit.c:1581
+#: builtin/commit.c:1630
msgid "default"
msgstr "per defecte"
-#: builtin/commit.c:1581 builtin/tag.c:603
+#: builtin/commit.c:1630 builtin/tag.c:604
msgid "how to strip spaces and #comments from message"
msgstr "com despullar els espais i #comentaris del missatge"
-#: builtin/commit.c:1582
+#: builtin/commit.c:1631
msgid "include status in commit message template"
msgstr "inclou l'estat en la plantilla de missatge de comissió"
-#: builtin/commit.c:1583 builtin/merge.c:223 builtin/revert.c:92
-#: builtin/tag.c:604
+#: builtin/commit.c:1632 builtin/merge.c:224 builtin/revert.c:92
+#: builtin/tag.c:605
msgid "key-id"
msgstr "ID de clau"
-#: builtin/commit.c:1584 builtin/merge.c:224 builtin/revert.c:93
+#: builtin/commit.c:1633 builtin/merge.c:225 builtin/revert.c:93
msgid "GPG sign commit"
msgstr "firma la comissió amb GPG"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1636
msgid "Commit contents options"
msgstr "Opcions dels continguts de les comissions"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1637
msgid "commit all changed files"
msgstr "comet tots els fitxers canviats"
-#: builtin/commit.c:1589
+#: builtin/commit.c:1638
msgid "add specified files to index for commit"
msgstr "afegeix els fitxers especificats a l'índex per a cometre"
-#: builtin/commit.c:1590
+#: builtin/commit.c:1639
msgid "interactively add files"
msgstr "afegeix els fitxers interactivament"
-#: builtin/commit.c:1591
+#: builtin/commit.c:1640
msgid "interactively add changes"
msgstr "afegeix els canvis interactivament"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1641
msgid "commit only specified files"
msgstr "comet només els fitxers especificats"
-#: builtin/commit.c:1593
+#: builtin/commit.c:1642
msgid "bypass pre-commit hook"
msgstr "evita el ganxo de precomissió"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1643
msgid "show what would be committed"
msgstr "mostra què es cometria"
-#: builtin/commit.c:1605
+#: builtin/commit.c:1654
msgid "amend previous commit"
msgstr "esmena la comissió anterior"
-#: builtin/commit.c:1606
+#: builtin/commit.c:1655
msgid "bypass post-rewrite hook"
msgstr "evita el ganxo de postreescriure"
-#: builtin/commit.c:1611
+#: builtin/commit.c:1660
msgid "ok to record an empty change"
-msgstr "bé registrar un canvi buit"
+msgstr "està bé registrar un canvi buit"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1662
msgid "ok to record a change with an empty message"
-msgstr "bé registrar un canvi amb missatge buit"
+msgstr "està bé registrar un canvi amb missatge buit"
-#: builtin/commit.c:1641
+#: builtin/commit.c:1691
msgid "could not parse HEAD commit"
msgstr "no s'ha pogut analitzar la comissió HEAD"
-#: builtin/commit.c:1680 builtin/merge.c:518
+#: builtin/commit.c:1730 builtin/merge.c:518
#, c-format
msgid "could not open '%s' for reading"
-msgstr "no s'ha pogut obrir '%s' per lectura"
+msgstr "no s'ha pogut obrir '%s' per a lectura"
-#: builtin/commit.c:1687
+#: builtin/commit.c:1737
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fitxer MERGE_HEAD corrupte (%s)"
-#: builtin/commit.c:1694
+#: builtin/commit.c:1744
msgid "could not read MERGE_MODE"
msgstr "no s'ha pogut llegir MERGE_MODE"
-#: builtin/commit.c:1713
+#: builtin/commit.c:1763
#, c-format
msgid "could not read commit message: %s"
msgstr "no s'ha pogut llegir el missatge de comissió: %s"
-#: builtin/commit.c:1724
+#: builtin/commit.c:1774
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Avortant la comissió; no heu editat el missatge.\n"
-#: builtin/commit.c:1729
+#: builtin/commit.c:1779
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Avortant la comissió a causa d'un missatge de comissió buit.\n"
-#: builtin/commit.c:1744 builtin/merge.c:851 builtin/merge.c:876
+#: builtin/commit.c:1794 builtin/merge.c:850 builtin/merge.c:875
msgid "failed to write commit object"
-msgstr "s'ha fallat al escriure l'objecte de comissió"
-
-#: builtin/commit.c:1756
-msgid "cannot lock HEAD ref"
-msgstr "no es pot bloquejar la referència HEAD"
+msgstr "s'ha fallat en escriure l'objecte de comissió"
-#: builtin/commit.c:1769
-msgid "cannot update HEAD ref"
-msgstr "no es pot actualitzar la referència HEAD"
-
-#: builtin/commit.c:1780
+#: builtin/commit.c:1827
msgid ""
"Repository has been updated, but unable to write\n"
-"new_index file. Check that disk is not full or quota is\n"
+"new_index file. Check that disk is not full and quota is\n"
"not exceeded, and then \"git reset HEAD\" to recover."
msgstr ""
-"S'ha actualitzat el repositori, però no es pot escriure\n"
-"el fitxer new_index. Comproveu que el disc no estigui\n"
-"ple i la quota no estigui excedit, i després\n"
-"\"git reset HEAD\" per recuperar."
+"S'ha actualitzat el dipòsit, però no es pot escriure el\n"
+"fitxer new_index. Comproveu que el disc no estigui ple i\n"
+"que la quota no estigui excedit, i després\n"
+"\"git reset HEAD\" per a recuperar."
#: builtin/config.c:8
msgid "git config [options]"
@@ -4649,19 +4784,19 @@ msgstr "Ubicació del fitxer de configuració"
#: builtin/config.c:54
msgid "use global config file"
-msgstr "utilitza el fitxer de configuració global"
+msgstr "usa el fitxer de configuració global"
#: builtin/config.c:55
msgid "use system config file"
-msgstr "utilitza el fitxer de configuració del sistema"
+msgstr "usa el fitxer de configuració del sistema"
#: builtin/config.c:56
msgid "use repository config file"
-msgstr "utilitza el fitxer de configuració del repositori"
+msgstr "usa el fitxer de configuració del dipòsit"
#: builtin/config.c:57
msgid "use given config file"
-msgstr "utilitza el fitxer de configuració donat"
+msgstr "usa el fitxer de configuració donat"
#: builtin/config.c:58
msgid "blob-id"
@@ -4742,19 +4877,19 @@ msgstr "Tipus"
#: builtin/config.c:75
msgid "value is \"true\" or \"false\""
-msgstr "valor és \"true\" o \"false\""
+msgstr "el valor és \"true\" o \"false\""
#: builtin/config.c:76
msgid "value is decimal number"
-msgstr "valor és un nombre decimal"
+msgstr "el valor és un nombre decimal"
#: builtin/config.c:77
msgid "value is --bool or --int"
-msgstr "valor és --bool o --int"
+msgstr "el valor és --bool o --int"
#: builtin/config.c:78
msgid "value is a path (file or directory name)"
-msgstr "valor és un path (nom de fitxer o directori)"
+msgstr "el valor és una ruta (nom de fitxer o directori)"
#: builtin/config.c:79
msgid "Other"
@@ -4768,63 +4903,87 @@ msgstr "termina els valors amb un octet NUL"
msgid "respect include directives on lookup"
msgstr "respecta les directives d'inclusió al cercar"
-#: builtin/count-objects.c:82
+#: builtin/config.c:315
+msgid "unable to parse default color value"
+msgstr "incapaç d'analitzar el valor de color per defecte"
+
+#: builtin/config.c:455
+#, c-format
+msgid ""
+"# This is Git's per-user configuration file.\n"
+"[core]\n"
+"# Please adapt and uncomment the following lines:\n"
+"#\tuser = %s\n"
+"#\temail = %s\n"
+msgstr ""
+"# Això és el fitxer de configuració del Git del usuari.\n"
+"[core]\n"
+"# Si us plau, adapteu i descomenteu les línies següentes:\n"
+"#\tuser = %s\n"
+"#\temail = %s\n"
+
+#: builtin/config.c:590
+#, c-format
+msgid "cannot create configuration file %s"
+msgstr "no es pot crear el fitxer de configuració '%s'"
+
+#: builtin/count-objects.c:55
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:97
+#: builtin/count-objects.c:65
msgid "print sizes in human readable format"
msgstr "imprimeix les mides en un format llegible per humans"
-#: builtin/describe.c:16
+#: builtin/describe.c:17
msgid "git describe [options] <commit-ish>*"
msgstr "git describe [opcions] <comissió>*"
-#: builtin/describe.c:17
+#: builtin/describe.c:18
msgid "git describe [options] --dirty"
msgstr "git describe [opcions] --dirty"
-#: builtin/describe.c:216
+#: builtin/describe.c:217
#, c-format
msgid "annotated tag %s not available"
msgstr "l'etiqueta anotada %s no és disponible"
-#: builtin/describe.c:220
+#: builtin/describe.c:221
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "l'etiqueta anotada %s no té nom incrustat"
-#: builtin/describe.c:222
+#: builtin/describe.c:223
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "l'etiqueta '%s' realment és '%s' aquí"
-#: builtin/describe.c:249
+#: builtin/describe.c:250 builtin/log.c:452
#, c-format
msgid "Not a valid object name %s"
msgstr "%s no és un nom d'objecte vàlid"
-#: builtin/describe.c:252
+#: builtin/describe.c:253
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s no és un objecte de '%s' vàlid"
-#: builtin/describe.c:269
+#: builtin/describe.c:270
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "cap etiqueta coincideix exactament amb '%s'"
-#: builtin/describe.c:271
+#: builtin/describe.c:272
#, c-format
msgid "searching to describe %s\n"
-msgstr "cercant per descriure %s\n"
+msgstr "cercant per a descriure %s\n"
-#: builtin/describe.c:318
+#: builtin/describe.c:319
#, c-format
msgid "finished search at %s\n"
-msgstr "cerca terminada a %s\n"
+msgstr "s'ha terminat la cerca a %s\n"
-#: builtin/describe.c:345
+#: builtin/describe.c:346
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -4833,7 +4992,7 @@ msgstr ""
"Cap etiqueta anotada pot descriure '%s'.\n"
"No obstant, hi havia etiquetes no anotades: proveu --tags."
-#: builtin/describe.c:349
+#: builtin/describe.c:350
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -4842,162 +5001,165 @@ msgstr ""
"Cap etiqueta pot descriure '%s'.\n"
"Proveu --always, o creeu algunes etiquetes."
-#: builtin/describe.c:370
+#: builtin/describe.c:371
#, c-format
msgid "traversed %lu commits\n"
msgstr "%lu comissions travessades\n"
-#: builtin/describe.c:373
+#: builtin/describe.c:374
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
"gave up search at %s\n"
msgstr ""
"s'ha trobat més de %i etiquetes: s'ha llistat les %i més recents\n"
-"cerca renunciada a %s\n"
+"s'ha renunciat la cerca a %s\n"
-#: builtin/describe.c:395
+#: builtin/describe.c:396
msgid "find the tag that comes after the commit"
msgstr "troba l'etiqueta que vingui després de la comissió"
-#: builtin/describe.c:396
+#: builtin/describe.c:397
msgid "debug search strategy on stderr"
msgstr "estratègia de cerca de depuració en stderr"
-#: builtin/describe.c:397
+#: builtin/describe.c:398
msgid "use any ref"
-msgstr "utilitza qualsevulla referència"
+msgstr "usa qualsevulla referència"
-#: builtin/describe.c:398
+#: builtin/describe.c:399
msgid "use any tag, even unannotated"
-msgstr "utilitza qualsevulla etiqueta, encara les sense anotar"
+msgstr "usa qualsevulla etiqueta, encara les sense anotar"
-#: builtin/describe.c:399
+#: builtin/describe.c:400
msgid "always use long format"
-msgstr "sempre utilitza el format llarg"
+msgstr "sempre usa el format llarg"
-#: builtin/describe.c:400
+#: builtin/describe.c:401
msgid "only follow first parent"
msgstr "només segueix el primer pare"
-#: builtin/describe.c:403
+#: builtin/describe.c:404
msgid "only output exact matches"
msgstr "emet només coincidències exactes"
-#: builtin/describe.c:405
+#: builtin/describe.c:406
msgid "consider <n> most recent tags (default: 10)"
msgstr "considera les <n> etiquetes més recents (per defecte: 10)"
-#: builtin/describe.c:407
+#: builtin/describe.c:408
msgid "only consider tags matching <pattern>"
msgstr "només considera les etiquetes que coincideixen amb <patró>"
-#: builtin/describe.c:409 builtin/name-rev.c:318
+#: builtin/describe.c:410 builtin/name-rev.c:318
msgid "show abbreviated commit object as fallback"
-msgstr "mostra l'objecte de comissió abreviat com retrocediment"
+msgstr "mostra l'objecte de comissió abreviat com a retrocediment"
-#: builtin/describe.c:410
+#: builtin/describe.c:411
msgid "mark"
msgstr "marca"
-#: builtin/describe.c:411
+#: builtin/describe.c:412
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-dirty\")"
-#: builtin/describe.c:429
+#: builtin/describe.c:430
msgid "--long is incompatible with --abbrev=0"
msgstr "--long és incompatible amb --abbrev=0"
-#: builtin/describe.c:455
+#: builtin/describe.c:456
msgid "No names found, cannot describe anything."
msgstr "Cap nom trobat, no es pot descriure res."
-#: builtin/describe.c:475
+#: builtin/describe.c:476
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty és incompatible amb les comissions"
-#: builtin/diff.c:85
+#: builtin/diff.c:86
#, c-format
msgid "'%s': not a regular file or symlink"
-msgstr "'%s': no és un fitxer regular ni enllaç simbòlic"
+msgstr "'%s': no és ni fitxer regular ni enllaç simbòlic"
-#: builtin/diff.c:236
+#: builtin/diff.c:237
#, c-format
msgid "invalid option: %s"
msgstr "opció invàlida: %s"
-#: builtin/diff.c:357
+#: builtin/diff.c:358
msgid "Not a git repository"
-msgstr "No és un repositori de git"
+msgstr "No és un dipòsit de git"
-#: builtin/diff.c:400
+#: builtin/diff.c:401
#, c-format
msgid "invalid object '%s' given."
-msgstr "objecte invàlid '%s' donat."
+msgstr "s'ha donat un objecte invàlid '%s'."
-#: builtin/diff.c:409
+#: builtin/diff.c:410
#, c-format
msgid "more than two blobs given: '%s'"
-msgstr "més de dos blobs donats: '%s'"
+msgstr "s'ha donat més de dos blobs: '%s"
-#: builtin/diff.c:416
+#: builtin/diff.c:417
#, c-format
msgid "unhandled object '%s' given."
-msgstr "objecte no manejat '%s' donat."
+msgstr "s'ha donat l'objecte no manejat '%s'."
-#: builtin/fast-export.c:23
+#: builtin/fast-export.c:24
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [opcions-de-llista-de-revisions]"
-#: builtin/fast-export.c:702
+#: builtin/fast-export.c:979
msgid "show progress after <n> objects"
msgstr "mostra el progrés després de <n> objectes"
-#: builtin/fast-export.c:704
+#: builtin/fast-export.c:981
msgid "select handling of signed tags"
msgstr "selecciona el manejament de les etiquetes firmades"
-#: builtin/fast-export.c:707
+#: builtin/fast-export.c:984
msgid "select handling of tags that tag filtered objects"
msgstr ""
-"selecciona el manejament de les etiquetes que etiqueten objectes filtrats"
+"selecciona el manejament de les etiquetes que etiquetin objectes filtrats"
-#: builtin/fast-export.c:710
+#: builtin/fast-export.c:987
msgid "Dump marks to this file"
msgstr "Bolcar les marques a aquest fitxer"
-#: builtin/fast-export.c:712
+#: builtin/fast-export.c:989
msgid "Import marks from this file"
-msgstr "Importa marques d'aquest fitxer"
+msgstr "Importa les marques d'aquest fitxer"
-#: builtin/fast-export.c:714
+#: builtin/fast-export.c:991
msgid "Fake a tagger when tags lack one"
-msgstr "Fingeix un etiquetador quan als etiquetes lis manca un"
+msgstr "Fingeix un etiquetador quan un lis manca a les etiquetes"
-#: builtin/fast-export.c:716
+#: builtin/fast-export.c:993
msgid "Output full tree for each commit"
-msgstr "Imprimeix l'arbre complet per cada comissió"
+msgstr "Imprimeix l'arbre complet de cada comissió"
-#: builtin/fast-export.c:718
+#: builtin/fast-export.c:995
msgid "Use the done feature to terminate the stream"
-msgstr "Utilitza la característica done per terminar el corrent"
+msgstr "Usa la característica done per a terminar el corrent"
-#: builtin/fast-export.c:719
+#: builtin/fast-export.c:996
msgid "Skip output of blob data"
msgstr "Salta l'emissió de dades de blob"
-#: builtin/fast-export.c:720
+#: builtin/fast-export.c:997
msgid "refspec"
msgstr "especificació de referència"
-#: builtin/fast-export.c:721
+#: builtin/fast-export.c:998
msgid "Apply refspec to exported refs"
msgstr "Aplica l'especificació de referència a les referències exportades"
+#: builtin/fast-export.c:999
+msgid "anonymize output"
+msgstr "anonimitza la sortida"
+
#: builtin/fetch.c:20
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
-msgstr ""