diff options
415 files changed, 37846 insertions, 16713 deletions
@@ -13,6 +13,7 @@ Alex Riesen <raa.lkml@gmail.com> <raa@limbo.localdomain> Alex Riesen <raa.lkml@gmail.com> <raa@steel.home> Alex Vandiver <alex@chmrr.net> <alexmv@MIT.EDU> Alexander Gavrilov <angavrilov@gmail.com> +Alexander Kuleshov <kuleshovmail@gmail.com> Alexey Shumkin <alex.crezoff@gmail.com> <zapped@mail.ru> Alexey Shumkin <alex.crezoff@gmail.com> <Alex.Crezoff@gmail.com> Anders Kaseorg <andersk@MIT.EDU> <andersk@ksplice.com> diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines index 7636199..c6e536f 100644 --- a/Documentation/CodingGuidelines +++ b/Documentation/CodingGuidelines @@ -1,5 +1,5 @@ Like other projects, we also have some guidelines to keep to the -code. For Git in general, three rough rules are: +code. For Git in general, a few rough rules are: - Most importantly, we never say "It's in POSIX; we'll happily ignore your needs should your system not conform to it." @@ -526,7 +526,7 @@ Writing Documentation: `backticks around word phrases`, do so. `--pretty=oneline` `git rev-list` - `remote.pushdefault` + `remote.pushDefault` Word phrases enclosed in `backtick characters` are rendered literally and will not be further expanded. The use of `backticks` to achieve the diff --git a/Documentation/RelNotes/2.3.2.txt b/Documentation/RelNotes/2.3.2.txt index f4caf54..93462e4 100644 --- a/Documentation/RelNotes/2.3.2.txt +++ b/Documentation/RelNotes/2.3.2.txt @@ -24,7 +24,7 @@ Fixes since v2.3.1 "curl-config --vernum", which confused our build system. * An earlier workaround to squelch unhelpful deprecation warnings - from the complier on Mac OSX unnecessarily set minimum required + from the compiler on Mac OSX unnecessarily set minimum required version of the OS, which the user might want to raise (or lower) for other reasons. diff --git a/Documentation/RelNotes/2.3.3.txt b/Documentation/RelNotes/2.3.3.txt new file mode 100644 index 0000000..5ef1264 --- /dev/null +++ b/Documentation/RelNotes/2.3.3.txt @@ -0,0 +1,39 @@ +Git v2.3.3 Release Notes +======================== + +Fixes since v2.3.2 +------------------ + + * A corrupt input to "git diff -M" used cause us to segfault. + + * The borrowed code in kwset API did not follow our usual convention + to use "unsigned char" to store values that range from 0-255. + + * Description given by "grep -h" for its --exclude-standard option + was phrased poorly. + + * Documentaton for "git remote add" mentioned "--tags" and + "--no-tags" and it was not clear that fetch from the remote in + the future will use the default behaviour when neither is given + to override it. + + * "git diff --shortstat --dirstat=changes" showed a dirstat based on + lines that was never asked by the end user in addition to the + dirstat that the user asked for. + + * The interaction between "git submodule update" and the + submodule.*.update configuration was not clearly documented. + + * "git apply" was not very careful about reading from, removing, + updating and creating paths outside the working tree (under + --index/--cached) or the current directory (when used as a + replacement for GNU patch). + + * "git daemon" looked up the hostname even when "%CH" and "%IP" + interpolations are not requested, which was unnecessary. + + * The "interpolated-path" option of "git daemon" inserted any string + client declared on the "host=" capability request without checking. + Sanitize and limit %H and %CH to a saner and a valid DNS name. + +Also contains typofixes, documentation updates and trivial code clean-ups. diff --git a/Documentation/RelNotes/2.3.4.txt b/Documentation/RelNotes/2.3.4.txt new file mode 100644 index 0000000..094c7b8 --- /dev/null +++ b/Documentation/RelNotes/2.3.4.txt @@ -0,0 +1,32 @@ +Git v2.3.4 Release Notes +======================== + +Fixes since v2.3.3 +------------------ + + * The 'color.status.unmerged' configuration was not described. + + * "git log --decorate" did not reset colors correctly around the + branch names. + + * "git -C '' subcmd" refused to work in the current directory, unlike + "cd ''" which silently behaves as a no-op. + + * "git imap-send" learned to optionally talk with an IMAP server via + libcURL; because there is no other option when Git is built with + NO_OPENSSL option, use that codepath by default under such + configuration. + + * A workaround for certain build of GPG that triggered false breakage + in a test has been added. + + * "git rebase -i" recently started to include the number of + commits in the insn sheet to be processed, but on a platform + that prepends leading whitespaces to "wc -l" output, the numbers + are shown with extra whitespaces that aren't necessary. + + * We did not parse username followed by literal IPv6 address in SSH + transport URLs, e.g. ssh://user@[2001:db8::1]:22/repo.git + correctly. + +Also contains typofixes, documentation updates and trivial code clean-ups. diff --git a/Documentation/RelNotes/2.3.5.txt b/Documentation/RelNotes/2.3.5.txt new file mode 100644 index 0000000..5b309db --- /dev/null +++ b/Documentation/RelNotes/2.3.5.txt @@ -0,0 +1,44 @@ +Git v2.3.5 Release Notes +======================== + +Fixes since v2.3.4 +------------------ + + * The prompt script (in contrib/) did not show the untracked sign + when working in a subdirectory without any untracked files. + + * Even though "git grep --quiet" is run merely to ask for the exit + status, we spawned the pager regardless. Stop doing that. + + * Recommend format-patch and send-email for those who want to submit + patches to this project. + + * An failure early in the "git clone" that started creating the + working tree and repository could have resulted in some directories + and files left without getting cleaned up. + + * "git fetch" that fetches a commit using the allow-tip-sha1-in-want + extension could have failed to fetch all the requested refs. + + * The split-index mode introduced at v2.3.0-rc0~41 was broken in the + codepath to protect us against a broken reimplementation of Git + that writes an invalid index with duplicated index entries, etc. + + * "git prune" used to largely ignore broken refs when deciding which + objects are still being used, which could spread an existing small + damage and make it a larger one. + + * "git tag -h" used to show the "--column" and "--sort" options + that are about listing in a wrong section. + + * The transfer.hiderefs support did not quite work for smart-http + transport. + + * The code that reads from the ctags file in the completion script + (in contrib/) did not spell ${param/pattern/string} substitution + correctly, which happened to work with bash but not with zsh. + + * The explanation on "rebase --preserve-merges", "pull --rebase=preserve", + and "push --force-with-lease" in the documentation was unclear. + +Also contains typofixes, documentation updates and trivial code clean-ups. diff --git a/Documentation/RelNotes/2.3.6.txt b/Documentation/RelNotes/2.3.6.txt new file mode 100644 index 0000000..432f770 --- /dev/null +++ b/Documentation/RelNotes/2.3.6.txt @@ -0,0 +1,13 @@ +Git v2.3.6 Release Notes +======================== + +Fixes since v2.3.5 +------------------ + + * "diff-highlight" (in contrib/) used to show byte-by-byte + differences, which meant that multi-byte characters can be chopped + in the middle. It learned to pay attention to character boundaries + (assuming the UTF-8 payload). + +Also contains typofixes, documentation updates and trivial code +clean-ups. diff --git a/Documentation/RelNotes/2.3.7.txt b/Documentation/RelNotes/2.3.7.txt new file mode 100644 index 0000000..fc95812 --- /dev/null +++ b/Documentation/RelNotes/2.3.7.txt @@ -0,0 +1,21 @@ +Git v2.3.7 Release Notes +======================== + +Fixes since v2.3.6 +------------------ + + * An earlier update to the parser that disects a URL broke an + address, followed by a colon, followed by an empty string (instead + of the port number), e.g. ssh://example.com:/path/to/repo. + + * The completion script (in contrib/) contaminated global namespace + and clobbered on a shell variable $x. + + * The "git push --signed" protocol extension did not limit what the + "nonce" that is a server-chosen string can contain or how long it + can be, which was unnecessarily lax. Limit both the length and the + alphabet to a reasonably small space that can still have enough + entropy. + +Also contains typofixes, documentation updates and trivial code +clean-ups. diff --git a/Documentation/RelNotes/2.3.8.txt b/Documentation/RelNotes/2.3.8.txt new file mode 100644 index 0000000..0b67268 --- /dev/null +++ b/Documentation/RelNotes/2.3.8.txt @@ -0,0 +1,22 @@ +Git v2.3.8 Release Notes +======================== + +Fixes since v2.3.7 +------------------ + + * The usual "git diff" when seeing a file turning into a directory + showed a patchset to remove the file and create all files in the + directory, but "git diff --no-index" simply refused to work. Also, + when asked to compare a file and a directory, imitate POSIX "diff" + and compare the file with the file with the same name in the + directory, instead of refusing to run. + + * The default $HOME/.gitconfig file created upon "git config --global" + that edits it had incorrectly spelled user.name and user.email + entries in it. + + * "git commit --date=now" or anything that relies on approxidate lost + the daylight-saving-time offset. + +Also contains typofixes, documentation updates and trivial code +clean-ups. diff --git a/Documentation/RelNotes/2.4.0.txt b/Documentation/RelNotes/2.4.0.txt new file mode 100644 index 0000000..cde64be --- /dev/null +++ b/Documentation/RelNotes/2.4.0.txt @@ -0,0 +1,514 @@ +Git 2.4 Release Notes +===================== + +Backward compatibility warning(s) +--------------------------------- + +This release has a few changes in the user-visible output from +Porcelain commands. These are not meant to be parsed by scripts, but +users still may want to be aware of the changes: + + * The output from "git log --decorate" (and, more generally, the "%d" + format specifier used in the "--format=<string>" parameter to the + "git log" family of commands) has changed. It used to list "HEAD" + just like other branches; e.g., + + $ git log --decorate -1 master + commit bdb0f6788fa5e3cacc4315e9ff318a27b2676ff4 (HEAD, master) + ... + + This release changes the output slightly when HEAD refers to a + branch whose name is also shown in the output. The above is now + shown as: + + $ git log --decorate -1 master + commit bdb0f6788fa5e3cacc4315e9ff318a27b2676ff4 (HEAD -> master) + ... + + * The phrasing "git branch" uses to describe a detached HEAD has been + updated to agree with the phrasing used by "git status": + + - When HEAD is at the same commit as when it was originally + detached, they now both show "detached at <commit object name>". + + - When HEAD has moved since it was originally detached, they now + both show "detached from <commit object name>". + + Previously, "git branch" always used "from". + + +Updates since v2.3 +------------------ + +Ports + + * Our default I/O size (8 MiB) for large files was too large for some + platforms with smaller SSIZE_MAX, leading to read(2)/write(2) + failures. + + * We did not check the curl library version before using the + CURLOPT_PROXYAUTH feature, which did not exist in older versions of + the library. + + * We now detect number of CPUs on older BSD-derived systems. + + * Portability fixes and workarounds for shell scripts have been added + to help BSD-derived systems. + + +UI, Workflows & Features + + * The command usage info strings given by "git cmd -h" and in + documentation have been tweaked for consistency. + + * The "sync" subcommand of "git p4" now allows users to exclude + subdirectories like its "clone" subcommand does. + + * "git log --invert-grep --grep=WIP" will show only commits that do + not have the string "WIP" in their messages. + + * "git push" has been taught an "--atomic" option that makes a push + that updates more than one ref an "all-or-none" affair. + + * Extending the "push to deploy" feature that was added in 2.3, the + behaviour of "git push" when updating the branch that is checked + out can now be tweaked by a "push-to-checkout" hook. + + * HTTP-based transports now send Accept-Language when making + requests. The languages to accept are inferred from environment + variables on the client side (LANGUAGE, etc). + + * "git send-email" used to accept a mistaken "y" (or "yes") as an + answer to "What encoding do you want to use [UTF-8]?" without + questioning. Now it asks for confirmation when the answer looks too + short to be a valid encoding name. + + * When "git apply --whitespace=fix" fixed whitespace errors in the + common context lines, the command reports that it did so. + + * "git status" now allows the "-v" option to be given twice, in which + case it also shows the differences in the working tree that are not + staged to be committed. + + * "git cherry-pick" used to clean up the log message even when it is + merely replaying an existing commit. It now replays the message + verbatim unless you are editing the message of the resulting + commit. + + * "git archive" can now be told to set the 'text' attribute in the + resulting zip archive. + + * Output from "git log --decorate" now distinguishes between a + detached HEAD vs. a HEAD that points at a branch. + + This is a potentially backward-incompatible change; see above for + more information. + + * When HEAD was detached when at commit xyz and hasn't been moved + since it was detached, "git status" would report "detached at xyz" + whereas "git branch" would report "detached from xyz". Now the + output of "git branch" agrees with that of "git status". + + This is a potentially backward-incompatible change; see above for + more information. + + * "git -C '' subcmd" now works in the current directory (analogously + to "cd ''") rather than dying with an error message. + (merge 6a536e2 kn/git-cd-to-empty later to maint). + + * The versionsort.prereleaseSuffix configuration variable can be used + to specify that, for example, v1.0-pre1 comes before v1.0. + + * A new "push.followTags" configuration turns the "--follow-tags" + option on by default for the "git push" command. + + * "git log --graph --no-walk A B..." is a nonsensical combination of + options: "--no-walk" requests discrete points in the history, while + "--graph" asks to draw connections between these discrete points. + Forbid the use of these options together. + + * "git rev-list --bisect --first-parent" does not work (yet) and can + even cause SEGV; forbid it. "git log --bisect --first-parent" would + not be useful until "git bisect --first-parent" materializes, so + also forbid it for now. + + +Performance, Internal Implementation, Development Support etc. + + * Slightly change the implementation of the N_() macro to help us + detect mistakes. + + * Restructure the implementation of "reflog expire" to fit better + with the recently updated reference API. + + * The transport-helper did not pass transport options such as + verbosity, progress, cloning, etc. to import and export based + helpers, like it did for fetch and push based helpers, robbing them + of the chance to honor the wish of the end-users better. + + * The tests that wanted to see that a file becomes unreadable after + running "chmod a-r file", and the tests that wanted to make sure + that they are not run as root, used "can we write into the / + directory?" as a cheap substitute. But on some platforms that is + not a good heuristic. The tests and their prerequisites have been + updated to check what they really require. + (merge f400e51 jk/sanity later to maint). + + * Various issues around "reflog expire", e.g. using --updateref when + expiring a reflog for a symbolic reference, have been corrected + and/or made saner. + + * The documentation for the strbuf API had been split between the API + documentation and the header file. Consolidate the documentation in + strbuf.h. + + * The error handling functions and conventions are now documented in + the API manual (in api-error-handling.txt). + + * Optimize gitattribute look-up, mostly useful in "git grep" on a + project that does not use many attributes, by avoiding it when we + (should) know that the attributes are not defined in the first + place. + + * Typofix in comments. + (merge ef2956a ak/git-pm-typofix later to maint). + + * Code clean-up. + (merge 0b868f0 sb/hex-object-name-is-at-most-41-bytes-long later to maint). + (merge 5d30851 dp/remove-duplicated-header-inclusion later to maint). + + * Simplify the ref transaction API for verifying that "the ref should + be pointing at this object". + + * Simplify the code in "git daemon" that parses out and holds + hostnames used in request interpolation. + + * Restructure the "git push" codepath to make it easier to add new + configuration bits. + + * The run-command interface made it easy to make a pipe for us to + read from a process, wait for the process to finish, and then + attempt to read its output. But this pattern can lead to deadlock. + So introduce a helper to do this correctly (i.e., first read, and + then wait the process to finish) and also add code to prevent such + abuse in the run-command helper. + + * People often forget to chain the commands in their test together + with &&, letting a failure from an earlier command in the test go + unnoticed. The new GIT_TEST_CHAIN_LINT mechanism allows you to + catch such a mistake more easily. + + +Also contains various documentation updates and code clean-ups. + + +Fixes since v2.3 +---------------- + +Unless otherwise noted, all the fixes since v2.3 in the maintenance +track are contained in this release (see the maintenance releases' +notes for details). + + * "git blame HEAD -- missing" failed to correctly say "HEAD" when it + tried to say "No such path 'missing' in HEAD". + (merge a46442f jk/blame-commit-label later to maint). + + * "git rerere" (invoked internally from many mergy operations) did + not correctly signal errors when it attempted to update the working + tree files but failed for whatever reason. + (merge 89ea903 jn/rerere-fail-on-auto-update-failure later to maint). + + * Setting diff.submodule to 'log' made "git format-patch" produce + broken patches. + (merge 339de50 dk/format-patch-ignore-diff-submodule later to maint). + + * After attempting and failing a password-less authentication (e.g., + Kerberos), libcURL refuses to fall back to password-based Basic + authentication without a bit of help/encouragement. + (merge 4dbe664 bc/http-fallback-to-password-after-krb-fails later to maint). + + * The "git push" documentation for the "--repo=<there>" option was + easily misunderstood. + (merge 57b92a7 mg/push-repo-option-doc later to maint). + + * Code to read a branch name from various files in the .git/ + directory would have overrun array limits if asked to read an empty + file. + (merge 66ec904 jk/status-read-branch-name-fix later to maint). + + * Remove a superfluous conditional that is always true. + (merge 94ee8e2 jk/remote-curl-an-array-in-struct-cannot-be-null later to maint). + + * The "git diff --raw" documentation incorrectly implied that C(opy) + and R(ename) are the only statuses that can be followed by a score + number. + (merge ac1c2d9 jc/diff-format-doc later to maint). + + * A broken pack .idx file in the receiving repository prevented the + dumb http transport from fetching a good copy of it from the other + side. + (merge 8b9c2dd jk/dumb-http-idx-fetch-fix later to maint). + + * The error message from "git commit", when a non-existing author + name was given as value to the "--author=" parameter, has been + reworded to avoid misunderstanding. + (merge 1044b1f mg/commit-author-no-match-malformed-message later to maint). + + * "git log --help" used to show rev-list options that are irrelevant + to the "log" command. + (merge 3cab02d jc/doc-log-rev-list-options later to maint). + + * "git apply --whitespace=fix" used to under-allocate memory when the + fix resulted in a longer text than the original patch. + (merge 407a792 jc/apply-ws-fix-expands later to maint). + + * The interactive "show a list and let the user choose from it" + interface used by "git add -i" unnecessarily prompted the user even + when the candidate list was empty, against which the only "choice" + the user could have made was to choose nothing. + (merge a9c4641 ak/add-i-empty-candidates later to maint). + + * The todo list created by "git rebase -i" did not fully honor + core.abbrev settings. + (merge edb72d5 ks/rebase-i-abbrev later to maint). + + * "git fetch" over a remote-helper that cannot respond to the "list" + command could not fetch from a symbolic reference (e.g., HEAD). + (merge 33cae54 mh/deref-symref-over-helper-transport later to maint). + + * "git push --signed" gave an incorrectly worded error message when + the other side did not support the capability. + + * The "git push --signed" protocol extension did not limit what the + "nonce" (a server-chosen string) could contain nor how long it + could be, which was unnecessarily lax. Limit both the length and + the alphabet to a reasonably small space that can still have enough + entropy. + (merge afcb6ee jc/push-cert later to maint). + + * The completion script (in contrib/) clobbered the shell variable $x + in the global shell namespace. + (merge 852ff1c ma/bash-completion-leaking-x later to maint). + + * We incorrectly formatted a "uintmax_t" integer that doesn't fit in + "int". + (merge d306f3d jk/decimal-width-for-uintmax later to maint). + + * The configuration parser used to be confused when reading + configuration from a blob object that ends with a lone CR. + (merge 1d0655c jk/config-no-ungetc-eof later to maint). + + * The pack bitmap support did not build with older versions of GCC. + (merge bd4e882 jk/pack-bitmap later to maint). + + * The documentation wasn't clear that "remote.<nick>.pushURL" and + "remote.<nick>.URL" are there to name the same repository accessed + via different transports, not two separate repositories. + (merge 697f652 jc/remote-set-url-doc later to maint). + + * Older GnuPG implementations may not correctly import the keyring + material we prepare for the tests to use. + (merge 1f985d6 ch/new-gpg-drops-rfc-1991 later to maint). + + * The credential helper for Windows (in contrib/) used to mishandle + user names that contain an at-sign. + (merge 13d261e av/wincred-with-at-in-username-fix later to maint). + + * "diff-highlight" (in contrib/) used to show byte-by-byte + differences, which could cause multi-byte characters to be chopped + in the middle. It learned to pay attention to character boundaries + (assuming UTF-8). + (merge 8d00662 jk/colors later to maint). + + * Document longstanding configuration variable naming rules in + CodingGuidelines. + (merge 35840a3 jc/conf-var-doc later to maint). + + * An earlier workaround to squelch unhelpful deprecation warnings + from the compiler on OS X unnecessarily set a minimum required + version of the OS, which the user might want to raise (or lower) + for other reasons. + (merge 88c03eb es/squelch-openssl-warnings-on-macosx later to maint). + + * Certain older vintages of cURL give irregular output from + "curl-config --vernum", which confused our build system. + (merge 3af6792 tc/curl-vernum-output-broken-in-7.11 later to maint). + + * In v2.2.0, we broke "git prune" that runs in a repository that + borrows from an alternate object store. + (merge b0a4264 jk/prune-mtime later to maint). + + * "git submodule add" failed to squash "path/to/././submodule" to + "path/to/submodule". + (merge 8196e72 ps/submodule-sanitize-path-upon-add later to maint). + + * "git merge-file" did not work correctly when invoked in a + subdirectory. + (merge 204a8ff ab/merge-file-prefix later to maint). + + * "git blame" could die trying to free an uninitialized piece of + memory. + (merge e600592 es/blame-commit-info-fix later to maint). + + * "git fast-import" used to crash when it could not close and + finalize the resulting packfile cleanly. + (merge 5e915f3 jk/fast-import-die-nicely-fix later to maint). + + * "update-index --refresh" used to leak memory when an entry could + not be refreshed for whatever reason. + (merge bc1c2ca sb/plug-leak-in-make-cache-entry later to maint). + + * The "interpolated-path" option of "git daemon" inserted any string + the client declared on the "host=" capability request without + checking. Sanitize and limit %H and %CH to a saner and a valid DNS + name. + (merge b485373 jk/daemon-interpolate later to maint). + + * "git daemon" unnecessarily looked up the hostname even when "%CH" + and "%IP" interpolations were not requested. + (merge dc8edc8 rs/daemon-interpolate later to maint). + + * We relied on "--no-" prefix handling in Perl's Getopt::Long + package, even though that support didn't exist in Perl 5.8 (which + we still support). Manually add support to help people with older + Getopt::Long packages. + (merge f471494 km/send-email-getopt-long-workarounds later to maint). + + * "git apply" was not very careful about reading from, removing, + updating and creating paths outside the working tree (under + --index/--cached) or the current directory (when used as a + replacement for GNU patch). + (merge e0d201b jc/apply-beyond-symlink later to maint). + + * Correct a breakage in git-svn, introduced around the v2.2 era, that + can cause FileHandles to be closed prematurely. + (merge e426311 ew/svn-maint-fixes later to maint). + + * We did not parse usernames followed by literal IPv6 addresses + correctly in SSH transport URLs; e.g., + ssh://user@[2001:db8::1]:22/repo.git. + (merge 6b6c5f7 tb/connect-ipv6-parse-fix later to maint). + + * The configuration variable 'mailinfo.scissors' was hard to + discover in the documentation. + (merge afb5de7 mm/am-c-doc later to maint). + + * The interaction between "git submodule update" and the + submodule.*.update configuration was not clearly documented. + (merge 5c31acf ms/submodule-update-config-doc later to maint). + + * "git diff --shortstat" used together with "--dirstat=changes" or + "--dirstat=files" incorrectly output dirstat information twice. + (merge ab27389 mk/diff-shortstat-dirstat-fix later to maint). + + * The manpage for "git remote add" mentioned "--tags" and "--no-tags" + but did not explain what happens if neither option is provided. + (merge aaba0ab mg/doc-remote-tags-or-not later to maint). + + * The description of "--exclude-standard option" in the output of + "git grep -h" was phrased poorly. + (merge 77fdb8a nd/grep-exclude-standard-help-fix later to maint). + + * "git rebase -i" recently started to include the number of commits + in the todo list, but that output included extraneous whitespace on + a platform that prepends leading whitespaces to its "wc -l" output. + (merge 2185d3b es/rebase-i-count-todo later to maint). + + * The borrowed code in the kwset API did not follow our usual + convention to use "unsigned char" to store values that range from + 0-255. + (merge 189c860 bw/kwset-use-unsigned later to maint). + + * A corrupt input to "git diff -M" used to cause it to segfault. + (merge 4d6be03 jk/diffcore-rename-duplicate later to maint). + + * Certain builds of GPG triggered false breakages in a test. + (merge 3f88c1b mg/verify-commit later to maint). + + * "git imap-send" learned to optionally talk with an IMAP server via + libcURL. Because there is no other option when Git is built with + the NO_OPENSSL option, use libcURL by default in that case. + (merge dcd01ea km/imap-send-libcurl-options later to maint). + + * "git log --decorate" did not reset colors correctly around the + branch names. + (merge 5ee8758 jc/decorate-leaky-separator-color later to maint). + + * The code that reads from the ctags file in the completion script + (in contrib/) did not spell ${param/pattern/string} substitution + correctly, which happened to work with bash but not with zsh. + (merge db8d750 js/completion-ctags-pattern-substitution-fix later to maint). + + * The transfer.hiderefs support did not quite work for smart-http + transport. + (merge 8ddf3ca jk/smart-http-hide-refs later to maint). + + * In the "git tag -h" output, move the documentation for the + "--column" and "--sort" options to the "Tag listing options" + section. + (merge dd059c6 jk/tag-h-column-is-a-listing-option later to maint). + + * "git prune" used to largely ignore broken refs when deciding which + objects are still being used, which could cause reference + corruption to lead to object loss. + (merge ea56c4e jk/prune-with-corrupt-refs later to maint). + + * The split-index mode introduced in v2.3.0-rc0~41 was broken in the + codepath to protect us against a broken reimplementation of Git + that writes an invalid index with duplicated index entries, etc. + (merge 03f15a7 tg/fix-check-order-with-split-index later to maint). + + * "git fetch", when fetching a commit using the + allow-tip-sha1-in-want extension, could have failed to fetch all of + the requested refs. + (merge 32d0462 jk/fetch-pack later to maint). + + * An failure early in the "git clone" that started creating the + working tree and repository could have resulted in the failure to + clean up some directories and files. + (merge 16eff6c jk/cleanup-failed-clone later to maint). + + * Recommend format-patch and send-email for those who want to submit + patches to this project. + (merge b25c469 jc/submitting-patches-mention-send-email later to maint). + + * Do not spawn the pager when "git grep" is run with "--quiet". + (merge c2048f0 ws/grep-quiet-no-pager later to maint). + + * The prompt script (in contrib/) did not show the untracked sign + when working in a subdirectory without any untracked files. + (merge 9bdc517 ct/prompt-untracked-fix later to maint). + + * An earlier update to the URL parser broke an address that contains + a colon but an empty string for the port number, like + ssh://example.com:/path/to/repo. + (merge 6b6c5f7 tb/connect-ipv6-parse-fix later to maint). + + * Code cleanups and documentation updates. + (merge 2ce63e9 rs/simple-cleanups later to maint). + (merge 33baa69 rj/no-xopen-source-for-cygwin later to maint). + (merge 817d03e jc/diff-test-updates later to maint). + (merge eb32c66 ak/t5516-typofix later to maint). + (merge bcd57cb mr/doc-clean-f-f later to maint). + (merge 0d6accc mg/doc-status-color-slot later to maint). + (merge 53e53c7 sg/completion-remote later to maint). + (merge 8fa7975 ak/git-done-help-cleanup later to maint). + (merge 9a6f128 rs/deflate-init-cleanup later to maint). + (merge 6f75d45 rs/use-isxdigit later to maint). + (merge 376e4b3 jk/test-annoyances later to maint). + (merge 7032054 nd/doc-git-index-version later to maint). + (merge e869c5e tg/test-index-v4 later to maint). + (merge 599d223 jk/simplify-csum-file-sha1fd-check later to maint). + (merge 260d585 sg/completion-gitcomp-nl-for-refs later to maint). + (merge 777c55a jc/report-path-error-to-dir later to maint). + (merge fddfaf8 ph/push-doc-cas later to maint). + (merge d50d31e ss/pull-rebase-preserve later to maint). + (merge c8c3f1d pt/enter-repo-comment-fix later to maint). + (merge d7bfb9e jz/gitweb-conf-doc-fix later to maint). + (merge f907282 jk/cherry-pick-docfix later to maint). + (merge d3c0811 iu/fix-parse-options-h-comment later to maint). + (merge 6c3b2af jg/cguide-we-cannot-count later to maint). + (merge 2b8bd44 jk/pack-corruption-post-mortem later to maint). + (merge 9585cb8 jn/doc-fast-import-no-16-octopus-limit later to maint). + (merge 5dcd1b1 ps/grep-help-all-callback-arg later to maint). + (merge f1f4c84 va/fix-git-p4-tests later to maint). diff --git a/Documentation/RelNotes/2.4.1.txt b/Documentation/RelNotes/2.4.1.txt new file mode 100644 index 0000000..a65a6c5 --- /dev/null +++ b/Documentation/RelNotes/2.4.1.txt @@ -0,0 +1,40 @@ +Git v2.4.1 Release Notes +======================== + +Fixes since v2.4 +---------------- + + * The usual "git diff" when seeing a file turning into a directory + showed a patchset to remove the file and create all files in the + directory, but "git diff --no-index" simply refused to work. Also, + when asked to compare a file and a directory, imitate POSIX "diff" + and compare the file with the file with the same name in the + directory, instead of refusing to run. + + * The default $HOME/.gitconfig file created upon "git config --global" + that edits it had incorrectly spelled user.name and user.email + entries in it. + + * "git commit --date=now" or anything that relies on approxidate lost + the daylight-saving-time offset. + + * "git cat-file bl $blob" failed to barf even though there is no + object type that is "bl". + + * Teach the codepaths that read .gitignore and .gitattributes files + that these files encoded in UTF-8 may have UTF-8 BOM marker at the + beginning; this makes it in line with what we do for configuration + files already. + + * Access to objects in repositories that borrow from another one on a + slow NFS server unnecessarily got more expensive due to recent code + becoming more cautious in a naive way not to lose objects to pruning. + + * We avoid setting core.worktree when the repository location is the + ".git" directory directly at the top level of the working tree, but + the code misdetected the case in which the working tree is at the + root level of the filesystem (which arguably is a silly thing to + do, but still valid). + +Also contains typofixes, documentation updates and trivial code +clean-ups. diff --git a/Documentation/RelNotes/2.5.0.txt b/Documentation/RelNotes/2.5.0.txt new file mode 100644 index 0000000..b102837 --- /dev/null +++ b/Documentation/RelNotes/2.5.0.txt @@ -0,0 +1,322 @@ +Git 2.5 Release Notes +===================== + +Updates since v2.4 +------------------ + +Ports + + +UI, Workflows & Features + + * "git p4" now detects the filetype (e.g. binary) correctly even when + the files are opened exclusively. + + * git p4 attempts to better handle branches in Perforce. + + * "git p4" learned "--changes-block-size <n>" to read the changes in + chunks from Perforce, instead of making one call to "p4 changes" + that may trigger "too many rows scanned" error from Perforce. + + * "git show-branch --topics HEAD" (with no other arguments) did not + do anything interesting. Instead, contrast the given revision + against all the local branches by default. + + * A replacement for contrib/workdir/git-new-workdir that does not + rely on symbolic links and make sharing of objects and refs safer + by making the borrowee and borrowers aware of each other. + + * Tweak the sample "store" backend of the credential helper to honor + XDG configuration file locations when specified. + + * A heuristic to help the "git <cmd> <revs> <pathspec>" command line + convention to catch mistyped paths is to make sure all the non-rev + parameters in the later part of the command line are names of the + files in the working tree, but that means "git grep $str -- \*.c" + must always be disambiguated with "--", because nobody sane will + create a file whose name literally is asterisk-dot-see. Loosen the + heuristic to declare that with a wildcard string the user likely + meant to give us a pathspec. + + * "git merge FETCH_HEAD" learned that the previous "git fetch" could + be to create an Octopus merge, i.e. recording multiple branches + that are not marked as "not-for-merge"; this allows us to lose an + old style invocation "git merge <msg> HEAD $commits..." in the + implementation of "git pull" script; the old style syntax can now + be deprecated. + + * Help us to find broken test script that splits the body part of the + test by mistaken use of wrong kind of quotes. + (merge d93d5d5 jc/test-prereq-validate later to maint). + + * Developer support to automatically detect broken &&-chain in the + test scripts is now turned on by default. + (merge 92b269f jk/test-chain-lint later to maint). + + * Filter scripts were run with SIGPIPE disabled on the Git side, + expecting that they may not read what Git feeds them to filter. + We however treated a filter that does not read its input fully + before exiting as an error. + + This changes semantics, but arguably in a good way. If a filter + can produce its output without consuming its input using whatever + magic, we now let it do so, instead of diagnosing it as a + programming error. + + * Instead of dying immediately upon failing to obtain a lock, the + locking (of refs etc) retries after a short while with backoff. + + * Introduce http.<url>.SSLCipherList configuration variable to tweak + the list of cipher suite to be used with libcURL when talking with + https:// sites. + + * "git subtree" script (in contrib/) used "echo -n" to produce + progress messages in a non-portable way. + + * "git subtree" script (in contrib/) does not have --squash option + when pushing, but the documentation and help text pretended as if + it did. + + * The Git subcommand completion (in contrib/) listed credential + helpers among candidates, which is not something the end user would + invoke interatively. + + +Performance, Internal Implementation, Development Support etc. + + * "unsigned char [20]" used thoughout the code to represent object + names are being converted into a semi-opaque "struct object_id". + This effort is expected to interfere with other topics in flight, + but hopefully will give us one extra level of abstraction in the + end, when completed. + + * Catch a programmer mistake to feed a pointer not an array to + ARRAY_SIZE() macro, by using a couple of GCC extensions. + (merge 89c855e ep/do-not-feed-a-pointer-to-array-size later to maint). + + * Some error messages in "git config" were emitted without calling + the usual error() facility. + + * When "add--interactive" splits a hunk into two overlapping hunks + and then let the user choose only one, it sometimes feeds an + incorrect patch text to "git apply". Add tests to demonstrate + this. + + I have a slight suspicion that this may be $gmane/87202 coming back + and biting us (I seem to have said "let's run with this and see + what happens" back then). + + * More line-ending tests. + + * An earlier rewrite to use strbuf_getwholeline() instead of fgets(3) + to read packed-refs file revealed that the former is unacceptably + inefficient. + + * The refs API uses ref_lock struct which had its own "int fd", even + though the same file descriptor was in the lock struct it contains. + Clean-up the code to lose this redundant field. + + * Add the "--allow-unknown-type" option to "cat-file" to allow + inspecting loose objects of an experimental or a broken type. + + * Many long-running operations show progress eye-candy, even when + they are later backgrounded. Hide the eye-candy when the process + is sent to the background instead. + (merge 9a9a41d lm/squelch-bg-progress later to maint). + + * There was a dead code that used to handle "git pull --tags" and + show special-cased error message, which was made irrelevant when + the semantics of the option changed back in Git 1.9 days. + (merge 19d122b pt/pull-tags-error-diag later to maint). + + +Also contains various documentation updates and code clean-ups. + + +Fixes since v2.4 +---------------- + +Unless otherwise noted, all the fixes since v2.4 in the maintenance +track are contained in this release (see the maintenance releases' +notes for details). + + * Git 2.4 broke setting verbosity and progress levels on "git clone" + with native transports. + (merge 822f0c4 mh/clone-verbosity-fix later to maint). + + * "git add -e" did not allow the user to abort the operation by + killing the editor. + (merge cb64800 jk/add-e-kill-editor later to maint). + + * Memory usage of "git index-pack" has been trimmed by tens of + per-cent. + (merge c6458e6 nd/slim-index-pack-memory-usage later to maint). + + * "git rev-list --objects $old --not --all" to see if everything that + is reachable from $old is already connected to the existing refs + was very inefficient. + (merge b6e8a3b jk/still-interesting later to maint). + + * "hash-object --literally" introduced in v2.2 was not prepared to + take a really long object type name. + (merge 1427a7f jc/hash-object later to maint). + + * "git rebase --quiet" was not quite quiet when there is nothing to + do. + (merge 22946a9 jk/rebase-quiet-noop later to maint). + + * The completion for "log --decorate=" parameter value was incorrect. + (merge af16bda sg/complete-decorate-full-not-long later to maint). + + * "filter-branch" corrupted commit log message that ends with an + incomplete line on platforms with some "sed" implementations that + munge such a line. Work it around by avoiding to use "sed". + (merge df06201 jk/filter-branch-use-of-sed-on-incomplete-line later to maint). + + * "git daemon" fails to build from the source under NO_IPV6 + configuration (regression in 2.4). + (merge d358f77 jc/daemon-no-ipv6-for-2.4.1 later to maint). + + * Some time ago, "git blame" (incorrectly) lost the convert_to_git() + call when synthesizing a fake "tip" commit that represents the + state in the working tree, which broke folks who record the history + with LF line ending to make their project portabile across + platforms while terminating lines in their working tree files with + CRLF for their platform. + (merge 4bf256d tb/blame-resurrect-convert-to-git later to maint). + + * We avoid setting core.worktree when the repository location is the + ".git" directory directly at the top level of the working tree, but + the code misdetected the case in which the working tree is at the + root level of the filesystem (which arguably is a silly thing to + do, but still valid). + (merge 84ccad8 jk/init-core-worktree-at-root later to maint). + + * "git commit --date=now" or anything that relies on approxidate lost + the daylight-saving-time offset. + (merge f6e6362 jc/epochtime-wo-tz later to maint). + + * Access to objects in repositories that borrow from another one on a + slow NFS server unnecessarily got more expensive due to recent code + becoming more cautious in a naive way not to lose objects to pruning. + (merge ee1c6c3 jk/prune-mtime later to maint). + + * The codepaths that read .gitignore and .gitattributes files have been + taught that these files encoded in UTF-8 may have UTF-8 BOM marker at + the beginning; this makes it in line with what we do for configuration + files already. + (merge 27547e5 cn/bom-in-gitignore later to maint). + + * a few helper scripts in the test suite did not report errors + correcty. + (merge de248e9 ep/fix-test-lib-functions-report later to maint). + + * The default $HOME/.gitconfig file created upon "git config --global" + that edits it had incorrectly spelled user.name and user.email + entries in it. + (merge 7e11052 oh/fix-config-default-user-name-section later to maint). + + * "git cat-file bl $blob" failed to barf even though there is no + object type that is "bl". + (merge b7994af jk/type-from-string-gently later to maint). + + * The usual "git diff" when seeing a file turning into a directory + showed a patchset to remove the file and create all files in the + directory, but "git diff --no-index" simply refused to work. Also, + when asked to compare a file and a directory, imitate POSIX "diff" + and compare the file with the file with the same name in the + directory, instead of refusing to run. + (merge 0615173 jc/diff-no-index-d-f later to maint). + + * "git rebase -i" moved the "current" command from "todo" to "done" a + bit too prematurely, losing a step when a "pick" did not even start. + (merge 8cbc57c ph/rebase-i-redo later to maint). + + * The connection initiation code for "ssh" transport tried to absorb + differences between the stock "ssh" and Putty-supplied "plink" and + its derivatives, but the logic to tell that we are using "plink" + variants were too loose and falsely triggered when "plink" appeared + anywhere in the path (e.g. "/home/me/bin/uplink/ssh"). + (merge baaf233 bc/connect-plink later to maint). + + * "git stash pop/apply" forgot to make sure that not just the working + tree is clean but also the index is clean. The latter is important + as a stash application can conflict and the index will be used for + conflict resolution. + (merge ed178ef jk/stash-require-clean-index later to maint). + + * We have prepended $GIT_EXEC_PATH and the path "git" is installed in + (typically "/usr/bin") to $PATH when invoking subprograms and hooks + for almost eternity, but the original use case the latter tried to + support was semi-bogus (i.e. install git to /opt/foo/git and run it + without having /opt/foo on $PATH), and more importantly it has + become less and less relevant as Git grew more mainstream (i.e. the + users would _want_ to have it on their $PATH). Stop prepending the + path in which "git" is installed to users' $PATH, as that would + interfere the command search order people depend on (e.g. they may + not like versions of programs that are unrelated to Git in /usr/bin + and want to override them by having different ones in /usr/local/bin + and have the latter directory earlier in their $PATH). + (merge a0b4507 jk/git-no-more-argv0-path-munging later to maint). + + * core.excludesfile (defaulting to $XDG_HOME/git/ignore) is supposed + to be overridden by repository-specific .git/info/exclude file, but + the order was swapped from the beginning. This belatedly fixes it. + (merge 099d2d8 jc/gitignore-precedence later to maint). + + * After "git add -N", the path appeared in output of "git diff HEAD" + and "git diff --cached HEAD", leading "git status" to classify it + as "Changes to be committed". Such a path, however, is not yet to + be scheduled to be committed. "git diff" showed the change to the + path as modification, not as a "new file", in the header of its + output. + + Treat such paths as "yet to be added to the index but Git already + know about them"; "git diff HEAD" and "git diff --cached HEAD" + should not talk about them, and "git diff" should show them as new + files yet to be added to the index. + (merge d95d728 nd/diff-i-t-a later to maint). + + * There was a commented-out (instead of being marked to expect + failure) test that documented a breakage that was fixed since the + test was written; turn it into a proper test. + (merge 66d2e04 sb/t1020-cleanup later to maint). + + * The "log --decorate" enhancement in Git 2.4 that shows the commit + at the tip of the current branch e.g. "HEAD -> master", did not + work with --decorate=full. + (merge 429ad20 mg/log-decorate-HEAD later to maint). + + * The ref API did not handle cases where 'refs/heads/xyzzy/frotz' is + removed at the same time as 'refs/heads/xyzzy' is added (or vice + versa) very well. + (merge c628edf mh/ref-directory-file later to maint). + + * Multi-ref transaction support we merged a few releases ago + unnecessarily kept many file descriptors open, risking to fail with + resource exhaustion. This is for 2.4.x track. + (merge 185ce3a mh/write-refs-sooner-2.4 later to maint). + + * "git bundle verify" did not diagnose extra parameters on the + command line. + (merge 7886cfa ps/bundle-verify-arg later to maint). + + * Various documentation mark-up fixes to make the output more + consistent in general and also make AsciiDoctor (an alternative + formatter) happier. + (merge d0258b9 jk/asciidoc-markup-fix later to maint). + (merge ad3967a jk/stripspace-asciidoctor-fix later to maint). + (merge 975e382 ja/tutorial-asciidoctor-fix later to maint). + + * Code cleanups and documentation updates. + (merge 0269f96 mm/usage-log-l-can-take-regex later to maint). + (merge 64f2589 nd/t1509-chroot-test later to maint). + (merge f86a374 sb/test-bitmap-free-at-end later to maint). + (merge 05bfc7d sb/line-log-plug-pairdiff-leak later to maint). + (merge 846e5df pt/xdg-config-path later to maint). + (merge 1154aa4 jc/plug-fmt-merge-msg-leak later to maint). + (merge 319b678 jk/sha1-file-reduce-useless-warnings later to maint). + (merge 9a35c14 fg/document-commit-message-stripping later to maint). + (merge bbf431c ps/doc-packfile-vs-pack-file later to maint). + (merge 309a9e3 jk/skip-http-tests-under-no-curl later to maint). + (merge ccd593c dl/branch-error-message later to maint). diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index ef0eeb4..98fc4cc 100644 --- a/Documentation/SubmittingPatches +++ b/Documentation/SubmittingPatches @@ -136,6 +136,11 @@ that is fine, but please mark it as such. (4) Sending your patches. +Learn to use format-patch and send-email if possible. These commands +are optimized for the workflow of sending patches, avoiding many ways +your existing e-mail client that is optimized for "multipart/*" mime +type e-mails to corrupt and render your patches unusable. + People on the Git mailing list need to be able to read and comment on the changes you are submitting. It is important for a developer to be able to "quote" your changes, using standard diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt index 0cebc4f..a09969b 100644 --- a/Documentation/blame-options.txt +++ b/Documentation/blame-options.txt @@ -4,13 +4,13 @@ --root:: Do not treat root commits as boundaries. This can also be - controlled via the `blame.showroot` config option. + controlled via the `blame.showRoot` config option. --show-stats:: Include additional statistics at the end of blame output. -L <start>,<end>:: --L :<regex>:: +-L :<funcname>:: Annotate only the given line range. May be specified multiple times. Overlapping ranges are allowed. + diff --git a/Documentation/config.txt b/Documentation/config.txt index 1530255..5f76e8c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -14,7 +14,8 @@ the fully qualified variable name of the variable itself is the last dot-separated segment and the section name is everything before the last dot. The variable names are case-insensitive, allow only alphanumeric characters and `-`, and must start with an alphabetic character. Some -variables may appear multiple times. +variables may appear multiple times; we say then that the variable is +multivalued. Syntax ~~~~~~ @@ -25,7 +26,7 @@ blank lines are ignored. The file consists of sections and variables. A section begins with the name of the section in square brackets and continues until the next -section begins. Section names are not case sensitive. Only alphanumeric +section begins. Section names are case-insensitive. Only alphanumeric characters, `-` and `.` are allowed in section names. Each variable must belong to some section, which means that there must be a section header before the first setting of a variable. @@ -40,8 +41,8 @@ in the section header, like in the example below: -------- Subsection names are case sensitive and can contain any characters except -newline (doublequote `"` and backslash have to be escaped as `\"` and `\\`, -respectively). Section headers cannot span multiple +newline (doublequote `"` and backslash can be included by escaping them +as `\"` and `\\`, respectively). Section headers cannot span multiple lines. Variables may belong directly to a section or to a given subsection. You can have `[section]` if you have `[section "subsection"]`, but you don't need to. @@ -53,38 +54,27 @@ restrictions as section names. All the other lines (and the remainder of the line after the section header) are recognized as setting variables, in the form -'name = value'. If there is no equal sign on the line, the entire line -is taken as 'name' and the variable is recognized as boolean "true". +'name = value' (or just 'name', which is a short-hand to say that +the variable is the boolean "true"). The variable names are case-insensitive, allow only alphanumeric characters -and `-`, and must start with an alphabetic character. There can be more -than one value for a given variable; we say then that the variable is -multivalued. - -Leading and trailing whitespace in a variable value is discarded. -Internal whitespace within a variable value is retained verbatim. +and `-`, and must start with an alphabetic character. -The values following the equals sign in variable assign are all either -a string, an integer, or a boolean. Boolean values may be given as yes/no, -1/0, true/false or on/off. Case is not significant in boolean values, when -converting value to the canonical form using '--bool' type specifier; -'git config' will ensure that the output is "true" or "false". +A line that defines a value can be continued to the next line by +ending it with a `\`; the backquote and the end-of-line are +stripped. Leading whitespaces after 'name =', the remainder of the +line after the first comment character '#' or ';', and trailing +whitespaces of the line are discarded unless they are enclosed in +double quotes. Internal whitespaces within the value are retained +verbatim. -String values may be entirely or partially enclosed in double quotes. -You need to enclose variable values in double quotes if you want to -preserve leading or trailing whitespace, or if the variable value contains -comment characters (i.e. it contains '#' or ';'). -Double quote `"` and backslash `\` characters in variable values must -be escaped: use `\"` for `"` and `\\` for `\`. +Inside double quotes, double quote `"` and backslash `\` characters +must be escaped: use `\"` for `"` and `\\` for `\`. The following escape sequences (beside `\"` and `\\`) are recognized: `\n` for newline character (NL), `\t` for horizontal tabulation (HT, TAB) and `\b` for backspace (BS). Other char escape sequences (including octal escape sequences) are invalid. -Variable values ending in a `\` are continued on the next line in the -customary UNIX fashion. - -Some variables may require a special value format. Includes ~~~~~~~~ @@ -126,6 +116,60 @@ Example path = foo ; expand "foo" relative to the current file path = ~/foo ; expand "foo" in your $HOME directory + +Values +~~~~~~ + +Values of many variables are treated as a simple string, but there +are variables that take values of specific types and there are rules +as to how to spell them. + +boolean:: + + When a variable is said to take a boolean value, many + synonyms are accepted for 'true' and 'false'; these are all + case-insensitive. + + true;; Boolean true can be spelled as `yes`, `on`, `true`, + or `1`. Also, a variable defined without `= <value>` + is taken as true. + + false;; Boolean false can be spelled as `no`, `off`, + `false`, or `0`. ++ +When converting value to the canonical form using '--bool' type +specifier; 'git config' will ensure that the output is "true" or +"false" (spelled in lowercase). + +integer:: + The value for many variables that specify various sizes can + be suffixed with `k`, `M`,... to mean "scale the number by + 1024", "by 1024x1024", etc. + +color:: + The value for a variables that takes a color is a list of + colors (at most two) and attributes (at most one), separated + by spaces. The colors accepted are `normal`, `black`, + `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and + `white`; the attributes are `bold`, `dim`, `ul`, `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. Attributes may be turned off specifically + by prefixing them with `no` (e.g., `noreverse`, `noul`, etc). ++ +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). If your terminal supports it, you may also +specify 24-bit RGB values as hex, like `#ff0ab3`. ++ +The attributes are meant to be reset at the beginning of each item +in the colored output, so setting color.decorate.branch to `black` +will paint that branch name in a plain `black`, even if the previous +thing on the same output line (e.g. opening parenthesis before the +list of branch names in `log --decorate` output) is set to be +painted with `bold` or some other attribute. + + Variables ~~~~~~~~~ @@ -225,7 +269,7 @@ See linkgit:git-update-index[1]. + The default is true (when core.filemode is not specified in the config file). -core.ignorecase:: +core.ignoreCase:: If true, this option enables various workarounds to enable Git to work better on filesystems that are not case sensitive, like FAT. For example, if a directory listing finds @@ -234,12 +278,12 @@ core.ignorecase:: "Makefile". + The default is false, except linkgit:git-clone[1] or linkgit:git-init[1] -will probe and set core.ignorecase true if appropriate when the repository +will probe and set core.ignoreCase true if appropriate when the repository is created. -core.precomposeunicode:: +core.precomposeUnicode:: This option is only used by Mac OS implementation of Git. - When core.precomposeunicode=true, Git reverts the unicode decomposition + When core.precomposeUnicode=true, Git reverts the unicode decomposition of filenames done by Mac OS. This is useful when sharing a repository between Mac OS and Linux or Windows. (Git for Windows 1.7.10 or higher is needed, or Git under cygwin 1.7). @@ -264,13 +308,13 @@ core.trustctime:: crawlers and some backup systems). See linkgit:git-update-index[1]. True by default. -core.checkstat:: +core.checkStat:: Determines which stat fields to match between the index and work tree. The user can set this to 'default' or 'minimal'. Default (or explicitly 'default'), is to check all fields, including the sub-second part of mtime and ctime. -core.quotepath:: +core.quotePath:: The commands that output paths (e.g. 'ls-files', 'diff'), when not given the `-z` option, will quote "unusual" characters in the pathname by enclosing the @@ -409,6 +453,8 @@ false), while all other repositories are assumed to be bare (bare core.worktree:: Set the path to the root of the working tree. + If GIT_COMMON_DIR environment variable is set, core.worktree + is ignored and not used for determining the root of working tree. This can be overridden by the GIT_WORK_TREE environment variable and the '--work-tree' command-line option. The value can be an absolute path or relative to the path to @@ -474,9 +520,9 @@ core.compression:: -1 is the zlib default. 0 means no compression, and 1..9 are various speed/size tradeoffs, 9 being slowest. If set, this provides a default to other compression variables, - such as 'core.loosecompression' and 'pack.compression'. + such as 'core.looseCompression' and 'pack.compression'. -core.loosecompression:: +core.looseCompression:: An integer -1..9, indicating the compression level for objects that are not in a pack file. -1 is the zlib default. 0 means no compression, and 1..9 are various speed/size tradeoffs, 9 being @@ -537,7 +583,7 @@ be delta compressed, but larger binary media files won't be. + Common unit suffixes of 'k', 'm', or 'g' are supported. -core.excludesfile:: +core.excludesFile:: In addition to '.gitignore' (per-directory) and '.git/info/exclude', Git looks into this file for patterns of files which are not meant to be tracked. "`~/`" is expanded @@ -546,7 +592,7 @@ core.excludesfile:: If $XDG_CONFIG_HOME is either not set or empty, $HOME/.config/git/ignore is used instead. See linkgit:gitignore[5]. -core.askpass:: +core.askPass:: Some commands (e.g. svn and http interfaces) that interactively ask for a password can be told to use an external program given via the value of this variable. Can be overridden by the 'GIT_ASKPASS' @@ -555,11 +601,11 @@ core.askpass:: prompt. The external program shall be given a suitable prompt as command-line argument and write the password on its STDOUT. -core.attributesfile:: +core.attributesFile:: In addition to '.gitattributes' (per-directory) and '.git/info/attributes', Git looks into this file for attributes (see linkgit:gitattributes[5]). Path expansions are made the same - way as for `core.excludesfile`. Its default value is + way as for `core.excludesFile`. Its default value is $XDG_CONFIG_HOME/git/attributes. If $XDG_CONFIG_HOME is either not set or empty, $HOME/.config/git/attributes is used instead. @@ -569,7 +615,7 @@ core.editor:: variable when it is set, and the environment variable `GIT_EDITOR` is not set. See linkgit:git-var[1]. -core.commentchar:: +core.commentChar:: Commands such as `commit` and `tag` that lets you edit messages consider a line that begins with this character commented, and removes them after the editor returns @@ -578,6 +624,12 @@ core.commentchar:: If set to "auto", `git-commit` would select a character that is not the beginning character of any line in existing commit messages. +core.packedRefsTimeout:: + The length of time, in milliseconds, to retry when trying to + lock the `packed-refs` file. Value 0 means not to retry at + all; -1 means to try indefinitely. Default is 1000 (i.e., + retry for 1 second). + sequence.editor:: Text editor used by `git rebase -i` for editing the rebase instruction file. The value is meant to be interpreted by the shell when it is used. @@ -638,7 +690,7 @@ core.whitespace:: is relevant for `indent-with-non-tab` and when Git fixes `tab-in-indent` errors. The default tab width is 8. Allowed values are 1 to 63. -core.fsyncobjectfiles:: +core.fsyncObjectFiles:: This boolean will enable 'fsync()' when writing object files. + This is a total waste of time and effort on a filesystem that orders @@ -646,7 +698,7 @@ data writes properly, but can be useful for filesystems that do not use journalling (traditional UNIX filesystems) or that only journal metadata and not file contents (OS X's HFS+, or Linux ext3 with "data=writeback"). -core.preloadindex:: +core.preloadIndex:: Enable parallel index preload for operations like 'git diff' + This can speed up operations like 'git diff' and 'git status' especially @@ -717,7 +769,7 @@ am.keepcr:: by giving '--no-keep-cr' from the command line. See linkgit:git-am[1], linkgit:git-mailsplit[1]. -apply.ignorewhitespace:: +apply.ignoreWhitespace:: When set to 'change', tells 'git apply' to ignore changes in whitespace, in the same way as the '--ignore-space-change' option. @@ -729,7 +781,7 @@ apply.whitespace:: Tells 'git apply' how to handle whitespaces, in the same way as the '--whitespace' option. See linkgit:git-apply[1]. -branch.autosetupmerge:: +branch.autoSetupMerge:: Tells 'git branch' and 'git checkout' to set up new branches so that linkgit:git-pull[1] will appropriately merge from the starting point branch. Note that even if this option is not set, @@ -741,7 +793,7 @@ branch.autosetupmerge:: local branch or remote-tracking branch. This option defaults to true. -branch.autosetuprebase:: +branch.autoSetupRebase:: When a new branch is created with 'git branch' or 'git checkout' that tracks another branch, this variable tells Git to set up pull to rebase instead of merge (see "branch.<name>.rebase"). @@ -752,27 +804,27 @@ branch.autosetuprebase:: remote-tracking branches. When `always`, rebase will be set to true for all tracking branches. - See "branch.autosetupmerge" for details on how to set up a + See "branch.autoSetupMerge" for details on how to set up a branch to track another branch. This option defaults to never. branch.<name>.remote:: When on branch <name>, it tells 'git fetch' and 'git push' which remote to fetch from/push to. The remote to push to - may be overridden with `remote.pushdefault` (for all branches). + may be overridden with `remote.pushDefault` (for all branches). The remote to push to, for the current branch, may be further - overridden by `branch.<name>.pushremote`. If no remote is + overridden by `branch.<name>.pushRemote`. If no remote is configured, or if you are not on any branch, it defaults to - `origin` for fetching and `remote.pushdefault` for pushing. + `origin` for fetching and `remote.pushDefault` for pushing. Additionally, `.` (a period) is the current local repository (a dot-repository), see `branch.<name>.merge`'s final note below. -branch.<name>.pushremote:: +branch.<name>.pushRemote:: When on branch <name>, it overrides `branch.<name>.remote` for - pushing. It also overrides `remote.pushdefault` for pushing + pushing. It also overrides `remote.pushDefault` for pushing from branch <name>. When you pull from one place (e.g. your upstream) and push to another place (e.g. your own publishing - repository), you would want to set `remote.pushdefault` to + repository), you would want to set `remote.pushDefault` to specify the remote to push to for all branches, and use this option to override it for a specific branch. @@ -794,7 +846,7 @@ branch.<name>.merge:: branch.<name>.merge to the desired branch, and use the relative path setting `.` (a period) for branch.<name>.remote. -branch.<name>.mergeoptions:: +branch.<name>.mergeOptions:: Sets default options for merging into branch <name>. The syntax and supported options are the same as those of linkgit:git-merge[1], but option values containing whitespace characters are currently not @@ -846,20 +898,6 @@ color.branch.<slot>:: `remote` (a remote-tracking branch in refs/remotes/), `upstream` (upstream tracking branch), `plain` (other refs). -+ -The value for these configuration variables is a list of colors (at most -two) and attributes (at most one), separated by spaces. The colors -accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, -`magenta`, `cyan` and `white`; the attributes are `bold`, `dim`, `ul`, -`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. Attributes may be turned off specifically by prefixing -them with `no` (e.g., `noreverse`, `noul`, etc). -+ -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). If your terminal supports it, you may also -specify 24-bit RGB values as hex, like `#ff0ab3`. color.diff:: Whether to use ANSI escape sequences to add color to patches. @@ -879,8 +917,7 @@ color.diff.<slot>:: of `plain` (context text), `meta` (metainformation), `frag` (hunk header), 'func' (function in hunk header), `old` (removed lines), `new` (added lines), `commit` (commit headers), or `whitespace` - (highlighting whitespace errors). The values of these variables may be - specified as in color.branch.<slot>. + (highlighting whitespace errors). color.decorate.<slot>:: Use customized color for 'git log --decorate' output. `<slot>` is one @@ -917,8 +954,6 @@ color.grep.<slot>:: separators between fields on a line (`:`, `-`, and `=`) and between hunks (`--`) -- -+ -The values of these variables may be specified as in color.branch.<slot>. color.interactive:: When set to `always`, always use colors for interactive prompts @@ -931,14 +966,13 @@ color.interactive.<slot>:: Use customized color for 'git add --interactive' and 'git clean --interactive' output. `<slot>` may be `prompt`, `header`, `help` or `error`, for four distinct types of normal output from - interactive commands. The values of these variables may be - specified as in color.branch.<slot>. + interactive commands. color.pager:: A boolean to enable/disable colored output when the pager is in use (default is true). -color.showbranch:: +color.showBranch:: A boolean to enable/disable color in the output of linkgit:git-show-branch[1]. May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which case colors are used @@ -956,10 +990,10 @@ color.status.<slot>:: `added` or `updated` (files which are added but not committed), `changed` (files which are changed but not added in the index), `untracked` (files which are not tracked by Git), - `branch` (the current branch), or + `branch` (the current branch), `nobranch` (the color the 'no branch' warning is shown in, defaulting - to red). The values of these variables may be specified as in - color.branch.<slot>. + to red), or + `unmerged` (files which have unmerged changes). color.ui:: This variable determines the default value for variables such @@ -1038,7 +1072,7 @@ commit.cleanup:: have to remove the help lines that begin with `#` in the commit log template yourself, if you do this). -commit.gpgsign:: +commit.gpgSign:: A boolean to specify whether all commits should be GPG signed. Use of this option when doing operations such as rebase can @@ -1151,7 +1185,7 @@ format.cc:: by mail. See the --to and --cc options in linkgit:git-format-patch[1]. -format.subjectprefix:: +format.subjectPrefix:: The default for format-patch is to output files with the '[PATCH]' subject prefix. Use this variable to change that prefix. @@ -1161,7 +1195,7 @@ format.signature:: Set this variable to the empty string ("") to suppress signature generation. -format.signaturefile:: +format.signatureFile:: Works just like format.signature except the contents of the file specified by this variable will be used as the signature. @@ -1185,7 +1219,7 @@ format.thread:: A true boolean value is the same as `shallow`, and a false value disables threading. -format.signoff:: +format.signOff:: A boolean value which lets you enable the `-s/--signoff` option of format-patch by default. *Note:* Adding the Signed-off-by: line to a patch should be a conscious act and means that you certify you have @@ -1224,17 +1258,17 @@ gc.auto:: light-weight garbage collection from time to time. The default value is 6700. Setting this to 0 disables it. -gc.autopacklimit:: +gc.autoPackLimit:: When there are more than this many packs that are not marked with `*.keep` file in the repository, `git gc --auto` consolidates them into one larger pack. The default value is 50. Setting this to 0 disables it. -gc.autodetach:: +gc.autoDetach:: Make `git gc --auto` return immediately and run in background if the system supports it. Default is true. -gc.packrefs:: +gc.packRefs:: Running `git pack-refs` in a repository renders it unclonable by Git versions prior to 1.5.1.2 over dumb transports such as HTTP. This variable determines whether @@ -1242,38 +1276,45 @@ gc.packrefs:: to enable it within all non-bare repos or it can be set to a boolean value. The default is `true`. -gc.pruneexpire:: +gc.pruneExpire:: When 'git gc' is run, it will call 'prune --expire 2.weeks.ago'. Override the grace period with this config variable. The value "now" may be used to disable this grace period and always prune unreachable objects immediately. -gc.reflogexpire:: -gc.<pattern>.reflogexpire:: +gc.pruneWorktreesExpire:: + When 'git gc' is run, it will call + 'prune --worktrees --expire 3.months.ago'. + Override the grace period with this config variable. The value + "now" may be used to disable the grace period and prune + $GIT_DIR/worktrees immediately. + +gc.reflogExpire:: +gc.<pattern>.reflogExpire:: 'git reflog expire' removes reflog entries older than this time; defaults to 90 days. With "<pattern>" (e.g. "refs/stash") in the middle the setting applies only to the refs that match the <pattern>. -gc.reflogexpireunreachable:: -gc.<ref>.reflogexpireunreachable:: +gc.reflogExpireUnreachable:: +gc.<ref>.reflogExpireUnreachable:: 'git reflog expire' removes reflog entries older than this time and are not reachable from the current tip; defaults to 30 days. With "<pattern>" (e.g. "refs/stash") in the middle, the setting applies only to the refs that match the <pattern>. -gc.rerereresolved:: +gc.rerereResolved:: Records of conflicted merge you resolved earlier are kept for this many days when 'git rerere gc' is run. The default is 60 days. See linkgit:git-rerere[1]. -gc.rerereunresolved:: +gc.rerereUnresolved:: Records of conflicted merge you have not resolved are kept for this many days when 'git rerere gc' is run. The default is 15 days. See linkgit:git-rerere[1]. -gitcvs.commitmsgannotation:: +gitcvs.commitMsgAnnotation:: Append this string to each commit message. Set to empty string to disable this feature. Defaults to "via git-CVS emulator". @@ -1281,7 +1322,7 @@ gitcvs.enabled:: Whether the CVS server interface is enabled for this repository. See linkgit:git-cvsserver[1]. -gitcvs.logfile:: +gitcvs.logFile:: Path to a log file where the CVS server interface well... logs various stuff. See linkgit:git-cvsserver[1]. @@ -1293,10 +1334,10 @@ gitcvs.usecrlfattr:: treat it as text. If they suppress text conversion, the file will be set with '-kb' mode, which suppresses any newline munging the client might otherwise do. If the attributes do not allow - the file type to be determined, then 'gitcvs.allbinary' is + the file type to be determined, then 'gitcvs.allBinary' is used. See linkgit:gitattributes[5]. -gitcvs.allbinary:: +gitcvs.allBinary:: This is used if 'gitcvs.usecrlfattr' does not resolve the correct '-kb' mode to use. If true, all unresolved files are sent to the client in @@ -1306,7 +1347,7 @@ gitcvs.allbinary:: then the contents of the file are examined to decide if it is binary, similar to 'core.autocrlf'. -gitcvs.dbname:: +gitcvs.dbName:: Database used by git-cvsserver to cache revision information derived from the Git repository. The exact meaning depends on the used database driver, for SQLite (which is the default driver) this @@ -1314,7 +1355,7 @@ gitcvs.dbname:: linkgit:git-cvsserver[1] for details). May not contain semicolons (`;`). Default: '%Ggitcvs.%m.sqlite' -gitcvs.dbdriver:: +gitcvs.dbDriver:: Used Perl DBI driver. You can specify any available driver for this here, but it might not work. git-cvsserver is tested with 'DBD::SQLite', reported to work with 'DBD::Pg', and @@ -1322,10 +1363,10 @@ gitcvs.dbdriver:: May not contain double colons (`:`). Default: 'SQLite'. See linkgit:git-cvsserver[1]. -gitcvs.dbuser, gitcvs.dbpass:: - Database user and password. Only useful if setting 'gitcvs.dbdriver', +gitcvs.dbUser, gitcvs.dbPass:: + Database user and password. Only useful if setting 'gitcvs.dbDriver', since SQLite has no concept of database users and/or passwords. - 'gitcvs.dbuser' supports variable substitution (see + 'gitcvs.dbUser' supports variable substitution (see linkgit:git-cvsserver[1] for details). gitcvs.dbTableNamePrefix:: @@ -1336,7 +1377,7 @@ gitcvs.dbTableNamePrefix:: characters will be replaced with underscores. All gitcvs variables except for 'gitcvs.usecrlfattr' and -'gitcvs.allbinary' can also be specified as +'gitcvs.allBinary' can also be specified as 'gitcvs.<access_method>.<varname>' (where 'access_method' is one of "ext" and "pserver") to make them apply only for the given access method. @@ -1354,7 +1395,7 @@ gitweb.highlight:: gitweb.patches:: gitweb.pickaxe:: gitweb.remote_heads:: -gitweb.showsizes:: +gitweb.showSizes:: gitweb.snapshot:: See linkgit:gitweb.conf[5] for description. @@ -1383,15 +1424,15 @@ gpg.program:: signed, and the program is expected to send the result to its standard output. -gui.commitmsgwidth:: +gui.commitMsgWidth:: Defines how wide the commit message window is in the linkgit:git-gui[1]. "75" is the default. -gui.diffcontext:: +gui.diffContext:: Specifies how many context lines should be used in calls to diff made by the linkgit:git-gui[1]. The default is "5". -gui.displayuntracked:: +gui.displayUntracked:: Determines if linkgit::git-gui[1] shows untracked files in the file list. The default is "true". @@ -1403,16 +1444,16 @@ gui.encoding:: If this option is not set, the tools default to the locale encoding. -gui.matchtrackingbranch:: +gui.matchTrackingBranch:: Determines if new branches created with linkgit:git-gui[1] should default to tracking remote branches with matching names or not. Default: "false". -gui.newbranchtemplate:: +gui.newBranchTemplate:: Is used as suggested name when creating new branches using the linkgit:git-gui[1]. -gui.pruneduringfetch:: +gui.pruneDuringFetch:: "true" if linkgit:git-gui[1] should prune remote-tracking branches when performing a fetch. The default value is "false". @@ -1420,17 +1461,17 @@ gui.trustmtime:: Determines if linkgit:git-gui[1] should trust the file modification timestamp or not. By default the timestamps are not trusted. -gui.spellingdictionary:: +gui.spellingDictionary:: Specifies the dictionary used for spell checking commit messages in the linkgit:git-gui[1]. When set to "none" spell checking is turned off. -gui.fastcopyblame:: +gui.fastCopyBlame:: If true, 'git gui blame' uses `-C` instead of `-C -C` for original location detection. It makes blame significantly faster on huge repositories at the expense of less thorough copy detection. -gui.copyblamethreshold:: +gui.copyBlameThreshold:: Specifies the threshold to use in 'git gui blame' original location detection, measured in alphanumeric characters. See the linkgit:git-blame[1] manual for more information on copy detection. @@ -1450,22 +1491,22 @@ guitool.<name>.cmd:: 'FILENAME', and the name of the current branch as 'CUR_BRANCH' (if the head is detached, 'CUR_BRANCH' is empty). -guitool.<name>.needsfile:: +guitool.<name>.needsFile:: Run the tool only if a diff is selected in the GUI. It guarantees that 'FILENAME' is not empty. -guitool.<name>.noconsole:: +guitool.<name>.noConsole:: Run the command silently, without creating a window to display its output. -guitool.<name>.norescan:: +guitool.<name>.noRescan:: Don't rescan the working directory for changes after the tool finishes execution. guitool.<name>.confirm:: Show a confirmation dialog before actually running the tool. -guitool.<name>.argprompt:: +guitool.<name>.argPrompt:: Request a string argument from the user, and pass it to the tool through the 'ARGS' environment variable. Since requesting an argument implies confirmation, the 'confirm' option has no effect @@ -1473,13 +1514,13 @@ guitool.<name>.argprompt:: the dialog uses a built-in generic prompt; otherwise the exact value of the variable is used. -guitool.<name>.revprompt:: +guitool.<name>.revPrompt:: Request a single valid revision from the user, and set the 'REVISION' environment variable. In other aspects this option - is similar to 'argprompt', and can be used together with it. + is similar to 'argPrompt', and can be used together with it. -guitool.<name>.revunmerged:: - Show only unmerged branches in the 'revprompt' subdialog. +guitool.<name>.revUnmerged:: + Show only unmerged branches in the 'revPrompt' subdialog. This is useful for tools similar to merge or rebase, but not for things like checkout or reset. @@ -1489,7 +1530,7 @@ guitool.<name>.title:: guitool.<name>.prompt:: Specifies the general prompt string to display at the top of - the dialog, before subsections for 'argprompt' and 'revprompt'. + the dialog, before subsections for 'argPrompt' and 'revPrompt'. The default value includes the actual command. help.browser:: @@ -1501,7 +1542,7 @@ help.format:: Values 'man', 'info', 'web' and 'html' are supported. 'man' is the default. 'web' and 'html' are the same. -help.autocorrect:: +help.autoCorrect:: Automatically correct and execute mistyped commands after waiting for the given number of deciseconds (0.1 sec). If more than one command can be deduced from the entered text, nothing @@ -1510,7 +1551,7 @@ help.autocorrect:: value is 0 - the command will be just shown but not executed. This is the default. -help.htmlpath:: +help.htmlPath:: Specify the path where the HTML documentation resides. File system paths and URLs are supported. HTML pages will be prefixed with this path when help is displayed in the 'web' format. This defaults to the documentation @@ -1522,17 +1563,30 @@ http.proxy:: `curl(1)`). This can be overridden on a per-remote basis; see remote.<name>.proxy -http.cookiefile:: +http.cookieFile:: File containing previously stored cookie lines which should be used in the Git http session, if they match the server. The file format of the file to read cookies from should be plain HTTP headers or the Netscape/Mozilla cookie file format (see linkgit:curl[1]). - NOTE that the file specified with http.cookiefile is only used as + NOTE that the file specified with http.cookieFile is only used as input unless http.saveCookies is set. -http.savecookies:: +http.saveCookies:: If set, store cookies received during requests to the file specified by - http.cookiefile. Has no effect if http.cookiefile is unset. + http.cookieFile. Has no effect if http.cookieFile is unset. + +http.sslCipherList:: + A list of SSL ciphers to use when negotiating an SSL connection. + The available ciphers depend on whether libcurl was built against + NSS or OpenSSL and the particular configuration of the crypto + library in use. Internally this sets the 'CURLOPT_SSL_CIPHER_LIST' + option; see the libcurl documentation for more details on the format + of this list. ++ +Can be overridden by the 'GIT_SSL_CIPHER_LIST' environment variable. +To force git to use libcurl's default cipher list and ignore any +explicit http.sslCipherList option, set 'GIT_SSL_CIPHER_LIST' to the +empty string. http.sslVerify:: Whether to verify the SSL certificate when fetching or pushing @@ -1603,7 +1657,7 @@ http.noEPSV:: support EPSV mode. Can be overridden by the 'GIT_CURL_FTP_NO_EPSV' environment variable. Default is false (curl will use EPSV). -http.useragent:: +http.userAgent:: The HTTP USER_AGENT string presented to an HTTP server. The default value represents the version of the client Git such as git/1.7.1. This option allows you to override this value to a more common value @@ -1676,7 +1730,7 @@ index.version:: Specify the version with which new index files should be initialized. This does not affect existing repositories. -init.templatedir:: +init.templateDir:: Specify the directory from which templates will be copied. (See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].) @@ -1692,7 +1746,7 @@ instaweb.local:: If true the web server started by linkgit:git-instaweb[1] will be bound to the local IP (127.0.0.1). -instaweb.modulepath:: +instaweb.modulePath:: The default module path for linkgit:git-instaweb[1] to use instead of /usr/lib/apache2/modules. Only used if httpd is Apache. @@ -1701,7 +1755,7 @@ instaweb.port:: The port number to bind the gitweb httpd to. See linkgit:git-instaweb[1]. -interactive.singlekey:: +interactive.singleKey:: In interactive commands, allow the user to provide one-letter input with a single key (i.e., without hitting enter). Currently this is used by the `--patch` mode of @@ -1729,7 +1783,7 @@ log.decorate:: specified, the full ref name (including prefix) will be printed. This is the same as the log commands '--decorate' option. -log.showroot:: +log.showRoot:: If true, the initial commit will be shown as a big creation event. This is equivalent to a diff against an empty tree. Tools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which @@ -1966,7 +2020,7 @@ pack.useBitmaps:: true. You should not generally need to turn this off unless you are debugging pack bitmaps. -pack.writebitmaps (deprecated):: +pack.writeBitmaps (deprecated):: This is a deprecated synonym for `repack.writeBitmaps`. pack.writeBitmapHashCache:: @@ -2007,7 +2061,7 @@ pull.ff:: a case (equivalent to giving the `--no-ff` option from the command line). When set to `only`, only such fast-forward merges are allowed (equivalent to giving the `--ff-only` option from the - command line). + command line). This setting overrides `merge.ff` when pulling. pull.rebase:: When true, rebase branches on top of the fetched branch, instead @@ -2085,14 +2139,20 @@ new default). -- +push.followTags:: + If set to true enable '--follow-tags' option by default. You + may override this configuration at time of push by specifying + '--no-follow-tags'. + + rebase.stat:: Whether to show a diffstat of what changed upstream since the last rebase. False by default. -rebase.autosquash:: +rebase.autoSquash:: If set to true enable '--autosquash' option by default. -rebase.autostash:: +rebase.autoStash:: When set to true, automatically create a temporary stash before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. @@ -2100,7 +2160,7 @@ rebase.autostash:: successful rebase might result in non-trivial conflicts. Defaults to false. -receive.advertiseatomic:: +receive.advertiseAtomic:: By default, git-receive-pack will advertise the atomic push capability to its clients. If you don't want to this capability to be advertised, set this variable to false. @@ -2110,13 +2170,13 @@ receive.autogc:: receiving data from git-push and updating refs. You can stop it by setting this variable to false. -receive.certnonceseed:: +receive.certNonceSeed:: By setting this variable to a string, `git receive-pack` will accept a `git push --signed` and verifies it by using a "nonce" protected by HMAC using this string as a secret key. -receive.certnonceslop:: +receive.certNonceSlop:: When a `git push --signed` sent a push certificate with a "nonce" that was issued by a receive-pack serving the same repository within this many seconds, export the "nonce" @@ -2180,7 +2240,7 @@ receive.denyNonFastForwards:: even if that push is forced. This configuration variable is set when initializing a shared repository. -receive.hiderefs:: +receive.hideRefs:: String(s) `receive-pack` uses to decide which refs to omit from its initial advertisement. Use more than one definitions to specify multiple prefix strings. A ref that @@ -2189,18 +2249,18 @@ receive.hiderefs:: push`, and an attempt to update or delete a hidden ref by `git push` is rejected. -receive.updateserverinfo:: +receive.updateServerInfo:: If set to true, git-receive-pack will run git-update-server-info after receiving data from git-push and updating refs. -receive.shallowupdate:: +receive.shallowUpdate:: If set to true, .git/shallow can be updated when new refs require new shallow roots. Otherwise those refs are rejected. -remote.pushdefault:: +remote.pushDefault:: The remote to push to by default. Overrides `branch.<name>.remote` for all branches, and is overridden by - `branch.<name>.pushremote` for specific branches. + `branch.<name>.pushRemote` for specific branches. remote.<name>.url:: The URL of a remote repository. See linkgit:git-fetch[1] or @@ -2238,18 +2298,18 @@ remote.<name>.skipFetchAll:: remote.<name>.receivepack:: The default program to execute on the remote side when pushing. See - option \--receive-pack of linkgit:git-push[1]. + option --receive-pack of linkgit:git-push[1]. remote.<name>.uploadpack:: The default program to execute on the remote side when fetching. See - option \--upload-pack of linkgit:git-fetch-pack[1]. + option --upload-pack of linkgit:git-fetch-pack[1]. -remote.<name>.tagopt:: - Setting this value to \--no-tags disables automatic tag following when - fetching from remote <name>. Setting it to \--tags will fetch every +remote.<name>.tagOpt:: + Setting this value to --no-tags disables automatic tag following when + fetching from remote <name>. Setting it to --tags will fetch every tag from remote <name>, even if they are not reachable from remote branch heads. Passing these flags directly to linkgit:git-fetch[1] can - override this setting. See options \--tags and \--no-tags of + override this setting. See options --tags and --no-tags of linkgit:git-fetch[1]. remote.<name>.vcs:: @@ -2266,7 +2326,7 @@ remotes.<group>:: The list of remotes which are fetched by "git remote update <group>". See linkgit:git-remote[1]. -repack.usedeltabaseoffset:: +repack.useDeltaBaseOffset:: By default, linkgit:git-repack[1] creates packs that use delta-base offset. If you need to share your repository with Git older than version 1.4.4, either directly or via a dumb @@ -2289,7 +2349,7 @@ repack.writeBitmaps:: space and extra time spent on the initial repack. Defaults to false. -rerere.autoupdate:: +rerere.autoUpdate:: When set to true, `git-rerere` updates the index with the resulting contents after it cleanly resolves conflicts using previously recorded resolution. Defaults to false. @@ -2308,12 +2368,12 @@ sendemail.identity:: values in the 'sendemail' section. The default identity is the value of 'sendemail.identity'. -sendemail.smtpencryption:: +sendemail.smtpEncryption:: See linkgit:git-send-email[1] for description. Note that this setting is not subject to the 'identity' mechanism. sendemail.smtpssl (deprecated):: - Deprecated alias for 'sendemail.smtpencryption = ssl'. + Deprecated alias for 'sendemail.smtpEncryption = ssl'. sendemail.smtpsslcertpath:: Path to ca-certificates (either a directory or a single file). @@ -2325,29 +2385,29 @@ sendemail.<identity>.*:: identity is selected, through command-line or 'sendemail.identity'. -sendemail.aliasesfile:: -sendemail.aliasfiletype:: +sendemail.aliasesFile:: +sendemail.aliasFileType:: sendemail.annotate:: sendemail.bcc:: sendemail.cc:: -sendemail.cccmd:: -sendemail.chainreplyto:: +sendemail.ccCmd:: +sendemail.chainReplyTo:: sendemail.confirm:: -sendemail.envelopesender:: +sendemail.envelopeSender:: sendemail.from:: -sendemail.multiedit:: +sendemail.multiEdit:: sendemail.signedoffbycc:: -sendemail.smtppass:: +sendemail.smtpPass:: sendemail.suppresscc:: -sendemail.suppressfrom:: +sendemail.suppressFrom:: sendemail.to:: -sendemail.smtpdomain:: -sendemail.smtpserver:: -sendemail.smtpserverport:: -sendemail.smtpserveroption:: -sendemail.smtpuser:: +sendemail.smtpDomain:: +sendemail.smtpServer:: +sendemail.smtpServerPort:: +sendemail.smtpServerOption:: +sendemail.smtpUser:: sendemail.thread:: -sendemail.transferencoding:: +sendemail.transferEncoding:: sendemail.validate:: sendemail.xmailer:: See linkgit:git-send-email[1] for description. @@ -2399,7 +2459,7 @@ If this variable is not specified, it defaults to 'normal'. This variable can be overridden with the -u|--untracked-files option of linkgit:git-status[1] and linkgit:git-commit[1]. -status.submodulesummary:: +status.submoduleSummary:: Defaults to false. If this is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled and a @@ -2474,9 +2534,9 @@ transfer.fsckObjects:: not set, the value of this variable is used instead. Defaults to false. -transfer.hiderefs:: - This variable can be used to set both `receive.hiderefs` - and `uploadpack.hiderefs` at the same time to the same +transfer.hideRefs:: + This variable can be used to set both `receive.hideRefs` + and `uploadpack.hideRefs` at the same time to the same values. See entries for these other variables. transfer.unpackLimit:: @@ -2491,7 +2551,7 @@ uploadarchive.allowUnreachable:: linkgit:git-upload-archive[1] for more details. Defaults to `false`. -uploadpack.hiderefs:: +uploadpack.hideRefs:: String(s) `upload-pack` uses to decide which refs to omit from its initial advertisement. Use more than one definitions to specify multiple prefix strings. A ref that @@ -2501,12 +2561,12 @@ uploadpack.hiderefs:: fetch` will fail. See also `uploadpack.allowtipsha1inwant`. uploadpack.allowtipsha1inwant:: - When `uploadpack.hiderefs` is in effect, allow `upload-pack` + When `uploadpack.hideRefs` is in effect, allow `upload-pack` to accept a fetch request that asks for an object at the tip of a hidden ref (by default, such a request is rejected). - see also `uploadpack.hiderefs`. + see also `uploadpack.hideRefs`. -uploadpack.keepalive:: +uploadpack.keepAlive:: When `upload-pack` has started `pack-objects`, there may be a quiet period while `pack-objects` prepares the pack. Normally it would output progress information, but if `--quiet` was used @@ -2514,7 +2574,7 @@ uploadpack.keepalive:: the pack data begins. Some clients and networks may consider the server to be hung and give up. Setting this option instructs `upload-pack` to send an empty keepalive packet every - `uploadpack.keepalive` seconds. Setting this option to 0 + `uploadpack.keepAlive` seconds. Setting this option to 0 disables keepalive packets entirely. The default is 5 seconds. url.<base>.insteadOf:: @@ -2551,13 +2611,25 @@ user.name:: Can be overridden by the 'GIT_AUTHOR_NAME' and 'GIT_COMMITTER_NAME' environment variables. See linkgit:git-commit-tree[1]. -user.signingkey:: +user.signingKey:: If linkgit:git-tag[1] or linkgit:git-commit[1] is not selecting the key you want it to automatically when creating a signed tag or commit, you can override the default selection with this variable. This option is passed unchanged to gpg's --local-user parameter, so you may specify a key using any method that gpg supports. +versionsort.prereleaseSuffix:: + When version sort is used in linkgit:git-tag[1], prerelease + tags (e.g. "1.0-rc1") may appear after the main release + "1.0". By specifying the suffix "-rc" in this variable, + "1.0-rc1" will appear before "1.0". ++ +This variable can be specified multiple times, once per suffix. The +order of suffixes in the config file determines the sorting order +(e.g. if "-pre" appears before "-rc" in the config file then 1.0-preXX +is sorted before 1.0-rcXX). The sorting order between different +suffixes is undefined if they are in multiple config files. + web.browser:: Specify a web browser that may be used by some commands. Currently only linkgit:git-instaweb[1] and linkgit:git-help[1] diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index b001779..6eaa452 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -1,4 +1,4 @@ -diff.autorefreshindex:: +diff.autoRefreshIndex:: When using 'git diff' to compare with work tree files, do not consider stat-only change as changed. Instead, silently run `git update-index --refresh` to @@ -75,11 +75,11 @@ diff.ignoreSubmodules:: commands such as 'git diff-files'. 'git checkout' also honors this setting when reporting uncommitted changes. Setting it to 'all' disables the submodule summary normally shown by 'git commit' - and 'git status' when 'status.submodulesummary' is set unless it is + and 'git status' when 'status.submoduleSummary' is set unless it is overridden by using the --ignore-submodules command-line option. The 'git submodule' commands are not affected by this setting. -diff.mnemonicprefix:: +diff.mnemonicPrefix:: If set, 'git diff' uses a prefix pair that is different from the standard "a/" and "b/" depending on what is being compared. When this configuration is in effect, reverse diff output also swaps @@ -98,7 +98,7 @@ diff.mnemonicprefix:: diff.noprefix:: If set, 'git diff' does not show any source or destination prefix. -diff.orderfile:: +diff.orderFile:: File indicating how to order files within a diff, using one shell glob pattern per line. Can be overridden by the '-O' option to linkgit:git-diff[1]. @@ -148,7 +148,7 @@ diff.<driver>.textconv:: conversion is used to generate a human-readable diff. See linkgit:gitattributes[5] for details. -diff.<driver>.wordregex:: +diff.<driver>.wordRegex:: The regular expression that the diff driver should use to split words in a line. See linkgit:gitattributes[5] for details. diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt index 843a20b..bcf54da 100644 --- a/Documentation/diff-generate-patch.txt +++ b/Documentation/diff-generate-patch.txt @@ -77,7 +77,7 @@ combined diff format Any diff-generating command can take the `-c` or `--cc` option to produce a 'combined diff' when showing a merge. This is the default format when showing merges with linkgit:git-diff[1] or -linkgit:git-show[1]. Note also that you can give the `-m' option to any +linkgit:git-show[1]. Note also that you can give the `-m` option to any of these commands to force generation of diffs with individual parents of a merge. diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 6cb083a..b7c3afe 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -23,7 +23,9 @@ ifndef::git-format-patch[] -u:: --patch:: Generate patch (see section on generating patches). - {git-diff? This is the default.} +ifdef::git-diff[] + This is the default. +endif::git-diff[] endif::git-format-patch[] -s:: @@ -42,7 +44,9 @@ endif::git-format-patch[] ifndef::git-format-patch[] --raw:: Generate the raw format. - {git-diff-core? This is the default.} +ifdef::git-diff-core[] + This is the default. +endif::git-diff-core[] endif::git-format-patch[] ifndef::git-format-patch[] @@ -432,8 +436,8 @@ endif::git-format-patch[] -O<orderfile>:: Output the patch in the order specified in the <orderfile>, which has one shell glob pattern per line. - This overrides the `diff.orderfile` configuration variable - (see linkgit:git-config[1]). To cancel `diff.orderfile`, + This overrides the `diff.orderFile` configuration variable + (see linkgit:git-config[1]). To cancel `diff.orderFile`, use `-O/dev/null`. ifndef::git-format-patch[] diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index b09a783..45583d8 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -68,7 +68,7 @@ endif::git-pull[] By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following. The default - behavior for a remote may be specified with the remote.<name>.tagopt + behavior for a remote may be specified with the remote.<name>.tagOpt setting. See linkgit:git-config[1]. ifndef::git-pull[] diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 1c74907..fe5282f 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -93,7 +93,8 @@ This effectively runs `add --interactive`, but bypasses the initial command menu and directly jumps to the `patch` subcommand. See ``Interactive mode'' for details. --e, \--edit:: +-e:: +--edit:: Open the diff vs. the index in an editor and let the user edit it. After the editor was closed, adjust the hunk headers and apply the patch to the index. @@ -173,7 +174,7 @@ for "git add --no-all <pathspec>...", i.e. ignored removed files. Configuration ------------- -The optional configuration variable `core.excludesfile` indicates a path to a +The optional configuration variable `core.excludesFile` indicates a path to a file containing patterns of file names to exclude from git-add, similar to $GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to those in info/exclude. See linkgit:gitignore[5]. @@ -317,7 +318,7 @@ After deciding the fate for all hunks, if there is any hunk that was chosen, the index is updated with the selected hunks. + You can omit having to type return here, by setting the configuration -variable `interactive.singlekey` to `true`. +variable `interactive.singleKey` to `true`. diff:: diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index 9489664..d9ed6a1 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -242,7 +242,7 @@ has no effect when `--index` or `--cached` is in use. Configuration ------------- -apply.ignorewhitespace:: +apply.ignoreWhitespace:: Set to 'change' if you want changes in whitespace to be ignored by default. Set to one of: no, none, never, false if you want changes in whitespace to be significant. diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 311b336..359619b 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -51,7 +51,7 @@ When a local branch is started off a remote-tracking branch, Git sets up the branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` configuration entries) so that 'git pull' will appropriately merge from the remote-tracking branch. This behavior may be changed via the global -`branch.autosetupmerge` configuration flag. That setting can be +`branch.autoSetupMerge` configuration flag. That setting can be overridden by using the `--track` and `--no-track` options, and changed later using `git branch --set-upstream-to`. @@ -166,14 +166,14 @@ This option is only applicable in non-verbose mode. upstream when the new branch is checked out. + This behavior is the default when the start point is a remote-tracking branch. -Set the branch.autosetupmerge configuration variable to `false` if you +Set the branch.autoSetupMerge configuration variable to `false` if you want `git checkout` and `git branch` to always behave as if '--no-track' were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch. --no-track:: Do not set up "upstream" configuration, even if the - branch.autosetupmerge configuration variable is true. + branch.autoSetupMerge configuration variable is true. --set-upstream:: If specified branch does not exist yet or if `--force` has been diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt index f6a16f4..499ae7b 100644 --- a/Documentation/git-cat-file.txt +++ b/Documentation/git-cat-file.txt @@ -9,7 +9,7 @@ git-cat-file - Provide content or type and size information for repository objec SYNOPSIS -------- [verse] -'git cat-file' (-t | -s | -e | -p | <type> | --textconv ) <object> +'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv ) <object> 'git cat-file' (--batch | --batch-check) < <list-of-objects> DESCRIPTION @@ -69,6 +69,9 @@ OPTIONS not be combined with any other options or arguments. See the section `BATCH OUTPUT` below for details. +--allow-unknown-type:: + Allow -s or -t to query broken/corrupt objects of unknown type. + OUTPUT ------ If '-t' is specified, one of the <type>. diff --git a/Documentation/git-check-ignore.txt b/Documentation/git-check-ignore.txt index 788a011..e35cd04 100644 --- a/Documentation/git-check-ignore.txt +++ b/Documentation/git-check-ignore.txt @@ -72,7 +72,7 @@ matching pattern, <source> is the pattern's source file, and <linenum> is the line number of the pattern within that source. If the pattern contained a `!` prefix or `/` suffix, it will be preserved in the output. <source> will be an absolute path when referring to the file -configured by `core.excludesfile`, or relative to the repository root +configured by `core.excludesFile`, or relative to the repository root when referring to `.git/info/exclude` or a per-directory exclude file. If `-z` is specified, the pathnames in the output are delimited by the diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 33ad2ad..d263a56 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -144,7 +144,7 @@ explicitly give a name with '-b' in such a case. --no-track:: Do not set up "upstream" configuration, even if the - branch.autosetupmerge configuration variable is true. + branch.autoSetupMerge configuration variable is true. -l:: Create the new branch's reflog; see linkgit:git-branch[1] for @@ -210,7 +210,7 @@ the conflicted merge in the specified paths. --conflict=<style>:: The same as --merge option above, but changes the way the conflicting hunks are presented, overriding the - merge.conflictstyle configuration variable. Possible values are + merge.conflictStyle configuration variable. Possible values are "merge" (default) and "diff3" (in addition to what is shown by "merge" style, shows the original contents). @@ -225,6 +225,19 @@ This means that you can use `git checkout -p` to selectively discard edits from your current working tree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode. +--to=<path>:: + Check out a branch in a separate working directory at + `<path>`. A new working directory is linked to the current + repository, sharing everything except working directory + specific files such as HEAD, index... See "MULTIPLE WORKING + TREES" section for more information. + +--ignore-other-worktrees:: + `git checkout` refuses when the wanted ref is already checked + out by another worktree. This option makes it check the ref + out anyway. In other words, the ref can be held by more than one + worktree. + <branch>:: Branch to checkout; if it refers to a branch (i.e., a name that, when prepended with "refs/heads/", is a valid ref), then that @@ -388,6 +401,71 @@ $ git reflog -2 HEAD # or $ git log -g -2 HEAD ------------ +MULTIPLE WORKING TREES +---------------------- + +A git repository can support multiple working trees, allowing you to check +out more than one branch at a time. With `git checkout --to` a new working +tree is associated with the repository. This new working tree is called a +"linked working tree" as opposed to the "main working tree" prepared by "git +init" or "git clone". A repository has one main working tree (if it's not a +bare repository) and zero or more linked working trees. + +Each linked working tree has a private sub-directory in the repository's +$GIT_DIR/worktrees directory. The private sub-directory's name is usually +the base name of the linked working tree's path, possibly appended with a +number to make it unique. For example, when `$GIT_DIR=/path/main/.git` the +command `git checkout --to /path/other/test-next next` creates the linked +working tree in `/path/other/test-next` and also creates a +`$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` +if `test-next` is already taken). + +Within a linked working tree, $GIT_DIR is set to point to this private +directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and +$GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR +(e.g. `/path/main/.git`). These settings are made in a `.git` file located at +the top directory of the linked working tree. + +Path resolution via `git rev-parse --git-path` uses either +$GIT_DIR or $GIT_COMMON_DIR depending on the path. For example, in the +linked working tree `git rev-parse --git-path HEAD` returns +`/path/main/.git/worktrees/test-next/HEAD` (not +`/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git +rev-parse --git-path refs/heads/master` uses +$GIT_COMMON_DIR and returns `/path/main/.git/refs/heads/master`, +since refs are shared across all working trees. + +See linkgit:gitrepository-layout[5] for more information. The rule of +thumb is do not make any assumption about whether a path belongs to +$GIT_DIR or $GIT_COMMON_DIR when you need to directly access something +inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path. + +When you are done with a linked working tree you can simply delete it. +The working tree's entry in the repository's $GIT_DIR/worktrees +directory will eventually be removed automatically (see +`gc.pruneworktreesexpire` in linkgit::git-config[1]), or you can run +`git prune --worktrees` in the main or any linked working tree to +clean up any stale entries in $GIT_DIR/worktrees. + +If you move a linked working directory to another file system, or +within a file system that does not support hard links, you need to run +at least one git command inside the linked working directory +(e.g. `git status`) in order to update its entry in $GIT_DIR/worktrees +so that it does not get automatically removed. + +To prevent a $GIT_DIR/worktrees entry from from being pruned (which +can be useful in some situations, such as when the +entry's working tree is stored on a portable device), add a file named +'locked' to the entry's directory. The file contains the reason in +plain text. For example, if a linked working tree's `.git` file points +to `/path/main/.git/worktrees/test-next` then a file named +`/path/main/.git/worktrees/test-next/locked` will prevent the +`test-next` entry from being pruned. See +linkgit:gitrepository-layout[5] for details. + +Multiple checkout support for submodules is incomplete. It is NOT +recommended to make multiple checkouts of a superproject. + EXAMPLES -------- diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 1c03c79..1147c71 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -131,7 +131,8 @@ effect to your index in a row. --keep-redundant-commits:: If a commit being cherry picked duplicates a commit already in the current history, it will become empty. By default these - redundant commits are ignored. This option overrides that behavior and + redundant commits cause `cherry-pick` to stop so the user can + examine the commit. This option overrides that behavior and creates an empty commit object. Implies `--allow-empty`. --strategy=<strategy>:: diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt index a469eab..f5f2a8d 100644 --- a/Documentation/git-commit-tree.txt +++ b/Documentation/git-commit-tree.txt @@ -59,7 +59,7 @@ OPTIONS GPG-sign commit. --no-gpg-sign:: - Countermand `commit.gpgsign` configuration variable that is + Countermand `commit.gpgSign` configuration variable that is set to force each and every commit to be signed. diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 1e74b75..617dea0 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -180,8 +180,8 @@ OPTIONS + -- strip:: - Strip leading and trailing empty lines, trailing whitespace, and - #commentary and collapse consecutive empty lines. + Strip leading and trailing empty lines, trailing whitespace, + commentary and collapse consecutive empty lines. whitespace:: Same as `strip` except #commentary is not removed. verbatim:: @@ -282,8 +282,15 @@ configuration variable documented in linkgit:git-config[1]. --verbose:: Show unified diff between the HEAD commit and what would be committed at the bottom of the commit message - template. Note that this diff output doesn't have its - lines prefixed with '#'. + template to help the user describe the commit by reminding + what changes the commit has. + Note that this diff output doesn't have its + lines prefixed with '#'. This diff will not be a part + of the commit message. ++ +If specified twice, show in addition the unified diff between +what would be committed and the worktree files, i.e. the unstaged +changes to tracked files. -q:: --quiet:: @@ -310,7 +317,7 @@ configuration variable documented in linkgit:git-config[1]. GPG-sign commit. --no-gpg-sign:: - Countermand `commit.gpgsign` configuration variable that is + Countermand `commit.gpgSign` configuration variable that is set to force each and every commit to be signed. \--:: diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index 9dfa1a5..02ec096 100644 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@ -405,7 +405,7 @@ true % git config --bool --get-urlmatch http.sslverify https://weak.example.com false % git config --get-urlmatch http https://weak.example.com -http.cookiefile /tmp/cookie.txt +http.cookieFile /tmp/cookie.txt http.sslverify false ------------ diff --git a/Documentation/git-credential-store.txt b/Documentation/git-credential-store.txt index bc97071..e3c8f27 100644 --- a/Documentation/git-credential-store.txt +++ b/Documentation/git-credential-store.txt @@ -31,10 +31,41 @@ OPTIONS --file=<path>:: - Use `<path>` to store credentials. The file will have its + Use `<path>` to lookup and store credentials. The file will have its filesystem permissions set to prevent other users on the system from reading it, but will not be encrypted or otherwise - protected. Defaults to `~/.git-credentials`. + protected. If not specified, credentials will be searched for from + `~/.git-credentials` and `$XDG_CONFIG_HOME/git/credentials`, and + credentials will be written to `~/.git-credentials` if it exists, or + `$XDG_CONFIG_HOME/git/credentials` if it exists and the former does + not. See also <<FILES>>. + +[[FILES]] +FILES +----- + +If not set explicitly with '--file', there are two files where +git-credential-store will search for credentials in order of precedence: + +~/.git-credentials:: + User-specific credentials file. + +$XDG_CONFIG_HOME/git/credentials:: + Second user-specific credentials file. If '$XDG_CONFIG_HOME' is not set + or empty, `$HOME/.config/git/credentials` will be used. Any credentials + stored in this file will not be used if `~/.git-credentials` has a + matching credential as well. It is a good idea not to create this file + if you sometimes use older versions of Git that do not support it. + +For credential lookups, the files are read in the order given above, with the +first matching credential found taking precedence over credentials found in +files further down the list. + +Credential storage will by default write to the first existing file in the +list. If none of these files exist, `~/.git-credentials` will be created and +written to. + +When erasing credentials, matching credentials will be erased from all files. EXAMPLES -------- diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt index 4961f1a..db4d7a9 100644 --- a/Documentation/git-cvsserver.txt +++ b/Documentation/git-cvsserver.txt @@ -154,7 +154,7 @@ with CVS_SERVER (and shouldn't) as 'git-shell' understands `cvs` to mean [gitcvs] enabled=1 # optional for debugging - logfile=/path/to/logfile + logFile=/path/to/logfile ------ Note: you need to ensure each user that is going to invoke 'git-cvsserver' has @@ -254,14 +254,14 @@ Configuring database backend its documentation if changing these variables, especially about `DBI->connect()`. -gitcvs.dbname:: +gitcvs.dbName:: Database name. The exact meaning depends on the selected database driver, for SQLite this is a filename. Supports variable substitution (see below). May not contain semicolons (`;`). Default: '%Ggitcvs.%m.sqlite' -gitcvs.dbdriver:: +gitcvs.dbDriver:: Used DBI driver. You can specify any available driver for this here, but it might not work. cvsserver is tested with 'DBD::SQLite', reported to work with @@ -271,12 +271,12 @@ gitcvs.dbdriver:: Default: 'SQLite' gitcvs.dbuser:: - Database user. Only useful if setting `dbdriver`, since + Database user. Only useful if setting `dbDriver`, since SQLite has no concept of database users. Supports variable substitution (see below). -gitcvs.dbpass:: - Database password. Only useful if setting `dbdriver`, since +gitcvs.dbPass:: + Database password. Only useful if setting `dbDriver`, since SQLite has no concept of database passwords. gitcvs.dbTableNamePrefix:: @@ -288,7 +288,7 @@ All variables can also be set per access method, see <<configaccessmethod,above> Variable substitution ^^^^^^^^^^^^^^^^^^^^^ -In `dbdriver` and `dbuser` you can use the following variables: +In `dbDriver` and `dbUser` you can use the following variables: %G:: Git directory name @@ -413,16 +413,16 @@ about end-of-line conversion. Alternatively, if `gitcvs.usecrlfattr` config is not enabled or the attributes do not allow automatic detection for a filename, then -the server uses the `gitcvs.allbinary` config for the default setting. -If `gitcvs.allbinary` is set, then file not otherwise +the server uses the `gitcvs.allBinary` config for the default setting. +If `gitcvs.allBinary` is set, then file not otherwise specified will default to '-kb' mode. Otherwise the '-k' mode -is left blank. But if `gitcvs.allbinary` is set to "guess", then +is left blank. But if `gitcvs.allBinary` is set to "guess", then the correct '-k' mode will be guessed based on the contents of the file. For best consistency with 'cvs', it is probably best to override the defaults by setting `gitcvs.usecrlfattr` to true, -and `gitcvs.allbinary` to "guess". +and `gitcvs.allBinary` to "guess". Dependencies ------------ diff --git a/Documentation/git-fast-export.txt b/Documentation/git-fast-export.txt index 929e496..ed57c68 100644 --- a/Documentation/git-fast-export.txt +++ b/Documentation/git-fast-export.txt @@ -67,17 +67,17 @@ produced incorrect results if you gave these options. have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at completion, the same path can also be safely given to - \--import-marks. + --import-marks. The file will not be written if no new object has been marked/exported. --import-marks=<file>:: Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and - must use the same format as produced by \--export-marks. + must use the same format as produced by --export-marks. + Any commits that have already been marked will not be exported again. -If the backend uses a similar \--import-marks file, this allows for +If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs. diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index f71fb01..fd32895 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -42,13 +42,13 @@ OPTIONS --quiet:: Disable all non-fatal output, making fast-import silent when it is successful. This option disables the output shown by - \--stats. + --stats. --stats:: Display some basic statistics about the objects fast-import has created, the packfiles they were stored into, and the memory used by fast-import during this run. Showing this output - is currently the default, but can be disabled with \--quiet. + is currently the default, but can be disabled with --quiet. Options for Frontends ~~~~~~~~~~~~~~~~~~~~~ @@ -81,12 +81,12 @@ Locations of Marks Files have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at checkpoint (or completion) the same path can also be - safely given to \--import-marks. + safely given to --import-marks. --import-marks=<file>:: Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and - must use the same format as produced by \--export-marks. + must use the same format as produced by --export-marks. Multiple options may be supplied to import more than one set of marks. If a mark is defined to different values, the last file wins. @@ -179,8 +179,8 @@ fast-forward update, fast-import will skip updating that ref and instead prints a warning message. fast-import will always attempt to update all branch refs, and does not stop on the first failure. -Branch updates can be forced with \--force, but it's recommended that -this only be used on an otherwise quiet repository. Using \--force +Branch updates can be forced with --force, but it's recommended that +this only be used on an otherwise quiet repository. Using --force is not necessary for an initial import into an empty repository. @@ -231,11 +231,11 @@ Date Formats ~~~~~~~~~~~~ The following date formats are supported. A frontend should select the format it will use for this import by passing the format name -in the \--date-format=<fmt> command-line option. +in the --date-format=<fmt> command-line option. `raw`:: This is the Git native format and is `<time> SP <offutc>`. - It is also fast-import's default format, if \--date-format was + It is also fast-import's default format, if --date-format was not specified. + The time of the event is specified by `<time>` as the number of @@ -437,7 +437,7 @@ the email address from the other fields in the line. Note that of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded. The time of the change is specified by `<when>` using the date format -that was selected by the \--date-format=<fmt> command-line option. +that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax. @@ -507,10 +507,6 @@ omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge. -However Git's other tools never create commits with more than 15 -additional ancestors (forming a 16-way merge). For this reason -it is suggested that frontends do not use more than 15 `merge` -commands per commit; 16, if starting a new, empty branch. Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above). @@ -604,7 +600,7 @@ be removed from the branch. See `filemodify` above for a detailed description of `<path>`. `filecopy` -^^^^^^^^^^^^ +^^^^^^^^^^ Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced @@ -892,7 +888,7 @@ save out all current branch refs, tags and marks. .... Note that fast-import automatically switches packfiles when the current -packfile reaches \--max-pack-size, or 4 GiB, whichever limit is +packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks. @@ -1230,7 +1226,7 @@ users of fast-import, and are offered here as suggestions. Use One Mark Per Commit ~~~~~~~~~~~~~~~~~~~~~~~ When doing a repository conversion, use a unique mark per commit -(`mark :<n>`) and supply the \--export-marks option on the command +(`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the @@ -1295,7 +1291,7 @@ even for considerably large projects (100,000+ commits). However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely -large projects (especially if -f and a large \--window parameter is +large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project! @@ -1309,7 +1305,7 @@ Repacking Historical Data ~~~~~~~~~~~~~~~~~~~~~~~~~ If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying -\--window=50 (or higher) when you run 'git repack'. +--window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository. @@ -1411,7 +1407,7 @@ branch, their in-memory storage size can grow to a considerable size fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be -increased or decreased on the command line with \--active-branches=. +increased or decreased on the command line with --active-branches=. per active tree ~~~~~~~~~~~~~~~ diff --git a/Documentation/git-fetch-pack.txt b/Documentation/git-fetch-pack.txt index 93b5067..8680f45 100644 --- a/Documentation/git-fetch-pack.txt +++ b/Documentation/git-fetch-pack.txt @@ -80,7 +80,7 @@ be in a separate packet, and the list must end with a flush packet. the things up in .bash_profile). --exec=<git-upload-pack>:: - Same as \--upload-pack=<git-upload-pack>. + Same as --upload-pack=<git-upload-pack>. --depth=<n>:: Limit fetching to ancestor-chains not longer than n. diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt index 8deb614..e62d9a0 100644 --- a/Documentation/git-fetch.txt +++ b/Documentation/git-fetch.txt @@ -26,7 +26,7 @@ By default, any tag that points into the histories being fetched is also fetched; the effect is to fetch tags that point at branches that you are interested in. This default behavior can be changed by using the --tags or --no-tags options or by -configuring remote.<name>.tagopt. By using a refspec that fetches tags +configuring remote.<name>.tagOpt. By using a refspec that fetches tags explicitly, you can fetch tags that do not point into branches you are interested in as well. diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index c0fd470..bb3ea93 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -273,13 +273,13 @@ attachments, and sign off patches with configuration variables. ------------ [format] headers = "Organization: git-foo\n" - subjectprefix = CHANGE + subjectPrefix = CHANGE suffix = .txt numbered = auto to = <email> cc = <email> attach [ = mime-boundary-string ] - signoff = true + signOff = true coverletter = auto ------------ diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt index 273c466..5223498 100644 --- a/Documentation/git-gc.txt +++ b/Documentation/git-gc.txt @@ -54,10 +54,10 @@ all loose objects are combined into a single pack using `git repack -d -l`. Setting the value of `gc.auto` to 0 disables automatic packing of loose objects. + -If the number of packs exceeds the value of `gc.autopacklimit`, +If the number of packs exceeds the value of `gc.autoPackLimit`, then existing packs (except those marked with a `.keep` file) are consolidated into a single pack by using the `-A` option of -'git repack'. Setting `gc.autopacklimit` to 0 disables +'git repack'. Setting `gc.autoPackLimit` to 0 disables automatic consolidation of packs. --prune=<date>:: @@ -101,18 +101,18 @@ branches: ------------ [gc "refs/remotes/*"] reflogExpire = never - reflogexpireUnreachable = 3 days + reflogExpireUnreachable = 3 days ------------ -The optional configuration variable 'gc.rerereresolved' indicates +The optional configuration variable 'gc.rerereResolved' indicates how long records of conflicted merge you resolved earlier are kept. This defaults to 60 days. -The optional configuration variable 'gc.rerereunresolved' indicates +The optional configuration variable 'gc.rerereUnresolved' indicates how long records of conflicted merge you have not resolved are kept. This defaults to 15 days. -The optional configuration variable 'gc.packrefs' determines if +The optional configuration variable 'gc.packRefs' determines if 'git gc' runs 'git pack-refs'. This can be set to "notbare" to enable it within all non-bare repos or it can be set to a boolean value. This defaults to true. diff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt index 02c1f12..0c75f3b 100644 --- a/Documentation/git-hash-object.txt +++ b/Documentation/git-hash-object.txt @@ -9,7 +9,7 @@ git-hash-object - Compute object ID and optionally creates a blob from a file SYNOPSIS -------- [verse] -'git hash-object' [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] <file>... +'git hash-object' [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin [--literally]] [--] <file>... 'git hash-object' [-t <type>] [-w] --stdin-paths [--no-filters] < <list-of-paths> DESCRIPTION @@ -51,7 +51,13 @@ OPTIONS Hash the contents as is, ignoring any input filter that would have been chosen by the attributes mechanism, including the end-of-line conversion. If the file is read from standard input then this - is always implied, unless the --path option is given. + is always implied, unless the `--path` option is given. + +--literally:: + Allow `--stdin` to hash any garbage into a loose object which might not + otherwise pass standard object parsing or git-fsck checks. Useful for + stress-testing Git itself or reproducing characteristics of corrupt or + bogus objects encountered in the wild. GIT --- diff --git a/Documentation/git-http-backend.txt b/Documentation/git-http-backend.txt index d422ba4..3ca18c4 100644 --- a/Documentation/git-http-backend.txt +++ b/Documentation/git-http-backend.txt @@ -65,8 +65,8 @@ automatically by the web server. EXAMPLES -------- -All of the following examples map 'http://$hostname/git/foo/bar.git' -to '/var/www/git/foo/bar.git'. +All of the following examples map `http://$hostname/git/foo/bar.git` +to `/var/www/git/foo/bar.git`. Apache 2.x:: Ensure mod_cgi, mod_alias, and mod_env are enabled, set diff --git a/Documentation/git-imap-send.txt b/Documentation/git-imap-send.txt index 77aacf1..5d1e4c8 100644 --- a/Documentation/git-imap-send.txt +++ b/Documentation/git-imap-send.txt @@ -44,7 +44,8 @@ OPTIONS --no-curl:: Talk to the IMAP server using git's own IMAP routines instead of - using libcurl. + using libcurl. Ignored if Git was built with the NO_OPENSSL option + set. CONFIGURATION diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt index 369f889..8174d27 100644 --- a/Documentation/git-init.txt +++ b/Documentation/git-init.txt @@ -125,7 +125,7 @@ The template directory will be one of the following (in order): - the contents of the `$GIT_TEMPLATE_DIR` environment variable; - - the `init.templatedir` configuration variable; or + - the `init.templateDir` configuration variable; or - the default template directory: `/usr/share/git-core/templates`. diff --git a/Documentation/git-instaweb.txt b/Documentation/git-instaweb.txt index f3eef51..cc75b25 100644 --- a/Documentation/git-instaweb.txt +++ b/Documentation/git-instaweb.txt @@ -76,7 +76,7 @@ You may specify configuration in your .git/config httpd = apache2 -f port = 4321 browser = konqueror - modulepath = /usr/lib/apache2/modules + modulePath = /usr/lib/apache2/modules ----------------------------------------------------------------------- diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index 1f7bc67..5692945 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -62,9 +62,9 @@ produced by `--stat`, etc. output by allowing them to allocate space in advance. -L <start>,<end>:<file>:: --L :<regex>:<file>:: +-L :<funcname>:<file>:: Trace the evolution of the line range given by "<start>,<end>" - (or the funcname regex <regex>) within the <file>. You may + (or the function name regex <funcname>) within the <file>. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments. @@ -184,7 +184,7 @@ log.date:: `--date` option.) Defaults to "default", which means to write dates like `Sat May 8 19:35:34 2010 -0500`. -log.showroot:: +log.showRoot:: If `false`, `git log` and related commands will not treat the initial commit as a big creation event. Any root commits in `git log -p` output would be shown without a diff attached. diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index cf2c374..273a100 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -104,6 +104,10 @@ commit or stash your changes before running 'git merge'. If no commit is given from the command line, merge the remote-tracking branches that the current branch is configured to use as its upstream. See also the configuration section of this manual page. ++ +When `FETCH_HEAD` (and no other commit) is specified, the branches +recorded in the `.git/FETCH_HEAD` file by the previous invocation +of `git fetch` for merging are merged to the current branch. PRE-MERGE CHECKS @@ -232,7 +236,7 @@ Barbie's remark on your side. The only thing you can tell is that your side wants to say it is hard and you'd prefer to go shopping, while the other side wants to claim it is easy. -An alternative style can be used by setting the "merge.conflictstyle" +An alternative style can be used by setting the "merge.conflictStyle" configuration variable to "diff3". In "diff3" style, the above conflict may look like this: @@ -329,7 +333,7 @@ CONFIGURATION ------------- include::merge-config.txt[] -branch.<name>.mergeoptions:: +branch.<name>.mergeOptions:: Sets default options for merging into branch <name>. The syntax and supported options are the same as those of 'git merge', but option values containing whitespace characters are currently not supported. diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index a1664b9..82aa5d6 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -225,9 +225,20 @@ Git repository: they can find the p4 branches in refs/heads. --max-changes <n>:: - Limit the number of imported changes to 'n'. Useful to - limit the amount of history when using the '@all' p4 revision - specifier. + Import at most 'n' changes, rather than the entire range of + changes included in the given revision specifier. A typical + usage would be use '@all' as the revision specifier, but then + to use '--max-changes 1000' to import only the last 1000 + revisions rather than the entire revision history. + +--changes-block-size <n>:: + The internal block size to use when converting a revision + specifier such as '@all' into a list of specific change + numbers. Instead of using a single call to 'p4 changes' to + find the full list of changes for the conversion, there are a + sequence of calls to 'p4 changes -m', each of which requests + one block of changes of the given size. The default block size + is 500, which should usually be suitable. --keep-path:: The mapping of file names from the p4 depot path to Git, by diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt index c2f76fb..bbea529 100644 --- a/Documentation/git-pack-objects.txt +++ b/Documentation/git-pack-objects.txt @@ -192,7 +192,7 @@ self-contained. Use `git index-pack --fix-thin` --shallow:: Optimize a pack that will be provided to a client with a shallow - repository. This option, combined with \--thin, can result in a + repository. This option, combined with --thin, can result in a smaller pack at the cost of speed. --delta-base-offset:: diff --git a/Documentation/git-prune.txt b/Documentation/git-prune.txt index 7a493c8..1cf3bed 100644 --- a/Documentation/git-prune.txt +++ b/Documentation/git-prune.txt @@ -48,6 +48,9 @@ OPTIONS --expire <time>:: Only expire loose objects older than <time>. +--worktrees:: + Prune dead working tree information in $GIT_DIR/worktrees. + <head>...:: In addition to objects reachable from any of our references, keep objects diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 200eb22..712ab4b 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -111,13 +111,12 @@ include::merge-options.txt[] was rebased since last fetched, the rebase uses that information to avoid rebasing non-local changes. + -When preserve, also rebase the current branch on top of the upstream -branch, but pass `--preserve-merges` along to `git rebase` so that -locally created merge commits will not be flattened. +When set to preserve, rebase with the `--preserve-merges` option passed +to `git rebase` so that locally created merge commits will not be flattened. + When false, merge the current branch into the upstream branch. + -See `pull.rebase`, `branch.<name>.rebase` and `branch.autosetuprebase` in +See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging. + diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index e1a46a7..135d810 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -128,7 +128,10 @@ already exists on the remote side. Push all the refs that would be pushed without this option, and also push annotated tags in `refs/tags` that are missing from the remote but are pointing at commit-ish that are - reachable from the refs being pushed. + reachable from the refs being pushed. This can also be specified + with configuration variable 'push.followTags'. For more + information, see 'push.followTags' in linkgit:git-config[1]. + --signed:: GPG-sign the push request to update refs on the receiving @@ -154,9 +157,8 @@ already exists on the remote side. Usually, "git push" refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it. + -This option bypasses the check, but instead requires that the -current value of the ref to be the expected value. "git push" -fails otherwise. +This option overrides this restriction if the current value of the +remote ref is the expected value. "git push" fails otherwise. + Imagine that you have to rebase what you have already published. You will have to bypass the "must fast-forward" rule in order to @@ -168,15 +170,14 @@ commit, and blindly pushing with `--force` will lose her work. This option allows you to say that you expect the history you are updating is what you rebased and want to replace. If the remote ref still points at the commit you specified, you can be sure that no -other people did anything to the ref (it is like taking a "lease" on -the ref without explicitly locking it, and you update the ref while -making sure that your earlier "lease" is still valid). +other people did anything to the ref. It is like taking a "lease" on +the ref without explicitly locking it, and the remote ref is updated +only if the "lease" is still valid. + `--force-with-lease` alone, without specifying the details, will protect all remote refs that are going to be updated by requiring their current value to be the same as the remote-tracking branch we have -for them, unless specified with a `--force-with-lease=<refname>:<expect>` -option that explicitly states what the expected value is. +for them. + `--force-with-lease=<refname>`, without specifying the expected value, will protect the named ref (alone), if it is going to be updated, by @@ -264,8 +265,8 @@ origin +master` to force a push to the `master` branch). See the --[no-]verify:: Toggle the pre-push hook (see linkgit:githooks[5]). The - default is \--verify, giving the hook a chance to prevent the - push. With \--no-verify, the hook is bypassed completely. + default is --verify, giving the hook a chance to prevent the + push. With --no-verify, the hook is bypassed completely. include::urls-remotes.txt[] diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 924827d..1d01baa 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -80,7 +80,7 @@ remain the checked-out branch. If the upstream branch already contains a change you have made (e.g., because you mailed a patch which was applied upstream), then that commit will be skipped. For example, running `git rebase master` on the -following history (in which A' and A introduce the same set of changes, +following history (in which `A'` and `A` introduce the same set of changes, but have different committer information): ------------ @@ -207,10 +207,10 @@ rebase.stat:: Whether to show a diffstat of what changed upstream since the last rebase. False by default. -rebase.autosquash:: +rebase.autoSquash:: If set to true enable '--autosquash' option by default. -rebase.autostash:: +rebase.autoStash:: If set to true enable '--autostash' option by default. OPTIONS @@ -362,7 +362,9 @@ default is `--no-fork-point`, otherwise the default is `--fork-point`. -p:: --preserve-merges:: - Instead of ignoring merges, try to recreate them. + Recreate merge commits instead of flattening the history by replaying + commits a merge commit introduces. Merge conflict resolutions or manual + amendments to merge commits are not preserved. + This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good @@ -414,7 +416,7 @@ squash/fixup series. This option is only valid when the '--interactive' option is used. + If the '--autosquash' option is enabled by default using the -configuration variable `rebase.autosquash`, this option can be +configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting. --[no-]autostash:: diff --git a/Documentation/git-receive-pack.txt b/Documentation/git-receive-pack.txt index 9016960..000ee8d 100644 --- a/Documentation/git-receive-pack.txt +++ b/Documentation/git-receive-pack.txt @@ -100,7 +100,7 @@ the following environment variables: starting time is different by this many seconds from the current session. Only meaningful when `GIT_PUSH_CERT_NONCE_STATUS` says `SLOP`. - Also read about `receive.certnonceslop` variable in + Also read about `receive.certNonceSlop` variable in linkgit:git-config[1]. This hook is called before any refname is updated and before any diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt index 4786a78..0e0bd36 100644 --- a/Documentation/git-repack.txt +++ b/Documentation/git-repack.txt @@ -115,7 +115,7 @@ other objects in that pack they already have locally. Write a reachability bitmap index as part of the repack. This only makes sense when used with `-a` or `-A`, as the bitmaps must be able to refer to all reachable objects. This option - overrides the setting of `pack.writebitmaps`. + overrides the setting of `pack.writeBitmaps`. --pack-kept-objects:: Include objects in `.keep` files when repacking. Note that we @@ -123,7 +123,7 @@ other objects in that pack they already have locally. This means that we may duplicate objects, but this makes the option safe to use when there are concurrent pushes or fetches. This option is generally only useful if you are writing bitmaps - with `-b` or `pack.writebitmaps`, as it ensures that the + with `-b` or `pack.writeBitmaps`, as it ensures that the bitmapped packfile has the necessary objects. Configuration diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index a62227f..9ee083c 100644 --- a/Documentation/git-rerere.txt +++ b/Documentation/git-rerere.txt @@ -69,7 +69,7 @@ Prune records of conflicted merges that occurred a long time ago. By default, unresolved conflicts older than 15 days and resolved conflicts older than 60 days are pruned. These defaults are controlled via the -`gc.rerereunresolved` and `gc.rerereresolved` configuration +`gc.rerereUnresolved` and `gc.rerereResolved` configuration variables respectively. diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt index 5b11922..b10ea60 100644 --- a/Documentation/git-rev-list.txt +++ b/Documentation/git-rev-list.txt @@ -9,54 +9,54 @@ git-rev-list - Lists commit objects in reverse chronological order SYNOPSIS -------- [verse] -'git rev-list' [ \--max-count=<number> ] - [ \--skip=<number> ] - [ \--max-age=<timestamp> ] - [ \--min-age=<timestamp> ] - [ \--sparse ] - [ \--merges ] - [ \--no-merges ] - [ \--min-parents=<number> ] - [ \--no-min-parents ] - [ \--max-parents=<number> ] - [ \--no-max-parents ] - [ \--first-parent ] - [ \--remove-empty ] - [ \--full-history ] - [ \--not ] - [ \--all ] - [ \--branches[=<pattern>] ] - [ \--tags[=<pattern>] ] - [ \--remotes[=<pattern>] ] - [ \--glob=<glob-pattern> ] - [ \--ignore-missing ] - [ \--stdin ] - [ \--quiet ] - [ \--topo-order ] - [ \--parents ] - [ \--timestamp ] - [ \--left-right ] - [ \--left-only ] - [ \--right-only ] - [ \--cherry-mark ] - [ \--cherry-pick ] - [ \--encoding=<encoding> ] - [ \--(author|committer|grep)=<pattern> ] - [ \--regexp-ignore-case | -i ] - [ \--extended-regexp | -E ] - [ \--fixed-strings | -F ] - [ \--date=(local|relative|default|iso|iso-strict|rfc|short) ] - [ [ \--objects | \--objects-edge | \--objects-edge-aggressive ] - [ \--unpacked ] ] - [ \--pretty | \--header ] - [ \--bisect ] - [ \--bisect-vars ] - [ \--bisect-all ] - [ \--merge ] - [ \--reverse ] - [ \--walk-reflogs ] - [ \--no-walk ] [ \--do-walk ] - [ \--use-bitmap-index ] +'git rev-list' [ --max-count=<number> ] + [ --skip=<number> ] + [ --max-age=<timestamp> ] + [ --min-age=<timestamp> ] + [ --sparse ] + [ --merges ] + [ --no-merges ] + [ --min-parents=<number> ] + [ --no-min-parents ] + [ --max-parents=<number> ] + [ --no-max-parents ] + [ --first-parent ] + [ --remove-empty ] + [ --full-history ] + [ --not ] + [ --all ] + [ --branches[=<pattern>] ] + [ --tags[=<pattern>] ] + [ --remotes[=<pattern>] ] + [ --glob=<glob-pattern> ] + [ --ignore-missing ] + [ --stdin ] + [ --quiet ] + [ --topo-order ] + [ --parents ] + [ --timestamp ] + [ --left-right ] + [ --left-only ] + [ --right-only ] + [ --cherry-mark ] + [ --cherry-pick ] + [ --encoding=<encoding> ] + [ --(author|committer|grep)=<pattern> ] + [ --regexp-ignore-case | -i ] + [ --extended-regexp | -E ] + [ --fixed-strings | -F ] + [ --date=(local|relative|default|iso|iso-strict|rfc|short) ] + [ [ --objects | --objects-edge | --objects-edge-aggressive ] + [ --unpacked ] ] + [ --pretty | --header ] + [ --bisect ] + [ --bisect-vars ] + [ --bisect-all ] + [ --merge ] + [ --reverse ] + [ --walk-reflogs ] + [ --no-walk ] [ --do-walk ] + [ --use-bitmap-index ] <commit>... [ \-- <paths>... ] DESCRIPTION diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt index d6de42f..c483100 100644 --- a/Documentation/git-rev-parse.txt +++ b/Documentation/git-rev-parse.txt @@ -102,7 +102,7 @@ eval "set -- $(git rev-parse --sq --prefix "$prefix" "$@")" + If you want to make sure that the output actually names an object in your object database and/or can be used as a specific type of object -you require, you can add "\^{type}" peeling operator to the parameter. +you require, you can add the `^{type}` peeling operator to the parameter. For example, `git rev-parse "$VAR^{commit}"` will make sure `$VAR` names an existing object that is a commit-ish (i.e. a commit, or an annotated tag that points at a commit). To make sure that `$VAR` @@ -147,7 +147,7 @@ can be used. form as close to the original input as possible. --symbolic-full-name:: - This is similar to \--symbolic, but it omits input that + This is similar to --symbolic, but it omits input that are not refs (i.e. branch or tag names; or more explicitly disambiguating "heads/master" form, when you want to name the "master" branch when there is an @@ -216,6 +216,9 @@ If `$GIT_DIR` is not defined and the current directory is not detected to lie in a Git repository or work tree print a message to stderr and exit with nonzero status. +--git-common-dir:: + Show `$GIT_COMMON_DIR` if defined, else `$GIT_DIR`. + --is-inside-git-dir:: When the current working directory is below the repository directory print "true", otherwise "false". @@ -233,6 +236,13 @@ print a message to stderr and exit with nonzero status. repository. If <path> is a gitfile then the resolved path to the real repository is printed. +--git-path <path>:: + Resolve "$GIT_DIR/<path>" and takes other path relocation + variables such as $GIT_OBJECT_DIRECTORY, + $GIT_INDEX_FILE... into account. For example, if + $GIT_OBJECT_DIRECTORY is set to /foo/bar then "git rev-parse + --git-path objects/abc" returns /foo/bar/abc. + --show-cdup:: When the command is invoked from a subdirectory, show the path of the top-level directory relative to the current diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index f248a86..8045546 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -47,7 +47,7 @@ Composing --annotate:: Review and edit each patch you're about to send. Default is the value of 'sendemail.annotate'. See the CONFIGURATION section for - 'sendemail.multiedit'. + 'sendemail.multiEdit'. --bcc=<address>:: Specify a "Bcc:" value for each email. Default is the value of @@ -73,7 +73,7 @@ and In-Reply-To headers will be used unless they are removed. + Missing From or In-Reply-To headers will be prompted for. + -See the CONFIGURATION section for 'sendemail.multiedit'. +See the CONFIGURATION section for 'sendemail.multiEdit'. --from=<address>:: Specify the sender of the emails. If not specified on the command line, @@ -156,31 +156,31 @@ Sending subscribed to a list. In order to use the 'From' address, set the value to "auto". If you use the sendmail binary, you must have suitable privileges for the -f parameter. Default is the value of the - 'sendemail.envelopesender' configuration variable; if that is + 'sendemail.envelopeSender' configuration variable; if that is unspecified, choosing the envelope sender is left to your MTA. --smtp-encryption=<encryption>:: Specify the encryption to use, either 'ssl' or 'tls'. Any other value reverts to plain SMTP. Default is the value of - 'sendemail.smtpencryption'. + 'sendemail.smtpEncryption'. --smtp-domain=<FQDN>:: Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO command to the SMTP server. Some servers require the FQDN to match your IP address. If not set, git send-email attempts to determine your FQDN automatically. Default is the value of - 'sendemail.smtpdomain'. + 'sendemail.smtpDomain'. --smtp-pass[=<password>]:: Password for SMTP-AUTH. The argument is optional: If no argument is specified, then the empty string is used as - the password. Default is the value of 'sendemail.smtppass', + the password. Default is the value of 'sendemail.smtpPass', however '--smtp-pass' always overrides this value. + Furthermore, passwords need not be specified in configuration files or on the command line. If a username has been specified (with -'--smtp-user' or a 'sendemail.smtpuser'), but no password has been -specified (with '--smtp-pass' or 'sendemail.smtppass'), then +'--smtp-user' or a 'sendemail.smtpUser'), but no password has been +specified (with '--smtp-pass' or 'sendemail.smtpPass'), then a password is obtained using 'git-credential'. --smtp-server=<host>:: @@ -188,7 +188,7 @@ a password is obtained using 'git-credential'. `smtp.example.com` or a raw IP address). Alternatively it can specify a full pathname of a sendmail-like program instead; the program must support the `-i` option. Default value can - be specified by the 'sendemail.smtpserver' configuration + be specified by the 'sendemail.smtpServer' configuration option; the built-in default is `/usr/sbin/sendmail` or `/usr/lib/sendmail` if such program is available, or `localhost` otherwise. @@ -199,11 +199,11 @@ a password is obtained using 'git-credential'. submission port 587, or the common SSL smtp port 465); symbolic port names (e.g. "submission" instead of 587) are also accepted. The port can also be set with the - 'sendemail.smtpserverport' configuration variable. + 'sendemail.smtpServerPort' configuration variable. --smtp-server-option=<option>:: If set, specifies the outgoing SMTP server option to use. - Default value can be specified by the 'sendemail.smtpserveroption' + Default value can be specified by the 'sendemail.smtpServerOption' configuration option. + The --smtp-server-option option must be repeated for each option you want @@ -225,8 +225,8 @@ must be used for each option. be the best choice on most platforms). --smtp-user=<user>:: - Username for SMTP-AUTH. Default is the value of 'sendemail.smtpuser'; - if a username is not specified (with '--smtp-user' or 'sendemail.smtpuser'), + Username for SMTP-AUTH. Default is the value of 'sendemail.smtpUser'; + if a username is not specified (with '--smtp-user' or 'sendemail.smtpUser'), then authentication is not attempted. --smtp-debug=0|1:: @@ -247,14 +247,14 @@ Automating Specify a command to execute once per patch file which should generate patch file specific "Cc:" entries. Output of this command must be single email address per line. - Default is the value of 'sendemail.cccmd' configuration value. + Default is the value of 'sendemail.ccCmd' configuration value. --[no-]chain-reply-to:: If this is set, each email will be sent as a reply to the previous email sent. If disabled with "--no-chain-reply-to", all emails after the first will be sent as replies to the first email sent. When using this, it is recommended that the first file given be an overview of the - entire patch series. Disabled by default, but the 'sendemail.chainreplyto' + entire patch series. Disabled by default, but the 'sendemail.chainReplyTo' configuration variable can be used to enable it. --identity=<identity>:: @@ -304,7 +304,7 @@ specified, as well as 'body' if --no-signed-off-cc is specified. --[no-]suppress-from:: If this is set, do not add the From: address to the cc: list. - Default is the value of 'sendemail.suppressfrom' configuration + Default is the value of 'sendemail.suppressFrom' configuration value; if that is unspecified, default to --no-suppress-from. --[no-]thread:: @@ -377,15 +377,15 @@ default to '--validate'. CONFIGURATION ------------- -sendemail.aliasesfile:: +sendemail.aliasesFile:: To avoid typing long email addresses, point this to one or more - email aliases files. You must also supply 'sendemail.aliasfiletype'. + email aliases files. You must also supply 'sendemail.aliasFileType'. -sendemail.aliasfiletype:: - Format of the file(s) specified in sendemail.aliasesfile. Must be +sendemail.aliasFileType:: + Format of the file(s) specified in sendemail.aliasesFile. Must be one of 'mutt', 'mailrc', 'pine', 'elm', or 'gnus'. -sendemail.multiedit:: +sendemail.multiEdit:: If true (default), a single editor instance will be spawned to edit files you have to edit (patches when '--annotate' is used, and the summary when '--compose' is used). If false, files will be edited one @@ -404,10 +404,10 @@ To use 'git send-email' to send your patches through the GMail SMTP server, edit ~/.gitconfig to specify your account settings: [sendemail] - smtpencryption = tls - smtpserver = smtp.gmail.com - smtpuser = yourname@gmail.com - smtpserverport = 587 + smtpEncryption = tls + smtpServer = smtp.gmail.com + smtpUser = yourname@gmail.com + smtpServerPort = 587 Once your commits are ready to be sent to the mailing list, run the following commands: diff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt index 45c7725..b5d09f7 100644 --- a/Documentation/git-send-pack.txt +++ b/Documentation/git-send-pack.txt @@ -29,7 +29,7 @@ OPTIONS a directory on the default $PATH. --exec=<git-receive-pack>:: - Same as \--receive-pack=<git-receive-pack>. + Same as --receive-pack=<git-receive-pack>. --all:: Instead of explicitly specifying which refs to update, diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt index 4e617e6..82a4125 100644 --- a/Documentation/git-show.txt +++ b/Documentation/git-show.txt @@ -22,7 +22,7 @@ presents the merge commit in a special format as produced by For tags, it shows the tag message and the referenced objects. For trees, it shows the names (equivalent to 'git ls-tree' -with \--name-only). +with --name-only). For plain blobs, it shows the plain contents. diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt index 56573bd..335f312 100644 --- a/Documentation/git-status.txt +++ b/Documentation/git-status.txt @@ -41,6 +41,14 @@ OPTIONS --long:: Give the output in the long-format. This is the default. +-v:: +--verbose:: + In addition to the names of files that have been changed, also + show the textual changes that are staged to be committed + (i.e., like the output of `git diff --cached`). If `-v` is specified + twice, then also show the changes in the working tree that + have not yet been staged (i.e., like the output of `git diff`). + -u[<mode>]:: --untracked-files[=<mode>]:: Show untracked files. @@ -80,7 +88,7 @@ configuration variable documented in linkgit:git-config[1]. only changes to the commits stored in the superproject are shown (this was the behavior before 1.7.0). Using "all" hides all changes to submodules (and suppresses the output of submodule summaries when the config option - `status.submodulesummary` is set). + `status.submoduleSummary` is set). --ignored:: Show ignored files as well. @@ -210,7 +218,7 @@ If the config variable `status.relativePaths` is set to false, then all paths shown are relative to the repository root, not to the current directory. -If `status.submodulesummary` is set to a non zero number or true (identical +If `status.submoduleSummary` is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled for the long format and a summary of commits for modified submodules will be shown (see --summary-limit option of linkgit:git-submodule[1]). Please note diff --git a/Documentation/git-stripspace.txt b/Documentation/git-stripspace.txt index 6c6e989..60328d5 100644 --- a/Documentation/git-stripspace.txt +++ b/Documentation/git-stripspace.txt @@ -49,7 +49,7 @@ EXAMPLES Given the following noisy input with '$' indicating the end of a line: --------- +--------- |A brief introduction $ | $ |$ @@ -65,7 +65,7 @@ Given the following noisy input with '$' indicating the end of a line: Use 'git stripspace' with no arguments to obtain: --------- +--------- |A brief introduction$ |$ |A new paragraph$ @@ -79,7 +79,7 @@ Use 'git stripspace' with no arguments to obtain: Use 'git stripspace --strip-comments' to obtain: --------- +--------- |A brief introduction$ |$ |A new paragraph$ diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 39e9a18..11d1e2f 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -70,8 +70,8 @@ COMMANDS --username=<user>;; For transports that SVN handles authentication for (http, https, and plain svn), specify the username. For other - transports (e.g. svn+ssh://), you must include the username in - the URL, e.g. svn+ssh://foo@svn.bar.com/project + transports (e.g. `svn+ssh://`), you must include the username in + the URL, e.g. `svn+ssh://foo@svn.bar.com/project` --prefix=<prefix>;; This allows one to specify a prefix which is prepended to the names of remotes if trunk/branches/tags are @@ -279,9 +279,9 @@ first have already been pushed into SVN. Ask the user to confirm that a patch set should actually be sent to SVN. For each patch, one may answer "yes" (accept this patch), "no" (discard this patch), "all" (accept all patches), or "quit". - + - 'git svn dcommit' returns immediately if answer is "no" or "quit", without - committing anything to SVN. ++ +'git svn dcommit' returns immediately if answer is "no" or "quit", without +committing anything to SVN. 'branch':: Create a branch in the SVN repository. diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index e953ba4..034d10d 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@ -98,10 +98,13 @@ OPTIONS --sort=<type>:: Sort in a specific order. Supported type is "refname" (lexicographic order), "version:refname" or "v:refname" (tag - names are treated as versions). Prepend "-" to reverse sort - order. When this option is not given, the sort order defaults to the - value configured for the 'tag.sort' variable if it exists, or - lexicographic order otherwise. See linkgit:git-config[1]. + names are treated as versions). The "version:refname" sort + order can also be affected by the + "versionsort.prereleaseSuffix" configuration variable. Prepend + "-" to reverse sort order. When this option is not given, the + sort order defaults to the value configured for the 'tag.sort' + variable if it exists, or lexicographic order otherwise. See + linkgit:git-config[1]. --column[=<options>]:: --no-column:: @@ -155,13 +158,13 @@ This option is only applicable when listing tags without annotation lines. CONFIGURATION ------------- By default, 'git tag' in sign-with-default mode (-s) will use your -committer identity (of the form "Your Name <\your@email.address>") to +committer identity (of the form `Your Name <your@email.address>`) to find a key. If you want to use a different default key, you can specify it in the repository configuration as follows: ------------------------------------- [user] - signingkey = <gpg-key-id> + signingKey = <gpg-key-id> ------------------------------------- diff --git a/Documentation/git-unpack-objects.txt b/Documentation/git-unpack-objects.txt index 12cb108..07d4329 100644 --- a/Documentation/git-unpack-objects.txt +++ b/Documentation/git-unpack-objects.txt @@ -9,7 +9,7 @@ git-unpack-objects - Unpack objects from a packed archive SYNOPSIS -------- [verse] -'git unpack-objects' [-n] [-q] [-r] [--strict] < <pack-file> +'git unpack-objects' [-n] [-q] [-r] [--strict] < <packfile> DESCRIPTION @@ -19,8 +19,8 @@ the objects contained within and writing them into the repository in "loose" (one object per file) format. Objects that already exist in the repository will *not* be unpacked -from the pack-file. Therefore, nothing will be unpacked if you use -this command on a pack-file that exists within the target repository. +from the packfile. Therefore, nothing will be unpacked if you use +this command on a packfile that exists within the target repository. See linkgit:git-repack[1] for options to generate new packs and replace existing ones. diff --git a/Documentation/git-verify-pack.txt b/Documentation/git-verify-pack.txt index 526ba7b..61ca6d0 100644 --- a/Documentation/git-verify-pack.txt +++ b/Documentation/git-verify-pack.txt @@ -40,7 +40,7 @@ OUTPUT FORMAT ------------- When specifying the -v option the format used is: - SHA-1 type size size-in-pack-file offset-in-packfile + SHA-1 type size size-in-packfile offset-in-packfile for objects that are not deltified in the pack, and diff --git a/Documentation/git.txt b/Documentation/git.txt index 52c4d2a..38cc004 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -43,9 +43,21 @@ 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.3.2/git.html[documentation for release 2.3.2] +* link:v2.4.1/git.html[documentation for release 2.4.1] * release notes for + link:RelNotes/2.4.1.txt[2.4.1], + link:RelNotes/2.4.0.txt[2.4]. + +* link:v2.3.8/git.html[documentation for release 2.3.8] + +* release notes for + link:RelNotes/2.3.8.txt[2.3.8], + link:RelNotes/2.3.7.txt[2.3.7], + link:RelNotes/2.3.6.txt[2.3.6], + link:RelNotes/2.3.5.txt[2.3.5], + link:RelNotes/2.3.4.txt[2.3.4], + link:RelNotes/2.3.3.txt[2.3.3], link:RelNotes/2.3.2.txt[2.3.2], link:RelNotes/2.3.1.txt[2.3.1], link:RelNotes/2.3.0.txt[2.3]. @@ -767,7 +779,8 @@ Git so take care if using Cogito etc. 'GIT_INDEX_VERSION':: This environment variable allows the specification of an index version for new repositories. It won't affect existing index - files. By default index file version [23] is used. + files. By default index file version 2 or 3 is used. See + linkgit:git-update-index[1] for more information. 'GIT_OBJECT_DIRECTORY':: If the object storage directory is specified via this @@ -822,6 +835,15 @@ Git so take care if using Cogito etc. an explicit repository directory set via 'GIT_DIR' or on the command line. +'GIT_COMMON_DIR':: + If this variable is set to a path, non-worktree files that are + normally in $GIT_DIR will be taken from this path + instead. Worktree-specific files such as HEAD or index are + taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and + the section 'MULTIPLE CHECKOUT MODE' in linkgit:checkout[1] + details. This variable has lower precedence than other path + variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY... + Git Commits ~~~~~~~~~~~ 'GIT_AUTHOR_NAME':: @@ -918,7 +940,7 @@ for further details. If this environment variable is set, then Git commands which need to acquire passwords or passphrases (e.g. for HTTP or IMAP authentication) will call this program with a suitable prompt as command-line argument - and read the password from its STDOUT. See also the 'core.askpass' + and read the password from its STDOUT. See also the 'core.askPass' option in linkgit:git-config[1]. 'GIT_TERMINAL_PROMPT':: @@ -1025,6 +1047,17 @@ GIT_ICASE_PATHSPECS:: variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog. +`GIT_REF_PARANOIA`:: + If set to `1`, include broken or badly named refs when iterating + over lists of refs. In a normal, non-corrupted repository, this + does nothing. However, enabling it may help git to detect and + abort some operations in the presence of broken refs. Git sets + this variable automatically when performing destructive + operations like linkgit:git-prune[1]. You should not need to set + it yourself unless you want to be paranoid about making sure + an operation has touched every ref (e.g., because you are + cloning a repository to make a backup). + Discussion[[Discussion]] ------------------------ diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index c892ffa..70899b3 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -80,7 +80,7 @@ Attributes which should be version-controlled and distributed to other repositories (i.e., attributes of interest to all users) should go into `.gitattributes` files. Attributes that should affect all repositories for a single user should be placed in a file specified by the -`core.attributesfile` configuration option (see linkgit:git-config[1]). +`core.attributesFile` configuration option (see linkgit:git-config[1]). Its default value is $XDG_CONFIG_HOME/git/attributes. If $XDG_CONFIG_HOME is either not set or empty, $HOME/.config/git/attributes is used instead. Attributes for all users on a system should be placed in the diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt index 8475c07..36e9ab3 100644 --- a/Documentation/gitcore-tutorial.txt +++ b/Documentation/gitcore-tutorial.txt @@ -259,7 +259,7 @@ index 557db03..263414f 100644 @@ -1 +1,2 @@ Hello World +It's a new day for git ----- +------------ i.e. the diff of the change we caused by adding another line to `hello`. diff --git a/Documentation/gitcredentials.txt b/Documentation/gitcredentials.txt index 47576be..1c75be0 100644 --- a/Documentation/gitcredentials.txt +++ b/Documentation/gitcredentials.txt @@ -32,7 +32,7 @@ strategies to ask the user for usernames and passwords: to the program on the command line, and the user's input is read from its standard output. -2. Otherwise, if the `core.askpass` configuration variable is set, its +2. Otherwise, if the `core.askPass` configuration variable is set, its value is used as above. 3. Otherwise, if the `SSH_ASKPASS` environment variable is set, its diff --git a/Documentation/gitdiffcore.txt b/Documentation/gitdiffcore.txt index c8b3e51..c579593 100644 --- a/Documentation/gitdiffcore.txt +++ b/Documentation/gitdiffcore.txt @@ -28,8 +28,8 @@ The 'git diff-{asterisk}' family works by first comparing two sets of files: - 'git diff-index' compares contents of a "tree" object and the - working directory (when '\--cached' flag is not used) or a - "tree" object and the index file (when '\--cached' flag is + working directory (when '--cached' flag is not used) or a + "tree" object and the index file (when '--cached' flag is used); - 'git diff-files' compares contents of the index file and the @@ -142,7 +142,7 @@ merges these filepairs and creates: When the "-C" option is used, the original contents of modified files, and deleted files (and also unmodified files, if the -"\--find-copies-harder" option is used) are considered as candidates +"--find-copies-harder" option is used) are considered as candidates of the source files in rename/copy operation. If the input were like these filepairs, that talk about a modified file fileY and a newly created file file0: diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt index 4fd0442..473623d 100644 --- a/Documentation/gitignore.txt +++ b/Documentation/gitignore.txt @@ -38,7 +38,7 @@ precedence, the last matching pattern decides the outcome): * Patterns read from `$GIT_DIR/info/exclude`. * Patterns read from the file specified by the configuration - variable 'core.excludesfile'. + variable 'core.excludesFile'. Which file to place a pattern in depends on how the pattern is meant to be used. @@ -56,7 +56,7 @@ be used. * Patterns which a user wants Git to ignore in all situations (e.g., backup or temporary files generated by the user's editor of choice) generally go into a file specified by - `core.excludesfile` in the user's `~/.gitconfig`. Its default value is + `core.excludesFile` in the user's `~/.gitconfig`. Its default value is $XDG_CONFIG_HOME/git/ignore. If $XDG_CONFIG_HOME is either not set or empty, $HOME/.config/git/ignore is used instead. diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt index 7ae50aa..6ade002 100644 --- a/Documentation/gitk.txt +++ b/Documentation/gitk.txt @@ -99,10 +99,10 @@ linkgit:git-rev-list[1] for a complete list. detailed explanation.) -L<start>,<end>:<file>:: --L:<regex>:<file>:: +-L:<funcname>:<file>:: Trace the evolution of the line range given by "<start>,<end>" - (or the funcname regex <regex>) within the <file>. You may + (or the function name regex <funcname>) within the <file>. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments. diff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.txt index 8edf72c..82e2d15 100644 --- a/Documentation/gitremote-helpers.txt +++ b/Documentation/gitremote-helpers.txt @@ -408,14 +408,14 @@ set by Git if the remote helper has the 'option' capability. of <n> correspond to the number of -v flags passed on the command line. -'option progress' \{'true'|'false'\}:: +'option progress' {'true'|'false'}:: Enables (or disables) progress messages displayed by the transport helper during a command. 'option depth' <depth>:: Deepens the history of a shallow repository. -'option followtags' \{'true'|'false'\}:: +'option followtags' {'true'|'false'}:: If enabled the helper should automatically fetch annotated tag objects if the object the tag points at was transferred during the fetch command. If the tag is not fetched by @@ -423,7 +423,7 @@ set by Git if the remote helper has the 'option' capability. ask for the tag specifically. Some helpers may be able to use this option to avoid a second network connection. -'option dry-run' \{'true'|'false'\}: +'option dry-run' {'true'|'false'}: If true, pretend the operation completed successfully, but don't actually change any repository data. For most helpers this only applies to the 'push', if supported. @@ -434,18 +434,18 @@ set by Git if the remote helper has the 'option' capability. must not rely on this option being set before connect request occurs. -'option check-connectivity' \{'true'|'false'\}:: +'option check-connectivity' {'true'|'false'}:: Request the helper to check connectivity of a clone. -'option force' \{'true'|'false'\}:: +'option force' {'true'|'false'}:: Request the helper to perform a force update. Defaults to 'false'. -'option cloning \{'true'|'false'\}:: +'option cloning {'true'|'false'}:: Notify the helper this is a clone request (i.e. the current repository is guaranteed empty). -'option update-shallow \{'true'|'false'\}:: +'option update-shallow {'true'|'false'}:: Allow to extend .git/shallow if the new refs require it. SEE ALSO diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt index 79653f3..7173b38 100644 --- a/Documentation/gitrepository-layout.txt +++ b/Documentation/gitrepository-layout.txt @@ -46,6 +46,9 @@ of incomplete object store is not suitable to be published for use with dumb transports but otherwise is OK as long as `objects/info/alternates` points at the object stores it borrows from. ++ +This directory is ignored if $GIT_COMMON_DIR is set and +"$GIT_COMMON_DIR/objects" will be used instead. objects/[0-9a-f][0-9a-f]:: A newly created object is stored in its own file. @@ -92,7 +95,8 @@ refs:: References are stored in subdirectories of this directory. The 'git prune' command knows to preserve objects reachable from refs found in this directory and - its subdirectories. + its subdirectories. This directory is ignored if $GIT_COMMON_DIR + is set and "$GIT_COMMON_DIR/refs" will be used instead. refs/heads/`name`:: records tip-of-the-tree commit objects of branch `name` @@ -114,7 +118,8 @@ refs/replace/`<obj-sha1>`:: packed-refs:: records the same information as refs/heads/, refs/tags/, and friends record in a more efficient way. See - linkgit:git-pack-refs[1]. + linkgit:git-pack-refs[1]. This file is ignored if $GIT_COMMON_DIR + is set and "$GIT_COMMON_DIR/packed-refs" will be used instead. HEAD:: A symref (see glossary) to the `refs/heads/` namespace @@ -133,6 +138,11 @@ being a symref to point at the current branch. Such a state is often called 'detached HEAD.' See linkgit:git-checkout[1] for details. +config:: + Repository specific configuration file. This file is ignored + if $GIT_COMMON_DIR is set and "$GIT_COMMON_DIR/config" will be + used instead. + branches:: A slightly deprecated way to store shorthands to be used to specify a URL to 'git fetch', 'git pull' and 'git push'. @@ -140,7 +150,10 @@ branches:: 'name' can be given to these commands in place of 'repository' argument. See the REMOTES section in linkgit:git-fetch[1] for details. This mechanism is legacy - and not likely to be found in modern repositories. + and not likely to be found in modern repositories. This + directory is ignored if $GIT_COMMON_DIR is set and + "$GIT_COMMON_DIR/branches" will be used instead. + hooks:: Hooks are customization scripts used by various Git @@ -149,7 +162,9 @@ hooks:: default. To enable, the `.sample` suffix has to be removed from the filename by renaming. Read linkgit:githooks[5] for more details about - each hook. + each hook. This directory is ignored if $GIT_COMMON_DIR is set + and "$GIT_COMMON_DIR/hooks" will be used instead. + index:: The current index file for the repository. It is @@ -161,7 +176,8 @@ sharedindex.<SHA-1>:: info:: Additional information about the repository is recorded - in this directory. + in this directory. This directory is ignored if $GIT_COMMON_DIR + is set and "$GIT_COMMON_DIR/index" will be used instead. info/refs:: This file helps dumb transports discover what refs are @@ -201,12 +217,15 @@ remotes:: when interacting with remote repositories via 'git fetch', 'git pull' and 'git push' commands. See the REMOTES section in linkgit:git-fetch[1] for details. This mechanism is legacy - and not likely to be found in modern repositories. + and not likely to be found in modern repositories. This + directory is ignored if $GIT_COMMON_DIR is set and + "$GIT_COMMON_DIR/remotes" will be used instead. logs:: - Records of changes made to refs are stored in this - directory. See linkgit:git-update-ref[1] - for more information. + Records of changes made to refs are stored in this directory. + See linkgit:git-update-ref[1] for more information. This + directory is ignored if $GIT_COMMON_DIR is set and + "$GIT_COMMON_DIR/logs" will be used instead. logs/refs/heads/`name`:: Records all changes made to the branch tip named `name`. @@ -217,11 +236,46 @@ logs/refs/tags/`name`:: shallow:: This is similar to `info/grafts` but is internally used and maintained by shallow clone mechanism. See `--depth` - option to linkgit:git-clone[1] and linkgit:git-fetch[1]. + option to linkgit:git-clone[1] and linkgit:git-fetch[1]. This + file is ignored if $GIT_COMMON_DIR is set and + "$GIT_COMMON_DIR/shallow" will be used instead. + +commondir:: + If this file exists, $GIT_COMMON_DIR (see linkgit:git[1]) will + be set to the path specified in this file if it is not + explicitly set. If the specified path is relative, it is + relative to $GIT_DIR. The repository with commondir is + incomplete without the repository pointed by "commondir". modules:: Contains the git-repositories of the submodules. +worktrees:: + Contains worktree specific information of linked + checkouts. Each subdirectory contains the worktree-related + part of a linked checkout. This directory is ignored if + $GIT_COMMON_DIR is set and "$GIT_COMMON_DIR/worktrees" will be + used instead. + +worktrees/<id>/gitdir:: + A text file containing the absolute path back to the .git file + that points to here. This is used to check if the linked + repository has been manually removed and there is no need to + keep this directory any more. mtime of this file should be + updated every time the linked repository is accessed. + +worktrees/<id>/locked:: + If this file exists, the linked repository may be on a + portable device and not available. It does not mean that the + linked repository is gone and `worktrees/<id>` could be + removed. The file's content contains a reason string on why + the repository is locked. + +worktrees/<id>/link:: + If this file exists, it is a hard link to the linked .git + file. It is used to detect if the linked repository is + manually removed. + SEE ALSO -------- linkgit:git-init[1], diff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt index ebe7a6c..a096e7d 100644 --- a/Documentation/gitweb.conf.txt +++ b/Documentation/gitweb.conf.txt @@ -482,7 +482,7 @@ project config. Per-repository configuration takes precedence over value composed from `@git_base_url_list` elements and project name. + You can setup one single value (single entry/item in this list) at build -time by setting the `GITWEB_BASE_URL` built-time configuration variable. +time by setting the `GITWEB_BASE_URL` build-time configuration variable. By default it is set to (), i.e. an empty list. This means that gitweb would not try to create project URL (to fetch) from project name. @@ -706,7 +706,7 @@ show-sizes:: I/O. Enabled by default. + This feature can be configured on a per-repository basis via -repository's `gitweb.showsizes` configuration variable (boolean). +repository's `gitweb.showSizes` configuration variable (boolean). patches:: Enable and configure "patches" view, which displays list of commits in email diff --git a/Documentation/howto/recover-corrupted-object-harder.txt b/Documentation/howto/recover-corrupted-object-harder.txt index 23e685d..9c4cd09 100644 --- a/Documentation/howto/recover-corrupted-object-harder.txt +++ b/Documentation/howto/recover-corrupted-object-harder.txt @@ -240,3 +240,240 @@ But more importantly, git's hashing and checksumming noticed a problem that easily could have gone undetected in another system. The result still compiled, but would have caused an interesting bug (that would have been blamed on some random commit). + + +The adventure continues... +-------------------------- + +I ended up doing this again! Same entity, new hardware. The assumption +at this point is that the old disk corrupted the packfile, and then the +corruption was migrated to the new hardware (because it was done by +rsync or similar, and no fsck was done at the time of migration). + +This time, the affected blob was over 20 megabytes, which was far too +large to do a brute-force on. I followed the instructions above to +create the `zlib` file. I then used the `inflate` program below to pull +the corrupted data from that. Examining that output gave me a hint about +where in the file the corruption was. But now I was working with the +file itself, not the zlib contents. So knowing the sha1 of the object +and the approximate area of the corruption, I used the `sha1-munge` +program below to brute-force the correct byte. + +Here's the inflate program (it's essentially `gunzip` but without the +`.gz` header processing): + +-------------------------- +#include <stdio.h> +#include <string.h> +#include <zlib.h> +#include <stdlib.h> + +int main(int argc, char **argv) +{ + /* + * oversized so we can read the whole buffer in; + * this could actually be switched to streaming + * to avoid any memory limitations + */ + static unsigned char buf[25 * 1024 * 1024]; + static unsigned char out[25 * 1024 * 1024]; + int len; + z_stream z; + int ret; + + len = read(0, buf, sizeof(buf)); + memset(&z, 0, sizeof(z)); + inflateInit(&z); + + z.next_in = buf; + z.avail_in = len; + z.next_out = out; + z.avail_out = sizeof(out); + + ret = inflate(&z, 0); + if (ret != Z_OK && ret != Z_STREAM_END) + fprintf(stderr, "initial inflate failed (%d)\n", ret); + + fprintf(stderr, "outputting %lu bytes", z.total_out); + fwrite(out, 1, z.total_out, stdout); + return 0; +} +-------------------------- + +And here is the `sha1-munge` program: + +-------------------------- +#include <stdio.h> +#include <unistd.h> +#include <string.h> +#include <signal.h> +#include <openssl/sha.h> +#include <stdlib.h> + +/* eye candy */ +static int counter = 0; +static void progress(int sig) +{ + fprintf(stderr, "\r%d", counter); + alarm(1); +} + +static const signed char hexval_table[256] = { + -1, -1, -1, -1, -1, -1, -1, -1, /* 00-07 */ + -1, -1, -1, -1, -1, -1, -1, -1, /* 08-0f */ + -1, -1, -1, -1, -1, -1, -1, -1, /* 10-17 */ + -1, -1, -1, -1, -1, -1, -1, -1, /* 18-1f */ + -1, -1, -1, -1, -1, -1, -1, -1, /* 20-27 */ + -1, -1, -1, -1, -1, -1, -1, -1, /* 28-2f */ + 0, 1, 2, 3, 4, 5, 6, 7, /* 30-37 */ + 8, 9, -1, -1, -1, -1, -1, -1, /* 38-3f */ + -1, 10, 11, 12, 13, 14, 15, -1, /* 40-47 */ + -1, -1, -1, -1, -1, -1, -1, -1, /* 48-4f */ + -1, -1, -1, -1, -1, -1, -1, -1, /* 50-57 */ + -1, -1, -1, -1, -1, -1, -1, -1, /* 58-5f */ + -1, 10, 11, 12, 13, 14, 15, -1, /* 60-67 */ + -1, -1, -1, -1, -1, -1, -1, -1, /* 68-67 */ + -1, -1, -1, -1, -1, -1, -1, -1, /* 70-77 */ + -1, -1, -1, -1, -1, -1, -1, -1, /* 78-7f */ + -1, -1, -1, -1, -1, -1, -1, -1, /* 80-87 */ + -1, -1, -1, -1, -1, -1, -1, -1, /* 88-8f */ + -1, -1, -1, -1, -1, -1, -1, -1, /* 90-97 */ + -1, -1, -1, -1, -1, -1, -1, -1, /* 98-9f */ + -1, -1, -1, -1, -1, -1, -1, -1, /* a0-a7 */ + -1, -1, -1, -1, -1, -1, -1, -1, /* a8-af */ + -1, -1, -1, -1, -1, -1, -1, -1, /* b0-b7 */ + -1, -1, -1, -1, -1, -1, -1, -1, /* b8-bf */ + -1, -1, -1, -1, -1, -1, -1, -1, /* c0-c7 */ + -1, -1, -1, -1, -1, -1, -1, -1, /* c8-cf */ + -1, -1, -1, -1, -1, -1, -1, -1, /* d0-d7 */ + -1, -1, -1, -1, -1, -1, -1, -1, /* d8-df */ + -1, -1, -1, -1, -1, -1, -1, -1, /* e0-e7 */ + -1, -1, -1, -1, -1, -1, -1, -1, /* e8-ef */ + -1, -1, -1, -1, -1, -1, -1, -1, /* f0-f7 */ + -1, -1, -1, -1, -1, -1, -1, -1, /* f8-ff */ +}; + +static inline unsigned int hexval(unsigned char c) +{ +return hexval_table[c]; +} + +static int get_sha1_hex(const char *hex, unsigned char *sha1) +{ + int i; + for (i = 0; i < 20; i++) { + unsigned int val; + /* + * hex[1]=='\0' is caught when val is checked below, + * but if hex[0] is NUL we have to avoid reading + * past the end of the string: + */ + if (!hex[0]) + return -1; + val = (hexval(hex[0]) << 4) | hexval(hex[1]); + if (val & ~0xff) + return -1; + *sha1++ = val; + hex += 2; + } + return 0; +} + +int main(int argc, char **argv) +{ + /* oversized so we can read the whole buffer in */ + static unsigned char buf[25 * 1024 * 1024]; + char header[32]; + int header_len; + unsigned char have[20], want[20]; + int start, len; + SHA_CTX orig; + unsigned i, j; + + if (!argv[1] || get_sha1_hex(argv[1], want)) { + fprintf(stderr, "usage: sha1-munge <sha1> [start] <file.in\n"); + return 1; + } + + if (argv[2]) + start = atoi(argv[2]); + else + start = 0; + + len = read(0, buf, sizeof(buf)); + header_len = sprintf(header, "blob %d", len) + 1; + fprintf(stderr, "using header: %s\n", header); + + /* + * We keep a running sha1 so that if you are munging + * near the end of the file, we do not have to re-sha1 + * the unchanged earlier bytes + */ + SHA1_Init(&orig); + SHA1_Update(&orig, header, header_len); + if (start) + SHA1_Update(&orig, buf, start); + + signal(SIGALRM, progress); + alarm(1); + + for (i = start; i < len; i++) { + unsigned char c; + SHA_CTX x; + +#if 0 + /* + * deletion -- this would not actually work in practice, + * I think, because we've already committed to a + * particular size in the header. Ditto for addition + * below. In those cases, you'd have to do the whole + * sha1 from scratch, or possibly keep three running + * "orig" sha1 computations going. + */ + memcpy(&x, &orig, sizeof(x)); + SHA1_Update(&x, buf + i + 1, len - i - 1); + SHA1_Final(have, &x); + if (!memcmp(have, want, 20)) + printf("i=%d, deletion\n", i); +#endif + + /* + * replacement -- note that this tries each of the 256 + * possible bytes. If you suspect a single-bit flip, + * it would be much shorter to just try the 8 + * bit-flipped variants. + */ + c = buf[i]; + for (j = 0; j <= 0xff; j++) { + buf[i] = j; + + memcpy(&x, &orig, sizeof(x)); + SHA1_Update(&x, buf + i, len - i); + SHA1_Final(have, &x); + if (!memcmp(have, want, 20)) + printf("i=%d, j=%02x\n", i, j); + } + buf[i] = c; + +#if 0 + /* addition */ + for (j = 0; j <= 0xff; j++) { + unsigned char extra = j; + memcpy(&x, &orig, sizeof(x)); + SHA1_Update(&x, &extra, 1); + SHA1_Update(&x, buf + i, len - i); + SHA1_Final(have, &x); + if (!memcmp(have, want, 20)) + printf("i=%d, addition=%02x", i, j); + } +#endif + + SHA1_Update(&orig, buf + i, 1); + counter++; + } + + alarm(0); + fprintf(stderr, "\r%d\n", counter); + return 0; +} +-------------------------- diff --git a/Documentation/line-range-format.txt b/Documentation/line-range-format.txt index d7f2603..829676f 100644 --- a/Documentation/line-range-format.txt +++ b/Documentation/line-range-format.txt @@ -22,8 +22,9 @@ This is only valid for <end> and will specify a number of lines before or after the line given by <start>. + -If ``:<regex>'' is given in place of <start> and <end>, it denotes the range -from the first funcname line that matches <regex>, up to the next -funcname line. ``:<regex>'' searches from the end of the previous `-L` range, -if any, otherwise from the start of file. -``^:<regex>'' searches from the start of file. +If ``:<funcname>'' is given in place of <start> and <end>, it is a +regular expression that denotes the range from the first funcname line +that matches <funcname>, up to the next funcname line. ``:<funcname>'' +searches from the end of the previous `-L` range, if any, otherwise +from the start of file. ``^:<funcname>'' searches from the start of +file. diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index d78d6d8..8a0e52f 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -1,4 +1,4 @@ -merge.conflictstyle:: +merge.conflictStyle:: Specify the style in which conflicted hunks are written out to working tree files upon merge. The default is "merge", which shows a `<<<<<<<` conflict marker, changes made by one side, diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 4ed8587..77ac439 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -59,8 +59,8 @@ endif::git-rev-list[] matches any of the given patterns are chosen (but see `--all-match`). + -When `--show-notes` is in effect, the message from the notes as -if it is part of the log message. +When `--show-notes` is in effect, the message from the notes is +matched as if it were part of the log message. --all-match:: Limit the commits output to ones that match all given `--grep`, @@ -123,7 +123,8 @@ parents) and `--max-parents=-1` (negative numbers denote no upper limit). because merges into a topic branch tend to be only about adjusting to updated upstream from time to time, and this option allows you to ignore the individual commits - brought in to your history by such a merge. + brought in to your history by such a merge. Cannot be + combined with --bisect. --not:: Reverses the meaning of the '{caret}' prefix (or lack thereof) @@ -185,7 +186,7 @@ ifndef::git-rev-list[] Pretend as if the bad bisection ref `refs/bisect/bad` was listed and as if it was followed by `--not` and the good bisection refs `refs/bisect/good-*` on the command - line. + line. Cannot be combined with --first-parent. endif::git-rev-list[] --stdin:: @@ -566,7 +567,7 @@ outputs 'midpoint', the output of the two commands would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length -one. +one. Cannot be combined with --first-parent. --bisect-vars:: This calculates the same as `--bisect`, except that refs in @@ -679,6 +680,7 @@ endif::git-rev-list[] given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. + Cannot be combined with `--graph`. --do-walk:: Overrides a previous `--no-walk`. @@ -781,6 +783,7 @@ you would get an output like this: on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. + Cannot be combined with `--no-walk`. + This enables parent rewriting, see 'History Simplification' below. + diff --git a/Documentation/technical/api-error-handling.txt b/Documentation/technical/api-error-handling.txt index fc68db1..ceeedd4 100644 --- a/Documentation/technical/api-error-handling.txt +++ b/Documentation/technical/api-error-handling.txt @@ -58,7 +58,7 @@ to `die` or `error` as-is. For example: if (ref_transaction_commit(transaction, &err)) die("%s", err.buf); -The 'err' parameter will be untouched if no error occured, so multiple +The 'err' parameter will be untouched if no error occurred, so multiple function calls can be chained: t = ref_transaction_begin(&err); diff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt index 462e206..fc09c63 100644 --- a/Documentation/technical/pack-protocol.txt +++ b/Documentation/technical/pack-protocol.txt @@ -465,7 +465,7 @@ contain all the objects that the server will need to complete the new references. ---- - update-request = *shallow ( command-list | push-cert ) [pack-file] + update-request = *shallow ( command-list | push-cert ) [packfile] shallow = PKT-LINE("shallow" SP obj-id LF) @@ -491,7 +491,7 @@ references. *PKT-LINE(gpg-signature-lines LF) PKT-LINE("push-cert-end" LF) - pack-file = "PACK" 28*(OCTET) + packfile = "PACK" 28*(OCTET) ---- If the receiving end does not support delete-refs, the sending end MUST @@ -502,11 +502,11 @@ MUST NOT send a push-cert command. When a push-cert command is sent, command-list MUST NOT be sent; the commands recorded in the push certificate is used instead. -The pack-file MUST NOT be sent if the only command used is 'delete'. +The packfile MUST NOT be sent if the only command used is 'delete'. -A pack-file MUST be sent if either create or update command is used, +A packfile MUST be sent if either create or update command is used, even if the server already has all the necessary objects. In this -case the client MUST send an empty pack-file. The only time this +case the client MUST send an empty packfile. The only time this is likely to happen is if the client is creating a new branch or a tag that points to an existing obj-id. diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 7330d88..68978f5 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -1200,7 +1200,7 @@ for other users who clone your repository. If you wish the exclude patterns to affect only certain repositories (instead of every repository for a given project), you may instead put them in a file in your repository named `.git/info/exclude`, or in any -file specified by the `core.excludesfile` configuration variable. +file specified by the `core.excludesFile` configuration variable. Some Git commands can also take exclude patterns directly on the command line. See linkgit:gitignore[5] for the details. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 5007865..bfb715d 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.3.2 +DEF_VER=v2.4.0.GIT LF=' ' @@ -357,6 +357,10 @@ all:: # and define it to "no" if you need to remove the parentheses () around the # constant. The default is "auto", which means to use parentheses if your # compiler is detected to support it. +# +# Define HAVE_BSD_SYSCTL if your platform has a BSD-compatible sysctl function. +# +# Define HAVE_GETDELIM if your system has the getdelim() function. GIT-VERSION-FILE: FORCE @$(SHELL_PATH) ./GIT-VERSION-GEN @@ -1432,6 +1436,14 @@ ifdef HAVE_CLOCK_MONOTONIC BASIC_CFLAGS += -DHAVE_CLOCK_MONOTONIC endif +ifdef HAVE_BSD_SYSCTL + BASIC_CFLAGS += -DHAVE_BSD_SYSCTL +endif + +ifdef HAVE_GETDELIM + BASIC_CFLAGS += -DHAVE_GETDELIM +endif + ifeq ($(TCLTK_PATH),) NO_TCLTK = NoThanks endif @@ -2097,6 +2109,7 @@ GIT-BUILD-OPTIONS: FORCE @echo PYTHON_PATH=\''$(subst ','\'',$(PYTHON_PATH_SQ))'\' >>$@ @echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@ @echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@ + @echo NO_EXPAT=\''$(subst ','\'',$(subst ','\'',$(NO_EXPAT)))'\' >>$@ @echo USE_LIBPCRE=\''$(subst ','\'',$(subst ','\'',$(USE_LIBPCRE)))'\' >>$@ @echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@ @echo NO_PYTHON=\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' >>$@ @@ -1,299 +1 @@ -Git ???? Release Notes -====================== - -Updates since v2.3 ------------------- - -Ports - - * Our default I/O size (8 MiB) for large files was too large for some - platforms with smaller SSIZE_MAX, leading to read(2)/write(2) - failures. - - * We did not check the curl library version before using - CURLOPT_PROXYAUTH feature that may not exist. - - -UI, Workflows & Features - - * The command usage info strings given by "git cmd -h" and in - documentation have been tweaked for consistency. - - * The "sync" subcommand of "git p4" now allows users to exclude - subdirectories like its "clone" subcommand does. - - * "git log --invert-grep --grep=WIP" will show only commits that do - not have the string "WIP" in their messages. - - * "git push" has been taught a "--atomic" option that makes push to - update more than one ref an "all-or-none" affair. - - * Extending the "push to deploy" added in 2.3, the behaviour of "git - push" when updating the branch that is checked out can now be - tweaked by push-to-checkout hook. - - * Using environment variable LANGUAGE and friends on the client side, - HTTP-based transports now send Accept-Language when making requests. - - * "git send-email" used to accept a mistaken "y" (or "yes") as an - answer to "What encoding do you want to use [UTF-8]? " without - questioning. Now it asks for confirmation when the answer looks - too short to be a valid encoding name. - - * When "git apply --whitespace=fix" fixed whitespace errors in the - common context lines, the command reports that it did so. - - -Performance, Internal Implementation, Development Support etc. - - * Implementation of N_() macro has been updated slightly to help us - detect mistakes. - - * Implementation of "reflog expire" has been restructured to fit the - reflogs better with the recently updated ref API. - - * The transport-helper did not give transport options such as - verbosity, progress, cloning, etc. to import and export based - helpers, like it did for fetch and push based helpers, robbing them - the chance to honor the wish of the end-users better. - - * The tests that wanted to see that file becomes unreadable after - running "chmod a-r file", and the tests that wanted to make sure it - is not run as root, we used "can we write into the / directory?" as - a cheap substitute, but on some platforms that is not a good - heuristics. The tests and their prerequisites have been updated to - check what they really require. - (merge f400e51 jk/sanity later to maint). - - * Various issues around "reflog expire", e.g. using --updateref when - expiring a reflog for a symbolic reference, have been corrected - and/or made saner. - - * The strbuf API was explained between the API documentation and in - the header file. Move missing bits to strbuf.h so that programmers - can check only one place for all necessary information. - - * The error handling functions and conventions are now documented in - the API manual. - - * Optimize attribute look-up, mostly useful in "git grep" on a - project that does not use many attributes, by avoiding it when we - (should) know that the attributes are not defined in the first - place. - - * Typofix in comments. - (merge ef2956a ak/git-pm-typofix later to maint). - - * Code clean-up. - (merge 0b868f0 sb/hex-object-name-is-at-most-41-bytes-long later to maint). - (merge 5d30851 dp/remove-duplicated-header-inclusion later to maint). - - * Simplify the ref transaction API around how "the ref should be - pointing at this object" is specified. - - -Also contains various documentation updates and code clean-ups. - - -Fixes since v2.3 ----------------- - -Unless otherwise noted, all the fixes since v2.3 in the maintenance -track are contained in this release (see the maintenance releases' -notes for details). - - * "git blame HEAD -- missing" failed to correctly say "HEAD" when it - tried to say "No such path 'missing' in HEAD". - (merge a46442f jk/blame-commit-label later to maint). - - * "git rerere" (invoked internally from many mergy operations) did - not correctly signal errors when told to update the working tree - files and failed to do so for whatever reason. - (merge 89ea903 jn/rerere-fail-on-auto-update-failure later to maint). - - * Setting diff.submodule to 'log' made "git format-patch" produce - broken patches. - (merge 339de50 dk/format-patch-ignore-diff-submodule later to maint). - - * After attempting and failing a password-less authentication - (e.g. kerberos), libcURL refuses to fall back to password based - Basic authentication without a bit of help/encouragement. - (merge 4dbe664 bc/http-fallback-to-password-after-krb-fails later to maint). - - * The "git push" documentation made the "--repo=<there>" option - easily misunderstood. - (merge 57b92a7 mg/push-repo-option-doc later to maint). - - * Code to read branch name from various files in .git/ directory - would have misbehaved if the code to write them left an empty file. - (merge 66ec904 jk/status-read-branch-name-fix later to maint). - - * A misspelled conditional that is always true has been fixed. - (merge 94ee8e2 jk/remote-curl-an-array-in-struct-cannot-be-null later to maint). - - * The documentation incorrectly said that C(opy) and R(ename) are the - only ones that can be followed by the score number in the output in - the --raw format. - (merge ac1c2d9 jc/diff-format-doc later to maint). - - * A broken pack .idx file in the receiving repository prevented the - dumb http transport from fetching a good copy of it from the other - side. - (merge 8b9c2dd jk/dumb-http-idx-fetch-fix later to maint). - - * The error message from "git commit", when a non-existing author - name was given as value to the "--author=" parameter, has been - reworded to avoid misunderstanding. - (merge 1044b1f mg/commit-author-no-match-malformed-message later to maint). - - * "git log --help" used to show rev-list options that are irrelevant - to the "log" command. - (merge 3cab02d jc/doc-log-rev-list-options later to maint). - - * "git apply --whitespace=fix" used to under-allocate the memory when - the fix resulted in a longer text than the original patch. - (merge 407a792 jc/apply-ws-fix-expands later to maint). - - * The interactive "show a list and let the user choose from it" - interface "add -i" used showed and prompted to the user even when - the candidate list was empty, against which the only "choice" the - user could have made was to choose nothing. - (merge a9c4641 ak/add-i-empty-candidates later to maint). - - * The insn sheet "git rebase -i" creates did not fully honor - core.abbrev settings. - (merge edb72d5 ks/rebase-i-abbrev later to maint). - - * "git fetch" over a remote-helper that cannot respond to "list" - command could not fetch from a symbolic reference e.g. HEAD. - (merge 33cae54 mh/deref-symref-over-helper-transport later to maint). - - * "git push --signed" gave an incorrectly worded error message when - the other side did not support the capability. - (merge 45917f0 jc/push-cert later to maint). - - * We didn't format an integer that wouldn't fit in "int" but in - "uintmax_t" correctly. - (merge d306f3d jk/decimal-width-for-uintmax later to maint). - - * Reading configuration from a blob object, when it ends with a lone - CR, use to confuse the configuration parser. - (merge 1d0655c jk/config-no-ungetc-eof later to maint). - - * The pack bitmap support did not build with older versions of GCC. - (merge bd4e882 jk/pack-bitmap later to maint). - - * The documentation wasn't clear that "remote.<nick>.pushURL" and - "remote.<nick>.URL" are there to name the same repository accessed - via different transports, not two separate repositories. - (merge 697f652 jc/remote-set-url-doc later to maint). - - * Older GnuPG implementations may not correctly import the keyring - material we prepare for the tests to use. - (merge 1f985d6 ch/new-gpg-drops-rfc-1991 later to maint). - - * The credential helper for Windows (in contrib/) used to mishandle - a user name with an at-sign in it. - (merge 13d261e av/wincred-with-at-in-username-fix later to maint). - - * Longstanding configuration variable naming rules has been added to - the documentation. - (merge 35840a3 jc/conf-var-doc later to maint). - - * An earlier workaround to squelch unhelpful deprecation warnings - from the complier on Mac OSX unnecessarily set minimum required - version of the OS, which the user might want to raise (or lower) - for other reasons. - (merge 88c03eb es/squelch-openssl-warnings-on-macosx later to maint). - - * Certain older vintages of cURL give irregular output from - "curl-config --vernum", which confused our build system. - (merge 3af6792 tc/curl-vernum-output-broken-in-7.11 later to maint). - - * In v2.2.0, we broke "git prune" that runs in a repository that - borrows from an alternate object store. - (merge b0a4264 jk/prune-mtime later to maint). - - * "git submodule add" failed to squash "path/to/././submodule" to - "path/to/submodule". - (merge 8196e72 ps/submodule-sanitize-path-upon-add later to maint). - - * "git merge-file" did not work correctly in a subdirectory. - (merge 204a8ff ab/merge-file-prefix later to maint). - - * "git blame" died, trying to free an uninitialized piece of memory. - (merge e600592 es/blame-commit-info-fix later to maint). - - * "git fast-import" used to crash when it could not close and - conclude the resulting packfile cleanly. - (merge 5e915f3 jk/fast-import-die-nicely-fix later to maint). - - * "update-index --refresh" used to leak when an entry cannot be - refreshed for whatever reason. - (merge bc1c2ca sb/plug-leak-in-make-cache-entry later to maint). - - * The "interpolated-path" option of "git daemon" inserted any string - client declared on the "host=" capability request without checking. - Sanitize and limit %H and %CH to a saner and a valid DNS name. - (merge b485373 jk/daemon-interpolate later to maint). - - * "git daemon" looked up the hostname even when "%CH" and "%IP" - interpolations are not requested, which was unnecessary. - (merge dc8edc8 rs/daemon-interpolate later to maint). - - * Even though we officially haven't dropped Perl 5.8 support, the - Getopt::Long package that came with it does not support "--no-" - prefix to negate a boolean option; manually add support to help - people with older Getopt::Long package. - (merge f471494 km/send-email-getopt-long-workarounds later to maint). - - * "git apply" was not very careful about reading from, removing, - updating and creating paths outside the working tree (under - --index/--cached) or the current directory (when used as a - replacement for GNU patch). - (merge e0d201b jc/apply-beyond-symlink later to maint). - - * A breakage to git-svn around v2.2 era that triggers premature - closing of FileHandle has been corrected. - (merge e426311 ew/svn-maint-fixes later to maint). - - * We did not parse username followed by literal IPv6 address in SSH - transport URLs, e.g. ssh://user@[2001:db8::1]:22/repo.git - correctly. - (merge 3f55cca tb/connect-ipv6-parse-fix later to maint). - - * The configuration variable 'mailinfo.scissors' was hard to - discover in the documentation. - (merge afb5de7 mm/am-c-doc later to maint). - - * The interaction between "git submodule update" and the - submodule.*.update configuration was not clearly documented. - (merge 5c31acf ms/submodule-update-config-doc later to maint). - - * "git diff --shortstat --dirstat=changes" showed a dirstat based on - lines that was never asked by the end user in addition to the - dirstat that the user asked for. - (merge ab27389 mk/diff-shortstat-dirstat-fix later to maint). - - * "git remote add" mentioned "--tags" and "--no-tags" and was not - clear that fetch from the remote in the future will use the default - behaviour when neither is given to override it. - (merge aaba0ab mg/doc-remote-tags-or-not later to maint). - - * Description given by "grep -h" for its --exclude-standard option - was phrased poorly. - (merge 77fdb8a nd/grep-exclude-standard-help-fix later to maint). - - * The borrowed code in kwset API did not follow our usual convention - to use "unsigned char" to store values that range from 0-255. - (merge 189c860 bw/kwset-use-unsigned later to maint). - - * A corrupt input to "git diff -M" used to cause it to segfault. - (merge 4d6be03 jk/diffcore-rename-duplicate later to maint). - - * Code cleanups and documentaiton updates. - (merge 2ce63e9 rs/simple-cleanups later to maint). - (merge 33baa69 rj/no-xopen-source-for-cygwin later to maint). - (merge 817d03e jc/diff-test-updates later to maint). - (merge eb32c66 ak/t5516-typofix later to maint). - (merge bcd57cb mr/doc-clean-f-f later to maint). +Documentation/RelNotes/2.5.0.txt
\ No newline at end of file diff --git a/archive-zip.c b/archive-zip.c index 4bde019..ae3d67f 100644 --- a/archive-zip.c +++ b/archive-zip.c @@ -5,6 +5,8 @@ #include "archive.h" #include "streaming.h" #include "utf8.h" +#include "userdiff.h" +#include "xdiff-interface.h" static int zip_date; static int zip_time; @@ -120,7 +122,6 @@ static void *zlib_deflate_raw(void *data, unsigned long size, void *buffer; int result; - memset(&stream, 0, sizeof(stream)); git_deflate_init_raw(&stream, compression_level); maxsize = git_deflate_bound(&stream, size); buffer = xmalloc(maxsize); @@ -189,6 +190,16 @@ static int has_only_ascii(const char *s) } } +static int entry_is_binary(const char *path, const void *buffer, size_t size) +{ + struct userdiff_driver *driver = userdiff_find_by_path(path); + if (!driver) + driver = userdiff_find_by_name("default"); + if (driver->binary != -1) + return driver->binary; + return buffer_is_binary(buffer, size); +} + #define STREAM_BUFFER_SIZE (1024 * 16) static int write_zip_entry(struct archiver_args *args, @@ -210,6 +221,8 @@ static int write_zip_entry(struct archiver_args *args, struct git_istream *stream = NULL; unsigned long flags = 0; unsigned long size; + int is_binary = -1; + const char *path_without_prefix = path + args->baselen; crc = crc32(0, NULL, 0); @@ -256,6 +269,8 @@ static int write_zip_entry(struct archiver_args *args, return error("cannot read %s", sha1_to_hex(sha1)); crc = crc32(crc, buffer, size); + is_binary = entry_is_binary(path_without_prefix, + buffer, size); out = buffer; } compressed_size = (method == 0) ? size : 0; @@ -300,7 +315,6 @@ static int write_zip_entry(struct archiver_args *args, copy_le16(dirent.extra_length, ZIP_EXTRA_MTIME_SIZE); copy_le16(dirent.comment_length, 0); copy_le16(dirent.disk, 0); - copy_le16(dirent.attr1, 0); copy_le32(dirent.attr2, attr2); copy_le32(dirent.offset, zip_offset); @@ -328,6 +342,9 @@ static int write_zip_entry(struct archiver_args *args, if (readlen <= 0) break; crc = crc32(crc, buf, readlen); + if (is_binary == -1) + is_binary = entry_is_binary(path_without_prefix, + buf, readlen); write_or_die(1, buf, readlen); } close_istream(stream); @@ -349,7 +366,6 @@ static int write_zip_entry(struct archiver_args *args, size_t out_len; unsigned char compressed[STREAM_BUFFER_SIZE * 2]; - memset(&zstream, 0, sizeof(zstream)); git_deflate_init_raw(&zstream, args->compression_level); compressed_size = 0; @@ -361,6 +377,9 @@ static int write_zip_entry(struct archiver_args *args, if (readlen <= 0) break; crc = crc32(crc, buf, readlen); + if (is_binary == -1) + is_binary = entry_is_binary(path_without_prefix, + buf, readlen); zstream.next_in = buf; zstream.avail_in = readlen; @@ -405,6 +424,8 @@ static int write_zip_entry(struct archiver_args *args, free(deflated); free(buffer); + copy_le16(dirent.attr1, !is_binary); + memcpy(zip_dir + zip_dir_offset, &dirent, ZIP_DIR_HEADER_SIZE); zip_dir_offset += ZIP_DIR_HEADER_SIZE; memcpy(zip_dir + zip_dir_offset, path, pathlen); @@ -427,12 +448,12 @@ static void write_zip_trailer(const unsigned char *sha1) copy_le16(trailer.entries, zip_dir_entries); copy_le32(trailer.size, zip_dir_offset); copy_le32(trailer.offset, zip_offset); - copy_le16(trailer.comment_length, sha1 ? 40 : 0); + copy_le16(trailer.comment_length, sha1 ? GIT_SHA1_HEXSZ : 0); write_or_die(1, zip_dir, zip_dir_offset); write_or_die(1, &trailer, ZIP_DIR_TRAILER_SIZE); if (sha1) - write_or_die(1, sha1_to_hex(sha1), 40); + write_or_die(1, sha1_to_hex(sha1), GIT_SHA1_HEXSZ); } static void dos_time(time_t *time, int *dos_date, int *dos_time) @@ -101,7 +101,7 @@ static void setup_archive_check(struct git_attr_check *check) struct directory { struct directory *up; - unsigned char sha1[20]; + struct object_id oid; int baselen, len; unsigned mode; int stage; @@ -177,7 +177,7 @@ static void queue_directory(const unsigned char *sha1, d->stage = stage; c->bottom = d; d->len = sprintf(d->path, "%.*s%s/", (int)base->len, base->buf, filename); - hashcpy(d->sha1, sha1); + hashcpy(d->oid.hash, sha1); } static int write_directory(struct archiver_context *c) @@ -191,7 +191,7 @@ static int write_directory(struct archiver_context *c) d->path[d->len - 1] = '\0'; /* no trailing slash */ ret = write_directory(c) || - write_archive_entry(d->sha1, d->path, d->baselen, + write_archive_entry(d->oid.hash, d->path, d->baselen, d->path + d->baselen, d->mode, d->stage, c) != READ_TREE_RECURSIVE; free(d); @@ -354,7 +354,7 @@ static void parse_treeish_arg(const char **argv, time_t archive_time; struct tree *tree; const struct commit *commit; - unsigned char sha1[20]; + struct object_id oid; /* Remotes are only allowed to fetch actual refs */ if (remote && !remote_allow_unreachable) { @@ -362,15 +362,15 @@ static void parse_treeish_arg(const char **argv, const char *colon = strchrnul(name, ':'); int refnamelen = colon - name; - if (!dwim_ref(name, refnamelen, sha1, &ref)) + if (!dwim_ref(name, refnamelen, oid.hash, &ref)) die("no such ref: %.*s", refnamelen, name); free(ref); } - if (get_sha1(name, sha1)) + if (get_sha1(name, oid.hash)) die("Not a valid object name"); - commit = lookup_commit_reference_gently(sha1, 1); + commit = lookup_commit_reference_gently(oid.hash, 1); if (commit) { commit_sha1 = commit->object.sha1; archive_time = commit->date; @@ -379,21 +379,21 @@ static void parse_treeish_arg(const char **argv, archive_time = time(NULL); } - tree = parse_tree_indirect(sha1); + tree = parse_tree_indirect(oid.hash); if (tree == NULL) die("not a tree object"); if (prefix) { - unsigned char tree_sha1[20]; + struct object_id tree_oid; unsigned int mode; int err; err = get_tree_entry(tree->object.sha1, prefix, - tree_sha1, &mode); + tree_oid.hash, &mode); if (err || !S_ISDIR(mode)) die("current working directory is untracked"); - tree = parse_tree_indirect(tree_sha1); + tree = parse_tree_indirect(tree_oid.hash); } ar_args->tree = tree; ar_args->commit_sha1 = commit_sha1; @@ -12,6 +12,7 @@ #include "exec_cmd.h" #include "attr.h" #include "dir.h" +#include "utf8.h" const char git_attr__true[] = "(builtin)true"; const char git_attr__false[] = "\0(builtin)false"; @@ -379,8 +380,12 @@ static struct attr_stack *read_attr_from_file(const char *path, int macro_ok) return NULL; } res = xcalloc(1, sizeof(*res)); - while (fgets(buf, sizeof(buf), fp)) - handle_attr_line(res, buf, path, ++lineno, macro_ok); + while (fgets(buf, sizeof(buf), fp)) { + char *bufp = buf; + if (!lineno) + skip_utf8_bom(&bufp, strlen(bufp)); + handle_attr_line(res, bufp, path, ++lineno, macro_ok); + } fclose(fp); return res; } @@ -488,7 +493,6 @@ static int git_attr_system(void) static void bootstrap_attr_stack(void) { struct attr_stack *elem; - char *xdg_attributes_file; if (attr_stack) return; @@ -507,10 +511,8 @@ static void bootstrap_attr_stack(void) } } - if (!git_attributes_file) { - home_config_paths(NULL, &xdg_attributes_file, "attributes"); - git_attributes_file = xdg_attributes_file; - } + if (!git_attributes_file) + git_attributes_file = xdg_config_home("attributes"); if (git_attributes_file) { elem = read_attr_from_file(git_attributes_file, 1); if (elem) { @@ -15,7 +15,7 @@ static struct sha1_array good_revs; static struct sha1_array skipped_revs; -static unsigned char *current_bad_sha1; +static struct object_id *current_bad_oid; static const char *argv_checkout[] = {"checkout", "-q", NULL, "--", NULL}; static const char *argv_show_branch[] = {"show-branch", NULL, NULL}; @@ -404,8 +404,8 @@ static int register_ref(const char *refname, const unsigned char *sha1, int flags, void *cb_data) { if (!strcmp(refname, "bad")) { - current_bad_sha1 = xmalloc(20); - hashcpy(current_bad_sha1, sha1); + current_bad_oid = xmalloc(sizeof(*current_bad_oid)); + hashcpy(current_bad_oid->hash, sha1); } else if (starts_with(refname, "good-")) { sha1_array_append(&good_revs, sha1); } else if (starts_with(refname, "skip-")) { @@ -564,7 +564,7 @@ static struct commit_list *skip_away(struct commit_list *list, int count) for (i = 0; cur; cur = cur->next, i++) { if (i == index) { - if (hashcmp(cur->item->object.sha1, current_bad_sha1)) + if (hashcmp(cur->item->object.sha1, current_bad_oid->hash)) return cur; if (previous) return previous; @@ -607,7 +607,7 @@ static void bisect_rev_setup(struct rev_info *revs, const char *prefix, /* rev_argv.argv[0] will be ignored by setup_revisions */ argv_array_push(&rev_argv, "bisect_rev_setup"); - argv_array_pushf(&rev_argv, bad_format, sha1_to_hex(current_bad_sha1)); + argv_array_pushf(&rev_argv, bad_format, oid_to_hex(current_bad_oid)); for (i = 0; i < good_revs.nr; i++) argv_array_pushf(&rev_argv, good_format, sha1_to_hex(good_revs.sha1[i])); @@ -628,7 +628,7 @@ static void bisect_common(struct rev_info *revs) } static void exit_if_skipped_commits(struct commit_list *tried, - const unsigned char *bad) + const struct object_id *bad) { if (!tried) return; @@ -637,12 +637,12 @@ static void exit_if_skipped_commits(struct commit_list *tried, "The first bad commit could be any of:\n"); print_commit_list(tried, "%s\n", "%s\n"); if (bad) - printf("%s\n", sha1_to_hex(bad)); + printf("%s\n", oid_to_hex(bad)); printf("We cannot bisect more!\n"); exit(2); } -static int is_expected_rev(const unsigned char *sha1) +static int is_expected_rev(const struct object_id *oid) { const char *filename = git_path("BISECT_EXPECTED_REV"); struct stat st; @@ -658,7 +658,7 @@ static int is_expected_rev(const unsigned char *sha1) return 0; if (strbuf_getline(&str, fp, '\n') != EOF) - res = !strcmp(str.buf, sha1_to_hex(sha1)); + res = !strcmp(str.buf, oid_to_hex(oid)); strbuf_release(&str); fclose(fp); @@ -719,7 +719,7 @@ static struct commit **get_bad_and_good_commits(int *rev_nr) struct commit **rev = xmalloc(len * sizeof(*rev)); int i, n = 0; - rev[n++] = get_commit_reference(current_bad_sha1); + rev[n++] = get_commit_reference(current_bad_oid->hash); for (i = 0; i < good_revs.nr; i++) rev[n++] = get_commit_reference(good_revs.sha1[i]); *rev_nr = n; @@ -729,8 +729,8 @@ static struct commit **get_bad_and_good_commits(int *rev_nr) static void handle_bad_merge_base(void) { - if (is_expected_rev(current_bad_sha1)) { - char *bad_hex = sha1_to_hex(current_bad_sha1); + if (is_expected_rev(current_bad_oid)) { + char *bad_hex = oid_to_hex(current_bad_oid); char *good_hex = join_sha1_array_hex(&good_revs, ' '); fprintf(stderr, "The merge base %s is bad.\n" @@ -750,7 +750,7 @@ static void handle_bad_merge_base(void) static void handle_skipped_merge_base(const unsigned char *mb) { char *mb_hex = sha1_to_hex(mb); - char *bad_hex = sha1_to_hex(current_bad_sha1); + char *bad_hex = sha1_to_hex(current_bad_oid->hash); char *good_hex = join_sha1_array_hex(&good_revs, ' '); warning("the merge base between %s and [%s] " @@ -781,7 +781,7 @@ static void check_merge_bases(int no_checkout) for (; result; result = result->next) { const unsigned char *mb = result->item->object.sha1; - if (!hashcmp(mb, current_bad_sha1)) { + if (!hashcmp(mb, current_bad_oid->hash)) { handle_bad_merge_base(); } else if (0 <= sha1_array_lookup(&good_revs, mb)) { continue; @@ -838,7 +838,7 @@ static void check_good_are_ancestors_of_bad(const char *prefix, int no_checkout) struct stat st; int fd; - if (!current_bad_sha1) + if (!current_bad_oid) die("a bad revision is needed"); /* Check if file BISECT_ANCESTORS_OK exists. */ @@ -903,7 +903,7 @@ int bisect_next_all(const char *prefix, int no_checkout) struct commit_list *tried; int reaches = 0, all = 0, nr, steps; const unsigned char *bisect_rev; - char bisect_rev_hex[41]; + char bisect_rev_hex[GIT_SHA1_HEXSZ + 1]; if (read_bisect_refs()) die("reading bisect refs failed"); @@ -927,7 +927,7 @@ int bisect_next_all(const char *prefix, int no_checkout) exit_if_skipped_commits(tried, NULL); printf("%s was both good and bad\n", - sha1_to_hex(current_bad_sha1)); + oid_to_hex(current_bad_oid)); exit(1); } @@ -938,10 +938,10 @@ int bisect_next_all(const char *prefix, int no_checkout) } bisect_rev = revs.commits->item->object.sha1; - memcpy(bisect_rev_hex, sha1_to_hex(bisect_rev), 41); + memcpy(bisect_rev_hex, sha1_to_hex(bisect_rev), GIT_SHA1_HEXSZ + 1); - if (!hashcmp(bisect_rev, current_bad_sha1)) { - exit_if_skipped_commits(tried, current_bad_sha1); + if (!hashcmp(bisect_rev, current_bad_oid->hash)) { + exit_if_skipped_commits(tried, current_bad_oid); printf("%s is the first bad commit\n", bisect_rev_hex); show_diff_tree(prefix, revs.commits->item); /* This means the bisection process succeeded. */ diff --git a/builtin/add.c b/builtin/add.c index 3390933..df5135b 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -63,6 +63,7 @@ static void update_callback(struct diff_queue_struct *q, switch (fix_unmerged_status(p, data)) { default: die(_("unexpected diff status %c"), p->status); + case DIFF_STATUS_ADDED: case DIFF_STATUS_MODIFIED: case DIFF_STATUS_TYPE_CHANGED: if (add_file_to_index(&the_index, path, data->flags)) { @@ -208,7 +209,8 @@ static int edit_patch(int argc, const char **argv, const char *prefix) if (run_diff_files(&rev, 0)) die(_("Could not write patch")); - launch_editor(file, NULL, NULL); + if (launch_editor(file, NULL, NULL)) + die(_("editing patch failed")); if (stat(file, &st)) die_errno(_("Could not stat '%s'"), file); diff --git a/builtin/apply.c b/builtin/apply.c index 65b97ee..146be97 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -208,7 +208,7 @@ struct patch { struct patch *next; /* three-way fallback result */ - unsigned char threeway_stage[3][20]; + struct object_id threeway_stage[3]; }; static void free_fragment_list(struct fragment *list) @@ -2776,7 +2776,8 @@ static int apply_one_fragment(struct image *img, struct fragment *frag, default: if (apply_verbosely) error(_("invalid start of line: '%c'"), first); - return -1; + applied_pos = -1; + goto out; } if (added_blank_line) { if (!new_blank_lines_at_end) @@ -2915,6 +2916,7 @@ static int apply_one_fragment(struct image *img, struct fragment *frag, (int)(old - oldlines), oldlines); } +out: free(oldlines); strbuf_release(&newlines); free(preimage.line_allocated); @@ -3424,11 +3426,11 @@ static int try_threeway(struct image *image, struct patch *patch, if (status) { patch->conflicted_threeway = 1; if (patch->is_new) - hashclr(patch->threeway_stage[0]); + oidclr(&patch->threeway_stage[0]); else - hashcpy(patch->threeway_stage[0], pre_sha1); - hashcpy(patch->threeway_stage[1], our_sha1); - hashcpy(patch->threeway_stage[2], post_sha1); + hashcpy(patch->threeway_stage[0].hash, pre_sha1); + hashcpy(patch->threeway_stage[1].hash, our_sha1); + hashcpy(patch->threeway_stage[2].hash, post_sha1); fprintf(stderr, "Applied patch to '%s' with conflicts.\n", patch->new_name); } else { fprintf(stderr, "Applied patch to '%s' cleanly.\n", patch->new_name); @@ -4184,14 +4186,14 @@ static void add_conflicted_stages_file(struct patch *patch) remove_file_from_cache(patch->new_name); for (stage = 1; stage < 4; stage++) { - if (is_null_sha1(patch->threeway_stage[stage - 1])) + if (is_null_oid(&patch->threeway_stage[stage - 1])) continue; ce = xcalloc(1, ce_size); memcpy(ce->name, patch->new_name, namelen); ce->ce_mode = create_ce_mode(mode); ce->ce_flags = create_ce_flags(stage); ce->ce_namelen = namelen; - hashcpy(ce->sha1, patch->threeway_stage[stage - 1]); + hashcpy(ce->sha1, patch->threeway_stage[stage - 1].hash); if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0) die(_("unable to add cache entry for %s"), patch->new_name); } diff --git a/builtin/blame.c b/builtin/blame.c index 06484c2..8d70623 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -2348,6 +2348,7 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt, if (strbuf_read(&buf, 0, 0) < 0) die_errno("failed to read from stdin"); } + convert_to_git(path, buf.buf, buf.len, &buf, 0); origin->file.ptr = buf.buf; origin->file.size = buf.len; pretend_sha1_file(buf.buf, buf.len, OBJ_BLOB, origin->blob_sha1); diff --git a/builtin/branch.c b/builtin/branch.c index 6a25957..9cbab18 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -242,7 +242,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds, sha1, &flags); if (!target) { error(remote_branch - ? _("remote branch '%s' not found.") + ? _("remote-tracking branch '%s' not found.") : _("branch '%s' not found."), bname.buf); ret = 1; continue; @@ -257,7 +257,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds, if (delete_ref(name, sha1, REF_NODEREF)) { error(remote_branch - ? _("Error deleting remote branch '%s'") + ? _("Error deleting remote-tracking branch '%s'") : _("Error deleting branch '%s'"), bname.buf); ret = 1; @@ -265,7 +265,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds, } if (!quiet) { printf(remote_branch - ? _("Deleted remote branch %s (was %s).\n") + ? _("Deleted remote-tracking branch %s (was %s).\n") : _("Deleted branch %s (was %s).\n"), bname.buf, (flags & REF_ISBROKEN) ? "broken" @@ -589,9 +589,16 @@ static char *get_head_description(void) else if (state.bisect_in_progress) strbuf_addf(&desc, _("(no branch, bisect started on %s)"), state.branch); - else if (state.detached_from) - strbuf_addf(&desc, _("(detached from %s)"), - state.detached_from); + else if (state.detached_from) { + /* TRANSLATORS: make sure these match _("HEAD detached at ") + and _("HEAD detached from ") in wt-status.c */ + if (state.detached_at) + strbuf_addf(&desc, _("(HEAD detached at %s)"), + state.detached_from); + else + strbuf_addf(&desc, _("(HEAD detached from %s)"), + state.detached_from); + } else strbuf_addstr(&desc, _("(no branch)")); free(state.branch); @@ -764,7 +771,6 @@ static const char edit_description[] = "BRANCH_DESCRIPTION"; static int edit_branch_description(const char *branch_name) { - FILE *fp; int status; struct strbuf buf = STRBUF_INIT; struct strbuf name = STRBUF_INIT; @@ -777,8 +783,7 @@ static int edit_branch_description(const char *branch_name) " %s\n" "Lines starting with '%c' will be stripped.\n", branch_name, comment_line_char); - fp = fopen(git_path(edit_description), "w"); - if ((fwrite(buf.buf, 1, buf.len, fp) < buf.len) || fclose(fp)) { + if (write_file(git_path(edit_description), 0, "%s", buf.buf)) { strbuf_release(&buf); return error(_("could not write branch description template: %s"), strerror(errno)); diff --git a/builtin/bundle.c b/builtin/bundle.c index 92a8a60..4883a43 100644 --- a/builtin/bundle.c +++ b/builtin/bundle.c @@ -42,6 +42,10 @@ int cmd_bundle(int argc, const char **argv, const char *prefix) if (!strcmp(cmd, "verify")) { close(bundle_fd); + if (argc != 1) { + usage(builtin_bundle_usage); + return 1; + } if (verify_bundle(&header, 1)) return 1; fprintf(stderr, _("%s is okay\n"), bundle_file); @@ -52,6 +56,10 @@ int cmd_bundle(int argc, const char **argv, const char *prefix) return !!list_bundle_refs(&header, argc, argv); } if (!strcmp(cmd, "create")) { + if (argc < 2) { + usage(builtin_bundle_usage); + return 1; + } if (!startup_info->have_repository) die(_("Need a repository to create a bundle.")); return !!create_bundle(&header, bundle_file, argc, argv); diff --git a/builtin/cat-file.c b/builtin/cat-file.c index df99df4..ecb4888 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -9,13 +9,20 @@ #include "userdiff.h" #include "streaming.h" -static int cat_one_file(int opt, const char *exp_type, const char *obj_name) +static int cat_one_file(int opt, const char *exp_type, const char *obj_name, + int unknown_type) { unsigned char sha1[20]; enum object_type type; char *buf; unsigned long size; struct object_context obj_context; + struct object_info oi = {NULL}; + struct strbuf sb = STRBUF_INIT; + unsigned flags = LOOKUP_REPLACE_OBJECT; + + if (unknown_type) + flags |= LOOKUP_UNKNOWN_OBJECT; if (get_sha1_with_context(obj_name, 0, sha1, &obj_context)) die("Not a valid object name %s", obj_name); @@ -23,20 +30,22 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name) buf = NULL; switch (opt) { case 't': - type = sha1_object_info(sha1, NULL); - if (type > 0) { - printf("%s\n", typename(type)); + oi.typename = &sb; + if (sha1_object_info_extended(sha1, &oi, flags) < 0) + die("git cat-file: could not get object info"); + if (sb.len) { + printf("%s\n", sb.buf); + strbuf_release(&sb); return 0; } break; case 's': - type = sha1_object_info(sha1, &size); - if (type > 0) { - printf("%lu\n", size); - return 0; - } - break; + oi.sizep = &size; + if (sha1_object_info_extended(sha1, &oi, flags) < 0) + die("git cat-file: could not get object info"); + printf("%lu\n", size); + return 0; case 'e': return !has_sha1_file(sha1); @@ -323,7 +332,7 @@ static int batch_objects(struct batch_options *opt) } static const char * const cat_file_usage[] = { - N_("git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>"), + N_("git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<type>|--textconv) <object>"), N_("git cat-file (--batch | --batch-check) < <list-of-objects>"), NULL }; @@ -359,16 +368,19 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix) int opt = 0; const char *exp_type = NULL, *obj_name = NULL; struct batch_options batch = {0}; + int unknown_type = 0; const struct option options[] = { OPT_GROUP(N_("<type> can be one of: blob, tree, commit, tag")), - OPT_SET_INT('t', NULL, &opt, N_("show object type"), 't'), - OPT_SET_INT('s', NULL, &opt, N_("show object size"), 's'), - OPT_SET_INT('e', NULL, &opt, + OPT_CMDMODE('t', NULL, &opt, N_("show object type"), 't'), + OPT_CMDMODE('s', NULL, &opt, N_("show object size"), 's'), + OPT_CMDMODE('e', NULL, &opt, N_("exit with zero when there's no error"), 'e'), - OPT_SET_INT('p', NULL, &opt, N_("pretty-print object's content"), 'p'), - OPT_SET_INT(0, "textconv", &opt, + OPT_CMDMODE('p', NULL, &opt, N_("pretty-print object's content"), 'p'), + OPT_CMDMODE(0, "textconv", &opt, N_("for blob objects, run textconv on object's content"), 'c'), + OPT_BOOL( 0, "allow-unknown-type", &unknown_type, + N_("allow -s and -t to work with broken/corrupt objects")), { OPTION_CALLBACK, 0, "batch", &batch, "format", N_("show info and content of objects fed from the standard input"), PARSE_OPT_OPTARG, batch_option_callback }, @@ -380,9 +392,6 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix) git_config(git_cat_file_config, NULL); - if (argc != 3 && argc != 2) - usage_with_options(cat_file_usage, options); - argc = parse_options(argc, argv, prefix, options, cat_file_usage, 0); if (opt) { @@ -405,5 +414,7 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix) if (batch.enabled) return batch_objects(&batch); - return cat_one_file(opt, exp_type, obj_name); + if (unknown_type && opt != 't' && opt != 's') + die("git cat-file --allow-unknown-type: use with -s or -t"); + return cat_one_file(opt, exp_type, obj_name, unknown_type); } diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c index 9ca2da1..8028c37 100644 --- a/builtin/checkout-index.c +++ b/builtin/checkout-index.c @@ -241,7 +241,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix) /* Check out named files first */ for (i = 0; i < argc; i++) { const char *arg = argv[i]; - const char *p; + char *p; if (all) die("git checkout-index: don't mix '--all' and explicit filenames"); @@ -249,8 +249,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix) die("git checkout-index: don't mix '--stdin' and explicit filenames"); p = prefix_path(prefix, prefix_length, arg); checkout_file(p, prefix); - if (p < arg || p > arg + strlen(arg)) - free((char *)p); + free(p); } if (read_from_stdin) { @@ -260,7 +259,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix) die("git checkout-index: don't mix '--all' and '--stdin'"); while (strbuf_getline(&buf, stdin, line_termination) != EOF) { - const char *p; + char *p; if (line_termination && buf.buf[0] == '"') { strbuf_reset(&nbuf); if (unquote_c_style(&nbuf, buf.buf, NULL)) @@ -269,8 +268,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix) } p = prefix_path(prefix, prefix_length, buf.buf); checkout_file(p, prefix); - if (p < buf.buf || p > buf.buf + buf.len) - free((char *)p); + free(p); } strbuf_release(&nbuf); strbuf_release(&buf); diff --git a/builtin/checkout.c b/builtin/checkout.c index 3e141fc..2f92328 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -20,6 +20,7 @@ #include "resolve-undo.h" #include "submodule.h" #include "argv-array.h" +#include "sigchain.h" static const char * const checkout_usage[] = { N_("git checkout [<options>] <branch>"), @@ -36,6 +37,7 @@ struct checkout_opts { int writeout_stage; int overwrite_ignore; int ignore_skipworktree; + int ignore_other_worktrees; const char *new_branch; const char *new_branch_force; @@ -48,6 +50,10 @@ struct checkout_opts { const char *prefix; struct pathspec pathspec; struct tree *source_tree; + + const char *new_worktree; + const char **saved_argv; + int new_worktree_mode; }; static int post_checkout_hook(struct commit *old, struct commit *new, @@ -267,6 +273,9 @@ static int checkout_paths(const struct checkout_opts *opts, die(_("Cannot update paths and switch to branch '%s' at the same time."), opts->new_branch); + if (opts->new_worktree) + die(_("'%s' cannot be used with updating paths"), "--to"); + if (opts->patch_mode) return run_add_interactive(revision, "--patch=checkout", &opts->pathspec); @@ -441,6 +450,11 @@ struct branch_info { const char *name; /* The short name used */ const char *path; /* The full name of a real branch */ struct commit *commit; /* The named commit */ + /* + * if not null the branch is detached because it's already + * checked out in this checkout + */ + char *checkout; }; static void setup_branch_path(struct branch_info *branch) @@ -502,7 +516,7 @@ static int merge_working_tree(const struct checkout_opts *opts, topts.dir->flags |= DIR_SHOW_IGNORED; setup_standard_excludes(topts.dir); } - tree = parse_tree_indirect(old->commit ? + tree = parse_tree_indirect(old->commit && !opts->new_worktree_mode ? old->commit->object.sha1 : EMPTY_TREE_SHA1_BIN); init_tree_desc(&trees[0], tree->buffer, tree->size); @@ -606,18 +620,21 @@ static void update_refs_for_switch(const struct checkout_opts *opts, if (opts->new_orphan_branch) { if (opts->new_branch_log && !log_all_ref_updates) { int temp; - char log_file[PATH_MAX]; - char *ref_name = mkpath("refs/heads/%s", opts->new_orphan_branch); + struct strbuf log_file = STRBUF_INIT; + int ret; + const char *ref_name; + ref_name = mkpath("refs/heads/%s", opts->new_orphan_branch); temp = log_all_ref_updates; log_all_ref_updates = 1; - if (log_ref_setup(ref_name, log_file, sizeof(log_file))) { + ret = log_ref_setup(ref_name, &log_file); + log_all_ref_updates = temp; + strbuf_release(&log_file); + if (ret) { fprintf(stderr, _("Can not do reflog for '%s'\n"), opts->new_orphan_branch); - log_all_ref_updates = temp; return; } - log_all_ref_updates = temp; } } else @@ -743,10 +760,17 @@ static void suggest_reattach(struct commit *commit, struct rev_info *revs) if (advice_detached_head) fprintf(stderr, - _( + Q_( + /* The singular version */ + "If you want to keep it by creating a new branch, " + "this may be a good time\nto do so with:\n\n" + " git branch <new-branch-name> %s\n\n", + /* The plural version */ "If you want to keep them by creating a new branch, " "this may be a good time\nto do so with:\n\n" - " git branch <new-branch-name> %s\n\n"), + " git branch <new-branch-name> %s\n\n", + /* Give ngettext() the count */ + lost), find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV)); } @@ -815,7 +839,8 @@ static int switch_branches(const struct checkout_opts *opts, return ret; } - if (!opts->quiet && !old.path && old.commit && new->commit != old.commit) + if (!opts->quiet && !old.path && old.commit && + new->commit != old.commit && !opts->new_worktree_mode) orphaned_commit_warning(old.commit, new->commit); update_refs_for_switch(opts, &old, new); @@ -825,6 +850,138 @@ static int switch_branches(const struct checkout_opts *opts, return ret || writeout_error; } +static char *junk_work_tree; +static char *junk_git_dir; +static int is_junk; +static pid_t junk_pid; + +static void remove_junk(void) +{ + struct strbuf sb = STRBUF_INIT; + if (!is_junk || getpid() != junk_pid) + return; + if (junk_git_dir) { + strbuf_addstr(&sb, junk_git_dir); + remove_dir_recursively(&sb, 0); + strbuf_reset(&sb); + } + if (junk_work_tree) { + strbuf_addstr(&sb, junk_work_tree); + remove_dir_recursively(&sb, 0); + } + strbuf_release(&sb); +} + +static void remove_junk_on_signal(int signo) +{ + remove_junk(); + sigchain_pop(signo); + raise(signo); +} + +static int prepare_linked_checkout(const struct checkout_opts *opts, + struct branch_info *new) +{ + struct strbuf sb_git = STRBUF_INIT, sb_repo = STRBUF_INIT; + struct strbuf sb = STRBUF_INIT; + const char *path = opts->new_worktree, *name; + struct stat st; + struct child_process cp; + int counter = 0, len, ret; + + if (!new->commit) + die(_("no branch specified")); + if (file_exists(path) && !is_empty_dir(path)) + die(_("'%s' already exists"), path); + + len = strlen(path); + while (len && is_dir_sep(path[len - 1])) + len--; + + for (name = path + len - 1; name > path; name--) + if (is_dir_sep(*name)) { + name++; + break; + } + strbuf_addstr(&sb_repo, + git_path("worktrees/%.*s", (int)(path + len - name), name)); + len = sb_repo.len; + if (safe_create_leading_directories_const(sb_repo.buf)) + die_errno(_("could not create leading directories of '%s'"), + sb_repo.buf); + while (!stat(sb_repo.buf, &st)) { + counter++; + strbuf_setlen(&sb_repo, len); + strbuf_addf(&sb_repo, "%d", counter); + } + name = strrchr(sb_repo.buf, '/') + 1; + + junk_pid = getpid(); + atexit(remove_junk); + sigchain_push_common(remove_junk_on_signal); + + if (mkdir(sb_repo.buf, 0777)) + die_errno(_("could not create directory of '%s'"), sb_repo.buf); + junk_git_dir = xstrdup(sb_repo.buf); + is_junk = 1; + + /* + * lock the incomplete repo so prune won't delete it, unlock + * after the preparation is over. + */ + strbuf_addf(&sb, "%s/locked", sb_repo.buf); + write_file(sb.buf, 1, "initializing\n"); + + strbuf_addf(&sb_git, "%s/.git", path); + if (safe_create_leading_directories_const(sb_git.buf)) + die_errno(_("could not create leading directories of '%s'"), + sb_git.buf); + junk_work_tree = xstrdup(path); + + strbuf_reset(&sb); + strbuf_addf(&sb, "%s/gitdir", sb_repo.buf); + write_file(sb.buf, 1, "%s\n", real_path(sb_git.buf)); + write_file(sb_git.buf, 1, "gitdir: %s/worktrees/%s\n", + real_path(get_git_common_dir()), name); + /* + * This is to keep resolve_ref() happy. We need a valid HEAD + * or is_git_directory() will reject the directory. Any valid + * value would do because this value will be ignored and + * replaced at the next (real) checkout. + */ + strbuf_reset(&sb); + strbuf_addf(&sb, "%s/HEAD", sb_repo.buf); + write_file(sb.buf, 1, "%s\n", sha1_to_hex(new->commit->object.sha1)); + strbuf_reset(&sb); + strbuf_addf(&sb, "%s/commondir", sb_repo.buf); + write_file(sb.buf, 1, "../..\n"); + + if (!opts->quiet) + fprintf_ln(stderr, _("Enter %s (identifier %s)"), path, name); + + setenv("GIT_CHECKOUT_NEW_WORKTREE", "1", 1); + setenv(GIT_DIR_ENVIRONMENT, sb_git.buf, 1); + setenv(GIT_WORK_TREE_ENVIRONMENT, path, 1); + memset(&cp, 0, sizeof(cp)); + cp.git_cmd = 1; + cp.argv = opts->saved_argv; + ret = run_command(&cp); + if (!ret) { + is_junk = 0; + free(junk_work_tree); + free(junk_git_dir); + junk_work_tree = NULL; + junk_git_dir = NULL; + } + strbuf_reset(&sb); + strbuf_addf(&sb, "%s/locked", sb_repo.buf); + unlink_or_warn(sb.buf); + strbuf_release(&sb); + strbuf_release(&sb_repo); + strbuf_release(&sb_git); + return ret; +} + static int git_checkout_config(const char *var, const char *value, void *cb) { if (!strcmp(var, "diff.ignoresubmodules")) { @@ -880,13 +1037,80 @@ static const char *unique_tracking_name(const char *name, unsigned char *sha1) return NULL; } +static void check_linked_checkout(struct branch_info *new, const char *id) +{ + struct strbuf sb = STRBUF_INIT; + struct strbuf path = STRBUF_INIT; + struct strbuf gitdir = STRBUF_INIT; + const char *start, *end; + + if (id) + strbuf_addf(&path, "%s/worktrees/%s/HEAD", get_git_common_dir(), id); + else + strbuf_addf(&path, "%s/HEAD", get_git_common_dir()); + + if (strbuf_read_file(&sb, path.buf, 0) < 0 || + !skip_prefix(sb.buf, "ref:", &start)) + goto done; + while (isspace(*start)) + start++; + end = start; + while (*end && !isspace(*end)) + end++; + if (strncmp(start, new->path, end - start) || new->path[end - start] != '\0') + goto done; + if (id) { + strbuf_reset(&path); + strbuf_addf(&path, "%s/worktrees/%s/gitdir", get_git_common_dir(), id); + if (strbuf_read_file(&gitdir, path.buf, 0) <= 0) + goto done; + strbuf_rtrim(&gitdir); + } else + strbuf_addstr(&gitdir, get_git_common_dir()); + die(_("'%s' is already checked out at '%s'"), new->name, gitdir.buf); +done: + strbuf_release(&path); + strbuf_release(&sb); + strbuf_release(&gitdir); +} + +static void check_linked_checkouts(struct branch_info *new) +{ + struct strbuf path = STRBUF_INIT; + DIR *dir; + struct dirent *d; + + strbuf_addf(&path, "%s/worktrees", get_git_common_dir()); + if ((dir = opendir(path.buf)) == NULL) { + strbuf_release(&path); + return; + } + + /* + * $GIT_COMMON_DIR/HEAD is practically outside + * $GIT_DIR so resolve_ref_unsafe() won't work (it + * uses git_path). Parse the ref ourselves. + */ + check_linked_checkout(new, NULL); + + while ((d = readdir(dir)) != NULL) { + if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, "..")) + continue; + check_linked_checkout(new, d->d_name); + } + strbuf_release(&path); + closedir(dir); +} + static int parse_branchname_arg(int argc, const char **argv, int dwim_new_local_branch_ok, struct branch_info *new, - struct tree **source_tree, - unsigned char rev[20], - const char **new_branch) + struct checkout_opts *opts, + unsigned char rev[20]) { + struct tree **source_tree = &opts->source_tree; + const char **new_branch = &opts->new_branch; + int force_detach = opts->force_detach; int argcount = 0; unsigned char branch_rev[20]; const char *arg; @@ -1007,6 +1231,17 @@ static int parse_branchname_arg(int argc, const char **argv, else new->path = NULL; /* not an existing branch */ + if (new->path && !force_detach && !*new_branch) { + unsigned char sha1[20]; + int flag; + char *head_ref = resolve_refdup("HEAD", 0, sha1, &flag); + if (head_ref && + (!(flag & REF_ISSYMREF) || strcmp(head_ref, new->path)) && + !opts->ignore_other_worktrees) + check_linked_checkouts(new); + free(head_ref); + } + new->commit = lookup_commit_reference_gently(rev, 1); if (!new->commit) { /* not a commit */ @@ -1086,6 +1321,9 @@ static int checkout_branch(struct checkout_opts *opts, die(_("Cannot switch branch to a non-commit '%s'"), new->name); + if (opts->new_worktree) + return prepare_linked_checkout(opts, new); + if (!new->commit && opts->new_branch) { unsigned char rev[20]; int flag; @@ -1128,6 +1366,10 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) N_("do not limit pathspecs to sparse entries only")), OPT_HIDDEN_BOOL(0, "guess", &dwim_new_local_branch, N_("second guess 'git checkout <no-such-branch>'")), + OPT_FILENAME(0, "to", &opts.new_worktree, + N_("check a branch out in a separate working directory")), + OPT_BOOL(0, "ignore-other-worktrees", &opts.ignore_other_worktrees, + N_("do not check if another worktree is holding the given ref")), OPT_END(), }; @@ -1136,6 +1378,9 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) opts.overwrite_ignore = 1; opts.prefix = prefix; + opts.saved_argv = xmalloc(sizeof(const char *) * (argc + 2)); + memcpy(opts.saved_argv, argv, sizeof(const char *) * (argc + 1)); + gitmodules_config(); git_config(git_checkout_config, &opts); @@ -1144,6 +1389,14 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) argc = parse_options(argc, argv, prefix, options, checkout_usage, PARSE_OPT_KEEP_DASHDASH); + /* recursive execution from checkout_new_worktree() */ + opts.new_worktree_mode = getenv("GIT_CHECKOUT_NEW_WORKTREE") != NULL; + if (opts.new_worktree_mode) + opts.new_worktree = NULL; + + if (!opts.new_worktree) + setup_work_tree(); + if (conflict_style) { opts.merge = 1; /* implied */ git_xmerge_config("merge.conflictstyle", conflict_style, NULL); @@ -1197,8 +1450,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) opts.track == BRANCH_TRACK_UNSPECIFIED && !opts.new_branch; int n = parse_branchname_arg(argc, argv, dwim_ok, - &new, &opts.source_tree, - rev, &opts.new_branch); + &new, &opts, rev); argv += n; argc -= n; } diff --git a/builtin/clone.c b/builtin/clone.c index 9572467..b878252 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -293,16 +293,17 @@ static void copy_alternates(struct strbuf *src, struct strbuf *dst, struct strbuf line = STRBUF_INIT; while (strbuf_getline(&line, in, '\n') != EOF) { - char *abs_path, abs_buf[PATH_MAX]; + char *abs_path; if (!line.len || line.buf[0] == '#') continue; if (is_absolute_path(line.buf)) { add_to_alternates_file(line.buf); continue; } - abs_path = mkpath("%s/objects/%s", src_repo, line.buf); - normalize_path_copy(abs_buf, abs_path); - add_to_alternates_file(abs_buf); + abs_path = mkpathdup("%s/objects/%s", src_repo, line.buf); + normalize_path_copy(abs_path, abs_path); + add_to_alternates_file(abs_path); + free(abs_path); } strbuf_release(&line); fclose(in); @@ -842,20 +843,21 @@ int cmd_clone(int argc, const char **argv, const char *prefix) git_dir = mkpathdup("%s/.git", dir); } + atexit(remove_junk); + sigchain_push_common(remove_junk_on_signal); + if (!option_bare) { - junk_work_tree = work_tree; if (safe_create_leading_directories_const(work_tree) < 0) die_errno(_("could not create leading directories of '%s'"), work_tree); if (!dest_exists && mkdir(work_tree, 0777)) - die_errno(_("could not create work tree dir '%s'."), + die_errno(_("could not create work tree dir '%s'"), work_tree); + junk_work_tree = work_tree; set_git_work_tree(work_tree); } - junk_git_dir = git_dir; - atexit(remove_junk); - sigchain_push_common(remove_junk_on_signal); + junk_git_dir = git_dir; if (safe_create_leading_directories_const(git_dir) < 0) die(_("could not create leading directories of '%s'"), git_dir); @@ -905,6 +907,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix) remote = remote_get(option_origin); transport = transport_get(remote, remote->url[0]); + transport_set_verbosity(transport, option_verbosity, option_progress); + path = get_repo_path(remote->url[0], &is_bundle); is_local = option_local != 0 && path && !is_bundle; if (is_local) { @@ -931,8 +935,6 @@ int cmd_clone(int argc, const char **argv, const char *prefix) if (option_single_branch) transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1"); - transport_set_verbosity(transport, option_verbosity, option_progress); - if (option_upload_pack) transport_set_option(transport, TRANS_OPT_UPLOADPACK, option_upload_pack); diff --git a/builtin/commit.c b/builtin/commit.c index fe380a9..254477f 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -170,7 +170,7 @@ static void determine_whence(struct wt_status *s) whence = FROM_MERGE; else if (file_exists(git_path("CHERRY_PICK_HEAD"))) { whence = FROM_CHERRY_PICK; - if (file_exists(git_path("sequencer"))) + if (file_exists(git_path(SEQ_DIR))) sequencer_in_use = 1; } else @@ -229,7 +229,7 @@ static int commit_index_files(void) static int list_paths(struct string_list *list, const char *with_tree, const char *prefix, const struct pathspec *pattern) { - int i; + int i, ret; char *m; if (!pattern->nr) @@ -256,7 +256,9 @@ static int list_paths(struct string_list *list, const char *with_tree, item->util = item; /* better a valid pointer than a fake one */ } - return report_path_error(m, pattern, prefix); + ret = report_path_error(m, pattern, prefix); + free(m); + return ret; } static void add_remove_files(struct string_list *list) @@ -1397,12 +1399,10 @@ int cmd_status(int argc, const char **argv, const char *prefix) static const char *implicit_ident_advice(void) { - char *user_config = NULL; - char *xdg_config = NULL; - int config_exists; + char *user_config = expand_user_path("~/.gitconfig"); + char *xdg_config = xdg_config_home("config"); + int config_exists = file_exists(user_config) || file_exists(xdg_config); - home_config_paths(&user_config, &xdg_config, "config"); - config_exists = file_exists(user_config) || file_exists(xdg_config); free(user_config); free(xdg_config); diff --git a/builtin/config.c b/builtin/config.c index d32c532..7188405 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -193,7 +193,7 @@ static int get_value(const char *key_, const char *regex_) key_regexp = (regex_t*)xmalloc(sizeof(regex_t)); if (regcomp(key_regexp, key, REG_EXTENDED)) { - fprintf(stderr, "Invalid key pattern: %s\n", key_); + error("invalid key pattern: %s", key_); free(key_regexp); key_regexp = NULL; ret = CONFIG_INVALID_PATTERN; @@ -214,7 +214,7 @@ static int get_value(const char *key_, const char *regex_) regexp = (regex_t*)xmalloc(sizeof(regex_t)); if (regcomp(regexp, regex_, REG_EXTENDED)) { - fprintf(stderr, "Invalid pattern: %s\n", regex_); + error("invalid pattern: %s", regex_); free(regexp); regexp = NULL; ret = CONFIG_INVALID_PATTERN; @@ -455,9 +455,9 @@ static char *default_user_config(void) struct strbuf buf = STRBUF_INIT; strbuf_addf(&buf, _("# This is Git's per-user configuration file.\n" - "[core]\n" + "[user]\n" "# Please adapt and uncomment the following lines:\n" - "# user = %s\n" + "# name = %s\n" "# email = %s\n"), ident_default_name(), ident_default_email()); @@ -488,10 +488,8 @@ int cmd_config(int argc, const char **argv, const char *prefix) } if (use_global_config) { - char *user_config = NULL; - char *xdg_config = NULL; - - home_config_paths(&user_config, &xdg_config, "config"); + char *user_config = expand_user_path("~/.gitconfig"); + char *xdg_config = xdg_config_home("config"); if (!user_config) /* diff --git a/builtin/count-objects.c b/builtin/count-objects.c index e47ef0b..ad0c799 100644 --- a/builtin/count-objects.c +++ b/builtin/count-objects.c @@ -70,8 +70,10 @@ int cmd_count_objects(int argc, const char **argv, const char *prefix) /* we do not take arguments other than flags for now */ if (argc) usage_with_options(count_objects_usage, opts); - if (verbose) + if (verbose) { report_garbage = real_report_garbage; + report_linked_checkout_garbage(); + } for_each_loose_file_in_objdir(get_object_directory(), count_loose, count_cruft, NULL, NULL); diff --git a/builtin/fetch.c b/builtin/fetch.c index f951265..7910419 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -588,7 +588,8 @@ static int store_updated_refs(const char *raw_url, const char *remote_name, struct strbuf note = STRBUF_INIT; const char *what, *kind; struct ref *rm; - char *url, *filename = dry_run ? "/dev/null" : git_path("FETCH_HEAD"); + char *url; + const char *filename = dry_run ? "/dev/null" : git_path("FETCH_HEAD"); int want_status; fp = fopen(filename, "a"); @@ -822,7 +823,7 @@ static void check_not_current_branch(struct ref *ref_map) static int truncate_fetch_head(void) { - char *filename = git_path("FETCH_HEAD"); + const char *filename = git_path("FETCH_HEAD"); FILE *fp = fopen(filename, "w"); if (!fp) diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c index 1d962dc..05f4c26 100644 --- a/builtin/fmt-merge-msg.c +++ b/builtin/fmt-merge-msg.c @@ -223,16 +223,14 @@ static void add_branch_desc(struct strbuf *out, const char *name) #define util_as_integral(elem) ((intptr_t)((elem)->util)) -static void record_person(int which, struct string_list *people, - struct commit *commit) +static void record_person_from_buf(int which, struct string_list *people, + const char *buffer) { - const char *buffer; char *name_buf, *name, *name_end; struct string_list_item *elem; const char *field; field = (which == 'a') ? "\nauthor " : "\ncommitter "; - buffer = get_commit_buffer(commit, NULL); name = strstr(buffer, field); if (!name) return; @@ -245,7 +243,6 @@ static void record_person(int which, struct string_list *people, if (name_end < name) return; name_buf = xmemdupz(name, name_end - name + 1); - unuse_commit_buffer(commit, buffer); elem = string_list_lookup(people, name_buf); if (!elem) { @@ -256,6 +253,15 @@ static void record_person(int which, struct string_list *people, free(name_buf); } + +static void record_person(int which, struct string_list *people, + struct commit *commit) +{ + const char *buffer = get_commit_buffer(commit, NULL); + record_person_from_buf(which, people, buffer); + unuse_commit_buffer(commit, buffer); +} + static int cmp_string_list_util_as_integral(const void *a_, const void *b_) { const struct string_list_item *a = a_, *b = b_; diff --git a/builtin/fsck.c b/builtin/fsck.c index 0c75786..4783896 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -225,12 +225,12 @@ static void check_unreachable_object(struct object *obj) printf("dangling %s %s\n", typename(obj->type), sha1_to_hex(obj->sha1)); if (write_lost_and_found) { - char *filename = git_path("lost-found/%s/%s", + const char *filename = git_path("lost-found/%s/%s", obj->type == OBJ_COMMIT ? "commit" : "other", sha1_to_hex(obj->sha1)); FILE *f; - if (safe_create_leading_directories(filename)) { + if (safe_create_leading_directories_const(filename)) { error("Could not create lost-found"); return; } diff --git a/builtin/gc.c b/builtin/gc.c index 5c634af..36fe333 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -33,11 +33,13 @@ static int gc_auto_threshold = 6700; static int gc_auto_pack_limit = 50; static int detach_auto = 1; static const char *prune_expire = "2.weeks.ago"; +static const char *prune_worktrees_expire = "3.months.ago"; static struct argv_array pack_refs_cmd = ARGV_ARRAY_INIT; static struct argv_array reflog = ARGV_ARRAY_INIT; static struct argv_array repack = ARGV_ARRAY_INIT; static struct argv_array prune = ARGV_ARRAY_INIT; +static struct argv_array prune_worktrees = ARGV_ARRAY_INIT; static struct argv_array rerere = ARGV_ARRAY_INIT; static char *pidfile; @@ -55,6 +57,17 @@ static void remove_pidfile_on_signal(int signo) raise(signo); } +static void git_config_date_string(const char *key, const char **output) +{ + if (git_config_get_string_const(key, output)) + return; + if (strcmp(*output, "now")) { + unsigned long now = approxidate("now"); + if (approxidate(*output) >= now) + git_die_config(key, _("Invalid %s: '%s'"), key, *output); + } +} + static void gc_config(void) { const char *value; @@ -71,16 +84,8 @@ static void gc_config(void) git_config_get_int("gc.auto", &gc_auto_threshold); git_config_get_int("gc.autopacklimit", &gc_auto_pack_limit); git_config_get_bool("gc.autodetach", &detach_auto); - - if (!git_config_get_string_const("gc.pruneexpire", &prune_expire)) { - if (strcmp(prune_expire, "now")) { - unsigned long now = approxidate("now"); - if (approxidate(prune_expire) >= now) { - git_die_config("gc.pruneexpire", _("Invalid gc.pruneexpire: '%s'"), - prune_expire); - } - } - } + git_config_date_string("gc.pruneexpire", &prune_expire); + git_config_date_string("gc.pruneworktreesexpire", &prune_worktrees_expire); git_config(git_default_config, NULL); } @@ -287,7 +292,8 @@ int cmd_gc(int argc, const char **argv, const char *prefix) argv_array_pushl(&pack_refs_cmd, "pack-refs", "--all", "--prune", NULL); argv_array_pushl(&reflog, "reflog", "expire", "--all", NULL); argv_array_pushl(&repack, "repack", "-d", "-l", NULL); - argv_array_pushl(&prune, "prune", "--expire", NULL ); + argv_array_pushl(&prune, "prune", "--expire", NULL); + argv_array_pushl(&prune_worktrees, "prune", "--worktrees", "--expire", NULL); argv_array_pushl(&rerere, "rerere", "gc", NULL); gc_config(); @@ -357,6 +363,12 @@ int cmd_gc(int argc, const char **argv, const char *prefix) return error(FAILED_RUN, prune.argv[0]); } + if (prune_worktrees_expire) { + argv_array_push(&prune_worktrees, prune_worktrees_expire); + if (run_command_v_opt(prune_worktrees.argv, RUN_GIT_CMD)) + return error(FAILED_RUN, prune_worktrees.argv[0]); + } + if (run_command_v_opt(rerere.argv, RUN_GIT_CMD)) return error(FAILED_RUN, rerere.argv[0]); diff --git a/builtin/grep.c b/builtin/grep.c index 335f25d..d04f440 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -738,7 +738,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix) PARSE_OPT_OPTARG, NULL, (intptr_t)default_pager }, OPT_BOOL(0, "ext-grep", &external_grep_allowed__ignored, N_("allow calling of grep(1) (ignored by this build)")), - { OPTION_CALLBACK, 0, "help-all", &options, NULL, N_("show usage"), + { OPTION_CALLBACK, 0, "help-all", NULL, NULL, N_("show usage"), PARSE_OPT_HIDDEN | PARSE_OPT_NOARG, help_callback }, OPT_END() }; @@ -885,7 +885,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix) } } - if (!show_in_pager) + if (!show_in_pager && !opt.status_only) setup_pager(); if (!use_index && (untracked || cached)) diff --git a/builtin/hash-object.c b/builtin/hash-object.c index 207b90c..07fef3c 100644 --- a/builtin/hash-object.c +++ b/builtin/hash-object.c @@ -22,10 +22,8 @@ static int hash_literally(unsigned char *sha1, int fd, const char *type, unsigne if (strbuf_read(&buf, fd, 4096) < 0) ret = -1; - else if (flags & HASH_WRITE_OBJECT) - ret = write_sha1_file(buf.buf, buf.len, type, sha1); else - ret = hash_sha1_file(buf.buf, buf.len, type, sha1); + ret = hash_sha1_file_literally(buf.buf, buf.len, type, sha1, flags); strbuf_release(&buf); return ret; } diff --git a/builtin/help.c b/builtin/help.c index 6133fe4..3422e73 100644 --- a/builtin/help.c +++ b/builtin/help.c @@ -171,7 +171,7 @@ static void exec_man_cmd(const char *cmd, const char *page) { struct strbuf shell_cmd = STRBUF_INIT; strbuf_addf(&shell_cmd, "%s %s", cmd, page); - execl("/bin/sh", "sh", "-c", shell_cmd.buf, (char *)NULL); + execl(SHELL_PATH, SHELL_PATH, "-c", shell_cmd.buf, (char *)NULL); warning(_("failed to exec '%s': %s"), cmd, strerror(errno)); } @@ -456,7 +456,7 @@ static void list_common_guides_help(void) int cmd_help(int argc, const char **argv, const char *prefix) { int nongit; - const char *alias; + char *alias; enum help_format parsed_help_format; argc = parse_options(argc, argv, prefix, builtin_help_options, @@ -499,6 +499,7 @@ int cmd_help(int argc, const char **argv, const char *prefix) alias = alias_lookup(argv[0]); if (alias && !is_git_command(argv[0])) { printf_ln(_("`git %s' is aliased to `%s'"), argv[0], alias); + free(alias); return 0; } diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 4632117..7ea2020 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -18,16 +18,14 @@ static const char index_pack_usage[] = struct object_entry { struct pack_idx_entry idx; unsigned long size; - unsigned int hdr_size; - enum object_type type; - enum object_type real_type; - unsigned delta_depth; - int base_object_no; + unsigned char hdr_size; + signed char type; + signed char real_type; }; -union delta_base { - unsigned char sha1[20]; - off_t offset; +struct object_stat { + unsigned delta_depth; + int base_object_no; }; struct base_data { @@ -49,25 +47,28 @@ struct thread_local { int pack_fd; }; -/* - * Even if sizeof(union delta_base) == 24 on 64-bit archs, we really want - * to memcmp() only the first 20 bytes. - */ -#define UNION_BASE_SZ 20 - #define FLAG_LINK (1u<<20) #define FLAG_CHECKED (1u<<21) -struct delta_entry { - union delta_base base; +struct ofs_delta_entry { + off_t offset; + int obj_no; +}; + +struct ref_delta_entry { + unsigned char sha1[20]; int obj_no; }; static struct object_entry *objects; -static struct delta_entry *deltas; +static struct object_stat *obj_stat; +static struct ofs_delta_entry *ofs_deltas; +static struct ref_delta_entry *ref_deltas; static struct thread_local nothread_data; static int nr_objects; -static int nr_deltas; +static int nr_ofs_deltas; +static int nr_ref_deltas; +static int ref_deltas_alloc; static int nr_resolved_deltas; static int nr_threads; @@ -476,7 +477,8 @@ static void *unpack_entry_data(unsigned long offset, unsigned long size, } static void *unpack_raw_entry(struct object_entry *obj, - union delta_base *delta_base, + off_t *ofs_offset, + unsigned char *ref_sha1, unsigned char *sha1) { unsigned char *p; @@ -505,11 +507,10 @@ static void *unpack_raw_entry(struct object_entry *obj, switch (obj->type) { case OBJ_REF_DELTA: - hashcpy(delta_base->sha1, fill(20)); + hashcpy(ref_sha1, fill(20)); use(20); break; case OBJ_OFS_DELTA: - memset(delta_base, 0, sizeof(*delta_base)); p = fill(1); c = *p; use(1); @@ -523,8 +524,8 @@ static void *unpack_raw_entry(struct object_entry *obj, use(1); base_offset = (base_offset << 7) + (c & 127); } - delta_base->offset = obj->idx.offset - base_offset; - if (delta_base->offset <= 0 || delta_base->offset >= obj->idx.offset) + *ofs_offset = obj->idx.offset - base_offset; + if (*ofs_offset <= 0 || *ofs_offset >= obj->idx.offset) bad_object(obj->idx.offset, _("delta base offset is out of bound")); break; case OBJ_COMMIT: @@ -608,55 +609,108 @@ static void *get_data_from_pack(struct object_entry *obj) return unpack_data(obj, NULL, NULL); } -static int compare_delta_bases(const union delta_base *base1, - const union delta_base *base2, - enum object_type type1, - enum object_type type2) +static int compare_ofs_delta_bases(off_t offset1, off_t offset2, + enum object_type type1, + enum object_type type2) +{ + int cmp = type1 - type2; + if (cmp) + return cmp; + return offset1 - offset2; +} + +static int find_ofs_delta(const off_t offset, enum object_type type) +{ + int first = 0, last = nr_ofs_deltas; + + while (first < last) { + int next = (first + last) / 2; + struct ofs_delta_entry *delta = &ofs_deltas[next]; + int cmp; + + cmp = compare_ofs_delta_bases(offset, delta->offset, + type, objects[delta->obj_no].type); + if (!cmp) + return next; + if (cmp < 0) { + last = next; + continue; + } + first = next+1; + } + return -first-1; +} + +static void find_ofs_delta_children(off_t offset, + int *first_index, int *last_index, + enum object_type type) +{ + int first = find_ofs_delta(offset, type); + int last = first; + int end = nr_ofs_deltas - 1; + + if (first < 0) { + *first_index = 0; + *last_index = -1; + return; + } + while (first > 0 && ofs_deltas[first - 1].offset == offset) + --first; + while (last < end && ofs_deltas[last + 1].offset == offset) + ++last; + *first_index = first; + *last_index = last; +} + +static int compare_ref_delta_bases(const unsigned char *sha1, + const unsigned char *sha2, + enum object_type type1, + enum object_type type2) { int cmp = type1 - type2; if (cmp) return cmp; - return memcmp(base1, base2, UNION_BASE_SZ); + return hashcmp(sha1, sha2); } -static int find_delta(const union delta_base *base, enum object_type type) +static int find_ref_delta(const unsigned char *sha1, enum object_type type) { - int first = 0, last = nr_deltas; - - while (first < last) { - int next = (first + last) / 2; - struct delta_entry *delta = &deltas[next]; - int cmp; - - cmp = compare_delta_bases(base, &delta->base, - type, objects[delta->obj_no].type); - if (!cmp) - return next; - if (cmp < 0) { - last = next; - continue; - } - first = next+1; - } - return -first-1; + int first = 0, last = nr_ref_deltas; + + while (first < last) { + int next = (first + last) / 2; + struct ref_delta_entry *delta = &ref_deltas[next]; + int cmp; + + cmp = compare_ref_delta_bases(sha1, delta->sha1, + type, objects[delta->obj_no].type); + if (!cmp) + return next; + if (cmp < 0) { + last = next; + continue; + } + first = next+1; + } + return -first-1; } -static void find_delta_children(const union delta_base *base, - int *first_index, int *last_index, - enum object_type type) +static void find_ref_delta_children(const unsigned char *sha1, + int *first_index, int *last_index, + enum object_type type) { - int first = find_delta(base, type); + int first = find_ref_delta(sha1, type); int last = first; - int end = nr_deltas - 1; + int end = nr_ref_deltas - 1; if (first < 0) { *first_index = 0; *last_index = -1; return; } - while (first > 0 && !memcmp(&deltas[first - 1].base, base, UNION_BASE_SZ)) + while (first > 0 && !hashcmp(ref_deltas[first - 1].sha1, sha1)) --first; - while (last < end && !memcmp(&deltas[last + 1].base, base, UNION_BASE_SZ)) + while (last < end && !hashcmp(ref_deltas[last + 1].sha1, sha1)) ++last; *first_index = first; *last_index = last; @@ -873,13 +927,15 @@ static void resolve_delta(struct object_entry *delta_obj, void *base_data, *delta_data; if (show_stat) { - delta_obj->delta_depth = base->obj->delta_depth + 1; + int i = delta_obj - objects; + int j = base->obj - objects; + obj_stat[i].delta_depth = obj_stat[j].delta_depth + 1; deepest_delta_lock(); - if (deepest_delta < delta_obj->delta_depth) - deepest_delta = delta_obj->delta_depth; + if (deepest_delta < obj_stat[i].delta_depth) + deepest_delta = obj_stat[i].delta_depth; deepest_delta_unlock(); + obj_stat[i].base_object_no = j; } - delta_obj->base_object_no = base->obj - objects; delta_data = get_data_from_pack(delta_obj); base_data = get_base_data(base); result->obj = delta_obj; @@ -902,7 +958,7 @@ static void resolve_delta(struct object_entry *delta_obj, * "want"; if so, swap in "set" and return true. Otherwise, leave it untouched * and return false. */ -static int compare_and_swap_type(enum object_type *type, +static int compare_and_swap_type(signed char *type, enum object_type want, enum object_type set) { @@ -921,16 +977,13 @@ static struct base_data *find_unresolved_deltas_1(struct base_data *base, struct base_data *prev_base) { if (base->ref_last == -1 && base->ofs_last == -1) { - union delta_base base_spec; - - hashcpy(base_spec.sha1, base->obj->idx.sha1); - find_delta_children(&base_spec, - &base->ref_first, &base->ref_last, OBJ_REF_DELTA); + find_ref_delta_children(base->obj->idx.sha1, + &base->ref_first, &base->ref_last, + OBJ_REF_DELTA); - memset(&base_spec, 0, sizeof(base_spec)); - base_spec.offset = base->obj->idx.offset; - find_delta_children(&base_spec, - &base->ofs_first, &base->ofs_last, OBJ_OFS_DELTA); + find_ofs_delta_children(base->obj->idx.offset, + &base->ofs_first, &base->ofs_last, + OBJ_OFS_DELTA); if (base->ref_last == -1 && base->ofs_last == -1) { free(base->data); @@ -941,7 +994,7 @@ static struct base_data *find_unresolved_deltas_1(struct base_data *base, } if (base->ref_first <= base->ref_last) { - struct object_entry *child = objects + deltas[base->ref_first].obj_no; + struct object_entry *child = objects + ref_deltas[base->ref_first].obj_no; struct base_data *result = alloc_base_data(); if (!compare_and_swap_type(&child->real_type, OBJ_REF_DELTA, @@ -957,7 +1010,7 @@ static struct base_data *find_unresolved_deltas_1(struct base_data *base, } if (base->ofs_first <= base->ofs_last) { - struct object_entry *child = objects + deltas[base->ofs_first].obj_no; + struct object_entry *child = objects + ofs_deltas[base->ofs_first].obj_no; struct base_data *result = alloc_base_data(); assert(child->real_type == OBJ_OFS_DELTA); @@ -993,15 +1046,20 @@ static void find_unresolved_deltas(struct base_data *base) } } -static int compare_delta_entry(const void *a, const void *b) +static int compare_ofs_delta_entry(const void *a, const void *b) { - const struct delta_entry *delta_a = a; - const struct delta_entry *delta_b = b; + const struct ofs_delta_entry *delta_a = a; + const struct ofs_delta_entry *delta_b = b; - /* group by type (ref vs ofs) and then by value (sha-1 or offset) */ - return compare_delta_bases(&delta_a->base, &delta_b->base, - objects[delta_a->obj_no].type, - objects[delta_b->obj_no].type); + return delta_a->offset - delta_b->offset; +} + +static int compare_ref_delta_entry(const void *a, const void *b) +{ + const struct ref_delta_entry *delta_a = a; + const struct ref_delta_entry *delta_b = b; + + return hashcmp(delta_a->sha1, delta_b->sha1); } static void resolve_base(struct object_entry *obj) @@ -1047,7 +1105,8 @@ static void *threaded_second_pass(void *data) static void parse_pack_objects(unsigned char *sha1) { int i, nr_delays = 0; - struct delta_entry *delta = deltas; + struct ofs_delta_entry *ofs_delta = ofs_deltas; + unsigned char ref_delta_sha1[20]; struct stat st; if (verbose) @@ -1056,12 +1115,18 @@ static void parse_pack_objects(unsigned char *sha1) nr_objects); for (i = 0; i < nr_objects; i++) { struct object_entry *obj = &objects[i]; - void *data = unpack_raw_entry(obj, &delta->base, obj->idx.sha1); + void *data = unpack_raw_entry(obj, &ofs_delta->offset, + ref_delta_sha1, obj->idx.sha1); obj->real_type = obj->type; - if (is_delta_type(obj->type)) { - nr_deltas++; - delta->obj_no = i; - delta++; + if (obj->type == OBJ_OFS_DELTA) { + nr_ofs_deltas++; + ofs_delta->obj_no = i; + ofs_delta++; + } else if (obj->type == OBJ_REF_DELTA) { + ALLOC_GROW(ref_deltas, nr_ref_deltas + 1, ref_deltas_alloc); + hashcpy(ref_deltas[nr_ref_deltas].sha1, ref_delta_sha1); + ref_deltas[nr_ref_deltas].obj_no = i; + nr_ref_deltas++; } else if (!data) { /* large blobs, check later */ obj->real_type = OBJ_BAD; @@ -1112,15 +1177,18 @@ static void resolve_deltas(void) { int i; - if (!nr_deltas) + if (!nr_ofs_deltas && !nr_ref_deltas) return; /* Sort deltas by base SHA1/offset for fast searching */ - qsort(deltas, nr_deltas, sizeof(struct delta_entry), - compare_delta_entry); + qsort(ofs_deltas, nr_ofs_deltas, sizeof(struct ofs_delta_entry), + compare_ofs_delta_entry); + qsort(ref_deltas, nr_ref_deltas, sizeof(struct ref_delta_entry), + compare_ref_delta_entry); if (verbose) - progress = start_progress(_("Resolving deltas"), nr_deltas); + progress = start_progress(_("Resolving deltas"), + nr_ref_deltas + nr_ofs_deltas); #ifndef NO_PTHREADS nr_dispatched = 0; @@ -1158,7 +1226,7 @@ static void resolve_deltas(void) static void fix_unresolved_deltas(struct sha1file *f, int nr_unresolved); static void conclude_pack(int fix_thin_pack, const char *curr_pack, unsigned char *pack_sha1) { - if (nr_deltas == nr_resolved_deltas) { + if (nr_ref_deltas + nr_ofs_deltas == nr_resolved_deltas) { stop_progress(&progress); /* Flush remaining pack final 20-byte SHA1. */ flush(); @@ -1169,7 +1237,7 @@ static void conclude_pack(int fix_thin_pack, const char *curr_pack, unsigned cha struct sha1file *f; unsigned char read_sha1[20], tail_sha1[20]; struct strbuf msg = STRBUF_INIT; - int nr_unresolved = nr_deltas - nr_resolved_deltas; + int nr_unresolved = nr_ofs_deltas + nr_ref_deltas - nr_resolved_deltas; int nr_objects_initial = nr_objects; if (nr_unresolved <= 0) die(_("confusion beyond insanity")); @@ -1191,11 +1259,11 @@ static void conclude_pack(int fix_thin_pack, const char *curr_pack, unsigned cha die(_("Unexpected tail checksum for %s " "(disk corruption?)"), curr_pack); } - if (nr_deltas != nr_resolved_deltas) + if (nr_ofs_deltas + nr_ref_deltas != nr_resolved_deltas) die(Q_("pack has %d unresolved delta", "pack has %d unresolved deltas", - nr_deltas - nr_resolved_deltas), - nr_deltas - nr_resolved_deltas); + nr_ofs_deltas + nr_ref_deltas - nr_resolved_deltas), + nr_ofs_deltas + nr_ref_deltas - nr_resolved_deltas); } static int write_compressed(struct sha1file *f, void *in, unsigned int size) @@ -1204,7 +1272,6 @@ static int write_compressed(struct sha1file *f, void *in, unsigned int size) int status; unsigned char outbuf[4096]; - memset(&stream, 0, sizeof(stream)); git_deflate_init(&stream, zlib_compression_level); stream.next_in = in; stream.avail_in = size; @@ -1255,14 +1322,14 @@ static struct object_entry *append_obj_to_pack(struct sha1file *f, static int delta_pos_compare(const void *_a, const void *_b) { - struct delta_entry *a = *(struct delta_entry **)_a; - struct delta_entry *b = *(struct delta_entry **)_b; + struct ref_delta_entry *a = *(struct ref_delta_entry **)_a; + struct ref_delta_entry *b = *(struct ref_delta_entry **)_b; return a->obj_no - b->obj_no; } static void fix_unresolved_deltas(struct sha1file *f, int nr_unresolved) { - struct delta_entry **sorted_by_pos; + struct ref_delta_entry **sorted_by_pos; int i, n = 0; /* @@ -1276,28 +1343,25 @@ static void fix_unresolved_deltas(struct sha1file *f, int nr_unresolved) * resolving deltas in the same order as their position in the pack. */ sorted_by_pos = xmalloc(nr_unresolved * sizeof(*sorted_by_pos)); - for (i = 0; i < nr_deltas; i++) { - if (objects[deltas[i].obj_no].real_type != OBJ_REF_DELTA) - continue; - sorted_by_pos[n++] = &deltas[i]; - } + for (i = 0; i < nr_ref_deltas; i++) + sorted_by_pos[n++] = &ref_deltas[i]; qsort(sorted_by_pos, n, sizeof(*sorted_by_pos), delta_pos_compare); for (i = 0; i < n; i++) { - struct delta_entry *d = sorted_by_pos[i]; + struct ref_delta_entry *d = sorted_by_pos[i]; enum object_type type; struct base_data *base_obj = alloc_base_data(); if (objects[d->obj_no].real_type != OBJ_REF_DELTA) continue; - base_obj->data = read_sha1_file(d->base.sha1, &type, &base_obj->size); + base_obj->data = read_sha1_file(d->sha1, &type, &base_obj->size); if (!base_obj->data) continue; - if (check_sha1_signature(d->base.sha1, base_obj->data, + if (check_sha1_signature(d->sha1, base_obj->data, base_obj->size, typename(type))) - die(_("local object %s is corrupt"), sha1_to_hex(d->base.sha1)); - base_obj->obj = append_obj_to_pack(f, d->base.sha1, + die(_("local object %s is corrupt"), sha1_to_hex(d->sha1)); + base_obj->obj = append_obj_to_pack(f, d->sha1, base_obj->data, base_obj->size, type); find_unresolved_deltas(base_obj); display_progress(progress, nr_resolved_deltas); @@ -1489,7 +1553,7 @@ static void read_idx_option(struct pack_idx_option *opts, const char *pack_name) static void show_pack_info(int stat_only) { - int i, baseobjects = nr_objects - nr_deltas; + int i, baseobjects = nr_objects - nr_ref_deltas - nr_ofs_deltas; unsigned long *chain_histogram = NULL; if (deepest_delta) @@ -1499,7 +1563,7 @@ static void show_pack_info(int stat_only) struct object_entry *obj = &objects[i]; if (is_delta_type(obj->type)) - chain_histogram[obj->delta_depth - 1]++; + chain_histogram[obj_stat[i].delta_depth - 1]++; if (stat_only) continue; printf("%s %-6s %lu %lu %"PRIuMAX, @@ -1508,8 +1572,8 @@ static void show_pack_info(int stat_only) (unsigned long)(obj[1].idx.offset - obj->idx.offset), (uintmax_t)obj->idx.offset); if (is_delta_type(obj->type)) { - struct object_entry *bobj = &objects[obj->base_object_no]; - printf(" %u %s", obj->delta_depth, sha1_to_hex(bobj->idx.sha1)); + struct object_entry *bobj = &objects[obj_stat[i].base_object_no]; + printf(" %u %s", obj_stat[i].delta_depth, sha1_to_hex(bobj->idx.sha1)); } putchar('\n'); } @@ -1672,11 +1736,14 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix) curr_pack = open_pack_file(pack_name); parse_pack_header(); objects = xcalloc(nr_objects + 1, sizeof(struct object_entry)); - deltas = xcalloc(nr_objects, sizeof(struct delta_entry)); + if (show_stat) + obj_stat = xcalloc(nr_objects + 1, sizeof(struct object_stat)); + ofs_deltas = xcalloc(nr_objects, sizeof(struct ofs_delta_entry)); parse_pack_objects(pack_sha1); resolve_deltas(); conclude_pack(fix_thin_pack, curr_pack, pack_sha1); - free(deltas); + free(ofs_deltas); + free(ref_deltas); if (strict) foreign_nr = check_objects(); diff --git a/builtin/init-db.c b/builtin/init-db.c index 6723d39..4335738 100644 --- a/builtin/init-db.c +++ b/builtin/init-db.c @@ -182,6 +182,20 @@ static int git_init_db_config(const char *k, const char *v, void *cb) return 0; } +/* + * If the git_dir is not directly inside the working tree, then git will not + * find it by default, and we need to set the worktree explicitly. + */ +static int needs_work_tree_config(const char *git_dir, const char *work_tree) +{ + if (!strcmp(work_tree, "/") && !strcmp(git_dir, "/.git")) + return 0; + if (skip_prefix(git_dir, work_tree, &git_dir) && + !strcmp(git_dir, "/.git")) + return 0; + return 1; +} + static int create_default_files(const char *template_path) { const char *git_dir = get_git_dir(); @@ -274,10 +288,8 @@ static int create_default_files(const char *template_path) /* allow template config file to override the default */ if (log_all_ref_updates == -1) git_config_set("core.logallrefupdates", "true"); - if (!starts_with(git_dir, work_tree) || - strcmp(git_dir + strlen(work_tree), "/.git")) { + if (needs_work_tree_config(git_dir, work_tree)) git_config_set("core.worktree", work_tree); - } } if (!reinit) { @@ -350,7 +362,6 @@ int set_git_dir_init(const char *git_dir, const char *real_git_dir, static void separate_git_dir(const char *git_dir) { struct stat st; - FILE *fp; if (!stat(git_link, &st)) { const char *src; @@ -366,11 +377,7 @@ static void separate_git_dir(const char *git_dir) die_errno(_("unable to move %s to %s"), src, git_dir); } - fp = fopen(git_link, "w"); - if (!fp) - die(_("Could not create git link %s"), git_link); - fprintf(fp, "gitdir: %s\n", git_dir); - fclose(fp); + write_file(git_link, 1, "gitdir: %s\n", git_dir); } int init_db(const char *template_dir, unsigned int flags) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 914054d..6fa2205 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -354,49 +354,6 @@ void overlay_tree_on_cache(const char *tree_name, const char *prefix) } } -int report_path_error(const char *ps_matched, - const struct pathspec *pathspec, - const char *prefix) -{ - /* - * Make sure all pathspec matched; otherwise it is an error. - */ - struct strbuf sb = STRBUF_INIT; - int num, errors = 0; - for (num = 0; num < pathspec->nr; num++) { - int other, found_dup; - - if (ps_matched[num]) - continue; - /* - * The caller might have fed identical pathspec - * twice. Do not barf on such a mistake. - * FIXME: parse_pathspec should have eliminated - * duplicate pathspec. - */ - for (found_dup = other = 0; - !found_dup && other < pathspec->nr; - other++) { - if (other == num || !ps_matched[other]) - continue; - if (!strcmp(pathspec->items[other].original, - pathspec->items[num].original)) - /* - * Ok, we have a match already. - */ - found_dup = 1; - } - if (found_dup) - continue; - - error("pathspec '%s' did not match any file(s) known to git.", - pathspec->items[num].original); - errors++; - } - strbuf_release(&sb); - return errors; -} - static const char * const ls_files_usage[] = { N_("git ls-files [<options>] [<file>...]"), NULL diff --git a/builtin/merge.c b/builtin/merge.c index 3b0f8f9..f89f60e 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -492,8 +492,7 @@ static void merge_name(const char *remote, struct strbuf *msg) } if (len) { struct strbuf truname = STRBUF_INIT; - strbuf_addstr(&truname, "refs/heads/"); - strbuf_addstr(&truname, remote); + strbuf_addf(&truname, "refs/heads/%s", remote); strbuf_setlen(&truname, truname.len - len); if (ref_exists(truname.buf)) { strbuf_addf(msg, @@ -504,28 +503,7 @@ static void merge_name(const char *remote, struct strbuf *msg) strbuf_release(&truname); goto cleanup; } - } - - if (!strcmp(remote, "FETCH_HEAD") && - !access(git_path("FETCH_HEAD"), R_OK)) { - const char *filename; - FILE *fp; - struct strbuf line = STRBUF_INIT; - char *ptr; - - filename = git_path("FETCH_HEAD"); - fp = fopen(filename, "r"); - if (!fp) - die_errno(_("could not open '%s' for reading"), - filename); - strbuf_getline(&line, fp, '\n'); - fclose(fp); - ptr = strstr(line.buf, "\tnot-for-merge\t"); - if (ptr) - strbuf_remove(&line, ptr-line.buf+1, 13); - strbuf_addbuf(msg, &line); - strbuf_release(&line); - goto cleanup; + strbuf_release(&truname); } if (remote_head->util) { @@ -1037,28 +1015,24 @@ static int default_edit_option(void) st_stdin.st_mode == st_stdout.st_mode); } -static struct commit_list *collect_parents(struct commit *head_commit, - int *head_subsumed, - int argc, const char **argv) +static struct commit_list *reduce_parents(struct commit *head_commit, + int *head_subsumed, + struct commit_list *remoteheads) { - int i; - struct commit_list *remoteheads = NULL, *parents, *next; - struct commit_list **remotes = &remoteheads; + struct commit_list *parents, *next, **remotes = &remoteheads; - if (head_commit) - remotes = &commit_list_insert(head_commit, remotes)->next; - for (i = 0; i < argc; i++) { - struct commit *commit = get_merge_parent(argv[i]); - if (!commit) - help_unknown_ref(argv[i], "merge", - "not something we can merge"); - remotes = &commit_list_insert(commit, remotes)->next; - } - *remotes = NULL; + /* + * Is the current HEAD reachable from another commit being + * merged? If so we do not want to record it as a parent of + * the resulting merge, unless --no-ff is given. We will flip + * this variable to 0 when we find HEAD among the independent + * tips being merged. + */ + *head_subsumed = 1; + /* Find what parents to record by checking independent ones. */ parents = reduce_heads(remoteheads); - *head_subsumed = 1; /* we will flip this to 0 when we find it */ for (remoteheads = NULL, remotes = &remoteheads; parents; parents = next) { @@ -1068,7 +1042,119 @@ static struct commit_list *collect_parents(struct commit *head_commit, *head_subsumed = 0; else remotes = &commit_list_insert(commit, remotes)->next; + free(parents); + } + return remoteheads; +} + +static void prepare_merge_message(struct strbuf *merge_names, struct strbuf *merge_msg) +{ + struct fmt_merge_msg_opts opts; + + memset(&opts, 0, sizeof(opts)); + opts.add_title = !have_message; + opts.shortlog_len = shortlog_len; + opts.credit_people = (0 < option_edit); + + fmt_merge_msg(merge_names, merge_msg, &opts); + if (merge_msg->len) + strbuf_setlen(merge_msg, merge_msg->len - 1); +} + +static void handle_fetch_head(struct commit_list **remotes, struct strbuf *merge_names) +{ + const char *filename; + int fd, pos, npos; + struct strbuf fetch_head_file = STRBUF_INIT; + + if (!merge_names) + merge_names = &fetch_head_file; + + filename = git_path("FETCH_HEAD"); + fd = open(filename, O_RDONLY); + if (fd < 0) + die_errno(_("could not open '%s' for reading"), filename); + + if (strbuf_read(merge_names, fd, 0) < 0) + die_errno(_("could not read '%s'"), filename); + if (close(fd) < 0) + die_errno(_("could not close '%s'"), filename); + + for (pos = 0; pos < merge_names->len; pos = npos) { + unsigned char sha1[20]; + char *ptr; + struct commit *commit; + + ptr = strchr(merge_names->buf + pos, '\n'); + if (ptr) + npos = ptr - merge_names->buf + 1; + else + npos = merge_names->len; + + if (npos - pos < 40 + 2 || + get_sha1_hex(merge_names->buf + pos, sha1)) + commit = NULL; /* bad */ + else if (memcmp(merge_names->buf + pos + 40, "\t\t", 2)) + continue; /* not-for-merge */ + else { + char saved = merge_names->buf[pos + 40]; + merge_names->buf[pos + 40] = '\0'; + commit = get_merge_parent(merge_names->buf + pos); + merge_names->buf[pos + 40] = saved; + } + if (!commit) { + if (ptr) + *ptr = '\0'; + die("not something we can merge in %s: %s", + filename, merge_names->buf + pos); + } + remotes = &commit_list_insert(commit, remotes)->next; + } + + if (merge_names == &fetch_head_file) + strbuf_release(&fetch_head_file); +} + +static struct commit_list *collect_parents(struct commit *head_commit, + int *head_subsumed, + int argc, const char **argv, + struct strbuf *merge_msg) +{ + int i; + struct commit_list *remoteheads = NULL; + struct commit_list **remotes = &remoteheads; + struct strbuf merge_names = STRBUF_INIT, *autogen = NULL; + + if (merge_msg && (!have_message || shortlog_len)) + autogen = &merge_names; + + if (head_commit) + remotes = &commit_list_insert(head_commit, remotes)->next; + + if (argc == 1 && !strcmp(argv[0], "FETCH_HEAD")) { + handle_fetch_head(remotes, autogen); + remoteheads = reduce_parents(head_commit, head_subsumed, remoteheads); + } else { + for (i = 0; i < argc; i++) { + struct commit *commit = get_merge_parent(argv[i]); + if (!commit) + help_unknown_ref(argv[i], "merge", + "not something we can merge"); + remotes = &commit_list_insert(commit, remotes)->next; + } + remoteheads = reduce_parents(head_commit, head_subsumed, remoteheads); + if (autogen) { + struct commit_list *p; + for (p = remoteheads; p; p = p->next) + merge_name(merge_remote_util(p->item)->name, autogen); + } } + + if (autogen) { + prepare_merge_message(autogen, merge_msg); + strbuf_release(autogen); + } + return remoteheads; } @@ -1158,61 +1244,62 @@ int cmd_merge(int argc, const char **argv, const char *prefix) option_commit = 0; } - if (!abort_current_merge) { - if (!argc) { - if (default_to_upstream) - argc = setup_with_upstream(&argv); - else - die(_("No commit specified and merge.defaultToUpstream not set.")); - } else if (argc == 1 && !strcmp(argv[0], "-")) - argv[0] = "@{-1}"; + if (!argc) { + if (default_to_upstream) + argc = setup_with_upstream(&argv); + else + die(_("No commit specified and merge.defaultToUpstream not set.")); + } else if (argc == 1 && !strcmp(argv[0], "-")) { + argv[0] = "@{-1}"; } + if (!argc) usage_with_options(builtin_merge_usage, builtin_merge_options); - /* - * This could be traditional "merge <msg> HEAD <commit>..." and - * the way we can tell it is to see if the second token is HEAD, - * but some people might have misused the interface and used a - * commit-ish that is the same as HEAD there instead. - * Traditional format never would have "-m" so it is an - * additional safety measure to check for it. - */ - - if (!have_message && head_commit && - is_old_style_invocation(argc, argv, head_commit->object.sha1)) { - strbuf_addstr(&merge_msg, argv[0]); - head_arg = argv[1]; - argv += 2; - argc -= 2; - remoteheads = collect_parents(head_commit, &head_subsumed, argc, argv); - } else if (!head_commit) { + if (!head_commit) { struct commit *remote_head; /* * If the merged head is a valid one there is no reason * to forbid "git merge" into a branch yet to be born. * We do the same for "git pull". */ - if (argc != 1) - die(_("Can merge only exactly one commit into " - "empty head")); if (squash) die(_("Squash commit into empty head not supported yet")); if (fast_forward == FF_NO) die(_("Non-fast-forward commit does not make sense into " "an empty head")); - remoteheads = collect_parents(head_commit, &head_subsumed, argc, argv); + remoteheads = collect_parents(head_commit, &head_subsumed, + argc, argv, NULL); remote_head = remoteheads->item; if (!remote_head) die(_("%s - not something we can merge"), argv[0]); + if (remoteheads->next) + die(_("Can merge only exactly one commit into empty head")); read_empty(remote_head->object.sha1, 0); update_ref("initial pull", "HEAD", remote_head->object.sha1, NULL, 0, UPDATE_REFS_DIE_ON_ERR); goto done; - } else { - struct strbuf merge_names = STRBUF_INIT; + } + /* + * This could be traditional "merge <msg> HEAD <commit>..." and + * the way we can tell it is to see if the second token is HEAD, + * but some people might have misused the interface and used a + * commit-ish that is the same as HEAD there instead. + * Traditional format never would have "-m" so it is an + * additional safety measure to check for it. + */ + if (!have_message && + is_old_style_invocation(argc, argv, head_commit->object.sha1)) { + warning("old-style 'git merge <msg> HEAD <commit>' is deprecated."); + strbuf_addstr(&merge_msg, argv[0]); + head_arg = argv[1]; + argv += 2; + argc -= 2; + remoteheads = collect_parents(head_commit, &head_subsumed, + argc, argv, NULL); + } else { /* We are invoked directly as the first-class UI. */ head_arg = "HEAD"; @@ -1221,21 +1308,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix) * the standard merge summary message to be appended * to the given message. */ - remoteheads = collect_parents(head_commit, &head_subsumed, argc, argv); - for (p = remoteheads; p; p = p->next) - merge_name(merge_remote_util(p->item)->name, &merge_names); - - if (!have_message || shortlog_len) { - struct fmt_merge_msg_opts opts; - memset(&opts, 0, sizeof(opts)); - opts.add_title = !have_message; - opts.shortlog_len = shortlog_len; - opts.credit_people = (0 < option_edit); - - fmt_merge_msg(&merge_names, &merge_msg, &opts); - if (merge_msg.len) - strbuf_setlen(&merge_msg, merge_msg.len - 1); - } + remoteheads = collect_parents(head_commit, &head_subsumed, + argc, argv, &merge_msg); } if (!head_commit || !argc) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index d816587..c067107 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -125,7 +125,6 @@ static unsigned long do_compress(void **pptr, unsigned long size) void *in, *out; unsigned long maxsize; - memset(&stream, 0, sizeof(stream)); git_deflate_init(&stream, pack_compression_level); maxsize = git_deflate_bound(&stream, size); @@ -153,7 +152,6 @@ static unsigned long write_large_blob_data(struct git_istream *st, struct sha1fi unsigned char obuf[1024 * 16]; unsigned long olen = 0; - memset(&stream, 0, sizeof(stream)); git_deflate_init(&stream, pack_compression_level); for (;;) { @@ -963,10 +961,8 @@ static int want_object_in_pack(const unsigned char *sha1, off_t offset = find_pack_entry_one(sha1, p); if (offset) { if (!*found_pack) { - if (!is_pack_valid(p)) { - warning("packfile %s cannot be accessed", p->pack_name); + if (!is_pack_valid(p)) continue; - } *found_offset = offset; *found_pack = p; } diff --git a/builtin/patch-id.c b/builtin/patch-id.c index 77db873..ba34dac 100644 --- a/builtin/patch-id.c +++ b/builtin/patch-id.c @@ -1,14 +1,14 @@ #include "builtin.h" -static void flush_current_id(int patchlen, unsigned char *id, unsigned char *result) +static void flush_current_id(int patchlen, struct object_id *id, struct object_id *result) { char name[50]; if (!patchlen) return; - memcpy(name, sha1_to_hex(id), 41); - printf("%s %s\n", sha1_to_hex(result), name); + memcpy(name, oid_to_hex(id), GIT_SHA1_HEXSZ + 1); + printf("%s %s\n", oid_to_hex(result), name); } static int remove_space(char *line) @@ -53,23 +53,23 @@ static int scan_hunk_header(const char *p, int *p_before, int *p_after) return 1; } -static void flush_one_hunk(unsigned char *result, git_SHA_CTX *ctx) +static void flush_one_hunk(struct object_id *result, git_SHA_CTX *ctx) { - unsigned char hash[20]; + unsigned char hash[GIT_SHA1_RAWSZ]; unsigned short carry = 0; int i; git_SHA1_Final(hash, ctx); git_SHA1_Init(ctx); /* 20-byte sum, with carry */ - for (i = 0; i < 20; ++i) { - carry += result[i] + hash[i]; - result[i] = carry; + for (i = 0; i < GIT_SHA1_RAWSZ; ++i) { + carry += result->hash[i] + hash[i]; + result->hash[i] = carry; carry >>= 8; } } -static int get_one_patchid(unsigned char *next_sha1, unsigned char *result, +static int get_one_patchid(struct object_id *next_oid, struct object_id *result, struct strbuf *line_buf, int stable) { int patchlen = 0, found_next = 0; @@ -77,7 +77,7 @@ static int get_one_patchid(unsigned char *next_sha1, unsigned char *result, git_SHA_CTX ctx; git_SHA1_Init(&ctx); - hashclr(result); + oidclr(result); while (strbuf_getwholeline(line_buf, stdin, '\n') != EOF) { char *line = line_buf->buf; @@ -93,7 +93,7 @@ static int get_one_patchid(unsigned char *next_sha1, unsigned char *result, else if (!memcmp(line, "\\ ", 2) && 12 < strlen(line)) continue; - if (!get_sha1_hex(p, next_sha1)) { + if (!get_oid_hex(p, next_oid)) { found_next = 1; break; } @@ -143,7 +143,7 @@ static int get_one_patchid(unsigned char *next_sha1, unsigned char *result, } if (!found_next) - hashclr(next_sha1); + oidclr(next_oid); flush_one_hunk(result, &ctx); @@ -152,15 +152,15 @@ static int get_one_patchid(unsigned char *next_sha1, unsigned char *result, static void generate_id_list(int stable) { - unsigned char sha1[20], n[20], result[20]; + struct object_id oid, n, result; int patchlen; struct strbuf line_buf = STRBUF_INIT; - hashclr(sha1); + oidclr(&oid); while (!feof(stdin)) { - patchlen = get_one_patchid(n, result, &line_buf, stable); - flush_current_id(patchlen, sha1, result); - hashcpy(sha1, n); + patchlen = get_one_patchid(&n, &result, &line_buf, stable); + flush_current_id(patchlen, &oid, &result); + oidcpy(&oid, &n); } strbuf_release(&line_buf); } diff --git a/builtin/prune.c b/builtin/prune.c index 04d3b12..0c73246 100644 --- a/builtin/prune.c +++ b/builtin/prune.c @@ -76,6 +76,95 @@ static int prune_subdir(int nr, const char *path, void *data) return 0; } +static int prune_worktree(const char *id, struct strbuf *reason) +{ + struct stat st; + char *path; + int fd, len; + + if (!is_directory(git_path("worktrees/%s", id))) { + strbuf_addf(reason, _("Removing worktrees/%s: not a valid directory"), id); + return 1; + } + if (file_exists(git_path("worktrees/%s/locked", id))) + return 0; + if (stat(git_path("worktrees/%s/gitdir", id), &st)) { + strbuf_addf(reason, _("Removing worktrees/%s: gitdir file does not exist"), id); + return 1; + } + fd = open(git_path("worktrees/%s/gitdir", id), O_RDONLY); + if (fd < 0) { + strbuf_addf(reason, _("Removing worktrees/%s: unable to read gitdir file (%s)"), + id, strerror(errno)); + return 1; + } + len = st.st_size; + path = xmalloc(len + 1); + read_in_full(fd, path, len); + close(fd); + while (len && (path[len - 1] == '\n' || path[len - 1] == '\r')) + len--; + if (!len) { + strbuf_addf(reason, _("Removing worktrees/%s: invalid gitdir file"), id); + free(path); + return 1; + } + path[len] = '\0'; + if (!file_exists(path)) { + struct stat st_link; + free(path); + /* + * the repo is moved manually and has not been + * accessed since? + */ + if (!stat(git_path("worktrees/%s/link", id), &st_link) && + st_link.st_nlink > 1) + return 0; + if (st.st_mtime <= expire) { + strbuf_addf(reason, _("Removing worktrees/%s: gitdir file points to non-existent location"), id); + return 1; + } else { + return 0; + } + } + free(path); + return 0; +} + +static void prune_worktrees(void) +{ + struct strbuf reason = STRBUF_INIT; + struct strbuf path = STRBUF_INIT; + DIR *dir = opendir(git_path("worktrees")); + struct dirent *d; + int ret; + if (!dir) + return; + while ((d = readdir(dir)) != NULL) { + if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, "..")) + continue; + strbuf_reset(&reason); + if (!prune_worktree(d->d_name, &reason)) + continue; + if (show_only || verbose) + printf("%s\n", reason.buf); + if (show_only) + continue; + strbuf_reset(&path); + strbuf_addstr(&path, git_path("worktrees/%s", d->d_name)); + ret = remove_dir_recursively(&path, 0); + if (ret < 0 && errno == ENOTDIR) + ret = unlink(path.buf); + if (ret) + error(_("failed to remove: %s"), strerror(errno)); + } + closedir(dir); + if (!show_only) + rmdir(git_path("worktrees")); + strbuf_release(&reason); + strbuf_release(&path); +} + /* * Write errors (particularly out of space) can result in * failed temporary packs (and more rarely indexes and other @@ -102,10 +191,12 @@ int cmd_prune(int argc, const char **argv, const char *prefix) { struct rev_info revs; struct progress *progress = NULL; + int do_prune_worktrees = 0; const struct option options[] = { OPT__DRY_RUN(&show_only, N_("do not remove, show only")), OPT__VERBOSE(&verbose, N_("report pruned objects")), OPT_BOOL(0, "progress", &show_progress, N_("show progress")), + OPT_BOOL(0, "worktrees", &do_prune_worktrees, N_("prune .git/worktrees")), OPT_EXPIRY_DATE(0, "expire", &expire, N_("expire objects older than <time>")), OPT_END() @@ -115,9 +206,18 @@ int cmd_prune(int argc, const char **argv, const char *prefix) expire = ULONG_MAX; save_commit_buffer = 0; check_replace_refs = 0; + ref_paranoia = 1; init_revisions(&revs, prefix); argc = parse_options(argc, argv, prefix, options, prune_usage, 0); + + if (do_prune_worktrees) { + if (argc) + die(_("--worktrees does not take extra arguments")); + prune_worktrees(); + return 0; + } + while (argc--) { unsigned char sha1[20]; const char *name = *argv++; diff --git a/builtin/push.c b/builtin/push.c index fc771a9..57c138b 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -473,13 +473,22 @@ static int option_parse_recurse_submodules(const struct option *opt, static int git_push_config(const char *k, const char *v, void *cb) { - struct wt_status *s = cb; + int *flags = cb; int status; status = git_gpg_config(k, v, NULL); if (status) return status; - return git_default_config(k, v, s); + + if (!strcmp(k, "push.followtags")) { + if (git_config_bool(k, v)) + *flags |= TRANSPORT_PUSH_FOLLOW_TAGS; + else + *flags &= ~TRANSPORT_PUSH_FOLLOW_TAGS; + return 0; + } + + return git_default_config(k, v, NULL); } int cmd_push(int argc, const char **argv, const char *prefix) @@ -487,7 +496,6 @@ int cmd_push(int argc, const char **argv, const char *prefix) int flags = 0; int tags = 0; int rc; - int atomic = 0; const char *repo = NULL; /* default repository */ struct option options[] = { OPT__VERBOSITY(&verbosity), @@ -519,12 +527,12 @@ int cmd_push(int argc, const char **argv, const char *prefix) OPT_BIT(0, "follow-tags", &flags, N_("push missing but relevant tags"), TRANSPORT_PUSH_FOLLOW_TAGS), OPT_BIT(0, "signed", &flags, N_("GPG sign the push"), TRANSPORT_PUSH_CERT), - OPT_BOOL(0, "atomic", &atomic, N_("request atomic transaction on remote side")), + OPT_BIT(0, "atomic", &flags, N_("request atomic transaction on remote side"), TRANSPORT_PUSH_ATOMIC), OPT_END() }; packet_trace_identity("push"); - git_config(git_push_config, NULL); + git_config(git_push_config, &flags); argc = parse_options(argc, argv, prefix, options, push_usage, 0); if (deleterefs && (tags || (flags & (TRANSPORT_PUSH_ALL | TRANSPORT_PUSH_MIRROR)))) @@ -535,9 +543,6 @@ int cmd_push(int argc, const char **argv, const char *prefix) if (tags) add_refspec("refs/tags/*"); - if (atomic) - flags |= TRANSPORT_PUSH_ATOMIC; - if (argc > 0) { repo = argv[0]; set_refspecs(argv + 1, argc - 1, repo); diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 70e9ce5..d2ec52b 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -743,6 +743,22 @@ static int update_shallow_ref(struct command *cmd, struct shallow_info *si) return 0; } +/* + * NEEDSWORK: we should consolidate various implementions of "are we + * on an unborn branch?" test into one, and make the unified one more + * robust. !get_sha1() based check used here and elsewhere would not + * allow us to tell an unborn branch from corrupt ref, for example. + * For the purpose of fixing "deploy-to-update does not work when + * pushing into an empty repository" issue, this should suffice for + * now. + */ +static int head_has_history(void) +{ + unsigned char sha1[20]; + + return !get_sha1("HEAD", sha1); +} + static const char *push_to_deploy(unsigned char *sha1, struct argv_array *env, const char *work_tree) @@ -755,7 +771,7 @@ static const char *push_to_deploy(unsigned char *sha1, }; const char *diff_index[] = { "diff-index", "--quiet", "--cached", "--ignore-submodules", - "HEAD", "--", NULL + NULL, "--", NULL }; const char *read_tree[] = { "read-tree", "-u", "-m", NULL, NULL @@ -782,6 +798,9 @@ static const char *push_to_deploy(unsigned char *sha1, if (run_command(&child)) return "Working directory has unstaged changes"; + /* diff-index with either HEAD or an empty tree */ + diff_index[4] = head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX; + child_process_init(&child); child.argv = diff_index; child.env = env->argv; @@ -989,7 +1008,7 @@ static void run_update_post_hook(struct command *commands) int argc; const char **argv; struct child_process proc = CHILD_PROCESS_INIT; - char *hook; + const char *hook; hook = find_hook("post-update"); for (argc = 0, cmd = commands; cmd; cmd = cmd->next) { diff --git a/builtin/remote.c b/builtin/remote.c index 5d3ab90..ad57fc9 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -584,7 +584,7 @@ static int migrate_file(struct remote *remote) { struct strbuf buf = STRBUF_INIT; int i; - char *path = NULL; + const char *path = NULL; strbuf_addf(&buf, "remote.%s.url", remote->name); for (i = 0; i < remote->url_nr; i++) diff --git a/builtin/repack.c b/builtin/repack.c index 28fbc70..af7340c 100644 --- a/builtin/repack.c +++ b/builtin/repack.c @@ -228,13 +228,17 @@ int cmd_repack(int argc, const char **argv, const char *prefix) get_non_kept_pack_filenames(&existing_packs); if (existing_packs.nr && delete_redundant) { - if (unpack_unreachable) + if (unpack_unreachable) { argv_array_pushf(&cmd.args, "--unpack-unreachable=%s", unpack_unreachable); - else if (pack_everything & LOOSEN_UNREACHABLE) + argv_array_push(&cmd.env_array, "GIT_REF_PARANOIA=1"); + } else if (pack_everything & LOOSEN_UNREACHABLE) { argv_array_push(&cmd.args, "--unpack-unreachable"); + } else { + argv_array_push(&cmd.env_array, "GIT_REF_PARANOIA=1"); + } } } else { argv_array_push(&cmd.args, "--unpacked"); @@ -281,7 +285,8 @@ int cmd_repack(int argc, const char **argv, const char *prefix) failed = 0; for_each_string_list_item(item, &names) { for (ext = 0; ext < ARRAY_SIZE(exts); ext++) { - char *fname, *fname_old; + const char *fname_old; + char *fname; fname = mkpathdup("%s/pack-%s%s", packdir, item->string, exts[ext].name); if (!file_exists(fname)) { @@ -309,7 +314,8 @@ int cmd_repack(int argc, const char **argv, const char *prefix) if (failed) { struct string_list rollback_failure = STRING_LIST_INIT_DUP; for_each_string_list_item(item, &rollback) { - char *fname, *fname_old; + const char *fname_old; + char *fname; fname = mkpathdup("%s/%s", packdir, item->string); fname_old = mkpath("%s/old-%s", packdir, item->string); if (rename(fname_old, fname)) @@ -362,7 +368,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix) /* Remove the "old-" files */ for_each_string_list_item(item, &names) { for (ext = 0; ext < ARRAY_SIZE(exts); ext++) { - char *fname; + const char *fname; fname = mkpath("%s/old-%s%s", packdir, item->string, diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c index 3626c61..4d10dd9 100644 --- a/builtin/rev-parse.c +++ b/builtin/rev-parse.c @@ -533,6 +533,13 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix) for (i = 1; i < argc; i++) { const char *arg = argv[i]; + if (!strcmp(arg, "--git-path")) { + if (!argv[i + 1]) + die("--git-path requires an argument"); + puts(git_path("%s", argv[i + 1])); + i++; + continue; + } if (as_is) { if (show_file(arg, output_prefix) && as_is < 2) verify_filename(prefix, arg, 0); @@ -755,6 +762,10 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix) free(cwd); continue; } + if (!strcmp(arg, "--git-common-dir")) { + puts(get_git_common_dir()); + continue; + } if (!strcmp(arg, "--resolve-git-dir")) { const char *gitdir = argv[++i]; if (!gitdir) diff --git a/builtin/show-branch.c b/builtin/show-branch.c index f3fb5fb..e69fb7c 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -718,7 +718,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) } /* If nothing is specified, show all branches by default */ - if (ac + all_heads + all_remotes == 0) + if (ac <= topics && all_heads + all_remotes == 0) all_heads = 1; if (reflog) { @@ -785,13 +785,13 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) } free(ref); } - else if (all_heads + all_remotes) - snarf_refs(all_heads, all_remotes); else { while (0 < ac) { append_one_rev(*av); ac--; av++; } + if (all_heads + all_remotes) + snarf_refs(all_heads, all_remotes); } head_p = resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, diff --git a/builtin/tag.c b/builtin/tag.c index 4194b9a..6f07ac6 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -605,13 +605,13 @@ int cmd_tag(int argc, const char **argv, const char *prefix) OPT_STRING('u', "local-user", &keyid, N_("key-id"), N_("use another key to sign the tag")), OPT__FORCE(&force, N_("replace the tag if exists")), + + OPT_GROUP(N_("Tag listing options")), OPT_COLUMN(0, "column", &colopts, N_("show tag list in columns")), { OPTION_CALLBACK, 0, "sort", &tag_sort, N_("type"), N_("sort tags"), PARSE_OPT_NONEG, parse_opt_sort }, - - OPT_GROUP(N_("Tag listing options")), { OPTION_CALLBACK, 0, "contains", &with_commit, N_("commit"), N_("print only tags that contain the commit"), diff --git a/builtin/update-index.c b/builtin/update-index.c index 790a6aa..7431938 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c @@ -693,10 +693,9 @@ static int do_unresolve(int ac, const char **av, for (i = 1; i < ac; i++) { const char *arg = av[i]; - const char *p = prefix_path(prefix, prefix_length, arg); + char *p = prefix_path(prefix, prefix_length, arg); err |= unresolve_one(p); - if (p < arg || p > arg + strlen(arg)) - free((char *)p); + free(p); } return err; } @@ -745,6 +744,7 @@ static int do_reupdate(int ac, const char **av, path = xstrdup(ce->name); update_one(path); free(path); + free(old); if (save_nr != active_nr) goto redo; } @@ -1036,14 +1036,14 @@ int cmd_update_index(int argc, const char **argv, const char *prefix) case PARSE_OPT_DONE: { const char *path = ctx.argv[0]; - const char *p; + char *p; setup_work_tree(); p = prefix_path(prefix, prefix_length, path); update_one(p); if (set_executable_bit) chmod_path(set_executable_bit, p); - free((char *)p); + free(p); ctx.argc--; ctx.argv++; break; @@ -1074,7 +1074,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix) setup_work_tree(); while (strbuf_getline(&buf, stdin, line_termination) != EOF) { - const char *p; + char *p; if (line_termination && buf.buf[0] == '"') { strbuf_reset(&nbuf); if (unquote_c_style(&nbuf, buf.buf, NULL)) @@ -1085,7 +1085,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix) update_one(p); if (set_executable_bit) chmod_path(set_executable_bit, p); - free((char *)p); + free(p); } strbuf_release(&nbuf); strbuf_release(&buf); diff --git a/bulk-checkin.c b/bulk-checkin.c index 0c4b8a7..7cffc3a 100644 --- a/bulk-checkin.c +++ b/bulk-checkin.c @@ -24,7 +24,7 @@ static struct bulk_checkin_state { static void finish_bulk_checkin(struct bulk_checkin_state *state) { - unsigned char sha1[20]; + struct object_id oid; struct strbuf packname = STRBUF_INIT; int i; @@ -36,11 +36,11 @@ static void finish_bulk_checkin(struct bulk_checkin_state *state) unlink(state->pack_tmp_name); goto clear_exit; } else if (state->nr_written == 1) { - sha1close(state->f, sha1, CSUM_FSYNC); + sha1close(state->f, oid.hash, CSUM_FSYNC); } else { - int fd = sha1close(state->f, sha1, 0); - fixup_pack_header_footer(fd, sha1, state->pack_tmp_name, - state->nr_written, sha1, + int fd = sha1close(state->f, oid.hash, 0); + fixup_pack_header_footer(fd, oid.hash, state->pack_tmp_name, + state->nr_written, oid.hash, state->offset); close(fd); } @@ -48,7 +48,7 @@ static void finish_bulk_checkin(struct bulk_checkin_state *state) strbuf_addf(&packname, "%s/pack/pack-", get_object_directory()); finish_tmp_packfile(&packname, state->pack_tmp_name, state->written, state->nr_written, - &state->pack_idx_opts, sha1); + &state->pack_idx_opts, oid.hash); for (i = 0; i < state->nr_written; i++) free(state->written[i]); @@ -105,7 +105,6 @@ static int stream_to_pack(struct bulk_checkin_state *state, int write_object = (flags & HASH_WRITE_OBJECT); off_t offset = 0; - memset(&s, 0, sizeof(s)); git_deflate_init(&s, pack_compression_level); hdrlen = encode_in_pack_object_header(type, size, obuf); @@ -334,7 +334,7 @@ static int write_bundle_refs(int bundle_fd, struct rev_info *revs) if (e->item->flags & UNINTERESTING) continue; if (dwim_ref(e->name, strlen(e->name), sha1, &ref) != 1) - continue; + goto skip_write_ref; if (read_ref_full(e->name, RESOLVE_REF_READING, sha1, &flag)) flag = 0; display_ref = (flag & REF_ISSYMREF) ? e->name : ref; @@ -342,7 +342,7 @@ static int write_bundle_refs(int bundle_fd, struct rev_info *revs) if (e->item->type == OBJ_TAG && !is_tag_in_date_range(e->item, revs)) { e->item->flags |= UNINTERESTING; - continue; + goto skip_write_ref; } /* @@ -357,8 +357,7 @@ static int write_bundle_refs(int bundle_fd, struct rev_info *revs) if (!(e->item->flags & SHOWN) && e->item->type == OBJ_COMMIT) { warning(_("ref '%s' is excluded by the rev-list options"), e->name); - free(ref); - continue; + goto skip_write_ref; } /* * If you run "git bundle create bndl v1.0..v2.0", the @@ -388,8 +387,7 @@ static int write_bundle_refs(int bundle_fd, struct rev_info *revs) obj->flags |= SHOWN; add_pending_object(revs, obj, e->name); } - free(ref); - continue; + goto skip_write_ref; } ref_count++; @@ -397,6 +395,7 @@ static int write_bundle_refs(int bundle_fd, struct rev_info *revs) write_or_die(bundle_fd, " ", 1); write_or_die(bundle_fd, display_ref, strlen(display_ref)); write_or_die(bundle_fd, "\n", 1); + skip_write_ref: free(ref); } @@ -43,6 +43,14 @@ int git_deflate_end_gently(git_zstream *); int git_deflate(git_zstream *, int flush); unsigned long git_deflate_bound(git_zstream *, unsigned long); +/* The length in bytes and in hex digits of an object name (SHA-1 value). */ +#define GIT_SHA1_RAWSZ 20 +#define GIT_SHA1_HEXSZ (2 * GIT_SHA1_RAWSZ) + +struct object_id { + unsigned char hash[GIT_SHA1_RAWSZ]; +}; + #if defined(DT_UNKNOWN) && !defined(NO_D_TYPE_IN_DIRENT) #define DTYPE(de) ((de)->d_type) #else @@ -374,6 +382,7 @@ static inline enum object_type object_type(unsigned int mode) /* Double-check local_repo_env below if you add to this list. */ #define GIT_DIR_ENVIRONMENT "GIT_DIR" +#define GIT_COMMON_DIR_ENVIRONMENT "GIT_COMMON_DIR" #define GIT_NAMESPACE_ENVIRONMENT "GIT_NAMESPACE" #define GIT_WORK_TREE_ENVIRONMENT "GIT_WORK_TREE" #define GIT_PREFIX_ENVIRONMENT "GIT_PREFIX" @@ -427,11 +436,13 @@ extern int is_inside_git_dir(void); extern char *git_work_tree_cfg; extern int is_inside_work_tree(void); extern const char *get_git_dir(void); +extern const char *get_git_common_dir(void); extern int is_git_directory(const char *path); extern char *get_object_directory(void); extern char *get_index_file(void); extern char *get_graft_file(void); extern int set_git_dir(const char *path); +extern int get_common_dir(struct strbuf *sb, const char *gitdir); extern const char *get_git_namespace(void); extern const char *strip_namespace(const char *namespaced_ref); extern const char *get_git_work_tree(void); @@ -618,6 +629,15 @@ extern int core_apply_sparse_checkout; extern int precomposed_unicode; extern int protect_hfs; extern int protect_ntfs; +extern int git_db_env, git_index_env, git_graft_env, git_common_dir_env; + +/* + * Include broken refs in all ref iterations, which will + * generally choke dangerous operations rather than letting + * them silently proceed without taking the broken ref into + * account. + */ +extern int ref_paranoia; /* * The character that begins a commented line in user-editable file @@ -680,18 +700,19 @@ extern int check_repository_format(void); extern char *mksnpath(char *buf, size_t n, const char *fmt, ...) __attribute__((format (printf, 3, 4))); -extern char *git_snpath(char *buf, size_t n, const char *fmt, ...) - __attribute__((format (printf, 3, 4))); +extern void strbuf_git_path(struct strbuf *sb, const char *fmt, ...) + __attribute__((format (printf, 2, 3))); extern char *git_pathdup(const char *fmt, ...) __attribute__((format (printf, 1, 2))); extern char *mkpathdup(const char *fmt, ...) __attribute__((format (printf, 1, 2))); /* Return a statically allocated filename matching the sha1 signature */ -extern char *mkpath(const char *fmt, ...) __attribute__((format (printf, 1, 2))); -extern char *git_path(const char *fmt, ...) __attribute__((format (printf, 1, 2))); -extern char *git_path_submodule(const char *path, const char *fmt, ...) +extern const char *mkpath(const char *fmt, ...) __attribute__((format (printf, 1, 2))); +extern const char *git_path(const char *fmt, ...) __attribute__((format (printf, 1, 2))); +extern const char *git_path_submodule(const char *path, const char *fmt, ...) __attribute__((format (printf, 2, 3))); +extern void report_linked_checkout_garbage(void); /* * Return the name of the file in the local object database that would @@ -716,13 +737,13 @@ extern char *sha1_pack_name(const unsigned char *sha1); extern char *sha1_pack_index_name(const unsigned char *sha1); extern const char *find_unique_abbrev(const unsigned char *sha1, int); -extern const unsigned char null_sha1[20]; +extern const unsigned char null_sha1[GIT_SHA1_RAWSZ]; static inline int hashcmp(const unsigned char *sha1, const unsigned char *sha2) { int i; - for (i = 0; i < 20; i++, sha1++, sha2++) { + for (i = 0; i < GIT_SHA1_RAWSZ; i++, sha1++, sha2++) { if (*sha1 != *sha2) return *sha1 - *sha2; } @@ -730,20 +751,42 @@ static inline int hashcmp(const unsigned char *sha1, const unsigned char *sha2) return 0; } +static inline int oidcmp(const struct object_id *oid1, const struct object_id *oid2) +{ + return hashcmp(oid1->hash, oid2->hash); +} + static inline int is_null_sha1(const unsigned char *sha1) { return !hashcmp(sha1, null_sha1); } +static inline int is_null_oid(const struct object_id *oid) +{ + return !hashcmp(oid->hash, null_sha1); +} + static inline void hashcpy(unsigned char *sha_dst, const unsigned char *sha_src) { - memcpy(sha_dst, sha_src, 20); + memcpy(sha_dst, sha_src, GIT_SHA1_RAWSZ); +} + +static inline void oidcpy(struct object_id *dst, const struct object_id *src) +{ + hashcpy(dst->hash, src->hash); } + static inline void hashclr(unsigned char *hash) { - memset(hash, 0, 20); + memset(hash, 0, GIT_SHA1_RAWSZ); } +static inline void oidclr(struct object_id *oid) +{ + hashclr(oid->hash); +} + + #define EMPTY_TREE_SHA1_HEX \ "4b825dc642cb6eb9a060e54bf8d69288fbee4904" #define EMPTY_TREE_SHA1_BIN_LITERAL \ @@ -814,7 +857,6 @@ enum scld_error safe_create_leading_directories(char *path); enum scld_error safe_create_leading_directories_const(const char *path); int mkdir_in_gitdir(const char *path); -extern void home_config_paths(char **global, char **xdg, char *file); extern char *expand_user_path(const char *path); const char *enter_repo(const char *path, int strict); static inline int is_absolute_path(const char *path) @@ -834,8 +876,16 @@ 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); +/** + * Return a newly allocated string with the evaluation of + * "$XDG_CONFIG_HOME/git/$filename" if $XDG_CONFIG_HOME is non-empty, otherwise + * "$HOME/.config/git/$filename". Return NULL upon error. + */ +extern char *xdg_config_home(const char *filename); + /* object replacement */ #define LOOKUP_REPLACE_OBJECT 1 +#define LOOKUP_UNKNOWN_OBJECT 2 extern void *read_sha1_file_extended(const unsigned char *sha1, enum object_type *type, unsigned long *size, unsigned flag); static inline void *read_sha1_file(const unsigned char *sha1, enum object_type *type, unsigned long *size) { @@ -872,6 +922,7 @@ static inline const unsigned char *lookup_replace_object_extended(const unsigned extern int sha1_object_info(const unsigned char *, unsigned long *); extern int hash_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *sha1); extern int write_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *return_sha1); +extern int hash_sha1_file_literally(const void *buf, unsigned long len, const char *type, unsigned char *sha1, unsigned flags); extern int pretend_sha1_file(void *, unsigned long, enum object_type, unsigned char *); extern int force_object_loose(const unsigned char *sha1, time_t mtime); extern int git_open_noatime(const char *name); @@ -950,8 +1001,10 @@ extern int for_each_abbrev(const char *prefix, each_abbrev_fn, void *); * null-terminated string. */ extern int get_sha1_hex(const char *hex, unsigned char *sha1); +extern int get_oid_hex(const char *hex, struct object_id *sha1); extern char *sha1_to_hex(const unsigned char *sha1); /* static buffer result! */ +extern char *oid_to_hex(const struct object_id *oid); /* same static buffer as sha1_to_hex */ extern int read_ref_full(const char *refname, int resolve_flags, unsigned char *sha1, int *flags); extern int read_ref(const char *refname, unsigned char *sha1); @@ -1172,6 +1225,7 @@ extern struct packed_git { int pack_fd; unsigned pack_local:1, pack_keep:1, + freshened:1, do_not_close:1; unsigned char sha1[20]; /* something like ".git/objects/pack/xxxxx.pack" */ @@ -1287,14 +1341,16 @@ int for_each_loose_file_in_objdir_buf(struct strbuf *path, /* * Iterate over loose and packed objects in both the local - * repository and any alternates repositories. + * repository and any alternates repositories (unless the + * LOCAL_ONLY flag is set). */ +#define FOR_EACH_OBJECT_LOCAL_ONLY 0x1 typedef int each_packed_object_fn(const unsigned char *sha1, struct packed_git *pack, uint32_t pos, void *data); -extern int for_each_loose_object(each_loose_object_fn, void *); -extern int for_each_packed_object(each_packed_object_fn, void *); +extern int for_each_loose_object(each_loose_object_fn, void *, unsigned flags); +extern int for_each_packed_object(each_packed_object_fn, void *, unsigned flags); struct object_info { /* Request */ @@ -1302,6 +1358,7 @@ struct object_info { unsigned long *sizep; unsigned long *disk_sizep; unsigned char *delta_base_sha1; + struct strbuf *typename; /* Response */ enum { @@ -1490,9 +1547,13 @@ extern const char *git_mailmap_blob; extern void maybe_flush_or_die(FILE *, const char *); __attribute__((format (printf, 2, 3))) extern void fprintf_or_die(FILE *, const char *fmt, ...); + +#define COPY_READ_ERROR (-2) +#define COPY_WRITE_ERROR (-3) extern int copy_fd(int ifd, int ofd); extern int copy_file(const char *dst, const char *src, int mode); extern int copy_file_with_time(const char *dst, const char *src, int mode); + extern void write_or_die(int fd, const void *buf, size_t count); extern int write_or_whine(int fd, const void *buf, size_t count, const char *msg); extern int write_or_whine_pipe(int fd, const void *buf, size_t count, const char *msg); @@ -1506,6 +1567,8 @@ static inline ssize_t write_str_in_full(int fd, const char *str) { return write_in_full(fd, str, strlen(str)); } +__attribute__((format (printf, 3, 4))) +extern int write_file(const char *path, int fatal, const char *fmt, ...); /* pager.c */ extern void setup_pager(void); @@ -1575,7 +1638,6 @@ extern int ws_blank_line(const char *line, int len, unsigned ws_rule); #define ws_tab_width(rule) ((rule) & WS_TAB_WIDTH_MASK) /* ls-files */ -int report_path_error(const char *ps_matched, const struct pathspec *pathspec, const char *prefix); void overlay_tree_on_cache(const char *tree_name, const char *prefix); char *alias_lookup(const char *alias); diff --git a/combine-diff.c b/combine-diff.c index 91edce5..8eb7278 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -44,9 +44,9 @@ static struct combine_diff_path *intersect_paths(struct combine_diff_path *curr, memset(p->parent, 0, sizeof(p->parent[0]) * num_parent); - hashcpy(p->sha1, q->queue[i]->two->sha1); + hashcpy(p->oid.hash, q->queue[i]->two->sha1); p->mode = q->queue[i]->two->mode; - hashcpy(p->parent[n].sha1, q->queue[i]->one->sha1); + hashcpy(p->parent[n].oid.hash, q->queue[i]->one->sha1); p->parent[n].mode = q->queue[i]->one->mode; p->parent[n].status = q->queue[i]->status; *tail = p; @@ -77,7 +77,7 @@ static struct combine_diff_path *intersect_paths(struct combine_diff_path *curr, continue; } - hashcpy(p->parent[n].sha1, q->queue[i]->one->sha1); + hashcpy(p->parent[n].oid.hash, q->queue[i]->one->sha1); p->parent[n].mode = q->queue[i]->one->mode; p->parent[n].status = q->queue[i]->status; @@ -284,7 +284,7 @@ static struct lline *coalesce_lines(struct lline *base, int *lenbase, return base; } -static char *grab_blob(const unsigned char *sha1, unsigned int mode, +static char *grab_blob(const struct object_id *oid, unsigned int mode, unsigned long *size, struct userdiff_driver *textconv, const char *path) { @@ -294,20 +294,20 @@ static char *grab_blob(const unsigned char *sha1, unsigned int mode, if (S_ISGITLINK(mode)) { blob = xmalloc(100); *size = snprintf(blob, 100, - "Subproject commit %s\n", sha1_to_hex(sha1)); - } else if (is_null_sha1(sha1)) { + "Subproject commit %s\n", oid_to_hex(oid)); + } else if (is_null_oid(oid)) { /* deleted blob */ *size = 0; return xcalloc(1, 1); } else if (textconv) { struct diff_filespec *df = alloc_filespec(path); - fill_filespec(df, sha1, 1, mode); + fill_filespec(df, oid->hash, 1, mode); *size = fill_textconv(textconv, df, &blob); free_filespec(df); } else { - blob = read_sha1_file(sha1, &type, size); + blob = read_sha1_file(oid->hash, &type, size); if (type != OBJ_BLOB) - die("object '%s' is not a blob!", sha1_to_hex(sha1)); + die("object '%s' is not a blob!", oid_to_hex(oid)); } return blob; } @@ -389,7 +389,7 @@ static void consume_line(void *state_, char *line, unsigned long len) } } -static void combine_diff(const unsigned char *parent, unsigned int mode, +static void combine_diff(const struct object_id *parent, unsigned int mode, mmfile_t *result_file, struct sline *sline, unsigned int cnt, int n, int num_parent, int result_deleted, @@ -897,7 +897,7 @@ static void show_combined_header(struct combine_diff_path *elem, int show_file_header) { struct diff_options *opt = &rev->diffopt; - int abbrev = DIFF_OPT_TST(opt, FULL_INDEX) ? 40 : DEFAULT_ABBREV; + int abbrev = DIFF_OPT_TST(opt, FULL_INDEX) ? GIT_SHA1_HEXSZ : DEFAULT_ABBREV; const char *a_prefix = opt->a_prefix ? opt->a_prefix : "a/"; const char *b_prefix = opt->b_prefix ? opt->b_prefix : "b/"; const char *c_meta = diff_get_color_opt(opt, DIFF_METAINFO); @@ -914,11 +914,11 @@ static void show_combined_header(struct combine_diff_path *elem, "", elem->path, line_prefix, c_meta, c_reset); printf("%s%sindex ", line_prefix, c_meta); for (i = 0; i < num_parent; i++) { - abb = find_unique_abbrev(elem->parent[i].sha1, + abb = find_unique_abbrev(elem->parent[i].oid.hash, abbrev); printf("%s%s", i ? "," : "", abb); } - abb = find_unique_abbrev(elem->sha1, abbrev); + abb = find_unique_abbrev(elem->oid.hash, abbrev); printf("..%s%s\n", abb, c_reset); if (mode_differs) { @@ -991,7 +991,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent, /* Read the result of merge first */ if (!working_tree_file) - result = grab_blob(elem->sha1, elem->mode, &result_size, + result = grab_blob(&elem->oid, elem->mode, &result_size, textconv, elem->path); else { /* Used by diff-tree to read from the working tree */ @@ -1013,12 +1013,12 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent, result = strbuf_detach(&buf, NULL); elem->mode = canon_mode(st.st_mode); } else if (S_ISDIR(st.st_mode)) { - unsigned char sha1[20]; - if (resolve_gitlink_ref(elem->path, "HEAD", sha1) < 0) - result = grab_blob(elem->sha1, elem->mode, + struct object_id oid; + if (resolve_gitlink_ref(elem->path, "HEAD", oid.hash) < 0) + result = grab_blob(&elem->oid, elem->mode, &result_size, NULL, NULL); else - result = grab_blob(sha1, elem->mode, + result = grab_blob(&oid, elem->mode, &result_size, NULL, NULL); } else if (textconv) { struct diff_filespec *df = alloc_filespec(elem->path); @@ -1090,7 +1090,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent, for (i = 0; !is_binary && i < num_parent; i++) { char *buf; unsigned long size; - buf = grab_blob(elem->parent[i].sha1, + buf = grab_blob(&elem->parent[i].oid, elem->parent[i].mode, &size, NULL, NULL); if (buffer_is_binary(buf, size)) @@ -1139,14 +1139,14 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent, for (i = 0; i < num_parent; i++) { int j; for (j = 0; j < i; j++) { - if (!hashcmp(elem->parent[i].sha1, - elem->parent[j].sha1)) { + if (!oidcmp(&elem->parent[i].oid, + &elem->parent[j].oid)) { reuse_combine_diff(sline, cnt, i, j); break; } } if (i <= j) - combine_diff(elem->parent[i].sha1, + combine_diff(&elem->parent[i].oid, elem->parent[i].mode, &result_file, sline, cnt, i, num_parent, result_deleted, @@ -1206,9 +1206,9 @@ static void show_raw_diff(struct combine_diff_path *p, int num_parent, struct re /* Show sha1's */ for (i = 0; i < num_parent; i++) - printf(" %s", diff_unique_abbrev(p->parent[i].sha1, + printf(" %s", diff_unique_abbrev(p->parent[i].oid.hash, opt->abbrev)); - printf(" %s ", diff_unique_abbrev(p->sha1, opt->abbrev)); + printf(" %s ", diff_unique_abbrev(p->oid.hash, opt->abbrev)); } if (opt->output_format & (DIFF_FORMAT_RAW | DIFF_FORMAT_NAME_STATUS)) { @@ -1271,16 +1271,16 @@ static struct diff_filepair *combined_pair(struct combine_diff_path *p, for (i = 0; i < num_parent; i++) { pair->one[i].path = p->path; pair->one[i].mode = p->parent[i].mode; - hashcpy(pair->one[i].sha1, p->parent[i].sha1); - pair->one[i].sha1_valid = !is_null_sha1(p->parent[i].sha1); + hashcpy(pair->one[i].sha1, p->parent[i].oid.hash); + pair->one[i].sha1_valid = !is_null_oid(&p->parent[i].oid); pair->one[i].has_more_entries = 1; } pair->one[num_parent - 1].has_more_entries = 0; pair->two->path = p->path; pair->two->mode = p->mode; - hashcpy(pair->two->sha1, p->sha1); - pair->two->sha1_valid = !is_null_sha1(p->sha1); + hashcpy(pair->two->sha1, p->oid.hash); + pair->two->sha1_valid = !is_null_oid(&p->oid); return pair; } diff --git a/command-list.txt b/command-list.txt index f1eae08..54d8d21 100644 --- a/command-list.txt +++ b/command-list.txt @@ -1,5 +1,5 @@ # List of known git commands. -# command name category [deprecated] [common] +# command name category [deprecated] [common] git-add mainporcelain common git-am mainporcelain git-annotate ancillaryinterrogators @@ -40,21 +40,21 @@ git-diff-files plumbinginterrogators git-diff-index plumbinginterrogators git-diff-tree plumbinginterrogators git-difftool ancillaryinterrogators -git-fast-export ancillarymanipulators -git-fast-import ancillarymanipulators +git-fast-export ancillarymanipulators +git-fast-import ancillarymanipulators git-fetch mainporcelain common git-fetch-pack synchingrepositories git-filter-branch ancillarymanipulators git-fmt-merge-msg purehelpers git-for-each-ref plumbinginterrogators git-format-patch mainporcelain -git-fsck ancillaryinterrogators +git-fsck ancillaryinterrogators git-gc mainporcelain git-get-tar-commit-id ancillaryinterrogators git-grep mainporcelain common git-gui mainporcelain git-hash-object plumbingmanipulators -git-help ancillaryinterrogators +git-help ancillaryinterrogators git-http-backend synchingrepositories git-http-fetch synchelpers git-http-push synchelpers @@ -55,12 +55,12 @@ struct commit *lookup_commit(const unsigned char *sha1) struct commit *lookup_commit_reference_by_name(const char *name) { - unsigned char sha1[20]; + struct object_id oid; struct commit *commit; - if (get_sha1_committish(name, sha1)) + if (get_sha1_committish(name, oid.hash)) return NULL; - commit = lookup_commit_reference(sha1); + commit = lookup_commit_reference(oid.hash); if (parse_commit(commit)) return NULL; return commit; @@ -99,7 +99,7 @@ static int commit_graft_alloc, commit_graft_nr; static const unsigned char *commit_graft_sha1_access(size_t index, void *table) { struct commit_graft **commit_graft_table = table; - return commit_graft_table[index]->sha1; + return commit_graft_table[index]->oid.hash; } static int commit_graft_pos(const unsigned char *sha1) @@ -110,7 +110,7 @@ static int commit_graft_pos(const unsigned char *sha1) int register_commit_graft(struct commit_graft *graft, int ignore_dups) { - int pos = commit_graft_pos(graft->sha1); + int pos = commit_graft_pos(graft->oid.hash); if (0 <= pos) { if (ignore_dups) @@ -138,22 +138,23 @@ struct commit_graft *read_graft_line(char *buf, int len) /* The format is just "Commit Parent1 Parent2 ...\n" */ int i; struct commit_graft *graft = NULL; + const int entry_size = GIT_SHA1_HEXSZ + 1; while (len && isspace(buf[len-1])) buf[--len] = '\0'; if (buf[0] == '#' || buf[0] == '\0') return NULL; - if ((len + 1) % 41) + if ((len + 1) % entry_size) goto bad_graft_data; - i = (len + 1) / 41 - 1; - graft = xmalloc(sizeof(*graft) + 20 * i); + i = (len + 1) / entry_size - 1; + graft = xmalloc(sizeof(*graft) + GIT_SHA1_RAWSZ * i); graft->nr_parent = i; - if (get_sha1_hex(buf, graft->sha1)) + if (get_oid_hex(buf, &graft->oid)) goto bad_graft_data; - for (i = 40; i < len; i += 41) { + for (i = GIT_SHA1_HEXSZ; i < len; i += entry_size) { if (buf[i] != ' ') goto bad_graft_data; - if (get_sha1_hex(buf + i + 1, graft->parent[i/41])) + if (get_sha1_hex(buf + i + 1, graft->parent[i/entry_size].hash)) goto bad_graft_data; } return graft; @@ -302,39 +303,42 @@ int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long s { const char *tail = buffer; const char *bufptr = buffer; - unsigned char parent[20]; + struct object_id parent; struct commit_list **pptr; struct commit_graft *graft; + const int tree_entry_len = GIT_SHA1_HEXSZ + 5; + const int parent_entry_len = GIT_SHA1_HEXSZ + 7; if (item->object.parsed) return 0; item->object.parsed = 1; tail += size; - if (tail <= bufptr + 46 || memcmp(bufptr, "tree ", 5) || bufptr[45] != '\n') + if (tail <= bufptr + tree_entry_len + 1 || memcmp(bufptr, "tree ", 5) || + bufptr[tree_entry_len] != '\n') return error("bogus commit object %s", sha1_to_hex(item->object.sha1)); - if (get_sha1_hex(bufptr + 5, parent) < 0) + if (get_sha1_hex(bufptr + 5, parent.hash) < 0) return error("bad tree pointer in commit %s", sha1_to_hex(item->object.sha1)); - item->tree = lookup_tree(parent); - bufptr += 46; /* "tree " + "hex sha1" + "\n" */ + item->tree = lookup_tree(parent.hash); + bufptr += tree_entry_len + 1; /* "tree " + "hex sha1" + "\n" */ pptr = &item->parents; graft = lookup_commit_graft(item->object.sha1); - while (bufptr + 48 < tail && !memcmp(bufptr, "parent ", 7)) { + while (bufptr + parent_entry_len < tail && !memcmp(bufptr, "parent ", 7)) { struct commit *new_parent; - if (tail <= bufptr + 48 || - get_sha1_hex(bufptr + 7, parent) || - bufptr[47] != '\n') + if (tail <= bufptr + parent_entry_len + 1 || + get_sha1_hex(bufptr + 7, parent.hash) || + bufptr[parent_entry_len] != '\n') return error("bad parents in commit %s", sha1_to_hex(item->object.sha1)); - bufptr += 48; + bufptr += parent_entry_len + 1; /* * The clone is shallow if nr_parent < 0, and we must * not traverse its real parents even when we unhide them. */ if (graft && (graft->nr_parent < 0 || grafts_replace_parents)) continue; - new_parent = lookup_commit(parent); + new_parent = lookup_commit(parent.hash); if (new_parent) pptr = &commit_list_insert(new_parent, pptr)->next; } @@ -342,7 +346,7 @@ int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long s int i; struct commit *new_parent; for (i = 0; i < graft->nr_parent; i++) { - new_parent = lookup_commit(graft->parent[i]); + new_parent = lookup_commit(graft->parent[i].hash); if (!new_parent) continue; pptr = &commit_list_insert(new_parent, pptr)->next; @@ -1580,10 +1584,10 @@ struct commit *get_merge_parent(const char *name) { struct object *obj; struct commit *commit; - unsigned char sha1[20]; - if (get_sha1(name, sha1)) + struct object_id oid; + if (get_sha1(name, oid.hash)) return NULL; - obj = parse_object(sha1); + obj = parse_object(oid.hash); commit = (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT); if (commit && !commit->util) { struct merge_remote_desc *desc; @@ -226,9 +226,9 @@ enum rev_sort_order { void sort_in_topological_order(struct commit_list **, enum rev_sort_order); struct commit_graft { - unsigned char sha1[20]; + struct object_id oid; int nr_parent; /* < 0 if shallow commit */ - unsigned char parent[FLEX_ARRAY][20]; /* more */ + struct object_id parent[FLEX_ARRAY]; /* more */ }; typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *); diff --git a/compat/mingw.h b/compat/mingw.h index a6f7b9f..738865c 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -106,8 +106,6 @@ static inline unsigned int alarm(unsigned int seconds) { return 0; } static inline int fsync(int fd) { return _commit(fd); } -static inline pid_t getppid(void) -{ return 1; } static inline void sync(void) {} static inline uid_t getuid(void) @@ -129,6 +127,12 @@ static inline int sigaddset(sigset_t *set, int signum) #define SIG_UNBLOCK 0 static inline int sigprocmask(int how, const sigset_t *set, sigset_t *oldset) { return 0; } +static inline pid_t getppid(void) +{ return 1; } +static inline pid_t getpgid(pid_t pid) +{ return pid == 0 ? getpid() : pid; } +static inline pid_t tcgetpgrp(int fd) +{ return getpid(); } /* * simple adaptors @@ -12,6 +12,7 @@ #include "quote.h" #include "hashmap.h" #include "string-list.h" +#include "utf8.h" struct config_source { struct config_source *prev; @@ -49,7 +50,7 @@ static struct config_set the_config_set; static int config_file_fgetc(struct config_source *conf) { - return fgetc(conf->u.file); + return getc_unlocked(conf->u.file); } static int config_file_ungetc(int c, struct config_source *conf) @@ -417,8 +418,7 @@ static int git_parse_source(config_fn_t fn, void *data) struct strbuf *var = &cf->var; /* U+FEFF Byte Order Mark in UTF8 */ - static const unsigned char *utf8_bom = (unsigned char *) "\xef\xbb\xbf"; - const unsigned char *bomptr = utf8_bom; + const char *bomptr = utf8_bom; for (;;) { int c = get_next_char(); @@ -426,7 +426,7 @@ static int git_parse_source(config_fn_t fn, void *data) /* We are at the file beginning; skip UTF8-encoded BOM * if present. Sane editors won't put this in on their * own, but e.g. Windows Notepad will do it happily. */ - if ((unsigned char) c == *bomptr) { + if (c == (*bomptr & 0377)) { bomptr++; continue; } else { @@ -1088,7 +1088,9 @@ int git_config_from_file(config_fn_t fn, const char *filename, void *data) f = fopen(filename, "r"); if (f) { + flockfile(f); ret = do_config_from_file(fn, filename, filename, f, data); + funlockfile(f); fclose(f); } return ret; @@ -1185,10 +1187,8 @@ int git_config_system(void) int git_config_early(config_fn_t fn, void *data, const char *repo_config) { int ret = 0, found = 0; - char *xdg_config = NULL; - char *user_config = NULL; - - home_config_paths(&user_config, &xdg_config, "config"); + char *xdg_config = xdg_config_home("config"); + char *user_config = expand_user_path("~/.gitconfig"); if (git_config_system() && !access_or_die(git_etc_gitconfig(), R_OK, 0)) { ret += git_config_from_file(fn, git_etc_gitconfig(), diff --git a/config.mak.uname b/config.mak.uname index b64b63c..d26665f 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -36,6 +36,7 @@ ifeq ($(uname_S),Linux) HAVE_DEV_TTY = YesPlease HAVE_CLOCK_GETTIME = YesPlease HAVE_CLOCK_MONOTONIC = YesPlease + HAVE_GETDELIM = YesPlease endif ifeq ($(uname_S),GNU/kFreeBSD) HAVE_ALLOCA_H = YesPlease @@ -107,6 +108,7 @@ ifeq ($(uname_S),Darwin) COMPAT_OBJS += compat/precompose_utf8.o BASIC_CFLAGS += -DPRECOMPOSE_UNICODE BASIC_CFLAGS += -DPROTECT_HFS_DEFAULT=1 + HAVE_BSD_SYSCTL = YesPlease endif ifeq ($(uname_S),SunOS) NEEDS_SOCKET = YesPlease @@ -199,6 +201,7 @@ ifeq ($(uname_S),FreeBSD) PYTHON_PATH = /usr/local/bin/python HAVE_PATHS_H = YesPlease GMTIME_UNRELIABLE_ERRORS = UnfortunatelyYes + HAVE_BSD_SYSCTL = YesPlease endif ifeq ($(uname_S),OpenBSD) NO_STRCASESTR = YesPlease @@ -208,6 +211,7 @@ ifeq ($(uname_S),OpenBSD) BASIC_CFLAGS += -I/usr/local/include BASIC_LDFLAGS += -L/usr/local/lib HAVE_PATHS_H = YesPlease + HAVE_BSD_SYSCTL = YesPlease endif ifeq ($(uname_S),MirBSD) NO_STRCASESTR = YesPlease @@ -215,6 +219,7 @@ ifeq ($(uname_S),MirBSD) USE_ST_TIMESPEC = YesPlease NEEDS_LIBICONV = YesPlease HAVE_PATHS_H = YesPlease + HAVE_BSD_SYSCTL = YesPlease endif ifeq ($(uname_S),NetBSD) ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2) @@ -225,6 +230,7 @@ ifeq ($(uname_S),NetBSD) USE_ST_TIMESPEC = YesPlease NO_MKSTEMPS = YesPlease HAVE_PATHS_H = YesPlease + HAVE_BSD_SYSCTL = YesPlease endif ifeq ($(uname_S),AIX) DEFAULT_PAGER = more diff --git a/configure.ac b/configure.ac index 55e5a9b..bbdde85 100644 --- a/configure.ac +++ b/configure.ac @@ -1046,6 +1046,29 @@ GIT_CONF_SUBST([NO_INITGROUPS]) # # Define NO_ICONV if your libc does not properly support iconv. +AC_DEFUN([BSD_SYSCTL_SRC], [ +AC_LANG_PROGRAM([[ +#include <stddef.h> +#include <sys/types.h> +#include <sys/sysctl.h> +]],[[ +int val, mib[2]; +size_t len; +mib[0] = CTL_HW; +mib[1] = 1; +len = sizeof(val); +return sysctl(mib, 2, &val, &len, NULL, 0) ? 1 : 0; +]])]) + +# +# Define HAVE_BSD_SYSCTL=YesPlease if a BSD-compatible sysctl function is available. +AC_MSG_CHECKING([for BSD sysctl]) +AC_COMPILE_IFELSE([BSD_SYSCTL_SRC], + [AC_MSG_RESULT([yes]) + HAVE_BSD_SYSCTL=YesPlease], + [AC_MSG_RESULT([no]) + HAVE_BSD_SYSCTL=]) +GIT_CONF_SUBST([HAVE_BSD_SYSCTL]) ## Other checks. # Define USE_PIC if you need the main git objects to be built with -fPIC @@ -310,6 +310,8 @@ static void get_host_and_port(char **host, const char **port) if (end != colon + 1 && *end == '\0' && 0 <= portnr && portnr < 65536) { *colon = 0; *port = colon + 1; + } else if (!colon[1]) { + *colon = 0; } } } @@ -722,7 +724,7 @@ struct child_process *git_connect(int fd[2], const char *url, conn->in = conn->out = -1; if (protocol == PROTO_SSH) { const char *ssh; - int putty; + int putty, tortoiseplink = 0; char *ssh_host = hostandport; const char *port = NULL; get_host_and_port(&ssh_host, &port); @@ -739,29 +741,42 @@ struct child_process *git_connect(int fd[2], const char *url, free(hostandport); free(path); + free(conn); return NULL; + } + + ssh = getenv("GIT_SSH_COMMAND"); + if (ssh) { + conn->use_shell = 1; + putty = 0; } else { - 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")) - argv_array_push(&conn->args, "-batch"); - if (port) { - /* P is for PuTTY, p is for OpenSSH */ - argv_array_push(&conn->args, putty ? "-P" : "-p"); - argv_array_push(&conn->args, port); - } - argv_array_push(&conn->args, ssh_host); + const char *base; + char *ssh_dup; + + ssh = getenv("GIT_SSH"); + if (!ssh) + ssh = "ssh"; + + ssh_dup = xstrdup(ssh); + base = basename(ssh_dup); + + tortoiseplink = !strcasecmp(base, "tortoiseplink") || + !strcasecmp(base, "tortoiseplink.exe"); + putty = !strcasecmp(base, "plink") || + !strcasecmp(base, "plink.exe") || tortoiseplink; + + free(ssh_dup); + } + + argv_array_push(&conn->args, ssh); + if (tortoiseplink) + argv_array_push(&conn->args, "-batch"); + if (port) { + /* P is for PuTTY, p is for OpenSSH */ + argv_array_push(&conn->args, putty ? "-P" : "-p"); + argv_array_push(&conn->args, port); } + argv_array_push(&conn->args, ssh_host); } else { /* remove repo-local variables from the environment */ conn->env = local_repo_env; diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index c21190d..bfc74e9 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -186,7 +186,7 @@ fi __gitcompappend () { - local i=${#COMPREPLY[@]} + local x i=${#COMPREPLY[@]} for x in $1; do if [[ "$x" == "$3"* ]]; then COMPREPLY[i++]="$2$x$4" @@ -411,12 +411,9 @@ __git_refs_remotes () __git_remotes () { - local i IFS=$'\n' d="$(__gitdir)" + local d="$(__gitdir)" test -d "$d/remotes" && ls -1 "$d/remotes" - for i in $(git --git-dir="$d" config --get-regexp 'remote\..*\.url' 2>/dev/null); do - i="${i#remote.}" - echo "${i/.url*/}" - done + git --git-dir="$d" remote } __git_list_merge_strategies () @@ -668,8 +665,8 @@ __git_list_porcelain_commands () checkout-index) : plumbing;; commit-tree) : plumbing;; count-objects) : infrequent;; - credential-cache) : credentials helper;; - credential-store) : credentials helper;; + credential) : credentials;; + credential-*) : credentials helper;; cvsexportcommit) : export;; cvsimport) : import;; cvsserver) : daemon;; @@ -738,35 +735,29 @@ __git_list_porcelain_commands () __git_porcelain_commands= __git_compute_porcelain_commands () { - __git_compute_all_commands test -n "$__git_porcelain_commands" || __git_porcelain_commands=$(__git_list_porcelain_commands) } -__git_pretty_aliases () +# Lists all set config variables starting with the given section prefix, +# with the prefix removed. +__git_get_config_variables () { - local i IFS=$'\n' - for i in $(git --git-dir="$(__gitdir)" config --get-regexp "pretty\..*" 2>/dev/null); do - case "$i" in - pretty.*) - i="${i#pretty.}" - echo "${i/ */}" - ;; - esac + local section="$1" i IFS=$'\n' + for i in $(git --git-dir="$(__gitdir)" config --get-regexp "^$section\..*" 2>/dev/null); do + i="${i#$section.}" + echo "${i/ */}" done } +__git_pretty_aliases () +{ + __git_get_config_variables "pretty" +} + __git_aliases () { - local i IFS=$'\n' - for i in $(git --git-dir="$(__gitdir)" config --get-regexp "alias\..*" 2>/dev/null); do - case "$i" in - alias.*) - i="${i#alias.}" - echo "${i/ */}" - ;; - esac - done + __git_get_config_variables "alias" } # __git_aliased_command requires 1 argument @@ -980,7 +971,7 @@ _git_branch () case "$cur" in --set-upstream-to=*) - __gitcomp "$(__git_refs)" "" "${cur##--set-upstream-to=}" + __gitcomp_nl "$(__git_refs)" "" "${cur##--set-upstream-to=}" ;; --*) __gitcomp " @@ -1048,7 +1039,7 @@ _git_checkout () _git_cherry () { - __gitcomp "$(__git_refs)" + __gitcomp_nl "$(__git_refs)" } _git_cherry_pick () @@ -1305,7 +1296,7 @@ _git_gitk () } __git_match_ctag() { - awk "/^${1////\\/}/ { print \$1 }" "$2" + awk "/^${1//\//\\/}/ { print \$1 }" "$2" } _git_grep () @@ -1451,7 +1442,7 @@ _git_log () return ;; --decorate=*) - __gitcomp "long short" "" "${cur##--decorate=}" + __gitcomp "full short no" "" "${cur##--decorate=}" return ;; --*) @@ -2014,6 +2005,7 @@ _git_config () color.status.changed color.status.header color.status.nobranch + color.status.unmerged color.status.untracked color.status.updated color.ui @@ -2125,6 +2117,7 @@ _git_config () http.noEPSV http.postBuffer http.proxy + http.sslCipherList http.sslCAInfo http.sslCAPath http.sslCert @@ -2188,6 +2181,7 @@ _git_config () pull.octopus pull.twohead push.default + push.followTags rebase.autosquash rebase.stat receive.autogc @@ -2261,12 +2255,7 @@ _git_remote () __git_complete_remote_or_refspec ;; update) - local i c='' IFS=$'\n' - for i in $(git --git-dir="$(__gitdir)" config --get-regexp "remotes\..*" 2>/dev/null); do - i="${i#remotes.}" - c="$c ${i/ */}" - done - __gitcomp "$c" + __gitcomp "$(__git_get_config_variables "remotes")" ;; *) ;; diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index 214e859..f18aedc 100644 --- a/contrib/completion/git-prompt.sh +++ b/contrib/completion/git-prompt.sh @@ -487,7 +487,7 @@ __git_ps1 () if [ -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" ] && [ "$(git config --bool bash.showUntrackedFiles)" != "false" ] && - git ls-files --others --exclude-standard --error-unmatch -- '*' >/dev/null 2>/dev/null + git ls-files --others --exclude-standard --error-unmatch -- ':/*' >/dev/null 2>/dev/null then u="%${ZSH_VERSION+%}" fi diff --git a/contrib/diff-highlight/diff-highlight b/contrib/diff-highlight/diff-highlight index 08c88bb..ffefc31 100755 --- a/contrib/diff-highlight/diff-highlight +++ b/contrib/diff-highlight/diff-highlight @@ -1,5 +1,6 @@ #!/usr/bin/perl +use 5.008; use warnings FATAL => 'all'; use strict; @@ -164,8 +165,12 @@ sub highlight_pair { sub split_line { local $_ = shift; - return map { /$COLOR/ ? $_ : (split //) } - split /($COLOR*)/; + return utf8::decode($_) ? + map { utf8::encode($_); $_ } + map { /$COLOR/ ? $_ : (split //) } + split /($COLOR+)/ : + map { /$COLOR/ ? $_ : (split //) } + split /($COLOR+)/; } sub highlight_line { diff --git a/contrib/hooks/multimail/README b/contrib/hooks/multimail/README index 477d65f..6efa4ff 100644 --- a/contrib/hooks/multimail/README +++ b/contrib/hooks/multimail/README @@ -456,34 +456,35 @@ consider sharing them with the community! Getting involved ---------------- -git-multimail is an open-source project, built by volunteers. We -would welcome your help! +git-multimail is an open-source project, built by volunteers. We would +welcome your help! -The current maintainer is Michael Haggerty <mhagger@alum.mit.edu>. +The current maintainers are Michael Haggerty <mhagger@alum.mit.edu> +and Matthieu Moy <matthieu.moy@grenoble-inp.fr>. -General discussion of git-multimail takes place on the main Git -mailing list, +Please note that although a copy of git-multimail is distributed in +the "contrib" section of the main Git project, development takes place +in a separate git-multimail repository on GitHub: - git@vger.kernel.org + https://github.com/git-multimail/git-multimail -Please CC emails regarding git-multimail to me so that I don't -overlook them. +Whenever enough changes to git-multimail have accumulated, a new +code-drop of git-multimail will be submitted for inclusion in the Git +project. -The git-multimail project itself is currently hosted on GitHub: +We use the GitHub issue tracker to keep track of bugs and feature +requests, and we use GitHub pull requests to exchange patches (though, +if you prefer, you can send patches via the Git mailing list with CC +to the maintainers). Please sign off your patches as per the Git +project practice. - https://github.com/mhagger/git-multimail +General discussion of git-multimail can take place on the main Git +mailing list, -We use the GitHub issue tracker to keep track of bugs and feature -requests, and GitHub pull requests to exchange patches (though, if you -prefer, you can send patches via the Git mailing list with cc to me). -Please sign off your patches as per the Git project practice. - -Please note that although a copy of git-multimail will probably be -distributed in the "contrib" section of the main Git project, -development takes place in the separate git-multimail repository on -GitHub! (Whenever enough changes to git-multimail have accumulated, a -new code-drop of git-multimail will be submitted for inclusion in the -Git project.) + git@vger.kernel.org + +Please CC emails regarding git-multimail to the maintainers so that we +don't overlook them. Footnotes diff --git a/contrib/hooks/multimail/README.Git b/contrib/hooks/multimail/README.Git index 129b771..ab3ece5 100644 --- a/contrib/hooks/multimail/README.Git +++ b/contrib/hooks/multimail/README.Git @@ -3,13 +3,13 @@ section of the Git project as a convenience to Git users. git-multimail is developed as an independent project at the following website: - https://github.com/mhagger/git-multimail + https://github.com/git-multimail/git-multimail The version in this directory was obtained from the upstream project -on 2014-04-07 and consists of the "git-multimail" subdirectory from +on 2015-04-27 and consists of the "git-multimail" subdirectory from revision - 1b32653bafc4f902535b9fc1cd9cae911325b870 + 8c3aaafa873bf10de8dddf1d202c449b3eff3b42 refs/tags/1.0.2 Please see the README file in this directory for information about how to report bugs or contribute to git-multimail. diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh index fa1a583..07bd77c 100755 --- a/contrib/subtree/git-subtree.sh +++ b/contrib/subtree/git-subtree.sh @@ -26,7 +26,7 @@ b,branch= create a new branch from the split subtree ignore-joins ignore prior --rejoin commits onto= try connecting new tree to an existing one rejoin merge the new branch back into HEAD - options for 'add', 'merge', 'pull' and 'push' + options for 'add', 'merge', and 'pull' squash merge subtree changes as a single commit " eval "$(echo "$OPTS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?)" @@ -51,14 +51,21 @@ prefix= debug() { if [ -n "$debug" ]; then - echo "$@" >&2 + printf "%s\n" "$*" >&2 fi } say() { if [ -z "$quiet" ]; then - echo "$@" >&2 + printf "%s\n" "$*" >&2 + fi +} + +progress() +{ + if [ -z "$quiet" ]; then + printf "%s\r" "$*" >&2 fi } @@ -599,7 +606,7 @@ cmd_split() eval "$grl" | while read rev parents; do revcount=$(($revcount + 1)) - say -n "$revcount/$revmax ($createcount)
" + progress "$revcount/$revmax ($createcount)" debug "Processing commit: $rev" exists=$(cache_get $rev) if [ -n "$exists" ]; then diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt index 54e4b4a..60d76cd 100644 --- a/contrib/subtree/git-subtree.txt +++ b/contrib/subtree/git-subtree.txt @@ -146,7 +146,7 @@ OPTIONS OPTIONS FOR add, merge, push, pull ---------------------------------- --squash:: - This option is only valid for add, merge, push and pull + This option is only valid for add, merge, and pull commands. + Instead of merging the entire history from the subtree project, produce @@ -356,9 +356,14 @@ static int filter_buffer_or_fd(int in, int out, void *data) sigchain_push(SIGPIPE, SIG_IGN); if (params->src) { - write_err = (write_in_full(child_process.in, params->src, params->size) < 0); + write_err = (write_in_full(child_process.in, + params->src, params->size) < 0); + if (errno == EPIPE) + write_err = 0; } else { write_err = copy_fd(params->fd, child_process.in); + if (write_err == COPY_WRITE_ERROR && errno == EPIPE) + write_err = 0; } if (close(child_process.in)) @@ -7,13 +7,10 @@ int copy_fd(int ifd, int ofd) ssize_t len = xread(ifd, buffer, sizeof(buffer)); if (!len) break; - if (len < 0) { - return error("copy-fd: read returned %s", - strerror(errno)); - } + if (len < 0) + return COPY_READ_ERROR; if (write_in_full(ofd, buffer, len) < 0) - return error("copy-fd: write returned %s", - strerror(errno)); + return COPY_WRITE_ERROR; } return 0; } @@ -43,6 +40,14 @@ int copy_file(const char *dst, const char *src, int mode) return fdo; } status = copy_fd(fdi, fdo); + switch (status) { + case COPY_READ_ERROR: + error("copy-fd: read returned %s", strerror(errno)); + break; + case COPY_WRITE_ERROR: + error("copy-fd: write returned %s", strerror(errno)); + break; + } close(fdi); if (close(fdo) != 0) return error("%s: close error: %s", dst, strerror(errno)); diff --git a/credential-store.c b/credential-store.c index 925d3f4..f692509 100644 --- a/credential-store.c +++ b/credential-store.c @@ -6,7 +6,7 @@ static struct lock_file credential_lock; -static void parse_credential_file(const char *fn, +static int parse_credential_file(const char *fn, struct credential *c, void (*match_cb)(struct credential *), void (*other_cb)(struct strbuf *)) @@ -14,18 +14,20 @@ static void parse_credential_file(const char *fn, FILE *fh; struct strbuf line = STRBUF_INIT; struct credential entry = CREDENTIAL_INIT; + int found_credential = 0; fh = fopen(fn, "r"); if (!fh) { - if (errno != ENOENT) + if (errno != ENOENT && errno != EACCES) die_errno("unable to open %s", fn); - return; + return found_credential; } while (strbuf_getline(&line, fh, '\n') != EOF) { credential_from_url(&entry, line.buf); if (entry.username && entry.password && credential_match(c, &entry)) { + found_credential = 1; if (match_cb) { match_cb(&entry); break; @@ -38,6 +40,7 @@ static void parse_credential_file(const char *fn, credential_clear(&entry); strbuf_release(&line); fclose(fh); + return found_credential; } static void print_entry(struct credential *c) @@ -64,21 +67,10 @@ static void rewrite_credential_file(const char *fn, struct credential *c, die_errno("unable to commit credential store"); } -static void store_credential(const char *fn, struct credential *c) +static void store_credential_file(const char *fn, struct credential *c) { struct strbuf buf = STRBUF_INIT; - /* - * Sanity check that what we are storing is actually sensible. - * In particular, we can't make a URL without a protocol field. - * Without either a host or pathname (depending on the scheme), - * we have no primary key. And without a username and password, - * we are not actually storing a credential. - */ - if (!c->protocol || !(c->host || c->path) || - !c->username || !c->password) - return; - strbuf_addf(&buf, "%s://", c->protocol); strbuf_addstr_urlencode(&buf, c->username, 1); strbuf_addch(&buf, ':'); @@ -95,8 +87,37 @@ static void store_credential(const char *fn, struct credential *c) strbuf_release(&buf); } -static void remove_credential(const char *fn, struct credential *c) +static void store_credential(const struct string_list *fns, struct credential *c) +{ + struct string_list_item *fn; + + /* + * Sanity check that what we are storing is actually sensible. + * In particular, we can't make a URL without a protocol field. + * Without either a host or pathname (depending on the scheme), + * we have no primary key. And without a username and password, + * we are not actually storing a credential. + */ + if (!c->protocol || !(c->host || c->path) || !c->username || !c->password) + return; + + for_each_string_list_item(fn, fns) + if (!access(fn->string, F_OK)) { + store_credential_file(fn->string, c); + return; + } + /* + * Write credential to the filename specified by fns->items[0], thus + * creating it + */ + if (fns->nr) + store_credential_file(fns->items[0].string, c); +} + +static void remove_credential(const struct string_list *fns, struct credential *c) { + struct string_list_item *fn; + /* * Sanity check that we actually have something to match * against. The input we get is a restrictive pattern, @@ -105,14 +126,20 @@ static void remove_credential(const char *fn, struct credential *c) * to empty input. So explicitly disallow it, and require that the * pattern have some actual content to match. */ - if (c->protocol || c->host || c->path || c->username) - rewrite_credential_file(fn, c, NULL); + if (!c->protocol && !c->host && !c->path && !c->username) + return; + for_each_string_list_item(fn, fns) + if (!access(fn->string, F_OK)) + rewrite_credential_file(fn->string, c, NULL); } -static int lookup_credential(const char *fn, struct credential *c) +static void lookup_credential(const struct string_list *fns, struct credential *c) { - parse_credential_file(fn, c, print_entry, NULL); - return c->username && c->password; + struct string_list_item *fn; + + for_each_string_list_item(fn, fns) + if (parse_credential_file(fn->string, c, print_entry, NULL)) + return; /* Found credential */ } int main(int argc, char **argv) @@ -123,6 +150,7 @@ int main(int argc, char **argv) }; const char *op; struct credential c = CREDENTIAL_INIT; + struct string_list fns = STRING_LIST_INIT_DUP; char *file = NULL; struct option options[] = { OPT_STRING(0, "file", &file, "path", @@ -137,22 +165,30 @@ int main(int argc, char **argv) usage_with_options(usage, options); op = argv[0]; - if (!file) - file = expand_user_path("~/.git-credentials"); - if (!file) + if (file) { + string_list_append(&fns, file); + } else { + if ((file = expand_user_path("~/.git-credentials"))) + string_list_append_nodup(&fns, file); + file = xdg_config_home("credentials"); + if (file) + string_list_append_nodup(&fns, file); + } + if (!fns.nr) die("unable to set up default path; use --file"); if (credential_read(&c, stdin) < 0) die("unable to read credential"); if (!strcmp(op, "get")) - lookup_credential(file, &c); + lookup_credential(&fns, &c); else if (!strcmp(op, "erase")) - remove_credential(file, &c); + remove_credential(&fns, &c); else if (!strcmp(op, "store")) - store_credential(file, &c); + store_credential(&fns, &c); else ; /* Ignore unknown operation. */ + string_list_clear(&fns, 0); return 0; } diff --git a/csum-file.c b/csum-file.c index b00b215..a172199 100644 --- a/csum-file.c +++ b/csum-file.c @@ -130,14 +130,10 @@ struct sha1file *sha1fd_check(const char *name) sink = open("/dev/null", O_WRONLY); if (sink < 0) - return NULL; + die_errno("unable to open /dev/null"); check = open(name, O_RDONLY); - if (check < 0) { - int saved_errno = errno; - close(sink); - errno = saved_errno; - return NULL; - } + if (check < 0) + die_errno("unable to open '%s'", name); f = sha1fd(sink, name); f->check_fd = check; return f; @@ -43,9 +43,6 @@ static const char *base_path; static const char *interpolated_path; static int base_path_relaxed; -/* Flag indicating client sent extra args. */ -static int saw_extended_args; - /* If defined, ~user notation is allowed and the string is inserted * after ~user/. E.g. a request to git://host/~alice/frotz would * go to /home/alice/pub_git/frotz with --user-path=pub_git. @@ -56,25 +53,27 @@ static const char *user_path; static unsigned int timeout; static unsigned int init_timeout; -static char *hostname; -static char *canon_hostname; -static char *ip_address; -static char *tcp_port; - -static int hostname_lookup_done; +struct hostinfo { + struct strbuf hostname; + struct strbuf canon_hostname; + struct strbuf ip_address; + struct strbuf tcp_port; + unsigned int hostname_lookup_done:1; + unsigned int saw_extended_args:1; +}; -static void lookup_hostname(void); +static void lookup_hostname(struct hostinfo *hi); -static const char *get_canon_hostname(void) +static const char *get_canon_hostname(struct hostinfo *hi) { - lookup_hostname(); - return canon_hostname; + lookup_hostname(hi); + return hi->canon_hostname.buf; } -static const char *get_ip_address(void) +static const char *get_ip_address(struct hostinfo *hi) { - lookup_hostname(); - return ip_address; + lookup_hostname(hi); + return hi->ip_address.buf; } static void logreport(int priority, const char *err, va_list params) @@ -122,38 +121,34 @@ static void NORETURN daemon_die(const char *err, va_list params) exit(1); } -static void strbuf_addstr_or_null(struct strbuf *sb, const char *s) -{ - if (s) - strbuf_addstr(sb, s); -} - struct expand_path_context { const char *directory; + struct hostinfo *hostinfo; }; static size_t expand_path(struct strbuf *sb, const char *placeholder, void *ctx) { struct expand_path_context *context = ctx; + struct hostinfo *hi = context->hostinfo; switch (placeholder[0]) { case 'H': - strbuf_addstr_or_null(sb, hostname); + strbuf_addbuf(sb, &hi->hostname); return 1; case 'C': if (placeholder[1] == 'H') { - strbuf_addstr_or_null(sb, get_canon_hostname()); + strbuf_addstr(sb, get_canon_hostname(hi)); return 2; } break; case 'I': if (placeholder[1] == 'P') { - strbuf_addstr_or_null(sb, get_ip_address()); + strbuf_addstr(sb, get_ip_address(hi)); return 2; } break; case 'P': - strbuf_addstr_or_null(sb, tcp_port); + strbuf_addbuf(sb, &hi->tcp_port); return 1; case 'D': strbuf_addstr(sb, context->directory); @@ -162,7 +157,7 @@ static size_t expand_path(struct strbuf *sb, const char *placeholder, void *ctx) return 0; } -static const char *path_ok(const char *directory) +static const char *path_ok(const char *directory, struct hostinfo *hi) { static char rpath[PATH_MAX]; static char interp_path[PATH_MAX]; @@ -198,11 +193,12 @@ static const char *path_ok(const char *directory) dir = rpath; } } - else if (interpolated_path && saw_extended_args) { + else if (interpolated_path && hi->saw_extended_args) { struct strbuf expanded_path = STRBUF_INIT; struct expand_path_context context; context.directory = directory; + context.hostinfo = hi; if (*dir != '/') { /* Allow only absolute */ @@ -292,7 +288,8 @@ static int daemon_error(const char *dir, const char *msg) static const char *access_hook; -static int run_access_hook(struct daemon_service *service, const char *dir, const char *path) +static int run_access_hook(struct daemon_service *service, const char *dir, + const char *path, struct hostinfo *hi) { struct child_process child = CHILD_PROCESS_INIT; struct strbuf buf = STRBUF_INIT; @@ -301,16 +298,14 @@ static int run_access_hook(struct daemon_service *service, const char *dir, cons char *eol; int seen_errors = 0; -#define STRARG(x) ((x) ? (x) : "") *arg++ = access_hook; *arg++ = service->name; *arg++ = path; - *arg++ = STRARG(hostname); - *arg++ = STRARG(get_canon_hostname()); - *arg++ = STRARG(get_ip_address()); - *arg++ = STRARG(tcp_port); + *arg++ = hi->hostname.buf; + *arg++ = get_canon_hostname(hi); + *arg++ = get_ip_address(hi); + *arg++ = hi->tcp_port.buf; *arg = NULL; -#undef STRARG child.use_shell = 1; child.argv = argv; @@ -354,7 +349,8 @@ error_return: return -1; } -static int run_service(const char *dir, struct daemon_service *service) +static int run_service(const char *dir, struct daemon_service *service, + struct hostinfo *hi) { const char *path; int enabled = service->enabled; @@ -368,7 +364,7 @@ static int run_service(const char *dir, struct daemon_service *service) return daemon_error(dir, "service not enabled"); } - if (!(path = path_ok(dir))) + if (!(path = path_ok(dir, hi))) return daemon_error(dir, "no such repository"); /* @@ -404,7 +400,7 @@ static int run_service(const char *dir, struct daemon_service *service) * Optionally, a hook can choose to deny access to the * repository depending on the phase of the moon. */ - if (access_hook && run_access_hook(service, dir, path)) + if (access_hook && run_access_hook(service, dir, path, hi)) return -1; /* @@ -542,7 +538,7 @@ static void parse_host_and_port(char *hostport, char **host, * trailing and leading dots, which means that the client cannot escape * our base path via ".." traversal. */ -static void sanitize_client_strbuf(struct strbuf *out, const char *in) +static void sanitize_client(struct strbuf *out, const char *in) { for (; *in; in++) { if (*in == '/') @@ -556,36 +552,27 @@ static void sanitize_client_strbuf(struct strbuf *out, const char *in) strbuf_setlen(out, out->len - 1); } -static char *sanitize_client(const char *in) -{ - struct strbuf out = STRBUF_INIT; - sanitize_client_strbuf(&out, in); - return strbuf_detach(&out, NULL); -} - /* * Like sanitize_client, but we also perform any canonicalization * to make life easier on the admin. */ -static char *canonicalize_client(const char *in) +static void canonicalize_client(struct strbuf *out, const char *in) { - struct strbuf out = STRBUF_INIT; - sanitize_client_strbuf(&out, in); - strbuf_tolower(&out); - return strbuf_detach(&out, NULL); + sanitize_client(out, in); + strbuf_tolower(out); } /* * Read the host as supplied by the client connection. */ -static void parse_host_arg(char *extra_args, int buflen) +static void parse_host_arg(struct hostinfo *hi, char *extra_args, int buflen) { char *val; int vallen; char *end = extra_args + buflen; if (extra_args < end && *extra_args) { - saw_extended_args = 1; + hi->saw_extended_args = 1; if (strncasecmp("host=", extra_args, 5) == 0) { val = extra_args + 5; vallen = strlen(val) + 1; @@ -594,13 +581,10 @@ static void parse_host_arg(char *extra_args, int buflen) char *host; char *port; parse_host_and_port(val, &host, &port); - if (port) { - free(tcp_port); - tcp_port = sanitize_client(port); - } - free(hostname); - hostname = canonicalize_client(host); - hostname_lookup_done = 0; + if (port) + sanitize_client(&hi->tcp_port, port); + canonicalize_client(&hi->hostname, host); + hi->hostname_lookup_done = 0; } /* On to the next one */ @@ -614,9 +598,9 @@ static void parse_host_arg(char *extra_args, int buflen) /* * Locate canonical hostname and its IP address. */ -static void lookup_hostname(void) +static void lookup_hostname(struct hostinfo *hi) { - if (!hostname_lookup_done && hostname) { + if (!hi->hostname_lookup_done && hi->hostname.len) { #ifndef NO_IPV6 struct addrinfo hints; struct addrinfo *ai; @@ -626,19 +610,20 @@ static void lookup_hostname(void) memset(&hints, 0, sizeof(hints)); hints.ai_flags = AI_CANONNAME; - gai = getaddrinfo(hostname, NULL, &hints, &ai); + gai = getaddrinfo(hi->hostname.buf, NULL, &hints, &ai); if (!gai) { struct sockaddr_in *sin_addr = (void *)ai->ai_addr; inet_ntop(AF_INET, &sin_addr->sin_addr, addrbuf, sizeof(addrbuf)); - free(ip_address); - ip_address = xstrdup(addrbuf); + strbuf_addstr(&hi->ip_address, addrbuf); - free(canon_hostname); - canon_hostname = ai->ai_canonname ? - sanitize_client(ai->ai_canonname) : - xstrdup(ip_address); + if (ai->ai_canonname) + sanitize_client(&hi->canon_hostname, + ai->ai_canonname); + else + strbuf_addbuf(&hi->canon_hostname, + &hi->ip_address); freeaddrinfo(ai); } @@ -648,7 +633,7 @@ static void lookup_hostname(void) char **ap; static char addrbuf[HOST_NAME_MAX + 1]; - hent = gethostbyname(hostname); + hent = gethostbyname(hi->hostname.buf); if (hent) { ap = hent->h_addr_list; memset(&sa, 0, sizeof sa); @@ -659,22 +644,39 @@ static void lookup_hostname(void) inet_ntop(hent->h_addrtype, &sa.sin_addr, addrbuf, sizeof(addrbuf)); - free(canon_hostname); - canon_hostname = sanitize_client(hent->h_name); - free(ip_address); - ip_address = xstrdup(addrbuf); + sanitize_client(&hi->canon_hostname, hent->h_name); + strbuf_addstr(&hi->ip_address, addrbuf); } #endif - hostname_lookup_done = 1; + hi->hostname_lookup_done = 1; } } +static void hostinfo_init(struct hostinfo *hi) +{ + memset(hi, 0, sizeof(*hi)); + strbuf_init(&hi->hostname, 0); + strbuf_init(&hi->canon_hostname, 0); + strbuf_init(&hi->ip_address, 0); + strbuf_init(&hi->tcp_port, 0); +} + +static void hostinfo_clear(struct hostinfo *hi) +{ + strbuf_release(&hi->hostname); + strbuf_release(&hi->canon_hostname); + strbuf_release(&hi->ip_address); + strbuf_release(&hi->tcp_port); +} static int execute(void) { char *line = packet_buffer; int pktlen, len, i; char *addr = getenv("REMOTE_ADDR"), *port = getenv("REMOTE_PORT"); + struct hostinfo hi; + + hostinfo_init(&hi); if (addr) loginfo("Connection from %s:%s", addr, port); @@ -693,14 +695,8 @@ static int execute(void) pktlen--; } - free(hostname); - free(canon_hostname); - free(ip_address); - free(tcp_port); - hostname = canon_hostname = ip_address = tcp_port = NULL; - if (len != pktlen) - parse_host_arg(line + len + 1, pktlen - len - 1); + parse_host_arg(&hi, line + len + 1, pktlen - len - 1); for (i = 0; i < ARRAY_SIZE(daemon_service); i++) { struct daemon_service *s = &(daemon_service[i]); @@ -713,10 +709,13 @@ static int execute(void) * Note: The directory here is probably context sensitive, * and might depend on the actual service being performed. */ - return run_service(arg, s); + int rc = run_service(arg, s, &hi); + hostinfo_clear(&hi); + return rc; } } + hostinfo_clear(&hi); logerror("Protocol error: '%s'", line); return -1; } @@ -1167,15 +1166,6 @@ static struct credentials *prepare_credentials(const char *user_name, } #endif -static void store_pid(const char *path) -{ - FILE *f = fopen(path, "w"); - if (!f) - die_errno("cannot open pid file '%s'", path); - if (fprintf(f, "%"PRIuMAX"\n", (uintmax_t) getpid()) < 0 || fclose(f) != 0) - die_errno("failed to write pid file '%s'", path); -} - static int serve(struct string_list *listen_addr, int listen_port, struct credentials *cred) { @@ -1386,7 +1376,7 @@ int main(int argc, char **argv) sanitize_stdfds(); if (pid_file) - store_pid(pid_file); + write_file(pid_file, 1, "%"PRIuMAX"\n", (uintmax_t) getpid()); /* prepare argv for serving-processes */ cld_argv = xmalloc(sizeof (char *) * (argc + 2)); @@ -704,10 +704,17 @@ int parse_date_basic(const char *date, unsigned long *timestamp, int *offset) date += match; } - /* mktime uses local timezone */ + /* do not use mktime(), which uses local timezone, here */ *timestamp = tm_to_time_t(&tm); + if (*timestamp == -1) + return -1; + if (*offset == -1) { - time_t temp_time = mktime(&tm); + time_t temp_time; + + /* gmtime_r() in match_digit() may have clobbered it */ + tm.tm_isdst = -1; + temp_time = mktime(&tm); if ((time_t)*timestamp > temp_time) { *offset = ((time_t)*timestamp - temp_time) / 60; } else { @@ -715,9 +722,6 @@ int parse_date_basic(const char *date, unsigned long *timestamp, int *offset) } } - if (*timestamp == -1) - return -1; - if (!tm_gmt) *timestamp -= *offset * 60; return 0; /* success */ @@ -125,7 +125,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option) dpath->next = NULL; memcpy(dpath->path, ce->name, path_len); dpath->path[path_len] = '\0'; - hashclr(dpath->sha1); + oidclr(&dpath->oid); memset(&(dpath->parent[0]), 0, sizeof(struct combine_diff_parent)*5); @@ -155,7 +155,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option) if (2 <= stage) { int mode = nce->ce_mode; num_compare_stages++; - hashcpy(dpath->parent[stage-2].sha1, nce->sha1); + hashcpy(dpath->parent[stage-2].oid.hash, nce->sha1); dpath->parent[stage-2].mode = ce_mode_from_stat(nce, mode); dpath->parent[stage-2].status = DIFF_STATUS_MODIFIED; @@ -212,6 +212,11 @@ int run_diff_files(struct rev_info *revs, unsigned int option) ce->sha1, !is_null_sha1(ce->sha1), ce->name, 0); continue; + } else if (ce->ce_flags & CE_INTENT_TO_ADD) { + diff_addremove(&revs->diffopt, '+', ce->ce_mode, + EMPTY_BLOB_SHA1_BIN, 0, + ce->name, 0); + continue; } changed = match_stat_with_submodule(&revs->diffopt, ce, &st, @@ -339,14 +344,14 @@ static int show_modified(struct rev_info *revs, memcpy(p->path, new->name, pathlen); p->path[pathlen] = 0; p->mode = mode; - hashclr(p->sha1); + oidclr(&p->oid); memset(p->parent, 0, 2 * sizeof(struct combine_diff_parent)); p->parent[0].status = DIFF_STATUS_MODIFIED; p->parent[0].mode = new->ce_mode; - hashcpy(p->parent[0].sha1, new->sha1); + hashcpy(p->parent[0].oid.hash, new->sha1); p->parent[1].status = DIFF_STATUS_MODIFIED; p->parent[1].mode = old->ce_mode; - hashcpy(p->parent[1].sha1, old->sha1); + hashcpy(p->parent[1].oid.hash, old->sha1); show_combined_diff(p, 2, revs->dense_combined_merges, revs); free(p); return 0; @@ -376,6 +381,13 @@ static void do_oneway_diff(struct unpack_trees_options *o, struct rev_info *revs = o->unpack_data; int match_missing, cached; + /* i-t-a entries do not actually exist in the index */ + if (idx && (idx->ce_flags & CE_INTENT_TO_ADD)) { + idx = NULL; + if (!tree) + return; /* nothing to diff.. */ + } + /* if the entry is not checked out, don't examine work tree */ cached = o->index_only || (idx && ((idx->ce_flags & CE_VALID) || ce_skip_worktree(idx))); diff --git a/diff-no-index.c b/diff-no-index.c index 265709b..0320605 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -97,8 +97,27 @@ static int queue_diff(struct diff_options *o, if (get_mode(name1, &mode1) || get_mode(name2, &mode2)) return -1; - if (mode1 && mode2 && S_ISDIR(mode1) != S_ISDIR(mode2)) - return error("file/directory conflict: %s, %s", name1, name2); + if (mode1 && mode2 && S_ISDIR(mode1) != S_ISDIR(mode2)) { + struct diff_filespec *d1, *d2; + + if (S_ISDIR(mode1)) { + /* 2 is file that is created */ + d1 = noindex_filespec(NULL, 0); + d2 = noindex_filespec(name2, mode2); + name2 = NULL; + mode2 = 0; + } else { + /* 1 is file that is deleted */ + d1 = noindex_filespec(name1, mode1); + d2 = noindex_filespec(NULL, 0); + name1 = NULL; + mode1 = 0; + } + /* emit that file */ + diff_queue(&diff_queued_diff, d1, d2); + + /* and then let the entire directory be created or deleted */ + } if (S_ISDIR(mode1) || S_ISDIR(mode2)) { struct strbuf buffer1 = STRBUF_INIT; @@ -182,12 +201,50 @@ static int queue_diff(struct diff_options *o, } } +/* append basename of F to D */ +static void append_basename(struct strbuf *path, const char *dir, const char *file) +{ + const char *tail = strrchr(file, '/'); + + strbuf_addstr(path, dir); + while (path->len && path->buf[path->len - 1] == '/') + path->len--; + strbuf_addch(path, '/'); + strbuf_addstr(path, tail ? tail + 1 : file); +} + +/* + * DWIM "diff D F" into "diff D/F F" and "diff F D" into "diff F D/F" + * Note that we append the basename of F to D/, so "diff a/b/file D" + * becomes "diff a/b/file D/file", not "diff a/b/file D/a/b/file". + */ +static void fixup_paths(const char **path, struct strbuf *replacement) +{ + unsigned int isdir0, isdir1; + + if (path[0] == file_from_standard_input || + path[1] == file_from_standard_input) + return; + isdir0 = is_directory(path[0]); + isdir1 = is_directory(path[1]); + if (isdir0 == isdir1) + return; + if (isdir0) { + append_basename(replacement, path[0], path[1]); + path[0] = replacement->buf; + } else { + append_basename(replacement, path[1], path[0]); + path[1] = replacement->buf; + } +} + void diff_no_index(struct rev_info *revs, int argc, const char **argv, const char *prefix) { int i, prefixlen; const char *paths[2]; + struct strbuf replacement = STRBUF_INIT; diff_setup(&revs->diffopt); for (i = 1; i < argc - 2; ) { @@ -217,6 +274,9 @@ void diff_no_index(struct rev_info *revs, p = xstrdup(prefix_filename(prefix, prefixlen, p)); paths[i] = p; } + + fixup_paths(paths, &replacement); + revs->diffopt.skip_stat_unmatch = 1; if (!revs->diffopt.output_format) revs->diffopt.output_format = DIFF_FORMAT_PATCH; @@ -235,6 +295,8 @@ void diff_no_index(struct rev_info *revs, diffcore_std(&revs->diffopt); diff_flush(&revs->diffopt); + strbuf_release(&replacement); + /* * The return code for --no-index imitates diff(1): * 0 = no changes, 1 = changes, else error @@ -2093,7 +2093,6 @@ static unsigned char *deflate_it(char *data, unsigned char *deflated; git_zstream stream; - memset(&stream, 0, sizeof(stream)); git_deflate_init(&stream, zlib_compression_level); bound = git_deflate_bound(&stream, size); deflated = xmalloc(bound); @@ -6,6 +6,7 @@ #include "tree-walk.h" #include "pathspec.h" +#include "object.h" struct rev_info; struct diff_options; @@ -207,11 +208,11 @@ struct combine_diff_path { struct combine_diff_path *next; char *path; unsigned int mode; - unsigned char sha1[20]; + struct object_id oid; struct combine_diff_parent { char status; unsigned int mode; - unsigned char sha1[20]; + struct object_id oid; } parent[FLEX_ARRAY]; }; #define combine_diff_path_size(n, l) \ @@ -12,6 +12,7 @@ #include "refs.h" #include "wildmatch.h" #include "pathspec.h" +#include "utf8.h" #include "varint.h" #include "ewah/ewok.h" @@ -393,6 +394,49 @@ int match_pathspec(const struct pathspec *ps, return negative ? 0 : positive; } +int report_path_error(const char *ps_matched, + const struct pathspec *pathspec, + const char *prefix) +{ + /* + * Make sure all pathspec matched; otherwise it is an error. + */ + struct strbuf sb = STRBUF_INIT; + int num, errors = 0; + for (num = 0; num < pathspec->nr; num++) { + int other, found_dup; + + if (ps_matched[num]) + continue; + /* + * The caller might have fed identical pathspec + * twice. Do not barf on such a mistake. + * FIXME: parse_pathspec should have eliminated + * duplicate pathspec. + */ + for (found_dup = other = 0; + !found_dup && other < pathspec->nr; + other++) { + if (other == num || !ps_matched[other]) + continue; + if (!strcmp(pathspec->items[other].original, + pathspec->items[num].original)) + /* + * Ok, we have a match already. + */ + found_dup = 1; + } + if (found_dup) + continue; + + error("pathspec '%s' did not match any file(s) known to git.", + pathspec->items[num].original); + errors++; + } + strbuf_release(&sb); + return errors; +} + /* * Return the length of the "simple" part of a path match limiter. */ @@ -698,7 +742,12 @@ static int add_excludes(const char *fname, const char *base, int baselen, } el->filebuf = buf; + + if (skip_utf8_bom(&buf, size)) + size -= buf - el->filebuf; + entry = buf; + for (i = 0; i < size; i++) { if (buf[i] == '\n') { if (entry != buf + i && entry[0] != '#') { @@ -2141,20 +2190,21 @@ int remove_dir_recursively(struct strbuf *path, int flag) void setup_standard_excludes(struct dir_struct *dir) { const char *path; - char *xdg_path; dir->exclude_per_dir = ".gitignore"; + + /* core.excludefile defaulting to $XDG_HOME/git/ignore */ + if (!excludes_file) + excludes_file = xdg_config_home("ignore"); + if (excludes_file && !access_or_warn(excludes_file, R_OK, 0)) + add_excludes_from_file_1(dir, excludes_file, + dir->untracked ? &dir->ss_excludes_file : NULL); + + /* per repository user preference */ path = git_path("info/exclude"); - if (!excludes_file) { - home_config_paths(NULL, &xdg_path, "ignore"); - excludes_file = xdg_path; - } if (!access_or_warn(path, R_OK, 0)) add_excludes_from_file_1(dir, path, dir->untracked ? &dir->ss_info_exclude : NULL); - if (excludes_file && !access_or_warn(excludes_file, R_OK, 0)) - add_excludes_from_file_1(dir, excludes_file, - dir->untracked ? &dir->ss_excludes_file : NULL); } int remove_path(const char *name) @@ -211,6 +211,7 @@ extern char *common_prefix(const struct pathspec *pathspec); extern int match_pathspec(const struct pathspec *pathspec, const char *name, int namelen, int prefix, char *seen, int is_dir); +extern int report_path_error(const char *ps_matched, const struct pathspec *pathspec, const char *prefix); extern int within_depth(const char *name, int namelen, int depth, int max_depth); extern int fill_directory(struct dir_struct *dir, const struct pathspec *pathspec); diff --git a/environment.c b/environment.c index 1ade5c9..61c685b 100644 --- a/environment.c +++ b/environment.c @@ -24,6 +24,7 @@ int is_bare_repository_cfg = -1; /* unspecified */ int log_all_ref_updates = -1; /* unspecified */ int warn_ambiguous_refs = 1; int warn_on_object_refname_ambiguity = 1; +int ref_paranoia = -1; int repository_format_version; const char *git_commit_encoding; const char *git_log_output_encoding; @@ -91,8 +92,9 @@ static char *work_tree; static const char *namespace; static size_t namespace_len; -static const char *git_dir; +static const char *git_dir, *git_common_dir; static char *git_object_dir, *git_index_file, *git_graft_file; +int git_db_env, git_index_env, git_graft_env, git_common_dir_env; /* * Repository-local GIT_* environment variables; see cache.h for details. @@ -110,6 +112,7 @@ const char * const local_repo_env[] = { NO_REPLACE_OBJECTS_ENVIRONMENT, GIT_PREFIX_ENVIRONMENT, GIT_SHALLOW_FILE_ENVIRONMENT, + GIT_COMMON_DIR_ENVIRONMENT, NULL }; @@ -134,14 +137,23 @@ static char *expand_namespace(const char *raw_namespace) return strbuf_detach(&buf, NULL); } -static char *git_path_from_env(const char *envvar, const char *path) +static char *git_path_from_env(const char *envvar, const char *git_dir, + const char *path, int *fromenv) { const char *value = getenv(envvar); - return value ? xstrdup(value) : git_pathdup("%s", path); + if (!value) { + char *buf = xmalloc(strlen(git_dir) + strlen(path) + 2); + sprintf(buf, "%s/%s", git_dir, path); + return buf; + } + if (fromenv) + *fromenv = 1; + return xstrdup(value); } static void setup_git_env(void) { + struct strbuf sb = STRBUF_INIT; const char *gitfile; const char *shallow_file; @@ -150,9 +162,15 @@ static void setup_git_env(void) git_dir = DEFAULT_GIT_DIR_ENVIRONMENT; gitfile = read_gitfile(git_dir); git_dir = xstrdup(gitfile ? gitfile : git_dir); - git_object_dir = git_path_from_env(DB_ENVIRONMENT, "objects"); - git_index_file = git_path_from_env(INDEX_ENVIRONMENT, "index"); - git_graft_file = git_path_from_env(GRAFT_ENVIRONMENT, "info/grafts"); + if (get_common_dir(&sb, git_dir)) + git_common_dir_env = 1; + git_common_dir = strbuf_detach(&sb, NULL); + git_object_dir = git_path_from_env(DB_ENVIRONMENT, git_common_dir, + "objects", &git_db_env); + git_index_file = git_path_from_env(INDEX_ENVIRONMENT, git_dir, + "index", &git_index_env); + git_graft_file = git_path_from_env(GRAFT_ENVIRONMENT, git_common_dir, + "info/grafts", &git_graft_env); if (getenv(NO_REPLACE_OBJECTS_ENVIRONMENT)) check_replace_refs = 0; namespace = expand_namespace(getenv(GIT_NAMESPACE_ENVIRONMENT)); @@ -175,6 +193,11 @@ const char *get_git_dir(void) return git_dir; } +const char *get_git_common_dir(void) +{ + return git_common_dir; +} + const char *get_git_namespace(void) { if (!namespace) @@ -96,7 +96,6 @@ void setup_path(void) struct strbuf new_path = STRBUF_INIT; add_path(&new_path, git_exec_path()); - add_path(&new_path, argv0_path); if (old_path) strbuf_addstr(&new_path, old_path); diff --git a/fast-import.c b/fast-import.c index b82fcdd..6378726 100644 --- a/fast-import.c +++ b/fast-import.c @@ -405,7 +405,7 @@ static void dump_marks_helper(FILE *, uintmax_t, struct mark_set *); static void write_crash_report(const char *err) { - char *loc = git_path("fast_import_crash_%"PRIuMAX, (uintmax_t) getpid()); + const char *loc = git_path("fast_import_crash_%"PRIuMAX, (uintmax_t) getpid()); FILE *rpt = fopen(loc, "w"); struct branch *b; unsigned long lu; @@ -1062,7 +1062,6 @@ static int store_object( } else delta = NULL; - memset(&s, 0, sizeof(s)); git_deflate_init(&s, pack_compression_level); if (delta) { s.next_in = delta; @@ -1090,7 +1089,6 @@ static int store_object( free(delta); delta = NULL; - memset(&s, 0, sizeof(s)); git_deflate_init(&s, pack_compression_level); s.next_in = (void *)dat->buf; s.avail_in = dat->len; @@ -1190,7 +1188,6 @@ static void stream_blob(uintmax_t len, unsigned char *sha1out, uintmax_t mark) crc32_begin(pack_file); - memset(&s, 0, sizeof(s)); git_deflate_init(&s, pack_compression_level); hdrlen = encode_in_pack_object_header(OBJ_BLOB, len, out_buf); @@ -3116,12 +3113,9 @@ static void parse_progress(void) static char* make_fast_import_path(const char *path) { - struct strbuf abs_path = STRBUF_INIT; - if (!relative_marks_paths || is_absolute_path(path)) return xstrdup(path); - strbuf_addf(&abs_path, "%s/info/fast-import/%s", get_git_dir(), path); - return strbuf_detach(&abs_path, NULL); + return xstrdup(git_path("info/fast-import/%s", path)); } static void option_import_marks(const char *marks, diff --git a/fetch-pack.c b/fetch-pack.c index 655ee64..48526aa 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -544,16 +544,19 @@ static void filter_refs(struct fetch_pack_args *args, /* Append unmatched requests to the list */ if (allow_tip_sha1_in_want) { for (i = 0; i < nr_sought; i++) { + unsigned char sha1[20]; + ref = sought[i]; if (ref->matched) continue; - if (get_sha1_hex(ref->name, ref->old_sha1)) + if (get_sha1_hex(ref->name, sha1) || + ref->name[40] != '\0' || + hashcmp(sha1, ref->old_sha1)) continue; ref->matched = 1; - *newtail = ref; - ref->next = NULL; - newtail = &ref->next; + *newtail = copy_ref(ref); + newtail = &(*newtail)->next; } } *refs = newlist; @@ -625,7 +628,6 @@ static int everything_local(struct fetch_pack_args *args, for (retval = 1, ref = *refs; ref ; ref = ref->next) { const unsigned char *remote = ref->old_sha1; - unsigned char local[20]; struct object *o; o = lookup_object(remote); @@ -638,8 +640,6 @@ static int everything_local(struct fetch_pack_args *args, ref->name); continue; } - - hashcpy(ref->new_sha1, local); if (!args->verbose) continue; fprintf(stderr, @@ -827,10 +827,10 @@ To restore the original branch and stop patching run \"\$cmdline --abort\"." continue fi - if test -x "$GIT_DIR"/hooks/applypatch-msg + hook="$(git rev-parse --git-path hooks/applypatch-msg)" + if test -x "$hook" then - "$GIT_DIR"/hooks/applypatch-msg "$dotest/final-commit" || - stop_here $this + "$hook" "$dotest/final-commit" || stop_here $this fi if test -f "$dotest/final-commit" @@ -904,9 +904,10 @@ did you forget to use 'git add'?" stop_here_user_resolve $this fi - if test -x "$GIT_DIR"/hooks/pre-applypatch + hook="$(git rev-parse --git-path hooks/pre-applypatch)" + if test -x "$hook" then - "$GIT_DIR"/hooks/pre-applypatch || stop_here $this + "$hook" || stop_here $this fi tree=$(git write-tree) && @@ -933,18 +934,17 @@ did you forget to use 'git add'?" echo "$(cat "$dotest/original-commit") $commit" >> "$dotest/rewritten" fi - if test -x "$GIT_DIR"/hooks/post-applypatch - then - "$GIT_DIR"/hooks/post-applypatch - fi + hook="$(git rev-parse --git-path hooks/post-applypatch)" + test -x "$hook" && "$hook" go_next done if test -s "$dotest"/rewritten; then git notes copy --for-rewrite=rebase < "$dotest"/rewritten - if test -x "$GIT_DIR"/hooks/post-rewrite; then - "$GIT_DIR"/hooks/post-rewrite rebase < "$dotest"/rewritten + hook="$(git rev-parse --git-path hooks/post-rewrite)" + if test -x "$hook"; then + "$hook" rebase < "$dotest"/rewritten fi fi diff --git a/git-compat-util.h b/git-compat-util.h index 1663537..17584ad 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -3,6 +3,23 @@ #define _FILE_OFFSET_BITS 64 + +/* Derived from Linux "Features Test Macro" header + * Convenience macros to test the versions of gcc (or + * a compatible compiler). + * Use them like this: + * #if GIT_GNUC_PREREQ (2,8) + * ... code requiring gcc 2.8 or later ... + * #endif +*/ +#if defined(__GNUC__) && defined(__GNUC_MINOR__) +# define GIT_GNUC_PREREQ(maj, min) \ + ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) +#else + #define GIT_GNUC_PREREQ(maj, min) 0 +#endif + + #ifndef FLEX_ARRAY /* * See if our compiler is known to support flexible array members. @@ -25,7 +42,42 @@ #endif #endif -#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) + +/* + * BUILD_ASSERT_OR_ZERO - assert a build-time dependency, as an expression. + * @cond: the compile-time condition which must be true. + * + * Your compile will fail if the condition isn't true, or can't be evaluated + * by the compiler. This can be used in an expression: its value is "0". + * + * Example: + * #define foo_to_char(foo) \ + * ((char *)(foo) \ + * + BUILD_ASSERT_OR_ZERO(offsetof(struct foo, string) == 0)) + */ +#define BUILD_ASSERT_OR_ZERO(cond) \ + (sizeof(char [1 - 2*!(cond)]) - 1) + +#if defined(__GNUC__) && (__GNUC__ >= 3) +# if GIT_GNUC_PREREQ(3, 1) + /* &arr[0] degrades to a pointer: a different type from an array */ +# define BARF_UNLESS_AN_ARRAY(arr) \ + BUILD_ASSERT_OR_ZERO(!__builtin_types_compatible_p(__typeof__(arr), \ + __typeof__(&(arr)[0]))) +# else +# define BARF_UNLESS_AN_ARRAY(arr) 0 +# endif +#endif +/* + * ARRAY_SIZE - get the number of elements in a visible array + * <at> x: the array whose size you want. + * + * This does not work on pointers, or arrays declared as [], or + * function parameters. With correct compiler support, such usage + * will cause a build error (see the build_assert_or_zero macro). + */ +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]) + BARF_UNLESS_AN_ARRAY(x)) + #define bitsizeof(x) (CHAR_BIT * sizeof(x)) #define maximum_signed_value_of_type(a) \ @@ -127,6 +179,9 @@ #else #include <poll.h> #endif +#ifdef HAVE_BSD_SYSCTL +#include <sys/sysctl.h> +#endif #if defined(__MINGW32__) /* pull in Windows compatibility stuff */ @@ -877,4 +932,14 @@ struct tm *git_gmtime_r(const time_t *, struct tm *); #define USE_PARENS_AROUND_GETTEXT_N 1 #endif +#ifndef SHELL_PATH +# define SHELL_PATH "/bin/sh" +#endif + +#ifndef _POSIX_THREAD_SAFE_FUNCTIONS +#define flockfile(fh) +#define funlockfile(fh) +#define getc_unlocked(fh) getc(fh) +#endif + #endif diff --git a/git-cvsimport.perl b/git-cvsimport.perl index 73d367c..82ecb03 100755 --- a/git-cvsimport.perl +++ b/git-cvsimport.perl @@ -1162,7 +1162,7 @@ if ($orig_branch) { die "Fast-forward update failed: $?\n" if $?; } else { - system(qw(git merge cvsimport HEAD), "$remote/$opt_o"); + system(qw(git merge -m cvsimport), "$remote/$opt_o"); die "Could not merge $opt_o into the current branch.\n" if $?; } } else { diff --git a/git-filter-branch.sh b/git-filter-branch.sh index e6e99f5..5b3f63d 100755 --- a/git-filter-branch.sh +++ b/git-filter-branch.sh @@ -346,7 +346,15 @@ while read commit parents; do die "parent filter failed: $filter_parent" fi - sed -e '1,/^$/d' <../commit | \ + { + while read -r header_line && test -n "$header_line" + do + # skip header lines... + :; + done + # and output the actual commit message + cat + } <../commit | eval "$filter_msg" > ../message || die "msg filter failed: $filter_msg" workdir=$workdir @SHELL_PATH@ -c "$filter_commit" "git commit-tree" \ diff --git a/git-gui/GIT-VERSION-GEN b/git-gui/GIT-VERSION-GEN index a9ea218..a88b682 100755 --- a/git-gui/GIT-VERSION-GEN +++ b/git-gui/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=0.19.GITGUI +DEF_VER=0.20.GITGUI LF=' ' diff --git a/git-gui/Makefile b/git-gui/Makefile index cde8b2e..4f00bdd 100644 --- a/git-gui/Makefile +++ b/git-gui/Makefile @@ -177,7 +177,8 @@ git-gui: GIT-VERSION-FILE GIT-GUI-VARS echo then >>$@+ && \ echo ' 'echo \'git-gui version '$(GITGUI_VERSION)'\' >>$@+ && \ echo else >>$@+ && \ - echo ' 'exec \''$(libdir_SQ)/Git Gui.app/Contents/MacOS/$(subst \,,$(TKEXECUTABLE))'\' \ + echo ' libdir="$${GIT_GUI_LIB_DIR:-$(libdir_SQ)}"' >>$@+ && \ + echo ' 'exec \"'$$libdir/Git Gui.app/Contents/MacOS/$(subst \,,$(TKEXECUTABLE))'\" \ '"$$0" "$$@"' >>$@+ && \ echo fi >>$@+ && \ chmod +x $@+ && \ diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh index b186329..11048c7 100755 --- a/git-gui/git-gui.sh +++ b/git-gui/git-gui.sh @@ -49,7 +49,11 @@ catch {rename send {}} ; # What an evil concept... ## ## locate our library -set oguilib {@@GITGUI_LIBDIR@@} +if { [info exists ::env(GIT_GUI_LIB_DIR) ] } { + set oguilib $::env(GIT_GUI_LIB_DIR) +} else { + set oguilib {@@GITGUI_LIBDIR@@} +} set oguirel {@@GITGUI_RELATIVE@@} if {$oguirel eq {1}} { set oguilib [file dirname [file normalize $argv0]] @@ -79,9 +83,9 @@ if {![catch {set _verbose $env(GITGUI_VERBOSE)}]} { return [uplevel 1 real__auto_load $name $args] } rename source real__source - proc source {name} { - puts stderr "source $name" - uplevel 1 real__source $name + proc source {args} { + puts stderr "source $args" + uplevel 1 [linsert $args 0 real__source] } if {[tk windowingsystem] eq "win32"} { console show } } @@ -666,9 +670,7 @@ proc kill_file_process {fd} { catch { if {[is_Windows]} { - # Use a Cygwin-specific flag to allow killing - # native Windows processes - exec kill -f $process + exec taskkill /pid $process } else { exec kill $process } @@ -908,6 +910,7 @@ set default_config(gui.fontdiff) [font configure font_diff] set default_config(gui.maxfilesdisplayed) 5000 set default_config(gui.usettk) 1 set default_config(gui.warndetachedcommit) 1 +set default_config(gui.tabsize) 8 set font_descs { {fontui font_ui {mc "Main Font"}} {fontdiff font_diff {mc "Diff/Console Font"}} @@ -1283,7 +1286,7 @@ load_config 0 apply_config # v1.7.0 introduced --show-toplevel to return the canonical work-tree -if {[package vsatisfies $_git_version 1.7.0-]} { +if {[package vcompare $_git_version 1.7.0] >= 0} { if { [is_Cygwin] } { catch {set _gitworktree [exec cygpath --windows [git rev-parse --show-toplevel]]} } else { @@ -1539,7 +1542,7 @@ proc rescan_stage2 {fd after} { close $fd } - if {[package vsatisfies $::_git_version 1.6.3-]} { + if {[package vcompare $::_git_version 1.6.3] >= 0} { set ls_others [list --exclude-standard] } else { set ls_others [list --exclude-per-directory=.gitignore] @@ -1962,20 +1965,22 @@ proc display_all_files {} { set to_display [lsort [array names file_states]] set display_limit [get_config gui.maxfilesdisplayed] - if {[llength $to_display] > $display_limit} { - if {!$files_warning} { - # do not repeatedly warn: - set files_warning 1 - info_popup [mc "Displaying only %s of %s files." \ - $display_limit [llength $to_display]] - } - set to_display [lrange $to_display 0 [expr {$display_limit-1}]] - } + set displayed 0 foreach path $to_display { set s $file_states($path) set m [lindex $s 0] set icon_name [lindex $s 1] + if {$displayed > $display_limit && [string index $m 1] eq {O} } { + if {!$files_warning} { + # do not repeatedly warn: + set files_warning 1 + info_popup [mc "Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s files." \ + $display_limit [llength $to_display]] + } + continue + } + set s [string index $m 0] if {$s ne {U} && $s ne {_}} { display_all_files_helper $ui_index $path \ @@ -1990,6 +1995,7 @@ proc display_all_files {} { if {$s ne {_}} { display_all_files_helper $ui_workdir $path \ $icon_name $s + incr displayed } } diff --git a/git-gui/lib/choose_repository.tcl b/git-gui/lib/choose_repository.tcl index 3c10bc6..75d1da8 100644 --- a/git-gui/lib/choose_repository.tcl +++ b/git-gui/lib/choose_repository.tcl @@ -18,6 +18,7 @@ field local_path {} ; # Where this repository is locally field origin_url {} ; # Where we are cloning from field origin_name origin ; # What we shall call 'origin' field clone_type hardlink ; # Type of clone to construct +field recursive true ; # Recursive cloning flag field readtree_err ; # Error output from read-tree (if any) field sorted_recent ; # recent repositories (sorted) @@ -337,16 +338,31 @@ method _git_init {} { return 1 } -proc _is_git {path} { +proc _is_git {path {outdir_var ""}} { + if {$outdir_var ne ""} { + upvar 1 $outdir_var outdir + } + if {[file isfile $path]} { + set fp [open $path r] + gets $fp line + close $fp + if {[regexp "^gitdir: (.+)$" $line line link_target]} { + set path [file join [file dirname $path] $link_target] + set path [file normalize $path] + } + } + if {[file exists [file join $path HEAD]] && [file exists [file join $path objects]] && [file exists [file join $path config]]} { + set outdir $path return 1 } if {[is_Cygwin]} { if {[file exists [file join $path HEAD]] && [file exists [file join $path objects.lnk]] && [file exists [file join $path config.lnk]]} { + set outdir $path return 1 } } @@ -525,6 +541,11 @@ method _do_clone {} { foreach r $w_types { pack $r -anchor w } + ${NS}::checkbutton $args.type_f.recursive \ + -text [mc "Recursively clone submodules too"] \ + -variable @recursive \ + -onvalue true -offvalue false + pack $args.type_f.recursive -anchor w grid $args.type_l $args.type_f -sticky new grid columnconfigure $args 1 -weight 1 @@ -952,6 +973,30 @@ method _do_clone_checkout {HEAD} { fileevent $fd readable [cb _readtree_wait $fd] } +method _do_validate_submodule_cloning {ok} { + if {$ok} { + $o_cons done $ok + set done 1 + } else { + _clone_failed $this [mc "Cannot clone submodules."] + } +} + +method _do_clone_submodules {} { + if {$recursive eq {true}} { + destroy $w_body + set o_cons [console::embed \ + $w_body \ + [mc "Cloning submodules"]] + pack $w_body -fill both -expand 1 -padx 10 + $o_cons exec \ + [list git submodule update --init --recursive] \ + [cb _do_validate_submodule_cloning] + } else { + set done 1 + } +} + method _readtree_wait {fd} { set buf [read $fd] $o_cons update_meter $buf @@ -982,7 +1027,7 @@ method _readtree_wait {fd} { fconfigure $fd_ph -blocking 0 -translation binary -eofchar {} fileevent $fd_ph readable [cb _postcheckout_wait $fd_ph] } else { - set done 1 + _do_clone_submodules $this } } @@ -996,7 +1041,7 @@ method _postcheckout_wait {fd_ph} { hook_failed_popup post-checkout $pch_error 0 } unset pch_error - set done 1 + _do_clone_submodules $this return } fconfigure $fd_ph -blocking 0 @@ -1063,7 +1108,7 @@ method _open_local_path {} { } method _do_open2 {} { - if {![_is_git [file join $local_path .git]]} { + if {![_is_git [file join $local_path .git] actualgit]} { error_popup [mc "Not a Git repository: %s" [file tail $local_path]] return } @@ -1076,7 +1121,7 @@ method _do_open2 {} { } _append_recentrepos [pwd] - set ::_gitdir .git + set ::_gitdir $actualgit set ::_prefix {} set done 1 } diff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl index b0a5180..0d56986 100644 --- a/git-gui/lib/diff.tcl +++ b/git-gui/lib/diff.tcl @@ -1,6 +1,19 @@ # git-gui diff viewer # Copyright (C) 2006, 2007 Shawn Pearce +proc apply_tab_size {{firsttab {}}} { + global have_tk85 repo_config ui_diff + + set w [font measure font_diff "0"] + if {$have_tk85 && $firsttab != 0} { + $ui_diff configure -tabs [list [expr {$firsttab * $w}] [expr {($firsttab + $repo_config(gui.tabsize)) * $w}]] + } elseif {$have_tk85 || $repo_config(gui.tabsize) != 8} { + $ui_diff configure -tabs [expr {$repo_config(gui.tabsize) * $w}] + } else { + $ui_diff configure -tabs {} + } +} + proc clear_diff {} { global ui_diff current_diff_path current_diff_header global ui_index ui_workdir @@ -105,6 +118,8 @@ proc show_diff {path w {lno {}} {scroll_pos {}} {callback {}}} { set cont_info [list $scroll_pos $callback] + apply_tab_size 0 + if {[string first {U} $m] >= 0} { merge_load_stages $path [list show_unmerged_diff $cont_info] } elseif {$m eq {_O}} { @@ -401,7 +416,10 @@ proc read_diff {fd conflict_size cont_info} { # -- Automatically detect if this is a 3 way diff. # - if {[string match {@@@ *} $line]} {set is_3way_diff 1} + if {[string match {@@@ *} $line]} { + set is_3way_diff 1 + apply_tab_size 1 + } if {$::current_diff_inheader} { diff --git a/git-gui/lib/option.tcl b/git-gui/lib/option.tcl index 23c9ae7..b5b6b2f 100644 --- a/git-gui/lib/option.tcl +++ b/git-gui/lib/option.tcl @@ -161,6 +161,7 @@ proc do_options {} { {b gui.warndetachedcommit {mc "Warn before committing to a detached head"}} {s gui.stageuntracked {mc "Staging of untracked files"} {list "yes" "no" "ask"}} {b gui.displayuntracked {mc "Show untracked files"}} + {i-1..99 gui.tabsize {mc "Tab spacing"}} } { set type [lindex $option 0] set name [lindex $option 1] diff --git a/git-gui/macosx/AppMain.tcl b/git-gui/macosx/AppMain.tcl index 738bdd0..b6c6dc3 100644 --- a/git-gui/macosx/AppMain.tcl +++ b/git-gui/macosx/AppMain.tcl @@ -1,5 +1,10 @@ set gitexecdir {@@gitexecdir@@} -set gitguilib {@@GITGUI_LIBDIR@@} +if { [info exists ::env(GIT_GUI_LIB_DIR) ] } { + set gitguilib $::env(GIT_GUI_LIB_DIR) +} else { + set gitguilib {@@GITGUI_LIBDIR@@} +} + set env(PATH) "$gitexecdir:$env(PATH)" if {[string first -psn [lindex $argv 0]] == 0} { diff --git a/git-gui/po/bg.po b/git-gui/po/bg.po index 89b3a4e..4d9b039 100644 --- a/git-gui/po/bg.po +++ b/git-gui/po/bg.po @@ -1,15 +1,15 @@ # Bulgarian translation of git-gui po-file. -# Copyright (C) 2012, 2013, 2014 Alexander Shopov <ash@kambanaria.org>. +# Copyright (C) 2012, 2013, 2014, 2015 Alexander Shopov <ash@kambanaria.org>. # This file is distributed under the same license as the git package. -# Alexander Shopov <ash@kambanaria.org>, 2012, 2013, 2014. +# Alexander Shopov <ash@kambanaria.org>, 2012, 2013, 2014, 2015. # # msgid "" msgstr "" "Project-Id-Version: git-gui master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-13 20:45+0200\n" -"PO-Revision-Date: 2014-01-13 21:31+0200\n" +"POT-Creation-Date: 2015-04-07 07:37+0300\n" +"PO-Revision-Date: 2015-04-07 07:46+0300\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" "Language: bg\n" @@ -18,33 +18,33 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: git-gui.sh:859 +#: git-gui.sh:861 #, tcl-format msgid "Invalid font specified in %s:" -msgstr "Указан е неправилен шрифт в %s:" +msgstr "Указан е неправилен шрифт в „%s“:" -#: git-gui.sh:912 +#: git-gui.sh:915 msgid "Main Font" msgstr "ОÑновен шрифт" -#: git-gui.sh:913 +#: git-gui.sh:916 msgid "Diff/Console Font" msgstr "Шрифт за разликите/конзолата" -#: git-gui.sh:928 git-gui.sh:942 git-gui.sh:955 git-gui.sh:1045 -#: git-gui.sh:1064 git-gui.sh:3115 +#: git-gui.sh:931 git-gui.sh:945 git-gui.sh:958 git-gui.sh:1048 +#: git-gui.sh:1067 git-gui.sh:3125 msgid "git-gui: fatal error" msgstr "git-gui: фатална грешка" -#: git-gui.sh:929 +#: git-gui.sh:932 msgid "Cannot find git in PATH." msgstr "Командата git липÑва в Ð¿ÑŠÑ‚Ñ (PATH)." -#: git-gui.sh:956 +#: git-gui.sh:959 msgid "Cannot parse Git version string:" msgstr "Ðизът Ñ Ð²ÐµÑ€ÑиÑта на Git не може да бъде интерпретиран:" -#: git-gui.sh:981 +#: git-gui.sh:984 #, tcl-format msgid "" "Git version cannot be determined.\n" @@ -57,504 +57,509 @@ msgid "" msgstr "" "ВерÑиÑта на Git не може да бъде определена.\n" "\n" -"ВерÑиÑта на %s изглежда, че е „%s“.\n" +"ВерÑиÑта на „%s“ изглежда, че е „%s“.\n" "\n" -"%s изиÑква Git, верÑÐ¸Ñ Ð¿Ð¾Ð½Ðµ 1.5.0.\n" +"„%s“ изиÑква Git, верÑÐ¸Ñ Ð¿Ð¾Ð½Ðµ 1.5.0.\n" "\n" -"Да Ñе приеме ли, че „%s“ е верÑÐ¸Ñ 1.5.0?\n" +"Да Ñе приеме ли, че „%s“ е верÑÐ¸Ñ â€ž1.5.0“?\n" -#: git-gui.sh:1278 +#: git-gui.sh:1281 msgid "Git directory not found:" msgstr "ДиректориÑта на Git не е открита:" -#: git-gui.sh:1312 +#: git-gui.sh:1315 msgid "Cannot move to top of working directory:" msgstr "Ðе може да Ñе премине към родителÑката директориÑ." -#: git-gui.sh:1320 +#: git-gui.sh:1323 msgid "Cannot use bare repository:" msgstr "Голо хранилище не може да Ñе използва:" -#: git-gui.sh:1328 +#: git-gui.sh:1331 msgid "No working directory" msgstr "Работната Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð»Ð¸Ð¿Ñва" -#: git-gui.sh:1500 lib/checkout_op.tcl:306 +#: git-gui.sh:1503 lib/checkout_op.tcl:306 msgid "Refreshing file status..." msgstr "ОбновÑване на ÑÑŠÑтоÑнието на файла…" -#: git-gui.sh:1560 +#: git-gui.sh:1563 msgid "Scanning for modified files ..." msgstr "Проверка за променени файлове…" -#: git-gui.sh:1632 +#: git-gui.sh:1639 msgid "Calling prepare-commit-msg hook..." -msgstr "Куката prepare-commit-msg Ñе изпълнÑва в момента…" +msgstr "Куката „prepare-commit-msg“ Ñе изпълнÑва в момента…" -#: git-gui.sh:1649 +#: git-gui.sh:1656 msgid "Commit declined by prepare-commit-msg hook." -msgstr "Подаването е отхвърлено от куката prepare-commit-msg." +msgstr "Подаването е отхвърлено от куката „prepare-commit-msg“." -#: git-gui.sh:1807 lib/browser.tcl:252 +#: git-gui.sh:1814 lib/browser.tcl:252 msgid "Ready." msgstr "Готово." -#: git-gui.sh:1965 +#: git-gui.sh:1978 #, tcl-format -msgid "Displaying only %s of %s files." -msgstr "Показване на Ñамо %s от %s файла." +msgid "" +"Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s files." +msgstr "" +"ДоÑтигнат е макÑималниÑÑ‚ брой файлове за показване (gui.maxfilesdisplayed = " +"%s). Файловете Ñа общо %s." -#: git-gui.sh:2091 +#: git-gui.sh:2101 msgid "Unmodified" msgstr "Ðепроменен" -#: git-gui.sh:2093 +#: git-gui.sh:2103 msgid "Modified, not staged" msgstr "Променен, но не е в индекÑа" -#: git-gui.sh:2094 git-gui.sh:2106 +#: git-gui.sh:2104 git-gui.sh:2116 msgid "Staged for commit" msgstr "Ð’ индекÑа за подаване" -#: git-gui.sh:2095 git-gui.sh:2107 +#: git-gui.sh:2105 git-gui.sh:2117 msgid "Portions staged for commit" msgstr "ЧаÑти Ñа в индекÑа за подаване" -#: git-gui.sh:2096 git-gui.sh:2108 +#: git-gui.sh:2106 git-gui.sh:2118 msgid "Staged for commit, missing" msgstr "Ð’ индекÑа за подаване, но липÑва" -#: git-gui.sh:2098 +#: git-gui.sh:2108 msgid "File type changed, not staged" msgstr "Видът на файла е Ñменен, но не е в индекÑа" -#: git-gui.sh:2099 git-gui.sh:2100 +#: git-gui.sh:2109 git-gui.sh:2110 msgid "File type changed, old type staged for commit" -msgstr "Видът на файла е Ñменен, в индекÑа е ÑтариÑÑ‚" +msgstr "Видът на файла е Ñменен, но в индекÑа е вÑе още ÑтариÑÑ‚" -#: git-gui.sh:2101 +#: git-gui.sh:2111 msgid "File type changed, staged" msgstr "Видът на файла е Ñменен и е в индекÑа" -#: git-gui.sh:2102 +#: git-gui.sh:2112 msgid "File type change staged, modification not staged" -msgstr "Видът на файла е Ñменен, промÑната не е в индекÑа" +msgstr "Видът на файла е Ñменен, но промÑната не е в индекÑа" -#: git-gui.sh:2103 +#: git-gui.sh:2113 msgid "File type change staged, file missing" msgstr "Видът на файла е Ñменен, файлът липÑва" -#: git-gui.sh:2105 +#: git-gui.sh:2115 msgid "Untracked, not staged" msgstr "ÐеÑледен" -#: git-gui.sh:2110 +#: git-gui.sh:2120 msgid "Missing" msgstr "ЛипÑващ" -#: git-gui.sh:2111 +#: git-gui.sh:2121 msgid "Staged for removal" msgstr "Ð’ индекÑа за изтриване" -#: git-gui.sh:2112 +#: git-gui.sh:2122 msgid "Staged for removal, still present" msgstr "Ð’ индекÑа за изтриване, но още го има" -#: git-gui.sh:2114 git-gui.sh:2115 git-gui.sh:2116 git-gui.sh:2117 -#: git-gui.sh:2118 git-gui.sh:2119 +#: git-gui.sh:2124 git-gui.sh:2125 git-gui.sh:2126 git-gui.sh:2127 +#: git-gui.sh:2128 git-gui.sh:2129 msgid "Requires merge resolution" msgstr "ИзиÑква коригиране при Ñливане" -#: git-gui.sh:2154 +#: git-gui.sh:2164 msgid "Starting gitk... please wait..." -msgstr "Стартиране на gitk…, изчакайте…" +msgstr "Стартиране на „gitk“…, изчакайте…" -#: git-gui.sh:2166 +#: git-gui.sh:2176 msgid "Couldn't find gitk in PATH" -msgstr "Ð’ пътищата, определени от променливата PATH, липÑва изпълним gitk" +msgstr "Командата „gitk“ липÑва в пътищата, определени от променливата PATH." -#: git-gui.sh:2225 +#: git-gui.sh:2235 msgid "Couldn't find git gui in PATH" -msgstr "Ð’ пътищата, определени от променливата PATH, липÑва изпълним git gui" +msgstr "" +"Командата „git gui“ липÑва в пътищата, определени от променливата PATH." -#: git-gui.sh:2644 lib/choose_repository.tcl:40 +#: git-gui.sh:2654 lib/choose_repository.tcl:41 msgid "Repository" msgstr "Хранилище" -#: git-gui.sh:2645 +#: git-gui.sh:2655 msgid "Edit" msgstr "Редактиране" -#: git-gui.sh:2647 lib/choose_rev.tcl:567 +#: git-gui.sh:2657 lib/choose_rev.tcl:567 msgid "Branch" msgstr "Клон" -#: git-gui.sh:2650 lib/choose_rev.tcl:554 +#: git-gui.sh:2660 lib/choose_rev.tcl:554 msgid "Commit@@noun" msgstr "Подаване" -#: git-gui.sh:2653 lib/merge.tcl:123 lib/merge.tcl:152 lib/merge.tcl:170 +#: git-gui.sh:2663 lib/merge.tcl:123 lib/merge.tcl:152 lib/merge.tcl:170 msgid "Merge" msgstr "Сливане" -#: git-gui.sh:2654 lib/choose_rev.tcl:563 +#: git-gui.sh:2664 lib/choose_rev.tcl:563 msgid "Remote" msgstr "Отдалечено хранилище" -#: git-gui.sh:2657 +#: git-gui.sh:2667 msgid "Tools" msgstr "Команди" -#: git-gui.sh:2666 +#: git-gui.sh:2676 msgid "Explore Working Copy" msgstr "Разглеждане на работното копие" -#: git-gui.sh:2672 +#: git-gui.sh:2682 msgid "Git Bash" -msgstr "Bash на Git" +msgstr "Bash за Git" -#: git-gui.sh:2682 +#: git-gui.sh:2692 msgid "Browse Current Branch's Files" msgstr "Разглеждане на файловете в Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ ÐºÐ»Ð¾Ð½" -#: git-gui.sh:2686 +#: git-gui.sh:2696 msgid "Browse Branch Files..." -msgstr "Разглеждане на Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ ÐºÐ»Ð¾Ð½" +msgstr "Разглеждане на Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ ÐºÐ»Ð¾Ð½â€¦" -#: git-gui.sh:2691 +#: git-gui.sh:2701 msgid "Visualize Current Branch's History" msgstr "Ð’Ð¸Ð·ÑƒÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð½Ð° иÑториÑта на Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ ÐºÐ»Ð¾Ð½" -#: git-gui.sh:2695 +#: git-gui.sh:2705 msgid "Visualize All Branch History" msgstr "Ð’Ð¸Ð·ÑƒÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð½Ð° иÑториÑта на вÑички клонове" -#: git-gui.sh:2702 +#: git-gui.sh:2712 #, tcl-format msgid "Browse %s's Files" msgstr "Разглеждане на файловете в %s" -#: git-gui.sh:2704 +#: git-gui.sh:2714 #, tcl-format msgid "Visualize %s's History" msgstr "Ð’Ð¸Ð·ÑƒÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð½Ð° иÑториÑта на %s" -#: git-gui.sh:2709 lib/database.tcl:40 lib/database.tcl:66 +#: git-gui.sh:2719 lib/database.tcl:40 lib/database.tcl:66 msgid "Database Statistics" msgstr "СтатиÑтика на базата от данни" -#: git-gui.sh:2712 lib/database.tcl:33 +#: git-gui.sh:2722 lib/database.tcl:33 msgid "Compress Database" msgstr "КомпреÑиране на базата от данни" -#: git-gui.sh:2715 +#: git-gui.sh:2725 msgid "Verify Database" msgstr "Проверка на базата от данни" -#: git-gui.sh:2722 git-gui.sh:2726 git-gui.sh:2730 lib/shortcut.tcl:8 +#: git-gui.sh:2732 git-gui.sh:2736 git-gui.sh:2740 lib/shortcut.tcl:8 #: lib/shortcut.tcl:40 lib/shortcut.tcl:72 msgid "Create Desktop Icon" msgstr "ДобавÑне на икона на Ñ€Ð°Ð±Ð¾Ñ‚Ð½Ð¸Ñ Ð¿Ð»Ð¾Ñ‚" -#: git-gui.sh:2738 lib/choose_repository.tcl:192 lib/choose_repository.tcl:200 +#: git-gui.sh:2748 lib/choose_repository.tcl:193 lib/choose_repository.tcl:201 msgid "Quit" msgstr "Спиране на програмата" -#: git-gui.sh:2746 +#: git-gui.sh:2756 msgid "Undo" msgstr "ОтмÑна" -#: git-gui.sh:2749 +#: git-gui.sh:2759 msgid "Redo" msgstr "Повторение" -#: git-gui.sh:2753 git-gui.sh:3348 +#: git-gui.sh:2763 git-gui.sh:3368 msgid "Cut" msgstr "ОтрÑзване" -#: git-gui.sh:2756 git-gui.sh:3351 git-gui.sh:3425 git-gui.sh:3510 +#: git-gui.sh:2766 git-gui.sh:3371 git-gui.sh:3445 git-gui.sh:3530 #: lib/console.tcl:69 msgid "Copy" msgstr "Копиране" -#: git-gui.sh:2759 git-gui.sh:3354 +#: git-gui.sh:2769 git-gui.sh:3374 msgid "Paste" msgstr "ПоÑтавÑне" -#: git-gui.sh:2762 git-gui.sh:3357 lib/remote_branch_delete.tcl:39 +#: git-gui.sh:2772 git-gui.sh:3377 lib/remote_branch_delete.tcl:39 #: lib/branch_delete.tcl:28 msgid "Delete" msgstr "Изтриване" -#: git-gui.sh:2766 git-gui.sh:3361 git-gui.sh:3514 lib/console.tcl:71 +#: git-gui.sh:2776 git-gui.sh:3381 git-gui.sh:3534 lib/console.tcl:71 msgid "Select All" msgstr "Избиране на вÑичко" -#: git-gui.sh:2775 +#: git-gui.sh:2785 msgid "Create..." msgstr "Създаване…" -#: git-gui.sh:2781 +#: git-gui.sh:2791 msgid "Checkout..." msgstr "ИзтеглÑне…" -#: git-gui.sh:2787 +#: git-gui.sh:2797 msgid "Rename..." msgstr "Преименуване…" -#: git-gui.sh:2792 +#: git-gui.sh:2802 msgid "Delete..." msgstr "Изтриване…" -#: git-gui.sh:2797 +#: git-gui.sh:2807 msgid "Reset..." msgstr "ОтмÑна на промените…" -#: git-gui.sh:2807 +#: git-gui.sh:2817 msgid "Done" msgstr "Готово" -#: git-gui.sh:2809 +#: git-gui.sh:2819 msgid "Commit@@verb" msgstr "Подаване" -#: git-gui.sh:2818 git-gui.sh:3289 +#: git-gui.sh:2828 git-gui.sh:3309 msgid "New Commit" -msgstr "Подаване" +msgstr "Ðово подаване" -#: git-gui.sh:2826 git-gui.sh:3296 +#: git-gui.sh:2836 git-gui.sh:3316 msgid "Amend Last Commit" msgstr "ПоправÑне на поÑледното подаване" -#: git-gui.sh:2836 git-gui.sh:3250 lib/remote_branch_delete.tcl:101 +#: git-gui.sh:2846 git-gui.sh:3270 lib/remote_branch_delete.tcl:101 msgid "Rescan" msgstr "ОбновÑване" -#: git-gui.sh:2842 +#: git-gui.sh:2852 msgid "Stage To Commit" msgstr "Към индекÑа за подаване" -#: git-gui.sh:2848 +#: git-gui.sh:2858 msgid "Stage Changed Files To Commit" msgstr "Ð’Ñички променени файлове към индекÑа за подаване" -#: git-gui.sh:2854 +#: git-gui.sh:2864 msgid "Unstage From Commit" msgstr "Изваждане от индекÑа за подаване" -#: git-gui.sh:2860 lib/index.tcl:442 +#: git-gui.sh:2870 lib/index.tcl:442 msgid "Revert Changes" msgstr "Връщане на оригинала" -#: git-gui.sh:2868 git-gui.sh:3561 git-gui.sh:3592 +#: git-gui.sh:2878 git-gui.sh:3581 git-gui.sh:3612 msgid "Show Less Context" msgstr "По-малко контекÑÑ‚" -#: git-gui.sh:2872 git-gui.sh:3565 git-gui.sh:3596 +#: git-gui.sh:2882 git-gui.sh:3585 git-gui.sh:3616 msgid "Show More Context" msgstr "Повече контекÑÑ‚" -#: git-gui.sh:2879 git-gui.sh:3263 git-gui.sh:3372 +#: git-gui.sh:2889 git-gui.sh:3283 git-gui.sh:3392 msgid "Sign Off" msgstr "ПодпиÑване" -#: git-gui.sh:2895 +#: git-gui.sh:2905 msgid "Local Merge..." msgstr "Локално Ñливане…" -#: git-gui.sh:2900 +#: git-gui.sh:2910 msgid "Abort Merge..." msgstr "ПреуÑтановÑване на Ñливане…" -#: git-gui.sh:2912 git-gui.sh:2940 +#: git-gui.sh:2922 git-gui.sh:2950 msgid "Add..." msgstr "ДобавÑне…" -#: git-gui.sh:2916 +#: git-gui.sh:2926 msgid "Push..." msgstr "Избутване…" -#: git-gui.sh:2920 +#: git-gui.sh:2930 msgid "Delete Branch..." msgstr "Изтриване на клон…" -#: git-gui.sh:2930 git-gui.sh:3543 +#: git-gui.sh:2940 git-gui.sh:3563 msgid "Options..." msgstr "Опции…" -#: git-gui.sh:2941 +#: git-gui.sh:2951 msgid "Remove..." msgstr "Премахване…" -#: git-gui.sh:2950 lib/choose_repository.tcl:54 +#: git-gui.sh:2960 lib/choose_repository.tcl:55 msgid "Help" msgstr "Помощ" -#: git-gui.sh:2954 git-gui.sh:2958 lib/choose_repository.tcl:48 -#: lib/choose_repository.tcl:57 lib/about.tcl:14 +#: git-gui.sh:2964 git-gui.sh:2968 lib/choose_repository.tcl:49 +#: lib/choose_repository.tcl:58 lib/about.tcl:14 #, tcl-format msgid "About %s" msgstr "ОтноÑно %s" -#: git-gui.sh:2982 +#: git-gui.sh:2992 msgid "Online Documentation" msgstr "Ð”Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ð¸Ñ Ð² Интернет" -#: git-gui.sh:2985 lib/choose_repository.tcl:51 lib/choose_repository.tcl:60 +#: git-gui.sh:2995 lib/choose_repository.tcl:52 lib/choose_repository.tcl:61 msgid "Show SSH Key" msgstr "Показване на ключа за SSH" -#: git-gui.sh:3004 git-gui.sh:3136 +#: git-gui.sh:3014 git-gui.sh:3146 msgid "Usage" msgstr "Употреба" -#: git-gui.sh:3085 lib/blame.tcl:573 +#: git-gui.sh:3095 lib/blame.tcl:573 msgid "Error" msgstr "Грешка" -#: git-gui.sh:3116 +#: git-gui.sh:3126 #, tcl-format msgid "fatal: cannot stat path %s: No such file or directory" msgstr "" -"фатално: пътÑÑ‚ %s не може да бъде открит: такъв файл или Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ñма" +"ФÐТÐЛÐРГРЕШКÐ: пътÑÑ‚ %s не може да бъде открит: такъв файл или Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ " +"нÑма" -#: git-gui.sh:3149 +#: git-gui.sh:3159 msgid "Current Branch:" msgstr "Текущ клон:" -#: git-gui.sh:3175 +#: git-gui.sh:3185 msgid "Staged Changes (Will Commit)" msgstr "Промени в индекÑа (за подаване)" -#: git-gui.sh:3195 +#: git-gui.sh:3205 msgid "Unstaged Changes" msgstr "Промени извън индекÑа" -#: git-gui.sh:3256 +#: git-gui.sh:3276 msgid "Stage Changed" msgstr "ИндекÑÑŠÑ‚ е променен" -#: git-gui.sh:3275 lib/transport.tcl:137 lib/transport.tcl:229 +#: git-gui.sh:3295 lib/transport.tcl:137 lib/transport.tcl:229 msgid "Push" msgstr "ИзтлаÑкване" -#: git-gui.sh:3310 +#: git-gui.sh:3330 msgid "Initial Commit Message:" msgstr "Първоначално Ñъобщение при подаване:" -#: git-gui.sh:3311 +#: git-gui.sh:3331 msgid "Amended Commit Message:" msgstr "Поправено Ñъобщение при подаване:" -#: git-gui.sh:3312 +#: git-gui.sh:3332 msgid "Amended Initial Commit Message:" msgstr "Поправено първоначално Ñъобщение при подаване:" -#: git-gui.sh:3313 +#: git-gui.sh:3333 msgid "Amended Merge Commit Message:" msgstr "Поправено Ñъобщение при подаване ÑÑŠÑ Ñливане:" -#: git-gui.sh:3314 +#: git-gui.sh:3334 msgid "Merge Commit Message:" msgstr "Съобщение при подаване ÑÑŠÑ Ñливане:" -#: git-gui.sh:3315 +#: git-gui.sh:3335 msgid "Commit Message:" msgstr "Съобщение при подаване:" -#: git-gui.sh:3364 git-gui.sh:3518 lib/console.tcl:73 +#: git-gui.sh:3384 git-gui.sh:3538 lib/console.tcl:73 msgid "Copy All" msgstr "Копиране на вÑичко" -#: git-gui.sh:3388 lib/blame.tcl:105 +#: git-gui.sh:3408 lib/blame.tcl:105 msgid "File:" msgstr "Файл:" -#: git-gui.sh:3506 +#: git-gui.sh:3526 msgid "Refresh" msgstr "ОбновÑване" -#: git-gui.sh:3527 +#: git-gui.sh:3547 msgid "Decrease Font Size" msgstr "По-едър шрифт" -#: git-gui.sh:3531 +#: git-gui.sh:3551 msgid "Increase Font Size" msgstr "По-дребен шрифт" -#: git-gui.sh:3539 lib/blame.tcl:294 +#: git-gui.sh:3559 lib/blame.tcl:294 msgid "Encoding" msgstr "Кодиране" -#: git-gui.sh:3550 +#: git-gui.sh:3570 msgid "Apply/Reverse Hunk" msgstr "Прилагане/връщане на парче" -#: git-gui.sh:3555 +#: git-gui.sh:3575 msgid "Apply/Reverse Line" msgstr "Прилагане/връщане на ред" -#: git-gui.sh:3574 +#: git-gui.sh:3594 msgid "Run Merge Tool" msgstr "Изпълнение на програмата за Ñливане" -#: git-gui.sh:3579 +#: git-gui.sh:3599 msgid "Use Remote Version" msgstr "ВерÑÐ¸Ñ Ð¾Ñ‚ отдалеченото хранилище" -#: git-gui.sh:3583 +#: git-gui.sh:3603 msgid "Use Local Version" msgstr "Локална верÑиÑ" -#: git-gui.sh:3587 +#: git-gui.sh:3607 msgid "Revert To Base" msgstr "Връщане към родителÑката верÑиÑ" -#: git-gui.sh:3605 +#: git-gui.sh:3625 msgid "Visualize These Changes In The Submodule" msgstr "Визуализиране на промените в подмодула" -#: git-gui.sh:3609 +#: git-gui.sh:3629 msgid "Visualize Current Branch History In The Submodule" msgstr "Ð’Ð¸Ð·ÑƒÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð½Ð° иÑториÑта на Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ ÐºÐ»Ð¾Ð½ в иÑториÑта за подмодула" -#: git-gui.sh:3613 +#: git-gui.sh:3633 msgid "Visualize All Branch History In The Submodule" msgstr "Ð’Ð¸Ð·ÑƒÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð½Ð° иÑториÑта на вÑички клони в иÑториÑта за подмодула" -#: git-gui.sh:3618 +#: git-gui.sh:3638 msgid "Start git gui In The Submodule" msgstr "Стартиране на „git gui“ за подмодула" -#: git-gui.sh:3653 +#: git-gui.sh:3673 msgid "Unstage Hunk From Commit" msgstr "Изваждане на парчето от подаването" -#: git-gui.sh:3655 +#: git-gui.sh:3675 msgid "Unstage Lines From Commit" msgstr "Изваждане на редовете от подаването" -#: git-gui.sh:3657 +#: git-gui.sh:3677 msgid "Unstage Line From Commit" msgstr "Изваждане на реда от подаването" -#: git-gui.sh:3660 +#: git-gui.sh:3680 msgid "Stage Hunk For Commit" msgstr "ДобавÑне на парчето за подаване" -#: git-gui.sh:3662 +#: git-gui.sh:3682 msgid "Stage Lines For Commit" msgstr "ДобавÑне на редовете за подаване" -#: git-gui.sh:3664 +#: git-gui.sh:3684 msgid "Stage Line For Commit" msgstr "ДобавÑне на реда за подаване" -#: git-gui.sh:3689 +#: git-gui.sh:3709 msgid "Initializing..." msgstr "Инициализиране…" -#: git-gui.sh:3832 +#: git-gui.sh:3852 #, tcl-format msgid "" "Possible environment issues exist.\n" @@ -567,11 +572,11 @@ msgstr "" "Възможно е да има проблем ÑÑŠÑ Ñредата.\n" "\n" "Ðай-вероÑтно Ñледните променливи нÑма да бъдат\n" -"взети под внимание от подпроцеÑите Git изпълнени\n" +"взети под внимание от подпроцеÑите на Git\n" "от %s:\n" "\n" -#: git-gui.sh:3861 +#: git-gui.sh:3881 msgid "" "\n" "This is due to a known issue with the\n" @@ -581,7 +586,7 @@ msgstr "" "Това е познат проблем и Ñе дължи на\n" "верÑиÑта на Tcl включена в Cygwin." -#: git-gui.sh:3866 +#: git-gui.sh:3886 #, tcl-format msgid "" "\n" @@ -593,9 +598,9 @@ msgid "" msgstr "" "\n" "\n" -"Добър замеÑтител на %s\n" -"е да поÑтавите наÑтройките user.name и\n" -"user.email в Ð»Ð¸Ñ‡Ð½Ð¸Ñ Ñи файл ~/.gitconfig.\n" +"Добър замеÑтител на „%s“\n" +"е да поÑтавите наÑтройките „user.name“ и\n" +"„user.email“ в Ð»Ð¸Ñ‡Ð½Ð¸Ñ Ñи файл „~/.gitconfig“.\n" #: lib/spellcheck.tcl:57 msgid "Unsupported spell checker" @@ -744,9 +749,9 @@ msgstr "[Към родителÑ]" msgid "Browse Branch Files" msgstr "Разглеждане на файловете в клона" -#: lib/browser.tcl:288 lib/choose_repository.tcl:406 -#: lib/choose_repository.tcl:493 lib/choose_repository.tcl:502 -#: lib/choose_repository.tcl:1029 +#: lib/browser.tcl:288 lib/choose_repository.tcl:422 +#: lib/choose_repository.tcl:509 lib/choose_repository.tcl:518 +#: lib/choose_repository.tcl:1074 msgid "Browse" msgstr "Разглеждане" @@ -762,12 +767,12 @@ msgstr "За изпълнението на „%s“ Ñ‚Ñ€Ñбва да избер #: lib/tools.tcl:91 #, tcl-format msgid "Are you sure you want to run %1$s on file \"%2$s\"?" -msgstr "Сигурни ли Ñте, че иÑкате да Ñтартирате „%1$s“ върху „%2$s“?" +msgstr "Сигурни ли Ñте, че иÑкате да изпълните „%1$s“ върху файла „%2$s“?" #: lib/tools.tcl:95 #, tcl-format msgid "Are you sure you want to run %s?" -msgstr "Сигурни ли Ñте, че иÑкате да Ñтартирате „%s“?" +msgstr "Сигурни ли Ñте, че иÑкате да изпълните „%s“?" #: lib/tools.tcl:116 #, tcl-format @@ -797,7 +802,7 @@ msgstr "Клон за изтеглÑне" msgid "Checkout" msgstr "ИзтеглÑне" -#: lib/branch_checkout.tcl:39 lib/option.tcl:309 lib/branch_create.tcl:69 +#: lib/branch_checkout.tcl:39 lib/option.tcl:310 lib/branch_create.tcl:69 msgid "Options" msgstr "Опции" @@ -812,7 +817,7 @@ msgstr "Изтриване от Ð»Ð¾ÐºÐ°Ð»Ð½Ð¸Ñ ÐºÐ»Ð¾Ð½" #: lib/transport.tcl:7 #, tcl-format msgid "Fetching new changes from %s" -msgstr "ДоÑтавÑне на промените от %s" +msgstr "ДоÑтавÑне на промените от „%s“" #: lib/transport.tcl:18 #, tcl-format @@ -826,26 +831,25 @@ msgstr "ОкаÑÑ‚Ñ€Ñне на ÑледÑщите клони на изтритР#: lib/transport.tcl:25 msgid "fetch all remotes" -msgstr "доÑтавÑне на вÑички хранилища" +msgstr "доÑтавÑне на вÑички отдалечени хранилища" #: lib/transport.tcl:26 msgid "Fetching new changes from all remotes" -msgstr "ДоÑтавÑне на промените от вÑички отдалечени хранилища" +msgstr "ДоÑтавÑне на новите промени от вÑички отдалечени хранилища" #: lib/transport.tcl:40 msgid "remote prune all remotes" -msgstr "окаÑÑ‚Ñ€Ñне на вÑички клони ÑледÑщи изтрити клони" +msgstr "окаÑÑ‚Ñ€Ñне на вÑички ÑледÑщи клони" #: lib/transport.tcl:41 msgid "Pruning tracking branches deleted from all remotes" msgstr "" -"ОкаÑÑ‚Ñ€Ñне на ÑледÑщите клони на изтритите клони от вÑички отдалечени " -"хранилища" +"ОкаÑÑ‚Ñ€Ñне на вÑички клони, които ÑледÑÑ‚ изтрити клони от отдалечени хранилища" #: lib/transport.tcl:55 #, tcl-format msgid "Pushing changes to %s" -msgstr "ИзтлаÑкване на промените към %s" +msgstr "ИзтлаÑкване на промените към „%s“" #: lib/transport.tcl:93 #, tcl-format @@ -855,7 +859,7 @@ msgstr "ИзтлаÑкване на вÑичко към „%s“" #: lib/transport.tcl:111 #, tcl-format msgid "Pushing %s %s to %s" -msgstr "ИзтлаÑкване на %s %s към %s" +msgstr "ИзтлаÑкване на %s „%s“ към „%s“" #: lib/transport.tcl:132 msgid "Push Branches" @@ -1031,7 +1035,7 @@ msgid "" "If you like this text, it can be your font." msgstr "" "Това е примерен текÑÑ‚.\n" -"Ðко ви хареÑва как изглежда, изберете този шрифт." +"Ðко ви хареÑва как изглежда, изберете шрифта." #: lib/option.tcl:11 #, tcl-format @@ -1098,7 +1102,8 @@ msgstr "ÐапаÑване на ÑледÑщите клонове" #: lib/option.tcl:151 msgid "Use Textconv For Diffs and Blames" -msgstr "Използване на „textconv“ за разликите и анотациите" +msgstr "" +"Преобразуване на текÑта Ñ â€žtextconv“ при анотиране и извеждане на разлики" #: lib/option.tcl:152 msgid "Blame Copy Only On Changed Files" @@ -1106,7 +1111,7 @@ msgstr "Ðнотиране на копието Ñамо по Ð¿Ñ€Ð¾Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ #: lib/option.tcl:153 msgid "Maximum Length of Recent Repositories List" -msgstr "МакÑимален брой Ñкоро ползвани хранилища" +msgstr "МакÑимална дължина на ÑпиÑъка ÑÑŠÑ Ñкоро ползвани хранилища" #: lib/option.tcl:154 msgid "Minimum Letters To Blame Copy On" @@ -1122,7 +1127,7 @@ msgstr "Брой редове за контекÑта при извеждане #: lib/option.tcl:157 msgid "Additional Diff Parameters" -msgstr "Допълнителни параметри за разликите" +msgstr "Допълнителни аргументи към „git diff“" #: lib/option.tcl:158 msgid "Commit Message Text Width" @@ -1138,45 +1143,62 @@ msgstr "Стандартно кодиране на файловете" #: lib/option.tcl:161 msgid "Warn before committing to a detached head" -msgstr "Предупреждение при подаване към неÑвързан връх" +msgstr "Предупреждаване при подаването при неÑвързан връх" #: lib/option.tcl:162 msgid "Staging of untracked files" -msgstr "ДобавÑне на неÑледените файлове към индекÑа" +msgstr "Вкарване на неÑледени файлове в индекÑа" #: lib/option.tcl:163 msgid "Show untracked files" msgstr "Показване на неÑледените файлове" -#: lib/option.tcl:209 +#: lib/option.tcl:164 +msgid "Tab spacing" +msgstr "Размер на табулациÑта в интервали" + +#: lib/option.tcl:210 msgid "Change" msgstr "СмÑна" -#: lib/option.tcl:253 +#: lib/option.tcl:254 msgid "Spelling Dictionary:" msgstr "ПравопиÑен речник:" -#: lib/option.tcl:283 +#: lib/option.tcl:284 msgid "Change Font" msgstr "СмÑна на шрифта" -#: lib/option.tcl:287 +#: lib/option.tcl:288 #, tcl-format msgid "Choose %s" msgstr "Избор на „%s“" -#: lib/option.tcl:293 +#: lib/option.tcl:294 msgid "pt." msgstr "тчк." -#: lib/option.tcl:307 +#: lib/option.tcl:308 msgid "Preferences" msgstr "ÐаÑтройки" -#: lib/option.tcl:344 +#: lib/option.tcl:345 msgid "Failed to completely save options:" msgstr "ÐеуÑпешно запазване на наÑтройките:" +#: lib/encoding.tcl:443 +msgid "Default" +msgstr "Стандартното" + +#: lib/encoding.tcl:448 +#, tcl-format +msgid "System (%s)" +msgstr "СиÑтемното (%s)" + +#: lib/encoding.tcl:459 lib/encoding.tcl:465 +msgid "Other" +msgstr "Друго" + #: lib/mergetool.tcl:8 msgid "Force resolution to the base version?" msgstr "Да Ñе използва базовата верÑиÑ" @@ -1208,7 +1230,7 @@ msgstr "" #, tcl-format msgid "File %s seems to have unresolved conflicts, still stage?" msgstr "" -"Изглежда, че във файла „%s“ вÑе още има некоригирани конфликти. Да Ñе добави " +"Изглежда, че вÑе още има некоригирани конфликти във файла „%s“. Да Ñе добави " "ли файлът към индекÑа?" #: lib/mergetool.tcl:60 @@ -1286,7 +1308,7 @@ msgstr "ПодробноÑти за командата" #: lib/tools_dlg.tcl:49 msgid "Use '/' separators to create a submenu tree:" -msgstr "За Ñъздаване на подменюта използвайте за разделител знака „/“:" +msgstr "За Ñъздаване на подменюта използвайте знака „/“ за разделител:" #: lib/tools_dlg.tcl:60 msgid "Command:" @@ -1346,7 +1368,7 @@ msgstr "Премахване" #: lib/tools_dlg.tcl:231 msgid "(Blue denotes repository-local tools)" -msgstr "(команди към локалното хранилище Ñа обозначени в Ñиньо)" +msgstr "(командите към локалното хранилище Ñа обозначени в Ñиньо)" #: lib/tools_dlg.tcl:292 #, tcl-format @@ -1379,7 +1401,7 @@ msgstr "Предишна поÑва" #: lib/search.tcl:52 msgid "RegExp" -msgstr "Рег. изр." +msgstr "Рег. израз" #: lib/search.tcl:54 msgid "Case" @@ -1393,7 +1415,7 @@ msgstr "Клавишната ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°Ñ†Ð¸Ñ Ð½Ðµ може да бъде з msgid "Cannot write icon:" msgstr "Иконата не може да бъде запазена:" -#: lib/diff.tcl:64 +#: lib/diff.tcl:77 #, tcl-format msgid "" "No differences detected.\n" @@ -1416,12 +1438,12 @@ msgstr "" "Ðвтоматично ще започне нова проверка дали нÑма други файлове в това " "ÑÑŠÑтоÑние." -#: lib/diff.tcl:104 +#: lib/diff.tcl:117 #, tcl-format msgid "Loading diff of %s..." msgstr "Зареждане на разликите в „%s“…" -#: lib/diff.tcl:125 +#: lib/diff.tcl:140 msgid "" "LOCAL: deleted\n" "REMOTE:\n" @@ -1429,7 +1451,7 @@ msgstr "" "ЛОКÐЛÐО: изтрит\n" "ОТДÐЛЕЧЕÐО:\n" -#: lib/diff.tcl:130 +#: lib/diff.tcl:145 msgid "" "REMOTE: deleted\n" "LOCAL:\n" @@ -1437,41 +1459,41 @@ msgstr "" "ОТДÐЛЕЧЕÐО: изтрит\n" "ЛОКÐЛÐО:\n" -#: lib/diff.tcl:137 +#: lib/diff.tcl:152 msgid "LOCAL:\n" msgstr "ЛОКÐЛÐО:\n" -#: lib/diff.tcl:140 +#: lib/diff.tcl:155 msgid "REMOTE:\n" msgstr "ОТДÐЛЕЧЕÐО:\n" -#: lib/diff.tcl:202 lib/diff.tcl:337 +#: lib/diff.tcl:217 lib/diff.tcl:355 #, tcl-format msgid "Unable to display %s" -msgstr "Ðе може да бъде показан файлът „%s“" +msgstr "Файлът „%s“ не може да бъде показан" -#: lib/diff.tcl:203 +#: lib/diff.tcl:218 msgid "Error loading file:" msgstr "Грешка при зареждане на файл:" -#: lib/diff.tcl:210 +#: lib/diff.tcl:225 msgid "Git Repository (subproject)" -msgstr "Хранилище на Git (подпроект)" +msgstr "Хранилище на Git (подмодул)" -#: lib/diff.tcl:222 +#: lib/diff.tcl:237 msgid "* Binary file (not showing content)." -msgstr "⃠Двоичен файл (Ñъдържанието не Ñе показва)." +msgstr "◠Двоичен файл (Ñъдържанието не Ñе показва)." -#: lib/diff.tcl:227 +#: lib/diff.tcl:242 #, tcl-format msgid "" "* Untracked file is %d bytes.\n" "* Showing only first %d bytes.\n" msgstr "" -"⃠ÐеÑледениÑÑ‚ файл е %d байта.\n" -"⃠Показват Ñе Ñамо първите %d байта.\n" +"â— ÐеÑледениÑÑ‚ файл е %d байта.\n" +"◠Показват Ñе Ñамо първите %d байта.\n" -#: lib/diff.tcl:233 +#: lib/diff.tcl:248 #, tcl-format msgid "" "\n" @@ -1479,26 +1501,26 @@ msgid "" "* To see the entire file, use an external editor.\n" msgstr "" "\n" -"⃠ÐеÑледениÑÑ‚ файл е отрÑзан дотук %s.\n" -"⃠Използвайте външен редактор, за да видите Ñ†ÐµÐ»Ð¸Ñ Ñ„Ð°Ð¹Ð».\n" +"â— ÐеÑледениÑÑ‚ файл е отрÑзан дотук от програмата „%s“.\n" +"◠Използвайте външен редактор, за да видите Ñ†ÐµÐ»Ð¸Ñ Ñ„Ð°Ð¹Ð».\n" -#: lib/diff.tcl:338 lib/blame.tcl:1128 +#: lib/diff.tcl:356 lib/blame.tcl:1128 msgid "Error loading diff:" msgstr "Грешка при зареждане на разлика:" -#: lib/diff.tcl:557 +#: lib/diff.tcl:578 msgid "Failed to unstage selected hunk." msgstr "Избраното парче не може да бъде извадено от индекÑа." -#: lib/diff.tcl:564 +#: lib/diff.tcl:585 msgid "Failed to stage selected hunk." -msgstr "Избраното парче не може да бъде добавен към индекÑа." +msgstr "Избраното парче не може да бъде добавено към индекÑа." -#: lib/diff.tcl:643 +#: lib/diff.tcl:664 msgid "Failed to unstage selected line." msgstr "ИзбраниÑÑ‚ ред не може да бъде изваден от индекÑа." -#: lib/diff.tcl:651 +#: lib/diff.tcl:672 msgid "Failed to stage selected line." msgstr "ИзбраниÑÑ‚ ред не може да бъде добавен към индекÑа." @@ -1512,7 +1534,7 @@ msgstr "От хранилище" #: lib/remote_branch_delete.tcl:88 msgid "Branches" -msgstr "Клонове" +msgstr "Клони" #: lib/remote_branch_delete.tcl:110 msgid "Delete Only If" @@ -1539,7 +1561,7 @@ msgid "" msgstr "" "Следните клони не Ñа Ñлети напълно в „%s“:\n" "\n" -" ⃠%s" +" â— %s" #: lib/remote_branch_delete.tcl:190 #, tcl-format @@ -1578,239 +1600,251 @@ msgstr "Ðе е избрано хранилище." msgid "Scanning %s..." msgstr "ПретърÑване на „%s“…" -#: lib/choose_repository.tcl:32 +#: lib/choose_repository.tcl:33 msgid "Git Gui" msgstr "ГПИ на Git" -#: lib/choose_repository.tcl:91 lib/choose_repository.tcl:396 +#: lib/choose_repository.tcl:92 lib/choose_repository.tcl:412 msgid "Create New Repository" msgstr "Създаване на ново хранилище" -#: lib/choose_repository.tcl:97 +#: lib/choose_repository.tcl:98 msgid "New..." msgstr "Ðово…" -#: lib/choose_repository.tcl:104 lib/choose_repository.tcl:480 +#: lib/choose_repository.tcl:105 lib/choose_repository.tcl:496 msgid "Clone Existing Repository" msgstr "Клониране на ÑъщеÑтвуващо хранилище" -#: lib/choose_repository.tcl:115 +#: lib/choose_repository.tcl:116 msgid "Clone..." msgstr "Клониране…" -#: lib/choose_repository.tcl:122 lib/choose_repository.tcl:1019 +#: lib/choose_repository.tcl:123 lib/choose_repository.tcl:1064 msgid "Open Existing Repository" msgstr "ОтварÑне на ÑъщеÑтвуващо хранилище" -#: lib/choose_repository.tcl:128 +#: lib/choose_repository.tcl:129 msgid "Open..." msgstr "ОтварÑне…" -#: lib/choose_repository.tcl:141 +#: lib/choose_repository.tcl:142 msgid "Recent Repositories" msgstr "Скоро ползвани" -#: lib/choose_repository.tcl:147 +#: lib/choose_repository.tcl:148 msgid "Open Recent Repository:" msgstr "ОтварÑне на хранилище ползвано наÑкоро:" -#: lib/choose_repository.tcl:315 lib/choose_repository.tcl:322 -#: lib/choose_repository.tcl:329 +#: lib/choose_repository.tcl:316 lib/choose_repository.tcl:323 +#: lib/choose_repository.tcl:330 #, tcl-format msgid "Failed to create repository %s:" msgstr "ÐеуÑпешно Ñъздаване на хранилището „%s“:" -#: lib/choose_repository.tcl:391 lib/branch_create.tcl:33 +#: lib/choose_repository.tcl:407 lib/branch_create.tcl:33 msgid "Create" msgstr "Създаване" -#: lib/choose_repository.tcl:401 +#: lib/choose_repository.tcl:417 msgid "Directory:" msgstr "ДиректориÑ:" -#: lib/choose_repository.tcl:431 lib/choose_repository.tcl:552 -#: lib/choose_repository.tcl:1053 +#: lib/choose_repository.tcl:447 lib/choose_repository.tcl:573 +#: lib/choose_repository.tcl:1098 msgid "Git Repository" msgstr "Хранилище на Git" -#: lib/choose_repository.tcl:456 +#: lib/choose_repository.tcl:472 #, tcl-format msgid "Directory %s already exists." msgstr "Вече ÑъщеÑтвува Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ â€ž%s“." -#: lib/choose_repository.tcl:460 +#: lib/choose_repository.tcl:476 #, tcl-format msgid "File %s already exists." msgstr "Вече ÑъщеÑтвува файл „%s“." -#: lib/choose_repository.tcl:475 +#: lib/choose_repository.tcl:491 msgid "Clone" msgstr "Клониране" -#: lib/choose_repository.tcl:488 +#: lib/choose_repository.tcl:504 msgid "Source Location:" msgstr "ÐÐ´Ñ€ÐµÑ Ð½Ð° източника:" -#: lib/choose_repository.tcl:497 +#: lib/choose_repository.tcl:513 msgid "Target Directory:" msgstr "Целева директориÑ:" -#: lib/choose_repository.tcl:507 +#: lib/choose_repository.tcl:523 msgid "Clone Type:" msgstr "Вид клониране:" -#: lib/choose_repository.tcl:512 +#: lib/choose_repository.tcl:528 msgid "Standard (Fast, Semi-Redundant, Hardlinks)" msgstr "Стандартно (бързо, чаÑтично ÑподелÑне на файлове, твърди връзки)" -#: lib/choose_repository.tcl:517 +#: lib/choose_repository.tcl:533 msgid "Full Copy (Slower, Redundant Backup)" msgstr "Пълно (бавно, пълноценно резервно копие)" -#: lib/choose_repository.tcl:522 +#: lib/choose_repository.tcl:538 msgid "Shared (Fastest, Not Recommended, No Backup)" msgstr "Споделено (най-бързо, не Ñе препоръчва, не прави резервно копие)" -#: lib/choose_repository.tcl:558 lib/choose_repository.tcl:605 -#: lib/choose_repository.tcl:751 lib/choose_repository.tcl:821 -#: lib/choose_repository.tcl:1059 lib/choose_repository.tcl:1067 +#: lib/choose_repository.tcl:545 +msgid "Recursively clone submodules too" +msgstr "РекурÑивно клониране и на подмодулите" + +#: lib/choose_repository.tcl:579 lib/choose_repository.tcl:626 +#: lib/choose_repository.tcl:772 lib/choose_repository.tcl:842 +#: lib/choose_repository.tcl:1104 lib/choose_repository.tcl:1112 #, tcl-format msgid "Not a Git repository: %s" msgstr "Това не е хранилище на Git: %s" -#: lib/choose_repository.tcl:594 +#: lib/choose_repository.tcl:615 msgid "Standard only available for local repository." msgstr "Само локални хранилища могат да Ñе клонират Ñтандартно" -#: lib/choose_repository.tcl:598 +#: lib/choose_repository.tcl:619 msgid "Shared only available for local repository." msgstr "Само локални хранилища могат да Ñе клонират Ñподелено" -#: lib/choose_repository.tcl:619 +#: lib/choose_repository.tcl:640 #, tcl-format msgid "Location %s already exists." -msgstr "Вече ÑъщеÑтвува меÑтоположението „%s“." +msgstr "МеÑтоположението „%s“ вече ÑъщеÑтвува." -#: lib/choose_repository.tcl:630 +#: lib/choose_repository.tcl:651 msgid "Failed to configure origin" msgstr "ÐеуÑпешно наÑтройване на хранилището-източник" -#: lib/choose_repository.tcl:642 +#: lib/choose_repository.tcl:663 msgid "Counting objects" msgstr "ПреброÑване на обекти" -#: lib/choose_repository.tcl:643 +#: lib/choose_repository.tcl:664 msgid "buckets" msgstr "клетки" -#: lib/choose_repository.tcl:667 +#: lib/choose_repository.tcl:688 #, tcl-format msgid "Unable to copy objects/info/alternates: %s" msgstr "Обектите/информациÑта/Ñинонимите не могат да бъдат копирани: %s" -#: lib/choose_repository.tcl:703 +#: lib/choose_repository.tcl:724 #, tcl-format msgid "Nothing to clone from %s." msgstr "ÐÑма какво да Ñе клонира от „%s“." -#: lib/choose_repository.tcl:705 lib/choose_repository.tcl:919 -#: lib/choose_repository.tcl:931 +#: lib/choose_repository.tcl:726 lib/choose_repository.tcl:940 +#: lib/choose_repository.tcl:952 msgid "The 'master' branch has not been initialized." msgstr "ОÑновниÑÑ‚ клон — „master“ не е инициализиран." -#: lib/choose_repository.tcl:718 +#: lib/choose_repository.tcl:739 msgid "Hardlinks are unavailable. Falling back to copying." msgstr "Ðе Ñе поддържат твърди връзки. Преминава Ñе към копиране." -#: lib/choose_repository.tcl:730 +#: lib/choose_repository.tcl:751 #, tcl-format msgid "Cloning from %s" msgstr "Клониране на „%s“" -#: lib/choose_repository.tcl:761 +#: lib/choose_repository.tcl:782 msgid "Copying objects" msgstr "Копиране на обекти" -#: lib/choose_repository.tcl:762 +#: lib/choose_repository.tcl:783 msgid "KiB" msgstr "KiB" -#: lib/choose_repository.tcl:786 +#: lib/choose_repository.tcl:807 #, tcl-format msgid "Unable to copy object: %s" msgstr "ÐеуÑпешно копиране на обект: %s" -#: lib/choose_repository.tcl:796 +#: lib/choose_repository.tcl:817 msgid "Linking objects" msgstr "Създаване на връзки към обектите" -#: lib/choose_repository.tcl:797 +#: lib/choose_repository.tcl:818 msgid "objects" msgstr "обекти" -#: lib/choose_repository.tcl:805 +#: lib/choose_repository.tcl:826 #, tcl-format msgid "Unable to hardlink object: %s" msgstr "ÐеуÑпешно Ñъздаване на твърда връзка към обект: %s" -#: lib/choose_repository.tcl:860 +#: lib/choose_repository.tcl:881 msgid "Cannot fetch branches and objects. See console output for details." msgstr "" "Клоните и обектите не могат да бъдат изтеглени. За повече Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ " "погледнете изхода на конзолата." -#: lib/choose_repository.tcl:871 +#: lib/choose_repository.tcl:892 msgid "Cannot fetch tags. See console output for details." msgstr "" "Етикетите не могат да бъдат изтеглени. За повече Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð³Ð»ÐµÐ´Ð½ÐµÑ‚Ðµ " "изхода на конзолата." -#: lib/choose_repository.tcl:895 +#: lib/choose_repository.tcl:916 msgid "Cannot determine HEAD. See console output for details." msgstr "" -"Върхът HEAD не може да бъде определен. За повече Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð³Ð»ÐµÐ´Ð½ÐµÑ‚Ðµ " +"Върхът „HEAD“ не може да бъде определен. За повече Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð³Ð»ÐµÐ´Ð½ÐµÑ‚Ðµ " "изхода на конзолата." -#: lib/choose_repository.tcl:904 +#: lib/choose_repository.tcl:925 #, tcl-format msgid "Unable to cleanup %s" -msgstr "Ðе може да Ñе зачиÑти „%s“" +msgstr "„%s“ не може да Ñе зачиÑти" -#: lib/choose_repository.tcl:910 +#: lib/choose_repository.tcl:931 msgid "Clone failed." msgstr "ÐеуÑпешно клониране." -#: lib/choose_repository.tcl:917 +#: lib/choose_repository.tcl:938 msgid "No default branch obtained." msgstr "Ðе е получен клон по подразбиране." -#: lib/choose_repository.tcl:928 +#: lib/choose_repository.tcl:949 #, tcl-format msgid "Cannot resolve %s as a commit." msgstr "ÐÑма подаване отговарÑщо на „%s“." -#: lib/choose_repository.tcl:940 +#: lib/choose_repository.tcl:961 msgid "Creating working directory" msgstr "Създаване на работната директориÑ" -#: lib/choose_repository.tcl:941 lib/index.tcl:70 lib/index.tcl:136 +#: lib/choose_repository.tcl:962 lib/index.tcl:70 lib/index.tcl:136 #: lib/index.tcl:207 msgid "files" msgstr "файлове" -#: lib/choose_repository.tcl:970 +#: lib/choose_repository.tcl:981 +msgid "Cannot clone submodules." +msgstr "Подмодулите не могат да Ñе клонират." + +#: lib/choose_repository.tcl:990 +msgid "Cloning submodules" +msgstr "Клониране на подмодулите" + +#: lib/choose_repository.tcl:1015 msgid "Initial file checkout failed." msgstr "ÐеуÑпешно първоначално изтеглÑне." -#: lib/choose_repository.tcl:1014 +#: lib/choose_repository.tcl:1059 msgid "Open" msgstr "ОтварÑне" -#: lib/choose_repository.tcl:1024 +#: lib/choose_repository.tcl:1069 msgid "Repository:" msgstr "Хранилище:" -#: lib/choose_repository.tcl:1073 +#: lib/choose_repository.tcl:1118 #, tcl-format msgid "Failed to open repository %s:" msgstr "ÐеуÑпешно отварÑне на хранилището „%s“:" @@ -1849,7 +1883,7 @@ msgid "" msgstr "" "Клонът „%s“ ÑъщеÑтвува.\n" "\n" -"Той не може да бъде тривиално превъртÑн до %s.\n" +"Той не може да бъде тривиално ÑлÑÑ‚ до „%s“.\n" "Ðеобходимо е Ñливане." #: lib/checkout_op.tcl:243 @@ -2003,7 +2037,7 @@ msgstr "Изберете клон за Ñледени." #: lib/branch_create.tcl:141 #, tcl-format msgid "Tracking branch %s is not a branch in the remote repository." -msgstr "Клонът, който Ñе Ñледи „%s“ не ÑъщеÑтвува в отдалеченото хранилище." +msgstr "СледÑщиÑÑ‚ клон — „%s“, не ÑъщеÑтвува в отдалеченото хранилище." #: lib/console.tcl:59 msgid "Working... please wait..." @@ -2023,7 +2057,7 @@ msgstr "Това неÑвързано изтеглÑне" #: lib/choose_rev.tcl:60 msgid "Revision Expression:" -msgstr "Израз за верÑиÑ" +msgstr "Израз за верÑиÑ:" #: lib/choose_rev.tcl:72 msgid "Local Branch" @@ -2101,7 +2135,7 @@ msgstr "ИдентификациÑта ви не може да бъде опре #: lib/commit.tcl:80 msgid "Invalid GIT_COMMITTER_IDENT:" -msgstr "Ðеправилно поле GIT_COMMITTER_IDENT:" +msgstr "Ðеправилно поле „GIT_COMMITTER_IDENT“:" #: lib/commit.tcl:129 #, tcl-format @@ -2157,7 +2191,7 @@ msgid "" msgstr "" "ÐÑма промени за подаване.\n" "\n" -"ТрÑбва да добавите поне 1 файл към индекÑа, преди да подадете.\n" +"ТрÑбва да добавите поне един файл към индекÑа, за да подадете.\n" #: lib/commit.tcl:204 msgid "" @@ -2173,9 +2207,9 @@ msgstr "" "\n" "Използвайте ÑÐ»ÐµÐ´Ð½Ð¸Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚:\n" "\n" -"⃠Първи ред: опиÑание в едно изречение на промÑната.\n" -"⃠Втори ред: празен.\n" -"⃠ОÑтаналите редове: опишете защо Ñе налага тази промÑна.\n" +"◠Първи ред: опиÑание в едно изречение на промÑната.\n" +"◠Втори ред: празен.\n" +"◠ОÑтаналите редове: опишете защо Ñе налага тази промÑна.\n" #: lib/commit.tcl:235 msgid "Calling pre-commit hook..." @@ -2194,13 +2228,12 @@ msgid "" " \n" " Do you really want to proceed with your Commit?" msgstr "" -"Ще подадете към неÑвързан връх. Това дейÑтвие е опаÑно, защото при " -"преминаването към който и да е клон ще загубите промените Ñи и не е Ñигурно, " -"че ще можете по-къÑно да ги възÑтановите чрез журнала на указателите. Ðай-" -"вероÑтно Ñ‚Ñ€Ñбва първо да Ñъздадете клон базиран на текущото ÑÑŠÑтоÑние и да " -"подадете към него.\n" +"Ще подавате към неÑвързан връх. Това е опаÑно — при изтеглÑнето на друг клон " +"ще изгубите промените Ñи. След това може да е невъзможно да ги възÑтановите " +"от журнала на указателите „reflog“. Ðай-вероÑтно Ñ‚Ñ€Ñбва да отмените това " +"подаване и да Ñъздадете клон, в който да подадете.\n" " \n" -"Сигурни ли Ñте, че иÑкате да подадете точно Ñега?" +"Сигурни ли Ñте, че иÑкате да подадете към неÑвързан връх?" #: lib/commit.tcl:290 msgid "Calling commit-msg hook..." @@ -2212,7 +2245,7 @@ msgstr "Подаването е отхвърлено от куката за ÑÑŠ #: lib/commit.tcl:318 msgid "Committing changes..." -msgstr "Подаване на промените." +msgstr "Подаване на промените…" #: lib/commit.tcl:334 msgid "write-tree failed:" @@ -2278,7 +2311,7 @@ msgstr "Изтриване, Ñамо ако промените Ñа Ñлети Ð #: lib/branch_delete.tcl:103 #, tcl-format msgid "The following branches are not completely merged into %s:" -msgstr "Ðе вÑички промени в клоните Ñа Ñлети в %s:" +msgstr "Ðе вÑички промени в клоните Ñа Ñлети в „%s“:" #: lib/branch_delete.tcl:141 #, tcl-format @@ -2324,7 +2357,7 @@ msgstr "Ðнотиране на родителÑкото подаване" #: lib/blame.tcl:466 #, tcl-format msgid "Reading %s..." -msgstr "%s Ñе чете…" +msgstr "Чете Ñе „%s“…" #: lib/blame.tcl:594 msgid "Loading copy/move tracking annotations..." @@ -2372,7 +2405,7 @@ msgstr "Първоначален файл:" #: lib/blame.tcl:1057 msgid "Cannot find HEAD commit:" -msgstr "Подаването за връх HEAD не може да Ñе открие:" +msgstr "Подаването за връх „HEAD“ не може да Ñе открие:" #: lib/blame.tcl:1112 msgid "Cannot find parent commit:" @@ -2421,7 +2454,7 @@ msgstr "Отключване на индекÑа" #: lib/index.tcl:298 #, tcl-format msgid "Unstaging %s from commit" -msgstr "Изваждане на %s от подаването" +msgstr "Изваждане на „%s“ от подаването" #: lib/index.tcl:337 msgid "Ready to commit." @@ -2435,7 +2468,7 @@ msgstr "ДобавÑне на „%s“" #: lib/index.tcl:380 #, tcl-format msgid "Stage %d untracked files?" -msgstr "Да Ñе добавÑÑ‚ ли %d на брой неÑледени файла към индекÑа?" +msgstr "Да Ñе вкарат ли %d неÑледени файла в индекÑа?" #: lib/index.tcl:428 #, tcl-format @@ -2466,19 +2499,6 @@ msgstr "Махане на промените в избраните файловРmsgid "Reverting %s" msgstr "Махане на промените в „%s“" -#: lib/encoding.tcl:443 -msgid "Default" -msgstr "Стандартното" - -#: lib/encoding.tcl:448 -#, tcl-format -msgid "System (%s)" -msgstr "СиÑтемното (%s)" - -#: lib/encoding.tcl:459 lib/encoding.tcl:465 -msgid "Other" -msgstr "Друго" - #: lib/date.tcl:25 #, tcl-format msgid "Invalid date from Git: %s" @@ -2518,7 +2538,7 @@ msgstr "КомпреÑиране на базата Ñ Ð´Ð°Ð½Ð½Ð¸ за обект #: lib/database.tcl:83 msgid "Verifying the object database with fsck-objects" -msgstr "Проверка на базата Ñ Ð´Ð°Ð½Ð½Ð¸ за обектите Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð°Ñ‚Ð° fsck-objects" +msgstr "Проверка на базата Ñ Ð´Ð°Ð½Ð½Ð¸ за обектите Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð°Ñ‚Ð° „fsck-objects“" #: lib/database.tcl:107 #, tcl-format @@ -2532,7 +2552,7 @@ msgid "" msgstr "" "Ð’ това хранилище в момента има към %i непакетирани обекти.\n" "\n" -"Зd добра производителноÑÑ‚ Ñе препоръчва да компреÑирате базата Ñ Ð´Ð°Ð½Ð½Ð¸ за " +"За добра производителноÑÑ‚ Ñе препоръчва да компреÑирате базата Ñ Ð´Ð°Ð½Ð½Ð¸ за " "обектите.\n" "\n" "Да Ñе започне ли компреÑирането?" @@ -2547,7 +2567,7 @@ msgstr "предупреждение" #: lib/error.tcl:96 msgid "You must correct the above errors before committing." -msgstr "Преди да можете да подадете, оправете горните грешки." +msgstr "Преди да можете да подадете, коригирайте горните грешки." #: lib/merge.tcl:13 msgid "" @@ -2659,7 +2679,7 @@ msgid "" msgstr "" "Да Ñе преуÑтанови ли Ñливането?\n" "\n" -"Ð’ такъв Ñлучай *ВСИЧКИ* неподадени промени ще бъдат безвъзвратно загубени.\n" +"Ð’ такъв Ñлучай â—ВСИЧКИ◠неподадени промени ще бъдат безвъзвратно загубени.\n" "\n" "ÐаиÑтина ли да Ñе преуÑтанови Ñливането?" @@ -2673,7 +2693,7 @@ msgid "" msgstr "" "Да Ñе занулÑÑ‚ ли промените?\n" "\n" -"Ð’ такъв Ñлучай *ВСИЧКИ* неподадени промени ще бъдат безвъзвратно загубени.\n" +"Ð’ такъв Ñлучай â—ВСИЧКИ◠неподадени промени ще бъдат безвъзвратно загубени.\n" "\n" "ÐаиÑтина ли да Ñе занулÑÑ‚ промените?" diff --git a/git-gui/po/sv.po b/git-gui/po/sv.po index fcb063f..1b4ad83 100644 --- a/git-gui/po/sv.po +++ b/git-gui/po/sv.po @@ -2,47 +2,51 @@ # Copyright (C) 2007-2008 Shawn Pearce, et al. # This file is distributed under the same license as the git-gui package. # -# Peter Krefting <peter@softwolves.pp.se>, 2007-2008. # Mikael Magnusson <mikachu@gmail.com>, 2008. +# Peter Krefting <peter@softwolves.pp.se>, 2007-2008, 2015. +# msgid "" msgstr "" "Project-Id-Version: sv\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-12 21:11+0100\n" -"PO-Revision-Date: 2010-09-12 21:12+0100\n" +"POT-Creation-Date: 2015-03-27 10:15+0100\n" +"PO-Revision-Date: 2015-03-27 10:24+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Gtranslator 2.91.6\n" -#: git-gui.sh:781 +#: git-gui.sh:861 #, tcl-format msgid "Invalid font specified in %s:" msgstr "Ogiltigt teckensnitt angivet i %s:" -#: git-gui.sh:831 +#: git-gui.sh:915 msgid "Main Font" msgstr "Huvudteckensnitt" -#: git-gui.sh:832 +#: git-gui.sh:916 msgid "Diff/Console Font" msgstr "Diff/konsolteckensnitt" -#: git-gui.sh:845 git-gui.sh:859 git-gui.sh:872 git-gui.sh:955 git-gui.sh:974 -#: git-gui.sh:2964 +#: git-gui.sh:931 git-gui.sh:945 git-gui.sh:958 git-gui.sh:1048 +#: git-gui.sh:1067 git-gui.sh:3125 msgid "git-gui: fatal error" msgstr "git-gui: ödesdigert fel" -#: git-gui.sh:846 +#: git-gui.sh:932 msgid "Cannot find git in PATH." msgstr "Hittar inte git i PATH." -#: git-gui.sh:873 +#: git-gui.sh:959 msgid "Cannot parse Git version string:" msgstr "Kan inte tolka versionssträng frÃ¥n Git:" -#: git-gui.sh:891 +#: git-gui.sh:984 #, tcl-format msgid "" "Git version cannot be determined.\n" @@ -61,478 +65,505 @@ msgstr "" "\n" "Anta att \"%s\" är version 1.5.0?\n" -#: git-gui.sh:1180 +#: git-gui.sh:1281 msgid "Git directory not found:" msgstr "Git-katalogen hittades inte:" -#: git-gui.sh:1201 +#: git-gui.sh:1315 msgid "Cannot move to top of working directory:" msgstr "Kan inte gÃ¥ till början pÃ¥ arbetskatalogen:" -#: git-gui.sh:1209 +#: git-gui.sh:1323 msgid "Cannot use bare repository:" msgstr "Kan inte använda naket arkiv:" -#: git-gui.sh:1217 +#: git-gui.sh:1331 msgid "No working directory" msgstr "Ingen arbetskatalog" -#: git-gui.sh:1389 lib/checkout_op.tcl:306 +#: git-gui.sh:1503 lib/checkout_op.tcl:306 msgid "Refreshing file status..." msgstr "Uppdaterar filstatus..." -#: git-gui.sh:1445 +#: git-gui.sh:1563 msgid "Scanning for modified files ..." msgstr "Söker efter ändrade filer..." -#: git-gui.sh:1509 +#: git-gui.sh:1639 msgid "Calling prepare-commit-msg hook..." msgstr "" "Anropar kroken för förberedelse av incheckningsmeddelande (prepare-commit-" "msg)..." -#: git-gui.sh:1526 +#: git-gui.sh:1656 msgid "Commit declined by prepare-commit-msg hook." msgstr "" "Incheckningen avvisades av kroken för förberedelse av incheckningsmeddelande " "(prepare-commit-msg)." -#: git-gui.sh:1684 lib/browser.tcl:246 +#: git-gui.sh:1814 lib/browser.tcl:252 msgid "Ready." msgstr "Klar." -#: git-gui.sh:1842 +#: git-gui.sh:1978 #, tcl-format -msgid "Displaying only %s of %s files." -msgstr "Visar endast %s av %s filer." +msgid "" +"Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s files." +msgstr "" +"Visningsgräns (gui.maxfilesdisplayed = %s) nÃ¥dd, visare inte samtliga %s " +"filer." -#: git-gui.sh:1968 +#: git-gui.sh:2101 msgid "Unmodified" msgstr "Oförändrade" -#: git-gui.sh:1970 +#: git-gui.sh:2103 msgid "Modified, not staged" msgstr "Förändrade, ej köade" -#: git-gui.sh:1971 git-gui.sh:1979 +#: git-gui.sh:2104 git-gui.sh:2116 msgid "Staged for commit" msgstr "Köade för incheckning" -#: git-gui.sh:1972 git-gui.sh:1980 +#: git-gui.sh:2105 git-gui.sh:2117 msgid "Portions staged for commit" msgstr "Delar köade för incheckning" -#: git-gui.sh:1973 git-gui.sh:1981 +#: git-gui.sh:2106 git-gui.sh:2118 msgid "Staged for commit, missing" msgstr "Köade för incheckning, saknade" -#: git-gui.sh:1975 +#: git-gui.sh:2108 msgid "File type changed, not staged" msgstr "Filtyp ändrad, ej köade" -#: git-gui.sh:1976 +#: git-gui.sh:2109 git-gui.sh:2110 +msgid "File type changed, old type staged for commit" +msgstr "Filtyp ändrad, gammal typ köade för incheckning" + +#: git-gui.sh:2111 msgid "File type changed, staged" msgstr "Filtyp ändrad, köade" -#: git-gui.sh:1978 +#: git-gui.sh:2112 +msgid "File type change staged, modification not staged" +msgstr "Filtypsändringar köade, innehÃ¥llsändringar ej köade" + +#: git-gui.sh:2113 +msgid "File type change staged, file missing" +msgstr "Filtypsändringar köade, fil saknas" + +#: git-gui.sh:2115 msgid "Untracked, not staged" msgstr "Ej spÃ¥rade, ej köade" -#: git-gui.sh:1983 +#: git-gui.sh:2120 msgid "Missing" msgstr "Saknade" -#: git-gui.sh:1984 +#: git-gui.sh:2121 msgid "Staged for removal" msgstr "Köade för borttagning" -#: git-gui.sh:1985 +#: git-gui.sh:2122 msgid "Staged for removal, still present" msgstr "Köade för borttagning, fortfarande närvarande" -#: git-gui.sh:1987 git-gui.sh:1988 git-gui.sh:1989 git-gui.sh:1990 -#: git-gui.sh:1991 git-gui.sh:1992 +#: git-gui.sh:2124 git-gui.sh:2125 git-gui.sh:2126 git-gui.sh:2127 +#: git-gui.sh:2128 git-gui.sh:2129 msgid "Requires merge resolution" msgstr "Kräver konflikthantering efter sammanslagning" -#: git-gui.sh:2027 +#: git-gui.sh:2164 msgid "Starting gitk... please wait..." msgstr "Startar gitk... vänta..." -#: git-gui.sh:2039 +#: git-gui.sh:2176 msgid "Couldn't find gitk in PATH" msgstr "Hittade inte gitk i PATH." -#: git-gui.sh:2098 +#: git-gui.sh:2235 msgid "Couldn't find git gui in PATH" msgstr "Hittade inte git gui i PATH." -#: git-gui.sh:2515 lib/choose_repository.tcl:36 +#: git-gui.sh:2654 lib/choose_repository.tcl:41 msgid "Repository" msgstr "Arkiv" -#: git-gui.sh:2516 +#: git-gui.sh:2655 msgid "Edit" msgstr "Redigera" -#: git-gui.sh:2518 lib/choose_rev.tcl:566 +#: git-gui.sh:2657 lib/choose_rev.tcl:567 msgid "Branch" msgstr "Gren" -#: git-gui.sh:2521 lib/choose_rev.tcl:553 +#: git-gui.sh:2660 lib/choose_rev.tcl:554 msgid "Commit@@noun" msgstr "Incheckning" -#: git-gui.sh:2524 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 +#: git-gui.sh:2663 lib/merge.tcl:123 lib/merge.tcl:152 lib/merge.tcl:170 msgid "Merge" msgstr "SlÃ¥ ihop" -#: git-gui.sh:2525 lib/choose_rev.tcl:562 +#: git-gui.sh:2664 lib/choose_rev.tcl:563 msgid "Remote" msgstr "Fjärrarkiv" -#: git-gui.sh:2528 +#: git-gui.sh:2667 msgid "Tools" msgstr "Verktyg" -#: git-gui.sh:2537 +#: git-gui.sh:2676 msgid "Explore Working Copy" msgstr "Utforska arbetskopia" -#: git-gui.sh:2543 +#: git-gui.sh:2682 +msgid "Git Bash" +msgstr "Git Bash" + +#: git-gui.sh:2692 msgid "Browse Current Branch's Files" msgstr "Bläddra i grenens filer" -#: git-gui.sh:2547 +#: git-gui.sh:2696 msgid "Browse Branch Files..." msgstr "Bläddra filer pÃ¥ gren..." -#: git-gui.sh:2552 +#: git-gui.sh:2701 msgid "Visualize Current Branch's History" msgstr "Visualisera grenens historik" -#: git-gui.sh:2556 +#: git-gui.sh:2705 msgid "Visualize All Branch History" msgstr "Visualisera alla grenars historik" -#: git-gui.sh:2563 +#: git-gui.sh:2712 #, tcl-format msgid "Browse %s's Files" msgstr "Bläddra i filer för %s" -#: git-gui.sh:2565 +#: git-gui.sh:2714 #, tcl-format msgid "Visualize %s's History" msgstr "Visualisera historik för %s" -#: git-gui.sh:2570 lib/database.tcl:40 lib/database.tcl:66 +#: git-gui.sh:2719 lib/database.tcl:40 lib/database.tcl:66 msgid "Database Statistics" msgstr "Databasstatistik" -#: git-gui.sh:2573 lib/database.tcl:33 +#: git-gui.sh:2722 lib/database.tcl:33 msgid "Compress Database" msgstr "Komprimera databas" -#: git-gui.sh:2576 +#: git-gui.sh:2725 msgid "Verify Database" msgstr "Verifiera databas" -#: git-gui.sh:2583 git-gui.sh:2587 git-gui.sh:2591 lib/shortcut.tcl:8 +#: git-gui.sh:2732 git-gui.sh:2736 git-gui.sh:2740 lib/shortcut.tcl:8 #: lib/shortcut.tcl:40 lib/shortcut.tcl:72 msgid "Create Desktop Icon" msgstr "Skapa skrivbordsikon" -#: git-gui.sh:2599 lib/choose_repository.tcl:188 lib/choose_repository.tcl:196 +#: git-gui.sh:2748 lib/choose_repository.tcl:193 lib/choose_repository.tcl:201 msgid "Quit" msgstr "Avsluta" -#: git-gui.sh:2607 +#: git-gui.sh:2756 msgid "Undo" msgstr "Ã…ngra" -#: git-gui.sh:2610 +#: git-gui.sh:2759 msgid "Redo" msgstr "Gör om" -#: git-gui.sh:2614 git-gui.sh:3190 +#: git-gui.sh:2763 git-gui.sh:3368 msgid "Cut" msgstr "Klipp ut" -#: git-gui.sh:2617 git-gui.sh:3193 git-gui.sh:3267 git-gui.sh:3340 +#: git-gui.sh:2766 git-gui.sh:3371 git-gui.sh:3445 git-gui.sh:3530 #: lib/console.tcl:69 msgid "Copy" msgstr "Kopiera" -#: git-gui.sh:2620 git-gui.sh:3196 +#: git-gui.sh:2769 git-gui.sh:3374 msgid "Paste" msgstr "Klistra in" -#: git-gui.sh:2623 git-gui.sh:3199 lib/branch_delete.tcl:28 -#: lib/remote_branch_delete.tcl:39 +#: git-gui.sh:2772 git-gui.sh:3377 lib/remote_branch_delete.tcl:39 +#: lib/branch_delete.tcl:28 msgid "Delete" msgstr "Ta bort" -#: git-gui.sh:2627 git-gui.sh:3203 git-gui.sh:3344 lib/console.tcl:71 +#: git-gui.sh:2776 git-gui.sh:3381 git-gui.sh:3534 lib/console.tcl:71 msgid "Select All" msgstr "Markera alla" -#: git-gui.sh:2636 +#: git-gui.sh:2785 msgid "Create..." msgstr "Skapa..." -#: git-gui.sh:2642 +#: git-gui.sh:2791 msgid "Checkout..." msgstr "Checka ut..." -#: git-gui.sh:2648 +#: git-gui.sh:2797 msgid "Rename..." msgstr "Byt namn..." -#: git-gui.sh:2653 +#: git-gui.sh:2802 msgid "Delete..." msgstr "Ta bort..." -#: git-gui.sh:2658 +#: git-gui.sh:2807 msgid "Reset..." msgstr "Ã…terställ..." -#: git-gui.sh:2668 +#: git-gui.sh:2817 msgid "Done" msgstr "Färdig" -#: git-gui.sh:2670 +#: git-gui.sh:2819 msgid "Commit@@verb" msgstr "Checka in" -#: git-gui.sh:2679 git-gui.sh:3131 +#: git-gui.sh:2828 git-gui.sh:3309 msgid "New Commit" msgstr "Ny incheckning" -#: git-gui.sh:2687 git-gui.sh:3138 +#: git-gui.sh:2836 git-gui.sh:3316 msgid "Amend Last Commit" msgstr "Lägg till föregÃ¥ende incheckning" -#: git-gui.sh:2697 git-gui.sh:3092 lib/remote_branch_delete.tcl:101 +#: git-gui.sh:2846 git-gui.sh:3270 lib/remote_branch_delete.tcl:101 msgid "Rescan" msgstr "Sök pÃ¥ nytt" -#: git-gui.sh:2703 +#: git-gui.sh:2852 msgid "Stage To Commit" msgstr "Köa för incheckning" -#: git-gui.sh:2709 +#: git-gui.sh:2858 msgid "Stage Changed Files To Commit" msgstr "Köa ändrade filer för incheckning" -#: git-gui.sh:2715 +#: git-gui.sh:2864 msgid "Unstage From Commit" msgstr "Ta bort frÃ¥n incheckningskö" -#: git-gui.sh:2721 lib/index.tcl:415 +#: git-gui.sh:2870 lib/index.tcl:442 msgid "Revert Changes" msgstr "Ã…terställ ändringar" -#: git-gui.sh:2729 git-gui.sh:3391 git-gui.sh:3422 +#: git-gui.sh:2878 git-gui.sh:3581 git-gui.sh:3612 msgid "Show Less Context" msgstr "Visa mindre sammanhang" -#: git-gui.sh:2733 git-gui.sh:3395 git-gui.sh:3426 +#: git-gui.sh:2882 git-gui.sh:3585 git-gui.sh:3616 msgid "Show More Context" msgstr "Visa mer sammanhang" -#: git-gui.sh:2740 git-gui.sh:3105 git-gui.sh:3214 +#: git-gui.sh:2889 git-gui.sh:3283 git-gui.sh:3392 msgid "Sign Off" msgstr "Skriv under" -#: git-gui.sh:2756 +#: git-gui.sh:2905 msgid "Local Merge..." msgstr "Lokal sammanslagning..." -#: git-gui.sh:2761 +#: git-gui.sh:2910 msgid "Abort Merge..." msgstr "Avbryt sammanslagning..." -#: git-gui.sh:2773 git-gui.sh:2801 +#: git-gui.sh:2922 git-gui.sh:2950 msgid "Add..." msgstr "Lägg till..." -#: git-gui.sh:2777 +#: git-gui.sh:2926 msgid "Push..." msgstr "Sänd..." -#: git-gui.sh:2781 +#: git-gui.sh:2930 msgid "Delete Branch..." msgstr "Ta bort gren..." -#: git-gui.sh:2791 git-gui.sh:3373 +#: git-gui.sh:2940 git-gui.sh:3563 msgid "Options..." msgstr "Alternativ..." -#: git-gui.sh:2802 +#: git-gui.sh:2951 msgid "Remove..." msgstr "Ta bort..." -#: git-gui.sh:2811 lib/choose_repository.tcl:50 +#: git-gui.sh:2960 lib/choose_repository.tcl:55 msgid "Help" msgstr "Hjälp" -#: git-gui.sh:2815 git-gui.sh:2819 lib/about.tcl:14 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 +#: git-gui.sh:2964 git-gui.sh:2968 lib/choose_repository.tcl:49 +#: lib/choose_repository.tcl:58 lib/about.tcl:14 #, tcl-format msgid "About %s" msgstr "Om %s" -#: git-gui.sh:2843 +#: git-gui.sh:2992 msgid "Online Documentation" msgstr "Webbdokumentation" -#: git-gui.sh:2846 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 +#: git-gui.sh:2995 lib/choose_repository.tcl:52 lib/choose_repository.tcl:61 msgid "Show SSH Key" msgstr "Visa SSH-nyckel" -#: git-gui.sh:2965 +#: git-gui.sh:3014 git-gui.sh:3146 +msgid "Usage" +msgstr "Användning" + +#: git-gui.sh:3095 lib/blame.tcl:573 +msgid "Error" +msgstr "Fel" + +#: git-gui.sh:3126 #, tcl-format msgid "fatal: cannot stat path %s: No such file or directory" msgstr "" "ödesdigert: kunde inte ta status pÃ¥ sökvägen %s: Fil eller katalog saknas" -#: git-gui.sh:2997 +#: git-gui.sh:3159 msgid "Current Branch:" msgstr "Aktuell gren:" -#: git-gui.sh:3023 +#: git-gui.sh:3185 msgid "Staged Changes (Will Commit)" msgstr "Köade ändringar (kommer att checkas in)" -#: git-gui.sh:3043 +#: git-gui.sh:3205 msgid "Unstaged Changes" msgstr "Oköade ändringar" -#: git-gui.sh:3098 +#: git-gui.sh:3276 msgid "Stage Changed" msgstr "Köa ändrade" -#: git-gui.sh:3117 lib/transport.tcl:107 lib/transport.tcl:196 +#: git-gui.sh:3295 lib/transport.tcl:137 lib/transport.tcl:229 msgid "Push" msgstr "Sänd" -#: git-gui.sh:3152 +#: git-gui.sh:3330 msgid "Initial Commit Message:" msgstr "Inledande incheckningsmeddelande:" -#: git-gui.sh:3153 +#: git-gui.sh:3331 msgid "Amended Commit Message:" msgstr "Utökat incheckningsmeddelande:" -#: git-gui.sh:3154 +#: git-gui.sh:3332 msgid "Amended Initial Commit Message:" msgstr "Utökat inledande incheckningsmeddelande:" -#: git-gui.sh:3155 +#: git-gui.sh:3333 msgid "Amended Merge Commit Message:" msgstr "Utökat incheckningsmeddelande för sammanslagning:" -#: git-gui.sh:3156 +#: git-gui.sh:3334 msgid "Merge Commit Message:" msgstr "Incheckningsmeddelande för sammanslagning:" -#: git-gui.sh:3157 +#: git-gui.sh:3335 msgid "Commit Message:" msgstr "Incheckningsmeddelande:" -#: git-gui.sh:3206 git-gui.sh:3348 lib/console.tcl:73 +#: git-gui.sh:3384 git-gui.sh:3538 lib/console.tcl:73 msgid "Copy All" msgstr "Kopiera alla" -#: git-gui.sh:3230 lib/blame.tcl:104 +#: git-gui.sh:3408 lib/blame.tcl:105 msgid "File:" msgstr "Fil:" -#: git-gui.sh:3336 +#: git-gui.sh:3526 msgid "Refresh" msgstr "Uppdatera" -#: git-gui.sh:3357 +#: git-gui.sh:3547 msgid "Decrease Font Size" msgstr "Minska teckensnittsstorlek" -#: git-gui.sh:3361 +#: git-gui.sh:3551 msgid "Increase Font Size" msgstr "Öka teckensnittsstorlek" -#: git-gui.sh:3369 lib/blame.tcl:281 +#: git-gui.sh:3559 lib/blame.tcl:294 msgid "Encoding" msgstr "Teckenkodning" -#: git-gui.sh:3380 +#: git-gui.sh:3570 msgid "Apply/Reverse Hunk" msgstr "Använd/Ã¥terställ del" -#: git-gui.sh:3385 +#: git-gui.sh:3575 msgid "Apply/Reverse Line" msgstr "Använd/Ã¥terställ rad" -#: git-gui.sh:3404 +#: git-gui.sh:3594 msgid "Run Merge Tool" msgstr "Starta verktyg för sammanslagning" -#: git-gui.sh:3409 +#: git-gui.sh:3599 msgid "Use Remote Version" msgstr "Använd versionen frÃ¥n fjärrarkivet" -#: git-gui.sh:3413 +#: git-gui.sh:3603 msgid "Use Local Version" msgstr "Använd lokala versionen" -#: git-gui.sh:3417 +#: git-gui.sh:3607 msgid "Revert To Base" msgstr "Ã…terställ till basversionen" -#: git-gui.sh:3435 +#: git-gui.sh:3625 msgid "Visualize These Changes In The Submodule" msgstr "Visualisera ändringarna i undermodulen" -#: git-gui.sh:3439 +#: git-gui.sh:3629 msgid "Visualize Current Branch History In The Submodule" msgstr "Visualisera grenens historik i undermodulen" -#: git-gui.sh:3443 +#: git-gui.sh:3633 msgid "Visualize All Branch History In The Submodule" msgstr "Visualisera alla grenars historik i undermodulen" -#: git-gui.sh:3448 +#: git-gui.sh:3638 msgid "Start git gui In The Submodule" msgstr "Starta git gui i undermodulen" -#: git-gui.sh:3483 +#: git-gui.sh:3673 msgid "Unstage Hunk From Commit" msgstr "Ta bort del ur incheckningskö" -#: git-gui.sh:3485 +#: git-gui.sh:3675 msgid "Unstage Lines From Commit" msgstr "Ta bort rader ur incheckningskö" -#: git-gui.sh:3487 +#: git-gui.sh:3677 msgid "Unstage Line From Commit" msgstr "Ta bort rad ur incheckningskö" -#: git-gui.sh:3490 +#: git-gui.sh:3680 msgid "Stage Hunk For Commit" msgstr "Ställ del i incheckningskö" -#: git-gui.sh:3492 +#: git-gui.sh:3682 msgid "Stage Lines For Commit" msgstr "Ställ rader i incheckningskö" -#: git-gui.sh:3494 +#: git-gui.sh:3684 msgid "Stage Line For Commit" msgstr "Ställ rad i incheckningskö" -#: git-gui.sh:3519 +#: git-gui.sh:3709 msgid "Initializing..." msgstr "Initierar..." -#: git-gui.sh:3658 +#: git-gui.sh:3852 #, tcl-format msgid "" "Possible environment issues exist.\n" @@ -549,7 +580,7 @@ msgstr "" "av %s:\n" "\n" -#: git-gui.sh:3687 +#: git-gui.sh:3881 msgid "" "\n" "This is due to a known issue with the\n" @@ -559,7 +590,7 @@ msgstr "" "Detta beror pÃ¥ ett känt problem med\n" "Tcl-binären som följer med Cygwin." -#: git-gui.sh:3692 +#: git-gui.sh:3886 #, tcl-format msgid "" "\n" @@ -576,314 +607,30 @@ msgstr "" "user.name och user.email i din personliga\n" "~/.gitconfig-fil.\n" -#: lib/about.tcl:26 -msgid "git-gui - a graphical user interface for Git." -msgstr "git-gui - ett grafiskt användargränssnitt för Git." - -#: lib/blame.tcl:72 -msgid "File Viewer" -msgstr "Filvisare" - -#: lib/blame.tcl:78 -msgid "Commit:" -msgstr "Incheckning:" - -#: lib/blame.tcl:271 -msgid "Copy Commit" -msgstr "Kopiera incheckning" - -#: lib/blame.tcl:275 -msgid "Find Text..." -msgstr "Sök text..." - -#: lib/blame.tcl:284 -msgid "Do Full Copy Detection" -msgstr "Gör full kopieringsigenkänning" - -#: lib/blame.tcl:288 -msgid "Show History Context" -msgstr "Visa historiksammanhang" - -#: lib/blame.tcl:291 -msgid "Blame Parent Commit" -msgstr "Klandra föräldraincheckning" - -#: lib/blame.tcl:450 -#, tcl-format -msgid "Reading %s..." -msgstr "Läser %s..." - -#: lib/blame.tcl:581 -msgid "Loading copy/move tracking annotations..." -msgstr "Läser annoteringar för kopiering/flyttning..." - -#: lib/blame.tcl:601 -msgid "lines annotated" -msgstr "rader annoterade" - -#: lib/blame.tcl:793 -msgid "Loading original location annotations..." -msgstr "Läser in annotering av originalplacering..." - -#: lib/blame.tcl:796 -msgid "Annotation complete." -msgstr "Annotering fullbordad." - -#: lib/blame.tcl:826 -msgid "Busy" -msgstr "Upptagen" - -#: lib/blame.tcl:827 -msgid "Annotation process is already running." -msgstr "Annoteringsprocess körs redan." - -#: lib/blame.tcl:866 -msgid "Running thorough copy detection..." -msgstr "Kör grundlig kopieringsigenkänning..." - -#: lib/blame.tcl:934 -msgid "Loading annotation..." -msgstr "Läser in annotering..." - -#: lib/blame.tcl:987 -msgid "Author:" -msgstr "Författare:" - -#: lib/blame.tcl:991 -msgid "Committer:" -msgstr "Incheckare:" - -#: lib/blame.tcl:996 -msgid "Original File:" -msgstr "Ursprunglig fil:" - -#: lib/blame.tcl:1044 -msgid "Cannot find HEAD commit:" -msgstr "Hittar inte incheckning för HEAD:" - -#: lib/blame.tcl:1099 -msgid "Cannot find parent commit:" -msgstr "Hittar inte föräldraincheckning:" - -#: lib/blame.tcl:1114 -msgid "Unable to display parent" -msgstr "Kan inte visa förälder" - -#: lib/blame.tcl:1115 lib/diff.tcl:323 -msgid "Error loading diff:" -msgstr "Fel vid inläsning av differens:" - -#: lib/blame.tcl:1255 -msgid "Originally By:" -msgstr "Ursprungligen av:" - -#: lib/blame.tcl:1261 -msgid "In File:" -msgstr "I filen:" - -#: lib/blame.tcl:1266 -msgid "Copied Or Moved Here By:" -msgstr "Kopierad eller flyttad hit av:" - -#: lib/branch_checkout.tcl:16 lib/branch_checkout.tcl:21 -msgid "Checkout Branch" -msgstr "Checka ut gren" - -#: lib/branch_checkout.tcl:26 -msgid "Checkout" -msgstr "Checka ut" - -#: lib/branch_checkout.tcl:30 lib/branch_create.tcl:37 -#: lib/branch_delete.tcl:34 lib/branch_rename.tcl:32 lib/browser.tcl:286 -#: lib/checkout_op.tcl:579 lib/choose_font.tcl:45 lib/merge.tcl:172 -#: lib/option.tcl:127 lib/remote_add.tcl:34 lib/remote_branch_delete.tcl:43 -#: lib/tools_dlg.tcl:41 lib/tools_dlg.tcl:202 lib/tools_dlg.tcl:345 -#: lib/transport.tcl:111 -msgid "Cancel" -msgstr "Avbryt" - -#: lib/branch_checkout.tcl:35 lib/browser.tcl:291 lib/tools_dlg.tcl:321 -msgid "Revision" -msgstr "Revision" +#: lib/line.tcl:17 +msgid "Goto Line:" +msgstr "GÃ¥ till rad:" -#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:69 lib/option.tcl:287 -msgid "Options" -msgstr "Alternativ" +#: lib/line.tcl:23 +msgid "Go" +msgstr "GÃ¥" -#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92 -msgid "Fetch Tracking Branch" -msgstr "Hämta spÃ¥rande gren" - -#: lib/branch_checkout.tcl:47 -msgid "Detach From Local Branch" -msgstr "Koppla bort frÃ¥n lokal gren" - -#: lib/branch_create.tcl:23 -msgid "Create Branch" -msgstr "Skapa gren" - -#: lib/branch_create.tcl:28 -msgid "Create New Branch" -msgstr "Skapa ny gren" - -#: lib/branch_create.tcl:33 lib/choose_repository.tcl:389 -msgid "Create" -msgstr "Skapa" - -#: lib/branch_create.tcl:42 -msgid "Branch Name" -msgstr "Namn pÃ¥ gren" - -#: lib/branch_create.tcl:44 lib/remote_add.tcl:41 lib/tools_dlg.tcl:51 -msgid "Name:" -msgstr "Namn:" - -#: lib/branch_create.tcl:57 -msgid "Match Tracking Branch Name" -msgstr "Använd namn pÃ¥ spÃ¥rad gren" - -#: lib/branch_create.tcl:66 -msgid "Starting Revision" -msgstr "Inledande revision" - -#: lib/branch_create.tcl:72 -msgid "Update Existing Branch:" -msgstr "Uppdatera befintlig gren:" - -#: lib/branch_create.tcl:75 -msgid "No" -msgstr "Nej" - -#: lib/branch_create.tcl:80 -msgid "Fast Forward Only" -msgstr "Endast snabbspolning" - -#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571 -msgid "Reset" -msgstr "Ã…terställ" - -#: lib/branch_create.tcl:97 -msgid "Checkout After Creation" -msgstr "Checka ut när skapad" - -#: lib/branch_create.tcl:132 -msgid "Please select a tracking branch." -msgstr "Välj en gren att spÃ¥ra." - -#: lib/branch_create.tcl:141 -#, tcl-format -msgid "Tracking branch %s is not a branch in the remote repository." -msgstr "Den spÃ¥rade grenen %s är inte en gren i fjärrarkivet." - -#: lib/branch_create.tcl:154 lib/branch_rename.tcl:92 -msgid "Please supply a branch name." -msgstr "Ange ett namn för grenen." - -#: lib/branch_create.tcl:165 lib/branch_rename.tcl:112 -#, tcl-format -msgid "'%s' is not an acceptable branch name." -msgstr "\"%s\" kan inte användas som namn pÃ¥ grenen." - -#: lib/branch_delete.tcl:16 -msgid "Delete Branch" -msgstr "Ta bort gren" - -#: lib/branch_delete.tcl:21 -msgid "Delete Local Branch" -msgstr "Ta bort lokal gren" - -#: lib/branch_delete.tcl:39 -msgid "Local Branches" -msgstr "Lokala grenar" - -#: lib/branch_delete.tcl:51 -msgid "Delete Only If Merged Into" -msgstr "Ta bara bort om sammanslagen med" - -#: lib/branch_delete.tcl:53 lib/remote_branch_delete.tcl:120 -msgid "Always (Do not perform merge checks)" -msgstr "Alltid (utför inte sammanslagningstest)" - -#: lib/branch_delete.tcl:103 -#, tcl-format -msgid "The following branches are not completely merged into %s:" -msgstr "Följande grenar är inte till fullo sammanslagna med %s:" - -#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:218 -msgid "" -"Recovering deleted branches is difficult.\n" -"\n" -"Delete the selected branches?" -msgstr "" -"Det kan vara svÃ¥rt att Ã¥terställa borttagna grenar.\n" -"\n" -"Ta bort de valda grenarna?" - -#: lib/branch_delete.tcl:141 -#, tcl-format -msgid "" -"Failed to delete branches:\n" -"%s" -msgstr "" -"Kunde inte ta bort grenar:\n" -"%s" - -#: lib/branch_rename.tcl:15 lib/branch_rename.tcl:23 -msgid "Rename Branch" -msgstr "Byt namn pÃ¥ gren" - -#: lib/branch_rename.tcl:28 -msgid "Rename" -msgstr "Byt namn" - -#: lib/branch_rename.tcl:38 -msgid "Branch:" -msgstr "Gren:" - -#: lib/branch_rename.tcl:46 -msgid "New Name:" -msgstr "Nytt namn:" - -#: lib/branch_rename.tcl:81 -msgid "Please select a branch to rename." -msgstr "Välj en gren att byta namn pÃ¥." - -#: lib/branch_rename.tcl:102 lib/checkout_op.tcl:202 -#, tcl-format -msgid "Branch '%s' already exists." -msgstr "Grenen \"%s\" finns redan." - -#: lib/branch_rename.tcl:123 -#, tcl-format -msgid "Failed to rename '%s'." -msgstr "Kunde inte byta namn pÃ¥ \"%s\"." - -#: lib/browser.tcl:17 -msgid "Starting..." -msgstr "Startar..." - -#: lib/browser.tcl:27 -msgid "File Browser" -msgstr "Filbläddrare" - -#: lib/browser.tcl:126 lib/browser.tcl:143 -#, tcl-format -msgid "Loading %s..." -msgstr "Läser %s..." +#: lib/console.tcl:59 +msgid "Working... please wait..." +msgstr "Arbetar... vänta..." -#: lib/browser.tcl:187 -msgid "[Up To Parent]" -msgstr "[Upp till förälder]" +#: lib/console.tcl:81 lib/checkout_op.tcl:146 lib/sshkey.tcl:55 +#: lib/database.tcl:30 +msgid "Close" +msgstr "Stäng" -#: lib/browser.tcl:269 lib/browser.tcl:276 -msgid "Browse Branch Files" -msgstr "Bläddra filer pÃ¥ grenen" +#: lib/console.tcl:186 +msgid "Success" +msgstr "Lyckades" -#: lib/browser.tcl:282 lib/choose_repository.tcl:404 -#: lib/choose_repository.tcl:491 lib/choose_repository.tcl:500 -#: lib/choose_repository.tcl:1027 -msgid "Browse" -msgstr "Bläddra" +#: lib/console.tcl:200 +msgid "Error: Command Failed" +msgstr "Fel: Kommando misslyckades" #: lib/checkout_op.tcl:85 #, tcl-format @@ -895,11 +642,6 @@ msgstr "Hämtar %s frÃ¥n %s" msgid "fatal: Cannot resolve %s" msgstr "ödesdigert: Kunde inte slÃ¥ upp %s" -#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:30 -#: lib/sshkey.tcl:55 -msgid "Close" -msgstr "Stäng" - #: lib/checkout_op.tcl:175 #, tcl-format msgid "Branch '%s' does not exist." @@ -910,6 +652,11 @@ msgstr "Grenen \"%s\" finns inte." msgid "Failed to configure simplified git-pull for '%s'." msgstr "Kunde inte konfigurera förenklad git-pull för '%s'." +#: lib/checkout_op.tcl:202 lib/branch_rename.tcl:102 +#, tcl-format +msgid "Branch '%s' already exists." +msgstr "Grenen \"%s\" finns redan." + #: lib/checkout_op.tcl:229 #, tcl-format msgid "" @@ -1008,10 +755,23 @@ msgstr "Det kanske inte är sÃ¥ enkelt att Ã¥terskapa förlorade incheckningar." msgid "Reset '%s'?" msgstr "Ã…terställa \"%s\"?" -#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:336 +#: lib/checkout_op.tcl:567 lib/merge.tcl:166 lib/tools_dlg.tcl:336 msgid "Visualize" msgstr "Visualisera" +#: lib/checkout_op.tcl:571 lib/branch_create.tcl:85 +msgid "Reset" +msgstr "Ã…terställ" + +#: lib/checkout_op.tcl:579 lib/transport.tcl:141 lib/remote_add.tcl:34 +#: lib/browser.tcl:292 lib/merge.tcl:174 lib/branch_checkout.tcl:30 +#: lib/choose_font.tcl:45 lib/option.tcl:127 lib/tools_dlg.tcl:41 +#: lib/tools_dlg.tcl:202 lib/tools_dlg.tcl:345 lib/branch_rename.tcl:32 +#: lib/remote_branch_delete.tcl:43 lib/branch_create.tcl:37 +#: lib/branch_delete.tcl:34 +msgid "Cancel" +msgstr "Avbryt" + #: lib/checkout_op.tcl:635 #, tcl-format msgid "" @@ -1029,544 +789,442 @@ msgstr "" "\n" "Detta skulle inte ha hänt. %s kommer nu stängas och ge upp." -#: lib/choose_font.tcl:41 -msgid "Select" -msgstr "Välj" - -#: lib/choose_font.tcl:55 -msgid "Font Family" -msgstr "Teckensnittsfamilj" - -#: lib/choose_font.tcl:76 -msgid "Font Size" -msgstr "Storlek" - -#: lib/choose_font.tcl:93 -msgid "Font Example" -msgstr "Exempel" - -#: lib/choose_font.tcl:105 -msgid "" -"This is example text.\n" -"If you like this text, it can be your font." -msgstr "" -"Detta är en exempeltext.\n" -"Om du tycker om den här texten kan den vara ditt teckensnitt." - -#: lib/choose_repository.tcl:28 -msgid "Git Gui" -msgstr "Git Gui" - -#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:394 -msgid "Create New Repository" -msgstr "Skapa nytt arkiv" - -#: lib/choose_repository.tcl:93 -msgid "New..." -msgstr "Nytt..." - -#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:478 -msgid "Clone Existing Repository" -msgstr "Klona befintligt arkiv" - -#: lib/choose_repository.tcl:111 -msgid "Clone..." -msgstr "Klona..." - -#: lib/choose_repository.tcl:118 lib/choose_repository.tcl:1017 -msgid "Open Existing Repository" -msgstr "Öppna befintligt arkiv" - -#: lib/choose_repository.tcl:124 -msgid "Open..." -msgstr "Öppna..." - -#: lib/choose_repository.tcl:137 -msgid "Recent Repositories" -msgstr "Senaste arkiven" - -#: lib/choose_repository.tcl:143 -msgid "Open Recent Repository:" -msgstr "Öppna tidigare arkiv:" - -#: lib/choose_repository.tcl:313 lib/choose_repository.tcl:320 -#: lib/choose_repository.tcl:327 +#: lib/transport.tcl:6 lib/remote_add.tcl:132 #, tcl-format -msgid "Failed to create repository %s:" -msgstr "Kunde inte skapa arkivet %s:" - -#: lib/choose_repository.tcl:399 -msgid "Directory:" -msgstr "Katalog:" - -#: lib/choose_repository.tcl:429 lib/choose_repository.tcl:550 -#: lib/choose_repository.tcl:1051 -msgid "Git Repository" -msgstr "Gitarkiv" +msgid "fetch %s" +msgstr "hämta %s" -#: lib/choose_repository.tcl:454 +#: lib/transport.tcl:7 #, tcl-format -msgid "Directory %s already exists." -msgstr "Katalogen %s finns redan." +msgid "Fetching new changes from %s" +msgstr "Hämtar nya ändringar frÃ¥n %s" -#: lib/choose_repository.tcl:458 +#: lib/transport.tcl:18 #, tcl-format -msgid "File %s already exists." -msgstr "Filen %s finns redan." - -#: lib/choose_repository.tcl:473 -msgid "Clone" -msgstr "Klona" - -#: lib/choose_repository.tcl:486 -msgid "Source Location:" -msgstr "Plats för källkod:" +msgid "remote prune %s" +msgstr "fjärrborttagning %s" -#: lib/choose_repository.tcl:495 -msgid "Target Directory:" -msgstr "MÃ¥lkatalog:" +#: lib/transport.tcl:19 +#, tcl-format +msgid "Pruning tracking branches deleted from %s" +msgstr "Tar bort spÃ¥rande grenar som tagits bort frÃ¥n %s" -#: lib/choose_repository.tcl:505 -msgid "Clone Type:" -msgstr "Typ av klon:" +#: lib/transport.tcl:25 +msgid "fetch all remotes" +msgstr "hämta alla fjärrarkiv" -#: lib/choose_repository.tcl:510 -msgid "Standard (Fast, Semi-Redundant, Hardlinks)" -msgstr "Standard (snabb, semiredundant, hÃ¥rda länkar)" +#: lib/transport.tcl:26 +msgid "Fetching new changes from all remotes" +msgstr "Hämtar nya ändringar frÃ¥n alla fjärrarkiv" -#: lib/choose_repository.tcl:515 -msgid "Full Copy (Slower, Redundant Backup)" -msgstr "Full kopia (lÃ¥ngsammare, redundant säkerhetskopia)" +#: lib/transport.tcl:40 +msgid "remote prune all remotes" +msgstr "rensa alla fjärrarkiv" -#: lib/choose_repository.tcl:520 -msgid "Shared (Fastest, Not Recommended, No Backup)" -msgstr "Delad (snabbast, rekommenderas ej, ingen säkerhetskopia)" +#: lib/transport.tcl:41 +msgid "Pruning tracking branches deleted from all remotes" +msgstr "Rensar spÃ¥rande grenar som tagits bort, frÃ¥n alla fjärrarkiv" -#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603 -#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819 -#: lib/choose_repository.tcl:1057 lib/choose_repository.tcl:1065 +#: lib/transport.tcl:54 lib/transport.tcl:92 lib/transport.tcl:110 +#: lib/remote_add.tcl:162 #, tcl-format -msgid "Not a Git repository: %s" -msgstr "Inte ett Gitarkiv: %s" - -#: lib/choose_repository.tcl:592 -msgid "Standard only available for local repository." -msgstr "Standard är endast tillgängligt för lokala arkiv." - -#: lib/choose_repository.tcl:596 -msgid "Shared only available for local repository." -msgstr "Delat är endast tillgängligt för lokala arkiv." +msgid "push %s" +msgstr "sänd %s" -#: lib/choose_repository.tcl:617 +#: lib/transport.tcl:55 #, tcl-format -msgid "Location %s already exists." -msgstr "Platsen %s finns redan." - -#: lib/choose_repository.tcl:628 -msgid "Failed to configure origin" -msgstr "Kunde inte konfigurera ursprung" - -#: lib/choose_repository.tcl:640 -msgid "Counting objects" -msgstr "Räknar objekt" - -#: lib/choose_repository.tcl:641 -msgid "buckets" -msgstr "hinkar" +msgid "Pushing changes to %s" +msgstr "Sänder ändringar till %s" -#: lib/choose_repository.tcl:665 +#: lib/transport.tcl:93 #, tcl-format -msgid "Unable to copy objects/info/alternates: %s" -msgstr "Kunde inte kopiera objekt/info/alternativ: %s" +msgid "Mirroring to %s" +msgstr "Speglar till %s" -#: lib/choose_repository.tcl:701 +#: lib/transport.tcl:111 #, tcl-format -msgid "Nothing to clone from %s." -msgstr "Ingenting att klona frÃ¥n %s." +msgid "Pushing %s %s to %s" +msgstr "Sänder %s %s till %s" -#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917 -#: lib/choose_repository.tcl:929 -msgid "The 'master' branch has not been initialized." -msgstr "Grenen \"master\" har inte initierats." +#: lib/transport.tcl:132 +msgid "Push Branches" +msgstr "Sänd grenar" -#: lib/choose_repository.tcl:716 -msgid "Hardlinks are unavailable. Falling back to copying." -msgstr "HÃ¥rda länkar är inte tillgängliga. Faller tillbaka pÃ¥ kopiering." +#: lib/transport.tcl:147 +msgid "Source Branches" +msgstr "Källgrenar" -#: lib/choose_repository.tcl:728 -#, tcl-format -msgid "Cloning from %s" -msgstr "Klonar frÃ¥n %s" +#: lib/transport.tcl:162 +msgid "Destination Repository" +msgstr "Destinationsarkiv" -#: lib/choose_repository.tcl:759 -msgid "Copying objects" -msgstr "Kopierar objekt" +#: lib/transport.tcl:165 lib/remote_branch_delete.tcl:51 +msgid "Remote:" +msgstr "Fjärrarkiv:" -#: lib/choose_repository.tcl:760 -msgid "KiB" -msgstr "KiB" +#: lib/transport.tcl:187 lib/remote_branch_delete.tcl:72 +msgid "Arbitrary Location:" +msgstr "Godtycklig plats:" -#: lib/choose_repository.tcl:784 -#, tcl-format -msgid "Unable to copy object: %s" -msgstr "Kunde inte kopiera objekt: %s" +#: lib/transport.tcl:205 +msgid "Transfer Options" +msgstr "Överföringsalternativ" -#: lib/choose_repository.tcl:794 -msgid "Linking objects" -msgstr "Länkar objekt" +#: lib/transport.tcl:207 +msgid "Force overwrite existing branch (may discard changes)" +msgstr "Tvinga överskrivning av befintlig gren (kan kasta bort ändringar)" -#: lib/choose_repository.tcl:795 -msgid "objects" -msgstr "objekt" +#: lib/transport.tcl:211 +msgid "Use thin pack (for slow network connections)" +msgstr "Använd tunt paket (för lÃ¥ngsamma nätverksanslutningar)" -#: lib/choose_repository.tcl:803 -#, tcl-format -msgid "Unable to hardlink object: %s" -msgstr "Kunde inte hÃ¥rdlänka objekt: %s" +#: lib/transport.tcl:215 +msgid "Include tags" +msgstr "Ta med taggar" -#: lib/choose_repository.tcl:858 -msgid "Cannot fetch branches and objects. See console output for details." -msgstr "Kunde inte hämta grenar och objekt. Se konsolutdata för detaljer." +#: lib/remote_add.tcl:20 +msgid "Add Remote" +msgstr "Lägg till fjärrarkiv" -#: lib/choose_repository.tcl:869 -msgid "Cannot fetch tags. See console output for details." -msgstr "Kunde inte hämta taggar. Se konsolutdata för detaljer." +#: lib/remote_add.tcl:25 +msgid "Add New Remote" +msgstr "Lägg till nytt fjärrarkiv" -#: lib/choose_repository.tcl:893 -msgid "Cannot determine HEAD. See console output for details." -msgstr "Kunde inte avgöra HEAD. Se konsolutdata för detaljer." +#: lib/remote_add.tcl:30 lib/tools_dlg.tcl:37 +msgid "Add" +msgstr "Lägg till" -#: lib/choose_repository.tcl:902 -#, tcl-format -msgid "Unable to cleanup %s" -msgstr "Kunde inte städa upp %s" +#: lib/remote_add.tcl:39 +msgid "Remote Details" +msgstr "Detaljer för fjärrarkiv" -#: lib/choose_repository.tcl:908 -msgid "Clone failed." -msgstr "Kloning misslyckades." +#: lib/remote_add.tcl:41 lib/tools_dlg.tcl:51 lib/branch_create.tcl:44 +msgid "Name:" +msgstr "Namn:" -#: lib/choose_repository.tcl:915 -msgid "No default branch obtained." -msgstr "Hämtade ingen standardgren." +#: lib/remote_add.tcl:50 +msgid "Location:" +msgstr "Plats:" -#: lib/choose_repository.tcl:926 -#, tcl-format -msgid "Cannot resolve %s as a commit." -msgstr "Kunde inte slÃ¥ upp %s till nÃ¥gon incheckning." +#: lib/remote_add.tcl:60 +msgid "Further Action" +msgstr "Ytterligare Ã¥tgärd" -#: lib/choose_repository.tcl:938 -msgid "Creating working directory" -msgstr "Skapar arbetskatalog" +#: lib/remote_add.tcl:63 +msgid "Fetch Immediately" +msgstr "Hämta omedelbart" -#: lib/choose_repository.tcl:939 lib/index.tcl:70 lib/index.tcl:133 -#: lib/index.tcl:201 -msgid "files" -msgstr "filer" +#: lib/remote_add.tcl:69 +msgid "Initialize Remote Repository and Push" +msgstr "Initiera fjärrarkiv och sänd till" -#: lib/choose_repository.tcl:968 -msgid "Initial file checkout failed." -msgstr "Inledande filutcheckning misslyckades." +#: lib/remote_add.tcl:75 +msgid "Do Nothing Else Now" +msgstr "Gör ingent mer nu" -#: lib/choose_repository.tcl:1012 -msgid "Open" -msgstr "Öppna" +#: lib/remote_add.tcl:100 +msgid "Please supply a remote name." +msgstr "Ange ett namn för fjärrarkivet." -#: lib/choose_repository.tcl:1022 -msgid "Repository:" -msgstr "Arkiv:" +#: lib/remote_add.tcl:113 +#, tcl-format +msgid "'%s' is not an acceptable remote name." +msgstr "\"%s\" kan inte användas som namn pÃ¥ fjärrarkivet." -#: lib/choose_repository.tcl:1071 +#: lib/remote_add.tcl:124 #, tcl-format -msgid "Failed to open repository %s:" -msgstr "Kunde inte öppna arkivet %s:" +msgid "Failed to add remote '%s' of location '%s'." +msgstr "Kunde inte lägga till fjärrarkivet \"%s\" pÃ¥ platsen \"%s\"." -#: lib/choose_rev.tcl:52 -msgid "This Detached Checkout" -msgstr "Denna frÃ¥nkopplade utcheckning" +#: lib/remote_add.tcl:133 +#, tcl-format +msgid "Fetching the %s" +msgstr "Hämtar %s" -#: lib/choose_rev.tcl:60 -msgid "Revision Expression:" -msgstr "Revisionsuttryck:" +#: lib/remote_add.tcl:156 +#, tcl-format +msgid "Do not know how to initialize repository at location '%s'." +msgstr "Vet inte hur arkivet pÃ¥ platsen \"%s\" skall initieras." -#: lib/choose_rev.tcl:72 -msgid "Local Branch" -msgstr "Lokal gren" +#: lib/remote_add.tcl:163 +#, tcl-format +msgid "Setting up the %s (at %s)" +msgstr "Konfigurerar %s (pÃ¥ %s)" -#: lib/choose_rev.tcl:77 -msgid "Tracking Branch" -msgstr "SpÃ¥rande gren" +#: lib/browser.tcl:17 +msgid "Starting..." +msgstr "Startar..." -#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:543 -msgid "Tag" -msgstr "Tagg" +#: lib/browser.tcl:27 +msgid "File Browser" +msgstr "Filbläddrare" -#: lib/choose_rev.tcl:321 +#: lib/browser.tcl:132 lib/browser.tcl:149 #, tcl-format -msgid "Invalid revision: %s" -msgstr "Ogiltig revision: %s" - -#: lib/choose_rev.tcl:342 -msgid "No revision selected." -msgstr "Ingen revision vald." +msgid "Loading %s..." +msgstr "Läser %s..." -#: lib/choose_rev.tcl:350 -msgid "Revision expression is empty." -msgstr "Revisionsuttrycket är tomt." +#: lib/browser.tcl:193 +msgid "[Up To Parent]" +msgstr "[Upp till förälder]" -#: lib/choose_rev.tcl:536 -msgid "Updated" -msgstr "Uppdaterad" +#: lib/browser.tcl:275 lib/browser.tcl:282 +msgid "Browse Branch Files" +msgstr "Bläddra filer pÃ¥ grenen" -#: lib/choose_rev.tcl:564 -msgid "URL" -msgstr "Webbadress" +#: lib/browser.tcl:288 lib/choose_repository.tcl:422 +#: lib/choose_repository.tcl:509 lib/choose_repository.tcl:518 +#: lib/choose_repository.tcl:1074 +msgid "Browse" +msgstr "Bläddra" -#: lib/commit.tcl:9 -msgid "" -"There is nothing to amend.\n" -"\n" -"You are about to create the initial commit. There is no commit before this " -"to amend.\n" -msgstr "" -"Det finns ingenting att utöka.\n" -"\n" -"Du hÃ¥ller pÃ¥ att skapa den inledande incheckningen. Det finns ingen tidigare " -"incheckning att utöka.\n" +#: lib/browser.tcl:297 lib/branch_checkout.tcl:35 lib/tools_dlg.tcl:321 +msgid "Revision" +msgstr "Revision" -#: lib/commit.tcl:18 +#: lib/merge.tcl:13 msgid "" -"Cannot amend while merging.\n" +"Cannot merge while amending.\n" "\n" -"You are currently in the middle of a merge that has not been fully " -"completed. You cannot amend the prior commit unless you first abort the " -"current merge activity.\n" +"You must finish amending this commit before starting any type of merge.\n" msgstr "" -"Kan inte utöka vid sammanslagning.\n" +"Kan inte slÃ¥ ihop vid utökning.\n" "\n" -"Du är i mitten av en sammanslagning som inte är fullbordad. Du kan inte " -"utöka tidigare incheckningar om du inte först avbryter den pÃ¥gÃ¥ende " -"sammanslagningen.\n" - -#: lib/commit.tcl:48 -msgid "Error loading commit data for amend:" -msgstr "Fel vid inläsning av incheckningsdata för utökning:" - -#: lib/commit.tcl:75 -msgid "Unable to obtain your identity:" -msgstr "Kunde inte hämta din identitet:" - -#: lib/commit.tcl:80 -msgid "Invalid GIT_COMMITTER_IDENT:" -msgstr "Felaktig GIT_COMMITTER_IDENT:" - -#: lib/commit.tcl:129 -#, tcl-format -msgid "warning: Tcl does not support encoding '%s'." -msgstr "varning: Tcl stöder inte teckenkodningen \"%s\"." +"Du mÃ¥ste göra färdig utökningen av incheckningen innan du pÃ¥börjar nÃ¥gon " +"slags sammanslagning.\n" -#: lib/commit.tcl:149 +#: lib/merge.tcl:27 msgid "" "Last scanned state does not match repository state.\n" "\n" "Another Git program has modified this repository since the last scan. A " -"rescan must be performed before another commit can be created.\n" +"rescan must be performed before a merge can be performed.\n" "\n" "The rescan will be automatically started now.\n" msgstr "" "Det senaste inlästa tillstÃ¥ndet motsvarar inte tillstÃ¥ndet i arkivet.\n" "\n" "Ett annat Git-program har ändrat arkivet sedan senaste avsökningen. Du mÃ¥ste " -"utföra en ny sökning innan du kan göra en ny incheckning.\n" +"utföra en ny sökning innan du kan utföra en sammanslagning.\n" "\n" "Sökningen kommer att startas automatiskt nu.\n" -#: lib/commit.tcl:172 +#: lib/merge.tcl:45 #, tcl-format msgid "" -"Unmerged files cannot be committed.\n" +"You are in the middle of a conflicted merge.\n" "\n" -"File %s has merge conflicts. You must resolve them and stage the file " -"before committing.\n" +"File %s has merge conflicts.\n" +"\n" +"You must resolve them, stage the file, and commit to complete the current " +"merge. Only then can you begin another merge.\n" msgstr "" -"Osammanslagna filer kan inte checkas in.\n" +"Du är mitt i en sammanslagning med konflikter.\n" "\n" -"Filen %s har sammanslagningskonflikter. Du mÃ¥ste lösa dem och köa filen " -"innan du checkar in den.\n" +"Filen %s har sammanslagningskonflikter.\n" +"\n" +"Du mÃ¥ste lösa dem, köa filen och checka in för att fullborda den aktuella " +"sammanslagningen. När du gjort det kan du pÃ¥börja en ny sammanslagning.\n" -#: lib/commit.tcl:180 +#: lib/merge.tcl:55 #, tcl-format msgid "" -"Unknown file state %s detected.\n" +"You are in the middle of a change.\n" "\n" -"File %s cannot be committed by this program.\n" +"File %s is modified.\n" +"\n" +"You should complete the current commit before starting a merge. Doing so " +"will help you abort a failed merge, should the need arise.\n" msgstr "" -"Okänd filstatus %s upptäckt.\n" +"Du är mitt i en ändring.\n" "\n" -"Filen %s kan inte checkas in av programmet.\n" +"Filen %s har ändringar.\n" +"\n" +"Du bör fullborda den aktuella incheckningen innan du pÃ¥börjar en " +"sammanslagning. Om du gör det blir det enklare att avbryta en misslyckad " +"sammanslagning, om det skulle vara nödvändigt.\n" + +#: lib/merge.tcl:108 +#, tcl-format +msgid "%s of %s" +msgstr "%s av %s" + +#: lib/merge.tcl:122 +#, tcl-format +msgid "Merging %s and %s..." +msgstr "SlÃ¥r ihop %s och %s..." + +#: lib/merge.tcl:133 +msgid "Merge completed successfully." +msgstr "Sammanslagningen avslutades framgÃ¥ngsrikt." -#: lib/commit.tcl:188 +#: lib/merge.tcl:135 +msgid "Merge failed. Conflict resolution is required." +msgstr "Sammanslagningen misslyckades. Du mÃ¥ste lösa konflikterna." + +#: lib/merge.tcl:160 +#, tcl-format +msgid "Merge Into %s" +msgstr "SlÃ¥ ihop i %s" + +#: lib/merge.tcl:179 +msgid "Revision To Merge" +msgstr "Revisioner att slÃ¥ ihop" + +#: lib/merge.tcl:214 msgid "" -"No changes to commit.\n" +"Cannot abort while amending.\n" "\n" -"You must stage at least 1 file before you can commit.\n" +"You must finish amending this commit.\n" msgstr "" -"Inga ändringar att checka in.\n" +"Kan inte avbryta vid utökning.\n" "\n" -"Du mÃ¥ste köa Ã¥tminstone en fil innan du kan checka in.\n" +"Du mÃ¥ste göra dig färdig med att utöka incheckningen.\n" -#: lib/commit.tcl:203 +#: lib/merge.tcl:224 msgid "" -"Please supply a commit message.\n" +"Abort merge?\n" "\n" -"A good commit message has the following format:\n" +"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" "\n" -"- First line: Describe in one sentence what you did.\n" -"- Second line: Blank\n" -"- Remaining lines: Describe why this change is good.\n" +"Continue with aborting the current merge?" msgstr "" -"Ange ett incheckningsmeddelande.\n" +"Avbryt sammanslagning?\n" "\n" -"Ett bra incheckningsmeddelande har följande format:\n" +"Om du avbryter sammanslagningen kommer *ALLA* ej incheckade ändringar att gÃ¥ " +"förlorade.\n" "\n" -"- Första raden: Beskriv i en mening vad du gjorde.\n" -"- Andra raden: Tom\n" -"- Följande rader: Beskriv varför det här är en bra ändring.\n" - -#: lib/commit.tcl:234 -msgid "Calling pre-commit hook..." -msgstr "Anropar kroken före incheckning (pre-commit)..." +"GÃ¥ vidare med att avbryta den aktuella sammanslagningen?" -#: lib/commit.tcl:249 -msgid "Commit declined by pre-commit hook." -msgstr "Incheckningen avvisades av kroken före incheckning (pre-commit)." +#: lib/merge.tcl:230 +msgid "" +"Reset changes?\n" +"\n" +"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" +"\n" +"Continue with resetting the current changes?" +msgstr "" +"Ã…terställ ändringar?\n" +"\n" +"Om du Ã¥terställer ändringarna kommer *ALLA* ej incheckade ändringar att gÃ¥ " +"förlorade.\n" +"\n" +"GÃ¥ vidare med att Ã¥terställa de aktuella ändringarna?" -#: lib/commit.tcl:272 -msgid "Calling commit-msg hook..." -msgstr "Anropar kroken för incheckningsmeddelande (commit-msg)..." +#: lib/merge.tcl:241 +msgid "Aborting" +msgstr "Avbryter" -#: lib/commit.tcl:287 -msgid "Commit declined by commit-msg hook." -msgstr "Incheckning avvisad av kroken för incheckningsmeddelande (commit-msg)." +#: lib/merge.tcl:241 +msgid "files reset" +msgstr "filer Ã¥terställda" -#: lib/commit.tcl:300 -msgid "Committing changes..." -msgstr "Checkar in ändringar..." +#: lib/merge.tcl:269 +msgid "Abort failed." +msgstr "Misslyckades avbryta." -#: lib/commit.tcl:316 -msgid "write-tree failed:" -msgstr "write-tree misslyckades:" +#: lib/merge.tcl:271 +msgid "Abort completed. Ready." +msgstr "Avbrytning fullbordad. Redo." -#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382 -msgid "Commit failed." -msgstr "Incheckningen misslyckades." +#: lib/tools.tcl:75 +#, tcl-format +msgid "Running %s requires a selected file." +msgstr "För att starta %s mÃ¥ste du välja en fil." -#: lib/commit.tcl:334 +#: lib/tools.tcl:91 #, tcl-format -msgid "Commit %s appears to be corrupt" -msgstr "Incheckningen %s verkar vara trasig" +msgid "Are you sure you want to run %1$s on file \"%2$s\"?" +msgstr "Är du säker pÃ¥ att du vill starta %1$s med filen \"%2$s\"?" -#: lib/commit.tcl:339 -msgid "" -"No changes to commit.\n" -"\n" -"No files were modified by this commit and it was not a merge commit.\n" -"\n" -"A rescan will be automatically started now.\n" -msgstr "" -"Inga ändringar att checka in.\n" -"\n" -"Inga filer ändrades av incheckningen och det var inte en sammanslagning.\n" -"\n" -"En sökning kommer att startas automatiskt nu.\n" +#: lib/tools.tcl:95 +#, tcl-format +msgid "Are you sure you want to run %s?" +msgstr "Är du säker pÃ¥ att du vill starta %s?" -#: lib/commit.tcl:346 -msgid "No changes to commit." -msgstr "Inga ändringar att checka in." +#: lib/tools.tcl:116 +#, tcl-format +msgid "Tool: %s" +msgstr "Verktyg: %s" -#: lib/commit.tcl:360 -msgid "commit-tree failed:" -msgstr "commit-tree misslyckades:" +#: lib/tools.tcl:117 +#, tcl-format +msgid "Running: %s" +msgstr "Exekverar: %s" -#: lib/commit.tcl:381 -msgid "update-ref failed:" -msgstr "update-ref misslyckades:" +#: lib/tools.tcl:155 +#, tcl-format +msgid "Tool completed successfully: %s" +msgstr "Verktyget avslutades framgÃ¥ngsrikt: %s" -#: lib/commit.tcl:469 +#: lib/tools.tcl:157 #, tcl-format -msgid "Created commit %s: %s" -msgstr "Skapade incheckningen %s: %s" +msgid "Tool failed: %s" +msgstr "Verktyget misslyckades: %s" -#: lib/console.tcl:59 -msgid "Working... please wait..." -msgstr "Arbetar... vänta..." +#: lib/branch_checkout.tcl:16 lib/branch_checkout.tcl:21 +msgid "Checkout Branch" +msgstr "Checka ut gren" -#: lib/console.tcl:186 -msgid "Success" -msgstr "Lyckades" +#: lib/branch_checkout.tcl:26 +msgid "Checkout" +msgstr "Checka ut" -#: lib/console.tcl:200 -msgid "Error: Command Failed" -msgstr "Fel: Kommando misslyckades" +#: lib/branch_checkout.tcl:39 lib/option.tcl:310 lib/branch_create.tcl:69 +msgid "Options" +msgstr "Alternativ" -#: lib/database.tcl:42 -msgid "Number of loose objects" -msgstr "Antal lösa objekt" +#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92 +msgid "Fetch Tracking Branch" +msgstr "Hämta spÃ¥rande gren" -#: lib/database.tcl:43 -msgid "Disk space used by loose objects" -msgstr "Diskutrymme använt av lösa objekt" +#: lib/branch_checkout.tcl:47 +msgid "Detach From Local Branch" +msgstr "Koppla bort frÃ¥n lokal gren" -#: lib/database.tcl:44 -msgid "Number of packed objects" -msgstr "Antal packade objekt" +#: lib/spellcheck.tcl:57 +msgid "Unsupported spell checker" +msgstr "Stavningskontrollprogrammet stöds inte" -#: lib/database.tcl:45 -msgid "Number of packs" -msgstr "Antal paket" +#: lib/spellcheck.tcl:65 +msgid "Spell checking is unavailable" +msgstr "Stavningskontroll är ej tillgänglig" -#: lib/database.tcl:46 -msgid "Disk space used by packed objects" -msgstr "Diskutrymme använt av packade objekt" +#: lib/spellcheck.tcl:68 +msgid "Invalid spell checking configuration" +msgstr "Ogiltig inställning för stavningskontroll" -#: lib/database.tcl:47 -msgid "Packed objects waiting for pruning" -msgstr "Packade objekt som väntar pÃ¥ städning" +#: lib/spellcheck.tcl:70 +#, tcl-format +msgid "Reverting dictionary to %s." +msgstr "Ã…terställer ordlistan till %s." -#: lib/database.tcl:48 -msgid "Garbage files" -msgstr "Skräpfiler" +#: lib/spellcheck.tcl:73 +msgid "Spell checker silently failed on startup" +msgstr "Stavningskontroll misslyckades tyst vid start" -#: lib/database.tcl:72 -msgid "Compressing the object database" -msgstr "Komprimerar objektdatabasen" +#: lib/spellcheck.tcl:80 +msgid "Unrecognized spell checker" +msgstr "Stavningskontrollprogrammet känns inte igen" -#: lib/database.tcl:83 -msgid "Verifying the object database with fsck-objects" -msgstr "Verifierar objektdatabasen med fsck-objects" +#: lib/spellcheck.tcl:186 +msgid "No Suggestions" +msgstr "Inga förslag" -#: lib/database.tcl:107 -#, tcl-format -msgid "" -"This repository currently has approximately %i loose objects.\n" -"\n" -"To maintain optimal performance it is strongly recommended that you compress " -"the database.\n" -"\n" -"Compress the database now?" -msgstr "" -"Arkivet har för närvarande omkring %i lösa objekt.\n" -"\n" -"För att bibehÃ¥lla optimal prestanda rekommenderas det Ã¥ det bestämdaste att " -"du komprimerar databasen.\n" -"\n" -"Komprimera databasen nu?" +#: lib/spellcheck.tcl:388 +msgid "Unexpected EOF from spell checker" +msgstr "Oväntat filslut frÃ¥n stavningskontroll" -#: lib/date.tcl:25 +#: lib/spellcheck.tcl:392 +msgid "Spell Checker Failed" +msgstr "Stavningskontroll misslyckades" + +#: lib/status_bar.tcl:87 #, tcl-format -msgid "Invalid date from Git: %s" -msgstr "Ogiltigt datum frÃ¥n Git: %s" +msgid "%s ... %*i of %*i %s (%3i%%)" +msgstr "%s... %*i av %*i %s (%3i%%)" -#: lib/diff.tcl:64 +#: lib/diff.tcl:77 #, tcl-format msgid "" "No differences detected.\n" @@ -1589,12 +1247,12 @@ msgstr "" "En sökning kommer automatiskt att startas för att hitta andra filer som kan " "vara i samma tillstÃ¥nd." -#: lib/diff.tcl:104 +#: lib/diff.tcl:117 #, tcl-format msgid "Loading diff of %s..." msgstr "Läser differens för %s..." -#: lib/diff.tcl:125 +#: lib/diff.tcl:140 msgid "" "LOCAL: deleted\n" "REMOTE:\n" @@ -1602,7 +1260,7 @@ msgstr "" "LOKAL: borttagen\n" "FJÄRR:\n" -#: lib/diff.tcl:130 +#: lib/diff.tcl:145 msgid "" "REMOTE: deleted\n" "LOCAL:\n" @@ -1610,32 +1268,32 @@ msgstr "" "FJÄRR: borttagen\n" "LOKAL:\n" -#: lib/diff.tcl:137 +#: lib/diff.tcl:152 msgid "LOCAL:\n" msgstr "LOKAL:\n" -#: lib/diff.tcl:140 +#: lib/diff.tcl:155 msgid "REMOTE:\n" msgstr "FJÄRR:\n" -#: lib/diff.tcl:202 lib/diff.tcl:322 +#: lib/diff.tcl:217 lib/diff.tcl:355 #, tcl-format msgid "Unable to display %s" msgstr "Kan inte visa %s" -#: lib/diff.tcl:203 +#: lib/diff.tcl:218 msgid "Error loading file:" msgstr "Fel vid läsning av fil:" -#: lib/diff.tcl:210 +#: lib/diff.tcl:225 msgid "Git Repository (subproject)" msgstr "Gitarkiv (underprojekt)" -#: lib/diff.tcl:222 +#: lib/diff.tcl:237 msgid "* Binary file (not showing content)." msgstr "* Binärfil (visar inte innehÃ¥llet)." -#: lib/diff.tcl:227 +#: lib/diff.tcl:242 #, tcl-format msgid "" "* Untracked file is %d bytes.\n" @@ -1644,7 +1302,7 @@ msgstr "" "* Den ospÃ¥rade filen är %d byte.\n" "* Visar endast inledande %d byte.\n" -#: lib/diff.tcl:233 +#: lib/diff.tcl:248 #, tcl-format msgid "" "\n" @@ -1655,257 +1313,213 @@ msgstr "" "* Den ospÃ¥rade filen klipptes här av %s.\n" "* För att se hela filen, använd ett externt redigeringsprogram.\n" -#: lib/diff.tcl:485 +#: lib/diff.tcl:356 lib/blame.tcl:1128 +msgid "Error loading diff:" +msgstr "Fel vid inläsning av differens:" + +#: lib/diff.tcl:578 msgid "Failed to unstage selected hunk." msgstr "Kunde inte ta bort den valda delen frÃ¥n kön." -#: lib/diff.tcl:492 +#: lib/diff.tcl:585 msgid "Failed to stage selected hunk." msgstr "Kunde inte lägga till den valda delen till kön." -#: lib/diff.tcl:571 +#: lib/diff.tcl:664 msgid "Failed to unstage selected line." msgstr "Kunde inte ta bort den valda raden frÃ¥n kön." -#: lib/diff.tcl:579 +#: lib/diff.tcl:672 msgid "Failed to stage selected line." msgstr "Kunde inte lägga till den valda raden till kön." -#: lib/encoding.tcl:443 -msgid "Default" -msgstr "Standard" +#: lib/remote.tcl:200 +msgid "Push to" +msgstr "Sänd till" -#: lib/encoding.tcl:448 -#, tcl-format -msgid "System (%s)" -msgstr "Systemets (%s)" +#: lib/remote.tcl:218 +msgid "Remove Remote" +msgstr "Ta bort fjärrarkiv" -#: lib/encoding.tcl:459 lib/encoding.tcl:465 -msgid "Other" -msgstr "Annan" +#: lib/remote.tcl:223 +msgid "Prune from" +msgstr "Ta bort frÃ¥n" -#: lib/error.tcl:20 lib/error.tcl:116 -msgid "error" -msgstr "fel" +#: lib/remote.tcl:228 +msgid "Fetch from" +msgstr "Hämta frÃ¥n" -#: lib/error.tcl:36 -msgid "warning" -msgstr "varning" +#: lib/choose_font.tcl:41 +msgid "Select" +msgstr "Välj" -#: lib/error.tcl:96 -msgid "You must correct the above errors before committing." -msgstr "Du mÃ¥ste rätta till felen ovan innan du checkar in." +#: lib/choose_font.tcl:55 +msgid "Font Family" +msgstr "Teckensnittsfamilj" -#: lib/index.tcl:6 -msgid "Unable to unlock the index." -msgstr "Kunde inte lÃ¥sa upp indexet." +#: lib/choose_font.tcl:76 +msgid "Font Size" +msgstr "Storlek" -#: lib/index.tcl:17 -msgid "Index Error" -msgstr "Indexfel" +#: lib/choose_font.tcl:93 +msgid "Font Example" +msgstr "Exempel" -#: lib/index.tcl:19 +#: lib/choose_font.tcl:105 msgid "" -"Updating the Git index failed. A rescan will be automatically started to " -"resynchronize git-gui." +"This is example text.\n" +"If you like this text, it can be your font." msgstr "" -"Misslyckades med att uppdatera Gitindexet. En omsökning kommer att startas " -"automatiskt för att synkronisera om git-gui." - -#: lib/index.tcl:30 -msgid "Continue" -msgstr "Fortsätt" +"Detta är en exempeltext.\n" +"Om du tycker om den här texten kan den vara ditt teckensnitt." -#: lib/index.tcl:33 -msgid "Unlock Index" -msgstr "LÃ¥s upp index" +#: lib/option.tcl:11 +#, tcl-format +msgid "Invalid global encoding '%s'" +msgstr "Den globala teckenkodningen \"%s\" är ogiltig" -#: lib/index.tcl:292 +#: lib/option.tcl:19 #, tcl-format -msgid "Unstaging %s from commit" -msgstr "Tar bort %s för incheckningskön" +msgid "Invalid repo encoding '%s'" +msgstr "Arkivets teckenkodning \"%s\" är ogiltig" -#: lib/index.tcl:331 -msgid "Ready to commit." -msgstr "Redo att checka in." +#: lib/option.tcl:119 +msgid "Restore Defaults" +msgstr "Ã…terställ standardvärden" -#: lib/index.tcl:344 -#, tcl-format -msgid "Adding %s" -msgstr "Lägger till %s" +#: lib/option.tcl:123 +msgid "Save" +msgstr "Spara" -#: lib/index.tcl:401 +#: lib/option.tcl:133 #, tcl-format -msgid "Revert changes in file %s?" -msgstr "Ã…terställ ändringarna i filen %s?" +msgid "%s Repository" +msgstr "Arkivet %s" -#: lib/index.tcl:403 -#, tcl-format -msgid "Revert changes in these %i files?" -msgstr "Ã…terställ ändringarna i dessa %i filer?" +#: lib/option.tcl:134 +msgid "Global (All Repositories)" +msgstr "Globalt (alla arkiv)" -#: lib/index.tcl:411 -msgid "Any unstaged changes will be permanently lost by the revert." -msgstr "" -"Alla oköade ändringar kommer permanent gÃ¥ förlorade vid Ã¥terställningen." +#: lib/option.tcl:140 +msgid "User Name" +msgstr "Användarnamn" -#: lib/index.tcl:414 -msgid "Do Nothing" -msgstr "Gör ingenting" +#: lib/option.tcl:141 +msgid "Email Address" +msgstr "E-postadress" -#: lib/index.tcl:432 -msgid "Reverting selected files" -msgstr "Ã…terställer valda filer" +#: lib/option.tcl:143 +msgid "Summarize Merge Commits" +msgstr "Summera sammanslagningsincheckningar" -#: lib/index.tcl:436 -#, tcl-format -msgid "Reverting %s" -msgstr "Ã…terställer %s" +#: lib/option.tcl:144 +msgid "Merge Verbosity" +msgstr "Pratsamhet för sammanslagningar" -#: lib/merge.tcl:13 -msgid "" -"Cannot merge while amending.\n" -"\n" -"You must finish amending this commit before starting any type of merge.\n" -msgstr "" -"Kan inte slÃ¥ ihop vid utökning.\n" -"\n" -"Du mÃ¥ste göra färdig utökningen av incheckningen innan du pÃ¥börjar nÃ¥gon " -"slags sammanslagning.\n" +#: lib/option.tcl:145 +msgid "Show Diffstat After Merge" +msgstr "Visa diffstatistik efter sammanslagning" -#: lib/merge.tcl:27 -msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before a merge can be performed.\n" -"\n" -"The rescan will be automatically started now.\n" -msgstr "" -"Det senaste inlästa tillstÃ¥ndet motsvarar inte tillstÃ¥ndet i arkivet.\n" -"\n" -"Ett annat Git-program har ändrat arkivet sedan senaste avsökningen. Du mÃ¥ste " -"utföra en ny sökning innan du kan utföra en sammanslagning.\n" -"\n" -"Sökningen kommer att startas automatiskt nu.\n" +#: lib/option.tcl:146 +msgid "Use Merge Tool" +msgstr "Använd verktyg för sammanslagning" -#: lib/merge.tcl:45 -#, tcl-format -msgid "" -"You are in the middle of a conflicted merge.\n" -"\n" -"File %s has merge conflicts.\n" -"\n" -"You must resolve them, stage the file, and commit to complete the current " -"merge. Only then can you begin another merge.\n" -msgstr "" -"Du är mitt i en sammanslagning med konflikter.\n" -"\n" -"Filen %s har sammanslagningskonflikter.\n" -"\n" -"Du mÃ¥ste lösa dem, köa filen och checka in för att fullborda den aktuella " -"sammanslagningen. När du gjort det kan du pÃ¥börja en ny sammanslagning.\n" +#: lib/option.tcl:148 +msgid "Trust File Modification Timestamps" +msgstr "Lita pÃ¥ filändringstidsstämplar" -#: lib/merge.tcl:55 -#, tcl-format -msgid "" -"You are in the middle of a change.\n" -"\n" -"File %s is modified.\n" -"\n" -"You should complete the current commit before starting a merge. Doing so " -"will help you abort a failed merge, should the need arise.\n" -msgstr "" -"Du är mitt i en ändring.\n" -"\n" -"Filen %s har ändringar.\n" -"\n" -"Du bör fullborda den aktuella incheckningen innan du pÃ¥börjar en " -"sammanslagning. Om du gör det blir det enklare att avbryta en misslyckad " -"sammanslagning, om det skulle vara nödvändigt.\n" +#: lib/option.tcl:149 +msgid "Prune Tracking Branches During Fetch" +msgstr "Städa spÃ¥rade grenar vid hämtning" -#: lib/merge.tcl:107 -#, tcl-format -msgid "%s of %s" -msgstr "%s av %s" +#: lib/option.tcl:150 +msgid "Match Tracking Branches" +msgstr "Matcha spÃ¥rade grenar" -#: lib/merge.tcl:120 -#, tcl-format -msgid "Merging %s and %s..." -msgstr "SlÃ¥r ihop %s och %s..." +#: lib/option.tcl:151 +msgid "Use Textconv For Diffs and Blames" +msgstr "Använd Textconv för diff och klandring" -#: lib/merge.tcl:131 -msgid "Merge completed successfully." -msgstr "Sammanslagningen avslutades framgÃ¥ngsrikt." +#: lib/option.tcl:152 +msgid "Blame Copy Only On Changed Files" +msgstr "Klandra kopiering bara i ändrade filer" -#: lib/merge.tcl:133 -msgid "Merge failed. Conflict resolution is required." -msgstr "Sammanslagningen misslyckades. Du mÃ¥ste lösa konflikterna." +#: lib/option.tcl:153 +msgid "Maximum Length of Recent Repositories List" +msgstr "Max längd för lista över tidigare arkiv" -#: lib/merge.tcl:158 -#, tcl-format -msgid "Merge Into %s" -msgstr "SlÃ¥ ihop i %s" +#: lib/option.tcl:154 +msgid "Minimum Letters To Blame Copy On" +msgstr "Minsta antal tecken att klandra kopiering för" -#: lib/merge.tcl:177 -msgid "Revision To Merge" -msgstr "Revisioner att slÃ¥ ihop" +#: lib/option.tcl:155 +msgid "Blame History Context Radius (days)" +msgstr "Historikradie för klandring (dagar)" -#: lib/merge.tcl:212 -msgid "" -"Cannot abort while amending.\n" -"\n" -"You must finish amending this commit.\n" -msgstr "" -"Kan inte avbryta vid utökning.\n" -"\n" -"Du mÃ¥ste göra dig färdig med att utöka incheckningen.\n" +#: lib/option.tcl:156 +msgid "Number of Diff Context Lines" +msgstr "Antal rader sammanhang i differenser" -#: lib/merge.tcl:222 -msgid "" -"Abort merge?\n" -"\n" -"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" -"\n" -"Continue with aborting the current merge?" -msgstr "" -"Avbryt sammanslagning?\n" -"\n" -"Om du avbryter sammanslagningen kommer *ALLA* ej incheckade ändringar att gÃ¥ " -"förlorade.\n" -"\n" -"GÃ¥ vidare med att avbryta den aktuella sammanslagningen?" +#: lib/option.tcl:157 +msgid "Additional Diff Parameters" +msgstr "Ytterligare diff-parametrar" -#: lib/merge.tcl:228 -msgid "" -"Reset changes?\n" -"\n" -"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" -"\n" -"Continue with resetting the current changes?" -msgstr "" -"Ã…terställ ändringar?\n" -"\n" -"Om du Ã¥terställer ändringarna kommer *ALLA* ej incheckade ändringar att gÃ¥ " -"förlorade.\n" -"\n" -"GÃ¥ vidare med att Ã¥terställa de aktuella ändringarna?" +#: lib/option.tcl:158 +msgid "Commit Message Text Width" +msgstr "Textbredd för incheckningsmeddelande" -#: lib/merge.tcl:239 -msgid "Aborting" -msgstr "Avbryter" +#: lib/option.tcl:159 +msgid "New Branch Name Template" +msgstr "Mall för namn pÃ¥ nya grenar" -#: lib/merge.tcl:239 -msgid "files reset" -msgstr "filer Ã¥terställda" +#: lib/option.tcl:160 +msgid "Default File Contents Encoding" +msgstr "Standardteckenkodning för filinnehÃ¥ll" -#: lib/merge.tcl:267 -msgid "Abort failed." -msgstr "Misslyckades avbryta." +#: lib/option.tcl:161 +msgid "Warn before committing to a detached head" +msgstr "Varna för incheckning pÃ¥ frÃ¥nkopplat huvud" -#: lib/merge.tcl:269 -msgid "Abort completed. Ready." -msgstr "Avbrytning fullbordad. Redo." +#: lib/option.tcl:162 +msgid "Staging of untracked files" +msgstr "Köa ospÃ¥rade filer" + +#: lib/option.tcl:163 +msgid "Show untracked files" +msgstr "Visa ospÃ¥rade filer" + +#: lib/option.tcl:164 +msgid "Tab spacing" +msgstr "Blanksteg för tabulatortecken" + +#: lib/option.tcl:210 +msgid "Change" +msgstr "Ändra" + +#: lib/option.tcl:254 +msgid "Spelling Dictionary:" +msgstr "Stavningsordlista:" + +#: lib/option.tcl:284 +msgid "Change Font" +msgstr "Byt teckensnitt" + +#: lib/option.tcl:288 +#, tcl-format +msgid "Choose %s" +msgstr "Välj %s" + +#: lib/option.tcl:294 +msgid "pt." +msgstr "p." + +#: lib/option.tcl:308 +msgid "Preferences" +msgstr "Inställningar" + +#: lib/option.tcl:345 +msgid "Failed to completely save options:" +msgstr "Misslyckades med att helt spara alternativ:" #: lib/mergetool.tcl:8 msgid "Force resolution to the base version?" @@ -1952,21 +1566,21 @@ msgstr "Kan inte lösa borttagnings- eller länkkonflikter med ett verktyg" msgid "Conflict file does not exist" msgstr "Konfliktfil existerar inte" -#: lib/mergetool.tcl:264 +#: lib/mergetool.tcl:246 #, tcl-format msgid "Not a GUI merge tool: '%s'" msgstr "Inte ett grafiskt verktyg för sammanslagning: %s" -#: lib/mergetool.tcl:268 +#: lib/mergetool.tcl:275 #, tcl-format msgid "Unsupported merge tool '%s'" msgstr "Verktyget \"%s\" för sammanslagning stöds inte" -#: lib/mergetool.tcl:303 +#: lib/mergetool.tcl:310 msgid "Merge tool is already running, terminate it?" msgstr "Verktyget för sammanslagning körs redan. Vill du avsluta det?" -#: lib/mergetool.tcl:323 +#: lib/mergetool.tcl:330 #, tcl-format msgid "" "Error retrieving versions:\n" @@ -1975,7 +1589,7 @@ msgstr "" "Fel vid hämtning av versioner:\n" "%s" -#: lib/mergetool.tcl:343 +#: lib/mergetool.tcl:350 #, tcl-format msgid "" "Could not start the merge tool:\n" @@ -1986,213 +1600,158 @@ msgstr "" "\n" "%s" -#: lib/mergetool.tcl:347 +#: lib/mergetool.tcl:354 msgid "Running merge tool..." msgstr "Kör verktyg för sammanslagning..." -#: lib/mergetool.tcl:375 lib/mergetool.tcl:383 +#: lib/mergetool.tcl:382 lib/mergetool.tcl:390 msgid "Merge tool failed." msgstr "Verktyget för sammanslagning misslyckades." -#: lib/option.tcl:11 -#, tcl-format -msgid "Invalid global encoding '%s'" -msgstr "Den globala teckenkodningen \"%s\" är ogiltig" - -#: lib/option.tcl:19 -#, tcl-format -msgid "Invalid repo encoding '%s'" -msgstr "Arkivets teckenkodning \"%s\" är ogiltig" - -#: lib/option.tcl:119 -msgid "Restore Defaults" -msgstr "Ã…terställ standardvärden" - -#: lib/option.tcl:123 -msgid "Save" -msgstr "Spara" - -#: lib/option.tcl:133 -#, tcl-format -msgid "%s Repository" -msgstr "Arkivet %s" - -#: lib/option.tcl:134 -msgid "Global (All Repositories)" -msgstr "Globalt (alla arkiv)" - -#: lib/option.tcl:140 -msgid "User Name" -msgstr "Användarnamn" - -#: lib/option.tcl:141 -msgid "Email Address" -msgstr "E-postadress" - -#: lib/option.tcl:143 -msgid "Summarize Merge Commits" -msgstr "Summera sammanslagningsincheckningar" +#: lib/tools_dlg.tcl:22 +msgid "Add Tool" +msgstr "Lägg till verktyg" -#: lib/option.tcl:144 -msgid "Merge Verbosity" -msgstr "Pratsamhet för sammanslagningar" +#: lib/tools_dlg.tcl:28 +msgid "Add New Tool Command" +msgstr "Lägg till nytt verktygskommando" -#: lib/option.tcl:145 -msgid "Show Diffstat After Merge" -msgstr "Visa diffstatistik efter sammanslagning" +#: lib/tools_dlg.tcl:34 +msgid "Add globally" +msgstr "Lägg till globalt" -#: lib/option.tcl:146 -msgid "Use Merge Tool" -msgstr "Använd verktyg för sammanslagning" +#: lib/tools_dlg.tcl:46 +msgid "Tool Details" +msgstr "Detaljer för verktyg" -#: lib/option.tcl:148 -msgid "Trust File Modification Timestamps" -msgstr "Lita pÃ¥ filändringstidsstämplar" +#: lib/tools_dlg.tcl:49 +msgid "Use '/' separators to create a submenu tree:" +msgstr "Använd \"/\"-avdelare för att skapa ett undermenyträd:" -#: lib/option.tcl:149 -msgid "Prune Tracking Branches During Fetch" -msgstr "Städa spÃ¥rade grenar vid hämtning" +#: lib/tools_dlg.tcl:60 +msgid "Command:" +msgstr "Kommando:" -#: lib/option.tcl:150 -msgid "Match Tracking Branches" -msgstr "Matcha spÃ¥rade grenar" +#: lib/tools_dlg.tcl:71 +msgid "Show a dialog before running" +msgstr "Visa dialog innan programmet startas" -#: lib/option.tcl:151 -msgid "Use Textconv For Diffs and Blames" -msgstr "Använd Textconv för diff och klandring" +#: lib/tools_dlg.tcl:77 +msgid "Ask the user to select a revision (sets $REVISION)" +msgstr "Be användaren välja en version (sätter $REVISION)" -#: lib/option.tcl:152 -msgid "Blame Copy Only On Changed Files" -msgstr "Klandra kopiering bara i ändrade filer" +#: lib/tools_dlg.tcl:82 +msgid "Ask the user for additional arguments (sets $ARGS)" +msgstr "Be användaren om ytterligare parametrar (sätter $ARGS)" -#: lib/option.tcl:153 -msgid "Minimum Letters To Blame Copy On" -msgstr "Minsta antal tecken att klandra kopiering för" +#: lib/tools_dlg.tcl:89 +msgid "Don't show the command output window" +msgstr "Visa inte kommandots utdatafönster" -#: lib/option.tcl:154 -msgid "Blame History Context Radius (days)" -msgstr "Historikradie för klandring (dagar)" +#: lib/tools_dlg.tcl:94 +msgid "Run only if a diff is selected ($FILENAME not empty)" +msgstr "Kör endast om en diff har markerats ($FILENAME är inte tomt)" -#: lib/option.tcl:155 -msgid "Number of Diff Context Lines" -msgstr "Antal rader sammanhang i differenser" +#: lib/tools_dlg.tcl:118 +msgid "Please supply a name for the tool." +msgstr "Ange ett namn för verktyget." -#: lib/option.tcl:156 -msgid "Commit Message Text Width" -msgstr "Textbredd för incheckningsmeddelande" +#: lib/tools_dlg.tcl:126 +#, tcl-format +msgid "Tool '%s' already exists." +msgstr "Verktyget \"%s\" finns redan." -#: lib/option.tcl:157 -msgid "New Branch Name Template" -msgstr "Mall för namn pÃ¥ nya grenar" +#: lib/tools_dlg.tcl:148 +#, tcl-format +msgid "" +"Could not add tool:\n" +"%s" +msgstr "" +"Kunde inte lägga till verktyget:\n" +"%s" -#: lib/option.tcl:158 -msgid "Default File Contents Encoding" -msgstr "Standardteckenkodning för filinnehÃ¥ll" +#: lib/tools_dlg.tcl:187 +msgid "Remove Tool" +msgstr "Ta bort verktyg" -#: lib/option.tcl:204 -msgid "Change" -msgstr "Ändra" +#: lib/tools_dlg.tcl:193 +msgid "Remove Tool Commands" +msgstr "Ta bort verktygskommandon" -#: lib/option.tcl:231 -msgid "Spelling Dictionary:" -msgstr "Stavningsordlista:" +#: lib/tools_dlg.tcl:198 +msgid "Remove" +msgstr "Ta bort" -#: lib/option.tcl:261 -msgid "Change Font" -msgstr "Byt teckensnitt" +#: lib/tools_dlg.tcl:231 +msgid "(Blue denotes repository-local tools)" +msgstr "(BlÃ¥tt anger verktyg lokala för arkivet)" -#: lib/option.tcl:265 +#: lib/tools_dlg.tcl:292 #, tcl-format -msgid "Choose %s" -msgstr "Välj %s" - -#: lib/option.tcl:271 -msgid "pt." -msgstr "p." - -#: lib/option.tcl:285 -msgid "Preferences" -msgstr "Inställningar" - -#: lib/option.tcl:322 -msgid "Failed to completely save options:" -msgstr "Misslyckades med att helt spara alternativ:" - -#: lib/remote_add.tcl:20 -msgid "Add Remote" -msgstr "Lägg till fjärrarkiv" +msgid "Run Command: %s" +msgstr "Kör kommandot: %s" -#: lib/remote_add.tcl:25 -msgid "Add New Remote" -msgstr "Lägg till nytt fjärrarkiv" +#: lib/tools_dlg.tcl:306 +msgid "Arguments" +msgstr "Argument" -#: lib/remote_add.tcl:30 lib/tools_dlg.tcl:37 -msgid "Add" -msgstr "Lägg till" +#: lib/tools_dlg.tcl:341 +msgid "OK" +msgstr "OK" -#: lib/remote_add.tcl:39 -msgid "Remote Details" -msgstr "Detaljer för fjärrarkiv" +#: lib/search.tcl:48 +msgid "Find:" +msgstr "Sök:" -#: lib/remote_add.tcl:50 -msgid "Location:" -msgstr "Plats:" +#: lib/search.tcl:50 +msgid "Next" +msgstr "Nästa" -#: lib/remote_add.tcl:60 -msgid "Further Action" -msgstr "Ytterligare Ã¥tgärd" +#: lib/search.tcl:51 +msgid "Prev" +msgstr "Föreg" -#: lib/remote_add.tcl:63 -msgid "Fetch Immediately" -msgstr "Hämta omedelbart" +#: lib/search.tcl:52 +msgid "RegExp" +msgstr "Reg.uttr." -#: lib/remote_add.tcl:69 -msgid "Initialize Remote Repository and Push" -msgstr "Initiera fjärrarkiv och sänd till" +#: lib/search.tcl:54 +msgid "Case" +msgstr "Skiftläge" -#: lib/remote_add.tcl:75 -msgid "Do Nothing Else Now" -msgstr "Gör ingent mer nu" - -#: lib/remote_add.tcl:100 -msgid "Please supply a remote name." -msgstr "Ange ett namn för fjärrarkivet." +#: lib/branch_rename.tcl:15 lib/branch_rename.tcl:23 +msgid "Rename Branch" +msgstr "Byt namn pÃ¥ gren" -#: lib/remote_add.tcl:113 -#, tcl-format -msgid "'%s' is not an acceptable remote name." -msgstr "\"%s\" kan inte användas som namn pÃ¥ fjärrarkivet." +#: lib/branch_rename.tcl:28 +msgid "Rename" +msgstr "Byt namn" -#: lib/remote_add.tcl:124 -#, tcl-format -msgid "Failed to add remote '%s' of location '%s'." -msgstr "Kunde inte lägga till fjärrarkivet \"%s\" pÃ¥ platsen \"%s\"." +#: lib/branch_rename.tcl:38 +msgid "Branch:" +msgstr "Gren:" -#: lib/remote_add.tcl:132 lib/transport.tcl:6 -#, tcl-format -msgid "fetch %s" -msgstr "hämta %s" +#: lib/branch_rename.tcl:46 +msgid "New Name:" +msgstr "Nytt namn:" -#: lib/remote_add.tcl:133 -#, tcl-format -msgid "Fetching the %s" -msgstr "Hämtar %s" +#: lib/branch_rename.tcl:81 +msgid "Please select a branch to rename." +msgstr "Välj en gren att byta namn pÃ¥." -#: lib/remote_add.tcl:156 -#, tcl-format -msgid "Do not know how to initialize repository at location '%s'." -msgstr "Vet inte hur arkivet pÃ¥ platsen \"%s\" skall initieras." +#: lib/branch_rename.tcl:92 lib/branch_create.tcl:154 +msgid "Please supply a branch name." +msgstr "Ange ett namn för grenen." -#: lib/remote_add.tcl:162 lib/transport.tcl:25 lib/transport.tcl:63 -#: lib/transport.tcl:81 +#: lib/branch_rename.tcl:112 lib/branch_create.tcl:165 #, tcl-format -msgid "push %s" -msgstr "sänd %s" +msgid "'%s' is not an acceptable branch name." +msgstr "\"%s\" kan inte användas som namn pÃ¥ grenen." -#: lib/remote_add.tcl:163 +#: lib/branch_rename.tcl:123 #, tcl-format -msgid "Setting up the %s (at %s)" -msgstr "Konfigurerar %s (pÃ¥ %s)" +msgid "Failed to rename '%s'." +msgstr "Kunde inte byta namn pÃ¥ \"%s\"." #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 msgid "Delete Branch Remotely" @@ -2202,14 +1761,6 @@ msgstr "Ta bort gren frÃ¥n fjärrarkiv" msgid "From Repository" msgstr "FrÃ¥n arkiv" -#: lib/remote_branch_delete.tcl:51 lib/transport.tcl:134 -msgid "Remote:" -msgstr "Fjärrarkiv:" - -#: lib/remote_branch_delete.tcl:72 lib/transport.tcl:154 -msgid "Arbitrary Location:" -msgstr "Godtycklig plats:" - #: lib/remote_branch_delete.tcl:88 msgid "Branches" msgstr "Grenar" @@ -2222,6 +1773,10 @@ msgstr "Ta endast bort om" msgid "Merged Into:" msgstr "Sammanslagen i:" +#: lib/remote_branch_delete.tcl:120 lib/branch_delete.tcl:53 +msgid "Always (Do not perform merge checks)" +msgstr "Alltid (utför inte sammanslagningstest)" + #: lib/remote_branch_delete.tcl:153 msgid "A branch is required for 'Merged Into'." msgstr "En gren krävs för \"Sammanslagen i\"." @@ -2250,96 +1805,381 @@ msgstr "" msgid "Please select one or more branches to delete." msgstr "Välj en eller flera grenar att ta bort." +#: lib/remote_branch_delete.tcl:218 lib/branch_delete.tcl:115 +msgid "" +"Recovering deleted branches is difficult.\n" +"\n" +"Delete the selected branches?" +msgstr "" +"Det kan vara svÃ¥rt att Ã¥terställa borttagna grenar.\n" +"\n" +"Ta bort de valda grenarna?" + #: lib/remote_branch_delete.tcl:227 #, tcl-format msgid "Deleting branches from %s" msgstr "Tar bort grenar frÃ¥n %s" -#: lib/remote_branch_delete.tcl:293 +#: lib/remote_branch_delete.tcl:300 msgid "No repository selected." msgstr "Inget arkiv markerat." -#: lib/remote_branch_delete.tcl:298 +#: lib/remote_branch_delete.tcl:305 #, tcl-format msgid "Scanning %s..." msgstr "Söker %s..." -#: lib/remote.tcl:163 -msgid "Remove Remote" -msgstr "Ta bort fjärrarkiv" +#: lib/choose_repository.tcl:33 +msgid "Git Gui" +msgstr "Git Gui" -#: lib/remote.tcl:168 -msgid "Prune from" -msgstr "Ta bort frÃ¥n" +#: lib/choose_repository.tcl:92 lib/choose_repository.tcl:412 +msgid "Create New Repository" +msgstr "Skapa nytt arkiv" -#: lib/remote.tcl:173 -msgid "Fetch from" -msgstr "Hämta frÃ¥n" +#: lib/choose_repository.tcl:98 +msgid "New..." +msgstr "Nytt..." -#: lib/remote.tcl:215 -msgid "Push to" -msgstr "Sänd till" +#: lib/choose_repository.tcl:105 lib/choose_repository.tcl:496 +msgid "Clone Existing Repository" +msgstr "Klona befintligt arkiv" -#: lib/search.tcl:22 -msgid "Find:" -msgstr "Sök:" +#: lib/choose_repository.tcl:116 +msgid "Clone..." +msgstr "Klona..." -#: lib/search.tcl:24 -msgid "Next" -msgstr "Nästa" +#: lib/choose_repository.tcl:123 lib/choose_repository.tcl:1064 +msgid "Open Existing Repository" +msgstr "Öppna befintligt arkiv" -#: lib/search.tcl:25 -msgid "Prev" -msgstr "Föreg" +#: lib/choose_repository.tcl:129 +msgid "Open..." +msgstr "Öppna..." -#: lib/search.tcl:26 -msgid "Case-Sensitive" -msgstr "Skilj pÃ¥ VERSALER/gemener" +#: lib/choose_repository.tcl:142 +msgid "Recent Repositories" +msgstr "Senaste arkiven" -#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 -msgid "Cannot write shortcut:" -msgstr "Kan inte skriva genväg:" +#: lib/choose_repository.tcl:148 +msgid "Open Recent Repository:" +msgstr "Öppna tidigare arkiv:" -#: lib/shortcut.tcl:137 -msgid "Cannot write icon:" -msgstr "Kan inte skriva ikon:" +#: lib/choose_repository.tcl:316 lib/choose_repository.tcl:323 +#: lib/choose_repository.tcl:330 +#, tcl-format +msgid "Failed to create repository %s:" +msgstr "Kunde inte skapa arkivet %s:" -#: lib/spellcheck.tcl:57 -msgid "Unsupported spell checker" -msgstr "Stavningskontrollprogrammet stöds inte" +#: lib/choose_repository.tcl:407 lib/branch_create.tcl:33 +msgid "Create" +msgstr "Skapa" -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" -msgstr "Stavningskontroll är ej tillgänglig" +#: lib/choose_repository.tcl:417 +msgid "Directory:" +msgstr "Katalog:" -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" -msgstr "Ogiltig inställning för stavningskontroll" +#: lib/choose_repository.tcl:447 lib/choose_repository.tcl:573 +#: lib/choose_repository.tcl:1098 +msgid "Git Repository" +msgstr "Gitarkiv" -#: lib/spellcheck.tcl:70 +#: lib/choose_repository.tcl:472 #, tcl-format -msgid "Reverting dictionary to %s." -msgstr "Ã…terställer ordlistan till %s." +msgid "Directory %s already exists." +msgstr "Katalogen %s finns redan." -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" -msgstr "Stavningskontroll misslyckades tyst vid start" +#: lib/choose_repository.tcl:476 +#, tcl-format +msgid "File %s already exists." +msgstr "Filen %s finns redan." -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" -msgstr "Stavningskontrollprogrammet känns inte igen" +#: lib/choose_repository.tcl:491 +msgid "Clone" +msgstr "Klona" -#: lib/spellcheck.tcl:186 -msgid "No Suggestions" -msgstr "Inga förslag" +#: lib/choose_repository.tcl:504 +msgid "Source Location:" +msgstr "Plats för källkod:" -#: lib/spellcheck.tcl:388 -msgid "Unexpected EOF from spell checker" -msgstr "Oväntat filslut frÃ¥n stavningskontroll" +#: lib/choose_repository.tcl:513 +msgid "Target Directory:" +msgstr "MÃ¥lkatalog:" -#: lib/spellcheck.tcl:392 -msgid "Spell Checker Failed" -msgstr "Stavningskontroll misslyckades" +#: lib/choose_repository.tcl:523 +msgid "Clone Type:" +msgstr "Typ av klon:" + +#: lib/choose_repository.tcl:528 +msgid "Standard (Fast, Semi-Redundant, Hardlinks)" +msgstr "Standard (snabb, semiredundant, hÃ¥rda länkar)" + +#: lib/choose_repository.tcl:533 +msgid "Full Copy (Slower, Redundant Backup)" +msgstr "Full kopia (lÃ¥ngsammare, redundant säkerhetskopia)" + +#: lib/choose_repository.tcl:538 +msgid "Shared (Fastest, Not Recommended, No Backup)" +msgstr "Delad (snabbast, rekommenderas ej, ingen säkerhetskopia)" + +#: lib/choose_repository.tcl:545 +msgid "Recursively clone submodules too" +msgstr "Klona även rekursivt undermoduler" + +#: lib/choose_repository.tcl:579 lib/choose_repository.tcl:626 +#: lib/choose_repository.tcl:772 lib/choose_repository.tcl:842 +#: lib/choose_repository.tcl:1104 lib/choose_repository.tcl:1112 +#, tcl-format +msgid "Not a Git repository: %s" +msgstr "Inte ett Gitarkiv: %s" + +#: lib/choose_repository.tcl:615 +msgid "Standard only available for local repository." +msgstr "Standard är endast tillgängligt för lokala arkiv." + +#: lib/choose_repository.tcl:619 +msgid "Shared only available for local repository." +msgstr "Delat är endast tillgängligt för lokala arkiv." + +#: lib/choose_repository.tcl:640 +#, tcl-format +msgid "Location %s already exists." +msgstr "Platsen %s finns redan." + +#: lib/choose_repository.tcl:651 +msgid "Failed to configure origin" +msgstr "Kunde inte konfigurera ursprung" + +#: lib/choose_repository.tcl:663 +msgid "Counting objects" +msgstr "Räknar objekt" + +#: lib/choose_repository.tcl:664 +msgid "buckets" +msgstr "hinkar" + +#: lib/choose_repository.tcl:688 +#, tcl-format +msgid "Unable to copy objects/info/alternates: %s" +msgstr "Kunde inte kopiera objekt/info/alternativ: %s" + +#: lib/choose_repository.tcl:724 +#, tcl-format +msgid "Nothing to clone from %s." +msgstr "Ingenting att klona frÃ¥n %s." + +#: lib/choose_repository.tcl:726 lib/choose_repository.tcl:940 +#: lib/choose_repository.tcl:952 +msgid "The 'master' branch has not been initialized." +msgstr "Grenen \"master\" har inte initierats." + +#: lib/choose_repository.tcl:739 +msgid "Hardlinks are unavailable. Falling back to copying." +msgstr "HÃ¥rda länkar är inte tillgängliga. Faller tillbaka pÃ¥ kopiering." + +#: lib/choose_repository.tcl:751 +#, tcl-format +msgid "Cloning from %s" +msgstr "Klonar frÃ¥n %s" + +#: lib/choose_repository.tcl:782 +msgid "Copying objects" +msgstr "Kopierar objekt" + +#: lib/choose_repository.tcl:783 +msgid "KiB" +msgstr "KiB" + +#: lib/choose_repository.tcl:807 +#, tcl-format +msgid "Unable to copy object: %s" +msgstr "Kunde inte kopiera objekt: %s" + +#: lib/choose_repository.tcl:817 +msgid "Linking objects" +msgstr "Länkar objekt" + +#: lib/choose_repository.tcl:818 +msgid "objects" +msgstr "objekt" + +#: lib/choose_repository.tcl:826 +#, tcl-format +msgid "Unable to hardlink object: %s" +msgstr "Kunde inte hÃ¥rdlänka objekt: %s" + +#: lib/choose_repository.tcl:881 +msgid "Cannot fetch branches and objects. See console output for details." +msgstr "Kunde inte hämta grenar och objekt. Se konsolutdata för detaljer." + +#: lib/choose_repository.tcl:892 +msgid "Cannot fetch tags. See console output for details." +msgstr "Kunde inte hämta taggar. Se konsolutdata för detaljer." + +#: lib/choose_repository.tcl:916 +msgid "Cannot determine HEAD. See console output for details." +msgstr "Kunde inte avgöra HEAD. Se konsolutdata för detaljer." + +#: lib/choose_repository.tcl:925 +#, tcl-format +msgid "Unable to cleanup %s" +msgstr "Kunde inte städa upp %s" + +#: lib/choose_repository.tcl:931 +msgid "Clone failed." +msgstr "Kloning misslyckades." + +#: lib/choose_repository.tcl:938 +msgid "No default branch obtained." +msgstr "Hämtade ingen standardgren." + +#: lib/choose_repository.tcl:949 +#, tcl-format +msgid "Cannot resolve %s as a commit." +msgstr "Kunde inte slÃ¥ upp %s till nÃ¥gon incheckning." + +#: lib/choose_repository.tcl:961 +msgid "Creating working directory" +msgstr "Skapar arbetskatalog" + +#: lib/choose_repository.tcl:962 lib/index.tcl:70 lib/index.tcl:136 +#: lib/index.tcl:207 +msgid "files" +msgstr "filer" + +#: lib/choose_repository.tcl:981 +msgid "Cannot clone submodules." +msgstr "Kan inte klona undermoduler." + +#: lib/choose_repository.tcl:990 +msgid "Cloning submodules" +msgstr "Klonar undermoduler" + +#: lib/choose_repository.tcl:1015 +msgid "Initial file checkout failed." +msgstr "Inledande filutcheckning misslyckades." + +#: lib/choose_repository.tcl:1059 +msgid "Open" +msgstr "Öppna" + +#: lib/choose_repository.tcl:1069 +msgid "Repository:" +msgstr "Arkiv:" + +#: lib/choose_repository.tcl:1118 +#, tcl-format +msgid "Failed to open repository %s:" +msgstr "Kunde inte öppna arkivet %s:" + +#: lib/about.tcl:26 +msgid "git-gui - a graphical user interface for Git." +msgstr "git-gui - ett grafiskt användargränssnitt för Git." + +#: lib/blame.tcl:73 +msgid "File Viewer" +msgstr "Filvisare" + +#: lib/blame.tcl:79 +msgid "Commit:" +msgstr "Incheckning:" + +#: lib/blame.tcl:280 +msgid "Copy Commit" +msgstr "Kopiera incheckning" + +#: lib/blame.tcl:284 +msgid "Find Text..." +msgstr "Sök text..." + +#: lib/blame.tcl:288 +msgid "Goto Line..." +msgstr "GÃ¥ till rad..." + +#: lib/blame.tcl:297 +msgid "Do Full Copy Detection" +msgstr "Gör full kopieringsigenkänning" + +#: lib/blame.tcl:301 +msgid "Show History Context" +msgstr "Visa historiksammanhang" + +#: lib/blame.tcl:304 +msgid "Blame Parent Commit" +msgstr "Klandra föräldraincheckning" + +#: lib/blame.tcl:466 +#, tcl-format +msgid "Reading %s..." +msgstr "Läser %s..." + +#: lib/blame.tcl:594 +msgid "Loading copy/move tracking annotations..." +msgstr "Läser annoteringar för kopiering/flyttning..." + +#: lib/blame.tcl:614 +msgid "lines annotated" +msgstr "rader annoterade" + +#: lib/blame.tcl:806 +msgid "Loading original location annotations..." +msgstr "Läser in annotering av originalplacering..." + +#: lib/blame.tcl:809 +msgid "Annotation complete." +msgstr "Annotering fullbordad." + +#: lib/blame.tcl:839 +msgid "Busy" +msgstr "Upptagen" + +#: lib/blame.tcl:840 +msgid "Annotation process is already running." +msgstr "Annoteringsprocess körs redan." + +#: lib/blame.tcl:879 +msgid "Running thorough copy detection..." +msgstr "Kör grundlig kopieringsigenkänning..." + +#: lib/blame.tcl:947 +msgid "Loading annotation..." +msgstr "Läser in annotering..." + +#: lib/blame.tcl:1000 +msgid "Author:" +msgstr "Författare:" + +#: lib/blame.tcl:1004 +msgid "Committer:" +msgstr "Incheckare:" + +#: lib/blame.tcl:1009 +msgid "Original File:" +msgstr "Ursprunglig fil:" + +#: lib/blame.tcl:1057 +msgid "Cannot find HEAD commit:" +msgstr "Hittar inte incheckning för HEAD:" + +#: lib/blame.tcl:1112 +msgid "Cannot find parent commit:" +msgstr "Hittar inte föräldraincheckning:" + +#: lib/blame.tcl:1127 +msgid "Unable to display parent" +msgstr "Kan inte visa förälder" + +#: lib/blame.tcl:1269 +msgid "Originally By:" +msgstr "Ursprungligen av:" + +#: lib/blame.tcl:1275 +msgid "In File:" +msgstr "I filen:" + +#: lib/blame.tcl:1280 +msgid "Copied Or Moved Here By:" +msgstr "Kopierad eller flyttad hit av:" #: lib/sshkey.tcl:31 msgid "No keys found." @@ -2390,189 +2230,480 @@ msgstr "Lyckades skapa nyckeln, men hittar inte nÃ¥gon nyckel." msgid "Your key is in: %s" msgstr "Din nyckel finns i: %s" -#: lib/status_bar.tcl:86 +#: lib/branch_create.tcl:23 +msgid "Create Branch" +msgstr "Skapa gren" + +#: lib/branch_create.tcl:28 +msgid "Create New Branch" +msgstr "Skapa ny gren" + +#: lib/branch_create.tcl:42 +msgid "Branch Name" +msgstr "Namn pÃ¥ gren" + +#: lib/branch_create.tcl:57 +msgid "Match Tracking Branch Name" +msgstr "Använd namn pÃ¥ spÃ¥rad gren" + +#: lib/branch_create.tcl:66 +msgid "Starting Revision" +msgstr "Inledande revision" + +#: lib/branch_create.tcl:72 +msgid "Update Existing Branch:" +msgstr "Uppdatera befintlig gren:" + +#: lib/branch_create.tcl:75 +msgid "No" +msgstr "Nej" + +#: lib/branch_create.tcl:80 +msgid "Fast Forward Only" +msgstr "Endast snabbspolning" + +#: lib/branch_create.tcl:97 +msgid "Checkout After Creation" +msgstr "Checka ut när skapad" + +#: lib/branch_create.tcl:132 +msgid "Please select a tracking branch." +msgstr "Välj en gren att spÃ¥ra." + +#: lib/branch_create.tcl:141 #, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" -msgstr "%s... %*i av %*i %s (%3i%%)" +msgid "Tracking branch %s is not a branch in the remote repository." +msgstr "Den spÃ¥rade grenen %s är inte en gren i fjärrarkivet." -#: lib/tools_dlg.tcl:22 -msgid "Add Tool" -msgstr "Lägg till verktyg" +#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 +msgid "Cannot write shortcut:" +msgstr "Kan inte skriva genväg:" -#: lib/tools_dlg.tcl:28 -msgid "Add New Tool Command" -msgstr "Lägg till nytt verktygskommando" +#: lib/shortcut.tcl:137 +msgid "Cannot write icon:" +msgstr "Kan inte skriva ikon:" -#: lib/tools_dlg.tcl:34 -msgid "Add globally" -msgstr "Lägg till globalt" +#: lib/choose_rev.tcl:52 +msgid "This Detached Checkout" +msgstr "Denna frÃ¥nkopplade utcheckning" -#: lib/tools_dlg.tcl:46 -msgid "Tool Details" -msgstr "Detaljer för verktyg" +#: lib/choose_rev.tcl:60 +msgid "Revision Expression:" +msgstr "Revisionsuttryck:" -#: lib/tools_dlg.tcl:49 -msgid "Use '/' separators to create a submenu tree:" -msgstr "Använd \"/\"-avdelare för att skapa ett undermenyträd:" +#: lib/choose_rev.tcl:72 +msgid "Local Branch" +msgstr "Lokal gren" -#: lib/tools_dlg.tcl:60 -msgid "Command:" -msgstr "Kommando:" +#: lib/choose_rev.tcl:77 +msgid "Tracking Branch" +msgstr "SpÃ¥rande gren" -#: lib/tools_dlg.tcl:71 -msgid "Show a dialog before running" -msgstr "Visa dialog innan programmet startas" +#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544 +msgid "Tag" +msgstr "Tagg" -#: lib/tools_dlg.tcl:77 -msgid "Ask the user to select a revision (sets $REVISION)" -msgstr "Be användaren välja en version (sätter $REVISION)" +#: lib/choose_rev.tcl:321 +#, tcl-format +msgid "Invalid revision: %s" +msgstr "Ogiltig revision: %s" -#: lib/tools_dlg.tcl:82 -msgid "Ask the user for additional arguments (sets $ARGS)" -msgstr "Be användaren om ytterligare parametrar (sätter $ARGS)" +#: lib/choose_rev.tcl:342 +msgid "No revision selected." +msgstr "Ingen revision vald." -#: lib/tools_dlg.tcl:89 -msgid "Don't show the command output window" -msgstr "Visa inte kommandots utdatafönster" +#: lib/choose_rev.tcl:350 +msgid "Revision expression is empty." +msgstr "Revisionsuttrycket är tomt." -#: lib/tools_dlg.tcl:94 -msgid "Run only if a diff is selected ($FILENAME not empty)" -msgstr "Kör endast om en diff har markerats ($FILENAME är inte tomt)" +#: lib/choose_rev.tcl:537 +msgid "Updated" +msgstr "Uppdaterad" -#: lib/tools_dlg.tcl:118 -msgid "Please supply a name for the tool." -msgstr "Ange ett namn för verktyget." +#: lib/choose_rev.tcl:565 +msgid "URL" +msgstr "Webbadress" -#: lib/tools_dlg.tcl:126 +#: lib/commit.tcl:9 +msgid "" +"There is nothing to amend.\n" +"\n" +"You are about to create the initial commit. There is no commit before this " +"to amend.\n" +msgstr "" +"Det finns ingenting att utöka.\n" +"\n" +"Du hÃ¥ller pÃ¥ att skapa den inledande incheckningen. Det finns ingen tidigare " +"incheckning att utöka.\n" + +#: lib/commit.tcl:18 +msgid "" +"Cannot amend while merging.\n" +"\n" +"You are currently in the middle of a merge that has not been fully " +"completed. You cannot amend the prior commit unless you first abort the " +"current merge activity.\n" +msgstr "" +"Kan inte utöka vid sammanslagning.\n" +"\n" +"Du är i mitten av en sammanslagning som inte är fullbordad. Du kan inte " +"utöka tidigare incheckningar om du inte först avbryter den pÃ¥gÃ¥ende " +"sammanslagningen.\n" + +#: lib/commit.tcl:48 +msgid "Error loading commit data for amend:" +msgstr "Fel vid inläsning av incheckningsdata för utökning:" + +#: lib/commit.tcl:75 +msgid "Unable to obtain your identity:" +msgstr "Kunde inte hämta din identitet:" + +#: lib/commit.tcl:80 +msgid "Invalid GIT_COMMITTER_IDENT:" +msgstr "Felaktig GIT_COMMITTER_IDENT:" + +#: lib/commit.tcl:129 #, tcl-format -msgid "Tool '%s' already exists." -msgstr "Verktyget \"%s\" finns redan." +msgid "warning: Tcl does not support encoding '%s'." +msgstr "varning: Tcl stöder inte teckenkodningen \"%s\"." -#: lib/tools_dlg.tcl:148 +#: lib/commit.tcl:149 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before another commit can be created.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"Det senaste inlästa tillstÃ¥ndet motsvarar inte tillstÃ¥ndet i arkivet.\n" +"\n" +"Ett annat Git-program har ändrat arkivet sedan senaste avsökningen. Du mÃ¥ste " +"utföra en ny sökning innan du kan göra en ny incheckning.\n" +"\n" +"Sökningen kommer att startas automatiskt nu.\n" + +#: lib/commit.tcl:173 #, tcl-format msgid "" -"Could not add tool:\n" -"%s" +"Unmerged files cannot be committed.\n" +"\n" +"File %s has merge conflicts. You must resolve them and stage the file " +"before committing.\n" msgstr "" -"Kunde inte lägga till verktyget:\n" -"%s" +"Osammanslagna filer kan inte checkas in.\n" +"\n" +"Filen %s har sammanslagningskonflikter. Du mÃ¥ste lösa dem och köa filen " +"innan du checkar in den.\n" -#: lib/tools_dlg.tcl:187 -msgid "Remove Tool" -msgstr "Ta bort verktyg" +#: lib/commit.tcl:181 +#, tcl-format +msgid "" +"Unknown file state %s detected.\n" +"\n" +"File %s cannot be committed by this program.\n" +msgstr "" +"Okänd filstatus %s upptäckt.\n" +"\n" +"Filen %s kan inte checkas in av programmet.\n" -#: lib/tools_dlg.tcl:193 -msgid "Remove Tool Commands" -msgstr "Ta bort verktygskommandon" +#: lib/commit.tcl:189 +msgid "" +"No changes to commit.\n" +"\n" +"You must stage at least 1 file before you can commit.\n" +msgstr "" +"Inga ändringar att checka in.\n" +"\n" +"Du mÃ¥ste köa Ã¥tminstone en fil innan du kan checka in.\n" -#: lib/tools_dlg.tcl:198 -msgid "Remove" -msgstr "Ta bort" +#: lib/commit.tcl:204 +msgid "" +"Please supply a commit message.\n" +"\n" +"A good commit message has the following format:\n" +"\n" +"- First line: Describe in one sentence what you did.\n" +"- Second line: Blank\n" +"- Remaining lines: Describe why this change is good.\n" +msgstr "" +"Ange ett incheckningsmeddelande.\n" +"\n" +"Ett bra incheckningsmeddelande har följande format:\n" +"\n" +"- Första raden: Beskriv i en mening vad du gjorde.\n" +"- Andra raden: Tom\n" +"- Följande rader: Beskriv varför det här är en bra ändring.\n" -#: lib/tools_dlg.tcl:231 -msgid "(Blue denotes repository-local tools)" -msgstr "(BlÃ¥tt anger verktyg lokala för arkivet)" +#: lib/commit.tcl:235 +msgid "Calling pre-commit hook..." +msgstr "Anropar kroken före incheckning (pre-commit)..." -#: lib/tools_dlg.tcl:292 -#, tcl-format -msgid "Run Command: %s" -msgstr "Kör kommandot: %s" +#: lib/commit.tcl:250 +msgid "Commit declined by pre-commit hook." +msgstr "Incheckningen avvisades av kroken före incheckning (pre-commit)." -#: lib/tools_dlg.tcl:306 -msgid "Arguments" -msgstr "Argument" +#: lib/commit.tcl:269 +msgid "" +"You are about to commit on a detached head. This is a potentially dangerous " +"thing to do because if you switch to another branch you will lose your " +"changes and it can be difficult to retrieve them later from the reflog. You " +"should probably cancel this commit and create a new branch to continue.\n" +" \n" +" Do you really want to proceed with your Commit?" +msgstr "" +"Du är pÃ¥ väg att checka in pÃ¥ ett frÃ¥nkopplat huvud. Det kan potentiellt " +"vara farligt, eftersom du kommer förlora dina ändringar om du växlar till en " +"annan gren och det kan vara svÃ¥rt att hämta dem senare frÃ¥n ref-loggen. Du " +"bör troligen avbryta incheckningen och skapa en ny gren för att fortsätta.\n" +" \n" +" Vill du verkligen fortsätta checka in?" + +#: lib/commit.tcl:290 +msgid "Calling commit-msg hook..." +msgstr "Anropar kroken för incheckningsmeddelande (commit-msg)..." -#: lib/tools_dlg.tcl:341 -msgid "OK" -msgstr "OK" +#: lib/commit.tcl:305 +msgid "Commit declined by commit-msg hook." +msgstr "Incheckning avvisad av kroken för incheckningsmeddelande (commit-msg)." -#: lib/tools.tcl:75 +#: lib/commit.tcl:318 +msgid "Committing changes..." +msgstr "Checkar in ändringar..." + +#: lib/commit.tcl:334 +msgid "write-tree failed:" +msgstr "write-tree misslyckades:" + +#: lib/commit.tcl:335 lib/commit.tcl:379 lib/commit.tcl:400 +msgid "Commit failed." +msgstr "Incheckningen misslyckades." + +#: lib/commit.tcl:352 #, tcl-format -msgid "Running %s requires a selected file." -msgstr "För att starta %s mÃ¥ste du välja en fil." +msgid "Commit %s appears to be corrupt" +msgstr "Incheckningen %s verkar vara trasig" -#: lib/tools.tcl:90 +#: lib/commit.tcl:357 +msgid "" +"No changes to commit.\n" +"\n" +"No files were modified by this commit and it was not a merge commit.\n" +"\n" +"A rescan will be automatically started now.\n" +msgstr "" +"Inga ändringar att checka in.\n" +"\n" +"Inga filer ändrades av incheckningen och det var inte en sammanslagning.\n" +"\n" +"En sökning kommer att startas automatiskt nu.\n" + +#: lib/commit.tcl:364 +msgid "No changes to commit." +msgstr "Inga ändringar att checka in." + +#: lib/commit.tcl:378 +msgid "commit-tree failed:" +msgstr "commit-tree misslyckades:" + +#: lib/commit.tcl:399 +msgid "update-ref failed:" +msgstr "update-ref misslyckades:" + +#: lib/commit.tcl:492 #, tcl-format -msgid "Are you sure you want to run %s?" -msgstr "Är du säker pÃ¥ att du vill starta %s?" +msgid "Created commit %s: %s" +msgstr "Skapade incheckningen %s: %s" + +#: lib/branch_delete.tcl:16 +msgid "Delete Branch" +msgstr "Ta bort gren" + +#: lib/branch_delete.tcl:21 +msgid "Delete Local Branch" +msgstr "Ta bort lokal gren" + +#: lib/branch_delete.tcl:39 +msgid "Local Branches" +msgstr "Lokala grenar" -#: lib/tools.tcl:110 +#: lib/branch_delete.tcl:51 +msgid "Delete Only If Merged Into" +msgstr "Ta bara bort om sammanslagen med" + +#: lib/branch_delete.tcl:103 #, tcl-format -msgid "Tool: %s" -msgstr "Verktyg: %s" +msgid "The following branches are not completely merged into %s:" +msgstr "Följande grenar är inte till fullo sammanslagna med %s:" -#: lib/tools.tcl:111 +#: lib/branch_delete.tcl:141 #, tcl-format -msgid "Running: %s" -msgstr "Exekverar: %s" +msgid "" +"Failed to delete branches:\n" +"%s" +msgstr "" +"Kunde inte ta bort grenar:\n" +"%s" + +#: lib/index.tcl:6 +msgid "Unable to unlock the index." +msgstr "Kunde inte lÃ¥sa upp indexet." + +#: lib/index.tcl:17 +msgid "Index Error" +msgstr "Indexfel" + +#: lib/index.tcl:19 +msgid "" +"Updating the Git index failed. A rescan will be automatically started to " +"resynchronize git-gui." +msgstr "" +"Misslyckades med att uppdatera Gitindexet. En omsökning kommer att startas " +"automatiskt för att synkronisera om git-gui." -#: lib/tools.tcl:149 +#: lib/index.tcl:30 +msgid "Continue" +msgstr "Fortsätt" + +#: lib/index.tcl:33 +msgid "Unlock Index" +msgstr "LÃ¥s upp index" + +#: lib/index.tcl:298 #, tcl-format -msgid "Tool completed successfully: %s" -msgstr "Verktyget avslutades framgÃ¥ngsrikt: %s" +msgid "Unstaging %s from commit" +msgstr "Tar bort %s för incheckningskön" -#: lib/tools.tcl:151 +#: lib/index.tcl:337 +msgid "Ready to commit." +msgstr "Redo att checka in." + +#: lib/index.tcl:350 #, tcl-format -msgid "Tool failed: %s" -msgstr "Verktyget misslyckades: %s" +msgid "Adding %s" +msgstr "Lägger till %s" -#: lib/transport.tcl:7 +#: lib/index.tcl:380 #, tcl-format -msgid "Fetching new changes from %s" -msgstr "Hämtar nya ändringar frÃ¥n %s" +msgid "Stage %d untracked files?" +msgstr "Köa %d ospÃ¥rade filer?" -#: lib/transport.tcl:18 +#: lib/index.tcl:428 #, tcl-format -msgid "remote prune %s" -msgstr "fjärrborttagning %s" +msgid "Revert changes in file %s?" +msgstr "Ã…terställ ändringarna i filen %s?" -#: lib/transport.tcl:19 +#: lib/index.tcl:430 #, tcl-format -msgid "Pruning tracking branches deleted from %s" -msgstr "Tar bort spÃ¥rande grenar som tagits bort frÃ¥n %s" +msgid "Revert changes in these %i files?" +msgstr "Ã…terställ ändringarna i dessa %i filer?" -#: lib/transport.tcl:26 +#: lib/index.tcl:438 +msgid "Any unstaged changes will be permanently lost by the revert." +msgstr "" +"Alla oköade ändringar kommer permanent gÃ¥ förlorade vid Ã¥terställningen." + +#: lib/index.tcl:441 +msgid "Do Nothing" +msgstr "Gör ingenting" + +#: lib/index.tcl:459 +msgid "Reverting selected files" +msgstr "Ã…terställer valda filer" + +#: lib/index.tcl:463 #, tcl-format -msgid "Pushing changes to %s" -msgstr "Sänder ändringar till %s" +msgid "Reverting %s" +msgstr "Ã…terställer %s" -#: lib/transport.tcl:64 +#: lib/encoding.tcl:443 +msgid "Default" +msgstr "Standard" + +#: lib/encoding.tcl:448 #, tcl-format -msgid "Mirroring to %s" -msgstr "Speglar till %s" +msgid "System (%s)" +msgstr "Systemets (%s)" -#: lib/transport.tcl:82 +#: lib/encoding.tcl:459 lib/encoding.tcl:465 +msgid "Other" +msgstr "Annan" + +#: lib/date.tcl:25 #, tcl-format -msgid "Pushing %s %s to %s" -msgstr "Sänder %s %s till %s" +msgid "Invalid date from Git: %s" +msgstr "Ogiltigt datum frÃ¥n Git: %s" -#: lib/transport.tcl:102 -msgid "Push Branches" -msgstr "Sänd grenar" +#: lib/database.tcl:42 +msgid "Number of loose objects" +msgstr "Antal lösa objekt" -#: lib/transport.tcl:117 -msgid "Source Branches" -msgstr "Källgrenar" +#: lib/database.tcl:43 +msgid "Disk space used by loose objects" +msgstr "Diskutrymme använt av lösa objekt" -#: lib/transport.tcl:131 -msgid "Destination Repository" -msgstr "Destinationsarkiv" +#: lib/database.tcl:44 +msgid "Number of packed objects" +msgstr "Antal packade objekt" -#: lib/transport.tcl:172 -msgid "Transfer Options" -msgstr "Överföringsalternativ" +#: lib/database.tcl:45 +msgid "Number of packs" +msgstr "Antal paket" -#: lib/transport.tcl:174 -msgid "Force overwrite existing branch (may discard changes)" -msgstr "Tvinga överskrivning av befintlig gren (kan kasta bort ändringar)" +#: lib/database.tcl:46 +msgid "Disk space used by packed objects" +msgstr "Diskutrymme använt av packade objekt" -#: lib/transport.tcl:178 -msgid "Use thin pack (for slow network connections)" -msgstr "Använd tunt paket (för lÃ¥ngsamma nätverksanslutningar)" +#: lib/database.tcl:47 +msgid "Packed objects waiting for pruning" +msgstr "Packade objekt som väntar pÃ¥ städning" -#: lib/transport.tcl:182 -msgid "Include tags" -msgstr "Ta med taggar" +#: lib/database.tcl:48 +msgid "Garbage files" +msgstr "Skräpfiler" + +#: lib/database.tcl:72 +msgid "Compressing the object database" +msgstr "Komprimerar objektdatabasen" + +#: lib/database.tcl:83 +msgid "Verifying the object database with fsck-objects" +msgstr "Verifierar objektdatabasen med fsck-objects" + +#: lib/database.tcl:107 +#, tcl-format +msgid "" +"This repository currently has approximately %i loose objects.\n" +"\n" +"To maintain optimal performance it is strongly recommended that you compress " +"the database.\n" +"\n" +"Compress the database now?" +msgstr "" +"Arkivet har för närvarande omkring %i lösa objekt.\n" +"\n" +"För att bibehÃ¥lla optimal prestanda rekommenderas det Ã¥ det bestämdaste att " +"du komprimerar databasen.\n" +"\n" +"Komprimera databasen nu?" + +#: lib/error.tcl:20 lib/error.tcl:116 +msgid "error" +msgstr "fel" + +#: lib/error.tcl:36 +msgid "warning" +msgstr "varning" + +#: lib/error.tcl:96 +msgid "You must correct the above errors before committing." +msgstr "Du mÃ¥ste rätta till felen ovan innan du checkar in." + +#~ msgid "Displaying only %s of %s files." +#~ msgstr "Visar endast %s av %s filer." + +#~ msgid "Case-Sensitive" +#~ msgstr "Skilj pÃ¥ VERSALER/gemener" #~ msgid "Cannot use funny .git directory:" #~ msgstr "Kan inte använda underlig .git-katalog:" diff --git a/git-gui/po/vi.po b/git-gui/po/vi.po new file mode 100644 index 0000000..d956b59 --- /dev/null +++ b/git-gui/po/vi.po @@ -0,0 +1,2690 @@ +# Vietnamese translation for GIT-GUI +# Bản dịch Tiếng Việt dà nh cho gói Git-gui. +# This file is distributed under the same license as the git-core package. +# First translated by Trần Ngá»c Quân <vnwildman@gmail.com>, 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: git-gui 0.19.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-06-26 13:42+0700\n" +"PO-Revision-Date: 2014-06-27 07:48+0700\n" +"Last-Translator: Trần Ngá»c Quân <vnwildman@gmail.com>\n" +"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" +"Language: vi\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Poedit-Language: Vietnamese\n" +"X-Poedit-Country: VIET NAM\n" +"X-Poedit-SourceCharset: utf-8\n" +"X-Poedit-Basepath: ../\n" + +#: git-gui.sh:859 +#, tcl-format +msgid "Invalid font specified in %s:" +msgstr "Phông chữ không hợp lệ được đặc tả trong %s:" + +#: git-gui.sh:912 +msgid "Main Font" +msgstr "Phông chữ chÃnh" + +#: git-gui.sh:913 +msgid "Diff/Console Font" +msgstr "Phông chữ cho Bảng Ä‘iá»u khiển hay Diff" + +#: git-gui.sh:928 git-gui.sh:942 git-gui.sh:955 git-gui.sh:1045 +#: git-gui.sh:1064 git-gui.sh:3119 +msgid "git-gui: fatal error" +msgstr "git-gui: lá»—i nghiêm trá»ng" + +#: git-gui.sh:929 +msgid "Cannot find git in PATH." +msgstr "Không tìm thấy git trong biến PATH." + +#: git-gui.sh:956 +msgid "Cannot parse Git version string:" +msgstr "Không thể phân tÃch chuá»—i phiên bản Git:" + +#: git-gui.sh:981 +#, tcl-format +msgid "" +"Git version cannot be determined.\n" +"\n" +"%s claims it is version '%s'.\n" +"\n" +"%s requires at least Git 1.5.0 or later.\n" +"\n" +"Assume '%s' is version 1.5.0?\n" +msgstr "" +"Không thể nháºn ra phiên bản của Git.\n" +"\n" +"%s nói đây là phiên bản '%s'.\n" +"\n" +"%s yêu cầu Git phiên bản từ 1.5.0 hay má»›i hÆ¡n.\n" +"\n" +"Cá»i '%s' có phiên bản là 1.5.0?\n" + +#: git-gui.sh:1278 +msgid "Git directory not found:" +msgstr "Không tìm thấy thÆ° mục git:" + +#: git-gui.sh:1312 +msgid "Cannot move to top of working directory:" +msgstr "Không thể di chuyển đến đỉnh của thÆ° mục là m việc:" + +#: git-gui.sh:1320 +msgid "Cannot use bare repository:" +msgstr "Không thể dùng kho trần:" + +#: git-gui.sh:1328 +msgid "No working directory" +msgstr "Không có thÆ° mục là m việc" + +#: git-gui.sh:1500 lib/checkout_op.tcl:306 +msgid "Refreshing file status..." +msgstr "Cáºp nháºt lại trạng thái táºp tin..." + +#: git-gui.sh:1560 +msgid "Scanning for modified files ..." +msgstr "Äang quét Ä‘Ä©a tìm táºp tin thay đổi..." + +#: git-gui.sh:1636 +msgid "Calling prepare-commit-msg hook..." +msgstr "Äang gá»i móc prepare-commit-msg..." + +#: git-gui.sh:1653 +msgid "Commit declined by prepare-commit-msg hook." +msgstr "Lần chuyển giao bị chối từ do móc prepare-commit-msg." + +#: git-gui.sh:1811 lib/browser.tcl:252 +msgid "Ready." +msgstr "Sẵn sà ng." + +#: git-gui.sh:1969 +#, tcl-format +msgid "Displaying only %s of %s files." +msgstr "Chỉ hiển thị %s trong số %s táºp tin." + +#: git-gui.sh:2095 +msgid "Unmodified" +msgstr "Không thay đổi gì" + +#: git-gui.sh:2097 +msgid "Modified, not staged" +msgstr "Äã sá»a nhÆ°ng chÆ°a đánh dấu để chuyển giao" + +#: git-gui.sh:2098 git-gui.sh:2110 +msgid "Staged for commit" +msgstr "Äánh dấu để chuyển giao" + +#: git-gui.sh:2099 git-gui.sh:2111 +msgid "Portions staged for commit" +msgstr "Các phần được đánh dấu là cần chuyển giao" + +#: git-gui.sh:2100 git-gui.sh:2112 +msgid "Staged for commit, missing" +msgstr "Äã đánh dấu là cần chuyển giao, thiếu" + +#: git-gui.sh:2102 +msgid "File type changed, not staged" +msgstr "Äã đổi kiểu táºp tin nhÆ°ng chÆ°a được đánh dấu cần chuyển giao" + +#: git-gui.sh:2103 git-gui.sh:2104 +msgid "File type changed, old type staged for commit" +msgstr "Äã đổi kiểu táºp tin, kiểu cÅ© đã được đánh dấu cần chuyển giao" + +#: git-gui.sh:2105 +msgid "File type changed, staged" +msgstr "Äã đổi kiểu táºp tin, đã được đánh dấu cần chuyển giao" + +#: git-gui.sh:2106 +msgid "File type change staged, modification not staged" +msgstr "" +"Thay đổi kiểu táºp tin đã được đánh dấu cần chuyển giao, nhÆ°ng các thay đổi " +"thì chÆ°a" + +#: git-gui.sh:2107 +msgid "File type change staged, file missing" +msgstr "" +"Thay đổi kiểu táºp tin đã được đánh dấu cần chuyển giao, táºp tin bị thiếu" + +#: git-gui.sh:2109 +msgid "Untracked, not staged" +msgstr "ChÆ°a được theo dõi, chÆ°a đánh dấu là cần chuyển giao" + +#: git-gui.sh:2114 +msgid "Missing" +msgstr "Thiếu" + +#: git-gui.sh:2115 +msgid "Staged for removal" +msgstr "Äã đánh dấu là cần gỡ bá»" + +#: git-gui.sh:2116 +msgid "Staged for removal, still present" +msgstr "Äã đánh dấu là cần gỡ bá», nhÆ°ng vẫn hiện diện" + +#: git-gui.sh:2118 git-gui.sh:2119 git-gui.sh:2120 git-gui.sh:2121 +#: git-gui.sh:2122 git-gui.sh:2123 +msgid "Requires merge resolution" +msgstr "Các yêu cầu phân giải hòa trá»™n" + +#: git-gui.sh:2158 +msgid "Starting gitk... please wait..." +msgstr "Äang khởi Ä‘á»™ng gitk... vui lòng chá»..." + +#: git-gui.sh:2170 +msgid "Couldn't find gitk in PATH" +msgstr "Không thể tìm thấy gitk trong PATH" + +#: git-gui.sh:2229 +msgid "Couldn't find git gui in PATH" +msgstr "Không thể tìm thấy git gui trong PATH" + +#: git-gui.sh:2648 lib/choose_repository.tcl:40 +msgid "Repository" +msgstr "Kho" + +#: git-gui.sh:2649 +msgid "Edit" +msgstr "Chỉnh sá»a" + +#: git-gui.sh:2651 lib/choose_rev.tcl:567 +msgid "Branch" +msgstr "Nhánh" + +#: git-gui.sh:2654 lib/choose_rev.tcl:554 +msgid "Commit@@noun" +msgstr "Chuyển giao@@noun" + +#: git-gui.sh:2657 lib/merge.tcl:123 lib/merge.tcl:152 lib/merge.tcl:170 +msgid "Merge" +msgstr "Trá»™n" + +#: git-gui.sh:2658 lib/choose_rev.tcl:563 +msgid "Remote" +msgstr "Máy chủ" + +#: git-gui.sh:2661 +msgid "Tools" +msgstr "Công cụ" + +#: git-gui.sh:2670 +msgid "Explore Working Copy" +msgstr "Quét dò thÆ° mục là m việc" + +#: git-gui.sh:2676 +msgid "Git Bash" +msgstr "Git Bash" + +#: git-gui.sh:2686 +msgid "Browse Current Branch's Files" +msgstr "Duyệt các Táºp tin ở nhánh hiện nay" + +#: git-gui.sh:2690 +msgid "Browse Branch Files..." +msgstr "Duyệt các táºp tin nhánh..." + +#: git-gui.sh:2695 +msgid "Visualize Current Branch's History" +msgstr "Hiển thị trá»±c quan lịch sá» nhánh hiện nay" + +#: git-gui.sh:2699 +msgid "Visualize All Branch History" +msgstr "Hiển thị trá»±c quan lịch sá» má»i nhánh" + +#: git-gui.sh:2706 +#, tcl-format +msgid "Browse %s's Files" +msgstr "Duyệt táºp tin của %s..." + +#: git-gui.sh:2708 +#, tcl-format +msgid "Visualize %s's History" +msgstr "Duyệt lịch sá» của %s trá»±c quan" + +#: git-gui.sh:2713 lib/database.tcl:40 lib/database.tcl:66 +msgid "Database Statistics" +msgstr "Thống kê cÆ¡ sở dữ liệu" + +#: git-gui.sh:2716 lib/database.tcl:33 +msgid "Compress Database" +msgstr "Nén cÆ¡ sở dữ liệu" + +#: git-gui.sh:2719 +msgid "Verify Database" +msgstr "Thẩm tra cÆ¡ sở dữ liệu" + +#: git-gui.sh:2726 git-gui.sh:2730 git-gui.sh:2734 lib/shortcut.tcl:8 +#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 +msgid "Create Desktop Icon" +msgstr "Tạo lối tắt ở mà n hình ná»n" + +#: git-gui.sh:2742 lib/choose_repository.tcl:192 lib/choose_repository.tcl:200 +msgid "Quit" +msgstr "Thoát" + +#: git-gui.sh:2750 +msgid "Undo" +msgstr "Hủy lệnh vừa rồi" + +#: git-gui.sh:2753 +msgid "Redo" +msgstr "Là m lại" + +#: git-gui.sh:2757 git-gui.sh:3362 +msgid "Cut" +msgstr "Cắt" + +#: git-gui.sh:2760 git-gui.sh:3365 git-gui.sh:3439 git-gui.sh:3524 +#: lib/console.tcl:69 +msgid "Copy" +msgstr "Chép" + +#: git-gui.sh:2763 git-gui.sh:3368 +msgid "Paste" +msgstr "Dán" + +#: git-gui.sh:2766 git-gui.sh:3371 lib/branch_delete.tcl:28 +#: lib/remote_branch_delete.tcl:39 +msgid "Delete" +msgstr "Xóa bá»" + +#: git-gui.sh:2770 git-gui.sh:3375 git-gui.sh:3528 lib/console.tcl:71 +msgid "Select All" +msgstr "Chá»n tất cả" + +#: git-gui.sh:2779 +msgid "Create..." +msgstr "Tạo..." + +#: git-gui.sh:2785 +msgid "Checkout..." +msgstr "Lấy ra..." + +#: git-gui.sh:2791 +msgid "Rename..." +msgstr "Äổi tên..." + +#: git-gui.sh:2796 +msgid "Delete..." +msgstr "Xóa..." + +#: git-gui.sh:2801 +msgid "Reset..." +msgstr "Äặt lại.." + +#: git-gui.sh:2811 +msgid "Done" +msgstr "Xong" + +#: git-gui.sh:2813 +msgid "Commit@@verb" +msgstr "Chuyển giao@@verb" + +#: git-gui.sh:2822 git-gui.sh:3303 +msgid "New Commit" +msgstr "Lần chuyển giao má»›i" + +#: git-gui.sh:2830 git-gui.sh:3310 +msgid "Amend Last Commit" +msgstr "Tu bổ lần chuyển giao cuối" + +#: git-gui.sh:2840 git-gui.sh:3264 lib/remote_branch_delete.tcl:101 +msgid "Rescan" +msgstr "Quét lại" + +#: git-gui.sh:2846 +msgid "Stage To Commit" +msgstr "ÄÆ°a lên bệ phóng để chuyển giao" + +#: git-gui.sh:2852 +msgid "Stage Changed Files To Commit" +msgstr "Äánh dấu các táºp tin đã thay đổi cần chuyển giao" + +#: git-gui.sh:2858 +msgid "Unstage From Commit" +msgstr "ÄÆ°a ra khá»i bệ phóng để không chuyển giao" + +#: git-gui.sh:2864 lib/index.tcl:442 +msgid "Revert Changes" +msgstr "Hoà n nguyên các thay đổi" + +#: git-gui.sh:2872 git-gui.sh:3575 git-gui.sh:3606 +msgid "Show Less Context" +msgstr "Hiện Ãt ná»™i dung hÆ¡n" + +#: git-gui.sh:2876 git-gui.sh:3579 git-gui.sh:3610 +msgid "Show More Context" +msgstr "Hiện chi tiết hÆ¡n" + +#: git-gui.sh:2883 git-gui.sh:3277 git-gui.sh:3386 +msgid "Sign Off" +msgstr "Ký tên" + +#: git-gui.sh:2899 +msgid "Local Merge..." +msgstr "Trá»™n ná»™i bá»™..." + +#: git-gui.sh:2904 +msgid "Abort Merge..." +msgstr "Hủy bá» hòa trá»™n..." + +#: git-gui.sh:2916 git-gui.sh:2944 +msgid "Add..." +msgstr "Thêm..." + +#: git-gui.sh:2920 +msgid "Push..." +msgstr "Äẩy lên..." + +#: git-gui.sh:2924 +msgid "Delete Branch..." +msgstr "Xoá nhánh..." + +#: git-gui.sh:2934 git-gui.sh:3557 +msgid "Options..." +msgstr "Tùy chá»n..." + +#: git-gui.sh:2945 +msgid "Remove..." +msgstr "Gỡ bá»..." + +#: git-gui.sh:2954 lib/choose_repository.tcl:54 +msgid "Help" +msgstr "Trợ giúp" + +#: git-gui.sh:2958 git-gui.sh:2962 lib/about.tcl:14 +#: lib/choose_repository.tcl:48 lib/choose_repository.tcl:57 +#, tcl-format +msgid "About %s" +msgstr "Giá»›i thiệu vá» %s" + +#: git-gui.sh:2986 +msgid "Online Documentation" +msgstr "Äá»c tà i liệu trá»±c tuyến" + +#: git-gui.sh:2989 lib/choose_repository.tcl:51 lib/choose_repository.tcl:60 +msgid "Show SSH Key" +msgstr "Hiện khoá SSH" + +#: git-gui.sh:3008 git-gui.sh:3140 +msgid "Usage" +msgstr "Cách dùng" + +#: git-gui.sh:3089 lib/blame.tcl:573 +msgid "Error" +msgstr "Lá»—i" + +#: git-gui.sh:3120 +#, tcl-format +msgid "fatal: cannot stat path %s: No such file or directory" +msgstr "" +"lá»—i nghiêm trá»ng: không thể lấy thông tin vá» Ä‘Æ°á»ng dẫn %s: Không có táºp tin " +"hoặc thÆ° mục nhÆ° váºy" + +#: git-gui.sh:3153 +msgid "Current Branch:" +msgstr "Nhánh hiện hà nh:" + +#: git-gui.sh:3179 +msgid "Staged Changes (Will Commit)" +msgstr "Äánh dấu các thay đổi (Sẽ chuyển giao)" + +#: git-gui.sh:3199 +msgid "Unstaged Changes" +msgstr "Bá» ra khá»i bệ phóng các thay đổi" + +#: git-gui.sh:3270 +msgid "Stage Changed" +msgstr "Äặt lên bệ phóng các thay đổi" + +#: git-gui.sh:3289 lib/transport.tcl:137 lib/transport.tcl:229 +msgid "Push" +msgstr "Äẩy lên" + +#: git-gui.sh:3324 +msgid "Initial Commit Message:" +msgstr "Phần chú thÃch cho lần chuyển giao khởi tạo:" + +#: git-gui.sh:3325 +msgid "Amended Commit Message:" +msgstr "Phần chú giải cho lần chuyển giao tu bổ:" + +#: git-gui.sh:3326 +msgid "Amended Initial Commit Message:" +msgstr "Phần chú giải cho lần chuyển giao tu bổ lần khởi tạo:" + +#: git-gui.sh:3327 +msgid "Amended Merge Commit Message:" +msgstr "Phần chú giải cho lần chuyển giao tu bổ lần hòa trá»™n" + +#: git-gui.sh:3328 +msgid "Merge Commit Message:" +msgstr "Ghi chú của lần chuyển giao hòa trá»™n:" + +#: git-gui.sh:3329 +msgid "Commit Message:" +msgstr "Chú thÃch của lần chuyển giao:" + +#: git-gui.sh:3378 git-gui.sh:3532 lib/console.tcl:73 +msgid "Copy All" +msgstr "Chép tất cả" + +#: git-gui.sh:3402 lib/blame.tcl:105 +msgid "File:" +msgstr "Táºp tin:" + +#: git-gui.sh:3520 +msgid "Refresh" +msgstr "Là m tÆ°Æ¡i lại" + +#: git-gui.sh:3541 +msgid "Decrease Font Size" +msgstr "Giảm kÃch cỡ phông" + +#: git-gui.sh:3545 +msgid "Increase Font Size" +msgstr "Tăng kÃch cỡ phông" + +#: git-gui.sh:3553 lib/blame.tcl:294 +msgid "Encoding" +msgstr "Bảng mã" + +#: git-gui.sh:3564 +msgid "Apply/Reverse Hunk" +msgstr "Ãp dụng hay đảo ngược cả khối" + +#: git-gui.sh:3569 +msgid "Apply/Reverse Line" +msgstr "Ãp dụng hay đảo ngược dòng" + +#: git-gui.sh:3588 +msgid "Run Merge Tool" +msgstr "Chạy công cụ hòa trá»™n" + +#: git-gui.sh:3593 +msgid "Use Remote Version" +msgstr "Dùng phiên bản ở máy chủ" + +#: git-gui.sh:3597 +msgid "Use Local Version" +msgstr "Dùng phiên bản ở máy ná»™i bá»™" + +#: git-gui.sh:3601 +msgid "Revert To Base" +msgstr "Trở lại cÆ¡ bản" + +#: git-gui.sh:3619 +msgid "Visualize These Changes In The Submodule" +msgstr "Hiển thị trá»±c quan các thay đổi trong mô-Ä‘un con" + +#: git-gui.sh:3623 +msgid "Visualize Current Branch History In The Submodule" +msgstr "Hiển thị trá»±c quan lịch sá» nhánh hiện tại trong mô-Ä‘un con" + +#: git-gui.sh:3627 +msgid "Visualize All Branch History In The Submodule" +msgstr "Hiển thị trá»±c quan lịch sá» má»i nhánh trong mô-Ä‘un con" + +#: git-gui.sh:3632 +msgid "Start git gui In The Submodule" +msgstr "Khởi chạy git gui trong mô-Ä‘un-con" + +#: git-gui.sh:3667 +msgid "Unstage Hunk From Commit" +msgstr "BỠđánh dấu Ä‘oạn cần chuyển giao" + +#: git-gui.sh:3669 +msgid "Unstage Lines From Commit" +msgstr "BỠđánh dấu các dòng cần chuyển giao" + +#: git-gui.sh:3671 +msgid "Unstage Line From Commit" +msgstr "BỠđánh dấu dòng cần chuyển giao" + +#: git-gui.sh:3674 +msgid "Stage Hunk For Commit" +msgstr "Äánh dấu Ä‘oạn cần chuyển giao" + +#: git-gui.sh:3676 +msgid "Stage Lines For Commit" +msgstr "Äánh dấu các dòng cần chuyển giao" + +#: git-gui.sh:3678 +msgid "Stage Line For Commit" +msgstr "Äánh dấu dòng cần chuyển giao" + +#: git-gui.sh:3703 +msgid "Initializing..." +msgstr "Äang khởi tạo..." + +#: git-gui.sh:3846 +#, tcl-format +msgid "" +"Possible environment issues exist.\n" +"\n" +"The following environment variables are probably\n" +"going to be ignored by any Git subprocess run\n" +"by %s:\n" +"\n" +msgstr "" +"Gần nhÆ° chắc chắn là môi trÆ°á»ng tồn tại.\n" +"\n" +"Các biến môi trÆ°á»ng sau đây có lẽ sẽ bị bá» qua bởi các tiến trình con git\n" +"chạy bởi %s:\n" +"\n" + +#: git-gui.sh:3875 +msgid "" +"\n" +"This is due to a known issue with the\n" +"Tcl binary distributed by Cygwin." +msgstr "" +"\n" +"Cái nà y có nguyên nhân bởi má»™t lá»—i phát ra từ\n" +"Tcl phân phối bởi Cygwin." + +#: git-gui.sh:3880 +#, tcl-format +msgid "" +"\n" +"\n" +"A good replacement for %s\n" +"is placing values for the user.name and\n" +"user.email settings into your personal\n" +"~/.gitconfig file.\n" +msgstr "" +"\n" +"\n" +"Thay thế tốt cho %s\n" +"là thay thế các giá trị cà i đặt cho user.name và \n" +"user.email thà nh táºp tin cá nhân của bạn\n" +"~/.gitconfig.\n" + +#: lib/about.tcl:26 +msgid "git-gui - a graphical user interface for Git." +msgstr "git-gui - công cụ đồ há»a dà nh cho Git." + +#: lib/blame.tcl:73 +msgid "File Viewer" +msgstr "Bá»™ Xem Táºp Tin" + +#: lib/blame.tcl:79 +msgid "Commit:" +msgstr "Lần chuyển giao:" + +#: lib/blame.tcl:280 +msgid "Copy Commit" +msgstr "Chép lần chuyển giao" + +#: lib/blame.tcl:284 +msgid "Find Text..." +msgstr "Tìm chữ..." + +#: lib/blame.tcl:288 +msgid "Goto Line..." +msgstr "Nhảy đến dòng..." + +#: lib/blame.tcl:297 +msgid "Do Full Copy Detection" +msgstr "Thá»±c hiện dò tìm chép toà n bá»™" + +#: lib/blame.tcl:301 +msgid "Show History Context" +msgstr "Hiển thị ná»™i dung của lịch sá»" + +#: lib/blame.tcl:304 +msgid "Blame Parent Commit" +msgstr "Xem công trạng của lần chuyển giao cha mẹ" + +#: lib/blame.tcl:466 +#, tcl-format +msgid "Reading %s..." +msgstr "Äang Ä‘á»c %s..." + +#: lib/blame.tcl:594 +msgid "Loading copy/move tracking annotations..." +msgstr "Äang tải phần chú giải theo dõi chép/chuyển..." + +#: lib/blame.tcl:614 +msgid "lines annotated" +msgstr "dòng chú giải" + +#: lib/blame.tcl:806 +msgid "Loading original location annotations..." +msgstr "Äang tải các chú giải vị trà nguyên gốc..." + +#: lib/blame.tcl:809 +msgid "Annotation complete." +msgstr "Chú giải hoà n tất." + +#: lib/blame.tcl:839 +msgid "Busy" +msgstr "Báºn" + +#: lib/blame.tcl:840 +msgid "Annotation process is already running." +msgstr "Tiến trình chú giải Ä‘ang diá»…n ra." + +#: lib/blame.tcl:879 +msgid "Running thorough copy detection..." +msgstr "Äang chạy dò tìm sao chép toà n diện..." + +#: lib/blame.tcl:947 +msgid "Loading annotation..." +msgstr "Äang tải phần chú giải..." + +#: lib/blame.tcl:1000 +msgid "Author:" +msgstr "Tác giả:" + +#: lib/blame.tcl:1004 +msgid "Committer:" +msgstr "NgÆ°á»i chuyển giao:" + +#: lib/blame.tcl:1009 +msgid "Original File:" +msgstr "Táºp tin gốc:" + +#: lib/blame.tcl:1057 +msgid "Cannot find HEAD commit:" +msgstr "Không thể tìm thấy HEAD của lần chuyển giao:" + +#: lib/blame.tcl:1112 +msgid "Cannot find parent commit:" +msgstr "Không thể tìm thấy lần chuyển giao mẹ:" + +#: lib/blame.tcl:1127 +msgid "Unable to display parent" +msgstr "Không thể hiển thị cha mẹ" + +#: lib/blame.tcl:1128 lib/diff.tcl:341 +msgid "Error loading diff:" +msgstr "Gặp lá»—i khi tải diff:" + +#: lib/blame.tcl:1269 +msgid "Originally By:" +msgstr "Nguyên gốc bởi:" + +#: lib/blame.tcl:1275 +msgid "In File:" +msgstr "Trong táºp tin:" + +#: lib/blame.tcl:1280 +msgid "Copied Or Moved Here By:" +msgstr "Äã chép hoặc Di chuyển đến đây bởi:" + +#: lib/branch_checkout.tcl:16 lib/branch_checkout.tcl:21 +msgid "Checkout Branch" +msgstr "Lấy ra nhánh" + +#: lib/branch_checkout.tcl:26 +msgid "Checkout" +msgstr "Lấy ra" + +#: lib/branch_checkout.tcl:30 lib/branch_create.tcl:37 +#: lib/branch_delete.tcl:34 lib/branch_rename.tcl:32 lib/browser.tcl:292 +#: lib/checkout_op.tcl:579 lib/choose_font.tcl:45 lib/merge.tcl:174 +#: lib/option.tcl:127 lib/remote_add.tcl:34 lib/remote_branch_delete.tcl:43 +#: lib/tools_dlg.tcl:41 lib/tools_dlg.tcl:202 lib/tools_dlg.tcl:345 +#: lib/transport.tcl:141 +msgid "Cancel" +msgstr "Thôi" + +#: lib/branch_checkout.tcl:35 lib/browser.tcl:297 lib/tools_dlg.tcl:321 +msgid "Revision" +msgstr "Äiểm sá»a đổi" + +#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:69 lib/option.tcl:309 +msgid "Options" +msgstr "Tùy chá»n" + +#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92 +msgid "Fetch Tracking Branch" +msgstr "Lấy vá» nhánh được theo dõi" + +#: lib/branch_checkout.tcl:47 +msgid "Detach From Local Branch" +msgstr "Tách rá»i từ Nhánh ná»™i bá»™" + +#: lib/branch_create.tcl:23 +msgid "Create Branch" +msgstr "Tạo nhánh" + +#: lib/branch_create.tcl:28 +msgid "Create New Branch" +msgstr "Tạo nhánh má»›i" + +#: lib/branch_create.tcl:33 lib/choose_repository.tcl:391 +msgid "Create" +msgstr "Tạo" + +#: lib/branch_create.tcl:42 +msgid "Branch Name" +msgstr "Tên nhánh" + +#: lib/branch_create.tcl:44 lib/remote_add.tcl:41 lib/tools_dlg.tcl:51 +msgid "Name:" +msgstr "Tên:" + +#: lib/branch_create.tcl:57 +msgid "Match Tracking Branch Name" +msgstr "Khá»›p vá»›i tên nhánh được theo dõi" + +#: lib/branch_create.tcl:66 +msgid "Starting Revision" +msgstr "Äiểm đầu" + +#: lib/branch_create.tcl:72 +msgid "Update Existing Branch:" +msgstr "Cáºp nháºt nhánh sẵn có:" + +#: lib/branch_create.tcl:75 +msgid "No" +msgstr "Không" + +#: lib/branch_create.tcl:80 +msgid "Fast Forward Only" +msgstr "Chỉ fast-forward" + +#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571 +msgid "Reset" +msgstr "Äặt lại" + +#: lib/branch_create.tcl:97 +msgid "Checkout After Creation" +msgstr "Lấy ra sau khi tạo" + +#: lib/branch_create.tcl:132 +msgid "Please select a tracking branch." +msgstr "Vui lòng chá»n nhánh theo dõi." + +#: lib/branch_create.tcl:141 +#, tcl-format +msgid "Tracking branch %s is not a branch in the remote repository." +msgstr "Nhánh theo dõi %s không phải là má»™t nhánh trên kho chứa máy chủ." + +#: lib/branch_create.tcl:154 lib/branch_rename.tcl:92 +msgid "Please supply a branch name." +msgstr "Hãy cung cấp tên nhánh." + +#: lib/branch_create.tcl:165 lib/branch_rename.tcl:112 +#, tcl-format +msgid "'%s' is not an acceptable branch name." +msgstr "'%s' không phải là má»™t tên nhánh được chấp nháºn." + +#: lib/branch_delete.tcl:16 +msgid "Delete Branch" +msgstr "Xoá nhánh" + +#: lib/branch_delete.tcl:21 +msgid "Delete Local Branch" +msgstr "Xóa nhánh ná»™i bá»™" + +#: lib/branch_delete.tcl:39 +msgid "Local Branches" +msgstr "Nhánh ná»™i bá»™" + +#: lib/branch_delete.tcl:51 +msgid "Delete Only If Merged Into" +msgstr "Chỉ xóa nếu đã hòa trá»™n và o" + +#: lib/branch_delete.tcl:53 lib/remote_branch_delete.tcl:120 +msgid "Always (Do not perform merge checks)" +msgstr "Luôn (Không thá»±c hiện kiểm tra hòa trá»™n)" + +#: lib/branch_delete.tcl:103 +#, tcl-format +msgid "The following branches are not completely merged into %s:" +msgstr "Các nhánh sau đây không được hòa trá»™n hoà n toà n và o %s:" + +#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:218 +msgid "" +"Recovering deleted branches is difficult.\n" +"\n" +"Delete the selected branches?" +msgstr "" +"Khôi phục các nhánh đã bị xóa là việc khó khăn.\n" +"\n" +"Xóa nhánh đã chá»n chứ?" + +#: lib/branch_delete.tcl:141 +#, tcl-format +msgid "" +"Failed to delete branches:\n" +"%s" +msgstr "" +"Gặp lá»—i khi xóa các nhánh:\n" +"%s" + +#: lib/branch_rename.tcl:15 lib/branch_rename.tcl:23 +msgid "Rename Branch" +msgstr "Äổi tên nhánh" + +#: lib/branch_rename.tcl:28 +msgid "Rename" +msgstr "Äổi tên" + +#: lib/branch_rename.tcl:38 +msgid "Branch:" +msgstr "Nhánh:" + +#: lib/branch_rename.tcl:46 +msgid "New Name:" +msgstr "Tên má»›i:" + +#: lib/branch_rename.tcl:81 +msgid "Please select a branch to rename." +msgstr "Hãy chá»n nhánh cần đổi tên." + +#: lib/branch_rename.tcl:102 lib/checkout_op.tcl:202 +#, tcl-format +msgid "Branch '%s' already exists." +msgstr "Nhánh '%s' đã có rồi." + +#: lib/branch_rename.tcl:123 +#, tcl-format +msgid "Failed to rename '%s'." +msgstr "Gặp lá»—i khi đổi tên '%s'." + +#: lib/browser.tcl:17 +msgid "Starting..." +msgstr "Äang khởi Ä‘á»™ng..." + +#: lib/browser.tcl:27 +msgid "File Browser" +msgstr "Bá»™ duyệt táºp tin" + +#: lib/browser.tcl:132 lib/browser.tcl:149 +#, tcl-format +msgid "Loading %s..." +msgstr "Äang tải %s..." + +#: lib/browser.tcl:193 +msgid "[Up To Parent]" +msgstr "[Tá»›i cha mẹ]" + +#: lib/browser.tcl:275 lib/browser.tcl:282 +msgid "Browse Branch Files" +msgstr "Duyệt các táºp tin nhánh" + +#: lib/browser.tcl:288 lib/choose_repository.tcl:406 +#: lib/choose_repository.tcl:493 lib/choose_repository.tcl:502 +#: lib/choose_repository.tcl:1029 +msgid "Browse" +msgstr "Tìm duyệt" + +#: lib/checkout_op.tcl:85 +#, tcl-format +msgid "Fetching %s from %s" +msgstr "Äang lấy vá» %s từ %s" + +#: lib/checkout_op.tcl:133 +#, tcl-format +msgid "fatal: Cannot resolve %s" +msgstr "gặp lá»—i nghiêm trá»ng: Không thể phân giải %s" + +#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:30 +#: lib/sshkey.tcl:55 +msgid "Close" +msgstr "Äóng" + +#: lib/checkout_op.tcl:175 +#, tcl-format +msgid "Branch '%s' does not exist." +msgstr "ChÆ°a có nhánh '%s'" + +#: lib/checkout_op.tcl:194 +#, tcl-format +msgid "Failed to configure simplified git-pull for '%s'." +msgstr "Gặp lá»—i khi cấu hình git-pull Ä‘Æ¡n giản dà nh cho '%s'." + +#: lib/checkout_op.tcl:229 +#, tcl-format +msgid "" +"Branch '%s' already exists.\n" +"\n" +"It cannot fast-forward to %s.\n" +"A merge is required." +msgstr "" +"Nhánh '%s' đã sẵn có.\n" +"\n" +"Không thể fast-forward thà nh %s.\n" +"Bạn cần phải hòa trá»™n." + +#: lib/checkout_op.tcl:243 +#, tcl-format +msgid "Merge strategy '%s' not supported." +msgstr "Không há»— trợ chiến lược hòa trá»™n '%s'." + +#: lib/checkout_op.tcl:262 +#, tcl-format +msgid "Failed to update '%s'." +msgstr "Gặp lá»—i khi cáºp nháºt '%s'." + +#: lib/checkout_op.tcl:274 +msgid "Staging area (index) is already locked." +msgstr "Vùng bệ phóng (chỉ mục) đã bị khóa rồi." + +#: lib/checkout_op.tcl:289 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before the current branch can be changed.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"Trạng thái quét không khá»›p vá»›i trạng thái kho.\n" +"\n" +"Có Git khác đã sá»a kho nà y kể từ lần quét cuối. Cần quét lại trÆ°á»›c khi thá»±c " +"hiện việc chuyển nhánh.\n" +"\n" +"Sẽ thá»±c hiện việc quét lại ngay bây giá»i.\n" + +#: lib/checkout_op.tcl:345 +#, tcl-format +msgid "Updating working directory to '%s'..." +msgstr "Cáºp nháºt thÆ° mục là m việc thà nh '%s'..." + +#: lib/checkout_op.tcl:346 +msgid "files checked out" +msgstr "các táºp tin cần lấy ra" + +#: lib/checkout_op.tcl:376 +#, tcl-format +msgid "Aborted checkout of '%s' (file level merging is required)." +msgstr "Hủy bá» lấy ra '%s' (cần hòa trá»™n mức táºp tin)." + +#: lib/checkout_op.tcl:377 +msgid "File level merge required." +msgstr "Cần mức hòa trá»™n táºp tin." + +#: lib/checkout_op.tcl:381 +#, tcl-format +msgid "Staying on branch '%s'." +msgstr "Äang ở trên nhánh '%s'." + +#: lib/checkout_op.tcl:452 +msgid "" +"You are no longer on a local branch.\n" +"\n" +"If you wanted to be on a branch, create one now starting from 'This Detached " +"Checkout'." +msgstr "" +"Bạn hiện không còn ở nhánh ná»™i bá»™.\n" +"\n" +"Nếu bạn muốn trên má»™t nhánh, hãy tạo má»™t cái từ 'Äây là lấy ra tách rá»i'." + +#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507 +#, tcl-format +msgid "Checked out '%s'." +msgstr "Äã lấy ra '%s'." + +#: lib/checkout_op.tcl:535 +#, tcl-format +msgid "Resetting '%s' to '%s' will lose the following commits:" +msgstr "Äặt lại '%s' thà nh '%s' sẽ là m mất những lần chuyển giao sau đây:" + +#: lib/checkout_op.tcl:557 +msgid "Recovering lost commits may not be easy." +msgstr "Lấy lại những lần chuyển giao đã mất là không dá»…." + +#: lib/checkout_op.tcl:562 +#, tcl-format +msgid "Reset '%s'?" +msgstr "Äặt lại '%s'?" + +#: lib/checkout_op.tcl:567 lib/merge.tcl:166 lib/tools_dlg.tcl:336 +msgid "Visualize" +msgstr "Trá»±c quan" + +#: lib/checkout_op.tcl:635 +#, tcl-format +msgid "" +"Failed to set current branch.\n" +"\n" +"This working directory is only partially switched. We successfully updated " +"your files, but failed to update an internal Git file.\n" +"\n" +"This should not have occurred. %s will now close and give up." +msgstr "" +"Gặp lá»—i khi đặt nhánh hiện hà nh.\n" +"\n" +"ThÆ° mục là m việc chỉ chuyển không hoà n toà n. Chúng tôi cáºp nháºt thà nh công " +"các táºp tin của bạn, nhÆ°ng lại gặp lá»—i khi cáºp nháºt má»™t táºp tin của Git.\n" +"\n" +"Äiá»u nà y đáng lẽ không thể xảy ra. %s giá» sẽ đóng lại và đầu hà ng." + +#: lib/choose_font.tcl:41 +msgid "Select" +msgstr "Chá»n" + +#: lib/choose_font.tcl:55 +msgid "Font Family" +msgstr "Há» phông chữ" + +#: lib/choose_font.tcl:76 +msgid "Font Size" +msgstr "Cỡ phông chữ" + +#: lib/choose_font.tcl:93 +msgid "Font Example" +msgstr "Phông chữ và dụ" + +#: lib/choose_font.tcl:105 +msgid "" +"This is example text.\n" +"If you like this text, it can be your font." +msgstr "" +"Äây là chữ mẫu.\n" +"Nếu bạn thÃch chữ nhÆ° thế nà y thì chá»n phông chữ nà y." + +#: lib/choose_repository.tcl:32 +msgid "Git Gui" +msgstr "Git Gui" + +#: lib/choose_repository.tcl:91 lib/choose_repository.tcl:396 +msgid "Create New Repository" +msgstr "Tạo kho má»›i" + +#: lib/choose_repository.tcl:97 +msgid "New..." +msgstr "Má»›i..." + +#: lib/choose_repository.tcl:104 lib/choose_repository.tcl:480 +msgid "Clone Existing Repository" +msgstr "Nhân bản má»™t kho sẵn có" + +#: lib/choose_repository.tcl:115 +msgid "Clone..." +msgstr "Nhân bản..." + +#: lib/choose_repository.tcl:122 lib/choose_repository.tcl:1019 +msgid "Open Existing Repository" +msgstr "Mở má»™t kho đã có." + +#: lib/choose_repository.tcl:128 +msgid "Open..." +msgstr "Mở..." + +#: lib/choose_repository.tcl:141 +msgid "Recent Repositories" +msgstr "Các kho má»›i dùng" + +#: lib/choose_repository.tcl:147 +msgid "Open Recent Repository:" +msgstr "Mở kho má»›i dùng:" + +#: lib/choose_repository.tcl:315 lib/choose_repository.tcl:322 +#: lib/choose_repository.tcl:329 +#, tcl-format +msgid "Failed to create repository %s:" +msgstr "Gặp lá»—i khi tạo kho %s:" + +#: lib/choose_repository.tcl:401 +msgid "Directory:" +msgstr "ThÆ° mục:" + +#: lib/choose_repository.tcl:431 lib/choose_repository.tcl:552 +#: lib/choose_repository.tcl:1053 +msgid "Git Repository" +msgstr "Kho Git" + +#: lib/choose_repository.tcl:456 +#, tcl-format +msgid "Directory %s already exists." +msgstr "ThÆ° mục %s đã sẵn có." + +#: lib/choose_repository.tcl:460 +#, tcl-format +msgid "File %s already exists." +msgstr "Táºp tin %s đã có sẵn." + +#: lib/choose_repository.tcl:475 +msgid "Clone" +msgstr "Nhân bản" + +#: lib/choose_repository.tcl:488 +msgid "Source Location:" +msgstr "Vị trà nguồn:" + +#: lib/choose_repository.tcl:497 +msgid "Target Directory:" +msgstr "ThÆ° mục Ä‘Ãch:" + +#: lib/choose_repository.tcl:507 +msgid "Clone Type:" +msgstr "Kiểu nhân bản:" + +#: lib/choose_repository.tcl:512 +msgid "Standard (Fast, Semi-Redundant, Hardlinks)" +msgstr "Tiêu chuẩn (Nhanh, Semi-Redundant, Hardlinks)" + +#: lib/choose_repository.tcl:517 +msgid "Full Copy (Slower, Redundant Backup)" +msgstr "Sao chép toà n bá»™ (Cháºm hÆ¡n, Redundant Backup)" + +#: lib/choose_repository.tcl:522 +msgid "Shared (Fastest, Not Recommended, No Backup)" +msgstr "Chia sẻ (Nhanh nhất, Không nên dùng, No Backup)" + +#: lib/choose_repository.tcl:558 lib/choose_repository.tcl:605 +#: lib/choose_repository.tcl:751 lib/choose_repository.tcl:821 +#: lib/choose_repository.tcl:1059 lib/choose_repository.tcl:1067 +#, tcl-format +msgid "Not a Git repository: %s" +msgstr "Không phải là kho git: %s" + +#: lib/choose_repository.tcl:594 +msgid "Standard only available for local repository." +msgstr "Tiêu chuẩn chỉ sẵn sà ng vá»›i kho ná»™i bá»™." + +#: lib/choose_repository.tcl:598 +msgid "Shared only available for local repository." +msgstr "'Chia sẻ' chỉ sẵn sà ng vá»›i kho ná»™i bá»™." + +#: lib/choose_repository.tcl:619 +#, tcl-format +msgid "Location %s already exists." +msgstr "Miá»n địa phÆ°Æ¡ng %s đã sẵn có." + +#: lib/choose_repository.tcl:630 +msgid "Failed to configure origin" +msgstr "Gặp lá»—i khi cấu hình bản gốc" + +#: lib/choose_repository.tcl:642 +msgid "Counting objects" +msgstr "Äang đếm số đối tượng" + +#: lib/choose_repository.tcl:643 +msgid "buckets" +msgstr "xô" + +#: lib/choose_repository.tcl:667 +#, tcl-format +msgid "Unable to copy objects/info/alternates: %s" +msgstr "Không thể sao chép objects/info/alternates: %s" + +#: lib/choose_repository.tcl:703 +#, tcl-format +msgid "Nothing to clone from %s." +msgstr "Không có gì để nhân bản từ %s" + +#: lib/choose_repository.tcl:705 lib/choose_repository.tcl:919 +#: lib/choose_repository.tcl:931 +msgid "The 'master' branch has not been initialized." +msgstr "Nhánh 'master' chÆ°a được khởi tạo." + +#: lib/choose_repository.tcl:718 +msgid "Hardlinks are unavailable. Falling back to copying." +msgstr "Liên kết cứng không sẵn sà ng. Trở lại chế Ä‘á»™ sao chép." + +#: lib/choose_repository.tcl:730 +#, tcl-format +msgid "Cloning from %s" +msgstr "Äang nhân bản từ %s" + +#: lib/choose_repository.tcl:761 +msgid "Copying objects" +msgstr "Äang chép các đối tượng" + +#: lib/choose_repository.tcl:762 +msgid "KiB" +msgstr "KiB" + +#: lib/choose_repository.tcl:786 +#, tcl-format +msgid "Unable to copy object: %s" +msgstr "Không thể chép đối tượng: %s" + +#: lib/choose_repository.tcl:796 +msgid "Linking objects" +msgstr "Äang liên kết các đối tượng" + +#: lib/choose_repository.tcl:797 +msgid "objects" +msgstr "đối tượng" + +#: lib/choose_repository.tcl:805 +#, tcl-format +msgid "Unable to hardlink object: %s" +msgstr "Không thể tạo liên kết cứng đối tượng: %s" + +#: lib/choose_repository.tcl:860 +msgid "Cannot fetch branches and objects. See console output for details." +msgstr "" +"Không thể lấy các nhánh và đối tượng. Xem kết xuất từ bảng Ä‘iá»u khiển để có " +"thêm thông tin." + +#: lib/choose_repository.tcl:871 +msgid "Cannot fetch tags. See console output for details." +msgstr "" +"Không thể lấy vá» các thẻ. Hãy xem kết xuất từ bảng Ä‘iá»u khiển để có thêm " +"thông tin chi tiết." + +#: lib/choose_repository.tcl:895 +msgid "Cannot determine HEAD. See console output for details." +msgstr "" +"Không thể dò tìm HEAD. Hãy xem kết xuất từ bảng Ä‘iá»u khiển để có thêm thông " +"tin chi tiết." + +#: lib/choose_repository.tcl:904 +#, tcl-format +msgid "Unable to cleanup %s" +msgstr "Không thể dá»n sạch %s" + +#: lib/choose_repository.tcl:910 +msgid "Clone failed." +msgstr "Gặp lá»—i khi nhân bản." + +#: lib/choose_repository.tcl:917 +msgid "No default branch obtained." +msgstr "Không tìm thấy nhánh mặc định." + +#: lib/choose_repository.tcl:928 +#, tcl-format +msgid "Cannot resolve %s as a commit." +msgstr "Không thể phân giải %s nhÆ° là má»™t lần chuyển giao." + +#: lib/choose_repository.tcl:940 +msgid "Creating working directory" +msgstr "Äang tạo thÆ° mục là m việc" + +#: lib/choose_repository.tcl:941 lib/index.tcl:70 lib/index.tcl:136 +#: lib/index.tcl:207 +msgid "files" +msgstr "táºp tin" + +#: lib/choose_repository.tcl:970 +msgid "Initial file checkout failed." +msgstr "Lấy ra táºp tin khởi tạo gặp lá»—i." + +#: lib/choose_repository.tcl:1014 +msgid "Open" +msgstr "Mở" + +#: lib/choose_repository.tcl:1024 +msgid "Repository:" +msgstr "Kho:" + +#: lib/choose_repository.tcl:1073 +#, tcl-format +msgid "Failed to open repository %s:" +msgstr "Gặp lá»—i khi mở kho %s:" + +#: lib/choose_rev.tcl:52 +msgid "This Detached Checkout" +msgstr "Äây là việc lấy ra bị tách rá»i" + +#: lib/choose_rev.tcl:60 +msgid "Revision Expression:" +msgstr "Biểu thức Ä‘iểm xét:" + +#: lib/choose_rev.tcl:72 +msgid "Local Branch" +msgstr "Nhánh ná»™i bá»™" + +#: lib/choose_rev.tcl:77 +msgid "Tracking Branch" +msgstr "Nhánh Theo dõi" + +#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544 +msgid "Tag" +msgstr "Thẻ" + +#: lib/choose_rev.tcl:321 +#, tcl-format +msgid "Invalid revision: %s" +msgstr "Äiểm xét duyệt không hợp lệ: %s" + +#: lib/choose_rev.tcl:342 +msgid "No revision selected." +msgstr "ChÆ°a chá»n Ä‘iểm xét duyệt." + +#: lib/choose_rev.tcl:350 +msgid "Revision expression is empty." +msgstr "Biểu thức chÃnh quy rá»—ng." + +#: lib/choose_rev.tcl:537 +msgid "Updated" +msgstr "Äã cáºp nháºt" + +#: lib/choose_rev.tcl:565 +msgid "URL" +msgstr "URL" + +#: lib/commit.tcl:9 +msgid "" +"There is nothing to amend.\n" +"\n" +"You are about to create the initial commit. There is no commit before this " +"to amend.\n" +msgstr "" +"Ở đây chẳng có gì để tu bổ cả.\n" +"\n" +"Bạn Ä‘ang tạo lần chuyển giao khởi tạo. Ở đây không có lần chuyển giao trÆ°á»›c " +"nà o để mà tu bổ.\n" + +#: lib/commit.tcl:18 +msgid "" +"Cannot amend while merging.\n" +"\n" +"You are currently in the middle of a merge that has not been fully " +"completed. You cannot amend the prior commit unless you first abort the " +"current merge activity.\n" +msgstr "" +"Không thể tu bổ trong khi hòa trá»™n.\n" +"\n" +"Bạn hiện Ä‘ang ở giữa quá trình hòa trôn, mà nó chÆ°a hoà n tất. Bạn không thể " +"tu bổ lần chuyển giao tiá»n nhiệm trừ phi bạn bãi bá» lần hòa trá»™n hiện Ä‘ang " +"kÃch hoạt.\n" + +#: lib/commit.tcl:48 +msgid "Error loading commit data for amend:" +msgstr "Gặp lá»—i khi tải dữ liệu chuyển giao cho lệnh tu bổ:" + +#: lib/commit.tcl:75 +msgid "Unable to obtain your identity:" +msgstr "Không thể lấy được định danh của bạn:" + +#: lib/commit.tcl:80 +msgid "Invalid GIT_COMMITTER_IDENT:" +msgstr "GIT_COMMITTER_IDENT không hợp lệ:" + +#: lib/commit.tcl:129 +#, tcl-format +msgid "warning: Tcl does not support encoding '%s'." +msgstr "cảnh báo: Tcl không há»— trợ bảng mã '%s'." + +#: lib/commit.tcl:149 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before another commit can be created.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"Trạng thái quét không khá»›p vá»›i trạng thái kho.\n" +"\n" +"Có Git khác đã sá»a kho nà y kể từ lần quét cuối. Cần quét lại trÆ°á»›c khi thá»±c " +"hiện việc chuyển giao khác.\n" +"\n" +"Sẽ thá»±c hiện việc quét lại ngay bây giá»i.\n" + +#: lib/commit.tcl:173 +#, tcl-format +msgid "" +"Unmerged files cannot be committed.\n" +"\n" +"File %s has merge conflicts. You must resolve them and stage the file " +"before committing.\n" +msgstr "" +"Các táºp tin chÆ°a hòa trá»™n không thể được chuyển giao.\n" +"\n" +"Táºp tin %s có xung Ä‘á»™t hòa trá»™n. Bạn phải giải quyết chúng và đưa lên bệ " +"phóng trÆ°á»›c khi chuyển giao.\n" + +#: lib/commit.tcl:181 +#, tcl-format +msgid "" +"Unknown file state %s detected.\n" +"\n" +"File %s cannot be committed by this program.\n" +msgstr "" +"Tìm thấy trạng thái táºp tim không hiểu %s.\n" +"\n" +"Táºp tin %s không thể được chuyển giao bởi chÆ°Æ¡ng trình nà y.\n" + +#: lib/commit.tcl:189 +msgid "" +"No changes to commit.\n" +"\n" +"You must stage at least 1 file before you can commit.\n" +msgstr "" +"Không có thay đổi nà o cần chuyển giao.\n" +"\n" +"Bạn phải Ä‘Æ°a lên bệ phóng Ãt nhất là má»™t táºp tin trÆ°á»›c khi có thể chuyển " +"giao.\n" + +#: lib/commit.tcl:204 +msgid "" +"Please supply a commit message.\n" +"\n" +"A good commit message has the following format:\n" +"\n" +"- First line: Describe in one sentence what you did.\n" +"- Second line: Blank\n" +"- Remaining lines: Describe why this change is good.\n" +msgstr "" +"Hãy cung cấp lá»i chú giải cho lần chuyển giao.\n" +"\n" +"Lá»i chú giải tốt nhất nên có định dạng sau:\n" +"\n" +"- Dòng đầu tiên: Mô tả những gì bạn đã là m.\n" +"- Dòng thứ hai: Äể trống\n" +"- Các dòng còn lại: Mô tả xem vì sao những thay đổi nà y là cần thiết.\n" + +#: lib/commit.tcl:235 +msgid "Calling pre-commit hook..." +msgstr "Äang gá»i móc (hook) pre-commit..." + +#: lib/commit.tcl:250 +msgid "Commit declined by pre-commit hook." +msgstr "Lần chuyển giao bị khÆ°á»›c từ do móc pre-commit." + +#: lib/commit.tcl:269 +msgid "" +"You are about to commit on a detached head. This is a potentially dangerous " +"thing to do because if you switch to another branch you will lose your " +"changes and it can be difficult to retrieve them later from the reflog. You " +"should probably cancel this commit and create a new branch to continue.\n" +" \n" +" Do you really want to proceed with your Commit?" +msgstr "" +"Bạn thá»±c hiện chuyển giao ở chá»— đã tách rá»i khá»i các đầu. Äiá»u nà y là nguy " +"hiểm bởi nếu bạn chuyển sang nhánh khác thì bạn sẽ mất những thay đổi nà y và " +"việc lấy lại chúng từ reflog cÅ©ng khó khăn. Bạn gần nhÆ° chắc chắn là nên hủy " +"bá» lần chuyển giao nà y và tạo má»™t nhánh má»›i trÆ°á»›c khi tiếp tục.\n" +" \n" +" Bạn có thá»±c sá»± muốn tiếp tục chuyển giao?" + +#: lib/commit.tcl:290 +msgid "Calling commit-msg hook..." +msgstr "Äang gá»i móc commit-msg..." + +#: lib/commit.tcl:305 +msgid "Commit declined by commit-msg hook." +msgstr "Lần chuyển giao bị khÆ°á»›c từ do móc commit-msg." + +#: lib/commit.tcl:318 +msgid "Committing changes..." +msgstr "Chuyển giao các thay đổi..." + +#: lib/commit.tcl:334 +msgid "write-tree failed:" +msgstr "gặp lá»—i khi write-tree:" + +#: lib/commit.tcl:335 lib/commit.tcl:379 lib/commit.tcl:400 +msgid "Commit failed." +msgstr "Gặp lá»—i khi chuyển giao." + +#: lib/commit.tcl:352 +#, tcl-format +msgid "Commit %s appears to be corrupt" +msgstr "Lần chuyển giao %s có vẻ đã hÆ° há»ng" + +#: lib/commit.tcl:357 +msgid "" +"No changes to commit.\n" +"\n" +"No files were modified by this commit and it was not a merge commit.\n" +"\n" +"A rescan will be automatically started now.\n" +msgstr "" +"Không có thay đổi nà o để chuyển giao.\n" +"\n" +"Không có táºp tin nà o được sá»a bởi lần chuyển giao nà y và nó không phải là " +"lần chuyển giao hòa trá»™n.\n" +"\n" +"Sẽ thá»±c hiện việc quét lại ngay bây giá».\n" + +#: lib/commit.tcl:364 +msgid "No changes to commit." +msgstr "Không có thay đổi nà o để chuyển giao." + +#: lib/commit.tcl:378 +msgid "commit-tree failed:" +msgstr "commit-tree gặp lá»—i:" + +#: lib/commit.tcl:399 +msgid "update-ref failed:" +msgstr "cáºp nháºt tham chiếu thất bại:" + +#: lib/commit.tcl:492 +#, tcl-format +msgid "Created commit %s: %s" +msgstr "Lần chuyển giao đã tạo %s: %s" + +#: lib/console.tcl:59 +msgid "Working... please wait..." +msgstr "Äang chạy.. vui lòng đợi..." + +#: lib/console.tcl:186 +msgid "Success" +msgstr "Thà nh công" + +#: lib/console.tcl:200 +msgid "Error: Command Failed" +msgstr "Lá»—i: Câu lệnh gặp lá»—i" + +#: lib/database.tcl:42 +msgid "Number of loose objects" +msgstr "Số lượng đối tượng bị mất" + +#: lib/database.tcl:43 +msgid "Disk space used by loose objects" +msgstr "Dung lượng Ä‘Ä©a được dùng bởi các đối tượng bị mất" + +#: lib/database.tcl:44 +msgid "Number of packed objects" +msgstr "Số lượng đối tượng được đóng gói" + +#: lib/database.tcl:45 +msgid "Number of packs" +msgstr "Số lượng gói" + +#: lib/database.tcl:46 +msgid "Disk space used by packed objects" +msgstr "Dung lượng Ä‘Ä©a được dùng bởi các đối tượng gói" + +#: lib/database.tcl:47 +msgid "Packed objects waiting for pruning" +msgstr "Các đối tượng gói chá» xén bá»›t" + +#: lib/database.tcl:48 +msgid "Garbage files" +msgstr "Các táºp tin rác" + +#: lib/database.tcl:72 +msgid "Compressing the object database" +msgstr "Nén cÆ¡ sở dữ liệu đối tượng" + +#: lib/database.tcl:83 +msgid "Verifying the object database with fsck-objects" +msgstr "Äang kiểm tra cÆ¡ sở dữ liệu đối tượng bằng lệnh fsck" + +#: lib/database.tcl:107 +#, tcl-format +msgid "" +"This repository currently has approximately %i loose objects.\n" +"\n" +"To maintain optimal performance it is strongly recommended that you compress " +"the database.\n" +"\n" +"Compress the database now?" +msgstr "" +"Hiện kho nà y mất Æ°á»›c chừng khoảng %i đối tượng.\n" +"\n" +"Äể tối Æ°u hóa hiệu suất, khuyến nghị bạn nên nén cÆ¡ sở dữ liệu của mình " +"lại.\n" +"\n" +"Nén cÆ¡ sở dữ liệu chứ?" + +#: lib/date.tcl:25 +#, tcl-format +msgid "Invalid date from Git: %s" +msgstr "Ngà y tháng không hợp lệ từ Git: %s" + +#: lib/diff.tcl:64 +#, tcl-format +msgid "" +"No differences detected.\n" +"\n" +"%s has no changes.\n" +"\n" +"The modification date of this file was updated by another application, but " +"the content within the file was not changed.\n" +"\n" +"A rescan will be automatically started to find other files which may have " +"the same state." +msgstr "" +"Không tìm thấy khác biệt gì.\n" +"\n" +"%s không thay đổi.\n" +"\n" +"Thá»i gian sá»a đổi của táºp tin nà y được cáºp nháºt bởi ứng dụng khác, nhÆ°ng ná»™i " +"dung bên trong táºp tin thì không thay đổi.\n" +"\n" +"Sẽ thá»±c hiện quét lại má»™t cách tá»± Ä‘á»™ng để tìm các táºp tin khác cái mà có thể " +"có cùng tình trạng." + +#: lib/diff.tcl:104 +#, tcl-format +msgid "Loading diff of %s..." +msgstr "Äang tải diff của %s..." + +#: lib/diff.tcl:125 +msgid "" +"LOCAL: deleted\n" +"REMOTE:\n" +msgstr "" +"NỘIBỘ: đã xoá\n" +"MÃYCHỦ:\n" + +#: lib/diff.tcl:130 +msgid "" +"REMOTE: deleted\n" +"LOCAL:\n" +msgstr "" +"MÃYCHỦ: đã xoá\n" +"NỘIBỘ:\n" + +#: lib/diff.tcl:137 +msgid "LOCAL:\n" +msgstr "NỘI-BỘ:\n" + +#: lib/diff.tcl:140 +msgid "REMOTE:\n" +msgstr "MÃY-CHỦ:\n" + +#: lib/diff.tcl:202 lib/diff.tcl:340 +#, tcl-format +msgid "Unable to display %s" +msgstr "Không thể hiển thị %s" + +#: lib/diff.tcl:203 +msgid "Error loading file:" +msgstr "Lá»—i khi tải táºp tin:" + +#: lib/diff.tcl:210 +msgid "Git Repository (subproject)" +msgstr "Kho Git (dá»± án con)" + +#: lib/diff.tcl:222 +msgid "* Binary file (not showing content)." +msgstr "* Táºp tin nhị phân (không hiển thị ná»™i dung)." + +#: lib/diff.tcl:227 +#, tcl-format +msgid "" +"* Untracked file is %d bytes.\n" +"* Showing only first %d bytes.\n" +msgstr "" +"* Táºp tin chÆ°a theo dõi là %d byte.\n" +"* Chỉ hiển thị %d byte đầu .\n" + +#: lib/diff.tcl:233 +#, tcl-format +msgid "" +"\n" +"* Untracked file clipped here by %s.\n" +"* To see the entire file, use an external editor.\n" +msgstr "" +"\n" +"* Táºp tin chÆ°a theo dõi được cắt tại đây bởi %s.\n" +"* Äể xem toà n bá»™ táºp tin, hãy dùng ứng dụng biên soạn bên ngoà i.\n" + +#: lib/diff.tcl:560 +msgid "Failed to unstage selected hunk." +msgstr "Gặp lá»—i khi bá» ra khá»i bệ phóng khối đã chá»n" + +#: lib/diff.tcl:567 +msgid "Failed to stage selected hunk." +msgstr "Gặp lá»—i khi Ä‘Æ°a lên bệ phóng khối đã chá»n" + +#: lib/diff.tcl:646 +msgid "Failed to unstage selected line." +msgstr "Gặp lá»—i khi bá» ra khá»i bệ phóng dòng đã chá»n" + +#: lib/diff.tcl:654 +msgid "Failed to stage selected line." +msgstr "Gặp lá»—i khi Ä‘Æ°a lên bệ phóng dòng đã chá»n" + +#: lib/encoding.tcl:443 +msgid "Default" +msgstr "Mặc định" + +#: lib/encoding.tcl:448 +#, tcl-format +msgid "System (%s)" +msgstr "Hệ thống (%s)" + +#: lib/encoding.tcl:459 lib/encoding.tcl:465 +msgid "Other" +msgstr "Khác" + +#: lib/error.tcl:20 lib/error.tcl:116 +msgid "error" +msgstr "lá»—i" + +#: lib/error.tcl:36 +msgid "warning" +msgstr "cảnh báo" + +#: lib/error.tcl:96 +msgid "You must correct the above errors before committing." +msgstr "Bạn phải sá»a các lá»—i trên trÆ°á»›c khi chuyển giao." + +#: lib/index.tcl:6 +msgid "Unable to unlock the index." +msgstr "Không thể bá» khóa bảng mục lục" + +#: lib/index.tcl:17 +msgid "Index Error" +msgstr "Lá»—i mục lục" + +#: lib/index.tcl:19 +msgid "" +"Updating the Git index failed. A rescan will be automatically started to " +"resynchronize git-gui." +msgstr "" +"Cáºp nháºt mục lục cho Git gặp lá»—i. Việc quét lại sẽ tá»± Ä‘á»™ng được khởi chạy để " +"đồng hóa lại vá»›i git-gui." + +#: lib/index.tcl:30 +msgid "Continue" +msgstr "Tiếp tục" + +#: lib/index.tcl:33 +msgid "Unlock Index" +msgstr "Bá» khóa mục lục" + +#: lib/index.tcl:298 +#, tcl-format +msgid "Unstaging %s from commit" +msgstr "Bá» %s ra khá»i việc chuyển giao" + +#: lib/index.tcl:337 +msgid "Ready to commit." +msgstr "Äã chuyển giao rồi." + +#: lib/index.tcl:350 +#, tcl-format +msgid "Adding %s" +msgstr "Äang thêm %s" + +#: lib/index.tcl:380 +#, tcl-format +msgid "Stage %d untracked files?" +msgstr "ÄÆ°a %d táºp tin chÆ°a theo dõi lên bệ phóng để chuyển giao?" + +#: lib/index.tcl:428 +#, tcl-format +msgid "Revert changes in file %s?" +msgstr "Hoà n nguyên các thay đổi trong táºp tin %s?" + +#: lib/index.tcl:430 +#, tcl-format +msgid "Revert changes in these %i files?" +msgstr "Hoà n nguyên các thay đổi trong %i táºp tin?" + +#: lib/index.tcl:438 +msgid "Any unstaged changes will be permanently lost by the revert." +msgstr "" +"Má»i thay đổi chÆ°a được Ä‘Æ°a lên bệ phóng sẽ mất vÄ©nh viá»…n do lệnh revert." + +#: lib/index.tcl:441 +msgid "Do Nothing" +msgstr "Không là m gì" + +#: lib/index.tcl:459 +msgid "Reverting selected files" +msgstr "Äang hoà n nguyên các táºp tin đã chá»n" + +#: lib/index.tcl:463 +#, tcl-format +msgid "Reverting %s" +msgstr "Äang hoà n nguyên %s" + +#: lib/line.tcl:17 +msgid "Goto Line:" +msgstr "Nhảy đến dòng:" + +#: lib/line.tcl:23 +msgid "Go" +msgstr "Nhảy" + +#: lib/merge.tcl:13 +msgid "" +"Cannot merge while amending.\n" +"\n" +"You must finish amending this commit before starting any type of merge.\n" +msgstr "" +"Không thể hòa trá»™n trong khi tu bổ.\n" +"\n" +"Bạn phải hoà n tất việc tu bổ lần chuyển giao trÆ°á»›c khi bắt đầu bất kỳ kiểu " +"hòa trá»™n nà o.\n" + +#: lib/merge.tcl:27 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before a merge can be performed.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"Trạng thái quét không khá»›p vá»›i trạng thái kho.\n" +"\n" +"Có Git khác đã sá»a kho nà y kể từ lần quét cuối. Cần quét lại trÆ°á»›c khi thá»±c " +"hiện việc hòa trá»™n.\n" +"\n" +"Sẽ thá»±c hiện việc quét lại ngay bây giá»i.\n" + +#: lib/merge.tcl:45 +#, tcl-format +msgid "" +"You are in the middle of a conflicted merge.\n" +"\n" +"File %s has merge conflicts.\n" +"\n" +"You must resolve them, stage the file, and commit to complete the current " +"merge. Only then can you begin another merge.\n" +msgstr "" +"Bạn Ä‘ang ở giữa việc thay đổi.\n" +"\n" +"Táºp tin %s đã bị sá»a đổi.\n" +"\n" +"Bạn nên hoà n thiện lần chuyển giao hiện nay trÆ°á»›c khi hòa trá»™n. Chỉ có thế " +"bạn má»›i có thể bắt đầu hòa trá»™n cái .\n" + +#: lib/merge.tcl:55 +#, tcl-format +msgid "" +"You are in the middle of a change.\n" +"\n" +"File %s is modified.\n" +"\n" +"You should complete the current commit before starting a merge. Doing so " +"will help you abort a failed merge, should the need arise.\n" +msgstr "" +"Bạn Ä‘ang ở giữa việc thay đổi.\n" +"\n" +"Táºp tin %s đã bị sá»a đổi.\n" +"\n" +"Bạn nên hoà n thiện lần chuyển giao hiện nay trÆ°á»›c khi hòa trá»™n. Là m nhÆ° váºy " +"giúp bạn có thể loại bá» việc lá»—i trong hòa trá»™n.\n" + +#: lib/merge.tcl:108 +#, tcl-format +msgid "%s of %s" +msgstr "%s trên %s" + +#: lib/merge.tcl:122 +#, tcl-format +msgid "Merging %s and %s..." +msgstr "Äang hòa trá»™n %s và %s..." + +#: lib/merge.tcl:133 +msgid "Merge completed successfully." +msgstr "Hòa trá»™n đã thá»±c hiện thà nh công." + +#: lib/merge.tcl:135 +msgid "Merge failed. Conflict resolution is required." +msgstr "Hòa trá»™n gặp lá»—i. Cần giải quyết các xung Ä‘á»™t trÆ°á»›c." + +#: lib/merge.tcl:160 +#, tcl-format +msgid "Merge Into %s" +msgstr "Hòa trá»™n và o %s" + +#: lib/merge.tcl:179 +msgid "Revision To Merge" +msgstr "Äiểm cần hòa trá»™n" + +#: lib/merge.tcl:214 +msgid "" +"Cannot abort while amending.\n" +"\n" +"You must finish amending this commit.\n" +msgstr "" +"Không thể hủy bá» trong khi Ä‘ang tu bổ.\n" +"\n" +"Bạn cần phải hoà n tất việc tu bổ lần chuyển giao nà y.\n" + +#: lib/merge.tcl:224 +msgid "" +"Abort merge?\n" +"\n" +"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" +"\n" +"Continue with aborting the current merge?" +msgstr "" +"Bãi bá» hòa trá»™n?\n" +"\n" +"Bãi bá» hòa trá»™n hiện nay sẽ là m *TẤT CẢ* các thay đổi chÆ°a được chuyển giao " +"bị mất.\n" +"\n" +"Tiếp tục bãi bá» việc hòa trá»™n hiện tại?" + +#: lib/merge.tcl:230 +msgid "" +"Reset changes?\n" +"\n" +"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" +"\n" +"Continue with resetting the current changes?" +msgstr "" +"Äặt lại má»i thay đổi?\n" +"\n" +"Việc đặt lại các thay đổi sẽ là m *MỌI* thay đổi chÆ°a chuyển giao biến mất.\n" +"\n" +"Vẫn tiếp tục đặt lại các thay đổi hiện tại?" + +#: lib/merge.tcl:241 +msgid "Aborting" +msgstr "Bãi bá»" + +#: lib/merge.tcl:241 +msgid "files reset" +msgstr "đặt lại các táºp tin" + +#: lib/merge.tcl:269 +msgid "Abort failed." +msgstr "Gặp lá»—i khi bãi bá»." + +#: lib/merge.tcl:271 +msgid "Abort completed. Ready." +msgstr "Äã bãi bá» xong. Sẵn sà ng." + +#: lib/mergetool.tcl:8 +msgid "Force resolution to the base version?" +msgstr "Buá»™c phân giải thà nh nhánh cÆ¡ sở?" + +#: lib/mergetool.tcl:9 +msgid "Force resolution to this branch?" +msgstr "Buá»™c phân giải thà nh nhánh nà y?" + +#: lib/mergetool.tcl:10 +msgid "Force resolution to the other branch?" +msgstr "Buá»™c phân giải thà nh nhánh khác?" + +#: lib/mergetool.tcl:14 +#, tcl-format +msgid "" +"Note that the diff shows only conflicting changes.\n" +"\n" +"%s will be overwritten.\n" +"\n" +"This operation can be undone only by restarting the merge." +msgstr "" +"Chú ý là diff chỉ hiển thị những thay đổi xung Ä‘á»™t.\n" +"\n" +"%s sẽ bị ghi đè.\n" +"\n" +"Thao tác nà y chỉ có thể bá» dở bằng cách khởi Ä‘á»™ng lại việc hòa trá»™n." + +#: lib/mergetool.tcl:45 +#, tcl-format +msgid "File %s seems to have unresolved conflicts, still stage?" +msgstr "" +"Táºp tin %s có vẻ chÆ°a được giải quyết xung Ä‘á»™t, vẫn đánh dấu là cần chuyển " +"giao?" + +#: lib/mergetool.tcl:60 +#, tcl-format +msgid "Adding resolution for %s" +msgstr "Äang phân giải cho %s" + +#: lib/mergetool.tcl:141 +msgid "Cannot resolve deletion or link conflicts using a tool" +msgstr "Không thể phân giải xung Ä‘á»™t xóa hay liên kết dùng má»™t công cụ" + +#: lib/mergetool.tcl:146 +msgid "Conflict file does not exist" +msgstr "Táºp tin xung Ä‘á»™t không tồn tại" + +#: lib/mergetool.tcl:246 +#, tcl-format +msgid "Not a GUI merge tool: '%s'" +msgstr "Không phải là má»™t công cụ hòa trá»™n GUI: '%s'" + +#: lib/mergetool.tcl:275 +#, tcl-format +msgid "Unsupported merge tool '%s'" +msgstr "Không há»— trợ công cụ trá»™n '%s'" + +#: lib/mergetool.tcl:310 +msgid "Merge tool is already running, terminate it?" +msgstr "Công cụ hòa trá»™n Ä‘ang chạy rồi, chấm dứt nó?" + +#: lib/mergetool.tcl:330 +#, tcl-format +msgid "" +"Error retrieving versions:\n" +"%s" +msgstr "" +"Gặp lá»—i khi truy lại phiên bản:\n" +"%s" + +#: lib/mergetool.tcl:350 +#, tcl-format +msgid "" +"Could not start the merge tool:\n" +"\n" +"%s" +msgstr "" +"Không thể khởi chạy công cụ hòa trá»™n:\n" +"\n" +"%s" + +#: lib/mergetool.tcl:354 +msgid "Running merge tool..." +msgstr "Äang chạy công cụ trá»™n..." + +#: lib/mergetool.tcl:382 lib/mergetool.tcl:390 +msgid "Merge tool failed." +msgstr "Công cụ trá»™n gặp lá»—i." + +#: lib/option.tcl:11 +#, tcl-format +msgid "Invalid global encoding '%s'" +msgstr "Bảng mã toà n cục không hợp lệ '%s'" + +#: lib/option.tcl:19 +#, tcl-format +msgid "Invalid repo encoding '%s'" +msgstr "Bảng mã kho chứa không hợp lệ '%s'" + +#: lib/option.tcl:119 +msgid "Restore Defaults" +msgstr "Phục hồi thà nh mặc định" + +#: lib/option.tcl:123 +msgid "Save" +msgstr "Ghi lại" + +#: lib/option.tcl:133 +#, tcl-format +msgid "%s Repository" +msgstr "%s kho" + +#: lib/option.tcl:134 +msgid "Global (All Repositories)" +msgstr "Toà n cục (Má»i kho)" + +#: lib/option.tcl:140 +msgid "User Name" +msgstr "Tên ngÆ°á»i dùng" + +#: lib/option.tcl:141 +msgid "Email Address" +msgstr "Äịa chỉ thÆ° Ä‘iện tá»" + +#: lib/option.tcl:143 +msgid "Summarize Merge Commits" +msgstr "Tổng hợp vá» hòa trá»™n các lần chuyển giao" + +#: lib/option.tcl:144 +msgid "Merge Verbosity" +msgstr "Chi tiết việc hòa trá»™n" + +#: lib/option.tcl:145 +msgid "Show Diffstat After Merge" +msgstr "Hiển thị thống kê khác biệt sau hòa trá»™n" + +#: lib/option.tcl:146 +msgid "Use Merge Tool" +msgstr "Dùng Công cụ trá»™n" + +#: lib/option.tcl:148 +msgid "Trust File Modification Timestamps" +msgstr "Tin dấu vết thá»i gian sá»a đổi táºp tin" + +#: lib/option.tcl:149 +msgid "Prune Tracking Branches During Fetch" +msgstr "Xén các nhánh theo dõi trong khi lấy vá»" + +#: lib/option.tcl:150 +msgid "Match Tracking Branches" +msgstr "Khá»›p nhánh theo dõi" + +#: lib/option.tcl:151 +msgid "Use Textconv For Diffs and Blames" +msgstr "Dùng Textconv Cho Diffs và Blames" + +#: lib/option.tcl:152 +msgid "Blame Copy Only On Changed Files" +msgstr "Chỉ chép blame trên các táºp tin thay đổi" + +#: lib/option.tcl:153 +msgid "Maximum Length of Recent Repositories List" +msgstr "Số lượng kho má»›i dùng tối Ä‘a được lÆ°u trữ" + +#: lib/option.tcl:154 +msgid "Minimum Letters To Blame Copy On" +msgstr "Chữ tối thiểu để blame chép và o" + +#: lib/option.tcl:155 +msgid "Blame History Context Radius (days)" +msgstr "Bán kÃnh ngữ cảnh lịch sá» blame (ngà y)" + +#: lib/option.tcl:156 +msgid "Number of Diff Context Lines" +msgstr "Số dòng ná»™i dung Diff" + +#: lib/option.tcl:157 +msgid "Additional Diff Parameters" +msgstr "Äối số bổ xung cho Diff" + +#: lib/option.tcl:158 +msgid "Commit Message Text Width" +msgstr "Chiá»u rá»™ng của phần chú thÃch" + +#: lib/option.tcl:159 +msgid "New Branch Name Template" +msgstr "Mẫu tên nhánh má»›i" + +#: lib/option.tcl:160 +msgid "Default File Contents Encoding" +msgstr "Bảng mã dà nh cho ná»™i dung táºp tin mặc định" + +#: lib/option.tcl:161 +msgid "Warn before committing to a detached head" +msgstr "Cảnh báo trÆ°á»›c khi chuyển giao má»™t đầu bị tách rá»i" + +#: lib/option.tcl:162 +msgid "Staging of untracked files" +msgstr "Äánh dấu những táºp tin chÆ°a được theo dõi là cần chuyển giao" + +#: lib/option.tcl:163 +msgid "Show untracked files" +msgstr "Hiện các táºp tin chÆ°a được theo dõi" + +#: lib/option.tcl:209 +msgid "Change" +msgstr "Thay đổi" + +#: lib/option.tcl:253 +msgid "Spelling Dictionary:" +msgstr "Từ Ä‘iển chÃnh tả:" + +#: lib/option.tcl:283 +msgid "Change Font" +msgstr "Äổi phông chữ" + +#: lib/option.tcl:287 +#, tcl-format +msgid "Choose %s" +msgstr "Chá»n %s" + +#: lib/option.tcl:293 +msgid "pt." +msgstr "pt." + +#: lib/option.tcl:307 +msgid "Preferences" +msgstr "Cá nhân hóa" + +#: lib/option.tcl:344 +msgid "Failed to completely save options:" +msgstr "Gặp lá»—i khi hoà n tất ghi lại các tùy chá»n:" + +#: lib/remote_add.tcl:20 +msgid "Add Remote" +msgstr "Thêm máy chủ" + +#: lib/remote_add.tcl:25 +msgid "Add New Remote" +msgstr "Thêm máy chủ má»›i" + +#: lib/remote_add.tcl:30 lib/tools_dlg.tcl:37 +msgid "Add" +msgstr "Thêm và o" + +#: lib/remote_add.tcl:39 +msgid "Remote Details" +msgstr "Chi tiết vá» máy chủ" + +#: lib/remote_add.tcl:50 +msgid "Location:" +msgstr "Vị trÃ:" + +#: lib/remote_add.tcl:60 +msgid "Further Action" +msgstr "Hà nh Ä‘á»™ng thêm" + +#: lib/remote_add.tcl:63 +msgid "Fetch Immediately" +msgstr "Lấy vá» ngay láºp tức" + +#: lib/remote_add.tcl:69 +msgid "Initialize Remote Repository and Push" +msgstr "Khởi tạo Kho máy chủ và đẩy dữ liệu lên" + +#: lib/remote_add.tcl:75 +msgid "Do Nothing Else Now" +msgstr "Không là m gì cả" + +#: lib/remote_add.tcl:100 +msgid "Please supply a remote name." +msgstr "Hãy cung cấp tên máy chủ." + +#: lib/remote_add.tcl:113 +#, tcl-format +msgid "'%s' is not an acceptable remote name." +msgstr "'%s' không phải là tên máy chủ được chấp nháºn." + +#: lib/remote_add.tcl:124 +#, tcl-format +msgid "Failed to add remote '%s' of location '%s'." +msgstr "Gặp lá»—i khi thêm máy chủ '%s' của vị trà '%s'." + +#: lib/remote_add.tcl:132 lib/transport.tcl:6 +#, tcl-format +msgid "fetch %s" +msgstr "lấy vá» %s" + +#: lib/remote_add.tcl:133 +#, tcl-format +msgid "Fetching the %s" +msgstr "Äang lấy vá» %s" + +#: lib/remote_add.tcl:156 +#, tcl-format +msgid "Do not know how to initialize repository at location '%s'." +msgstr "Không hiểu là m thế nà o để khởi tạo kho chứa tại vị trà '%s'." + +#: lib/remote_add.tcl:162 lib/transport.tcl:54 lib/transport.tcl:92 +#: lib/transport.tcl:110 +#, tcl-format +msgid "push %s" +msgstr "đẩy %s lên máy chủ" + +#: lib/remote_add.tcl:163 +#, tcl-format +msgid "Setting up the %s (at %s)" +msgstr "Cà i đặt '%s' (tại %s)" + +#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 +msgid "Delete Branch Remotely" +msgstr "Xóa nhánh trên máy chủ" + +#: lib/remote_branch_delete.tcl:48 +msgid "From Repository" +msgstr "Từ Kho" + +#: lib/remote_branch_delete.tcl:51 lib/transport.tcl:165 +msgid "Remote:" +msgstr "Máy chủ:" + +#: lib/remote_branch_delete.tcl:72 lib/transport.tcl:187 +msgid "Arbitrary Location:" +msgstr "Äịa Ä‘iểm tùy ý:" + +#: lib/remote_branch_delete.tcl:88 +msgid "Branches" +msgstr "Nhánh" + +#: lib/remote_branch_delete.tcl:110 +msgid "Delete Only If" +msgstr "Chỉ xoá Nếu" + +#: lib/remote_branch_delete.tcl:112 +msgid "Merged Into:" +msgstr "Äã trá»™n và o:" + +#: lib/remote_branch_delete.tcl:153 +msgid "A branch is required for 'Merged Into'." +msgstr "Cần má»™t nhánh cho 'Hòa trá»™n và o'." + +#: lib/remote_branch_delete.tcl:185 +#, tcl-format +msgid "" +"The following branches are not completely merged into %s:\n" +"\n" +" - %s" +msgstr "" +"Các nhánh sau đây không được hòa trá»™n hoà n toà n và o %s:\n" +"\n" +" - %s" + +#: lib/remote_branch_delete.tcl:190 +#, tcl-format +msgid "" +"One or more of the merge tests failed because you have not fetched the " +"necessary commits. Try fetching from %s first." +msgstr "" +"Má»™t hay nhiá»u hÆ¡n kiểm tra hòa trá»™n không đạt bởi vì bạn đã không lấy vá» " +"những lần chuyển giao cần thiết. Hãy lấy vá» từ %s trÆ°á»›c đã." + +#: lib/remote_branch_delete.tcl:208 +msgid "Please select one or more branches to delete." +msgstr "Xin hãy chá»n má»™t hay nhiá»u nhánh cần xóa." + +#: lib/remote_branch_delete.tcl:227 +#, tcl-format +msgid "Deleting branches from %s" +msgstr "Äang xoá các nhánh từ %s" + +#: lib/remote_branch_delete.tcl:300 +msgid "No repository selected." +msgstr "ChÆ°a chá»n kho." + +#: lib/remote_branch_delete.tcl:305 +#, tcl-format +msgid "Scanning %s..." +msgstr "Äang quét: %s..." + +#: lib/remote.tcl:200 +msgid "Push to" +msgstr "Äẩy lên" + +#: lib/remote.tcl:218 +msgid "Remove Remote" +msgstr "Gỡ bá» Máy chủ" + +#: lib/remote.tcl:223 +msgid "Prune from" +msgstr "Xén từ" + +#: lib/remote.tcl:228 +msgid "Fetch from" +msgstr "Lấy vá» từ" + +#: lib/search.tcl:48 +msgid "Find:" +msgstr "Tìm:" + +#: lib/search.tcl:50 +msgid "Next" +msgstr "Tiếp" + +#: lib/search.tcl:51 +msgid "Prev" +msgstr "TrÆ°á»›c" + +#: lib/search.tcl:52 +msgid "RegExp" +msgstr "BTCQ" + +#: lib/search.tcl:54 +msgid "Case" +msgstr "Hoa" + +#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 +msgid "Cannot write shortcut:" +msgstr "Không thể ghi lối tắt:" + +#: lib/shortcut.tcl:137 +msgid "Cannot write icon:" +msgstr "Không thể ghi biểu tượng:" + +#: lib/spellcheck.tcl:57 +msgid "Unsupported spell checker" +msgstr "Không há»— trợ kiểm tra chÃnh tả" + +#: lib/spellcheck.tcl:65 +msgid "Spell checking is unavailable" +msgstr "Kiểm tra chÃnh tả không sẵn sà ng" + +#: lib/spellcheck.tcl:68 +msgid "Invalid spell checking configuration" +msgstr "Cấu hình bá»™ soát chÃnh tả không hợp lệ" + +#: lib/spellcheck.tcl:70 +#, tcl-format +msgid "Reverting dictionary to %s." +msgstr "Äang hoà n nguyên từ Ä‘iển thà nh %s." + +#: lib/spellcheck.tcl:73 +msgid "Spell checker silently failed on startup" +msgstr "Phần kiểm tra chÃnh tả đã gặp lá»—i khi khởi Ä‘á»™ng" + +#: lib/spellcheck.tcl:80 +msgid "Unrecognized spell checker" +msgstr "Không chấp nháºn bá»™ kiểm tra chÃnh tả" + +#: lib/spellcheck.tcl:186 +msgid "No Suggestions" +msgstr "Không có gợi ý" + +#: lib/spellcheck.tcl:388 +msgid "Unexpected EOF from spell checker" +msgstr "Gặp kết thúc bất ngá» từ bá»™ kiểm tra chÃnh tả" + +#: lib/spellcheck.tcl:392 +msgid "Spell Checker Failed" +msgstr "Kiểm tra chÃnh tả không thà nh công" + +#: lib/sshkey.tcl:31 +msgid "No keys found." +msgstr "Không tìm thấy khóa nà o." + +#: lib/sshkey.tcl:34 +#, tcl-format +msgid "Found a public key in: %s" +msgstr "Tìm thấy khoá công khai trong: %s" + +#: lib/sshkey.tcl:40 +msgid "Generate Key" +msgstr "Tạo khoá" + +#: lib/sshkey.tcl:58 +msgid "Copy To Clipboard" +msgstr "Chép và o clipboard" + +#: lib/sshkey.tcl:72 +msgid "Your OpenSSH Public Key" +msgstr "Khóa công OpenSSH của bạn" + +#: lib/sshkey.tcl:80 +msgid "Generating..." +msgstr "Äang tạo..." + +#: lib/sshkey.tcl:86 +#, tcl-format +msgid "" +"Could not start ssh-keygen:\n" +"\n" +"%s" +msgstr "" +"Không thể chạy ssh-keygen:\n" +"\n" +"%s" + +#: lib/sshkey.tcl:113 +msgid "Generation failed." +msgstr "Việc tạo khoá đã thất bại." + +#: lib/sshkey.tcl:120 +msgid "Generation succeeded, but no keys found." +msgstr "Việc tạo thà nh công nhÆ°ng lại không tìm thấy khóa." + +#: lib/sshkey.tcl:123 +#, tcl-format +msgid "Your key is in: %s" +msgstr "Khóa của bạn trong: %s" + +#: lib/status_bar.tcl:87 +#, tcl-format +msgid "%s ... %*i of %*i %s (%3i%%)" +msgstr "%s ... %*i trong %*i %s (%3i%%)" + +#: lib/tools_dlg.tcl:22 +msgid "Add Tool" +msgstr "Thêm công cụ" + +#: lib/tools_dlg.tcl:28 +msgid "Add New Tool Command" +msgstr "Thêm lệnh công cụ má»›i" + +#: lib/tools_dlg.tcl:34 +msgid "Add globally" +msgstr "Thêm toà n cục" + +#: lib/tools_dlg.tcl:46 +msgid "Tool Details" +msgstr "Chi tiết công cụ" + +#: lib/tools_dlg.tcl:49 +msgid "Use '/' separators to create a submenu tree:" +msgstr "Dùng dấu ngăn cách '/' để tạo cây trình Ä‘Æ¡n con:" + +#: lib/tools_dlg.tcl:60 +msgid "Command:" +msgstr "Lệnh:" + +#: lib/tools_dlg.tcl:71 +msgid "Show a dialog before running" +msgstr "Hiển thị há»™p thoại trÆ°á»›c khi chạy" + +#: lib/tools_dlg.tcl:77 +msgid "Ask the user to select a revision (sets $REVISION)" +msgstr "Há»i ngÆ°á»i dùng chá»n Ä‘iểm xem xét (đặt biến $REVISION)" + +#: lib/tools_dlg.tcl:82 +msgid "Ask the user for additional arguments (sets $ARGS)" +msgstr "Há»i ngÆ°á»i dùng các đối số bổ xung thêm (đặt biến $ARGS)" + +#: lib/tools_dlg.tcl:89 +msgid "Don't show the command output window" +msgstr "Không hiển thị cá»a sổ kết xuất câu lệnh" + +#: lib/tools_dlg.tcl:94 +msgid "Run only if a diff is selected ($FILENAME not empty)" +msgstr "Chỉ chạy nếu diff được chá»n (biến $FILENAME không rá»—ng)" + +#: lib/tools_dlg.tcl:118 +msgid "Please supply a name for the tool." +msgstr "Hãy cung cấp tên cho công cụ." + +#: lib/tools_dlg.tcl:126 +#, tcl-format +msgid "Tool '%s' already exists." +msgstr "Công cụ '%s' đã sẵn có." + +#: lib/tools_dlg.tcl:148 +#, tcl-format +msgid "" +"Could not add tool:\n" +"%s" +msgstr "" +"Không thể thêm công cụ:\n" +"%s" + +#: lib/tools_dlg.tcl:187 +msgid "Remove Tool" +msgstr "Gỡ bá» công cụ" + +#: lib/tools_dlg.tcl:193 +msgid "Remove Tool Commands" +msgstr "Gỡ bá» công cụ lệnh" + +#: lib/tools_dlg.tcl:198 +msgid "Remove" +msgstr "Gỡ bá»" + +#: lib/tools_dlg.tcl:231 +msgid "(Blue denotes repository-local tools)" +msgstr "(Các công cụ chỉ thị kho-ná»™i-bá»™ xanh)" + +#: lib/tools_dlg.tcl:292 +#, tcl-format +msgid "Run Command: %s" +msgstr "Chạy lệnh: %s" + +#: lib/tools_dlg.tcl:306 +msgid "Arguments" +msgstr "Äối số" + +#: lib/tools_dlg.tcl:341 +msgid "OK" +msgstr "Äồng ý" + +#: lib/tools.tcl:75 +#, tcl-format +msgid "Running %s requires a selected file." +msgstr "Chạy %s yêu cầu cần phải chá»n má»™t táºp tin." + +#: lib/tools.tcl:91 +#, tcl-format +msgid "Are you sure you want to run %1$s on file \"%2$s\"?" +msgstr "Bạn có chắc là muốn chạy %1$s trên táºp tin \"%2$s\" không?" + +#: lib/tools.tcl:95 +#, tcl-format +msgid "Are you sure you want to run %s?" +msgstr "Bạn có chắc là muốn chạy %s không?" + +#: lib/tools.tcl:116 +#, tcl-format +msgid "Tool: %s" +msgstr "Công cụ: %s" + +#: lib/tools.tcl:117 +#, tcl-format +msgid "Running: %s" +msgstr "Äang chạy: %s" + +#: lib/tools.tcl:155 +#, tcl-format +msgid "Tool completed successfully: %s" +msgstr "Công cụ được biên dịch thà nh công: %s" + +#: lib/tools.tcl:157 +#, tcl-format +msgid "Tool failed: %s" +msgstr "Công cụ gặp lá»—i: %s" + +#: lib/transport.tcl:7 +#, tcl-format +msgid "Fetching new changes from %s" +msgstr "Lấy các thay đổi má»›i từ %s" + +#: lib/transport.tcl:18 +#, tcl-format +msgid "remote prune %s" +msgstr "xén bá»›t trên máy chủ %s" + +#: lib/transport.tcl:19 +#, tcl-format +msgid "Pruning tracking branches deleted from %s" +msgstr "Xén bá»›t các nhánh theo dõi bị xóa từ %s" + +#: lib/transport.tcl:25 +msgid "fetch all remotes" +msgstr "lấy vá» từ tất cả các máy chủ" + +#: lib/transport.tcl:26 +msgid "Fetching new changes from all remotes" +msgstr "Äang lấy các thay đổi má»›i từ má»i máy chủ" + +#: lib/transport.tcl:40 +msgid "remote prune all remotes" +msgstr "xén bá»›t má»i máy chủ" + +#: lib/transport.tcl:41 +msgid "Pruning tracking branches deleted from all remotes" +msgstr "Xén tỉa các nhánh đã theo dõi bị xóa từ má»i máy chủ" + +#: lib/transport.tcl:55 +#, tcl-format +msgid "Pushing changes to %s" +msgstr "Äang đẩy các nhánh lên %s" + +#: lib/transport.tcl:93 +#, tcl-format +msgid "Mirroring to %s" +msgstr "Bản sao đến %s" + +#: lib/transport.tcl:111 +#, tcl-format +msgid "Pushing %s %s to %s" +msgstr "Äang (đẩy) %s %s lên %s" + +#: lib/transport.tcl:132 +msgid "Push Branches" +msgstr "Äẩy lên các nhánh" + +#: lib/transport.tcl:147 +msgid "Source Branches" +msgstr "Nhánh nguồn" + +#: lib/transport.tcl:162 +msgid "Destination Repository" +msgstr "Kho chứa Ä‘Ãch" + +#: lib/transport.tcl:205 +msgid "Transfer Options" +msgstr "Tùy chá»n truyá»n" + +#: lib/transport.tcl:207 +msgid "Force overwrite existing branch (may discard changes)" +msgstr "Ép buá»™c ghi đè nhánh sẵn có (có thể sẽ loại bá» các thay đổi)" + +#: lib/transport.tcl:211 +msgid "Use thin pack (for slow network connections)" +msgstr "Dùng gói má»ng (dà nh cho kết nối mạng cháºm)" + +#: lib/transport.tcl:215 +msgid "Include tags" +msgstr "Bao gồm các thẻ" + +#~ msgid "Case-Sensitive" +#~ msgstr "Có phân biệt HOA/thÆ°á»ng" diff --git a/git-instaweb.sh b/git-instaweb.sh index 513efa6..47e38f3 100755 --- a/git-instaweb.sh +++ b/git-instaweb.sh @@ -20,6 +20,7 @@ start start the web server restart restart the web server " +SUBDIRECTORY_OK=Yes . git-sh-setup fqgitdir="$GIT_DIR" @@ -204,7 +205,7 @@ webrick_conf () { # actual gitweb.cgi using a shell script to force it wrapper="$fqgitdir/gitweb/$httpd/wrapper.sh" cat > "$wrapper" <<EOF -#!/bin/sh +#!@SHELL_PATH@ # we use this shell script wrapper around the real gitweb.cgi since # there appears to be no other way to pass arbitrary environment variables # into the CGI process @@ -368,7 +368,7 @@ def getP4OpenedType(file): # Returns the perforce file type for the given file. result = p4_read_pipe(["opened", wildcard_encode(file)]) - match = re.match(".*\((.+)\)\r?$", result) + match = re.match(".*\((.+)\)( \*exclusive\*)?\r?$", result) if match: return match.group(1) else: @@ -502,12 +502,14 @@ def p4Cmd(cmd): def p4Where(depotPath): if not depotPath.endswith("/"): depotPath += "/" - depotPath = depotPath + "..." - outputList = p4CmdList(["where", depotPath]) + depotPathLong = depotPath + "..." + outputList = p4CmdList(["where", depotPathLong]) output = None for entry in outputList: if "depotFile" in entry: - if entry["depotFile"] == depotPath: + # Search for the base client side depot path, as long as it starts with the branch's P4 path. + # The base path always ends with "/...". + if entry["depotFile"].find(depotPath) == 0 and entry["depotFile"][-4:] == "/...": output = entry break elif "data" in entry: @@ -740,17 +742,43 @@ def createOrUpdateBranchesFromOrigin(localRefPrefix = "refs/remotes/p4/", silent def originP4BranchesExist(): return gitBranchExists("origin") or gitBranchExists("origin/p4") or gitBranchExists("origin/p4/master") -def p4ChangesForPaths(depotPaths, changeRange): +def p4ChangesForPaths(depotPaths, changeRange, block_size): assert depotPaths - cmd = ['changes'] - for p in depotPaths: - cmd += ["%s...%s" % (p, changeRange)] - output = p4_read_pipe_lines(cmd) + assert block_size + + # Parse the change range into start and end + if changeRange is None or changeRange == '': + changeStart = '@1' + changeEnd = '#head' + else: + parts = changeRange.split(',') + assert len(parts) == 2 + changeStart = parts[0] + changeEnd = parts[1] + # Accumulate change numbers in a dictionary to avoid duplicates changes = {} - for line in output: - changeNum = int(line.split(" ")[1]) - changes[changeNum] = True + + for p in depotPaths: + # Retrieve changes a block at a time, to prevent running + # into a MaxScanRows error from the server. + start = changeStart + end = changeEnd + get_another_block = True + while get_another_block: + new_changes = [] + cmd = ['changes'] + cmd += ['-m', str(block_size)] + cmd += ["%s...%s,%s" % (p, start, end)] + for line in p4_read_pipe_lines(cmd): + changeNum = int(line.split(" ")[1]) + new_changes.append(changeNum) + changes[changeNum] = True + if len(new_changes) == block_size: + get_another_block = True + end = '@' + str(min(new_changes)) + else: + get_another_block = False changelist = changes.keys() changelist.sort() @@ -1627,7 +1655,10 @@ class P4Submit(Command, P4UserMap): if self.useClientSpec: self.clientSpecDirs = getClientSpec() - if self.useClientSpec: + # Check for the existance of P4 branches + branchesDetected = (len(p4BranchesInGit().keys()) > 1) + + if self.useClientSpec and not branchesDetected: # all files are relative to the client spec self.clientPath = getClientRoot() else: @@ -1911,7 +1942,10 @@ class P4Sync(Command, P4UserMap): optparse.make_option("--import-labels", dest="importLabels", action="store_true"), optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false", help="Import into refs/heads/ , not refs/remotes"), - optparse.make_option("--max-changes", dest="maxChanges"), + optparse.make_option("--max-changes", dest="maxChanges", + help="Maximum number of changes to import"), + optparse.make_option("--changes-block-size", dest="changes_block_size", type="int", + help="Internal block size to use when iteratively calling p4 changes"), optparse.make_option("--keep-path", dest="keepRepoPath", action='store_true', help="Keep entire BRANCH/DIR/SUBDIR prefix during import"), optparse.make_option("--use-client-spec", dest="useClientSpec", action='store_true', @@ -1940,6 +1974,7 @@ class P4Sync(Command, P4UserMap): self.syncWithOrigin = True self.importIntoRemotes = True self.maxChanges = "" + self.changes_block_size = 500 self.keepRepoPath = False self.depotPaths = None self.p4BranchesInGit = [] @@ -2586,7 +2621,7 @@ class P4Sync(Command, P4UserMap): branchPrefix = self.depotPaths[0] + branch + "/" range = "@1,%s" % maxChange #print "prefix" + branchPrefix - changes = p4ChangesForPaths([branchPrefix], range) + changes = p4ChangesForPaths([branchPrefix], range, self.changes_block_size) if len(changes) <= 0: return False firstChange = changes[0] @@ -3002,7 +3037,7 @@ class P4Sync(Command, P4UserMap): if self.verbose: print "Getting p4 changes for %s...%s" % (', '.join(self.depotPaths), self.changeRange) - changes = p4ChangesForPaths(self.depotPaths, self.changeRange) + changes = p4ChangesForPaths(self.depotPaths, self.changeRange, self.changes_block_size) if len(self.maxChanges) > 0: changes = changes[:min(int(self.maxChanges), len(changes))] diff --git a/git-pull.sh b/git-pull.sh index 4d4fc77..0917d0d 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -54,8 +54,11 @@ then fi # Setup default fast-forward options via `pull.ff` -pull_ff=$(git config pull.ff) +pull_ff=$(bool_or_string_config pull.ff) case "$pull_ff" in +true) + no_ff=--ff + ;; false) no_ff=--no-ff ;; @@ -81,8 +84,8 @@ do diffstat=--no-stat ;; --stat|--summary) diffstat=--stat ;; - --log|--no-log) - log_arg=$1 ;; + --log|--log=*|--no-log) + log_arg="$1" ;; --no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit) no_commit=--no-commit ;; --c|--co|--com|--comm|--commi|--commit) @@ -190,15 +193,6 @@ esac error_on_no_merge_candidates () { exec >&2 - for opt - do - case "$opt" in - -t|--t|--ta|--tag|--tags) - echo "It doesn't make sense to pull all tags; you probably meant:" - echo " git fetch --tags" - exit 1 - esac - done if test true = "$rebase" then @@ -240,7 +234,7 @@ test true = "$rebase" && { if ! git rev-parse -q --verify HEAD >/dev/null then # On an unborn branch - if test -f "$GIT_DIR/index" + if test -f "$(git rev-parse --git-path index)" then die "$(gettext "updating an unborn branch with changes added to the index")" fi @@ -323,7 +317,6 @@ then fi fi -merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit case "$rebase" in true) eval="git-rebase $diffstat $strategy_args $merge_args $rebase_args $verbosity" @@ -334,7 +327,7 @@ true) eval="git-merge $diffstat $no_commit $verify_signatures $edit $squash $no_ff $ff_only" eval="$eval $log_arg $strategy_args $merge_args $verbosity $progress" eval="$eval $gpg_sign_args" - eval="$eval \"\$merge_name\" HEAD $merge_head" + eval="$eval FETCH_HEAD" ;; esac eval "exec $eval" diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index c96b984..bab0dcc 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -132,6 +132,16 @@ mark_action_done () { fi } +# Put the last action marked done at the beginning of the todo list +# again. If there has not been an action marked done yet, leave the list of +# items on the todo list unchanged. +reschedule_last_action () { + tail -n 1 "$done" | cat - "$todo" >"$todo".new + sed -e \$d <"$done" >"$done".new + mv -f "$todo".new "$todo" + mv -f "$done".new "$done" +} + append_todo_help () { git stripspace --comment-lines >>"$todo" <<\EOF @@ -252,6 +262,12 @@ pick_one () { output eval git cherry-pick \ ${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")} \ "$strategy_args" $empty_args $ff "$@" + + # If cherry-pick dies it leaves the to-be-picked commit unrecorded. Reschedule + # previous task so this commit is not lost. + ret=$? + case "$ret" in [01]) ;; *) reschedule_last_action ;; esac + return $ret } pick_one_preserving_merges () { @@ -642,9 +658,9 @@ do_next () { git notes copy --for-rewrite=rebase < "$rewritten_list" || true # we don't care if this copying failed } && - if test -x "$GIT_DIR"/hooks/post-rewrite && - test -s "$rewritten_list"; then - "$GIT_DIR"/hooks/post-rewrite rebase < "$rewritten_list" + hook="$(git rev-parse --git-path hooks/post-rewrite)" + if test -x "$hook" && test -s "$rewritten_list"; then + "$hook" rebase < "$rewritten_list" true # we don't care if this hook failed fi && warn "Successfully rebased and updated $head_name." @@ -1030,10 +1046,11 @@ test -n "$autosquash" && rearrange_squash "$todo" test -n "$cmd" && add_exec_commands "$todo" todocount=$(git stripspace --strip-comments <"$todo" | wc -l) +todocount=${todocount##* } cat >>"$todo" <<EOF -$comment_char Rebase $shortrevisions onto $shortonto ($todocount TODO item(s)) +$comment_char Rebase $shortrevisions onto $shortonto ($todocount command(s)) EOF append_todo_help git stripspace --comment-lines >>"$todo" <<\EOF diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh index d3fb67d..2cc2a6d 100644 --- a/git-rebase--merge.sh +++ b/git-rebase--merge.sh @@ -94,10 +94,8 @@ finish_rb_merge () { if test -s "$state_dir"/rewritten then git notes copy --for-rewrite=rebase <"$state_dir"/rewritten - if test -x "$GIT_DIR"/hooks/post-rewrite - then - "$GIT_DIR"/hooks/post-rewrite rebase <"$state_dir"/rewritten - fi + hook="$(git rev-parse --git-path hooks/post-rewrite)" + test -x "$hook" && "$hook" rebase <"$state_dir"/rewritten fi say All done. } diff --git a/git-rebase.sh b/git-rebase.sh index 55da9db..1757404 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -202,9 +202,9 @@ run_specific_rebase () { run_pre_rebase_hook () { if test -z "$ok_to_skip_pre_rebase" && - test -x "$GIT_DIR/hooks/pre-rebase" + test -x "$(git rev-parse --git-path hooks/pre-rebase)" then - "$GIT_DIR/hooks/pre-rebase" ${1+"$@"} || + "$(git rev-parse --git-path hooks/pre-rebase)" ${1+"$@"} || die "$(gettext "The pre-rebase hook refused to rebase.")" fi } @@ -582,7 +582,7 @@ then # Lazily switch to the target branch if needed... test -z "$switch_to" || GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $switch_to" \ - git checkout "$switch_to" -- + git checkout -q "$switch_to" -- say "$(eval_gettext "Current branch \$branch_name is up to date.")" finish_rebase exit 0 diff --git a/git-sh-setup.sh b/git-sh-setup.sh index c42c6e6..4691fbc 100644 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -344,7 +344,7 @@ git_dir_init () { echo >&2 "Unable to determine absolute path of git directory" exit 1 } - : ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"} + : ${GIT_OBJECT_DIRECTORY="$(git rev-parse --git-path objects)"} } if test -z "$NONGIT_OK" diff --git a/git-stash.sh b/git-stash.sh index d4cf818..7911f30 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -20,7 +20,7 @@ require_work_tree cd_to_toplevel TMP="$GIT_DIR/.git-stash.$$" -TMPindex=${GIT_INDEX_FILE-"$GIT_DIR/index"}.stash.$$ +TMPindex=${GIT_INDEX_FILE-"$(git rev-parse --git-path index)"}.stash.$$ trap 'rm -f "$TMP-"* "$TMPindex"' 0 ref_stash=refs/stash @@ -184,7 +184,7 @@ store_stash () { fi # Make sure the reflog for stash is kept. - : >>"$GIT_DIR/logs/$ref_stash" + : >>"$(git rev-parse --git-path logs/$ref_stash)" git update-ref -m "$stash_msg" $ref_stash $w_commit ret=$? test $ret != 0 && test -z $quiet && @@ -259,7 +259,7 @@ save_stash () { say "$(gettext "No local changes to save")" exit 0 fi - test -f "$GIT_DIR/logs/$ref_stash" || + test -f "$(git rev-parse --git-path logs/$ref_stash)" || clear_stash || die "$(gettext "Cannot initialize stash")" create_stash "$stash_msg" $untracked @@ -442,6 +442,8 @@ apply_stash () { assert_stash_like "$@" git update-index -q --refresh || die "$(gettext "unable to refresh index")" + git diff-index --cached --quiet --ignore-submodules HEAD -- || + die "$(gettext "Cannot apply stash: Your index contains uncommitted changes.")" # current index state c_tree=$(git write-tree) || @@ -204,10 +204,12 @@ static int handle_options(const char ***argv, int *argc, int *envchanged) fprintf(stderr, "No directory given for -C.\n" ); usage(git_usage_string); } - if (chdir((*argv)[1])) - die_errno("Cannot change to '%s'", (*argv)[1]); - if (envchanged) - *envchanged = 1; + if ((*argv)[1][0]) { + if (chdir((*argv)[1])) + die_errno("Cannot change to '%s'", (*argv)[1]); + if (envchanged) + *envchanged = 1; + } (*argv)++; (*argc)--; } else { @@ -380,7 +382,7 @@ static struct cmd_struct commands[] = { { "check-ignore", cmd_check_ignore, RUN_SETUP | NEED_WORK_TREE }, { "check-mailmap", cmd_check_mailmap, RUN_SETUP }, { "check-ref-format", cmd_check_ref_format }, - { "checkout", cmd_checkout, RUN_SETUP | NEED_WORK_TREE }, + { "checkout", cmd_checkout, RUN_SETUP }, { "checkout-index", cmd_checkout_index, RUN_SETUP | NEED_WORK_TREE}, { "cherry", cmd_cherry, RUN_SETUP }, @@ -618,6 +620,7 @@ int main(int argc, char **av) { const char **argv = (const char **) av; const char *cmd; + int done_help = 0; startup_info = &git_startup_info; @@ -680,9 +683,7 @@ int main(int argc, char **av) setup_path(); while (1) { - static int done_help = 0; - static int was_alias = 0; - was_alias = run_argv(&argc, &argv); + int was_alias = run_argv(&argc, &argv); if (errno != ENOENT) break; if (was_alias) { diff --git a/gitk-git/gitk b/gitk-git/gitk index 78358a7..9a2daf3 100755 --- a/gitk-git/gitk +++ b/gitk-git/gitk @@ -2516,6 +2516,13 @@ proc makewindow {} { } else { bindall <ButtonRelease-4> "allcanvs yview scroll -5 units" bindall <ButtonRelease-5> "allcanvs yview scroll 5 units" + bind $ctext <Button> { + if {"%b" eq 6} { + $ctext xview scroll -5 units + } elseif {"%b" eq 7} { + $ctext xview scroll 5 units + } + } if {[tk windowingsystem] eq "aqua"} { bindall <MouseWheel> { set delta [expr {- (%D)}] @@ -2776,33 +2783,87 @@ proc doprogupdate {} { } } +proc config_check_tmp_exists {tries_left} { + global config_file_tmp + + if {[file exists $config_file_tmp]} { + incr tries_left -1 + if {$tries_left > 0} { + after 100 [list config_check_tmp_exists $tries_left] + } else { + error_popup "There appears to be a stale $config_file_tmp\ + file, which will prevent gitk from saving its configuration on exit.\ + Please remove it if it is not being used by any existing gitk process." + } + } +} + +proc config_init_trace {name} { + global config_variable_changed config_variable_original + + upvar #0 $name var + set config_variable_changed($name) 0 + set config_variable_original($name) $var +} + +proc config_variable_change_cb {name name2 op} { + global config_variable_changed config_variable_original + + upvar #0 $name var + if {$op eq "write" && + (![info exists config_variable_original($name)] || + $config_variable_original($name) ne $var)} { + set config_variable_changed($name) 1 + } +} + proc savestuff {w} { - global viewname viewfiles viewargs viewargscmd viewperm nextviewnum - global use_ttk global stuffsaved global config_file config_file_tmp - global config_variables + global config_variables config_variable_changed + global viewchanged + + upvar #0 viewname current_viewname + upvar #0 viewfiles current_viewfiles + upvar #0 viewargs current_viewargs + upvar #0 viewargscmd current_viewargscmd + upvar #0 viewperm current_viewperm + upvar #0 nextviewnum current_nextviewnum + upvar #0 use_ttk current_use_ttk if {$stuffsaved} return if {![winfo viewable .]} return - catch { - if {[file exists $config_file_tmp]} { - file delete -force $config_file_tmp + set remove_tmp 0 + if {[catch { + set try_count 0 + while {[catch {set f [open $config_file_tmp {WRONLY CREAT EXCL}]}]} { + if {[incr try_count] > 50} { + error "Unable to write config file: $config_file_tmp exists" + } + after 100 } - set f [open $config_file_tmp w] + set remove_tmp 1 if {$::tcl_platform(platform) eq {windows}} { file attributes $config_file_tmp -hidden true } + if {[file exists $config_file]} { + source $config_file + } foreach var_name $config_variables { upvar #0 $var_name var - puts $f [list set $var_name $var] + upvar 0 $var_name old_var + if {!$config_variable_changed($var_name) && [info exists old_var]} { + puts $f [list set $var_name $old_var] + } else { + puts $f [list set $var_name $var] + } } puts $f "set geometry(main) [wm geometry .]" puts $f "set geometry(state) [wm state .]" puts $f "set geometry(topwidth) [winfo width .tf]" puts $f "set geometry(topheight) [winfo height .tf]" - if {$use_ttk} { + if {$current_use_ttk} { puts $f "set geometry(pwsash0) \"[.tf.histframe.pwclist sashpos 0] 1\"" puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sashpos 1] 1\"" } else { @@ -2812,15 +2873,43 @@ proc savestuff {w} { puts $f "set geometry(botwidth) [winfo width .bleft]" puts $f "set geometry(botheight) [winfo height .bleft]" + array set view_save {} + array set views {} + if {![info exists permviews]} { set permviews {} } + foreach view $permviews { + set view_save([lindex $view 0]) 1 + set views([lindex $view 0]) $view + } puts -nonewline $f "set permviews {" - for {set v 0} {$v < $nextviewnum} {incr v} { - if {$viewperm($v)} { - puts $f "{[list $viewname($v) $viewfiles($v) $viewargs($v) $viewargscmd($v)]}" + for {set v 1} {$v < $current_nextviewnum} {incr v} { + if {$viewchanged($v)} { + if {$current_viewperm($v)} { + set views($current_viewname($v)) [list $current_viewname($v) $current_viewfiles($v) $current_viewargs($v) $current_viewargscmd($v)] + } else { + set view_save($current_viewname($v)) 0 + } + } + } + # write old and updated view to their places and append remaining to the end + foreach view $permviews { + set view_name [lindex $view 0] + if {$view_save($view_name)} { + puts $f "{$views($view_name)}" } + unset views($view_name) + } + foreach view_name [array names views] { + puts $f "{$views($view_name)}" } puts $f "}" close $f file rename -force $config_file_tmp $config_file + set remove_tmp 0 + } err]} { + puts "Error saving config: $err" + } + if {$remove_tmp} { + file delete -force $config_file_tmp } set stuffsaved 1 } @@ -3977,6 +4066,7 @@ set known_view_options { {committer t15 . "--committer=*" {mc "Committer:"}} {loginfo t15 .. "--grep=*" {mc "Commit Message:"}} {allmatch b .. "--all-match" {mc "Matches all Commit Info criteria"}} + {igrep b .. "--invert-grep" {mc "Matches none Commit Info criteria"}} {changes_l l + {} {mc "Changes to Files:"}} {pickaxe_s r0 . {} {mc "Fixed String"}} {pickaxe_t r1 . "--pickaxe-regex" {mc "Regular Expression"}} @@ -4238,7 +4328,7 @@ proc allviewmenus {n op args} { proc newviewok {top n {apply 0}} { global nextviewnum newviewperm newviewname newishighlight - global viewname viewfiles viewperm selectedview curview + global viewname viewfiles viewperm viewchanged selectedview curview global viewargs viewargscmd newviewopts viewhlmenu if {[catch { @@ -4259,6 +4349,7 @@ proc newviewok {top n {apply 0}} { incr nextviewnum set viewname($n) $newviewname($n) set viewperm($n) $newviewopts($n,perm) + set viewchanged($n) 1 set viewfiles($n) $files set viewargs($n) $newargs set viewargscmd($n) $newviewopts($n,cmd) @@ -4271,6 +4362,7 @@ proc newviewok {top n {apply 0}} { } else { # editing an existing view set viewperm($n) $newviewopts($n,perm) + set viewchanged($n) 1 if {$newviewname($n) ne $viewname($n)} { set viewname($n) $newviewname($n) doviewmenu .bar.view 5 [list showview $n] \ @@ -4293,7 +4385,7 @@ proc newviewok {top n {apply 0}} { } proc delview {} { - global curview viewperm hlview selectedhlview + global curview viewperm hlview selectedhlview viewchanged if {$curview == 0} return if {[info exists hlview] && $hlview == $curview} { @@ -4302,6 +4394,7 @@ proc delview {} { } allviewmenus $curview delete set viewperm($curview) 0 + set viewchanged($curview) 1 showview 0 } @@ -11237,6 +11330,7 @@ proc prefspage_general {notebook} { ${NS}::label $page.maxwidthl -text [mc "Maximum graph width (lines)"] spinbox $page.maxwidth -from 0 -to 100 -width 4 -textvariable maxwidth grid $page.spacer $page.maxwidthl $page.maxwidth -sticky w + #xgettext:no-tcl-format ${NS}::label $page.maxpctl -text [mc "Maximum graph width (% of pane)"] spinbox $page.maxpct -from 1 -to 100 -width 4 -textvariable maxgraphpct grid x $page.maxpctl $page.maxpct -sticky w @@ -11936,7 +12030,7 @@ if { [info exists ::env(GIT_TRACE)] } { } # defaults... -set wrcomcmd "git diff-tree --stdin -p --pretty" +set wrcomcmd "git diff-tree --stdin -p --pretty=email" set gitencoding {} catch { @@ -12109,6 +12203,7 @@ catch { } source $config_file } +config_check_tmp_exists 50 set config_variables { mainfont textfont uifont tabstop findmergefiles maxgraphpct maxwidth @@ -12122,6 +12217,10 @@ set config_variables { linehoveroutlinecolor mainheadcirclecolor workingfilescirclecolor indexcirclecolor circlecolors linkfgcolor circleoutlinecolor } +foreach var $config_variables { + config_init_trace $var + trace add variable $var write config_variable_change_cb +} parsefont mainfont $mainfont eval font create mainfont [fontflags mainfont] @@ -12249,6 +12348,7 @@ set highlight_related [mc "None"] set highlight_files {} set viewfiles(0) {} set viewperm(0) 0 +set viewchanged(0) 0 set viewargs(0) {} set viewargscmd(0) {} @@ -12307,6 +12407,7 @@ if {$cmdline_files ne {} || $revtreeargs ne {} || $revtreeargscmd ne {}} { set viewargs(1) $revtreeargs set viewargscmd(1) $revtreeargscmd set viewperm(1) 0 + set viewchanged(1) 0 set vdatemode(1) 0 addviewmenu 1 .bar.view entryconf [mca "Edit view..."] -state normal @@ -12322,6 +12423,7 @@ if {[info exists permviews]} { set viewargs($n) [lindex $v 2] set viewargscmd($n) [lindex $v 3] set viewperm($n) 1 + set viewchanged($n) 0 addviewmenu $n } } diff --git a/gitk-git/po/bg.po b/gitk-git/po/bg.po index f86a161..1df0716 100644 --- a/gitk-git/po/bg.po +++ b/gitk-git/po/bg.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gitk master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-03 11:17+0300\n" +"POT-Creation-Date: 2015-03-15 14:37+1100\n" "PO-Revision-Date: 2014-07-28 07:32+0300\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" @@ -22,28 +22,28 @@ msgstr "" msgid "Couldn't get list of unmerged files:" msgstr "СпиÑъкът Ñ Ð½ÐµÑлети файлове не може да бъде получен:" -#: gitk:212 gitk:2379 +#: gitk:212 gitk:2381 msgid "Color words" msgstr "ОцветÑване на думите" -#: gitk:217 gitk:2379 gitk:8155 gitk:8188 +#: gitk:217 gitk:2381 gitk:8201 gitk:8234 msgid "Markup words" msgstr "ОтбелÑзване на думите" -#: gitk:322 +#: gitk:324 msgid "Error parsing revisions:" msgstr "Грешка при разбор на верÑиите:" -#: gitk:378 +#: gitk:380 msgid "Error executing --argscmd command:" msgstr "Грешка при изпълнение на командата Ñ â€ž--argscmd“." -#: gitk:391 +#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "Ðе Ñа избрани файлове — указана е опциÑта „--merge“, но нÑма неÑлети файлове." -#: gitk:394 +#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -51,306 +51,306 @@ msgstr "" "Ðе Ñа избрани файлове — указана е опциÑта „--merge“, но нÑма неÑлети файлове " "в ограничениÑта." -#: gitk:416 gitk:564 +#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "Грешка при изпълнение на „git log“:" -#: gitk:434 gitk:580 +#: gitk:436 gitk:582 msgid "Reading" msgstr "Прочитане" -#: gitk:494 gitk:4470 +#: gitk:496 gitk:4508 msgid "Reading commits..." msgstr "Прочитане на подаваниÑта…" -#: gitk:497 gitk:1635 gitk:4473 +#: gitk:499 gitk:1637 gitk:4511 msgid "No commits selected" msgstr "Ðе Ñа избрани подаваниÑ" -#: gitk:1509 +#: gitk:1511 msgid "Can't parse git log output:" msgstr "Изходът от „git log“ не може да Ñе анализира:" -#: gitk:1738 +#: gitk:1740 msgid "No commit information available" msgstr "ЛипÑва Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° подаваниÑ" -#: gitk:1895 +#: gitk:1897 msgid "mc" msgstr "mc" -#: gitk:1930 gitk:4263 gitk:9604 gitk:11174 gitk:11453 +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 msgid "OK" msgstr "Добре" -#: gitk:1932 gitk:4265 gitk:9131 gitk:9210 gitk:9326 gitk:9375 gitk:9606 -#: gitk:11175 gitk:11454 +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 +#: gitk:11221 gitk:11501 msgid "Cancel" msgstr "Отказ" -#: gitk:2067 +#: gitk:2069 msgid "Update" msgstr "ОбновÑване" -#: gitk:2068 +#: gitk:2070 msgid "Reload" msgstr "Презареждане" -#: gitk:2069 +#: gitk:2071 msgid "Reread references" msgstr "Ðаново прочитане на наÑтройките" -#: gitk:2070 +#: gitk:2072 msgid "List references" msgstr "ИзброÑване на указателите" -#: gitk:2072 +#: gitk:2074 msgid "Start git gui" msgstr "Стартиране на „git gui“" -#: gitk:2074 +#: gitk:2076 msgid "Quit" msgstr "Спиране на програмата" -#: gitk:2066 +#: gitk:2068 msgid "File" msgstr "Файл" -#: gitk:2078 +#: gitk:2080 msgid "Preferences" msgstr "ÐаÑтройки" -#: gitk:2077 +#: gitk:2079 msgid "Edit" msgstr "Редактиране" -#: gitk:2082 +#: gitk:2084 msgid "New view..." msgstr "Ðов изглед…" -#: gitk:2083 +#: gitk:2085 msgid "Edit view..." msgstr "Редактиране на изгледа…" -#: gitk:2084 +#: gitk:2086 msgid "Delete view" msgstr "Изтриване на изгледа" -#: gitk:2086 +#: gitk:2088 msgid "All files" msgstr "Ð’Ñички файлове" -#: gitk:2081 gitk:4016 +#: gitk:2083 gitk:4050 msgid "View" msgstr "Изглед" -#: gitk:2091 gitk:2101 gitk:2976 +#: gitk:2093 gitk:2103 gitk:3009 msgid "About gitk" msgstr "ОтноÑно gitk" -#: gitk:2092 gitk:2106 +#: gitk:2094 gitk:2108 msgid "Key bindings" msgstr "Клавишни комбинации" -#: gitk:2090 gitk:2105 +#: gitk:2092 gitk:2107 msgid "Help" msgstr "Помощ" -#: gitk:2183 gitk:8587 +#: gitk:2185 gitk:8633 msgid "SHA1 ID:" msgstr "SHA1:" -#: gitk:2227 +#: gitk:2229 msgid "Row" msgstr "Ред" -#: gitk:2265 +#: gitk:2267 msgid "Find" msgstr "ТърÑене" -#: gitk:2293 +#: gitk:2295 msgid "commit" msgstr "подаване" -#: gitk:2297 gitk:2299 gitk:4631 gitk:4654 gitk:4678 gitk:6698 gitk:6770 -#: gitk:6855 +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 +#: gitk:6893 msgid "containing:" msgstr "Ñъдържащо:" -#: gitk:2300 gitk:3488 gitk:3493 gitk:4707 +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 msgid "touching paths:" msgstr "заÑÑгащо пътищата:" -#: gitk:2301 gitk:4721 +#: gitk:2303 gitk:4759 msgid "adding/removing string:" msgstr "добавÑщо/премахващо низ" -#: gitk:2302 gitk:4723 +#: gitk:2304 gitk:4761 msgid "changing lines matching:" msgstr "променÑщо редове напаÑващи:" -#: gitk:2311 gitk:2313 gitk:4710 +#: gitk:2313 gitk:2315 gitk:4748 msgid "Exact" msgstr "Точно" -#: gitk:2313 gitk:4798 gitk:6666 +#: gitk:2315 gitk:4836 gitk:6704 msgid "IgnCase" msgstr "Без региÑÑ‚ÑŠÑ€" -#: gitk:2313 gitk:4680 gitk:4796 gitk:6662 +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 msgid "Regexp" msgstr "Рег. израз" -#: gitk:2315 gitk:2316 gitk:4818 gitk:4848 gitk:4855 gitk:6791 gitk:6859 +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 msgid "All fields" msgstr "Ð’Ñички полета" -#: gitk:2316 gitk:4815 gitk:4848 gitk:6729 +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 msgid "Headline" msgstr "Първи ред" -#: gitk:2317 gitk:4815 gitk:6729 gitk:6859 gitk:7332 +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 msgid "Comments" msgstr "Коментари" -#: gitk:2317 gitk:4815 gitk:4820 gitk:4855 gitk:6729 gitk:7267 gitk:8765 -#: gitk:8780 +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 +#: gitk:8826 msgid "Author" msgstr "Ðвтор" -#: gitk:2317 gitk:4815 gitk:6729 gitk:7269 +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 msgid "Committer" msgstr "Подаващ" -#: gitk:2348 +#: gitk:2350 msgid "Search" msgstr "ТърÑене" -#: gitk:2356 +#: gitk:2358 msgid "Diff" msgstr "Разлики" -#: gitk:2358 +#: gitk:2360 msgid "Old version" msgstr "Стара верÑиÑ" -#: gitk:2360 +#: gitk:2362 msgid "New version" msgstr "Ðова верÑиÑ" -#: gitk:2362 +#: gitk:2364 msgid "Lines of context" msgstr "КонтекÑÑ‚ в редове" -#: gitk:2372 +#: gitk:2374 msgid "Ignore space change" msgstr "Празните знаци без значение" -#: gitk:2376 gitk:2378 gitk:7894 gitk:8141 +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 msgid "Line diff" msgstr "Поредови разлики" -#: gitk:2443 +#: gitk:2445 msgid "Patch" msgstr "Кръпка" -#: gitk:2445 +#: gitk:2447 msgid "Tree" msgstr "Дърво" -#: gitk:2604 gitk:2624 +#: gitk:2616 gitk:2636 msgid "Diff this -> selected" msgstr "Разлики между това и избраното" -#: gitk:2605 gitk:2625 +#: gitk:2617 gitk:2637 msgid "Diff selected -> this" msgstr "Разлики между избраното и това" -#: gitk:2606 gitk:2626 +#: gitk:2618 gitk:2638 msgid "Make patch" msgstr "Създаване на кръпка" -#: gitk:2607 gitk:9189 +#: gitk:2619 gitk:9235 msgid "Create tag" msgstr "Създаване на етикет" -#: gitk:2608 gitk:9306 +#: gitk:2620 gitk:9352 msgid "Write commit to file" msgstr "Запазване на подаването във файл" -#: gitk:2609 gitk:9363 +#: gitk:2621 gitk:9409 msgid "Create new branch" msgstr "Създаване на нов клон" -#: gitk:2610 +#: gitk:2622 msgid "Cherry-pick this commit" msgstr "Отбиране на това подаване" -#: gitk:2611 +#: gitk:2623 msgid "Reset HEAD branch to here" msgstr "Привеждане на върха на клона към текущото подаване" -#: gitk:2612 +#: gitk:2624 msgid "Mark this commit" msgstr "ОтбелÑзване на това подаване" -#: gitk:2613 +#: gitk:2625 msgid "Return to mark" msgstr "Връщане към отбелÑзаното подаване" -#: gitk:2614 +#: gitk:2626 msgid "Find descendant of this and mark" msgstr "Откриване и отбелÑзване на наÑледниците" -#: gitk:2615 +#: gitk:2627 msgid "Compare with marked commit" msgstr "Сравнение Ñ Ð¾Ñ‚Ð±ÐµÐ»Ñзаното подаване" -#: gitk:2616 gitk:2627 +#: gitk:2628 gitk:2639 msgid "Diff this -> marked commit" msgstr "Разлики между това и отбелÑзаното" -#: gitk:2617 gitk:2628 +#: gitk:2629 gitk:2640 msgid "Diff marked commit -> this" msgstr "Разлики между отбелÑзаното и това" -#: gitk:2618 +#: gitk:2630 msgid "Revert this commit" msgstr "ОтмÑна на това подаване" -#: gitk:2634 +#: gitk:2646 msgid "Check out this branch" msgstr "ИзтеглÑне на този клон" -#: gitk:2635 +#: gitk:2647 msgid "Remove this branch" msgstr "Изтриване на този клон" -#: gitk:2642 +#: gitk:2654 msgid "Highlight this too" msgstr "ОтбелÑзване и на това" -#: gitk:2643 +#: gitk:2655 msgid "Highlight this only" msgstr "ОтбелÑзване Ñамо на това" -#: gitk:2644 +#: gitk:2656 msgid "External diff" msgstr "Външна програма за разлики" -#: gitk:2645 +#: gitk:2657 msgid "Blame parent commit" msgstr "Ðнотиране на родителÑкото подаване" -#: gitk:2652 +#: gitk:2664 msgid "Show origin of this line" msgstr "Показване на произхода на този ред" -#: gitk:2653 +#: gitk:2665 msgid "Run git gui blame on this line" msgstr "Изпълнение на „git gui blame“ върху този ред" -#: gitk:2978 +#: gitk:3011 msgid "" "\n" "Gitk - a commit viewer for git\n" @@ -366,303 +366,313 @@ msgstr "" "\n" "Използвайте и разпроÑтранÑвайте при уÑловиÑта на ОПЛ на ГÐУ" -#: gitk:2986 gitk:3051 gitk:9790 +#: gitk:3019 gitk:3085 gitk:9836 msgid "Close" msgstr "ЗатварÑне" -#: gitk:3007 +#: gitk:3040 msgid "Gitk key bindings" msgstr "Клавишни комбинации" -#: gitk:3010 +#: gitk:3043 msgid "Gitk key bindings:" msgstr "Клавишни комбинации:" -#: gitk:3012 +#: gitk:3045 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tСпиране на програмата" -#: gitk:3013 +#: gitk:3046 #, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-W>\t\tЗатварÑне на прозореца" -#: gitk:3014 +#: gitk:3047 msgid "<Home>\t\tMove to first commit" msgstr "<Home>\t\tКъм първото подаване" -#: gitk:3015 +#: gitk:3048 msgid "<End>\t\tMove to last commit" msgstr "<End>\t\tКъм поÑледното подаване" -#: gitk:3016 +#: gitk:3049 msgid "<Up>, p, k\tMove up one commit" msgstr "<Up>, p, k\tЕдно подаване нагоре" -#: gitk:3017 +#: gitk:3050 msgid "<Down>, n, j\tMove down one commit" msgstr "<Down>, n, j\tЕдно подаване надолу" -#: gitk:3018 +#: gitk:3051 msgid "<Left>, z, h\tGo back in history list" msgstr "<Left>, z, h\tÐазад в иÑториÑта" -#: gitk:3019 +#: gitk:3052 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Right>, x, l\tÐапред в иÑториÑта" -#: gitk:3020 +#: gitk:3053 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "" + +#: gitk:3054 msgid "<PageUp>\tMove up one page in commit list" msgstr "<PageUp>\tСтраница нагоре в ÑпиÑъка Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñта" -#: gitk:3021 +#: gitk:3055 msgid "<PageDown>\tMove down one page in commit list" msgstr "<PageDown>\tСтраница надолу в ÑпиÑъка Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñта" -#: gitk:3022 +#: gitk:3056 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tКъм началото на ÑпиÑъка Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñта" -#: gitk:3023 +#: gitk:3057 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tКъм ÐºÑ€Ð°Ñ Ð½Ð° ÑпиÑъка Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñта" -#: gitk:3024 +#: gitk:3058 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Up>\tРед нагоре в ÑпиÑъка Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ" -#: gitk:3025 +#: gitk:3059 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Down>\tРед надолу в ÑпиÑъка Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ" -#: gitk:3026 +#: gitk:3060 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tСтраница нагоре в ÑпиÑъка Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ" -#: gitk:3027 +#: gitk:3061 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tСтраница надолу в ÑпиÑъка Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ" -#: gitk:3028 +#: gitk:3062 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" msgstr "<Shift-Up>\tТърÑене назад (визуално нагоре, иÑторичеÑки — поÑледващи)" -#: gitk:3029 +#: gitk:3063 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" msgstr "" "<Shift-Down>\tТърÑене напред (визуално надолу, иÑторичеÑки — предхождащи)" -#: gitk:3030 +#: gitk:3064 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Delete>, b\tСтраница нагоре в изгледа за разлики" -#: gitk:3031 +#: gitk:3065 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Backspace>\tСтраница надолу в изгледа за разлики" -#: gitk:3032 +#: gitk:3066 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Space>\t\tСтраница надолу в изгледа за разлики" -#: gitk:3033 +#: gitk:3067 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\t18 реда нагоре в изгледа за разлики" -#: gitk:3034 +#: gitk:3068 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\t18 реда надолу в изгледа за разлики" -#: gitk:3035 +#: gitk:3069 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tТърÑене" -#: gitk:3036 +#: gitk:3070 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tКъм Ñледващата поÑва" -#: gitk:3037 +#: gitk:3071 msgid "<Return>\tMove to next find hit" msgstr "<Return>\tКъм Ñледващата поÑва" -#: gitk:3038 +#: gitk:3072 msgid "/\t\tFocus the search box" msgstr "/\t\tÐ¤Ð¾ÐºÑƒÑ Ð²ÑŠÑ€Ñ…Ñƒ полето за Ñ‚ÑŠÑ€Ñене" -#: gitk:3039 +#: gitk:3073 msgid "?\t\tMove to previous find hit" msgstr "?\t\tКъм предишната поÑва" -#: gitk:3040 +#: gitk:3074 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tСледващ файл в изгледа за разлики" -#: gitk:3041 +#: gitk:3075 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tТърÑене на Ñледващата поÑва в изгледа за разлики" -#: gitk:3042 +#: gitk:3076 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tТърÑене на предишната поÑва в изгледа за разлики" -#: gitk:3043 +#: gitk:3077 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tПо-голÑм размер на шрифта" -#: gitk:3044 +#: gitk:3078 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tПо-голÑм размер на шрифта" -#: gitk:3045 +#: gitk:3079 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tПо-малък размер на шрифта" -#: gitk:3046 +#: gitk:3080 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tПо-малък размер на шрифта" -#: gitk:3047 +#: gitk:3081 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tОбновÑване" -#: gitk:3512 gitk:3521 +#: gitk:3546 gitk:3555 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Грешка при Ñъздаването на временната Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ â€ž%s“:" -#: gitk:3534 +#: gitk:3568 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Грешка при получаването на „%s“ от %s:" -#: gitk:3597 +#: gitk:3631 msgid "command failed:" msgstr "неуÑпешно изпълнение на команда:" -#: gitk:3746 +#: gitk:3780 msgid "No such commit" msgstr "Такова подаване нÑма" -#: gitk:3760 +#: gitk:3794 msgid "git gui blame: command failed:" msgstr "„git gui blame“: неуÑпешно изпълнение на команда:" -#: gitk:3791 +#: gitk:3825 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Върхът за Ñливане не може да бъде прочетен: %s" -#: gitk:3799 +#: gitk:3833 #, tcl-format msgid "Error reading index: %s" msgstr "Грешка при прочитане на индекÑа: %s" -#: gitk:3824 +#: gitk:3858 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Командата „git blame“ не може да бъде Ñтартирана: %s" -#: gitk:3827 gitk:6697 +#: gitk:3861 gitk:6735 msgid "Searching" msgstr "ТърÑене" -#: gitk:3859 +#: gitk:3893 #, tcl-format msgid "Error running git blame: %s" msgstr "Грешка при изпълнението на „git blame“: %s" -#: gitk:3887 +#: gitk:3921 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "Този ред идва от подаването %s, което не е в изгледа" -#: gitk:3901 +#: gitk:3935 msgid "External diff viewer failed:" msgstr "ÐеуÑпешно изпълнение на външната програма за разлики:" -#: gitk:4019 +#: gitk:4053 msgid "Gitk view definition" msgstr "Ð”ÐµÑ„Ð¸Ð½Ð¸Ñ†Ð¸Ñ Ð½Ð° изглед в Gitk" -#: gitk:4023 +#: gitk:4057 msgid "Remember this view" msgstr "Запазване на този изглед" -#: gitk:4024 +#: gitk:4058 msgid "References (space separated list):" msgstr "Указатели (ÑпиÑък Ñ Ñ€Ð°Ð·Ð´ÐµÐ»Ð¸Ñ‚ÐµÐ» интервал):" -#: gitk:4025 +#: gitk:4059 msgid "Branches & tags:" msgstr "Клони и етикети:" -#: gitk:4026 +#: gitk:4060 msgid "All refs" msgstr "Ð’Ñички указатели" -#: gitk:4027 +#: gitk:4061 msgid "All (local) branches" msgstr "Ð’Ñички (локални) клони" -#: gitk:4028 +#: gitk:4062 msgid "All tags" msgstr "Ð’Ñички етикети" -#: gitk:4029 +#: gitk:4063 msgid "All remote-tracking branches" msgstr "Ð’Ñички ÑледÑщи клони" -#: gitk:4030 +#: gitk:4064 msgid "Commit Info (regular expressions):" msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° подаване (рег. изр.):" -#: gitk:4031 +#: gitk:4065 msgid "Author:" msgstr "Ðвтор:" -#: gitk:4032 +#: gitk:4066 msgid "Committer:" msgstr "Подал:" -#: gitk:4033 +#: gitk:4067 msgid "Commit Message:" msgstr "Съобщение при подаване:" -#: gitk:4034 +#: gitk:4068 msgid "Matches all Commit Info criteria" msgstr "Съвпадение по ÐºÐ¾Ñ Ð´Ð° е Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° подаването" -#: gitk:4035 +#: gitk:4069 +#, fuzzy +msgid "Matches none Commit Info criteria" +msgstr "Съвпадение по ÐºÐ¾Ñ Ð´Ð° е Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° подаването" + +#: gitk:4070 msgid "Changes to Files:" msgstr "Промени по файловете:" -#: gitk:4036 +#: gitk:4071 msgid "Fixed String" msgstr "ДоÑловен низ" -#: gitk:4037 +#: gitk:4072 msgid "Regular Expression" msgstr "РегулÑрен израз" -#: gitk:4038 +#: gitk:4073 msgid "Search string:" msgstr "Ðиз за Ñ‚ÑŠÑ€Ñене:" -#: gitk:4039 +#: gitk:4074 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -670,204 +680,204 @@ msgstr "" "Дата на подаване („2 weeks ago“ (преди 2 Ñедмици), „2009-03-17 15:27:38“, " "„March 17, 2009 15:27:38“):" -#: gitk:4040 +#: gitk:4075 msgid "Since:" msgstr "От:" -#: gitk:4041 +#: gitk:4076 msgid "Until:" msgstr "До:" -#: gitk:4042 +#: gitk:4077 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "" "Ограничаване и/или преÑкачане на определен брой верÑии (неотрицателно цÑло " "чиÑло):" -#: gitk:4043 +#: gitk:4078 msgid "Number to show:" msgstr "Брой показани:" -#: gitk:4044 +#: gitk:4079 msgid "Number to skip:" msgstr "Брой преÑкочени:" -#: gitk:4045 +#: gitk:4080 msgid "Miscellaneous options:" msgstr "Разни:" -#: gitk:4046 +#: gitk:4081 msgid "Strictly sort by date" msgstr "Подреждане по дата" -#: gitk:4047 +#: gitk:4082 msgid "Mark branch sides" msgstr "ОтбелÑзване на Ñтраните по клона" -#: gitk:4048 +#: gitk:4083 msgid "Limit to first parent" msgstr "Само Ð¿ÑŠÑ€Ð²Ð¸Ñ Ñ€Ð¾Ð´Ð¸Ñ‚ÐµÐ»" -#: gitk:4049 +#: gitk:4084 msgid "Simple history" msgstr "ОпроÑтена иÑториÑ" -#: gitk:4050 +#: gitk:4085 msgid "Additional arguments to git log:" msgstr "Допълнителни аргументи към „git log“:" -#: gitk:4051 +#: gitk:4086 msgid "Enter files and directories to include, one per line:" msgstr "Въведете файловете и директориите за включване, по елемент на ред" -#: gitk:4052 +#: gitk:4087 msgid "Command to generate more commits to include:" msgstr "" "Команда за генерирането на допълнителни подаваниÑ, които да бъдат включени:" -#: gitk:4176 +#: gitk:4211 msgid "Gitk: edit view" msgstr "Gitk: редактиране на изглед" -#: gitk:4184 +#: gitk:4219 msgid "-- criteria for selecting revisions" msgstr "— критерии за избор на верÑии" -#: gitk:4189 +#: gitk:4224 msgid "View Name" msgstr "Име на изглед" -#: gitk:4264 +#: gitk:4299 msgid "Apply (F5)" msgstr "Прилагане (F5)" -#: gitk:4302 +#: gitk:4337 msgid "Error in commit selection arguments:" msgstr "Грешка в аргументите за избор на подаваниÑ:" -#: gitk:4355 gitk:4407 gitk:4868 gitk:4882 gitk:6152 gitk:12281 gitk:12282 +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 msgid "None" msgstr "ÐÑма" -#: gitk:4965 gitk:4970 +#: gitk:5003 gitk:5008 msgid "Descendant" msgstr "ÐаÑледник" -#: gitk:4966 +#: gitk:5004 msgid "Not descendant" msgstr "Ðе е наÑледник" -#: gitk:4973 gitk:4978 +#: gitk:5011 gitk:5016 msgid "Ancestor" msgstr "ПредшеÑтвеник" -#: gitk:4974 +#: gitk:5012 msgid "Not ancestor" msgstr "Ðе е предшеÑтвеник" -#: gitk:5268 +#: gitk:5306 msgid "Local changes checked in to index but not committed" msgstr "Локални промени добавени към индекÑа, но неподадени" -#: gitk:5304 +#: gitk:5342 msgid "Local uncommitted changes, not checked in to index" msgstr "Локални промени извън индекÑа" -#: gitk:7077 +#: gitk:7115 msgid "and many more" msgstr "и още много" -#: gitk:7080 +#: gitk:7118 msgid "many" msgstr "много" -#: gitk:7271 +#: gitk:7309 msgid "Tags:" msgstr "Етикети:" -#: gitk:7288 gitk:7294 gitk:8760 +#: gitk:7326 gitk:7332 gitk:8806 msgid "Parent" msgstr "Родител" -#: gitk:7299 +#: gitk:7337 msgid "Child" msgstr "Дете" -#: gitk:7308 +#: gitk:7346 msgid "Branch" msgstr "Клон" -#: gitk:7311 +#: gitk:7349 msgid "Follows" msgstr "Следва" -#: gitk:7314 +#: gitk:7352 msgid "Precedes" msgstr "ПредшеÑтва" -#: gitk:7901 +#: gitk:7947 #, tcl-format msgid "Error getting diffs: %s" msgstr "Грешка при получаването на разликите: %s" -#: gitk:8585 +#: gitk:8631 msgid "Goto:" msgstr "Към ред:" -#: gitk:8606 +#: gitk:8652 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "Съкратената Ñума по SHA1 %s не е еднозначна" -#: gitk:8613 +#: gitk:8659 #, tcl-format msgid "Revision %s is not known" msgstr "Ðепозната верÑÐ¸Ñ %s" -#: gitk:8623 +#: gitk:8669 #, tcl-format msgid "SHA1 id %s is not known" msgstr "Ðепозната Ñума по SHA1 %s" -#: gitk:8625 +#: gitk:8671 #, tcl-format msgid "Revision %s is not in the current view" msgstr "ВерÑÐ¸Ñ %s не е в Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ Ð¸Ð·Ð³Ð»ÐµÐ´" -#: gitk:8767 gitk:8782 +#: gitk:8813 gitk:8828 msgid "Date" msgstr "Дата" -#: gitk:8770 +#: gitk:8816 msgid "Children" msgstr "Деца" -#: gitk:8833 +#: gitk:8879 #, tcl-format msgid "Reset %s branch to here" msgstr "ЗанулÑване на клона „%s“ към текущото подаване" -#: gitk:8835 +#: gitk:8881 msgid "Detached head: can't reset" msgstr "ÐеÑвързан връх: невъзможно занулÑване" -#: gitk:8940 gitk:8946 +#: gitk:8986 gitk:8992 msgid "Skipping merge commit " msgstr "ПропуÑкане на подаването на Ñливането" -#: gitk:8955 gitk:8960 +#: gitk:9001 gitk:9006 msgid "Error getting patch ID for " msgstr "Грешка при получаването на идентификатора на " -#: gitk:8956 gitk:8961 +#: gitk:9002 gitk:9007 msgid " - stopping\n" msgstr " — Ñпиране\n" -#: gitk:8966 gitk:8969 gitk:8977 gitk:8991 gitk:9000 +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 msgid "Commit " msgstr "Подаване" -#: gitk:8970 +#: gitk:9016 msgid "" " is the same patch as\n" " " @@ -875,7 +885,7 @@ msgstr "" " е Ñъщата кръпка като\n" " " -#: gitk:8978 +#: gitk:9024 msgid "" " differs from\n" " " @@ -883,7 +893,7 @@ msgstr "" " Ñе различава от\n" " " -#: gitk:8980 +#: gitk:9026 msgid "" "Diff of commits:\n" "\n" @@ -891,130 +901,130 @@ msgstr "" "Разлика между подаваниÑта:\n" "\n" -#: gitk:8992 gitk:9001 +#: gitk:9038 gitk:9047 #, tcl-format msgid " has %s children - stopping\n" msgstr " има %s деца — Ñпиране\n" -#: gitk:9020 +#: gitk:9066 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Грешка при запазването на подаването във файл: %s" -#: gitk:9026 +#: gitk:9072 #, tcl-format msgid "Error diffing commits: %s" msgstr "Грешка при изчиÑлÑването на разликите между подаваниÑта: %s" -#: gitk:9072 +#: gitk:9118 msgid "Top" msgstr "Ðай-горе" -#: gitk:9073 +#: gitk:9119 msgid "From" msgstr "От" -#: gitk:9078 +#: gitk:9124 msgid "To" msgstr "До" -#: gitk:9102 +#: gitk:9148 msgid "Generate patch" msgstr "Генериране на кръпка" -#: gitk:9104 +#: gitk:9150 msgid "From:" msgstr "От:" -#: gitk:9113 +#: gitk:9159 msgid "To:" msgstr "До:" -#: gitk:9122 +#: gitk:9168 msgid "Reverse" msgstr "Обръщане" -#: gitk:9124 gitk:9320 +#: gitk:9170 gitk:9366 msgid "Output file:" msgstr "Запазване във файла:" -#: gitk:9130 +#: gitk:9176 msgid "Generate" msgstr "Генериране" -#: gitk:9168 +#: gitk:9214 msgid "Error creating patch:" msgstr "Грешка при Ñъздаването на кръпка:" -#: gitk:9191 gitk:9308 gitk:9365 +#: gitk:9237 gitk:9354 gitk:9411 msgid "ID:" msgstr "Идентификатор:" -#: gitk:9200 +#: gitk:9246 msgid "Tag name:" msgstr "Име на етикет:" -#: gitk:9203 +#: gitk:9249 msgid "Tag message is optional" msgstr "Съобщението за етикет е незадължително" -#: gitk:9205 +#: gitk:9251 msgid "Tag message:" msgstr "Съобщение за етикет:" -#: gitk:9209 gitk:9374 +#: gitk:9255 gitk:9420 msgid "Create" msgstr "Създаване" -#: gitk:9227 +#: gitk:9273 msgid "No tag name specified" msgstr "ЛипÑва име на етикет" -#: gitk:9231 +#: gitk:9277 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Етикетът „%s“ вече ÑъщеÑтвува" -#: gitk:9241 +#: gitk:9287 msgid "Error creating tag:" msgstr "Грешка при Ñъздаването на етикет:" -#: gitk:9317 +#: gitk:9363 msgid "Command:" msgstr "Команда:" -#: gitk:9325 +#: gitk:9371 msgid "Write" msgstr "Запазване" -#: gitk:9343 +#: gitk:9389 msgid "Error writing commit:" msgstr "Грешка при запазването на подаването:" -#: gitk:9370 +#: gitk:9416 msgid "Name:" msgstr "Име:" -#: gitk:9393 +#: gitk:9439 msgid "Please specify a name for the new branch" msgstr "Укажете име за Ð½Ð¾Ð²Ð¸Ñ ÐºÐ»Ð¾Ð½" -#: gitk:9398 +#: gitk:9444 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "Клонът „%s“ вече ÑъщеÑтвува. Да бъде ли презапиÑан?" -#: gitk:9465 +#: gitk:9511 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "" "Подаването „%s“ вече е включено в клона „%s“ — да бъде ли приложено отново?" -#: gitk:9470 +#: gitk:9516 msgid "Cherry-picking" msgstr "Отбиране" -#: gitk:9479 +#: gitk:9525 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -1023,7 +1033,7 @@ msgstr "" "ÐеуÑпешно отбиране, защото във файла „%s“ има локални промени.\n" "Подайте, занулете или ги Ñкатайте и пробвайте отново." -#: gitk:9485 +#: gitk:9531 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1031,20 +1041,20 @@ msgstr "" "ÐеуÑпешно отбиране поради конфликти при Ñливане.\n" "ИÑкате ли да ги коригирате чрез „git citool“?" -#: gitk:9501 gitk:9559 +#: gitk:9547 gitk:9605 msgid "No changes committed" msgstr "Ðе Ñа подадени промени" -#: gitk:9528 +#: gitk:9574 #, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" msgstr "Подаването „%s“ не е включено в клона „%s“. Да бъде ли отменено?" -#: gitk:9533 +#: gitk:9579 msgid "Reverting" msgstr "ОтмÑна" -#: gitk:9541 +#: gitk:9587 #, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " @@ -1053,7 +1063,7 @@ msgstr "" "ÐеуÑпешна отмÑна, защото във файла „%s“ има локални промени.\n" "Подайте, занулете или ги Ñкатайте и пробвайте отново.<" -#: gitk:9545 +#: gitk:9591 msgid "" "Revert failed because of merge conflict.\n" " Do you wish to run git citool to resolve it?" @@ -1061,28 +1071,28 @@ msgstr "" "ÐеуÑпешно отмÑна поради конфликти при Ñливане.\n" "ИÑкате ли да ги коригирате чрез „git citool“?" -#: gitk:9588 +#: gitk:9634 msgid "Confirm reset" msgstr "Потвърждаване на занулÑването" -#: gitk:9590 +#: gitk:9636 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Да Ñе занули ли клонът „%s“ към „%s“?" -#: gitk:9592 +#: gitk:9638 msgid "Reset type:" msgstr "Вид занулÑване:" -#: gitk:9595 +#: gitk:9641 msgid "Soft: Leave working tree and index untouched" msgstr "Слабо: работното дърво и индекÑа оÑтават Ñъщите" -#: gitk:9598 +#: gitk:9644 msgid "Mixed: Leave working tree untouched, reset index" msgstr "СмеÑено: работното дърво оÑтава Ñъщото, индекÑÑŠÑ‚ Ñе занулÑва" -#: gitk:9601 +#: gitk:9647 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1090,19 +1100,19 @@ msgstr "" "Силно: занулÑване и на работното дърво, и на индекÑа\n" "(*ВСИЧКИ* локални промени ще бъдат безвъзвратно загубени)" -#: gitk:9618 +#: gitk:9664 msgid "Resetting" msgstr "ЗанулÑване" -#: gitk:9678 +#: gitk:9724 msgid "Checking out" msgstr "ИзтеглÑне" -#: gitk:9731 +#: gitk:9777 msgid "Cannot delete the currently checked-out branch" msgstr "Текущо изтеглениÑÑ‚ клон не може да бъде изтрит" -#: gitk:9737 +#: gitk:9783 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1111,16 +1121,16 @@ msgstr "" "ПодаваниÑта на клона „%s“ не Ñа на никой друг клон.\n" "ÐаиÑтина ли да Ñе изтрие клонът „%s“?" -#: gitk:9768 +#: gitk:9814 #, tcl-format msgid "Tags and heads: %s" msgstr "Етикети и върхове: %s" -#: gitk:9783 +#: gitk:9829 msgid "Filter" msgstr "Филтриране" -#: gitk:10079 +#: gitk:10125 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1128,213 +1138,213 @@ msgstr "" "Грешка при прочитането на топологиÑта на подаваниÑта. ИнформациÑта за клона " "и предшеÑтващите/Ñледващите етикети ще е непълна." -#: gitk:11056 +#: gitk:11102 msgid "Tag" msgstr "Етикет" -#: gitk:11060 +#: gitk:11106 msgid "Id" msgstr "Идентификатор" -#: gitk:11143 +#: gitk:11189 msgid "Gitk font chooser" msgstr "Избор на шрифт за Gitk" -#: gitk:11160 +#: gitk:11206 msgid "B" msgstr "Ч" -#: gitk:11163 +#: gitk:11209 msgid "I" msgstr "К" -#: gitk:11281 +#: gitk:11327 msgid "Commit list display options" msgstr "ÐаÑтройки на ÑпиÑъка Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ" -#: gitk:11284 +#: gitk:11330 msgid "Maximum graph width (lines)" msgstr "МакÑимална широчина на графа (в редове)" -#: gitk:11287 -#, tcl-format +#: gitk:11334 +#, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "МакÑимална широчина на графа (% от панела)" -#: gitk:11290 +#: gitk:11337 msgid "Show local changes" msgstr "Показване на локалните промени" -#: gitk:11293 +#: gitk:11340 msgid "Auto-select SHA1 (length)" msgstr "Ðвтоматично избиране на SHA1 (дължина)" -#: gitk:11297 +#: gitk:11344 msgid "Hide remote refs" msgstr "Скриване на отдалечените указатели" -#: gitk:11301 +#: gitk:11348 msgid "Diff display options" msgstr "ÐаÑтройки на показването на разликите" -#: gitk:11303 +#: gitk:11350 msgid "Tab spacing" msgstr "Широчина на табулатора" -#: gitk:11306 +#: gitk:11353 msgid "Display nearby tags/heads" msgstr "Извеждане на близките етикети и върхове" -#: gitk:11309 +#: gitk:11356 msgid "Maximum # tags/heads to show" msgstr "МакÑимален брой етикети/върхове за показване" -#: gitk:11312 +#: gitk:11359 msgid "Limit diffs to listed paths" msgstr "Разлика Ñамо в избраните пътища" -#: gitk:11315 +#: gitk:11362 msgid "Support per-file encodings" msgstr "Поддръжка на различни ÐºÐ¾Ð´Ð¸Ñ€Ð°Ð½Ð¸Ñ Ð·Ð° вÑеки файл" -#: gitk:11321 gitk:11468 +#: gitk:11368 gitk:11515 msgid "External diff tool" msgstr "Външен инÑтрумент за разлики" -#: gitk:11322 +#: gitk:11369 msgid "Choose..." msgstr "Избор…" -#: gitk:11327 +#: gitk:11374 msgid "General options" msgstr "Общи наÑтройки" -#: gitk:11330 +#: gitk:11377 msgid "Use themed widgets" msgstr "Използване на тема за графичните обекти" -#: gitk:11332 +#: gitk:11379 msgid "(change requires restart)" msgstr "(промÑната изиÑква реÑтартиране на Gitk)" -#: gitk:11334 +#: gitk:11381 msgid "(currently unavailable)" msgstr "(в момента недоÑтъпно)" -#: gitk:11345 +#: gitk:11392 msgid "Colors: press to choose" msgstr "Цветове: избира Ñе Ñ Ð½Ð°Ñ‚Ð¸Ñкане" -#: gitk:11348 +#: gitk:11395 msgid "Interface" msgstr "ИнтерфейÑ" -#: gitk:11349 +#: gitk:11396 msgid "interface" msgstr "интерфейÑ" -#: gitk:11352 +#: gitk:11399 msgid "Background" msgstr "Фон" -#: gitk:11353 gitk:11383 +#: gitk:11400 gitk:11430 msgid "background" msgstr "фон" -#: gitk:11356 +#: gitk:11403 msgid "Foreground" msgstr "Знаци" -#: gitk:11357 +#: gitk:11404 msgid "foreground" msgstr "знаци" -#: gitk:11360 +#: gitk:11407 msgid "Diff: old lines" msgstr "Разлика: Ñтари редове" -#: gitk:11361 +#: gitk:11408 msgid "diff old lines" msgstr "разлика, Ñтари редове" -#: gitk:11365 +#: gitk:11412 msgid "Diff: new lines" msgstr "Разлика: нови редове" -#: gitk:11366 +#: gitk:11413 msgid "diff new lines" msgstr "разлика, нови редове" -#: gitk:11370 +#: gitk:11417 msgid "Diff: hunk header" msgstr "Разлика: начало на парче" -#: gitk:11372 +#: gitk:11419 msgid "diff hunk header" msgstr "разлика, начало на парче" -#: gitk:11376 +#: gitk:11423 msgid "Marked line bg" msgstr "Фон на отбелÑзан ред" -#: gitk:11378 +#: gitk:11425 msgid "marked line background" msgstr "фон на отбелÑзан ред" -#: gitk:11382 +#: gitk:11429 msgid "Select bg" msgstr "Избор на фон" -#: gitk:11391 +#: gitk:11438 msgid "Fonts: press to choose" msgstr "Шрифтове: избира Ñе Ñ Ð½Ð°Ñ‚Ð¸Ñкане" -#: gitk:11393 +#: gitk:11440 msgid "Main font" msgstr "ОÑновен шрифт" -#: gitk:11394 +#: gitk:11441 msgid "Diff display font" msgstr "Шрифт за разликите" -#: gitk:11395 +#: gitk:11442 msgid "User interface font" msgstr "Шрифт на интерфейÑа" -#: gitk:11417 +#: gitk:11464 msgid "Gitk preferences" msgstr "ÐаÑтройки на Gitk" -#: gitk:11426 +#: gitk:11473 msgid "General" msgstr "Общи" -#: gitk:11427 +#: gitk:11474 msgid "Colors" msgstr "Цветове" -#: gitk:11428 +#: gitk:11475 msgid "Fonts" msgstr "Шрифтове" -#: gitk:11478 +#: gitk:11525 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: избор на цвÑÑ‚ на „%s“" -#: gitk:12177 +#: gitk:12242 msgid "Cannot find a git repository here." msgstr "Тук липÑва хранилище на Git." -#: gitk:12224 +#: gitk:12289 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Ðееднозначен аргумент „%s“: има и такава верÑиÑ, и такъв файл" -#: gitk:12236 +#: gitk:12301 msgid "Bad arguments to gitk:" msgstr "Ðеправилни аргументи на gitk:" -#: gitk:12339 +#: gitk:12405 msgid "Command line" msgstr "Команден ред" diff --git a/gitk-git/po/ca.po b/gitk-git/po/ca.po new file mode 100644 index 0000000..2c1f606 --- /dev/null +++ b/gitk-git/po/ca.po @@ -0,0 +1,1354 @@ +# Translation of gitk +# Copyright (C) 2005-2014 Paul Mackerras +# This file is distributed under the same license as the gitk package. +# Alex Henrie <alexhenrie24@gmail.com>, 2015. +# +# +msgid "" +msgstr "" +"Project-Id-Version: gitk\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-03-15 14:37+1100\n" +"PO-Revision-Date: 2015-02-01 22:49-0700\n" +"Last-Translator: Alex Henrie <alexhenrie24@gmail.com>\n" +"Language-Team: Catalan\n" +"Language: ca\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.7.3\n" + +#: gitk:140 +msgid "Couldn't get list of unmerged files:" +msgstr "No s'ha pogut obtenir la llista de fitxers no fusionats:" + +#: gitk:212 gitk:2381 +msgid "Color words" +msgstr "Colora les paraules" + +#: gitk:217 gitk:2381 gitk:8201 gitk:8234 +msgid "Markup words" +msgstr "Marca les paraules" + +#: gitk:324 +msgid "Error parsing revisions:" +msgstr "Error en analitzar les revisions:" + +#: gitk:380 +msgid "Error executing --argscmd command:" +msgstr "Error en executar l'ordre --argscmd:" + +#: gitk:393 +msgid "No files selected: --merge specified but no files are unmerged." +msgstr "" +"No hi ha fitxers seleccionats: s'ha especificat --merge però cap fitxer està " +"sense fusionar." + +#: gitk:396 +msgid "" +"No files selected: --merge specified but no unmerged files are within file " +"limit." +msgstr "" +"No hi ha fitxers seleccionats: s'ha especificat --merge però cap fitxer " +"sense fusionar està dins del lÃmit de fitxers." + +#: gitk:418 gitk:566 +msgid "Error executing git log:" +msgstr "Error en executar git log:" + +#: gitk:436 gitk:582 +msgid "Reading" +msgstr "Llegint" + +#: gitk:496 gitk:4508 +msgid "Reading commits..." +msgstr "Llegint les revisions..." + +#: gitk:499 gitk:1637 gitk:4511 +msgid "No commits selected" +msgstr "Cap comissió seleccionada" + +#: gitk:1511 +msgid "Can't parse git log output:" +msgstr "No es pot analitzar la sortida del git log:" + +#: gitk:1740 +msgid "No commit information available" +msgstr "Cap informació de comissió disponible" + +#: gitk:1897 +msgid "mc" +msgstr "mc" + +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 +msgid "OK" +msgstr "D'acord" + +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 +#: gitk:11221 gitk:11501 +msgid "Cancel" +msgstr "Cancel·la" + +#: gitk:2069 +msgid "Update" +msgstr "Actualitza" + +#: gitk:2070 +msgid "Reload" +msgstr "Recarrega" + +#: gitk:2071 +msgid "Reread references" +msgstr "Rellegeix les referències" + +#: gitk:2072 +msgid "List references" +msgstr "Llista les referències" + +#: gitk:2074 +msgid "Start git gui" +msgstr "Inicia el git gui" + +#: gitk:2076 +msgid "Quit" +msgstr "Surt" + +#: gitk:2068 +msgid "File" +msgstr "Fitxer" + +#: gitk:2080 +msgid "Preferences" +msgstr "Preferències" + +#: gitk:2079 +msgid "Edit" +msgstr "Edita" + +#: gitk:2084 +msgid "New view..." +msgstr "Vista nova..." + +#: gitk:2085 +msgid "Edit view..." +msgstr "Edita la vista..." + +#: gitk:2086 +msgid "Delete view" +msgstr "Suprimeix vista" + +#: gitk:2088 +msgid "All files" +msgstr "Tots els fitxers" + +#: gitk:2083 gitk:4050 +msgid "View" +msgstr "Vista" + +#: gitk:2093 gitk:2103 gitk:3009 +msgid "About gitk" +msgstr "Quant al gitk" + +#: gitk:2094 gitk:2108 +msgid "Key bindings" +msgstr "Associacions de tecles" + +#: gitk:2092 gitk:2107 +msgid "Help" +msgstr "Ajuda" + +#: gitk:2185 gitk:8633 +msgid "SHA1 ID:" +msgstr "ID SHA1:" + +#: gitk:2229 +msgid "Row" +msgstr "Fila" + +#: gitk:2267 +msgid "Find" +msgstr "Cerca" + +#: gitk:2295 +msgid "commit" +msgstr "comissió" + +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 +#: gitk:6893 +msgid "containing:" +msgstr "que contingui:" + +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 +msgid "touching paths:" +msgstr "que toqui els camins:" + +#: gitk:2303 gitk:4759 +msgid "adding/removing string:" +msgstr "que afegeixi/elimini la cadena:" + +#: gitk:2304 gitk:4761 +msgid "changing lines matching:" +msgstr "que tingui lÃnies canviades coincidents amb:" + +#: gitk:2313 gitk:2315 gitk:4748 +msgid "Exact" +msgstr "Exacte" + +#: gitk:2315 gitk:4836 gitk:6704 +msgid "IgnCase" +msgstr "Ignora majúscula i minúscula" + +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 +msgid "Regexp" +msgstr "Regexp" + +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 +msgid "All fields" +msgstr "Tots els camps" + +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 +msgid "Headline" +msgstr "Titular" + +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 +msgid "Comments" +msgstr "Comentaris" + +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 +#: gitk:8826 +msgid "Author" +msgstr "Autor" + +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 +msgid "Committer" +msgstr "Comitent" + +#: gitk:2350 +msgid "Search" +msgstr "Cerca" + +#: gitk:2358 +msgid "Diff" +msgstr "Diferència" + +#: gitk:2360 +msgid "Old version" +msgstr "Versió antiga" + +#: gitk:2362 +msgid "New version" +msgstr "Versió nova" + +#: gitk:2364 +msgid "Lines of context" +msgstr "LÃnies de context" + +#: gitk:2374 +msgid "Ignore space change" +msgstr "Ignora canvis d'espai" + +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +msgid "Line diff" +msgstr "Diferència de lÃnies" + +#: gitk:2445 +msgid "Patch" +msgstr "Pedaç" + +#: gitk:2447 +msgid "Tree" +msgstr "Arbre" + +#: gitk:2616 gitk:2636 +msgid "Diff this -> selected" +msgstr "Diferencia aquesta -> la seleccionada" + +#: gitk:2617 gitk:2637 +msgid "Diff selected -> this" +msgstr "Diferencia la seleccionada -> aquesta" + +#: gitk:2618 gitk:2638 +msgid "Make patch" +msgstr "Fes pedaç" + +#: gitk:2619 gitk:9235 +msgid "Create tag" +msgstr "Crea etiqueta" + +#: gitk:2620 gitk:9352 +msgid "Write commit to file" +msgstr "Escriu la comissió a un fitxer" + +#: gitk:2621 gitk:9409 +msgid "Create new branch" +msgstr "Crea una branca nova" + +#: gitk:2622 +msgid "Cherry-pick this commit" +msgstr "Recull aquesta comissió com a cirera" + +#: gitk:2623 +msgid "Reset HEAD branch to here" +msgstr "Restableix la branca HEAD aquÃ" + +#: gitk:2624 +msgid "Mark this commit" +msgstr "Marca aquesta comissió" + +#: gitk:2625 +msgid "Return to mark" +msgstr "Torna a la marca" + +#: gitk:2626 +msgid "Find descendant of this and mark" +msgstr "Troba la descendent d'aquesta i marca-la" + +#: gitk:2627 +msgid "Compare with marked commit" +msgstr "Compara amb la comissió marcada" + +#: gitk:2628 gitk:2639 +msgid "Diff this -> marked commit" +msgstr "Diferencia aquesta -> la comissió marcada" + +#: gitk:2629 gitk:2640 +msgid "Diff marked commit -> this" +msgstr "Diferencia la comissió seleccionada -> aquesta" + +#: gitk:2630 +msgid "Revert this commit" +msgstr "Reverteix aquesta comissió" + +#: gitk:2646 +msgid "Check out this branch" +msgstr "Agafa aquesta branca" + +#: gitk:2647 +msgid "Remove this branch" +msgstr "Elimina aquesta branca" + +#: gitk:2654 +msgid "Highlight this too" +msgstr "Ressalta aquest també" + +#: gitk:2655 +msgid "Highlight this only" +msgstr "Ressalta només aquest" + +#: gitk:2656 +msgid "External diff" +msgstr "Diferència externa" + +#: gitk:2657 +msgid "Blame parent commit" +msgstr "Culpabilitat de la comissió mare" + +#: gitk:2664 +msgid "Show origin of this line" +msgstr "Mostra l'origen d'aquesta lÃnia" + +#: gitk:2665 +msgid "Run git gui blame on this line" +msgstr "Executa git gui blame en aquesta lÃnia" + +#: gitk:3011 +msgid "" +"\n" +"Gitk - a commit viewer for git\n" +"\n" +"Copyright © 2005-2014 Paul Mackerras\n" +"\n" +"Use and redistribute under the terms of the GNU General Public License" +msgstr "" +"\n" +"Gitk - visualitzador de comissions per al git\n" +"\n" +"Copyright © 2005-2014 Paul Mackerras\n" +"\n" +"Useu-lo i redistribuïu-lo sota els termes de la Llicència Pública General GNU" + +#: gitk:3019 gitk:3085 gitk:9836 +msgid "Close" +msgstr "Tanca" + +#: gitk:3040 +msgid "Gitk key bindings" +msgstr "Associacions de tecles del Gitk" + +#: gitk:3043 +msgid "Gitk key bindings:" +msgstr "Associacions de tecles del Gitk:" + +#: gitk:3045 +#, tcl-format +msgid "<%s-Q>\t\tQuit" +msgstr "<%s-Q>\t\tSurt" + +#: gitk:3046 +#, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-W>\t\tTanca la finestra" + +#: gitk:3047 +msgid "<Home>\t\tMove to first commit" +msgstr "<Inici>\t\tVés a la primera comissió" + +#: gitk:3048 +msgid "<End>\t\tMove to last commit" +msgstr "<Fi>\t\tVés a l'última comissió" + +#: gitk:3049 +msgid "<Up>, p, k\tMove up one commit" +msgstr "<Amunt>, p, k\tMou-te una comissió amunt" + +#: gitk:3050 +msgid "<Down>, n, j\tMove down one commit" +msgstr "<Avall>, n, j\tMou-te una comissió avall" + +#: gitk:3051 +msgid "<Left>, z, h\tGo back in history list" +msgstr "<Esquerra>, z, h\tRetrocedeix en la llista d'història" + +#: gitk:3052 +msgid "<Right>, x, l\tGo forward in history list" +msgstr "<Dreta>, x, l\tAvança en la llista d'història" + +#: gitk:3053 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "" +"<%s-n>\tVés a l'enèsima mare de la comissió actual en la llista d'història" + +#: gitk:3054 +msgid "<PageUp>\tMove up one page in commit list" +msgstr "<RePà g>\tBaixa una pà gina en la llista de comissions" + +#: gitk:3055 +msgid "<PageDown>\tMove down one page in commit list" +msgstr "<AvPà g>\tBaixa per una pà gina en la llista de comissions" + +#: gitk:3056 +#, tcl-format +msgid "<%s-Home>\tScroll to top of commit list" +msgstr "<%s-Inici>\tDesplaça't a la part superior de la llista de comissions" + +#: gitk:3057 +#, tcl-format +msgid "<%s-End>\tScroll to bottom of commit list" +msgstr "<%s-Fi>\tDesplaça't a la part inferior de la llista de comissions" + +#: gitk:3058 +#, tcl-format +msgid "<%s-Up>\tScroll commit list up one line" +msgstr "<%s-Amunt>\tDesplaça la llista de comissions una lÃnia cap amunt" + +#: gitk:3059 +#, tcl-format +msgid "<%s-Down>\tScroll commit list down one line" +msgstr "<%s-Avall>\tDesplaça la llista de comissions una lÃnia cap avall" + +#: gitk:3060 +#, tcl-format +msgid "<%s-PageUp>\tScroll commit list up one page" +msgstr "<%s-RePà g>\tDesplaça la llista de comissions amunt per una pà gina" + +#: gitk:3061 +#, tcl-format +msgid "<%s-PageDown>\tScroll commit list down one page" +msgstr "<%s-AvPà g>\tDesplaça la llista de comissions una pà gina cap avall" + +#: gitk:3062 +msgid "<Shift-Up>\tFind backwards (upwards, later commits)" +msgstr "<Maj-Amunt>\tCerca cap enrere (amunt, les comissions més noves)" + +#: gitk:3063 +msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" +msgstr "<Maj-Avall>\tCerca cap endavant (avall, les comissions més velles)" + +#: gitk:3064 +msgid "<Delete>, b\tScroll diff view up one page" +msgstr "<Supr>, b\tDesplaça la vista de diferència una pà gina cap amunt" + +#: gitk:3065 +msgid "<Backspace>\tScroll diff view up one page" +msgstr "<Retrocés>\tDesplaça la vista de diferència una pà gina cap amunt" + +#: gitk:3066 +msgid "<Space>\t\tScroll diff view down one page" +msgstr "<Espai>\t\tDesplaça la vista de diferència una pà gina cap avall" + +#: gitk:3067 +msgid "u\t\tScroll diff view up 18 lines" +msgstr "u\t\tDesplaça la vista de diferència 18 lÃnies cap amunt" + +#: gitk:3068 +msgid "d\t\tScroll diff view down 18 lines" +msgstr "d\t\tDesplaça la vista de diferència 18 lÃnies cap avall " + +#: gitk:3069 +#, tcl-format +msgid "<%s-F>\t\tFind" +msgstr "<%s-F>\t\tCerca" + +#: gitk:3070 +#, tcl-format +msgid "<%s-G>\t\tMove to next find hit" +msgstr "<%s-G>\t\tMou-te a la propera coincidència de la cerca" + +#: gitk:3071 +msgid "<Return>\tMove to next find hit" +msgstr "<Retorn>\tMou-te a la propera coincidència de la cerca" + +#: gitk:3072 +msgid "/\t\tFocus the search box" +msgstr "/\t\tPosa el focus a la caixa de cerca" + +#: gitk:3073 +msgid "?\t\tMove to previous find hit" +msgstr "?\t\tMou a la coincidència prèvia de la cerca" + +#: gitk:3074 +msgid "f\t\tScroll diff view to next file" +msgstr "f\t\tDesplaça la vista de diferència al proper fitxer" + +#: gitk:3075 +#, tcl-format +msgid "<%s-S>\t\tSearch for next hit in diff view" +msgstr "<%s-S>\t\tCerca la propera coincidència en la vista de diferència" + +#: gitk:3076 +#, tcl-format +msgid "<%s-R>\t\tSearch for previous hit in diff view" +msgstr "<%s-R>\t\tCerca la coincidència prèvia en la vista de diferència" + +#: gitk:3077 +#, tcl-format +msgid "<%s-KP+>\tIncrease font size" +msgstr "<%s-KP+>\tAugmenta la mida de lletra" + +#: gitk:3078 +#, tcl-format +msgid "<%s-plus>\tIncrease font size" +msgstr "<%s-més>\tAugmenta la mida de lletra" + +#: gitk:3079 +#, tcl-format +msgid "<%s-KP->\tDecrease font size" +msgstr "<%s-KP->\tDisminueix la mida de lletra" + +#: gitk:3080 +#, tcl-format +msgid "<%s-minus>\tDecrease font size" +msgstr "<%s-menys>\tDisminueix la mida de lletra" + +#: gitk:3081 +msgid "<F5>\t\tUpdate" +msgstr "<F5>\t\tActualitza" + +#: gitk:3546 gitk:3555 +#, tcl-format +msgid "Error creating temporary directory %s:" +msgstr "Error en crear el directori temporal %s:" + +#: gitk:3568 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Error en obtenir \"%s\" de %s:" + +#: gitk:3631 +msgid "command failed:" +msgstr "l'ordre ha fallat:" + +#: gitk:3780 +msgid "No such commit" +msgstr "Cap comissió aixÃ" + +#: gitk:3794 +msgid "git gui blame: command failed:" +msgstr "git gui blame: l'ordre ha fallat:" + +#: gitk:3825 +#, tcl-format +msgid "Couldn't read merge head: %s" +msgstr "No s'ha pogut llegir el cap de fusió: %s" + +#: gitk:3833 +#, tcl-format +msgid "Error reading index: %s" +msgstr "Error en llegir l'Ãndex: %s" + +#: gitk:3858 +#, tcl-format +msgid "Couldn't start git blame: %s" +msgstr "No s'ha pogut iniciar el git blame: %s" + +#: gitk:3861 gitk:6735 +msgid "Searching" +msgstr "Cercant" + +#: gitk:3893 +#, tcl-format +msgid "Error running git blame: %s" +msgstr "Error en executar el git blame: %s" + +#: gitk:3921 +#, tcl-format +msgid "That line comes from commit %s, which is not in this view" +msgstr "" +"Aquella lÃnia ve de la comissió %s, la qual no és en aquesta visualització" + +#: gitk:3935 +msgid "External diff viewer failed:" +msgstr "El visualitzador de diferència extern ha fallat:" + +#: gitk:4053 +msgid "Gitk view definition" +msgstr "Definició de vista del Gitk" + +#: gitk:4057 +msgid "Remember this view" +msgstr "Recorda aquesta vista" + +#: gitk:4058 +msgid "References (space separated list):" +msgstr "Referències (llista separada per espais)" + +#: gitk:4059 +msgid "Branches & tags:" +msgstr "Branques i etiquetes:" + +#: gitk:4060 +msgid "All refs" +msgstr "Totes les referències" + +#: gitk:4061 +msgid "All (local) branches" +msgstr "Totes les branques (locals)" + +#: gitk:4062 +msgid "All tags" +msgstr "Totes les etiquetes" + +#: gitk:4063 +msgid "All remote-tracking branches" +msgstr "Totes les branques amb seguiment remot" + +#: gitk:4064 +msgid "Commit Info (regular expressions):" +msgstr "Informació de comissió (expressions regulars):" + +#: gitk:4065 +msgid "Author:" +msgstr "Autor:" + +#: gitk:4066 +msgid "Committer:" +msgstr "Comitent:" + +#: gitk:4067 +msgid "Commit Message:" +msgstr "Missatge de comissió:" + +#: gitk:4068 +msgid "Matches all Commit Info criteria" +msgstr "Coincideix amb tots els criteris d'informació de comissió" + +#: gitk:4069 +#, fuzzy +msgid "Matches none Commit Info criteria" +msgstr "Coincideix amb tots els criteris d'informació de comissió" + +#: gitk:4070 +msgid "Changes to Files:" +msgstr "Canvis als fitxers:" + +#: gitk:4071 +msgid "Fixed String" +msgstr "Cadena fixa" + +#: gitk:4072 +msgid "Regular Expression" +msgstr "Expressió regular" + +#: gitk:4073 +msgid "Search string:" +msgstr "Cadena de cerca:" + +#: gitk:4074 +msgid "" +"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " +"15:27:38\"):" +msgstr "" +"Dates de comissió (\"fa 2 setmanes\", \"2009-03-17 15:27:38\", \"17 abr 2009 " +"15:27:38\"):" + +#: gitk:4075 +msgid "Since:" +msgstr "Des de:" + +#: gitk:4076 +msgid "Until:" +msgstr "Fins:" + +#: gitk:4077 +msgid "Limit and/or skip a number of revisions (positive integer):" +msgstr "Limita o salta un nombre de revisions (nombre enter positiu)" + +#: gitk:4078 +msgid "Number to show:" +msgstr "Nombre a mostrar:" + +#: gitk:4079 +msgid "Number to skip:" +msgstr "Nombre a saltar:" + +#: gitk:4080 +msgid "Miscellaneous options:" +msgstr "Opcions miscel·là nies:" + +#: gitk:4081 +msgid "Strictly sort by date" +msgstr "Ordena estrictament per data" + +#: gitk:4082 +msgid "Mark branch sides" +msgstr "Marca els costats de les branques" + +#: gitk:4083 +msgid "Limit to first parent" +msgstr "Limita a la primera mare" + +#: gitk:4084 +msgid "Simple history" +msgstr "Història senzilla" + +#: gitk:4085 +msgid "Additional arguments to git log:" +msgstr "Parà metres addicionals al git log:" + +#: gitk:4086 +msgid "Enter files and directories to include, one per line:" +msgstr "Introduïu els fitxers i directoris a incloure, un per lÃnia:" + +#: gitk:4087 +msgid "Command to generate more commits to include:" +msgstr "Ordre per a generar més comissions a incloure:" + +#: gitk:4211 +msgid "Gitk: edit view" +msgstr "Gitk: vista d'edició" + +#: gitk:4219 +msgid "-- criteria for selecting revisions" +msgstr "-- criteris per a seleccionar les revisions" + +#: gitk:4224 +msgid "View Name" +msgstr "Nom de vista" + +#: gitk:4299 +msgid "Apply (F5)" +msgstr "Aplica (F5)" + +#: gitk:4337 +msgid "Error in commit selection arguments:" +msgstr "Error en els parà metres de selecció de comissions:" + +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 +msgid "None" +msgstr "Cap" + +#: gitk:5003 gitk:5008 +msgid "Descendant" +msgstr "Descendent" + +#: gitk:5004 +msgid "Not descendant" +msgstr "No descendent" + +#: gitk:5011 gitk:5016 +msgid "Ancestor" +msgstr "Avantpassat" + +#: gitk:5012 +msgid "Not ancestor" +msgstr "No avantpassat" + +#: gitk:5306 +msgid "Local changes checked in to index but not committed" +msgstr "Canvis locals registrats en l'Ãndex però no comesos" + +#: gitk:5342 +msgid "Local uncommitted changes, not checked in to index" +msgstr "Canvis locals sense cometre, no registrats en l'Ãndex" + +#: gitk:7115 +msgid "and many more" +msgstr "i moltes més" + +#: gitk:7118 +msgid "many" +msgstr "moltes" + +#: gitk:7309 +msgid "Tags:" +msgstr "Etiquetes:" + +#: gitk:7326 gitk:7332 gitk:8806 +msgid "Parent" +msgstr "Mare" + +#: gitk:7337 +msgid "Child" +msgstr "Filla" + +#: gitk:7346 +msgid "Branch" +msgstr "Branca" + +#: gitk:7349 +msgid "Follows" +msgstr "Segueix" + +#: gitk:7352 +msgid "Precedes" +msgstr "Precedeix" + +#: gitk:7947 +#, tcl-format +msgid "Error getting diffs: %s" +msgstr "Error en obtenir les diferències: %s" + +#: gitk:8631 +msgid "Goto:" +msgstr "Vés a:" + +#: gitk:8652 +#, tcl-format +msgid "Short SHA1 id %s is ambiguous" +msgstr "L'id SHA1 curta %s és ambigua" + +#: gitk:8659 +#, tcl-format +msgid "Revision %s is not known" +msgstr "La revisió %s és desconeguda" + +#: gitk:8669 +#, tcl-format +msgid "SHA1 id %s is not known" +msgstr "L'id SHA1 %s és desconeguda" + +#: gitk:8671 +#, tcl-format +msgid "Revision %s is not in the current view" +msgstr "La revisió %s no és en la vista actual" + +#: gitk:8813 gitk:8828 +msgid "Date" +msgstr "Data" + +#: gitk:8816 +msgid "Children" +msgstr "Filles" + +#: gitk:8879 +#, tcl-format +msgid "Reset %s branch to here" +msgstr "Restableix la branca %s aquÃ" + +#: gitk:8881 +msgid "Detached head: can't reset" +msgstr "Cap separat: no es pot restablir" + +#: gitk:8986 gitk:8992 +msgid "Skipping merge commit " +msgstr "Saltant la comissió de fusió " + +#: gitk:9001 gitk:9006 +msgid "Error getting patch ID for " +msgstr "Error en obtenir l'ID de pedaç de " + +#: gitk:9002 gitk:9007 +msgid " - stopping\n" +msgstr " - aturant\n" + +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 +msgid "Commit " +msgstr "Comissió " + +#: gitk:9016 +msgid "" +" is the same patch as\n" +" " +msgstr "" +" és el mateix pedaç que\n" +" " + +#: gitk:9024 +msgid "" +" differs from\n" +" " +msgstr "" +" difereix de\n" +" " + +#: gitk:9026 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "" +"Diferència entre comissions:\n" +"\n" + +#: gitk:9038 gitk:9047 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr " té %s filles - aturant\n" + +#: gitk:9066 +#, tcl-format +msgid "Error writing commit to file: %s" +msgstr "Error en escriure la comissió al fitxer: %s" + +#: gitk:9072 +#, tcl-format +msgid "Error diffing commits: %s" +msgstr "Error en diferenciar les comissions: %s" + +#: gitk:9118 +msgid "Top" +msgstr "Part superior" + +#: gitk:9119 +msgid "From" +msgstr "De" + +#: gitk:9124 +msgid "To" +msgstr "A" + +#: gitk:9148 +msgid "Generate patch" +msgstr "Genera pedaç" + +#: gitk:9150 +msgid "From:" +msgstr "De:" + +#: gitk:9159 +msgid "To:" +msgstr "A:" + +#: gitk:9168 +msgid "Reverse" +msgstr "Inverteix" + +#: gitk:9170 gitk:9366 +msgid "Output file:" +msgstr "Fitxer de sortida:" + +#: gitk:9176 +msgid "Generate" +msgstr "Genera" + +#: gitk:9214 +msgid "Error creating patch:" +msgstr "Error en crear el pedaç:" + +#: gitk:9237 gitk:9354 gitk:9411 +msgid "ID:" +msgstr "ID:" + +#: gitk:9246 +msgid "Tag name:" +msgstr "Nom d'etiqueta:" + +#: gitk:9249 +msgid "Tag message is optional" +msgstr "El missatge d'etiqueta és opcional" + +#: gitk:9251 +msgid "Tag message:" +msgstr "Missatge d'etiqueta:" + +#: gitk:9255 gitk:9420 +msgid "Create" +msgstr "Crea" + +#: gitk:9273 +msgid "No tag name specified" +msgstr "No s'ha especificat cap nom d'etiqueta" + +#: gitk:9277 +#, tcl-format +msgid "Tag \"%s\" already exists" +msgstr "L'etiqueta \"%s\" ja existeix" + +#: gitk:9287 +msgid "Error creating tag:" +msgstr "Error en crear l'etiqueta:" + +#: gitk:9363 +msgid "Command:" +msgstr "Ordre:" + +#: gitk:9371 +msgid "Write" +msgstr "Escriu" + +#: gitk:9389 +msgid "Error writing commit:" +msgstr "Error en escriure la comissió:" + +#: gitk:9416 +msgid "Name:" +msgstr "Nom:" + +#: gitk:9439 +msgid "Please specify a name for the new branch" +msgstr "Si us plau, especifiqueu un nom per a la branca nova" + +#: gitk:9444 +#, tcl-format +msgid "Branch '%s' already exists. Overwrite?" +msgstr "La branca '%s' ja existeix. Voleu sobreescriure?" + +#: gitk:9511 +#, tcl-format +msgid "Commit %s is already included in branch %s -- really re-apply it?" +msgstr "" +"La comissió %s ja està inclosa en la branca %s -- realment voleu tornar a " +"aplicar-la?" + +#: gitk:9516 +msgid "Cherry-picking" +msgstr "Recollint cireres" + +#: gitk:9525 +#, tcl-format +msgid "" +"Cherry-pick failed because of local changes to file '%s'.\n" +"Please commit, reset or stash your changes and try again." +msgstr "" +"El recull de cireres ha fallat a causa de canvis locals al fitxer '%s'.\n" +"Si us plau, cometeu, restabliu o emmagatzemeu els vostres canvis i torneu a " +"intentar." + +#: gitk:9531 +msgid "" +"Cherry-pick failed because of merge conflict.\n" +"Do you wish to run git citool to resolve it?" +msgstr "" +"El recull de cireres ha fallat a causa d'un conflicte de fusió.\n" +"Voleu executar el git citool per a resoldre'l?" + +#: gitk:9547 gitk:9605 +msgid "No changes committed" +msgstr "Cap canvi comès" + +#: gitk:9574 +#, tcl-format +msgid "Commit %s is not included in branch %s -- really revert it?" +msgstr "" +"La comissió %s no s'inclou en la branca %s -- realment voleu revertir-la?" + +#: gitk:9579 +msgid "Reverting" +msgstr "Revertint" + +#: gitk:9587 +#, tcl-format +msgid "" +"Revert failed because of local changes to the following files:%s Please " +"commit, reset or stash your changes and try again." +msgstr "" +"La reversió ha fallat a causa de canvis locals als fitxers següents:%s Si us " +"plau, cometeu, restabliu o emmagatzemeu els vostres canvis i torneu-ho a " +"intentar." + +#: gitk:9591 +msgid "" +"Revert failed because of merge conflict.\n" +" Do you wish to run git citool to resolve it?" +msgstr "" +"La reversió ha fallat a causa d'un conflicte de fusió.\n" +" Voleu executar el git citool per a resoldre'l?" + +#: gitk:9634 +msgid "Confirm reset" +msgstr "Confirma el restabliment" + +#: gitk:9636 +#, tcl-format +msgid "Reset branch %s to %s?" +msgstr "Voleu restablir la branca %s a %s?" + +#: gitk:9638 +msgid "Reset type:" +msgstr "Tipus de restabliment:" + +#: gitk:9641 +msgid "Soft: Leave working tree and index untouched" +msgstr "Suau: Deixa l'arbre de treball i l'Ãndex sense tocar" + +#: gitk:9644 +msgid "Mixed: Leave working tree untouched, reset index" +msgstr "Mixt: Deixa l'arbre de treball sense tocar, restableix l'Ãndex" + +#: gitk:9647 +msgid "" +"Hard: Reset working tree and index\n" +"(discard ALL local changes)" +msgstr "" +"Dur: Restableix l'arbre de treball i l'Ãndex\n" +"(descarta TOTS els canvis locals)" + +#: gitk:9664 +msgid "Resetting" +msgstr "Restablint" + +#: gitk:9724 +msgid "Checking out" +msgstr "Agafant" + +#: gitk:9777 +msgid "Cannot delete the currently checked-out branch" +msgstr "No es pot suprimir la branca actualment agafada" + +#: gitk:9783 +#, tcl-format +msgid "" +"The commits on branch %s aren't on any other branch.\n" +"Really delete branch %s?" +msgstr "" +"Les comissions en la branca %s no són en cap altra branca.\n" +"Realment voleu suprimir la branca %s?" + +#: gitk:9814 +#, tcl-format +msgid "Tags and heads: %s" +msgstr "Etiquetes i caps: %s" + +#: gitk:9829 +msgid "Filter" +msgstr "Filtre" + +#: gitk:10125 +msgid "" +"Error reading commit topology information; branch and preceding/following " +"tag information will be incomplete." +msgstr "" +"Error en llegir la informació de topologia de comissió; la informació sobre " +"branques i etiquetes precedents/següents serà incompleta." + +#: gitk:11102 +msgid "Tag" +msgstr "Etiqueta" + +#: gitk:11106 +msgid "Id" +msgstr "Id" + +#: gitk:11189 +msgid "Gitk font chooser" +msgstr "Selector de tipus de lletra del Gitk" + +#: gitk:11206 +msgid "B" +msgstr "B" + +#: gitk:11209 +msgid "I" +msgstr "I" + +#: gitk:11327 +msgid "Commit list display options" +msgstr "Opcions de visualització de la llista de comissions" + +#: gitk:11330 +msgid "Maximum graph width (lines)" +msgstr "Amplada mà xima del grà fic (lÃnies)" + +#: gitk:11334 +#, no-tcl-format +msgid "Maximum graph width (% of pane)" +msgstr "Amplada mà xima del grà fic (% del panell)" + +#: gitk:11337 +msgid "Show local changes" +msgstr "Mostra els canvis locals" + +#: gitk:11340 +msgid "Auto-select SHA1 (length)" +msgstr "Selecciona automà ticament l'SHA1 (longitud)" + +#: gitk:11344 +msgid "Hide remote refs" +msgstr "Amaga les referències remotes" + +#: gitk:11348 +msgid "Diff display options" +msgstr "Opcions de visualització de diferència" + +#: gitk:11350 +msgid "Tab spacing" +msgstr "Espaiat de tabulació" + +#: gitk:11353 +msgid "Display nearby tags/heads" +msgstr "Mostra etiquetes/caps propers" + +#: gitk:11356 +msgid "Maximum # tags/heads to show" +msgstr "Nombre mà xim d'etiquetes/caps a mostrar" + +#: gitk:11359 +msgid "Limit diffs to listed paths" +msgstr "Limita les diferències als camins llistats" + +#: gitk:11362 +msgid "Support per-file encodings" +msgstr "Admet codificacions especÃfiques per a cada fitxer" + +#: gitk:11368 gitk:11515 +msgid "External diff tool" +msgstr "Eina de diferència externa" + +#: gitk:11369 +msgid "Choose..." +msgstr "Trieu..." + +#: gitk:11374 +msgid "General options" +msgstr "Opcions generals" + +#: gitk:11377 +msgid "Use themed widgets" +msgstr "Usa els ginys tematitzats" + +#: gitk:11379 +msgid "(change requires restart)" +msgstr "(el canvi requereix reiniciar)" + +#: gitk:11381 +msgid "(currently unavailable)" +msgstr "(actualment no disponible)" + +#: gitk:11392 +msgid "Colors: press to choose" +msgstr "Colors: pressiona per a triar" + +#: gitk:11395 +msgid "Interface" +msgstr "InterfÃcie" + +#: gitk:11396 +msgid "interface" +msgstr "interfÃcie" + +#: gitk:11399 +msgid "Background" +msgstr "Fons" + +#: gitk:11400 gitk:11430 +msgid "background" +msgstr "fons" + +#: gitk:11403 +msgid "Foreground" +msgstr "Primer pla" + +#: gitk:11404 +msgid "foreground" +msgstr "primer pla" + +#: gitk:11407 +msgid "Diff: old lines" +msgstr "Diferència: lÃnies velles" + +#: gitk:11408 +msgid "diff old lines" +msgstr "diferencia les lÃnies velles" + +#: gitk:11412 +msgid "Diff: new lines" +msgstr "Diferència: lÃnies noves" + +#: gitk:11413 +msgid "diff new lines" +msgstr "diferencia les lÃnies noves" + +#: gitk:11417 +msgid "Diff: hunk header" +msgstr "Diferència: capçalera de tros" + +#: gitk:11419 +msgid "diff hunk header" +msgstr "diferencia la capçalera de tros" + +#: gitk:11423 +msgid "Marked line bg" +msgstr "Fons de la lÃnia marcada" + +#: gitk:11425 +msgid "marked line background" +msgstr "fons de la lÃnia marcada" + +#: gitk:11429 +msgid "Select bg" +msgstr "fons de la selecció" + +#: gitk:11438 +msgid "Fonts: press to choose" +msgstr "Tipus de lletra: pressiona per a triar" + +#: gitk:11440 +msgid "Main font" +msgstr "Tipus de lletra principal" + +#: gitk:11441 +msgid "Diff display font" +msgstr "Tipus de lletra de visualització de diferència" + +#: gitk:11442 +msgid "User interface font" +msgstr "Tipus de lletra de la interfÃcie d'usuari" + +#: gitk:11464 +msgid "Gitk preferences" +msgstr "Preferències del Gitk" + +#: gitk:11473 +msgid "General" +msgstr "General" + +#: gitk:11474 +msgid "Colors" +msgstr "Colors" + +#: gitk:11475 +msgid "Fonts" +msgstr "Tipus de lletra" + +#: gitk:11525 +#, tcl-format +msgid "Gitk: choose color for %s" +msgstr "Gitk: tria el color per a %s" + +#: gitk:12242 +msgid "Cannot find a git repository here." +msgstr "No es pot trobar cap dipòsit de git aquÃ." + +#: gitk:12289 +#, tcl-format +msgid "Ambiguous argument '%s': both revision and filename" +msgstr "Parà metre ambigu '%s': és tant revisió com nom de fitxer" + +#: gitk:12301 +msgid "Bad arguments to gitk:" +msgstr "Parà metres dolents al gitk:" + +#: gitk:12405 +msgid "Command line" +msgstr "LÃnia d'ordres" diff --git a/gitk-git/po/de.po b/gitk-git/po/de.po index bd194a3..dabd4ee 100644 --- a/gitk-git/po/de.po +++ b/gitk-git/po/de.po @@ -8,33 +8,42 @@ msgid "" msgstr "" "Project-Id-Version: git-gui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 20:21+0100\n" +"POT-Creation-Date: 2015-03-15 14:37+1100\n" "PO-Revision-Date: 2010-01-27 20:27+0100\n" "Last-Translator: Christian Stimming <stimming@tuhh.de>\n" "Language-Team: German\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: gitk:115 +#: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "Liste der nicht zusammengeführten Dateien nicht gefunden:" -#: gitk:274 +#: gitk:212 gitk:2381 +msgid "Color words" +msgstr "" + +#: gitk:217 gitk:2381 gitk:8201 gitk:8234 +msgid "Markup words" +msgstr "" + +#: gitk:324 msgid "Error parsing revisions:" msgstr "Fehler beim Laden der Versionen:" -#: gitk:329 +#: gitk:380 msgid "Error executing --argscmd command:" msgstr "Fehler beim Ausführen des --argscmd-Kommandos:" -#: gitk:342 +#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "Keine Dateien ausgewählt: Es wurde --merge angegeben, aber es existieren " "keine nicht zusammengeführten Dateien." -#: gitk:345 +#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -42,299 +51,315 @@ msgstr "" "Keine Dateien ausgewählt: Es wurde --merge angegeben, aber es sind keine " "nicht zusammengeführten Dateien in der Dateiauswahl." -#: gitk:367 gitk:514 +#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "Fehler beim Ausführen von »git log«:" -#: gitk:385 gitk:530 +#: gitk:436 gitk:582 msgid "Reading" msgstr "Lesen" -#: gitk:445 gitk:4261 +#: gitk:496 gitk:4508 msgid "Reading commits..." msgstr "Versionen werden gelesen ..." -#: gitk:448 gitk:1578 gitk:4264 +#: gitk:499 gitk:1637 gitk:4511 msgid "No commits selected" msgstr "Keine Versionen ausgewählt" -#: gitk:1454 +#: gitk:1511 msgid "Can't parse git log output:" msgstr "Ausgabe von »git log« kann nicht erkannt werden:" -#: gitk:1674 +#: gitk:1740 msgid "No commit information available" msgstr "Keine Versionsinformation verfügbar" -#: gitk:1816 +#: gitk:1897 msgid "mc" msgstr "mc" -#: gitk:1851 gitk:4054 gitk:9044 gitk:10585 gitk:10804 +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 msgid "OK" msgstr "Ok" -#: gitk:1853 gitk:4056 gitk:8634 gitk:8713 gitk:8828 gitk:8877 gitk:9046 -#: gitk:10586 gitk:10805 +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 +#: gitk:11221 gitk:11501 msgid "Cancel" msgstr "Abbrechen" -#: gitk:1975 +#: gitk:2069 msgid "Update" msgstr "Aktualisieren" -#: gitk:1976 +#: gitk:2070 msgid "Reload" msgstr "Neu laden" -#: gitk:1977 +#: gitk:2071 msgid "Reread references" msgstr "Zweige neu laden" -#: gitk:1978 +#: gitk:2072 msgid "List references" msgstr "Zweige/Markierungen auflisten" -#: gitk:1980 +#: gitk:2074 msgid "Start git gui" msgstr "»git gui« starten" -#: gitk:1982 +#: gitk:2076 msgid "Quit" msgstr "Beenden" -#: gitk:1974 +#: gitk:2068 msgid "File" msgstr "Datei" -#: gitk:1986 +#: gitk:2080 msgid "Preferences" msgstr "Einstellungen" -#: gitk:1985 +#: gitk:2079 msgid "Edit" msgstr "Bearbeiten" -#: gitk:1990 +#: gitk:2084 msgid "New view..." msgstr "Neue Ansicht ..." -#: gitk:1991 +#: gitk:2085 msgid "Edit view..." msgstr "Ansicht bearbeiten ..." -#: gitk:1992 +#: gitk:2086 msgid "Delete view" msgstr "Ansicht entfernen" -#: gitk:1994 +#: gitk:2088 msgid "All files" msgstr "Alle Dateien" -#: gitk:1989 gitk:3808 +#: gitk:2083 gitk:4050 msgid "View" msgstr "Ansicht" -#: gitk:1999 gitk:2009 gitk:2780 +#: gitk:2093 gitk:2103 gitk:3009 msgid "About gitk" msgstr "Ãœber gitk" -#: gitk:2000 gitk:2014 +#: gitk:2094 gitk:2108 msgid "Key bindings" msgstr "Tastenkürzel" -#: gitk:1998 gitk:2013 +#: gitk:2092 gitk:2107 msgid "Help" msgstr "Hilfe" -#: gitk:2091 gitk:8110 +#: gitk:2185 gitk:8633 msgid "SHA1 ID:" msgstr "SHA1 ID:" -#: gitk:2122 +#: gitk:2229 msgid "Row" msgstr "Zeile" -#: gitk:2160 +#: gitk:2267 msgid "Find" msgstr "Suche" -#: gitk:2161 -msgid "next" -msgstr "nächste" - -#: gitk:2162 -msgid "prev" -msgstr "vorige" - -#: gitk:2163 +#: gitk:2295 msgid "commit" msgstr "Version nach" -#: gitk:2166 gitk:2168 gitk:4422 gitk:4445 gitk:4469 gitk:6410 gitk:6482 -#: gitk:6566 +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 +#: gitk:6893 msgid "containing:" msgstr "Beschreibung:" -#: gitk:2169 gitk:3290 gitk:3295 gitk:4497 +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 msgid "touching paths:" msgstr "Dateien:" -#: gitk:2170 gitk:4502 +#: gitk:2303 gitk:4759 msgid "adding/removing string:" msgstr "Änderungen:" -#: gitk:2179 gitk:2181 +#: gitk:2304 gitk:4761 +msgid "changing lines matching:" +msgstr "" + +#: gitk:2313 gitk:2315 gitk:4748 msgid "Exact" msgstr "Exakt" -#: gitk:2181 gitk:4577 gitk:6378 +#: gitk:2315 gitk:4836 gitk:6704 msgid "IgnCase" msgstr "Kein Groß/Klein" -#: gitk:2181 gitk:4471 gitk:4575 gitk:6374 +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 msgid "Regexp" msgstr "Regexp" -#: gitk:2183 gitk:2184 gitk:4596 gitk:4626 gitk:4633 gitk:6502 gitk:6570 +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 msgid "All fields" msgstr "Alle Felder" -#: gitk:2184 gitk:4594 gitk:4626 gitk:6441 +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 msgid "Headline" msgstr "Ãœberschrift" -#: gitk:2185 gitk:4594 gitk:6441 gitk:6570 gitk:7003 +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 msgid "Comments" msgstr "Beschreibung" -#: gitk:2185 gitk:4594 gitk:4598 gitk:4633 gitk:6441 gitk:6938 gitk:8285 -#: gitk:8300 +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 +#: gitk:8826 msgid "Author" msgstr "Autor" -#: gitk:2185 gitk:4594 gitk:6441 gitk:6940 +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 msgid "Committer" msgstr "Eintragender" -#: gitk:2216 +#: gitk:2350 msgid "Search" msgstr "Suchen" -#: gitk:2224 +#: gitk:2358 msgid "Diff" msgstr "Vergleich" -#: gitk:2226 +#: gitk:2360 msgid "Old version" msgstr "Alte Version" -#: gitk:2228 +#: gitk:2362 msgid "New version" msgstr "Neue Version" -#: gitk:2230 +#: gitk:2364 msgid "Lines of context" msgstr "Kontextzeilen" -#: gitk:2240 +#: gitk:2374 msgid "Ignore space change" msgstr "Leerzeichenänderungen ignorieren" -#: gitk:2299 +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +msgid "Line diff" +msgstr "" + +#: gitk:2445 msgid "Patch" msgstr "Patch" -#: gitk:2301 +#: gitk:2447 msgid "Tree" msgstr "Baum" -#: gitk:2456 gitk:2473 +#: gitk:2616 gitk:2636 msgid "Diff this -> selected" msgstr "Vergleich: diese -> gewählte" -#: gitk:2457 gitk:2474 +#: gitk:2617 gitk:2637 msgid "Diff selected -> this" msgstr "Vergleich: gewählte -> diese" -#: gitk:2458 gitk:2475 +#: gitk:2618 gitk:2638 msgid "Make patch" msgstr "Patch erstellen" -#: gitk:2459 gitk:8692 +#: gitk:2619 gitk:9235 msgid "Create tag" msgstr "Markierung erstellen" -#: gitk:2460 gitk:8808 +#: gitk:2620 gitk:9352 msgid "Write commit to file" msgstr "Version in Datei schreiben" -#: gitk:2461 gitk:8865 +#: gitk:2621 gitk:9409 msgid "Create new branch" msgstr "Neuen Zweig erstellen" -#: gitk:2462 +#: gitk:2622 msgid "Cherry-pick this commit" msgstr "Diese Version pflücken" -#: gitk:2463 +#: gitk:2623 msgid "Reset HEAD branch to here" msgstr "HEAD-Zweig auf diese Version zurücksetzen" -#: gitk:2464 +#: gitk:2624 msgid "Mark this commit" msgstr "Lesezeichen setzen" -#: gitk:2465 +#: gitk:2625 msgid "Return to mark" msgstr "Zum Lesezeichen" -#: gitk:2466 +#: gitk:2626 msgid "Find descendant of this and mark" msgstr "Abkömmling von Lesezeichen und dieser Version finden" -#: gitk:2467 +#: gitk:2627 msgid "Compare with marked commit" msgstr "Mit Lesezeichen vergleichen" -#: gitk:2481 +#: gitk:2628 gitk:2639 +#, fuzzy +msgid "Diff this -> marked commit" +msgstr "Vergleich: diese -> gewählte" + +#: gitk:2629 gitk:2640 +#, fuzzy +msgid "Diff marked commit -> this" +msgstr "Vergleich: gewählte -> diese" + +#: gitk:2630 +#, fuzzy +msgid "Revert this commit" +msgstr "Lesezeichen setzen" + +#: gitk:2646 msgid "Check out this branch" msgstr "Auf diesen Zweig umstellen" -#: gitk:2482 +#: gitk:2647 msgid "Remove this branch" msgstr "Zweig löschen" -#: gitk:2489 +#: gitk:2654 msgid "Highlight this too" msgstr "Diesen auch hervorheben" -#: gitk:2490 +#: gitk:2655 msgid "Highlight this only" msgstr "Nur diesen hervorheben" -#: gitk:2491 +#: gitk:2656 msgid "External diff" msgstr "Externes Diff-Programm" -#: gitk:2492 +#: gitk:2657 msgid "Blame parent commit" msgstr "Annotieren der Elternversion" -#: gitk:2499 +#: gitk:2664 msgid "Show origin of this line" msgstr "Herkunft dieser Zeile anzeigen" -#: gitk:2500 +#: gitk:2665 msgid "Run git gui blame on this line" msgstr "Diese Zeile annotieren (»git gui blame«)" -#: gitk:2782 +#: gitk:3011 +#, fuzzy msgid "" "\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" +"Copyright © 2005-2014 Paul Mackerras\n" "\n" "Use and redistribute under the terms of the GNU General Public License" msgstr "" @@ -343,500 +368,520 @@ msgstr "" "\n" "Copyright \\u00a9 2005-2010 Paul Mackerras\n" "\n" -"Benutzung und Weiterverbreitung gemäß den Bedingungen der GNU General Public License" +"Benutzung und Weiterverbreitung gemäß den Bedingungen der GNU General Public " +"License" -#: gitk:2790 gitk:2854 gitk:9230 +#: gitk:3019 gitk:3085 gitk:9836 msgid "Close" msgstr "Schließen" -#: gitk:2811 +#: gitk:3040 msgid "Gitk key bindings" msgstr "Gitk-Tastaturbelegung" -#: gitk:2814 +#: gitk:3043 msgid "Gitk key bindings:" msgstr "Gitk-Tastaturbelegung:" -#: gitk:2816 +#: gitk:3045 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tBeenden" -#: gitk:2817 +#: gitk:3046 +#, fuzzy, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-F>\t\tSuchen" + +#: gitk:3047 msgid "<Home>\t\tMove to first commit" msgstr "<Pos1>\t\tZur neuesten Version springen" -#: gitk:2818 +#: gitk:3048 msgid "<End>\t\tMove to last commit" msgstr "<Ende>\t\tZur ältesten Version springen" -#: gitk:2819 -msgid "<Up>, p, i\tMove up one commit" +#: gitk:3049 +#, fuzzy +msgid "<Up>, p, k\tMove up one commit" msgstr "<Hoch>, p, i\tNächste neuere Version" -#: gitk:2820 -msgid "<Down>, n, k\tMove down one commit" +#: gitk:3050 +#, fuzzy +msgid "<Down>, n, j\tMove down one commit" msgstr "<Runter>, n, k\tNächste ältere Version" -#: gitk:2821 -msgid "<Left>, z, j\tGo back in history list" +#: gitk:3051 +#, fuzzy +msgid "<Left>, z, h\tGo back in history list" msgstr "<Links>, z, j\tEine Version zurückgehen" -#: gitk:2822 +#: gitk:3052 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Rechts>, x, l\tEine Version weitergehen" -#: gitk:2823 +#: gitk:3053 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "" + +#: gitk:3054 msgid "<PageUp>\tMove up one page in commit list" msgstr "<BildHoch>\tEine Seite nach oben blättern" -#: gitk:2824 +#: gitk:3055 msgid "<PageDown>\tMove down one page in commit list" msgstr "<BildRunter>\tEine Seite nach unten blättern" -#: gitk:2825 +#: gitk:3056 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Pos1>\tZum oberen Ende der Versionsliste blättern" -#: gitk:2826 +#: gitk:3057 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-Ende>\tZum unteren Ende der Versionsliste blättern" -#: gitk:2827 +#: gitk:3058 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Hoch>\tVersionsliste eine Zeile nach oben blättern" -#: gitk:2828 +#: gitk:3059 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Runter>\tVersionsliste eine Zeile nach unten blättern" -#: gitk:2829 +#: gitk:3060 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-BildHoch>\tVersionsliste eine Seite nach oben blättern" -#: gitk:2830 +#: gitk:3061 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-BildRunter>\tVersionsliste eine Seite nach unten blättern" -#: gitk:2831 +#: gitk:3062 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" msgstr "<Umschalt-Hoch>\tRückwärts suchen (nach oben; neuere Versionen)" -#: gitk:2832 +#: gitk:3063 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" msgstr "<Umschalt-Runter> Suchen (nach unten; ältere Versionen)" -#: gitk:2833 +#: gitk:3064 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Entf>, b\t\tVergleich eine Seite nach oben blättern" -#: gitk:2834 +#: gitk:3065 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Löschtaste>\tVergleich eine Seite nach oben blättern" -#: gitk:2835 +#: gitk:3066 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Leertaste>\tVergleich eine Seite nach unten blättern" -#: gitk:2836 +#: gitk:3067 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tVergleich um 18 Zeilen nach oben blättern" -#: gitk:2837 +#: gitk:3068 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tVergleich um 18 Zeilen nach unten blättern" -#: gitk:2838 +#: gitk:3069 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tSuchen" -#: gitk:2839 +#: gitk:3070 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tWeitersuchen" -#: gitk:2840 +#: gitk:3071 msgid "<Return>\tMove to next find hit" msgstr "<Eingabetaste>\tWeitersuchen" -#: gitk:2841 +#: gitk:3072 msgid "/\t\tFocus the search box" msgstr "/\t\tTastaturfokus ins Suchfeld" -#: gitk:2842 +#: gitk:3073 msgid "?\t\tMove to previous find hit" msgstr "?\t\tRückwärts weitersuchen" -#: gitk:2843 +#: gitk:3074 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tVergleich zur nächsten Datei blättern" -#: gitk:2844 +#: gitk:3075 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tWeitersuchen im Vergleich" -#: gitk:2845 +#: gitk:3076 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tRückwärts weitersuchen im Vergleich" -#: gitk:2846 +#: gitk:3077 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-Nummerblock-Plus>\tSchrift vergrößern" -#: gitk:2847 +#: gitk:3078 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-Plus>\tSchrift vergrößern" -#: gitk:2848 +#: gitk:3079 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-Nummernblock-Minus> Schrift verkleinern" -#: gitk:2849 +#: gitk:3080 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-Minus>\tSchrift verkleinern" -#: gitk:2850 +#: gitk:3081 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tAktualisieren" -#: gitk:3305 gitk:3314 +#: gitk:3546 gitk:3555 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Fehler beim Erzeugen des temporären Verzeichnisses »%s«:" -#: gitk:3327 +#: gitk:3568 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Fehler beim Holen von »%s« von »%s«:" -#: gitk:3390 +#: gitk:3631 msgid "command failed:" msgstr "Kommando fehlgeschlagen:" -#: gitk:3539 +#: gitk:3780 msgid "No such commit" msgstr "Version nicht gefunden" -#: gitk:3553 +#: gitk:3794 msgid "git gui blame: command failed:" msgstr "git gui blame: Kommando fehlgeschlagen:" -#: gitk:3584 +#: gitk:3825 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Zusammenführungs-Spitze konnte nicht gelesen werden: %s" -#: gitk:3592 +#: gitk:3833 #, tcl-format msgid "Error reading index: %s" msgstr "Fehler beim Lesen der Bereitstellung (»index«): %s" -#: gitk:3617 +#: gitk:3858 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "»git blame« konnte nicht gestartet werden: %s" -#: gitk:3620 gitk:6409 +#: gitk:3861 gitk:6735 msgid "Searching" msgstr "Suchen" -#: gitk:3652 +#: gitk:3893 #, tcl-format msgid "Error running git blame: %s" msgstr "Fehler beim Ausführen von »git blame«: %s" -#: gitk:3680 +#: gitk:3921 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "" "Diese Zeile stammt aus Version %s, die nicht in dieser Ansicht gezeigt wird" -#: gitk:3694 +#: gitk:3935 msgid "External diff viewer failed:" msgstr "Externes Diff-Programm fehlgeschlagen:" -#: gitk:3812 +#: gitk:4053 msgid "Gitk view definition" msgstr "Gitk-Ansichten" -#: gitk:3816 +#: gitk:4057 msgid "Remember this view" msgstr "Diese Ansicht speichern" -#: gitk:3817 +#: gitk:4058 msgid "References (space separated list):" msgstr "Zweige/Markierungen (durch Leerzeichen getrennte Liste):" -#: gitk:3818 +#: gitk:4059 msgid "Branches & tags:" msgstr "Zweige/Markierungen:" -#: gitk:3819 +#: gitk:4060 msgid "All refs" msgstr "Alle Markierungen und Zweige" -#: gitk:3820 +#: gitk:4061 msgid "All (local) branches" msgstr "Alle (lokalen) Zweige" -#: gitk:3821 +#: gitk:4062 msgid "All tags" msgstr "Alle Markierungen" -#: gitk:3822 +#: gitk:4063 msgid "All remote-tracking branches" msgstr "Alle Ãœbernahmezweige" -#: gitk:3823 +#: gitk:4064 msgid "Commit Info (regular expressions):" msgstr "Versionsinformationen (reguläre Ausdrücke):" -#: gitk:3824 +#: gitk:4065 msgid "Author:" msgstr "Autor:" -#: gitk:3825 +#: gitk:4066 msgid "Committer:" msgstr "Eintragender:" -#: gitk:3826 +#: gitk:4067 msgid "Commit Message:" msgstr "Versionsbeschreibung:" -#: gitk:3827 +#: gitk:4068 msgid "Matches all Commit Info criteria" msgstr "Alle Versionsinformationen-Kriterien erfüllen" -#: gitk:3828 +#: gitk:4069 +#, fuzzy +msgid "Matches none Commit Info criteria" +msgstr "Alle Versionsinformationen-Kriterien erfüllen" + +#: gitk:4070 msgid "Changes to Files:" msgstr "Dateien:" -#: gitk:3829 +#: gitk:4071 msgid "Fixed String" msgstr "Zeichenkette" -#: gitk:3830 +#: gitk:4072 msgid "Regular Expression" msgstr "Regulärer Ausdruck" -#: gitk:3831 +#: gitk:4073 msgid "Search string:" msgstr "Suchausdruck:" -#: gitk:3832 +#: gitk:4074 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" -msgstr "Datum (»2 weeks ago«, »2009-03-17 15:27:38«, »March 17, 2009 15:27:38«)" +msgstr "" +"Datum (»2 weeks ago«, »2009-03-17 15:27:38«, »March 17, 2009 15:27:38«)" -#: gitk:3833 +#: gitk:4075 msgid "Since:" msgstr "Von:" -#: gitk:3834 +#: gitk:4076 msgid "Until:" msgstr "Bis:" -#: gitk:3835 +#: gitk:4077 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "Versionsanzahl begrenzen oder einige überspringen (ganzzahliger Wert):" -#: gitk:3836 +#: gitk:4078 msgid "Number to show:" msgstr "Anzeigen:" -#: gitk:3837 +#: gitk:4079 msgid "Number to skip:" msgstr "Ãœberspringen:" -#: gitk:3838 +#: gitk:4080 msgid "Miscellaneous options:" msgstr "Sonstiges:" -#: gitk:3839 +#: gitk:4081 msgid "Strictly sort by date" msgstr "Streng nach Datum sortieren" -#: gitk:3840 +#: gitk:4082 msgid "Mark branch sides" msgstr "Zweig-Seiten markieren" -#: gitk:3841 +#: gitk:4083 msgid "Limit to first parent" msgstr "Auf erste Elternversion beschränken" -#: gitk:3842 +#: gitk:4084 msgid "Simple history" msgstr "Einfache Historie" -#: gitk:3843 +#: gitk:4085 msgid "Additional arguments to git log:" msgstr "Zusätzliche Argumente für »git log«:" -#: gitk:3844 +#: gitk:4086 msgid "Enter files and directories to include, one per line:" msgstr "Folgende Dateien und Verzeichnisse anzeigen (eine pro Zeile):" -#: gitk:3845 +#: gitk:4087 msgid "Command to generate more commits to include:" msgstr "Versionsliste durch folgendes Kommando erzeugen lassen:" -#: gitk:3967 +#: gitk:4211 msgid "Gitk: edit view" msgstr "Gitk: Ansicht bearbeiten" -#: gitk:3975 +#: gitk:4219 msgid "-- criteria for selecting revisions" msgstr "-- Auswahl der angezeigten Versionen" -#: gitk:3980 +#: gitk:4224 msgid "View Name" msgstr "Ansichtsname" -#: gitk:4055 +#: gitk:4299 msgid "Apply (F5)" msgstr "Anwenden (F5)" -#: gitk:4093 +#: gitk:4337 msgid "Error in commit selection arguments:" msgstr "Fehler in den ausgewählten Versionen:" -#: gitk:4146 gitk:4198 gitk:4646 gitk:4660 gitk:5921 gitk:11534 gitk:11535 +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 msgid "None" msgstr "Keine" -#: gitk:4594 gitk:6441 gitk:8287 gitk:8302 -msgid "Date" -msgstr "Datum" - -#: gitk:4594 gitk:6441 -msgid "CDate" -msgstr "Eintragedatum" - -#: gitk:4743 gitk:4748 +#: gitk:5003 gitk:5008 msgid "Descendant" msgstr "Abkömmling" -#: gitk:4744 +#: gitk:5004 msgid "Not descendant" msgstr "Kein Abkömmling" -#: gitk:4751 gitk:4756 +#: gitk:5011 gitk:5016 msgid "Ancestor" msgstr "Vorgänger" -#: gitk:4752 +#: gitk:5012 msgid "Not ancestor" msgstr "Kein Vorgänger" -#: gitk:5042 +#: gitk:5306 msgid "Local changes checked in to index but not committed" msgstr "Lokale Änderungen bereitgestellt, aber nicht eingetragen" -#: gitk:5078 +#: gitk:5342 msgid "Local uncommitted changes, not checked in to index" msgstr "Lokale Änderungen, nicht bereitgestellt" -#: gitk:6759 +#: gitk:7115 +msgid "and many more" +msgstr "" + +#: gitk:7118 msgid "many" msgstr "viele" -#: gitk:6942 +#: gitk:7309 msgid "Tags:" msgstr "Markierungen:" -#: gitk:6959 gitk:6965 gitk:8280 +#: gitk:7326 gitk:7332 gitk:8806 msgid "Parent" msgstr "Eltern" -#: gitk:6970 +#: gitk:7337 msgid "Child" msgstr "Kind" -#: gitk:6979 +#: gitk:7346 msgid "Branch" msgstr "Zweig" -#: gitk:6982 +#: gitk:7349 msgid "Follows" msgstr "Folgt auf" -#: gitk:6985 +#: gitk:7352 msgid "Precedes" msgstr "Vorgänger von" -#: gitk:7522 +#: gitk:7947 #, tcl-format msgid "Error getting diffs: %s" msgstr "Fehler beim Laden des Vergleichs: %s" -#: gitk:8108 +#: gitk:8631 msgid "Goto:" msgstr "Gehe zu:" -#: gitk:8129 +#: gitk:8652 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "Kurzer SHA1-Hashwert »%s« ist mehrdeutig" -#: gitk:8136 +#: gitk:8659 #, tcl-format msgid "Revision %s is not known" msgstr "Version »%s« ist unbekannt" -#: gitk:8146 +#: gitk:8669 #, tcl-format msgid "SHA1 id %s is not known" msgstr "SHA1-Hashwert »%s« ist unbekannt" -#: gitk:8148 +#: gitk:8671 #, tcl-format msgid "Revision %s is not in the current view" msgstr "Version »%s« wird in der aktuellen Ansicht nicht angezeigt" -#: gitk:8290 +#: gitk:8813 gitk:8828 +msgid "Date" +msgstr "Datum" + +#: gitk:8816 msgid "Children" msgstr "Kinder" -#: gitk:8348 +#: gitk:8879 #, tcl-format msgid "Reset %s branch to here" msgstr "Zweig »%s« hierher zurücksetzen" -#: gitk:8350 +#: gitk:8881 msgid "Detached head: can't reset" msgstr "Zweigspitze ist abgetrennt: Zurücksetzen nicht möglich" -#: gitk:8459 gitk:8465 +#: gitk:8986 gitk:8992 msgid "Skipping merge commit " msgstr "Ãœberspringe Zusammenführungs-Version " -#: gitk:8474 gitk:8479 +#: gitk:9001 gitk:9006 msgid "Error getting patch ID for " msgstr "Fehler beim Holen der Patch-ID für " -#: gitk:8475 gitk:8480 +#: gitk:9002 gitk:9007 msgid " - stopping\n" msgstr " - Abbruch.\n" -#: gitk:8485 gitk:8488 gitk:8496 gitk:8510 gitk:8519 +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 msgid "Commit " msgstr "Version " -#: gitk:8489 +#: gitk:9016 msgid "" " is the same patch as\n" " " @@ -844,7 +889,7 @@ msgstr "" " ist das gleiche Patch wie\n" " " -#: gitk:8497 +#: gitk:9024 msgid "" " differs from\n" " " @@ -852,7 +897,7 @@ msgstr "" " ist unterschiedlich von\n" " " -#: gitk:8499 +#: gitk:9026 msgid "" "Diff of commits:\n" "\n" @@ -860,130 +905,131 @@ msgstr "" "Vergleich der Versionen:\n" "\n" -#: gitk:8511 gitk:8520 +#: gitk:9038 gitk:9047 #, tcl-format msgid " has %s children - stopping\n" msgstr " hat %s Kinder. Abbruch\n" -#: gitk:8539 +#: gitk:9066 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Fehler beim Schreiben der Version in Datei: %s" -#: gitk:8545 +#: gitk:9072 #, tcl-format msgid "Error diffing commits: %s" msgstr "Fehler beim Vergleichen der Versionen: %s" -#: gitk:8575 +#: gitk:9118 msgid "Top" msgstr "Oben" -#: gitk:8576 +#: gitk:9119 msgid "From" msgstr "Von" -#: gitk:8581 +#: gitk:9124 msgid "To" msgstr "bis" -#: gitk:8605 +#: gitk:9148 msgid "Generate patch" msgstr "Patch erstellen" -#: gitk:8607 +#: gitk:9150 msgid "From:" msgstr "Von:" -#: gitk:8616 +#: gitk:9159 msgid "To:" msgstr "bis:" -#: gitk:8625 +#: gitk:9168 msgid "Reverse" msgstr "Umgekehrt" -#: gitk:8627 gitk:8822 +#: gitk:9170 gitk:9366 msgid "Output file:" msgstr "Ausgabedatei:" -#: gitk:8633 +#: gitk:9176 msgid "Generate" msgstr "Erzeugen" -#: gitk:8671 +#: gitk:9214 msgid "Error creating patch:" msgstr "Fehler beim Erzeugen des Patches:" -#: gitk:8694 gitk:8810 gitk:8867 +#: gitk:9237 gitk:9354 gitk:9411 msgid "ID:" msgstr "ID:" -#: gitk:8703 +#: gitk:9246 msgid "Tag name:" msgstr "Markierungsname:" -#: gitk:8706 +#: gitk:9249 msgid "Tag message is optional" msgstr "Eine Markierungsbeschreibung ist optional" -#: gitk:8708 +#: gitk:9251 msgid "Tag message:" msgstr "Markierungsbeschreibung:" -#: gitk:8712 gitk:8876 +#: gitk:9255 gitk:9420 msgid "Create" msgstr "Erstellen" -#: gitk:8730 +#: gitk:9273 msgid "No tag name specified" msgstr "Kein Markierungsname angegeben" -#: gitk:8734 +#: gitk:9277 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Markierung »%s« existiert bereits." -#: gitk:8744 +#: gitk:9287 msgid "Error creating tag:" msgstr "Fehler beim Erstellen der Markierung:" -#: gitk:8819 +#: gitk:9363 msgid "Command:" msgstr "Kommando:" -#: gitk:8827 +#: gitk:9371 msgid "Write" msgstr "Schreiben" -#: gitk:8845 +#: gitk:9389 msgid "Error writing commit:" msgstr "Fehler beim Schreiben der Version:" -#: gitk:8872 +#: gitk:9416 msgid "Name:" msgstr "Name:" -#: gitk:8895 +#: gitk:9439 msgid "Please specify a name for the new branch" msgstr "Bitte geben Sie einen Namen für den neuen Zweig an." -#: gitk:8900 +#: gitk:9444 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "Zweig »%s« existiert bereits. Soll er überschrieben werden?" -#: gitk:8966 +#: gitk:9511 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "" -"Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut eintragen?" +"Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut " +"eintragen?" -#: gitk:8971 +#: gitk:9516 msgid "Cherry-picking" msgstr "Version pflücken" -#: gitk:8980 +#: gitk:9525 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -993,7 +1039,7 @@ msgstr "" "vorliegen. Bitte diese Änderungen eintragen, zurücksetzen oder\n" "zwischenspeichern (»git stash«) und dann erneut versuchen." -#: gitk:8986 +#: gitk:9531 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1002,34 +1048,66 @@ msgstr "" "ist. Soll das Zusammenführungs-Werkzeug (»git citool«) aufgerufen\n" "werden, um diesen Konflikt aufzulösen?" -#: gitk:9002 +#: gitk:9547 gitk:9605 msgid "No changes committed" msgstr "Keine Änderungen eingetragen" -#: gitk:9028 +#: gitk:9574 +#, fuzzy, tcl-format +msgid "Commit %s is not included in branch %s -- really revert it?" +msgstr "" +"Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut " +"eintragen?" + +#: gitk:9579 +#, fuzzy +msgid "Reverting" +msgstr "Zurücksetzen" + +#: gitk:9587 +#, fuzzy, tcl-format +msgid "" +"Revert failed because of local changes to the following files:%s Please " +"commit, reset or stash your changes and try again." +msgstr "" +"Pflücken fehlgeschlagen, da noch lokale Änderungen in Datei »%s«\n" +"vorliegen. Bitte diese Änderungen eintragen, zurücksetzen oder\n" +"zwischenspeichern (»git stash«) und dann erneut versuchen." + +#: gitk:9591 +#, fuzzy +msgid "" +"Revert failed because of merge conflict.\n" +" Do you wish to run git citool to resolve it?" +msgstr "" +"Pflücken fehlgeschlagen, da ein Zusammenführungs-Konflikt aufgetreten\n" +"ist. Soll das Zusammenführungs-Werkzeug (»git citool«) aufgerufen\n" +"werden, um diesen Konflikt aufzulösen?" + +#: gitk:9634 msgid "Confirm reset" msgstr "Zurücksetzen bestätigen" -#: gitk:9030 +#: gitk:9636 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Zweig »%s« auf »%s« zurücksetzen?" -#: gitk:9032 +#: gitk:9638 msgid "Reset type:" msgstr "Art des Zurücksetzens:" -#: gitk:9035 +#: gitk:9641 msgid "Soft: Leave working tree and index untouched" msgstr "Harmlos: Arbeitskopie und Bereitstellung unverändert" -#: gitk:9038 +#: gitk:9644 msgid "Mixed: Leave working tree untouched, reset index" msgstr "" "Gemischt: Arbeitskopie unverändert,\n" "Bereitstellung zurückgesetzt" -#: gitk:9041 +#: gitk:9647 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1037,21 +1115,21 @@ msgstr "" "Hart: Arbeitskopie und Bereitstellung\n" "(Alle lokalen Änderungen werden gelöscht)" -#: gitk:9058 +#: gitk:9664 msgid "Resetting" msgstr "Zurücksetzen" -#: gitk:9118 +#: gitk:9724 msgid "Checking out" msgstr "Umstellen" -#: gitk:9171 +#: gitk:9777 msgid "Cannot delete the currently checked-out branch" msgstr "" "Der Zweig, auf den die Arbeitskopie momentan umgestellt ist, kann nicht " "gelöscht werden." -#: gitk:9177 +#: gitk:9783 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1060,16 +1138,16 @@ msgstr "" "Die Versionen auf Zweig »%s« existieren auf keinem anderen Zweig.\n" "Zweig »%s« trotzdem löschen?" -#: gitk:9208 +#: gitk:9814 #, tcl-format msgid "Tags and heads: %s" msgstr "Markierungen und Zweige: %s" -#: gitk:9223 +#: gitk:9829 msgid "Filter" msgstr "Filtern" -#: gitk:9518 +#: gitk:10125 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1077,202 +1155,228 @@ msgstr "" "Fehler beim Lesen der Strukturinformationen; Zweige und Informationen zu " "Vorgänger/Nachfolger werden unvollständig sein." -#: gitk:10504 +#: gitk:11102 msgid "Tag" msgstr "Markierung" -#: gitk:10504 +#: gitk:11106 msgid "Id" msgstr "Id" -#: gitk:10554 +#: gitk:11189 msgid "Gitk font chooser" msgstr "Gitk-Schriften wählen" -#: gitk:10571 +#: gitk:11206 msgid "B" msgstr "F" -#: gitk:10574 +#: gitk:11209 msgid "I" msgstr "K" -#: gitk:10692 -msgid "Gitk preferences" -msgstr "Gitk-Einstellungen" - -#: gitk:10694 +#: gitk:11327 msgid "Commit list display options" msgstr "Anzeige der Versionsliste" -#: gitk:10697 +#: gitk:11330 msgid "Maximum graph width (lines)" msgstr "Maximale Graphenbreite (Zeilen)" -#: gitk:10700 -#, tcl-format +#: gitk:11334 +#, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Maximale Graphenbreite (% des Fensters)" -#: gitk:10703 +#: gitk:11337 msgid "Show local changes" msgstr "Lokale Änderungen anzeigen" -#: gitk:10706 -msgid "Auto-select SHA1" +#: gitk:11340 +#, fuzzy +msgid "Auto-select SHA1 (length)" msgstr "SHA1-Hashwert automatisch auswählen" -#: gitk:10709 +#: gitk:11344 msgid "Hide remote refs" msgstr "Entfernte Zweige/Markierungen ausblenden" -#: gitk:10713 +#: gitk:11348 msgid "Diff display options" msgstr "Anzeige des Vergleichs" -#: gitk:10715 +#: gitk:11350 msgid "Tab spacing" msgstr "Tabulatorbreite" -#: gitk:10718 -msgid "Display nearby tags" +#: gitk:11353 +#, fuzzy +msgid "Display nearby tags/heads" msgstr "Naheliegende Markierungen anzeigen" -#: gitk:10721 +#: gitk:11356 +msgid "Maximum # tags/heads to show" +msgstr "" + +#: gitk:11359 msgid "Limit diffs to listed paths" msgstr "Vergleich nur für angezeigte Pfade" -#: gitk:10724 +#: gitk:11362 msgid "Support per-file encodings" msgstr "Zeichenkodierung pro Datei ermitteln" -#: gitk:10730 gitk:10819 +#: gitk:11368 gitk:11515 msgid "External diff tool" msgstr "Externes Diff-Programm" -#: gitk:10731 +#: gitk:11369 msgid "Choose..." msgstr "Wählen ..." -#: gitk:10736 +#: gitk:11374 msgid "General options" msgstr "Allgemeine Optionen" -#: gitk:10739 +#: gitk:11377 msgid "Use themed widgets" msgstr "Aussehen der Benutzeroberfläche durch Thema bestimmen" -#: gitk:10741 +#: gitk:11379 msgid "(change requires restart)" msgstr "(Änderungen werden erst nach Neustart wirksam)" -#: gitk:10743 +#: gitk:11381 msgid "(currently unavailable)" msgstr "(Momentan nicht verfügbar)" -#: gitk:10747 +#: gitk:11392 msgid "Colors: press to choose" msgstr "Farben: Klicken zum Wählen" -#: gitk:10750 +#: gitk:11395 msgid "Interface" msgstr "Benutzeroberfläche" -#: gitk:10751 +#: gitk:11396 msgid "interface" msgstr "Benutzeroberfläche" -#: gitk:10754 +#: gitk:11399 msgid "Background" msgstr "Hintergrund" -#: gitk:10755 gitk:10785 +#: gitk:11400 gitk:11430 msgid "background" msgstr "Hintergrund" -#: gitk:10758 +#: gitk:11403 msgid "Foreground" msgstr "Vordergrund" -#: gitk:10759 +#: gitk:11404 msgid "foreground" msgstr "Vordergrund" -#: gitk:10762 +#: gitk:11407 msgid "Diff: old lines" msgstr "Vergleich: Alte Zeilen" -#: gitk:10763 +#: gitk:11408 msgid "diff old lines" msgstr "Vergleich - Alte Zeilen" -#: gitk:10767 +#: gitk:11412 msgid "Diff: new lines" msgstr "Vergleich: Neue Zeilen" -#: gitk:10768 +#: gitk:11413 msgid "diff new lines" msgstr "Vergleich - Neue Zeilen" -#: gitk:10772 +#: gitk:11417 msgid "Diff: hunk header" msgstr "Vergleich: Änderungstitel" -#: gitk:10774 +#: gitk:11419 msgid "diff hunk header" msgstr "Vergleich - Änderungstitel" -#: gitk:10778 +#: gitk:11423 msgid "Marked line bg" msgstr "Hintergrund für markierte Zeile" -#: gitk:10780 +#: gitk:11425 msgid "marked line background" msgstr "Hintergrund für markierte Zeile" -#: gitk:10784 +#: gitk:11429 msgid "Select bg" msgstr "Hintergrundfarbe auswählen" -#: gitk:10788 +#: gitk:11438 msgid "Fonts: press to choose" msgstr "Schriftart: Klicken zum Wählen" -#: gitk:10790 +#: gitk:11440 msgid "Main font" msgstr "Programmschriftart" -#: gitk:10791 +#: gitk:11441 msgid "Diff display font" msgstr "Schriftart für Vergleich" -#: gitk:10792 +#: gitk:11442 msgid "User interface font" msgstr "Beschriftungen" -#: gitk:10829 +#: gitk:11464 +msgid "Gitk preferences" +msgstr "Gitk-Einstellungen" + +#: gitk:11473 +#, fuzzy +msgid "General" +msgstr "Erzeugen" + +#: gitk:11474 +msgid "Colors" +msgstr "" + +#: gitk:11475 +msgid "Fonts" +msgstr "" + +#: gitk:11525 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: Farbe wählen für %s" -#: gitk:11433 +#: gitk:12242 msgid "Cannot find a git repository here." msgstr "Kein Git-Projektarchiv gefunden." -#: gitk:11437 -#, tcl-format -msgid "Cannot find the git directory \"%s\"." -msgstr "Git-Verzeichnis »%s« wurde nicht gefunden." - -#: gitk:11484 +#: gitk:12289 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Mehrdeutige Angabe »%s«: Sowohl Version als auch Dateiname existiert." -#: gitk:11496 +#: gitk:12301 msgid "Bad arguments to gitk:" msgstr "Falsche Kommandozeilen-Parameter für gitk:" -#: gitk:11587 +#: gitk:12405 msgid "Command line" msgstr "Kommandozeile" + +#~ msgid "next" +#~ msgstr "nächste" + +#~ msgid "prev" +#~ msgstr "vorige" + +#~ msgid "CDate" +#~ msgstr "Eintragedatum" + +#~ msgid "Cannot find the git directory \"%s\"." +#~ msgstr "Git-Verzeichnis »%s« wurde nicht gefunden." diff --git a/gitk-git/po/es.po b/gitk-git/po/es.po index 0471dd0..cfc10e1 100644 --- a/gitk-git/po/es.po +++ b/gitk-git/po/es.po @@ -8,25 +8,43 @@ msgid "" msgstr "" "Project-Id-Version: gitk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-18 22:03+1100\n" +"POT-Creation-Date: 2015-03-15 14:37+1100\n" "PO-Revision-Date: 2008-03-25 11:20+0100\n" "Last-Translator: Santiago Gala <santiago.gala@gmail.com>\n" "Language-Team: Spanish\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: gitk:113 +#: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "Imposible obtener la lista de archivos pendientes de fusión:" -#: gitk:340 +#: gitk:212 gitk:2381 +msgid "Color words" +msgstr "" + +#: gitk:217 gitk:2381 gitk:8201 gitk:8234 +msgid "Markup words" +msgstr "" + +#: gitk:324 +#, fuzzy +msgid "Error parsing revisions:" +msgstr "Error al leer las diferencias de fusión:" + +#: gitk:380 +msgid "Error executing --argscmd command:" +msgstr "" + +#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "No hay archivos seleccionados: se seleccionó la opción --merge pero no hay " "archivos pendientes de fusión." -#: gitk:343 +#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -34,254 +52,317 @@ msgstr "" "No hay archivos seleccionados: se seleccionó la opción --merge pero los " "archivos especificados no necesitan fusión." -#: gitk:378 +#: gitk:418 gitk:566 +#, fuzzy +msgid "Error executing git log:" +msgstr "Error al crear la etiqueta:" + +#: gitk:436 gitk:582 msgid "Reading" msgstr "Leyendo" -#: gitk:438 gitk:3462 +#: gitk:496 gitk:4508 msgid "Reading commits..." msgstr "Leyendo revisiones..." -#: gitk:441 gitk:1528 gitk:3465 +#: gitk:499 gitk:1637 gitk:4511 msgid "No commits selected" msgstr "No se seleccionaron revisiones" -#: gitk:1399 +#: gitk:1511 msgid "Can't parse git log output:" msgstr "Error analizando la salida de git log:" -#: gitk:1605 +#: gitk:1740 msgid "No commit information available" msgstr "Falta información sobre las revisiones" -#: gitk:1709 gitk:1731 gitk:3259 gitk:7764 gitk:9293 gitk:9466 +#: gitk:1897 +msgid "mc" +msgstr "" + +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 msgid "OK" msgstr "Aceptar" -#: gitk:1733 gitk:3260 gitk:7439 gitk:7510 gitk:7613 gitk:7660 gitk:7766 -#: gitk:9294 gitk:9467 +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 +#: gitk:11221 gitk:11501 msgid "Cancel" msgstr "Cancelar" -#: gitk:1811 +#: gitk:2069 msgid "Update" msgstr "Actualizar" -#: gitk:1813 +#: gitk:2070 +msgid "Reload" +msgstr "" + +#: gitk:2071 msgid "Reread references" msgstr "Releer referencias" -#: gitk:1814 +#: gitk:2072 msgid "List references" msgstr "Lista de referencias" -#: gitk:1815 +#: gitk:2074 +msgid "Start git gui" +msgstr "" + +#: gitk:2076 msgid "Quit" msgstr "Salir" -#: gitk:1810 +#: gitk:2068 msgid "File" msgstr "Archivo" -#: gitk:1818 +#: gitk:2080 msgid "Preferences" msgstr "Preferencias" -#: gitk:1817 +#: gitk:2079 msgid "Edit" msgstr "Editar" -#: gitk:1821 +#: gitk:2084 msgid "New view..." msgstr "Nueva vista..." -#: gitk:1822 +#: gitk:2085 msgid "Edit view..." msgstr "Modificar vista..." -#: gitk:1823 +#: gitk:2086 msgid "Delete view" msgstr "Eliminar vista" -#: gitk:1825 +#: gitk:2088 msgid "All files" msgstr "Todos los archivos" -#: gitk:1820 gitk:3196 +#: gitk:2083 gitk:4050 msgid "View" msgstr "Vista" -#: gitk:1828 gitk:2487 +#: gitk:2093 gitk:2103 gitk:3009 msgid "About gitk" msgstr "Acerca de gitk" -#: gitk:1829 +#: gitk:2094 gitk:2108 msgid "Key bindings" msgstr "Combinaciones de teclas" -#: gitk:1827 +#: gitk:2092 gitk:2107 msgid "Help" msgstr "Ayuda" -#: gitk:1887 -msgid "SHA1 ID: " -msgstr "SHA1 ID: " +#: gitk:2185 gitk:8633 +msgid "SHA1 ID:" +msgstr "SHA1 ID:" -#: gitk:1918 +#: gitk:2229 msgid "Row" msgstr "" -#: gitk:1949 +#: gitk:2267 msgid "Find" msgstr "Buscar" -#: gitk:1950 -msgid "next" -msgstr "<<" - -#: gitk:1951 -msgid "prev" -msgstr ">>" - -#: gitk:1952 +#: gitk:2295 msgid "commit" msgstr "revisión" -#: gitk:1955 gitk:1957 gitk:3617 gitk:3640 gitk:3664 gitk:5550 gitk:5621 +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 +#: gitk:6893 msgid "containing:" msgstr "que contiene:" -#: gitk:1958 gitk:2954 gitk:2959 gitk:3692 +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 msgid "touching paths:" msgstr "que modifica la ruta:" -#: gitk:1959 gitk:3697 +#: gitk:2303 gitk:4759 msgid "adding/removing string:" msgstr "que añade/elimina cadena:" -#: gitk:1968 gitk:1970 +#: gitk:2304 gitk:4761 +msgid "changing lines matching:" +msgstr "" + +#: gitk:2313 gitk:2315 gitk:4748 msgid "Exact" msgstr "Exacto" -#: gitk:1970 gitk:3773 gitk:5518 +#: gitk:2315 gitk:4836 gitk:6704 msgid "IgnCase" msgstr "NoMayús" -#: gitk:1970 gitk:3666 gitk:3771 gitk:5514 +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 msgid "Regexp" msgstr "Regex" -#: gitk:1972 gitk:1973 gitk:3792 gitk:3822 gitk:3829 gitk:5641 gitk:5708 +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 msgid "All fields" msgstr "Todos los campos" -#: gitk:1973 gitk:3790 gitk:3822 gitk:5580 +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 msgid "Headline" msgstr "TÃtulo" -#: gitk:1974 gitk:3790 gitk:5580 gitk:5708 gitk:6109 +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 msgid "Comments" msgstr "Comentarios" -#: gitk:1974 gitk:3790 gitk:3794 gitk:3829 gitk:5580 gitk:6045 gitk:7285 -#: gitk:7300 +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 +#: gitk:8826 msgid "Author" msgstr "Autor" -#: gitk:1974 gitk:3790 gitk:5580 gitk:6047 +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 msgid "Committer" msgstr "" -#: gitk:2003 +#: gitk:2350 msgid "Search" msgstr "Buscar" -#: gitk:2010 +#: gitk:2358 msgid "Diff" msgstr "Diferencia" -#: gitk:2012 +#: gitk:2360 msgid "Old version" msgstr "Versión antigua" -#: gitk:2014 +#: gitk:2362 msgid "New version" msgstr "Versión nueva" -#: gitk:2016 +#: gitk:2364 msgid "Lines of context" msgstr "LÃneas de contexto" -#: gitk:2026 +#: gitk:2374 msgid "Ignore space change" msgstr "Ignora cambios de espaciado" -#: gitk:2084 +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +msgid "Line diff" +msgstr "" + +#: gitk:2445 msgid "Patch" msgstr "Parche" -#: gitk:2086 +#: gitk:2447 msgid "Tree" msgstr "Ãrbol" -#: gitk:2213 gitk:2226 +#: gitk:2616 gitk:2636 msgid "Diff this -> selected" msgstr "Diferencia de esta -> seleccionada" -#: gitk:2214 gitk:2227 +#: gitk:2617 gitk:2637 msgid "Diff selected -> this" msgstr "Diferencia de seleccionada -> esta" -#: gitk:2215 gitk:2228 +#: gitk:2618 gitk:2638 msgid "Make patch" msgstr "Crear patch" -#: gitk:2216 gitk:7494 +#: gitk:2619 gitk:9235 msgid "Create tag" msgstr "Crear etiqueta" -#: gitk:2217 gitk:7593 +#: gitk:2620 gitk:9352 msgid "Write commit to file" msgstr "Escribir revisiones a archivo" -#: gitk:2218 gitk:7647 +#: gitk:2621 gitk:9409 msgid "Create new branch" msgstr "Crear nueva rama" -#: gitk:2219 +#: gitk:2622 msgid "Cherry-pick this commit" msgstr "Añadir esta revisión a la rama actual (cherry-pick)" -#: gitk:2220 +#: gitk:2623 msgid "Reset HEAD branch to here" msgstr "Traer la rama HEAD aquÃ" -#: gitk:2234 +#: gitk:2624 +#, fuzzy +msgid "Mark this commit" +msgstr "Añadir esta revisión a la rama actual (cherry-pick)" + +#: gitk:2625 +msgid "Return to mark" +msgstr "" + +#: gitk:2626 +msgid "Find descendant of this and mark" +msgstr "" + +#: gitk:2627 +msgid "Compare with marked commit" +msgstr "" + +#: gitk:2628 gitk:2639 +#, fuzzy +msgid "Diff this -> marked commit" +msgstr "Diferencia de esta -> seleccionada" + +#: gitk:2629 gitk:2640 +#, fuzzy +msgid "Diff marked commit -> this" +msgstr "Diferencia de seleccionada -> esta" + +#: gitk:2630 +#, fuzzy +msgid "Revert this commit" +msgstr "Añadir esta revisión a la rama actual (cherry-pick)" + +#: gitk:2646 msgid "Check out this branch" msgstr "Cambiar a esta rama" -#: gitk:2235 +#: gitk:2647 msgid "Remove this branch" msgstr "Eliminar esta rama" -#: gitk:2242 +#: gitk:2654 msgid "Highlight this too" msgstr "Seleccionar también" -#: gitk:2243 +#: gitk:2655 msgid "Highlight this only" msgstr "Seleccionar sólo" -#: gitk:2245 +#: gitk:2656 +msgid "External diff" +msgstr "" + +#: gitk:2657 msgid "Blame parent commit" msgstr "" -#: gitk:2488 +#: gitk:2664 +msgid "Show origin of this line" +msgstr "" + +#: gitk:2665 +msgid "Run git gui blame on this line" +msgstr "" + +#: gitk:3011 +#, fuzzy msgid "" "\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" +"Copyright © 2005-2014 Paul Mackerras\n" "\n" "Use and redistribute under the terms of the GNU General Public License" msgstr "" @@ -293,425 +374,728 @@ msgstr "" "Uso y redistribución permitidos según los términos de la Licencia Pública " "General de GNU (GNU GPL)" -#: gitk:2496 gitk:2557 gitk:7943 +#: gitk:3019 gitk:3085 gitk:9836 msgid "Close" msgstr "Cerrar" -#: gitk:2515 +#: gitk:3040 msgid "Gitk key bindings" msgstr "Combinaciones de tecla de Gitk" -#: gitk:2517 +#: gitk:3043 msgid "Gitk key bindings:" msgstr "Combinaciones de tecla de Gitk:" -#: gitk:2519 +#: gitk:3045 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tSalir" -#: gitk:2520 +#: gitk:3046 +#, fuzzy, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-F>\t\tBuscar" + +#: gitk:3047 msgid "<Home>\t\tMove to first commit" msgstr "<Home>\t\tIr a la primera revisión" -#: gitk:2521 +#: gitk:3048 msgid "<End>\t\tMove to last commit" msgstr "<End>\t\tIr a la última revisión" -#: gitk:2522 -msgid "<Up>, p, i\tMove up one commit" +#: gitk:3049 +#, fuzzy +msgid "<Up>, p, k\tMove up one commit" msgstr "<Up>, p, i\tSubir una revisión" -#: gitk:2523 -msgid "<Down>, n, k\tMove down one commit" +#: gitk:3050 +#, fuzzy +msgid "<Down>, n, j\tMove down one commit" msgstr "<Down>, n, k\tBajar una revisión" -#: gitk:2524 -msgid "<Left>, z, j\tGo back in history list" +#: gitk:3051 +#, fuzzy +msgid "<Left>, z, h\tGo back in history list" msgstr "<Left>, z, j\tRetroceder en la historia" -#: gitk:2525 +#: gitk:3052 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Right>, x, l\tAvanzar en la historia" -#: gitk:2526 +#: gitk:3053 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "" + +#: gitk:3054 msgid "<PageUp>\tMove up one page in commit list" msgstr "<PageUp>\tSubir una página en la lista de revisiones" -#: gitk:2527 +#: gitk:3055 msgid "<PageDown>\tMove down one page in commit list" msgstr "<PageDown>\tBajar una página en la lista de revisiones" -#: gitk:2528 +#: gitk:3056 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tDesplazarse al inicio de la lista de revisiones" -#: gitk:2529 +#: gitk:3057 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tDesplazarse al final de la lista de revisiones" -#: gitk:2530 +#: gitk:3058 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Up>\tDesplazar una lÃnea hacia arriba la lista de revisiones" -#: gitk:2531 +#: gitk:3059 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Down>\tDesplazar una lÃnea hacia abajo la lista de revisiones" -#: gitk:2532 +#: gitk:3060 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tDesplazar una página hacia arriba la lista de revisiones" -#: gitk:2533 +#: gitk:3061 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tDesplazar una página hacia abajo la lista de revisiones" -#: gitk:2534 +#: gitk:3062 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" msgstr "<Shift-Up>\tBuscar hacia atrás (arriba, revisiones siguientes)" -#: gitk:2535 +#: gitk:3063 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" msgstr "<Shift-Down>\tBuscar hacia adelante (abajo, revisiones anteriores)" -#: gitk:2536 +#: gitk:3064 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Delete>, b\tDesplaza hacia arriba una página la vista de diferencias" -#: gitk:2537 +#: gitk:3065 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Backspace>\tDesplaza hacia arriba una página la vista de diferencias" -#: gitk:2538 +#: gitk:3066 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Space>\t\tDesplaza hacia abajo una página la vista de diferencias" -#: gitk:2539 +#: gitk:3067 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tDesplaza hacia arriba 18 lÃneas la vista de diferencias" -#: gitk:2540 +#: gitk:3068 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tDesplaza hacia abajo 18 lÃneas la vista de diferencias" -#: gitk:2541 +#: gitk:3069 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tBuscar" -#: gitk:2542 +#: gitk:3070 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tBuscar el siguiente" -#: gitk:2543 +#: gitk:3071 msgid "<Return>\tMove to next find hit" msgstr "<Return>\tBuscar el siguiente" -#: gitk:2544 -msgid "/\t\tMove to next find hit, or redo find" -msgstr "/\t\tBuscar el siguiente, o reiniciar la búsqueda" +#: gitk:3072 +msgid "/\t\tFocus the search box" +msgstr "" -#: gitk:2545 +#: gitk:3073 msgid "?\t\tMove to previous find hit" msgstr "?\t\tBuscar el anterior" -#: gitk:2546 +#: gitk:3074 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tDesplazar la vista de diferencias al archivo siguiente" -#: gitk:2547 +#: gitk:3075 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tBuscar siguiente en la vista de diferencias" -#: gitk:2548 +#: gitk:3076 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tBuscar anterior en la vista de diferencias" -#: gitk:2549 +#: gitk:3077 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tAumentar tamaño del texto" -#: gitk:2550 +#: gitk:3078 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tAumentar tamaño del texto" -#: gitk:2551 +#: gitk:3079 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tDisminuir tamaño del texto" -#: gitk:2552 +#: gitk:3080 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tDisminuir tamaño del texto" -#: gitk:2553 +#: gitk:3081 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tActualizar" -#: gitk:3200 +#: gitk:3546 gitk:3555 +#, fuzzy, tcl-format +msgid "Error creating temporary directory %s:" +msgstr "Error en la creación del parche:" + +#: gitk:3568 +#, fuzzy, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Error al leer las diferencias de fusión:" + +#: gitk:3631 +#, fuzzy +msgid "command failed:" +msgstr "LÃnea de comandos" + +#: gitk:3780 +#, fuzzy +msgid "No such commit" +msgstr "No se han guardado cambios" + +#: gitk:3794 +msgid "git gui blame: command failed:" +msgstr "" + +#: gitk:3825 +#, tcl-format +msgid "Couldn't read merge head: %s" +msgstr "" + +#: gitk:3833 +#, fuzzy, tcl-format +msgid "Error reading index: %s" +msgstr "Error al crear la etiqueta:" + +#: gitk:3858 +#, tcl-format +msgid "Couldn't start git blame: %s" +msgstr "" + +#: gitk:3861 gitk:6735 +msgid "Searching" +msgstr "Buscando" + +#: gitk:3893 +#, fuzzy, tcl-format +msgid "Error running git blame: %s" +msgstr "Error al crear la etiqueta:" + +#: gitk:3921 +#, tcl-format +msgid "That line comes from commit %s, which is not in this view" +msgstr "" + +#: gitk:3935 +#, fuzzy +msgid "External diff viewer failed:" +msgstr "f\t\tDesplazar la vista de diferencias al archivo siguiente" + +#: gitk:4053 msgid "Gitk view definition" msgstr "Definición de vistas de Gitk" -#: gitk:3225 -msgid "Name" -msgstr "Nombre" - -#: gitk:3228 +#: gitk:4057 msgid "Remember this view" msgstr "Recordar esta vista" -#: gitk:3232 -msgid "Commits to include (arguments to git log):" +#: gitk:4058 +msgid "References (space separated list):" +msgstr "" + +#: gitk:4059 +msgid "Branches & tags:" +msgstr "" + +#: gitk:4060 +#, fuzzy +msgid "All refs" +msgstr "Todos los archivos" + +#: gitk:4061 +msgid "All (local) branches" +msgstr "" + +#: gitk:4062 +msgid "All tags" +msgstr "" + +#: gitk:4063 +msgid "All remote-tracking branches" +msgstr "" + +#: gitk:4064 +msgid "Commit Info (regular expressions):" +msgstr "" + +#: gitk:4065 +#, fuzzy +msgid "Author:" +msgstr "Autor" + +#: gitk:4066 +#, fuzzy +msgid "Committer:" +msgstr "revisión" + +#: gitk:4067 +msgid "Commit Message:" +msgstr "" + +#: gitk:4068 +msgid "Matches all Commit Info criteria" +msgstr "" + +#: gitk:4069 +msgid "Matches none Commit Info criteria" +msgstr "" + +#: gitk:4070 +msgid "Changes to Files:" +msgstr "" + +#: gitk:4071 +msgid "Fixed String" +msgstr "" + +#: gitk:4072 +msgid "Regular Expression" +msgstr "" + +#: gitk:4073 +#, fuzzy +msgid "Search string:" +msgstr "Buscando" + +#: gitk:4074 +msgid "" +"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " +"15:27:38\"):" +msgstr "" + +#: gitk:4075 +msgid "Since:" +msgstr "" + +#: gitk:4076 +msgid "Until:" +msgstr "" + +#: gitk:4077 +msgid "Limit and/or skip a number of revisions (positive integer):" +msgstr "" + +#: gitk:4078 +msgid "Number to show:" +msgstr "" + +#: gitk:4079 +msgid "Number to skip:" +msgstr "" + +#: gitk:4080 +msgid "Miscellaneous options:" +msgstr "" + +#: gitk:4081 +msgid "Strictly sort by date" +msgstr "" + +#: gitk:4082 +msgid "Mark branch sides" +msgstr "" + +#: gitk:4083 +#, fuzzy +msgid "Limit to first parent" +msgstr "Limitar las diferencias a las rutas seleccionadas" + +#: gitk:4084 +msgid "Simple history" +msgstr "" + +#: gitk:4085 +#, fuzzy +msgid "Additional arguments to git log:" msgstr "Revisiones a incluir (argumentos a git log):" -#: gitk:3239 +#: gitk:4086 +msgid "Enter files and directories to include, one per line:" +msgstr "Introducir archivos y directorios a incluir, uno por lÃnea:" + +#: gitk:4087 msgid "Command to generate more commits to include:" msgstr "Comando que genera más revisiones a incluir:" -#: gitk:3246 -msgid "Enter files and directories to include, one per line:" -msgstr "Introducir archivos y directorios a incluir, uno por lÃnea:" +#: gitk:4211 +msgid "Gitk: edit view" +msgstr "" + +#: gitk:4219 +msgid "-- criteria for selecting revisions" +msgstr "" + +#: gitk:4224 +#, fuzzy +msgid "View Name" +msgstr "Vista" + +#: gitk:4299 +msgid "Apply (F5)" +msgstr "" -#: gitk:3293 +#: gitk:4337 msgid "Error in commit selection arguments:" msgstr "Error en los argumentos de selección de las revisiones:" -#: gitk:3347 gitk:3399 gitk:3842 gitk:3856 gitk:5060 gitk:10141 gitk:10142 +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 msgid "None" msgstr "Ninguno" -#: gitk:3790 gitk:5580 gitk:7287 gitk:7302 -msgid "Date" -msgstr "Fecha" - -#: gitk:3790 gitk:5580 -msgid "CDate" -msgstr "Fecha de creación" - -#: gitk:3939 gitk:3944 +#: gitk:5003 gitk:5008 msgid "Descendant" msgstr "Descendiente" -#: gitk:3940 +#: gitk:5004 msgid "Not descendant" msgstr "No descendiente" -#: gitk:3947 gitk:3952 +#: gitk:5011 gitk:5016 msgid "Ancestor" msgstr "Antepasado" -#: gitk:3948 +#: gitk:5012 msgid "Not ancestor" msgstr "No antepasado" -#: gitk:4187 +#: gitk:5306 msgid "Local changes checked in to index but not committed" msgstr "Cambios locales añadidos al Ãndice pero sin completar revisión" -#: gitk:4220 +#: gitk:5342 msgid "Local uncommitted changes, not checked in to index" msgstr "Cambios locales sin añadir al Ãndice" -#: gitk:5549 -msgid "Searching" -msgstr "Buscando" +#: gitk:7115 +msgid "and many more" +msgstr "" + +#: gitk:7118 +msgid "many" +msgstr "" -#: gitk:6049 +#: gitk:7309 msgid "Tags:" msgstr "Etiquetas:" -#: gitk:6066 gitk:6072 gitk:7280 +#: gitk:7326 gitk:7332 gitk:8806 msgid "Parent" msgstr "Padre" -#: gitk:6077 +#: gitk:7337 msgid "Child" msgstr "Hija" -#: gitk:6086 +#: gitk:7346 msgid "Branch" msgstr "Rama" -#: gitk:6089 +#: gitk:7349 msgid "Follows" msgstr "Sigue-a" -#: gitk:6092 +#: gitk:7352 msgid "Precedes" msgstr "Precede-a" -#: gitk:6378 -msgid "Error getting merge diffs:" +#: gitk:7947 +#, fuzzy, tcl-format +msgid "Error getting diffs: %s" msgstr "Error al leer las diferencias de fusión:" -#: gitk:7113 +#: gitk:8631 msgid "Goto:" msgstr "Ir a:" -#: gitk:7115 -msgid "SHA1 ID:" -msgstr "SHA1 ID:" - -#: gitk:7134 +#: gitk:8652 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "La id SHA1 abreviada %s es ambigua" -#: gitk:7146 +#: gitk:8659 +#, fuzzy, tcl-format +msgid "Revision %s is not known" +msgstr "La id SHA1 %s es desconocida" + +#: gitk:8669 #, tcl-format msgid "SHA1 id %s is not known" msgstr "La id SHA1 %s es desconocida" -#: gitk:7148 +#: gitk:8671 #, tcl-format -msgid "Tag/Head %s is not known" -msgstr "La etiqueta/rama %s es deconocida" +msgid "Revision %s is not in the current view" +msgstr "" -#: gitk:7290 +#: gitk:8813 gitk:8828 +msgid "Date" +msgstr "Fecha" + +#: gitk:8816 msgid "Children" msgstr "Hijas" -#: gitk:7347 +#: gitk:8879 #, tcl-format msgid "Reset %s branch to here" msgstr "Poner la rama %s en esta revisión" -#: gitk:7349 +#: gitk:8881 msgid "Detached head: can't reset" msgstr "" -#: gitk:7381 +#: gitk:8986 gitk:8992 +msgid "Skipping merge commit " +msgstr "" + +#: gitk:9001 gitk:9006 +#, fuzzy +msgid "Error getting patch ID for " +msgstr "Error en la creación del parche:" + +#: gitk:9002 gitk:9007 +msgid " - stopping\n" +msgstr "" + +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 +#, fuzzy +msgid "Commit " +msgstr "revisión" + +#: gitk:9016 +msgid "" +" is the same patch as\n" +" " +msgstr "" + +#: gitk:9024 +msgid "" +" differs from\n" +" " +msgstr "" + +#: gitk:9026 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "" + +#: gitk:9038 gitk:9047 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr "" + +#: gitk:9066 +#, fuzzy, tcl-format +msgid "Error writing commit to file: %s" +msgstr "Error al escribir revisión:" + +#: gitk:9072 +#, fuzzy, tcl-format +msgid "Error diffing commits: %s" +msgstr "Error al escribir revisión:" + +#: gitk:9118 msgid "Top" msgstr "Origen" -#: gitk:7382 +#: gitk:9119 msgid "From" msgstr "De" -#: gitk:7387 +#: gitk:9124 msgid "To" msgstr "A" -#: gitk:7410 +#: gitk:9148 msgid "Generate patch" msgstr "Generar parche" -#: gitk:7412 +#: gitk:9150 msgid "From:" msgstr "De:" -#: gitk:7421 +#: gitk:9159 msgid "To:" msgstr "Para:" -#: gitk:7430 +#: gitk:9168 msgid "Reverse" msgstr "Invertir" -#: gitk:7432 gitk:7607 +#: gitk:9170 gitk:9366 msgid "Output file:" msgstr "Escribir a archivo:" -#: gitk:7438 +#: gitk:9176 msgid "Generate" msgstr "Generar" -#: gitk:7474 +#: gitk:9214 msgid "Error creating patch:" msgstr "Error en la creación del parche:" -#: gitk:7496 gitk:7595 gitk:7649 +#: gitk:9237 gitk:9354 gitk:9411 msgid "ID:" msgstr "ID:" -#: gitk:7505 +#: gitk:9246 msgid "Tag name:" msgstr "Nombre de etiqueta:" -#: gitk:7509 gitk:7659 +#: gitk:9249 +msgid "Tag message is optional" +msgstr "" + +#: gitk:9251 +#, fuzzy +msgid "Tag message:" +msgstr "Nombre de etiqueta:" + +#: gitk:9255 gitk:9420 msgid "Create" msgstr "Crear" -#: gitk:7524 +#: gitk:9273 msgid "No tag name specified" msgstr "No se ha especificado etiqueta" -#: gitk:7528 +#: gitk:9277 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "La etiqueta \"%s\" ya existe" -#: gitk:7534 +#: gitk:9287 msgid "Error creating tag:" msgstr "Error al crear la etiqueta:" -#: gitk:7604 +#: gitk:9363 msgid "Command:" msgstr "Comando:" -#: gitk:7612 +#: gitk:9371 msgid "Write" msgstr "Escribir" -#: gitk:7628 +#: gitk:9389 msgid "Error writing commit:" msgstr "Error al escribir revisión:" -#: gitk:7654 +#: gitk:9416 msgid "Name:" msgstr "Nombre:" -#: gitk:7674 +#: gitk:9439 msgid "Please specify a name for the new branch" msgstr "Especifique un nombre para la nueva rama" -#: gitk:7703 +#: gitk:9444 +#, fuzzy, tcl-format +msgid "Branch '%s' already exists. Overwrite?" +msgstr "La etiqueta \"%s\" ya existe" + +#: gitk:9511 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "La revisión %s ya está incluida en la rama %s -- ¿Volver a aplicarla?" -#: gitk:7708 +#: gitk:9516 msgid "Cherry-picking" msgstr "Eligiendo revisiones (cherry-picking)" -#: gitk:7720 +#: gitk:9525 +#, tcl-format +msgid "" +"Cherry-pick failed because of local changes to file '%s'.\n" +"Please commit, reset or stash your changes and try again." +msgstr "" + +#: gitk:9531 +msgid "" +"Cherry-pick failed because of merge conflict.\n" +"Do you wish to run git citool to resolve it?" +msgstr "" + +#: gitk:9547 gitk:9605 msgid "No changes committed" msgstr "No se han guardado cambios" -#: gitk:7745 +#: gitk:9574 +#, fuzzy, tcl-format +msgid "Commit %s is not included in branch %s -- really revert it?" +msgstr "La revisión %s ya está incluida en la rama %s -- ¿Volver a aplicarla?" + +#: gitk:9579 +#, fuzzy +msgid "Reverting" +msgstr "Reponiendo" + +#: gitk:9587 +#, tcl-format +msgid "" +"Revert failed because of local changes to the following files:%s Please " +"commit, reset or stash your changes and try again." +msgstr "" + +#: gitk:9591 +msgid "" +"Revert failed because of merge conflict.\n" +" Do you wish to run git citool to resolve it?" +msgstr "" + +#: gitk:9634 msgid "Confirm reset" msgstr "Confirmar git reset" -#: gitk:7747 +#: gitk:9636 #, tcl-format msgid "Reset branch %s to %s?" msgstr "¿Reponer la rama %s a %s?" -#: gitk:7751 +#: gitk:9638 msgid "Reset type:" msgstr "Tipo de reposición:" -#: gitk:7755 +#: gitk:9641 msgid "Soft: Leave working tree and index untouched" msgstr "Suave: No altera la copia de trabajo ni el Ãndice" -#: gitk:7758 +#: gitk:9644 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Mixta: Actualiza el Ãndice, no altera la copia de trabajo" -#: gitk:7761 +#: gitk:9647 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -719,19 +1103,19 @@ msgstr "" "Dura: Actualiza el Ãndice y la copia de trabajo\n" "(abandona TODAS las modificaciones locales)" -#: gitk:7777 +#: gitk:9664 msgid "Resetting" msgstr "Reponiendo" -#: gitk:7834 +#: gitk:9724 msgid "Checking out" msgstr "Creando copia de trabajo" -#: gitk:7885 +#: gitk:9777 msgid "Cannot delete the currently checked-out branch" msgstr "No se puede borrar la rama actual" -#: gitk:7891 +#: gitk:9783 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -740,16 +1124,16 @@ msgstr "" "Las revisiones de la rama %s no están presentes en otras ramas.\n" "¿Borrar la rama %s?" -#: gitk:7922 +#: gitk:9814 #, tcl-format msgid "Tags and heads: %s" msgstr "Etiquetas y ramas: %s" -#: gitk:7936 +#: gitk:9829 msgid "Filter" msgstr "Filtro" -#: gitk:8230 +#: gitk:10125 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -757,155 +1141,255 @@ msgstr "" "Error al leer la topologÃa de revisiones: la información sobre las ramas y " "etiquetas precedentes y siguientes será incompleta." -#: gitk:9216 +#: gitk:11102 msgid "Tag" msgstr "Etiqueta" -#: gitk:9216 +#: gitk:11106 msgid "Id" msgstr "Id" -#: gitk:9262 +#: gitk:11189 msgid "Gitk font chooser" msgstr "Selector de tipografÃas gitk" -#: gitk:9279 +#: gitk:11206 msgid "B" msgstr "B" -#: gitk:9282 +#: gitk:11209 msgid "I" msgstr "I" -#: gitk:9375 -msgid "Gitk preferences" -msgstr "Preferencias de gitk" - -#: gitk:9376 +#: gitk:11327 msgid "Commit list display options" msgstr "Opciones de visualización de la lista de revisiones" -#: gitk:9379 +#: gitk:11330 msgid "Maximum graph width (lines)" msgstr "Ancho máximo del gráfico (en lÃneas)" -#: gitk:9383 -#, tcl-format +#: gitk:11334 +#, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Ancho máximo del gráfico (en % del panel)" -#: gitk:9388 +#: gitk:11337 msgid "Show local changes" msgstr "Mostrar cambios locales" -#: gitk:9393 -msgid "Auto-select SHA1" +#: gitk:11340 +#, fuzzy +msgid "Auto-select SHA1 (length)" msgstr "Seleccionar automáticamente SHA1 hash" -#: gitk:9398 +#: gitk:11344 +msgid "Hide remote refs" +msgstr "" + +#: gitk:11348 msgid "Diff display options" msgstr "Opciones de visualización de diferencias" -#: gitk:9400 +#: gitk:11350 msgid "Tab spacing" msgstr "Espaciado de tabulador" -#: gitk:9404 -msgid "Display nearby tags" +#: gitk:11353 +#, fuzzy +msgid "Display nearby tags/heads" msgstr "Mostrar etiquetas cercanas" -#: gitk:9409 +#: gitk:11356 +msgid "Maximum # tags/heads to show" +msgstr "" + +#: gitk:11359 msgid "Limit diffs to listed paths" msgstr "Limitar las diferencias a las rutas seleccionadas" -#: gitk:9414 +#: gitk:11362 msgid "Support per-file encodings" msgstr "" -#: gitk:9421 +#: gitk:11368 gitk:11515 msgid "External diff tool" msgstr "" -#: gitk:9423 +#: gitk:11369 msgid "Choose..." msgstr "" -#: gitk:9428 +#: gitk:11374 +#, fuzzy +msgid "General options" +msgstr "Generar parche" + +#: gitk:11377 +msgid "Use themed widgets" +msgstr "" + +#: gitk:11379 +msgid "(change requires restart)" +msgstr "" + +#: gitk:11381 +msgid "(currently unavailable)" +msgstr "" + +#: gitk:11392 msgid "Colors: press to choose" msgstr "Colores: pulse para seleccionar" -#: gitk:9431 +#: gitk:11395 +msgid "Interface" +msgstr "" + +#: gitk:11396 +#, fuzzy +msgid "interface" +msgstr "TipografÃa para interfaz de usuario" + +#: gitk:11399 msgid "Background" msgstr "Fondo" -#: gitk:9435 +#: gitk:11400 gitk:11430 +#, fuzzy +msgid "background" +msgstr "Fondo" + +#: gitk:11403 msgid "Foreground" msgstr "Primer plano" -#: gitk:9439 +#: gitk:11404 +#, fuzzy +msgid "foreground" +msgstr "Primer plano" + +#: gitk:11407 msgid "Diff: old lines" msgstr "Diff: lÃneas viejas" -#: gitk:9444 +#: gitk:11408 +#, fuzzy +msgid "diff old lines" +msgstr "Diff: lÃneas viejas" + +#: gitk:11412 msgid "Diff: new lines" msgstr "Diff: lÃneas nuevas" -#: gitk:9449 +#: gitk:11413 +#, fuzzy +msgid "diff new lines" +msgstr "Diff: lÃneas nuevas" + +#: gitk:11417 msgid "Diff: hunk header" msgstr "Diff: cabecera de fragmento" -#: gitk:9455 +#: gitk:11419 +#, fuzzy +msgid "diff hunk header" +msgstr "Diff: cabecera de fragmento" + +#: gitk:11423 +msgid "Marked line bg" +msgstr "" + +#: gitk:11425 +msgid "marked line background" +msgstr "" + +#: gitk:11429 msgid "Select bg" msgstr "Color de fondo de la selección" -#: gitk:9459 +#: gitk:11438 msgid "Fonts: press to choose" msgstr "TipografÃas: pulse para elegir" -#: gitk:9461 +#: gitk:11440 msgid "Main font" msgstr "TipografÃa principal" -#: gitk:9462 +#: gitk:11441 msgid "Diff display font" msgstr "TipografÃa para diferencias" -#: gitk:9463 +#: gitk:11442 msgid "User interface font" msgstr "TipografÃa para interfaz de usuario" -#: gitk:9488 +#: gitk:11464 +msgid "Gitk preferences" +msgstr "Preferencias de gitk" + +#: gitk:11473 +#, fuzzy +msgid "General" +msgstr "Generar" + +#: gitk:11474 +msgid "Colors" +msgstr "" + +#: gitk:11475 +msgid "Fonts" +msgstr "" + +#: gitk:11525 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: elegir color para %s" -#: gitk:9934 -msgid "" -"Sorry, gitk cannot run with this version of Tcl/Tk.\n" -" Gitk requires at least Tcl/Tk 8.4." -msgstr "" -"Esta versión de Tcl/Tk es demasiado antigua.\n" -" Gitk requiere Tcl/Tk versión 8.4 o superior." - -#: gitk:10047 +#: gitk:12242 msgid "Cannot find a git repository here." msgstr "No hay un repositorio git aquÃ." -#: gitk:10051 -#, tcl-format -msgid "Cannot find the git directory \"%s\"." -msgstr "No hay directorio git \"%s\"." - -#: gitk:10098 +#: gitk:12289 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "" "Argumento ambiguo: '%s' es tanto una revisión como un nombre de archivo" -#: gitk:10110 +#: gitk:12301 msgid "Bad arguments to gitk:" msgstr "Argumentos incorrectos a Gitk:" -#: gitk:10170 +#: gitk:12405 msgid "Command line" msgstr "LÃnea de comandos" + +#~ msgid "SHA1 ID: " +#~ msgstr "SHA1 ID: " + +#~ msgid "next" +#~ msgstr "<<" + +#~ msgid "prev" +#~ msgstr ">>" + +#~ msgid "/\t\tMove to next find hit, or redo find" +#~ msgstr "/\t\tBuscar el siguiente, o reiniciar la búsqueda" + +#~ msgid "Name" +#~ msgstr "Nombre" + +#~ msgid "CDate" +#~ msgstr "Fecha de creación" + +#~ msgid "Tag/Head %s is not known" +#~ msgstr "La etiqueta/rama %s es deconocida" + +#~ msgid "" +#~ "Sorry, gitk cannot run with this version of Tcl/Tk.\n" +#~ " Gitk requires at least Tcl/Tk 8.4." +#~ msgstr "" +#~ "Esta versión de Tcl/Tk es demasiado antigua.\n" +#~ " Gitk requiere Tcl/Tk versión 8.4 o superior." + +#~ msgid "Cannot find the git directory \"%s\"." +#~ msgstr "No hay directorio git \"%s\"." diff --git a/gitk-git/po/fr.po b/gitk-git/po/fr.po index 5370ddc..747ee19 100644 --- a/gitk-git/po/fr.po +++ b/gitk-git/po/fr.po @@ -8,36 +8,45 @@ msgid "" msgstr "" "Project-Id-Version: gitk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-05 15:16+0200\n" +"POT-Creation-Date: 2015-03-15 14:37+1100\n" "PO-Revision-Date: 2009-11-19 22:13+0100\n" "Last-Translator: Emmanuel Trillaud <etrillaud@gmail.com>\n" "Language-Team: git@vger.kernel.org\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: French\n" "X-Poedit-Country: FRANCE\n" -#: gitk:113 +#: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "Impossible de récupérer la liste des fichiers non fusionnés :" -#: gitk:269 +#: gitk:212 gitk:2381 +msgid "Color words" +msgstr "" + +#: gitk:217 gitk:2381 gitk:8201 gitk:8234 +msgid "Markup words" +msgstr "" + +#: gitk:324 msgid "Error parsing revisions:" msgstr "Erreur lors du parcours des révisions :" -#: gitk:324 +#: gitk:380 msgid "Error executing --argscmd command:" msgstr "Erreur à l'exécution de la commande --argscmd :" -#: gitk:337 +#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "Aucun fichier sélectionné : --merge précisé, mais tous les fichiers sont " "fusionnés." # FIXME : améliorer la traduction de 'file limite' -#: gitk:340 +#: gitk:396 #, fuzzy msgid "" "No files selected: --merge specified but no unmerged files are within file " @@ -46,295 +55,315 @@ msgstr "" "Aucun fichier sélectionné : --merge précisé mais aucun fichier non fusionné " "n'est dans la limite des fichiers." -#: gitk:362 gitk:509 +#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "Erreur à l'exécution de git log :" -#: gitk:380 gitk:525 +#: gitk:436 gitk:582 msgid "Reading" msgstr "Lecture en cours" -#: gitk:440 gitk:4123 +#: gitk:496 gitk:4508 msgid "Reading commits..." msgstr "Lecture des commits..." -#: gitk:443 gitk:1561 gitk:4126 +#: gitk:499 gitk:1637 gitk:4511 msgid "No commits selected" msgstr "Aucun commit sélectionné" -#: gitk:1437 +#: gitk:1511 msgid "Can't parse git log output:" msgstr "Impossible de lire la sortie de git log :" -#: gitk:1657 +#: gitk:1740 msgid "No commit information available" msgstr "Aucune information disponible sur le commit" -#: gitk:1793 gitk:1817 gitk:3916 gitk:8786 gitk:10322 gitk:10498 +#: gitk:1897 +msgid "mc" +msgstr "" + +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 msgid "OK" msgstr "OK" -#: gitk:1819 gitk:3918 gitk:8383 gitk:8457 gitk:8567 gitk:8616 gitk:8788 -#: gitk:10323 gitk:10499 +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 +#: gitk:11221 gitk:11501 msgid "Cancel" msgstr "Annuler" -#: gitk:1919 +#: gitk:2069 msgid "Update" msgstr "Mise à jour" -#: gitk:1920 +#: gitk:2070 msgid "Reload" msgstr "Recharger" -#: gitk:1921 +#: gitk:2071 msgid "Reread references" msgstr "Relire les références" -#: gitk:1922 +#: gitk:2072 msgid "List references" msgstr "Lister les références" -#: gitk:1924 +#: gitk:2074 msgid "Start git gui" msgstr "Démarrer git gui" -#: gitk:1926 +#: gitk:2076 msgid "Quit" msgstr "Quitter" -#: gitk:1918 +#: gitk:2068 msgid "File" msgstr "Fichier" -#: gitk:1930 +#: gitk:2080 msgid "Preferences" msgstr "Préférences" -#: gitk:1929 +#: gitk:2079 msgid "Edit" msgstr "Éditer" -#: gitk:1934 +#: gitk:2084 msgid "New view..." msgstr "Nouvelle vue..." -#: gitk:1935 +#: gitk:2085 msgid "Edit view..." msgstr "Éditer la vue..." -#: gitk:1936 +#: gitk:2086 msgid "Delete view" msgstr "Supprimer la vue" -#: gitk:1938 +#: gitk:2088 msgid "All files" msgstr "Tous les fichiers" -#: gitk:1933 gitk:3670 +#: gitk:2083 gitk:4050 msgid "View" msgstr "Vue" -#: gitk:1943 gitk:1953 gitk:2654 +#: gitk:2093 gitk:2103 gitk:3009 msgid "About gitk" msgstr "À propos de gitk" -#: gitk:1944 gitk:1958 +#: gitk:2094 gitk:2108 msgid "Key bindings" msgstr "Raccourcis clavier" -#: gitk:1942 gitk:1957 +#: gitk:2092 gitk:2107 msgid "Help" msgstr "Aide" -#: gitk:2018 -msgid "SHA1 ID: " -msgstr "ID SHA1 :" +#: gitk:2185 gitk:8633 +msgid "SHA1 ID:" +msgstr "Id SHA1 :" -#: gitk:2049 +#: gitk:2229 msgid "Row" msgstr "Colonne" -#: gitk:2080 +#: gitk:2267 msgid "Find" msgstr "Recherche" -#: gitk:2081 -msgid "next" -msgstr "suivant" - -#: gitk:2082 -msgid "prev" -msgstr "précédent" - -#: gitk:2083 +#: gitk:2295 msgid "commit" msgstr "commit" -#: gitk:2086 gitk:2088 gitk:4284 gitk:4307 gitk:4331 gitk:6272 gitk:6344 -#: gitk:6428 +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 +#: gitk:6893 msgid "containing:" msgstr "contient :" -#: gitk:2089 gitk:3162 gitk:3167 gitk:4359 +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 msgid "touching paths:" msgstr "chemins modifiés :" -#: gitk:2090 gitk:4364 +#: gitk:2303 gitk:4759 msgid "adding/removing string:" msgstr "ajoute/supprime la chaîne :" -#: gitk:2099 gitk:2101 +#: gitk:2304 gitk:4761 +msgid "changing lines matching:" +msgstr "" + +#: gitk:2313 gitk:2315 gitk:4748 msgid "Exact" msgstr "Exact" -#: gitk:2101 gitk:4439 gitk:6240 +#: gitk:2315 gitk:4836 gitk:6704 msgid "IgnCase" msgstr "Ignorer la casse" -#: gitk:2101 gitk:4333 gitk:4437 gitk:6236 +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 msgid "Regexp" msgstr "Expression régulière" -#: gitk:2103 gitk:2104 gitk:4458 gitk:4488 gitk:4495 gitk:6364 gitk:6432 +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 msgid "All fields" msgstr "Tous les champs" -#: gitk:2104 gitk:4456 gitk:4488 gitk:6303 +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 msgid "Headline" msgstr "Surligner" -#: gitk:2105 gitk:4456 gitk:6303 gitk:6432 gitk:6866 +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 msgid "Comments" msgstr "Commentaires" -#: gitk:2105 gitk:4456 gitk:4460 gitk:4495 gitk:6303 gitk:6801 gitk:8063 -#: gitk:8078 +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 +#: gitk:8826 msgid "Author" msgstr "Auteur" -#: gitk:2105 gitk:4456 gitk:6303 gitk:6803 +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 msgid "Committer" msgstr "Auteur du commit" -#: gitk:2134 +#: gitk:2350 msgid "Search" msgstr "Rechercher" -#: gitk:2141 +#: gitk:2358 msgid "Diff" msgstr "Diff" -#: gitk:2143 +#: gitk:2360 msgid "Old version" msgstr "Ancienne version" -#: gitk:2145 +#: gitk:2362 msgid "New version" msgstr "Nouvelle version" -#: gitk:2147 +#: gitk:2364 msgid "Lines of context" msgstr "Lignes de contexte" -#: gitk:2157 +#: gitk:2374 msgid "Ignore space change" msgstr "Ignorer les modifications d'espace" -#: gitk:2215 +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +msgid "Line diff" +msgstr "" + +#: gitk:2445 msgid "Patch" msgstr "Patch" -#: gitk:2217 +#: gitk:2447 msgid "Tree" msgstr "Arbre" -#: gitk:2361 gitk:2378 +#: gitk:2616 gitk:2636 msgid "Diff this -> selected" msgstr "Diff entre ceci et la sélection" -#: gitk:2362 gitk:2379 +#: gitk:2617 gitk:2637 msgid "Diff selected -> this" msgstr "Diff entre sélection et ceci" -#: gitk:2363 gitk:2380 +#: gitk:2618 gitk:2638 msgid "Make patch" msgstr "Créer patch" -#: gitk:2364 gitk:8441 +#: gitk:2619 gitk:9235 msgid "Create tag" msgstr "Créer tag" -#: gitk:2365 gitk:8547 +#: gitk:2620 gitk:9352 msgid "Write commit to file" msgstr "Écrire le commit dans un fichier" -#: gitk:2366 gitk:8604 +#: gitk:2621 gitk:9409 msgid "Create new branch" msgstr "Créer une nouvelle branche" -#: gitk:2367 +#: gitk:2622 msgid "Cherry-pick this commit" msgstr "Cueillir (cherry-pick) ce commit" -#: gitk:2368 +#: gitk:2623 msgid "Reset HEAD branch to here" msgstr "Réinitialiser la branche HEAD vers cet état" -#: gitk:2369 +#: gitk:2624 msgid "Mark this commit" msgstr "Marquer ce commit" -#: gitk:2370 +#: gitk:2625 msgid "Return to mark" msgstr "Retourner à la marque" -#: gitk:2371 +#: gitk:2626 msgid "Find descendant of this and mark" msgstr "Chercher le descendant de ceci et le marquer" -#: gitk:2372 +#: gitk:2627 msgid "Compare with marked commit" msgstr "Comparer avec le commit marqué" -#: gitk:2386 +#: gitk:2628 gitk:2639 +#, fuzzy +msgid "Diff this -> marked commit" +msgstr "Diff entre ceci et la sélection" + +#: gitk:2629 gitk:2640 +#, fuzzy +msgid "Diff marked commit -> this" +msgstr "Diff entre sélection et ceci" + +#: gitk:2630 +#, fuzzy +msgid "Revert this commit" +msgstr "Marquer ce commit" + +#: gitk:2646 msgid "Check out this branch" msgstr "Récupérer cette branche" -#: gitk:2387 +#: gitk:2647 msgid "Remove this branch" msgstr "Supprimer cette branche" -#: gitk:2394 +#: gitk:2654 msgid "Highlight this too" msgstr "Surligner également ceci" -#: gitk:2395 +#: gitk:2655 msgid "Highlight this only" msgstr "Surligner seulement ceci" -#: gitk:2396 +#: gitk:2656 msgid "External diff" msgstr "Diff externe" -#: gitk:2397 +#: gitk:2657 msgid "Blame parent commit" msgstr "Blâmer le commit parent" -#: gitk:2404 +#: gitk:2664 msgid "Show origin of this line" msgstr "Montrer l'origine de cette ligne" -#: gitk:2405 +#: gitk:2665 msgid "Run git gui blame on this line" msgstr "Exécuter git gui blame sur cette ligne" -#: gitk:2656 +#: gitk:3011 +#, fuzzy msgid "" "\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" +"Copyright © 2005-2014 Paul Mackerras\n" "\n" "Use and redistribute under the terms of the GNU General Public License" msgstr "" @@ -346,299 +375,317 @@ msgstr "" "Utilisation et redistribution soumises aux termes de la GNU General Public " "License" -#: gitk:2664 gitk:2726 gitk:8969 +#: gitk:3019 gitk:3085 gitk:9836 msgid "Close" msgstr "Fermer" -#: gitk:2683 +#: gitk:3040 msgid "Gitk key bindings" msgstr "Raccourcis clavier de Gitk" -#: gitk:2686 +#: gitk:3043 msgid "Gitk key bindings:" msgstr "Raccourcis clavier de Gitk :" -#: gitk:2688 +#: gitk:3045 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tQuitter" -#: gitk:2689 +#: gitk:3046 +#, fuzzy, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-F>\t\tRechercher" + +#: gitk:3047 msgid "<Home>\t\tMove to first commit" msgstr "<Début>\t\tAller au premier commit" -#: gitk:2690 +#: gitk:3048 msgid "<End>\t\tMove to last commit" msgstr "<Fin>\t\tAller au dernier commit" -#: gitk:2691 -msgid "<Up>, p, i\tMove up one commit" +#: gitk:3049 +#, fuzzy +msgid "<Up>, p, k\tMove up one commit" msgstr "<Haut>, p, i\t Aller au commit suivant" -#: gitk:2692 -msgid "<Down>, n, k\tMove down one commit" +#: gitk:3050 +#, fuzzy +msgid "<Down>, n, j\tMove down one commit" msgstr "<Bas>, n, k\t Aller au commit précédent" -#: gitk:2693 -msgid "<Left>, z, j\tGo back in history list" +#: gitk:3051 +#, fuzzy +msgid "<Left>, z, h\tGo back in history list" msgstr "<Gauche>, z, j\tReculer dans l'historique" -#: gitk:2694 +#: gitk:3052 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Droite>, x, l\tAvancer dans l'historique" -#: gitk:2695 +#: gitk:3053 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "" + +#: gitk:3054 msgid "<PageUp>\tMove up one page in commit list" msgstr "<PageUp>\tMonter d'une page dans la liste des commits" -#: gitk:2696 +#: gitk:3055 msgid "<PageDown>\tMove down one page in commit list" msgstr "<PageDown>\tDescendre d'une page dans la liste des commits" -#: gitk:2697 +#: gitk:3056 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Début>\tAller en haut de la liste des commits" -#: gitk:2698 +#: gitk:3057 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tAller en bas de la liste des commits" -#: gitk:2699 +#: gitk:3058 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Up>\tMonter d'une ligne dans la liste des commits" -#: gitk:2700 +#: gitk:3059 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Down>\tDescendre d'une ligne dans la liste des commits" -#: gitk:2701 +#: gitk:3060 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tMonter d'une page dans la liste des commits" -#: gitk:2702 +#: gitk:3061 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tDescendre d'une page dans la liste des commits" -#: gitk:2703 +#: gitk:3062 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" msgstr "" "<Shift-Up>\tRecherche en arrière (vers l'avant, commits les plus anciens)" -#: gitk:2704 +#: gitk:3063 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" msgstr "" "<Shift-Down>\tRecherche en avant (vers l'arrière, commit les plus récents)" -#: gitk:2705 +#: gitk:3064 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Supprimer>, b\tMonter d'une page dans la vue des diff" -#: gitk:2706 +#: gitk:3065 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Backspace>\tMonter d'une page dans la vue des diff" -#: gitk:2707 +#: gitk:3066 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Espace>\t\tDescendre d'une page dans la vue des diff" -#: gitk:2708 +#: gitk:3067 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tMonter de 18 lignes dans la vue des diff" -#: gitk:2709 +#: gitk:3068 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tDescendre de 18 lignes dans la vue des diff" -#: gitk:2710 +#: gitk:3069 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tRechercher" -#: gitk:2711 +#: gitk:3070 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tAller au résultat de recherche suivant" -#: gitk:2712 +#: gitk:3071 msgid "<Return>\tMove to next find hit" msgstr "<Return>\t\tAller au résultat de recherche suivant" -#: gitk:2713 +#: gitk:3072 msgid "/\t\tFocus the search box" msgstr "/\t\tFocus sur la zone de recherche" -#: gitk:2714 +#: gitk:3073 msgid "?\t\tMove to previous find hit" msgstr "?\t\tAller au résultat de recherche précédent" -#: gitk:2715 +#: gitk:3074 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tAller au prochain fichier dans la vue des diff" -#: gitk:2716 +#: gitk:3075 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tAller au résultat suivant dans la vue des diff" -#: gitk:2717 +#: gitk:3076 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tAller au résultat précédent dans la vue des diff" -#: gitk:2718 +#: gitk:3077 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tAugmenter la taille de la police" -#: gitk:2719 +#: gitk:3078 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tAugmenter la taille de la police" -#: gitk:2720 +#: gitk:3079 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tDiminuer la taille de la police" -#: gitk:2721 +#: gitk:3080 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tDiminuer la taille de la police" -#: gitk:2722 +#: gitk:3081 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tMise à jour" -#: gitk:3177 -#, tcl-format -msgid "Error getting \"%s\" from %s:" -msgstr "Erreur en obtenant \"%s\" de %s:" - -#: gitk:3234 gitk:3243 +#: gitk:3546 gitk:3555 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Erreur lors de la création du répertoire temporaire %s :" -#: gitk:3255 +#: gitk:3568 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Erreur en obtenant \"%s\" de %s:" + +#: gitk:3631 msgid "command failed:" msgstr "échec de la commande :" -#: gitk:3401 +#: gitk:3780 msgid "No such commit" msgstr "Commit inexistant" -#: gitk:3415 +#: gitk:3794 msgid "git gui blame: command failed:" msgstr "git gui blame : échec de la commande :" -#: gitk:3446 +#: gitk:3825 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Impossible de lire le head de la fusion : %s" -#: gitk:3454 +#: gitk:3833 #, tcl-format msgid "Error reading index: %s" msgstr "Erreur à la lecture de l'index : %s" -#: gitk:3479 +#: gitk:3858 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Impossible de démarrer git blame : %s" -#: gitk:3482 gitk:6271 +#: gitk:3861 gitk:6735 msgid "Searching" msgstr "Recherche en cours" -#: gitk:3514 +#: gitk:3893 #, tcl-format msgid "Error running git blame: %s" msgstr "Erreur à l'exécution de git blame : %s" -#: gitk:3542 +#: gitk:3921 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "Cette ligne est issue du commit %s, qui n'est pas dans cette vue" -#: gitk:3556 +#: gitk:3935 msgid "External diff viewer failed:" msgstr "Échec de l'outil externe de visualisation des diff" -#: gitk:3674 +#: gitk:4053 msgid "Gitk view definition" msgstr "Définition des vues de Gitk" -#: gitk:3678 +#: gitk:4057 msgid "Remember this view" msgstr "Se souvenir de cette vue" -#: gitk:3679 +#: gitk:4058 msgid "References (space separated list):" msgstr "Références (liste d'éléments séparés par des espaces) :" -#: gitk:3680 +#: gitk:4059 msgid "Branches & tags:" msgstr "Branches & tags :" -#: gitk:3681 +#: gitk:4060 msgid "All refs" msgstr "Toutes les références" -#: gitk:3682 +#: gitk:4061 msgid "All (local) branches" msgstr "Toutes les branches (locales)" -#: gitk:3683 +#: gitk:4062 msgid "All tags" msgstr "Tous les tags" -#: gitk:3684 +#: gitk:4063 msgid "All remote-tracking branches" msgstr "Toutes les branches de suivi à distance" -#: gitk:3685 +#: gitk:4064 msgid "Commit Info (regular expressions):" msgstr "Info sur les commits (expressions régulières) :" -#: gitk:3686 +#: gitk:4065 msgid "Author:" msgstr "Auteur :" -#: gitk:3687 +#: gitk:4066 msgid "Committer:" msgstr "Commiteur :" -#: gitk:3688 +#: gitk:4067 msgid "Commit Message:" msgstr "Message de commit :" -#: gitk:3689 +#: gitk:4068 msgid "Matches all Commit Info criteria" msgstr "Correspond à tous les critères d'Info sur les commits" -#: gitk:3690 +#: gitk:4069 +#, fuzzy +msgid "Matches none Commit Info criteria" +msgstr "Correspond à tous les critères d'Info sur les commits" + +#: gitk:4070 msgid "Changes to Files:" msgstr "Changements des fichiers :" -#: gitk:3691 +#: gitk:4071 msgid "Fixed String" msgstr "Chaîne Figée" -#: gitk:3692 +#: gitk:4072 msgid "Regular Expression" msgstr "Expression Régulière" -#: gitk:3693 +#: gitk:4073 msgid "Search string:" msgstr "Recherche de la chaîne :" -#: gitk:3694 +#: gitk:4074 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -646,207 +693,204 @@ msgstr "" "Dates des commits (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, " "2009 15:27:38\") :" -#: gitk:3695 +#: gitk:4075 msgid "Since:" msgstr "De :" -#: gitk:3696 +#: gitk:4076 msgid "Until:" msgstr "Jusqu'au :" -#: gitk:3697 +#: gitk:4077 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "Limiter et/ou sauter un certain nombre (entier positif) de révisions :" -#: gitk:3698 +#: gitk:4078 msgid "Number to show:" msgstr "Nombre à afficher :" -#: gitk:3699 +#: gitk:4079 msgid "Number to skip:" msgstr "Nombre à sauter :" -#: gitk:3700 +#: gitk:4080 msgid "Miscellaneous options:" msgstr "Options diverses :" -#: gitk:3701 +#: gitk:4081 msgid "Strictly sort by date" msgstr "Trier par date" # FIXME : traduction de "branch sides" -#: gitk:3702 +#: gitk:4082 #, fuzzy msgid "Mark branch sides" msgstr "Marquer les extrémités des branches" -#: gitk:3703 +#: gitk:4083 msgid "Limit to first parent" msgstr "Limiter au premier ancêtre" -#: gitk:3704 +#: gitk:4084 msgid "Simple history" msgstr "Historique simple" -#: gitk:3705 +#: gitk:4085 msgid "Additional arguments to git log:" msgstr "Arguments supplémentaires de git log :" -#: gitk:3706 +#: gitk:4086 msgid "Enter files and directories to include, one per line:" msgstr "Saisir les fichiers et répertoires à inclure, un par ligne :" -#: gitk:3707 +#: gitk:4087 msgid "Command to generate more commits to include:" msgstr "Commande pour générer plus de commits à inclure :" -#: gitk:3829 +#: gitk:4211 msgid "Gitk: edit view" msgstr "Gitk : éditer la vue" -#: gitk:3837 +#: gitk:4219 msgid "-- criteria for selecting revisions" msgstr "-- critère pour la sélection des révisions" -#: gitk:3842 -msgid "View Name:" +#: gitk:4224 +#, fuzzy +msgid "View Name" msgstr "Nom de la vue :" -#: gitk:3917 +#: gitk:4299 msgid "Apply (F5)" msgstr "Appliquer (F5)" -#: gitk:3955 +#: gitk:4337 msgid "Error in commit selection arguments:" msgstr "Erreur dans les arguments de sélection des commits :" -#: gitk:4008 gitk:4060 gitk:4508 gitk:4522 gitk:5783 gitk:11196 gitk:11197 +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 msgid "None" msgstr "Aucun" -#: gitk:4456 gitk:6303 gitk:8065 gitk:8080 -msgid "Date" -msgstr "Date" - -#: gitk:4456 gitk:6303 -msgid "CDate" -msgstr "CDate" - -#: gitk:4605 gitk:4610 +#: gitk:5003 gitk:5008 msgid "Descendant" msgstr "Descendant" -#: gitk:4606 +#: gitk:5004 msgid "Not descendant" msgstr "Pas un descendant" -#: gitk:4613 gitk:4618 +#: gitk:5011 gitk:5016 msgid "Ancestor" msgstr "Ancêtre" -#: gitk:4614 +#: gitk:5012 msgid "Not ancestor" msgstr "Pas un ancêtre" -#: gitk:4904 +#: gitk:5306 msgid "Local changes checked in to index but not committed" msgstr "Modifications locales enregistrées dans l'index mais non commitées" -#: gitk:4940 +#: gitk:5342 msgid "Local uncommitted changes, not checked in to index" msgstr "Modifications locales non enregistrées dans l'index et non commitées" -#: gitk:6621 +#: gitk:7115 +msgid "and many more" +msgstr "" + +#: gitk:7118 msgid "many" msgstr "nombreux" -#: gitk:6805 +#: gitk:7309 msgid "Tags:" msgstr "Tags :" -#: gitk:6822 gitk:6828 gitk:8058 +#: gitk:7326 gitk:7332 gitk:8806 msgid "Parent" msgstr "Parent" -#: gitk:6833 +#: gitk:7337 msgid "Child" msgstr "Enfant" -#: gitk:6842 +#: gitk:7346 msgid "Branch" msgstr "Branche" -#: gitk:6845 +#: gitk:7349 msgid "Follows" msgstr "Suit" -#: gitk:6848 +#: gitk:7352 msgid "Precedes" msgstr "Précède" -#: gitk:7346 +#: gitk:7947 #, tcl-format msgid "Error getting diffs: %s" msgstr "Erreur lors de la récupération des diff : %s" -#: gitk:7886 +#: gitk:8631 msgid "Goto:" msgstr "Aller à :" -#: gitk:7888 -msgid "SHA1 ID:" -msgstr "Id SHA1 :" - -#: gitk:7907 +#: gitk:8652 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "Id SHA1 court %s est ambigu" -#: gitk:7914 +#: gitk:8659 #, tcl-format msgid "Revision %s is not known" msgstr "Id SHA1 %s est inconnu" -#: gitk:7924 +#: gitk:8669 #, tcl-format msgid "SHA1 id %s is not known" msgstr "Id SHA1 %s est inconnu" -#: gitk:7926 +#: gitk:8671 #, tcl-format msgid "Revision %s is not in the current view" msgstr "La révision %s n'est pas dans la vue courante" -#: gitk:8068 +#: gitk:8813 gitk:8828 +msgid "Date" +msgstr "Date" + +#: gitk:8816 msgid "Children" msgstr "Enfants" -#: gitk:8125 +#: gitk:8879 #, tcl-format msgid "Reset %s branch to here" msgstr "Réinitialiser la branche %s vers cet état" -#: gitk:8127 +#: gitk:8881 msgid "Detached head: can't reset" msgstr "Head détaché : impossible de réinitialiser" -#: gitk:8236 gitk:8242 +#: gitk:8986 gitk:8992 msgid "Skipping merge commit " msgstr "Éviter le commit de la fusion " -#: gitk:8251 gitk:8256 +#: gitk:9001 gitk:9006 msgid "Error getting patch ID for " msgstr "Erreur à l'obtention de l'ID du patch pour " -#: gitk:8252 gitk:8257 +#: gitk:9002 gitk:9007 msgid " - stopping\n" msgstr " - arrêt en cours\n" -#: gitk:8262 gitk:8265 gitk:8273 gitk:8283 gitk:8292 +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 msgid "Commit " msgstr "Commit " -#: gitk:8266 +#: gitk:9016 msgid "" " is the same patch as\n" " " @@ -854,7 +898,7 @@ msgstr "" "est le même patch que \n" " " -#: gitk:8274 +#: gitk:9024 msgid "" " differs from\n" " " @@ -862,117 +906,138 @@ msgstr "" " diffère de\n" " " -#: gitk:8276 -msgid "- stopping\n" -msgstr "- arrêt en cours\n" +#: gitk:9026 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "" -#: gitk:8284 gitk:8293 +#: gitk:9038 gitk:9047 #, tcl-format msgid " has %s children - stopping\n" msgstr "a %s enfants - arrêt en cours\n" -#: gitk:8324 +#: gitk:9066 +#, fuzzy, tcl-format +msgid "Error writing commit to file: %s" +msgstr "Erreur à l'ecriture du commit :" + +#: gitk:9072 +#, fuzzy, tcl-format +msgid "Error diffing commits: %s" +msgstr "Erreur à l'ecriture du commit :" + +#: gitk:9118 msgid "Top" msgstr "Haut" -#: gitk:8325 +#: gitk:9119 msgid "From" msgstr "De" -#: gitk:8330 +#: gitk:9124 msgid "To" msgstr "À" -#: gitk:8354 +#: gitk:9148 msgid "Generate patch" msgstr "Générer le patch" -#: gitk:8356 +#: gitk:9150 msgid "From:" msgstr "De :" -#: gitk:8365 +#: gitk:9159 msgid "To:" msgstr "À :" -#: gitk:8374 +#: gitk:9168 msgid "Reverse" msgstr "Inverser" -#: gitk:8376 gitk:8561 +#: gitk:9170 gitk:9366 msgid "Output file:" msgstr "Fichier de sortie :" -#: gitk:8382 +#: gitk:9176 msgid "Generate" msgstr "Générer" -#: gitk:8420 +#: gitk:9214 msgid "Error creating patch:" msgstr "Erreur à la création du patch :" -#: gitk:8443 gitk:8549 gitk:8606 +#: gitk:9237 gitk:9354 gitk:9411 msgid "ID:" msgstr "ID :" -#: gitk:8452 +#: gitk:9246 msgid "Tag name:" msgstr "Nom du Tag :" -#: gitk:8456 gitk:8615 +#: gitk:9249 +msgid "Tag message is optional" +msgstr "" + +#: gitk:9251 +#, fuzzy +msgid "Tag message:" +msgstr "Nom du Tag :" + +#: gitk:9255 gitk:9420 msgid "Create" msgstr "Créer" -#: gitk:8473 +#: gitk:9273 msgid "No tag name specified" msgstr "Aucun nom de tag spécifié" -#: gitk:8477 +#: gitk:9277 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Le tag \"%s\" existe déjà " -#: gitk:8483 +#: gitk:9287 msgid "Error creating tag:" msgstr "Erreur à la création du tag :" -#: gitk:8558 +#: gitk:9363 msgid "Command:" msgstr "Commande :" -#: gitk:8566 +#: gitk:9371 msgid "Write" msgstr "Écrire" -#: gitk:8584 +#: gitk:9389 msgid "Error writing commit:" msgstr "Erreur à l'ecriture du commit :" -#: gitk:8611 +#: gitk:9416 msgid "Name:" msgstr "Nom :" -#: gitk:8634 +#: gitk:9439 msgid "Please specify a name for the new branch" msgstr "Veuillez spécifier un nom pour la nouvelle branche" -#: gitk:8639 +#: gitk:9444 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "La branche '%s' existe déjà . Écraser?" -#: gitk:8705 +#: gitk:9511 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "" "Le Commit %s est déjà inclus dans la branche %s -- le ré-appliquer malgré " "tout?" -#: gitk:8710 +#: gitk:9516 msgid "Cherry-picking" msgstr "Cueillir (Cherry-picking)" -#: gitk:8719 +#: gitk:9525 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -983,7 +1048,7 @@ msgstr "" "Veuillez commiter, réinitialiser ou stasher vos changements et essayer de " "nouveau." -#: gitk:8725 +#: gitk:9531 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -992,34 +1057,67 @@ msgstr "" "fusion.\n" "Souhaitez-vous exécuter git citool pour le résoudre ?" -#: gitk:8741 +#: gitk:9547 gitk:9605 msgid "No changes committed" msgstr "Aucun changement commité" -#: gitk:8767 +#: gitk:9574 +#, fuzzy, tcl-format +msgid "Commit %s is not included in branch %s -- really revert it?" +msgstr "" +"Le Commit %s est déjà inclus dans la branche %s -- le ré-appliquer malgré " +"tout?" + +#: gitk:9579 +#, fuzzy +msgid "Reverting" +msgstr "Réinitialisation" + +#: gitk:9587 +#, fuzzy, tcl-format +msgid "" +"Revert failed because of local changes to the following files:%s Please " +"commit, reset or stash your changes and try again." +msgstr "" +"La cueillette (cherry-pick) a échouée à cause de modifications locales du " +"fichier '%s'.\n" +"Veuillez commiter, réinitialiser ou stasher vos changements et essayer de " +"nouveau." + +#: gitk:9591 +#, fuzzy +msgid "" +"Revert failed because of merge conflict.\n" +" Do you wish to run git citool to resolve it?" +msgstr "" +"La cueillette (cherry-pick) a échouée à cause d'un conflit lors d'une " +"fusion.\n" +"Souhaitez-vous exécuter git citool pour le résoudre ?" + +#: gitk:9634 msgid "Confirm reset" msgstr "Confirmer la réinitialisation" -#: gitk:8769 +#: gitk:9636 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Réinitialiser la branche %s à %s?" -#: gitk:8773 +#: gitk:9638 msgid "Reset type:" msgstr "Type de réinitialisation :" -#: gitk:8777 +#: gitk:9641 msgid "Soft: Leave working tree and index untouched" msgstr "Douce : Laisse le répertoire de travail et l'index intacts" -#: gitk:8780 +#: gitk:9644 msgid "Mixed: Leave working tree untouched, reset index" msgstr "" "Hybride : Laisse le répertoire de travail dans son état courant, " "réinitialise l'index" -#: gitk:8783 +#: gitk:9647 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1027,21 +1125,21 @@ msgstr "" "Dure : Réinitialise le répertoire de travail et l'index\n" "(abandonne TOUS les changements locaux)" -#: gitk:8800 +#: gitk:9664 msgid "Resetting" msgstr "Réinitialisation" # Fixme: Récupération est-il vraiment une mauvaise traduction? -#: gitk:8857 +#: gitk:9724 #, fuzzy msgid "Checking out" msgstr "Récupération" -#: gitk:8910 +#: gitk:9777 msgid "Cannot delete the currently checked-out branch" msgstr "Impossible de supprimer la branche en cours" -#: gitk:8916 +#: gitk:9783 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1050,16 +1148,16 @@ msgstr "" "Les commits de la branche %s ne sont dans aucune autre branche.\n" "Voulez-vous vraiment supprimer cette branche %s ?" -#: gitk:8947 +#: gitk:9814 #, tcl-format msgid "Tags and heads: %s" msgstr "Tags et heads : %s" -#: gitk:8962 +#: gitk:9829 msgid "Filter" msgstr "Filtrer" -#: gitk:9257 +#: gitk:10125 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1068,187 +1166,244 @@ msgstr "" "informations sur les branches et les tags précédents/suivants seront " "incomplètes." -#: gitk:10243 +#: gitk:11102 msgid "Tag" msgstr "Tag" -#: gitk:10243 +#: gitk:11106 msgid "Id" msgstr "Id" -#: gitk:10291 +#: gitk:11189 msgid "Gitk font chooser" msgstr "Sélecteur de police de Gitk" -#: gitk:10308 +#: gitk:11206 msgid "B" msgstr "B" -#: gitk:10311 +#: gitk:11209 msgid "I" msgstr "I" -#: gitk:10407 -msgid "Gitk preferences" -msgstr "Préférences de Gitk" - -#: gitk:10409 +#: gitk:11327 msgid "Commit list display options" msgstr "Options d'affichage de la liste des commits" -#: gitk:10412 +#: gitk:11330 msgid "Maximum graph width (lines)" msgstr "Longueur maximum du graphe (lignes)" # FIXME : Traduction standard de "pane"? -#: gitk:10416 -#, fuzzy, tcl-format +#: gitk:11334 +#, fuzzy, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Longueur maximum du graphe (% du panneau)" -#: gitk:10420 +#: gitk:11337 msgid "Show local changes" msgstr "Montrer les changements locaux" -#: gitk:10423 -msgid "Auto-select SHA1" +#: gitk:11340 +#, fuzzy +msgid "Auto-select SHA1 (length)" msgstr "Sélection auto. du SHA1" -#: gitk:10427 +#: gitk:11344 +msgid "Hide remote refs" +msgstr "Cacher les refs distantes" + +#: gitk:11348 msgid "Diff display options" msgstr "Options d'affichage des diff" -#: gitk:10429 +#: gitk:11350 msgid "Tab spacing" msgstr "Taille des tabulations" -#: gitk:10432 -msgid "Display nearby tags" +#: gitk:11353 +#, fuzzy +msgid "Display nearby tags/heads" msgstr "Afficher les tags les plus proches" -#: gitk:10435 -msgid "Hide remote refs" -msgstr "Cacher les refs distantes" +#: gitk:11356 +msgid "Maximum # tags/heads to show" +msgstr "" -#: gitk:10438 +#: gitk:11359 msgid "Limit diffs to listed paths" msgstr "Limiter les différences aux chemins listés" -#: gitk:10441 +#: gitk:11362 msgid "Support per-file encodings" msgstr "Support pour un encodage des caractères par fichier" -#: gitk:10447 gitk:10512 +#: gitk:11368 gitk:11515 msgid "External diff tool" msgstr "Outil diff externe" -#: gitk:10449 +#: gitk:11369 msgid "Choose..." msgstr "Choisir..." -#: gitk:10454 +#: gitk:11374 +#, fuzzy +msgid "General options" +msgstr "Générer le patch" + +#: gitk:11377 +msgid "Use themed widgets" +msgstr "" + +#: gitk:11379 +msgid "(change requires restart)" +msgstr "" + +#: gitk:11381 +msgid "(currently unavailable)" +msgstr "" + +#: gitk:11392 msgid "Colors: press to choose" msgstr "Couleurs : cliquer pour choisir" -#: gitk:10457 +#: gitk:11395 +msgid "Interface" +msgstr "" + +#: gitk:11396 +#, fuzzy +msgid "interface" +msgstr "Police de l'interface utilisateur" + +#: gitk:11399 msgid "Background" msgstr "Arrière-plan" -#: gitk:10458 gitk:10488 +#: gitk:11400 gitk:11430 msgid "background" msgstr "arrière-plan" -#: gitk:10461 +#: gitk:11403 msgid "Foreground" msgstr "Premier plan" -#: gitk:10462 +#: gitk:11404 msgid "foreground" msgstr "premier plan" -#: gitk:10465 +#: gitk:11407 msgid "Diff: old lines" msgstr "Diff : anciennes lignes" -#: gitk:10466 +#: gitk:11408 msgid "diff old lines" msgstr "diff anciennes lignes" -#: gitk:10470 +#: gitk:11412 msgid "Diff: new lines" msgstr "Diff : nouvelles lignes" -#: gitk:10471 +#: gitk:11413 msgid "diff new lines" msgstr "diff nouvelles lignes" -#: gitk:10475 +#: gitk:11417 msgid "Diff: hunk header" msgstr "Diff : entête du hunk" -#: gitk:10477 +#: gitk:11419 msgid "diff hunk header" msgstr "diff : entête du hunk" -#: gitk:10481 +#: gitk:11423 msgid "Marked line bg" msgstr "Arrière-plan de la ligne marquée" -#: gitk:10483 +#: gitk:11425 msgid "marked line background" msgstr "Arrière-plan de la ligne marquée" -#: gitk:10487 +#: gitk:11429 msgid "Select bg" msgstr "Sélectionner l'arrière-plan" -#: gitk:10491 +#: gitk:11438 msgid "Fonts: press to choose" msgstr "Polices : cliquer pour choisir" -#: gitk:10493 +#: gitk:11440 msgid "Main font" msgstr "Police principale" -#: gitk:10494 +#: gitk:11441 msgid "Diff display font" msgstr "Police d'affichage des diff" -#: gitk:10495 +#: gitk:11442 msgid "User interface font" msgstr "Police de l'interface utilisateur" -#: gitk:10522 +#: gitk:11464 +msgid "Gitk preferences" +msgstr "Préférences de Gitk" + +#: gitk:11473 +#, fuzzy +msgid "General" +msgstr "Générer" + +#: gitk:11474 +msgid "Colors" +msgstr "" + +#: gitk:11475 +msgid "Fonts" +msgstr "" + +#: gitk:11525 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk : choisir la couleur de %s" -#: gitk:10973 -msgid "" -"Sorry, gitk cannot run with this version of Tcl/Tk.\n" -" Gitk requires at least Tcl/Tk 8.4." -msgstr "" -"Désolé, gitk ne peut être exécuté avec cette version de Tcl/Tk.\n" -" Gitk requiert Tcl/Tk version 8.4 ou supérieur." - -#: gitk:11101 +#: gitk:12242 msgid "Cannot find a git repository here." msgstr "Impossible de trouver un dépôt git ici." -#: gitk:11105 -#, tcl-format -msgid "Cannot find the git directory \"%s\"." -msgstr "Impossible de trouver le répertoire git \"%s\"." - -#: gitk:11152 +#: gitk:12289 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Argument '%s' ambigu : à la fois une révision et un nom de fichier" -#: gitk:11164 +#: gitk:12301 msgid "Bad arguments to gitk:" msgstr "Arguments invalides pour gitk :" -#: gitk:11249 +#: gitk:12405 msgid "Command line" msgstr "Ligne de commande" + +#~ msgid "SHA1 ID: " +#~ msgstr "ID SHA1 :" + +#~ msgid "next" +#~ msgstr "suivant" + +#~ msgid "prev" +#~ msgstr "précédent" + +#~ msgid "CDate" +#~ msgstr "CDate" + +#~ msgid "- stopping\n" +#~ msgstr "- arrêt en cours\n" + +#~ msgid "" +#~ "Sorry, gitk cannot run with this version of Tcl/Tk.\n" +#~ " Gitk requires at least Tcl/Tk 8.4." +#~ msgstr "" +#~ "Désolé, gitk ne peut être exécuté avec cette version de Tcl/Tk.\n" +#~ " Gitk requiert Tcl/Tk version 8.4 ou supérieur." + +#~ msgid "Cannot find the git directory \"%s\"." +#~ msgstr "Impossible de trouver le répertoire git \"%s\"." diff --git a/gitk-git/po/hu.po b/gitk-git/po/hu.po index 7262b61..5e3e946 100644 --- a/gitk-git/po/hu.po +++ b/gitk-git/po/hu.po @@ -8,32 +8,41 @@ msgid "" msgstr "" "Project-Id-Version: git-gui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-14 13:33+0100\n" +"POT-Creation-Date: 2015-03-15 14:37+1100\n" "PO-Revision-Date: 2009-12-14 14:04+0100\n" "Last-Translator: Laszlo Papp <djszapi@archlinux.us>\n" "Language-Team: Hungarian\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: gitk:115 +#: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "Nem sikerült letölteni az unmerged fájl listát:" -#: gitk:271 +#: gitk:212 gitk:2381 +msgid "Color words" +msgstr "" + +#: gitk:217 gitk:2381 gitk:8201 gitk:8234 +msgid "Markup words" +msgstr "" + +#: gitk:324 msgid "Error parsing revisions:" msgstr "Hiba történt értelmezés közben:" -#: gitk:326 +#: gitk:380 msgid "Error executing --argscmd command:" msgstr "Hiba történt a végrehajtáskor --argscmd parancs:" -#: gitk:339 +#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "Nincsen fájl kiválasztva: --merge megadve, de egyetlen fájl sem unmerged." -#: gitk:342 +#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -41,299 +50,315 @@ msgstr "" "Nincsen fájl kiválasztva: --merge megadva, de nincsenek unmerged fájlok a " "fájlon belül limit." -#: gitk:364 gitk:511 +#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "Hiba történt a git log végrehajtása közben:" -#: gitk:382 gitk:527 +#: gitk:436 gitk:582 msgid "Reading" msgstr "Olvasás" -#: gitk:442 gitk:4258 +#: gitk:496 gitk:4508 msgid "Reading commits..." msgstr "Commitok olvasása ..." -#: gitk:445 gitk:1575 gitk:4261 +#: gitk:499 gitk:1637 gitk:4511 msgid "No commits selected" msgstr "Nincsen commit kiválasztva" -#: gitk:1451 +#: gitk:1511 msgid "Can't parse git log output:" msgstr "Nem lehet értelmezni a git log kimenetét:" -#: gitk:1671 +#: gitk:1740 msgid "No commit information available" msgstr "Nincsen elérhetÅ‘ commit információ" -#: gitk:1813 +#: gitk:1897 msgid "mc" msgstr "mc" -#: gitk:1848 gitk:4051 gitk:9029 gitk:10570 gitk:10789 +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 msgid "OK" msgstr "OK" -#: gitk:1850 gitk:4053 gitk:8629 gitk:8703 gitk:8813 gitk:8862 gitk:9031 -#: gitk:10571 gitk:10790 +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 +#: gitk:11221 gitk:11501 msgid "Cancel" msgstr "Visszavonás" -#: gitk:1972 +#: gitk:2069 msgid "Update" msgstr "Frissités" -#: gitk:1973 +#: gitk:2070 msgid "Reload" msgstr "Újratöltés" -#: gitk:1974 +#: gitk:2071 msgid "Reread references" msgstr "Referenciák újraolvasása" -#: gitk:1975 +#: gitk:2072 msgid "List references" msgstr "Referenciák listázása" -#: gitk:1977 +#: gitk:2074 msgid "Start git gui" msgstr "Git gui indÃtása" -#: gitk:1979 +#: gitk:2076 msgid "Quit" msgstr "Kilépés" -#: gitk:1971 +#: gitk:2068 msgid "File" msgstr "Fájl" -#: gitk:1983 +#: gitk:2080 msgid "Preferences" msgstr "BeállÃtások" -#: gitk:1982 +#: gitk:2079 msgid "Edit" msgstr "Szerkesztés" -#: gitk:1987 +#: gitk:2084 msgid "New view..." msgstr "Új nézet ..." -#: gitk:1988 +#: gitk:2085 msgid "Edit view..." msgstr "Nézet szerkesztése ..." -#: gitk:1989 +#: gitk:2086 msgid "Delete view" msgstr "Nézet törlése" -#: gitk:1991 +#: gitk:2088 msgid "All files" msgstr "Minden fájl" -#: gitk:1986 gitk:3805 +#: gitk:2083 gitk:4050 msgid "View" msgstr "Nézet" -#: gitk:1996 gitk:2006 gitk:2777 +#: gitk:2093 gitk:2103 gitk:3009 msgid "About gitk" msgstr "Gitk névjegy" -#: gitk:1997 gitk:2011 +#: gitk:2094 gitk:2108 msgid "Key bindings" msgstr "Billentyűkombináció" -#: gitk:1995 gitk:2010 +#: gitk:2092 gitk:2107 msgid "Help" msgstr "SegÃtség" -#: gitk:2088 -msgid "SHA1 ID: " -msgstr "SHA1 ID: " +#: gitk:2185 gitk:8633 +msgid "SHA1 ID:" +msgstr "SHA1 ID:" -#: gitk:2119 +#: gitk:2229 msgid "Row" msgstr "Sor" -#: gitk:2157 +#: gitk:2267 msgid "Find" msgstr "Keresés" -#: gitk:2158 -msgid "next" -msgstr "következÅ‘" - -#: gitk:2159 -msgid "prev" -msgstr "elÅ‘zÅ‘" - -#: gitk:2160 +#: gitk:2295 msgid "commit" msgstr "commit" -#: gitk:2163 gitk:2165 gitk:4419 gitk:4442 gitk:4466 gitk:6407 gitk:6479 -#: gitk:6563 +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 +#: gitk:6893 msgid "containing:" msgstr "tartalmazás:" -#: gitk:2166 gitk:3287 gitk:3292 gitk:4494 +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 msgid "touching paths:" msgstr "érintendÅ‘ útvonalak:" -#: gitk:2167 gitk:4499 +#: gitk:2303 gitk:4759 msgid "adding/removing string:" msgstr "string hozzáadása/törlése:" -#: gitk:2176 gitk:2178 +#: gitk:2304 gitk:4761 +msgid "changing lines matching:" +msgstr "" + +#: gitk:2313 gitk:2315 gitk:4748 msgid "Exact" msgstr "Pontos" -#: gitk:2178 gitk:4574 gitk:6375 +#: gitk:2315 gitk:4836 gitk:6704 msgid "IgnCase" msgstr "Kis/nagy betű nem számÃt" -#: gitk:2178 gitk:4468 gitk:4572 gitk:6371 +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 msgid "Regexp" msgstr "Regexp" -#: gitk:2180 gitk:2181 gitk:4593 gitk:4623 gitk:4630 gitk:6499 gitk:6567 +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 msgid "All fields" msgstr "Minden mezÅ‘" -#: gitk:2181 gitk:4591 gitk:4623 gitk:6438 +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 msgid "Headline" msgstr "FÅ‘cÃm" -#: gitk:2182 gitk:4591 gitk:6438 gitk:6567 gitk:7000 +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 msgid "Comments" msgstr "Megjegyzések" -#: gitk:2182 gitk:4591 gitk:4595 gitk:4630 gitk:6438 gitk:6935 gitk:8280 -#: gitk:8295 +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 +#: gitk:8826 msgid "Author" msgstr "SzerzÅ‘" -#: gitk:2182 gitk:4591 gitk:6438 gitk:6937 +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 msgid "Committer" msgstr "Commitoló" -#: gitk:2213 +#: gitk:2350 msgid "Search" msgstr "Keresés" -#: gitk:2221 +#: gitk:2358 msgid "Diff" msgstr "Diff" -#: gitk:2223 +#: gitk:2360 msgid "Old version" msgstr "Régi verzió" -#: gitk:2225 +#: gitk:2362 msgid "New version" msgstr "Új verzió" -#: gitk:2227 +#: gitk:2364 msgid "Lines of context" msgstr "Tartalmi sorok" -#: gitk:2237 +#: gitk:2374 msgid "Ignore space change" msgstr "Space váltás mellÅ‘zése" -#: gitk:2296 +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +msgid "Line diff" +msgstr "" + +#: gitk:2445 msgid "Patch" msgstr "Patch" -#: gitk:2298 +#: gitk:2447 msgid "Tree" msgstr "Tree" -#: gitk:2453 gitk:2470 +#: gitk:2616 gitk:2636 msgid "Diff this -> selected" msgstr "Diff ezeket -> kiválasztott" -#: gitk:2454 gitk:2471 +#: gitk:2617 gitk:2637 msgid "Diff selected -> this" msgstr "Diff kiválasztottakat -> ezt" -#: gitk:2455 gitk:2472 +#: gitk:2618 gitk:2638 msgid "Make patch" msgstr "Patch készÃtése" -#: gitk:2456 gitk:8687 +#: gitk:2619 gitk:9235 msgid "Create tag" msgstr "Tag készÃtése" -#: gitk:2457 gitk:8793 +#: gitk:2620 gitk:9352 msgid "Write commit to file" msgstr "Commit fáljba Ãrása" -#: gitk:2458 gitk:8850 +#: gitk:2621 gitk:9409 msgid "Create new branch" msgstr "Új branch készÃtése" -#: gitk:2459 +#: gitk:2622 msgid "Cherry-pick this commit" msgstr "Cherry-pick erre a commitra" -#: gitk:2460 +#: gitk:2623 msgid "Reset HEAD branch to here" msgstr "HEAD branch újraindÃtása ide" -#: gitk:2461 +#: gitk:2624 msgid "Mark this commit" msgstr "Ezen commit megjelölése" -#: gitk:2462 +#: gitk:2625 msgid "Return to mark" msgstr "Visszatérés a megjelöléshez" -#: gitk:2463 +#: gitk:2626 msgid "Find descendant of this and mark" msgstr "Találd meg ezen utódokat és jelöld meg" -#: gitk:2464 +#: gitk:2627 msgid "Compare with marked commit" msgstr "ÖsszehasonlÃtás a megjelölt commit-tal" -#: gitk:2478 +#: gitk:2628 gitk:2639 +#, fuzzy +msgid "Diff this -> marked commit" +msgstr "Diff ezeket -> kiválasztott" + +#: gitk:2629 gitk:2640 +#, fuzzy +msgid "Diff marked commit -> this" +msgstr "Diff kiválasztottakat -> ezt" + +#: gitk:2630 +#, fuzzy +msgid "Revert this commit" +msgstr "Ezen commit megjelölése" + +#: gitk:2646 msgid "Check out this branch" msgstr "Check out ezt a branchot" -#: gitk:2479 +#: gitk:2647 msgid "Remove this branch" msgstr "Töröld ezt a branch-ot" -#: gitk:2486 +#: gitk:2654 msgid "Highlight this too" msgstr "Emeld ki ezt is" -#: gitk:2487 +#: gitk:2655 msgid "Highlight this only" msgstr "Csak ezt emeld ki" -#: gitk:2488 +#: gitk:2656 msgid "External diff" msgstr "KülsÅ‘ diff" -#: gitk:2489 +#: gitk:2657 msgid "Blame parent commit" msgstr "Blame szülÅ‘ kommitra" -#: gitk:2496 +#: gitk:2664 msgid "Show origin of this line" msgstr "Mutasd meg ennek a sornak az eredetét" -#: gitk:2497 +#: gitk:2665 msgid "Run git gui blame on this line" msgstr "Futtasd a git gui blame-t ezen a soron" -#: gitk:2779 +#: gitk:3011 +#, fuzzy msgid "" "\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" +"Copyright © 2005-2014 Paul Mackerras\n" "\n" "Use and redistribute under the terms of the GNU General Public License" msgstr "" @@ -344,298 +369,316 @@ msgstr "" "\n" "Használd és terjeszd a GNU General Public License feltételei mellett" -#: gitk:2787 gitk:2851 gitk:9215 +#: gitk:3019 gitk:3085 gitk:9836 msgid "Close" msgstr "Bezárás" -#: gitk:2808 +#: gitk:3040 msgid "Gitk key bindings" msgstr "Gitk-billentyű hozzárendelés" -#: gitk:2811 +#: gitk:3043 msgid "Gitk key bindings:" msgstr "Gitk-billentyű hozzaárendelés:" -#: gitk:2813 +#: gitk:3045 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tKilépés" -#: gitk:2814 +#: gitk:3046 +#, fuzzy, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-F>\t\tKeresés" + +#: gitk:3047 msgid "<Home>\t\tMove to first commit" msgstr "<Pos1>\t\tElsÅ‘ commithoz" -#: gitk:2815 +#: gitk:3048 msgid "<End>\t\tMove to last commit" msgstr "<Ende>\t\tUtolsó commithoz" -#: gitk:2816 -msgid "<Up>, p, i\tMove up one commit" +#: gitk:3049 +#, fuzzy +msgid "<Up>, p, k\tMove up one commit" msgstr "<Hoch>, p, i\tEgy committal feljebb" -#: gitk:2817 -msgid "<Down>, n, k\tMove down one commit" +#: gitk:3050 +#, fuzzy +msgid "<Down>, n, j\tMove down one commit" msgstr "<Runter>, n, k\tEgy committal lejjebb" -#: gitk:2818 -msgid "<Left>, z, j\tGo back in history list" +#: gitk:3051 +#, fuzzy +msgid "<Left>, z, h\tGo back in history list" msgstr "<Links>, z, j\tVissza a history listába" -#: gitk:2819 +#: gitk:3052 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Rechts>, x, l\tElÅ‘re a history listába" -#: gitk:2820 +#: gitk:3053 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "" + +#: gitk:3054 msgid "<PageUp>\tMove up one page in commit list" msgstr "<BildHoch>\tEgy lappal feljebb a commit listába" -#: gitk:2821 +#: gitk:3055 msgid "<PageDown>\tMove down one page in commit list" msgstr "<BildRunter>\tEgy lappal lejjebb a commit listába" -#: gitk:2822 +#: gitk:3056 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Pos1>\tGörgetés a commit lista tetejéhez" -#: gitk:2823 +#: gitk:3057 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-Ende>\tGörgetés a commit lista aljához" -#: gitk:2824 +#: gitk:3058 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Hoch>\tEgy sorral feljebb görgetés a commit listában" -#: gitk:2825 +#: gitk:3059 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Runter>\tEgy sorral lejjebb görgetés a commit listában" -#: gitk:2826 +#: gitk:3060 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-BildHoch>\tEgy lappal feljebb görgetés a commit listában" -#: gitk:2827 +#: gitk:3061 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-BildRunter>\tEgy sorral lejjebb görgetés a commit listában" -#: gitk:2828 +#: gitk:3062 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" msgstr "<Umschalt-Hoch>\tKeresés visszafele (felfele, utolsó commitok)" -#: gitk:2829 +#: gitk:3063 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" msgstr "<Umschalt-Runter>\tKeresés elÅ‘re (lefelé; korábbi commitok)" -#: gitk:2830 +#: gitk:3064 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Entf>, b\t\tEgy lappal feljebb görgetés a diff nézetben" -#: gitk:2831 +#: gitk:3065 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Löschtaste>\tEgy lappal feljebb görgetés a diff nézetben" -#: gitk:2832 +#: gitk:3066 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Leertaste>\tEgy lappal lejjebb görgetés a diff nézetben" -#: gitk:2833 +#: gitk:3067 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\t18 sorral felfelé görgetés diff nézetben" -#: gitk:2834 +#: gitk:3068 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\t18 sorral lejjebb görgetés a diff nézetben" -#: gitk:2835 +#: gitk:3069 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tKeresés" -#: gitk:2836 +#: gitk:3070 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tKövetkezÅ‘ találathoz" -#: gitk:2837 +#: gitk:3071 msgid "<Return>\tMove to next find hit" msgstr "<Eingabetaste>\tKövetkezÅ‘ találathoz" -#: gitk:2838 +#: gitk:3072 msgid "/\t\tFocus the search box" msgstr "/\t\tLépj a keresési mezÅ‘re" -#: gitk:2839 +#: gitk:3073 msgid "?\t\tMove to previous find hit" msgstr "?\t\tElÅ‘zÅ‘ találathoz" -#: gitk:2840 +#: gitk:3074 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tKövetkezÅ‘ fájlra görgetés diff nézetben" -#: gitk:2841 +#: gitk:3075 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tKövetkezÅ‘ találatra keresés diff nézetben" -#: gitk:2842 +#: gitk:3076 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tElÅ‘zÅ‘ találatra keresés diff nézetben" -#: gitk:2843 +#: gitk:3077 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-Nummerblock-Plus>\tBetűméret növelése" -#: gitk:2844 +#: gitk:3078 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-Plus>\tBetűméret növelése" -#: gitk:2845 +#: gitk:3079 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-Nummernblock-Minus> Betűméret csökkentése" -#: gitk:2846 +#: gitk:3080 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-Minus>\tBetűméret csökkentése" -#: gitk:2847 +#: gitk:3081 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tFrissÃtés" -#: gitk:3302 gitk:3311 +#: gitk:3546 gitk:3555 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Hiba történt az ideiglenes könyvtár létrehozása közben %s:" -#: gitk:3324 +#: gitk:3568 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Hiba történt \"%s\" letöltése közben %s-rÅ‘l:" -#: gitk:3387 +#: gitk:3631 msgid "command failed:" msgstr "parancs hiba:" -#: gitk:3536 +#: gitk:3780 msgid "No such commit" msgstr "Nincs ilyen commit" -#: gitk:3550 +#: gitk:3794 msgid "git gui blame: command failed:" msgstr "git gui blame: parancs hiba:" -#: gitk:3581 +#: gitk:3825 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Nem sikerült a Merge head olvasása: %s" -#: gitk:3589 +#: gitk:3833 #, tcl-format msgid "Error reading index: %s" msgstr "Hiba történt az index olvasása közben: %s" -#: gitk:3614 +#: gitk:3858 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Nem sikerült a git blame indÃtása: %s" -#: gitk:3617 gitk:6406 +#: gitk:3861 gitk:6735 msgid "Searching" msgstr "Keresés" -#: gitk:3649 +#: gitk:3893 #, tcl-format msgid "Error running git blame: %s" msgstr "Hiba történt a git blame futtatása közben: %s" -#: gitk:3677 +#: gitk:3921 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "" "A %s commitból származik az a sor, amelyik nem található ebben a nézetben" -#: gitk:3691 +#: gitk:3935 msgid "External diff viewer failed:" msgstr "KülsÅ‘ diff nézegetÅ‘ hiba:" -#: gitk:3809 +#: gitk:4053 msgid "Gitk view definition" msgstr "Gitk nézet meghatározása" -#: gitk:3813 +#: gitk:4057 msgid "Remember this view" msgstr "Maradj ennél a nézetnél" -#: gitk:3814 +#: gitk:4058 msgid "References (space separated list):" msgstr "Referenciák (szóközzel tagolt lista" -#: gitk:3815 +#: gitk:4059 msgid "Branches & tags:" msgstr "Branch-ek & tagek:" -#: gitk:3816 +#: gitk:4060 msgid "All refs" msgstr "Minden ref" -#: gitk:3817 +#: gitk:4061 msgid "All (local) branches" msgstr "Minden (helyi) branch" -#: gitk:3818 +#: gitk:4062 msgid "All tags" msgstr "Minden tag" -#: gitk:3819 +#: gitk:4063 msgid "All remote-tracking branches" msgstr "Minden távoli követÅ‘ branch" -#: gitk:3820 +#: gitk:4064 msgid "Commit Info (regular expressions):" msgstr "Commit Infó (reguláris kifejezés):" -#: gitk:3821 +#: gitk:4065 msgid "Author:" msgstr "SzerzÅ‘:" -#: gitk:3822 +#: gitk:4066 msgid "Committer:" msgstr "Commitoló:" -#: gitk:3823 +#: gitk:4067 msgid "Commit Message:" msgstr "Commit üzenet:" -#: gitk:3824 +#: gitk:4068 msgid "Matches all Commit Info criteria" msgstr "Egyezik minen Commit Infó feltétellel" -#: gitk:3825 +#: gitk:4069 +#, fuzzy +msgid "Matches none Commit Info criteria" +msgstr "Egyezik minen Commit Infó feltétellel" + +#: gitk:4070 msgid "Changes to Files:" msgstr "Fájl változások:" -#: gitk:3826 +#: gitk:4071 msgid "Fixed String" msgstr "Fix String" -#: gitk:3827 +#: gitk:4072 msgid "Regular Expression" msgstr "Reguláris kifejezés" -#: gitk:3828 +#: gitk:4073 msgid "Search string:" msgstr "Keresés szöveg:" -#: gitk:3829 +#: gitk:4074 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -643,206 +686,203 @@ msgstr "" "Commit Dátumok (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" -#: gitk:3830 +#: gitk:4075 msgid "Since:" msgstr "EttÅ‘l:" -#: gitk:3831 +#: gitk:4076 msgid "Until:" msgstr "Eddig:" -#: gitk:3832 +#: gitk:4077 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "Limitálva és/vagy kihagyva egy adott számú revÃziót (pozitÃv egész):" -#: gitk:3833 +#: gitk:4078 msgid "Number to show:" msgstr "Mutatandó szám:" -#: gitk:3834 +#: gitk:4079 msgid "Number to skip:" msgstr "Kihagyandó szám:" -#: gitk:3835 +#: gitk:4080 msgid "Miscellaneous options:" msgstr "Különféle opciók:" -#: gitk:3836 +#: gitk:4081 msgid "Strictly sort by date" msgstr "Szigorú rendezás dátum alapján" -#: gitk:3837 +#: gitk:4082 msgid "Mark branch sides" msgstr "Jelölje meg az ágakat" -#: gitk:3838 +#: gitk:4083 msgid "Limit to first parent" msgstr "Korlátozás az elsÅ‘ szülÅ‘re" -#: gitk:3839 +#: gitk:4084 msgid "Simple history" msgstr "Egyszerű history" -#: gitk:3840 +#: gitk:4085 msgid "Additional arguments to git log:" msgstr "További argumentok a git log-hoz:" -#: gitk:3841 +#: gitk:4086 msgid "Enter files and directories to include, one per line:" msgstr "Fájlok és könyvtárak bejegyzése amiket tartalmaz, soronként:" -#: gitk:3842 +#: gitk:4087 msgid "Command to generate more commits to include:" msgstr "Parancs több tartalmazó commit generálására:" -#: gitk:3964 +#: gitk:4211 msgid "Gitk: edit view" msgstr "Gitk: szerkesztés nézet" -#: gitk:3972 +#: gitk:4219 msgid "-- criteria for selecting revisions" msgstr "-- kritériumok a revÃziók kiválasztásához" -#: gitk:3977 +#: gitk:4224 msgid "View Name" msgstr "Nézet neve" -#: gitk:4052 +#: gitk:4299 msgid "Apply (F5)" msgstr "Alkalmaz (F5)" -#: gitk:4090 +#: gitk:4337 msgid "Error in commit selection arguments:" msgstr "Hiba történt a commit argumentumok kiválasztása közben:" -#: gitk:4143 gitk:4195 gitk:4643 gitk:4657 gitk:5918 gitk:11519 gitk:11520 +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 msgid "None" msgstr "Keine" -#: gitk:4591 gitk:6438 gitk:8282 gitk:8297 -msgid "Date" -msgstr "Dátum" - -#: gitk:4591 gitk:6438 -msgid "CDate" -msgstr "Dátum" - -#: gitk:4740 gitk:4745 +#: gitk:5003 gitk:5008 msgid "Descendant" msgstr "Leszármazott" -#: gitk:4741 +#: gitk:5004 msgid "Not descendant" msgstr "Nem leszármazott" -#: gitk:4748 gitk:4753 +#: gitk:5011 gitk:5016 msgid "Ancestor" msgstr "ElÅ‘d" -#: gitk:4749 +#: gitk:5012 msgid "Not ancestor" msgstr "Nem elÅ‘d" -#: gitk:5039 +#: gitk:5306 msgid "Local changes checked in to index but not committed" msgstr "" "Lokális változtatások, melyek be vannak téve az indexbe, de még nincsenek " "commitolva" -#: gitk:5075 +#: gitk:5342 msgid "Local uncommitted changes, not checked in to index" msgstr "Lokális nem commitolt változások, nincsenek betéve az indexbe" -#: gitk:6756 +#: gitk:7115 +msgid "and many more" +msgstr "" + +#: gitk:7118 msgid "many" msgstr "sok" -#: gitk:6939 +#: gitk:7309 msgid "Tags:" msgstr "Tagek:" -#: gitk:6956 gitk:6962 gitk:8275 +#: gitk:7326 gitk:7332 gitk:8806 msgid "Parent" msgstr "Eltern" -#: gitk:6967 +#: gitk:7337 msgid "Child" msgstr "Gyerek" -#: gitk:6976 +#: gitk:7346 msgid "Branch" msgstr "Ãg" -#: gitk:6979 +#: gitk:7349 msgid "Follows" msgstr "KövetkezÅ‘k" -#: gitk:6982 +#: gitk:7352 msgid "Precedes" msgstr "MegelÅ‘zÅ‘k" -#: gitk:7519 +#: gitk:7947 #, tcl-format msgid "Error getting diffs: %s" msgstr "Hiba történt a diff-ek letöltése közben: %s" -#: gitk:8103 +#: gitk:8631 msgid "Goto:" msgstr "Menj:" -#: gitk:8105 -msgid "SHA1 ID:" -msgstr "SHA1 ID:" - -#: gitk:8124 +#: gitk:8652 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "Rövid SHA1 id %s félreérthetÅ‘" -#: gitk:8131 +#: gitk:8659 +#, tcl-format msgid "Revision %s is not known" msgstr "A(z) %s revÃzió nem ismert" -#: gitk:8141 +#: gitk:8669 #, tcl-format msgid "SHA1 id %s is not known" msgstr "SHA1 id %s nem ismert" -#: gitk:8143 +#: gitk:8671 #, tcl-format msgid "Revision %s is not in the current view" msgstr "A(z) %s revÃzió nincs a jelenlegi nézetben" -#: gitk:8285 +#: gitk:8813 gitk:8828 +msgid "Date" +msgstr "Dátum" + +#: gitk:8816 msgid "Children" msgstr "Gyerekek" -#: gitk:8343 +#: gitk:8879 #, tcl-format msgid "Reset %s branch to here" msgstr "ÃllÃtsd vissza a %s branch-ot ide" -#: gitk:8345 +#: gitk:8881 msgid "Detached head: can't reset" msgstr "ElkülönÃtett head: nem lehet visszaállÃtani" -#: gitk:8454 gitk:8460 +#: gitk:8986 gitk:8992 msgid "Skipping merge commit " msgstr "Merge commit kihagyása " -#: gitk:8469 gitk:8474 +#: gitk:9001 gitk:9006 msgid "Error getting patch ID for " msgstr "Hiba történt a patch ID megszerzése közben a következÅ‘nél " -#: gitk:8470 gitk:8475 +#: gitk:9002 gitk:9007 msgid " - stopping\n" msgstr " - abbahagyás\n" -#: gitk:8480 gitk:8483 gitk:8491 gitk:8505 gitk:8514 +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 msgid "Commit " msgstr "Commit " -#: gitk:8484 +#: gitk:9016 msgid "" " is the same patch as\n" " " @@ -850,7 +890,7 @@ msgstr "" " Ugyanaz a patch mint\n" " " -#: gitk:8492 +#: gitk:9024 msgid "" " differs from\n" " " @@ -858,7 +898,7 @@ msgstr "" " különbözik innentÅ‘l\n" " " -#: gitk:8494 +#: gitk:9026 msgid "" "Diff of commits:\n" "\n" @@ -866,121 +906,132 @@ msgstr "" "A commitok diffje:\n" "\n" -#: gitk:8506 gitk:8515 +#: gitk:9038 gitk:9047 #, tcl-format msgid " has %s children - stopping\n" msgstr " %s gyereke van. abbahagyás\n" -#: gitk:8534 +#: gitk:9066 +#, tcl-format msgid "Error writing commit to file: %s" msgstr "Hiba történt a commit fájlba Ãrása közben: %s" -#: gitk:8540 +#: gitk:9072 +#, tcl-format msgid "Error diffing commits: %s" msgstr "Hiba történt a commitok diffelése közben: %s" -#: gitk:8570 +#: gitk:9118 msgid "Top" msgstr "Teteje" -#: gitk:8571 +#: gitk:9119 msgid "From" msgstr "Innen" -#: gitk:8576 +#: gitk:9124 msgid "To" msgstr "Ide" -#: gitk:8600 +#: gitk:9148 msgid "Generate patch" msgstr "Patch generálása" -#: gitk:8602 +#: gitk:9150 msgid "From:" msgstr "Innen:" -#: gitk:8611 +#: gitk:9159 msgid "To:" msgstr "Ide:" -#: gitk:8620 +#: gitk:9168 msgid "Reverse" msgstr "Visszafele" -#: gitk:8622 gitk:8807 +#: gitk:9170 gitk:9366 msgid "Output file:" msgstr "Kimeneti fájl:" -#: gitk:8628 +#: gitk:9176 msgid "Generate" msgstr "Generálás" -#: gitk:8666 +#: gitk:9214 msgid "Error creating patch:" msgstr "Hiba törtét a patch készÃtése közben:" -#: gitk:8689 gitk:8795 gitk:8852 +#: gitk:9237 gitk:9354 gitk:9411 msgid "ID:" msgstr "ID:" -#: gitk:8698 +#: gitk:9246 msgid "Tag name:" msgstr "Tag név:" -#: gitk:8702 gitk:8861 +#: gitk:9249 +msgid "Tag message is optional" +msgstr "" + +#: gitk:9251 +#, fuzzy +msgid "Tag message:" +msgstr "Tag név:" + +#: gitk:9255 gitk:9420 msgid "Create" msgstr "Létrehozás" -#: gitk:8719 +#: gitk:9273 msgid "No tag name specified" msgstr "A tag neve nincsen megadva" -#: gitk:8723 +#: gitk:9277 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "%s Tag már létezik" -#: gitk:8729 +#: gitk:9287 msgid "Error creating tag:" msgstr "Hiba történt a tag létrehozása közben:" -#: gitk:8804 +#: gitk:9363 msgid "Command:" msgstr "Parancs:" -#: gitk:8812 +#: gitk:9371 msgid "Write" msgstr "Ãrás" -#: gitk:8830 +#: gitk:9389 msgid "Error writing commit:" msgstr "Hiba történt a commit Ãrása közben:" -#: gitk:8857 +#: gitk:9416 msgid "Name:" msgstr "Név:" -#: gitk:8880 +#: gitk:9439 msgid "Please specify a name for the new branch" msgstr "Kérem adja meg a nevét az új branchhoz" -#: gitk:8885 +#: gitk:9444 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "%s branch már létezik. FelülÃrja?" -#: gitk:8951 +#: gitk:9511 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "" "%s commit már benne van a %s branchban -- biztos hogy újra csinálja ?" "eintragen?" -#: gitk:8956 +#: gitk:9516 msgid "Cherry-picking" msgstr "Cherry-picking" -#: gitk:8965 +#: gitk:9525 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -990,7 +1041,7 @@ msgstr "" "Kérem commitolja, indÃtsa újra vagy rejtse el a változtatásait és próbálja " "újra." -#: gitk:8971 +#: gitk:9531 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -998,32 +1049,63 @@ msgstr "" "Cherry-pick hiba történt merge konfliktus miatt.\n" "KÃvánja futtatni a git citool-t a probléma megoldásához?" -#: gitk:8987 +#: gitk:9547 gitk:9605 msgid "No changes committed" msgstr "Nincsen változás commitolva" -#: gitk:9013 +#: gitk:9574 +#, fuzzy, tcl-format +msgid "Commit %s is not included in branch %s -- really revert it?" +msgstr "" +"%s commit már benne van a %s branchban -- biztos hogy újra csinálja ?" +"eintragen?" + +#: gitk:9579 +#, fuzzy +msgid "Reverting" +msgstr "ÚjraindÃtás" + +#: gitk:9587 +#, fuzzy, tcl-format +msgid "" +"Revert failed because of local changes to the following files:%s Please " +"commit, reset or stash your changes and try again." +msgstr "" +"Cherry-pick hiba történt lokális váltotások miatt a '%s' fájlban.\n" +"Kérem commitolja, indÃtsa újra vagy rejtse el a változtatásait és próbálja " +"újra." + +#: gitk:9591 +#, fuzzy +msgid "" +"Revert failed because of merge conflict.\n" +" Do you wish to run git citool to resolve it?" +msgstr "" +"Cherry-pick hiba történt merge konfliktus miatt.\n" +"KÃvánja futtatni a git citool-t a probléma megoldásához?" + +#: gitk:9634 msgid "Confirm reset" msgstr "ÚjraindÃtás megerÅ‘sÃtése" -#: gitk:9015 +#: gitk:9636 #, tcl-format msgid "Reset branch %s to %s?" msgstr "ÚjraindÃtja a %s branchot %s-ig?" -#: gitk:9017 +#: gitk:9638 msgid "Reset type:" msgstr "ÚjraindÃtás tÃpusa:" -#: gitk:9020 +#: gitk:9641 msgid "Soft: Leave working tree and index untouched" msgstr "Soft: Hagyd a working tree-t és az indexet érintetlenül" -#: gitk:9023 +#: gitk:9644 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Kevert: Hagyd a working tree-t érintetlenül, töröld az indexet" -#: gitk:9026 +#: gitk:9647 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1031,19 +1113,19 @@ msgstr "" "Hard: IndÃtsd újra a working tree-t és az indexet\n" "(MINDEN lokális változás eldobása)" -#: gitk:9043 +#: gitk:9664 msgid "Resetting" msgstr "ÚjraindÃtás" -#: gitk:9103 +#: gitk:9724 msgid "Checking out" msgstr "Kivesz" -#: gitk:9156 +#: gitk:9777 msgid "Cannot delete the currently checked-out branch" msgstr "Nem lehet a jelenleg kivett branch-ot törölni" -#: gitk:9162 +#: gitk:9783 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1052,16 +1134,16 @@ msgstr "" "A %s branchon található commit nem található meg semelyik másik branchon.\n" "Tényleg törli a %s branchot?" -#: gitk:9193 +#: gitk:9814 #, tcl-format msgid "Tags and heads: %s" msgstr "Tagek és headek: %s" -#: gitk:9208 +#: gitk:9829 msgid "Filter" msgstr "SzűrÅ‘" -#: gitk:9503 +#: gitk:10125 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1069,206 +1151,235 @@ msgstr "" "Hiba történt a commit topológiai információ olvasása közben; branch ésa " "megelÅ‘zÅ‘/következÅ‘ információ nem lesz teljes." -#: gitk:10489 +#: gitk:11102 msgid "Tag" msgstr "Tag" -#: gitk:10489 +#: gitk:11106 msgid "Id" msgstr "Id" -#: gitk:10539 +#: gitk:11189 msgid "Gitk font chooser" msgstr "Gitk-betű kiválasztó" -#: gitk:10556 +#: gitk:11206 msgid "B" msgstr "F" -#: gitk:10559 +#: gitk:11209 msgid "I" msgstr "K" -#: gitk:10677 -msgid "Gitk preferences" -msgstr "Gitk beállÃtások" - -#: gitk:10679 +#: gitk:11327 msgid "Commit list display options" msgstr "Commit lista kijelzési opciók" -#: gitk:10682 +#: gitk:11330 msgid "Maximum graph width (lines)" msgstr "Maximális grafikon szélesség (sorok)" -#: gitk:10685 -#, tcl-format +#: gitk:11334 +#, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Maximális grafikon szélesség (táble %-je)" -#: gitk:10688 +#: gitk:11337 msgid "Show local changes" msgstr "Mutasd a lokális változtatásokat" -#: gitk:10691 -msgid "Auto-select SHA1" +#: gitk:11340 +#, fuzzy +msgid "Auto-select SHA1 (length)" msgstr "SHA1 Automatikus kiválasztása" -#: gitk:10694 +#: gitk:11344 msgid "Hide remote refs" msgstr "A távoli refek elrejtése" -#: gitk:10698 +#: gitk:11348 msgid "Diff display options" msgstr "Diff kijelzÅ‘ opciók" -#: gitk:10700 +#: gitk:11350 msgid "Tab spacing" msgstr "Tab sorköz" -#: gitk:10703 -msgid "Display nearby tags" +#: gitk:11353 +#, fuzzy +msgid "Display nearby tags/heads" msgstr "Szomszédos tagek kijelzése" -#: gitk:10706 +#: gitk:11356 +msgid "Maximum # tags/heads to show" +msgstr "" + +#: gitk:11359 msgid "Limit diffs to listed paths" msgstr "Korlátozott diffek a kilistázott útvonalakhoz" -#: gitk:10709 +#: gitk:11362 msgid "Support per-file encodings" msgstr "Fájlonkénti kódolás támgatása" -#: gitk:10715 gitk:10804 +#: gitk:11368 gitk:11515 msgid "External diff tool" msgstr "KülsÅ‘ diff alkalmazás" -#: gitk:10716 +#: gitk:11369 msgid "Choose..." msgstr "Válaszd ..." -#: gitk:10721 +#: gitk:11374 msgid "General options" msgstr "Ãltalános opciók" -#: gitk:10724 +#: gitk:11377 msgid "Use themed widgets" msgstr "Témázott vezérlÅ‘k használata" -#: gitk:10726 +#: gitk:11379 msgid "(change requires restart)" msgstr "(a változás újraindÃtást igényel)" -#: gitk:10728 +#: gitk:11381 msgid "(currently unavailable)" msgstr "(jelenleg nem elérhetÅ‘)" -#: gitk:10732 +#: gitk:11392 msgid "Colors: press to choose" msgstr "SzÃnek: nyomja meg a kiválasztáshoz" -#: gitk:10735 +#: gitk:11395 msgid "Interface" msgstr "Interfész" -#: gitk:10736 +#: gitk:11396 msgid "interface" msgstr "interfész" -#: gitk:10739 +#: gitk:11399 msgid "Background" msgstr "Háttér" -#: gitk:10740 gitk:10770 +#: gitk:11400 gitk:11430 msgid "background" msgstr "háttér" -#: gitk:10743 +#: gitk:11403 msgid "Foreground" msgstr "ElÅ‘tér" -#: gitk:10744 +#: gitk:11404 msgid "foreground" msgstr "elÅ‘tér" -#: gitk:10747 +#: gitk:11407 msgid "Diff: old lines" msgstr "Diff: régi sorok" -#: gitk:10748 +#: gitk:11408 msgid "diff old lines" msgstr "diff régi sorok" -#: gitk:10752 +#: gitk:11412 msgid "Diff: new lines" msgstr "Diff: új sorok" -#: gitk:10753 +#: gitk:11413 msgid "diff new lines" msgstr "diff - új sorok" -#: gitk:10757 +#: gitk:11417 msgid "Diff: hunk header" msgstr "Diff: nagy headerök" -#: gitk:10759 +#: gitk:11419 msgid "diff hunk header" msgstr "diff - nagy headerök" -#: gitk:10763 +#: gitk:11423 msgid "Marked line bg" msgstr "Megjelölt sor háttér" -#: gitk:10765 +#: gitk:11425 msgid "marked line background" msgstr "megjelölt sor háttér" -#: gitk:10769 +#: gitk:11429 msgid "Select bg" msgstr "Válasszon hátteret" -#: gitk:10773 +#: gitk:11438 msgid "Fonts: press to choose" msgstr "Betű: nyomja meg a kiválasztáshoz" -#: gitk:10775 +#: gitk:11440 msgid "Main font" msgstr "FÅ‘ betű" -#: gitk:10776 +#: gitk:11441 msgid "Diff display font" msgstr "Diff kijelzÅ‘ betű" -#: gitk:10777 +#: gitk:11442 msgid "User interface font" msgstr "Felhasználói interfész betű" -#: gitk:10814 +#: gitk:11464 +msgid "Gitk preferences" +msgstr "Gitk beállÃtások" + +#: gitk:11473 +#, fuzzy +msgid "General" +msgstr "Generálás" + +#: gitk:11474 +msgid "Colors" +msgstr "" + +#: gitk:11475 +msgid "Fonts" +msgstr "" + +#: gitk:11525 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: válasszon szÃnt a %s-ra" -#: gitk:11418 +#: gitk:12242 msgid "Cannot find a git repository here." msgstr "Nem találhatü git repository itt." -#: gitk:11422 -#, tcl-format -msgid "Cannot find the git directory \"%s\"." -msgstr "Nem található a \"%s\" könyvtár." - -#: gitk:11469 +#: gitk:12289 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "FélreérthetÅ‘ argumentum '%s': revÃzió és fájlnév is" -#: gitk:11481 +#: gitk:12301 msgid "Bad arguments to gitk:" msgstr "Rossz gitk argumentumok:" -#: gitk:11572 +#: gitk:12405 msgid "Command line" msgstr "Parancs sor" +#~ msgid "SHA1 ID: " +#~ msgstr "SHA1 ID: " + +#~ msgid "next" +#~ msgstr "következÅ‘" + +#~ msgid "prev" +#~ msgstr "elÅ‘zÅ‘" + +#~ msgid "CDate" +#~ msgstr "Dátum" + +#~ msgid "Cannot find the git directory \"%s\"." +#~ msgstr "Nem található a \"%s\" könyvtár." + #~ msgid "Use all refs" #~ msgstr "Használd az összes referenciát" diff --git a/gitk-git/po/it.po b/gitk-git/po/it.po index a730d63..d630bb0 100644 --- a/gitk-git/po/it.po +++ b/gitk-git/po/it.po @@ -8,33 +8,42 @@ msgid "" msgstr "" "Project-Id-Version: gitk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 18:40+0100\n" +"POT-Creation-Date: 2015-03-15 14:37+1100\n" "PO-Revision-Date: 2010-01-28 18:41+0100\n" "Last-Translator: Michele Ballabio <barra_cuda@katamail.com>\n" "Language-Team: Italian\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: gitk:115 +#: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "Impossibile ottenere l'elenco dei file in attesa di fusione:" -#: gitk:274 +#: gitk:212 gitk:2381 +msgid "Color words" +msgstr "" + +#: gitk:217 gitk:2381 gitk:8201 gitk:8234 +msgid "Markup words" +msgstr "" + +#: gitk:324 msgid "Error parsing revisions:" msgstr "Errore nella lettura delle revisioni:" -#: gitk:329 +#: gitk:380 msgid "Error executing --argscmd command:" msgstr "Errore nell'esecuzione del comando specificato con --argscmd:" -#: gitk:342 +#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "Nessun file selezionato: è stata specificata l'opzione --merge ma non ci " "sono file in attesa di fusione." -#: gitk:345 +#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -42,299 +51,315 @@ msgstr "" "Nessun file selezionato: è stata specificata l'opzione --merge ma i file " "specificati non sono in attesa di fusione." -#: gitk:367 gitk:514 +#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "Errore nell'esecuzione di git log:" -#: gitk:385 gitk:530 +#: gitk:436 gitk:582 msgid "Reading" msgstr "Lettura in corso" -#: gitk:445 gitk:4261 +#: gitk:496 gitk:4508 msgid "Reading commits..." msgstr "Lettura delle revisioni in corso..." -#: gitk:448 gitk:1578 gitk:4264 +#: gitk:499 gitk:1637 gitk:4511 msgid "No commits selected" msgstr "Nessuna revisione selezionata" -#: gitk:1454 +#: gitk:1511 msgid "Can't parse git log output:" msgstr "Impossibile elaborare i dati di git log:" -#: gitk:1674 +#: gitk:1740 msgid "No commit information available" msgstr "Nessuna informazione disponibile sulle revisioni" -#: gitk:1816 +#: gitk:1897 msgid "mc" msgstr "" -#: gitk:1851 gitk:4054 gitk:9044 gitk:10585 gitk:10804 +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 msgid "OK" msgstr "OK" -#: gitk:1853 gitk:4056 gitk:8634 gitk:8713 gitk:8828 gitk:8877 gitk:9046 -#: gitk:10586 gitk:10805 +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 +#: gitk:11221 gitk:11501 msgid "Cancel" msgstr "Annulla" -#: gitk:1975 +#: gitk:2069 msgid "Update" msgstr "Aggiorna" -#: gitk:1976 +#: gitk:2070 msgid "Reload" msgstr "Ricarica" -#: gitk:1977 +#: gitk:2071 msgid "Reread references" msgstr "Rileggi riferimenti" -#: gitk:1978 +#: gitk:2072 msgid "List references" msgstr "Elenca riferimenti" -#: gitk:1980 +#: gitk:2074 msgid "Start git gui" msgstr "Avvia git gui" -#: gitk:1982 +#: gitk:2076 msgid "Quit" msgstr "Esci" -#: gitk:1974 +#: gitk:2068 msgid "File" msgstr "File" -#: gitk:1986 +#: gitk:2080 msgid "Preferences" msgstr "Preferenze" -#: gitk:1985 +#: gitk:2079 msgid "Edit" msgstr "Modifica" -#: gitk:1990 +#: gitk:2084 msgid "New view..." msgstr "Nuova vista..." -#: gitk:1991 +#: gitk:2085 msgid "Edit view..." msgstr "Modifica vista..." -#: gitk:1992 +#: gitk:2086 msgid "Delete view" msgstr "Elimina vista" -#: gitk:1994 +#: gitk:2088 msgid "All files" msgstr "Tutti i file" -#: gitk:1989 gitk:3808 +#: gitk:2083 gitk:4050 msgid "View" msgstr "Vista" -#: gitk:1999 gitk:2009 gitk:2780 +#: gitk:2093 gitk:2103 gitk:3009 msgid "About gitk" msgstr "Informazioni su gitk" -#: gitk:2000 gitk:2014 +#: gitk:2094 gitk:2108 msgid "Key bindings" msgstr "Scorciatoie da tastiera" -#: gitk:1998 gitk:2013 +#: gitk:2092 gitk:2107 msgid "Help" msgstr "Aiuto" -#: gitk:2091 gitk:8110 +#: gitk:2185 gitk:8633 msgid "SHA1 ID:" msgstr "SHA1 ID:" -#: gitk:2122 +#: gitk:2229 msgid "Row" msgstr "Riga" -#: gitk:2160 +#: gitk:2267 msgid "Find" msgstr "Trova" -#: gitk:2161 -msgid "next" -msgstr "succ" - -#: gitk:2162 -msgid "prev" -msgstr "prec" - -#: gitk:2163 +#: gitk:2295 msgid "commit" msgstr "revisione" -#: gitk:2166 gitk:2168 gitk:4422 gitk:4445 gitk:4469 gitk:6410 gitk:6482 -#: gitk:6566 +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 +#: gitk:6893 msgid "containing:" msgstr "contenente:" -#: gitk:2169 gitk:3290 gitk:3295 gitk:4497 +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 msgid "touching paths:" msgstr "che riguarda i percorsi:" -#: gitk:2170 gitk:4502 +#: gitk:2303 gitk:4759 msgid "adding/removing string:" msgstr "che aggiunge/rimuove la stringa:" -#: gitk:2179 gitk:2181 +#: gitk:2304 gitk:4761 +msgid "changing lines matching:" +msgstr "" + +#: gitk:2313 gitk:2315 gitk:4748 msgid "Exact" msgstr "Esatto" -#: gitk:2181 gitk:4577 gitk:6378 +#: gitk:2315 gitk:4836 gitk:6704 msgid "IgnCase" msgstr "" -#: gitk:2181 gitk:4471 gitk:4575 gitk:6374 +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 msgid "Regexp" msgstr "" -#: gitk:2183 gitk:2184 gitk:4596 gitk:4626 gitk:4633 gitk:6502 gitk:6570 +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 msgid "All fields" msgstr "Tutti i campi" -#: gitk:2184 gitk:4594 gitk:4626 gitk:6441 +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 msgid "Headline" msgstr "Titolo" -#: gitk:2185 gitk:4594 gitk:6441 gitk:6570 gitk:7003 +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 msgid "Comments" msgstr "Commenti" -#: gitk:2185 gitk:4594 gitk:4598 gitk:4633 gitk:6441 gitk:6938 gitk:8285 -#: gitk:8300 +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 +#: gitk:8826 msgid "Author" msgstr "Autore" -#: gitk:2185 gitk:4594 gitk:6441 gitk:6940 +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 msgid "Committer" msgstr "Revisione creata da" -#: gitk:2216 +#: gitk:2350 msgid "Search" msgstr "Cerca" -#: gitk:2224 +#: gitk:2358 msgid "Diff" msgstr "" -#: gitk:2226 +#: gitk:2360 msgid "Old version" msgstr "Vecchia versione" -#: gitk:2228 +#: gitk:2362 msgid "New version" msgstr "Nuova versione" -#: gitk:2230 +#: gitk:2364 msgid "Lines of context" msgstr "Linee di contesto" -#: gitk:2240 +#: gitk:2374 msgid "Ignore space change" msgstr "Ignora modifiche agli spazi" -#: gitk:2299 +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +msgid "Line diff" +msgstr "" + +#: gitk:2445 msgid "Patch" msgstr "Modifiche" -#: gitk:2301 +#: gitk:2447 msgid "Tree" msgstr "Directory" -#: gitk:2456 gitk:2473 +#: gitk:2616 gitk:2636 msgid "Diff this -> selected" msgstr "Diff questo -> selezionato" -#: gitk:2457 gitk:2474 +#: gitk:2617 gitk:2637 msgid "Diff selected -> this" msgstr "Diff selezionato -> questo" -#: gitk:2458 gitk:2475 +#: gitk:2618 gitk:2638 msgid "Make patch" msgstr "Crea patch" -#: gitk:2459 gitk:8692 +#: gitk:2619 gitk:9235 msgid "Create tag" msgstr "Crea etichetta" -#: gitk:2460 gitk:8808 +#: gitk:2620 gitk:9352 msgid "Write commit to file" msgstr "Scrivi revisione in un file" -#: gitk:2461 gitk:8865 +#: gitk:2621 gitk:9409 msgid "Create new branch" msgstr "Crea un nuovo ramo" -#: gitk:2462 +#: gitk:2622 msgid "Cherry-pick this commit" msgstr "Porta questa revisione in cima al ramo attuale" -#: gitk:2463 +#: gitk:2623 msgid "Reset HEAD branch to here" msgstr "Aggiorna il ramo HEAD a questa revisione" -#: gitk:2464 +#: gitk:2624 msgid "Mark this commit" msgstr "Segna questa revisione" -#: gitk:2465 +#: gitk:2625 msgid "Return to mark" msgstr "Torna alla revisione segnata" -#: gitk:2466 +#: gitk:2626 msgid "Find descendant of this and mark" msgstr "Trova il discendente di questa revisione e di quella segnata" -#: gitk:2467 +#: gitk:2627 msgid "Compare with marked commit" msgstr "Confronta con la revisione segnata" -#: gitk:2481 +#: gitk:2628 gitk:2639 +#, fuzzy +msgid "Diff this -> marked commit" +msgstr "Diff questo -> selezionato" + +#: gitk:2629 gitk:2640 +#, fuzzy +msgid "Diff marked commit -> this" +msgstr "Diff selezionato -> questo" + +#: gitk:2630 +#, fuzzy +msgid "Revert this commit" +msgstr "Segna questa revisione" + +#: gitk:2646 msgid "Check out this branch" msgstr "Attiva questo ramo" -#: gitk:2482 +#: gitk:2647 msgid "Remove this branch" msgstr "Elimina questo ramo" -#: gitk:2489 +#: gitk:2654 msgid "Highlight this too" msgstr "Evidenzia anche questo" -#: gitk:2490 +#: gitk:2655 msgid "Highlight this only" msgstr "Evidenzia solo questo" -#: gitk:2491 +#: gitk:2656 msgid "External diff" msgstr "Visualizza differenze in un altro programma" -#: gitk:2492 +#: gitk:2657 msgid "Blame parent commit" msgstr "Annota la revisione precedente" -#: gitk:2499 +#: gitk:2664 msgid "Show origin of this line" msgstr "Mostra la provenienza di questa riga" -#: gitk:2500 +#: gitk:2665 msgid "Run git gui blame on this line" msgstr "Esegui git gui blame su questa riga" -#: gitk:2782 +#: gitk:3011 +#, fuzzy msgid "" "\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" +"Copyright © 2005-2014 Paul Mackerras\n" "\n" "Use and redistribute under the terms of the GNU General Public License" msgstr "" @@ -346,298 +371,316 @@ msgstr "" "Utilizzo e redistribuzione permessi sotto i termini della GNU General Public " "License" -#: gitk:2790 gitk:2854 gitk:9230 +#: gitk:3019 gitk:3085 gitk:9836 msgid "Close" msgstr "Chiudi" -#: gitk:2811 +#: gitk:3040 msgid "Gitk key bindings" msgstr "Scorciatoie da tastiera di Gitk" -#: gitk:2814 +#: gitk:3043 msgid "Gitk key bindings:" msgstr "Scorciatoie da tastiera di Gitk:" -#: gitk:2816 +#: gitk:3045 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tEsci" -#: gitk:2817 +#: gitk:3046 +#, fuzzy, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-F>\t\tTrova" + +#: gitk:3047 msgid "<Home>\t\tMove to first commit" msgstr "<Home>\t\tVai alla prima revisione" -#: gitk:2818 +#: gitk:3048 msgid "<End>\t\tMove to last commit" msgstr "<End>\t\tVai all'ultima revisione" -#: gitk:2819 -msgid "<Up>, p, i\tMove up one commit" +#: gitk:3049 +#, fuzzy +msgid "<Up>, p, k\tMove up one commit" msgstr "<Su>, p, i\tVai più in alto di una revisione" -#: gitk:2820 -msgid "<Down>, n, k\tMove down one commit" +#: gitk:3050 +#, fuzzy +msgid "<Down>, n, j\tMove down one commit" msgstr "<Giù>, n, k\tVai più in basso di una revisione" -#: gitk:2821 -msgid "<Left>, z, j\tGo back in history list" +#: gitk:3051 +#, fuzzy +msgid "<Left>, z, h\tGo back in history list" msgstr "<Sinistra>, z, j\tTorna indietro nella cronologia" -#: gitk:2822 +#: gitk:3052 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Destra>, x, l\tVai avanti nella cronologia" -#: gitk:2823 +#: gitk:3053 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "" + +#: gitk:3054 msgid "<PageUp>\tMove up one page in commit list" msgstr "<PaginaSu>\tVai più in alto di una pagina nella lista delle revisioni" -#: gitk:2824 +#: gitk:3055 msgid "<PageDown>\tMove down one page in commit list" msgstr "" "<PaginaGiù>\tVai più in basso di una pagina nella lista delle revisioni" -#: gitk:2825 +#: gitk:3056 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tScorri alla cima della lista delle revisioni" -#: gitk:2826 +#: gitk:3057 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tScorri alla fine della lista delle revisioni" -#: gitk:2827 +#: gitk:3058 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Su>\tScorri la lista delle revisioni in alto di una riga" -#: gitk:2828 +#: gitk:3059 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Giù>\tScorri la lista delle revisioni in basso di una riga" -#: gitk:2829 +#: gitk:3060 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PaginaSu>\tScorri la lista delle revisioni in alto di una pagina" -#: gitk:2830 +#: gitk:3061 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PaginaGiù>\tScorri la lista delle revisioni in basso di una pagina" -#: gitk:2831 +#: gitk:3062 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" msgstr "<Shift-Su>\tTrova all'indietro (verso l'alto, revisioni successive)" -#: gitk:2832 +#: gitk:3063 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" msgstr "<Shift-Giù>\tTrova in avanti (verso il basso, revisioni precedenti)" -#: gitk:2833 +#: gitk:3064 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Delete>, b\tScorri la vista delle differenze in alto di una pagina" -#: gitk:2834 +#: gitk:3065 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Backspace>\tScorri la vista delle differenze in alto di una pagina" -#: gitk:2835 +#: gitk:3066 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Spazio>\t\tScorri la vista delle differenze in basso di una pagina" -#: gitk:2836 +#: gitk:3067 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tScorri la vista delle differenze in alto di 18 linee" -#: gitk:2837 +#: gitk:3068 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tScorri la vista delle differenze in basso di 18 linee" -#: gitk:2838 +#: gitk:3069 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tTrova" -#: gitk:2839 +#: gitk:3070 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tTrova in avanti" -#: gitk:2840 +#: gitk:3071 msgid "<Return>\tMove to next find hit" msgstr "<Invio>\tTrova in avanti" -#: gitk:2841 +#: gitk:3072 msgid "/\t\tFocus the search box" msgstr "/\t\tCursore nel box di ricerca" -#: gitk:2842 +#: gitk:3073 msgid "?\t\tMove to previous find hit" msgstr "?\t\tTrova all'indietro" -#: gitk:2843 +#: gitk:3074 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tScorri la vista delle differenze al file successivo" -#: gitk:2844 +#: gitk:3075 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tCerca in avanti nella vista delle differenze" -#: gitk:2845 +#: gitk:3076 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tCerca all'indietro nella vista delle differenze" -#: gitk:2846 +#: gitk:3077 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tAumenta dimensione carattere" -#: gitk:2847 +#: gitk:3078 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-più>\tAumenta dimensione carattere" -#: gitk:2848 +#: gitk:3079 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tDiminuisci dimensione carattere" -#: gitk:2849 +#: gitk:3080 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-meno>\tDiminuisci dimensione carattere" -#: gitk:2850 +#: gitk:3081 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tAggiorna" -#: gitk:3305 gitk:3314 +#: gitk:3546 gitk:3555 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Errore durante la creazione della directory temporanea %s:" -#: gitk:3327 +#: gitk:3568 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Errore nella lettura di \"%s\" da %s:" -#: gitk:3390 +#: gitk:3631 msgid "command failed:" msgstr "impossibile eseguire il comando:" -#: gitk:3539 +#: gitk:3780 msgid "No such commit" msgstr "Revisione inesistente" -#: gitk:3553 +#: gitk:3794 msgid "git gui blame: command failed:" msgstr "git gui blame: impossibile eseguire il comando:" -#: gitk:3584 +#: gitk:3825 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Impossibile leggere merge head: %s" -#: gitk:3592 +#: gitk:3833 #, tcl-format msgid "Error reading index: %s" msgstr "Errore nella lettura dell'indice: %s" -#: gitk:3617 +#: gitk:3858 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Impossibile eseguire git blame: %s" -#: gitk:3620 gitk:6409 +#: gitk:3861 gitk:6735 msgid "Searching" msgstr "Ricerca in corso" -#: gitk:3652 +#: gitk:3893 #, tcl-format msgid "Error running git blame: %s" msgstr "Errore nell'esecuzione di git blame: %s" -#: gitk:3680 +#: gitk:3921 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "Quella riga proviene dalla revisione %s, non presente in questa vista" -#: gitk:3694 +#: gitk:3935 msgid "External diff viewer failed:" msgstr "Impossibile eseguire il visualizzatore di differenze:" -#: gitk:3812 +#: gitk:4053 msgid "Gitk view definition" msgstr "Scelta vista Gitk" -#: gitk:3816 +#: gitk:4057 msgid "Remember this view" msgstr "Ricorda questa vista" -#: gitk:3817 +#: gitk:4058 msgid "References (space separated list):" msgstr "Riferimenti (lista di elementi separati da spazi)" -#: gitk:3818 +#: gitk:4059 msgid "Branches & tags:" msgstr "Rami ed etichette" -#: gitk:3819 +#: gitk:4060 msgid "All refs" msgstr "Tutti i riferimenti" -#: gitk:3820 +#: gitk:4061 msgid "All (local) branches" msgstr "Tutti i rami (locali)" -#: gitk:3821 +#: gitk:4062 msgid "All tags" msgstr "Tutte le etichette" -#: gitk:3822 +#: gitk:4063 msgid "All remote-tracking branches" msgstr "Tutti i rami remoti" -#: gitk:3823 +#: gitk:4064 msgid "Commit Info (regular expressions):" msgstr "Informazioni sulla revisione (espressioni regolari):" -#: gitk:3824 +#: gitk:4065 msgid "Author:" msgstr "Autore:" -#: gitk:3825 +#: gitk:4066 msgid "Committer:" msgstr "Revisione creata da:" -#: gitk:3826 +#: gitk:4067 msgid "Commit Message:" msgstr "Messaggio di revisione:" -#: gitk:3827 +#: gitk:4068 msgid "Matches all Commit Info criteria" msgstr "Risponde a tutti i criteri di ricerca sulle revisioni" -#: gitk:3828 +#: gitk:4069 +#, fuzzy +msgid "Matches none Commit Info criteria" +msgstr "Risponde a tutti i criteri di ricerca sulle revisioni" + +#: gitk:4070 msgid "Changes to Files:" msgstr "Modifiche ai file:" -#: gitk:3829 +#: gitk:4071 msgid "Fixed String" msgstr "Stringa fissa" -#: gitk:3830 +#: gitk:4072 msgid "Regular Expression" msgstr "Espressione regolare" -#: gitk:3831 +#: gitk:4073 msgid "Search string:" msgstr "Cerca stringa:" -#: gitk:3832 +#: gitk:4074 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -645,201 +688,201 @@ msgstr "" "Date di revisione (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, " "2009 15:27:38\"):" -#: gitk:3833 +#: gitk:4075 msgid "Since:" msgstr "Da:" -#: gitk:3834 +#: gitk:4076 msgid "Until:" msgstr "A:" -#: gitk:3835 +#: gitk:4077 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "Limita e/o salta N revisioni (intero positivo):" -#: gitk:3836 +#: gitk:4078 msgid "Number to show:" msgstr "Numero di revisioni da mostrare:" -#: gitk:3837 +#: gitk:4079 msgid "Number to skip:" msgstr "Numero di revisioni da saltare:" -#: gitk:3838 +#: gitk:4080 msgid "Miscellaneous options:" msgstr "Altre opzioni:" -#: gitk:3839 +#: gitk:4081 msgid "Strictly sort by date" msgstr "Ordina solo per data" -#: gitk:3840 +#: gitk:4082 msgid "Mark branch sides" msgstr "Segna i lati del ramo" -#: gitk:3841 +#: gitk:4083 msgid "Limit to first parent" msgstr "Limita al primo genitore" -#: gitk:3842 +#: gitk:4084 msgid "Simple history" msgstr "Cronologia semplificata" -#: gitk:3843 +#: gitk:4085 msgid "Additional arguments to git log:" msgstr "Ulteriori argomenti da passare a git log:" -#: gitk:3844 +#: gitk:4086 msgid "Enter files and directories to include, one per line:" msgstr "Inserire file e directory da includere, uno per riga:" -#: gitk:3845 +#: gitk:4087 msgid "Command to generate more commits to include:" msgstr "Comando che genera altre revisioni da visualizzare:" -#: gitk:3967 +#: gitk:4211 msgid "Gitk: edit view" msgstr "Gitk: modifica vista" -#: gitk:3975 +#: gitk:4219 msgid "-- criteria for selecting revisions" msgstr "-- criteri per la scelta delle revisioni" -#: gitk:3980 +#: gitk:4224 msgid "View Name" msgstr "Nome vista" -#: gitk:4055 +#: gitk:4299 msgid "Apply (F5)" msgstr "Applica (F5)" -#: gitk:4093 +#: gitk:4337 msgid "Error in commit selection arguments:" msgstr "Errore negli argomenti di selezione delle revisioni:" -#: gitk:4146 gitk:4198 gitk:4646 gitk:4660 gitk:5921 gitk:11534 gitk:11535 +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 msgid "None" msgstr "Nessuno" -#: gitk:4594 gitk:6441 gitk:8287 gitk:8302 -msgid "Date" -msgstr "Data" - -#: gitk:4594 gitk:6441 -msgid "CDate" -msgstr "" - -#: gitk:4743 gitk:4748 +#: gitk:5003 gitk:5008 msgid "Descendant" msgstr "Discendente" -#: gitk:4744 +#: gitk:5004 msgid "Not descendant" msgstr "Non discendente" -#: gitk:4751 gitk:4756 +#: gitk:5011 gitk:5016 msgid "Ancestor" msgstr "Ascendente" -#: gitk:4752 +#: gitk:5012 msgid "Not ancestor" msgstr "Non ascendente" -#: gitk:5042 +#: gitk:5306 msgid "Local changes checked in to index but not committed" msgstr "Modifiche locali presenti nell'indice ma non nell'archivio" -#: gitk:5078 +#: gitk:5342 msgid "Local uncommitted changes, not checked in to index" msgstr "Modifiche locali non presenti né nell'archivio né nell'indice" -#: gitk:6759 +#: gitk:7115 +msgid "and many more" +msgstr "" + +#: gitk:7118 msgid "many" msgstr "molti" -#: gitk:6942 +#: gitk:7309 msgid "Tags:" msgstr "Etichette:" -#: gitk:6959 gitk:6965 gitk:8280 +#: gitk:7326 gitk:7332 gitk:8806 msgid "Parent" msgstr "Genitore" -#: gitk:6970 +#: gitk:7337 msgid "Child" msgstr "Figlio" -#: gitk:6979 +#: gitk:7346 msgid "Branch" msgstr "Ramo" -#: gitk:6982 +#: gitk:7349 msgid "Follows" msgstr "Segue" -#: gitk:6985 +#: gitk:7352 msgid "Precedes" msgstr "Precede" -#: gitk:7522 +#: gitk:7947 #, tcl-format msgid "Error getting diffs: %s" msgstr "Errore nella lettura delle differenze:" -#: gitk:8108 +#: gitk:8631 msgid "Goto:" msgstr "Vai a:" -#: gitk:8129 +#: gitk:8652 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "La SHA1 id abbreviata %s è ambigua" -#: gitk:8136 +#: gitk:8659 #, tcl-format msgid "Revision %s is not known" msgstr "La revisione %s è sconosciuta" -#: gitk:8146 +#: gitk:8669 #, tcl-format msgid "SHA1 id %s is not known" msgstr "La SHA1 id %s è sconosciuta" -#: gitk:8148 +#: gitk:8671 #, tcl-format msgid "Revision %s is not in the current view" msgstr "La revisione %s non è presente nella vista attuale" -#: gitk:8290 +#: gitk:8813 gitk:8828 +msgid "Date" +msgstr "Data" + +#: gitk:8816 msgid "Children" msgstr "Figli" -#: gitk:8348 +#: gitk:8879 #, tcl-format msgid "Reset %s branch to here" msgstr "Aggiorna il ramo %s a questa revisione" -#: gitk:8350 +#: gitk:8881 msgid "Detached head: can't reset" msgstr "Nessun ramo attivo: reset impossibile" -#: gitk:8459 gitk:8465 +#: gitk:8986 gitk:8992 msgid "Skipping merge commit " msgstr "Salto la revisione di fusione " -#: gitk:8474 gitk:8479 +#: gitk:9001 gitk:9006 msgid "Error getting patch ID for " msgstr "Errore nella identificazione della patch per " -#: gitk:8475 gitk:8480 +#: gitk:9002 gitk:9007 msgid " - stopping\n" msgstr " - fine\n" -#: gitk:8485 gitk:8488 gitk:8496 gitk:8510 gitk:8519 +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 msgid "Commit " msgstr "La revisione " -#: gitk:8489 +#: gitk:9016 msgid "" " is the same patch as\n" " " @@ -847,7 +890,7 @@ msgstr "" " ha le stesse differenze di\n" " " -#: gitk:8497 +#: gitk:9024 msgid "" " differs from\n" " " @@ -855,7 +898,7 @@ msgstr "" " è diversa da\n" " " -#: gitk:8499 +#: gitk:9026 msgid "" "Diff of commits:\n" "\n" @@ -863,129 +906,129 @@ msgstr "" "Differenze tra le revisioni:\n" "\n" -#: gitk:8511 gitk:8520 +#: gitk:9038 gitk:9047 #, tcl-format msgid " has %s children - stopping\n" msgstr " ha %s figli - fine\n" -#: gitk:8539 +#: gitk:9066 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Errore nella scrittura della revisione nel file: %s" -#: gitk:8545 +#: gitk:9072 #, tcl-format msgid "Error diffing commits: %s" msgstr "Errore nelle differenze tra le revisioni: %s" -#: gitk:8575 +#: gitk:9118 msgid "Top" msgstr "Inizio" -#: gitk:8576 +#: gitk:9119 msgid "From" msgstr "Da" -#: gitk:8581 +#: gitk:9124 msgid "To" msgstr "A" -#: gitk:8605 +#: gitk:9148 msgid "Generate patch" msgstr "Genera patch" -#: gitk:8607 +#: gitk:9150 msgid "From:" msgstr "Da:" -#: gitk:8616 +#: gitk:9159 msgid "To:" msgstr "A:" -#: gitk:8625 +#: gitk:9168 msgid "Reverse" msgstr "Inverti" -#: gitk:8627 gitk:8822 +#: gitk:9170 gitk:9366 msgid "Output file:" msgstr "Scrivi sul file:" -#: gitk:8633 +#: gitk:9176 msgid "Generate" msgstr "Genera" -#: gitk:8671 +#: gitk:9214 msgid "Error creating patch:" msgstr "Errore nella creazione della patch:" -#: gitk:8694 gitk:8810 gitk:8867 +#: gitk:9237 gitk:9354 gitk:9411 msgid "ID:" msgstr "ID:" -#: gitk:8703 +#: gitk:9246 msgid "Tag name:" msgstr "Nome etichetta:" -#: gitk:8706 +#: gitk:9249 msgid "Tag message is optional" msgstr "Il messaggio dell'etichetta è opzionale" -#: gitk:8708 +#: gitk:9251 msgid "Tag message:" msgstr "Messaggio dell'etichetta:" -#: gitk:8712 gitk:8876 +#: gitk:9255 gitk:9420 msgid "Create" msgstr "Crea" -#: gitk:8730 +#: gitk:9273 msgid "No tag name specified" msgstr "Nessuna etichetta specificata" -#: gitk:8734 +#: gitk:9277 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "L'etichetta \"%s\" esiste già " -#: gitk:8744 +#: gitk:9287 msgid "Error creating tag:" msgstr "Errore nella creazione dell'etichetta:" -#: gitk:8819 +#: gitk:9363 msgid "Command:" msgstr "Comando:" -#: gitk:8827 +#: gitk:9371 msgid "Write" msgstr "Scrivi" -#: gitk:8845 +#: gitk:9389 msgid "Error writing commit:" msgstr "Errore nella scrittura della revisione:" -#: gitk:8872 +#: gitk:9416 msgid "Name:" msgstr "Nome:" -#: gitk:8895 +#: gitk:9439 msgid "Please specify a name for the new branch" msgstr "Specificare un nome per il nuovo ramo" -#: gitk:8900 +#: gitk:9444 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "Il ramo '%s' esiste già . Sovrascrivere?" -#: gitk:8966 +#: gitk:9511 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "La revisione %s è già inclusa nel ramo %s -- applicarla di nuovo?" -#: gitk:8971 +#: gitk:9516 msgid "Cherry-picking" msgstr "" -#: gitk:8980 +#: gitk:9525 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -996,7 +1039,7 @@ msgstr "" "Prima di riprovare, bisogna creare una nuova revisione, annullare le " "modifiche o usare 'git stash'." -#: gitk:8986 +#: gitk:9531 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1004,32 +1047,62 @@ msgstr "" "Impossibile eseguire cherry-pick a causa di un conflitto nella fusione.\n" "Vuoi avviare git citool per risolverlo?" -#: gitk:9002 +#: gitk:9547 gitk:9605 msgid "No changes committed" msgstr "Nessuna modifica archiviata" -#: gitk:9028 +#: gitk:9574 +#, fuzzy, tcl-format +msgid "Commit %s is not included in branch %s -- really revert it?" +msgstr "La revisione %s è già inclusa nel ramo %s -- applicarla di nuovo?" + +#: gitk:9579 +#, fuzzy +msgid "Reverting" +msgstr "git reset in corso" + +#: gitk:9587 +#, fuzzy, tcl-format +msgid "" +"Revert failed because of local changes to the following files:%s Please " +"commit, reset or stash your changes and try again." +msgstr "" +"Impossibile eseguire cherry-pick perché il file '%s' è stato modificato " +"nella directory di lavoro.\n" +"Prima di riprovare, bisogna creare una nuova revisione, annullare le " +"modifiche o usare 'git stash'." + +#: gitk:9591 +#, fuzzy +msgid "" +"Revert failed because of merge conflict.\n" +" Do you wish to run git citool to resolve it?" +msgstr "" +"Impossibile eseguire cherry-pick a causa di un conflitto nella fusione.\n" +"Vuoi avviare git citool per risolverlo?" + +#: gitk:9634 msgid "Confirm reset" msgstr "Conferma git reset" -#: gitk:9030 +#: gitk:9636 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Aggiornare il ramo %s a %s?" -#: gitk:9032 +#: gitk:9638 msgid "Reset type:" msgstr "Tipo di aggiornamento:" -#: gitk:9035 +#: gitk:9641 msgid "Soft: Leave working tree and index untouched" msgstr "Soft: Lascia la direcory di lavoro e l'indice come sono" -#: gitk:9038 +#: gitk:9644 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Mixed: Lascia la directory di lavoro come è, aggiorna l'indice" -#: gitk:9041 +#: gitk:9647 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1037,19 +1110,19 @@ msgstr "" "Hard: Aggiorna la directory di lavoro e l'indice\n" "(abbandona TUTTE le modifiche locali)" -#: gitk:9058 +#: gitk:9664 msgid "Resetting" msgstr "git reset in corso" -#: gitk:9118 +#: gitk:9724 msgid "Checking out" msgstr "Attivazione in corso" -#: gitk:9171 +#: gitk:9777 msgid "Cannot delete the currently checked-out branch" msgstr "Impossibile cancellare il ramo attualmente attivo" -#: gitk:9177 +#: gitk:9783 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1058,16 +1131,16 @@ msgstr "" "Le revisioni nel ramo %s non sono presenti su altri rami.\n" "Cancellare il ramo %s?" -#: gitk:9208 +#: gitk:9814 #, tcl-format msgid "Tags and heads: %s" msgstr "Etichette e rami: %s" -#: gitk:9223 +#: gitk:9829 msgid "Filter" msgstr "Filtro" -#: gitk:9518 +#: gitk:10125 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1075,202 +1148,225 @@ msgstr "" "Errore nella lettura della topologia delle revisioni: le informazioni sul " "ramo e le etichette precedenti e seguenti saranno incomplete." -#: gitk:10504 +#: gitk:11102 msgid "Tag" msgstr "Etichetta" -#: gitk:10504 +#: gitk:11106 msgid "Id" msgstr "Id" -#: gitk:10554 +#: gitk:11189 msgid "Gitk font chooser" msgstr "Scelta caratteri gitk" -#: gitk:10571 +#: gitk:11206 msgid "B" msgstr "B" -#: gitk:10574 +#: gitk:11209 msgid "I" msgstr "I" -#: gitk:10692 -msgid "Gitk preferences" -msgstr "Preferenze gitk" - -#: gitk:10694 +#: gitk:11327 msgid "Commit list display options" msgstr "Opzioni visualizzazione dell'elenco revisioni" -#: gitk:10697 +#: gitk:11330 msgid "Maximum graph width (lines)" msgstr "Larghezza massima del grafico (in linee)" -#: gitk:10700 -#, tcl-format +#: gitk:11334 +#, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Larghezza massima del grafico (% del pannello)" -#: gitk:10703 +#: gitk:11337 msgid "Show local changes" msgstr "Mostra modifiche locali" -#: gitk:10706 -msgid "Auto-select SHA1" +#: gitk:11340 +#, fuzzy +msgid "Auto-select SHA1 (length)" msgstr "Seleziona automaticamente SHA1 hash" -#: gitk:10709 +#: gitk:11344 msgid "Hide remote refs" msgstr "Nascondi i riferimenti remoti" -#: gitk:10713 +#: gitk:11348 msgid "Diff display options" msgstr "Opzioni di visualizzazione delle differenze" -#: gitk:10715 +#: gitk:11350 msgid "Tab spacing" msgstr "Spaziatura tabulazioni" -#: gitk:10718 -msgid "Display nearby tags" +#: gitk:11353 +#, fuzzy +msgid "Display nearby tags/heads" msgstr "Mostra etichette vicine" -#: gitk:10721 +#: gitk:11356 +msgid "Maximum # tags/heads to show" +msgstr "" + +#: gitk:11359 msgid "Limit diffs to listed paths" msgstr "Limita le differenze ai percorsi elencati" -#: gitk:10724 +#: gitk:11362 msgid "Support per-file encodings" msgstr "Attiva codifica file per file" -#: gitk:10730 gitk:10819 +#: gitk:11368 gitk:11515 msgid "External diff tool" msgstr "Visualizzatore di differenze" -#: gitk:10731 +#: gitk:11369 msgid "Choose..." msgstr "Scegli..." -#: gitk:10736 +#: gitk:11374 msgid "General options" msgstr "Opzioni generali" -#: gitk:10739 +#: gitk:11377 msgid "Use themed widgets" msgstr "Utilizza interfaccia a tema" -#: gitk:10741 +#: gitk:11379 msgid "(change requires restart)" msgstr "(una modifica richiede il riavvio)" -#: gitk:10743 +#: gitk:11381 msgid "(currently unavailable)" msgstr "(momentaneamente non disponibile)" -#: gitk:10747 +#: gitk:11392 msgid "Colors: press to choose" msgstr "Colori: premere per scegliere" -#: gitk:10750 +#: gitk:11395 msgid "Interface" msgstr "Interfaccia" -#: gitk:10751 +#: gitk:11396 msgid "interface" msgstr "interfaccia" -#: gitk:10754 +#: gitk:11399 msgid "Background" msgstr "Sfondo" -#: gitk:10755 gitk:10785 +#: gitk:11400 gitk:11430 msgid "background" msgstr "sfondo" -#: gitk:10758 +#: gitk:11403 msgid "Foreground" msgstr "Primo piano" -#: gitk:10759 +#: gitk:11404 msgid "foreground" msgstr "primo piano" -#: gitk:10762 +#: gitk:11407 msgid "Diff: old lines" msgstr "Diff: vecchie linee" -#: gitk:10763 +#: gitk:11408 msgid "diff old lines" msgstr "vecchie linee" -#: gitk:10767 +#: gitk:11412 msgid "Diff: new lines" msgstr "Diff: nuove linee" -#: gitk:10768 +#: gitk:11413 msgid "diff new lines" msgstr "nuove linee" -#: gitk:10772 +#: gitk:11417 msgid "Diff: hunk header" msgstr "Diff: intestazione della sezione" -#: gitk:10774 +#: gitk:11419 msgid "diff hunk header" msgstr "intestazione della sezione" -#: gitk:10778 +#: gitk:11423 msgid "Marked line bg" msgstr "Sfondo riga selezionata" -#: gitk:10780 +#: gitk:11425 msgid "marked line background" msgstr "sfondo riga selezionata" -#: gitk:10784 +#: gitk:11429 msgid "Select bg" msgstr "Sfondo" -#: gitk:10788 +#: gitk:11438 msgid "Fonts: press to choose" msgstr "Carattere: premere per scegliere" -#: gitk:10790 +#: gitk:11440 msgid "Main font" msgstr "Carattere principale" -#: gitk:10791 +#: gitk:11441 msgid "Diff display font" msgstr "Carattere per differenze" -#: gitk:10792 +#: gitk:11442 msgid "User interface font" msgstr "Carattere per interfaccia utente" -#: gitk:10829 +#: gitk:11464 +msgid "Gitk preferences" +msgstr "Preferenze gitk" + +#: gitk:11473 +#, fuzzy +msgid "General" +msgstr "Genera" + +#: gitk:11474 +msgid "Colors" +msgstr "" + +#: gitk:11475 +msgid "Fonts" +msgstr "" + +#: gitk:11525 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: scegliere un colore per %s" -#: gitk:11433 +#: gitk:12242 msgid "Cannot find a git repository here." msgstr "Archivio git non trovato." -#: gitk:11437 -#, tcl-format -msgid "Cannot find the git directory \"%s\"." -msgstr "Directory git \"%s\" non trovata." - -#: gitk:11484 +#: gitk:12289 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Argomento ambiguo: '%s' è sia revisione che nome di file" -#: gitk:11496 +#: gitk:12301 msgid "Bad arguments to gitk:" msgstr "Gitk: argomenti errati:" -#: gitk:11587 +#: gitk:12405 msgid "Command line" msgstr "Linea di comando" + +#~ msgid "next" +#~ msgstr "succ" + +#~ msgid "prev" +#~ msgstr "prec" + +#~ msgid "Cannot find the git directory \"%s\"." +#~ msgstr "Directory git \"%s\" non trovata." diff --git a/gitk-git/po/ja.po b/gitk-git/po/ja.po index 4f47051..db47a4c 100644 --- a/gitk-git/po/ja.po +++ b/gitk-git/po/ja.po @@ -8,34 +8,43 @@ msgid "" msgstr "" "Project-Id-Version: gitk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-04 00:08+0900\n" +"POT-Creation-Date: 2015-03-15 14:37+1100\n" "PO-Revision-Date: 2009-11-06 01:45+0900\n" "Last-Translator: Mizar <mizar.jp@gmail.com>\n" "Language-Team: Japanese\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: gitk:113 +#: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "マージã•ã‚Œã¦ã„ãªã„ファイルã®ãƒªã‚¹ãƒˆã‚’å–å¾—ã§ãã¾ã›ã‚“:" -#: gitk:269 +#: gitk:212 gitk:2381 +msgid "Color words" +msgstr "" + +#: gitk:217 gitk:2381 gitk:8201 gitk:8234 +msgid "Markup words" +msgstr "" + +#: gitk:324 msgid "Error parsing revisions:" msgstr "リビジョン解æžã‚¨ãƒ©ãƒ¼:" -#: gitk:324 +#: gitk:380 msgid "Error executing --argscmd command:" msgstr "--argscmd コマンド実行エラー:" -#: gitk:337 +#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "ファイル未é¸æŠž: --merge ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸãŒã€ãƒžãƒ¼ã‚¸ã•ã‚Œã¦ã„ãªã„ファイルã¯ã‚ã‚Š" "ã¾ã›ã‚“。" -#: gitk:340 +#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -43,299 +52,315 @@ msgstr "" "ファイル未é¸æŠž: --merge ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸãŒã€ãƒ•ã‚¡ã‚¤ãƒ«åˆ¶é™å†…ã«ãƒžãƒ¼ã‚¸ã•ã‚Œã¦ã„ãª" "ã„ファイルã¯ã‚ã‚Šã¾ã›ã‚“。" -#: gitk:362 gitk:509 +#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "git log 実行エラー:" -#: gitk:380 gitk:525 +#: gitk:436 gitk:582 msgid "Reading" msgstr "èªã¿è¾¼ã¿ä¸" -#: gitk:440 gitk:4132 +#: gitk:496 gitk:4508 msgid "Reading commits..." msgstr "コミットèªã¿è¾¼ã¿ä¸..." -#: gitk:443 gitk:1561 gitk:4135 +#: gitk:499 gitk:1637 gitk:4511 msgid "No commits selected" msgstr "コミットãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“" -#: gitk:1437 +#: gitk:1511 msgid "Can't parse git log output:" msgstr "git log ã®å‡ºåŠ›ã‚’解æžã§ãã¾ã›ã‚“:" -#: gitk:1657 +#: gitk:1740 msgid "No commit information available" msgstr "有効ãªã‚³ãƒŸãƒƒãƒˆã®æƒ…å ±ãŒã‚ã‚Šã¾ã›ã‚“" -#: gitk:1790 +#: gitk:1897 msgid "mc" msgstr "mc" -#: gitk:1817 gitk:3925 gitk:8842 gitk:10378 gitk:10558 +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 msgid "OK" msgstr "OK" -#: gitk:1819 gitk:3927 gitk:8439 gitk:8513 gitk:8623 gitk:8672 gitk:8844 -#: gitk:10379 gitk:10559 +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 +#: gitk:11221 gitk:11501 msgid "Cancel" msgstr "ã‚ャンセル" -#: gitk:1919 +#: gitk:2069 msgid "Update" msgstr "æ›´æ–°" -#: gitk:1920 +#: gitk:2070 msgid "Reload" msgstr "リãƒãƒ¼ãƒ‰" -#: gitk:1921 +#: gitk:2071 msgid "Reread references" msgstr "リファレンスをå†èªã¿è¾¼ã¿" -#: gitk:1922 +#: gitk:2072 msgid "List references" msgstr "リファレンスリストを表示" -#: gitk:1924 +#: gitk:2074 msgid "Start git gui" msgstr "git gui ã®é–‹å§‹" -#: gitk:1926 +#: gitk:2076 msgid "Quit" msgstr "終了" -#: gitk:1918 +#: gitk:2068 msgid "File" msgstr "ファイル" -#: gitk:1930 +#: gitk:2080 msgid "Preferences" msgstr "è¨å®š" -#: gitk:1929 +#: gitk:2079 msgid "Edit" msgstr "編集" -#: gitk:1934 +#: gitk:2084 msgid "New view..." msgstr "æ–°è¦ãƒ“ュー..." -#: gitk:1935 +#: gitk:2085 msgid "Edit view..." msgstr "ビュー編集..." -#: gitk:1936 +#: gitk:2086 msgid "Delete view" msgstr "ビュー削除" -#: gitk:1938 +#: gitk:2088 msgid "All files" msgstr "å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«" -#: gitk:1933 gitk:3679 +#: gitk:2083 gitk:4050 msgid "View" msgstr "ビュー" -#: gitk:1943 gitk:1953 gitk:2656 +#: gitk:2093 gitk:2103 gitk:3009 msgid "About gitk" msgstr "gitk ã«ã¤ã„ã¦" -#: gitk:1944 gitk:1958 +#: gitk:2094 gitk:2108 msgid "Key bindings" msgstr "ã‚ーãƒã‚¤ãƒ³ãƒ‡ã‚£ãƒ³ã‚°" -#: gitk:1942 gitk:1957 +#: gitk:2092 gitk:2107 msgid "Help" msgstr "ヘルプ" -#: gitk:2018 -msgid "SHA1 ID: " -msgstr "SHA1 ID: " +#: gitk:2185 gitk:8633 +msgid "SHA1 ID:" +msgstr "SHA1 ID:" -#: gitk:2049 +#: gitk:2229 msgid "Row" msgstr "è¡Œ" -#: gitk:2080 +#: gitk:2267 msgid "Find" msgstr "検索" -#: gitk:2081 -msgid "next" -msgstr "次" - -#: gitk:2082 -msgid "prev" -msgstr "å‰" - -#: gitk:2083 +#: gitk:2295 msgid "commit" msgstr "コミット" -#: gitk:2086 gitk:2088 gitk:4293 gitk:4316 gitk:4340 gitk:6281 gitk:6353 -#: gitk:6437 +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 +#: gitk:6893 msgid "containing:" msgstr "å«ã‚€:" -#: gitk:2089 gitk:3164 gitk:3169 gitk:4368 +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 msgid "touching paths:" msgstr "パスã®ä¸€éƒ¨:" -#: gitk:2090 gitk:4373 +#: gitk:2303 gitk:4759 msgid "adding/removing string:" msgstr "è¿½åŠ /除去ã™ã‚‹æ–‡å—列:" -#: gitk:2099 gitk:2101 +#: gitk:2304 gitk:4761 +msgid "changing lines matching:" +msgstr "" + +#: gitk:2313 gitk:2315 gitk:4748 msgid "Exact" msgstr "英å—ã®å¤§å°ã‚’区別ã™ã‚‹" -#: gitk:2101 gitk:4448 gitk:6249 +#: gitk:2315 gitk:4836 gitk:6704 msgid "IgnCase" msgstr "英å—ã®å¤§å°ã‚’区別ã—ãªã„" -#: gitk:2101 gitk:4342 gitk:4446 gitk:6245 +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 msgid "Regexp" msgstr "æ£è¦è¡¨ç¾" -#: gitk:2103 gitk:2104 gitk:4467 gitk:4497 gitk:4504 gitk:6373 gitk:6441 +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 msgid "All fields" msgstr "å…¨ã¦ã®é …ç›®" -#: gitk:2104 gitk:4465 gitk:4497 gitk:6312 +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 msgid "Headline" msgstr "ヘッドライン" -#: gitk:2105 gitk:4465 gitk:6312 gitk:6441 gitk:6875 +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 msgid "Comments" msgstr "コメント" -#: gitk:2105 gitk:4465 gitk:4469 gitk:4504 gitk:6312 gitk:6810 gitk:8091 -#: gitk:8106 +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 +#: gitk:8826 msgid "Author" msgstr "作者" -#: gitk:2105 gitk:4465 gitk:6312 gitk:6812 +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 msgid "Committer" msgstr "コミット者" -#: gitk:2134 +#: gitk:2350 msgid "Search" msgstr "検索" -#: gitk:2141 +#: gitk:2358 msgid "Diff" msgstr "Diff" -#: gitk:2143 +#: gitk:2360 msgid "Old version" msgstr "æ—§ãƒãƒ¼ã‚¸ãƒ§ãƒ³" -#: gitk:2145 +#: gitk:2362 msgid "New version" msgstr "æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³" -#: gitk:2147 +#: gitk:2364 msgid "Lines of context" msgstr "文脈行数" -#: gitk:2157 +#: gitk:2374 msgid "Ignore space change" msgstr "空白ã®é•ã„を無視" -#: gitk:2215 +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +msgid "Line diff" +msgstr "" + +#: gitk:2445 msgid "Patch" msgstr "パッãƒ" -#: gitk:2217 +#: gitk:2447 msgid "Tree" msgstr "ツリー" -#: gitk:2361 gitk:2378 +#: gitk:2616 gitk:2636 msgid "Diff this -> selected" msgstr "ã“ã‚Œã¨é¸æŠžã—ãŸã‚³ãƒŸãƒƒãƒˆã®diffを見る" -#: gitk:2362 gitk:2379 +#: gitk:2617 gitk:2637 msgid "Diff selected -> this" msgstr "é¸æŠžã—ãŸã‚³ãƒŸãƒƒãƒˆã¨ã“ã‚Œã®diffを見る" -#: gitk:2363 gitk:2380 +#: gitk:2618 gitk:2638 msgid "Make patch" msgstr "パッãƒä½œæˆ" -#: gitk:2364 gitk:8497 +#: gitk:2619 gitk:9235 msgid "Create tag" msgstr "タグ生æˆ" -#: gitk:2365 gitk:8603 +#: gitk:2620 gitk:9352 msgid "Write commit to file" msgstr "コミットをファイルã«æ›¸ã出ã™" -#: gitk:2366 gitk:8660 +#: gitk:2621 gitk:9409 msgid "Create new branch" msgstr "æ–°è¦ãƒ–ランãƒç”Ÿæˆ" -#: gitk:2367 +#: gitk:2622 msgid "Cherry-pick this commit" msgstr "ã“ã®ã‚³ãƒŸãƒƒãƒˆã‚’ãƒã‚§ãƒªãƒ¼ãƒ”ックã™ã‚‹" -#: gitk:2368 +#: gitk:2623 msgid "Reset HEAD branch to here" msgstr "ブランãƒã®HEADã‚’ã“ã“ã«ãƒªã‚»ãƒƒãƒˆã™ã‚‹" -#: gitk:2369 +#: gitk:2624 msgid "Mark this commit" msgstr "ã“ã®ã‚³ãƒŸãƒƒãƒˆã«ãƒžãƒ¼ã‚¯ã‚’ã¤ã‘ã‚‹" -#: gitk:2370 +#: gitk:2625 msgid "Return to mark" msgstr "マークを付ã‘ãŸæ‰€ã«æˆ»ã‚‹" -#: gitk:2371 +#: gitk:2626 msgid "Find descendant of this and mark" msgstr "ã“ã‚Œã¨ãƒžãƒ¼ã‚¯ã‚’ã¤ã‘ãŸæ‰€ã¨ã®åå«ã‚’見ã¤ã‘ã‚‹" -#: gitk:2372 +#: gitk:2627 msgid "Compare with marked commit" msgstr "マークを付ã‘ãŸã‚³ãƒŸãƒƒãƒˆã¨æ¯”較ã™ã‚‹" -#: gitk:2386 +#: gitk:2628 gitk:2639 +#, fuzzy +msgid "Diff this -> marked commit" +msgstr "ã“ã‚Œã¨é¸æŠžã—ãŸã‚³ãƒŸãƒƒãƒˆã®diffを見る" + +#: gitk:2629 gitk:2640 +#, fuzzy +msgid "Diff marked commit -> this" +msgstr "é¸æŠžã—ãŸã‚³ãƒŸãƒƒãƒˆã¨ã“ã‚Œã®diffを見る" + +#: gitk:2630 +#, fuzzy +msgid "Revert this commit" +msgstr "ã“ã®ã‚³ãƒŸãƒƒãƒˆã«ãƒžãƒ¼ã‚¯ã‚’ã¤ã‘ã‚‹" + +#: gitk:2646 msgid "Check out this branch" msgstr "ã“ã®ãƒ–ランãƒã‚’ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã™ã‚‹" -#: gitk:2387 +#: gitk:2647 msgid "Remove this branch" msgstr "ã“ã®ãƒ–ランãƒã‚’除去ã™ã‚‹" -#: gitk:2394 +#: gitk:2654 msgid "Highlight this too" msgstr "ã“れもãƒã‚¤ãƒ©ã‚¤ãƒˆã•ã›ã‚‹" -#: gitk:2395 +#: gitk:2655 msgid "Highlight this only" msgstr "ã“ã‚Œã ã‘ã‚’ãƒã‚¤ãƒ©ã‚¤ãƒˆã•ã›ã‚‹" -#: gitk:2396 +#: gitk:2656 msgid "External diff" msgstr "外部diffツール" -#: gitk:2397 +#: gitk:2657 msgid "Blame parent commit" msgstr "親コミットã‹ã‚‰ blame ã‚’ã‹ã‘ã‚‹" -#: gitk:2404 +#: gitk:2664 msgid "Show origin of this line" msgstr "ã“ã®è¡Œã®å‡ºè‡ªã‚’表示ã™ã‚‹" -#: gitk:2405 +#: gitk:2665 msgid "Run git gui blame on this line" msgstr "ã“ã®è¡Œã« git gui 㧠blame ã‚’ã‹ã‘ã‚‹" -#: gitk:2658 +#: gitk:3011 +#, fuzzy msgid "" "\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" +"Copyright © 2005-2014 Paul Mackerras\n" "\n" "Use and redistribute under the terms of the GNU General Public License" msgstr "" @@ -346,297 +371,315 @@ msgstr "" "\n" "使用ãŠã‚ˆã³å†é…布㯠GNU General Public License ã«å¾“ã£ã¦ãã ã•ã„" -#: gitk:2666 gitk:2728 gitk:9025 +#: gitk:3019 gitk:3085 gitk:9836 msgid "Close" msgstr "é–‰ã˜ã‚‹" -#: gitk:2685 +#: gitk:3040 msgid "Gitk key bindings" msgstr "Gitk ã‚ーãƒã‚¤ãƒ³ãƒ‡ã‚£ãƒ³ã‚°" -#: gitk:2688 +#: gitk:3043 msgid "Gitk key bindings:" msgstr "Gitk ã‚ーãƒã‚¤ãƒ³ãƒ‡ã‚£ãƒ³ã‚°:" -#: gitk:2690 +#: gitk:3045 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\t終了" -#: gitk:2691 +#: gitk:3046 +#, fuzzy, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-F>\t\t検索" + +#: gitk:3047 msgid "<Home>\t\tMove to first commit" msgstr "<Home>\t\t最åˆã®ã‚³ãƒŸãƒƒãƒˆã«ç§»å‹•" -#: gitk:2692 +#: gitk:3048 msgid "<End>\t\tMove to last commit" msgstr "<End>\t\t最後ã®ã‚³ãƒŸãƒƒãƒˆã«ç§»å‹•" -#: gitk:2693 -msgid "<Up>, p, i\tMove up one commit" +#: gitk:3049 +#, fuzzy +msgid "<Up>, p, k\tMove up one commit" msgstr "<Up>, p, i\t一ã¤ä¸Šã®ã‚³ãƒŸãƒƒãƒˆã«ç§»å‹•" -#: gitk:2694 -msgid "<Down>, n, k\tMove down one commit" +#: gitk:3050 +#, fuzzy +msgid "<Down>, n, j\tMove down one commit" msgstr "<Down>, n, k\t一ã¤ä¸‹ã®ã‚³ãƒŸãƒƒãƒˆã«ç§»å‹•" -#: gitk:2695 -msgid "<Left>, z, j\tGo back in history list" +#: gitk:3051 +#, fuzzy +msgid "<Left>, z, h\tGo back in history list" msgstr "<Left>, z, j\tå±¥æ´ã®å‰ã«æˆ»ã‚‹" -#: gitk:2696 +#: gitk:3052 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Right>, x, l\tå±¥æ´ã®æ¬¡ã¸é€²ã‚€" -#: gitk:2697 +#: gitk:3053 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "" + +#: gitk:3054 msgid "<PageUp>\tMove up one page in commit list" msgstr "<PageUp>\tコミットリストã®ä¸€ã¤ä¸Šã®ãƒšãƒ¼ã‚¸ã«ç§»å‹•" -#: gitk:2698 +#: gitk:3055 msgid "<PageDown>\tMove down one page in commit list" msgstr "<PageDown>\tコミットリストã®ä¸€ã¤ä¸‹ã®ãƒšãƒ¼ã‚¸ã«ç§»å‹•" -#: gitk:2699 +#: gitk:3056 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tコミットリストã®ä¸€ç•ªä¸Šã«ã‚¹ã‚¯ãƒãƒ¼ãƒ«ã™ã‚‹" -#: gitk:2700 +#: gitk:3057 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tコミットリストã®ä¸€ç•ªä¸‹ã«ã‚¹ã‚¯ãƒãƒ¼ãƒ«ã™ã‚‹" -#: gitk:2701 +#: gitk:3058 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Up>\tコミットリストã®ä¸€ã¤ä¸‹ã®è¡Œã«ã‚¹ã‚¯ãƒãƒ¼ãƒ«ã™ã‚‹" -#: gitk:2702 +#: gitk:3059 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Down>\tコミットリストã®ä¸€ã¤ä¸‹ã®è¡Œã«ã‚¹ã‚¯ãƒãƒ¼ãƒ«ã™ã‚‹" -#: gitk:2703 +#: gitk:3060 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tコミットリストã®ä¸Šã®ãƒšãƒ¼ã‚¸ã«ã‚¹ã‚¯ãƒãƒ¼ãƒ«ã™ã‚‹" -#: gitk:2704 +#: gitk:3061 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tコミットリストã®ä¸‹ã®ãƒšãƒ¼ã‚¸ã«ã‚¹ã‚¯ãƒãƒ¼ãƒ«ã™ã‚‹" -#: gitk:2705 +#: gitk:3062 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" msgstr "<Shift-Up>\t後方を検索 (上方ã®ãƒ»æ–°ã—ã„コミット)" -#: gitk:2706 +#: gitk:3063 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" msgstr "<Shift-Down>\tå‰æ–¹ã‚’検索（下方ã®ãƒ»å¤ã„コミット）" -#: gitk:2707 +#: gitk:3064 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Delete>, b\tdiffç”»é¢ã‚’上ã®ãƒšãƒ¼ã‚¸ã«ã‚¹ã‚¯ãƒãƒ¼ãƒ«ã™ã‚‹" -#: gitk:2708 +#: gitk:3065 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Backspace>\tdiffç”»é¢ã‚’上ã®ãƒšãƒ¼ã‚¸ã«ã‚¹ã‚¯ãƒãƒ¼ãƒ«ã™ã‚‹" -#: gitk:2709 +#: gitk:3066 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Space>\t\tdiffç”»é¢ã‚’下ã®ãƒšãƒ¼ã‚¸ã«ã‚¹ã‚¯ãƒãƒ¼ãƒ«ã™ã‚‹" -#: gitk:2710 +#: gitk:3067 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tdiffç”»é¢ã‚’上ã«18行スクãƒãƒ¼ãƒ«ã™ã‚‹" -#: gitk:2711 +#: gitk:3068 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tdiffç”»é¢ã‚’下ã«18行スクãƒãƒ¼ãƒ«ã™ã‚‹" -#: gitk:2712 +#: gitk:3069 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\t検索" -#: gitk:2713 +#: gitk:3070 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\t次を検索ã—ã¦ç§»å‹•" -#: gitk:2714 +#: gitk:3071 msgid "<Return>\tMove to next find hit" msgstr "<Return>\t次を検索ã—ã¦ç§»å‹•" -#: gitk:2715 +#: gitk:3072 msgid "/\t\tFocus the search box" msgstr "/\t\t検索ボックスã«ãƒ•ã‚©ãƒ¼ã‚«ã‚¹" -#: gitk:2716 +#: gitk:3073 msgid "?\t\tMove to previous find hit" msgstr "?\t\tå‰ã‚’検索ã—ã¦ç§»å‹•" -#: gitk:2717 +#: gitk:3074 msgid "f\t\tScroll diff view to next file" msgstr "f\t\t次ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«diffç”»é¢ã‚’スクãƒãƒ¼ãƒ«ã™ã‚‹" -#: gitk:2718 +#: gitk:3075 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tdiffç”»é¢ã®æ¬¡ã‚’検索" -#: gitk:2719 +#: gitk:3076 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tdiffç”»é¢ã®å‰ã‚’検索" -#: gitk:2720 +#: gitk:3077 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tæ–‡å—サイズを拡大" -#: gitk:2721 +#: gitk:3078 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tæ–‡å—サイズを拡大" -#: gitk:2722 +#: gitk:3079 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tæ–‡å—サイズを縮å°" -#: gitk:2723 +#: gitk:3080 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tæ–‡å—サイズを縮å°" -#: gitk:2724 +#: gitk:3081 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tæ›´æ–°" -#: gitk:3179 gitk:3188 +#: gitk:3546 gitk:3555 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "一時ディレクトリ %s 生æˆæ™‚エラー:" -#: gitk:3201 +#: gitk:3568 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "\"%s\" ã®ã‚¨ãƒ©ãƒ¼ãŒ %s ã«ç™ºç”Ÿ:" -#: gitk:3264 +#: gitk:3631 msgid "command failed:" msgstr "コマンド失敗:" -#: gitk:3410 +#: gitk:3780 msgid "No such commit" msgstr "ãã®ã‚ˆã†ãªã‚³ãƒŸãƒƒãƒˆã¯ã‚ã‚Šã¾ã›ã‚“" -#: gitk:3424 +#: gitk:3794 msgid "git gui blame: command failed:" msgstr "git gui blame: コマンド失敗:" -#: gitk:3455 +#: gitk:3825 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "マージã™ã‚‹ HEAD ã‚’èªã¿è¾¼ã‚ã¾ã›ã‚“: %s" -#: gitk:3463 +#: gitk:3833 #, tcl-format msgid "Error reading index: %s" msgstr "インデックスèªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼: %s" -#: gitk:3488 +#: gitk:3858 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "git blame を始ã‚られã¾ã›ã‚“: %s" -#: gitk:3491 gitk:6280 +#: gitk:3861 gitk:6735 msgid "Searching" msgstr "検索ä¸" -#: gitk:3523 +#: gitk:3893 #, tcl-format msgid "Error running git blame: %s" msgstr "git blame 実行エラー: %s" -#: gitk:3551 +#: gitk:3921 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "コミット %s ã«ç”±æ¥ã™ã‚‹ãã®è¡Œã¯ã€ã“ã®ãƒ“ューã«è¡¨ç¤ºã•ã‚Œã¦ã„ã¾ã›ã‚“" -#: gitk:3565 +#: gitk:3935 msgid "External diff viewer failed:" msgstr "外部diffビューアãŒå¤±æ•—:" -#: gitk:3683 +#: gitk:4053 msgid "Gitk view definition" msgstr "Gitk ビュー定義" -#: gitk:3687 +#: gitk:4057 msgid "Remember this view" msgstr "ã“ã®ãƒ“ューを記憶ã™ã‚‹" -#: gitk:3688 +#: gitk:4058 msgid "References (space separated list):" msgstr "リファレンス（スペース区切りã®ãƒªã‚¹ãƒˆï¼‰:" -#: gitk:3689 +#: gitk:4059 msgid "Branches & tags:" msgstr "ブランãƒï¼†ã‚¿ã‚°:" -#: gitk:3690 +#: gitk:4060 msgid "All refs" msgstr "å…¨ã¦ã®ãƒªãƒ•ã‚¡ãƒ¬ãƒ³ã‚¹" -#: gitk:3691 +#: gitk:4061 msgid "All (local) branches" msgstr "å…¨ã¦ã®ï¼ˆãƒãƒ¼ã‚«ãƒ«ãªï¼‰ãƒ–ランãƒ" -#: gitk:3692 +#: gitk:4062 msgid "All tags" msgstr "å…¨ã¦ã®ã‚¿ã‚°" -#: gitk:3693 +#: gitk:4063 msgid "All remote-tracking branches" msgstr "å…¨ã¦ã®ãƒªãƒ¢ãƒ¼ãƒˆè¿½è·¡ãƒ–ランãƒ" -#: gitk:3694 +#: gitk:4064 msgid "Commit Info (regular expressions):" msgstr "ã‚³ãƒŸãƒƒãƒˆæƒ…å ±ï¼ˆæ£è¦è¡¨ç¾ï¼‰:" -#: gitk:3695 +#: gitk:4065 msgid "Author:" msgstr "作者:" -#: gitk:3696 +#: gitk:4066 msgid "Committer:" msgstr "コミット者:" -#: gitk:3697 +#: gitk:4067 msgid "Commit Message:" msgstr "コミットメッセージ:" -#: gitk:3698 +#: gitk:4068 msgid "Matches all Commit Info criteria" msgstr "ã‚³ãƒŸãƒƒãƒˆæƒ…å ±ã®å…¨ã¦ã®æ¡ä»¶ã«ä¸€è‡´" -#: gitk:3699 +#: gitk:4069 +#, fuzzy +msgid "Matches none Commit Info criteria" +msgstr "ã‚³ãƒŸãƒƒãƒˆæƒ…å ±ã®å…¨ã¦ã®æ¡ä»¶ã«ä¸€è‡´" + +#: gitk:4070 msgid "Changes to Files:" msgstr "変更ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«:" -#: gitk:3700 +#: gitk:4071 msgid "Fixed String" msgstr "固定文å—列" -#: gitk:3701 +#: gitk:4072 msgid "Regular Expression" msgstr "æ£è¦è¡¨ç¾" -#: gitk:3702 +#: gitk:4073 msgid "Search string:" msgstr "検索文å—列:" -#: gitk:3703 +#: gitk:4074 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -644,205 +687,202 @@ msgstr "" "コミット日時 (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" -#: gitk:3704 +#: gitk:4075 msgid "Since:" msgstr "期間ã®å§‹ã‚:" -#: gitk:3705 +#: gitk:4076 msgid "Until:" msgstr "期間ã®çµ‚ã‚ã‚Š:" -#: gitk:3706 +#: gitk:4077 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "制é™ãƒ»çœç•¥ã™ã‚‹ãƒªãƒ“ジョンã®æ•°ï¼ˆæ£ã®æ•´æ•°ï¼‰:" -#: gitk:3707 +#: gitk:4078 msgid "Number to show:" msgstr "表示ã™ã‚‹æ•°:" -#: gitk:3708 +#: gitk:4079 msgid "Number to skip:" msgstr "çœç•¥ã™ã‚‹æ•°:" -#: gitk:3709 +#: gitk:4080 msgid "Miscellaneous options:" msgstr "ãã®ä»–ã®ã‚ªãƒ—ション:" -#: gitk:3710 +#: gitk:4081 msgid "Strictly sort by date" msgstr "厳密ã«æ—¥ä»˜é †ã§ä¸¦ã³æ›¿ãˆ" -#: gitk:3711 +#: gitk:4082 msgid "Mark branch sides" msgstr "å´æžãƒžãƒ¼ã‚¯" -#: gitk:3712 +#: gitk:4083 msgid "Limit to first parent" msgstr "最åˆã®è¦ªã«åˆ¶é™" -#: gitk:3713 +#: gitk:4084 msgid "Simple history" msgstr "簡易ãªå±¥æ´" -#: gitk:3714 +#: gitk:4085 msgid "Additional arguments to git log:" msgstr "git log ã¸ã®è¿½åŠ ã®å¼•æ•°:" -#: gitk:3715 +#: gitk:4086 msgid "Enter files and directories to include, one per line:" msgstr "å«ã¾ã‚Œã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ãƒ»ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’一行ã”ã¨ã«å…¥åŠ›:" -#: gitk:3716 +#: gitk:4087 msgid "Command to generate more commits to include:" msgstr "ã‚³ãƒŸãƒƒãƒˆè¿½åŠ ã‚³ãƒžãƒ³ãƒ‰:" -#: gitk:3838 +#: gitk:4211 msgid "Gitk: edit view" msgstr "Gitk: ビュー編集" -#: gitk:3846 +#: gitk:4219 msgid "-- criteria for selecting revisions" msgstr "― リビジョンã®é¸æŠžæ¡ä»¶" -#: gitk:3851 -msgid "View Name:" +#: gitk:4224 +#, fuzzy +msgid "View Name" msgstr "ビューå:" -#: gitk:3926 +#: gitk:4299 msgid "Apply (F5)" msgstr "é©ç”¨ (F5)" -#: gitk:3964 +#: gitk:4337 msgid "Error in commit selection arguments:" msgstr "コミットé¸æŠžå¼•æ•°ã®ã‚¨ãƒ©ãƒ¼:" -#: gitk:4017 gitk:4069 gitk:4517 gitk:4531 gitk:5792 gitk:11263 gitk:11264 +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 msgid "None" msgstr "ç„¡ã—" -#: gitk:4465 gitk:6312 gitk:8093 gitk:8108 -msgid "Date" -msgstr "日付" - -#: gitk:4465 gitk:6312 -msgid "CDate" -msgstr "作æˆæ—¥" - -#: gitk:4614 gitk:4619 +#: gitk:5003 gitk:5008 msgid "Descendant" msgstr "åå«" -#: gitk:4615 +#: gitk:5004 msgid "Not descendant" msgstr "éžåå«" -#: gitk:4622 gitk:4627 +#: gitk:5011 gitk:5016 msgid "Ancestor" msgstr "祖先" -#: gitk:4623 +#: gitk:5012 msgid "Not ancestor" msgstr "éžç¥–å…ˆ" -#: gitk:4913 +#: gitk:5306 msgid "Local changes checked in to index but not committed" msgstr "ステージã•ã‚ŒãŸã€ã‚³ãƒŸãƒƒãƒˆå‰ã®ãƒãƒ¼ã‚«ãƒ«ãªå¤‰æ›´" -#: gitk:4949 +#: gitk:5342 msgid "Local uncommitted changes, not checked in to index" msgstr "ステージã•ã‚Œã¦ã„ãªã„ã€ã‚³ãƒŸãƒƒãƒˆå‰ã®ãƒãƒ¼ã‚«ãƒ«ãªå¤‰æ›´" -#: gitk:6630 +#: gitk:7115 +msgid "and many more" +msgstr "" + +#: gitk:7118 msgid "many" msgstr "多数" -#: gitk:6814 +#: gitk:7309 msgid "Tags:" msgstr "ã‚¿ã‚°:" -#: gitk:6831 gitk:6837 gitk:8086 +#: gitk:7326 gitk:7332 gitk:8806 msgid "Parent" msgstr "親" -#: gitk:6842 +#: gitk:7337 msgid "Child" msgstr "å" -#: gitk:6851 +#: gitk:7346 msgid "Branch" msgstr "ブランãƒ" -#: gitk:6854 +#: gitk:7349 msgid "Follows" msgstr "下ä½" -#: gitk:6857 +#: gitk:7352 msgid "Precedes" msgstr "上ä½" -#: gitk:7359 +#: gitk:7947 #, tcl-format msgid "Error getting diffs: %s" msgstr "diffå–得エラー: %s" -#: gitk:7914 +#: gitk:8631 msgid "Goto:" msgstr "Goto:" -#: gitk:7916 -msgid "SHA1 ID:" -msgstr "SHA1 ID:" - -#: gitk:7935 +#: gitk:8652 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "%s ã‚’å«ã‚€ SHA1 ID ã¯è¤‡æ•°å˜åœ¨ã—ã¾ã™" -#: gitk:7942 +#: gitk:8659 #, tcl-format msgid "Revision %s is not known" msgstr "リビジョン %s ã¯ä¸æ˜Žã§ã™" -#: gitk:7952 +#: gitk:8669 #, tcl-format msgid "SHA1 id %s is not known" msgstr "SHA1 id %s ã¯ä¸æ˜Žã§ã™" -#: gitk:7954 +#: gitk:8671 #, tcl-format msgid "Revision %s is not in the current view" msgstr "リビジョン %s ã¯ç¾åœ¨ã®ãƒ“ューã«ã¯ã‚ã‚Šã¾ã›ã‚“" -#: gitk:8096 +#: gitk:8813 gitk:8828 +msgid "Date" +msgstr "日付" + +#: gitk:8816 msgid "Children" msgstr "å" -#: gitk:8153 +#: gitk:8879 #, tcl-format msgid "Reset %s branch to here" msgstr "%s ブランãƒã‚’ã“ã“ã«ãƒªã‚»ãƒƒãƒˆã™ã‚‹" -#: gitk:8155 +#: gitk:8881 msgid "Detached head: can't reset" msgstr "切り離ã•ã‚ŒãŸHEAD: リセットã§ãã¾ã›ã‚“" -#: gitk:8264 gitk:8270 +#: gitk:8986 gitk:8992 msgid "Skipping merge commit " msgstr "コミットマージをスã‚ップ: " -#: gitk:8279 gitk:8284 +#: gitk:9001 gitk:9006 msgid "Error getting patch ID for " msgstr "パッãƒå–得エラー: ID " -#: gitk:8280 gitk:8285 +#: gitk:9002 gitk:9007 msgid " - stopping\n" msgstr " - åœæ¢\n" -#: gitk:8290 gitk:8293 gitk:8301 gitk:8314 gitk:8323 +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 msgid "Commit " msgstr "コミット " -#: gitk:8294 +#: gitk:9016 msgid "" " is the same patch as\n" " " @@ -850,7 +890,7 @@ msgstr "" " ã¯ä¸‹è¨˜ã®ãƒ‘ッãƒã¨åŒç‰\n" " " -#: gitk:8302 +#: gitk:9024 msgid "" " differs from\n" " " @@ -858,7 +898,7 @@ msgstr "" " 下記ã‹ã‚‰ã®diff\n" " " -#: gitk:8304 +#: gitk:9026 msgid "" "Diff of commits:\n" "\n" @@ -866,122 +906,131 @@ msgstr "" "コミットã®diff:\n" "\n" -#: gitk:8315 gitk:8324 +#: gitk:9038 gitk:9047 #, tcl-format msgid " has %s children - stopping\n" msgstr " ã«ã¯ %s ã®åãŒã‚ã‚Šã¾ã™ - åœæ¢\n" -#: gitk:8344 +#: gitk:9066 #, tcl-format msgid "Error writing commit to file: %s" msgstr "ファイルã¸ã®ã‚³ãƒŸãƒƒãƒˆæ›¸ã出ã—エラー: %s" -#: gitk:8350 +#: gitk:9072 #, tcl-format msgid "Error diffing commits: %s" msgstr "コミットã®diff実行エラー: %s" -#: gitk:8380 +#: gitk:9118 msgid "Top" msgstr "Top" -#: gitk:8381 +#: gitk:9119 msgid "From" msgstr "From" -#: gitk:8386 +#: gitk:9124 msgid "To" msgstr "To" -#: gitk:8410 +#: gitk:9148 msgid "Generate patch" msgstr "パッãƒç”Ÿæˆ" -#: gitk:8412 +#: gitk:9150 msgid "From:" msgstr "From:" -#: gitk:8421 +#: gitk:9159 msgid "To:" msgstr "To:" -#: gitk:8430 +#: gitk:9168 msgid "Reverse" msgstr "逆" -#: gitk:8432 gitk:8617 +#: gitk:9170 gitk:9366 msgid "Output file:" msgstr "出力ファイル:" -#: gitk:8438 +#: gitk:9176 msgid "Generate" msgstr "生æˆ" -#: gitk:8476 +#: gitk:9214 msgid "Error creating patch:" msgstr "パッãƒç”Ÿæˆã‚¨ãƒ©ãƒ¼:" -#: gitk:8499 gitk:8605 gitk:8662 +#: gitk:9237 gitk:9354 gitk:9411 msgid "ID:" msgstr "ID:" -#: gitk:8508 +#: gitk:9246 msgid "Tag name:" msgstr "ã‚¿ã‚°å:" -#: gitk:8512 gitk:8671 +#: gitk:9249 +msgid "Tag message is optional" +msgstr "" + +#: gitk:9251 +#, fuzzy +msgid "Tag message:" +msgstr "ã‚¿ã‚°å:" + +#: gitk:9255 gitk:9420 msgid "Create" msgstr "生æˆ" -#: gitk:8529 +#: gitk:9273 msgid "No tag name specified" msgstr "ã‚¿ã‚°ã®å称ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“" -#: gitk:8533 +#: gitk:9277 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "ã‚¿ã‚° \"%s\" ã¯æ—¢ã«å˜åœ¨ã—ã¾ã™" -#: gitk:8539 +#: gitk:9287 msgid "Error creating tag:" msgstr "タグ生æˆã‚¨ãƒ©ãƒ¼:" -#: gitk:8614 +#: gitk:9363 msgid "Command:" msgstr "コマンド:" -#: gitk:8622 +#: gitk:9371 msgid "Write" msgstr "書ã出ã—" -#: gitk:8640 +#: gitk:9389 msgid "Error writing commit:" msgstr "コミット書ã出ã—エラー:" -#: gitk:8667 +#: gitk:9416 msgid "Name:" msgstr "åå‰:" -#: gitk:8690 +#: gitk:9439 msgid "Please specify a name for the new branch" msgstr "æ–°ã—ã„ブランãƒã®åå‰ã‚’指定ã—ã¦ãã ã•ã„" -#: gitk:8695 +#: gitk:9444 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "ブランム'%s' ã¯æ—¢ã«å˜åœ¨ã—ã¾ã™ã€‚上書ãã—ã¾ã™ã‹ï¼Ÿ" -#: gitk:8761 +#: gitk:9511 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "" "コミット %s ã¯æ—¢ã«ãƒ–ランム%s ã«å«ã¾ã‚Œã¦ã„ã¾ã™ ― 本当ã«ã“れをå†é©ç”¨ã—ã¾ã™ã‹ï¼Ÿ" -#: gitk:8766 +#: gitk:9516 msgid "Cherry-picking" msgstr "ãƒã‚§ãƒªãƒ¼ãƒ”ックä¸" -#: gitk:8775 +#: gitk:9525 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -991,7 +1040,7 @@ msgstr "" "ã‚ãªãŸã®å¤‰æ›´ã« commit, reset, stash ã®ã„ãšã‚Œã‹ã‚’è¡Œã£ã¦ã‹ã‚‰ã‚„ã‚Šç›´ã—ã¦ãã ã•" "ã„。" -#: gitk:8781 +#: gitk:9531 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -999,32 +1048,62 @@ msgstr "" "マージã®è¡çªã«ã‚ˆã£ã¦ãƒã‚§ãƒªãƒ¼ãƒ”ックã¯å¤±æ•—ã—ã¾ã—ãŸã€‚\n" "ã“ã®è§£æ±ºã®ãŸã‚ã« git citool を実行ã—ãŸã„ã§ã™ã‹ï¼Ÿ" -#: gitk:8797 +#: gitk:9547 gitk:9605 msgid "No changes committed" msgstr "何ã®å¤‰æ›´ã‚‚コミットã•ã‚Œã¦ã„ã¾ã›ã‚“" -#: gitk:8823 +#: gitk:9574 +#, fuzzy, tcl-format +msgid "Commit %s is not included in branch %s -- really revert it?" +msgstr "" +"コミット %s ã¯æ—¢ã«ãƒ–ランム%s ã«å«ã¾ã‚Œã¦ã„ã¾ã™ ― 本当ã«ã“れをå†é©ç”¨ã—ã¾ã™ã‹ï¼Ÿ" + +#: gitk:9579 +#, fuzzy +msgid "Reverting" +msgstr "リセットä¸" + +#: gitk:9587 +#, fuzzy, tcl-format +msgid "" +"Revert failed because of local changes to the following files:%s Please " +"commit, reset or stash your changes and try again." +msgstr "" +"ファイル '%s' ã®ãƒãƒ¼ã‚«ãƒ«ãªå¤‰æ›´ã®ãŸã‚ã«ãƒã‚§ãƒªãƒ¼ãƒ”ックã¯å¤±æ•—ã—ã¾ã—ãŸã€‚\n" +"ã‚ãªãŸã®å¤‰æ›´ã« commit, reset, stash ã®ã„ãšã‚Œã‹ã‚’è¡Œã£ã¦ã‹ã‚‰ã‚„ã‚Šç›´ã—ã¦ãã ã•" +"ã„。" + +#: gitk:9591 +#, fuzzy +msgid "" +"Revert failed because of merge conflict.\n" +" Do you wish to run git citool to resolve it?" +msgstr "" +"マージã®è¡çªã«ã‚ˆã£ã¦ãƒã‚§ãƒªãƒ¼ãƒ”ックã¯å¤±æ•—ã—ã¾ã—ãŸã€‚\n" +"ã“ã®è§£æ±ºã®ãŸã‚ã« git citool を実行ã—ãŸã„ã§ã™ã‹ï¼Ÿ" + +#: gitk:9634 msgid "Confirm reset" msgstr "確èªã‚’å–り消ã™" -#: gitk:8825 +#: gitk:9636 #, tcl-format msgid "Reset branch %s to %s?" msgstr "ブランム%s ã‚’ %s ã«ãƒªã‚»ãƒƒãƒˆã—ã¾ã™ã‹ï¼Ÿ" -#: gitk:8829 +#: gitk:9638 msgid "Reset type:" msgstr "Reset タイプ:" -#: gitk:8833 +#: gitk:9641 msgid "Soft: Leave working tree and index untouched" msgstr "Soft: 作æ¥ãƒ„リーもインデックスもãã®ã¾ã¾ã«ã™ã‚‹" -#: gitk:8836 +#: gitk:9644 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Mixed: 作æ¥ãƒ„リーをãã®ã¾ã¾ã«ã—ã¦ã€ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã‚’リセット" -#: gitk:8839 +#: gitk:9647 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1032,19 +1111,19 @@ msgstr "" "Hard: 作æ¥ãƒ„リーやインデックスをリセット\n" "（「全ã¦ã®ã€ãƒãƒ¼ã‚«ãƒ«ãªå¤‰æ›´ã‚’ç ´æ£„ï¼‰" -#: gitk:8856 +#: gitk:9664 msgid "Resetting" msgstr "リセットä¸" -#: gitk:8913 +#: gitk:9724 msgid "Checking out" msgstr "ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆ" -#: gitk:8966 +#: gitk:9777 msgid "Cannot delete the currently checked-out branch" msgstr "ç¾åœ¨ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã•ã‚Œã¦ã„るブランãƒã‚’削除ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“" -#: gitk:8972 +#: gitk:9783 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1053,16 +1132,16 @@ msgstr "" "ブランム%s ã«ã¯ä»–ã®ãƒ–ランãƒã«å˜åœ¨ã—ãªã„コミットãŒã‚ã‚Šã¾ã™ã€‚\n" "本当ã«ãƒ–ランム%s を削除ã—ã¾ã™ã‹ï¼Ÿ" -#: gitk:9003 +#: gitk:9814 #, tcl-format msgid "Tags and heads: %s" msgstr "ã‚¿ã‚°ã¨HEAD: %s" -#: gitk:9018 +#: gitk:9829 msgid "Filter" msgstr "フィルター" -#: gitk:9313 +#: gitk:10125 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1070,186 +1149,232 @@ msgstr "" "ã‚³ãƒŸãƒƒãƒˆæ§‹é€ æƒ…å ±èªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼; ブランãƒåŠã³ä¸Šä½/下ä½ã®ã‚¿ã‚°æƒ…å ±ãŒä¸å®Œå…¨ã§ã‚ã‚‹" "よã†ã§ã™ã€‚" -#: gitk:10299 +#: gitk:11102 msgid "Tag" msgstr "ã‚¿ã‚°" -#: gitk:10299 +#: gitk:11106 msgid "Id" msgstr "ID" -#: gitk:10347 +#: gitk:11189 msgid "Gitk font chooser" msgstr "Gitk フォントé¸æŠž" -#: gitk:10364 +#: gitk:11206 msgid "B" msgstr "B" -#: gitk:10367 +#: gitk:11209 msgid "I" msgstr "I" -#: gitk:10463 -msgid "Gitk preferences" -msgstr "Gitk è¨å®š" - -#: gitk:10465 +#: gitk:11327 msgid "Commit list display options" msgstr "コミットリスト表示オプション" -#: gitk:10468 +#: gitk:11330 msgid "Maximum graph width (lines)" msgstr "最大グラフ幅（線ã®æœ¬æ•°ï¼‰" -#: gitk:10472 -#, tcl-format +#: gitk:11334 +#, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "最大グラフ幅（ペインã«å¯¾ã™ã‚‹ï¼…）" -#: gitk:10476 +#: gitk:11337 msgid "Show local changes" msgstr "ãƒãƒ¼ã‚«ãƒ«ãªå¤‰æ›´ã‚’表示" -#: gitk:10479 -msgid "Auto-select SHA1" +#: gitk:11340 +#, fuzzy +msgid "Auto-select SHA1 (length)" msgstr "SHA1 ã®è‡ªå‹•é¸æŠž" -#: gitk:10483 +#: gitk:11344 +msgid "Hide remote refs" +msgstr "ãƒªãƒ¢ãƒ¼ãƒˆãƒªãƒ•ã‚¡ãƒ¬ãƒ³ã‚¹ã‚’éš ã™" + +#: gitk:11348 msgid "Diff display options" msgstr "diff表示オプション" -#: gitk:10485 +#: gitk:11350 msgid "Tab spacing" msgstr "タブ空白幅" -#: gitk:10488 -msgid "Display nearby tags" +#: gitk:11353 +#, fuzzy +msgid "Display nearby tags/heads" msgstr "è¿‘ãã®ã‚¿ã‚°ã‚’表示ã™ã‚‹" -#: gitk:10491 -msgid "Hide remote refs" -msgstr "ãƒªãƒ¢ãƒ¼ãƒˆãƒªãƒ•ã‚¡ãƒ¬ãƒ³ã‚¹ã‚’éš ã™" +#: gitk:11356 +msgid "Maximum # tags/heads to show" +msgstr "" -#: gitk:10494 +#: gitk:11359 msgid "Limit diffs to listed paths" msgstr "diff をリストã®ãƒ‘スã«åˆ¶é™" -#: gitk:10497 +#: gitk:11362 msgid "Support per-file encodings" msgstr "ファイルã”ã¨ã®ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ã®ã‚µãƒãƒ¼ãƒˆ" -#: gitk:10503 gitk:10572 +#: gitk:11368 gitk:11515 msgid "External diff tool" msgstr "外部diffツール" -#: gitk:10505 +#: gitk:11369 msgid "Choose..." msgstr "é¸æŠž..." -#: gitk:10510 +#: gitk:11374 +#, fuzzy +msgid "General options" +msgstr "パッãƒç”Ÿæˆ" + +#: gitk:11377 +msgid "Use themed widgets" +msgstr "" + +#: gitk:11379 +msgid "(change requires restart)" +msgstr "" + +#: gitk:11381 +msgid "(currently unavailable)" +msgstr "" + +#: gitk:11392 msgid "Colors: press to choose" msgstr "色: ボタンを押ã—ã¦é¸æŠž" -#: gitk:10513 +#: gitk:11395 msgid "Interface" msgstr "インターフェイス" -#: gitk:10514 +#: gitk:11396 msgid "interface" msgstr "インターフェイス" -#: gitk:10517 +#: gitk:11399 msgid "Background" msgstr "背景" -#: gitk:10518 gitk:10548 +#: gitk:11400 gitk:11430 msgid "background" msgstr "背景" -#: gitk:10521 +#: gitk:11403 msgid "Foreground" msgstr "å‰æ™¯" -#: gitk:10522 +#: gitk:11404 msgid "foreground" msgstr "å‰æ™¯" -#: gitk:10525 +#: gitk:11407 msgid "Diff: old lines" msgstr "Diff: æ—§ãƒãƒ¼ã‚¸ãƒ§ãƒ³" -#: gitk:10526 +#: gitk:11408 msgid "diff old lines" msgstr "diff æ—§ãƒãƒ¼ã‚¸ãƒ§ãƒ³" -#: gitk:10530 +#: gitk:11412 msgid "Diff: new lines" msgstr "Diff: æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³" -#: gitk:10531 +#: gitk:11413 msgid "diff new lines" msgstr "diff æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³" -#: gitk:10535 +#: gitk:11417 msgid "Diff: hunk header" msgstr "Diff: hunkヘッダ" -#: gitk:10537 +#: gitk:11419 msgid "diff hunk header" msgstr "diff hunkヘッダ" -#: gitk:10541 +#: gitk:11423 msgid "Marked line bg" msgstr "マーク行ã®èƒŒæ™¯" -#: gitk:10543 +#: gitk:11425 msgid "marked line background" msgstr "マーク行ã®èƒŒæ™¯" -#: gitk:10547 +#: gitk:11429 msgid "Select bg" msgstr "é¸æŠžã®èƒŒæ™¯" -#: gitk:10551 +#: gitk:11438 msgid "Fonts: press to choose" msgstr "フォント: ボタンを押ã—ã¦é¸æŠž" -#: gitk:10553 +#: gitk:11440 msgid "Main font" msgstr "主フォント" -#: gitk:10554 +#: gitk:11441 msgid "Diff display font" msgstr "Diff表示用フォント" -#: gitk:10555 +#: gitk:11442 msgid "User interface font" msgstr "UI用フォント" -#: gitk:10582 +#: gitk:11464 +msgid "Gitk preferences" +msgstr "Gitk è¨å®š" + +#: gitk:11473 +#, fuzzy +msgid "General" +msgstr "生æˆ" + +#: gitk:11474 +msgid "Colors" +msgstr "" + +#: gitk:11475 +msgid "Fonts" +msgstr "" + +#: gitk:11525 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: 「%s〠ã®è‰²ã‚’é¸æŠž" -#: gitk:11168 +#: gitk:12242 msgid "Cannot find a git repository here." msgstr "ã“ã“ã«ã¯gitリãƒã‚¸ãƒˆãƒªãŒã‚ã‚Šã¾ã›ã‚“。" -#: gitk:11172 -#, tcl-format -msgid "Cannot find the git directory \"%s\"." -msgstr "gitディレクトリ \"%s\" を見ã¤ã‘られã¾ã›ã‚“。" - -#: gitk:11219 +#: gitk:12289 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "ã‚ã„ã¾ã„ãªå¼•æ•° '%s': リビジョンã¨ãƒ•ã‚¡ã‚¤ãƒ«åã®ä¸¡æ–¹ã«è§£é‡ˆã§ãã¾ã™" -#: gitk:11231 +#: gitk:12301 msgid "Bad arguments to gitk:" msgstr "gitkã¸ã®ä¸æ£ãªå¼•æ•°:" -#: gitk:11316 +#: gitk:12405 msgid "Command line" msgstr "コマンド行" + +#~ msgid "SHA1 ID: " +#~ msgstr "SHA1 ID: " + +#~ msgid "next" +#~ msgstr "次" + +#~ msgid "prev" +#~ msgstr "å‰" + +#~ msgid "CDate" +#~ msgstr "作æˆæ—¥" + +#~ msgid "Cannot find the git directory \"%s\"." +#~ msgstr "gitディレクトリ \"%s\" を見ã¤ã‘られã¾ã›ã‚“。" diff --git a/gitk-git/po/pt_br.po b/gitk-git/po/pt_br.po index 1486e32..80d24bc 100644 --- a/gitk-git/po/pt_br.po +++ b/gitk-git/po/pt_br.po @@ -9,33 +9,42 @@ msgid "" msgstr "" "Project-Id-Version: gitk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-26 15:47-0800\n" +"POT-Creation-Date: 2015-03-15 14:37+1100\n" "PO-Revision-Date: 2010-12-06 23:39-0200\n" "Last-Translator: Alexandre Erwin Ittner <alexandre@ittner.com.br>\n" "Language-Team: Brazilian Portuguese <>\n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: gitk:115 +#: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "Não foi possÃvel obter a lista dos arquivos não mesclados:" -#: gitk:274 +#: gitk:212 gitk:2381 +msgid "Color words" +msgstr "" + +#: gitk:217 gitk:2381 gitk:8201 gitk:8234 +msgid "Markup words" +msgstr "" + +#: gitk:324 msgid "Error parsing revisions:" msgstr "Erro ao interpretar revisões:" -#: gitk:330 +#: gitk:380 msgid "Error executing --argscmd command:" msgstr "Erro ao executar o comando--argscmd:" -#: gitk:343 +#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "Nenhum arquivo foi selecionado: --merge especificado mas não há arquivos não-" "mesclados." -#: gitk:346 +#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -43,603 +52,634 @@ msgstr "" "Nenhum arquivo foi selecionado: --merge especificado mas não há arquivos não-" "mesclados dentro dos limites." -#: gitk:368 gitk:516 +#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "Erro ao executar git log:" -#: gitk:386 gitk:532 +#: gitk:436 gitk:582 msgid "Reading" msgstr "Lendo" -#: gitk:446 gitk:4271 +#: gitk:496 gitk:4508 msgid "Reading commits..." msgstr "Lendo revisões..." -#: gitk:449 gitk:1580 gitk:4274 +#: gitk:499 gitk:1637 gitk:4511 msgid "No commits selected" msgstr "Nenhuma revisão foi selecionada" -#: gitk:1456 +#: gitk:1511 msgid "Can't parse git log output:" msgstr "Não foi possÃvel interpretar a saÃda do \"git log\":" -#: gitk:1676 +#: gitk:1740 msgid "No commit information available" msgstr "Não há informações disponÃveis sobre a revisão" -#: gitk:1818 +#: gitk:1897 msgid "mc" msgstr "mc" -#: gitk:1853 gitk:4064 gitk:9067 gitk:10607 gitk:10817 +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 msgid "OK" msgstr "Ok" -#: gitk:1855 gitk:4066 gitk:8657 gitk:8736 gitk:8851 gitk:8900 gitk:9069 -#: gitk:10608 gitk:10818 +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 +#: gitk:11221 gitk:11501 msgid "Cancel" msgstr "Cancelar" -#: gitk:1980 +#: gitk:2069 msgid "Update" msgstr "Atualizar" -#: gitk:1981 +#: gitk:2070 msgid "Reload" msgstr "Recarregar" -#: gitk:1982 +#: gitk:2071 msgid "Reread references" msgstr "Ler as referências novamente" -#: gitk:1983 +#: gitk:2072 msgid "List references" msgstr "Listar referências" -#: gitk:1985 +#: gitk:2074 msgid "Start git gui" msgstr "Iniciar Git GUI" -#: gitk:1987 +#: gitk:2076 msgid "Quit" msgstr "Sair" -#: gitk:1979 +#: gitk:2068 msgid "File" msgstr "Arquivo" -#: gitk:1991 +#: gitk:2080 msgid "Preferences" msgstr "Preferências" -#: gitk:1990 +#: gitk:2079 msgid "Edit" msgstr "Editar" -#: gitk:1995 +#: gitk:2084 msgid "New view..." msgstr "Nova vista..." -#: gitk:1996 +#: gitk:2085 msgid "Edit view..." msgstr "Editar vista..." -#: gitk:1997 +#: gitk:2086 msgid "Delete view" msgstr "Apagar vista" -#: gitk:1999 +#: gitk:2088 msgid "All files" msgstr "Todos os arquivos" -#: gitk:1994 gitk:3817 +#: gitk:2083 gitk:4050 msgid "View" msgstr "Exibir" -#: gitk:2004 gitk:2014 gitk:2787 +#: gitk:2093 gitk:2103 gitk:3009 msgid "About gitk" msgstr "Sobre o gitk" -#: gitk:2005 gitk:2019 +#: gitk:2094 gitk:2108 msgid "Key bindings" msgstr "Atalhos de teclado" -#: gitk:2003 gitk:2018 +#: gitk:2092 gitk:2107 msgid "Help" msgstr "Ajuda" -#: gitk:2096 gitk:8132 +#: gitk:2185 gitk:8633 msgid "SHA1 ID:" msgstr "SHA1 ID:" -#: gitk:2127 +#: gitk:2229 msgid "Row" msgstr "Linha" -#: gitk:2165 +#: gitk:2267 msgid "Find" msgstr "Encontrar" -#: gitk:2166 -msgid "next" -msgstr "Próximo" - -#: gitk:2167 -msgid "prev" -msgstr "Anterior" - -#: gitk:2168 +#: gitk:2295 msgid "commit" msgstr "Revisão" -#: gitk:2171 gitk:2173 gitk:4432 gitk:4455 gitk:4479 gitk:6420 gitk:6492 -#: gitk:6576 +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 +#: gitk:6893 msgid "containing:" msgstr "contendo:" -#: gitk:2174 gitk:3298 gitk:3303 gitk:4507 +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 msgid "touching paths:" msgstr "envolvendo os caminhos:" -#: gitk:2175 gitk:4512 +#: gitk:2303 gitk:4759 msgid "adding/removing string:" msgstr "Adicionando/removendo texto:" -#: gitk:2184 gitk:2186 +#: gitk:2304 gitk:4761 +msgid "changing lines matching:" +msgstr "" + +#: gitk:2313 gitk:2315 gitk:4748 msgid "Exact" msgstr "Exatamente" -#: gitk:2186 gitk:4587 gitk:6388 +#: gitk:2315 gitk:4836 gitk:6704 msgid "IgnCase" msgstr "Ignorar maiúsculas/minúsculas" -#: gitk:2186 gitk:4481 gitk:4585 gitk:6384 +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 msgid "Regexp" msgstr "Expressão regular" -#: gitk:2188 gitk:2189 gitk:4606 gitk:4636 gitk:4643 gitk:6512 gitk:6580 +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 msgid "All fields" msgstr "Todos os campos" -#: gitk:2189 gitk:4604 gitk:4636 gitk:6451 +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 msgid "Headline" msgstr "Assunto" -#: gitk:2190 gitk:4604 gitk:6451 gitk:6580 gitk:7013 +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 msgid "Comments" msgstr "Descrição da revisão" -#: gitk:2190 gitk:4604 gitk:4608 gitk:4643 gitk:6451 gitk:6948 gitk:8307 -#: gitk:8322 +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 +#: gitk:8826 msgid "Author" msgstr "Autor" -#: gitk:2190 gitk:4604 gitk:6451 gitk:6950 +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 msgid "Committer" msgstr "Revisor" -#: gitk:2221 +#: gitk:2350 msgid "Search" msgstr "Buscar" -#: gitk:2229 +#: gitk:2358 msgid "Diff" msgstr "Diferenças" -#: gitk:2231 +#: gitk:2360 msgid "Old version" msgstr "Versão antiga" -#: gitk:2233 +#: gitk:2362 msgid "New version" msgstr "Versão nova" -#: gitk:2235 +#: gitk:2364 msgid "Lines of context" msgstr "Número de linhas de contexto" -#: gitk:2245 +#: gitk:2374 msgid "Ignore space change" msgstr "Ignorar mudanças de caixa" -#: gitk:2304 +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +msgid "Line diff" +msgstr "" + +#: gitk:2445 msgid "Patch" msgstr "Diferenças" -#: gitk:2306 +#: gitk:2447 msgid "Tree" msgstr "Ãrvore" -#: gitk:2463 gitk:2480 +#: gitk:2616 gitk:2636 msgid "Diff this -> selected" msgstr "Comparar esta revisão com a selecionada" -#: gitk:2464 gitk:2481 +#: gitk:2617 gitk:2637 msgid "Diff selected -> this" msgstr "Comparar a revisão selecionada com esta" -#: gitk:2465 gitk:2482 +#: gitk:2618 gitk:2638 msgid "Make patch" msgstr "Criar patch" -#: gitk:2466 gitk:8715 +#: gitk:2619 gitk:9235 msgid "Create tag" msgstr "Criar etiqueta" -#: gitk:2467 gitk:8831 +#: gitk:2620 gitk:9352 msgid "Write commit to file" msgstr "Salvar revisão para um arquivo" -#: gitk:2468 gitk:8888 +#: gitk:2621 gitk:9409 msgid "Create new branch" msgstr "Criar novo ramo" -#: gitk:2469 +#: gitk:2622 msgid "Cherry-pick this commit" msgstr "Fazer cherry-pick desta revisão" -#: gitk:2470 +#: gitk:2623 msgid "Reset HEAD branch to here" msgstr "Redefinir HEAD para cá" -#: gitk:2471 +#: gitk:2624 msgid "Mark this commit" msgstr "Marcar esta revisão" -#: gitk:2472 +#: gitk:2625 msgid "Return to mark" msgstr "Voltar à marca" -#: gitk:2473 +#: gitk:2626 msgid "Find descendant of this and mark" msgstr "Encontrar descendente e marcar" -#: gitk:2474 +#: gitk:2627 msgid "Compare with marked commit" msgstr "Comparar com a revisão marcada" -#: gitk:2488 +#: gitk:2628 gitk:2639 +#, fuzzy +msgid "Diff this -> marked commit" +msgstr "Comparar esta revisão com a selecionada" + +#: gitk:2629 gitk:2640 +#, fuzzy +msgid "Diff marked commit -> this" +msgstr "Comparar a revisão selecionada com esta" + +#: gitk:2630 +#, fuzzy +msgid "Revert this commit" +msgstr "Marcar esta revisão" + +#: gitk:2646 msgid "Check out this branch" msgstr "Efetuar checkout deste ramo" -#: gitk:2489 +#: gitk:2647 msgid "Remove this branch" msgstr "Excluir este ramo" -#: gitk:2496 +#: gitk:2654 msgid "Highlight this too" msgstr "Marcar este também" -#: gitk:2497 +#: gitk:2655 msgid "Highlight this only" msgstr "Marcar apenas este" -#: gitk:2498 +#: gitk:2656 msgid "External diff" msgstr "Diff externo" -#: gitk:2499 +#: gitk:2657 msgid "Blame parent commit" msgstr "Anotar revisão anterior" -#: gitk:2506 +#: gitk:2664 msgid "Show origin of this line" msgstr "Exibir origem desta linha" -#: gitk:2507 +#: gitk:2665 msgid "Run git gui blame on this line" msgstr "Executar 'git blame' nesta linha" -#: gitk:2789 -msgid "\n" +#: gitk:3011 +#, fuzzy +msgid "" +"\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright ©9 2005-2010 Paul Mackerras\n" +"Copyright © 2005-2014 Paul Mackerras\n" "\n" "Use and redistribute under the terms of the GNU General Public License" -msgstr "\n" +msgstr "" +"\n" "Gitk - um visualizador de revisões para o git \n" "\n" "Copyright ©9 2005-2010 Paul Mackerras\n" "\n" "Uso e distribuição segundo os termos da Licença Pública Geral GNU" -#: gitk:2797 gitk:2862 gitk:9253 +#: gitk:3019 gitk:3085 gitk:9836 msgid "Close" msgstr "Fechar" -#: gitk:2818 +#: gitk:3040 msgid "Gitk key bindings" msgstr "Atalhos de teclado" -#: gitk:2821 +#: gitk:3043 msgid "Gitk key bindings:" msgstr "Atalhos de teclado:" -#: gitk:2823 +#: gitk:3045 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tSair" -#: gitk:2824 +#: gitk:3046 #, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-W>\t\tFechar janela" -#: gitk:2825 +#: gitk:3047 msgid "<Home>\t\tMove to first commit" msgstr "<Home>\t\tIr para a primeira revisão" -#: gitk:2826 +#: gitk:3048 msgid "<End>\t\tMove to last commit" msgstr "<End>\t\tIr para a última revisão" -#: gitk:2827 -msgid "<Up>, p, i\tMove up one commit" +#: gitk:3049 +#, fuzzy +msgid "<Up>, p, k\tMove up one commit" msgstr "<Up>, p, i\tIr para uma revisão acima" -#: gitk:2828 -msgid "<Down>, n, k\tMove down one commit" +#: gitk:3050 +#, fuzzy +msgid "<Down>, n, j\tMove down one commit" msgstr "<Down>, n, k\tIr para uma revisão abaixo" -#: gitk:2829 -msgid "<Left>, z, j\tGo back in history list" +#: gitk:3051 +#, fuzzy +msgid "<Left>, z, h\tGo back in history list" msgstr "<Left>, z, j\tVoltar no histórico" -#: gitk:2830 +#: gitk:3052 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Right>, x, l\tAvançar no histórico" -#: gitk:2831 +#: gitk:3053 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "" + +#: gitk:3054 msgid "<PageUp>\tMove up one page in commit list" msgstr "<PageUp>\tSubir uma página na lista de revisões" -#: gitk:2832 +#: gitk:3055 msgid "<PageDown>\tMove down one page in commit list" msgstr "<PageDown>\tDescer uma página na lista de revisões" -#: gitk:2833 +#: gitk:3056 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tRolar para o inÃcio da lista de revisões" -#: gitk:2834 +#: gitk:3057 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tRolar para o final da lista de revisões" -#: gitk:2835 +#: gitk:3058 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Up>\tRolar uma linha acima na lista de revisões" -#: gitk:2836 +#: gitk:3059 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Down>\tRolar uma linha abaixo na lista de revisões" -#: gitk:2837 +#: gitk:3060 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tRolar uma página acima na lista de revisões" -#: gitk:2838 +#: gitk:3061 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tRolar uma página abaixo na lista de revisões" -#: gitk:2839 +#: gitk:3062 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" msgstr "<Shift-Up>\tProcurar próxima (revisões mas recentes)" -#: gitk:2840 +#: gitk:3063 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" msgstr "<Shift-Down>\tProcurar anterior (revisões mais antigas)" -#: gitk:2841 +#: gitk:3064 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Delete>, b\tRola alterações uma página acima" -#: gitk:2842 +#: gitk:3065 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Backspace>\tRolar alterações uma página abaixo" -#: gitk:2843 +#: gitk:3066 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Space>\t\tRolar alterações uma página abaixo" -#: gitk:2844 +#: gitk:3067 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tRolar alterações 18 linhas acima" -#: gitk:2845 +#: gitk:3068 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tRolar alterações 18 linhas abaixo" -#: gitk:2846 +#: gitk:3069 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tProcurar" -#: gitk:2847 +#: gitk:3070 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tIr para a próxima ocorrência" -#: gitk:2848 +#: gitk:3071 msgid "<Return>\tMove to next find hit" msgstr "<Return>\tIr para a próxima ocorrência" -#: gitk:2849 +#: gitk:3072 msgid "/\t\tFocus the search box" msgstr "/\t\tPor foco na caixa de busca" -#: gitk:2850 +#: gitk:3073 msgid "?\t\tMove to previous find hit" msgstr "?\t\tIr para a ocorrência anterior" -#: gitk:2851 +#: gitk:3074 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tRolar alterações para o próximo arquivo" -#: gitk:2852 +#: gitk:3075 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tProcurar a próxima ocorrência na lista de alterações" -#: gitk:2853 +#: gitk:3076 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tProcurar ocorrência anterior na lista de alterações" -#: gitk:2854 +#: gitk:3077 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tAumentar tamanho da fonte" -#: gitk:2855 +#: gitk:3078 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tAumentar tamanho da fonte" -#: gitk:2856 +#: gitk:3079 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tReduzir tamanho da fonte" -#: gitk:2857 +#: gitk:3080 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tReduzir tamanho da fonte" -#: gitk:2858 +#: gitk:3081 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tAtualizar" -#: gitk:3313 gitk:3322 +#: gitk:3546 gitk:3555 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Erro ao criar o diretório temporário %s:" -#: gitk:3335 +#: gitk:3568 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Erro ao ler \"%s\" de %s:" -#: gitk:3398 +#: gitk:3631 msgid "command failed:" msgstr "O comando falhou:" -#: gitk:3547 +#: gitk:3780 msgid "No such commit" msgstr "Revisão não encontrada" -#: gitk:3561 +#: gitk:3794 msgid "git gui blame: command failed:" msgstr "Comando 'git gui blame' falhou:" -#: gitk:3592 +#: gitk:3825 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "ImpossÃvel ler merge head: %s" -#: gitk:3600 +#: gitk:3833 #, tcl-format msgid "Error reading index: %s" msgstr "Erro ao ler o Ãndice: %s" -#: gitk:3625 +#: gitk:3858 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Não foi possÃvel inciar o 'git blame': %s" -#: gitk:3628 gitk:6419 +#: gitk:3861 gitk:6735 msgid "Searching" msgstr "Procurando" -#: gitk:3660 +#: gitk:3893 #, tcl-format msgid "Error running git blame: %s" msgstr "Erro ao executar 'git blame': %s" -#: gitk:3688 +#: gitk:3921 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "Esta linha vem da revisão %s, que não está nesta vista" -#: gitk:3702 +#: gitk:3935 msgid "External diff viewer failed:" msgstr "Erro do visualizador de alterações externo:" -#: gitk:3820 +#: gitk:4053 msgid "Gitk view definition" msgstr "Definir vista" -#: gitk:3824 +#: gitk:4057 msgid "Remember this view" msgstr "Lembrar esta vista" -#: gitk:3825 +#: gitk:4058 msgid "References (space separated list):" msgstr "Referências (separar a lista com um espaço):" -#: gitk:3826 +#: gitk:4059 msgid "Branches & tags:" msgstr "Ramos & etiquetas:" -#: gitk:3827 +#: gitk:4060 msgid "All refs" msgstr "Todas as referências" -#: gitk:3828 +#: gitk:4061 msgid "All (local) branches" msgstr "Todos os ramos locais" -#: gitk:3829 +#: gitk:4062 msgid "All tags" msgstr "Todas as etiquetas" -#: gitk:3830 +#: gitk:4063 msgid "All remote-tracking branches" msgstr "Todos os ramos de rastreio" -#: gitk:3831 +#: gitk:4064 msgid "Commit Info (regular expressions):" msgstr "Informações da revisão (expressões regulares):" -#: gitk:3832 +#: gitk:4065 msgid "Author:" msgstr "Autor:" -#: gitk:3833 +#: gitk:4066 msgid "Committer:" msgstr "Revisor:" -#: gitk:3834 +#: gitk:4067 msgid "Commit Message:" msgstr "Descrição da revisão:" -#: gitk:3835 +#: gitk:4068 msgid "Matches all Commit Info criteria" msgstr "Coincidir todos os critérios de informações da revisão" -#: gitk:3836 +#: gitk:4069 +#, fuzzy +msgid "Matches none Commit Info criteria" +msgstr "Coincidir todos os critérios de informações da revisão" + +#: gitk:4070 msgid "Changes to Files:" msgstr "Mudanças para os arquivos:" -#: gitk:3837 +#: gitk:4071 msgid "Fixed String" msgstr "Texto fixo" -#: gitk:3838 +#: gitk:4072 msgid "Regular Expression" msgstr "Expressão regular" -#: gitk:3839 +#: gitk:4073 msgid "Search string:" msgstr "Texto de busca" -#: gitk:3840 +#: gitk:4074 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -647,201 +687,201 @@ msgstr "" "Datas de revisão (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" -#: gitk:3841 +#: gitk:4075 msgid "Since:" msgstr "Desde:" -#: gitk:3842 +#: gitk:4076 msgid "Until:" msgstr "Até:" -#: gitk:3843 +#: gitk:4077 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "Limitar e/ou ignorar um número de revisões (inteiro positivo):" -#: gitk:3844 +#: gitk:4078 msgid "Number to show:" msgstr "Número para mostrar:" -#: gitk:3845 +#: gitk:4079 msgid "Number to skip:" msgstr "Número para ignorar:" -#: gitk:3846 +#: gitk:4080 msgid "Miscellaneous options:" msgstr "Opções diversas:" -#: gitk:3847 +#: gitk:4081 msgid "Strictly sort by date" msgstr "Ordenar estritamente pela data" -#: gitk:3848 +#: gitk:4082 msgid "Mark branch sides" msgstr "Marcar os dois lados do ramo" -#: gitk:3849 +#: gitk:4083 msgid "Limit to first parent" msgstr "Limitar ao primeiro antecessor" -#: gitk:3850 +#: gitk:4084 msgid "Simple history" msgstr "Histórico simplificado" -#: gitk:3851 +#: gitk:4085 msgid "Additional arguments to git log:" msgstr "Argumentos adicionais para o 'git log':" -#: gitk:3852 +#: gitk:4086 msgid "Enter files and directories to include, one per line:" msgstr "Arquivos e diretórios para incluir, um por linha" -#: gitk:3853 +#: gitk:4087 msgid "Command to generate more commits to include:" msgstr "Comando para gerar mais revisões para incluir:" -#: gitk:3977 +#: gitk:4211 msgid "Gitk: edit view" msgstr "Gitk: editar vista" -#: gitk:3985 +#: gitk:4219 msgid "-- criteria for selecting revisions" msgstr "-- critérios para selecionar revisões" -#: gitk:3990 +#: gitk:4224 msgid "View Name" msgstr "Nome da vista" -#: gitk:4065 +#: gitk:4299 msgid "Apply (F5)" msgstr "Aplicar (F5)" -#: gitk:4103 +#: gitk:4337 msgid "Error in commit selection arguments:" msgstr "Erro nos argumentos de seleção de revisões:" -#: gitk:4156 gitk:4208 gitk:4656 gitk:4670 gitk:5931 gitk:11551 gitk:11552 +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 msgid "None" msgstr "Nenhum" -#: gitk:4604 gitk:6451 gitk:8309 gitk:8324 -msgid "Date" -msgstr "Data" - -#: gitk:4604 gitk:6451 -msgid "CDate" -msgstr "DataR" - -#: gitk:4753 gitk:4758 +#: gitk:5003 gitk:5008 msgid "Descendant" msgstr "Descendente de" -#: gitk:4754 +#: gitk:5004 msgid "Not descendant" msgstr "Não descendente de" -#: gitk:4761 gitk:4766 +#: gitk:5011 gitk:5016 msgid "Ancestor" msgstr "Antecessor de" -#: gitk:4762 +#: gitk:5012 msgid "Not ancestor" msgstr "Não antecessor de" -#: gitk:5052 +#: gitk:5306 msgid "Local changes checked in to index but not committed" msgstr "Mudanças locais marcadas, porém não salvas" -#: gitk:5088 +#: gitk:5342 msgid "Local uncommitted changes, not checked in to index" msgstr "Mudanças locais não marcadas" -#: gitk:6769 +#: gitk:7115 +msgid "and many more" +msgstr "" + +#: gitk:7118 msgid "many" msgstr "muitas" -#: gitk:6952 +#: gitk:7309 msgid "Tags:" msgstr "Etiquetas:" -#: gitk:6969 gitk:6975 gitk:8302 +#: gitk:7326 gitk:7332 gitk:8806 msgid "Parent" msgstr "Antecessor" -#: gitk:6980 +#: gitk:7337 msgid "Child" msgstr "Descendente" -#: gitk:6989 +#: gitk:7346 msgid "Branch" msgstr "Ramo" -#: gitk:6992 +#: gitk:7349 msgid "Follows" msgstr "Segue" -#: gitk:6995 +#: gitk:7352 msgid "Precedes" msgstr "Precede" -#: gitk:7532 +#: gitk:7947 #, tcl-format msgid "Error getting diffs: %s" msgstr "Erro ao obter diferenças: %s" -#: gitk:8130 +#: gitk:8631 msgid "Goto:" msgstr "Ir para:" -#: gitk:8151 +#: gitk:8652 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "O id SHA1 %s é ambÃguo" -#: gitk:8158 +#: gitk:8659 #, tcl-format msgid "Revision %s is not known" msgstr "Revisão %s desconhecida" -#: gitk:8168 +#: gitk:8669 #, tcl-format msgid "SHA1 id %s is not known" msgstr "Id SHA1 %s desconhecido" -#: gitk:8170 +#: gitk:8671 #, tcl-format msgid "Revision %s is not in the current view" msgstr "A revisão %s não está na vista atual" -#: gitk:8312 +#: gitk:8813 gitk:8828 +msgid "Date" +msgstr "Data" + +#: gitk:8816 msgid "Children" msgstr "Descendentes" -#: gitk:8370 +#: gitk:8879 #, tcl-format msgid "Reset %s branch to here" msgstr "Redefinir ramo %s para este ponto" -#: gitk:8372 +#: gitk:8881 msgid "Detached head: can't reset" msgstr "Detached head: impossÃvel redefinir" -#: gitk:8481 gitk:8487 +#: gitk:8986 gitk:8992 msgid "Skipping merge commit " msgstr "Saltando revisão de mesclagem" -#: gitk:8496 gitk:8501 +#: gitk:9001 gitk:9006 msgid "Error getting patch ID for " msgstr "Erro ao obter patch ID para" -#: gitk:8497 gitk:8502 +#: gitk:9002 gitk:9007 msgid " - stopping\n" msgstr "- parando\n" -#: gitk:8507 gitk:8510 gitk:8518 gitk:8532 gitk:8541 +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 msgid "Commit " msgstr "Revisão" -#: gitk:8511 +#: gitk:9016 msgid "" " is the same patch as\n" " " @@ -849,13 +889,13 @@ msgstr "" "é o mesmo patch que\n" " " -#: gitk:8519 +#: gitk:9024 msgid "" " differs from\n" " " msgstr "difere de" -#: gitk:8521 +#: gitk:9026 msgid "" "Diff of commits:\n" "\n" @@ -863,129 +903,129 @@ msgstr "" "Diferença de revisões:\n" "\n" -#: gitk:8533 gitk:8542 +#: gitk:9038 gitk:9047 #, tcl-format msgid " has %s children - stopping\n" msgstr "possui %s descendentes - parando\n" -#: gitk:8561 +#: gitk:9066 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Erro ao salvar revisão para o arquivo: %s" -#: gitk:8567 +#: gitk:9072 #, tcl-format msgid "Error diffing commits: %s" msgstr "Erro ao comparar revisões: %s" -#: gitk:8598 +#: gitk:9118 msgid "Top" msgstr "InÃcio" -#: gitk:8599 +#: gitk:9119 msgid "From" msgstr "De" -#: gitk:8604 +#: gitk:9124 msgid "To" msgstr "Para" -#: gitk:8628 +#: gitk:9148 msgid "Generate patch" msgstr "Gerar patch" -#: gitk:8630 +#: gitk:9150 msgid "From:" msgstr "De:" -#: gitk:8639 +#: gitk:9159 msgid "To:" msgstr "Para:" -#: gitk:8648 +#: gitk:9168 msgid "Reverse" msgstr "Inverter" -#: gitk:8650 gitk:8845 +#: gitk:9170 gitk:9366 msgid "Output file:" msgstr "Arquivo de saÃda:" -#: gitk:8656 +#: gitk:9176 msgid "Generate" msgstr "Gerar" -#: gitk:8694 +#: gitk:9214 msgid "Error creating patch:" msgstr "Erro ao criar patch:" -#: gitk:8717 gitk:8833 gitk:8890 +#: gitk:9237 gitk:9354 gitk:9411 msgid "ID:" msgstr "ID:" -#: gitk:8726 +#: gitk:9246 msgid "Tag name:" msgstr "Nome da etiqueta:" -#: gitk:8729 +#: gitk:9249 msgid "Tag message is optional" msgstr "A descrição da etiqueta é opcional" -#: gitk:8731 +#: gitk:9251 msgid "Tag message:" msgstr "Descrição da etiqueta" -#: gitk:8735 gitk:8899 +#: gitk:9255 gitk:9420 msgid "Create" msgstr "Criar" -#: gitk:8753 +#: gitk:9273 msgid "No tag name specified" msgstr "Nome da etiqueta não indicado" -#: gitk:8757 +#: gitk:9277 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Etiqueta \"%s\" já existe" -#: gitk:8767 +#: gitk:9287 msgid "Error creating tag:" msgstr "Erro ao criar etiqueta:" -#: gitk:8842 +#: gitk:9363 msgid "Command:" msgstr "Comando:" -#: gitk:8850 +#: gitk:9371 msgid "Write" msgstr "Exportar" -#: gitk:8868 +#: gitk:9389 msgid "Error writing commit:" msgstr "Erro ao exportar revisão" -#: gitk:8895 +#: gitk:9416 msgid "Name:" msgstr "Nome:" -#: gitk:8918 +#: gitk:9439 msgid "Please specify a name for the new branch" msgstr "Indique um nome para o novo ramo" -#: gitk:8923 +#: gitk:9444 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "O ramo \"%s\" já existe. Sobrescrever?" -#: gitk:8989 +#: gitk:9511 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "Revisão %s já inclusa no ramo %s -- você realmente deseja reaplicá-la?" -#: gitk:8994 +#: gitk:9516 msgid "Cherry-picking" msgstr "Cherry-picking" -#: gitk:9003 +#: gitk:9525 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -995,7 +1035,7 @@ msgstr "" "Salve a uma revisão, redefina ou armazene (stash) suas mudanças e tente " "novamente." -#: gitk:9009 +#: gitk:9531 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1003,32 +1043,61 @@ msgstr "" "O cherry-pick falhou porque houve um conflito na mesclagem.\n" "Executar o 'git citool' para resolvê-lo?" -#: gitk:9025 +#: gitk:9547 gitk:9605 msgid "No changes committed" msgstr "Nenhuma revisão foi salva" -#: gitk:9051 +#: gitk:9574 +#, fuzzy, tcl-format +msgid "Commit %s is not included in branch %s -- really revert it?" +msgstr "Revisão %s já inclusa no ramo %s -- você realmente deseja reaplicá-la?" + +#: gitk:9579 +#, fuzzy +msgid "Reverting" +msgstr "Redefinindo" + +#: gitk:9587 +#, fuzzy, tcl-format +msgid "" +"Revert failed because of local changes to the following files:%s Please " +"commit, reset or stash your changes and try again." +msgstr "" +"O cherry-pick falhou porque o arquivo \"%s\" possui mudanças locais.\n" +"Salve a uma revisão, redefina ou armazene (stash) suas mudanças e tente " +"novamente." + +#: gitk:9591 +#, fuzzy +msgid "" +"Revert failed because of merge conflict.\n" +" Do you wish to run git citool to resolve it?" +msgstr "" +"O cherry-pick falhou porque houve um conflito na mesclagem.\n" +"Executar o 'git citool' para resolvê-lo?" + +#: gitk:9634 msgid "Confirm reset" msgstr "Confirmar redefinição" -#: gitk:9053 +#: gitk:9636 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Você realmente deseja redefinir o ramo %s para %s?" -#: gitk:9055 +#: gitk:9638 msgid "Reset type:" msgstr "Tipo de redefinição" -#: gitk:9058 +#: gitk:9641 msgid "Soft: Leave working tree and index untouched" msgstr "Soft: deixa a árvore de trabalho e o Ãndice intocados" -#: gitk:9061 +#: gitk:9644 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Misto: Deixa a árvore de trabalho intocada, redefine o Ãndice" -#: gitk:9064 +#: gitk:9647 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1036,19 +1105,19 @@ msgstr "" "Hard: Redefine a árvore de trabalho e o Ãndice\n" "(descarta TODAS as mudanças locais)" -#: gitk:9081 +#: gitk:9664 msgid "Resetting" msgstr "Redefinindo" -#: gitk:9141 +#: gitk:9724 msgid "Checking out" msgstr "Abrindo" -#: gitk:9194 +#: gitk:9777 msgid "Cannot delete the currently checked-out branch" msgstr "ImpossÃvel excluir o ramo atualmente aberto" -#: gitk:9200 +#: gitk:9783 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1057,16 +1126,16 @@ msgstr "" "As revisões do ramo \"%s\" não existem em nenhum outro ramo.\n" "Você realmente deseja excluir ramo \"%s\"?" -#: gitk:9231 +#: gitk:9814 #, tcl-format msgid "Tags and heads: %s" msgstr "Referências: %s" -#: gitk:9246 +#: gitk:9829 msgid "Filter" msgstr "Filtro" -#: gitk:9541 +#: gitk:10125 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1074,204 +1143,230 @@ msgstr "" "Erro ao ler a topologia das revisões; as informações dos ramos e etiquetas " "antecessoras/sucessoras estarão incompletas" -#: gitk:10527 +#: gitk:11102 msgid "Tag" msgstr "Etiqueta" -#: gitk:10527 +#: gitk:11106 msgid "Id" msgstr "Id" -#: gitk:10576 +#: gitk:11189 msgid "Gitk font chooser" msgstr "Selecionar fontes do Gitk" -#: gitk:10593 +#: gitk:11206 msgid "B" msgstr "B" -#: gitk:10596 +#: gitk:11209 msgid "I" msgstr "I" -#: gitk:10714 -msgid "Gitk preferences" -msgstr "Preferências do Gitk" - -#: gitk:10716 +#: gitk:11327 msgid "Commit list display options" msgstr "Opções da lista de revisões" -#: gitk:10719 +#: gitk:11330 msgid "Maximum graph width (lines)" msgstr "Largura máxima do grafo (linhas)" -#: gitk:10722 -#, tcl-format +#: gitk:11334 +#, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Largura máxima do grafo (% do painel)" -#: gitk:10725 +#: gitk:11337 msgid "Show local changes" msgstr "Exibir mudanças locais" -#: gitk:10728 -msgid "Auto-select SHA1" +#: gitk:11340 +#, fuzzy +msgid "Auto-select SHA1 (length)" msgstr "Selecionar o SHA1 automaticamente" -#: gitk:10731 +#: gitk:11344 msgid "Hide remote refs" msgstr "Ocultar referências remotas" -#: gitk:10735 +#: gitk:11348 msgid "Diff display options" msgstr "Opções de exibição das alterações" -#: gitk:10737 +#: gitk:11350 msgid "Tab spacing" msgstr "Espaços por tabulação" -#: gitk:10740 -msgid "Display nearby tags" +#: gitk:11353 +#, fuzzy +msgid "Display nearby tags/heads" msgstr "Exibir etiquetas próximas" -#: gitk:10743 +#: gitk:11356 +msgid "Maximum # tags/heads to show" +msgstr "" + +#: gitk:11359 msgid "Limit diffs to listed paths" msgstr "Limitar diferenças aos caminhos listados" -#: gitk:10746 +#: gitk:11362 msgid "Support per-file encodings" msgstr "Usar codificações distintas por arquivo" -#: gitk:10752 gitk:10832 +#: gitk:11368 gitk:11515 msgid "External diff tool" msgstr "Ferramenta 'diff' externa" -#: gitk:10753 +#: gitk:11369 msgid "Choose..." msgstr "Selecionar..." -#: gitk:10758 +#: gitk:11374 msgid "General options" msgstr "Opções gerais" -#: gitk:10761 +#: gitk:11377 msgid "Use themed widgets" msgstr "Usar temas para as janelas" -#: gitk:10763 +#: gitk:11379 msgid "(change requires restart)" msgstr "(exige reinicialização)" -#: gitk:10765 +#: gitk:11381 msgid "(currently unavailable)" msgstr "(atualmente indisponÃvel)" -#: gitk:10769 +#: gitk:11392 msgid "Colors: press to choose" msgstr "Cores: clique para escolher" -#: gitk:10772 +#: gitk:11395 msgid "Interface" msgstr "Interface" -#: gitk:10773 +#: gitk:11396 msgid "interface" msgstr "interface" -#: gitk:10776 +#: gitk:11399 msgid "Background" msgstr "Segundo plano" -#: gitk:10777 gitk:10807 +#: gitk:11400 gitk:11430 msgid "background" msgstr "segundo plano" -#: gitk:10780 +#: gitk:11403 msgid "Foreground" msgstr "Primeiro plano" -#: gitk:10781 +#: gitk:11404 msgid "foreground" msgstr "primeiro plano" -#: gitk:10784 +#: gitk:11407 msgid "Diff: old lines" msgstr "Diff: linhas excluÃdas" -#: gitk:10785 +#: gitk:11408 msgid "diff old lines" msgstr "linhas excluÃdas" -#: gitk:10789 +#: gitk:11412 msgid "Diff: new lines" msgstr "Diff: linhas adicionadas" -#: gitk:10790 +#: gitk:11413 msgid "diff new lines" msgstr "linhas adicionadas" -#: gitk:10794 +#: gitk:11417 msgid "Diff: hunk header" msgstr "Diff: cabeçalho do bloco" -#: gitk:10796 +#: gitk:11419 msgid "diff hunk header" msgstr "cabeçalho do bloco" -#: gitk:10800 +#: gitk:11423 msgid "Marked line bg" msgstr "2º plano da linha marcada" -#: gitk:10802 +#: gitk:11425 msgid "marked line background" msgstr "segundo plano da linha marcada" -#: gitk:10806 +#: gitk:11429 msgid "Select bg" msgstr "2º plano da seleção" -#: gitk:10810 +#: gitk:11438 msgid "Fonts: press to choose" msgstr "Fontes: clique para escolher" -#: gitk:10812 +#: gitk:11440 msgid "Main font" msgstr "Fonte principal" -#: gitk:10813 +#: gitk:11441 msgid "Diff display font" msgstr "Fonte da lista de mudanças" -#: gitk:10814 +#: gitk:11442 msgid "User interface font" msgstr "Fonte da interface" -#: gitk:10842 +#: gitk:11464 +msgid "Gitk preferences" +msgstr "Preferências do Gitk" + +#: gitk:11473 +#, fuzzy +msgid "General" +msgstr "Gerar" + +#: gitk:11474 +msgid "Colors" +msgstr "" + +#: gitk:11475 +msgid "Fonts" +msgstr "" + +#: gitk:11525 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: selecionar cor para %s" -#: gitk:11445 +#: gitk:12242 msgid "Cannot find a git repository here." msgstr "Não há nenhum repositório git aqui." -#: gitk:11449 -#, tcl-format -msgid "Cannot find the git directory \"%s\"." -msgstr "ImpossÃvel encontrar o diretório git \"%s\"." - -#: gitk:11496 +#: gitk:12289 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "" "O argumento \"%s\" é ambÃguo (especifica tanto uma revisão e um nome de " "arquivo)" -#: gitk:11508 +#: gitk:12301 msgid "Bad arguments to gitk:" msgstr "Argumentos incorretos para o gitk:" -#: gitk:11604 +#: gitk:12405 msgid "Command line" msgstr "Linha de comando" + +#~ msgid "next" +#~ msgstr "Próximo" + +#~ msgid "prev" +#~ msgstr "Anterior" + +#~ msgid "CDate" +#~ msgstr "DataR" + +#~ msgid "Cannot find the git directory \"%s\"." +#~ msgstr "ImpossÃvel encontrar o diretório git \"%s\"." diff --git a/gitk-git/po/ru.po b/gitk-git/po/ru.po index 5987303..faba672 100644 --- a/gitk-git/po/ru.po +++ b/gitk-git/po/ru.po @@ -5,315 +5,359 @@ msgid "" msgstr "" "Project-Id-Version: gitk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-24 16:00+0200\n" +"POT-Creation-Date: 2015-03-15 14:37+1100\n" "PO-Revision-Date: 2009-04-24 16:00+0200\n" "Last-Translator: Alex Riesen <raa.lkml@gmail.com>\n" "Language-Team: Russian\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: gitk:113 +#: gitk:140 msgid "Couldn't get list of unmerged files:" +msgstr "Ðевозможно получить ÑпиÑок файлов незавершённой операции ÑлиÑниÑ:" + +#: gitk:212 gitk:2381 +msgid "Color words" +msgstr "" + +#: gitk:217 gitk:2381 gitk:8201 gitk:8234 +msgid "Markup words" msgstr "" -"Ðевозможно получить ÑпиÑок файлов незавершённой операции ÑлиÑниÑ:" -#: gitk:268 +#: gitk:324 msgid "Error parsing revisions:" msgstr "Ошибка в идентификаторе верÑии:" -#: gitk:323 +#: gitk:380 msgid "Error executing --argscmd command:" msgstr "Ошибка Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹ заданной --argscmd:" -#: gitk:336 +#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" -"Файлы не выбраны: указан --merge, но не было найдено ни одного файла " -"где Ñта Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð´Ð¾Ð»Ð¶Ð½Ð° быть завершена." +"Файлы не выбраны: указан --merge, но не было найдено ни одного файла где Ñта " +"Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð´Ð¾Ð»Ð¶Ð½Ð° быть завершена." -#: gitk:339 +#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." msgstr "" -"Файлы не выбраны: указан --merge, но в рамках указанного " -"Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ð½Ð° имена файлов нет ни одного " -"где Ñта Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð´Ð¾Ð»Ð¶Ð½Ð° быть завершена." +"Файлы не выбраны: указан --merge, но в рамках указанного Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ð½Ð° " +"имена файлов нет ни одного где Ñта Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð´Ð¾Ð»Ð¶Ð½Ð° быть завершена." -#: gitk:361 gitk:508 +#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "Ошибка запуÑка git log:" -#: gitk:379 +#: gitk:436 gitk:582 msgid "Reading" msgstr "Чтение" -#: gitk:439 gitk:4021 +#: gitk:496 gitk:4508 msgid "Reading commits..." msgstr "Чтение верÑий..." -#: gitk:442 gitk:1560 gitk:4024 +#: gitk:499 gitk:1637 gitk:4511 msgid "No commits selected" msgstr "Ðичего не выбрано" -#: gitk:1436 +#: gitk:1511 msgid "Can't parse git log output:" msgstr "Ошибка обработки вывода команды git log:" -#: gitk:1656 +#: gitk:1740 msgid "No commit information available" msgstr "Ðет информации о ÑоÑтоÑнии" -#: gitk:1791 gitk:1815 gitk:3814 gitk:8478 gitk:10014 gitk:10186 +#: gitk:1897 +msgid "mc" +msgstr "" + +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 msgid "OK" msgstr "Ok" -#: gitk:1817 gitk:3816 gitk:8078 gitk:8152 gitk:8259 gitk:8308 gitk:8480 -#: gitk:10015 gitk:10187 +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 +#: gitk:11221 gitk:11501 msgid "Cancel" msgstr "Отмена" -#: gitk:1915 +#: gitk:2069 msgid "Update" msgstr "Обновить" -#: gitk:1916 +#: gitk:2070 msgid "Reload" msgstr "Перечитать" -#: gitk:1917 +#: gitk:2071 msgid "Reread references" msgstr "Обновить ÑпиÑок ÑÑылок" -#: gitk:1918 +#: gitk:2072 msgid "List references" msgstr "СпиÑок ÑÑылок" -#: gitk:1920 +#: gitk:2074 msgid "Start git gui" msgstr "ЗапуÑтить git gui" -#: gitk:1922 +#: gitk:2076 msgid "Quit" msgstr "Завершить" -#: gitk:1914 +#: gitk:2068 msgid "File" msgstr "Файл" -#: gitk:1925 +#: gitk:2080 msgid "Preferences" msgstr "ÐаÑтройки" -#: gitk:1924 +#: gitk:2079 msgid "Edit" msgstr "Редактировать" -#: gitk:1928 +#: gitk:2084 msgid "New view..." msgstr "Ðовое предÑтавление..." -#: gitk:1929 +#: gitk:2085 msgid "Edit view..." msgstr "Редактировать предÑтавление..." -#: gitk:1930 +#: gitk:2086 msgid "Delete view" msgstr "Удалить предÑтавление" -#: gitk:1932 +#: gitk:2088 msgid "All files" msgstr "Ð’Ñе файлы" -#: gitk:1927 gitk:3626 +#: gitk:2083 gitk:4050 msgid "View" msgstr "ПредÑтавление" -#: gitk:1935 gitk:2609 +#: gitk:2093 gitk:2103 gitk:3009 msgid "About gitk" msgstr "О gitk" -#: gitk:1936 +#: gitk:2094 gitk:2108 msgid "Key bindings" msgstr "ÐÐ°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ ÐºÐ»Ð°Ð²Ð¸Ð°Ñ‚ÑƒÑ€Ñ‹" -#: gitk:1934 +#: gitk:2092 gitk:2107 msgid "Help" msgstr "ПодÑказка" -#: gitk:1994 -msgid "SHA1 ID: " -msgstr "SHA1:" +#: gitk:2185 gitk:8633 +msgid "SHA1 ID:" +msgstr "SHA1 ID:" -#: gitk:2025 +#: gitk:2229 msgid "Row" msgstr "Строка" -#: gitk:2056 +#: gitk:2267 msgid "Find" msgstr "ПоиÑк" -#: gitk:2057 -msgid "next" -msgstr "След." - -#: gitk:2058 -msgid "prev" -msgstr "Пред." - -#: gitk:2059 +#: gitk:2295 msgid "commit" msgstr "ÑоÑтоÑние" -#: gitk:2062 gitk:2064 gitk:4179 gitk:4202 gitk:4226 gitk:6164 gitk:6236 -#: gitk:6320 +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 +#: gitk:6893 msgid "containing:" msgstr "Ñодержащее:" -#: gitk:2065 gitk:3117 gitk:3122 gitk:4254 +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 msgid "touching paths:" msgstr "каÑательно файлов:" -#: gitk:2066 gitk:4259 +#: gitk:2303 gitk:4759 msgid "adding/removing string:" msgstr "добавив/удалив Ñтроку:" -#: gitk:2075 gitk:2077 +#: gitk:2304 gitk:4761 +msgid "changing lines matching:" +msgstr "" + +#: gitk:2313 gitk:2315 gitk:4748 msgid "Exact" msgstr "Точно" -#: gitk:2077 gitk:4334 gitk:6132 +#: gitk:2315 gitk:4836 gitk:6704 msgid "IgnCase" msgstr "Игнорировать большие/маленькие" -#: gitk:2077 gitk:4228 gitk:4332 gitk:6128 +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 msgid "Regexp" msgstr "РегулÑрные выражениÑ" -#: gitk:2079 gitk:2080 gitk:4353 gitk:4383 gitk:4390 gitk:6256 gitk:6324 +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 msgid "All fields" msgstr "Во вÑех полÑÑ…" -#: gitk:2080 gitk:4351 gitk:4383 gitk:6195 +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 msgid "Headline" msgstr "Заголовок" -#: gitk:2081 gitk:4351 gitk:6195 gitk:6324 gitk:6737 +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 msgid "Comments" msgstr "Комментарии" -#: gitk:2081 gitk:4351 gitk:4355 gitk:4390 gitk:6195 gitk:6672 gitk:7923 -#: gitk:7938 +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 +#: gitk:8826 msgid "Author" msgstr "Ðвтор" -#: gitk:2081 gitk:4351 gitk:6195 gitk:6674 +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 msgid "Committer" msgstr "Сохранивший ÑоÑтоÑние" -#: gitk:2110 +#: gitk:2350 msgid "Search" msgstr "Ðайти" -#: gitk:2117 +#: gitk:2358 msgid "Diff" msgstr "Сравнить" -#: gitk:2119 +#: gitk:2360 msgid "Old version" msgstr "Ð¡Ñ‚Ð°Ñ€Ð°Ñ Ð²ÐµÑ€ÑиÑ" -#: gitk:2121 +#: gitk:2362 msgid "New version" msgstr "ÐÐ¾Ð²Ð°Ñ Ð²ÐµÑ€ÑиÑ" -#: gitk:2123 +#: gitk:2364 msgid "Lines of context" msgstr "Строк контекÑта" -#: gitk:2133 +#: gitk:2374 msgid "Ignore space change" msgstr "Игнорировать пробелы" -#: gitk:2191 +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +msgid "Line diff" +msgstr "" + +#: gitk:2445 msgid "Patch" msgstr "Патч" -#: gitk:2193 +#: gitk:2447 msgid "Tree" msgstr "Файлы" -#: gitk:2326 gitk:2339 +#: gitk:2616 gitk:2636 msgid "Diff this -> selected" msgstr "Сравнить Ñто ÑоÑтоÑние Ñ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð½Ñ‹Ð¼" -#: gitk:2327 gitk:2340 +#: gitk:2617 gitk:2637 msgid "Diff selected -> this" msgstr "Сравнить выделенное Ñ Ñтим ÑоÑтоÑнием" -#: gitk:2328 gitk:2341 +#: gitk:2618 gitk:2638 msgid "Make patch" msgstr "Создать патч" -#: gitk:2329 gitk:8136 +#: gitk:2619 gitk:9235 msgid "Create tag" msgstr "Создать метку" -#: gitk:2330 gitk:8239 +#: gitk:2620 gitk:9352 msgid "Write commit to file" msgstr "Сохранить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² файл" -#: gitk:2331 gitk:8296 +#: gitk:2621 gitk:9409 msgid "Create new branch" msgstr "Создать ветвь" -#: gitk:2332 +#: gitk:2622 msgid "Cherry-pick this commit" msgstr "Скопировать Ñто ÑоÑтоÑние" -#: gitk:2333 +#: gitk:2623 msgid "Reset HEAD branch to here" msgstr "УÑтановить HEAD на Ñто ÑоÑтоÑние" -#: gitk:2347 +#: gitk:2624 +#, fuzzy +msgid "Mark this commit" +msgstr "Скопировать Ñто ÑоÑтоÑние" + +#: gitk:2625 +msgid "Return to mark" +msgstr "" + +#: gitk:2626 +msgid "Find descendant of this and mark" +msgstr "" + +#: gitk:2627 +msgid "Compare with marked commit" +msgstr "" + +#: gitk:2628 gitk:2639 +#, fuzzy +msgid "Diff this -> marked commit" +msgstr "Сравнить Ñто ÑоÑтоÑние Ñ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð½Ñ‹Ð¼" + +#: gitk:2629 gitk:2640 +#, fuzzy +msgid "Diff marked commit -> this" +msgstr "Сравнить выделенное Ñ Ñтим ÑоÑтоÑнием" + +#: gitk:2630 +#, fuzzy +msgid "Revert this commit" +msgstr "Скопировать Ñто ÑоÑтоÑние" + +#: gitk:2646 msgid "Check out this branch" msgstr "Перейти на Ñту ветвь" -#: gitk:2348 +#: gitk:2647 msgid "Remove this branch" msgstr "Удалить Ñту ветвь" -#: gitk:2355 +#: gitk:2654 msgid "Highlight this too" msgstr "ПодÑветить Ñтот тоже" -#: gitk:2356 +#: gitk:2655 msgid "Highlight this only" msgstr "ПодÑветить только Ñтот" -#: gitk:2357 +#: gitk:2656 msgid "External diff" msgstr "Программа ÑравнениÑ" -#: gitk:2358 +#: gitk:2657 msgid "Blame parent commit" msgstr "Ðннотировать родительÑкое ÑоÑтоÑние" -#: gitk:2365 +#: gitk:2664 msgid "Show origin of this line" msgstr "Показать иÑточник Ñтой Ñтроки" -#: gitk:2366 +#: gitk:2665 msgid "Run git gui blame on this line" msgstr "ЗапуÑтить git gui blame Ð´Ð»Ñ Ñтой Ñтроки" -#: gitk:2611 +#: gitk:3011 +#, fuzzy msgid "" "\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" +"Copyright © 2005-2014 Paul Mackerras\n" "\n" "Use and redistribute under the terms of the GNU General Public License" msgstr "" @@ -324,497 +368,667 @@ msgstr "" "\n" "ИÑпользование и раÑпроÑтранение ÑоглаÑно уÑловиÑм GNU General Public License" -#: gitk:2619 gitk:2681 gitk:8661 +#: gitk:3019 gitk:3085 gitk:9836 msgid "Close" msgstr "Закрыть" -#: gitk:2638 +#: gitk:3040 msgid "Gitk key bindings" msgstr "ÐÐ°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ ÐºÐ»Ð°Ð²Ð¸Ð°Ñ‚ÑƒÑ€Ñ‹ в Gitk" -#: gitk:2641 +#: gitk:3043 msgid "Gitk key bindings:" msgstr "ÐÐ°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ ÐºÐ»Ð°Ð²Ð¸Ð°Ñ‚ÑƒÑ€Ñ‹ в Gitk:" -#: gitk:2643 +#: gitk:3045 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tЗавершить" -#: gitk:2644 +#: gitk:3046 +#, fuzzy, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-F>\t\tПоиÑк" + +#: gitk:3047 msgid "<Home>\t\tMove to first commit" msgstr "<Home>\t\tПерейти к первому ÑоÑтоÑнию" -#: gitk:2645 +#: gitk:3048 msgid "<End>\t\tMove to last commit" msgstr "<End>\t\tПерейти к поÑледнему ÑоÑтоÑнию" -#: gitk:2646 -msgid "<Up>, p, i\tMove up one commit" +#: gitk:3049 +#, fuzzy +msgid "<Up>, p, k\tMove up one commit" msgstr "<Up>, p, i\tПерейти к Ñледующему ÑоÑтоÑнию" -#: gitk:2647 -msgid "<Down>, n, k\tMove down one commit" +#: gitk:3050 +#, fuzzy +msgid "<Down>, n, j\tMove down one commit" msgstr "<Down>, n, k\tПерейти к предыдущему ÑоÑтоÑнию" -#: gitk:2648 -msgid "<Left>, z, j\tGo back in history list" +#: gitk:3051 +#, fuzzy +msgid "<Left>, z, h\tGo back in history list" msgstr "<Left>, z, j\tПоказать ранее поÑещённое ÑоÑтоÑние" -#: gitk:2649 +#: gitk:3052 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Right>, x, l\tПоказать Ñледующее поÑещённое ÑоÑтоÑние" -#: gitk:2650 +#: gitk:3053 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "" + +#: gitk:3054 msgid "<PageUp>\tMove up one page in commit list" msgstr "<PageUp>\tПерейти на Ñтраницу выше в ÑпиÑке ÑоÑтоÑний" -#: gitk:2651 +#: gitk:3055 msgid "<PageDown>\tMove down one page in commit list" msgstr "<PageDown>\tПерейти на Ñтраницу ниже в ÑпиÑке ÑоÑтоÑний" -#: gitk:2652 +#: gitk:3056 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tПоказать начало ÑпиÑка ÑоÑтоÑний" -#: gitk:2653 +#: gitk:3057 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tПоказать конец ÑпиÑка ÑоÑтоÑний" -#: gitk:2654 +#: gitk:3058 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Up>\tПровернуть ÑпиÑок ÑоÑтоÑний вверх" -#: gitk:2655 +#: gitk:3059 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Down>\tПровернуть ÑпиÑок ÑоÑтоÑний вниз" -#: gitk:2656 +#: gitk:3060 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tПровернуть ÑпиÑок ÑоÑтоÑний на Ñтраницу вверх" -#: gitk:2657 +#: gitk:3061 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tПровернуть ÑпиÑок ÑоÑтоÑний на Ñтраницу вниз" -#: gitk:2658 +#: gitk:3062 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" -msgstr "" -"<Shift-Up>\tПоиÑк в обратном порÑдке (вверх, Ñреди новых ÑоÑтоÑний)" +msgstr "<Shift-Up>\tПоиÑк в обратном порÑдке (вверх, Ñреди новых ÑоÑтоÑний)" -#: gitk:2659 +#: gitk:3063 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" msgstr "<Shift-Down>\tПоиÑк (вниз, Ñреди Ñтарых ÑоÑтоÑний)" -#: gitk:2660 +#: gitk:3064 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Delete>, b\tПрокрутить ÑпиÑок изменений на Ñтраницу выше" -#: gitk:2661 +#: gitk:3065 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Backspace>\tПрокрутить ÑпиÑок изменений на Ñтраницу выше" -#: gitk:2662 +#: gitk:3066 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Leertaste>\t\tПрокрутить ÑпиÑок изменений на Ñтраницу ниже" -#: gitk:2663 +#: gitk:3067 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tПрокрутить ÑпиÑок изменений на 18 Ñтрок вверх" -#: gitk:2664 +#: gitk:3068 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tПрокрутить ÑпиÑок изменений на 18 Ñтрок вниз" -#: gitk:2665 +#: gitk:3069 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tПоиÑк" -#: gitk:2666 +#: gitk:3070 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tПерейти к Ñледующему найденному ÑоÑтоÑнию" -#: gitk:2667 +#: gitk:3071 msgid "<Return>\tMove to next find hit" msgstr "<Return>\tПерейти к Ñледующему найденному ÑоÑтоÑнию" -#: gitk:2668 +#: gitk:3072 msgid "/\t\tFocus the search box" msgstr "/\t\tПерейти к полю поиÑка" -#: gitk:2669 +#: gitk:3073 msgid "?\t\tMove to previous find hit" msgstr "?\t\tПерейти к предыдущему найденному ÑоÑтоÑнию" -#: gitk:2670 +#: gitk:3074 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tПрокрутить ÑпиÑок изменений к Ñледующему файлу" -#: gitk:2671 +#: gitk:3075 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tПродолжить поиÑк в ÑпиÑке изменений" -#: gitk:2672 +#: gitk:3076 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tПерейти к предыдущему найденному текÑту в ÑпиÑке изменений" -#: gitk:2673 +#: gitk:3077 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tУвеличить размер шрифта" -#: gitk:2674 +#: gitk:3078 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tУвеличить размер шрифта" -#: gitk:2675 +#: gitk:3079 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tУменьшить размер шрифта" -#: gitk:2676 +#: gitk:3080 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tУменьшить размер шрифта" -#: gitk:2677 +#: gitk:3081 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tОбновить" -#: gitk:3132 -#, tcl-format -msgid "Error getting \"%s\" from %s:" -msgstr "Ошибка Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ \"%s\" из %s:" - -#: gitk:3189 gitk:3198 +#: gitk:3546 gitk:3555 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð³Ð¾ каталога %s:" -#: gitk:3211 +#: gitk:3568 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Ошибка Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ \"%s\" из %s:" + +#: gitk:3631 msgid "command failed:" msgstr "ошибка Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹:" -#: gitk:3357 +#: gitk:3780 msgid "No such commit" msgstr "СоÑтоÑние не найдено" -#: gitk:3371 +#: gitk:3794 msgid "git gui blame: command failed:" msgstr "git gui blame: ошибка Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹:" -#: gitk:3402 +#: gitk:3825 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ MERGE_HEAD: %s" -#: gitk:3410 +#: gitk:3833 #, tcl-format msgid "Error reading index: %s" msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¸Ð½Ð´ÐµÐºÑа: %s" -#: gitk:3435 +#: gitk:3858 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Ошибка запуÑка git blame: %s" -#: gitk:3438 gitk:6163 +#: gitk:3861 gitk:6735 msgid "Searching" msgstr "ПоиÑк" -#: gitk:3470 +#: gitk:3893 #, tcl-format msgid "Error running git blame: %s" msgstr "Ошибка Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ git blame: %s" -#: gitk:3498 +#: gitk:3921 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "" -"Ðта Ñтрока принадлежит ÑоÑтоÑнию %s, которое не показано в Ñтом " -"предÑтавлении" +"Ðта Ñтрока принадлежит ÑоÑтоÑнию %s, которое не показано в Ñтом предÑтавлении" -#: gitk:3512 +#: gitk:3935 msgid "External diff viewer failed:" msgstr "Ошибка Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹ ÑравнениÑ:" -#: gitk:3630 +#: gitk:4053 msgid "Gitk view definition" msgstr "Gitk определение предÑтавлений" -#: gitk:3634 +#: gitk:4057 msgid "Remember this view" msgstr "Запомнить предÑтавление" -#: gitk:3635 -msgid "Commits to include (arguments to git log):" -msgstr "Включить ÑоÑтоÑÐ½Ð¸Ñ (аргументы Ð´Ð»Ñ git-log):" +#: gitk:4058 +msgid "References (space separated list):" +msgstr "" + +#: gitk:4059 +msgid "Branches & tags:" +msgstr "" -#: gitk:3636 -msgid "Use all refs" -msgstr "ИÑпользовать вÑе ветви" +#: gitk:4060 +#, fuzzy +msgid "All refs" +msgstr "Ð’Ñе файлы" -#: gitk:3637 -msgid "Strictly sort by date" -msgstr "Ð¡Ñ‚Ñ€Ð¾Ð³Ð°Ñ Ñортировка по дате" +#: gitk:4061 +msgid "All (local) branches" +msgstr "" -#: gitk:3638 -msgid "Mark branch sides" -msgstr "Отметить Ñтороны ветвей" +#: gitk:4062 +msgid "All tags" +msgstr "" + +#: gitk:4063 +msgid "All remote-tracking branches" +msgstr "" + +#: gitk:4064 +msgid "Commit Info (regular expressions):" +msgstr "" + +#: gitk:4065 +#, fuzzy +msgid "Author:" +msgstr "Ðвтор" + +#: gitk:4066 +#, fuzzy +msgid "Committer:" +msgstr "Сохранивший ÑоÑтоÑние" + +#: gitk:4067 +msgid "Commit Message:" +msgstr "" + +#: gitk:4068 +msgid "Matches all Commit Info criteria" +msgstr "" + +#: gitk:4069 +msgid "Matches none Commit Info criteria" +msgstr "" + +#: gitk:4070 +msgid "Changes to Files:" +msgstr "" + +#: gitk:4071 +msgid "Fixed String" +msgstr "" + +#: gitk:4072 +msgid "Regular Expression" +msgstr "" -#: gitk:3639 -msgid "Since date:" +#: gitk:4073 +#, fuzzy +msgid "Search string:" +msgstr "ПоиÑк" + +#: gitk:4074 +msgid "" +"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " +"15:27:38\"):" +msgstr "" + +#: gitk:4075 +#, fuzzy +msgid "Since:" msgstr "С даты:" -#: gitk:3640 -msgid "Until date:" +#: gitk:4076 +#, fuzzy +msgid "Until:" msgstr "По дату:" -#: gitk:3641 -msgid "Max count:" -msgstr "МакÑ. количеÑтво:" +#: gitk:4077 +msgid "Limit and/or skip a number of revisions (positive integer):" +msgstr "" + +#: gitk:4078 +msgid "Number to show:" +msgstr "" + +#: gitk:4079 +msgid "Number to skip:" +msgstr "" + +#: gitk:4080 +msgid "Miscellaneous options:" +msgstr "" + +#: gitk:4081 +msgid "Strictly sort by date" +msgstr "Ð¡Ñ‚Ñ€Ð¾Ð³Ð°Ñ Ñортировка по дате" -#: gitk:3642 -msgid "Skip:" -msgstr "ПропуÑтить:" +#: gitk:4082 +msgid "Mark branch sides" +msgstr "Отметить Ñтороны ветвей" -#: gitk:3643 +#: gitk:4083 msgid "Limit to first parent" msgstr "Ограничить первым предком" -#: gitk:3644 -msgid "Command to generate more commits to include:" -msgstr "Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Ð´Ð»Ñ ÑпиÑка ÑоÑтоÑний:" +#: gitk:4084 +msgid "Simple history" +msgstr "" -#: gitk:3753 -msgid "Name" -msgstr "ИмÑ" +#: gitk:4085 +#, fuzzy +msgid "Additional arguments to git log:" +msgstr "Включить ÑоÑтоÑÐ½Ð¸Ñ (аргументы Ð´Ð»Ñ git-log):" -#: gitk:3801 +#: gitk:4086 msgid "Enter files and directories to include, one per line:" msgstr "Файлы и каталоги Ð´Ð»Ñ Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ð¸Ñтории, по одному на Ñтроку:" -#: gitk:3815 +#: gitk:4087 +msgid "Command to generate more commits to include:" +msgstr "Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Ð´Ð»Ñ ÑпиÑка ÑоÑтоÑний:" + +#: gitk:4211 +msgid "Gitk: edit view" +msgstr "" + +#: gitk:4219 +#, fuzzy +msgid "-- criteria for selecting revisions" +msgstr "Ошибка в идентификаторе верÑии:" + +#: gitk:4224 +#, fuzzy +msgid "View Name" +msgstr "ПредÑтавление" + +#: gitk:4299 msgid "Apply (F5)" msgstr "Применить (F5)" -#: gitk:3853 +#: gitk:4337 msgid "Error in commit selection arguments:" msgstr "Ошибка в параметрах выбора ÑоÑтоÑний:" -#: gitk:3906 gitk:3958 gitk:4403 gitk:4417 gitk:5675 gitk:10867 gitk:10868 +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 msgid "None" msgstr "Ðи одного" -#: gitk:4351 gitk:6195 gitk:7925 gitk:7940 -msgid "Date" -msgstr "Дата" - -#: gitk:4351 gitk:6195 -msgid "CDate" -msgstr "Дата ввода" - -#: gitk:4500 gitk:4505 +#: gitk:5003 gitk:5008 msgid "Descendant" msgstr "Порождённое" -#: gitk:4501 +#: gitk:5004 msgid "Not descendant" msgstr "Ðе порождённое" -#: gitk:4508 gitk:4513 +#: gitk:5011 gitk:5016 msgid "Ancestor" msgstr "Предок" -#: gitk:4509 +#: gitk:5012 msgid "Not ancestor" msgstr "Ðе предок" -#: gitk:4799 +#: gitk:5306 msgid "Local changes checked in to index but not committed" msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð·Ð°Ñ€ÐµÐ³Ð¸Ñтрированные в индекÑе, но не Ñохранённые" -#: gitk:4835 +#: gitk:5342 msgid "Local uncommitted changes, not checked in to index" msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² рабочем каталоге, не зарегиÑтрированные в индекÑе" -#: gitk:6676 +#: gitk:7115 +msgid "and many more" +msgstr "" + +#: gitk:7118 +msgid "many" +msgstr "" + +#: gitk:7309 msgid "Tags:" msgstr "Таги:" -#: gitk:6693 gitk:6699 gitk:7918 +#: gitk:7326 gitk:7332 gitk:8806 msgid "Parent" msgstr "Предок" -#: gitk:6704 +#: gitk:7337 msgid "Child" msgstr "Потомок" -#: gitk:6713 +#: gitk:7346 msgid "Branch" msgstr "Ветвь" -#: gitk:6716 +#: gitk:7349 msgid "Follows" msgstr "Следует за" -#: gitk:6719 +#: gitk:7352 msgid "Precedes" msgstr "ПредшеÑтвует" -#: gitk:7212 +#: gitk:7947 #, tcl-format msgid "Error getting diffs: %s" msgstr "Ошибка Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹: %s" -#: gitk:7751 +#: gitk:8631 msgid "Goto:" msgstr "Перейти к:" -#: gitk:7753 -msgid "SHA1 ID:" -msgstr "SHA1 ID:" - -#: gitk:7772 +#: gitk:8652 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "Сокращённый SHA1 идентификатор %s неоднозначен" -#: gitk:7784 +#: gitk:8659 +#, fuzzy, tcl-format +msgid "Revision %s is not known" +msgstr "SHA1 идентификатор %s не найден" + +#: gitk:8669 #, tcl-format msgid "SHA1 id %s is not known" msgstr "SHA1 идентификатор %s не найден" -#: gitk:7786 +#: gitk:8671 #, tcl-format -msgid "Tag/Head %s is not known" -msgstr "Метка или ветвь %s не найдена" +msgid "Revision %s is not in the current view" +msgstr "" -#: gitk:7928 +#: gitk:8813 gitk:8828 +msgid "Date" +msgstr "Дата" + +#: gitk:8816 msgid "Children" msgstr "Потомки" -#: gitk:7985 +#: gitk:8879 #, tcl-format msgid "Reset %s branch to here" msgstr "УÑтановить ветвь %s на Ñто ÑоÑтоÑние" -#: gitk:7987 +#: gitk:8881 msgid "Detached head: can't reset" msgstr "СоÑтоÑние не принадлежит ни одной ветви, переход невозможен" -#: gitk:8019 +#: gitk:8986 gitk:8992 +msgid "Skipping merge commit " +msgstr "" + +#: gitk:9001 gitk:9006 +#, fuzzy +msgid "Error getting patch ID for " +msgstr "Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ð°Ñ‚Ñ‡Ð°:" + +#: gitk:9002 gitk:9007 +msgid " - stopping\n" +msgstr "" + +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 +#, fuzzy +msgid "Commit " +msgstr "ÑоÑтоÑние" + +#: gitk:9016 +msgid "" +" is the same patch as\n" +" " +msgstr "" + +#: gitk:9024 +msgid "" +" differs from\n" +" " +msgstr "" + +#: gitk:9026 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "" + +#: gitk:9038 gitk:9047 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr "" + +#: gitk:9066 +#, fuzzy, tcl-format +msgid "Error writing commit to file: %s" +msgstr "Ошибка ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ ÑоÑтоÑниÑ:" + +#: gitk:9072 +#, fuzzy, tcl-format +msgid "Error diffing commits: %s" +msgstr "Ошибка ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ ÑоÑтоÑниÑ:" + +#: gitk:9118 msgid "Top" msgstr "Верх" -#: gitk:8020 +#: gitk:9119 msgid "From" msgstr "От" -#: gitk:8025 +#: gitk:9124 msgid "To" msgstr "До" -#: gitk:8049 +#: gitk:9148 msgid "Generate patch" msgstr "Создать патч" -#: gitk:8051 +#: gitk:9150 msgid "From:" msgstr "От:" -#: gitk:8060 +#: gitk:9159 msgid "To:" msgstr "До:" -#: gitk:8069 +#: gitk:9168 msgid "Reverse" msgstr "Ð’ обратном порÑдке" -#: gitk:8071 gitk:8253 +#: gitk:9170 gitk:9366 msgid "Output file:" msgstr "Файл Ð´Ð»Ñ ÑохранениÑ:" -#: gitk:8077 +#: gitk:9176 msgid "Generate" msgstr "Создать" -#: gitk:8115 +#: gitk:9214 msgid "Error creating patch:" msgstr "Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ð°Ñ‚Ñ‡Ð°:" -#: gitk:8138 gitk:8241 gitk:8298 +#: gitk:9237 gitk:9354 gitk:9411 msgid "ID:" msgstr "ID:" -#: gitk:8147 +#: gitk:9246 msgid "Tag name:" msgstr "Ð˜Ð¼Ñ Ð¼ÐµÑ‚ÐºÐ¸:" -#: gitk:8151 gitk:8307 +#: gitk:9249 +msgid "Tag message is optional" +msgstr "" + +#: gitk:9251 +#, fuzzy +msgid "Tag message:" +msgstr "Ð˜Ð¼Ñ Ð¼ÐµÑ‚ÐºÐ¸:" + +#: gitk:9255 gitk:9420 msgid "Create" msgstr "Создать" -#: gitk:8168 +#: gitk:9273 msgid "No tag name specified" msgstr "Ðе задано Ð¸Ð¼Ñ Ð¼ÐµÑ‚ÐºÐ¸" -#: gitk:8172 +#: gitk:9277 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Метка \"%s\" уже ÑущеÑтвует" -#: gitk:8178 +#: gitk:9287 msgid "Error creating tag:" msgstr "Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¼ÐµÑ‚ÐºÐ¸:" -#: gitk:8250 +#: gitk:9363 msgid "Command:" msgstr "Команда:" -#: gitk:8258 +#: gitk:9371 msgid "Write" msgstr "ЗапиÑÑŒ" -#: gitk:8276 +#: gitk:9389 msgid "Error writing commit:" msgstr "Ошибка ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ ÑоÑтоÑниÑ:" -#: gitk:8303 +#: gitk:9416 msgid "Name:" msgstr "ИмÑ:" -#: gitk:8326 +#: gitk:9439 msgid "Please specify a name for the new branch" msgstr "Укажите Ð¸Ð¼Ñ Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð¹ ветви" -#: gitk:8331 +#: gitk:9444 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "Ветвь '%s' уже ÑущеÑтвует. ПерепиÑать?" -#: gitk:8397 +#: gitk:9511 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" -msgstr "" -"СоÑтоÑние %s уже принадлежит ветви %s. Продолжить операцию?" +msgstr "СоÑтоÑние %s уже принадлежит ветви %s. Продолжить операцию?" -#: gitk:8402 +#: gitk:9516 msgid "Cherry-picking" msgstr "Копирование изменений" -#: gitk:8411 +#: gitk:9525 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -823,61 +1037,88 @@ msgstr "" "Копирование невозможно из-за изменений в файле '%s'.\n" "Сохраните или отмените Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸ повторите операцию." -#: gitk:8417 +#: gitk:9531 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" msgstr "" -"Копирование изменений невозможно из-за незавершённой операции " -"ÑлиÑниÑ.\nЗапуÑтить git citool Ð´Ð»Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ Ñтой операции?" +"Копирование изменений невозможно из-за незавершённой операции ÑлиÑниÑ.\n" +"ЗапуÑтить git citool Ð´Ð»Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ Ñтой операции?" -#: gitk:8433 +#: gitk:9547 gitk:9605 msgid "No changes committed" msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð½Ðµ Ñохранены" -#: gitk:8459 +#: gitk:9574 +#, fuzzy, tcl-format +msgid "Commit %s is not included in branch %s -- really revert it?" +msgstr "СоÑтоÑние %s уже принадлежит ветви %s. Продолжить операцию?" + +#: gitk:9579 +#, fuzzy +msgid "Reverting" +msgstr "УÑтановка" + +#: gitk:9587 +#, fuzzy, tcl-format +msgid "" +"Revert failed because of local changes to the following files:%s Please " +"commit, reset or stash your changes and try again." +msgstr "" +"Копирование невозможно из-за изменений в файле '%s'.\n" +"Сохраните или отмените Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸ повторите операцию." + +#: gitk:9591 +#, fuzzy +msgid "" +"Revert failed because of merge conflict.\n" +" Do you wish to run git citool to resolve it?" +msgstr "" +"Копирование изменений невозможно из-за незавершённой операции ÑлиÑниÑ.\n" +"ЗапуÑтить git citool Ð´Ð»Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ Ñтой операции?" + +#: gitk:9634 msgid "Confirm reset" msgstr "Подтвердите операцию перехода" -#: gitk:8461 +#: gitk:9636 #, tcl-format msgid "Reset branch %s to %s?" msgstr "УÑтановить ветвь %s на ÑоÑтоÑние %s?" -#: gitk:8465 +#: gitk:9638 msgid "Reset type:" msgstr "Тип операции перехода:" -#: gitk:8469 +#: gitk:9641 msgid "Soft: Leave working tree and index untouched" msgstr "Лёгкий: оÑтавить рабочий каталог и Ð¸Ð½Ð´ÐµÐºÑ Ð½ÐµÐ¸Ð·Ð¼ÐµÐ½Ð½Ñ‹Ð¼Ð¸" -#: gitk:8472 +#: gitk:9644 msgid "Mixed: Leave working tree untouched, reset index" -msgstr "" -"Смешанный: оÑтавить рабочий каталог неизменным, уÑтановить индекÑ" +msgstr "Смешанный: оÑтавить рабочий каталог неизменным, уÑтановить индекÑ" -#: gitk:8475 +#: gitk:9647 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" msgstr "" "ЖеÑткий: перепиÑать Ð¸Ð½Ð´ÐµÐºÑ Ð¸ рабочий каталог\n" -"(вÑе Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² рабочем каталоги будут потерÑны)" +"(вÑе Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² рабочем каталоге будут потерÑны)" -#: gitk:8492 +#: gitk:9664 msgid "Resetting" msgstr "УÑтановка" -#: gitk:8549 +#: gitk:9724 msgid "Checking out" msgstr "Переход" -#: gitk:8602 +#: gitk:9777 msgid "Cannot delete the currently checked-out branch" msgstr "ÐÐºÑ‚Ð¸Ð²Ð½Ð°Ñ Ð²ÐµÑ‚Ð²ÑŒ не может быть удалена" -#: gitk:8608 +#: gitk:9783 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -886,200 +1127,272 @@ msgstr "" "СоÑтоÑÐ½Ð¸Ñ Ð²ÐµÑ‚Ð²Ð¸ %s больше не принадлежат никакой другой ветви.\n" "ДейÑтвительно удалить ветвь %s?" -#: gitk:8639 +#: gitk:9814 #, tcl-format msgid "Tags and heads: %s" msgstr "Метки и ветви: %s" -#: gitk:8654 +#: gitk:9829 msgid "Filter" msgstr "Фильтровать" -#: gitk:8949 +#: gitk:10125 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." msgstr "" -"Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¸Ñтории проекта; Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ ветвÑÑ… и ÑоÑтоÑниÑÑ… " -"вокруг меток (до/поÑле) может быть неполной." +"Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¸Ñтории проекта; Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ ветвÑÑ… и ÑоÑтоÑниÑÑ… вокруг меток " +"(до/поÑле) может быть неполной." -#: gitk:9935 +#: gitk:11102 msgid "Tag" msgstr "Метка" -#: gitk:9935 +#: gitk:11106 msgid "Id" msgstr "Id" -#: gitk:9983 +#: gitk:11189 msgid "Gitk font chooser" msgstr "Шрифт Gitk" -#: gitk:10000 +#: gitk:11206 msgid "B" msgstr "Ж" -#: gitk:10003 +#: gitk:11209 msgid "I" msgstr "К" -#: gitk:10098 -msgid "Gitk preferences" -msgstr "ÐаÑтройки Gitk" - -#: gitk:10100 +#: gitk:11327 msgid "Commit list display options" msgstr "Параметры показа ÑпиÑка ÑоÑтоÑний" -#: gitk:10103 +#: gitk:11330 msgid "Maximum graph width (lines)" msgstr "МакÑ. ширина графа (Ñтрок)" -#: gitk:10107 -#, tcl-format +#: gitk:11334 +#, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "МакÑ. ширина графа (% ширины панели)" -#: gitk:10111 +#: gitk:11337 msgid "Show local changes" msgstr "Показывать Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² рабочем каталоге" -#: gitk:10114 -msgid "Auto-select SHA1" +#: gitk:11340 +#, fuzzy +msgid "Auto-select SHA1 (length)" msgstr "Выделить SHA1" -#: gitk:10118 +#: gitk:11344 +msgid "Hide remote refs" +msgstr "" + +#: gitk:11348 msgid "Diff display options" msgstr "Параметры показа изменений" -#: gitk:10120 +#: gitk:11350 msgid "Tab spacing" msgstr "Ширина табулÑции" -#: gitk:10123 -msgid "Display nearby tags" +#: gitk:11353 +#, fuzzy +msgid "Display nearby tags/heads" msgstr "Показывать близкие метки" -#: gitk:10126 +#: gitk:11356 +msgid "Maximum # tags/heads to show" +msgstr "" + +#: gitk:11359 msgid "Limit diffs to listed paths" msgstr "Ограничить показ изменений выбранными файлами" -#: gitk:10129 +#: gitk:11362 msgid "Support per-file encodings" msgstr "Поддержка кодировок в отдельных файлах" -#: gitk:10135 +#: gitk:11368 gitk:11515 msgid "External diff tool" msgstr "Программа Ð´Ð»Ñ Ð¿Ð¾ÐºÐ°Ð·Ð° изменений" -#: gitk:10137 +#: gitk:11369 msgid "Choose..." msgstr "Выберите..." -#: gitk:10142 +#: gitk:11374 +#, fuzzy +msgid "General options" +msgstr "Создать патч" + +#: gitk:11377 +msgid "Use themed widgets" +msgstr "" + +#: gitk:11379 +msgid "(change requires restart)" +msgstr "" + +#: gitk:11381 +msgid "(currently unavailable)" +msgstr "" + +#: gitk:11392 msgid "Colors: press to choose" msgstr "Цвета: нажмите Ð´Ð»Ñ Ð²Ñ‹Ð±Ð¾Ñ€Ð°" -#: gitk:10145 +#: gitk:11395 +msgid "Interface" +msgstr "" + +#: gitk:11396 +#, fuzzy +msgid "interface" +msgstr "Шрифт интерфейÑа" + +#: gitk:11399 msgid "Background" msgstr "Фон" -#: gitk:10146 gitk:10176 +#: gitk:11400 gitk:11430 msgid "background" msgstr "фон" -#: gitk:10149 +#: gitk:11403 msgid "Foreground" msgstr "Передний план" -#: gitk:10150 +#: gitk:11404 msgid "foreground" msgstr "передний план" -#: gitk:10153 +#: gitk:11407 msgid "Diff: old lines" msgstr "ИзменениÑ: Ñтарый текÑÑ‚" -#: gitk:10154 +#: gitk:11408 msgid "diff old lines" msgstr "Ñтарый текÑÑ‚ изменениÑ" -#: gitk:10158 +#: gitk:11412 msgid "Diff: new lines" msgstr "ИзменениÑ: новый текÑÑ‚" -#: gitk:10159 +#: gitk:11413 msgid "diff new lines" msgstr "новый текÑÑ‚ изменениÑ" -#: gitk:10163 +#: gitk:11417 msgid "Diff: hunk header" msgstr "ИзменениÑ: заголовок блока" -#: gitk:10165 +#: gitk:11419 msgid "diff hunk header" msgstr "заголовок блока изменений" -#: gitk:10169 +#: gitk:11423 msgid "Marked line bg" msgstr "Фон выбранной Ñтроки" -#: gitk:10171 +#: gitk:11425 msgid "marked line background" msgstr "фон выбранной Ñтроки" -#: gitk:10175 +#: gitk:11429 msgid "Select bg" msgstr "Выберите фон" -#: gitk:10179 +#: gitk:11438 msgid "Fonts: press to choose" msgstr "Шрифт: нажмите Ð´Ð»Ñ Ð²Ñ‹Ð±Ð¾Ñ€Ð°" -#: gitk:10181 +#: gitk:11440 msgid "Main font" msgstr "ОÑновной шрифт" -#: gitk:10182 +#: gitk:11441 msgid "Diff display font" msgstr "Шрифт показа изменений" -#: gitk:10183 +#: gitk:11442 msgid "User interface font" msgstr "Шрифт интерфейÑа" -#: gitk:10210 +#: gitk:11464 +msgid "Gitk preferences" +msgstr "ÐаÑтройки Gitk" + +#: gitk:11473 +#, fuzzy +msgid "General" +msgstr "Создать" + +#: gitk:11474 +msgid "Colors" +msgstr "" + +#: gitk:11475 +msgid "Fonts" +msgstr "" + +#: gitk:11525 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: выберите цвет Ð´Ð»Ñ %s" -#: gitk:10656 -msgid "" -"Sorry, gitk cannot run with this version of Tcl/Tk.\n" -" Gitk requires at least Tcl/Tk 8.4." -msgstr "" -"К Ñожалению gitk не может работать Ñ Ñтой верÑий Tcl/Tk.\n" -"ТребуетÑÑ ÐºÐ°Ðº минимум Tcl/Tk 8.4." - -#: gitk:10773 +#: gitk:12242 msgid "Cannot find a git repository here." msgstr "Git-репозитарий не найден в текущем каталоге." -#: gitk:10777 -#, tcl-format -msgid "Cannot find the git directory \"%s\"." -msgstr "Git-репозитарий \"%s\" не найден." - -#: gitk:10824 +#: gitk:12289 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Ðеоднозначный аргумент '%s': ÑущеÑтвует как верÑÐ¸Ñ Ð¸ Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð°" -#: gitk:10836 +#: gitk:12301 msgid "Bad arguments to gitk:" msgstr "Ðеправильные аргументы Ð´Ð»Ñ gitk:" -#: gitk:10896 +#: gitk:12405 msgid "Command line" msgstr "ÐšÐ¾Ð¼Ð°Ð½Ð´Ð½Ð°Ñ Ñтрока" +#~ msgid "SHA1 ID: " +#~ msgstr "SHA1:" + +#~ msgid "next" +#~ msgstr "След." + +#~ msgid "prev" +#~ msgstr "Пред." + +#~ msgid "Use all refs" +#~ msgstr "ИÑпользовать вÑе ветви" + +#~ msgid "Max count:" +#~ msgstr "МакÑ. количеÑтво:" + +#~ msgid "Skip:" +#~ msgstr "ПропуÑтить:" + +#~ msgid "Name" +#~ msgstr "ИмÑ" + +#~ msgid "CDate" +#~ msgstr "Дата ввода" + +#~ msgid "Tag/Head %s is not known" +#~ msgstr "Метка или ветвь %s не найдена" + +#~ msgid "" +#~ "Sorry, gitk cannot run with this version of Tcl/Tk.\n" +#~ " Gitk requires at least Tcl/Tk 8.4." +#~ msgstr "" +#~ "К Ñожалению gitk не может работать Ñ Ñтой верÑий Tcl/Tk.\n" +#~ "ТребуетÑÑ ÐºÐ°Ðº минимум Tcl/Tk 8.4." + +#~ msgid "Cannot find the git directory \"%s\"." +#~ msgstr "Git-репозитарий \"%s\" не найден." diff --git a/gitk-git/po/sv.po b/gitk-git/po/sv.po index df95e01..0994d87 100644 --- a/gitk-git/po/sv.po +++ b/gitk-git/po/sv.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: sv\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-16 08:06+0100\n" +"POT-Creation-Date: 2015-03-15 14:37+1100\n" "PO-Revision-Date: 2013-05-16 08:12+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" @@ -22,29 +22,29 @@ msgstr "" msgid "Couldn't get list of unmerged files:" msgstr "Kunde inte hämta lista över ej sammanslagna filer:" -#: gitk:210 gitk:2334 +#: gitk:212 gitk:2381 msgid "Color words" msgstr "Färga ord" -#: gitk:215 gitk:2334 gitk:7977 gitk:8010 +#: gitk:217 gitk:2381 gitk:8201 gitk:8234 msgid "Markup words" msgstr "Märk upp ord" -#: gitk:312 +#: gitk:324 msgid "Error parsing revisions:" msgstr "Fel vid tolkning av revisioner:" -#: gitk:368 +#: gitk:380 msgid "Error executing --argscmd command:" msgstr "Fel vid körning av --argscmd-kommando:" -#: gitk:381 +#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "Inga filer valdes: --merge angavs men det finns inga filer som inte har " "slagits samman." -#: gitk:384 +#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -52,319 +52,312 @@ msgstr "" "Inga filer valdes: --merge angavs men det finns inga filer inom " "filbegränsningen." -#: gitk:406 gitk:554 +#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "Fel vid körning av git log:" -#: gitk:424 gitk:570 +#: gitk:436 gitk:582 msgid "Reading" msgstr "Läser" -#: gitk:484 gitk:4409 +#: gitk:496 gitk:4508 msgid "Reading commits..." msgstr "Läser incheckningar..." -#: gitk:487 gitk:1625 gitk:4412 +#: gitk:499 gitk:1637 gitk:4511 msgid "No commits selected" msgstr "Inga incheckningar markerade" -#: gitk:1499 +#: gitk:1511 msgid "Can't parse git log output:" msgstr "Kan inte tolka utdata frÃ¥n git log:" -#: gitk:1719 +#: gitk:1740 msgid "No commit information available" msgstr "Ingen incheckningsinformation är tillgänglig" -#: gitk:1876 +#: gitk:1897 msgid "mc" msgstr "mc" -#: gitk:1911 gitk:4202 gitk:9437 gitk:10979 gitk:11258 +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 msgid "OK" msgstr "OK" -#: gitk:1913 gitk:4204 gitk:8964 gitk:9043 gitk:9159 gitk:9208 gitk:9439 -#: gitk:10980 gitk:11259 +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 +#: gitk:11221 gitk:11501 msgid "Cancel" msgstr "Avbryt" -#: gitk:2048 +#: gitk:2069 msgid "Update" msgstr "Uppdatera" -#: gitk:2049 +#: gitk:2070 msgid "Reload" msgstr "Ladda om" -#: gitk:2050 +#: gitk:2071 msgid "Reread references" msgstr "Läs om referenser" -#: gitk:2051 +#: gitk:2072 msgid "List references" msgstr "Visa referenser" -#: gitk:2053 +#: gitk:2074 msgid "Start git gui" msgstr "Starta git gui" -#: gitk:2055 +#: gitk:2076 msgid "Quit" msgstr "Avsluta" -#: gitk:2047 +#: gitk:2068 msgid "File" msgstr "Arkiv" -#: gitk:2059 +#: gitk:2080 msgid "Preferences" msgstr "Inställningar" -#: gitk:2058 +#: gitk:2079 msgid "Edit" msgstr "Redigera" -#: gitk:2063 +#: gitk:2084 msgid "New view..." msgstr "Ny vy..." -#: gitk:2064 +#: gitk:2085 msgid "Edit view..." msgstr "Ändra vy..." -#: gitk:2065 +#: gitk:2086 msgid "Delete view" msgstr "Ta bort vy" -#: gitk:2067 +#: gitk:2088 msgid "All files" msgstr "Alla filer" -#: gitk:2062 gitk:3955 +#: gitk:2083 gitk:4050 msgid "View" msgstr "Visa" -#: gitk:2072 gitk:2082 gitk:2925 +#: gitk:2093 gitk:2103 gitk:3009 msgid "About gitk" msgstr "Om gitk" -#: gitk:2073 gitk:2087 +#: gitk:2094 gitk:2108 msgid "Key bindings" msgstr "Tangentbordsbindningar" -#: gitk:2071 gitk:2086 +#: gitk:2092 gitk:2107 msgid "Help" msgstr "Hjälp" -#: gitk:2164 gitk:8420 +#: gitk:2185 gitk:8633 msgid "SHA1 ID:" msgstr "SHA1-id:" -#: gitk:2208 +#: gitk:2229 msgid "Row" msgstr "Rad" -#: gitk:2246 +#: gitk:2267 msgid "Find" msgstr "Sök" -#: gitk:2247 -msgid "next" -msgstr "nästa" - -#: gitk:2248 -msgid "prev" -msgstr "föreg" - -#: gitk:2249 +#: gitk:2295 msgid "commit" msgstr "incheckning" -#: gitk:2252 gitk:2254 gitk:4570 gitk:4593 gitk:4617 gitk:6592 gitk:6664 -#: gitk:6749 +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 +#: gitk:6893 msgid "containing:" msgstr "som innehÃ¥ller:" -#: gitk:2255 gitk:3437 gitk:3442 gitk:4646 +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 msgid "touching paths:" msgstr "som rör sökväg:" -#: gitk:2256 gitk:4660 +#: gitk:2303 gitk:4759 msgid "adding/removing string:" msgstr "som lägger/till tar bort sträng:" -#: gitk:2257 gitk:4662 +#: gitk:2304 gitk:4761 msgid "changing lines matching:" msgstr "ändrar rader som matchar:" -#: gitk:2266 gitk:2268 gitk:4649 +#: gitk:2313 gitk:2315 gitk:4748 msgid "Exact" msgstr "Exakt" -#: gitk:2268 gitk:4737 gitk:6560 +#: gitk:2315 gitk:4836 gitk:6704 msgid "IgnCase" msgstr "IgnVersaler" -#: gitk:2268 gitk:4619 gitk:4735 gitk:6556 +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 msgid "Regexp" msgstr "Reg.uttr." -#: gitk:2270 gitk:2271 gitk:4757 gitk:4787 gitk:4794 gitk:6685 gitk:6753 +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 msgid "All fields" msgstr "Alla fält" -#: gitk:2271 gitk:4754 gitk:4787 gitk:6623 +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 msgid "Headline" msgstr "Rubrik" -#: gitk:2272 gitk:4754 gitk:6623 gitk:6753 gitk:7221 +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 msgid "Comments" msgstr "Kommentarer" -#: gitk:2272 gitk:4754 gitk:4759 gitk:4794 gitk:6623 gitk:7156 gitk:8598 -#: gitk:8613 +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 +#: gitk:8826 msgid "Author" msgstr "Författare" -#: gitk:2272 gitk:4754 gitk:6623 gitk:7158 +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 msgid "Committer" msgstr "Incheckare" -#: gitk:2303 +#: gitk:2350 msgid "Search" msgstr "Sök" -#: gitk:2311 +#: gitk:2358 msgid "Diff" msgstr "Diff" -#: gitk:2313 +#: gitk:2360 msgid "Old version" msgstr "Gammal version" -#: gitk:2315 +#: gitk:2362 msgid "New version" msgstr "Ny version" -#: gitk:2317 +#: gitk:2364 msgid "Lines of context" msgstr "Rader sammanhang" -#: gitk:2327 +#: gitk:2374 msgid "Ignore space change" msgstr "Ignorera ändringar i blanksteg" -#: gitk:2331 gitk:2333 gitk:7735 gitk:7963 +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 msgid "Line diff" msgstr "Rad-diff" -#: gitk:2397 +#: gitk:2445 msgid "Patch" msgstr "Patch" -#: gitk:2399 +#: gitk:2447 msgid "Tree" msgstr "Träd" -#: gitk:2557 gitk:2577 +#: gitk:2616 gitk:2636 msgid "Diff this -> selected" msgstr "Diff denna -> markerad" -#: gitk:2558 gitk:2578 +#: gitk:2617 gitk:2637 msgid "Diff selected -> this" msgstr "Diff markerad -> denna" -#: gitk:2559 gitk:2579 +#: gitk:2618 gitk:2638 msgid "Make patch" msgstr "Skapa patch" -#: gitk:2560 gitk:9022 +#: gitk:2619 gitk:9235 msgid "Create tag" msgstr "Skapa tagg" -#: gitk:2561 gitk:9139 +#: gitk:2620 gitk:9352 msgid "Write commit to file" msgstr "Skriv incheckning till fil" -#: gitk:2562 gitk:9196 +#: gitk:2621 gitk:9409 msgid "Create new branch" msgstr "Skapa ny gren" -#: gitk:2563 +#: gitk:2622 msgid "Cherry-pick this commit" msgstr "Plocka denna incheckning" -#: gitk:2564 +#: gitk:2623 msgid "Reset HEAD branch to here" msgstr "Ã…terställ HEAD-grenen hit" -#: gitk:2565 +#: gitk:2624 msgid "Mark this commit" msgstr "Markera denna incheckning" -#: gitk:2566 +#: gitk:2625 msgid "Return to mark" msgstr "Ã…tergÃ¥ till markering" -#: gitk:2567 +#: gitk:2626 msgid "Find descendant of this and mark" msgstr "Hitta efterföljare till denna och markera" -#: gitk:2568 +#: gitk:2627 msgid "Compare with marked commit" msgstr "Jämför med markerad incheckning" -#: gitk:2569 gitk:2580 +#: gitk:2628 gitk:2639 msgid "Diff this -> marked commit" msgstr "Diff denna -> markerad incheckning" -#: gitk:2570 gitk:2581 +#: gitk:2629 gitk:2640 msgid "Diff marked commit -> this" msgstr "Diff markerad incheckning -> denna" -#: gitk:2571 +#: gitk:2630 msgid "Revert this commit" msgstr "Ã…ngra denna incheckning" -#: gitk:2587 +#: gitk:2646 msgid "Check out this branch" msgstr "Checka ut denna gren" -#: gitk:2588 +#: gitk:2647 msgid "Remove this branch" msgstr "Ta bort denna gren" -#: gitk:2595 +#: gitk:2654 msgid "Highlight this too" msgstr "Markera även detta" -#: gitk:2596 +#: gitk:2655 msgid "Highlight this only" msgstr "Markera bara detta" -#: gitk:2597 +#: gitk:2656 msgid "External diff" msgstr "Extern diff" -#: gitk:2598 +#: gitk:2657 msgid "Blame parent commit" msgstr "Klandra föräldraincheckning" -#: gitk:2605 +#: gitk:2664 msgid "Show origin of this line" msgstr "Visa ursprunget för den här raden" -#: gitk:2606 +#: gitk:2665 msgid "Run git gui blame on this line" msgstr "Kör git gui blame pÃ¥ den här raden" -#: gitk:2927 +#: gitk:3011 +#, fuzzy msgid "" "\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright ©9 2005-2011 Paul Mackerras\n" +"Copyright © 2005-2014 Paul Mackerras\n" "\n" "Use and redistribute under the terms of the GNU General Public License" msgstr "" @@ -375,302 +368,312 @@ msgstr "" "\n" "Använd och vidareförmedla enligt villkoren i GNU General Public License" -#: gitk:2935 gitk:3000 gitk:9623 +#: gitk:3019 gitk:3085 gitk:9836 msgid "Close" msgstr "Stäng" -#: gitk:2956 +#: gitk:3040 msgid "Gitk key bindings" msgstr "Tangentbordsbindningar för Gitk" -#: gitk:2959 +#: gitk:3043 msgid "Gitk key bindings:" msgstr "Tangentbordsbindningar för Gitk:" -#: gitk:2961 +#: gitk:3045 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tAvsluta" -#: gitk:2962 +#: gitk:3046 #, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-W>\t\tStäng fönster" -#: gitk:2963 +#: gitk:3047 msgid "<Home>\t\tMove to first commit" msgstr "<Home>\t\tGÃ¥ till första incheckning" -#: gitk:2964 +#: gitk:3048 msgid "<End>\t\tMove to last commit" msgstr "<End>\t\tGÃ¥ till sista incheckning" -#: gitk:2965 +#: gitk:3049 msgid "<Up>, p, k\tMove up one commit" msgstr "<Upp>, p, k\tGÃ¥ en incheckning upp" -#: gitk:2966 +#: gitk:3050 msgid "<Down>, n, j\tMove down one commit" msgstr "<Ned>, n, j\tGÃ¥ en incheckning ned" -#: gitk:2967 +#: gitk:3051 msgid "<Left>, z, h\tGo back in history list" msgstr "<Vänster>, z, h\tGÃ¥ bakÃ¥t i historiken" -#: gitk:2968 +#: gitk:3052 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Höger>, x, l\tGÃ¥ framÃ¥t i historiken" -#: gitk:2969 +#: gitk:3053 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "" + +#: gitk:3054 msgid "<PageUp>\tMove up one page in commit list" msgstr "<PageUp>\tGÃ¥ upp en sida i incheckningslistan" -#: gitk:2970 +#: gitk:3055 msgid "<PageDown>\tMove down one page in commit list" msgstr "<PageDown>\tGÃ¥ ned en sida i incheckningslistan" -#: gitk:2971 +#: gitk:3056 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tRulla till början av incheckningslistan" -#: gitk:2972 +#: gitk:3057 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tRulla till slutet av incheckningslistan" -#: gitk:2973 +#: gitk:3058 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Upp>\tRulla incheckningslistan upp ett steg" -#: gitk:2974 +#: gitk:3059 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Ned>\tRulla incheckningslistan ned ett steg" -#: gitk:2975 +#: gitk:3060 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tRulla incheckningslistan upp en sida" -#: gitk:2976 +#: gitk:3061 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tRulla incheckningslistan ned en sida" -#: gitk:2977 +#: gitk:3062 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" msgstr "<Skift-Upp>\tSök bakÃ¥t (uppÃ¥t, senare incheckningar)" -#: gitk:2978 +#: gitk:3063 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" msgstr "<Skift-Ned>\tSök framÃ¥t (nedÃ¥t, tidigare incheckningar)" -#: gitk:2979 +#: gitk:3064 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Delete>, b\tRulla diffvisningen upp en sida" -#: gitk:2980 +#: gitk:3065 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Baksteg>\tRulla diffvisningen upp en sida" -#: gitk:2981 +#: gitk:3066 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Blanksteg>\tRulla diffvisningen ned en sida" -#: gitk:2982 +#: gitk:3067 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tRulla diffvisningen upp 18 rader" -#: gitk:2983 +#: gitk:3068 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tRulla diffvisningen ned 18 rader" -#: gitk:2984 +#: gitk:3069 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tSök" -#: gitk:2985 +#: gitk:3070 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tGÃ¥ till nästa sökträff" -#: gitk:2986 +#: gitk:3071 msgid "<Return>\tMove to next find hit" msgstr "<Return>\t\tGÃ¥ till nästa sökträff" -#: gitk:2987 +#: gitk:3072 msgid "/\t\tFocus the search box" msgstr "/\t\tFokusera sökrutan" -#: gitk:2988 +#: gitk:3073 msgid "?\t\tMove to previous find hit" msgstr "?\t\tGÃ¥ till föregÃ¥ende sökträff" -#: gitk:2989 +#: gitk:3074 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tRulla diffvisningen till nästa fil" -#: gitk:2990 +#: gitk:3075 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tGÃ¥ till nästa sökträff i diffvisningen" -#: gitk:2991 +#: gitk:3076 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tGÃ¥ till föregÃ¥ende sökträff i diffvisningen" -#: gitk:2992 +#: gitk:3077 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-Num+>\tÖka teckenstorlek" -#: gitk:2993 +#: gitk:3078 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tÖka teckenstorlek" -#: gitk:2994 +#: gitk:3079 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-Num->\tMinska teckenstorlek" -#: gitk:2995 +#: gitk:3080 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tMinska teckenstorlek" -#: gitk:2996 +#: gitk:3081 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tUppdatera" -#: gitk:3451 gitk:3460 +#: gitk:3546 gitk:3555 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Fel vid skapande av temporär katalog %s:" -#: gitk:3473 +#: gitk:3568 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Fel vid hämtning av \"%s\" frÃ¥n %s:" -#: gitk:3536 +#: gitk:3631 msgid "command failed:" msgstr "kommando misslyckades:" -#: gitk:3685 +#: gitk:3780 msgid "No such commit" msgstr "Incheckning saknas" -#: gitk:3699 +#: gitk:3794 msgid "git gui blame: command failed:" msgstr "git gui blame: kommando misslyckades:" -#: gitk:3730 +#: gitk:3825 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Kunde inte läsa sammanslagningshuvud: %s" -#: gitk:3738 +#: gitk:3833 #, tcl-format msgid "Error reading index: %s" msgstr "Fel vid läsning av index: %s" -#: gitk:3763 +#: gitk:3858 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Kunde inte starta git blame: %s" -#: gitk:3766 gitk:6591 +#: gitk:3861 gitk:6735 msgid "Searching" msgstr "Söker" -#: gitk:3798 +#: gitk:3893 #, tcl-format msgid "Error running git blame: %s" msgstr "Fel vid körning av git blame: %s" -#: gitk:3826 +#: gitk:3921 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "Raden kommer frÃ¥n incheckningen %s, som inte finns i denna vy" -#: gitk:3840 +#: gitk:3935 msgid "External diff viewer failed:" msgstr "Externt diff-verktyg misslyckades:" -#: gitk:3958 +#: gitk:4053 msgid "Gitk view definition" msgstr "Definition av Gitk-vy" -#: gitk:3962 +#: gitk:4057 msgid "Remember this view" msgstr "Spara denna vy" -#: gitk:3963 +#: gitk:4058 msgid "References (space separated list):" msgstr "Referenser (blankstegsavdelad lista):" -#: gitk:3964 +#: gitk:4059 msgid "Branches & tags:" msgstr "Grenar & taggar:" -#: gitk:3965 +#: gitk:4060 msgid "All refs" msgstr "Alla referenser" -#: gitk:3966 +#: gitk:4061 msgid "All (local) branches" msgstr "Alla (lokala) grenar" -#: gitk:3967 +#: gitk:4062 msgid "All tags" msgstr "Alla taggar" -#: gitk:3968 +#: gitk:4063 msgid "All remote-tracking branches" msgstr "Alla fjärrspÃ¥rande grenar" -#: gitk:3969 +#: gitk:4064 msgid "Commit Info (regular expressions):" msgstr "Incheckningsinfo (reguljära uttryck):" -#: gitk:3970 +#: gitk:4065 msgid "Author:" msgstr "Författare:" -#: gitk:3971 +#: gitk:4066 msgid "Committer:" msgstr "Incheckare:" -#: gitk:3972 +#: gitk:4067 msgid "Commit Message:" msgstr "Incheckningsmeddelande:" -#: gitk:3973 +#: gitk:4068 msgid "Matches all Commit Info criteria" msgstr "Motsvarar alla kriterier för incheckningsinfo" -#: gitk:3974 +#: gitk:4069 +#, fuzzy +msgid "Matches none Commit Info criteria" +msgstr "Motsvarar alla kriterier för incheckningsinfo" + +#: gitk:4070 msgid "Changes to Files:" msgstr "Ändringar av filer:" -#: gitk:3975 +#: gitk:4071 msgid "Fixed String" msgstr "Fast sträng" -#: gitk:3976 +#: gitk:4072 msgid "Regular Expression" msgstr "Reguljärt uttryck" -#: gitk:3977 +#: gitk:4073 msgid "Search string:" msgstr "Söksträng:" -#: gitk:3978 +#: gitk:4074 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -678,201 +681,201 @@ msgstr "" "Incheckingsdatum (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" -#: gitk:3979 +#: gitk:4075 msgid "Since:" msgstr "FrÃ¥n:" -#: gitk:3980 +#: gitk:4076 msgid "Until:" msgstr "Till:" -#: gitk:3981 +#: gitk:4077 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "Begränsa och/eller hoppa över ett antal revisioner (positivt heltal):" -#: gitk:3982 +#: gitk:4078 msgid "Number to show:" msgstr "Antal att visa:" -#: gitk:3983 +#: gitk:4079 msgid "Number to skip:" msgstr "Antal att hoppa över:" -#: gitk:3984 +#: gitk:4080 msgid "Miscellaneous options:" msgstr "Diverse alternativ:" -#: gitk:3985 +#: gitk:4081 msgid "Strictly sort by date" msgstr "Strikt datumsortering" -#: gitk:3986 +#: gitk:4082 msgid "Mark branch sides" msgstr "Markera sidogrenar" -#: gitk:3987 +#: gitk:4083 msgid "Limit to first parent" msgstr "Begränsa till första förälder" -#: gitk:3988 +#: gitk:4084 msgid "Simple history" msgstr "Enkel historik" -#: gitk:3989 +#: gitk:4085 msgid "Additional arguments to git log:" msgstr "Ytterligare argument till git log:" -#: gitk:3990 +#: gitk:4086 msgid "Enter files and directories to include, one per line:" msgstr "Ange filer och kataloger att ta med, en per rad:" -#: gitk:3991 +#: gitk:4087 msgid "Command to generate more commits to include:" msgstr "Kommando för att generera fler incheckningar att ta med:" -#: gitk:4115 +#: gitk:4211 msgid "Gitk: edit view" msgstr "Gitk: redigera vy" -#: gitk:4123 +#: gitk:4219 msgid "-- criteria for selecting revisions" msgstr " - kriterier för val av revisioner" -#: gitk:4128 +#: gitk:4224 msgid "View Name" msgstr "Namn pÃ¥ vy" -#: gitk:4203 +#: gitk:4299 msgid "Apply (F5)" msgstr "Använd (F5)" -#: gitk:4241 +#: gitk:4337 msgid "Error in commit selection arguments:" msgstr "Fel i argument för val av incheckningar:" -#: gitk:4294 gitk:4346 gitk:4807 gitk:4821 gitk:6087 gitk:12041 gitk:12042 +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 msgid "None" msgstr "Inget" -#: gitk:4904 gitk:4909 +#: gitk:5003 gitk:5008 msgid "Descendant" msgstr "Avkomling" -#: gitk:4905 +#: gitk:5004 msgid "Not descendant" msgstr "Inte avkomling" -#: gitk:4912 gitk:4917 +#: gitk:5011 gitk:5016 msgid "Ancestor" msgstr "Förfader" -#: gitk:4913 +#: gitk:5012 msgid "Not ancestor" msgstr "Inte förfader" -#: gitk:5203 +#: gitk:5306 msgid "Local changes checked in to index but not committed" msgstr "Lokala ändringar sparade i indexet men inte incheckade" -#: gitk:5239 +#: gitk:5342 msgid "Local uncommitted changes, not checked in to index" msgstr "Lokala ändringar, ej sparade i indexet" -#: gitk:6971 +#: gitk:7115 msgid "and many more" msgstr "med mÃ¥nga flera" -#: gitk:6974 +#: gitk:7118 msgid "many" msgstr "mÃ¥nga" -#: gitk:7160 +#: gitk:7309 msgid "Tags:" msgstr "Taggar:" -#: gitk:7177 gitk:7183 gitk:8593 +#: gitk:7326 gitk:7332 gitk:8806 msgid "Parent" msgstr "Förälder" -#: gitk:7188 +#: gitk:7337 msgid "Child" msgstr "Barn" -#: gitk:7197 +#: gitk:7346 msgid "Branch" msgstr "Gren" -#: gitk:7200 +#: gitk:7349 msgid "Follows" msgstr "Följer" -#: gitk:7203 +#: gitk:7352 msgid "Precedes" msgstr "FöregÃ¥r" -#: gitk:7742 +#: gitk:7947 #, tcl-format msgid "Error getting diffs: %s" msgstr "Fel vid hämtning av diff: %s" -#: gitk:8418 +#: gitk:8631 msgid "Goto:" msgstr "GÃ¥ till:" -#: gitk:8439 +#: gitk:8652 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "Förkortat SHA1-id %s är tvetydigt" -#: gitk:8446 +#: gitk:8659 #, tcl-format msgid "Revision %s is not known" msgstr "Revisionen %s är inte känd" -#: gitk:8456 +#: gitk:8669 #, tcl-format msgid "SHA1 id %s is not known" msgstr "SHA-id:t %s är inte känt" -#: gitk:8458 +#: gitk:8671 #, tcl-format msgid "Revision %s is not in the current view" msgstr "Revisionen %s finns inte i den nuvarande vyn" -#: gitk:8600 gitk:8615 +#: gitk:8813 gitk:8828 msgid "Date" msgstr "Datum" -#: gitk:8603 +#: gitk:8816 msgid "Children" msgstr "Barn" -#: gitk:8666 +#: gitk:8879 #, tcl-format msgid "Reset %s branch to here" msgstr "Ã…terställ grenen %s hit" -#: gitk:8668 +#: gitk:8881 msgid "Detached head: can't reset" msgstr "FrÃ¥nkopplad head: kan inte Ã¥terställa" -#: gitk:8773 gitk:8779 +#: gitk:8986 gitk:8992 msgid "Skipping merge commit " msgstr "Hoppar över sammanslagningsincheckning " -#: gitk:8788 gitk:8793 +#: gitk:9001 gitk:9006 msgid "Error getting patch ID for " msgstr "Fel vid hämtning av patch-id för " -#: gitk:8789 gitk:8794 +#: gitk:9002 gitk:9007 msgid " - stopping\n" msgstr " - stannar\n" -#: gitk:8799 gitk:8802 gitk:8810 gitk:8824 gitk:8833 +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 msgid "Commit " msgstr "Incheckning " -#: gitk:8803 +#: gitk:9016 msgid "" " is the same patch as\n" " " @@ -880,7 +883,7 @@ msgstr "" " är samma patch som\n" " " -#: gitk:8811 +#: gitk:9024 msgid "" " differs from\n" " " @@ -888,7 +891,7 @@ msgstr "" " skiljer sig frÃ¥n\n" " " -#: gitk:8813 +#: gitk:9026 msgid "" "Diff of commits:\n" "\n" @@ -896,131 +899,131 @@ msgstr "" "Skillnad mellan incheckningar:\n" "\n" -#: gitk:8825 gitk:8834 +#: gitk:9038 gitk:9047 #, tcl-format msgid " has %s children - stopping\n" msgstr " har %s barn - stannar\n" -#: gitk:8853 +#: gitk:9066 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Fel vid skrivning av incheckning till fil: %s" -#: gitk:8859 +#: gitk:9072 #, tcl-format msgid "Error diffing commits: %s" msgstr "Fel vid jämförelse av incheckningar: %s" -#: gitk:8905 +#: gitk:9118 msgid "Top" msgstr "Topp" -#: gitk:8906 +#: gitk:9119 msgid "From" msgstr "FrÃ¥n" -#: gitk:8911 +#: gitk:9124 msgid "To" msgstr "Till" -#: gitk:8935 +#: gitk:9148 msgid "Generate patch" msgstr "Generera patch" -#: gitk:8937 +#: gitk:9150 msgid "From:" msgstr "FrÃ¥n:" -#: gitk:8946 +#: gitk:9159 msgid "To:" msgstr "Till:" -#: gitk:8955 +#: gitk:9168 msgid "Reverse" msgstr "Vänd" -#: gitk:8957 gitk:9153 +#: gitk:9170 gitk:9366 msgid "Output file:" msgstr "Utdatafil:" -#: gitk:8963 +#: gitk:9176 msgid "Generate" msgstr "Generera" -#: gitk:9001 +#: gitk:9214 msgid "Error creating patch:" msgstr "Fel vid generering av patch:" -#: gitk:9024 gitk:9141 gitk:9198 +#: gitk:9237 gitk:9354 gitk:9411 msgid "ID:" msgstr "Id:" -#: gitk:9033 +#: gitk:9246 msgid "Tag name:" msgstr "Taggnamn:" -#: gitk:9036 +#: gitk:9249 msgid "Tag message is optional" msgstr "Taggmeddelandet är valfritt" -#: gitk:9038 +#: gitk:9251 msgid "Tag message:" msgstr "Taggmeddelande:" -#: gitk:9042 gitk:9207 +#: gitk:9255 gitk:9420 msgid "Create" msgstr "Skapa" -#: gitk:9060 +#: gitk:9273 msgid "No tag name specified" msgstr "Inget taggnamn angavs" -#: gitk:9064 +#: gitk:9277 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Taggen \"%s\" finns redan" -#: gitk:9074 +#: gitk:9287 msgid "Error creating tag:" msgstr "Fel vid skapande av tagg:" -#: gitk:9150 +#: gitk:9363 msgid "Command:" msgstr "Kommando:" -#: gitk:9158 +#: gitk:9371 msgid "Write" msgstr "Skriv" -#: gitk:9176 +#: gitk:9389 msgid "Error writing commit:" msgstr "Fel vid skrivning av incheckning:" -#: gitk:9203 +#: gitk:9416 msgid "Name:" msgstr "Namn:" -#: gitk:9226 +#: gitk:9439 msgid "Please specify a name for the new branch" msgstr "Ange ett namn för den nya grenen" -#: gitk:9231 +#: gitk:9444 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "Grenen \"%s\" finns redan. Skriva över?" -#: gitk:9298 +#: gitk:9511 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "" "Incheckningen %s finns redan pÃ¥ grenen %s -- skall den verkligen appliceras " "pÃ¥ nytt?" -#: gitk:9303 +#: gitk:9516 msgid "Cherry-picking" msgstr "Plockar" -#: gitk:9312 +#: gitk:9525 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -1030,7 +1033,7 @@ msgstr "" "Checka in, Ã¥terställ eller spara undan (stash) dina ändringar och försök " "igen." -#: gitk:9318 +#: gitk:9531 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1038,20 +1041,20 @@ msgstr "" "Cherry-pick misslyckades pÃ¥ grund av en sammanslagningskonflikt.\n" "Vill du köra git citool för att lösa den?" -#: gitk:9334 gitk:9392 +#: gitk:9547 gitk:9605 msgid "No changes committed" msgstr "Inga ändringar incheckade" -#: gitk:9361 +#: gitk:9574 #, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" msgstr "Incheckningen %s finns inte pÃ¥ grenen %s -- vill du verkligen Ã¥ngra?" -#: gitk:9366 +#: gitk:9579 msgid "Reverting" msgstr "Ã…ngrar" -#: gitk:9374 +#: gitk:9587 #, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " @@ -1061,7 +1064,7 @@ msgstr "" "Checka in, Ã¥terställ eller spara undan (stash) dina ändringar och försök " "igen." -#: gitk:9378 +#: gitk:9591 msgid "" "Revert failed because of merge conflict.\n" " Do you wish to run git citool to resolve it?" @@ -1069,28 +1072,28 @@ msgstr "" "Misslyckades med att Ã¥ngra pÃ¥ grund av en sammanslagningskonflikt.\n" " Vill du köra git citool för att lösa den?" -#: gitk:9421 +#: gitk:9634 msgid "Confirm reset" msgstr "Bekräfta Ã¥terställning" -#: gitk:9423 +#: gitk:9636 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Ã…terställa grenen %s till %s?" -#: gitk:9425 +#: gitk:9638 msgid "Reset type:" msgstr "Typ av Ã¥terställning:" -#: gitk:9428 +#: gitk:9641 msgid "Soft: Leave working tree and index untouched" msgstr "Mjuk: Rör inte utcheckning och index" -#: gitk:9431 +#: gitk:9644 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Blandad: Rör inte utcheckning, Ã¥terställ index" -#: gitk:9434 +#: gitk:9647 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1098,19 +1101,19 @@ msgstr "" "HÃ¥rd: Ã…terställ utcheckning och index\n" "(förkastar ALLA lokala ändringar)" -#: gitk:9451 +#: gitk:9664 msgid "Resetting" msgstr "Ã…terställer" -#: gitk:9511 +#: gitk:9724 msgid "Checking out" msgstr "Checkar ut" -#: gitk:9564 +#: gitk:9777 msgid "Cannot delete the currently checked-out branch" msgstr "Kan inte ta bort den just nu utcheckade grenen" -#: gitk:9570 +#: gitk:9783 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1119,16 +1122,16 @@ msgstr "" "Incheckningarna pÃ¥ grenen %s existerar inte pÃ¥ nÃ¥gon annan gren.\n" "Vill du verkligen ta bort grenen %s?" -#: gitk:9601 +#: gitk:9814 #, tcl-format msgid "Tags and heads: %s" msgstr "Taggar och huvuden: %s" -#: gitk:9616 +#: gitk:9829 msgid "Filter" msgstr "Filter" -#: gitk:9912 +#: gitk:10125 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1136,217 +1139,223 @@ msgstr "" "Fel vid läsning av information om incheckningstopologi; information om " "grenar och föregÃ¥ende/senare taggar kommer inte vara komplett." -#: gitk:10899 +#: gitk:11102 msgid "Tag" msgstr "Tagg" -#: gitk:10899 +#: gitk:11106 msgid "Id" msgstr "Id" -#: gitk:10948 +#: gitk:11189 msgid "Gitk font chooser" msgstr "Teckensnittsväljare för Gitk" -#: gitk:10965 +#: gitk:11206 msgid "B" msgstr "F" -#: gitk:10968 +#: gitk:11209 msgid "I" msgstr "K" -#: gitk:11086 +#: gitk:11327 msgid "Commit list display options" msgstr "Alternativ för incheckningslistvy" -#: gitk:11089 +#: gitk:11330 msgid "Maximum graph width (lines)" msgstr "Maximal grafbredd (rader)" -#: gitk:11092 -#, tcl-format +#: gitk:11334 +#, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Maximal grafbredd (% av ruta)" -#: gitk:11095 +#: gitk:11337 msgid "Show local changes" msgstr "Visa lokala ändringar" -#: gitk:11098 +#: gitk:11340 msgid "Auto-select SHA1 (length)" msgstr "Välj SHA1 (längd) automatiskt" -#: gitk:11102 +#: gitk:11344 msgid "Hide remote refs" msgstr "Dölj fjärr-referenser" -#: gitk:11106 +#: gitk:11348 msgid "Diff display options" msgstr "Alternativ för diffvy" -#: gitk:11108 +#: gitk:11350 msgid "Tab spacing" msgstr "Blanksteg för tabulatortecken" -#: gitk:11111 +#: gitk:11353 msgid "Display nearby tags/heads" msgstr "Visa närliggande taggar/huvuden" -#: gitk:11114 +#: gitk:11356 msgid "Maximum # tags/heads to show" msgstr "Maximalt antal taggar/huvuden att visa" -#: gitk:11117 +#: gitk:11359 msgid "Limit diffs to listed paths" msgstr "Begränsa diff till listade sökvägar" -#: gitk:11120 +#: gitk:11362 msgid "Support per-file encodings" msgstr "Stöd för filspecifika teckenkodningar" -#: gitk:11126 gitk:11273 +#: gitk:11368 gitk:11515 msgid "External diff tool" msgstr "Externt diff-verktyg" -#: gitk:11127 +#: gitk:11369 msgid "Choose..." msgstr "Välj..." -#: gitk:11132 +#: gitk:11374 msgid "General options" msgstr "Allmänna inställningar" -#: gitk:11135 +#: gitk:11377 msgid "Use themed widgets" msgstr "Använd tema pÃ¥ fönsterelement" -#: gitk:11137 +#: gitk:11379 msgid "(change requires restart)" msgstr "(ändringen kräver omstart)" -#: gitk:11139 +#: gitk:11381 msgid "(currently unavailable)" msgstr "(för närvarande inte tillgängligt)" -#: gitk:11150 +#: gitk:11392 msgid "Colors: press to choose" msgstr "Färger: tryck för att välja" -#: gitk:11153 +#: gitk:11395 msgid "Interface" msgstr "Gränssnitt" -#: gitk:11154 +#: gitk:11396 msgid "interface" msgstr "gränssnitt" -#: gitk:11157 +#: gitk:11399 msgid "Background" msgstr "Bakgrund" -#: gitk:11158 gitk:11188 +#: gitk:11400 gitk:11430 msgid "background" msgstr "bakgrund" -#: gitk:11161 +#: gitk:11403 msgid "Foreground" msgstr "Förgrund" -#: gitk:11162 +#: gitk:11404 msgid "foreground" msgstr "förgrund" -#: gitk:11165 +#: gitk:11407 msgid "Diff: old lines" msgstr "Diff: gamla rader" -#: gitk:11166 +#: gitk:11408 msgid "diff old lines" msgstr "diff gamla rader" -#: gitk:11170 +#: gitk:11412 msgid "Diff: new lines" msgstr "Diff: nya rader" -#: gitk:11171 +#: gitk:11413 msgid "diff new lines" msgstr "diff nya rader" -#: gitk:11175 +#: gitk:11417 msgid "Diff: hunk header" msgstr "Diff: delhuvud" -#: gitk:11177 +#: gitk:11419 msgid "diff hunk header" msgstr "diff delhuvud" -#: gitk:11181 +#: gitk:11423 msgid "Marked line bg" msgstr "Markerad rad bakgrund" -#: gitk:11183 +#: gitk:11425 msgid "marked line background" msgstr "markerad rad bakgrund" -#: gitk:11187 +#: gitk:11429 msgid "Select bg" msgstr "Markerad bakgrund" -#: gitk:11196 +#: gitk:11438 msgid "Fonts: press to choose" msgstr "Teckensnitt: tryck för att välja" -#: gitk:11198 +#: gitk:11440 msgid "Main font" msgstr "Huvudteckensnitt" -#: gitk:11199 +#: gitk:11441 msgid "Diff display font" msgstr "Teckensnitt för diffvisning" -#: gitk:11200 +#: gitk:11442 msgid "User interface font" msgstr "Teckensnitt för användargränssnitt" -#: gitk:11222 +#: gitk:11464 msgid "Gitk preferences" msgstr "Inställningar för Gitk" -#: gitk:11231 +#: gitk:11473 msgid "General" msgstr "Allmänt" -#: gitk:11232 +#: gitk:11474 msgid "Colors" msgstr "Färger" -#: gitk:11233 +#: gitk:11475 msgid "Fonts" msgstr "Teckensnitt" -#: gitk:11283 +#: gitk:11525 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: välj färg för %s" -#: gitk:11937 +#: gitk:12242 msgid "Cannot find a git repository here." msgstr "Hittar inget git-arkiv här." -#: gitk:11984 +#: gitk:12289 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Tvetydigt argument \"%s\": bÃ¥de revision och filnamn" -#: gitk:11996 +#: gitk:12301 msgid "Bad arguments to gitk:" msgstr "Felaktiga argument till gitk:" -#: gitk:12099 +#: gitk:12405 msgid "Command line" msgstr "Kommandorad" +#~ msgid "next" +#~ msgstr "nästa" + +#~ msgid "prev" +#~ msgstr "föreg" + #~ msgid "CDate" #~ msgstr "Skapat datum" diff --git a/gitk-git/po/vi.po b/gitk-git/po/vi.po index 4dfe125..ade9cb7 100644 --- a/gitk-git/po/vi.po +++ b/gitk-git/po/vi.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: gitk @@GIT_VERSION@@\n" -"Report-Msgid-Bugs-To: Paul Mackerras <paulus@samba.org>\n" -"POT-Creation-Date: 2013-12-14 09:24+0700\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-03-15 14:37+1100\n" "PO-Revision-Date: 2013-12-14 14:40+0700\n" "Last-Translator: Trần Ngá»c Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" @@ -21,28 +21,28 @@ msgstr "" msgid "Couldn't get list of unmerged files:" msgstr "Không thể lấy danh sách các táºp-tin chÆ°a được hòa trá»™n:" -#: gitk:212 gitk:2353 +#: gitk:212 gitk:2381 msgid "Color words" msgstr "Tô mà u chữ" -#: gitk:217 gitk:2353 gitk:8103 gitk:8136 +#: gitk:217 gitk:2381 gitk:8201 gitk:8234 msgid "Markup words" msgstr "Äánh dấu chữ" -#: gitk:322 +#: gitk:324 msgid "Error parsing revisions:" msgstr "Gặp lá»—i khi phân tÃch Ä‘iểm xét duyệt:" -#: gitk:378 +#: gitk:380 msgid "Error executing --argscmd command:" msgstr "Gặp lá»—i khi thá»±c hiện lệnh --argscmd:" -#: gitk:391 +#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "ChÆ°a chá»n táºp tin: --merge đã chỉ định nhÆ°ng không có táºp tin chÆ°a hòa trá»™n." -#: gitk:394 +#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -50,319 +50,312 @@ msgstr "" "ChÆ°a chá»n táºp tin: --merge đã chỉ định nhÆ°ng không có táºp tin chÆ°a hòa trá»™n " "trong giá»›i hạn táºp tin." -#: gitk:416 gitk:564 +#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "Gặp lá»—i khi thá»±c hiện lệnh git log:" -#: gitk:434 gitk:580 +#: gitk:436 gitk:582 msgid "Reading" msgstr "Äang Ä‘á»c" -#: gitk:494 gitk:4429 +#: gitk:496 gitk:4508 msgid "Reading commits..." msgstr "Äang Ä‘á»c các lần chuyển giao..." -#: gitk:497 gitk:1635 gitk:4432 +#: gitk:499 gitk:1637 gitk:4511 msgid "No commits selected" msgstr "ChÆ°a chá»n các lần chuyển giao" -#: gitk:1509 +#: gitk:1511 msgid "Can't parse git log output:" msgstr "Không thể phân tÃch kết xuất từ lệnh git log:" -#: gitk:1738 +#: gitk:1740 msgid "No commit information available" msgstr "Không có thông tin vá» lần chuyển giao nà o" -#: gitk:1895 +#: gitk:1897 msgid "mc" msgstr "mc" -#: gitk:1930 gitk:4222 gitk:9552 gitk:11122 gitk:11401 +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 msgid "OK" msgstr "Äồng ý" -#: gitk:1932 gitk:4224 gitk:9079 gitk:9158 gitk:9274 gitk:9323 gitk:9554 -#: gitk:11123 gitk:11402 +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 +#: gitk:11221 gitk:11501 msgid "Cancel" msgstr "Thôi" -#: gitk:2067 +#: gitk:2069 msgid "Update" msgstr "Cáºp nháºt" -#: gitk:2068 +#: gitk:2070 msgid "Reload" msgstr "Tải lại" -#: gitk:2069 +#: gitk:2071 msgid "Reread references" msgstr "Äá»c lại tham chiếu" -#: gitk:2070 +#: gitk:2072 msgid "List references" msgstr "Liệt kê các tham chiếu" -#: gitk:2072 +#: gitk:2074 msgid "Start git gui" msgstr "Khởi chạy git gui" -#: gitk:2074 +#: gitk:2076 msgid "Quit" msgstr "Thoát" -#: gitk:2066 +#: gitk:2068 msgid "File" msgstr "ChÃnh" -#: gitk:2078 +#: gitk:2080 msgid "Preferences" msgstr "Cá nhân hóa" -#: gitk:2077 +#: gitk:2079 msgid "Edit" msgstr "Chỉnh sá»a" -#: gitk:2082 +#: gitk:2084 msgid "New view..." msgstr "Thêm trình bà y má»›i..." -#: gitk:2083 +#: gitk:2085 msgid "Edit view..." msgstr "Sá»a cách trình bà y..." -#: gitk:2084 +#: gitk:2086 msgid "Delete view" msgstr "Xóa cách trình bà y" -#: gitk:2086 +#: gitk:2088 msgid "All files" msgstr "Má»i táºp tin" -#: gitk:2081 gitk:3975 +#: gitk:2083 gitk:4050 msgid "View" msgstr "Trình bà y" -#: gitk:2091 gitk:2101 gitk:2945 +#: gitk:2093 gitk:2103 gitk:3009 msgid "About gitk" msgstr "Giá»›i thiệu vá» gitk" -#: gitk:2092 gitk:2106 +#: gitk:2094 gitk:2108 msgid "Key bindings" msgstr "Tổ hợp phÃm" -#: gitk:2090 gitk:2105 +#: gitk:2092 gitk:2107 msgid "Help" msgstr "Trợ giúp" -#: gitk:2183 gitk:8535 +#: gitk:2185 gitk:8633 msgid "SHA1 ID:" msgstr "SHA1 ID:" -#: gitk:2227 +#: gitk:2229 msgid "Row" msgstr "Hà ng" -#: gitk:2265 +#: gitk:2267 msgid "Find" msgstr "Tìm" -#: gitk:2266 -msgid "next" -msgstr "tiếp" - -#: gitk:2267 -msgid "prev" -msgstr "trÆ°á»›c" - -#: gitk:2268 +#: gitk:2295 msgid "commit" msgstr "lần chuyển giao" -#: gitk:2271 gitk:2273 gitk:4590 gitk:4613 gitk:4637 gitk:6653 gitk:6725 -#: gitk:6810 +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 +#: gitk:6893 msgid "containing:" msgstr "có chứa:" -#: gitk:2274 gitk:3457 gitk:3462 gitk:4666 +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 msgid "touching paths:" msgstr "Ä‘ang chạm Ä‘Æ°á»ng dẫn:" -#: gitk:2275 gitk:4680 +#: gitk:2303 gitk:4759 msgid "adding/removing string:" msgstr "thêm/gỡ bá» chuá»—i:" -#: gitk:2276 gitk:4682 +#: gitk:2304 gitk:4761 msgid "changing lines matching:" msgstr "những dòng thay đổi khá»›p mẫu:" -#: gitk:2285 gitk:2287 gitk:4669 +#: gitk:2313 gitk:2315 gitk:4748 msgid "Exact" msgstr "ChÃnh xác" -#: gitk:2287 gitk:4757 gitk:6621 +#: gitk:2315 gitk:4836 gitk:6704 msgid "IgnCase" msgstr "BquaHt" -#: gitk:2287 gitk:4639 gitk:4755 gitk:6617 +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 msgid "Regexp" msgstr "BTCQ" -#: gitk:2289 gitk:2290 gitk:4777 gitk:4807 gitk:4814 gitk:6746 gitk:6814 +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 msgid "All fields" msgstr "Má»i trÆ°á»ng" -#: gitk:2290 gitk:4774 gitk:4807 gitk:6684 +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 msgid "Headline" msgstr "Ná»™i dung chÃnh" -#: gitk:2291 gitk:4774 gitk:6684 gitk:6814 gitk:7283 +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 msgid "Comments" msgstr "Ghi chú" -#: gitk:2291 gitk:4774 gitk:4779 gitk:4814 gitk:6684 gitk:7218 gitk:8713 -#: gitk:8728 +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 +#: gitk:8826 msgid "Author" msgstr "Tác giả" -#: gitk:2291 gitk:4774 gitk:6684 gitk:7220 +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 msgid "Committer" msgstr "NgÆ°á»i chuyển giao" -#: gitk:2322 +#: gitk:2350 msgid "Search" msgstr "Tìm kiếm" -#: gitk:2330 +#: gitk:2358 msgid "Diff" msgstr "So sánh" -#: gitk:2332 +#: gitk:2360 msgid "Old version" msgstr "Phiên bản cÅ©" -#: gitk:2334 +#: gitk:2362 msgid "New version" msgstr "Phiên bản má»›i" -#: gitk:2336 +#: gitk:2364 msgid "Lines of context" msgstr "Các dòng của ná»™i dung" -#: gitk:2346 +#: gitk:2374 msgid "Ignore space change" msgstr "Không xét đến thay đổi do khoảng trắng" -#: gitk:2350 gitk:2352 gitk:7842 gitk:8089 +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 msgid "Line diff" msgstr "Khác biệt theo dòng" -#: gitk:2417 +#: gitk:2445 msgid "Patch" msgstr "Vá" -#: gitk:2419 +#: gitk:2447 msgid "Tree" msgstr "Cây" -#: gitk:2577 gitk:2597 +#: gitk:2616 gitk:2636 msgid "Diff this -> selected" msgstr "So sánh cái nà y -> cái đã chá»n" -#: gitk:2578 gitk:2598 +#: gitk:2617 gitk:2637 msgid "Diff selected -> this" msgstr "So sánh cái đã chá»n -> cái nà y" -#: gitk:2579 gitk:2599 +#: gitk:2618 gitk:2638 msgid "Make patch" msgstr "Tạo miếng vá" -#: gitk:2580 gitk:9137 +#: gitk:2619 gitk:9235 msgid "Create tag" msgstr "Tạo thẻ" -#: gitk:2581 gitk:9254 +#: gitk:2620 gitk:9352 msgid "Write commit to file" msgstr "Ghi lần chuyển giao ra táºp tin" -#: gitk:2582 gitk:9311 +#: gitk:2621 gitk:9409 msgid "Create new branch" msgstr "Tạo nhánh má»›i" -#: gitk:2583 +#: gitk:2622 msgid "Cherry-pick this commit" msgstr "Cherry-pick lần chuyển giao nà y" -#: gitk:2584 +#: gitk:2623 msgid "Reset HEAD branch to here" msgstr "Äặt lại HEAD của nhánh và o đây" -#: gitk:2585 +#: gitk:2624 msgid "Mark this commit" msgstr "Äánh dấu lần chuyển giao nà y" -#: gitk:2586 +#: gitk:2625 msgid "Return to mark" msgstr "Quay lại vị trà dấu" -#: gitk:2587 +#: gitk:2626 msgid "Find descendant of this and mark" msgstr "Tìm con cháu của cái nà y và cái đã đánh dấu" -#: gitk:2588 +#: gitk:2627 msgid "Compare with marked commit" msgstr "So sánh vá»›i lần chuyển giao đã đánh dấu" -#: gitk:2589 gitk:2600 +#: gitk:2628 gitk:2639 msgid "Diff this -> marked commit" msgstr "So sánh cái nà y -> lần chuyển giao đã đánh dấu" -#: gitk:2590 gitk:2601 +#: gitk:2629 gitk:2640 msgid "Diff marked commit -> this" msgstr "So sánh lần chuyển giao đã đánh dấu -> cái nà y" -#: gitk:2591 +#: gitk:2630 msgid "Revert this commit" msgstr "Hoà n lại lần chuyển giao nà y" -#: gitk:2607 +#: gitk:2646 msgid "Check out this branch" msgstr "Checkout nhánh nà y" -#: gitk:2608 +#: gitk:2647 msgid "Remove this branch" msgstr "Gỡ bá» nhánh nà y" -#: gitk:2615 +#: gitk:2654 msgid "Highlight this too" msgstr "CÅ©ng tô sáng nó" -#: gitk:2616 +#: gitk:2655 msgid "Highlight this only" msgstr "Chỉ tô sáng cái nà y" -#: gitk:2617 +#: gitk:2656 msgid "External diff" msgstr "diff từ bên ngoà i" -#: gitk:2618 +#: gitk:2657 msgid "Blame parent commit" msgstr "Xem công trạng lần chuyển giao cha mẹ" -#: gitk:2625 +#: gitk:2664 msgid "Show origin of this line" msgstr "Hiển thị nguyên gốc của dòng nà y" -#: gitk:2626 +#: gitk:2665 msgid "Run git gui blame on this line" msgstr "Chạy lệnh git gui blame cho dòng nà y" -#: gitk:2947 +#: gitk:3011 +#, fuzzy msgid "" "\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright © 2005-2011 Paul Mackerras\n" +"Copyright © 2005-2014 Paul Mackerras\n" "\n" "Use and redistribute under the terms of the GNU General Public License" msgstr "" @@ -373,304 +366,314 @@ msgstr "" "\n" "Dùng và phân phối lại phần má»m nà y theo các Ä‘iá»u khoản của Giấy Phép Công GNU" -#: gitk:2955 gitk:3020 gitk:9738 +#: gitk:3019 gitk:3085 gitk:9836 msgid "Close" msgstr "Äóng" -#: gitk:2976 +#: gitk:3040 msgid "Gitk key bindings" msgstr "Tổ hợp phÃm gitk" -#: gitk:2979 +#: gitk:3043 msgid "Gitk key bindings:" msgstr "Tổ hợp phÃm gitk:" -#: gitk:2981 +#: gitk:3045 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tThoát" -#: gitk:2982 +#: gitk:3046 #, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-W>\t\tÄóng cá»a sổ" -#: gitk:2983 +#: gitk:3047 msgid "<Home>\t\tMove to first commit" msgstr "<Home>\t\tChuyển đến lần chuyển giao đầu tiên" -#: gitk:2984 +#: gitk:3048 msgid "<End>\t\tMove to last commit" msgstr "<End>\t\tChuyển đến lần chuyển giao cuối" -#: gitk:2985 +#: gitk:3049 msgid "<Up>, p, k\tMove up one commit" msgstr "<Up>, p, k\tDi chuyển lên má»™t lần chuyển giao" -#: gitk:2986 +#: gitk:3050 msgid "<Down>, n, j\tMove down one commit" msgstr "<Down>, n, j\tDi chuyển xuống má»™t lần chuyển giao" -#: gitk:2987 +#: gitk:3051 msgid "<Left>, z, h\tGo back in history list" msgstr "<Left>, z, h\tQuay trở lại danh sách lịch sá»" -#: gitk:2988 +#: gitk:3052 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Right>, x, l\tDi chuyển tiếp trong danh sách lịch sá»" -#: gitk:2989 +#: gitk:3053 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "" + +#: gitk:3054 msgid "<PageUp>\tMove up one page in commit list" msgstr "<PageUp>\tDi chuyển lên má»™t trang trong danh sách lần chuyển giao" -#: gitk:2990 +#: gitk:3055 msgid "<PageDown>\tMove down one page in commit list" msgstr "<PageDown>\tDi chuyển xuống má»™t trang trong danh sách lần chuyển giao" -#: gitk:2991 +#: gitk:3056 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tCuá»™n lên trên cùng của danh sách lần chuyển giao" -#: gitk:2992 +#: gitk:3057 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tCuá»™n xuống dÆ°á»›i cùng của danh sách lần chuyển giao" -#: gitk:2993 +#: gitk:3058 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Up>\tCuá»™n danh sách lần chuyển giao lên má»™t dòng" -#: gitk:2994 +#: gitk:3059 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Down>\tCuá»™n danh sách lần chuyển giao xuống má»™t dòng" -#: gitk:2995 +#: gitk:3060 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tCuá»™n danh sách lần chuyển giao lên má»™t trang" -#: gitk:2996 +#: gitk:3061 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tCuá»™n danh sách lần chuyển giao xuống má»™t trang" -#: gitk:2997 +#: gitk:3062 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" msgstr "<Shift-Up>\tTìm vá» phÃa sau (hÆ°á»›ng lên trên, lần chuyển giao sau nà y)" -#: gitk:2998 +#: gitk:3063 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" msgstr "" "<Shift-Down>\tTìm vá» phÃa trÆ°á»›c (hÆ°á»›ng xuống dÆ°á»›i, lần chuyển giao trÆ°á»›c đây)" -#: gitk:2999 +#: gitk:3064 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Delete>, b\tCuá»™n phần trình bà y diff lên má»™t trang" -#: gitk:3000 +#: gitk:3065 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Backspace>\tCuá»™n phần trình bà y diff lên má»™t trang" -#: gitk:3001 +#: gitk:3066 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Space>\t\tCuá»™n phần trình bà y diff xuống má»™t trang" -#: gitk:3002 +#: gitk:3067 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tCuá»™n phần trình bà y diff lên 18 dòng" -#: gitk:3003 +#: gitk:3068 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tCuá»™n phần trình bà y diff xuống 18 dòng" -#: gitk:3004 +#: gitk:3069 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tTìm kiếm" -#: gitk:3005 +#: gitk:3070 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tDi chuyển đến chá»— gặp kế tiếp" -#: gitk:3006 +#: gitk:3071 msgid "<Return>\tMove to next find hit" msgstr "<Return>\t\tDi chuyển đến chá»— gặp kế tiếp" -#: gitk:3007 +#: gitk:3072 msgid "/\t\tFocus the search box" msgstr "/\t\tÄÆ°a con trá» chuá»™t và o ô tìm kiếm" -#: gitk:3008 +#: gitk:3073 msgid "?\t\tMove to previous find hit" msgstr "?\t\tDi chuyển đến chá»— gặp kế trÆ°á»›c" -#: gitk:3009 +#: gitk:3074 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tCuá»™n phần trình bà y diff sang táºp-tin kế" -#: gitk:3010 +#: gitk:3075 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tTìm đến chá»— khác biệt kế tiếp" -#: gitk:3011 +#: gitk:3076 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tTìm đến chá»— khác biệt kế trÆ°á»›c" -#: gitk:3012 +#: gitk:3077 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tTăng cỡ chữ" -#: gitk:3013 +#: gitk:3078 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tTăng cỡ chữ" -#: gitk:3014 +#: gitk:3079 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tGiảm cỡ chữ" -#: gitk:3015 +#: gitk:3080 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tGiảm cỡ chữ" -#: gitk:3016 +#: gitk:3081 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tCáºp nháºt" -#: gitk:3471 gitk:3480 +#: gitk:3546 gitk:3555 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Gặp lá»—i khi tạo thÆ° mục tạm %s:" -#: gitk:3493 +#: gitk:3568 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Lá»—i chà o há»i \"%s\" từ %s:" -#: gitk:3556 +#: gitk:3631 msgid "command failed:" msgstr "lệnh gặp lá»—i:" -#: gitk:3705 +#: gitk:3780 msgid "No such commit" msgstr "Không có lần chuyển giao nhÆ° váºy" -#: gitk:3719 +#: gitk:3794 msgid "git gui blame: command failed:" msgstr "git gui blame: lệnh gặp lá»—i:" -#: gitk:3750 +#: gitk:3825 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Không thể Ä‘á»™c đầu của hòa trá»™n: %s" # tcl-format -#: gitk:3758 +#: gitk:3833 #, tcl-format msgid "Error reading index: %s" msgstr "Gặp lá»—i khi Ä‘á»c chỉ mục: %s" -#: gitk:3783 +#: gitk:3858 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Không thể khởi chạy git blame: %s" -#: gitk:3786 gitk:6652 +#: gitk:3861 gitk:6735 msgid "Searching" msgstr "Äang tìm kiếm" -#: gitk:3818 +#: gitk:3893 #, tcl-format msgid "Error running git blame: %s" msgstr "Gặp lá»—i khi chạy git blame: %s" -#: gitk:3846 +#: gitk:3921 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "Dòng đến từ lần chuyển giao %s, cái mà không trong trình bà y nà y" -#: gitk:3860 +#: gitk:3935 msgid "External diff viewer failed:" msgstr "Bá»™ trình bà y diff từ bên ngoà i gặp lá»—i:" -#: gitk:3978 +#: gitk:4053 msgid "Gitk view definition" msgstr "Äịnh nghÄ©a cách trình bà y gitk" -#: gitk:3982 +#: gitk:4057 msgid "Remember this view" msgstr "Nhá»› cách trình bà y nà y" -#: gitk:3983 +#: gitk:4058 msgid "References (space separated list):" msgstr "Tham chiếu (danh sách ngăn cách bằng dấu cách):" -#: gitk:3984 +#: gitk:4059 msgid "Branches & tags:" msgstr "Nhánh & thẻ:" -#: gitk:3985 +#: gitk:4060 msgid "All refs" msgstr "Má»i tham chiếu" -#: gitk:3986 +#: gitk:4061 msgid "All (local) branches" msgstr "Má»i nhánh (ná»™i bá»™)" -#: gitk:3987 +#: gitk:4062 msgid "All tags" msgstr "Má»i thẻ" -#: gitk:3988 +#: gitk:4063 msgid "All remote-tracking branches" msgstr "Má»i nhánh remote-tracking" -#: gitk:3989 +#: gitk:4064 msgid "Commit Info (regular expressions):" msgstr "Thông tin chuyển giao (biểu thức chÃnh quy):" -#: gitk:3990 +#: gitk:4065 msgid "Author:" msgstr "Tác giả:" -#: gitk:3991 +#: gitk:4066 msgid "Committer:" msgstr "NgÆ°á»i chuyển giao:" -#: gitk:3992 +#: gitk:4067 msgid "Commit Message:" msgstr "Chú thÃch của lần chuyển giao:" -#: gitk:3993 +#: gitk:4068 msgid "Matches all Commit Info criteria" msgstr "Khá»›p má»i Ä‘iá»u kiện Thông tin Chuyển giao" -#: gitk:3994 +#: gitk:4069 +#, fuzzy +msgid "Matches none Commit Info criteria" +msgstr "Khá»›p má»i Ä‘iá»u kiện Thông tin Chuyển giao" + +#: gitk:4070 msgid "Changes to Files:" msgstr "Äổi thà nh Táºp tin:" -#: gitk:3995 +#: gitk:4071 msgid "Fixed String" msgstr "Chuá»—i cố định" -#: gitk:3996 +#: gitk:4072 msgid "Regular Expression" msgstr "Biểu thức chÃnh quy" -#: gitk:3997 +#: gitk:4073 msgid "Search string:" msgstr "Chuá»—i tìm kiếm:" -#: gitk:3998 +#: gitk:4074 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -678,203 +681,203 @@ msgstr "" "Ngà y chuyển giao (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" -#: gitk:3999 +#: gitk:4075 msgid "Since:" msgstr "Kể từ:" -#: gitk:4000 +#: gitk:4076 msgid "Until:" msgstr "Äến:" -#: gitk:4001 +#: gitk:4077 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "Giá»›i hạn và /hoặc bá» số của Ä‘iểm xét (số nguyên âm):" -#: gitk:4002 +#: gitk:4078 msgid "Number to show:" msgstr "Số lượng hiển thị:" -#: gitk:4003 +#: gitk:4079 msgid "Number to skip:" msgstr "Số lượng sẽ bá» qua:" -#: gitk:4004 +#: gitk:4080 msgid "Miscellaneous options:" msgstr "Tuỳ chá»n há»—n hợp:" -#: gitk:4005 +#: gitk:4081 msgid "Strictly sort by date" msgstr "Sắp xếp chặt chẽ theo ngà y" -#: gitk:4006 +#: gitk:4082 msgid "Mark branch sides" msgstr "Äánh dấu các cạnh nhánh" -#: gitk:4007 +#: gitk:4083 msgid "Limit to first parent" msgstr "Giá»›i hạn thà nh cha mẹ đầu tiên" -#: gitk:4008 +#: gitk:4084 msgid "Simple history" msgstr "Lịch sá» dạng Ä‘Æ¡n giản" -#: gitk:4009 +#: gitk:4085 msgid "Additional arguments to git log:" msgstr "Äối số bổ xung cho lệnh git log:" -#: gitk:4010 +#: gitk:4086 msgid "Enter files and directories to include, one per line:" msgstr "Nháºp và o các táºp tin và thÆ° mục bao gồm, má»—i dòng má»™t cái:" -#: gitk:4011 +#: gitk:4087 msgid "Command to generate more commits to include:" msgstr "Lệnh tạo ra nhiá»u lần chuyển giao hÆ¡n bao gồm:" -#: gitk:4135 +#: gitk:4211 msgid "Gitk: edit view" msgstr "Gitk: sá»a cách trình bà y" -#: gitk:4143 +#: gitk:4219 msgid "-- criteria for selecting revisions" msgstr "-- tiêu chuẩn chá»n Ä‘iểm xét duyệt" -#: gitk:4148 +#: gitk:4224 msgid "View Name" msgstr "Tên cách trình bà y" -#: gitk:4223 +#: gitk:4299 msgid "Apply (F5)" msgstr "Ãp dụng (F5)" -#: gitk:4261 +#: gitk:4337 msgid "Error in commit selection arguments:" msgstr "Lá»—i trong các đối số chá»n chuyển giao:" -#: gitk:4314 gitk:4366 gitk:4827 gitk:4841 gitk:6107 gitk:12184 gitk:12185 +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 msgid "None" msgstr "Không" -#: gitk:4924 gitk:4929 +#: gitk:5003 gitk:5008 msgid "Descendant" msgstr "Con cháu" -#: gitk:4925 +#: gitk:5004 msgid "Not descendant" msgstr "Không có con cháu" -#: gitk:4932 gitk:4937 +#: gitk:5011 gitk:5016 msgid "Ancestor" msgstr "Tổ tiên chung" -#: gitk:4933 +#: gitk:5012 msgid "Not ancestor" msgstr "Không có chung tổ tiên" -#: gitk:5223 +#: gitk:5306 msgid "Local changes checked in to index but not committed" msgstr "" "Có thay đổi ná»™i bá»™ đã được Ä‘Æ°a và o bảng mục lục, nhÆ°ng chÆ°a được chuyển giao" -#: gitk:5259 +#: gitk:5342 msgid "Local uncommitted changes, not checked in to index" msgstr "Có thay đổi ná»™i bá»™, nhÆ°ng chÆ°a được Ä‘Æ°a và o bảng mục lục" -#: gitk:7032 +#: gitk:7115 msgid "and many more" msgstr "và nhiá»u nữa" -#: gitk:7035 +#: gitk:7118 msgid "many" msgstr "nhiá»u" -#: gitk:7222 +#: gitk:7309 msgid "Tags:" msgstr "Thẻ:" -#: gitk:7239 gitk:7245 gitk:8708 +#: gitk:7326 gitk:7332 gitk:8806 msgid "Parent" msgstr "Cha" -#: gitk:7250 +#: gitk:7337 msgid "Child" msgstr "Con" -#: gitk:7259 +#: gitk:7346 msgid "Branch" msgstr "Nhánh" -#: gitk:7262 +#: gitk:7349 msgid "Follows" msgstr "Äứng sau" -#: gitk:7265 +#: gitk:7352 msgid "Precedes" msgstr "Äứng trÆ°á»›c" # tcl-format -#: gitk:7849 +#: gitk:7947 #, tcl-format msgid "Error getting diffs: %s" msgstr "Lá»—i lấy diff: %s" -#: gitk:8533 +#: gitk:8631 msgid "Goto:" msgstr "Nhảy tá»›i:" -#: gitk:8554 +#: gitk:8652 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "Äịnh danh SHA1 dạng ngắn %s là chÆ°a đủ rõ rà ng" -#: gitk:8561 +#: gitk:8659 #, tcl-format msgid "Revision %s is not known" msgstr "Không hiểu Ä‘iểm xét duyệt %s" -#: gitk:8571 +#: gitk:8669 #, tcl-format msgid "SHA1 id %s is not known" msgstr "Không hiểu định danh SHA1 %s" -#: gitk:8573 +#: gitk:8671 #, tcl-format msgid "Revision %s is not in the current view" msgstr "Äiểm %s không ở trong phần hiển thị hiện tại" -#: gitk:8715 gitk:8730 +#: gitk:8813 gitk:8828 msgid "Date" msgstr "Ngà y" -#: gitk:8718 +#: gitk:8816 msgid "Children" msgstr "Con cháu" -#: gitk:8781 +#: gitk:8879 #, tcl-format msgid "Reset %s branch to here" msgstr "Äặt lại nhánh %s tại đây" -#: gitk:8783 +#: gitk:8881 msgid "Detached head: can't reset" msgstr "Head đã bị tách rá»i: không thể đặt lại" -#: gitk:8888 gitk:8894 +#: gitk:8986 gitk:8992 msgid "Skipping merge commit " msgstr "Bá» qua lần chuyển giao hòa trá»™n " -#: gitk:8903 gitk:8908 +#: gitk:9001 gitk:9006 msgid "Error getting patch ID for " msgstr "Gặp lá»—i khi lấy ID miếng vá cho " -#: gitk:8904 gitk:8909 +#: gitk:9002 gitk:9007 msgid " - stopping\n" msgstr " - dừng\n" -#: gitk:8914 gitk:8917 gitk:8925 gitk:8939 gitk:8948 +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 msgid "Commit " msgstr "Commit " -#: gitk:8918 +#: gitk:9016 msgid "" " is the same patch as\n" " " @@ -882,7 +885,7 @@ msgstr "" " là cùng má»™t miếng vá vá»›i\n" " " -#: gitk:8926 +#: gitk:9024 msgid "" " differs from\n" " " @@ -890,7 +893,7 @@ msgstr "" " khác biệt từ\n" " " -#: gitk:8928 +#: gitk:9026 msgid "" "Diff of commits:\n" "\n" @@ -898,131 +901,131 @@ msgstr "" "Khác biệt của lần chuyển giao (commit):\n" "\n" -#: gitk:8940 gitk:8949 +#: gitk:9038 gitk:9047 #, tcl-format msgid " has %s children - stopping\n" msgstr " có %s con - dừng\n" -#: gitk:8968 +#: gitk:9066 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Gặp lá»—i trong quá trình ghi lần chuyển giao và o táºp tin: %s" -#: gitk:8974 +#: gitk:9072 #, tcl-format msgid "Error diffing commits: %s" msgstr "Gặp lá»—i khi so sánh sá»± khác biệt giữa các lần chuyển giao: %s" -#: gitk:9020 +#: gitk:9118 msgid "Top" msgstr "Äỉnh" -#: gitk:9021 +#: gitk:9119 msgid "From" msgstr "Từ" -#: gitk:9026 +#: gitk:9124 msgid "To" msgstr "Äến" -#: gitk:9050 +#: gitk:9148 msgid "Generate patch" msgstr "Tạo miếng vá" -#: gitk:9052 +#: gitk:9150 msgid "From:" msgstr "Từ:" -#: gitk:9061 +#: gitk:9159 msgid "To:" msgstr "Äến:" -#: gitk:9070 +#: gitk:9168 msgid "Reverse" msgstr "Äảo ngược" -#: gitk:9072 gitk:9268 +#: gitk:9170 gitk:9366 msgid "Output file:" msgstr "Táºp tin kết xuất:" -#: gitk:9078 +#: gitk:9176 msgid "Generate" msgstr "Tạo" -#: gitk:9116 +#: gitk:9214 msgid "Error creating patch:" msgstr "Gặp lá»—i khi tạo miếng vá:" -#: gitk:9139 gitk:9256 gitk:9313 +#: gitk:9237 gitk:9354 gitk:9411 msgid "ID:" msgstr "ID:" -#: gitk:9148 +#: gitk:9246 msgid "Tag name:" msgstr "Tên thẻ:" -#: gitk:9151 +#: gitk:9249 msgid "Tag message is optional" msgstr "Ghi chú thẻ chỉ là tùy chá»n" -#: gitk:9153 +#: gitk:9251 msgid "Tag message:" msgstr "Ghi chú cho thẻ:" -#: gitk:9157 gitk:9322 +#: gitk:9255 gitk:9420 msgid "Create" msgstr "Tạo" -#: gitk:9175 +#: gitk:9273 msgid "No tag name specified" msgstr "ChÆ°a chỉ ra tên của thẻ" -#: gitk:9179 +#: gitk:9277 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Thẻ “%s†đã có sẵn rồi" -#: gitk:9189 +#: gitk:9287 msgid "Error creating tag:" msgstr "Gặp lá»—i khi tạo thẻ:" -#: gitk:9265 +#: gitk:9363 msgid "Command:" msgstr "Lệnh:" -#: gitk:9273 +#: gitk:9371 msgid "Write" msgstr "Ghi" -#: gitk:9291 +#: gitk:9389 msgid "Error writing commit:" msgstr "Gặp lá»—i trong quá trình ghi chuyển giao:" -#: gitk:9318 +#: gitk:9416 msgid "Name:" msgstr "Tên:" -#: gitk:9341 +#: gitk:9439 msgid "Please specify a name for the new branch" msgstr "Vui lòng chỉ định tên cho nhánh má»›i" -#: gitk:9346 +#: gitk:9444 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "Nhánh “%s†đã có từ trÆ°á»›c rồi. Ghi đè?" -#: gitk:9413 +#: gitk:9511 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "" "Lần chuyển giao %s đã sẵn được bao gồm trong nhánh %s -- bạn có thá»±c sá»± muốn " "áp dụng lại nó không?" -#: gitk:9418 +#: gitk:9516 msgid "Cherry-picking" msgstr "Äang cherry-pick" -#: gitk:9427 +#: gitk:9525 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -1031,7 +1034,7 @@ msgstr "" "Cherry-pick gặp lá»—i bởi vì các thay đổi ná»™i bá»™ táºp tin “%sâ€.\n" "Xin hãy chuyển giao, reset hay stash các thay đổi của bạn sau đó thá» lại." -#: gitk:9433 +#: gitk:9531 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1039,22 +1042,22 @@ msgstr "" "Cherry-pick gặp lá»—i bởi vì xung Ä‘á»™t trong hòa trá»™n.\n" "Bạn có muốn chạy lệnh “git citool†để giải quyết vấn Ä‘á» nà y không?" -#: gitk:9449 gitk:9507 +#: gitk:9547 gitk:9605 msgid "No changes committed" msgstr "Không có thay đổi nà o cần chuyển giao" -#: gitk:9476 +#: gitk:9574 #, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" msgstr "" "Lần chuyển giao %s không được bao gồm trong nhánh %s -- bạn có thá»±c sá»± muốn " "“revert†nó không?" -#: gitk:9481 +#: gitk:9579 msgid "Reverting" msgstr "Äang hoà n tác" -#: gitk:9489 +#: gitk:9587 #, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " @@ -1063,7 +1066,7 @@ msgstr "" "Revert gặp lá»—i bởi vì táºp tin sau đã được thay đổi ná»™i bá»™:%s\n" "Xin hãy chạy lệnh “commitâ€, “reset†hoặc “stash†rồi thá» lại." -#: gitk:9493 +#: gitk:9591 msgid "" "Revert failed because of merge conflict.\n" " Do you wish to run git citool to resolve it?" @@ -1071,29 +1074,29 @@ msgstr "" "Revert gặp lá»—i bởi vì xung Ä‘á»™t hòa trá»™n.\n" " Bạn có muốn chạy lệnh “git citool†để phân giải nó không?" -#: gitk:9536 +#: gitk:9634 msgid "Confirm reset" msgstr "Xác nháºt đặt lại" -#: gitk:9538 +#: gitk:9636 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Äặt lại nhánh “%s†thà nh “%sâ€?" -#: gitk:9540 +#: gitk:9638 msgid "Reset type:" msgstr "Kiểu đặt lại:" -#: gitk:9543 +#: gitk:9641 msgid "Soft: Leave working tree and index untouched" msgstr "Má»m: Không Ä‘á»™ng đến thÆ° mục là m việc và bảng mục lục" -#: gitk:9546 +#: gitk:9644 msgid "Mixed: Leave working tree untouched, reset index" msgstr "" "Pha trá»™n: Không Ä‘á»™ng chạm đến thÆ° mục là m việc nhÆ°ng đặt lại bảng mục lục" -#: gitk:9549 +#: gitk:9647 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1101,19 +1104,19 @@ msgstr "" "Hard: Äặt lại cây là m việc và mục lục\n" "(hủy bá» MỌI thay đổi ná»™i bá»™)" -#: gitk:9566 +#: gitk:9664 msgid "Resetting" msgstr "Äang đặt lại" -#: gitk:9626 +#: gitk:9724 msgid "Checking out" msgstr "Äang checkout" -#: gitk:9679 +#: gitk:9777 msgid "Cannot delete the currently checked-out branch" msgstr "Không thể xóa nhánh hiện tại Ä‘ang được lấy ra" -#: gitk:9685 +#: gitk:9783 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1122,16 +1125,16 @@ msgstr "" "Các lần chuyển giao trên nhánh %s không ở trên nhánh khác.\n" "Thá»±c sá»± muốn xóa nhánh %s?" -#: gitk:9716 +#: gitk:9814 #, tcl-format msgid "Tags and heads: %s" msgstr "Thẻ và Äầu: %s" -#: gitk:9731 +#: gitk:9829 msgid "Filter" msgstr "Bá»™ lá»c" -#: gitk:10027 +#: gitk:10125 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1139,213 +1142,219 @@ msgstr "" "Gặp lá»—i khi Ä‘á»c thông tin hình há»c lần chuyển giao; thông tin nhánh và thẻ " "trÆ°á»›c/sau sẽ không hoà n thiện." -#: gitk:11004 +#: gitk:11102 msgid "Tag" msgstr "Thẻ" -#: gitk:11008 +#: gitk:11106 msgid "Id" msgstr "Id" -#: gitk:11091 +#: gitk:11189 msgid "Gitk font chooser" msgstr "Há»™p thoại chá»n phông Gitk" -#: gitk:11108 +#: gitk:11206 msgid "B" msgstr "B" -#: gitk:11111 +#: gitk:11209 msgid "I" msgstr "I" -#: gitk:11229 +#: gitk:11327 msgid "Commit list display options" msgstr "Các tùy chá»n vá» hiển thị danh sách lần chuyển giao" -#: gitk:11232 +#: gitk:11330 msgid "Maximum graph width (lines)" msgstr "Äá»™ rá»™ng biểu đồ tối Ä‘a (dòng)" -#: gitk:11235 -#, tcl-format +#: gitk:11334 +#, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Äá»™ rá»™ng biểu đồ tối Ä‘a (% của bảng)" -#: gitk:11238 +#: gitk:11337 msgid "Show local changes" msgstr "Hiển thị các thay đổi ná»™i bá»™" -#: gitk:11241 +#: gitk:11340 msgid "Auto-select SHA1 (length)" msgstr "Tá»± chá»n SHA1 (Ä‘á»™ dà i)" -#: gitk:11245 +#: gitk:11344 msgid "Hide remote refs" msgstr "Ẩn tham chiếu đến máy chủ" -#: gitk:11249 +#: gitk:11348 msgid "Diff display options" msgstr "Các tùy chá»n trình bà y các khác biệt" -#: gitk:11251 +#: gitk:11350 msgid "Tab spacing" msgstr "Khoảng cách tab" -#: gitk:11254 +#: gitk:11353 msgid "Display nearby tags/heads" msgstr "Hiển thị các thẻ/đầu xung quanh" -#: gitk:11257 +#: gitk:11356 msgid "Maximum # tags/heads to show" msgstr "Số lượng thẻ/đầu tối Ä‘a sẽ hiển thị" -#: gitk:11260 +#: gitk:11359 msgid "Limit diffs to listed paths" msgstr "Giá»›i hạn các khác biệt cho Ä‘Æ°á»ng dẫn đã liệt kê" -#: gitk:11263 +#: gitk:11362 msgid "Support per-file encodings" msgstr "Há»— trợ mã hóa má»—i-dòng" -#: gitk:11269 gitk:11416 +#: gitk:11368 gitk:11515 msgid "External diff tool" msgstr "Công cụ so sánh từ bên ngoà i" -#: gitk:11270 +#: gitk:11369 msgid "Choose..." msgstr "Chá»n..." -#: gitk:11275 +#: gitk:11374 msgid "General options" msgstr "Các tùy chá»n chung" -#: gitk:11278 +#: gitk:11377 msgid "Use themed widgets" msgstr "Dùng các widget chủ Ä‘á»" -#: gitk:11280 +#: gitk:11379 msgid "(change requires restart)" msgstr "(để thay đổi cần khởi Ä‘á»™ng lại)" -#: gitk:11282 +#: gitk:11381 msgid "(currently unavailable)" msgstr "(hiện tại không sẵn sà ng)" -#: gitk:11293 +#: gitk:11392 msgid "Colors: press to choose" msgstr "Mà u sắc: bấm và o nút phÃa dÆ°á»›i để chá»n mà u" -#: gitk:11296 +#: gitk:11395 msgid "Interface" msgstr "Giao diện" -#: gitk:11297 +#: gitk:11396 msgid "interface" msgstr "giao diện" -#: gitk:11300 +#: gitk:11399 msgid "Background" msgstr "Ná»n" -#: gitk:11301 gitk:11331 +#: gitk:11400 gitk:11430 msgid "background" msgstr "ná»n" -#: gitk:11304 +#: gitk:11403 msgid "Foreground" msgstr "Tiá»n cảnh" -#: gitk:11305 +#: gitk:11404 msgid "foreground" msgstr "tiá»n cảnh" -#: gitk:11308 +#: gitk:11407 msgid "Diff: old lines" msgstr "So sánh: dòng cÅ©" -#: gitk:11309 +#: gitk:11408 msgid "diff old lines" msgstr "diff dòng cÅ©" -#: gitk:11313 +#: gitk:11412 msgid "Diff: new lines" msgstr "So sánh: dòng má»›i" -#: gitk:11314 +#: gitk:11413 msgid "diff new lines" msgstr "mà u dòng má»›i" -#: gitk:11318 +#: gitk:11417 msgid "Diff: hunk header" msgstr "So sánh: phần đầu của Ä‘oạn" -#: gitk:11320 +#: gitk:11419 msgid "diff hunk header" msgstr "mà u của phần đầu của Ä‘oạn khi so sánh" -#: gitk:11324 +#: gitk:11423 msgid "Marked line bg" msgstr "Ná»n dòng đánh dấu" -#: gitk:11326 +#: gitk:11425 msgid "marked line background" msgstr "ná»n dòng được đánh dấu" -#: gitk:11330 +#: gitk:11429 msgid "Select bg" msgstr "Mà u ná»n" -#: gitk:11339 +#: gitk:11438 msgid "Fonts: press to choose" msgstr "Phông chữ: bấm và o các nút ở dÆ°á»›i để chá»n" -#: gitk:11341 +#: gitk:11440 msgid "Main font" msgstr "Phông chữ chÃnh" -#: gitk:11342 +#: gitk:11441 msgid "Diff display font" msgstr "Phông chữ dùng khi so sánh" -#: gitk:11343 +#: gitk:11442 msgid "User interface font" msgstr "Phông chữ giao diện" -#: gitk:11365 +#: gitk:11464 msgid "Gitk preferences" msgstr "Cá nhân hóa các cà i đặt cho Gitk" -#: gitk:11374 +#: gitk:11473 msgid "General" msgstr "Chung" -#: gitk:11375 +#: gitk:11474 msgid "Colors" msgstr "Mà u sắc" -#: gitk:11376 +#: gitk:11475 msgid "Fonts" msgstr "Phông chữ" -#: gitk:11426 +#: gitk:11525 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: chá»n mà u cho %s" -#: gitk:12080 +#: gitk:12242 msgid "Cannot find a git repository here." msgstr "Không thể tìm thấy kho git ở đây." -#: gitk:12127 +#: gitk:12289 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Äối số “%s†chÆ°a rõ rà ng: vừa là điểm xét duyệt vừa là tên táºp tin" -#: gitk:12139 +#: gitk:12301 msgid "Bad arguments to gitk:" msgstr "Äối số không hợp lệ cho gitk:" -#: gitk:12242 +#: gitk:12405 msgid "Command line" msgstr "Dòng lệnh" + +#~ msgid "next" +#~ msgstr "tiếp" + +#~ msgid "prev" +#~ msgstr "trÆ°á»›c" @@ -38,7 +38,7 @@ const signed char hexval_table[256] = { int get_sha1_hex(const char *hex, unsigned char *sha1) { int i; - for (i = 0; i < 20; i++) { + for (i = 0; i < GIT_SHA1_RAWSZ; i++) { unsigned int val; /* * hex[1]=='\0' is caught when val is checked below, @@ -56,15 +56,20 @@ int get_sha1_hex(const char *hex, unsigned char *sha1) return 0; } +int get_oid_hex(const char *hex, struct object_id *oid) +{ + return get_sha1_hex(hex, oid->hash); +} + char *sha1_to_hex(const unsigned char *sha1) { static int bufno; - static char hexbuffer[4][41]; + static char hexbuffer[4][GIT_SHA1_HEXSZ + 1]; static const char hex[] = "0123456789abcdef"; char *buffer = hexbuffer[3 & ++bufno], *buf = buffer; int i; - for (i = 0; i < 20; i++) { + for (i = 0; i < GIT_SHA1_RAWSZ; i++) { unsigned int val = *sha1++; *buf++ = hex[val >> 4]; *buf++ = hex[val & 0xf]; @@ -73,3 +78,8 @@ char *sha1_to_hex(const unsigned char *sha1) return buffer; } + +char *oid_to_hex(const struct object_id *oid) +{ + return sha1_to_hex(oid->hash); +} diff --git a/http-push.c b/http-push.c index 0beb7ab..c98dad2 100644 --- a/http-push.c +++ b/http-push.c @@ -316,7 +316,6 @@ static void start_fetch_packed(struct transfer_request *request) preq = new_http_pack_request(target, repo->url); if (preq == NULL) { - release_http_pack_request(preq); repo->can_update_info_refs = 0; return; } @@ -365,7 +364,6 @@ static void start_put(struct transfer_request *request) hdrlen = sprintf(hdr, "%s %lu", typename(type), len) + 1; /* Set it up */ - memset(&stream, 0, sizeof(stream)); git_deflate_init(&stream, zlib_compression_level); size = git_deflate_bound(&stream, len + hdrlen); strbuf_init(&request->buffer.buf, size); @@ -36,6 +36,7 @@ char curl_errorstr[CURL_ERROR_SIZE]; static int curl_ssl_verify = -1; static int curl_ssl_try; static const char *ssl_cert; +static const char *ssl_cipherlist; #if LIBCURL_VERSION_NUM >= 0x070903 static const char *ssl_key; #endif @@ -187,6 +188,8 @@ static int http_options(const char *var, const char *value, void *cb) curl_ssl_verify = git_config_bool(var, value); return 0; } + if (!strcmp("http.sslcipherlist", var)) + return git_config_string(&ssl_cipherlist, var, value); if (!strcmp("http.sslcert", var)) return git_config_string(&ssl_cert, var, value); #if LIBCURL_VERSION_NUM >= 0x070903 @@ -361,6 +364,13 @@ static CURL *get_curl_handle(void) if (http_proactive_auth) init_curl_http_auth(result); + if (getenv("GIT_SSL_CIPHER_LIST")) + ssl_cipherlist = getenv("GIT_SSL_CIPHER_LIST"); + + if (ssl_cipherlist != NULL && *ssl_cipherlist) + curl_easy_setopt(result, CURLOPT_SSL_CIPHER_LIST, + ssl_cipherlist); + if (ssl_cert != NULL) curl_easy_setopt(result, CURLOPT_SSLCERT, ssl_cert); if (has_cert_password()) @@ -1462,6 +1472,7 @@ void release_http_pack_request(struct http_pack_request *preq) } preq->slot = NULL; free(preq->url); + free(preq); } int finish_http_pack_request(struct http_pack_request *preq) diff --git a/imap-send.c b/imap-send.c index d69887d..37ac4aa 100644 --- a/imap-send.c +++ b/imap-send.c @@ -34,8 +34,16 @@ typedef void *SSL; #include "http.h" #endif +#if defined(USE_CURL_FOR_IMAP_SEND) && defined(NO_OPENSSL) +/* only available option */ +#define USE_CURL_DEFAULT 1 +#else +/* strictly opt in */ +#define USE_CURL_DEFAULT 0 +#endif + static int verbosity; -static int use_curl; /* strictly opt in */ +static int use_curl = USE_CURL_DEFAULT; static const char * const imap_send_usage[] = { "git imap-send [-v] [-q] [--[no-]curl] < <mbox>", NULL }; @@ -1504,9 +1512,14 @@ int main(int argc, char **argv) #ifndef USE_CURL_FOR_IMAP_SEND if (use_curl) { - warning("--use-curl not supported in this build"); + warning("--curl not supported in this build"); use_curl = 0; } +#elif defined(NO_OPENSSL) + if (!use_curl) { + warning("--no-curl not supported in this build"); + use_curl = 1; + } #endif if (!server.port) @@ -575,7 +575,7 @@ parse_lines(struct commit *commit, const char *prefix, struct string_list *args) name_part = skip_range_arg(item->string); if (!name_part || *name_part != ':' || !name_part[1]) - die("-L argument '%s' not of the form start,end:file", + die("-L argument not 'start,end:file' or ':funcname:file': %s", item->string); range_part = xstrndup(item->string, name_part - item->string); name_part++; @@ -1099,6 +1099,7 @@ static int process_all_files(struct line_log_data **range_out, rg->pair = diff_filepair_dup(queue->queue[i]); memcpy(&rg->diff, pairdiff, sizeof(struct diff_ranges)); } + free(pairdiff); } return changed; @@ -157,6 +157,80 @@ static int lock_file(struct lock_file *lk, const char *path, int flags) return lk->fd; } +static int sleep_microseconds(long us) +{ + struct timeval tv; + tv.tv_sec = 0; + tv.tv_usec = us; + return select(0, NULL, NULL, NULL, &tv); +} + +/* + * Constants defining the gaps between attempts to lock a file. The + * first backoff period is approximately INITIAL_BACKOFF_MS + * milliseconds. The longest backoff period is approximately + * (BACKOFF_MAX_MULTIPLIER * INITIAL_BACKOFF_MS) milliseconds. + */ +#define INITIAL_BACKOFF_MS 1L +#define BACKOFF_MAX_MULTIPLIER 1000 + +/* + * Try locking path, retrying with quadratic backoff for at least + * timeout_ms milliseconds. If timeout_ms is 0, try locking the file + * exactly once. If timeout_ms is -1, try indefinitely. + */ +static int lock_file_timeout(struct lock_file *lk, const char *path, + int flags, long timeout_ms) +{ + int n = 1; + int multiplier = 1; + long remaining_us = 0; + static int random_initialized = 0; + + if (timeout_ms == 0) + return lock_file(lk, path, flags); + + if (!random_initialized) { + srandom((unsigned int)getpid()); + random_initialized = 1; + } + + if (timeout_ms > 0) { + /* avoid overflow */ + if (timeout_ms <= LONG_MAX / 1000) + remaining_us = timeout_ms * 1000; + else + remaining_us = LONG_MAX; + } + + while (1) { + long backoff_ms, wait_us; + int fd; + + fd = lock_file(lk, path, flags); + + if (fd >= 0) + return fd; /* success */ + else if (errno != EEXIST) + return -1; /* failure other than lock held */ + else if (timeout_ms > 0 && remaining_us <= 0) + return -1; /* failure due to timeout */ + + backoff_ms = multiplier * INITIAL_BACKOFF_MS; + /* back off for between 0.75*backoff_ms and 1.25*backoff_ms */ + wait_us = (750 + random() % 500) * backoff_ms; + sleep_microseconds(wait_us); + remaining_us -= wait_us; + + /* Recursion: (n+1)^2 = n^2 + 2n + 1 */ + multiplier += 2*n + 1; + if (multiplier > BACKOFF_MAX_MULTIPLIER) + multiplier = BACKOFF_MAX_MULTIPLIER; + else + n++; + } +} + void unable_to_lock_message(const char *path, int err, struct strbuf *buf) { if (err == EEXIST) { @@ -179,9 +253,10 @@ NORETURN void unable_to_lock_die(const char *path, int err) } /* This should return a meaningful errno on failure */ -int hold_lock_file_for_update(struct lock_file *lk, const char *path, int flags) +int hold_lock_file_for_update_timeout(struct lock_file *lk, const char *path, + int flags, long timeout_ms) { - int fd = lock_file(lk, path, flags); + int fd = lock_file_timeout(lk, path, flags, timeout_ms); if (fd < 0 && (flags & LOCK_DIE_ON_ERROR)) unable_to_lock_die(path, errno); return fd; @@ -214,7 +289,7 @@ int hold_lock_file_for_append(struct lock_file *lk, const char *path, int flags) int save_errno = errno; if (flags & LOCK_DIE_ON_ERROR) - exit(128); + die("failed to prepare '%s' for appending", path); close(orig_fd); rollback_lock_file(lk); errno = save_errno; @@ -74,8 +74,20 @@ struct lock_file { extern void unable_to_lock_message(const char *path, int err, struct strbuf *buf); extern NORETURN void unable_to_lock_die(const char *path, int err); -extern int hold_lock_file_for_update(struct lock_file *, const char *path, int); -extern int hold_lock_file_for_append(struct lock_file *, const char *path, int); +extern int hold_lock_file_for_update_timeout( + struct lock_file *lk, const char *path, + int flags, long timeout_ms); + +static inline int hold_lock_file_for_update( + struct lock_file *lk, const char *path, + int flags) +{ + return hold_lock_file_for_update_timeout(lk, path, flags, 0); +} + +extern int hold_lock_file_for_append(struct lock_file *lk, const char *path, + int flags); + extern FILE *fdopen_lock_file(struct lock_file *, const char *mode); extern char *get_locked_file_path(struct lock_file *); extern int commit_lock_file_to(struct lock_file *, const char *path); @@ -13,6 +13,8 @@ #include "line-log.h" static struct decoration name_decoration = { "object names" }; +static int decoration_loaded; +static int decoration_flags; static char decoration_colors[][COLOR_MAXLEN] = { GIT_COLOR_RESET, @@ -92,6 +94,8 @@ static int add_ref_decoration(const char *refname, const unsigned char *sha1, in struct object *obj; enum decoration_type type = DECORATION_NONE; + assert(cb_data == NULL); + if (starts_with(refname, "refs/replace/")) { unsigned char original_sha1[20]; if (!check_replace_refs) @@ -121,8 +125,6 @@ static int add_ref_decoration(const char *refname, const unsigned char *sha1, in else if (!strcmp(refname, "HEAD")) type = DECORATION_REF_HEAD; - if (!cb_data || *(int *)cb_data == DECORATE_SHORT_REFS) - refname = prettify_refname(refname); add_name_decoration(type, refname, obj); while (obj->type == OBJ_TAG) { obj = ((struct tag *)obj)->tagged; @@ -137,7 +139,7 @@ static int add_ref_decoration(const char *refname, const unsigned char *sha1, in static int add_graft_decoration(const struct commit_graft *graft, void *cb_data) { - struct commit *commit = lookup_commit(graft->sha1); + struct commit *commit = lookup_commit(graft->oid.hash); if (!commit) return 0; add_name_decoration(DECORATION_GRAFTED, "grafted", &commit->object); @@ -146,11 +148,11 @@ static int add_graft_decoration(const struct commit_graft *graft, void *cb_data) void load_ref_decorations(int flags) { - static int loaded; - if (!loaded) { - loaded = 1; - for_each_ref(add_ref_decoration, &flags); - head_ref(add_ref_decoration, &flags); + if (!decoration_loaded) { + decoration_loaded = 1; + decoration_flags = flags; + for_each_ref(add_ref_decoration, NULL); + head_ref(add_ref_decoration, NULL); for_each_commit_graft(add_graft_decoration, NULL); } } @@ -173,6 +175,52 @@ static void show_children(struct rev_info *opt, struct commit *commit, int abbre } /* + * Do we have HEAD in the output, and also the branch it points at? + * If so, find that decoration entry for that current branch. + */ +static const struct name_decoration *current_pointed_by_HEAD(const struct name_decoration *decoration) +{ + const struct name_decoration *list, *head = NULL; + const char *branch_name = NULL; + unsigned char unused[20]; + int rru_flags; + + /* First find HEAD */ + for (list = decoration; list; list = list->next) + if (list->type == DECORATION_REF_HEAD) { + head = list; + break; + } + if (!head) + return NULL; + + /* Now resolve and find the matching current branch */ + branch_name = resolve_ref_unsafe("HEAD", 0, unused, &rru_flags); + if (!(rru_flags & REF_ISSYMREF)) + return NULL; + + if (!starts_with(branch_name, "refs/")) + return NULL; + + /* OK, do we have that ref in the list? */ + for (list = decoration; list; list = list->next) + if ((list->type == DECORATION_REF_LOCAL) && + !strcmp(branch_name, list->name)) { + return list; + } + + return NULL; +} + +static void show_name(struct strbuf *sb, const struct name_decoration *decoration) +{ + if (decoration_flags == DECORATE_SHORT_REFS) + strbuf_addstr(sb, prettify_refname(decoration->name)); + else + strbuf_addstr(sb, decoration->name); +} + +/* * The caller makes sure there is no funny color before calling. * format_decorations_extended makes sure the same after return. */ @@ -184,6 +232,7 @@ void format_decorations_extended(struct strbuf *sb, const char *suffix) { const struct name_decoration *decoration; + const struct name_decoration *current_and_HEAD; const char *color_commit = diff_get_color(use_color, DIFF_COMMIT); const char *color_reset = @@ -192,15 +241,37 @@ void format_decorations_extended(struct strbuf *sb, decoration = get_name_decoration(&commit->object); if (!decoration) return; + + current_and_HEAD = current_pointed_by_HEAD(decoration); while (decoration) { - strbuf_addstr(sb, color_commit); - strbuf_addstr(sb, prefix); - strbuf_addstr(sb, decorate_get_color(use_color, decoration->type)); - if (decoration->type == DECORATION_REF_TAG) - strbuf_addstr(sb, "tag: "); - strbuf_addstr(sb, decoration->name); - strbuf_addstr(sb, color_reset); - prefix = separator; + /* + * When both current and HEAD are there, only + * show HEAD->current where HEAD would have + * appeared, skipping the entry for current. + */ + if (decoration != current_and_HEAD) { + strbuf_addstr(sb, color_commit); + strbuf_addstr(sb, prefix); + strbuf_addstr(sb, color_reset); + strbuf_addstr(sb, decorate_get_color(use_color, decoration->type)); + if (decoration->type == DECORATION_REF_TAG) + strbuf_addstr(sb, "tag: "); + + show_name(sb, decoration); + + if (current_and_HEAD && + decoration->type == DECORATION_REF_HEAD) { + strbuf_addstr(sb, color_reset); + strbuf_addstr(sb, color_commit); + strbuf_addstr(sb, " -> "); + strbuf_addstr(sb, color_reset); + strbuf_addstr(sb, decorate_get_color(use_color, current_and_HEAD->type)); + show_name(sb, current_and_HEAD); + } + strbuf_addstr(sb, color_reset); + + prefix = separator; + } decoration = decoration->next; } strbuf_addstr(sb, color_commit); diff --git a/merge-blobs.c b/merge-blobs.c index 57211bc..7abb894 100644 --- a/merge-blobs.c +++ b/merge-blobs.c @@ -14,8 +14,10 @@ static int fill_mmfile_blob(mmfile_t *f, struct blob *obj) buf = read_sha1_file(obj->object.sha1, &type, &size); if (!buf) return -1; - if (type != OBJ_BLOB) + if (type != OBJ_BLOB) { + free(buf); return -1; + } f->ptr = buf; f->size = size; return 0; diff --git a/merge-recursive.c b/merge-recursive.c index 771f5e2..1c9c30d 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1858,6 +1858,9 @@ int merge_trees(struct merge_options *o, string_list_clear(re_head, 0); string_list_clear(entries, 1); + free(re_merge); + free(re_head); + free(entries); } else clean = 1; diff --git a/notes-merge.c b/notes-merge.c index 109ff4e..0b2b82c 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -280,7 +280,7 @@ static void check_notes_merge_worktree(struct notes_merge_options *o) "(%s exists).", git_path("NOTES_MERGE_*")); } - if (safe_create_leading_directories(git_path( + if (safe_create_leading_directories_const(git_path( NOTES_MERGE_WORKTREE "/.test"))) die_errno("unable to create directory %s", git_path(NOTES_MERGE_WORKTREE)); @@ -295,8 +295,8 @@ static void write_buf_to_worktree(const unsigned char *obj, const char *buf, unsigned long size) { int fd; - char *path = git_path(NOTES_MERGE_WORKTREE "/%s", sha1_to_hex(obj)); - if (safe_create_leading_directories(path)) + const char *path = git_path(NOTES_MERGE_WORKTREE "/%s", sha1_to_hex(obj)); + if (safe_create_leading_directories_const(path)) die_errno("unable to create directory for '%s'", path); if (file_exists(path)) die("found existing file at '%s'", path); @@ -41,7 +41,8 @@ int type_from_string_gently(const char *str, ssize_t len, int gentle) len = strlen(str); for (i = 1; i < ARRAY_SIZE(object_type_strings); i++) - if (!strncmp(str, object_type_strings[i], len)) + if (!strncmp(str, object_type_strings[i], len) && + object_type_strings[i][len] == '\0') return i; if (gentle) diff --git a/pack-bitmap.c b/pack-bitmap.c index 365f9d9..e5abb8a 100644 --- a/pack-bitmap.c +++ b/pack-bitmap.c @@ -209,14 +209,12 @@ static inline uint8_t read_u8(const unsigned char *buffer, size_t *pos) return buffer[(*pos)++]; } +#define MAX_XOR_OFFSET 160 + 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; - - recent_bitmaps = xcalloc(MAX_XOR_OFFSET, sizeof(struct stored_bitmap)); + struct stored_bitmap *recent_bitmaps[MAX_XOR_OFFSET] = { NULL }; for (i = 0; i < index->entry_count; ++i) { int xor_offset, flags; @@ -986,6 +984,8 @@ void test_bitmap_walk(struct rev_info *revs) fprintf(stderr, "OK!\n"); else fprintf(stderr, "Mismatch!\n"); + + free(result); } static int rebuild_bitmap(uint32_t *reposition, diff --git a/parse-options.h b/parse-options.h index 7940bc7..c71e9da 100644 --- a/parse-options.h +++ b/parse-options.h @@ -95,8 +95,7 @@ typedef int parse_opt_ll_cb(struct parse_opt_ctx_t *ctx, * * `defval`:: * default value to fill (*->value) with for PARSE_OPT_OPTARG. - * OPTION_{BIT,SET_INT} store the {mask,integer,pointer} to put in - * the value when met. + * OPTION_{BIT,SET_INT} store the {mask,integer} to put in the value when met. * CALLBACKS can use it like they want. */ struct option { @@ -4,6 +4,7 @@ #include "cache.h" #include "strbuf.h" #include "string-list.h" +#include "dir.h" static int get_st_mode_bits(const char *path, int *mode) { @@ -16,11 +17,15 @@ static int get_st_mode_bits(const char *path, int *mode) static char bad_path[] = "/bad-path/"; -static char *get_pathname(void) +static struct strbuf *get_pathname(void) { - static char pathname_array[4][PATH_MAX]; + static struct strbuf pathname_array[4] = { + STRBUF_INIT, STRBUF_INIT, STRBUF_INIT, STRBUF_INIT + }; static int index; - return pathname_array[3 & ++index]; + struct strbuf *sb = &pathname_array[3 & ++index]; + strbuf_reset(sb); + return sb; } static char *cleanup_path(char *path) @@ -34,6 +39,13 @@ static char *cleanup_path(char *path) return path; } +static void strbuf_cleanup_path(struct strbuf *sb) +{ + char *path = cleanup_path(sb->buf); + if (path > sb->buf) + strbuf_remove(sb, 0, path - sb->buf); +} + char *mksnpath(char *buf, size_t n, const char *fmt, ...) { va_list args; @@ -49,152 +61,192 @@ char *mksnpath(char *buf, size_t n, const char *fmt, ...) return cleanup_path(buf); } -static char *vsnpath(char *buf, size_t n, const char *fmt, va_list args) +static int dir_prefix(const char *buf, const char *dir) { - const char *git_dir = get_git_dir(); - size_t len; + int len = strlen(dir); + return !strncmp(buf, dir, len) && + (is_dir_sep(buf[len]) || buf[len] == '\0'); +} - len = strlen(git_dir); - if (n < len + 1) - goto bad; - memcpy(buf, git_dir, len); - if (len && !is_dir_sep(git_dir[len-1])) - buf[len++] = '/'; - len += vsnprintf(buf + len, n - len, fmt, args); - if (len >= n) - goto bad; - return cleanup_path(buf); -bad: - strlcpy(buf, bad_path, n); - return buf; +/* $buf =~ m|$dir/+$file| but without regex */ +static int is_dir_file(const char *buf, const char *dir, const char *file) +{ + int len = strlen(dir); + if (strncmp(buf, dir, len) || !is_dir_sep(buf[len])) + return 0; + while (is_dir_sep(buf[len])) + len++; + return !strcmp(buf + len, file); } -char *git_snpath(char *buf, size_t n, const char *fmt, ...) +static void replace_dir(struct strbuf *buf, int len, const char *newdir) { - char *ret; - va_list args; - va_start(args, fmt); - ret = vsnpath(buf, n, fmt, args); - va_end(args); - return ret; + int newlen = strlen(newdir); + int need_sep = (buf->buf[len] && !is_dir_sep(buf->buf[len])) && + !is_dir_sep(newdir[newlen - 1]); + if (need_sep) + len--; /* keep one char, to be replaced with '/' */ + strbuf_splice(buf, 0, len, newdir, newlen); + if (need_sep) + buf->buf[newlen] = '/'; } -char *git_pathdup(const char *fmt, ...) +static const char *common_list[] = { + "/branches", "/hooks", "/info", "!/logs", "/lost-found", + "/objects", "/refs", "/remotes", "/worktrees", "/rr-cache", "/svn", + "config", "!gc.pid", "packed-refs", "shallow", + NULL +}; + +static void update_common_dir(struct strbuf *buf, int git_dir_len) +{ + char *base = buf->buf + git_dir_len; + const char **p; + + if (is_dir_file(base, "logs", "HEAD") || + is_dir_file(base, "info", "sparse-checkout")) + return; /* keep this in $GIT_DIR */ + for (p = common_list; *p; p++) { + const char *path = *p; + int is_dir = 0; + if (*path == '!') + path++; + if (*path == '/') { + path++; + is_dir = 1; + } + if (is_dir && dir_prefix(base, path)) { + replace_dir(buf, git_dir_len, get_git_common_dir()); + return; + } + if (!is_dir && !strcmp(base, path)) { + replace_dir(buf, git_dir_len, get_git_common_dir()); + return; + } + } +} + +void report_linked_checkout_garbage(void) +{ + struct strbuf sb = STRBUF_INIT; + const char **p; + int len; + + if (!git_common_dir_env) + return; + strbuf_addf(&sb, "%s/", get_git_dir()); + len = sb.len; + for (p = common_list; *p; p++) { + const char *path = *p; + if (*path == '!') + continue; + strbuf_setlen(&sb, len); + strbuf_addstr(&sb, path); + if (file_exists(sb.buf)) + report_garbage("unused in linked checkout", sb.buf); + } + strbuf_release(&sb); +} + +static void adjust_git_path(struct strbuf *buf, int git_dir_len) +{ + const char *base = buf->buf + git_dir_len; + if (git_graft_env && is_dir_file(base, "info", "grafts")) + strbuf_splice(buf, 0, buf->len, + get_graft_file(), strlen(get_graft_file())); + else if (git_index_env && !strcmp(base, "index")) + strbuf_splice(buf, 0, buf->len, + get_index_file(), strlen(get_index_file())); + else if (git_db_env && dir_prefix(base, "objects")) + replace_dir(buf, git_dir_len + 7, get_object_directory()); + else if (git_common_dir_env) + update_common_dir(buf, git_dir_len); +} + +static void do_git_path(struct strbuf *buf, const char *fmt, va_list args) +{ + int gitdir_len; + strbuf_addstr(buf, get_git_dir()); + if (buf->len && !is_dir_sep(buf->buf[buf->len - 1])) + strbuf_addch(buf, '/'); + gitdir_len = buf->len; + strbuf_vaddf(buf, fmt, args); + adjust_git_path(buf, gitdir_len); + strbuf_cleanup_path(buf); +} + +void strbuf_git_path(struct strbuf *sb, const char *fmt, ...) { - char path[PATH_MAX], *ret; va_list args; va_start(args, fmt); - ret = vsnpath(path, sizeof(path), fmt, args); + do_git_path(sb, fmt, args); va_end(args); - return xstrdup(ret); } -char *mkpathdup(const char *fmt, ...) +const char *git_path(const char *fmt, ...) { - char *path; - struct strbuf sb = STRBUF_INIT; + struct strbuf *pathname = get_pathname(); va_list args; - va_start(args, fmt); - strbuf_vaddf(&sb, fmt, args); + do_git_path(pathname, fmt, args); va_end(args); - path = xstrdup(cleanup_path(sb.buf)); - - strbuf_release(&sb); - return path; + return pathname->buf; } -char *mkpath(const char *fmt, ...) +char *git_pathdup(const char *fmt, ...) { + struct strbuf path = STRBUF_INIT; va_list args; - unsigned len; - char *pathname = get_pathname(); - va_start(args, fmt); - len = vsnprintf(pathname, PATH_MAX, fmt, args); + do_git_path(&path, fmt, args); va_end(args); - if (len >= PATH_MAX) - return bad_path; - return cleanup_path(pathname); + return strbuf_detach(&path, NULL); } -char *git_path(const char *fmt, ...) +char *mkpathdup(const char *fmt, ...) { - char *pathname = get_pathname(); + struct strbuf sb = STRBUF_INIT; va_list args; - char *ret; - va_start(args, fmt); - ret = vsnpath(pathname, PATH_MAX, fmt, args); + strbuf_vaddf(&sb, fmt, args); va_end(args); - return ret; + strbuf_cleanup_path(&sb); + return strbuf_detach(&sb, NULL); } -void home_config_paths(char **global, char **xdg, char *file) +const char *mkpath(const char *fmt, ...) { - char *xdg_home = getenv("XDG_CONFIG_HOME"); - char *home = getenv("HOME"); - char *to_free = NULL; - - if (!home) { - if (global) - *global = NULL; - } else { - if (!xdg_home) { - to_free = mkpathdup("%s/.config", home); - xdg_home = to_free; - } - if (global) - *global = mkpathdup("%s/.gitconfig", home); - } - - if (xdg) { - if (!xdg_home) - *xdg = NULL; - else - *xdg = mkpathdup("%s/git/%s", xdg_home, file); - } - - free(to_free); + va_list args; + struct strbuf *pathname = get_pathname(); + va_start(args, fmt); + strbuf_vaddf(pathname, fmt, args); + va_end(args); + return cleanup_path(pathname->buf); } -char *git_path_submodule(const char *path, const char *fmt, ...) +const char *git_path_submodule(const char *path, const char *fmt, ...) { - char *pathname = get_pathname(); - struct strbuf buf = STRBUF_INIT; + struct strbuf *buf = get_pathname(); const char *git_dir; va_list args; - unsigned len; - len = strlen(path); - if (len > PATH_MAX-100) - return bad_path; + strbuf_addstr(buf, path); + if (buf->len && buf->buf[buf->len - 1] != '/') + strbuf_addch(buf, '/'); + strbuf_addstr(buf, ".git"); - strbuf_addstr(&buf, path); - if (len && path[len-1] != '/') - strbuf_addch(&buf, '/'); - strbuf_addstr(&buf, ".git"); - - git_dir = read_gitfile(buf.buf); + git_dir = read_gitfile(buf->buf); if (git_dir) { - strbuf_reset(&buf); - strbuf_addstr(&buf, git_dir); + strbuf_reset(buf); + strbuf_addstr(buf, git_dir); } - strbuf_addch(&buf, '/'); - - if (buf.len >= PATH_MAX) - return bad_path; - memcpy(pathname, buf.buf, buf.len + 1); - - strbuf_release(&buf); - len = strlen(pathname); + strbuf_addch(buf, '/'); va_start(args, fmt); - len += vsnprintf(pathname + len, PATH_MAX - len, fmt, args); + strbuf_vaddf(buf, fmt, args); va_end(args); - if (len >= PATH_MAX) - return bad_path; - return cleanup_path(pathname); + strbuf_cleanup_path(buf); + return buf->buf; } int validate_headref(const char *path) @@ -303,14 +355,9 @@ return_null: * (3) "relative/path" to mean cwd relative directory; or * (4) "/absolute/path" to mean absolute directory. * - * Unless "strict" is given, we try access() for existence of "%s.git/.git", - * "%s/.git", "%s.git", "%s" in this order. The first one that exists is - * what we try. - * - * Second, we try chdir() to that. Upon failure, we return NULL. - * - * Then, we try if the current directory is a valid git repository. - * Upon failure, we return NULL. + * Unless "strict" is given, we check "%s/.git", "%s", "%s.git/.git", "%s.git" + * in this order. We select the first one that is a valid git repository, and + * chdir() to it. If none match, or we fail to chdir, we return NULL. * * If all goes well, we return the directory we used to chdir() (but * before ~user is expanded), avoiding getcwd() resolving symbolic @@ -856,3 +903,18 @@ int is_ntfs_dotgit(const char *name) len = -1; } } + +char *xdg_config_home(const char *filename) +{ + const char *home, *config_home; + + assert(filename); + config_home = getenv("XDG_CONFIG_HOME"); + if (config_home && *config_home) + return mkpathdup("%s/git/%s", config_home, filename); + + home = getenv("HOME"); + if (home) + return mkpathdup("%s/.config/git/%s", home, filename); + return NULL; +} @@ -36,6 +36,11 @@ Language: pt_PT (Portuguese - Portugal) Repository: https://github.com/marcomsousa/git-l10n-pt_PT/ Leader: Marco Sousa <marcomsousa AT gmail.com> +Language: ru (Russian) +Repository: https://github.com/DJm00n/git-po-ru/ +Leader: Dimitriy Ryazantcev <DJm00n AT mail.ru> +Members: insolor <insolor AT gmail.com> + Language: sv (Swedish) Repository: https://github.com/nafmo/git-l10n-sv/ Leader: Peter Krefting <peter@softwolves.pp.se> @@ -46,7 +51,7 @@ Leader: Trần Ngá»c Quân <vnwildman AT gmail.com> Members: Nguyá»…n Thái Ngá»c Duy <pclouds AT gmail.com> Language: zh_CN (Simplified Chinese) -Repository: https://github.com/gotgit/git-po-zh_CN/ +Repository: https://github.com/jiangxin/git/ Leader: Jiang Xin <worldhello.net@gmail.com> Members: Riku <lu.riku AT gmail.com> Zhuang Ya <zhuangya AT me.com> @@ -130,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-11-20 09:42+0800\n" -"PO-Revision-Date: 2014-11-20 16:09+0800\n" +"POT-Creation-Date: 2015-04-03 08:13+0800\n" +"PO-Revision-Date: 2015-04-07 11:21+0300\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" "Language: bg\n" @@ -155,7 +155,7 @@ msgstr "" "за да отбележите коригирането им. След това извършете подаването." #: archive.c:11 -msgid "git archive [options] <tree-ish> [<path>...]" +msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [ОПЦИЯ…] УКÐЗÐТЕЛ_КЪМ_ДЪРВО [ПЪТ…]" #: archive.c:12 @@ -164,7 +164,7 @@ msgstr "git archive --list" #: archive.c:13 msgid "" -"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" +"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" "git archive --remote ХРÐÐИЛИЩЕ [--exec КОМÐÐДÐ] [ОПЦИЯ…] УКÐЗÐТЕЛ_КЪМ_ДЪРВО " "[ПЪТ…]" @@ -173,80 +173,80 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote ХРÐÐИЛИЩЕ [--exec КОМÐÐДÐ] --list" -#: archive.c:334 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328 +#: archive.c:342 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:419 +#: archive.c:427 msgid "fmt" msgstr "ФОРМÐТ" -#: archive.c:419 +#: archive.c:427 msgid "archive format" msgstr "ФОРМÐТ на архива" -#: archive.c:420 builtin/log.c:1204 +#: archive.c:428 builtin/log.c:1204 msgid "prefix" msgstr "префикÑ" -#: archive.c:421 +#: archive.c:429 msgid "prepend prefix to each pathname in the archive" msgstr "добавÑне на този Ð¿Ñ€ÐµÑ„Ð¸ÐºÑ ÐºÑŠÐ¼ вÑеки път в архива" -#: archive.c:422 builtin/archive.c:88 builtin/blame.c:2517 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986 +#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 +#: builtin/blame.c:2517 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 +#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 +#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151 msgid "file" msgstr "файл" -#: archive.c:423 builtin/archive.c:89 +#: archive.c:431 builtin/archive.c:89 msgid "write the archive to this file" msgstr "запазване на архива в този файл" -#: archive.c:425 +#: archive.c:433 msgid "read .gitattributes in working directory" msgstr "изчитане на „.gitattributes“ в работната директориÑ" -#: archive.c:426 +#: archive.c:434 msgid "report archived files on stderr" msgstr "извеждане на архивираните файлове на Ñтандартната грешка" -#: archive.c:427 +#: archive.c:435 msgid "store only" msgstr "Ñамо Ñъхранение без компреÑиране" -#: archive.c:428 +#: archive.c:436 msgid "compress faster" msgstr "бързо компреÑиране" -#: archive.c:436 +#: archive.c:444 msgid "compress better" msgstr "добро компреÑиране" -#: archive.c:439 +#: archive.c:447 msgid "list supported archive formats" msgstr "извеждане на ÑпиÑъка Ñ Ð¿Ð¾Ð´Ð´ÑŠÑ€Ð¶Ð°Ð½Ð¸Ñ‚Ðµ формати" -#: archive.c:441 builtin/archive.c:90 builtin/clone.c:85 +#: archive.c:449 builtin/archive.c:90 builtin/clone.c:86 msgid "repo" msgstr "хранилище" -#: archive.c:442 builtin/archive.c:91 +#: archive.c:450 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "изтеглÑне на архива от отдалеченото ХРÐÐИЛИЩЕ" -#: archive.c:443 builtin/archive.c:92 builtin/notes.c:490 +#: archive.c:451 builtin/archive.c:92 builtin/notes.c:478 msgid "command" msgstr "команда" -#: archive.c:444 builtin/archive.c:93 +#: archive.c:452 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "път към отдалечената команда „git-upload-archive“" -#: attr.c:258 +#: attr.c:264 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -376,7 +376,7 @@ msgstr "Файлът „%s“ не изглежда да е пратка на gi msgid "unrecognized header: %s%s (%d)" msgstr "непозната заглавна чаÑÑ‚: %s%s (%d)" -#: bundle.c:87 builtin/commit.c:788 +#: bundle.c:87 builtin/commit.c:766 #, c-format msgid "could not open '%s'" msgstr "„%s“ не може да Ñе отвори" @@ -385,9 +385,9 @@ msgstr "„%s“ не може да Ñе отвори" msgid "Repository lacks these prerequisite commits:" msgstr "Ð’ хранилището липÑват Ñледните необходими подаваниÑ:" -#: 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 +#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 +#: builtin/branch.c:659 builtin/commit.c:1045 builtin/log.c:330 +#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "неуÑпешно наÑтройване на обхождането на верÑиите" @@ -430,26 +430,26 @@ msgid "ref '%s' is excluded by the rev-list options" msgstr "" "указателÑÑ‚ „%s“ не е бил включен поради опциите зададени на „git rev-list“" -#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "непознат аргумент: %s" -#: bundle.c:444 +#: bundle.c:443 msgid "Refusing to create empty bundle." msgstr "Създаването на празна пратка е невъзможно." -#: bundle.c:454 +#: bundle.c:453 #, c-format msgid "cannot create '%s'" msgstr "Файлът „%s“ не може да бъде Ñъздаден" # FIXME better message -#: bundle.c:475 +#: bundle.c:474 msgid "index-pack died" msgstr "Командата „git index-pack“ не завърши уÑпешно" -#: color.c:157 +#: color.c:260 #, c-format msgid "invalid color value: %.*s" msgstr "неправилна ÑтойноÑÑ‚ за цвÑÑ‚: %.*s" @@ -468,56 +468,56 @@ msgstr "%s %s не е подаване!" msgid "memory exhausted" msgstr "паметта Ñвърши" -#: config.c:469 config.c:471 +#: config.c:474 config.c:476 #, c-format msgid "bad config file line %d in %s" msgstr "неправилен ред %d в „%s“" -#: config.c:587 +#: config.c:592 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" "неправилна чиÑлова ÑтойноÑÑ‚ „%s“ за наÑтройката „%s“ в раздела „%s“: %s" -#: config.c:589 +#: config.c:594 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "неправилна чиÑлова ÑтойноÑÑ‚ „%s“ за наÑтройката „%s“: %s" -#: config.c:674 +#: config.c:679 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "домашната папка на Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ñ Ð½Ðµ може да бъде открита: „%s“" -#: config.c:752 config.c:763 +#: config.c:757 config.c:768 #, c-format msgid "bad zlib compression level %d" msgstr "неправилно ниво на компреÑиране: %d" -#: config.c:885 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "неправилен режим за Ñъздаването на обекти: %s" -#: config.c:1201 +#: config.c:1216 msgid "unable to parse command-line config" msgstr "неправилни наÑтройки от ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¸Ñ Ñ€ÐµÐ´" -#: config.c:1262 +#: config.c:1277 msgid "unknown error occured while reading the configuration files" msgstr "неочаквана грешка при изчитането на конфигурационните файлове" -#: config.c:1586 +#: config.c:1601 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "неразпозната ÑтойноÑÑ‚ „%s“ от ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¸Ñ Ñ€ÐµÐ´" -#: config.c:1588 +#: config.c:1603 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "неправилна наÑтройка „%s“ във файла „%s“ на ред â„–%d" -#: config.c:1647 +#: config.c:1662 #, c-format msgid "%s has multiple values" msgstr "зададени Ñа нÑколко ÑтойноÑти за „%s“" @@ -609,7 +609,7 @@ msgstr[1] "преди %lu години" msgid "failed to read orderfile '%s'" msgstr "файлът Ñ Ð¿Ð¾Ð´Ñ€ÐµÐ´Ð±Ð°Ñ‚Ð° на ÑъответÑтвиÑта „%s“ не може да бъде прочетен" -#: diffcore-rename.c:516 +#: diffcore-rename.c:536 msgid "Performing inexact rename detection" msgstr "ТърÑене на Ð¿Ñ€ÐµÐ¸Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ð¸Ñ Ð½Ð° обекти Ñъчетани Ñ Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð¸" @@ -639,17 +639,17 @@ msgstr "" "Грешки в наÑтройката „diff.dirstat“:\n" "%s" -#: diff.c:2957 +#: diff.c:2956 #, c-format msgid "external diff died, stopping at %s" msgstr "" "външната програма за разлики завърши неуÑпешно. Спиране на работата при „%s“" -#: diff.c:3352 +#: diff.c:3351 msgid "--follow requires exactly one pathspec" msgstr "ОпциÑта „--follow“ изиÑква точно един път" -#: diff.c:3515 +#: diff.c:3514 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -658,7 +658,7 @@ msgstr "" "Ðеразпознат параметър към опциÑта „--dirstat/-X“:\n" "%s" -#: diff.c:3529 +#: diff.c:3528 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Ðеразпознат параметър към опциÑта „--submodule“: „%s“" @@ -767,11 +767,11 @@ msgstr[1] "" msgid "%s: %s - %s" msgstr "%s: %s — %s" -#: lockfile.c:275 +#: lockfile.c:283 msgid "BUG: reopen a lockfile that is still open" msgstr "ГРЕШКРВ GIT: преотварÑне на файл-ключалка" -#: lockfile.c:277 +#: lockfile.c:285 msgid "BUG: reopen a lockfile that has been committed" msgstr "ГРЕШКРВ GIT: преотварÑне на файл-ключалка, който е подаден" @@ -779,8 +779,8 @@ msgstr "ГРЕШКРВ GIT: преотварÑне на файл-ключалк msgid "failed to read the cache" msgstr "кешът не може да бъде прочетен" -#: merge.c:94 builtin/checkout.c:356 builtin/checkout.c:562 -#: builtin/clone.c:659 +#: merge.c:94 builtin/checkout.c:374 builtin/checkout.c:580 +#: builtin/clone.c:662 msgid "unable to write new index file" msgstr "неуÑпешно запиÑване на Ð½Ð¾Ð²Ð¸Ñ Ð¸Ð½Ð´ÐµÐºÑ" @@ -798,67 +798,67 @@ msgstr "неуÑпешно изпълнение на „addinfo_cache“ за п msgid "error building trees" msgstr "грешка при изграждане на дърветата" -#: merge-recursive.c:691 +#: merge-recursive.c:688 #, c-format msgid "failed to create path '%s'%s" msgstr "грешка при Ñъздаването на Ð¿ÑŠÑ‚Ñ â€ž%s“%s" -#: merge-recursive.c:702 +#: merge-recursive.c:699 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Изтриване на „%s“, за да Ñе оÑвободи мÑÑто за поддиректориÑ\n" # FIXME better message -#: merge-recursive.c:716 merge-recursive.c:737 +#: merge-recursive.c:713 merge-recursive.c:734 msgid ": perhaps a D/F conflict?" msgstr ": възможно е да има конфликт директориÑ/файл." -#: merge-recursive.c:727 +#: merge-recursive.c:724 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" "преуÑтановÑване на дейÑтвието, за да не Ñе изтрие неÑледениÑÑ‚ файл „%s“" -#: merge-recursive.c:767 +#: merge-recursive.c:764 #, c-format msgid "cannot read object %s '%s'" msgstr "обектът „%s“ (%s) не може да бъде прочетен" -#: merge-recursive.c:769 +#: merge-recursive.c:766 #, c-format msgid "blob expected for %s '%s'" msgstr "обектът „%s“ (%s) Ñе очакваше да е BLOB, а не е" -#: merge-recursive.c:792 builtin/clone.c:318 +#: merge-recursive.c:789 builtin/clone.c:321 #, c-format msgid "failed to open '%s'" msgstr "директориÑта „%s“ не може да бъде отворена" -#: merge-recursive.c:800 +#: merge-recursive.c:797 #, c-format msgid "failed to symlink '%s'" msgstr "неуÑпешно Ñъздаване на Ñимволната връзка „%s“" -#: merge-recursive.c:803 +#: merge-recursive.c:800 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" "не е ÑÑно какво да Ñе прави Ñ Ð¾Ð±ÐµÐºÑ‚Ð° „%2$s“ (%3$s) Ñ Ð¿Ñ€Ð°Ð²Ð° за доÑтъп „%1$06o“" -#: merge-recursive.c:941 +#: merge-recursive.c:938 msgid "Failed to execute internal merge" msgstr "ÐеуÑпешно вътрешно Ñливане" -#: merge-recursive.c:945 +#: merge-recursive.c:942 #, c-format msgid "Unable to add %s to database" msgstr "„%s“ не може да Ñе добави в базата Ñ Ð´Ð°Ð½Ð½Ð¸" -#: merge-recursive.c:961 +#: merge-recursive.c:958 msgid "unsupported object type in the tree" msgstr "в дървото има неподдържан вид обект" -#: merge-recursive.c:1036 merge-recursive.c:1050 +#: merge-recursive.c:1033 merge-recursive.c:1047 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -867,7 +867,7 @@ msgstr "" "КОÐФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. ВерÑÐ¸Ñ %s на „%s“ " "е оÑтавена в дървото." -#: merge-recursive.c:1042 merge-recursive.c:1055 +#: merge-recursive.c:1039 merge-recursive.c:1052 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -876,20 +876,20 @@ msgstr "" "КОÐФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. ВерÑÐ¸Ñ %s на „%s“ " "е оÑтавена в дървото: %s." -#: merge-recursive.c:1096 +#: merge-recursive.c:1093 msgid "rename" msgstr "преименуване" -#: merge-recursive.c:1096 +#: merge-recursive.c:1093 msgid "renamed" msgstr "преименуван" -#: merge-recursive.c:1152 +#: merge-recursive.c:1149 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "„%s“ е Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð² „%s“, затова Ñе Ð´Ð¾Ð±Ð°Ð²Ñ ÐºÐ°Ñ‚Ð¾ „%s“" -#: merge-recursive.c:1174 +#: merge-recursive.c:1171 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -898,124 +898,124 @@ msgstr "" "КОÐФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон " "„%s“, а „%s“ е преименуван на „%s“ в „%s“/%s." -#: merge-recursive.c:1179 +#: merge-recursive.c:1176 msgid " (left unresolved)" msgstr " (некоригиран конфликт)" -#: merge-recursive.c:1233 +#: merge-recursive.c:1230 #, 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:1263 +#: merge-recursive.c:1260 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Преименуване на „%s“ на „%s“, а „%s“ на „%s“" -#: merge-recursive.c:1462 +#: merge-recursive.c:1459 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" "КОÐФЛИКТ (преименуване/добавÑне): „%s“ е преименуван на „%s“ в клон „%s“, а " "„%s“ е добавен в „%s“" -#: merge-recursive.c:1472 +#: merge-recursive.c:1469 #, c-format msgid "Adding merged %s" msgstr "ДобавÑне на ÑÐ»ÐµÑ‚Ð¸Ñ â€ž%s“" -#: merge-recursive.c:1477 merge-recursive.c:1675 +#: merge-recursive.c:1474 merge-recursive.c:1672 #, c-format msgid "Adding as %s instead" msgstr "ДобавÑне като „%s“" -#: merge-recursive.c:1528 +#: merge-recursive.c:1525 #, c-format msgid "cannot read object %s" msgstr "обектът „%s“ не може да Ñе прочете" -#: merge-recursive.c:1531 +#: merge-recursive.c:1528 #, c-format msgid "object %s is not a blob" msgstr "обектът „%s“ не е BLOB" -#: merge-recursive.c:1579 +#: merge-recursive.c:1576 msgid "modify" msgstr "промÑна" -#: merge-recursive.c:1579 +#: merge-recursive.c:1576 msgid "modified" msgstr "променен" -#: merge-recursive.c:1589 +#: merge-recursive.c:1586 msgid "content" msgstr "Ñъдържание" -#: merge-recursive.c:1596 +#: merge-recursive.c:1593 msgid "add/add" msgstr "добавÑне/добавÑне" -#: merge-recursive.c:1630 +#: merge-recursive.c:1627 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "ПреÑкачане на „%s“ (ÑлетиÑÑ‚ резултат е идентичен ÑÑŠÑ ÑегашниÑ)" -#: merge-recursive.c:1644 +#: merge-recursive.c:1641 #, c-format msgid "Auto-merging %s" msgstr "Ðвтоматично Ñливане на „%s“" -#: merge-recursive.c:1648 git-submodule.sh:1150 +#: merge-recursive.c:1645 git-submodule.sh:1150 msgid "submodule" msgstr "ПОДМОДУЛ" -#: merge-recursive.c:1649 +#: merge-recursive.c:1646 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "КОÐФЛИКТ (%s): Конфликт при Ñливане на „%s“" -#: merge-recursive.c:1735 +#: merge-recursive.c:1732 #, c-format msgid "Removing %s" msgstr "Изтриване на „%s“" -#: merge-recursive.c:1760 +#: merge-recursive.c:1757 msgid "file/directory" msgstr "файл/директориÑ" -#: merge-recursive.c:1766 +#: merge-recursive.c:1763 msgid "directory/file" msgstr "директориÑ/файл" -#: merge-recursive.c:1771 +#: merge-recursive.c:1768 #, 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:1781 +#: merge-recursive.c:1778 #, c-format msgid "Adding %s" msgstr "ДобавÑне на „%s“" -#: merge-recursive.c:1798 +#: merge-recursive.c:1795 msgid "Fatal merge failure, shouldn't happen." msgstr "Фатална грешка при Ñливане, а такава не Ñ‚Ñ€Ñбва да възниква!" -#: merge-recursive.c:1817 +#: merge-recursive.c:1814 msgid "Already up-to-date!" msgstr "Вече е обновено!" -#: merge-recursive.c:1826 +#: merge-recursive.c:1823 #, c-format msgid "merging of trees %s and %s failed" msgstr "неуÑпешно Ñливане на дърветата „%s“ и „%s“" # FIXME message -#: merge-recursive.c:1856 +#: merge-recursive.c:1853 #, c-format msgid "Unprocessed path??? %s" msgstr "" @@ -1042,7 +1042,7 @@ msgstr "Ñливането не върна подаване" msgid "Could not parse object '%s'" msgstr "ÐеуÑпешен анализ на обекта „%s“" -#: merge-recursive.c:2019 builtin/merge.c:666 +#: merge-recursive.c:2019 builtin/merge.c:667 msgid "Unable to write index." msgstr "ИндекÑÑŠÑ‚ не може да бъде прочетен" @@ -1051,12 +1051,12 @@ msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" "Ðеинициализирано или нереферирано дърво за бележки не може да бъде подадено" -#: notes-utils.c:83 +#: notes-utils.c:82 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "Ðеправилна ÑтойноÑÑ‚ за „notes.rewriteMode“: „%s“" -#: notes-utils.c:93 +#: notes-utils.c:92 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "" @@ -1064,7 +1064,7 @@ msgstr "" #. TRANSLATORS: The first %s is the name of the #. environment variable, the second %s is its value -#: notes-utils.c:120 +#: notes-utils.c:119 #, c-format msgid "Bad %s value: '%s'" msgstr "Зададена е лоша ÑтойноÑÑ‚ на променливата „%s“: „%s“" @@ -1171,7 +1171,7 @@ msgstr "аргументът към опциÑта „--pretty“ не може msgid "done" msgstr "дейÑтвието завърши" -#: read-cache.c:1261 +#: read-cache.c:1275 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1180,7 +1180,7 @@ msgstr "" "Зададена е неправилна ÑтойноÑÑ‚ на наÑтройката „index.version“.\n" "Ще Ñе ползва верÑÐ¸Ñ %i" -#: read-cache.c:1271 +#: read-cache.c:1285 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1209,32 +1209,32 @@ msgstr "„%s“ Ñледи както „%s“, така и „%s“" msgid "Internal error" msgstr "Вътрешна грешка" -#: remote.c:1968 +#: remote.c:1980 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Този клон Ñледи „%s“, но ÑледениÑÑ‚ клон е изтрит.\n" -#: remote.c:1972 +#: remote.c:1984 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (за да коригирате това, използвайте „git branch --unset-upstream“)\n" -#: remote.c:1975 +#: remote.c:1987 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "Клонът е актуализиран към „%s“.\n" -#: remote.c:1979 +#: remote.c:1991 #, 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:1985 +#: remote.c:1997 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (публикувайте локалните Ñи промени чрез „git push“)\n" -#: remote.c:1988 +#: remote.c:2000 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1244,11 +1244,11 @@ msgstr[0] "" msgstr[1] "" "Клонът ви е Ñ %2$d Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ Ñлед „%1$s“ и може да бъде тривиално ÑлÑÑ‚.\n" -#: remote.c:1996 +#: remote.c:2008 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (обновете Ð»Ð¾ÐºÐ°Ð»Ð½Ð¸Ñ Ñи клон чрез „git pull“)\n" -#: remote.c:1999 +#: remote.c:2011 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1263,35 +1263,43 @@ msgstr[1] "" "ТекущиÑÑ‚ клон Ñе е отделил от „%s“,\n" "двата имат Ñъответно по %d и %d неÑъвпадащи подаваниÑ.\n" -#: remote.c:2009 +#: remote.c:2021 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (Ñлейте Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐºÐ»Ð¾Ð½ в Ð»Ð¾ÐºÐ°Ð»Ð½Ð¸Ñ Ñ‡Ñ€ÐµÐ· „git pull“)\n" -#: run-command.c:87 +#: revision.c:2348 +msgid "--first-parent is incompatible with --bisect" +msgstr "опциите „--first-parent“ и „--bisect“ Ñа неÑъвмеÑтими" + +#: run-command.c:83 msgid "open /dev/null failed" msgstr "неуÑпешно отварÑне на „/dev/null“" -#: run-command.c:89 +#: run-command.c:85 #, c-format msgid "dup2(%d,%d) failed" msgstr "неуÑпешно изпълнение на dup2(%d,%d)" -#: send-pack.c:265 +#: send-pack.c:272 msgid "failed to sign the push certificate" msgstr "Ñертификатът за изтлаÑкване не може да бъде подпиÑан" -#: send-pack.c:322 +#: send-pack.c:356 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 +#: send-pack.c:366 +msgid "the receiving end does not support --atomic push" +msgstr "получаващата Ñтрана не поддържа изтлаÑкване Ñ Ð¾Ð¿Ñ†Ð¸Ñта „--atomic“" + +#: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995 +#: builtin/merge.c:1005 #, c-format msgid "Could not open '%s' for writing" msgstr "„%s“ не може да бъде отворен за запиÑ" -#: sequencer.c:174 builtin/merge.c:343 builtin/merge.c:784 -#: builtin/merge.c:1004 builtin/merge.c:1017 +#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997 +#: builtin/merge.c:1010 #, c-format msgid "Could not write to '%s'" msgstr "„%s“ не може да бъде запиÑан" @@ -1316,7 +1324,7 @@ msgstr "" "подайте резултата Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ‚Ð° „git commit'“." # FIXME - must be the same as Could not write to '%s' above -#: sequencer.c:211 sequencer.c:852 sequencer.c:935 +#: sequencer.c:211 sequencer.c:861 sequencer.c:944 #, c-format msgid "Could not write to %s" msgstr "„%s“ не може да бъде запиÑан" @@ -1340,204 +1348,204 @@ msgid "Commit your changes or stash them to proceed." msgstr "Подайте или Ñкатайте промените, за да продължите" #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:304 +#: sequencer.c:321 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: новиÑÑ‚ Ð¸Ð½Ð´ÐµÐºÑ Ð½Ðµ може да бъде запазен" -#: sequencer.c:335 +#: sequencer.c:339 msgid "Could not resolve HEAD commit\n" msgstr "Подаването Ñочено от ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€žHEAD“ не може да бъде открито\n" -#: sequencer.c:355 +#: sequencer.c:359 msgid "Unable to update cache tree\n" msgstr "Дървото на кеша не може да бъде обновено\n" -#: sequencer.c:402 +#: sequencer.c:411 #, c-format msgid "Could not parse commit %s\n" msgstr "Подаването „%s“ не може да бъде анализирано\n" -#: sequencer.c:407 +#: sequencer.c:416 #, c-format msgid "Could not parse parent commit %s\n" msgstr "РодителÑкото подаване „%s“ не може да бъде анализирано\n" -#: sequencer.c:473 +#: sequencer.c:482 msgid "Your index file is unmerged." msgstr "ИндекÑÑŠÑ‚ не е ÑлÑÑ‚." -#: sequencer.c:492 +#: sequencer.c:501 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "Подаването „%s“ е Ñливане, но не е дадена опциÑта „-m“" -#: sequencer.c:500 +#: sequencer.c:509 #, c-format msgid "Commit %s does not have parent %d" msgstr "Подаването „%s“ нÑма родител %d" -#: sequencer.c:504 +#: sequencer.c:513 #, 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:517 +#: sequencer.c:526 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: неразпозната ÑтойноÑÑ‚ за родителÑкото подаване „%s“" -#: sequencer.c:521 +#: sequencer.c:530 #, c-format msgid "Cannot get commit message for %s" msgstr "ÐеуÑпешно извличане на Ñъобщението за подаване на „%s“" -#: sequencer.c:607 +#: sequencer.c:616 #, c-format msgid "could not revert %s... %s" msgstr "подаването „%s“… не може да бъде отменено: „%s“" -#: sequencer.c:608 +#: sequencer.c:617 #, c-format msgid "could not apply %s... %s" msgstr "подаването „%s“… не може да бъде приложено: „%s“" -#: sequencer.c:644 +#: sequencer.c:653 msgid "empty commit set passed" msgstr "зададено е празно множеÑтво от подаваниÑ" -#: sequencer.c:652 +#: sequencer.c:661 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: неуÑпешно изчитане на индекÑа" -#: sequencer.c:656 +#: sequencer.c:665 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: неуÑпешно обновÑване на индекÑа" -#: sequencer.c:716 +#: sequencer.c:725 #, c-format msgid "Cannot %s during a %s" msgstr "По време на „%1$s“ не може да Ñе извърши „%2$s“" -#: sequencer.c:738 +#: sequencer.c:747 #, c-format msgid "Could not parse line %d." msgstr "%d-ÑÑ‚ ред не може да Ñе анализира." -#: sequencer.c:743 +#: sequencer.c:752 msgid "No commits parsed." msgstr "Ðикое от подаваниÑта не може да Ñе разпознае." # FIXME Could not open %s. - full stop for consistence with next message -#: sequencer.c:756 +#: sequencer.c:765 #, c-format msgid "Could not open %s" msgstr "„%s“ не може да Ñе прочете." -#: sequencer.c:760 +#: sequencer.c:769 #, c-format msgid "Could not read %s." msgstr "„%s“ не може да Ñе отвори." -#: sequencer.c:767 +#: sequencer.c:776 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Файлът Ñ Ð¾Ð¿Ð¸Ñание на предÑтоÑщите дейÑÑ‚Ð²Ð¸Ñ â€” „%s“ не може да Ñе ползва" -#: sequencer.c:797 +#: sequencer.c:806 #, c-format msgid "Invalid key: %s" msgstr "Ðеправилен ключ: „%s“" -#: sequencer.c:800 +#: sequencer.c:809 #, c-format msgid "Invalid value for %s: %s" msgstr "Ðеправилна ÑтойноÑÑ‚ за „%s“: „%s“" -#: sequencer.c:812 +#: sequencer.c:821 #, c-format msgid "Malformed options sheet: %s" msgstr "Ðеправилно Ñъдържание на файла Ñ Ð¾Ð¿Ñ†Ð¸Ð¸: „%s“" -#: sequencer.c:833 +#: sequencer.c:842 msgid "a cherry-pick or revert is already in progress" msgstr "" "в момента вече Ñе извършва отбиране на Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ Ð¸Ð»Ð¸ пребазиране на клона" -#: sequencer.c:834 +#: sequencer.c:843 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "използвайте „git cherry-pick (--continue | --quit | --abort)“" -#: sequencer.c:838 +#: sequencer.c:847 #, c-format msgid "Could not create sequencer directory %s" msgstr "ДиректориÑта за ÑеквенÑора „%s“ не може да бъде Ñъздадена" -#: sequencer.c:854 sequencer.c:939 +#: sequencer.c:863 sequencer.c:948 #, c-format msgid "Error wrapping up %s." msgstr "Обработката на „%s“ не завърши уÑпешно." -#: sequencer.c:873 sequencer.c:1009 +#: sequencer.c:882 sequencer.c:1018 msgid "no cherry-pick or revert in progress" msgstr "" "в момента не Ñе извършва отбиране на Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ Ð¸Ð»Ð¸ пребазиране на клона" -#: sequencer.c:875 +#: sequencer.c:884 msgid "cannot resolve HEAD" msgstr "Подаването Ñочено от ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€žHEAD“ не може да бъде открито" -#: sequencer.c:877 +#: sequencer.c:886 msgid "cannot abort from a branch yet to be born" msgstr "" "дейÑтвието не може да бъде преуÑтановено, когато Ñте на клон, който тепърва " "предÑтои да бъде Ñъздаден" -#: sequencer.c:899 builtin/apply.c:4128 +#: sequencer.c:908 builtin/apply.c:4288 #, c-format msgid "cannot open %s: %s" msgstr "файлът „%s“ не може да бъде отворен: %s" -#: sequencer.c:902 +#: sequencer.c:911 #, c-format msgid "cannot read %s: %s" msgstr "файлът „%s“ не може да бъде прочетен: %s" -#: sequencer.c:903 +#: sequencer.c:912 msgid "unexpected end of file" msgstr "неочакван край на файл" -#: sequencer.c:909 +#: sequencer.c:918 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" "запазениÑÑ‚ преди започването на отбирането файл за ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€žHEAD“ — „%s“ е " "повреден" -#: sequencer.c:932 +#: sequencer.c:941 #, c-format msgid "Could not format %s." msgstr "Файлът „%s“ не може да Ñе форматира по подходÑÑ‰Ð¸Ñ Ð½Ð°Ñ‡Ð¸Ð½." -#: sequencer.c:1077 +#: sequencer.c:1086 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: не може да Ñе отбере „%s“" -#: sequencer.c:1080 +#: sequencer.c:1089 #, c-format msgid "%s: bad revision" msgstr "%s: неправилна верÑиÑ" -#: sequencer.c:1114 +#: sequencer.c:1123 msgid "Can't revert as initial commit" msgstr "Първоначалното подаване не може да бъде отменено" -#: sequencer.c:1115 +#: sequencer.c:1124 msgid "Can't cherry-pick into empty head" msgstr "При празен връх не могат да Ñе отбират подаваниÑ" @@ -1609,38 +1617,38 @@ msgstr "ЗапиÑÑŠÑ‚ „%s“ във файла „.gitmodules“ не можРmsgid "staging updated .gitmodules failed" msgstr "неуÑпешно добавÑне на Ð¿Ñ€Ð¾Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð» „.gitmodules“ в индекÑа" -#: submodule.c:1111 builtin/init-db.c:363 +#: submodule.c:1109 builtin/init-db.c:371 #, c-format msgid "Could not create git link %s" msgstr "Връзката в Git „%s“ не може да бъде Ñъздадена" -#: submodule.c:1122 +#: submodule.c:1120 #, 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 +#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557 +#: trailer.c:561 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "неправилна ÑтойноÑÑ‚ „%s“ за наÑтройката „%s“" -#: trailer.c:551 trailer.c:556 builtin/remote.c:288 +#: trailer.c:543 trailer.c:548 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "ÑтойноÑтта „%s“ Ñе Ð¿Ð¾Ð²Ñ‚Ð°Ñ€Ñ Ð² наÑтройките" -#: trailer.c:589 +#: trailer.c:581 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "празна завършваща лекÑема в епилога „%.*s“" -#: trailer.c:709 +#: trailer.c:701 #, c-format msgid "could not read input file '%s'" msgstr "входниÑÑ‚ файл „%s“ не може да бъде прочетен" -#: trailer.c:712 +#: trailer.c:704 msgid "could not read from stdin" msgstr "от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´ не може да Ñе чете" @@ -1677,26 +1685,26 @@ msgstr "неправилен номер на порт" msgid "invalid '..' path segment" msgstr "неправилна чаÑÑ‚ от Ð¿ÑŠÑ‚Ñ â€ž..“" -#: wrapper.c:509 +#: wrapper.c:523 #, c-format msgid "unable to access '%s': %s" msgstr "нÑма доÑтъп до „%s“: %s" -#: wrapper.c:530 +#: wrapper.c:544 #, c-format msgid "unable to access '%s'" msgstr "нÑма доÑтъп до „%s“" -#: wrapper.c:541 +#: wrapper.c:555 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "текущиÑÑ‚ потребител не може да бъде открит във файла „/etc/passwd“: %s" -#: wrapper.c:542 +#: wrapper.c:556 msgid "no such user" msgstr "такъв потребител не ÑъщеÑтвува" -#: wrapper.c:550 +#: wrapper.c:564 msgid "unable to get current working directory" msgstr "текущата работна Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ðµ недоÑтъпна" @@ -1730,11 +1738,11 @@ msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" " (използвайте „git rm ФÐЙЛ…“, за да укажете разрешаването на конфликта)" -#: wt-status.c:198 +#: wt-status.c:198 wt-status.c:878 msgid "Changes to be committed:" msgstr "Промени, които ще бъдат подадени:" -#: wt-status.c:216 +#: wt-status.c:216 wt-status.c:887 msgid "Changes not staged for commit:" msgstr "Промени, които не Ñа в индекÑа за подаване:" @@ -1849,15 +1857,15 @@ msgstr "неÑледено Ñъдържание, " msgid "bug: unhandled diff status %c" msgstr "грешка: ÑÑŠÑтоÑнието на промÑната „%c“ не може да бъде обработено" -#: wt-status.c:761 +#: wt-status.c:753 msgid "Submodules changed but not updated:" msgstr "Подмодулите Ñа променени, но не Ñа обновени:" -#: wt-status.c:763 +#: wt-status.c:755 msgid "Submodule changes to be committed:" msgstr "Промени в подмодулите за подаване:" -#: wt-status.c:842 +#: wt-status.c:835 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1865,193 +1873,193 @@ msgstr "" "Ðе променÑйте Ð³Ð¾Ñ€Ð½Ð¸Ñ Ñ€ÐµÐ´.\n" "Ð’Ñичко отдолу ще бъде изтрито." -#: wt-status.c:933 +#: wt-status.c:946 msgid "You have unmerged paths." msgstr "ÐÑкои пътища не Ñа Ñлети." -#: wt-status.c:936 +#: wt-status.c:949 msgid " (fix conflicts and run \"git commit\")" msgstr " (коригирайте конфликтите и изпълнете „git commit“)" -#: wt-status.c:939 +#: wt-status.c:952 msgid "All conflicts fixed but you are still merging." msgstr "Ð’Ñички конфликти Ñа решени, но продължавате Ñливането." -#: wt-status.c:942 +#: wt-status.c:955 msgid " (use \"git commit\" to conclude merge)" msgstr " (използвайте „git commit“, за да завършите Ñливането)" -#: wt-status.c:952 +#: wt-status.c:965 msgid "You are in the middle of an am session." msgstr "Ð’ момента прилагате поредица от кръпки чрез „git am“." -#: wt-status.c:955 +#: wt-status.c:968 msgid "The current patch is empty." msgstr "Текущата кръпка е празна." -#: wt-status.c:959 +#: wt-status.c:972 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (коригирайте конфликтите и изпълнете „git am --continue“)" -#: wt-status.c:961 +#: wt-status.c:974 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (използвайте „git am --skip“, за да пропуÑнете тази кръпка)" -#: wt-status.c:963 +#: wt-status.c:976 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" " (използвайте „git am --abort“, за да възÑтановите Ð¿ÑŠÑ€Ð²Ð¾Ð½Ð°Ñ‡Ð°Ð»Ð½Ð¸Ñ ÐºÐ»Ð¾Ð½)" -#: wt-status.c:1023 wt-status.c:1040 +#: wt-status.c:1036 wt-status.c:1053 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Ð’ момента пребазирате клона „%s“ върху „%s“." -#: wt-status.c:1028 wt-status.c:1045 +#: wt-status.c:1041 wt-status.c:1058 msgid "You are currently rebasing." msgstr "Ð’ момента пребазирате." -#: wt-status.c:1031 +#: wt-status.c:1044 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (коригирайте конфликтите и използвайте „git rebase --continue“)" -#: wt-status.c:1033 +#: wt-status.c:1046 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (използвайте „git rebase --skip“, за да пропуÑнете тази кръпка)" -#: wt-status.c:1035 +#: wt-status.c:1048 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" " (използвайте „git rebase --abort“, за да възÑтановите Ð¿ÑŠÑ€Ð²Ð¾Ð½Ð°Ñ‡Ð°Ð»Ð½Ð¸Ñ ÐºÐ»Ð¾Ð½)" -#: wt-status.c:1048 +#: wt-status.c:1061 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (вÑички конфликти Ñа коригирани: изпълнете „git rebase --continue“)" -#: wt-status.c:1052 +#: wt-status.c:1065 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "Ð’ момента разделÑте подаване докато пребазирате клона „%s“ върху „%s“." -#: wt-status.c:1057 +#: wt-status.c:1070 msgid "You are currently splitting a commit during a rebase." msgstr "Ð’ момента разделÑте подаване докато пребазирате." -#: wt-status.c:1060 +#: wt-status.c:1073 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (След като работното ви дърво Ñтане чиÑто, използвайте „git rebase --" "continue“)" -#: wt-status.c:1064 +#: wt-status.c:1077 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Ð’ момента редактирате подаване докато пребазирате клона „%s“ върху „%s“." -#: wt-status.c:1069 +#: wt-status.c:1082 msgid "You are currently editing a commit during a rebase." msgstr "Ð’ момента редактирате подаване докато пребазирате." -#: wt-status.c:1072 +#: wt-status.c:1085 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (използвайте „git commit --amend“, за да редактирате текущото подаване)" -#: wt-status.c:1074 +#: wt-status.c:1087 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (използвайте „git rebase --continue“, Ñлед като завършите промените Ñи)" -#: wt-status.c:1084 +#: wt-status.c:1097 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Ð’ момента отбирате подаването „%s“." -#: wt-status.c:1089 +#: wt-status.c:1102 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (коригирайте конфликтите и изпълнете „git cherry-pick --continue“)" -#: wt-status.c:1092 +#: wt-status.c:1105 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (вÑички конфликти Ñа коригирани, изпълнете „git cherry-pick --continue“)" -#: wt-status.c:1094 +#: wt-status.c:1107 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (използвайте „git cherry-pick --abort“, за да отмените вÑички дейÑÑ‚Ð²Ð¸Ñ Ñ " "отбиране)" -#: wt-status.c:1103 +#: wt-status.c:1116 #, c-format msgid "You are currently reverting commit %s." msgstr "Ð’ момента отменÑте подаване „%s“." -#: wt-status.c:1108 +#: wt-status.c:1121 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (коригирайте конфликтите и изпълнете „git revert --continue“)" -#: wt-status.c:1111 +#: wt-status.c:1124 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (вÑички конфликти Ñа коригирани, изпълнете „git revert --continue“)" -#: wt-status.c:1113 +#: wt-status.c:1126 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (използвайте „git revert --abort“, за да преуÑтановите отмÑната на " "подаване)" -#: wt-status.c:1124 +#: wt-status.c:1137 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Ð’ момента Ñ‚ÑŠÑ€Ñите двоично, като Ñте Ñтартирали от клон „%s“." -#: wt-status.c:1128 +#: wt-status.c:1141 msgid "You are currently bisecting." msgstr "Ð’ момента Ñ‚ÑŠÑ€Ñите двоично." -#: wt-status.c:1131 +#: wt-status.c:1144 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (използвайте „git bisect reset“, за да Ñе върнете към първоначалното " "ÑÑŠÑтоÑние и клон)" -#: wt-status.c:1306 +#: wt-status.c:1321 msgid "On branch " msgstr "Ðа клон " -#: wt-status.c:1313 +#: wt-status.c:1328 msgid "rebase in progress; onto " msgstr "извършвате пребазиране върху " -#: wt-status.c:1320 +#: wt-status.c:1333 msgid "HEAD detached at " -msgstr "УказателÑÑ‚ „HEAD“ не е Ñвързан и е при подаване " +msgstr "УказателÑÑ‚ „HEAD“ не е Ñвързан и е при " -#: wt-status.c:1322 +#: wt-status.c:1335 msgid "HEAD detached from " msgstr "УказателÑÑ‚ „HEAD“ не е Ñвързан и е отделѐн от " -#: wt-status.c:1325 +#: wt-status.c:1338 msgid "Not currently on any branch." msgstr "Извън вÑички клони." -#: wt-status.c:1342 +#: wt-status.c:1355 msgid "Initial commit" msgstr "Първоначално подаване" -#: wt-status.c:1356 +#: wt-status.c:1369 msgid "Untracked files" msgstr "ÐеÑледени файлове" -#: wt-status.c:1358 +#: wt-status.c:1371 msgid "Ignored files" msgstr "Игнорирани файлове" -#: wt-status.c:1362 +#: wt-status.c:1375 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2063,32 +2071,32 @@ msgstr "" "изпълнението, но не Ñ‚Ñ€Ñбва да забравÑте ръчно да добавÑте новите файлове.\n" "За повече подробноÑти погледнете „git status help“." -#: wt-status.c:1368 +#: wt-status.c:1381 #, c-format msgid "Untracked files not listed%s" msgstr "ÐеÑледените файлове не Ñа изведени%s" -#: wt-status.c:1370 +#: wt-status.c:1383 msgid " (use -u option to show untracked files)" msgstr " (използвайте опциÑта „-u“, за да изведете неÑледените файлове)" -#: wt-status.c:1376 +#: wt-status.c:1389 msgid "No changes" msgstr "ÐÑма промени" -#: wt-status.c:1381 +#: wt-status.c:1394 #, 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:1384 +#: wt-status.c:1397 #, c-format msgid "no changes added to commit\n" msgstr "към индекÑа за подаване не Ñа добавени промени\n" -#: wt-status.c:1387 +#: wt-status.c:1400 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -2097,58 +2105,58 @@ msgstr "" "към индекÑа за подаване не Ñа добавени промени, но има нови файлове " "(използвайте „git add“, за да започне Ñ‚Ñхното Ñледене)\n" -#: wt-status.c:1390 +#: wt-status.c:1403 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "към индекÑа за подаване не Ñа добавени промени, но има нови файлове\n" -#: wt-status.c:1393 +#: wt-status.c:1406 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "липÑват каквито и да е промени (Ñъздайте или копирайте файлове и използвайте " "„git add“, за да започне Ñ‚Ñхното Ñледене)\n" -#: wt-status.c:1396 wt-status.c:1401 +#: wt-status.c:1409 wt-status.c:1414 #, c-format msgid "nothing to commit\n" msgstr "липÑват каквито и да е промени\n" -#: wt-status.c:1399 +#: wt-status.c:1412 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "липÑват каквито и да е промени (използвайте опциÑта „-u“, за да Ñе изведат и " "неÑледените файлове)\n" -#: wt-status.c:1403 +#: wt-status.c:1416 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "липÑват каквито и да е промени, работното дърво е чиÑто\n" -#: wt-status.c:1512 +#: wt-status.c:1525 msgid "HEAD (no branch)" msgstr "HEAD (извън клон)" -#: wt-status.c:1518 +#: wt-status.c:1531 msgid "Initial commit on " msgstr "Първоначално подаване на клон" -#: wt-status.c:1550 +#: wt-status.c:1563 msgid "gone" msgstr "изтрит" -#: wt-status.c:1552 wt-status.c:1560 +#: wt-status.c:1565 wt-status.c:1573 msgid "behind " msgstr "назад Ñ " -#: compat/precompose_utf8.c:55 builtin/clone.c:357 +#: compat/precompose_utf8.c:55 builtin/clone.c:360 #, c-format msgid "failed to unlink '%s'" msgstr "неуÑпешно изтриване на „%s“" #: builtin/add.c:22 -msgid "git add [options] [--] <pathspec>..." +msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [ОПЦИЯ…] [--] ПЪТ…" #: builtin/add.c:65 @@ -2156,7 +2164,7 @@ msgstr "git add [ОПЦИЯ…] [--] ПЪТ…" msgid "unexpected diff status %c" msgstr "неочакван изходен код при генериране на разлика: %c" -#: builtin/add.c:70 builtin/commit.c:275 +#: builtin/add.c:70 builtin/commit.c:277 msgid "updating files failed" msgstr "неуÑпешно обновÑване на файловете" @@ -2201,14 +2209,14 @@ 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:110 -#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1375 +#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372 #: builtin/rm.c:269 msgid "dry run" msgstr "пробно изпълнeние" -#: 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/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19 +#: builtin/commit.c:1322 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 "повече подробноÑти" @@ -2217,7 +2225,7 @@ msgstr "повече подробноÑти" msgid "interactive picking" msgstr "интерактивно отбиране на промени" -#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:286 +#: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286 msgid "select hunks interactively" msgstr "интерактивен избор на парчета код" @@ -2267,10 +2275,6 @@ msgstr "" msgid "Use -f if you really want to add them.\n" msgstr "Използвайте опциÑта „-f“, за да ги добавите наиÑтина.\n" -#: builtin/add.c:287 -msgid "no files added" -msgstr "не Ñа добавени файлове" - #: builtin/add.c:293 msgid "adding files failed" msgstr "неуÑпешно добавÑне на файлове" @@ -2293,83 +2297,83 @@ msgstr "Ðищо не е зададено и нищо не е добавено.\ 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:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 +#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920 +#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 msgid "index file corrupt" msgstr "файлът Ñ Ð¸Ð½Ð´ÐµÐºÑа е повреден" -#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431 +#: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431 msgid "Unable to write new index file" msgstr "ÐовиÑÑ‚ Ð¸Ð½Ð´ÐµÐºÑ Ð½Ðµ може да бъде запиÑан" -#: builtin/apply.c:58 -msgid "git apply [options] [<patch>...]" +#: builtin/apply.c:59 +msgid "git apply [<options>] [<patch>...]" msgstr "git apply [ОПЦИЯ…] [КРЪПКÐ…]" -#: builtin/apply.c:111 +#: builtin/apply.c:112 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "непозната Ð¾Ð¿Ñ†Ð¸Ñ Ð·Ð° знаците за интервали „%s“" -#: builtin/apply.c:126 +#: builtin/apply.c:127 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "непозната Ð¾Ð¿Ñ†Ð¸Ñ Ð·Ð° игнориране на знаците за интервали „%s“" -#: builtin/apply.c:826 +#: builtin/apply.c:822 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "РегулÑрниÑÑ‚ израз за времето „%s“ не може за бъде компилиран" -#: builtin/apply.c:835 +#: builtin/apply.c:831 #, c-format msgid "regexec returned %d for input: %s" msgstr "РегулÑрниÑÑ‚ израз върна %d при подадена поÑледователноÑÑ‚ „%s“ на входа" -#: builtin/apply.c:916 +#: builtin/apply.c:912 #, c-format msgid "unable to find filename in patch at line %d" msgstr "ЛипÑва име на файл на ред %d от кръпката" -#: builtin/apply.c:948 +#: builtin/apply.c:944 #, 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:952 +#: builtin/apply.c:948 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply: лош изход от командата „git-diff“ — на ред %d бе получено " "неправилно име на нов файл" -#: builtin/apply.c:953 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply: лош изход от командата „git-diff“ — на ред %d бе получено " "неправилно име на Ñтар файл" -#: builtin/apply.c:960 +#: builtin/apply.c:956 #, 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:1423 +#: builtin/apply.c:1419 #, c-format msgid "recount: unexpected line: %.*s" msgstr "при повторното преброÑване бе получен неочакван ред: „%.*s“" -#: builtin/apply.c:1480 +#: builtin/apply.c:1476 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "чаÑÑ‚ от кръпка без заглавна чаÑÑ‚ на ред %d: %.*s" -#: builtin/apply.c:1497 +#: builtin/apply.c:1493 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2384,66 +2388,66 @@ msgstr[1] "" "След Ñъкращаването на първите %d чаÑти от компонентите на пътÑ, в заглавната " "чаÑÑ‚ на „git diff“ липÑва Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° име на файл (ред: %d)" -#: builtin/apply.c:1657 +#: builtin/apply.c:1656 msgid "new file depends on old contents" msgstr "новиÑÑ‚ файл завиÑи от Ñтарото Ñъдържание на файла" -#: builtin/apply.c:1659 +#: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "изтритиÑÑ‚ файл не е празен" -#: builtin/apply.c:1685 +#: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" msgstr "грешка в кръпката на ред %d" -#: builtin/apply.c:1721 +#: builtin/apply.c:1720 #, c-format msgid "new file %s depends on old contents" msgstr "новиÑÑ‚ файл „%s“ завиÑи от Ñтарото Ñъдържание на файла" -#: builtin/apply.c:1723 +#: builtin/apply.c:1722 #, c-format msgid "deleted file %s still has contents" msgstr "изтритиÑÑ‚ файл „%s“ не е празен" # FIXME - double **?? -#: builtin/apply.c:1726 +#: builtin/apply.c:1725 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "â—◠предупреждение: файлът „%s“ вече е празен, но не е изтрит" -#: builtin/apply.c:1872 +#: builtin/apply.c:1871 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "грешка в двоичната кръпка на ред %d: %.*s" -#: builtin/apply.c:1901 +#: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" msgstr "неразпозната двоичната кръпка на ред %d" -#: builtin/apply.c:2052 +#: builtin/apply.c:2051 #, c-format msgid "patch with only garbage at line %d" msgstr "кръпката е Ñ Ð¸Ð·Ñ†Ñло повредени данни на ред %d" -#: builtin/apply.c:2142 +#: builtin/apply.c:2141 #, c-format msgid "unable to read symlink %s" msgstr "Ñимволната връзка „%s“ не може да бъде прочетена" -#: builtin/apply.c:2146 +#: builtin/apply.c:2145 #, c-format msgid "unable to open or read %s" msgstr "файлът „%s“ не може да бъде отворен или прочетен" -#: builtin/apply.c:2754 +#: builtin/apply.c:2778 #, c-format msgid "invalid start of line: '%c'" msgstr "неправилно начало на ред: „%c“" -#: builtin/apply.c:2872 +#: builtin/apply.c:2897 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." @@ -2452,13 +2456,13 @@ msgstr[0] "" msgstr[1] "" "%d-то парче код бе уÑпешно приложено на ред %d (отмеÑтване от %d реда)." -#: builtin/apply.c:2884 +#: builtin/apply.c:2909 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" "КонтекÑÑ‚ÑŠÑ‚ е намален на (%ld/%ld) за прилагането на парчето код на ред %d" -#: builtin/apply.c:2890 +#: builtin/apply.c:2915 #, c-format msgid "" "while searching for:\n" @@ -2467,326 +2471,345 @@ msgstr "" "при Ñ‚ÑŠÑ€Ñене за:\n" "%.*s" -#: builtin/apply.c:2909 +#: builtin/apply.c:2935 #, c-format msgid "missing binary patch data for '%s'" msgstr "липÑват данните за двоичната кръпка за „%s“" -#: builtin/apply.c:3010 +#: builtin/apply.c:3036 #, c-format msgid "binary patch does not apply to '%s'" msgstr "двоичната кръпка не може да бъде приложена върху „%s“" -#: builtin/apply.c:3016 +#: builtin/apply.c:3042 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "двоичната кръпка за „%s“ води до неправилни резултати (очакваше Ñе SHA1: " "„%s“, а бе получено: „%s“)" -#: builtin/apply.c:3037 +#: builtin/apply.c:3063 #, c-format msgid "patch failed: %s:%ld" msgstr "неуÑпешно прилагане на кръпка: „%s:%ld“" -#: builtin/apply.c:3161 +#: builtin/apply.c:3187 #, c-format msgid "cannot checkout %s" msgstr "„%s“ не може да Ñе изтегли" -#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260 +#: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288 #, c-format msgid "read of %s failed" msgstr "неуÑпешно прочитане на „%s“" -#: builtin/apply.c:3240 builtin/apply.c:3462 +#: builtin/apply.c:3240 +#, c-format +msgid "reading from '%s' beyond a symbolic link" +msgstr "изчитане на „%s“ Ñлед проÑледÑване на Ñимволна връзка" + +#: builtin/apply.c:3268 builtin/apply.c:3490 #, c-format msgid "path %s has been renamed/deleted" msgstr "обектът Ñ Ð¿ÑŠÑ‚ „%s“ е преименуван или изтрит" -#: builtin/apply.c:3321 builtin/apply.c:3476 +#: builtin/apply.c:3349 builtin/apply.c:3504 #, c-format msgid "%s: does not exist in index" msgstr "„%s“ не ÑъщеÑтвува в индекÑа" -#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490 +#: builtin/apply.c:3353 builtin/apply.c:3496 builtin/apply.c:3518 #, c-format msgid "%s: %s" msgstr "„%s“: %s" -#: builtin/apply.c:3330 builtin/apply.c:3484 +#: builtin/apply.c:3358 builtin/apply.c:3512 #, c-format msgid "%s: does not match index" msgstr "„%s“ не ÑъответÑтва на индекÑа" -#: builtin/apply.c:3432 +#: builtin/apply.c:3460 msgid "removal patch leaves file contents" msgstr "изтриващата кръпка оÑÑ‚Ð°Ð²Ñ Ñ„Ð°Ð¹Ð»Ð° непразен" -#: builtin/apply.c:3501 +#: builtin/apply.c:3529 #, c-format msgid "%s: wrong type" msgstr "„%s“: неправилен вид" -#: builtin/apply.c:3503 +#: builtin/apply.c:3531 #, c-format msgid "%s has type %o, expected %o" msgstr "„%s“ е от вид „%o“, а Ñе очакваше „%o“" -#: builtin/apply.c:3604 +#: builtin/apply.c:3690 builtin/apply.c:3692 +#, c-format +msgid "invalid path '%s'" +msgstr "неправилен път: „%s“" + +#: builtin/apply.c:3747 #, c-format msgid "%s: already exists in index" msgstr "„%s“: вече ÑъщеÑтвува в индекÑа" -#: builtin/apply.c:3607 +#: builtin/apply.c:3750 #, c-format msgid "%s: already exists in working directory" msgstr "„%s“: вече ÑъщеÑтвува в работната директориÑ" -#: builtin/apply.c:3627 +#: builtin/apply.c:3770 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "новите права за доÑтъп (%o) на „%s“ не Ñъвпадат ÑÑŠÑ Ñтарите (%o)" -#: builtin/apply.c:3632 +#: builtin/apply.c:3775 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" "новите права за доÑтъп (%o) на „%s“ не Ñъвпадат ÑÑŠÑ Ñтарите (%o) на „%s“" -#: builtin/apply.c:3640 +#: builtin/apply.c:3795 +#, c-format +msgid "affected file '%s' is beyond a symbolic link" +msgstr "заÑегнатиÑÑ‚ файл „%s“ е Ñлед Ñимволна връзка" + +#: builtin/apply.c:3799 #, c-format msgid "%s: patch does not apply" msgstr "Кръпката „%s“ не може да бъде приложена" -#: builtin/apply.c:3653 +#: builtin/apply.c:3813 #, c-format msgid "Checking patch %s..." msgstr "ПроверÑване на кръпката „%s“…" -#: builtin/apply.c:3746 builtin/checkout.c:213 builtin/reset.c:135 +#: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "неуÑпешно Ñъздаване на Ð·Ð°Ð¿Ð¸Ñ Ð² кеша чрез „make_cache_entry“ за „%s“" -#: builtin/apply.c:3889 +#: builtin/apply.c:4049 #, c-format msgid "unable to remove %s from index" msgstr "„%s“ не може да Ñе извади от индекÑа" -#: builtin/apply.c:3918 +#: builtin/apply.c:4078 #, c-format msgid "corrupt patch for submodule %s" msgstr "повредена кръпка за модула „%s“" -#: builtin/apply.c:3922 +#: builtin/apply.c:4082 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" "не може да Ñе получи Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ñ‡Ñ€ÐµÐ· „stat“ за новоÑÑŠÐ·Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð» „%s“" -#: builtin/apply.c:3927 +#: builtin/apply.c:4087 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "не може да Ñе за Ñъздаде мÑÑтото за Ñъхранение на новоÑÑŠÐ·Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð» „%s“" -#: builtin/apply.c:3930 builtin/apply.c:4038 +#: builtin/apply.c:4090 builtin/apply.c:4198 #, c-format msgid "unable to add cache entry for %s" msgstr "не може да Ñе добави Ð·Ð°Ð¿Ð¸Ñ Ð² кеша за „%s“" -#: builtin/apply.c:3963 +#: builtin/apply.c:4123 #, c-format msgid "closing file '%s'" msgstr "затварÑне на файла „%s“" -#: builtin/apply.c:4012 +#: builtin/apply.c:4172 #, c-format msgid "unable to write file '%s' mode %o" msgstr "файлът „%s“ не може да Ñе запише Ñ Ñ€ÐµÐ¶Ð¸Ð¼ на доÑтъп „%o“" -#: builtin/apply.c:4099 +#: builtin/apply.c:4259 #, c-format msgid "Applied patch %s cleanly." msgstr "Кръпката „%s“ бе приложена чиÑто." -#: builtin/apply.c:4107 +#: builtin/apply.c:4267 msgid "internal error" msgstr "вътрешна грешка" -#: builtin/apply.c:4110 +#: builtin/apply.c:4270 #, 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:4120 +#: builtin/apply.c:4280 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "Ñъкращаване на името на файла Ñ Ð¾Ñ‚Ñ…Ð²ÑŠÑ€Ð»ÐµÐ½Ð¸Ñ‚Ðµ парчета на „ %.*s.rej“" -#: builtin/apply.c:4141 +#: builtin/apply.c:4301 #, c-format msgid "Hunk #%d applied cleanly." msgstr "%d-то парче бе уÑпешно приложено." -#: builtin/apply.c:4144 +#: builtin/apply.c:4304 #, c-format msgid "Rejected hunk #%d." msgstr "%d-то парче бе отхвърлено." -#: builtin/apply.c:4234 +#: builtin/apply.c:4394 msgid "unrecognized input" msgstr "непознат вход" -#: builtin/apply.c:4245 +#: builtin/apply.c:4405 msgid "unable to read index file" msgstr "индекÑÑŠÑ‚ не може да бъде запиÑан" -#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:91 -#: builtin/fetch.c:93 +#: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92 +#: builtin/fetch.c:92 msgid "path" msgstr "път" -#: builtin/apply.c:4363 +#: builtin/apply.c:4523 msgid "don't apply changes matching the given path" msgstr "без прилагане на промените напаÑващи на Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ð¿ÑŠÑ‚" -#: builtin/apply.c:4366 +#: builtin/apply.c:4526 msgid "apply changes matching the given path" msgstr "прилагане на промените напаÑващи на Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ð¿ÑŠÑ‚" -#: builtin/apply.c:4368 +#: builtin/apply.c:4528 msgid "num" msgstr "БРОЙ" -#: builtin/apply.c:4369 +#: builtin/apply.c:4529 msgid "remove <num> leading slashes from traditional diff paths" msgstr "премахване на този БРОЙ водещи елементи от пътищата в разликата" -#: builtin/apply.c:4372 +#: builtin/apply.c:4532 msgid "ignore additions made by the patch" msgstr "игнориране на редовете добавени от тази кръпка" -#: builtin/apply.c:4374 +#: builtin/apply.c:4534 msgid "instead of applying the patch, output diffstat for the input" msgstr "извеждане на ÑтатиÑтика на промените без прилагане на кръпката" -#: builtin/apply.c:4378 +#: builtin/apply.c:4538 msgid "show number of added and deleted lines in decimal notation" msgstr "извеждане на Ð±Ñ€Ð¾Ñ Ð½Ð° добавените и изтритите редове" -#: builtin/apply.c:4380 +#: builtin/apply.c:4540 msgid "instead of applying the patch, output a summary for the input" msgstr "извеждане на ÑтатиÑтика на входните данни без прилагане на кръпката" -#: builtin/apply.c:4382 +#: builtin/apply.c:4542 msgid "instead of applying the patch, see if the patch is applicable" msgstr "проверка дали кръпката може да Ñе приложи, без дейÑтвително прилагане" -#: builtin/apply.c:4384 +#: builtin/apply.c:4544 msgid "make sure the patch is applicable to the current index" msgstr "проверка дали кръпката може да бъде приложена към Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ Ð¸Ð½Ð´ÐµÐºÑ" -#: builtin/apply.c:4386 +#: builtin/apply.c:4546 msgid "apply a patch without touching the working tree" msgstr "прилагане на кръпката без промÑна на работното дърво" -#: builtin/apply.c:4388 +#: builtin/apply.c:4548 +msgid "accept a patch that touches outside the working area" +msgstr "прилагане на кръпка, коÑто Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ñ Ð¸ файлове извън работното дърво" + +#: builtin/apply.c:4550 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" "кръпката да бъде приложена. ОпциÑта Ñе комбинира Ñ â€ž--check“/„--stat“/„--" "summary“" -#: builtin/apply.c:4390 +#: builtin/apply.c:4552 msgid "attempt three-way merge if a patch does not apply" msgstr "пробване Ñ Ñ‚Ñ€Ð¾Ð¹Ð½Ð¾ Ñливане, ако кръпката не може да Ñе приложи директно" -#: builtin/apply.c:4392 +#: builtin/apply.c:4554 msgid "build a temporary index based on embedded index information" msgstr "" "Ñъздаване на временен Ð¸Ð½Ð´ÐµÐºÑ Ð½Ð° база на включената Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° индекÑа" -#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455 +#: builtin/apply.c:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412 msgid "paths are separated with NUL character" msgstr "разделÑне на пътищата Ñ Ð½ÑƒÐ»ÐµÐ²Ð¸Ñ Ð·Ð½Ð°Ðº „NUL“" -#: builtin/apply.c:4397 +#: builtin/apply.c:4559 msgid "ensure at least <n> lines of context match" msgstr "да Ñе оÑигури контекÑÑ‚ от поне такъв БРОЙ Ñъвпадащи редове" -#: builtin/apply.c:4398 +#: builtin/apply.c:4560 msgid "action" msgstr "дейÑтвие" -#: builtin/apply.c:4399 +#: builtin/apply.c:4561 msgid "detect new or modified lines that have whitespace errors" msgstr "заÑичане на нови или променени редове Ñ Ð³Ñ€ÐµÑˆÐºÐ¸ в знаците за интервали" -#: builtin/apply.c:4402 builtin/apply.c:4405 +#: builtin/apply.c:4564 builtin/apply.c:4567 msgid "ignore changes in whitespace when finding context" msgstr "" "игнориране на промените в знаците за интервали при откриване на контекÑта" -#: builtin/apply.c:4408 +#: builtin/apply.c:4570 msgid "apply the patch in reverse" msgstr "прилагане на кръпката в обратна поÑока" -#: builtin/apply.c:4410 +#: builtin/apply.c:4572 msgid "don't expect at least one line of context" msgstr "без изиÑкване на дори и един ред контекÑÑ‚" -#: builtin/apply.c:4412 +#: builtin/apply.c:4574 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "оÑтавÑне на отхвърлените парчета във файлове Ñ Ñ€Ð°Ð·ÑˆÐ¸Ñ€ÐµÐ½Ð¸Ðµ „.rej“" -#: builtin/apply.c:4414 +#: builtin/apply.c:4576 msgid "allow overlapping hunks" msgstr "позволÑване на заÑтъпващи Ñе парчета" -#: builtin/apply.c:4417 +#: builtin/apply.c:4579 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "пренебрегване на неправилно липÑващ знак за нов ред в ÐºÑ€Ð°Ñ Ð½Ð° файл" -#: builtin/apply.c:4420 +#: builtin/apply.c:4582 msgid "do not trust the line counts in the hunk headers" msgstr "без доверÑване на номерата на редовете в заглавните чаÑти на парчетата" -#: builtin/apply.c:4422 +#: builtin/apply.c:4584 msgid "root" msgstr "ÐÐЧÐЛÐÐ_ДИРЕКТОРИЯ" -#: builtin/apply.c:4423 +#: builtin/apply.c:4585 msgid "prepend <root> to all filenames" msgstr "добавÑне на тази ÐÐЧÐЛÐÐ_ДИРЕКТОРИЯ към имената на вÑички файлове" -#: builtin/apply.c:4445 +#: builtin/apply.c:4607 msgid "--3way outside a repository" msgstr "като „--3way“, но извън хранилище" -#: builtin/apply.c:4453 +#: builtin/apply.c:4615 msgid "--index outside a repository" msgstr "като „--index“, но извън хранилище" -#: builtin/apply.c:4456 +#: builtin/apply.c:4618 msgid "--cached outside a repository" msgstr "като „--cached“, но извън хранилище" -#: builtin/apply.c:4472 +#: builtin/apply.c:4637 #, c-format msgid "can't open patch '%s'" msgstr "кръпката „%s“ не може да бъде отворена" -#: builtin/apply.c:4486 +#: builtin/apply.c:4651 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "пренебрегната е %d грешка в знаците за интервали" msgstr[1] "пренебрегнати Ñа %d грешки в знаците за интервали" -#: builtin/apply.c:4492 builtin/apply.c:4502 +#: builtin/apply.c:4657 builtin/apply.c:4667 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2842,119 +2865,119 @@ msgstr "" "обновÑване на ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€žBISECT_HEAD“ вмеÑто да Ñе използва текущото подаване" #: builtin/blame.c:30 -msgid "git blame [options] [rev-opts] [rev] [--] file" -msgstr "git blame [ОПЦИЯ…] [ОПЦИИ_ЗÐ_ВЕРСИЯТÐ] [ВЕРСИЯ] [--] ФÐЙЛ" +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file" +msgstr "git blame [ОПЦИЯ…] [ОПЦИЯ_ЗÐ_ВЕРСИЯТÐ…] [ВЕРСИЯ] [--] ФÐЙЛ" #: builtin/blame.c:35 -msgid "[rev-opts] are documented in git-rev-list(1)" +msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "ОПЦИИте_ЗÐ_ВЕРСИЯТРÑа документирани в ръководÑтвото git-rev-list(1)" -#: builtin/blame.c:2501 +#: builtin/blame.c:2500 msgid "Show blame entries as we find them, incrementally" msgstr "Извеждане на анотациите Ñ Ð½Ð°Ð¼Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾ им, поÑледователно" # FIXME SHA-1 -> SHA1 -#: builtin/blame.c:2502 +#: builtin/blame.c:2501 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" "Извеждане на празни Ñуми по SHA1 за граничните Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ (Ñтандартно опциÑта " "е изключена)" -#: builtin/blame.c:2503 +#: builtin/blame.c:2502 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" "Ðачалните Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ Ð´Ð° не Ñе Ñчитат за гранични (Ñтандартно опциÑта е " "изключена)" -#: builtin/blame.c:2504 +#: builtin/blame.c:2503 msgid "Show work cost statistics" msgstr "Извеждане на ÑтатиÑтика за извършените дейÑтвиÑ" -#: builtin/blame.c:2505 +#: builtin/blame.c:2504 msgid "Show output score for blame entries" msgstr "Извеждане на допълнителна Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° определÑнето на анотациите" -#: builtin/blame.c:2506 +#: builtin/blame.c:2505 msgid "Show original filename (Default: auto)" msgstr "" "Извеждане на първоначалното име на файл (Ñтандартно това е автоматично)" -#: builtin/blame.c:2507 +#: builtin/blame.c:2506 msgid "Show original linenumber (Default: off)" msgstr "" "Извеждане на първоначалниÑÑ‚ номер на ред (Ñтандартно опциÑта е изключена)" -#: builtin/blame.c:2508 +#: builtin/blame.c:2507 msgid "Show in a format designed for machine consumption" msgstr "Извеждане във формат за по-нататъшна обработка" -#: builtin/blame.c:2509 +#: builtin/blame.c:2508 msgid "Show porcelain format with per-line commit information" msgstr "" "Извеждане във формат за команди от потребителÑко ниво Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð½Ð° вÑеки " "ред" -#: builtin/blame.c:2510 +#: builtin/blame.c:2509 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "Използване на ÑÑŠÑ‰Ð¸Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ като „git-annotate“ (Ñтандартно опциÑта е " "изключена)" -#: builtin/blame.c:2511 +#: builtin/blame.c:2510 msgid "Show raw timestamp (Default: off)" msgstr "Извеждане на неформатирани времена (Ñтандартно опциÑта е изключена)" -#: builtin/blame.c:2512 +#: builtin/blame.c:2511 msgid "Show long commit SHA1 (Default: off)" msgstr "Извеждане на пълните Ñуми по SHA1 (Ñтандартно опциÑта е изключена)" -#: builtin/blame.c:2513 +#: builtin/blame.c:2512 msgid "Suppress author name and timestamp (Default: off)" msgstr "Без име на автор и време на промÑна (Ñтандартно опциÑта е изключена)" -#: builtin/blame.c:2514 +#: builtin/blame.c:2513 msgid "Show author email instead of name (Default: off)" msgstr "" "Извеждане на е-пощата на автора, а не името му (Ñтандартно опциÑта е " "изключена)" -#: builtin/blame.c:2515 +#: builtin/blame.c:2514 msgid "Ignore whitespace differences" msgstr "Без разлики в знаците за интервали" -#: builtin/blame.c:2516 +#: builtin/blame.c:2515 msgid "Spend extra cycles to find better match" msgstr "Допълнителни изчиÑÐ»ÐµÐ½Ð¸Ñ Ð·Ð° по-добри резултати" -#: builtin/blame.c:2517 +#: builtin/blame.c:2516 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Изчитане на верÑиите от ФÐЙЛ, а не чрез изпълнение на „git-rev-list“" -#: builtin/blame.c:2518 +#: builtin/blame.c:2517 msgid "Use <file>'s contents as the final image" msgstr "Използване на Ñъдържанието на ФÐЙЛа като крайно положение" -#: builtin/blame.c:2519 builtin/blame.c:2520 +#: builtin/blame.c:2518 builtin/blame.c:2519 msgid "score" msgstr "напаÑване на редовете" -#: builtin/blame.c:2519 +#: builtin/blame.c:2518 msgid "Find line copies within and across files" msgstr "" "ТърÑене на копирани редове както в рамките на един файл, така и от един файл " "към друг" -#: builtin/blame.c:2520 +#: builtin/blame.c:2519 msgid "Find line movements within and across files" msgstr "" "ТърÑене на премеÑтени редове както в рамките на един файл, така и от един " "файл към друг" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "Process only line range n,m, counting from 1" msgstr "" "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ñамо за редовете в интервала от n до m включително. Броенето " @@ -2966,24 +2989,24 @@ 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:2602 +#: builtin/blame.c:2601 msgid "4 years, 11 months ago" msgstr "преди 4 години и 11 меÑеца" #: builtin/branch.c:24 -msgid "git branch [options] [-r | -a] [--merged | --no-merged]" +msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [ОПЦИЯ…] [-r | -a] [--merged | --no-merged]" #: builtin/branch.c:25 -msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" +msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [ОПЦИЯ…] [-l] [-f] ИМЕ_ÐÐ_КЛОР[ÐÐЧÐЛО]" #: builtin/branch.c:26 -msgid "git branch [options] [-r] (-d | -D) <branchname>..." +msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [ОПЦИЯ…] [-r] (-d | -D) ИМЕ_ÐÐ_КЛОÐ…" #: builtin/branch.c:27 -msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" +msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [ОПЦИЯ…] (-m | -M) [СТÐÐ _КЛОÐ] ÐОВ_КЛОÐ" #: builtin/branch.c:152 @@ -3125,198 +3148,203 @@ msgstr "(извън клон, пребазиране на „%s“)" msgid "(no branch, bisect started on %s)" msgstr "(извън клон, двоично Ñ‚ÑŠÑ€Ñене от „%s“)" -#: builtin/branch.c:593 +#: builtin/branch.c:596 #, c-format -msgid "(detached from %s)" -msgstr "(ÑÑŠÑтоÑние, неÑвързано към „%s“)" +msgid "(HEAD detached at %s)" +msgstr "(УказателÑÑ‚ „HEAD“ не е Ñвързан и е при „%s“)" -#: builtin/branch.c:596 +#: builtin/branch.c:599 +#, c-format +msgid "(HEAD detached from %s)" +msgstr "УказателÑÑ‚ „HEAD“ не е Ñвързан и е отделѐн от „%s“" + +#: builtin/branch.c:603 msgid "(no branch)" msgstr "(извън клон)" -#: builtin/branch.c:643 +#: builtin/branch.c:650 #, c-format msgid "object '%s' does not point to a commit" msgstr "обектът „%s“ не Ñочи към подаване" -#: builtin/branch.c:691 +#: builtin/branch.c:698 msgid "some refs could not be read" msgstr "нÑкои указатели не могат да бъдат прочетени" -#: builtin/branch.c:704 +#: builtin/branch.c:711 msgid "cannot rename the current branch while not on any." msgstr "" "не можете да преименувате Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ ÐºÐ»Ð¾Ð½, защото Ñте извън който и да е клон" -#: builtin/branch.c:714 +#: builtin/branch.c:721 #, c-format msgid "Invalid branch name: '%s'" msgstr "Ðеправилно име на клон: „%s“" -#: builtin/branch.c:729 +#: builtin/branch.c:736 msgid "Branch rename failed" msgstr "ÐеуÑпешно преименуване на клон" -#: builtin/branch.c:733 +#: builtin/branch.c:740 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Ðа клона Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»Ð½Ð¾ име „%s“ е дадено Ñлужебно име" -#: builtin/branch.c:737 +#: builtin/branch.c:744 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Клонът е преименуван на „%s“, но указателÑÑ‚ „HEAD“ не е обновен" -#: builtin/branch.c:744 +#: builtin/branch.c:751 msgid "Branch is renamed, but update of config-file failed" msgstr "Клонът е преименуван, но конфигурационниÑÑ‚ файл не е обновен" -#: builtin/branch.c:759 +#: builtin/branch.c:766 #, c-format msgid "malformed object name %s" msgstr "неправилно име на обект „%s“" -#: builtin/branch.c:783 +#: builtin/branch.c:790 #, c-format msgid "could not write branch description template: %s" msgstr "шаблонът за опиÑание на клон не бе запиÑан: „%s“" -#: builtin/branch.c:813 +#: builtin/branch.c:820 msgid "Generic options" msgstr "Общи наÑтройки" -#: builtin/branch.c:815 +#: builtin/branch.c:822 msgid "show hash and subject, give twice for upstream branch" msgstr "" "извеждане на хеша и темата. ПовтарÑнето на опциÑта Ð¿Ñ€Ð¸Ð±Ð°Ð²Ñ Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ‚Ðµ клони" -#: builtin/branch.c:816 +#: builtin/branch.c:823 msgid "suppress informational messages" msgstr "без информационни ÑъобщениÑ" -#: builtin/branch.c:817 +#: builtin/branch.c:824 msgid "set up tracking mode (see git-pull(1))" msgstr "задаване на режима на Ñледене (виж git-pull(1))" -#: builtin/branch.c:819 +#: builtin/branch.c:826 msgid "change upstream info" msgstr "ÑмÑна на ÑÐ»ÐµÐ´ÐµÐ½Ð¸Ñ ÐºÐ»Ð¾Ð½" -#: builtin/branch.c:823 +#: builtin/branch.c:830 msgid "use colored output" msgstr "цветен изход" -#: builtin/branch.c:824 +#: builtin/branch.c:831 msgid "act on remote-tracking branches" msgstr "дейÑтвие върху ÑледÑщите клони" -#: 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/branch.c:834 builtin/branch.c:840 builtin/branch.c:861 +#: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583 +#: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616 #: builtin/tag.c:622 msgid "commit" msgstr "подаване" -#: builtin/branch.c:828 builtin/branch.c:834 +#: builtin/branch.c:835 builtin/branch.c:841 msgid "print only branches that contain the commit" msgstr "извеждане Ñамо на клоните, които Ñъдържат това подаване" -#: builtin/branch.c:840 +#: builtin/branch.c:847 msgid "Specific git-branch actions:" msgstr "Специални дейÑÑ‚Ð²Ð¸Ñ Ð½Ð° „git-branch“:" -#: builtin/branch.c:841 +#: builtin/branch.c:848 msgid "list both remote-tracking and local branches" msgstr "извеждане както на ÑледÑщите, така и на локалните клони" -#: builtin/branch.c:843 +#: builtin/branch.c:850 msgid "delete fully merged branch" msgstr "изтриване на клони, които Ñа напълно Ñлети" -#: builtin/branch.c:844 +#: builtin/branch.c:851 msgid "delete branch (even if not merged)" msgstr "изтриване и на клони, които не Ñа напълно Ñлети" -#: builtin/branch.c:845 +#: builtin/branch.c:852 msgid "move/rename a branch and its reflog" msgstr "" "премеÑтване/преименуване на клон и принадлежащиÑÑ‚ му журнал на указателите" -#: builtin/branch.c:846 +#: builtin/branch.c:853 msgid "move/rename a branch, even if target exists" msgstr "премеÑтване/преименуване на клон, дори ако има вече клон Ñ Ñ‚Ð°ÐºÐ¾Ð²Ð° име" -#: builtin/branch.c:847 +#: builtin/branch.c:854 msgid "list branch names" msgstr "извеждане на имената на клоните" -#: builtin/branch.c:848 +#: builtin/branch.c:855 msgid "create the branch's reflog" msgstr "Ñъздаване на журнала на указателите на клона" -#: builtin/branch.c:850 +#: builtin/branch.c:857 msgid "edit the description for the branch" msgstr "редактиране на опиÑанието на клона" -#: builtin/branch.c:851 -msgid "force creation (when already exists)" -msgstr "принудително Ñъздаване, дори ако ÑъщеÑтвува клон Ñ Ñ‚Ð°ÐºÐ¾Ð²Ð° име" +#: builtin/branch.c:858 +msgid "force creation, move/rename, deletion" +msgstr "принудително Ñъздаване, премеÑтване, преименуване, изтриване" -#: builtin/branch.c:854 +#: builtin/branch.c:861 msgid "print only not merged branches" msgstr "извеждане Ñамо на неÑлетите клони" -#: builtin/branch.c:860 +#: builtin/branch.c:867 msgid "print only merged branches" msgstr "извеждане Ñамо на Ñлетите клони" -#: builtin/branch.c:864 +#: builtin/branch.c:871 msgid "list branches in columns" msgstr "извеждане по колони" -#: builtin/branch.c:877 +#: builtin/branch.c:884 msgid "Failed to resolve HEAD as a valid ref." msgstr "Ðе може да Ñе открие към какво Ñочи указателÑÑ‚ „HEAD“" -#: builtin/branch.c:881 builtin/clone.c:634 +#: builtin/branch.c:888 builtin/clone.c:637 msgid "HEAD not found below refs/heads!" msgstr "Ð’ директориÑта „refs/heads“ липÑва файл „HEAD“" -#: builtin/branch.c:903 +#: builtin/branch.c:910 msgid "--column and --verbose are incompatible" msgstr "Опциите „--column“ и „--verbose“ Ñа неÑъвмеÑтими" -#: builtin/branch.c:909 builtin/branch.c:948 +#: builtin/branch.c:921 builtin/branch.c:960 msgid "branch name required" msgstr "Ðеобходимо е име на клон" -#: builtin/branch.c:924 +#: builtin/branch.c:936 msgid "Cannot give description to detached HEAD" msgstr "Ðе може да зададете опиÑание на „HEAD“ извън клон" -#: builtin/branch.c:929 +#: builtin/branch.c:941 msgid "cannot edit description of more than one branch" msgstr "Ðе може да редактирате опиÑанието на повече от един клон едновременно" -#: builtin/branch.c:936 +#: builtin/branch.c:948 #, c-format msgid "No commit on branch '%s' yet." msgstr "Ð’ клона „%s“ вÑе още нÑма подаваниÑ." -#: builtin/branch.c:939 +#: builtin/branch.c:951 #, c-format msgid "No branch named '%s'." msgstr "ЛипÑва клон на име „%s“." -#: builtin/branch.c:954 +#: builtin/branch.c:966 msgid "too many branches for a rename operation" msgstr "Прекалено много клони за преименуване" -#: builtin/branch.c:959 +#: builtin/branch.c:971 msgid "too many branches to set new upstream" msgstr "Прекалено много клони за задаване на Ñледене" -#: builtin/branch.c:963 +#: builtin/branch.c:975 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -3324,39 +3352,39 @@ msgstr "" "Следеното от „HEAD“ не може да Ñе зададе да е „%s“, защото то не Ñочи към " "никой клон." -#: builtin/branch.c:966 builtin/branch.c:988 builtin/branch.c:1009 +#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021 #, c-format msgid "no such branch '%s'" msgstr "ÐÑма клон на име „%s“." -#: builtin/branch.c:970 +#: builtin/branch.c:982 #, c-format msgid "branch '%s' does not exist" msgstr "Ðе ÑъщеÑтвува клон на име „%s“." -#: builtin/branch.c:982 +#: builtin/branch.c:994 msgid "too many branches to unset upstream" msgstr "Прекалено много клони за махане на Ñледене" -#: builtin/branch.c:986 +#: builtin/branch.c:998 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "Следеното от „HEAD“ не може да махне, защото то не Ñочи към никой клон." -#: builtin/branch.c:992 +#: builtin/branch.c:1004 #, c-format msgid "Branch '%s' has no upstream information" msgstr "ÐÑма Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ ÐºÐ»Ð¾Ð½ÑŠÑ‚ „%s“ да Ñледи нÑкой друг" -#: builtin/branch.c:1006 +#: builtin/branch.c:1018 msgid "it does not make sense to create 'HEAD' manually" msgstr "ÐÑма никакъв ÑмиÑъл ръчно да Ñъздавате „HEAD“." -#: builtin/branch.c:1012 +#: builtin/branch.c:1024 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "Опциите „-a“ и „-r“ на „git branch“ Ñа неÑъвмеÑтими Ñ Ð¸Ð¼Ðµ на клон" -#: builtin/branch.c:1015 +#: builtin/branch.c:1027 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3365,7 +3393,7 @@ msgstr "" "ОпциÑта „--set-upstream“ вече е оÑтарÑла и предÑтои да бъде махната. " "Използвайте „--track“ или „--set-upstream-to“\n" -#: builtin/branch.c:1032 +#: builtin/branch.c:1044 #, c-format msgid "" "\n" @@ -3376,12 +3404,12 @@ msgstr "" "За да накарате „%s“ да Ñледи „%s“, изпълнете Ñледната команда:\n" "\n" -#: builtin/branch.c:1033 +#: builtin/branch.c:1045 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1034 +#: builtin/branch.c:1046 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -3399,57 +3427,57 @@ msgstr "За Ñъздаването на пратка е необходимо Ñ… msgid "Need a repository to unbundle." msgstr "За приемането на пратка е необходимо хранилище." -#: 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:326 +msgid "git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>" +msgstr "git cat-file (-t | -s | -e | -p | ВИД | --textconv) ОБЕКТ" -#: 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:327 +msgid "git cat-file (--batch | --batch-check) < <list-of-objects>" +msgstr "git cat-file (--batch | --batch-check) < СПИСЪК_С_ОБЕКТИ" -#: builtin/cat-file.c:370 +#: builtin/cat-file.c:364 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" "ВИДът може да е: „blob“ (обект BLOB), „tree“ (дърво), „commit“ (подаване), " "„tag“ (етикет)" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:365 msgid "show object type" msgstr "извеждане на вида на обект" -#: builtin/cat-file.c:372 +#: builtin/cat-file.c:366 msgid "show object size" msgstr "извеждане на размера на обект" -#: builtin/cat-file.c:374 +#: builtin/cat-file.c:368 msgid "exit with zero when there's no error" msgstr "изход Ñ 0, когато нÑма грешка" -#: builtin/cat-file.c:375 +#: builtin/cat-file.c:369 msgid "pretty-print object's content" msgstr "форматирано извеждане на Ñъдържанието на обекта" -#: builtin/cat-file.c:377 +#: builtin/cat-file.c:371 msgid "for blob objects, run textconv on object's content" msgstr "" "да Ñе Ñтартира програмата зададена в наÑтройката „textconv“ за преобразуване " "на Ñъдържанието на обекта" -#: builtin/cat-file.c:379 +#: builtin/cat-file.c:373 msgid "show info and content of objects fed from the standard input" msgstr "" "извеждане на Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¸ Ñъдържание на обектите подадени на ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´" -#: builtin/cat-file.c:382 +#: builtin/cat-file.c:376 msgid "show info about objects fed from the standard input" msgstr "извеждане на Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° обектите подадени на ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´" #: builtin/check-attr.c:11 -msgid "git check-attr [-a | --all | attr...] [--] pathname..." +msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | ÐТРИБУТ…] [--] ПЪТ…" #: builtin/check-attr.c:12 -msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" +msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>" msgstr "git check-attr --stdin [-z] [-a | --all | ÐТРИБУТ…] < СПИСЪК_С_ПЪТИЩÐ" #: builtin/check-attr.c:19 @@ -3468,7 +3496,7 @@ msgstr "изчитане на имената на файловете от Ñта msgid "terminate input and output records by a NUL character" msgstr "разделÑне на входните и изходните запиÑи Ñ Ð½ÑƒÐ»ÐµÐ²Ð¸Ñ Ð·Ð½Ð°Ðº „NUL“" -#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:274 +#: builtin/check-ignore.c:18 builtin/checkout.c:1107 builtin/gc.c:274 msgid "suppress progress reporting" msgstr "без показване на напредъка" @@ -3508,7 +3536,7 @@ msgid "--non-matching is only valid with --verbose" msgstr "опциÑта „--non-matching“ изиÑква „--verbose“" #: builtin/check-mailmap.c:8 -msgid "git check-mailmap [options] <contact>..." +msgid "git check-mailmap [<options>] <contact>..." msgstr "git check-mailmap [ОПЦИЯ…] КОÐТÐКТ…" #: builtin/check-mailmap.c:13 @@ -3525,7 +3553,7 @@ msgid "no contacts specified" msgstr "не Ñа указани контакти" #: builtin/checkout-index.c:126 -msgid "git checkout-index [options] [--] [<file>...]" +msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [ОПЦИЯ…] [--] [ФÐЙЛ…]" #: builtin/checkout-index.c:188 @@ -3569,116 +3597,116 @@ msgid "copy out the files from named stage" msgstr "копиране на файловете от това ÑÑŠÑтоÑние на Ñливане" #: builtin/checkout.c:25 -msgid "git checkout [options] <branch>" +msgid "git checkout [<options>] <branch>" msgstr "git checkout [ОПЦИЯ…] КЛОÐ" #: builtin/checkout.c:26 -msgid "git checkout [options] [<branch>] -- <file>..." +msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [ОПЦИЯ…] [КЛОÐ] -- ФÐЙЛ…" -#: builtin/checkout.c:114 builtin/checkout.c:147 +#: builtin/checkout.c:132 builtin/checkout.c:165 #, c-format msgid "path '%s' does not have our version" msgstr "вашата верÑÐ¸Ñ Ð»Ð¸Ð¿Ñва в Ð¿ÑŠÑ‚Ñ â€ž%s“" -#: builtin/checkout.c:116 builtin/checkout.c:149 +#: builtin/checkout.c:134 builtin/checkout.c:167 #, c-format msgid "path '%s' does not have their version" msgstr "чуждата верÑÐ¸Ñ Ð»Ð¸Ð¿Ñва в Ð¿ÑŠÑ‚Ñ â€ž%s“" # FIXME SAME AS [1] -#: builtin/checkout.c:132 +#: builtin/checkout.c:150 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "нÑÐºÐ¾Ñ Ð¾Ñ‚ необходимите верÑии липÑва в Ð¿ÑŠÑ‚Ñ â€ž%s“" # FIXME SAME AS [1] -#: builtin/checkout.c:176 +#: builtin/checkout.c:194 #, c-format msgid "path '%s' does not have necessary versions" msgstr "нÑÐºÐ¾Ñ Ð¾Ñ‚ необходимите верÑии липÑва в Ð¿ÑŠÑ‚Ñ â€ž%s“" -#: builtin/checkout.c:193 +#: builtin/checkout.c:211 #, c-format msgid "path '%s': cannot merge" msgstr "пътÑÑ‚ „%s“ не може да бъде ÑлÑн" -#: builtin/checkout.c:210 +#: builtin/checkout.c:228 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Резултатът за „%s“ не може да бъде ÑлÑн" -#: builtin/checkout.c:231 builtin/checkout.c:234 builtin/checkout.c:237 -#: builtin/checkout.c:240 +#: builtin/checkout.c:249 builtin/checkout.c:252 builtin/checkout.c:255 +#: builtin/checkout.c:258 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "ОпциÑта „%s“ е неÑъвмеÑтима Ñ Ð¾Ð±Ð½Ð¾Ð²Ñването на пътища" -#: builtin/checkout.c:243 builtin/checkout.c:246 +#: builtin/checkout.c:261 builtin/checkout.c:264 #, c-format msgid "'%s' cannot be used with %s" msgstr "ОпциÑта „%s“ е неÑъвмеÑтима Ñ â€ž%s“" -#: builtin/checkout.c:249 +#: builtin/checkout.c:267 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Ðевъзможно е едновременно да обновÑвате пътища и да Ñе прехвърлите към клона " "„%s“." -#: builtin/checkout.c:260 builtin/checkout.c:449 +#: builtin/checkout.c:278 builtin/checkout.c:467 msgid "corrupt index file" msgstr "повреден файл на индекÑа" -#: builtin/checkout.c:320 builtin/checkout.c:327 +#: builtin/checkout.c:338 builtin/checkout.c:345 #, c-format msgid "path '%s' is unmerged" msgstr "пътÑÑ‚ „%s“ не е ÑлÑÑ‚" -#: builtin/checkout.c:471 +#: builtin/checkout.c:489 msgid "you need to resolve your current index first" msgstr "първо Ñ‚Ñ€Ñбва да коригирате индекÑа Ñи" -#: builtin/checkout.c:597 +#: builtin/checkout.c:615 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "Журналът на указателите за „%s“ не може да бъде Ñъздаден\n" -#: builtin/checkout.c:635 +#: builtin/checkout.c:653 msgid "HEAD is now at" msgstr "УказателÑÑ‚ „HEAD“ в момента Ñочи към" -#: builtin/checkout.c:642 +#: builtin/checkout.c:660 #, c-format msgid "Reset branch '%s'\n" msgstr "ЗанулÑване на клона „%s“\n" -#: builtin/checkout.c:645 +#: builtin/checkout.c:663 #, c-format msgid "Already on '%s'\n" msgstr "Вече Ñте на „%s“\n" -#: builtin/checkout.c:649 +#: builtin/checkout.c:667 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Преминаване към клона „%s“ и занулÑване на промените\n" -#: builtin/checkout.c:651 builtin/checkout.c:1032 +#: builtin/checkout.c:669 builtin/checkout.c:1050 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Преминахте към Ð½Ð¾Ð²Ð¸Ñ ÐºÐ»Ð¾Ð½ „%s“\n" -#: builtin/checkout.c:653 +#: builtin/checkout.c:671 #, c-format msgid "Switched to branch '%s'\n" msgstr "Преминахте към клона „%s“\n" -#: builtin/checkout.c:705 +#: builtin/checkout.c:723 #, c-format msgid " ... and %d more.\n" msgstr "… и още %d.\n" -#: builtin/checkout.c:711 +#: builtin/checkout.c:729 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3700,158 +3728,158 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:729 +#: builtin/checkout.c:747 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" "to do so with:\n" "\n" -" git branch new_branch_name %s\n" +" git branch <new-branch-name> %s\n" "\n" msgstr "" -"Ðко вÑе пак иÑкате да запазите тези промени, Ñега е най-подходÑщиÑÑ‚\n" -"момент да Ñъздадете нов клон за Ñ‚ÑÑ… чрез командата:\n" +"Ðко вÑе пак иÑкате да запазите тези промени чрез Ñъздаване на клон,\n" +"Ñега е най-подходÑщиÑÑ‚ за това чрез командата:\n" "\n" " git branch ИМЕ_ÐÐ_ÐОВИЯ_КЛОР%s\n" "\n" -#: builtin/checkout.c:759 +#: builtin/checkout.c:777 msgid "internal error in revision walk" msgstr "вътрешна грешка при обхождането на верÑиите" -#: builtin/checkout.c:763 +#: builtin/checkout.c:781 msgid "Previous HEAD position was" msgstr "Преди това „HEAD“ Ñочеше към" -#: builtin/checkout.c:790 builtin/checkout.c:1027 +#: builtin/checkout.c:808 builtin/checkout.c:1045 msgid "You are on a branch yet to be born" msgstr "Ð’ момента Ñте на клон, който предÑтои да бъде Ñъздаден" -#: builtin/checkout.c:934 +#: builtin/checkout.c:952 #, c-format msgid "only one reference expected, %d given." msgstr "очакваше Ñе един указател, а Ñте подали %d." -#: builtin/checkout.c:973 +#: builtin/checkout.c:991 #, c-format msgid "invalid reference: %s" msgstr "неправилен указател: %s" -#: builtin/checkout.c:1002 +#: builtin/checkout.c:1020 #, c-format msgid "reference is not a tree: %s" msgstr "указателÑÑ‚ не Ñочи към обект-дърво: %s" -#: builtin/checkout.c:1041 +#: builtin/checkout.c:1059 msgid "paths cannot be used with switching branches" msgstr "задаването на път е неÑъвмеÑтимо Ñ Ð¿Ñ€ÐµÐ¼Ð¸Ð½Ð°Ð²Ð°Ð½ÐµÑ‚Ð¾ от един клон към друг" -#: builtin/checkout.c:1044 builtin/checkout.c:1048 +#: builtin/checkout.c:1062 builtin/checkout.c:1066 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "опциÑта „%s“ е неÑъвмеÑтима Ñ Ð¿Ñ€ÐµÐ¼Ð¸Ð½Ð°Ð²Ð°Ð½ÐµÑ‚Ð¾ от един клон към друг" -#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060 -#: builtin/checkout.c:1063 +#: builtin/checkout.c:1070 builtin/checkout.c:1073 builtin/checkout.c:1078 +#: builtin/checkout.c:1081 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "опциÑта „%s“ е неÑъвмеÑтима Ñ â€ž%s“" -#: builtin/checkout.c:1068 +#: builtin/checkout.c:1086 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" "За да преминете към клон, подайте указател, който Ñочи към подаване. „%s“ не " "е такъв" -#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:89 +#: builtin/checkout.c:1108 builtin/checkout.c:1110 builtin/clone.c:90 #: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "клон" -#: builtin/checkout.c:1091 +#: builtin/checkout.c:1109 msgid "create and checkout a new branch" msgstr "Ñъздаване и преминаване към нов клон" -#: builtin/checkout.c:1093 +#: builtin/checkout.c:1111 msgid "create/reset and checkout a branch" msgstr "Ñъздаване/занулÑване на клон и преминаване към него" -#: builtin/checkout.c:1094 +#: builtin/checkout.c:1112 msgid "create reflog for new branch" msgstr "Ñъздаване на журнал на указателите за нов клон" -#: builtin/checkout.c:1095 +#: builtin/checkout.c:1113 msgid "detach the HEAD at named commit" msgstr "отделÑне на ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€žHEAD“ към указаното подаване" -#: builtin/checkout.c:1096 +#: builtin/checkout.c:1114 msgid "set upstream info for new branch" msgstr "задаване на кой клон бива Ñледен при Ñъздаването на Ð½Ð¾Ð²Ð¸Ñ ÐºÐ»Ð¾Ð½" -#: builtin/checkout.c:1098 +#: builtin/checkout.c:1116 msgid "new-branch" msgstr "ÐОВ_КЛОÐ" -#: builtin/checkout.c:1098 +#: builtin/checkout.c:1116 msgid "new unparented branch" msgstr "нов клон без родител" -#: builtin/checkout.c:1099 +#: builtin/checkout.c:1117 msgid "checkout our version for unmerged files" msgstr "изтеглÑне на вашата верÑÐ¸Ñ Ð½Ð° неÑлетите файлове" -#: builtin/checkout.c:1101 +#: builtin/checkout.c:1119 msgid "checkout their version for unmerged files" msgstr "изтеглÑне на чуждата верÑÐ¸Ñ Ð½Ð° неÑлетите файлове" -#: builtin/checkout.c:1103 +#: builtin/checkout.c:1121 msgid "force checkout (throw away local modifications)" msgstr "принудително изтеглÑне (вашите промени ще бъдат занулени)" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1122 msgid "perform a 3-way merge with the new branch" msgstr "извършване на тройно Ñливане Ñ Ð½Ð¾Ð²Ð¸Ñ ÐºÐ»Ð¾Ð½" -#: builtin/checkout.c:1105 builtin/merge.c:226 +#: builtin/checkout.c:1123 builtin/merge.c:227 msgid "update ignored files (default)" msgstr "обновÑване на игнорираните файлове (Ñтандартно)" -#: builtin/checkout.c:1106 builtin/log.c:1239 parse-options.h:245 +#: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245 msgid "style" msgstr "Ñтил" -#: builtin/checkout.c:1107 +#: builtin/checkout.c:1125 msgid "conflict style (merge or diff3)" msgstr "дейÑтвие при конфликт (Ñливане или тройна разлика)" -#: builtin/checkout.c:1110 +#: builtin/checkout.c:1128 msgid "do not limit pathspecs to sparse entries only" msgstr "без ограничаване на изброените пътища Ñамо до чаÑтично изтеглените" -#: builtin/checkout.c:1112 -msgid "second guess 'git checkout no-such-branch'" +#: builtin/checkout.c:1130 +msgid "second guess 'git checkout <no-such-branch>'" msgstr "" -"поÑледващ опит за отгатване Ñлед неуÑпешен опит Ñ â€žgit checkout no-such-" -"branch“" +"опит за отгатване на име на клон Ñлед неуÑпешен опит Ñ â€žgit checkout " +"ÐЕСЪЩЕСТВУВÐЩ_КЛОГ" -#: builtin/checkout.c:1135 +#: builtin/checkout.c:1153 msgid "-b, -B and --orphan are mutually exclusive" msgstr "Опциите „-b“, „-B“ и „--orphan“ Ñа неÑъвмеÑтими една Ñ Ð´Ñ€ÑƒÐ³Ð°" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1170 msgid "--track needs a branch name" msgstr "опциÑта „--track“ изиÑква име на клон" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1175 msgid "Missing branch name; try -b" msgstr "ЛипÑва име на клон, използвайте опциÑта „-b“" -#: builtin/checkout.c:1194 +#: builtin/checkout.c:1212 msgid "invalid path specification" msgstr "указан е неправилен път" -#: builtin/checkout.c:1201 +#: builtin/checkout.c:1219 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -3860,12 +3888,12 @@ msgstr "" "Ðе можете едновременно да обновÑвате пътища и да преминете към клона „%s“.\n" "Дали не иÑкате да изтеглите „%s“, който не Ñочи към подаване?" -#: builtin/checkout.c:1206 +#: builtin/checkout.c:1224 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: опциÑта „--detach“ не приема аргумент-път „%s“" -#: builtin/checkout.c:1210 +#: builtin/checkout.c:1228 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -3956,17 +3984,18 @@ msgstr "ПРЕДУПРЕЖДЕÐИЕ: Ðикой обект не напаÑва msgid "Select items to delete" msgstr "Избиране на обекти за изтриване" -#: builtin/clean.c:757 +#. TRANSLATORS: Make sure to keep [y/N] as is +#: builtin/clean.c:758 #, c-format -msgid "remove %s? " -msgstr "Да Ñе изтрие ли „%s“? " +msgid "Remove %s [y/N]? " +msgstr "Да Ñе изтрие ли „%s“? „y“ — да, „N“ — ÐЕ" # FIXME improve message -#: builtin/clean.c:782 +#: builtin/clean.c:783 msgid "Bye." msgstr "Изход." -#: builtin/clean.c:790 +#: builtin/clean.c:791 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -3985,63 +4014,63 @@ msgstr "" "? — подÑказка за шаблоните" # FIXME how many *** -#: builtin/clean.c:817 +#: builtin/clean.c:818 msgid "*** Commands ***" msgstr "â—â—◠Команди â—â—â—" # FIXME improve message -#: builtin/clean.c:818 +#: builtin/clean.c:819 msgid "What now" msgstr "Избор на Ñледващо дейÑтвие" -#: builtin/clean.c:826 +#: builtin/clean.c:827 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "СледниÑÑ‚ обект ще бъде изтрит:" msgstr[1] "Следните обекти ще бъдат изтрити:" -#: builtin/clean.c:843 +#: builtin/clean.c:844 msgid "No more files to clean, exiting." msgstr "Файловете за изчиÑтване Ñвършиха. Изход от програмата." -#: builtin/clean.c:874 +#: builtin/clean.c:875 msgid "do not print names of files removed" msgstr "без извеждане на имената на файловете, които ще бъдат изтрити" -#: builtin/clean.c:876 +#: builtin/clean.c:877 msgid "force" msgstr "принудително изтриване" -#: builtin/clean.c:877 +#: builtin/clean.c:878 msgid "interactive cleaning" msgstr "интерактивно изтриване" -#: builtin/clean.c:879 +#: builtin/clean.c:880 msgid "remove whole directories" msgstr "изтриване на цели директории" -#: 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 +#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185 msgid "pattern" msgstr "шаблон" -#: builtin/clean.c:881 +#: builtin/clean.c:882 msgid "add <pattern> to ignore rules" msgstr "добавÑне на ШÐБЛОРот файлове, които да не Ñе триÑÑ‚" -#: builtin/clean.c:882 +#: builtin/clean.c:883 msgid "remove ignored files, too" msgstr "изтриване и на игнорираните файлове" -#: builtin/clean.c:884 +#: builtin/clean.c:885 msgid "remove only ignored files" msgstr "изтриване Ñамо на игнорирани файлове" -#: builtin/clean.c:902 +#: builtin/clean.c:903 msgid "-x and -X cannot be used together" msgstr "опциите „-x“ и „-X“ Ñа неÑъвмеÑтими" -#: builtin/clean.c:906 +#: builtin/clean.c:907 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -4049,7 +4078,7 @@ msgstr "" "ÐаÑтройката „clean.requireForce“ е зададена като иÑтина, което изиÑква нÑÐºÐ¾Ñ " "от опциите „-i“, „-n“ или „-f“. ÐÑма да Ñе извърши изчиÑтване" -#: builtin/clean.c:909 +#: builtin/clean.c:910 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -4059,152 +4088,156 @@ msgstr "" "изчиÑтване" #: builtin/clone.c:37 -msgid "git clone [options] [--] <repo> [<dir>]" +msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [ОПЦИЯ…] [--] ХРÐÐИЛИЩЕ [ДИРЕКТОРИЯ]" -#: builtin/clone.c:65 builtin/fetch.c:112 builtin/merge.c:223 -#: builtin/push.c:514 +#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224 +#: builtin/push.c:523 msgid "force progress reporting" msgstr "извеждане на напредъка" -#: builtin/clone.c:67 +#: builtin/clone.c:68 msgid "don't create a checkout" msgstr "без Ñъздаване на работно дърво" -#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488 +#: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496 msgid "create a bare repository" msgstr "Ñъздаване на голо хранилище" -#: builtin/clone.c:72 +#: builtin/clone.c:73 msgid "create a mirror repository (implies bare)" msgstr "" "Ñъздаване на хранилище-огледало (включва опциÑта „--bare“ за голо хранилище)" -#: builtin/clone.c:74 +#: builtin/clone.c:75 msgid "to clone from a local repository" msgstr "клониране от локално хранилище" -#: builtin/clone.c:76 +#: builtin/clone.c:77 msgid "don't use local hardlinks, always copy" msgstr "без твърди връзки, файловете винаги да Ñе копират" -#: builtin/clone.c:78 +#: builtin/clone.c:79 msgid "setup as shared repository" msgstr "наÑтройване за Ñподелено хранилище" -#: builtin/clone.c:80 builtin/clone.c:82 +#: builtin/clone.c:81 builtin/clone.c:83 msgid "initialize submodules in the clone" msgstr "инициализиране на подмодулите при това клониране" -#: builtin/clone.c:83 builtin/init-db.c:485 +#: builtin/clone.c:84 builtin/init-db.c:493 msgid "template-directory" msgstr "Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð¸" -#: builtin/clone.c:84 builtin/init-db.c:486 +#: builtin/clone.c:85 builtin/init-db.c:494 msgid "directory from which templates will be used" msgstr "директориÑ, коÑто Ñъдържа шаблоните, които да Ñе ползват" -#: builtin/clone.c:86 +#: builtin/clone.c:87 msgid "reference repository" msgstr "еталонно хранилище" -#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "ИМЕ" -#: builtin/clone.c:88 +#: builtin/clone.c:89 msgid "use <name> instead of 'origin' to track upstream" msgstr "използване на това ИМЕ вмеÑто „origin“ при проÑледÑване на клони" -#: builtin/clone.c:90 +#: builtin/clone.c:91 msgid "checkout <branch> instead of the remote's HEAD" msgstr "изтеглÑне на този КЛОÐ, а не ÑочениÑÑ‚ от Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ» „HEAD“" -#: builtin/clone.c:92 +#: builtin/clone.c:93 msgid "path to git-upload-pack on the remote" msgstr "път към командата „git-upload-pack“ на отдалеченото хранилище" -#: builtin/clone.c:93 builtin/fetch.c:113 builtin/grep.c:659 +#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659 msgid "depth" msgstr "ДЪЛБОЧИÐÐ" -#: builtin/clone.c:94 +#: builtin/clone.c:95 msgid "create a shallow clone of that depth" msgstr "плитко клониране до тази ДЪЛБОЧИÐÐ" -#: builtin/clone.c:96 +#: builtin/clone.c:97 msgid "clone only one branch, HEAD or --branch" msgstr "" "клониране Ñамо на един клон — или ÑÐ¾Ñ‡ÐµÐ½Ð¸Ñ Ð¾Ñ‚ Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ â€žHEAD“, или изрично " "Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ñ â€ž--branch“" -#: builtin/clone.c:97 builtin/init-db.c:494 +#: builtin/clone.c:99 +msgid "use --reference only while cloning" +msgstr "опциÑта „--reference“ може да Ñе използва Ñамо при клониране" + +#: builtin/clone.c:100 builtin/init-db.c:502 msgid "gitdir" msgstr "СЛУЖЕБÐÐ_ДИРЕКТОРИЯ" -#: builtin/clone.c:98 builtin/init-db.c:495 +#: builtin/clone.c:101 builtin/init-db.c:503 msgid "separate git dir from working tree" msgstr "отделна СЛУЖЕБÐÐ_ДИРЕКТОРИЯ за git извън работното дърво" -#: builtin/clone.c:99 +#: builtin/clone.c:102 msgid "key=value" msgstr "КЛЮЧ=СТОЙÐОСТ" -#: builtin/clone.c:100 +#: builtin/clone.c:103 msgid "set config inside the new repository" msgstr "задаване на наÑтройките на новото хранилище" -#: builtin/clone.c:253 +#: builtin/clone.c:256 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "еталонното хранилище „%s“ не е локално" -#: builtin/clone.c:257 +#: builtin/clone.c:260 #, c-format msgid "reference repository '%s' is shallow" msgstr "еталонното хранилище „%s“ е плитко" -#: builtin/clone.c:260 +#: builtin/clone.c:263 #, c-format msgid "reference repository '%s' is grafted" msgstr "еталонното хранилище „%s“ е Ñ Ð¿Ñ€Ð¸Ñаждане" -#: builtin/clone.c:322 +#: builtin/clone.c:325 #, c-format msgid "failed to create directory '%s'" msgstr "директориÑта „%s“ не може да бъде Ñъздадена" -#: builtin/clone.c:324 builtin/diff.c:84 +#: builtin/clone.c:327 builtin/diff.c:84 #, c-format msgid "failed to stat '%s'" msgstr "не може да бъде получена Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ñ‡Ñ€ÐµÐ· „stat“ за „%s“" -#: builtin/clone.c:326 +#: builtin/clone.c:329 #, c-format msgid "%s exists and is not a directory" msgstr "„%s“ ÑъщеÑтвува и не е директориÑ" -#: builtin/clone.c:340 +#: builtin/clone.c:343 #, c-format msgid "failed to stat %s\n" msgstr "не може да бъде получена Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ñ‡Ñ€ÐµÐ· „stat“ за „%s“\n" -#: builtin/clone.c:362 +#: builtin/clone.c:365 #, c-format msgid "failed to create link '%s'" msgstr "връзката „%s“ не може да бъде Ñъздадена" -#: builtin/clone.c:366 +#: builtin/clone.c:369 #, c-format msgid "failed to copy file to '%s'" msgstr "файлът не може да бъде копиран като „%s“" -#: builtin/clone.c:389 builtin/clone.c:563 +#: builtin/clone.c:392 builtin/clone.c:566 #, c-format msgid "done.\n" msgstr "дейÑтвието завърши.\n" -#: builtin/clone.c:401 +#: builtin/clone.c:404 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -4215,7 +4248,7 @@ msgstr "" "клон в момента Ñа изтеглени Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ‚Ð° „git status“. Можете да\n" "завършите изтеглÑнето на клона Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ‚Ð° „git checkout -f HEAD“.\n" -#: builtin/clone.c:478 +#: builtin/clone.c:481 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" @@ -4223,112 +4256,124 @@ msgstr "" "и който Ñледва да бъде изтеглен, не ÑъщеÑтвува." # FIXME translator note that the space at end is necesssary -#: builtin/clone.c:558 +#: builtin/clone.c:561 #, c-format msgid "Checking connectivity... " msgstr "Проверка на връзката… " -#: builtin/clone.c:561 +#: builtin/clone.c:564 msgid "remote did not send all necessary objects" msgstr "отдалеченото хранилище не изпрати вÑички необходими обекти." -#: builtin/clone.c:625 +#: builtin/clone.c:628 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "указателÑÑ‚ „HEAD“ от отдалеченото хранилище Ñочи към нещо,\n" "което не ÑъщеÑтвува. Ðе може да Ñе изтегли определен клон.\n" -#: builtin/clone.c:656 +#: builtin/clone.c:659 msgid "unable to checkout working tree" msgstr "работното дърво не може да бъде подготвено" -#: builtin/clone.c:765 +#: builtin/clone.c:746 +msgid "cannot repack to clean up" +msgstr "не може да Ñе извърши пакетиране за изчиÑтване на файловете" + +#: builtin/clone.c:748 +msgid "cannot unlink temporary alternates file" +msgstr "временниÑÑ‚ файл за алтернативни обекти не може да бъде изтрит" + +#: builtin/clone.c:778 msgid "Too many arguments." msgstr "Прекалено много аргументи." -#: builtin/clone.c:769 +#: builtin/clone.c:782 msgid "You must specify a repository to clone." msgstr "ТрÑбва да укажете кое хранилище иÑкате да клонирате." -#: builtin/clone.c:780 +#: builtin/clone.c:793 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "опциите „--bare“ и „--origin %s“ Ñа неÑъвмеÑтими." -#: builtin/clone.c:783 +#: builtin/clone.c:796 msgid "--bare and --separate-git-dir are incompatible." msgstr "опциите „--bare“ и „--separate-git-dir“ Ñа неÑъвмеÑтими." -#: builtin/clone.c:796 +#: builtin/clone.c:809 #, c-format msgid "repository '%s' does not exist" msgstr "не ÑъщеÑтвува хранилище „%s“" -#: builtin/clone.c:802 builtin/fetch.c:1155 +#: builtin/clone.c:815 builtin/fetch.c:1156 #, c-format msgid "depth %s is not a positive number" msgstr "дълбочината Ñ‚Ñ€Ñбва да е положително цÑло чиÑло, а не „%s“" -#: builtin/clone.c:812 +#: builtin/clone.c:825 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "целевиÑÑ‚ път „%s“ ÑъщеÑтвува и не е празна директориÑ." -#: builtin/clone.c:822 +#: builtin/clone.c:835 #, c-format msgid "working tree '%s' already exists." msgstr "в „%s“ вече ÑъщеÑтвува работно дърво." -#: builtin/clone.c:835 builtin/clone.c:847 +#: builtin/clone.c:850 builtin/clone.c:861 #, c-format msgid "could not create leading directories of '%s'" msgstr "родителÑките директории на „%s“ не могат да бъдат Ñъздадени" -#: builtin/clone.c:838 +#: builtin/clone.c:853 #, c-format -msgid "could not create work tree dir '%s'." +msgid "could not create work tree dir '%s'" msgstr "работното дърво в „%s“ не може да бъде Ñъздадено." -#: builtin/clone.c:857 +#: builtin/clone.c:871 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Клониране и Ñъздаване на голо хранилище в „%s“…\n" -#: builtin/clone.c:859 +#: builtin/clone.c:873 #, c-format msgid "Cloning into '%s'...\n" msgstr "Клониране и Ñъздаване на хранилище в „%s“…\n" -#: builtin/clone.c:895 +#: builtin/clone.c:898 +msgid "--dissociate given, but there is no --reference" +msgstr "ОпциÑта „--dissociate“ е неÑъвмеÑтима Ñ â€ž--reference“" + +#: builtin/clone.c:913 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "При локално клониране опциÑта „--depth“ Ñе игнорира. Ползвайте Ñхемата " "„file://“." -#: builtin/clone.c:898 +#: builtin/clone.c:916 msgid "source repository is shallow, ignoring --local" msgstr "клонираното хранилище е плитко, затова опциÑта „--local“ Ñе игнорира" -#: builtin/clone.c:903 +#: builtin/clone.c:921 msgid "--local is ignored" msgstr "опциÑта „--local“ Ñе игнорира" -#: builtin/clone.c:907 +#: builtin/clone.c:925 #, c-format msgid "Don't know how to clone %s" msgstr "Ðе Ñе поддържа клониране на връзки от вида „%s“ " -#: builtin/clone.c:958 builtin/clone.c:966 +#: builtin/clone.c:976 builtin/clone.c:984 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "ОтдалечениÑÑ‚ клон „%s“ липÑва в клонираното хранилище „%s“" -#: builtin/clone.c:969 +#: builtin/clone.c:987 msgid "You appear to have cloned an empty repository." msgstr "Изглежда клонирахте празно хранилище." #: builtin/column.c:9 -msgid "git column [options]" +msgid "git column [<options>]" msgstr "git column [ОПЦИЯ…]" #: builtin/column.c:26 @@ -4360,11 +4405,11 @@ msgid "--command must be the first argument" msgstr "опциÑта „--command“ Ñ‚Ñ€Ñбва да е първиÑÑ‚ аргумент" #: builtin/commit.c:37 -msgid "git commit [options] [--] <pathspec>..." +msgid "git commit [<options>] [--] <pathspec>..." msgstr "git commit [ОПЦИЯ…] [--] ПЪТ…" #: builtin/commit.c:42 -msgid "git status [options] [--] <pathspec>..." +msgid "git status [<options>] [--] <pathspec>..." msgstr "git status [ОПЦИЯ…] [--] ПЪТ…" #: builtin/commit.c:47 @@ -4467,75 +4512,70 @@ msgstr "" "Чрез командата „git cherry-pick --continue“ ще продължите отбирането на\n" "оÑтаналите подаваниÑ.\n" -#: builtin/commit.c:302 +#: builtin/commit.c:304 msgid "failed to unpack HEAD tree object" msgstr "върховото дърво (HEAD tree object) не може да бъде извадено от пакет" -#: builtin/commit.c:342 +#: builtin/commit.c:344 msgid "unable to create temporary index" msgstr "временниÑÑ‚ Ð¸Ð½Ð´ÐµÐºÑ Ð½Ðµ може да бъде Ñъздаден" -#: builtin/commit.c:348 +#: builtin/commit.c:350 msgid "interactive add failed" msgstr "неуÑпешно интерактивно добавÑне" -#: builtin/commit.c:359 +#: builtin/commit.c:361 msgid "unable to write index file" msgstr "индекÑÑŠÑ‚ не може да бъде запиÑан" -#: builtin/commit.c:361 +#: builtin/commit.c:363 msgid "unable to update temporary index" msgstr "временниÑÑ‚ Ð¸Ð½Ð´ÐµÐºÑ Ð½Ðµ може да бъде обновен" -#: builtin/commit.c:363 +#: builtin/commit.c:365 msgid "Failed to update main cache tree" msgstr "Дървото на оÑÐ½Ð¾Ð²Ð½Ð¸Ñ ÐºÐµÑˆ не може да бъде обновено" -#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461 +#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463 msgid "unable to write new_index file" msgstr "новиÑÑ‚ Ð¸Ð½Ð´ÐµÐºÑ Ð½Ðµ може да бъде запиÑан" -#: builtin/commit.c:443 +#: builtin/commit.c:445 msgid "cannot do a partial commit during a merge." msgstr "по време на Ñливане не може да Ñе извърши чаÑтично подаване." -#: builtin/commit.c:445 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a cherry-pick." msgstr "по време на отбиране не може да Ñе извърши чаÑтично подаване." -#: builtin/commit.c:454 +#: builtin/commit.c:456 msgid "cannot read the index" msgstr "индекÑÑŠÑ‚ не може да бъде прочетен" -#: builtin/commit.c:473 +#: builtin/commit.c:475 msgid "unable to write temporary index file" msgstr "временниÑÑ‚ Ð¸Ð½Ð´ÐµÐºÑ Ð½Ðµ може да бъде запиÑан" -#: builtin/commit.c:592 +#: builtin/commit.c:580 #, c-format msgid "commit '%s' lacks author header" msgstr "заглавната чаÑÑ‚ за автор в подаването „%s“ липÑва" -#: builtin/commit.c:594 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' has malformed author line" msgstr "заглавната чаÑÑ‚ за автор в подаването „%s“ е неправилна" -#: builtin/commit.c:613 +#: builtin/commit.c:601 msgid "malformed --author parameter" msgstr "неправилен параметър към опциÑта „--author“" -#: builtin/commit.c:621 +#: builtin/commit.c:609 #, c-format msgid "invalid date format: %s" msgstr "неправилен формат на дата: %s" -#: builtin/commit.c:642 -#, c-format -msgid "Malformed ident string: '%s'" -msgstr "Ðеправилен низ за идентичноÑÑ‚: „%s“" - -#: builtin/commit.c:675 +#: builtin/commit.c:653 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -4543,44 +4583,44 @@ msgstr "" "не може да Ñе избере знак за коментар — в текущото Ñъобщение за подаване Ñа " "използвани вÑички подобни знаци" -#: builtin/commit.c:712 builtin/commit.c:745 builtin/commit.c:1120 +#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 #, c-format msgid "could not lookup commit %s" msgstr "Ñледното подаване не може да бъде открито: %s" -#: builtin/commit.c:724 builtin/shortlog.c:273 +#: builtin/commit.c:702 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "(изчитане на Ñъобщението за подаване от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´)\n" -#: builtin/commit.c:726 +#: builtin/commit.c:704 msgid "could not read log from standard input" msgstr "Ñъобщението за подаване не бе прочетено ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´" -#: builtin/commit.c:730 +#: builtin/commit.c:708 #, c-format msgid "could not read log file '%s'" msgstr "файлът ÑÑŠÑ Ñъобщението за подаване „%s“ не може да бъде прочетен" -#: builtin/commit.c:752 +#: builtin/commit.c:730 msgid "could not read MERGE_MSG" msgstr "Ñъобщението за Ñливане MERGE_MSG не може да бъде прочетено" -#: builtin/commit.c:756 +#: builtin/commit.c:734 msgid "could not read SQUASH_MSG" msgstr "Ñъобщението за Ñмачкване SQUASH_MSG не може да бъде прочетено" -#: builtin/commit.c:760 +#: builtin/commit.c:738 #, c-format msgid "could not read '%s'" msgstr "файлът „%s“ не може да бъде прочетен" -#: builtin/commit.c:831 +#: builtin/commit.c:785 msgid "could not write commit template" msgstr "шаблонът за подаване не може да бъде запазен" # FIXME -#: builtin/commit.c:849 +#: builtin/commit.c:803 #, c-format msgid "" "\n" @@ -4596,7 +4636,7 @@ msgstr "" "и опитайте отново.\n" # FIXME -#: builtin/commit.c:854 +#: builtin/commit.c:808 #, c-format msgid "" "\n" @@ -4612,7 +4652,7 @@ msgstr "" " %s\n" "и опитайте отново.\n" -#: builtin/commit.c:867 +#: builtin/commit.c:821 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4621,7 +4661,7 @@ msgstr "" "Въведете Ñъобщението за подаване на промените. Редовете, които започват\n" "Ñ â€ž%c“, ще бъдат пропуÑнати, а празно Ñъобщение преуÑтановÑва подаването.\n" -#: builtin/commit.c:874 +#: builtin/commit.c:828 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4632,94 +4672,96 @@ msgstr "" "Ñ â€ž%c“, Ñъщо ще бъдат включени — може да ги изтриете вие. Празно \n" "Ñъобщение преуÑтановÑва подаването.\n" -#: builtin/commit.c:888 +#: builtin/commit.c:848 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sÐвтор: %.*s <%.*s>" -#: builtin/commit.c:896 +#: builtin/commit.c:856 #, c-format msgid "%sDate: %s" msgstr "%sДата: %s" -#: builtin/commit.c:903 +#: builtin/commit.c:863 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sПодаващ: %.*s <%.*s>" -#: builtin/commit.c:921 +#: builtin/commit.c:881 msgid "Cannot read index" msgstr "ИндекÑÑŠÑ‚ не може да бъде прочетен" -#: builtin/commit.c:978 +#: builtin/commit.c:938 msgid "Error building trees" msgstr "Грешка при изграждане на дърветата" -#: builtin/commit.c:993 builtin/tag.c:495 +#: builtin/commit.c:953 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:1095 +#: builtin/commit.c:1055 #, c-format -msgid "No existing author found with '%s'" -msgstr "Ðе е открит автор Ñ Ð¸Ð¼Ðµ „%s“." +msgid "--author '%s' is not 'Name <email>' and matches no existing author" +msgstr "" +"ОпциÑта „--author '%s'“ не Ð¾Ñ‚Ð³Ð¾Ð²Ð°Ñ€Ñ Ð½Ð° форма̀та „Име <е-поща>“ и не Ñъвпада Ñ " +"никой автор" -#: builtin/commit.c:1110 builtin/commit.c:1350 +#: builtin/commit.c:1070 builtin/commit.c:1310 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ðеправилна ÑтойноÑÑ‚ за неÑледените файлове: „%s“" -#: builtin/commit.c:1147 +#: builtin/commit.c:1107 msgid "--long and -z are incompatible" msgstr "Опциите „--long“ и „-z“ Ñа неÑъвмеÑтими." -#: builtin/commit.c:1177 +#: builtin/commit.c:1137 msgid "Using both --reset-author and --author does not make sense" msgstr "Опциите „--reset-author“ и „--author“ Ñа неÑъвмеÑтими." -#: builtin/commit.c:1186 +#: builtin/commit.c:1146 msgid "You have nothing to amend." msgstr "ÐÑма какво да бъде поправено." -#: builtin/commit.c:1189 +#: builtin/commit.c:1149 msgid "You are in the middle of a merge -- cannot amend." msgstr "Ð’ момента Ñе извършва Ñливане, не можете да поправÑте." -#: builtin/commit.c:1191 +#: builtin/commit.c:1151 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Ð’ момента Ñе извършва отбиране на подаване, не можете да поправÑте." -#: builtin/commit.c:1194 +#: builtin/commit.c:1154 msgid "Options --squash and --fixup cannot be used together" msgstr "Опциите „--squash“ и „--fixup“ Ñа неÑъвмеÑтими." -#: builtin/commit.c:1204 +#: builtin/commit.c:1164 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Опциите „-c“, „-C“, „-F“ и „--fixup““ Ñа неÑъвмеÑтими." -#: builtin/commit.c:1206 +#: builtin/commit.c:1166 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "ОпциÑта „-m“ е неÑъвмеÑтима Ñ â€ž-c“, „-C“, „-F“ и „--fixup“." -#: builtin/commit.c:1214 +#: builtin/commit.c:1174 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" "ОпциÑта „--reset-author“ може да Ñе използва Ñамо заедно Ñ â€ž-C“, „-c“ или\n" "„--amend“." -#: builtin/commit.c:1231 +#: builtin/commit.c:1191 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Опциите „--include“, „--only“, „--all“, „--interactive“ и „--patch“ Ñа\n" "неÑъвмеÑтими." -#: builtin/commit.c:1233 +#: builtin/commit.c:1193 msgid "No paths with --include/--only does not make sense." msgstr "Опциите „--include“ и „--only“ изиÑкват аргументи." # FIXME bad message -#: builtin/commit.c:1235 +#: builtin/commit.c:1195 msgid "Clever... amending the last one with dirty index." msgstr "" "ЧудеÑно Ñте Ñе Ñетили как да поправите Ñъобщението на поÑледното подаване " @@ -4727,63 +4769,63 @@ msgstr "" "променен индекÑ. Споделете и Ñ Ð´Ñ€ÑƒÐ³ потребител трика Ñ â€žgit commit --amend -" "o“." -#: builtin/commit.c:1237 +#: builtin/commit.c:1197 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" "Зададени Ñа изрични пътища без опциите „-i“ или „-o“. Приема Ñе, че вÑе едно " "Ñте\n" "ползвали опциÑта „--only“ Ñ ÐŸÐªÐ¢Ð¸Ñ‰Ð°â€¦" -#: builtin/commit.c:1249 builtin/tag.c:728 +#: builtin/commit.c:1209 builtin/tag.c:728 #, c-format msgid "Invalid cleanup mode %s" msgstr "ÐеÑъщеÑтвуващ режим на изчиÑтване „%s“" -#: builtin/commit.c:1254 +#: builtin/commit.c:1214 msgid "Paths with -a does not make sense." msgstr "ОпциÑта „-a“ е неÑъвмеÑтима ÑÑŠÑ Ð·Ð°Ð´Ð°Ð²Ð°Ð½ÐµÑ‚Ð¾ на пътища." -#: builtin/commit.c:1364 builtin/commit.c:1644 +#: builtin/commit.c:1324 builtin/commit.c:1604 msgid "show status concisely" msgstr "кратка Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° ÑÑŠÑтоÑнието" -#: builtin/commit.c:1366 builtin/commit.c:1646 +#: builtin/commit.c:1326 builtin/commit.c:1606 msgid "show branch information" msgstr "Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° клоните" -#: builtin/commit.c:1368 builtin/commit.c:1648 builtin/push.c:500 +#: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509 msgid "machine-readable output" msgstr "формат на изхода за четене от програма" -#: builtin/commit.c:1371 builtin/commit.c:1650 +#: builtin/commit.c:1331 builtin/commit.c:1610 msgid "show status in long format (default)" msgstr "подробна Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° ÑÑŠÑтоÑнието (Ñтандартно)" -#: builtin/commit.c:1374 builtin/commit.c:1653 +#: builtin/commit.c:1334 builtin/commit.c:1613 msgid "terminate entries with NUL" msgstr "разделÑне на елементите Ñ Ð½ÑƒÐ»ÐµÐ²Ð¸Ñ Ð·Ð½Ð°Ðº „NUL“" -#: builtin/commit.c:1376 builtin/commit.c:1656 builtin/fast-export.c:980 +#: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980 #: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "режим" -#: builtin/commit.c:1377 builtin/commit.c:1656 +#: builtin/commit.c:1337 builtin/commit.c:1616 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "извеждане на неÑледените файлове. Възможните режими Ñа „all“ (подробна\n" "информациÑ), „normal“ (кратка информациÑ), „no“ (без неÑледените файлове).\n" "СтандартниÑÑ‚ режим е: „all“." -#: builtin/commit.c:1380 +#: builtin/commit.c:1340 msgid "show ignored files" msgstr "извеждане на игнорираните файлове" -#: builtin/commit.c:1381 parse-options.h:153 +#: builtin/commit.c:1341 parse-options.h:153 msgid "when" msgstr "кога" -#: builtin/commit.c:1382 +#: builtin/commit.c:1342 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -4792,213 +4834,213 @@ msgstr "" "една от\n" "„all“ (вÑички), „dirty“ (тези Ñ Ð½ÐµÐ¿Ð¾Ð´Ð°Ð´ÐµÐ½Ð¸ промени), „untracked“ (неÑледени)" -#: builtin/commit.c:1384 +#: builtin/commit.c:1344 msgid "list untracked files in columns" msgstr "извеждане на неÑледените файлове в колони" -#: builtin/commit.c:1471 +#: builtin/commit.c:1431 msgid "couldn't look up newly created commit" msgstr "току що Ñъздаденото подаване не може да бъде открито" -#: builtin/commit.c:1473 +#: builtin/commit.c:1433 msgid "could not parse newly created commit" msgstr "току що Ñъздаденото подаване не може да бъде анализирано" -#: builtin/commit.c:1518 +#: builtin/commit.c:1478 msgid "detached HEAD" msgstr "неÑвързан връх „HEAD“" -#: builtin/commit.c:1521 +#: builtin/commit.c:1481 msgid " (root-commit)" msgstr " (начално подаване)" -#: builtin/commit.c:1614 +#: builtin/commit.c:1574 msgid "suppress summary after successful commit" msgstr "без Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ñлед уÑпешно подаване" -#: builtin/commit.c:1615 +#: builtin/commit.c:1575 msgid "show diff in commit message template" msgstr "добавÑне на разликата към шаблона за Ñъобщението при подаване" -#: builtin/commit.c:1617 +#: builtin/commit.c:1577 msgid "Commit message options" msgstr "Опции за Ñъобщението при подаване" -#: builtin/commit.c:1618 builtin/tag.c:601 +#: builtin/commit.c:1578 builtin/tag.c:601 msgid "read message from file" msgstr "взимане на Ñъобщението от файл" -#: builtin/commit.c:1619 +#: builtin/commit.c:1579 msgid "author" msgstr "автор" -#: builtin/commit.c:1619 +#: builtin/commit.c:1579 msgid "override author for commit" msgstr "задаване на автор за подаването" -#: builtin/commit.c:1620 builtin/gc.c:275 +#: builtin/commit.c:1580 builtin/gc.c:275 msgid "date" msgstr "дата" -#: builtin/commit.c:1620 +#: builtin/commit.c:1580 msgid "override date for commit" msgstr "задаване на дата за подаването" -#: builtin/commit.c:1621 builtin/merge.c:217 builtin/notes.c:408 -#: builtin/notes.c:565 builtin/tag.c:599 +#: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391 +#: builtin/notes.c:554 builtin/tag.c:599 msgid "message" msgstr "Ñъобщение" -#: builtin/commit.c:1621 +#: builtin/commit.c:1581 msgid "commit message" msgstr "Ñъобщение при подаване" -#: builtin/commit.c:1622 +#: builtin/commit.c:1582 msgid "reuse and edit message from specified commit" msgstr "преизползване и редактиране на Ñъобщението от указаното подаване" -#: builtin/commit.c:1623 +#: builtin/commit.c:1583 msgid "reuse message from specified commit" msgstr "преизползване на Ñъобщението от указаното подаване" -#: builtin/commit.c:1624 +#: builtin/commit.c:1584 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "използване на автоматичното Ñъобщение при Ñмачкване за вкарване на " "указаното\n" "подаване в предното без Ñледа" -#: builtin/commit.c:1625 +#: builtin/commit.c:1585 msgid "use autosquash formatted message to squash specified commit" msgstr "" "използване на автоматичното Ñъобщение при Ñмачкване за Ñмачкване на " "указаното\n" "подаване в предното" -#: builtin/commit.c:1626 +#: builtin/commit.c:1586 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "ÑмÑна на автора да Ñъвпада Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ñ‰Ð¸Ñ (използва Ñе Ñ â€ž-C“/„-c“/„--amend“)" -#: builtin/commit.c:1627 builtin/log.c:1191 builtin/revert.c:86 +#: builtin/commit.c:1587 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "добавÑне на поле за Ð¿Ð¾Ð´Ð¿Ð¸Ñ â€” „Signed-off-by:“" -#: builtin/commit.c:1628 +#: builtin/commit.c:1588 msgid "use specified template file" msgstr "използване на ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½ÐµÐ½ файл" -#: builtin/commit.c:1629 +#: builtin/commit.c:1589 msgid "force edit of commit" msgstr "редактиране на подаване" -#: builtin/commit.c:1630 +#: builtin/commit.c:1590 msgid "default" msgstr "Ñтандартно" -#: builtin/commit.c:1630 builtin/tag.c:604 +#: builtin/commit.c:1590 builtin/tag.c:604 msgid "how to strip spaces and #comments from message" msgstr "кои празни знаци и #коментари да Ñе махат от ÑъобщениÑта" -#: builtin/commit.c:1631 +#: builtin/commit.c:1591 msgid "include status in commit message template" msgstr "вмъкване на ÑÑŠÑтоÑнието в шаблона за Ñъобщението при подаване" -#: builtin/commit.c:1632 builtin/merge.c:224 builtin/revert.c:92 +#: builtin/commit.c:1592 builtin/merge.c:225 builtin/revert.c:92 #: builtin/tag.c:605 msgid "key-id" msgstr "ИДЕÐТИФИКÐТОР_ÐÐ_КЛЮЧ" -#: builtin/commit.c:1633 builtin/merge.c:225 builtin/revert.c:93 +#: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93 msgid "GPG sign commit" msgstr "подпиÑване на подаването Ñ GPG" -#: builtin/commit.c:1636 +#: builtin/commit.c:1596 msgid "Commit contents options" msgstr "Опции за избор на файлове при подаване" -#: builtin/commit.c:1637 +#: builtin/commit.c:1597 msgid "commit all changed files" msgstr "подаване на вÑички променени файлове" -#: builtin/commit.c:1638 +#: builtin/commit.c:1598 msgid "add specified files to index for commit" msgstr "добавÑне на указаните файлове към индекÑа за подаване" -#: builtin/commit.c:1639 +#: builtin/commit.c:1599 msgid "interactively add files" msgstr "интерактивно добавÑне на файлове" -#: builtin/commit.c:1640 +#: builtin/commit.c:1600 msgid "interactively add changes" msgstr "интерактивно добавÑне на промени" -#: builtin/commit.c:1641 +#: builtin/commit.c:1601 msgid "commit only specified files" msgstr "подаване Ñамо на указаните файлове" -#: builtin/commit.c:1642 +#: builtin/commit.c:1602 msgid "bypass pre-commit hook" msgstr "без изпълнение на куката преди подаване (pre-commit)" -#: builtin/commit.c:1643 +#: builtin/commit.c:1603 msgid "show what would be committed" msgstr "отпечатване на това, което би било подадено" -#: builtin/commit.c:1654 +#: builtin/commit.c:1614 msgid "amend previous commit" msgstr "поправÑне на предишното подаване" -#: builtin/commit.c:1655 +#: builtin/commit.c:1615 msgid "bypass post-rewrite hook" msgstr "без изпълнение на куката Ñлед презапиÑване (post-rewrite)" -#: builtin/commit.c:1660 +#: builtin/commit.c:1620 msgid "ok to record an empty change" msgstr "позволÑване на празни подаваниÑ" -#: builtin/commit.c:1662 +#: builtin/commit.c:1622 msgid "ok to record a change with an empty message" msgstr "позволÑване на Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ Ñ Ð¿Ñ€Ð°Ð·Ð½Ð¸ ÑъобщениÑ" -#: builtin/commit.c:1691 +#: builtin/commit.c:1651 msgid "could not parse HEAD commit" msgstr "върховото подаване „HEAD“ не може да бъде прочетено" -#: builtin/commit.c:1730 builtin/merge.c:518 +#: builtin/commit.c:1690 builtin/merge.c:519 #, c-format msgid "could not open '%s' for reading" msgstr "файлът не може да бъде прочетен: „%s“" -#: builtin/commit.c:1737 +#: builtin/commit.c:1697 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Повреден файл за върха за Ñливането „MERGE_HEAD“ (%s)" -#: builtin/commit.c:1744 +#: builtin/commit.c:1704 msgid "could not read MERGE_MODE" msgstr "режимът на Ñливане „MERGE_MODE“ не може да бъде прочетен" -#: builtin/commit.c:1763 +#: builtin/commit.c:1723 #, c-format msgid "could not read commit message: %s" msgstr "Ñъобщението за подаване не може да бъде прочетено: %s" -#: builtin/commit.c:1774 +#: builtin/commit.c:1734 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Ðеизвършване на подаване поради нередактирано Ñъобщение.\n" -#: builtin/commit.c:1779 +#: builtin/commit.c:1739 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Ðеизвършване на подаване поради празно Ñъобщение.\n" -#: builtin/commit.c:1794 builtin/merge.c:850 builtin/merge.c:875 +#: builtin/commit.c:1754 builtin/merge.c:851 builtin/merge.c:876 msgid "failed to write commit object" msgstr "обектът за подаването не може да бъде запиÑан" -#: builtin/commit.c:1827 +#: builtin/commit.c:1787 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5009,7 +5051,7 @@ msgstr "" "превишили диÑковата Ñи квота. След това изпълнете „git reset HEAD“." #: builtin/config.c:8 -msgid "git config [options]" +msgid "git config [<options>]" msgstr "git config [ОПЦИЯ…]" #: builtin/config.c:53 @@ -5097,17 +5139,13 @@ msgstr "изброÑване на вÑички" msgid "open an editor" msgstr "отварÑне на редактор" -#: builtin/config.c:72 builtin/config.c:73 -msgid "slot" -msgstr "наÑтройка" - #: builtin/config.c:72 -msgid "find the color configured: [default]" -msgstr "извеждане на Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ñ†Ð²ÑÑ‚: [Ñтандартно]" +msgid "find the color configured: slot [default]" +msgstr "извеждане на Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ñ†Ð²ÑÑ‚: номер [Ñтандартно]" #: builtin/config.c:73 -msgid "find the color setting: [stdout-is-tty]" -msgstr "извеждане на Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ñ†Ð²ÑÑ‚: [ÑтандартниÑÑ‚ изход е терминал]" +msgid "find the color setting: slot [stdout-is-tty]" +msgstr "извеждане на Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ñ†Ð²ÑÑ‚: номер [ÑтандартниÑÑ‚ изход е терминал]" #: builtin/config.c:74 msgid "Type" @@ -5142,11 +5180,11 @@ msgstr "разделÑне на ÑтойноÑтите Ñ Ð½ÑƒÐ»ÐµÐ²Ð¸Ñ Ð·Ð½Ð°Ð msgid "respect include directives on lookup" msgstr "при Ñ‚ÑŠÑ€Ñене да Ñе уважат и директивите за включване" -#: builtin/config.c:315 +#: builtin/config.c:316 msgid "unable to parse default color value" msgstr "неразпозната ÑтойноÑÑ‚ на ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ñ†Ð²ÑÑ‚" -#: builtin/config.c:455 +#: builtin/config.c:457 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -5161,7 +5199,7 @@ msgstr "" "#\tuser = %s\n" "#\temail = %s\n" -#: builtin/config.c:590 +#: builtin/config.c:589 #, c-format msgid "cannot create configuration file %s" msgstr "конфигурационниÑÑ‚ файл „%s“ не може да бъде Ñъздаден" @@ -5176,11 +5214,11 @@ msgstr "извеждане на размерите на обектите във # FIXME ... instead of *??? #: builtin/describe.c:17 -msgid "git describe [options] <commit-ish>*" +msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [ОПЦИЯ…] УКÐЗÐТЕЛ_КЪМ_ПОДÐÐ’ÐÐЕ…" #: builtin/describe.c:18 -msgid "git describe [options] --dirty" +msgid "git describe [<options>] --dirty" msgstr "git describe [ОПЦИЯ…] --dirty" #: builtin/describe.c:217 @@ -5399,180 +5437,180 @@ msgstr "Прилагане на ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ Ð½Ð° верÑÐ¸Ñ ÐºÑŠÐ¼ из msgid "anonymize output" msgstr "анонимизиране на извежданата информациÑ" -#: builtin/fetch.c:20 +#: builtin/fetch.c:19 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [ОПЦИЯ…] [ХРÐÐИЛИЩЕ [УКÐЗÐТЕЛ…]]" -#: builtin/fetch.c:21 +#: builtin/fetch.c:20 msgid "git fetch [<options>] <group>" msgstr "git fetch [ОПЦИЯ…] ГРУПÐ" -#: builtin/fetch.c:22 +#: builtin/fetch.c:21 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [ОПЦИЯ…] [(ХРÐÐИЛИЩЕ | ГРУПÐ)…]" -#: builtin/fetch.c:23 +#: builtin/fetch.c:22 msgid "git fetch --all [<options>]" msgstr "git fetch --all [ОПЦИЯ…]" -#: builtin/fetch.c:90 +#: builtin/fetch.c:89 msgid "fetch from all remotes" msgstr "доÑтавÑне от вÑички отдалечени хранилища" -#: builtin/fetch.c:92 +#: builtin/fetch.c:91 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "добавÑне към „.git/FETCH_HEAD“ вмеÑто замÑна" -#: builtin/fetch.c:94 +#: builtin/fetch.c:93 msgid "path to upload pack on remote end" msgstr "отдалечен път, където да Ñе качи пакетът" -#: builtin/fetch.c:95 +#: builtin/fetch.c:94 msgid "force overwrite of local branch" msgstr "принудително презапиÑване на Ð»Ð¾ÐºÐ°Ð»Ð½Ð¸Ñ ÐºÐ»Ð¾Ð½" -#: builtin/fetch.c:97 +#: builtin/fetch.c:96 msgid "fetch from multiple remotes" msgstr "доÑтавÑне от множеÑтво отдалечени хранилища" -#: builtin/fetch.c:99 +#: builtin/fetch.c:98 msgid "fetch all tags and associated objects" msgstr "доÑтавÑне на вÑички етикети и принадлежащи обекти" -#: builtin/fetch.c:101 +#: builtin/fetch.c:100 msgid "do not fetch all tags (--no-tags)" msgstr "без доÑтавÑнето на вÑички етикети „--no-tags“" -#: builtin/fetch.c:103 +#: builtin/fetch.c:102 msgid "prune remote-tracking branches no longer on remote" msgstr "окаÑÑ‚Ñ€Ñне на клоните ÑледÑщи вече неÑъщеÑтвуващи отдалечени клони" -#: builtin/fetch.c:104 +#: builtin/fetch.c:103 msgid "on-demand" msgstr "при нужда" -#: builtin/fetch.c:105 +#: builtin/fetch.c:104 msgid "control recursive fetching of submodules" msgstr "управление на рекурÑивното доÑтавÑне на подмодулите" -#: builtin/fetch.c:109 +#: builtin/fetch.c:108 msgid "keep downloaded pack" msgstr "запазване на изтеглените пакети Ñ Ð¾Ð±ÐµÐºÑ‚Ð¸" -#: builtin/fetch.c:111 +#: builtin/fetch.c:110 msgid "allow updating of HEAD ref" msgstr "позволÑване на обновÑването на ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€žHEAD“" -#: builtin/fetch.c:114 +#: builtin/fetch.c:113 msgid "deepen history of shallow clone" msgstr "задълбочаване на иÑториÑта на плитко хранилище" -#: builtin/fetch.c:116 +#: builtin/fetch.c:115 msgid "convert to a complete repository" msgstr "превръщане в пълно хранилище" -#: builtin/fetch.c:118 builtin/log.c:1208 +#: builtin/fetch.c:117 builtin/log.c:1208 msgid "dir" msgstr "директориÑ" -#: builtin/fetch.c:119 +#: builtin/fetch.c:118 msgid "prepend this to submodule path output" msgstr "добавÑне на това пред Ð¿ÑŠÑ‚Ñ Ð½Ð° подмодула" -#: builtin/fetch.c:122 +#: builtin/fetch.c:121 msgid "default mode for recursion" msgstr "Ñтандартен режим на рекурÑиÑ" -#: builtin/fetch.c:124 +#: builtin/fetch.c:123 msgid "accept refs that update .git/shallow" msgstr "приемане на указатели, които обновÑват „.git/shallow“" -#: builtin/fetch.c:125 +#: builtin/fetch.c:124 msgid "refmap" msgstr "карта Ñ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ð¸" -#: builtin/fetch.c:126 +#: builtin/fetch.c:125 msgid "specify fetch refmap" msgstr "указване на картата Ñ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ð¸ за доÑтавÑне" -#: builtin/fetch.c:376 +#: builtin/fetch.c:375 msgid "Couldn't find remote ref HEAD" msgstr "УказателÑÑ‚ „HEAD“ в отдалеченото хранилище не може да бъде открит" -#: builtin/fetch.c:454 +#: builtin/fetch.c:455 #, c-format msgid "object %s not found" msgstr "обектът „%s“ липÑва" -#: builtin/fetch.c:459 +#: builtin/fetch.c:460 msgid "[up to date]" msgstr "[актуализиран]" -#: builtin/fetch.c:473 +#: builtin/fetch.c:474 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s → %s (в Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ ÐºÐ»Ð¾Ð½ не може да Ñе доÑтавÑ)" -#: builtin/fetch.c:474 builtin/fetch.c:560 +#: builtin/fetch.c:475 builtin/fetch.c:561 msgid "[rejected]" msgstr "[отхвърлен]" -#: builtin/fetch.c:485 +#: builtin/fetch.c:486 msgid "[tag update]" msgstr "[обновÑване на етикетите]" -#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540 +#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541 msgid " (unable to update local ref)" msgstr " (локалните указатели не могат да бъдат обновени)" -#: builtin/fetch.c:505 +#: builtin/fetch.c:506 msgid "[new tag]" msgstr "[нов етикет]" -#: builtin/fetch.c:508 +#: builtin/fetch.c:509 msgid "[new branch]" msgstr "[нов клон]" -#: builtin/fetch.c:511 +#: builtin/fetch.c:512 msgid "[new ref]" msgstr "[нов указател]" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "unable to update local ref" msgstr "локален указател не може да бъде обновен" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "forced update" msgstr "принудително обновÑване" -#: builtin/fetch.c:562 +#: builtin/fetch.c:563 msgid "(non-fast-forward)" msgstr "(Ñливането не е тривиално)" -#: builtin/fetch.c:595 builtin/fetch.c:828 +#: builtin/fetch.c:596 builtin/fetch.c:829 #, c-format msgid "cannot open %s: %s\n" msgstr "файлът „%s“ не може да бъде отворен: %s\n" -#: builtin/fetch.c:604 +#: builtin/fetch.c:605 #, c-format msgid "%s did not send all necessary objects\n" msgstr "хранилището „%s“ не изпрати вÑички необходими обекти\n" -#: builtin/fetch.c:622 +#: builtin/fetch.c:623 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "отхвърлÑне на върха „%s“, защото плитките хранилища не могат да бъдат " "обновÑвани" -#: builtin/fetch.c:710 builtin/fetch.c:793 +#: builtin/fetch.c:711 builtin/fetch.c:794 #, c-format msgid "From %.*s\n" msgstr "От %.*s\n" # FIXME - is the space necessary -#: builtin/fetch.c:721 +#: builtin/fetch.c:722 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5582,55 +5620,55 @@ msgstr "" "„git remote prune %s“, за да премахнете оÑтарелите клони, които\n" "предизвикват конфликта" -#: builtin/fetch.c:773 +#: builtin/fetch.c:774 #, c-format msgid " (%s will become dangling)" msgstr " (обектът „%s“ ще Ñе окаже извън клон)" -#: builtin/fetch.c:774 +#: builtin/fetch.c:775 #, c-format msgid " (%s has become dangling)" msgstr " (обектът „%s“ вече е извън клон)" -#: builtin/fetch.c:798 +#: builtin/fetch.c:799 msgid "[deleted]" msgstr "[изтрит]" -#: builtin/fetch.c:799 builtin/remote.c:1063 +#: builtin/fetch.c:800 builtin/remote.c:1060 msgid "(none)" msgstr "(нищо)" -#: builtin/fetch.c:818 +#: builtin/fetch.c:819 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Ðе може да изтеглÑте в Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ ÐºÐ»Ð¾Ð½ „%s“ на хранилище, което не е голо" -#: builtin/fetch.c:837 +#: builtin/fetch.c:838 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "СтойноÑтта „%2$s“ за опциÑта „%1$s“ не е ÑъвмеÑтима Ñ â€ž%3$s“" -#: builtin/fetch.c:840 +#: builtin/fetch.c:841 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "ОпциÑта „%s“ Ñе игнорира при „%s“\n" -#: builtin/fetch.c:896 +#: builtin/fetch.c:897 #, c-format msgid "Don't know how to fetch from %s" msgstr "Ðе Ñе поддържа доÑтавÑне от „%s“" -#: builtin/fetch.c:1058 +#: builtin/fetch.c:1059 #, c-format msgid "Fetching %s\n" msgstr "ДоÑтавÑне на „%s“\n" -#: builtin/fetch.c:1060 builtin/remote.c:90 +#: builtin/fetch.c:1061 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "„%s“ не може да Ñе доÑтави" -#: builtin/fetch.c:1078 +#: builtin/fetch.c:1079 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5638,114 +5676,116 @@ msgstr "" "Ðе Ñте указали отдалечено хранилище. Задайте или адреÑ, или име\n" "на отдалечено хранилище, откъдето да Ñе доÑтавÑÑ‚ новите верÑии." -#: builtin/fetch.c:1101 +#: builtin/fetch.c:1102 msgid "You need to specify a tag name." msgstr "ТрÑбва да укажете име на етикет." -#: builtin/fetch.c:1143 +#: builtin/fetch.c:1144 msgid "--depth and --unshallow cannot be used together" msgstr "опциите „--depth“ и „--unshallow“ Ñа неÑъвмеÑтими" -#: builtin/fetch.c:1145 +#: builtin/fetch.c:1146 msgid "--unshallow on a complete repository does not make sense" msgstr "не можете да използвате опциÑта „--unshallow“ върху пълно хранилище" -#: builtin/fetch.c:1168 +#: builtin/fetch.c:1169 msgid "fetch --all does not take a repository argument" msgstr "към „git fetch --all“ не можете да добавите аргумент — хранилище" -#: builtin/fetch.c:1170 +#: builtin/fetch.c:1171 msgid "fetch --all does not make sense with refspecs" msgstr "" "към „git fetch --all“ не можете да добавите аргумент — указател на верÑиÑ" -#: builtin/fetch.c:1181 +#: builtin/fetch.c:1182 #, c-format msgid "No such remote or remote group: %s" msgstr "ÐÑма нито отдалечено хранилище, нито група от хранилища на име „%s“" -#: builtin/fetch.c:1189 +#: builtin/fetch.c:1190 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Указването на група и указването на верÑÐ¸Ñ Ñа неÑъвмеÑтими" #: builtin/fmt-merge-msg.c:13 -msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" -msgstr "git fmt-merge-msg [-m СЪОБЩЕÐИЕ] [--log[=БРОЙ]|--no-log] [--file ФÐЙЛ]" +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:197 builtin/repack.c:179 builtin/repack.c:183 -#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:590 +#: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698 +#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182 +#: builtin/show-branch.c:657 builtin/show-ref.c:178 builtin/tag.c:590 #: parse-options.h:132 parse-options.h:239 msgid "n" msgstr "БРОЙ" -#: builtin/fmt-merge-msg.c:664 +#: builtin/fmt-merge-msg.c:663 msgid "populate log with at most <n> entries from shortlog" msgstr "" "вмъкване на журнал ÑÑŠÑтоÑщ Ñе от не повече от БРОЙ запиÑа от ÑÑŠÐºÑ€Ð°Ñ‚ÐµÐ½Ð¸Ñ " "журнал" -#: builtin/fmt-merge-msg.c:667 +#: builtin/fmt-merge-msg.c:666 msgid "alias for --log (deprecated)" msgstr "Ñиноним на „--log“ (оÑтарÑло)" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:669 msgid "text" msgstr "ТЕКСТ" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:670 msgid "use <text> as start of message" msgstr "за начало на Ñъобщението да Ñе ползва ТЕКСТ" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:671 msgid "file to read from" msgstr "файл, от който да Ñе чете" -#: builtin/for-each-ref.c:676 +#: builtin/for-each-ref.c:675 msgid "unable to parse format" msgstr "форматът не може да бъде анализиран" -#: builtin/for-each-ref.c:1057 -msgid "git for-each-ref [options] [<pattern>]" +#: builtin/for-each-ref.c:1063 +msgid "git for-each-ref [<options>] [<pattern>]" msgstr "git for-each-ref [ОПЦИЯ…] [ШÐБЛОÐ]" -#: builtin/for-each-ref.c:1072 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for shells" msgstr "цитиране подходÑщо за командни интерпретатори на обвивката" -#: builtin/for-each-ref.c:1074 +#: builtin/for-each-ref.c:1080 msgid "quote placeholders suitably for perl" msgstr "цитиране подходÑщо за perl" -#: builtin/for-each-ref.c:1076 +#: builtin/for-each-ref.c:1082 msgid "quote placeholders suitably for python" msgstr "цитиране подходÑщо за python" -#: builtin/for-each-ref.c:1078 -msgid "quote placeholders suitably for tcl" +#: builtin/for-each-ref.c:1084 +msgid "quote placeholders suitably for Tcl" msgstr "цитиране подходÑщо за tcl" -#: builtin/for-each-ref.c:1081 +#: builtin/for-each-ref.c:1087 msgid "show only <n> matched refs" msgstr "извеждане Ñамо на този БРОЙ напаÑнати указатели" -#: builtin/for-each-ref.c:1082 builtin/replace.c:438 +#: builtin/for-each-ref.c:1088 builtin/replace.c:438 msgid "format" msgstr "ФОРМÐТ" -#: builtin/for-each-ref.c:1082 +#: builtin/for-each-ref.c:1088 msgid "format to use for the output" msgstr "ФОРМÐТ за изхода" -#: builtin/for-each-ref.c:1083 +#: builtin/for-each-ref.c:1089 msgid "key" msgstr "ключ" -#: builtin/for-each-ref.c:1084 +#: builtin/for-each-ref.c:1090 msgid "field name to sort on" msgstr "име на полето, по което да е подредбата" -#: builtin/fsck.c:147 builtin/prune.c:136 +#: builtin/fsck.c:147 builtin/prune.c:137 msgid "Checking connectivity" msgstr "Проверка на връзката" @@ -5754,7 +5794,7 @@ msgid "Checking object directories" msgstr "Проверка на директориите Ñ Ð¾Ð±ÐµÐºÑ‚Ð¸" #: builtin/fsck.c:603 -msgid "git fsck [options] [<object>...]" +msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [ОПЦИЯ…] [ОБЕКТ…]" #: builtin/fsck.c:609 @@ -5804,7 +5844,7 @@ msgstr "Проверка на обектите" # FIXME plural with ... #: builtin/gc.c:24 -msgid "git gc [options]" +msgid "git gc [<options>]" msgstr "git gc [ОПЦИЯ…]" #: builtin/gc.c:79 @@ -5871,7 +5911,7 @@ msgstr "" # FIXME plural ... options #: builtin/grep.c:23 -msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" +msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [ОПЦИЯ…] [-e] ШÐБЛОР[ВЕРСИЯ…] [[--] ПЪТ…]" #: builtin/grep.c:218 @@ -5912,8 +5952,8 @@ msgid "search in both tracked and untracked files" msgstr "Ñ‚ÑŠÑ€Ñене и в Ñледените, и в неÑледените файлове" #: builtin/grep.c:644 -msgid "search also in ignored files" -msgstr "Ñ‚ÑŠÑ€Ñене и в игнорираните файлове" +msgid "ignore files specified via '.gitignore'" +msgstr "игнориране на файловете указани в „.gitignore“" #: builtin/grep.c:647 msgid "show non-matching lines" @@ -6112,17 +6152,18 @@ msgstr "опциÑта „--cached“ е неÑъвмеÑтима ÑÑŠÑ Ð·Ð°Ð´Ð #: builtin/hash-object.c:82 msgid "" -"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " -"<file>..." +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " +"[--] <file>..." msgstr "" -"git hash-object [-t ВИД] [-w] [--path=ФÐЙЛ|--no-filters] [--stdin] [--] ФÐЙЛ…" +"git hash-object [-t ВИД] [-w] [--path=ФÐЙЛ | --no-filters] [--stdin] [--] " +"ФÐЙЛ…" # FIXME - list of paths or path... #: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "git hash-object --stdin-paths < ПЪТ…" -#: builtin/hash-object.c:94 builtin/tag.c:610 +#: builtin/hash-object.c:94 builtin/tag.c:612 msgid "type" msgstr "ВИД" @@ -6174,8 +6215,8 @@ msgid "show info page" msgstr "показване на информационна Ñтраница" #: builtin/help.c:52 -msgid "git help [--all] [--guides] [--man|--web|--info] [command]" -msgstr "git help [--all] [--guides] [--man|--web|--info] [КОМÐÐДÐ]" +msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" +msgstr "git help [--all] [--guides] [--man | --web | --info] [КОМÐÐДÐ]" #: builtin/help.c:64 #, c-format @@ -6218,63 +6259,63 @@ msgstr "" "„%s“: команда за поддържана програма за преглед на\n" " ръководÑтвото. ВмеÑто Ð½ÐµÑ Ð¿Ñ€Ð¾Ð±Ð²Ð°Ð¹Ñ‚Ðµ „man.<tool>.path“." -#: builtin/help.c:352 +#: builtin/help.c:354 #, c-format msgid "'%s': unknown man viewer." msgstr "„%s“: непозната програма за преглед на ръководÑтвото." -#: builtin/help.c:369 +#: builtin/help.c:371 msgid "no man viewer handled the request" msgstr "Ð½Ð¸ÐºÐ¾Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° за преглед на ръководÑтво не уÑÐ¿Ñ Ð´Ð° обработи заÑвката" -#: builtin/help.c:377 +#: builtin/help.c:379 msgid "no info viewer handled the request" msgstr "" "Ð½Ð¸ÐºÐ¾Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° за преглед на информационните Ñтраници не уÑÐ¿Ñ Ð´Ð° обработи " "заÑвката" -#: builtin/help.c:423 +#: builtin/help.c:428 msgid "Defining attributes per path" msgstr "Указване на атрибути към път" -#: builtin/help.c:424 +#: builtin/help.c:429 msgid "Everyday Git With 20 Commands Or So" msgstr "Ежедневието в Git в рамките на 20-ина команди" -#: builtin/help.c:425 +#: builtin/help.c:430 msgid "A Git glossary" msgstr "Речник Ñ Ñ‚ÐµÑ€Ð¼Ð¸Ð½Ð¸Ñ‚Ðµ на Git" -#: builtin/help.c:426 +#: builtin/help.c:431 msgid "Specifies intentionally untracked files to ignore" msgstr "Указване на неÑледени файлове, които да бъдат нарочно пренебрегвани" -#: builtin/help.c:427 +#: builtin/help.c:432 msgid "Defining submodule properties" msgstr "Дефиниране на ÑвойÑтвата на подмодулите" -#: builtin/help.c:428 +#: builtin/help.c:433 msgid "Specifying revisions and ranges for Git" msgstr "Указване на верÑии и интервали в Git" -#: builtin/help.c:429 +#: builtin/help.c:434 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "Въвеждащ урок за Git (верÑии поне 1.5.1)" -#: builtin/help.c:430 +#: builtin/help.c:435 msgid "An overview of recommended workflows with Git" msgstr "Общ преглед на препоръчваните начини за работа Ñ Git" -#: builtin/help.c:442 +#: builtin/help.c:447 msgid "The common Git guides are:\n" msgstr "ПопулÑрните пътеводители в Git Ñа:\n" -#: builtin/help.c:463 builtin/help.c:480 +#: builtin/help.c:468 builtin/help.c:485 #, c-format msgid "usage: %s%s" msgstr "употреба: %s%s" -#: builtin/help.c:496 +#: builtin/help.c:501 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "„git %s“ е Ñиноним на „%s“" @@ -6388,8 +6429,8 @@ msgstr "" "СЪВПÐДЕÐИЕ ÐРСТОЙÐОСТИТЕ ЗРСУМИТЕ ЗРSHA1: „%s“ ÐРДВРРÐЗЛИЧÐИ ОБЕКТÐ!" # FIXME merge with next? -#: builtin/index-pack.c:689 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:256 +#: builtin/index-pack.c:689 builtin/pack-objects.c:162 +#: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "обектът „%s“ не може да бъде прочетен" @@ -6487,74 +6528,74 @@ msgid_plural "pack has %d unresolved deltas" msgstr[0] "в пакета има %d ненапаÑваща разлика" msgstr[1] "в пакета има %d ненапаÑващи разлики" -#: builtin/index-pack.c:1220 +#: builtin/index-pack.c:1219 #, c-format msgid "unable to deflate appended object (%d)" msgstr "добавениÑÑ‚ обект не може да Ñе компреÑира Ñ â€ždeflate“: %d" -#: builtin/index-pack.c:1299 +#: builtin/index-pack.c:1298 #, c-format msgid "local object %s is corrupt" msgstr "локалниÑÑ‚ обект „%s“ е повреден" -#: builtin/index-pack.c:1323 +#: builtin/index-pack.c:1322 msgid "error while closing pack file" msgstr "грешка при затварÑнето на Ð¿Ð°ÐºÐµÑ‚Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»" -#: builtin/index-pack.c:1336 +#: builtin/index-pack.c:1335 #, c-format msgid "cannot write keep file '%s'" msgstr "" "грешка при запиÑването на файла „%s“, оÑигурÑващ запазване на директориÑ" -#: builtin/index-pack.c:1344 +#: builtin/index-pack.c:1343 #, c-format msgid "cannot close written keep file '%s'" msgstr "" "грешка при затварÑнето на запиÑÐ°Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð» „%s“, оÑигурÑващ запазване на " "директориÑ" -#: builtin/index-pack.c:1357 +#: builtin/index-pack.c:1356 msgid "cannot store pack file" msgstr "пакетниÑÑ‚ файл не може да бъде запазен" -#: builtin/index-pack.c:1368 +#: builtin/index-pack.c:1367 msgid "cannot store index file" msgstr "файлът за индекÑа не може да бъде Ñъхранен" -#: builtin/index-pack.c:1401 +#: builtin/index-pack.c:1400 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "зададена е неправилна верÑÐ¸Ñ Ð¿Ð°ÐºÐµÑ‚Ð¸Ñ€Ð°Ð½Ðµ: „pack.indexversion=%<PRIu32>“" -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1406 #, c-format msgid "invalid number of threads specified (%d)" msgstr "зададен е неправилен брой нишки: %d" -#: builtin/index-pack.c:1411 builtin/index-pack.c:1590 +#: builtin/index-pack.c:1410 builtin/index-pack.c:1589 #, c-format msgid "no threads support, ignoring %s" msgstr "липÑва поддръжка за нишки. „%s“ ще Ñе пренебрегне" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1468 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "СъщеÑтвуващиÑÑ‚ пакетен файл „%s“ не може да бъде отворен" -#: builtin/index-pack.c:1471 +#: builtin/index-pack.c:1470 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "СъщеÑтвуващиÑÑ‚ Ð¸Ð½Ð´ÐµÐºÑ Ð·Ð° Ð¿Ð°ÐºÐµÑ‚Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð» „%s“ не може да бъде отворен" -#: builtin/index-pack.c:1518 +#: builtin/index-pack.c:1517 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "%d обект не е разлика" msgstr[1] "%d обекта не Ñа разлика" -#: builtin/index-pack.c:1525 +#: builtin/index-pack.c:1524 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" @@ -6562,26 +6603,26 @@ msgstr[0] "дължината на веригата е %d: %lu обект" msgstr[1] "дължината на веригата е %d: %lu обекта" # FIXME it is not the cwd it is the previous cwd -#: builtin/index-pack.c:1554 +#: builtin/index-pack.c:1553 msgid "Cannot come back to cwd" msgstr "ПроцеÑÑŠÑ‚ не може да Ñе върне към предишната работна директориÑ" -#: builtin/index-pack.c:1602 builtin/index-pack.c:1605 -#: builtin/index-pack.c:1617 builtin/index-pack.c:1621 +#: builtin/index-pack.c:1601 builtin/index-pack.c:1604 +#: builtin/index-pack.c:1616 builtin/index-pack.c:1620 #, c-format msgid "bad %s" msgstr "неправилна ÑтойноÑÑ‚ „%s“" -#: builtin/index-pack.c:1635 +#: builtin/index-pack.c:1634 msgid "--fix-thin cannot be used without --stdin" msgstr "опциÑта „--fix-thin“ изиÑква „--stdin“" -#: builtin/index-pack.c:1639 builtin/index-pack.c:1648 +#: builtin/index-pack.c:1638 builtin/index-pack.c:1647 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "името на Ð¿Ð°ÐºÐµÑ‚Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð» „%s“ не завършва на „.pack“" -#: builtin/index-pack.c:1656 +#: builtin/index-pack.c:1655 msgid "--verify with no packfile name given" msgstr "опциÑта „--verify“ изиÑква име на пакетен файл" @@ -6638,38 +6679,38 @@ msgid "ignoring template %s" msgstr "игнориране на шаблона „%s“" # FIXME bad word insanely -#: builtin/init-db.c:133 +#: builtin/init-db.c:136 #, c-format msgid "insanely long template path %s" msgstr "твърде дълъг път към шаблон: „%s“" -#: builtin/init-db.c:141 +#: builtin/init-db.c:144 #, c-format msgid "templates not found %s" msgstr "директориÑта Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð¸Ñ‚Ðµ не е открита: „%s“" -#: builtin/init-db.c:154 +#: builtin/init-db.c:157 #, c-format msgid "not copying templates of a wrong format version %d from '%s'" msgstr "" "шаблоните Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÐµÐ½ номер на формата %d нÑма да бъдат копирани от „%s“" -#: builtin/init-db.c:192 +#: builtin/init-db.c:197 #, c-format msgid "insane git directory %s" msgstr "твърде дълго име на Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ð° Git: „%s“" -#: builtin/init-db.c:323 builtin/init-db.c:326 +#: builtin/init-db.c:331 builtin/init-db.c:334 #, c-format msgid "%s already exists" msgstr "ДиректориÑта „%s“ вече ÑъщеÑтвува" -#: builtin/init-db.c:355 +#: builtin/init-db.c:363 #, c-format msgid "unable to handle file type %d" msgstr "файлове от вид %d не Ñе поддържат" -#: builtin/init-db.c:358 +#: builtin/init-db.c:366 #, c-format msgid "unable to move %s to %s" msgstr "„%s“ не може да Ñе премеÑти в „%s“" @@ -6677,56 +6718,56 @@ msgstr "„%s“ не може да Ñе премеÑти в „%s“" #. TRANSLATORS: The first '%s' is either "Reinitialized #. existing" or "Initialized empty", the second " shared" or #. "", and the last '%s%s' is the verbatim directory name. -#: builtin/init-db.c:418 +#: builtin/init-db.c:426 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s хранилище на Git в „%s%s“\n" -#: builtin/init-db.c:419 +#: builtin/init-db.c:427 msgid "Reinitialized existing" msgstr "Ðаново инициализирано, ÑъщеÑтвуващо" -#: builtin/init-db.c:419 +#: builtin/init-db.c:427 msgid "Initialized empty" msgstr "Инициализирано празно" -#: builtin/init-db.c:420 +#: builtin/init-db.c:428 msgid " shared" msgstr ", Ñподелено" -#: builtin/init-db.c:467 +#: builtin/init-db.c:475 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" -"shared[=<permissions>]] [directory]" +"shared[=<permissions>]] [<directory>]" msgstr "" "git init [-q | --quiet] [--bare] [--template=ДИРЕКТОРИЯ_С_ШÐБЛОÐИ] [--" "shared[=ПРÐÐ’Ð]] [ДИРЕКТОРИЯ]" -#: builtin/init-db.c:490 +#: builtin/init-db.c:498 msgid "permissions" msgstr "права" -#: builtin/init-db.c:491 +#: builtin/init-db.c:499 msgid "specify that the git repository is to be shared amongst several users" msgstr "" "указване, че хранилището на Git ще бъде Ñподелено от повече от един " "потребител" -#: builtin/init-db.c:493 builtin/prune-packed.c:57 builtin/repack.c:172 +#: builtin/init-db.c:501 builtin/prune-packed.c:57 builtin/repack.c:171 msgid "be quiet" msgstr "без извеждане на информациÑ" -#: builtin/init-db.c:525 builtin/init-db.c:530 +#: builtin/init-db.c:533 builtin/init-db.c:538 #, c-format msgid "cannot mkdir %s" msgstr "директориÑта „%s“ не може да бъде Ñъздадена" -#: builtin/init-db.c:534 +#: builtin/init-db.c:542 #, c-format msgid "cannot chdir to %s" msgstr "не може да Ñе влезе в директориÑта „%s“" -#: builtin/init-db.c:555 +#: builtin/init-db.c:563 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -6735,7 +6776,7 @@ msgstr "" "%s (или --work-tree=ДИРЕКТОРИЯ) изиÑква указването на %s (или --git-" "dir=ДИРЕКТОРИЯ)" -#: builtin/init-db.c:583 +#: builtin/init-db.c:591 #, c-format msgid "Cannot access work tree '%s'" msgstr "Работното дърво в „%s“ е недоÑтъпно" @@ -6761,12 +6802,12 @@ msgid "trailer(s) to add" msgstr "епилог(зи) за добавÑне" #: builtin/log.c:41 -msgid "git log [<options>] [<revision range>] [[--] <path>...]\n" -msgstr "git log [ОПЦИЯ…] [ДИÐПÐЗОÐ_ÐÐ_ВЕРСИИТЕ] [[--] ПЪТ…]\n" +msgid "git log [<options>] [<revision range>] [[--] <path>...]" +msgstr "git log [ОПЦИЯ…] [ДИÐПÐЗОÐ_ÐÐ_ВЕРСИИТЕ] [[--] ПЪТ…]" #: builtin/log.c:42 -msgid " or: git show [options] <object>..." -msgstr " или: git show [ОПЦИЯ…] ОБЕКТ…" +msgid "git show [<options>] <object>..." +msgstr "git show [ОПЦИЯ…] ОБЕКТ…" #: builtin/log.c:81 #, c-format @@ -6849,7 +6890,7 @@ msgid "insane in-reply-to: %s" msgstr "неправилен формат на заглавната чаÑÑ‚ за отговор „in-reply-to“: %s" #: builtin/log.c:1026 -msgid "git format-patch [options] [<since> | <revision range>]" +msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [ОПЦИЯ…] [ОТ | ДИÐПÐЗОÐ_ÐÐ_ВЕРСИИТЕ]" # FIXME message WTF why ask it @@ -7057,98 +7098,98 @@ msgstr "" msgid "Unknown commit %s" msgstr "Ðепознато подаване „%s“" -#: builtin/ls-files.c:401 -msgid "git ls-files [options] [<file>...]" +#: builtin/ls-files.c:358 +msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [ОПЦИЯ…] [ФÐЙЛ…]" -#: builtin/ls-files.c:458 +#: builtin/ls-files.c:415 msgid "identify the file status with tags" msgstr "извеждане на ÑÑŠÑтоÑнието на файловете Ñ ÐµÐ´Ð½Ð¾Ð±ÑƒÐºÐ²ÐµÐ½Ð¸ флагове" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:417 msgid "use lowercase letters for 'assume unchanged' files" msgstr "малки букви за файловете, които да Ñе Ñчетат за непроменени" -#: builtin/ls-files.c:462 +#: builtin/ls-files.c:419 msgid "show cached files in the output (default)" msgstr "извеждане на кешираните файлове (Ñтандартно)" -#: builtin/ls-files.c:464 +#: builtin/ls-files.c:421 msgid "show deleted files in the output" msgstr "извеждане на изтритите файлове" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:423 msgid "show modified files in the output" msgstr "извеждане на променените файлове" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:425 msgid "show other files in the output" msgstr "извеждане на другите файлове" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:427 msgid "show ignored files in the output" msgstr "извеждане на игнорираните файлове" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:430 msgid "show staged contents' object name in the output" msgstr "извеждане на името на обекта за Ñъдържанието на индекÑа" -#: builtin/ls-files.c:475 +#: builtin/ls-files.c:432 msgid "show files on the filesystem that need to be removed" msgstr "извеждане на файловете, които Ñ‚Ñ€Ñбва да бъдат изтрити" -#: builtin/ls-files.c:477 +#: builtin/ls-files.c:434 msgid "show 'other' directories' names only" msgstr "извеждане Ñамо на името на другите (неÑледените) директории" -#: builtin/ls-files.c:480 +#: builtin/ls-files.c:437 msgid "don't show empty directories" msgstr "без извеждане на празните директории" -#: builtin/ls-files.c:483 +#: builtin/ls-files.c:440 msgid "show unmerged files in the output" msgstr "извеждане на неÑлетите файлове" # FIXME not clear about what this option does -#: builtin/ls-files.c:485 +#: builtin/ls-files.c:442 msgid "show resolve-undo information" msgstr "извеждане на информациÑта за отмÑна на разрешените подаваниÑ" -#: builtin/ls-files.c:487 +#: builtin/ls-files.c:444 msgid "skip files matching pattern" msgstr "преÑкачане на файловете напаÑващи ШÐБЛОÐа" -#: builtin/ls-files.c:490 +#: builtin/ls-files.c:447 msgid "exclude patterns are read from <file>" msgstr "шаблоните за игнориране да Ñе прочетат от този ФÐЙЛ" -#: builtin/ls-files.c:493 +#: builtin/ls-files.c:450 msgid "read additional per-directory exclude patterns in <file>" msgstr "" "изчитане на допълнителните шаблони за игнориране по Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð¾Ñ‚ този ФÐЙЛ" -#: builtin/ls-files.c:495 +#: builtin/ls-files.c:452 msgid "add the standard git exclusions" msgstr "добавÑне на Ñтандартно игнорираните от Git файлове" -#: builtin/ls-files.c:498 +#: builtin/ls-files.c:455 msgid "make the output relative to the project top directory" msgstr "пътищата да Ñа отноÑителни ÑпрÑмо оÑновната Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ð° проекта" -#: builtin/ls-files.c:501 +#: builtin/ls-files.c:458 msgid "if any <file> is not in the index, treat this as an error" msgstr "грешка, ако нÑкой от тези ФÐЙЛове не е в индекÑа" -#: builtin/ls-files.c:502 +#: builtin/ls-files.c:459 msgid "tree-ish" msgstr "УКÐЗÐТЕЛ_КЪМ_ДЪРВО" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:460 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "Ñчитане, че пътищата изтрити Ñлед УКÐЗÐТЕЛÑ_КЪМ_ДЪРВО вÑе още ÑъщеÑтвуват" -#: builtin/ls-files.c:505 +#: builtin/ls-files.c:462 msgid "show debugging data" msgstr "извеждане на информациÑта за изчиÑтване на грешки" @@ -7156,219 +7197,219 @@ msgstr "извеждане на информациÑта за изчиÑтван msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [ОПЦИЯ…] УКÐЗÐТЕЛ_КЪМ_ДЪРВО [ПЪТ…]" -#: builtin/ls-tree.c:126 +#: builtin/ls-tree.c:127 msgid "only show trees" msgstr "извеждане Ñамо на дървета" -#: builtin/ls-tree.c:128 +#: builtin/ls-tree.c:129 msgid "recurse into subtrees" msgstr "рекурÑивно обхождане поддърветата" -#: builtin/ls-tree.c:130 +#: builtin/ls-tree.c:131 msgid "show trees when recursing" msgstr "извеждане на дърветата при рекурÑивното обхождане" -#: builtin/ls-tree.c:133 +#: builtin/ls-tree.c:134 msgid "terminate entries with NUL byte" msgstr "разделÑне на обектите Ñ Ð½ÑƒÐ»ÐµÐ²Ð¸Ñ Ð·Ð½Ð°Ðº „NUL“" -#: builtin/ls-tree.c:134 +#: builtin/ls-tree.c:135 msgid "include object size" msgstr "извеждане на размера на обекта" -#: builtin/ls-tree.c:136 builtin/ls-tree.c:138 +#: builtin/ls-tree.c:137 builtin/ls-tree.c:139 msgid "list only filenames" msgstr "извеждане Ñамо имената на файловете" -#: builtin/ls-tree.c:141 +#: builtin/ls-tree.c:142 msgid "use full path names" msgstr "използване на пълните имена на пътищата" -#: builtin/ls-tree.c:143 +#: builtin/ls-tree.c:144 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" "извеждане на цÑлото дърво, не Ñамо на текущата Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ (включва опциÑта " "„--full-name“)" -#: builtin/merge.c:44 -msgid "git merge [options] [<commit>...]" +#: builtin/merge.c:45 +msgid "git merge [<options>] [<commit>...]" msgstr "git merge [ОПЦИЯ…] [ПОДÐÐ’ÐÐЕ…]" -#: builtin/merge.c:45 -msgid "git merge [options] <msg> HEAD <commit>" +#: builtin/merge.c:46 +msgid "git merge [<options>] <msg> HEAD <commit>" msgstr "git merge [ОПЦИЯ…] СЪОБЩЕÐИЕ HEAD ПОДÐÐ’ÐÐЕ" -#: builtin/merge.c:46 +#: builtin/merge.c:47 msgid "git merge --abort" msgstr "git merge --abort" # FIXME -m rather than just m -#: builtin/merge.c:99 +#: builtin/merge.c:100 msgid "switch `m' requires a value" msgstr "опциÑта „-m“ изиÑква ÑтойноÑÑ‚" -#: builtin/merge.c:136 +#: builtin/merge.c:137 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "ÐÑма такава ÑÑ‚Ñ€Ð°Ñ‚ÐµÐ³Ð¸Ñ Ð·Ð° Ñливане: „%s“.\n" -#: builtin/merge.c:137 +#: builtin/merge.c:138 #, c-format msgid "Available strategies are:" msgstr "Ðаличните Ñтратегии Ñа:" -#: builtin/merge.c:142 +#: builtin/merge.c:143 #, c-format msgid "Available custom strategies are:" msgstr "Допълнителните Ñтратегии Ñа:" -#: builtin/merge.c:192 +#: builtin/merge.c:193 msgid "do not show a diffstat at the end of the merge" msgstr "без извеждане на ÑтатиÑтиката Ñлед завършване на Ñливане" -#: builtin/merge.c:195 +#: builtin/merge.c:196 msgid "show a diffstat at the end of the merge" msgstr "извеждане на ÑтатиÑтиката Ñлед завършване на Ñливане" -#: builtin/merge.c:196 +#: builtin/merge.c:197 msgid "(synonym to --stat)" msgstr "(Ñиноним на „--stat“)" -#: builtin/merge.c:198 +#: builtin/merge.c:199 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "добавÑне (на макÑимум такъв БРОЙ) запиÑи от ÑÑŠÐºÑ€Ð°Ñ‚ÐµÐ½Ð¸Ñ Ð¶ÑƒÑ€Ð½Ð°Ð» в Ñъобщението " "за подаване" -#: builtin/merge.c:201 +#: builtin/merge.c:202 msgid "create a single commit instead of doing a merge" msgstr "Ñъздаване на едно подаване вмеÑто извършване на Ñливане" -#: builtin/merge.c:203 +#: builtin/merge.c:204 msgid "perform a commit if the merge succeeds (default)" msgstr "извършване на подаване при уÑпешно Ñливане (Ñтандартно дейÑтвие)" -#: builtin/merge.c:205 +#: builtin/merge.c:206 msgid "edit message before committing" msgstr "редактиране на Ñъобщението преди подаване" -#: builtin/merge.c:206 +#: builtin/merge.c:207 msgid "allow fast-forward (default)" msgstr "позволÑване на тривиално Ñливане (Ñтандартно дейÑтвие)" -#: builtin/merge.c:208 +#: builtin/merge.c:209 msgid "abort if fast-forward is not possible" msgstr "преуÑтановÑване, ако Ñливането не е тривиално" -#: builtin/merge.c:212 +#: builtin/merge.c:213 msgid "Verify that the named commit has a valid GPG signature" msgstr "Проверка, че именуваното подаване е Ñ Ð¿Ñ€Ð°Ð²Ð¸Ð»ÐµÐ½ Ð¿Ð¾Ð´Ð¿Ð¸Ñ Ð½Ð° GPG" -#: builtin/merge.c:213 builtin/notes.c:741 builtin/revert.c:89 +#: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89 msgid "strategy" msgstr "ÑтратегиÑ" -#: builtin/merge.c:214 +#: builtin/merge.c:215 msgid "merge strategy to use" msgstr "ÑÑ‚Ñ€Ð°Ñ‚ÐµÐ³Ð¸Ñ Ð·Ð° Ñливане, коÑто да Ñе ползва" -#: builtin/merge.c:215 +#: builtin/merge.c:216 msgid "option=value" msgstr "опциÑ=ÑтойноÑÑ‚" -#: builtin/merge.c:216 +#: builtin/merge.c:217 msgid "option for selected merge strategy" msgstr "Ð¾Ð¿Ñ†Ð¸Ñ Ð·Ð° избраната ÑÑ‚Ñ€Ð°Ñ‚ÐµÐ³Ð¸Ñ Ð·Ð° Ñливане" -#: builtin/merge.c:218 +#: builtin/merge.c:219 msgid "merge commit message (for a non-fast-forward merge)" msgstr "Ñъобщение при подаването ÑÑŠÑ Ñливане (при нетривиални ÑливаниÑ)" -#: builtin/merge.c:222 +#: builtin/merge.c:223 msgid "abort the current in-progress merge" msgstr "преуÑтановÑване на текущото Ñливане" -#: builtin/merge.c:250 +#: builtin/merge.c:251 msgid "could not run stash." msgstr "не може да Ñе извърши Ñкатаване" -#: builtin/merge.c:255 +#: builtin/merge.c:256 msgid "stash failed" msgstr "неуÑпешно Ñкатаване" -#: builtin/merge.c:260 +#: builtin/merge.c:261 #, c-format msgid "not a valid object: %s" msgstr "неправилен обект: „%s“" -#: builtin/merge.c:279 builtin/merge.c:296 +#: builtin/merge.c:280 builtin/merge.c:297 msgid "read-tree failed" msgstr "неуÑпешно прочитане на обект-дърво" -#: builtin/merge.c:326 +#: builtin/merge.c:327 msgid " (nothing to squash)" msgstr " (нÑма какво да Ñе Ñмачка)" -#: builtin/merge.c:339 +#: builtin/merge.c:340 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Подаване ÑÑŠÑ Ñмачкване — указателÑÑ‚ „HEAD“ нÑма да бъде обновен\n" -#: builtin/merge.c:371 +#: builtin/merge.c:372 msgid "Writing SQUASH_MSG" msgstr "ЗапиÑване на Ñъобщението за Ñмачкване SQUASH_MSG" -#: builtin/merge.c:373 +#: builtin/merge.c:374 msgid "Finishing SQUASH_MSG" msgstr "Завършване на Ñъобщението за Ñмачкване SQUASH_MSG" -#: builtin/merge.c:396 +#: builtin/merge.c:397 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" "ЛипÑва Ñъобщение при подаване — указателÑÑ‚ „HEAD“ нÑма да бъде обновен\n" -#: builtin/merge.c:446 +#: builtin/merge.c:447 #, c-format msgid "'%s' does not point to a commit" msgstr "„%s“ не Ñочи към подаване" -#: builtin/merge.c:558 +#: builtin/merge.c:559 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Ðеправилен низ за наÑтройката „branch.%s.mergeoptions“: „%s“" -#: builtin/merge.c:653 +#: builtin/merge.c:654 msgid "git write-tree failed to write a tree" msgstr "Командата „git write-tree“ не уÑÐ¿Ñ Ð´Ð° запише обект-дърво" -#: builtin/merge.c:677 +#: builtin/merge.c:678 msgid "Not handling anything other than two heads merge." msgstr "Поддържа Ñе Ñамо Ñливане на точно две иÑтории." -#: builtin/merge.c:691 +#: builtin/merge.c:692 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Ðепозната Ð¾Ð¿Ñ†Ð¸Ñ Ð·Ð° рекурÑивното Ñливане „merge-recursive“: „-X%s“" -#: builtin/merge.c:704 +#: builtin/merge.c:705 #, c-format msgid "unable to write %s" msgstr "„%s“ не може да бъде запиÑан" -#: builtin/merge.c:793 +#: builtin/merge.c:794 #, c-format msgid "Could not read from '%s'" msgstr "От „%s“ не може да Ñе чете" -#: builtin/merge.c:802 +#: builtin/merge.c:803 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Сливането нÑма да бъде подадено. За завършването му и подаването му " "използвайте командата „git commit“.\n" -#: builtin/merge.c:808 +#: builtin/merge.c:809 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -7383,50 +7424,50 @@ msgstr "" "Редовете, които започват Ñ â€ž%c“ ще бъдат пропуÑнати, а празно Ñъобщение\n" "преуÑтановÑва подаването.\n" -#: builtin/merge.c:832 +#: builtin/merge.c:833 msgid "Empty commit message." msgstr "Празно Ñъобщение при подаване." # FIXME - WTF is wonderful. -#: builtin/merge.c:844 +#: builtin/merge.c:845 #, c-format msgid "Wonderful.\n" msgstr "ПървиÑÑ‚ етап на тривиалното Ñливане завърши.\n" -#: builtin/merge.c:907 +#: builtin/merge.c:900 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "ÐеуÑпешно Ñливане — коригирайте конфликтите и подайте резултата.\n" -#: builtin/merge.c:923 +#: builtin/merge.c:916 #, c-format msgid "'%s' is not a commit" msgstr "„%s“ не е подаване" -#: builtin/merge.c:964 +#: builtin/merge.c:957 msgid "No current branch." msgstr "ÐÑма текущ клон." -#: builtin/merge.c:966 +#: builtin/merge.c:959 msgid "No remote for the current branch." msgstr "ТекущиÑÑ‚ клон не Ñледи никой." -#: builtin/merge.c:968 +#: builtin/merge.c:961 msgid "No default upstream defined for the current branch." msgstr "ТекущиÑÑ‚ клон не Ñледи никой клон." -#: builtin/merge.c:973 +#: builtin/merge.c:966 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Ðикой клон не Ñледи клона „%s“ от хранилището „%s“" -#: builtin/merge.c:1129 +#: builtin/merge.c:1122 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" "Ðе може да преуÑтановите Ñливане, защото в момента не Ñе извършва такова " "(липÑва указател „MERGE_HEAD“)." -#: builtin/merge.c:1145 +#: builtin/merge.c:1138 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -7434,11 +7475,11 @@ msgstr "" "Ðе Ñте завършили Ñливане. (УказателÑÑ‚ „MERGE_HEAD“ ÑъщеÑтвува).\n" "Подайте промените Ñи, преди да започнете ново Ñливане." -#: builtin/merge.c:1148 git-pull.sh:34 +#: builtin/merge.c:1141 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Ðе Ñте завършили Ñливане. (УказателÑÑ‚ „MERGE_HEAD“ ÑъщеÑтвува)." -#: builtin/merge.c:1152 +#: builtin/merge.c:1145 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -7446,111 +7487,111 @@ msgstr "" "Ðе Ñте завършили отбиране на подаване (указателÑÑ‚ „CHERRY_PICK_HEAD“\n" "ÑъщеÑтвува). Подайте промените Ñи, преди да започнете ново Ñливане." -#: builtin/merge.c:1155 +#: builtin/merge.c:1148 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" "Ðе Ñте завършили отбиране на подаване (указателÑÑ‚ „CHERRY_PICK_HEAD“\n" "ÑъщеÑтвува)." -#: builtin/merge.c:1164 +#: builtin/merge.c:1157 msgid "You cannot combine --squash with --no-ff." msgstr "ОпциÑта „--squash“ е неÑъвмеÑтима Ñ â€ž--no-ff“." -#: builtin/merge.c:1173 +#: builtin/merge.c:1166 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "Ðе е указано подаване и наÑтройката „merge.defaultToUpstream“ не е зададена." -#: builtin/merge.c:1205 +#: builtin/merge.c:1198 msgid "Can merge only exactly one commit into empty head" msgstr "Можете да Ñлеете точно едно подаване във връх без иÑториÑ" -#: builtin/merge.c:1208 +#: builtin/merge.c:1201 msgid "Squash commit into empty head not supported yet" msgstr "Подаване ÑÑŠÑ Ñмачкване във връх без иÑÑ‚Ð¾Ñ€Ð¸Ñ Ð²Ñе още не Ñе поддържа" -#: builtin/merge.c:1210 +#: builtin/merge.c:1203 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "Понеже върхът е без иÑториÑ, вÑички ÑÐ»Ð¸Ð²Ð°Ð½Ð¸Ñ Ñа тривиални, не може да Ñе " "извърши нетривиално Ñливане изиÑквано от опциÑта „--no-ff“" -#: builtin/merge.c:1215 +#: builtin/merge.c:1208 #, c-format msgid "%s - not something we can merge" msgstr "„%s“ — не е нещо, което може да Ñе Ñлее" -#: builtin/merge.c:1266 +#: builtin/merge.c:1259 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Подаването „%s“ е Ñ Ð½ÐµÐ´Ð¾Ð²ÐµÑ€ÐµÐ½ Ð¿Ð¾Ð´Ð¿Ð¸Ñ Ð¾Ñ‚ GPG, който твърди, че е на „%s“." -#: builtin/merge.c:1269 +#: builtin/merge.c:1262 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" "Подаването „%s“ е Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÐµÐ½ Ð¿Ð¾Ð´Ð¿Ð¸Ñ Ð¾Ñ‚ GPG, който твърди, че е на „%s“." -#: builtin/merge.c:1272 +#: builtin/merge.c:1265 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Подаването „%s“ е без Ð¿Ð¾Ð´Ð¿Ð¸Ñ Ð¾Ñ‚ GPG." -#: builtin/merge.c:1275 +#: builtin/merge.c:1268 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Подаването „%s“ е Ñ ÐºÐ¾Ñ€ÐµÐºÑ‚ÐµÐ½ Ð¿Ð¾Ð´Ð¿Ð¸Ñ Ð¾Ñ‚ GPG на „%s“.\n" -#: builtin/merge.c:1356 +#: builtin/merge.c:1349 #, c-format msgid "Updating %s..%s\n" msgstr "ОбновÑване „%s..%s“\n" -#: builtin/merge.c:1395 +#: builtin/merge.c:1388 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Проба Ñ Ð½Ð°Ð¹-тривиалното Ñливане в рамките на индекÑа…\n" # FIXME WTF message -#: builtin/merge.c:1402 +#: builtin/merge.c:1395 #, c-format msgid "Nope.\n" msgstr "ÐеуÑпешно Ñливане.\n" -#: builtin/merge.c:1434 +#: builtin/merge.c:1427 msgid "Not possible to fast-forward, aborting." msgstr "" "Ðе може да Ñе извърши тривиално Ñливане, преуÑтановÑване на дейÑтвието." -#: builtin/merge.c:1457 builtin/merge.c:1536 +#: builtin/merge.c:1450 builtin/merge.c:1529 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Привеждане на дървото към първоначалното…\n" -#: builtin/merge.c:1461 +#: builtin/merge.c:1454 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Пробване ÑÑŠÑ ÑтратегиÑта за Ñливане „%s“…\n" -#: builtin/merge.c:1527 +#: builtin/merge.c:1520 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "ÐÐ¸ÐºÐ¾Ñ ÑÑ‚Ñ€Ð°Ñ‚ÐµÐ³Ð¸Ñ Ð·Ð° Ñливане не може да извърши Ñливането.\n" -#: builtin/merge.c:1529 +#: builtin/merge.c:1522 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "ÐеуÑпешно Ñливане ÑÑŠÑ ÑÑ‚Ñ€Ð°Ñ‚ÐµÐ³Ð¸Ñ â€ž%s“.\n" -#: builtin/merge.c:1538 +#: builtin/merge.c:1531 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" "Ползва Ñе ÑтратегиÑта „%s“, коÑто ще подготви дървото за коригиране на " "ръка.\n" -#: builtin/merge.c:1550 +#: builtin/merge.c:1543 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -7558,12 +7599,12 @@ msgstr "" "защото бе зададена опциÑта „--no-commit“.\n" #: builtin/merge-base.c:29 -msgid "git merge-base [-a|--all] <commit> <commit>..." -msgstr "git merge-base [-a|--all] ПОДÐÐ’ÐÐЕ ПОДÐÐ’ÐÐЕ…" +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "git merge-base [-a | --all] ПОДÐÐ’ÐÐЕ ПОДÐÐ’ÐÐЕ…" #: builtin/merge-base.c:30 -msgid "git merge-base [-a|--all] --octopus <commit>..." -msgstr "git merge-base [-a|--all] --octopus ПОДÐÐ’ÐÐЕ…" +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "git merge-base [-a | --all] --octopus ПОДÐÐ’ÐÐЕ…" #: builtin/merge-base.c:31 msgid "git merge-base --independent <commit>..." @@ -7600,8 +7641,8 @@ msgstr "откриване къде ПОДÐÐ’ÐÐЕто Ñе е отклониР#: builtin/merge-file.c:8 msgid "" -"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " -"file2" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" msgstr "" "git merge-file [ОПЦИЯ…] [-L ИМЕ_1 [-L ОРИГИÐÐЛ [-L ИМЕ_2]]] ФÐЙЛ_1 ОРИГ_ФÐЙЛ " "ФÐЙЛ_2" @@ -7635,7 +7676,7 @@ msgid "do not warn about conflicts" msgstr "без Ð¿Ñ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ конфликти" #: builtin/merge-file.c:45 -msgid "set labels for file1/orig_file/file2" +msgid "set labels for file1/orig-file/file2" msgstr "задаване на етикети за ФÐЙЛ_1/ОРИГИÐÐЛ/ФÐЙЛ_2" #: builtin/mktree.c:64 @@ -7655,7 +7696,7 @@ msgid "allow creation of more than one tree" msgstr "разрешаване на Ñъздаването на повече от едно дърво" #: builtin/mv.c:15 -msgid "git mv [options] <source>... <destination>" +msgid "git mv [<options>] <source>... <destination>" msgstr "git mv [ОПЦИЯ…] ОБЕКТ… ЦЕЛ" # FIXME message< @@ -7745,21 +7786,21 @@ msgstr "%s, обект: „%s“, цел: „%s“" msgid "Renaming %s to %s\n" msgstr "Преименуване на „%s“ на „%s“\n" -#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:358 +#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359 #, c-format msgid "renaming '%s' failed" msgstr "неуÑпешно преименуване на „%s“" #: builtin/name-rev.c:255 -msgid "git name-rev [options] <commit>..." +msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [ОПЦИЯ…] ПОДÐÐ’ÐÐЕ…" #: builtin/name-rev.c:256 -msgid "git name-rev [options] --all" +msgid "git name-rev [<options>] --all" msgstr "git name-rev [ОПЦИЯ…] --all" #: builtin/name-rev.c:257 -msgid "git name-rev [options] --stdin" +msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [ОПЦИЯ…] --stdin" # FIXME sha @@ -7794,41 +7835,41 @@ msgid "dereference tags in the input (internal use)" msgstr "извеждане на идентификаторите на обекти-етикети (за вътрешни нужди)" #: builtin/notes.c:24 -msgid "git notes [--ref <notes_ref>] [list [<object>]]" +msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ] [list [ОБЕКТ]]" #: builtin/notes.c:25 msgid "" -"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) " -"<object>] [<object>]" +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " +"| (-c | -C) <object>] [<object>]" msgstr "" -"git notes [--ref УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ] add [-f] [-m СЪОБЩЕÐИЕ | -F ФÐЙЛ | (-c " -"| -C) ОБЕКТ] [ОБЕКТ]" +"git notes [--ref УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ] add [-f] [--allow-empty] [-m СЪОБЩЕÐИЕ " +"| -F ФÐЙЛ | (-c | -C) ОБЕКТ] [ОБЕКТ]" #: builtin/notes.c:26 -msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" +msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "" "git notes [--ref УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ] copy [-f] ОБЕКТ_ИЗТОЧÐИК ОБЕКТ_ЦЕЛ" #: builtin/notes.c:27 msgid "" -"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) " -"<object>] [<object>]" +"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " +"(-c | -C) <object>] [<object>]" msgstr "" -"git notes [--ref УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ] append [-m СЪОБЩЕÐИЕ | -F ФÐЙЛ | (-c | " -"-C) ОБЕКТ] [ОБЕКТ]" +"git notes [--ref УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ] append [--allow-empty] [-m СЪОБЩЕÐИЕ | " +"-F ФÐЙЛ | (-c | -C) ОБЕКТ] [ОБЕКТ]" #: builtin/notes.c:28 -msgid "git notes [--ref <notes_ref>] edit [<object>]" -msgstr "git notes [--ref УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ] edit [ОБЕКТ]" +msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" +msgstr "git notes [--ref УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ] edit [--allow-empty] [ОБЕКТ]" #: builtin/notes.c:29 -msgid "git notes [--ref <notes_ref>] show [<object>]" +msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "git notes [--ref УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ] show [ОБЕКТ]" #: builtin/notes.c:30 msgid "" -"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" +"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "" "git notes [--ref УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ] merge [-v | -q] [-s СТРÐТЕГИЯ] " "УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ" @@ -7842,15 +7883,15 @@ msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" #: builtin/notes.c:33 -msgid "git notes [--ref <notes_ref>] remove [<object>...]" +msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ] remove [ОБЕКТ…]" #: builtin/notes.c:34 -msgid "git notes [--ref <notes_ref>] prune [-n | -v]" +msgid "git notes [--ref <notes-ref>] prune [-n | -v]" msgstr "git notes [--ref УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ] prune [-n | -v]" #: builtin/notes.c:35 -msgid "git notes [--ref <notes_ref>] get-ref" +msgid "git notes [--ref <notes-ref>] get-ref" msgstr "git notes [--ref УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ] get-ref" #: builtin/notes.c:40 @@ -7882,7 +7923,7 @@ msgid "git notes show [<object>]" msgstr "git notes show [ОБЕКТ]" #: builtin/notes.c:71 -msgid "git notes merge [<options>] <notes_ref>" +msgid "git notes merge [<options>] <notes-ref>" msgstr "git notes merge [ОПЦИЯ…] УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ" #: builtin/notes.c:72 @@ -7905,119 +7946,118 @@ msgstr "git notes prune [ОПЦИЯ…]" msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:136 +#: builtin/notes.c:146 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "дейÑтвието „show“ не може да Ñе изпълни за обект „%s“" -#: builtin/notes.c:140 +#: builtin/notes.c:150 msgid "could not read 'show' output" msgstr "изведената Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ñ‚ дейÑтвието „show“ не може да Ñе прочете" -#: builtin/notes.c:148 +#: builtin/notes.c:158 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "дейÑтвието „show“ не може да Ñе завърши за обект „%s“" -#: builtin/notes.c:166 builtin/tag.c:477 +#: builtin/notes.c:173 builtin/tag.c:477 #, c-format msgid "could not create file '%s'" msgstr "файлът „%s“ не може да бъде Ñъздаден" -#: builtin/notes.c:185 +#: builtin/notes.c:192 msgid "Please supply the note contents using either -m or -F option" msgstr "Задайте Ñъдържанието на бележката Ñ Ð½ÑÐºÐ¾Ñ Ð¾Ñ‚ опциите „-m“ или „-F“" -#: builtin/notes.c:206 builtin/notes.c:847 -#, c-format -msgid "Removing note for object %s\n" -msgstr "Изтриване на бележката за обекта „%s“\n" - -#: builtin/notes.c:211 +#: builtin/notes.c:201 msgid "unable to write note object" msgstr "обектът-бележка не може да бъде запиÑан" -#: builtin/notes.c:213 +#: builtin/notes.c:203 #, c-format msgid "The note contents have been left in %s" msgstr "Съдържанието на бележката е във файла „%s“" -#: builtin/notes.c:247 builtin/tag.c:693 +#: builtin/notes.c:231 builtin/tag.c:693 #, c-format msgid "cannot read '%s'" msgstr "файлът „%s“ не може да бъде прочетен" -#: builtin/notes.c:249 builtin/tag.c:696 +#: builtin/notes.c:233 builtin/tag.c:696 #, c-format msgid "could not open or read '%s'" msgstr "файлът „%s“ не може да бъде отворен или прочетен" -#: 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 +#: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305 +#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506 +#: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652 +#: builtin/notes.c:854 builtin/tag.c:709 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Ðе може да Ñе открие към какво Ñочи „%s“." -#: builtin/notes.c:271 +#: builtin/notes.c:255 #, c-format msgid "Failed to read object '%s'." msgstr "Обектът „%s“ не може да бъде прочетен." -#: builtin/notes.c:275 +#: builtin/notes.c:259 #, c-format msgid "Cannot read note data from non-blob object '%s'." msgstr "" "Съдържанието на бележка не може да Ñе вземе от обект, който не е BLOB: „%s“." -#: builtin/notes.c:315 +#: builtin/notes.c:299 #, c-format msgid "Malformed input line: '%s'." msgstr "ДадениÑÑ‚ входен ред е Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÐµÐ½ формат: „%s“." -#: builtin/notes.c:330 +#: builtin/notes.c:314 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Бележката не може да Ñе копира от „%s“ към „%s“" -#: 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 +#: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489 +#: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645 +#: builtin/notes.c:919 msgid "too many parameters" msgstr "прекалено много параметри" -#: builtin/notes.c:387 builtin/notes.c:646 +#: builtin/notes.c:371 builtin/notes.c:658 #, c-format msgid "No note found for object %s." msgstr "ÐÑма бележки за обекта „%s“." -#: builtin/notes.c:409 builtin/notes.c:566 +#: builtin/notes.c:392 builtin/notes.c:555 msgid "note contents as a string" msgstr "низ, който е Ñъдържанието на бележката" -#: builtin/notes.c:412 builtin/notes.c:569 +#: builtin/notes.c:395 builtin/notes.c:558 msgid "note contents in a file" msgstr "файл ÑÑŠÑ Ñъдържанието на бележката" -#: builtin/notes.c:414 builtin/notes.c:417 builtin/notes.c:571 -#: builtin/notes.c:574 builtin/tag.c:628 +#: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560 +#: builtin/notes.c:563 builtin/tag.c:628 msgid "object" msgstr "обект" -#: builtin/notes.c:415 builtin/notes.c:572 +#: builtin/notes.c:398 builtin/notes.c:561 msgid "reuse and edit specified note object" msgstr "преизползване и редактиране на ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð¾Ð±ÐµÐºÑ‚-бележка" -#: builtin/notes.c:418 builtin/notes.c:575 +#: builtin/notes.c:401 builtin/notes.c:564 msgid "reuse specified note object" msgstr "преизползване на ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð¾Ð±ÐµÐºÑ‚-бележка" -#: builtin/notes.c:420 builtin/notes.c:488 +#: builtin/notes.c:404 builtin/notes.c:567 +msgid "allow storing empty note" +msgstr "приемане и на празни бележки" + +#: builtin/notes.c:405 builtin/notes.c:476 msgid "replace existing notes" msgstr "замÑна на ÑъщеÑтвуващите бележки" -#: builtin/notes.c:454 +#: builtin/notes.c:430 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -8026,27 +8066,32 @@ msgstr "" "Ðе може да Ñе добави бележка, защото такава вече ÑъщеÑтвува за обекта „%s“. " "Използвайте опциÑта „-f“, за да презапишете ÑъщеÑтвуващи бележки." -#: builtin/notes.c:459 builtin/notes.c:536 +#: builtin/notes.c:445 builtin/notes.c:524 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "ПрезапиÑване на ÑъщеÑтвуващите бележки за обекта „%s“\n" -#: builtin/notes.c:489 +#: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859 +#, c-format +msgid "Removing note for object %s\n" +msgstr "Изтриване на бележката за обекта „%s“\n" + +#: builtin/notes.c:477 msgid "read objects from stdin" msgstr "изчитане на обектите от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´" # FIXME imporve message -#: builtin/notes.c:491 +#: builtin/notes.c:479 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" "зареждане на наÑтройките за КОМÐÐДÐта, коÑто презапиÑва Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ (включва " "опциÑта „--stdin“)" -#: builtin/notes.c:509 +#: builtin/notes.c:497 msgid "too few parameters" msgstr "прекалено малко параметри" -#: builtin/notes.c:530 +#: builtin/notes.c:518 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -8055,14 +8100,14 @@ msgstr "" "Ðе може да Ñе копира бележка, защото такава вече ÑъщеÑтвува за обекта „%s“. " "Използвайте опциÑта „-f“, за да презапишете ÑъщеÑтвуващи бележки." -#: builtin/notes.c:542 +#: builtin/notes.c:530 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "" "Ðе може да Ñе копира бележка, коÑто не ÑъщеÑтвува — нÑма бележки за обекта-" "източник „%s“." -#: builtin/notes.c:591 +#: builtin/notes.c:582 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -8073,15 +8118,15 @@ msgstr "" "ВмеÑто това ги използвайте Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ‚Ð° „add“: „git notes add -f -m/-F/-c/-" "C“.\n" -#: builtin/notes.c:738 +#: builtin/notes.c:750 msgid "General options" msgstr "Общи опции" -#: builtin/notes.c:740 +#: builtin/notes.c:752 msgid "Merge options" msgstr "Опции при Ñливане" -#: builtin/notes.c:742 +#: builtin/notes.c:754 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -8091,44 +8136,44 @@ msgstr "" "„union“ (обединÑване), „cat_sort_uniq“ (обединÑване, подреждане, уникални " "резултати)" -#: builtin/notes.c:744 +#: builtin/notes.c:756 msgid "Committing unmerged notes" msgstr "Подаване на неÑлети бележки" -#: builtin/notes.c:746 +#: builtin/notes.c:758 msgid "finalize notes merge by committing unmerged notes" msgstr "завършване на Ñливането чрез подаване на неÑлети бележки" -#: builtin/notes.c:748 +#: builtin/notes.c:760 msgid "Aborting notes merge resolution" msgstr "ПреуÑтановÑване на корекциÑта при Ñливането на бележки" -#: builtin/notes.c:750 +#: builtin/notes.c:762 msgid "abort notes merge" msgstr "преуÑтановÑване на Ñливането на бележки" -#: builtin/notes.c:845 +#: builtin/notes.c:857 #, c-format msgid "Object %s has no note\n" msgstr "ÐÑма бележки за обекта „%s“\n" -#: builtin/notes.c:857 +#: builtin/notes.c:869 msgid "attempt to remove non-existent note is not an error" msgstr "опитът за изтриването на неÑъщеÑтвуваща бележка не Ñе Ñчита за грешка" -#: builtin/notes.c:860 +#: builtin/notes.c:872 msgid "read object names from the standard input" msgstr "изчитане на имената на обектите от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´" -#: builtin/notes.c:941 +#: builtin/notes.c:953 msgid "notes-ref" msgstr "УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ" -#: builtin/notes.c:942 -msgid "use notes from <notes_ref>" +#: builtin/notes.c:954 +msgid "use notes from <notes-ref>" msgstr "да Ñе използва бележката Ñочена от този УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ" -#: builtin/notes.c:977 builtin/remote.c:1624 +#: builtin/notes.c:989 builtin/remote.c:1621 #, c-format msgid "Unknown subcommand: %s" msgstr "Ðепозната подкоманда: %s" @@ -8145,197 +8190,201 @@ msgstr "" "git pack-objects [ОПЦИЯ…] ПРЕФИКС_ÐÐ_ИМЕТО [< СПИСЪК_С_ВЕРСИИ | < " "СПИСЪК_С_ОБЕКТИ]" -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 +#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 #, c-format msgid "deflate error (%d)" msgstr "грешка при декомпреÑиране Ñ â€ždeflate“ (%d)" -#: builtin/pack-objects.c:773 +#: builtin/pack-objects.c:771 msgid "Writing objects" msgstr "ЗапиÑване на обектите" -#: builtin/pack-objects.c:1015 +#: builtin/pack-objects.c:1013 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "изключване на запиÑването на битовата маÑка, защото нÑкои обекти нÑма да Ñе " "пакетират" -#: builtin/pack-objects.c:2175 +#: builtin/pack-objects.c:2173 msgid "Compressing objects" msgstr "КомпреÑиране на обектите" -#: builtin/pack-objects.c:2572 +#: builtin/pack-objects.c:2570 #, c-format msgid "unsupported index version %s" msgstr "неподдържана верÑÐ¸Ñ Ð½Ð° индекÑа „%s“" -#: builtin/pack-objects.c:2576 +#: builtin/pack-objects.c:2574 #, c-format msgid "bad index version '%s'" msgstr "неправилна верÑÐ¸Ñ Ð½Ð° индекÑа „%s“" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2597 #, c-format msgid "option %s does not accept negative form" msgstr "опциÑта „%s“ не притежава отрицателна верÑиÑ" -#: builtin/pack-objects.c:2603 +#: builtin/pack-objects.c:2601 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "неразпозната ÑтойноÑÑ‚ „%s“ за опциÑта „%s“" -#: builtin/pack-objects.c:2622 +#: builtin/pack-objects.c:2621 msgid "do not show progress meter" msgstr "без извеждане на напредъка" -#: builtin/pack-objects.c:2624 +#: builtin/pack-objects.c:2623 msgid "show progress meter" msgstr "извеждане на напредъка" -#: builtin/pack-objects.c:2626 +#: builtin/pack-objects.c:2625 msgid "show progress meter during object writing phase" msgstr "извеждане на напредъка във фазата на запазване на обектите" -#: builtin/pack-objects.c:2629 +#: builtin/pack-objects.c:2628 msgid "similar to --all-progress when progress meter is shown" msgstr "" "Ñъщото дейÑтвие като опциÑта „--all-progress“ при извеждането на напредъка" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2629 msgid "version[,offset]" msgstr "ВЕРСИЯ[,ОТМЕСТВÐÐЕ]" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2630 msgid "write the pack index file in the specified idx format version" msgstr "" "запазване на индекÑа на пакетните файлове във форма̀та Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð°Ñ‚Ð° верÑиÑ" -#: builtin/pack-objects.c:2634 +#: builtin/pack-objects.c:2633 msgid "maximum size of each output pack file" msgstr "макÑимален размер на вÑеки пакетен файл" -#: builtin/pack-objects.c:2636 +#: builtin/pack-objects.c:2635 msgid "ignore borrowed objects from alternate object store" msgstr "игнориране на обектите заети от други хранилища на обекти" -#: builtin/pack-objects.c:2638 +#: builtin/pack-objects.c:2637 msgid "ignore packed objects" msgstr "игнориране на пакетираните обекти" -#: builtin/pack-objects.c:2640 +#: builtin/pack-objects.c:2639 msgid "limit pack window by objects" msgstr "ограничаване на прозореца за пакетиране по брой обекти" -#: builtin/pack-objects.c:2642 +#: builtin/pack-objects.c:2641 msgid "limit pack window by memory in addition to object limit" msgstr "" "ограничаване на прозореца за пакетиране и по памет оÑвен по брой обекти" -#: builtin/pack-objects.c:2644 +#: builtin/pack-objects.c:2643 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "макÑимална дължина на веригата от разлики, коÑто е позволена в Ð¿Ð°ÐºÐµÑ‚Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»" -#: builtin/pack-objects.c:2646 +#: builtin/pack-objects.c:2645 msgid "reuse existing deltas" msgstr "преизползване на ÑъщеÑтвуващите разлики" -#: builtin/pack-objects.c:2648 +#: builtin/pack-objects.c:2647 msgid "reuse existing objects" msgstr "преизползване на ÑъщеÑтвуващите обекти" -#: builtin/pack-objects.c:2650 +#: builtin/pack-objects.c:2649 msgid "use OFS_DELTA objects" msgstr "използване на обекти „OFS_DELTA“" -#: builtin/pack-objects.c:2652 +#: builtin/pack-objects.c:2651 msgid "use threads when searching for best delta matches" msgstr "" "Ñтартиране на нишки за претърÑване на най-добрите ÑÑŠÐ²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ Ð½Ð° разликите" -#: builtin/pack-objects.c:2654 +#: builtin/pack-objects.c:2653 msgid "do not create an empty pack output" msgstr "без Ñъздаване на празен пакетен файл" -#: builtin/pack-objects.c:2656 +#: builtin/pack-objects.c:2655 msgid "read revision arguments from standard input" msgstr "изчитане на верÑиите от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´" -#: builtin/pack-objects.c:2658 +#: builtin/pack-objects.c:2657 msgid "limit the objects to those that are not yet packed" msgstr "ограничаване до вÑе още непакетираните обекти" -#: builtin/pack-objects.c:2661 +#: builtin/pack-objects.c:2660 msgid "include objects reachable from any reference" msgstr "" "включване на вÑички обекти, които могат да Ñе доÑтигнат от произволен " "указател" -#: builtin/pack-objects.c:2664 +#: builtin/pack-objects.c:2663 msgid "include objects referred by reflog entries" msgstr "включване и на обектите Ñочени от запиÑите в журнала на указателите" -#: builtin/pack-objects.c:2667 +#: builtin/pack-objects.c:2666 msgid "include objects referred to by the index" msgstr "включване и на обектите Ñочени от индекÑа" -#: builtin/pack-objects.c:2670 +#: builtin/pack-objects.c:2669 msgid "output pack to stdout" msgstr "извеждане на пакета на ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð¸Ð·Ñ…Ð¾Ð´" -#: builtin/pack-objects.c:2672 +#: builtin/pack-objects.c:2671 msgid "include tag objects that refer to objects to be packed" msgstr "" "включване и на обектите-етикети, които Ñочат към обектите, които ще бъдат " "пакетирани" -#: builtin/pack-objects.c:2674 +#: builtin/pack-objects.c:2673 msgid "keep unreachable objects" msgstr "запазване на недоÑтижимите обекти" -#: builtin/pack-objects.c:2675 parse-options.h:140 +#: builtin/pack-objects.c:2674 parse-options.h:140 msgid "time" msgstr "ВРЕМЕ" -#: builtin/pack-objects.c:2676 +#: builtin/pack-objects.c:2675 msgid "unpack unreachable objects newer than <time>" msgstr "разпакетиране на недоÑтижимите обекти, които Ñа по-нови от това ВРЕМЕ" -#: builtin/pack-objects.c:2679 +#: builtin/pack-objects.c:2678 msgid "create thin packs" msgstr "Ñъздаване на Ñъкратени пакети" -#: builtin/pack-objects.c:2681 +#: builtin/pack-objects.c:2680 +msgid "create packs suitable for shallow fetches" +msgstr "пакетиране подходÑщо за плитко доÑтавÑне" + +#: builtin/pack-objects.c:2682 msgid "ignore packs that have companion .keep file" msgstr "игнориране на пакетите, които Ñа придружени от файл „.keep“" -#: builtin/pack-objects.c:2683 +#: builtin/pack-objects.c:2684 msgid "pack compression level" msgstr "ниво на компреÑиране при пакетиране" -#: builtin/pack-objects.c:2685 +#: builtin/pack-objects.c:2686 msgid "do not hide commits by grafts" msgstr "" "извеждане на вÑички родители — дори и тези, които нормално Ñа Ñкрити при " "приÑажданиÑта" -#: builtin/pack-objects.c:2687 +#: builtin/pack-objects.c:2688 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "използване на ÑъщеÑтвуващи индекÑи на база битови маÑки за уÑкорÑване на " "преброÑването на обектите" -#: builtin/pack-objects.c:2689 +#: builtin/pack-objects.c:2690 msgid "write a bitmap index together with the pack index" msgstr "" "запазване и на Ð¸Ð½Ð´ÐµÐºÑ Ð½Ð° база побитова маÑка, заедно Ñ Ð¸Ð½Ð´ÐµÐºÑа за пакета" -#: builtin/pack-objects.c:2778 +#: builtin/pack-objects.c:2781 msgid "Counting objects" msgstr "ПреброÑване на обектите" #: builtin/pack-refs.c:6 -msgid "git pack-refs [options]" +msgid "git pack-refs [<options>]" msgstr "git pack-refs [ОПЦИЯ…]" #: builtin/pack-refs.c:14 @@ -8347,8 +8396,8 @@ msgid "prune loose refs (default)" msgstr "окаÑÑ‚Ñ€Ñне на недоÑтижимите указатели (Ñтандартно)" #: builtin/prune-packed.c:7 -msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" -msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" +msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" +msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" #: builtin/prune-packed.c:40 msgid "Removing duplicate objects" @@ -8582,7 +8631,7 @@ msgid "" "or update a remote ref to make it point at a non-commit object,\n" "without using the '--force' option.\n" msgstr "" -"Без да укажете опциÑта опциÑта „--force“, не може да обновите отдалечен\n" +"Без да укажете опциÑта „--force“, не може да обновите отдалечен\n" "указател, който вече Ñочи към обект, който не е подаване, както и тепърва\n" "да го промените да Ñочи към подобен обект.\n" @@ -8643,79 +8692,83 @@ msgstr "опциÑта „--mirror“ е неÑъвмеÑтима Ñ ÑƒÐºÐ°Ð·Ð²Ð msgid "--all and --mirror are incompatible" msgstr "опциите „--all“ и „--mirror“ Ñа неÑъвмеÑтими" -#: builtin/push.c:493 +#: builtin/push.c:502 msgid "repository" msgstr "хранилище" -#: builtin/push.c:494 +#: builtin/push.c:503 msgid "push all refs" msgstr "изтлаÑкване на вÑички указатели" -#: builtin/push.c:495 +#: builtin/push.c:504 msgid "mirror all refs" msgstr "огледално копие на вÑички указатели" -#: builtin/push.c:497 +#: builtin/push.c:506 msgid "delete refs" msgstr "изтриване на указателите" -#: builtin/push.c:498 +#: builtin/push.c:507 msgid "push tags (can't be used with --all or --mirror)" msgstr "изтлаÑкване на етикетите (неÑъвмеÑтимо Ñ Ð¾Ð¿Ñ†Ð¸Ð¸Ñ‚Ðµ „--all“ и „--mirror“)" -#: builtin/push.c:501 +#: builtin/push.c:510 msgid "force updates" msgstr "принудително обновÑване" # FIXME double check this -#: builtin/push.c:503 +#: builtin/push.c:512 msgid "refname>:<expect" msgstr "УКÐЗÐТЕЛ>:<ОЧÐКВÐÐÐ_СТОЙÐОСТ" -#: builtin/push.c:504 +#: builtin/push.c:513 msgid "require old value of ref to be at this value" msgstr "УКÐЗÐТЕЛÑÑ‚ Ñ‚Ñ€Ñбва първоначално да е Ñ Ñ‚Ð°Ð·Ð¸ ОЧÐКВÐÐÐ_СТОЙÐОСТ" -#: builtin/push.c:507 +#: builtin/push.c:516 msgid "control recursive pushing of submodules" msgstr "управление на рекурÑивното изтлаÑкване на подмодулите" -#: builtin/push.c:509 +#: builtin/push.c:518 msgid "use thin pack" msgstr "използване на Ñъкратени пакети" -#: builtin/push.c:510 builtin/push.c:511 +#: builtin/push.c:519 builtin/push.c:520 msgid "receive pack program" msgstr "програма за получаването на пакети" -#: builtin/push.c:512 +#: builtin/push.c:521 msgid "set upstream for git pull/status" msgstr "задаване на отдалеченото хранилище за командите „git pull/status“" -#: builtin/push.c:515 +#: builtin/push.c:524 msgid "prune locally removed refs" msgstr "окаÑÑ‚Ñ€Ñне на указателите, които Ñа премахнати от локалното хранилище" -#: builtin/push.c:517 +#: builtin/push.c:526 msgid "bypass pre-push hook" msgstr "без изпълнение на куката преди изтлаÑкване (pre-push)" -#: builtin/push.c:518 +#: builtin/push.c:527 msgid "push missing but relevant tags" msgstr "" "изтлаÑкване на липÑващите в отдалеченото хранилище, но Ñвързани Ñ Ñ‚ÐµÐºÑƒÑ‰Ð¾Ñ‚Ð¾ " "изтлаÑкване, етикети" -#: builtin/push.c:520 +#: builtin/push.c:529 msgid "GPG sign the push" msgstr "подпиÑване на изтлаÑкването Ñ GPG" -#: builtin/push.c:529 +#: builtin/push.c:530 +msgid "request atomic transaction on remote side" +msgstr "изиÑкване на атомарни операции от отÑрещната Ñтрана" + +#: builtin/push.c:539 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" "опциÑта „--delete“ е неÑъвмеÑтима Ñ Ð¾Ð¿Ñ†Ð¸Ð¸Ñ‚Ðµ „--all“, „--mirror“ и „--tags“" -#: builtin/push.c:531 +#: builtin/push.c:541 msgid "--delete doesn't make sense without any refs" msgstr "опциÑта „--delete“ изиÑква поне един указател на верÑиÑ" @@ -8795,12 +8848,12 @@ msgid "debug unpack-trees" msgstr "изчиÑтване на грешки в командата „unpack-trees“" # FIXME -#: builtin/reflog.c:499 +#: builtin/reflog.c:429 #, c-format msgid "%s' for '%s' is not a valid timestamp" msgstr "„%s“ не е правилна ÑтойноÑÑ‚ за време за „%s“" -#: builtin/reflog.c:615 builtin/reflog.c:620 +#: builtin/reflog.c:546 builtin/reflog.c:551 #, c-format msgid "'%s' is not a valid timestamp" msgstr "„%s“ не е правилна ÑтойноÑÑ‚ за време" @@ -8811,10 +8864,10 @@ msgstr "git remote [-v | --verbose]" #: builtin/remote.c:13 msgid "" -"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" +"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" -"git remote add [-t КЛОÐ] [-m ОСÐОВЕÐ_КЛОÐ] [-f] [--tags|--no-tags] [--" +"git remote add [-t КЛОÐ] [-m ОСÐОВЕÐ_КЛОÐ] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] ИМЕ ÐДРЕС" #: builtin/remote.c:14 builtin/remote.c:33 @@ -8825,8 +8878,8 @@ msgstr "git remote rename СТÐРО_ИМЕ ÐОВО_ИМЕ" msgid "git remote remove <name>" msgstr "git remote remove ИМЕ" -#: builtin/remote.c:16 -msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" +#: builtin/remote.c:16 builtin/remote.c:43 +msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head ИМЕ (-a | --auto | -d | --delete | КЛОÐ)" #: builtin/remote.c:17 @@ -8864,10 +8917,6 @@ msgstr "git remote set-url --delete ИМЕ ÐДРЕС" msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [ОПЦИЯ…] ИМЕ ÐДРЕС" -#: builtin/remote.c:43 -msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" -msgstr "git remote set-head ИМЕ (-a | --auto | -d | --delete | КЛОÐ)" - #: builtin/remote.c:48 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches ИМЕ КЛОÐ…" @@ -8947,56 +8996,56 @@ msgstr "" "указването на Ñледени клони е ÑмиÑлено Ñамо за отдалечени хранилища, от " "които Ñе доÑтавÑ" -#: builtin/remote.c:185 builtin/remote.c:641 +#: builtin/remote.c:187 builtin/remote.c:643 #, c-format msgid "remote %s already exists." msgstr "вече ÑъщеÑтвува отдалечено хранилище Ñ Ð¸Ð¼Ðµ „%s“." -#: builtin/remote.c:189 builtin/remote.c:645 +#: builtin/remote.c:191 builtin/remote.c:647 #, c-format msgid "'%s' is not a valid remote name" msgstr "„%s“ е неправилно име за отдалечено хранилище" -#: builtin/remote.c:233 +#: builtin/remote.c:235 #, c-format msgid "Could not setup master '%s'" msgstr "ОÑновниÑÑ‚ клон „%s“ не може да бъде наÑтроен" -#: builtin/remote.c:333 +#: builtin/remote.c:335 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "Обектите за доÑтавÑне за ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€ž%s“ не могат да бъдат получени" -#: builtin/remote.c:434 builtin/remote.c:442 +#: builtin/remote.c:436 builtin/remote.c:444 msgid "(matching)" msgstr "(Ñъвпадащи)" -#: builtin/remote.c:446 +#: builtin/remote.c:448 msgid "(delete)" msgstr "(за изтриване)" -#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602 +#: builtin/remote.c:592 builtin/remote.c:598 builtin/remote.c:604 #, c-format msgid "Could not append '%s' to '%s'" msgstr "„%s“ не може да Ñе добави към „%s“" -#: builtin/remote.c:634 builtin/remote.c:798 builtin/remote.c:898 +#: builtin/remote.c:636 builtin/remote.c:795 builtin/remote.c:895 #, c-format msgid "No such remote: %s" msgstr "Такова отдалечено хранилище нÑма: %s" -#: builtin/remote.c:651 +#: builtin/remote.c:653 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Разделът „%s“ в наÑтройките не може да бъде преименуван на „%s“" -#: builtin/remote.c:657 builtin/remote.c:850 +#: builtin/remote.c:659 builtin/remote.c:847 #, c-format msgid "Could not remove config section '%s'" msgstr "Разделът „%s“ в наÑтройките не може да бъде изтрит" # FIXME tabulator -#: builtin/remote.c:672 +#: builtin/remote.c:674 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -9007,32 +9056,32 @@ msgstr "" " %s\n" " Променете наÑтройките ръчно, ако е необходимо." -#: builtin/remote.c:678 +#: builtin/remote.c:680 #, c-format msgid "Could not append '%s'" msgstr "Разделът „%s“ не може да бъде добавен в наÑтройките" -#: builtin/remote.c:689 +#: builtin/remote.c:691 #, c-format msgid "Could not set '%s'" msgstr "Разделът „%s“ не може да бъде зададен в наÑтройките" -#: builtin/remote.c:711 +#: builtin/remote.c:713 #, c-format msgid "deleting '%s' failed" msgstr "неуÑпешно изтриване на „%s“" -#: builtin/remote.c:745 +#: builtin/remote.c:747 #, c-format msgid "creating '%s' failed" msgstr "неуÑпешно Ñъздаване на „%s“" -#: builtin/remote.c:769 +#: builtin/remote.c:766 #, c-format msgid "Could not remove branch %s" msgstr "Клонът „%s“ не може да бъде изтрит" -#: builtin/remote.c:836 +#: builtin/remote.c:833 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -9046,125 +9095,125 @@ msgstr[1] "" "Бележка: ÐÑколко клона извън йерархиÑта „refs/remotes/“ не бÑха изтрити.\n" "Изтрийте ги чрез командата:" -#: builtin/remote.c:951 +#: builtin/remote.c:948 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " нов (Ñледващото доÑтавÑне ще го разположи в „remotes/%s“)" -#: builtin/remote.c:954 +#: builtin/remote.c:951 msgid " tracked" msgstr " Ñледен" -#: builtin/remote.c:956 +#: builtin/remote.c:953 msgid " stale (use 'git remote prune' to remove)" msgstr " Ñтар (изтрийте чрез „git remote prune“)" # FIXME -#: builtin/remote.c:958 +#: builtin/remote.c:955 msgid " ???" msgstr " неÑÑно ÑÑŠÑтоÑние" # CHECK -#: builtin/remote.c:999 +#: builtin/remote.c:996 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" "неправилен клон за Ñливане „%s“. Ðевъзможно е да пребазирате върху повече от " "1 клон" -#: builtin/remote.c:1006 +#: builtin/remote.c:1003 #, c-format msgid "rebases onto remote %s" msgstr "пребазиране върху Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐºÐ»Ð¾Ð½ „%s“" -#: builtin/remote.c:1009 +#: builtin/remote.c:1006 #, c-format msgid " merges with remote %s" msgstr " Ñливане Ñ Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐºÐ»Ð¾Ð½ „%s“" -#: builtin/remote.c:1010 +#: builtin/remote.c:1007 msgid " and with remote" msgstr " и Ñ Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐºÐ»Ð¾Ð½" -#: builtin/remote.c:1012 +#: builtin/remote.c:1009 #, c-format msgid "merges with remote %s" msgstr "Ñливане Ñ Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐºÐ»Ð¾Ð½ „%s“" -#: builtin/remote.c:1013 +#: builtin/remote.c:1010 msgid " and with remote" msgstr " и Ñ Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐºÐ»Ð¾Ð½" -#: builtin/remote.c:1059 +#: builtin/remote.c:1056 msgid "create" msgstr "Ñъздаден" -#: builtin/remote.c:1062 +#: builtin/remote.c:1059 msgid "delete" msgstr "изтрит" -#: builtin/remote.c:1066 +#: builtin/remote.c:1063 msgid "up to date" msgstr "актуален" -#: builtin/remote.c:1069 +#: builtin/remote.c:1066 msgid "fast-forwardable" msgstr "може да Ñе Ñлее тривиално" -#: builtin/remote.c:1072 +#: builtin/remote.c:1069 msgid "local out of date" msgstr "локалниÑÑ‚ е изоÑтанал" -#: builtin/remote.c:1079 +#: builtin/remote.c:1076 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s принудително изтлаÑква към %-*s (%s)" -#: builtin/remote.c:1082 +#: builtin/remote.c:1079 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s изтлаÑква към %-*s (%s)" -#: builtin/remote.c:1086 +#: builtin/remote.c:1083 #, c-format msgid " %-*s forces to %s" msgstr " %-*s принудително изтлаÑква към %s" -#: builtin/remote.c:1089 +#: builtin/remote.c:1086 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s изтлаÑква към %s" -#: builtin/remote.c:1157 +#: builtin/remote.c:1154 msgid "do not query remotes" msgstr "без заÑвки към отдалечените хранилища" -#: builtin/remote.c:1184 +#: builtin/remote.c:1181 #, c-format msgid "* remote %s" msgstr "◠отдалечено хранилище „%s“" -#: builtin/remote.c:1185 +#: builtin/remote.c:1182 #, c-format msgid " Fetch URL: %s" msgstr " ÐÐ´Ñ€ÐµÑ Ð·Ð° доÑтавÑне: %s" -#: builtin/remote.c:1186 builtin/remote.c:1333 +#: builtin/remote.c:1183 builtin/remote.c:1334 msgid "(no URL)" msgstr "(без адреÑ)" # FIXME spaces betwen Push and URL -#: builtin/remote.c:1195 builtin/remote.c:1197 +#: builtin/remote.c:1192 builtin/remote.c:1194 #, c-format msgid " Push URL: %s" msgstr " ÐÐ´Ñ€ÐµÑ Ð·Ð° изтлаÑкване: %s" -#: builtin/remote.c:1199 builtin/remote.c:1201 builtin/remote.c:1203 +#: builtin/remote.c:1196 builtin/remote.c:1198 builtin/remote.c:1200 #, c-format msgid " HEAD branch: %s" msgstr " клон Ñочен от HEAD: %s" -#: builtin/remote.c:1205 +#: builtin/remote.c:1202 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -9173,227 +9222,227 @@ msgstr "" "хранилище е\n" " нееднозначен и е нÑкой от Ñледните):\n" -#: builtin/remote.c:1217 +#: builtin/remote.c:1214 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Отдалечен клон:%s" msgstr[1] " Отдалечени клони:%s" -#: builtin/remote.c:1220 builtin/remote.c:1247 +#: builtin/remote.c:1217 builtin/remote.c:1244 msgid " (status not queried)" msgstr " (ÑÑŠÑтоÑнието не бе проверено)" -#: builtin/remote.c:1229 +#: builtin/remote.c:1226 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:1237 +#: builtin/remote.c:1234 msgid " Local refs will be mirrored by 'git push'" msgstr " Локалните указатели ще бъдат пренеÑени чрез „ push“" -#: builtin/remote.c:1244 +#: builtin/remote.c:1241 #, 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:1265 +#: builtin/remote.c:1262 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "задаване на refs/remotes/ИМЕ/HEAD Ñпоред отдалеченото хранилище" -#: builtin/remote.c:1267 +#: builtin/remote.c:1264 msgid "delete refs/remotes/<name>/HEAD" msgstr "изтриване на refs/remotes/ИМЕ/HEAD" -#: builtin/remote.c:1282 +#: builtin/remote.c:1279 msgid "Cannot determine remote HEAD" msgstr "Ðе може да Ñе уÑтанови отдалечениÑÑ‚ връх" -#: builtin/remote.c:1284 +#: builtin/remote.c:1281 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "МножеÑтво клони Ñ Ð²ÑŠÑ€Ñ…Ð¾Ð²Ðµ. Изберете изрично нÑкой от Ñ‚ÑÑ… чрез командата:" -#: builtin/remote.c:1294 +#: builtin/remote.c:1291 #, c-format msgid "Could not delete %s" msgstr "„%s“ не може да бъде изтрит" -#: builtin/remote.c:1302 +#: builtin/remote.c:1299 #, c-format msgid "Not a valid ref: %s" msgstr "Ðеправилен указател: %s" -#: builtin/remote.c:1304 +#: builtin/remote.c:1301 #, c-format msgid "Could not setup %s" msgstr "„%s“ не може да Ñе наÑтрои" -#: builtin/remote.c:1322 +#: builtin/remote.c:1319 #, c-format msgid " %s will become dangling!" msgstr "„%s“ ще Ñе превърне в обект извън клоните!" -#: builtin/remote.c:1323 +#: builtin/remote.c:1320 #, c-format msgid " %s has become dangling!" msgstr "„%s“ Ñе превърна в обект извън клоните!" -#: builtin/remote.c:1329 +#: builtin/remote.c:1330 #, c-format msgid "Pruning %s" msgstr "ОкаÑÑ‚Ñ€Ñне на „%s“" -#: builtin/remote.c:1330 +#: builtin/remote.c:1331 #, c-format msgid "URL: %s" msgstr "адреÑ: %s" -#: builtin/remote.c:1357 +#: builtin/remote.c:1354 #, c-format msgid " * [would prune] %s" msgstr " â— [ще бъде окаÑтрено] %s" -#: builtin/remote.c:1360 +#: builtin/remote.c:1357 #, c-format msgid " * [pruned] %s" msgstr " â— [окаÑтрено] %s" -#: builtin/remote.c:1405 +#: builtin/remote.c:1402 msgid "prune remotes after fetching" msgstr "окаÑÑ‚Ñ€Ñне на огледалата на отдалечените хранилища Ñлед доÑтавÑне" -#: builtin/remote.c:1471 builtin/remote.c:1545 +#: builtin/remote.c:1468 builtin/remote.c:1542 #, c-format msgid "No such remote '%s'" msgstr "ÐÑма отдалечено хранилище на име „%s“" -#: builtin/remote.c:1491 +#: builtin/remote.c:1488 msgid "add branch" msgstr "добавÑне на клон" -#: builtin/remote.c:1498 +#: builtin/remote.c:1495 msgid "no remote specified" msgstr "не е указано отдалечено хранилище" -#: builtin/remote.c:1520 +#: builtin/remote.c:1517 msgid "manipulate push URLs" msgstr "промÑна на адреÑите за изтлаÑкване" -#: builtin/remote.c:1522 +#: builtin/remote.c:1519 msgid "add URL" msgstr "добавÑне на адреÑи" -#: builtin/remote.c:1524 +#: builtin/remote.c:1521 msgid "delete URLs" msgstr "изтриване на адреÑи" # FIXME message - incompatible -#: builtin/remote.c:1531 +#: builtin/remote.c:1528 msgid "--add --delete doesn't make sense" msgstr "опциите „--add“ и „--delete“ Ñа неÑъвмеÑтими" -#: builtin/remote.c:1571 +#: builtin/remote.c:1568 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Ðеправилен (Ñтар) формат за адреÑ: %s" -#: builtin/remote.c:1579 +#: builtin/remote.c:1576 #, c-format msgid "No such URL found: %s" msgstr "Такъв Ð°Ð´Ñ€ÐµÑ Ð½Ðµ е открит: %s" # FIXME CHECK MEANING -#: builtin/remote.c:1581 +#: builtin/remote.c:1578 msgid "Will not delete all non-push URLs" msgstr "Ðикой от адреÑите, които не Ñа за изтлаÑкване, нÑма да Ñе изтрие" -#: builtin/remote.c:1595 +#: builtin/remote.c:1592 msgid "be verbose; must be placed before a subcommand" msgstr "повече подробноÑти. ПоÑÑ‚Ð°Ð²Ñ Ñе пред подкоманда" #: builtin/repack.c:17 -msgid "git repack [options]" +msgid "git repack [<options>]" msgstr "git repack [ОПЦИЯ…]" -#: builtin/repack.c:160 +#: builtin/repack.c:159 msgid "pack everything in a single pack" msgstr "пакетиране на вÑичко в пакет" -#: builtin/repack.c:162 +#: builtin/repack.c:161 msgid "same as -a, and turn unreachable objects loose" msgstr "" "Ñъщото като опциÑта „-a“. Допълнително — недоÑтижимите обекти да Ñтанат " "непакетирани" -#: builtin/repack.c:165 +#: builtin/repack.c:164 msgid "remove redundant packs, and run git-prune-packed" msgstr "" "премахване на ненужните пакетирани файлове и изпълнение на командата „git-" "prune-packed“" -#: builtin/repack.c:167 +#: builtin/repack.c:166 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "подаване на опциÑта „--no-reuse-delta“ на командата „git-pack-objects“" -#: builtin/repack.c:169 +#: builtin/repack.c:168 msgid "pass --no-reuse-object to git-pack-objects" msgstr "" "подаване на опциÑта „--no-reuse-object“ на командата „git-pack-objects“" -#: builtin/repack.c:171 +#: builtin/repack.c:170 msgid "do not run git-update-server-info" msgstr "без изпълнение на командата „git-update-server-info“" -#: builtin/repack.c:174 +#: builtin/repack.c:173 msgid "pass --local to git-pack-objects" msgstr "подаване на опциÑта „--local“ на командата „git-pack-objects“" -#: builtin/repack.c:176 +#: builtin/repack.c:175 msgid "write bitmap index" msgstr "Ñъздаване и запиÑване на индекÑи на база битови маÑки" -#: builtin/repack.c:177 +#: builtin/repack.c:176 msgid "approxidate" msgstr "евриÑтична дата" -#: builtin/repack.c:178 +#: builtin/repack.c:177 msgid "with -A, do not loosen objects older than this" msgstr "" "при комбинирането Ñ Ð¾Ð¿Ñ†Ð¸Ñта „-A“ — без разпакетиране на обектите по Ñтари от " "това" -#: builtin/repack.c:180 +#: builtin/repack.c:179 msgid "size of the window used for delta compression" msgstr "размер на прозореца за делта компреÑиÑта" -#: builtin/repack.c:181 builtin/repack.c:185 +#: builtin/repack.c:180 builtin/repack.c:184 msgid "bytes" msgstr "байтове" -#: builtin/repack.c:182 +#: builtin/repack.c:181 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "Ñъщото като горната опциÑ, но ограничението да е по размер на паметта, а не " "по Ð±Ñ€Ð¾Ñ Ð½Ð° обектите" -#: builtin/repack.c:184 +#: builtin/repack.c:183 msgid "limits the maximum delta depth" msgstr "ограничаване на макÑималната дълбочина на делтата" -#: builtin/repack.c:186 +#: builtin/repack.c:185 msgid "maximum size of each packfile" msgstr "макÑимален размер на вÑеки пакет" -#: builtin/repack.c:188 +#: builtin/repack.c:187 msgid "repack objects in packs marked with .keep" msgstr "препакетиране на обектите в пакети белÑзани Ñ â€ž.keep“" -#: builtin/repack.c:374 +#: builtin/repack.c:375 #, c-format msgid "removing '%s' failed" msgstr "неуÑпешно изтриване на „%s“" @@ -9485,7 +9534,7 @@ msgid "use this format" msgstr "използване на този ФОРМÐТ" #: builtin/rerere.c:12 -msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" +msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "git rerere [clear | forget ПЪТ… | status | remaining | diff | gc]" #: builtin/rerere.c:57 @@ -9630,8 +9679,8 @@ msgid "Could not write new index file." msgstr "ÐовиÑÑ‚ Ð¸Ð½Ð´ÐµÐºÑ Ð½Ðµ може да бъде запиÑан." #: builtin/rev-parse.c:361 -msgid "git rev-parse --parseopt [options] -- [<args>...]" -msgstr "git rev-parse --parseopt [ОПЦИЯ…] -- [ÐРГУМЕÐТИ…]" +msgid "git rev-parse --parseopt [<options>] -- [<args>...]" +msgstr "git rev-parse --parseopt [ОПЦИЯ…] -- [ÐРГУМЕÐТ…]" #: builtin/rev-parse.c:366 msgid "keep the `--` passed as an arg" @@ -9647,21 +9696,21 @@ msgstr "изход в Ð´ÑŠÐ»Ð³Ð¸Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚" #: builtin/rev-parse.c:499 msgid "" -"git rev-parse --parseopt [options] -- [<args>...]\n" +"git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" -" or: git rev-parse [options] [<arg>...]\n" +" or: git rev-parse [<options>] [<arg>...]\n" "\n" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "" -"git rev-parse --parseopt [ОПЦИЯ…] -- [ÐРГУМЕÐТИ…]\n" -" или: git rev-parse --sq-quote [ÐРГУМЕÐТИ…]\n" -" или: git rev-parse [ОПЦИЯ…] [ÐРГУМЕÐТИ…]\n" +"git rev-parse --parseopt [ОПЦИЯ…] -- [ÐРГУМЕÐТ…]\n" +" или: git rev-parse --sq-quote [ÐРГУМЕÐТ…]\n" +" или: git rev-parse [ОПЦИЯ…] [ÐРГУМЕÐТ…]\n" "\n" "За повече Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° Ð¿ÑŠÑ€Ð²Ð¸Ñ Ð²Ð°Ñ€Ð¸Ð°Ð½Ñ‚ изпълнете „git rev-parse --parseopt -" "h“" #: builtin/revert.c:22 -msgid "git revert [options] <commit-ish>..." +msgid "git revert [<options>] <commit-ish>..." msgstr "git revert [ОПЦИЯ…] УКÐЗÐТЕЛ_КЪМ_ПОДÐÐ’ÐÐЕ…" #: builtin/revert.c:23 @@ -9669,7 +9718,7 @@ msgid "git revert <subcommand>" msgstr "git revert ПОДКОМÐÐДÐ" #: builtin/revert.c:28 -msgid "git cherry-pick [options] <commit-ish>..." +msgid "git cherry-pick [<options>] <commit-ish>..." msgstr "git cherry-pick [ОПЦИЯ…] УКÐЗÐТЕЛ_КЪМ_ПОДÐÐ’ÐÐЕ…" #: builtin/revert.c:29 @@ -9750,7 +9799,7 @@ msgid "cherry-pick failed" msgstr "неуÑпешно отбиране" #: builtin/rm.c:17 -msgid "git rm [options] [--] <file>..." +msgid "git rm [<options>] [--] <file>..." msgstr "git rm [ОПЦИЯ…] [--] ФÐЙЛ…" #: builtin/rm.c:65 @@ -9861,7 +9910,7 @@ msgid "git rm: unable to remove %s" msgstr "git rm: „%s“ не може да Ñе изтрие" #: builtin/shortlog.c:13 -msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]" +msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "git shortlog [ОПЦИЯ…] [ДИÐПÐЗОÐ_ÐÐ_ВЕРСИИТЕ] [[--] [ПЪТ…]]" #: builtin/shortlog.c:131 @@ -9894,93 +9943,93 @@ msgstr "" #: builtin/show-branch.c:9 msgid "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" -"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --" -"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | " -"<glob>)...]" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" +"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" +"\t\t[--more=<n> | --list | --independent | --merge-base]\n" +"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" msgstr "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" -"current] [--color[=КОГÐ] | --no-color] [--sparse] [--more=БРОЙ | --list | --" -"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(РЕВИЗИЯ | " -"УКÐЗÐТЕЛ)…]" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" +" [--current] [--color[=КОГÐ] | --no-color] [--sparse]\n" +" [--more=БРОЙ | --list | --independent | --merge-base]\n" +" [--no-name | --sha1-name] [--topics] [(РЕВИЗИЯ | УКÐЗÐТЕЛ)…]" -#: builtin/show-branch.c:10 -msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" -msgstr "git show-branch (-g|--reflog)[=БРОЙ[,БÐЗÐ]] [--list] [УКÐЗÐТЕЛ]" +#: builtin/show-branch.c:13 +msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" +msgstr "git show-branch (-g | --reflog)[=БРОЙ[,БÐЗÐ]] [--list] [УКÐЗÐТЕЛ]" -#: builtin/show-branch.c:649 +#: builtin/show-branch.c:652 msgid "show remote-tracking and local branches" msgstr "извеждане на ÑледÑщите и локалните клони" -#: builtin/show-branch.c:651 +#: builtin/show-branch.c:654 msgid "show remote-tracking branches" msgstr "извеждане на ÑледÑщите клони" -#: builtin/show-branch.c:653 +#: builtin/show-branch.c:656 msgid "color '*!+-' corresponding to the branch" msgstr "оцветÑване на „*!+-“ Ñпоред клоните" -#: builtin/show-branch.c:655 +#: builtin/show-branch.c:658 msgid "show <n> more commits after the common ancestor" msgstr "извеждане на такъв БРОЙ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ Ð¾Ñ‚ Ð¾Ð±Ñ‰Ð¸Ñ Ð¿Ñ€ÐµÐ´ÑˆÐµÑтвеник" -#: builtin/show-branch.c:657 +#: builtin/show-branch.c:660 msgid "synonym to more=-1" msgstr "Ñиноним на „more=-1“" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:661 msgid "suppress naming strings" msgstr "без низове за имената на клоните" -#: builtin/show-branch.c:660 +#: builtin/show-branch.c:663 msgid "include the current branch" msgstr "включване и на Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ ÐºÐ»Ð¾Ð½" -#: builtin/show-branch.c:662 +#: builtin/show-branch.c:665 msgid "name commits with their object names" msgstr "именуване на подаваниÑта Ñ Ð¸Ð¼ÐµÐ½Ð°Ñ‚Ð° им на обекти" -#: builtin/show-branch.c:664 +#: builtin/show-branch.c:667 msgid "show possible merge bases" msgstr "извеждане на възможните бази за ÑливаниÑ" -#: builtin/show-branch.c:666 +#: builtin/show-branch.c:669 msgid "show refs unreachable from any other ref" msgstr "извеждане на недоÑтижимите указатели" -#: builtin/show-branch.c:668 +#: builtin/show-branch.c:671 msgid "show commits in topological order" msgstr "извеждане на подаваниÑта в топологичеÑка подредба" -#: builtin/show-branch.c:671 +#: builtin/show-branch.c:674 msgid "show only commits not on the first branch" msgstr "извеждане Ñамо на подаваниÑта, които не Ñа от Ð¿ÑŠÑ€Ð²Ð¸Ñ ÐºÐ»Ð¾Ð½" -#: builtin/show-branch.c:673 +#: builtin/show-branch.c:676 msgid "show merges reachable from only one tip" msgstr "извеждане на ÑливаниÑта, които могат да Ñе доÑтигнат Ñамо от един връх" -#: builtin/show-branch.c:675 +#: builtin/show-branch.c:678 msgid "topologically sort, maintaining date order where possible" msgstr "" "топологичеÑка подредба, при запазване на подредбата по дата, доколкото е\n" "възможно" -#: builtin/show-branch.c:678 +#: builtin/show-branch.c:681 msgid "<n>[,<base>]" msgstr "БРОЙ[,БÐЗÐ]" -#: builtin/show-branch.c:679 +#: builtin/show-branch.c:682 msgid "show <n> most recent ref-log entries starting at base" msgstr "показване на най-много БРОЙ журнални запиÑа Ñ Ð½Ð°Ñ‡Ð°Ð»Ð¾ Ñъответната БÐЗÐ" # FIXME * -> ... #: builtin/show-ref.c:10 msgid "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" msgstr "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=ЧИСЛО]] [--abbrev[=ЧИСЛО]] [--tags] [--heads] [--] [ШÐБЛОÐ…]" # FIXME pattern & ref-list must be in <> @@ -10025,11 +10074,11 @@ msgstr "" "локалното хранилище" #: builtin/symbolic-ref.c:7 -msgid "git symbolic-ref [options] name [ref]" +msgid "git symbolic-ref [<options>] <name> [<ref>]" msgstr "git symbolic-ref [ОПЦИЯ…] ИМЕ [УКÐЗÐТЕЛ]" #: builtin/symbolic-ref.c:8 -msgid "git symbolic-ref -d [-q] name" +msgid "git symbolic-ref -d [-q] <name>" msgstr "git symbolic-ref -d [-q] ИМЕ" #: builtin/symbolic-ref.c:40 @@ -10044,20 +10093,21 @@ msgstr "изтриване на Ñимволен указател" msgid "shorten ref output" msgstr "кратка Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° указателÑ" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358 msgid "reason" msgstr "причина" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358 msgid "reason of the update" msgstr "причина за обновÑването" #: builtin/tag.c:22 msgid "" -"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " +"[<head>]" msgstr "" -"git tag [-a|-s|-u ИДЕÐТИФИКÐТОР_ÐÐ_КЛЮЧ] [-f] [-m СЪОБЩЕÐИЕ|-F ФÐЙЛ] ЕТИКЕТ " -"[ВРЪХ]" +"git tag [-a | -s | -u ИДЕÐТИФИКÐТОР_ÐÐ_КЛЮЧ] [-f] [-m СЪОБЩЕÐИЕ | -F ФÐЙЛ] " +"ЕТИКЕТ [ВРЪХ]" #: builtin/tag.c:23 msgid "git tag -d <tagname>..." @@ -10066,7 +10116,7 @@ msgstr "git tag -d ЕТИКЕТ…" # FIXME tabulator #: builtin/tag.c:24 msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" "\t\t[<pattern>...]" msgstr "" "git tag -l [-nБРОЙ] [--contains ПОДÐÐ’ÐÐЕ] [--points-at ОБЕКТ] \n" @@ -10215,18 +10265,18 @@ msgstr "използване на друг ключ за подпиÑванетРmsgid "replace the tag if exists" msgstr "замÑна на етикета, ако ÑъщеÑтвува" -#: builtin/tag.c:608 +#: builtin/tag.c:609 +msgid "Tag listing options" +msgstr "Опции за извеждането на етикети" + +#: builtin/tag.c:610 msgid "show tag list in columns" msgstr "извеждане на ÑпиÑъка на етикетите по колони" -#: builtin/tag.c:610 +#: builtin/tag.c:612 msgid "sort tags" msgstr "подреждане на етикетите" -#: builtin/tag.c:614 -msgid "Tag listing options" -msgstr "Опции за извеждането на етикети" - #: builtin/tag.c:617 builtin/tag.c:623 msgid "print only tags that contain the commit" msgstr "извеждане Ñамо на етикетите, които Ñъдържат подаването" @@ -10284,158 +10334,158 @@ msgid "Unpacking objects" msgstr "Разпакетиране на обектите" #: builtin/update-index.c:403 -msgid "git update-index [options] [--] [<file>...]" +msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [ОПЦИЯ…] [--] [ФÐЙЛ…]" -#: builtin/update-index.c:756 +#: builtin/update-index.c:757 msgid "continue refresh even when index needs update" msgstr "" "продължаване Ñ Ð¾Ð±Ð½Ð¾Ð²Ñването, дори когато индекÑÑŠÑ‚ Ñ‚Ñ€Ñбва да бъде обновен" -#: builtin/update-index.c:759 +#: builtin/update-index.c:760 msgid "refresh: ignore submodules" msgstr "подмодулите да Ñе игнорират при обновÑването" -#: builtin/update-index.c:762 +#: builtin/update-index.c:763 msgid "do not ignore new files" msgstr "новите файлове да не Ñе игнорират" -#: builtin/update-index.c:764 +#: builtin/update-index.c:765 msgid "let files replace directories and vice-versa" msgstr "файлове да могат да заменÑÑ‚ директории и обратно" -#: builtin/update-index.c:766 +#: builtin/update-index.c:767 msgid "notice files missing from worktree" msgstr "предупреждаване при липÑващи в работното дърво файлове" -#: builtin/update-index.c:768 +#: builtin/update-index.c:769 msgid "refresh even if index contains unmerged entries" msgstr "обновÑване дори и индекÑÑŠÑ‚ да Ñъдържа неÑлети обекти" -#: builtin/update-index.c:771 +#: builtin/update-index.c:772 msgid "refresh stat information" msgstr "обновÑване на информациÑта от функциÑта „stat“" -#: builtin/update-index.c:775 +#: builtin/update-index.c:776 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" "като опциÑта „--refresh“, но да Ñе проверÑÑ‚ и обектите, които Ñа били приети " "за непроменени" -#: builtin/update-index.c:779 +#: builtin/update-index.c:780 msgid "<mode>,<object>,<path>" msgstr "РЕЖИМ,ОБЕКТ,ПЪТ" -#: builtin/update-index.c:780 +#: builtin/update-index.c:781 msgid "add the specified entry to the index" msgstr "добавÑне на изброените обекти към индекÑа" -#: builtin/update-index.c:784 +#: builtin/update-index.c:785 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/update-index.c:785 +#: builtin/update-index.c:786 msgid "override the executable bit of the listed files" msgstr "изрично задаване на ÑтойноÑтта на флага дали файлът е изпълним" -#: builtin/update-index.c:789 +#: builtin/update-index.c:790 msgid "mark files as \"not changing\"" msgstr "задаване на флаг, че файлът не Ñе променÑ" -#: builtin/update-index.c:792 +#: builtin/update-index.c:793 msgid "clear assumed-unchanged bit" msgstr "изчиÑтване на флага, че файлът не Ñе променÑ" -#: builtin/update-index.c:795 +#: builtin/update-index.c:796 msgid "mark files as \"index-only\"" msgstr "задаване на флаг, че файловете Ñа Ñамо за индекÑа" -#: builtin/update-index.c:798 +#: builtin/update-index.c:799 msgid "clear skip-worktree bit" msgstr "изчиÑтване на флага, че файловете Ñа Ñамо за индекÑа" -#: builtin/update-index.c:801 +#: builtin/update-index.c:802 msgid "add to index only; do not add content to object database" msgstr "добавÑне Ñамо към индекÑа без добавÑне към базата от данни за обектите" -#: builtin/update-index.c:803 +#: builtin/update-index.c:804 msgid "remove named paths even if present in worktree" msgstr "изтриване на указаните пътища, дори и да ÑъщеÑтвуват в работното дърво" -#: builtin/update-index.c:805 +#: builtin/update-index.c:806 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" "при комбиниране Ñ Ð¾Ð¿Ñ†Ð¸Ñта „--stdin“ — входните редове Ñа разделени Ñ Ð½ÑƒÐ»ÐµÐ²Ð¸Ñ " "байт" -#: builtin/update-index.c:807 +#: builtin/update-index.c:808 msgid "read list of paths to be updated from standard input" msgstr "изчитане на ÑпиÑъка Ñ Ð¿ÑŠÑ‚Ð¸Ñ‰Ð° за обновÑване от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´" -#: builtin/update-index.c:811 +#: builtin/update-index.c:812 msgid "add entries from standard input to the index" msgstr "добавÑне на елементите от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´ към индекÑа" -#: builtin/update-index.c:815 +#: builtin/update-index.c:816 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" "възÑтановÑване на ÑÑŠÑтоÑнието преди Ñливане или нужда от обновÑване за " "изброените пътища" -#: builtin/update-index.c:819 +#: builtin/update-index.c:820 msgid "only update entries that differ from HEAD" msgstr "добавÑне Ñамо на Ñъдържанието, което Ñе различава от това в „HEAD“" -#: builtin/update-index.c:823 +#: builtin/update-index.c:824 msgid "ignore files missing from worktree" msgstr "игнориране на файловете, които липÑват в работното дърво" -#: builtin/update-index.c:826 +#: builtin/update-index.c:827 msgid "report actions to standard output" msgstr "извеждане на дейÑтвиÑта на ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð¸Ð·Ñ…Ð¾Ð´" -#: builtin/update-index.c:828 +#: builtin/update-index.c:829 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" "забравÑне на запиÑаната Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° неразрешени конфликти — за командите " "от потребителÑко ниво" -#: builtin/update-index.c:832 +#: builtin/update-index.c:833 msgid "write index in this format" msgstr "запиÑване на индекÑа в този формат" -#: builtin/update-index.c:834 +#: builtin/update-index.c:835 msgid "enable or disable split index" msgstr "включване или изключване на разделÑнето на индекÑа" #: builtin/update-ref.c:9 -msgid "git update-ref [options] -d <refname> [<oldval>]" +msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "git update-ref [ОПЦИЯ…] -d ИМЕ_ÐÐ_УКÐЗÐТЕЛ [СТÐÐ Ð_СТОЙÐОСТ]" # FIXME spaces - not needed in original #: builtin/update-ref.c:10 -msgid "git update-ref [options] <refname> <newval> [<oldval>]" +msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" msgstr "git update-ref [ОПЦИЯ…] ИМЕ_ÐÐ_УКÐЗÐТЕЛ ÐОВÐ_СТОЙÐОСТ [СТÐÐ Ð_СТОЙÐОСТ]" #: builtin/update-ref.c:11 -msgid "git update-ref [options] --stdin [-z]" +msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [ОПЦИЯ…] --stdin [-z]" -#: builtin/update-ref.c:363 +#: builtin/update-ref.c:359 msgid "delete the reference" msgstr "изтриване на указателÑ" -#: builtin/update-ref.c:365 +#: builtin/update-ref.c:361 msgid "update <refname> not the one it points to" msgstr "обновÑване на ИМЕто_ÐÐ_УКÐЗÐТЕЛÑ, а не това, към което Ñочи" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:362 msgid "stdin has NUL-terminated arguments" msgstr "" "нÑкои от елементите подадени на ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´ завършват Ñ Ð½ÑƒÐ»ÐµÐ²Ð¸Ñ Ð·Ð½Ð°Ðº " "„NUL“" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:363 msgid "read updates from stdin" msgstr "изчитане на указателите от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´" @@ -10448,16 +10498,16 @@ msgid "update the info files from scratch" msgstr "обновÑване на информационните файлове от нулата" #: builtin/verify-commit.c:17 -msgid "git verify-commit [-v|--verbose] <commit>..." -msgstr "git verify-tag [-v|--verbose] ПОДÐÐ’ÐÐЕ…" +msgid "git verify-commit [-v | --verbose] <commit>..." +msgstr "git verify-tag [-v | --verbose] ПОДÐÐ’ÐÐЕ…" #: builtin/verify-commit.c:75 msgid "print commit contents" msgstr "извеждане на Ñъдържанието на подаването" #: builtin/verify-pack.c:54 -msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." -msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] ПÐКЕТ…" +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." +msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] ПÐКЕТ…" #: builtin/verify-pack.c:64 msgid "verbose" @@ -10468,8 +10518,8 @@ msgid "show statistics only" msgstr "извеждане Ñамо на ÑтатиÑтиката" #: builtin/verify-tag.c:17 -msgid "git verify-tag [-v|--verbose] <tag>..." -msgstr "git verify-tag [-v|--verbose] ЕТИКЕТ…" +msgid "git verify-tag [-v | --verbose] <tag>..." +msgstr "git verify-tag [-v | --verbose] ЕТИКЕТ…" #: builtin/verify-tag.c:73 msgid "print tag contents" @@ -10495,7 +10545,7 @@ msgstr "Ñамо за изчиÑтване на грешки" msgid "print debugging messages to stderr" msgstr "извеждане на ÑъобщениÑта за траÑиране на Ñтандартната грешка" -#: git.c:17 +#: git.c:14 msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" @@ -10620,11 +10670,11 @@ msgstr "" "при възможноÑÑ‚ преизползване на решението на конфликта за обновÑване на " "индекÑа" -#: git-am.sh:52 +#: git-am.sh:53 msgid "You need to set your committer info first" msgstr "Първо Ñ‚Ñ€Ñбва да зададете Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° Ñебе Ñи" -#: git-am.sh:97 +#: git-am.sh:98 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -10635,7 +10685,7 @@ msgstr "" "към\n" "„ORIG_HEAD“" -#: git-am.sh:107 +#: git-am.sh:108 #, sh-format msgid "" "When you have resolved this problem, run \"$cmdline --continue\".\n" @@ -10649,21 +10699,21 @@ msgstr "" "на \n" "кръпки, изпълнете командата „$cmdline --abort“." -#: git-am.sh:123 +#: git-am.sh:124 msgid "Cannot fall back to three-way merge." msgstr "Ðе може да Ñе премине към тройно Ñливане." -#: git-am.sh:139 +#: git-am.sh:140 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Ð’ хранилището липÑват необходимите обекти BLOB, за да Ñе премине към тройно " "Ñливане." -#: git-am.sh:141 +#: git-am.sh:142 msgid "Using index info to reconstruct a base tree..." msgstr "Базовото дърво Ñе реконÑтруира от информациÑта в индекÑа…" -#: git-am.sh:156 +#: git-am.sh:157 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10671,29 +10721,29 @@ msgstr "" "Кръпката не може да Ñе приложи към обектите BLOB в индекÑа.\n" "Да не би да Ñте Ñ Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð°Ð»Ð¸ на ръка?" -#: git-am.sh:165 +#: git-am.sh:166 msgid "Falling back to patching base and 3-way merge..." msgstr "Преминаване към прилагане на кръпка към базата и тройно Ñливане…" -#: git-am.sh:181 +#: git-am.sh:182 msgid "Failed to merge in the changes." msgstr "ÐеуÑпешно Ñливане на промените." -#: git-am.sh:276 +#: git-am.sh:277 msgid "Only one StGIT patch series can be applied at once" msgstr "" "Само една ÑÐµÑ€Ð¸Ñ ÐºÑ€ÑŠÐ¿ÐºÐ¸ от „StGIT“ може да бъде прилагана в даден момент" -#: git-am.sh:363 +#: git-am.sh:364 #, sh-format msgid "Patch format $patch_format is not supported." msgstr "Ðеподдържан формат на кръпки: „$patch_format“." -#: git-am.sh:365 +#: git-am.sh:366 msgid "Patch format detection failed." msgstr "Форматът на кръпката не може да бъде определен." -#: git-am.sh:392 +#: git-am.sh:398 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -10701,7 +10751,7 @@ msgstr "" "Опциите „-b“/„--binary“ отдавна не правÑÑ‚ нищо и\n" "ще бъдат премахнати в бъдеще. Ðе ги ползвайте." -#: git-am.sh:486 +#: git-am.sh:496 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "" @@ -10709,11 +10759,11 @@ msgstr "" "зададен файл „mbox“." # FIXME better message -#: git-am.sh:491 +#: git-am.sh:501 msgid "Please make up your mind. --skip or --abort?" msgstr "Опциите „--skip“ и „--abort“ Ñа неÑъвмеÑтими." -#: git-am.sh:527 +#: git-am.sh:537 #, sh-format msgid "" "Stray $dotest directory found.\n" @@ -10722,11 +10772,11 @@ msgstr "" "Открита е излишна Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ â€ž$dotest“.\n" "Можете да Ñ Ð¸Ð·Ñ‚Ñ€Ð¸ÐµÑ‚Ðµ Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ‚Ð° „git am --abort“." -#: git-am.sh:535 +#: git-am.sh:545 msgid "Resolve operation not in progress, we are not resuming." msgstr "Ð’ момента не тече Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð¿Ð¾ коригиране и нÑма как да Ñе продължи." -#: git-am.sh:601 +#: git-am.sh:612 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "" @@ -10734,7 +10784,7 @@ msgstr "" "$files)" # FIXME spaces -#: git-am.sh:705 +#: git-am.sh:722 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" @@ -10747,35 +10797,35 @@ msgstr "" "на \n" "кръпки, изпълнете командата „$cmdline --abort“." -#: git-am.sh:732 +#: git-am.sh:749 msgid "Patch does not have a valid e-mail address." msgstr "Кръпката не Ñъдържа валиден Ð°Ð´Ñ€ÐµÑ Ð·Ð° е-поща." -#: git-am.sh:779 +#: git-am.sh:796 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "За интерактивно изпълнение е необходимо ÑтандартниÑÑ‚\n" "изход да е Ñвързан Ñ Ñ‚ÐµÑ€Ð¼Ð¸Ð½Ð°Ð», а в момента не е." -#: git-am.sh:783 +#: git-am.sh:800 msgid "Commit Body is:" msgstr "ТÑлото на кръпката за прилагане е:" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: git-am.sh:790 +#: git-am.sh:807 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgstr "" "Прилагане? „y“ — да/„n“ — не/„e“ — редактиране/„v“ — преглед/„a“ — приемане " "на вÑичко" -#: git-am.sh:826 +#: git-am.sh:843 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "Прилагане: $FIRSTLINE" -#: git-am.sh:847 +#: git-am.sh:864 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10785,7 +10835,7 @@ msgstr "" "Ðко нÑма друга промÑна за включване в индекÑа, най-вероÑтно нÑÐºÐ¾Ñ Ð´Ñ€ÑƒÐ³Ð°\n" "кръпка е довела до Ñъщите промени и в такъв Ñлучай проÑто пропуÑнете тази." -#: git-am.sh:855 +#: git-am.sh:872 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" @@ -10793,16 +10843,16 @@ msgstr "" "ИндекÑÑŠÑ‚ вÑе още Ñъдържа неÑлети промени — възможно е да не Ñте изпълнили " "„git add“." -#: git-am.sh:871 +#: git-am.sh:888 msgid "No changes -- Patch already applied." msgstr "Без промени — кръпката вече е приложена." -#: git-am.sh:881 +#: git-am.sh:898 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "ÐеуÑпешно прилагане на кръпката „$msgnum“: „$FIRSTLINE“" -#: git-am.sh:884 +#: git-am.sh:901 #, sh-format msgid "" "The copy of the patch that failed is found in:\n" @@ -10811,7 +10861,7 @@ msgstr "" "Дубликат на проблемната кръпка Ñе намира в:\n" " $dotest/patch" -#: git-am.sh:902 +#: git-am.sh:919 msgid "applying to an empty history" msgstr "прилагане върху празна иÑториÑ" @@ -10844,10 +10894,10 @@ msgstr "ТекущиÑÑ‚ указател „HEAD“ е неправилен." #: git-bisect.sh:130 #, sh-format msgid "" -"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." +"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." msgstr "" "ÐеуÑпешно преминаване към „$start_head“. Изпълнете командата „git bisect " -"reset СЪОТВЕТÐИЯ_КЛОГ." +"reset СЪЩЕСТВУВÐЩ_КЛОГ." #: git-bisect.sh:140 msgid "won't bisect on cg-seek'ed tree" @@ -10878,23 +10928,23 @@ msgstr "ФункциÑта „bisect_state“ изиÑква поне един Ð msgid "Bad rev input: $rev" msgstr "Ðеправилна верÑиÑ: „$rev“" -#: git-bisect.sh:250 +#: git-bisect.sh:253 msgid "'git bisect bad' can take only one argument." msgstr "Командата „git bisect bad“ приема Ñамо един аргумент." -#: git-bisect.sh:273 +#: git-bisect.sh:276 msgid "Warning: bisecting only with a bad commit." msgstr "ПРЕДУПРЕЖДЕÐИЕ: двоично Ñ‚ÑŠÑ€Ñене Ñамо по лошо подаване." #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#: git-bisect.sh:279 +#: git-bisect.sh:282 msgid "Are you sure [Y/n]? " msgstr "Да Ñе продължи ли? „Y“ — ДÐ, „n“ — не" # FIXME me? -#: git-bisect.sh:289 +#: git-bisect.sh:292 msgid "" "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.)" @@ -10903,7 +10953,7 @@ msgstr "" "направи Ñъответно и чрез командите „git bisect bad“ и „git bisect good“.)" # FIXME me -#: git-bisect.sh:292 +#: git-bisect.sh:295 msgid "" "You need to start by \"git bisect start\".\n" "You then need to give me at least one good and one bad revision.\n" @@ -10913,16 +10963,16 @@ msgstr "" "Ñ‚Ñ€Ñбва да зададете поне една добра и една лоша верÑиÑ. (Това може да Ñе\n" "направи Ñъответно и чрез командите „git bisect bad“ и „git bisect good“.)" -#: git-bisect.sh:363 git-bisect.sh:490 +#: git-bisect.sh:366 git-bisect.sh:493 msgid "We are not bisecting." msgstr "Ð’ момента не Ñе извършва двоично Ñ‚ÑŠÑ€Ñене." -#: git-bisect.sh:370 +#: git-bisect.sh:373 #, sh-format msgid "'$invalid' is not a valid commit" msgstr "„$invalid“ е неправилно подаване" -#: git-bisect.sh:379 +#: git-bisect.sh:382 #, sh-format msgid "" "Could not check out original HEAD '$branch'.\n" @@ -10931,11 +10981,11 @@ msgstr "" "Първоначално указаниÑÑ‚ клон „$branch“ в ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€žHEAD“ не може да бъде\n" "изтеглен. Пробвайте да изпълните командата „git bisect reset ПОДÐÐ’ÐÐЕ“." -#: git-bisect.sh:406 +#: git-bisect.sh:409 msgid "No logfile given" msgstr "Ðе е зададен журнален файл" -#: git-bisect.sh:407 +#: git-bisect.sh:410 #, sh-format msgid "cannot read $file for replaying" msgstr "" @@ -10943,17 +10993,17 @@ msgstr "" "командите от него наново" # FIXME WTF -#: git-bisect.sh:424 +#: git-bisect.sh:427 msgid "?? what are you talking about?" msgstr "" "Ðепозната команда. Възможните варианти Ñа: „start“, „good“, „bad“, „skip“" -#: git-bisect.sh:436 +#: git-bisect.sh:439 #, sh-format msgid "running $command" msgstr "изпълнение на командата „$command“" -#: git-bisect.sh:443 +#: git-bisect.sh:446 #, sh-format msgid "" "bisect run failed:\n" @@ -10963,12 +11013,12 @@ msgstr "" "изходниÑÑ‚ код от командата „$command“ е $res — това е извън интервала [0, " "128)" -#: git-bisect.sh:469 +#: git-bisect.sh:472 msgid "bisect run cannot continue any more" msgstr "двоичното Ñ‚ÑŠÑ€Ñене не може да продължи" # FIXME initial space -#: git-bisect.sh:475 +#: git-bisect.sh:478 #, sh-format msgid "" "bisect run failed:\n" @@ -10977,7 +11027,7 @@ msgstr "" "неуÑпешно двоично Ñ‚ÑŠÑ€Ñене:\n" "функциÑта „bisect_state $state“ завърши Ñ ÐºÐ¾Ð´ за грешка $res" -#: git-bisect.sh:482 +#: git-bisect.sh:485 msgid "bisect run success" msgstr "уÑпешно двоично Ñ‚ÑŠÑ€Ñене" @@ -11648,33 +11698,3 @@ 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“ не може да бъде обновен" @@ -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: 2015-01-18 11:24+0800\n" -"PO-Revision-Date: 2015-01-30 15:01-0700\n" +"POT-Creation-Date: 2015-04-03 08:13+0800\n" +"PO-Revision-Date: 2015-04-07 12:26-0700\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.7.3\n" +"X-Generator: Poedit 1.7.5\n" #: advice.c:55 #, c-format @@ -33,8 +33,8 @@ msgstr "" "resolució i feu una comissió." #: archive.c:11 -msgid "git archive [options] <tree-ish> [<path>...]" -msgstr "git archive [opcions] <arbre> [<camÃ>...]" +msgid "git archive [<options>] <tree-ish> [<path>...]" +msgstr "git archive [<opcions>] <arbre> [<camÃ>...]" #: archive.c:12 msgid "git archive --list" @@ -42,9 +42,10 @@ msgstr "git archive --list" #: archive.c:13 msgid "" -"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" +"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" -"git archive --remote <dipòsit> [--exec <ordre>] [opcions] <arbre> [<camÃ>...]" +"git archive --remote <dipòsit> [--exec <ordre>] [<opcions>] <arbre> " +"[<camÃ>...]" #: archive.c:14 msgid "git archive --remote <repo> [--exec <cmd>] --list" @@ -71,10 +72,10 @@ msgstr "prefix" msgid "prepend prefix to each pathname in the archive" msgstr "anteposa el prefix a cada nom de camà en l'arxiu" -#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2517 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986 +#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 +#: builtin/blame.c:2517 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:394 +#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 #: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151 msgid "file" msgstr "fitxer" @@ -123,7 +124,7 @@ msgstr "ordre" msgid "path to the remote git-upload-archive command" msgstr "camà a l'ordre git-upload-archive remot" -#: attr.c:258 +#: attr.c:264 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -260,7 +261,7 @@ msgstr "'%s' no sembla un fitxer de farcell v2" msgid "unrecognized header: %s%s (%d)" msgstr "capçalera no reconeguda: %s%s (%d)" -#: bundle.c:87 builtin/commit.c:770 +#: bundle.c:87 builtin/commit.c:766 #, c-format msgid "could not open '%s'" msgstr "no s'ha pogut obrir '%s'" @@ -269,8 +270,8 @@ msgstr "no s'ha pogut obrir '%s'" msgid "Repository lacks these prerequisite commits:" msgstr "Al dipòsit li manquen aquestes comissions prerequisits:" -#: bundle.c:163 sequencer.c:645 sequencer.c:1100 builtin/blame.c:2706 -#: builtin/branch.c:652 builtin/commit.c:1049 builtin/log.c:330 +#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 +#: builtin/branch.c:659 builtin/commit.c:1045 builtin/log.c:330 #: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358 #: builtin/shortlog.c:158 msgid "revision walk setup failed" @@ -311,25 +312,25 @@ msgstr "El rev-list s'ha mort" 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:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "parà metre no reconegut: %s" -#: bundle.c:444 +#: bundle.c:443 msgid "Refusing to create empty bundle." msgstr "Refusant crear un farcell buit." -#: bundle.c:454 +#: bundle.c:453 #, c-format msgid "cannot create '%s'" msgstr "no es pot crear '%s'" -#: bundle.c:475 +#: bundle.c:474 msgid "index-pack died" msgstr "L'index-pack s'ha mort" -#: color.c:259 +#: color.c:260 #, c-format msgid "invalid color value: %.*s" msgstr "valor de color no và lid: %.*s" @@ -348,55 +349,55 @@ msgstr "%s %s no és una comissió!" msgid "memory exhausted" msgstr "memòria esgotada" -#: config.c:469 config.c:471 +#: config.c:474 config.c:476 #, c-format msgid "bad config file line %d in %s" msgstr "lÃnia de fitxer de configuració dolenta %d en %s" -#: config.c:587 +#: config.c:592 #, 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 +#: config.c:594 #, 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 +#: config.c:679 #, 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 +#: config.c:757 config.c:768 #, c-format msgid "bad zlib compression level %d" msgstr "nivell de compressió de zlib dolent %d" -#: config.c:885 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "mode de creació d'objecte no và lid: %s" -#: config.c:1211 +#: config.c:1216 msgid "unable to parse command-line config" msgstr "no s'ha pogut analitzar la configuració de la lÃnia d'ordres" -#: config.c:1272 +#: config.c:1277 msgid "unknown error occured while reading the configuration files" msgstr "ha ocorregut un error desconegut en llegir els fitxers de configuració" -#: config.c:1596 +#: config.c:1601 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "no s'ha pogut analitzar '%s' de la configuració de la lÃnia d'ordres" -#: config.c:1598 +#: config.c:1603 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "variable de configuració dolenta '%s' en el fitxer '%s' a la lÃnia %d" -#: config.c:1657 +#: config.c:1662 #, c-format msgid "%s has multiple values" msgstr "%s té múltiples valors" @@ -488,7 +489,7 @@ msgstr[1] "fa %lu anys" msgid "failed to read orderfile '%s'" msgstr "s'ha fallat en llegir el fitxer d'ordres '%s'" -#: diffcore-rename.c:516 +#: diffcore-rename.c:536 msgid "Performing inexact rename detection" msgstr "Realitzant detecció inexacta de canvis de nom" @@ -517,16 +518,16 @@ msgstr "" "Errors trobats en la variable de configuració 'diff.dirstat':\n" "%s" -#: diff.c:2957 +#: diff.c:2956 #, c-format msgid "external diff died, stopping at %s" msgstr "El diff external s'ha mort, aturant a %s" -#: diff.c:3352 +#: diff.c:3351 msgid "--follow requires exactly one pathspec" msgstr "--follow requereix exactament una especificació de camÃ" -#: diff.c:3515 +#: diff.c:3514 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -535,7 +536,7 @@ msgstr "" "S'ha fallat en analitzar el parà metre d'opció de --dirstat/-X:\n" "%s" -#: diff.c:3529 +#: diff.c:3528 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "S'ha fallat en analitzar el parà metre d'opció de --submodule: %s" @@ -888,27 +889,27 @@ msgstr "la fusió dels arbres %s i %s ha fallat" msgid "Unprocessed path??? %s" msgstr "Camà no processat??? %s" -#: merge-recursive.c:1898 +#: merge-recursive.c:1901 msgid "Merging:" msgstr "Fusionant:" -#: merge-recursive.c:1911 +#: merge-recursive.c:1914 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "s'ha trobat %u avantpassat:" msgstr[1] "s'han trobat %u avantpassats:" -#: merge-recursive.c:1948 +#: merge-recursive.c:1951 msgid "merge returned no commit" msgstr "la fusió no ha retornat cap comissió" -#: merge-recursive.c:2005 +#: merge-recursive.c:2008 #, c-format msgid "Could not parse object '%s'" msgstr "No s'ha pogut analitzar l'objecte '%s'" -#: merge-recursive.c:2016 builtin/merge.c:667 +#: merge-recursive.c:2019 builtin/merge.c:667 msgid "Unable to write index." msgstr "No s'ha pogut escriure l'Ãndex." @@ -1038,7 +1039,7 @@ msgstr "no s'ha pogut analitzar el format --pretty" msgid "done" msgstr "fet" -#: read-cache.c:1267 +#: read-cache.c:1275 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1047,7 +1048,7 @@ msgstr "" "index.version establert, però el valor no és và lid.\n" "Usant la versió %i" -#: read-cache.c:1277 +#: read-cache.c:1285 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1135,23 +1136,31 @@ msgstr[1] "" msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (useu \"git pull\" per a fusionar la branca remota a la vostra)\n" -#: run-command.c:87 +#: revision.c:2348 +msgid "--first-parent is incompatible with --bisect" +msgstr "--first-parent és incompatible amb --bisect" + +#: run-command.c:83 msgid "open /dev/null failed" msgstr "s'ha fallat en obrir /dev/null" -#: run-command.c:89 +#: run-command.c:85 #, c-format msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) ha fallat" -#: send-pack.c:268 +#: send-pack.c:272 msgid "failed to sign the push certificate" msgstr "s'ha fallat en firmar el certificat de pujada" -#: send-pack.c:325 +#: send-pack.c:356 msgid "the receiving end does not support --signed push" msgstr "el destà receptor no admet pujar --signed" +#: send-pack.c:366 +msgid "the receiving end does not support --atomic push" +msgstr "el destà receptor no admet pujar --atomic" + #: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995 #: builtin/merge.c:1005 #, c-format @@ -1182,7 +1191,7 @@ msgstr "" "corregits amb 'git add <camins>' o 'git rm <camins>'\n" "i cometeu el resultat amb 'git commit'" -#: sequencer.c:211 sequencer.c:856 sequencer.c:939 +#: sequencer.c:211 sequencer.c:861 sequencer.c:944 #, c-format msgid "Could not write to %s" msgstr "No s'ha pogut escriure a %s" @@ -1218,31 +1227,31 @@ msgstr "No s'ha pogut resoldre la comissió HEAD\n" msgid "Unable to update cache tree\n" msgstr "No s'ha pogut actualitzar l'arbre cau\n" -#: sequencer.c:406 +#: sequencer.c:411 #, c-format msgid "Could not parse commit %s\n" msgstr "No s'ha pogut analitzar la comissió %s\n" -#: sequencer.c:411 +#: sequencer.c:416 #, c-format msgid "Could not parse parent commit %s\n" msgstr "No s'ha pogut analitzar la comissió mare %s\n" -#: sequencer.c:477 +#: sequencer.c:482 msgid "Your index file is unmerged." msgstr "El vostre fitxer d'Ãndex està sense fusionar." -#: sequencer.c:496 +#: sequencer.c:501 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "La comissió %s és una fusió però no s'ha donat cap opció -m." -#: sequencer.c:504 +#: sequencer.c:509 #, c-format msgid "Commit %s does not have parent %d" msgstr "La comissió %s no té mare %d" -#: sequencer.c:508 +#: sequencer.c:513 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" @@ -1250,154 +1259,154 @@ msgstr "" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:521 +#: sequencer.c:526 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: no es pot analitzar la comissió mare %s" -#: sequencer.c:525 +#: sequencer.c:530 #, c-format msgid "Cannot get commit message for %s" msgstr "No es pot obtenir el missatge de comissió de %s" -#: sequencer.c:611 +#: sequencer.c:616 #, c-format msgid "could not revert %s... %s" msgstr "no s'ha pogut revertir %s...%s" -#: sequencer.c:612 +#: sequencer.c:617 #, c-format msgid "could not apply %s... %s" msgstr "no s'ha pogut aplicar %s...%s" -#: sequencer.c:648 +#: sequencer.c:653 msgid "empty commit set passed" msgstr "conjunt de comissions buit passat" -#: sequencer.c:656 +#: sequencer.c:661 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: s'ha fallat en llegir l'Ãndex" -#: sequencer.c:660 +#: sequencer.c:665 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: s'ha fallat en actualitzar l'Ãndex" -#: sequencer.c:720 +#: sequencer.c:725 #, c-format msgid "Cannot %s during a %s" msgstr "No es pot %s durant un %s" -#: sequencer.c:742 +#: sequencer.c:747 #, c-format msgid "Could not parse line %d." msgstr "No s'ha pogut analitzar la lÃnia %d." -#: sequencer.c:747 +#: sequencer.c:752 msgid "No commits parsed." msgstr "Cap comissió analitzada." -#: sequencer.c:760 +#: sequencer.c:765 #, c-format msgid "Could not open %s" msgstr "No s'ha pogut obrir %s" -#: sequencer.c:764 +#: sequencer.c:769 #, c-format msgid "Could not read %s." msgstr "No s'ha pogut llegir %s." -#: sequencer.c:771 +#: sequencer.c:776 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Full d'instruccions inusable: %s" -#: sequencer.c:801 +#: sequencer.c:806 #, c-format msgid "Invalid key: %s" msgstr "Clau no và lida: %s" -#: sequencer.c:804 +#: sequencer.c:809 #, c-format msgid "Invalid value for %s: %s" msgstr "Valor no và lid per a %s: %s" -#: sequencer.c:816 +#: sequencer.c:821 #, c-format msgid "Malformed options sheet: %s" msgstr "Full d'opcions mal format: %s" -#: sequencer.c:837 +#: sequencer.c:842 msgid "a cherry-pick or revert is already in progress" msgstr "un recull de cireres o una reversió ja està en curs" -#: sequencer.c:838 +#: sequencer.c:843 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:842 +#: sequencer.c:847 #, c-format msgid "Could not create sequencer directory %s" msgstr "No s'ha pogut crear el directori de seqüenciador %s" -#: sequencer.c:858 sequencer.c:943 +#: sequencer.c:863 sequencer.c:948 #, c-format msgid "Error wrapping up %s." msgstr "Error en finalitzar %s." -#: sequencer.c:877 sequencer.c:1013 +#: sequencer.c:882 sequencer.c:1018 msgid "no cherry-pick or revert in progress" msgstr "ni hi ha cap recull de cireres ni cap reversió en curs" -#: sequencer.c:879 +#: sequencer.c:884 msgid "cannot resolve HEAD" msgstr "no es pot resoldre HEAD" -#: sequencer.c:881 +#: sequencer.c:886 msgid "cannot abort from a branch yet to be born" msgstr "no es pot avortar des d'una branca que encara ha de nà ixer" -#: sequencer.c:903 builtin/apply.c:4128 +#: sequencer.c:908 builtin/apply.c:4288 #, c-format msgid "cannot open %s: %s" msgstr "no es pot obrir %s: %s" -#: sequencer.c:906 +#: sequencer.c:911 #, c-format msgid "cannot read %s: %s" msgstr "no es pot llegir %s: %s" -#: sequencer.c:907 +#: sequencer.c:912 msgid "unexpected end of file" msgstr "final de fitxer inesperat" -#: sequencer.c:913 +#: sequencer.c:918 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" "el fitxer HEAD emmagatzemat abans del recull de cireres '%s' és corrupte" -#: sequencer.c:936 +#: sequencer.c:941 #, c-format msgid "Could not format %s." msgstr "No s'ha pogut formatar %s." -#: sequencer.c:1081 +#: sequencer.c:1086 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: no es pot recollir com a cirera un %s" -#: sequencer.c:1084 +#: sequencer.c:1089 #, c-format msgid "%s: bad revision" msgstr "%s: revisió dolenta" -#: sequencer.c:1118 +#: sequencer.c:1123 msgid "Can't revert as initial commit" msgstr "No es pot revertir com a comissió inicial" -#: sequencer.c:1119 +#: sequencer.c:1124 msgid "Can't cherry-pick into empty head" msgstr "No es pot recollir cireres en un cap buit" @@ -1470,38 +1479,38 @@ msgstr "No s'ha pogut eliminar l'entrada de .gitmodules per a %s" msgid "staging updated .gitmodules failed" msgstr "L'allistament del .gitmodules actualitzat ha fallat" -#: submodule.c:1111 builtin/init-db.c:371 +#: submodule.c:1109 builtin/init-db.c:371 #, c-format msgid "Could not create git link %s" msgstr "No s'ha pogut crear l'enllaç de git %s" -#: submodule.c:1122 +#: submodule.c:1120 #, c-format msgid "Could not set core.worktree in %s" msgstr "No s'ha pogut establir core.worktree en %s" -#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566 -#: trailer.c:570 +#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557 +#: trailer.c:561 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "valor desconegut '%s' per a la clau '%s'" -#: trailer.c:552 trailer.c:557 builtin/remote.c:290 +#: trailer.c:543 trailer.c:548 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "més d'un %s" -#: trailer.c:590 +#: trailer.c:581 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "fitxa de remolc buida en el remolc '%.*s'" -#: trailer.c:710 +#: trailer.c:701 #, c-format msgid "could not read input file '%s'" msgstr "no s'ha pogut llegir el fitxer d'entrada '%s'" -#: trailer.c:713 +#: trailer.c:704 msgid "could not read from stdin" msgstr "No s'ha pogut llegir des d'stdin" @@ -1538,26 +1547,26 @@ msgstr "número de port no và lid" msgid "invalid '..' path segment" msgstr "segment de camà '..' no và lid" -#: wrapper.c:509 +#: wrapper.c:523 #, c-format msgid "unable to access '%s': %s" msgstr "no s'ha pogut accedir a '%s': %s" -#: wrapper.c:530 +#: wrapper.c:544 #, c-format msgid "unable to access '%s'" msgstr "no s'ha pogut accedir a '%s'" -#: wrapper.c:541 +#: wrapper.c:555 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "no s'ha pogut trobar l'usuari actual en el fitxer passwd: %s" -#: wrapper.c:542 +#: wrapper.c:556 msgid "no such user" msgstr "no hi ha tal usuari" -#: wrapper.c:550 +#: wrapper.c:564 msgid "unable to get current working directory" msgstr "no s'ha pogut obtenir el directori de treball actual" @@ -1588,11 +1597,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (useu \"git rm <fitxer>...\" per a senyalar resolució)" -#: wt-status.c:198 +#: wt-status.c:198 wt-status.c:878 msgid "Changes to be committed:" msgstr "Canvis a cometre:" -#: wt-status.c:216 +#: wt-status.c:216 wt-status.c:887 msgid "Changes not staged for commit:" msgstr "Canvis no allistats per a cometre:" @@ -1703,15 +1712,15 @@ msgstr "contingut no seguit, " msgid "bug: unhandled diff status %c" msgstr "bug: estat de diferència no gestionat %c" -#: wt-status.c:758 +#: wt-status.c:753 msgid "Submodules changed but not updated:" msgstr "Submòduls canviats però no actualitzats:" -#: wt-status.c:760 +#: wt-status.c:755 msgid "Submodule changes to be committed:" msgstr "Canvis de submòdul a cometre:" -#: wt-status.c:839 +#: wt-status.c:835 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1719,191 +1728,191 @@ msgstr "" "No toqueu la lÃnia de sobre.\n" "Tot el que hi ha a sota s'eliminarà ." -#: wt-status.c:930 +#: wt-status.c:946 msgid "You have unmerged paths." msgstr "Teniu camins sense fusionar." -#: wt-status.c:933 +#: wt-status.c:949 msgid " (fix conflicts and run \"git commit\")" msgstr " (arregleu els conflictes i executeu \"git commit\")" -#: wt-status.c:936 +#: wt-status.c:952 msgid "All conflicts fixed but you are still merging." msgstr "Tots els conflictes estan arreglats però encara esteu fusionant." -#: wt-status.c:939 +#: wt-status.c:955 msgid " (use \"git commit\" to conclude merge)" msgstr " (useu \"git commit\" per a concloure la fusió)" -#: wt-status.c:949 +#: wt-status.c:965 msgid "You are in the middle of an am session." msgstr "Esteu enmig d'una sessió am." -#: wt-status.c:952 +#: wt-status.c:968 msgid "The current patch is empty." msgstr "El pedaç actual està buit." -#: wt-status.c:956 +#: wt-status.c:972 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (arregleu els conflictes i després executeu \"git am --continue\")" -#: wt-status.c:958 +#: wt-status.c:974 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (useu \"git am --skip\" per a ometre aquest pedaç)" -#: wt-status.c:960 +#: wt-status.c:976 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (useu \"git am --abort\" per a restaurar la branca original)" -#: wt-status.c:1020 wt-status.c:1037 +#: wt-status.c:1036 wt-status.c:1053 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Actualment esteu rebasant la branca '%s' en '%s'." -#: wt-status.c:1025 wt-status.c:1042 +#: wt-status.c:1041 wt-status.c:1058 msgid "You are currently rebasing." msgstr "Actualment esteu rebasant." -#: wt-status.c:1028 +#: wt-status.c:1044 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" " (arregleu els conflictes i després executeu \"git rebase --continue\")" -#: wt-status.c:1030 +#: wt-status.c:1046 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (useu \"git rebase --skip\" per a saltar aquest pedaç)" -#: wt-status.c:1032 +#: wt-status.c:1048 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (useu \"git rebase --abort\" per a agafar la branca original)" -#: wt-status.c:1045 +#: wt-status.c:1061 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (tots els conflictes arreglats: executeu \"git rebase --continue\")" -#: wt-status.c:1049 +#: wt-status.c:1065 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" "Actualment esteu dividint una comissió mentre rebaseu la branca '%s' en '%s'." -#: wt-status.c:1054 +#: wt-status.c:1070 msgid "You are currently splitting a commit during a rebase." msgstr "Actualment esteu dividint una comissió durant una rebase." -#: wt-status.c:1057 +#: wt-status.c:1073 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:1061 +#: wt-status.c:1077 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Actualment esteu editant una comissió mentre rebaseu la branca '%s' en '%s'." -#: wt-status.c:1066 +#: wt-status.c:1082 msgid "You are currently editing a commit during a rebase." msgstr "Actualment esteu editant una comissió durant una rebase." -#: wt-status.c:1069 +#: wt-status.c:1085 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (useu \"git commit --amend\" per a esmenar la comissió actual)" -#: wt-status.c:1071 +#: wt-status.c:1087 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (useu \"git rebase --continue\" una vegada que esteu satisfet amb els " "vostres canvis)" -#: wt-status.c:1081 +#: wt-status.c:1097 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Actualment esteu recollint com a cirera la comissió %s." -#: wt-status.c:1086 +#: wt-status.c:1102 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (arregleu els conflictes i executeu \"git cherry-pick --continue\")" -#: wt-status.c:1089 +#: wt-status.c:1105 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (tots els conflictes arreglats: executeu \"git cherry-pick --continue\")" -#: wt-status.c:1091 +#: wt-status.c:1107 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (useu \"git cherry-pick --abort\" per a cancel·lar l'operació de recull de " "cireres)" -#: wt-status.c:1100 +#: wt-status.c:1116 #, c-format msgid "You are currently reverting commit %s." msgstr "Actualment esteu revertint la comissió %s." -#: wt-status.c:1105 +#: wt-status.c:1121 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (arregleu els conflictes i executeu \"git revert --continue\")" -#: wt-status.c:1108 +#: wt-status.c:1124 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" " (tots els conflictes estan arreglats: executeu \"git revert --continue\")" -#: wt-status.c:1110 +#: wt-status.c:1126 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (useu \"git revert --abort\" per a cancel·lar l'operació de reversió)" -#: wt-status.c:1121 +#: wt-status.c:1137 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Actualment esteu bisecant, heu començat des de la branca '%s'." -#: wt-status.c:1125 +#: wt-status.c:1141 msgid "You are currently bisecting." msgstr "Actualment esteu bisecant." -#: wt-status.c:1128 +#: wt-status.c:1144 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (useu \"git bisect reset\" per a tornar a la branca original)" -#: wt-status.c:1303 +#: wt-status.c:1321 msgid "On branch " msgstr "En la branca " -#: wt-status.c:1310 +#: wt-status.c:1328 msgid "rebase in progress; onto " msgstr "rebase en progrés; en " -#: wt-status.c:1317 +#: wt-status.c:1333 msgid "HEAD detached at " msgstr "HEAD separat a " -#: wt-status.c:1319 +#: wt-status.c:1335 msgid "HEAD detached from " msgstr "HEAD separat de " -#: wt-status.c:1322 +#: wt-status.c:1338 msgid "Not currently on any branch." msgstr "Actualment no en cap branca." -#: wt-status.c:1339 +#: wt-status.c:1355 msgid "Initial commit" msgstr "Comissió inicial" -#: wt-status.c:1353 +#: wt-status.c:1369 msgid "Untracked files" msgstr "Fitxers no seguits" -#: wt-status.c:1355 +#: wt-status.c:1371 msgid "Ignored files" msgstr "Fitxers ignorats" -#: wt-status.c:1359 +#: wt-status.c:1375 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1915,31 +1924,31 @@ msgstr "" "oblidar-vos d'afegir fitxers nous per vós mateix (vegeu\n" "'git help status')." -#: wt-status.c:1365 +#: wt-status.c:1381 #, c-format msgid "Untracked files not listed%s" msgstr "Els fitxers no seguits no estan llistats%s" -#: wt-status.c:1367 +#: wt-status.c:1383 msgid " (use -u option to show untracked files)" msgstr " (useu l'opció -u per a mostrar els fitxers no seguits)" -#: wt-status.c:1373 +#: wt-status.c:1389 msgid "No changes" msgstr "Sense canvis" -#: wt-status.c:1378 +#: wt-status.c:1394 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "no hi ha canvis afegits a cometre (useu \"git add\" o \"git commit -a\")\n" -#: wt-status.c:1381 +#: wt-status.c:1397 #, c-format msgid "no changes added to commit\n" msgstr "no hi ha canvis afegits a cometre\n" -#: wt-status.c:1384 +#: wt-status.c:1400 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -1948,47 +1957,47 @@ msgstr "" "no hi ha res afegit a cometre però fitxers no seguits estan presents (useu " "\"git add\" per a seguir-los)\n" -#: wt-status.c:1387 +#: wt-status.c:1403 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "no hi ha res afegit a cometre però fitxers no seguits estan presents\n" -#: wt-status.c:1390 +#: wt-status.c:1406 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "no hi ha res a cometre (creeu/copieu fitxers i useu \"git add\" per a seguir-" "los)\n" -#: wt-status.c:1393 wt-status.c:1398 +#: wt-status.c:1409 wt-status.c:1414 #, c-format msgid "nothing to commit\n" msgstr "no hi ha res a cometre\n" -#: wt-status.c:1396 +#: wt-status.c:1412 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n" -#: wt-status.c:1400 +#: wt-status.c:1416 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "no hi ha res a cometre, directori de treball net\n" -#: wt-status.c:1509 +#: wt-status.c:1525 msgid "HEAD (no branch)" msgstr "HEAD (sense branca)" -#: wt-status.c:1515 +#: wt-status.c:1531 msgid "Initial commit on " msgstr "Comissió inicial en " -#: wt-status.c:1547 +#: wt-status.c:1563 msgid "gone" msgstr "no hi és" -#: wt-status.c:1549 wt-status.c:1557 +#: wt-status.c:1565 wt-status.c:1573 msgid "behind " msgstr "darrere " @@ -1998,15 +2007,15 @@ msgid "failed to unlink '%s'" msgstr "s'ha fallat en desenllaçar '%s'" #: builtin/add.c:22 -msgid "git add [options] [--] <pathspec>..." -msgstr "git add [opcions] [--] <especificació-de-camÃ>..." +msgid "git add [<options>] [--] <pathspec>..." +msgstr "git add [<opcions>] [--] <especificació-de-camÃ>..." #: builtin/add.c:65 #, c-format msgid "unexpected diff status %c" msgstr "estat de diff inesperat %c" -#: builtin/add.c:70 builtin/commit.c:275 +#: builtin/add.c:70 builtin/commit.c:277 msgid "updating files failed" msgstr "s'ha fallat en actualitzar els fitxers" @@ -2051,14 +2060,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n" -#: builtin/add.c: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:1372 +#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372 #: builtin/rm.c:269 msgid "dry run" msgstr "marxa en sec" -#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19 -#: builtin/commit.c:1326 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19 +#: builtin/commit.c:1322 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 detallat" @@ -2136,78 +2145,78 @@ msgstr "Res especificat, res afegit.\n" 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:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 +#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920 +#: builtin/commit.c:335 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:4510 builtin/mv.c:279 builtin/rm.c:431 +#: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431 msgid "Unable to write new index file" msgstr "no s'ha pogut escriure un fitxer d'Ãndex nou" -#: builtin/apply.c:58 -msgid "git apply [options] [<patch>...]" -msgstr "git apply [opcions] [<pedaç>...]" +#: builtin/apply.c:59 +msgid "git apply [<options>] [<patch>...]" +msgstr "git apply [<opcions>] [<pedaç>...]" -#: builtin/apply.c:111 +#: builtin/apply.c:112 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "opció d'espai en blanc '%s' no reconeguda" -#: builtin/apply.c:126 +#: builtin/apply.c:127 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "opció d'ignoral d'espai en blanc '%s' no reconeguda" -#: builtin/apply.c:826 +#: builtin/apply.c:822 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "No es pot preparar l'expressió regular de marca de temps %s" -#: builtin/apply.c:835 +#: builtin/apply.c:831 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec ha retornat %d per l'entrada: %s" -#: builtin/apply.c:916 +#: builtin/apply.c:912 #, c-format msgid "unable to find filename in patch at line %d" msgstr "no s'ha pogut trobar el nom de fitxer en el pedaç a la lÃnia %d" -#: builtin/apply.c:948 +#: builtin/apply.c:944 #, 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:952 +#: builtin/apply.c:948 #, 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:953 +#: builtin/apply.c:949 #, 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:960 +#: builtin/apply.c:956 #, 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:1423 +#: builtin/apply.c:1419 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recompte: lÃnia inesperada: %.*s" -#: builtin/apply.c:1480 +#: builtin/apply.c:1476 #, 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:1497 +#: builtin/apply.c:1493 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2222,77 +2231,77 @@ msgstr[1] "" "a la capçalera de git diff li manca informació de nom de fitxer en eliminar " "%d components de nom de camà inicial (lÃnia %d)" -#: builtin/apply.c:1657 +#: builtin/apply.c:1656 msgid "new file depends on old contents" msgstr "el fitxer nou depèn dels continguts antics" -#: builtin/apply.c:1659 +#: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "el fitxer suprimit encara té continguts" -#: builtin/apply.c:1685 +#: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" msgstr "el pedaç és malmès a la lÃnia %d" -#: builtin/apply.c:1721 +#: builtin/apply.c:1720 #, c-format msgid "new file %s depends on old contents" msgstr "el fitxer nou %s depèn dels continguts antics" -#: builtin/apply.c:1723 +#: builtin/apply.c:1722 #, c-format msgid "deleted file %s still has contents" msgstr "el fitxer suprimit %s encara té continguts" -#: builtin/apply.c:1726 +#: builtin/apply.c:1725 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** avÃs: el fitxer %s queda buit però no es suprimeix" -#: builtin/apply.c:1872 +#: builtin/apply.c:1871 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "pedaç binari malmès a la lÃnia %d: %.*s" -#: builtin/apply.c:1901 +#: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" msgstr "pedaç binari no reconegut a la lÃnia %d" -#: builtin/apply.c:2052 +#: builtin/apply.c:2051 #, c-format msgid "patch with only garbage at line %d" msgstr "pedaç amb només escombraries a la lÃnia %d" -#: builtin/apply.c:2142 +#: builtin/apply.c:2141 #, c-format msgid "unable to read symlink %s" msgstr "no s'ha pogut llegir l'enllaç simbòlic %s" -#: builtin/apply.c:2146 +#: builtin/apply.c:2145 #, c-format msgid "unable to open or read %s" msgstr "no s'ha pogut obrir o llegir %s" -#: builtin/apply.c:2754 +#: builtin/apply.c:2778 #, c-format msgid "invalid start of line: '%c'" msgstr "inici de lÃnia no và lid: '%c'" -#: builtin/apply.c:2872 +#: builtin/apply.c:2897 #, 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:2884 +#: builtin/apply.c:2909 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "El context s'ha reduït a (%ld/%ld) per a aplicar el fragment a %d" -#: builtin/apply.c:2890 +#: builtin/apply.c:2915 #, c-format msgid "" "while searching for:\n" @@ -2301,324 +2310,343 @@ msgstr "" "tot cercant:\n" "%.*s" -#: builtin/apply.c:2909 +#: builtin/apply.c:2935 #, c-format msgid "missing binary patch data for '%s'" msgstr "manquen les dades de pedaç binari de '%s'" -#: builtin/apply.c:3010 +#: builtin/apply.c:3036 #, c-format msgid "binary patch does not apply to '%s'" msgstr "el pedaç binari no s'aplica a '%s'" -#: builtin/apply.c:3016 +#: builtin/apply.c:3042 #, 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:3037 +#: builtin/apply.c:3063 #, c-format msgid "patch failed: %s:%ld" msgstr "el pedaç ha fallat: %s:%ld" -#: builtin/apply.c:3161 +#: builtin/apply.c:3187 #, c-format msgid "cannot checkout %s" msgstr "no es pot agafar %s" -#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260 +#: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288 #, c-format msgid "read of %s failed" msgstr "la lectura de %s ha fallat" -#: builtin/apply.c:3240 builtin/apply.c:3462 +#: builtin/apply.c:3240 +#, c-format +msgid "reading from '%s' beyond a symbolic link" +msgstr "llegint de '%s' més enllà d'un enllaç simbòlic" + +#: builtin/apply.c:3268 builtin/apply.c:3490 #, c-format msgid "path %s has been renamed/deleted" msgstr "el camà %s s'ha canviat de nom / s'ha suprimit" -#: builtin/apply.c:3321 builtin/apply.c:3476 +#: builtin/apply.c:3349 builtin/apply.c:3504 #, c-format msgid "%s: does not exist in index" msgstr "%s: no existeix en l'Ãndex" -#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490 +#: builtin/apply.c:3353 builtin/apply.c:3496 builtin/apply.c:3518 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3330 builtin/apply.c:3484 +#: builtin/apply.c:3358 builtin/apply.c:3512 #, c-format msgid "%s: does not match index" msgstr "%s: no coincideix amb l'Ãndex" -#: builtin/apply.c:3432 +#: builtin/apply.c:3460 msgid "removal patch leaves file contents" msgstr "el pedaç de supressió deixa els continguts dels fitxers" -#: builtin/apply.c:3501 +#: builtin/apply.c:3529 #, c-format msgid "%s: wrong type" msgstr "%s: tipus erroni" -#: builtin/apply.c:3503 +#: builtin/apply.c:3531 #, c-format msgid "%s has type %o, expected %o" msgstr "%s és del tipus %o, s'esperava %o" -#: builtin/apply.c:3604 +#: builtin/apply.c:3690 builtin/apply.c:3692 +#, c-format +msgid "invalid path '%s'" +msgstr "camà no và lid: %s" + +#: builtin/apply.c:3747 #, c-format msgid "%s: already exists in index" msgstr "%s: ja existeix en l'Ãndex" -#: builtin/apply.c:3607 +#: builtin/apply.c:3750 #, c-format msgid "%s: already exists in working directory" msgstr "%s: ja existeix en el directori de treball" -#: builtin/apply.c:3627 +#: builtin/apply.c:3770 #, 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:3632 +#: builtin/apply.c:3775 #, 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:3640 +#: builtin/apply.c:3795 +#, c-format +msgid "affected file '%s' is beyond a symbolic link" +msgstr "el fitxer afectat '%s' és més enllà d'un enllaç simbòlic" + +#: builtin/apply.c:3799 #, c-format msgid "%s: patch does not apply" msgstr "%s: el pedaç no aplica" -#: builtin/apply.c:3653 +#: builtin/apply.c:3813 #, c-format msgid "Checking patch %s..." msgstr "Comprovant el pedaç %s..." -#: builtin/apply.c:3746 builtin/checkout.c:231 builtin/reset.c:135 +#: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry ha fallat per al camà '%s'" -#: builtin/apply.c:3889 +#: builtin/apply.c:4049 #, c-format msgid "unable to remove %s from index" msgstr "no s'ha pogut eliminar %s de l'Ãndex" -#: builtin/apply.c:3918 +#: builtin/apply.c:4078 #, c-format msgid "corrupt patch for submodule %s" msgstr "pedaç corrupte per al submòdul %s" -#: builtin/apply.c:3922 +#: builtin/apply.c:4082 #, c-format msgid "unable to stat newly created file '%s'" msgstr "no s'ha pogut fer stat al fitxer novament creat '%s'" -#: builtin/apply.c:3927 +#: builtin/apply.c:4087 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "no s'ha pogut crear un magatzem de recolzament per al fitxer novament creat " "%s" -#: builtin/apply.c:3930 builtin/apply.c:4038 +#: builtin/apply.c:4090 builtin/apply.c:4198 #, c-format msgid "unable to add cache entry for %s" msgstr "no s'ha pogut afegir una entrada de cau per a %s" -#: builtin/apply.c:3963 +#: builtin/apply.c:4123 #, c-format msgid "closing file '%s'" msgstr "tancant el fitxer '%s'" -#: builtin/apply.c:4012 +#: builtin/apply.c:4172 #, c-format msgid "unable to write file '%s' mode %o" msgstr "no s'ha pogut escriure el fitxer '%s' mode %o" -#: builtin/apply.c:4099 +#: builtin/apply.c:4259 #, c-format msgid "Applied patch %s cleanly." msgstr "El pedaç %s s'ha aplicat netament." -#: builtin/apply.c:4107 +#: builtin/apply.c:4267 msgid "internal error" msgstr "error intern" -#: builtin/apply.c:4110 +#: builtin/apply.c:4270 #, 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:4120 +#: builtin/apply.c:4280 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "truncant el nom del fitxer .rej a %.*s.rej" -#: builtin/apply.c:4141 +#: builtin/apply.c:4301 #, c-format msgid "Hunk #%d applied cleanly." msgstr "El tros #%d s'ha aplicat netament." -#: builtin/apply.c:4144 +#: builtin/apply.c:4304 #, c-format msgid "Rejected hunk #%d." msgstr "S'ha rebutjat el tros #%d." -#: builtin/apply.c:4234 +#: builtin/apply.c:4394 msgid "unrecognized input" msgstr "entrada no reconeguda" -#: builtin/apply.c:4245 +#: builtin/apply.c:4405 msgid "unable to read index file" msgstr "no es pot llegir el fitxer d'Ãndex" -#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:92 -#: builtin/fetch.c:93 +#: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92 +#: builtin/fetch.c:92 msgid "path" msgstr "camÃ" -#: builtin/apply.c:4363 +#: builtin/apply.c:4523 msgid "don't apply changes matching the given path" msgstr "no apliquis els canvis que coincideixin amb el camà donat" -#: builtin/apply.c:4366 +#: builtin/apply.c:4526 msgid "apply changes matching the given path" msgstr "aplica els canvis que coincideixin amb el camà donat" -#: builtin/apply.c:4368 +#: builtin/apply.c:4528 msgid "num" msgstr "número" -#: builtin/apply.c:4369 +#: builtin/apply.c:4529 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" "elimina <nombre> barres obliqües inicials dels camins de diferència " "tradicionals" -#: builtin/apply.c:4372 +#: builtin/apply.c:4532 msgid "ignore additions made by the patch" msgstr "ignora afegiments fets pel pedaç" -#: builtin/apply.c:4374 +#: builtin/apply.c:4534 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:4378 +#: builtin/apply.c:4538 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:4380 +#: builtin/apply.c:4540 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:4382 +#: builtin/apply.c:4542 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:4384 +#: builtin/apply.c:4544 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:4386 +#: builtin/apply.c:4546 msgid "apply a patch without touching the working tree" msgstr "aplica un pedaç sense tocar l'arbre de treball" -#: builtin/apply.c:4388 +#: builtin/apply.c:4548 +msgid "accept a patch that touches outside the working area" +msgstr "accepta un pedaç que toqui fora de l'à rea de treball" + +#: builtin/apply.c:4550 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)" -#: builtin/apply.c:4390 +#: builtin/apply.c:4552 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:4392 +#: builtin/apply.c:4554 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:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455 +#: builtin/apply.c:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412 msgid "paths are separated with NUL character" msgstr "els camins es separen amb el carà cter NUL" -#: builtin/apply.c:4397 +#: builtin/apply.c:4559 msgid "ensure at least <n> lines of context match" msgstr "assegura't que almenys <n> lÃnies de context coincideixin" -#: builtin/apply.c:4398 +#: builtin/apply.c:4560 msgid "action" msgstr "acció" -#: builtin/apply.c:4399 +#: builtin/apply.c:4561 msgid "detect new or modified lines that have whitespace errors" msgstr "" "detecta les lÃnies noves o modificades que tinguin errors d'espai en blanc" -#: builtin/apply.c:4402 builtin/apply.c:4405 +#: builtin/apply.c:4564 builtin/apply.c:4567 msgid "ignore changes in whitespace when finding context" msgstr "ignora els canvis d'espai en blanc en cercar context" -#: builtin/apply.c:4408 +#: builtin/apply.c:4570 msgid "apply the patch in reverse" msgstr "aplica el pedaç al revés" -#: builtin/apply.c:4410 +#: builtin/apply.c:4572 msgid "don't expect at least one line of context" msgstr "no esperis almenys una lÃnia de context" -#: builtin/apply.c:4412 +#: builtin/apply.c:4574 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "deixa els trossos rebutjats en fitxers *.reg coresspondents" -#: builtin/apply.c:4414 +#: builtin/apply.c:4576 msgid "allow overlapping hunks" msgstr "permet trossos encavalcants" -#: builtin/apply.c:4417 +#: builtin/apply.c:4579 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:4420 +#: builtin/apply.c:4582 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:4422 +#: builtin/apply.c:4584 msgid "root" msgstr "arrel" -#: builtin/apply.c:4423 +#: builtin/apply.c:4585 msgid "prepend <root> to all filenames" msgstr "anteposa <arrel> a tots els noms de fitxer" -#: builtin/apply.c:4445 +#: builtin/apply.c:4607 msgid "--3way outside a repository" msgstr "--3way fora d'un dipòsit" -#: builtin/apply.c:4453 +#: builtin/apply.c:4615 msgid "--index outside a repository" msgstr "--index fora d'un dipòsit" -#: builtin/apply.c:4456 +#: builtin/apply.c:4618 msgid "--cached outside a repository" msgstr "--cached fora d'un dipòsit" -#: builtin/apply.c:4472 +#: builtin/apply.c:4637 #, c-format msgid "can't open patch '%s'" msgstr "no es pot obrir el pedaç '%s'" -#: builtin/apply.c:4486 +#: builtin/apply.c:4651 #, 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:4492 builtin/apply.c:4502 +#: builtin/apply.c:4657 builtin/apply.c:4667 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2673,108 +2701,108 @@ msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "actualitza BISECT_HEAD en lloc d'agafar la comissió actual" #: builtin/blame.c:30 -msgid "git blame [options] [rev-opts] [rev] [--] file" -msgstr "git blame [opcions] [opcions-de-revisió] [revisió] [--] fitxer" +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file" +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ó] estan documentades en git-rev-list(1)" +msgid "<rev-opts> are documented in git-rev-list(1)" +msgstr "es documenten les <opcions-de-revisió> en git-rev-list(1)" -#: builtin/blame.c:2501 +#: builtin/blame.c:2500 msgid "Show blame entries as we find them, incrementally" msgstr "Mostra les entrades de culpa mentre les trobem, incrementalment" -#: builtin/blame.c:2502 +#: builtin/blame.c:2501 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" "Mostra un SHA-1 en blanc per les comissions de frontera (Per defecte: " "desactivat)" -#: builtin/blame.c:2503 +#: builtin/blame.c:2502 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" "No tractis les comissions d'arrel com a lÃmits (Per defecte: desactivat)" -#: builtin/blame.c:2504 +#: builtin/blame.c:2503 msgid "Show work cost statistics" msgstr "Mostra les estadÃstiques de preu de treball" -#: builtin/blame.c:2505 +#: builtin/blame.c:2504 msgid "Show output score for blame entries" msgstr "Mostra la puntuació de sortida de les entrades de culpa" -#: builtin/blame.c:2506 +#: builtin/blame.c:2505 msgid "Show original filename (Default: auto)" msgstr "Mostra el nom de fitxer original (Per defecte: automà tic)" -#: builtin/blame.c:2507 +#: builtin/blame.c:2506 msgid "Show original linenumber (Default: off)" msgstr "Mostra el número de lÃnia original (Per defecte: desactivat)" -#: builtin/blame.c:2508 +#: builtin/blame.c:2507 msgid "Show in a format designed for machine consumption" msgstr "Presenta en un format dissenyat per consumpció per mà quina" -#: builtin/blame.c:2509 +#: builtin/blame.c:2508 msgid "Show porcelain format with per-line commit information" msgstr "Mostra el format de porcellana amb informació de comissió per lÃnia" -#: builtin/blame.c:2510 +#: builtin/blame.c:2509 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "Usa el mateix mode de sortida que git-annotate (Per defecte: desactivat)" -#: builtin/blame.c:2511 +#: builtin/blame.c:2510 msgid "Show raw timestamp (Default: off)" msgstr "Mostra la marca de temps crua (Per defecte: desactivat)" -#: builtin/blame.c:2512 +#: builtin/blame.c:2511 msgid "Show long commit SHA1 (Default: off)" msgstr "Mostra l'SHA1 de comissió llarg (Per defecte: desactivat)" -#: builtin/blame.c:2513 +#: builtin/blame.c:2512 msgid "Suppress author name and timestamp (Default: off)" msgstr "Omet el nom d'autor i la marca de temps (Per defecte: desactivat)" -#: builtin/blame.c:2514 +#: builtin/blame.c:2513 msgid "Show author email instead of name (Default: off)" msgstr "" "Mostra l'adreça de correu electrònic de l'autor en lloc del nom (Per " "defecte: desactivat)" -#: builtin/blame.c:2515 +#: builtin/blame.c:2514 msgid "Ignore whitespace differences" msgstr "Ignora les diferencies d'espai en blanc" -#: builtin/blame.c:2516 +#: builtin/blame.c:2515 msgid "Spend extra cycles to find better match" msgstr "Gasta cicles extres per a trobar una coincidència millor" -#: builtin/blame.c:2517 +#: builtin/blame.c:2516 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Usa les revisions de <fitxer> en lloc d'invocar git-rev-list" -#: builtin/blame.c:2518 +#: builtin/blame.c:2517 msgid "Use <file>'s contents as the final image" msgstr "Usa els continguts de <fitxer> com a la imatge final" -#: builtin/blame.c:2519 builtin/blame.c:2520 +#: builtin/blame.c:2518 builtin/blame.c:2519 msgid "score" msgstr "puntuació" -#: builtin/blame.c:2519 +#: builtin/blame.c:2518 msgid "Find line copies within and across files" msgstr "Troba còpies de lÃnia dins i a través dels fitxers" -#: builtin/blame.c:2520 +#: builtin/blame.c:2519 msgid "Find line movements within and across files" msgstr "Troba moviments de lÃnia dins i a través dels fitxers" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "Process only line range n,m, counting from 1" msgstr "Processa només el rang de lÃnies n,m, comptant des de 1" @@ -2784,25 +2812,25 @@ msgstr "Processa només el rang de lÃnies n,m, comptant 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:2602 +#: builtin/blame.c:2601 msgid "4 years, 11 months ago" msgstr "fa 4 anys i 11 mesos" #: builtin/branch.c:24 -msgid "git branch [options] [-r | -a] [--merged | --no-merged]" -msgstr "git branch [opcions] [-r | -a] [--merged | --no-merged]" +msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" +msgstr "git branch [<opcions>] [-r | -a] [--merged | --no-merged]" #: builtin/branch.c:25 -msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" -msgstr "git branch [opcions] [-l] [-f] <nom-de-branca> [<punt-inicial>]" +msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" +msgstr "git branch [<opcions>] [-l] [-f] <nom-de-branca> [<punt-inicial>]" #: builtin/branch.c:26 -msgid "git branch [options] [-r] (-d | -D) <branchname>..." -msgstr "git branch [opcions] [-r] (-d | -D) <nom-de-branca>..." +msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." +msgstr "git branch [<opcions>] [-r] (-d | -D) <nom-de-branca>..." #: builtin/branch.c:27 -msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" -msgstr "git branch [opcions] (-m | -M) [<branca-antiga>] <branca-nova>" +msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" +msgstr "git branch [<opcions>] (-m | -M) [<branca-antiga>] <branca-nova>" #: builtin/branch.c:152 #, c-format @@ -2944,237 +2972,242 @@ msgstr "(cap branca, rebasant %s)" msgid "(no branch, bisect started on %s)" msgstr "(cap branca, bisecció començada en %s)" -#: builtin/branch.c:593 +#: builtin/branch.c:596 #, c-format -msgid "(detached from %s)" -msgstr "(separat de %s)" +msgid "(HEAD detached at %s)" +msgstr "(HEAD separat a %s)" -#: builtin/branch.c:596 +#: builtin/branch.c:599 +#, c-format +msgid "(HEAD detached from %s)" +msgstr "(HEAD separat de %s)" + +#: builtin/branch.c:603 msgid "(no branch)" msgstr "(cap branca)" -#: builtin/branch.c:643 +#: builtin/branch.c:650 #, c-format msgid "object '%s' does not point to a commit" msgstr "l'objecte '%s' no assenyala cap comissió" -#: builtin/branch.c:691 +#: builtin/branch.c:698 msgid "some refs could not be read" msgstr "no s'han pogut llegir algunes referències" -#: builtin/branch.c:704 +#: builtin/branch.c:711 msgid "cannot rename the current branch while not on any." msgstr "no es pot canviar el nom de la branca actual mentre no s'és a cap." -#: builtin/branch.c:714 +#: builtin/branch.c:721 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de branca no và lid: '%s'" -#: builtin/branch.c:729 +#: builtin/branch.c:736 msgid "Branch rename failed" msgstr "El canvi de nom de branca ha fallat" -#: builtin/branch.c:733 +#: builtin/branch.c:740 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "S'ha canviat el nom de la branca malanomenada '%s'" -#: builtin/branch.c:737 +#: builtin/branch.c:744 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "S'ha canviat el nom de la branca a %s, però HEAD no està actualitzat!" -#: builtin/branch.c:744 +#: builtin/branch.c:751 msgid "Branch is renamed, but update of config-file failed" msgstr "" "La branca està canviada de nom, però l'actualització del fitxer de " "configuració ha fallat" -#: builtin/branch.c:759 +#: builtin/branch.c:766 #, c-format msgid "malformed object name %s" msgstr "nom d'objecte %s mal format" -#: builtin/branch.c:783 +#: builtin/branch.c:790 #, c-format msgid "could not write branch description template: %s" msgstr "no s'ha pogut escriure la plantilla de descripció de branca: %s" -#: builtin/branch.c:813 +#: builtin/branch.c:820 msgid "Generic options" msgstr "Opcions genèriques" -#: builtin/branch.c:815 +#: builtin/branch.c:822 msgid "show hash and subject, give twice for upstream branch" msgstr "mostra el hash i el tema, doneu dues vegades per la branca font" -#: builtin/branch.c:816 +#: builtin/branch.c:823 msgid "suppress informational messages" msgstr "omet els missatges informatius" -#: builtin/branch.c:817 +#: builtin/branch.c:824 msgid "set up tracking mode (see git-pull(1))" msgstr "configura el mode de seguiment (vegeu git-pull(1))" -#: builtin/branch.c:819 +#: builtin/branch.c:826 msgid "change upstream info" msgstr "canvia la informació de font" -#: builtin/branch.c:823 +#: builtin/branch.c:830 msgid "use colored output" msgstr "usa sortida colorada" -#: builtin/branch.c:824 +#: builtin/branch.c:831 msgid "act on remote-tracking branches" msgstr "actua en branques amb seguiment remot" -#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854 -#: builtin/branch.c:860 builtin/commit.c:1586 builtin/commit.c:1587 -#: builtin/commit.c:1588 builtin/commit.c:1589 builtin/tag.c:616 +#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861 +#: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583 +#: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616 #: builtin/tag.c:622 msgid "commit" msgstr "comissió" -#: builtin/branch.c:828 builtin/branch.c:834 +#: builtin/branch.c:835 builtin/branch.c:841 msgid "print only branches that contain the commit" msgstr "imprimeix només les branques que continguin la comissió" -#: builtin/branch.c:840 +#: builtin/branch.c:847 msgid "Specific git-branch actions:" msgstr "Accions de git-branch especÃfiques:" -#: builtin/branch.c:841 +#: builtin/branch.c:848 msgid "list both remote-tracking and local branches" msgstr "llista les branques amb seguiment remot i les locals" -#: builtin/branch.c:843 +#: builtin/branch.c:850 msgid "delete fully merged branch" msgstr "suprimeix la branca si és completament fusionada" -#: builtin/branch.c:844 +#: builtin/branch.c:851 msgid "delete branch (even if not merged)" msgstr "suprimeix la branca (encara que no estigui fusionada)" -#: builtin/branch.c:845 +#: builtin/branch.c:852 msgid "move/rename a branch and its reflog" msgstr "mou/canvia de nom una branca i el seu registre de referència" -#: builtin/branch.c:846 +#: builtin/branch.c:853 msgid "move/rename a branch, even if target exists" msgstr "mou/canvia de nom una branca, encara que el destà existeixi" -#: builtin/branch.c:847 +#: builtin/branch.c:854 msgid "list branch names" msgstr "llista els noms de branca" -#: builtin/branch.c:848 +#: builtin/branch.c:855 msgid "create the branch's reflog" msgstr "crea el registre de referència de la branca" -#: builtin/branch.c:850 +#: builtin/branch.c:857 msgid "edit the description for the branch" msgstr "edita la descripció de la branca" -#: builtin/branch.c:851 +#: builtin/branch.c:858 msgid "force creation, move/rename, deletion" msgstr "força creació, moviment/canvi de nom, supressió" -#: builtin/branch.c:854 +#: builtin/branch.c:861 msgid "print only not merged branches" msgstr "imprimeix només les branques sense fusionar" -#: builtin/branch.c:860 +#: builtin/branch.c:867 msgid "print only merged branches" msgstr "imprimeix només les branques fusionades" -#: builtin/branch.c:864 +#: builtin/branch.c:871 msgid "list branches in columns" msgstr "llista les branques en columnes" -#: builtin/branch.c:877 +#: builtin/branch.c:884 msgid "Failed to resolve HEAD as a valid ref." msgstr "S'ha fallat en resoldre HEAD com a referència và lida." -#: builtin/branch.c:881 builtin/clone.c:637 +#: builtin/branch.c:888 builtin/clone.c:637 msgid "HEAD not found below refs/heads!" msgstr "HEAD no trobat sota refs/heads!" -#: builtin/branch.c:903 +#: builtin/branch.c:910 msgid "--column and --verbose are incompatible" msgstr "--column i --verbose són incompatibles" -#: builtin/branch.c:914 builtin/branch.c:953 +#: builtin/branch.c:921 builtin/branch.c:960 msgid "branch name required" msgstr "cal el nom de branca" -#: builtin/branch.c:929 +#: builtin/branch.c:936 msgid "Cannot give description to detached HEAD" msgstr "No es pot donar descripció a un HEAD separat" -#: builtin/branch.c:934 +#: builtin/branch.c:941 msgid "cannot edit description of more than one branch" msgstr "no es pot editar la descripció de més d'una branca" -#: builtin/branch.c:941 +#: builtin/branch.c:948 #, c-format msgid "No commit on branch '%s' yet." msgstr "Encara no hi ha comissió en la branca '%s'." -#: builtin/branch.c:944 +#: builtin/branch.c:951 #, c-format msgid "No branch named '%s'." msgstr "No hi ha branca amb nom '%s'." -#: builtin/branch.c:959 +#: builtin/branch.c:966 msgid "too many branches for a rename operation" msgstr "hi ha massa branques per a una operació de canvi de nom" -#: builtin/branch.c:964 +#: builtin/branch.c:971 msgid "too many branches to set new upstream" msgstr "hi ha massa branques per a establir una nova font" -#: builtin/branch.c:968 +#: builtin/branch.c:975 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" "no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap branca." -#: builtin/branch.c:971 builtin/branch.c:993 builtin/branch.c:1014 +#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021 #, c-format msgid "no such branch '%s'" msgstr "no hi ha tal branca '%s'" -#: builtin/branch.c:975 +#: builtin/branch.c:982 #, c-format msgid "branch '%s' does not exist" msgstr "la branca '%s' no existeix" -#: builtin/branch.c:987 +#: builtin/branch.c:994 msgid "too many branches to unset upstream" msgstr "hi ha massa branques per a desestablir la font" -#: builtin/branch.c:991 +#: builtin/branch.c:998 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 perquè no assenyala cap branca." -#: builtin/branch.c:997 +#: builtin/branch.c:1004 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La branca '%s' no té informació de font" -#: builtin/branch.c:1011 +#: builtin/branch.c:1018 msgid "it does not make sense to create 'HEAD' manually" msgstr "no té sentit crear 'HEAD' manualment" -#: builtin/branch.c:1017 +#: builtin/branch.c:1024 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 branca" -#: builtin/branch.c:1020 +#: builtin/branch.c:1027 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3183,7 +3216,7 @@ msgstr "" "La bandera --set-upstream està desaprovada i s'eliminarà . Considereu usar --" "track o --set-upstream-to\n" -#: builtin/branch.c:1037 +#: builtin/branch.c:1044 #, c-format msgid "" "\n" @@ -3194,12 +3227,12 @@ msgstr "" "Si volÃeu fer '%s' seguir '%s', feu això:\n" "\n" -#: builtin/branch.c:1038 +#: builtin/branch.c:1045 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1039 +#: builtin/branch.c:1046 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -3217,55 +3250,55 @@ msgstr "Cal un dipòsit per a fer un farcell." msgid "Need a repository to unbundle." msgstr "Cal un dipòsit per a desfer un farcell." -#: builtin/cat-file.c:328 -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:326 +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:329 -msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" -msgstr "git cat-file (--batch|--batch-check) < <llista_de_objectes>" +#: builtin/cat-file.c:327 +msgid "git cat-file (--batch | --batch-check) < <list-of-objects>" +msgstr "git cat-file (--batch | --batch-check) < <llista-d'objectes>" -#: builtin/cat-file.c:366 +#: builtin/cat-file.c:364 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<tipus> pot ser un de: blob, tree, commit, tag" -#: builtin/cat-file.c:367 +#: builtin/cat-file.c:365 msgid "show object type" msgstr "mostra el tipus de l'objecte" -#: builtin/cat-file.c:368 +#: builtin/cat-file.c:366 msgid "show object size" msgstr "mostra la mida de l'objecte" -#: builtin/cat-file.c:370 +#: builtin/cat-file.c:368 msgid "exit with zero when there's no error" msgstr "surt amb zero quan no hi ha error" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:369 msgid "pretty-print object's content" msgstr "imprimeix bellament el contingut de l'objecte" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:371 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:375 +#: builtin/cat-file.c:373 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:378 +#: builtin/cat-file.c:376 msgid "show info about objects fed from the standard input" msgstr "mostra informació sobre els objectes rebuts de l'entrada està ndard" #: builtin/check-attr.c:11 -msgid "git check-attr [-a | --all | attr...] [--] pathname..." -msgstr "git check-attr [-a | --all | atribut...] [--] nom-de-camÃ..." +msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." +msgstr "git check-attr [-a | --all | <atribut>...] [--] <nom-de-camÃ>..." #: builtin/check-attr.c:12 -msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" +msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>" msgstr "" -"git check-attr --stdin [-z] [-a | --all | atribut...] < <llista-de-camins>" +"git check-attr --stdin [-z] [-a | --all | <atribut>...] < <llista-de-camins>" #: builtin/check-attr.c:19 msgid "report all attributes set on file" @@ -3320,8 +3353,8 @@ msgid "--non-matching is only valid with --verbose" msgstr "--non-matching és và lid només amb --verbose" #: builtin/check-mailmap.c:8 -msgid "git check-mailmap [options] <contact>..." -msgstr "git check-mailmap [opcions] <contacte>..." +msgid "git check-mailmap [<options>] <contact>..." +msgstr "git check-mailmap [<opcions>] <contacte>..." #: builtin/check-mailmap.c:13 msgid "also read contacts from stdin" @@ -3337,8 +3370,8 @@ msgid "no contacts specified" msgstr "no hi ha contactes especificats" #: builtin/checkout-index.c:126 -msgid "git checkout-index [options] [--] [<file>...]" -msgstr "git checkout-index [opcions] [--] [<fitxer>...]" +msgid "git checkout-index [<options>] [--] [<file>...]" +msgstr "git checkout-index [<opcions>] [--] [<fitxer>...]" #: builtin/checkout-index.c:188 msgid "check out all files in the index" @@ -3381,12 +3414,12 @@ msgid "copy out the files from named stage" msgstr "copia els fitxers des de l'etapa anomenada" #: builtin/checkout.c:25 -msgid "git checkout [options] <branch>" -msgstr "git checkout [opcions] <branca>" +msgid "git checkout [<options>] <branch>" +msgstr "git checkout [<opcions>] <branca>" #: builtin/checkout.c:26 -msgid "git checkout [options] [<branch>] -- <file>..." -msgstr "git checkout [opcions] [<branca>] -- <fitxer>..." +msgid "git checkout [<options>] [<branch>] -- <file>..." +msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..." #: builtin/checkout.c:132 builtin/checkout.c:165 #, c-format @@ -3516,13 +3549,13 @@ msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" "to do so with:\n" "\n" -" git branch new_branch_name %s\n" +" git branch <new-branch-name> %s\n" "\n" msgstr "" -"Si els voleu retenir per a crear una branca nova, ara pot ser un bon moment\n" -"per a fer-ho amb:\n" +"Si les voleu retenir creant una branca nova, ara pot ser un bon moment per\n" +"a fer-ho amb:\n" "\n" -" git branch nom_de_branca_nova %s\n" +" git branch <nom-de-branca-nova> %s\n" "\n" #: builtin/checkout.c:777 @@ -3638,8 +3671,8 @@ msgid "do not limit pathspecs to sparse entries only" msgstr "no limitis les especificacions de camà només a entrades escasses" #: builtin/checkout.c:1130 -msgid "second guess 'git checkout no-such-branch'" -msgstr "dubta 'git checkout cap-branca-aixÃ'" +msgid "second guess 'git checkout <no-such-branch>'" +msgstr "dubta 'git checkout <cap-branca-aixÃ>'" #: builtin/checkout.c:1153 msgid "-b, -B and --orphan are mutually exclusive" @@ -3761,16 +3794,17 @@ msgstr "AVÃS: No es pot trobar Ãtems que coincideixin amb: %s" msgid "Select items to delete" msgstr "Selecciona els Ãtems a suprimir" -#: builtin/clean.c:757 +#. TRANSLATORS: Make sure to keep [y/N] as is +#: builtin/clean.c:758 #, c-format -msgid "remove %s? " -msgstr "eliminar %s? " +msgid "Remove %s [y/N]? " +msgstr "Voleu eliminar %s [y/N]? " -#: builtin/clean.c:782 +#: builtin/clean.c:783 msgid "Bye." msgstr "Adéu." -#: builtin/clean.c:790 +#: builtin/clean.c:791 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -3788,62 +3822,62 @@ msgstr "" "help - aquesta pantalla\n" "? - ajuda de selecció de l'avÃs" -#: builtin/clean.c:817 +#: builtin/clean.c:818 msgid "*** Commands ***" msgstr "*** Ordres ***" -#: builtin/clean.c:818 +#: builtin/clean.c:819 msgid "What now" msgstr "Què ara" -#: builtin/clean.c:826 +#: builtin/clean.c:827 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Eliminaria l'Ãtem següent:" msgstr[1] "Eliminaria els Ãtems següents:" -#: builtin/clean.c:843 +#: builtin/clean.c:844 msgid "No more files to clean, exiting." msgstr "No hi ha més fitxers a netejar; sortint." -#: builtin/clean.c:874 +#: builtin/clean.c:875 msgid "do not print names of files removed" msgstr "no imprimeixis els noms dels fitxers eliminats" -#: builtin/clean.c:876 +#: builtin/clean.c:877 msgid "force" msgstr "força" -#: builtin/clean.c:877 +#: builtin/clean.c:878 msgid "interactive cleaning" msgstr "neteja interactiva" -#: builtin/clean.c:879 +#: builtin/clean.c:880 msgid "remove whole directories" msgstr "elimina directoris sencers" -#: 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 +#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185 msgid "pattern" msgstr "patró" -#: builtin/clean.c:881 +#: builtin/clean.c:882 msgid "add <pattern> to ignore rules" msgstr "afegiu <patró> per a ignorar les regles" -#: builtin/clean.c:882 +#: builtin/clean.c:883 msgid "remove ignored files, too" msgstr "elimina els fitxers ignorats, també" -#: builtin/clean.c:884 +#: builtin/clean.c:885 msgid "remove only ignored files" msgstr "elimina només els fitxers ignorats" -#: builtin/clean.c:902 +#: builtin/clean.c:903 msgid "-x and -X cannot be used together" msgstr "-x i -X no es poden usar junts" -#: builtin/clean.c:906 +#: builtin/clean.c:907 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -3851,7 +3885,7 @@ msgstr "" "clean.requireForce està establerta a veritat i ni -i, -n ni -f s'ha donat; " "refusant netejar" -#: builtin/clean.c:909 +#: builtin/clean.c:910 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -3860,11 +3894,11 @@ msgstr "" "refusant netejar" #: builtin/clone.c:37 -msgid "git clone [options] [--] <repo> [<dir>]" -msgstr "git clone [opcions] [--] <dipòsit> [<directori>]" +msgid "git clone [<options>] [--] <repo> [<dir>]" +msgstr "git clone [<opcions>] [--] <dipòsit> [<directori>]" -#: builtin/clone.c:66 builtin/fetch.c:112 builtin/merge.c:224 -#: builtin/push.c:514 +#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224 +#: builtin/push.c:523 msgid "force progress reporting" msgstr "força l'informe de progrés" @@ -3924,7 +3958,7 @@ msgstr "agafa <branca> en lloc del HEAD del remot" msgid "path to git-upload-pack on the remote" msgstr "camà a git-upload-pack en el remot" -#: builtin/clone.c:94 builtin/fetch.c:113 builtin/grep.c:659 +#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659 msgid "depth" msgstr "profunditat" @@ -4070,7 +4104,7 @@ msgstr "--bare i --separate-git-dir són incompatibles." msgid "repository '%s' does not exist" msgstr "el dipòsit '%s' no existeix" -#: builtin/clone.c:815 builtin/fetch.c:1155 +#: builtin/clone.c:815 builtin/fetch.c:1156 #, c-format msgid "depth %s is not a positive number" msgstr "la profunditat %s no és nombre positiu" @@ -4085,59 +4119,59 @@ msgstr "el camà destà '%s' ja existeix i no és un directori buit." msgid "working tree '%s' already exists." msgstr "l'arbre de treball '%s' ja existeix." -#: builtin/clone.c:848 builtin/clone.c:860 +#: builtin/clone.c:850 builtin/clone.c:861 #, c-format msgid "could not create leading directories of '%s'" msgstr "no s'ha pogut crear els directoris inicials de '%s'" -#: builtin/clone.c:851 +#: builtin/clone.c:853 #, c-format -msgid "could not create work tree dir '%s'." -msgstr "no s'ha pogut crear el directori d'arbre de treball '%s'." +msgid "could not create work tree dir '%s'" +msgstr "no s'ha pogut crear el directori d'arbre de treball '%s'" -#: builtin/clone.c:870 +#: builtin/clone.c:871 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonant al dipòsit nu '%s'...\n" -#: builtin/clone.c:872 +#: builtin/clone.c:873 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonant a '%s'...\n" -#: builtin/clone.c:897 +#: builtin/clone.c:898 msgid "--dissociate given, but there is no --reference" msgstr "s'ha donat --dissociate, però no hi ha --reference" -#: builtin/clone.c:912 +#: builtin/clone.c:913 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth s'ignora en els clons locals; useu file:// en lloc d'això." -#: builtin/clone.c:915 +#: builtin/clone.c:916 msgid "source repository is shallow, ignoring --local" msgstr "el dipòsit font és superficial, ignorant --local" -#: builtin/clone.c:920 +#: builtin/clone.c:921 msgid "--local is ignored" msgstr "--local s'ignora" -#: builtin/clone.c:924 +#: builtin/clone.c:925 #, c-format msgid "Don't know how to clone %s" msgstr "No es sap com clonar %s" -#: builtin/clone.c:975 builtin/clone.c:983 +#: builtin/clone.c:976 builtin/clone.c:984 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "La branca remota %s no es troba en la font %s" -#: builtin/clone.c:986 +#: builtin/clone.c:987 msgid "You appear to have cloned an empty repository." msgstr "Sembla que heu clonat un dipòsit buit." #: builtin/column.c:9 -msgid "git column [options]" -msgstr "git column [opcions]" +msgid "git column [<options>]" +msgstr "git column [<opcions>]" #: builtin/column.c:26 msgid "lookup config vars" @@ -4168,12 +4202,12 @@ msgid "--command must be the first argument" msgstr "--command ha de ser el primer parà metre" #: builtin/commit.c:37 -msgid "git commit [options] [--] <pathspec>..." -msgstr "git commit [opcions] [--] <especificació-de-camÃ>..." +msgid "git commit [<options>] [--] <pathspec>..." +msgstr "git commit [<opcions>] [--] <especificació-de-camÃ>..." #: builtin/commit.c:42 -msgid "git status [options] [--] <pathspec>..." -msgstr "git status [opcions] [--] <especificació-de-camÃ>..." +msgid "git status [<options>] [--] <pathspec>..." +msgstr "git status [<opcions>] [--] <especificació-de-camÃ>..." #: builtin/commit.c:47 msgid "" @@ -4273,70 +4307,70 @@ msgstr "" "Llavors \"git cherry-pick --continue\" reprendrà recollint\n" "com a cireres les comissions restants.\n" -#: builtin/commit.c:302 +#: builtin/commit.c:304 msgid "failed to unpack HEAD tree object" msgstr "s'ha fallat en desempaquetar l'objecte d'arbre HEAD" -#: builtin/commit.c:342 +#: builtin/commit.c:344 msgid "unable to create temporary index" msgstr "no s'ha pogut crear un Ãndex temporal" -#: builtin/commit.c:348 +#: builtin/commit.c:350 msgid "interactive add failed" msgstr "l'afegiment interactiu ha fallat" -#: builtin/commit.c:359 +#: builtin/commit.c:361 msgid "unable to write index file" msgstr "no s'ha pogut escriure el fitxer d'Ãndex" -#: builtin/commit.c:361 +#: builtin/commit.c:363 msgid "unable to update temporary index" msgstr "no s'ha pogut actualitzar l'Ãndex temporal" -#: builtin/commit.c:363 +#: builtin/commit.c:365 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 +#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463 msgid "unable to write new_index file" msgstr "no s'ha pogut escriure el fitxer new_index" -#: builtin/commit.c:443 +#: builtin/commit.c:445 msgid "cannot do a partial commit during a merge." msgstr "no es pot fer una comissió parcial durant una fusió." -#: builtin/commit.c:445 +#: builtin/commit.c:447 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:454 +#: builtin/commit.c:456 msgid "cannot read the index" msgstr "no es pot llegir l'Ãndex" -#: builtin/commit.c:473 +#: builtin/commit.c:475 msgid "unable to write temporary index file" msgstr "no s'ha pogut escriure un fitxer d'Ãndex temporal" -#: builtin/commit.c:584 +#: builtin/commit.c:580 #, c-format msgid "commit '%s' lacks author header" msgstr "a la comissió '%s' li manca la capçalera d'autor" -#: builtin/commit.c:586 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' has malformed author line" msgstr "la comissió '%s' té una lÃnia d'autor mal formada" -#: builtin/commit.c:605 +#: builtin/commit.c:601 msgid "malformed --author parameter" msgstr "parà metre --author mal format" -#: builtin/commit.c:613 +#: builtin/commit.c:609 #, c-format msgid "invalid date format: %s" msgstr "format de data no và lid: %s" -#: builtin/commit.c:657 +#: builtin/commit.c:653 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -4344,43 +4378,43 @@ msgstr "" "no es pot seleccionar un carà cter de comentari que\n" "no sigui usat en el missatge de comissió actual" -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1084 +#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 #, c-format msgid "could not lookup commit %s" msgstr "no s'ha pogut trobar la comissió %s" -#: builtin/commit.c:706 builtin/shortlog.c:273 +#: builtin/commit.c:702 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:708 +#: builtin/commit.c:704 msgid "could not read log from standard input" msgstr "no s'ha pogut llegir de l'entrada està ndard" -#: builtin/commit.c:712 +#: builtin/commit.c:708 #, c-format msgid "could not read log file '%s'" msgstr "no s'ha pogut llegir el fitxer de registre '%s'" -#: builtin/commit.c:734 +#: builtin/commit.c:730 msgid "could not read MERGE_MSG" msgstr "no s'ha pogut llegir MERGE_MSG" -#: builtin/commit.c:738 +#: builtin/commit.c:734 msgid "could not read SQUASH_MSG" msgstr "no s'ha pogur llegir SQUASH_MSG" -#: builtin/commit.c:742 +#: builtin/commit.c:738 #, c-format msgid "could not read '%s'" msgstr "no s'ha pogut llegir '%s'" -#: builtin/commit.c:789 +#: builtin/commit.c:785 msgid "could not write commit template" msgstr "no s'ha pogut escriure la plantilla de comissió" -#: builtin/commit.c:807 +#: builtin/commit.c:803 #, c-format msgid "" "\n" @@ -4395,7 +4429,7 @@ msgstr "" "\t%s\n" "i intenteu-ho de nou.\n" -#: builtin/commit.c:812 +#: builtin/commit.c:808 #, c-format msgid "" "\n" @@ -4410,7 +4444,7 @@ msgstr "" "\t%s\n" "i intenteu-ho de nou.\n" -#: builtin/commit.c:825 +#: builtin/commit.c:821 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4420,7 +4454,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:832 +#: builtin/commit.c:828 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4431,146 +4465,148 @@ msgstr "" "Es retindran les lÃnies començants amb '%c'; podeu eliminar-les per vós\n" "mateix si voleu. Un missatge buit avorta la comissió.\n" -#: builtin/commit.c:852 +#: builtin/commit.c:848 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:860 +#: builtin/commit.c:856 #, c-format msgid "%sDate: %s" msgstr "%sData: %s" -#: builtin/commit.c:867 +#: builtin/commit.c:863 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sComitent: %.*s <%.*s>" -#: builtin/commit.c:885 +#: builtin/commit.c:881 msgid "Cannot read index" msgstr "No es pot llegir l'Ãndex" -#: builtin/commit.c:942 +#: builtin/commit.c:938 msgid "Error building trees" msgstr "Error en construir arbres" -#: builtin/commit.c:957 builtin/tag.c:495 +#: builtin/commit.c:953 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 per usar o l'opció -m o l'opció -F.\n" -#: builtin/commit.c:1059 +#: builtin/commit.c:1055 #, c-format -msgid "No existing author found with '%s'" -msgstr "Cap autor existent trobat amb '%s'" +msgid "--author '%s' is not 'Name <email>' and matches no existing author" +msgstr "" +"--author '%s' no és 'Nom <adreça-de-correu-electrònic>' i no coincideix amb\n" +"cap autor existent" -#: builtin/commit.c:1074 builtin/commit.c:1314 +#: builtin/commit.c:1070 builtin/commit.c:1310 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fitxers no seguits no và lid '%s'" -#: builtin/commit.c:1111 +#: builtin/commit.c:1107 msgid "--long and -z are incompatible" msgstr "--long i -z són incompatibles" -#: builtin/commit.c:1141 +#: builtin/commit.c:1137 msgid "Using both --reset-author and --author does not make sense" msgstr "Usar ambdós --reset-author i --author no té sentit" -#: builtin/commit.c:1150 +#: builtin/commit.c:1146 msgid "You have nothing to amend." msgstr "No teniu res a esmenar." -#: builtin/commit.c:1153 +#: builtin/commit.c:1149 msgid "You are in the middle of a merge -- cannot amend." msgstr "Esteu enmig d'una fusió -- no es pot esmenar." -#: builtin/commit.c:1155 +#: builtin/commit.c:1151 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Esteu enmig d'un recull de cireres -- no es pot esmenar." -#: builtin/commit.c:1158 +#: builtin/commit.c:1154 msgid "Options --squash and --fixup cannot be used together" msgstr "Les opcions --squash i --fixup no es poden usar juntes" -#: builtin/commit.c:1168 +#: builtin/commit.c:1164 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Només un de -c/-C/-F/--fixup es pot usar." -#: builtin/commit.c:1170 +#: builtin/commit.c:1166 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:1178 +#: builtin/commit.c:1174 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author només es pot usar amb -C, -c o --amend." -#: builtin/commit.c:1195 +#: builtin/commit.c:1191 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "Només un de --include/--only/--all/--interactive/--patch es pot usar." -#: builtin/commit.c:1197 +#: builtin/commit.c:1193 msgid "No paths with --include/--only does not make sense." msgstr "--include/--only no té sentit sense camÃ." -#: builtin/commit.c:1199 +#: builtin/commit.c:1195 msgid "Clever... amending the last one with dirty index." msgstr "Intel·ligent... esmenant l'últim amb Ãndex brut." -#: builtin/commit.c:1201 +#: builtin/commit.c:1197 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" "S'han especificat camins explÃcits sense -i o -o; presumint camins --only..." -#: builtin/commit.c:1213 builtin/tag.c:728 +#: builtin/commit.c:1209 builtin/tag.c:728 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de neteja no và lid %s" -#: builtin/commit.c:1218 +#: builtin/commit.c:1214 msgid "Paths with -a does not make sense." msgstr "-a no té sentit amb camins." -#: builtin/commit.c:1328 builtin/commit.c:1608 +#: builtin/commit.c:1324 builtin/commit.c:1604 msgid "show status concisely" msgstr "mostra l'estat concisament" -#: builtin/commit.c:1330 builtin/commit.c:1610 +#: builtin/commit.c:1326 builtin/commit.c:1606 msgid "show branch information" msgstr "mostra la informació de branca" -#: builtin/commit.c:1332 builtin/commit.c:1612 builtin/push.c:500 +#: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509 msgid "machine-readable output" msgstr "sortida llegible per mà quina" -#: builtin/commit.c:1335 builtin/commit.c:1614 +#: builtin/commit.c:1331 builtin/commit.c:1610 msgid "show status in long format (default)" msgstr "mostra l'estat en format llarg (per defecte)" -#: builtin/commit.c:1338 builtin/commit.c:1617 +#: builtin/commit.c:1334 builtin/commit.c:1613 msgid "terminate entries with NUL" msgstr "acaba les entrades amb NUL" -#: builtin/commit.c:1340 builtin/commit.c:1620 builtin/fast-export.c:980 +#: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980 #: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "mode" -#: builtin/commit.c:1341 builtin/commit.c:1620 +#: builtin/commit.c:1337 builtin/commit.c:1616 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:1344 +#: builtin/commit.c:1340 msgid "show ignored files" msgstr "mostra els fitxers ignorats" -#: builtin/commit.c:1345 parse-options.h:153 +#: builtin/commit.c:1341 parse-options.h:153 msgid "when" msgstr "quan" -#: builtin/commit.c:1346 +#: builtin/commit.c:1342 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -4578,210 +4614,210 @@ msgstr "" "ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per " "defecte: all)" -#: builtin/commit.c:1348 +#: builtin/commit.c:1344 msgid "list untracked files in columns" msgstr "mostra els fitxers no seguits en columnes" -#: builtin/commit.c:1435 +#: builtin/commit.c:1431 msgid "couldn't look up newly created commit" msgstr "no s'ha pogut trobar la comissió novament creada" -#: builtin/commit.c:1437 +#: builtin/commit.c:1433 msgid "could not parse newly created commit" msgstr "no s'ha pogut analitzar la comissió novament creada" -#: builtin/commit.c:1482 +#: builtin/commit.c:1478 msgid "detached HEAD" msgstr "HEAD separat" -#: builtin/commit.c:1485 +#: builtin/commit.c:1481 msgid " (root-commit)" msgstr " (comissió d'arrel)" -#: builtin/commit.c:1578 +#: builtin/commit.c:1574 msgid "suppress summary after successful commit" msgstr "omet el resum després d'una comissió reeixida" -#: builtin/commit.c:1579 +#: builtin/commit.c:1575 msgid "show diff in commit message template" msgstr "mostra la diferència en la plantilla de missatge de comissió" -#: builtin/commit.c:1581 +#: builtin/commit.c:1577 msgid "Commit message options" msgstr "Opcions de missatge de comissió" -#: builtin/commit.c:1582 builtin/tag.c:601 +#: builtin/commit.c:1578 builtin/tag.c:601 msgid "read message from file" msgstr "llegiu el missatge des d'un fitxer" -#: builtin/commit.c:1583 +#: builtin/commit.c:1579 msgid "author" msgstr "autor" -#: builtin/commit.c:1583 +#: builtin/commit.c:1579 msgid "override author for commit" msgstr "autor corregit de la comissió" -#: builtin/commit.c:1584 builtin/gc.c:275 +#: builtin/commit.c:1580 builtin/gc.c:275 msgid "date" msgstr "data" -#: builtin/commit.c:1584 +#: builtin/commit.c:1580 msgid "override date for commit" msgstr "data corregida de la comissió" -#: builtin/commit.c:1585 builtin/merge.c:218 builtin/notes.c:391 +#: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391 #: builtin/notes.c:554 builtin/tag.c:599 msgid "message" msgstr "missatge" -#: builtin/commit.c:1585 +#: builtin/commit.c:1581 msgid "commit message" msgstr "missatge de comissió" -#: builtin/commit.c:1586 +#: builtin/commit.c:1582 msgid "reuse and edit message from specified commit" msgstr "reusa i edita el missatge de la comissió especificada" -#: builtin/commit.c:1587 +#: builtin/commit.c:1583 msgid "reuse message from specified commit" msgstr "reusa el missatge de la comissió especificada" -#: builtin/commit.c:1588 +#: builtin/commit.c:1584 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "usa el missatge formatat d'aixafada automà tica per a arreglar la comissió " "especificada" -#: builtin/commit.c:1589 +#: builtin/commit.c:1585 msgid "use autosquash formatted message to squash specified commit" msgstr "" "usa el missatge formatat d'aixafada automà tica per a aixafar la comissió " "especificada" -#: builtin/commit.c:1590 +#: builtin/commit.c:1586 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "l'autor de la comissió ja sóc jo (usat amb -C/-c/--amend)" -#: builtin/commit.c:1591 builtin/log.c:1191 builtin/revert.c:86 +#: builtin/commit.c:1587 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "afegeix Signed-off-by:" -#: builtin/commit.c:1592 +#: builtin/commit.c:1588 msgid "use specified template file" msgstr "usa el fitxer de plantilla especificat" -#: builtin/commit.c:1593 +#: builtin/commit.c:1589 msgid "force edit of commit" msgstr "força l'edició de la comissió" -#: builtin/commit.c:1594 +#: builtin/commit.c:1590 msgid "default" msgstr "per defecte" -#: builtin/commit.c:1594 builtin/tag.c:604 +#: builtin/commit.c:1590 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:1595 +#: builtin/commit.c:1591 msgid "include status in commit message template" msgstr "inclou l'estat en la plantilla de missatge de comissió" -#: builtin/commit.c:1596 builtin/merge.c:225 builtin/revert.c:92 +#: builtin/commit.c:1592 builtin/merge.c:225 builtin/revert.c:92 #: builtin/tag.c:605 msgid "key-id" msgstr "ID de clau" -#: builtin/commit.c:1597 builtin/merge.c:226 builtin/revert.c:93 +#: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93 msgid "GPG sign commit" msgstr "firma la comissió amb GPG" -#: builtin/commit.c:1600 +#: builtin/commit.c:1596 msgid "Commit contents options" msgstr "Opcions dels continguts de les comissions" -#: builtin/commit.c:1601 +#: builtin/commit.c:1597 msgid "commit all changed files" msgstr "comet tots els fitxers canviats" -#: builtin/commit.c:1602 +#: builtin/commit.c:1598 msgid "add specified files to index for commit" msgstr "afegeix els fitxers especificats a l'Ãndex per a cometre" -#: builtin/commit.c:1603 +#: builtin/commit.c:1599 msgid "interactively add files" msgstr "afegeix els fitxers interactivament" -#: builtin/commit.c:1604 +#: builtin/commit.c:1600 msgid "interactively add changes" msgstr "afegeix els canvis interactivament" -#: builtin/commit.c:1605 +#: builtin/commit.c:1601 msgid "commit only specified files" msgstr "comet només els fitxers especificats" -#: builtin/commit.c:1606 +#: builtin/commit.c:1602 msgid "bypass pre-commit hook" msgstr "evita el ganxo de precomissió" -#: builtin/commit.c:1607 +#: builtin/commit.c:1603 msgid "show what would be committed" msgstr "mostra què es cometria" -#: builtin/commit.c:1618 +#: builtin/commit.c:1614 msgid "amend previous commit" msgstr "esmena la comissió anterior" -#: builtin/commit.c:1619 +#: builtin/commit.c:1615 msgid "bypass post-rewrite hook" msgstr "evita el ganxo de postreescriure" -#: builtin/commit.c:1624 +#: builtin/commit.c:1620 msgid "ok to record an empty change" msgstr "està bé registrar un canvi buit" -#: builtin/commit.c:1626 +#: builtin/commit.c:1622 msgid "ok to record a change with an empty message" msgstr "està bé registrar un canvi amb missatge buit" -#: builtin/commit.c:1655 +#: builtin/commit.c:1651 msgid "could not parse HEAD commit" msgstr "no s'ha pogut analitzar la comissió HEAD" -#: builtin/commit.c:1694 builtin/merge.c:519 +#: builtin/commit.c:1690 builtin/merge.c:519 #, c-format msgid "could not open '%s' for reading" msgstr "no s'ha pogut obrir '%s' per a lectura" -#: builtin/commit.c:1701 +#: builtin/commit.c:1697 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fitxer MERGE_HEAD corrupte (%s)" -#: builtin/commit.c:1708 +#: builtin/commit.c:1704 msgid "could not read MERGE_MODE" msgstr "no s'ha pogut llegir MERGE_MODE" -#: builtin/commit.c:1727 +#: builtin/commit.c:1723 #, c-format msgid "could not read commit message: %s" msgstr "no s'ha pogut llegir el missatge de comissió: %s" -#: builtin/commit.c:1738 +#: builtin/commit.c:1734 #, 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:1743 +#: builtin/commit.c:1739 #, 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:1758 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1754 builtin/merge.c:851 builtin/merge.c:876 msgid "failed to write commit object" msgstr "s'ha fallat en escriure l'objecte de comissió" -#: builtin/commit.c:1791 +#: builtin/commit.c:1787 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -4793,8 +4829,8 @@ msgstr "" "\"git reset HEAD\" per a recuperar." #: builtin/config.c:8 -msgid "git config [options]" -msgstr "git config [opcions]" +msgid "git config [<options>]" +msgstr "git config [<opcions>]" #: builtin/config.c:53 msgid "Config file location" @@ -4950,12 +4986,12 @@ msgid "print sizes in human readable format" msgstr "imprimeix les mides en un format llegible per humans" #: builtin/describe.c:17 -msgid "git describe [options] <commit-ish>*" -msgstr "git describe [opcions] <comissió>*" +msgid "git describe [<options>] [<commit-ish>...]" +msgstr "git describe [opcions] [<comissió>...]" #: builtin/describe.c:18 -msgid "git describe [options] --dirty" -msgstr "git describe [opcions] --dirty" +msgid "git describe [<options>] --dirty" +msgstr "git describe [<opcions>] --dirty" #: builtin/describe.c:217 #, c-format @@ -5170,178 +5206,178 @@ msgstr "Aplica l'especificació de referència a les referències exportades" msgid "anonymize output" msgstr "anonimitza la sortida" -#: builtin/fetch.c:20 +#: builtin/fetch.c:19 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<opcions>] [<dipòsit> [<especificació-de-referència>...]]" -#: builtin/fetch.c:21 +#: builtin/fetch.c:20 msgid "git fetch [<options>] <group>" msgstr "git fetch [<opcions>] <grup>" -#: builtin/fetch.c:22 +#: builtin/fetch.c:21 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<opcions>] [(<dipòsit> | <grup>)...]" -#: builtin/fetch.c:23 +#: builtin/fetch.c:22 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<opcions>]" -#: builtin/fetch.c:90 +#: builtin/fetch.c:89 msgid "fetch from all remotes" msgstr "obtén de tots els remots" -#: builtin/fetch.c:92 +#: builtin/fetch.c:91 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "annexa a .git/FETCH_HEAD en lloc de sobreescriure" -#: builtin/fetch.c:94 +#: builtin/fetch.c:93 msgid "path to upload pack on remote end" -msgstr "camà al qual pujar el paquet en el costat remot" +msgstr "camà al qual pujar el paquet al costat remot" -#: builtin/fetch.c:95 +#: builtin/fetch.c:94 msgid "force overwrite of local branch" msgstr "força la sobreescriptura de la branca local" -#: builtin/fetch.c:97 +#: builtin/fetch.c:96 msgid "fetch from multiple remotes" msgstr "obtén de múltiples remots" -#: builtin/fetch.c:99 +#: builtin/fetch.c:98 msgid "fetch all tags and associated objects" msgstr "obtén totes les etiquetes i tots els objectes associats" -#: builtin/fetch.c:101 +#: builtin/fetch.c:100 msgid "do not fetch all tags (--no-tags)" msgstr "no obtinguis les etiquetes (--no-tags)" -#: builtin/fetch.c:103 +#: builtin/fetch.c:102 msgid "prune remote-tracking branches no longer on remote" msgstr "poda les branques amb seguiment remot que ja no estiguin en el remot" -#: builtin/fetch.c:104 +#: builtin/fetch.c:103 msgid "on-demand" msgstr "sota demanda" -#: builtin/fetch.c:105 +#: builtin/fetch.c:104 msgid "control recursive fetching of submodules" msgstr "controla l'obteniment recursiu de submòduls" -#: builtin/fetch.c:109 +#: builtin/fetch.c:108 msgid "keep downloaded pack" msgstr "desa el paquet baixat" -#: builtin/fetch.c:111 +#: builtin/fetch.c:110 msgid "allow updating of HEAD ref" msgstr "permet l'actualització de la referència HEAD" -#: builtin/fetch.c:114 +#: builtin/fetch.c:113 msgid "deepen history of shallow clone" msgstr "aprofundeix la història d'un clon superficial" -#: builtin/fetch.c:116 +#: builtin/fetch.c:115 msgid "convert to a complete repository" msgstr "converteix en un dipòsit complet" -#: builtin/fetch.c:118 builtin/log.c:1208 +#: builtin/fetch.c:117 builtin/log.c:1208 msgid "dir" msgstr "directori" -#: builtin/fetch.c:119 +#: builtin/fetch.c:118 msgid "prepend this to submodule path output" msgstr "anteposa això a la sortida de camà del submòdul" -#: builtin/fetch.c:122 +#: builtin/fetch.c:121 msgid "default mode for recursion" msgstr "mode de recursivitat per defecte" -#: builtin/fetch.c:124 +#: builtin/fetch.c:123 msgid "accept refs that update .git/shallow" msgstr "accepta les referències que actualitzin .git/shallow" -#: builtin/fetch.c:125 +#: builtin/fetch.c:124 msgid "refmap" msgstr "mapa de referències" -#: builtin/fetch.c:126 +#: builtin/fetch.c:125 msgid "specify fetch refmap" msgstr "mostra el mapa de referències d'obteniment" -#: builtin/fetch.c:376 +#: builtin/fetch.c:375 msgid "Couldn't find remote ref HEAD" msgstr "No s'ha pogut trobar la referència HEAD remota" -#: builtin/fetch.c:454 +#: builtin/fetch.c:455 #, c-format msgid "object %s not found" msgstr "objecte %s no trobat" -#: builtin/fetch.c:459 +#: builtin/fetch.c:460 msgid "[up to date]" msgstr "[al dia]" -#: builtin/fetch.c:473 +#: builtin/fetch.c:474 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s (no es pot obtenir en la branca actual)" -#: builtin/fetch.c:474 builtin/fetch.c:560 +#: builtin/fetch.c:475 builtin/fetch.c:561 msgid "[rejected]" msgstr "[rebutjat]" -#: builtin/fetch.c:485 +#: builtin/fetch.c:486 msgid "[tag update]" msgstr "[actualització d'etiqueta]" -#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540 +#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541 msgid " (unable to update local ref)" msgstr " (no s'ha pogut actualitzar la referència local)" -#: builtin/fetch.c:505 +#: builtin/fetch.c:506 msgid "[new tag]" msgstr "[etiqueta nova]" -#: builtin/fetch.c:508 +#: builtin/fetch.c:509 msgid "[new branch]" msgstr "[branca nova]" -#: builtin/fetch.c:511 +#: builtin/fetch.c:512 msgid "[new ref]" msgstr "[referència nova]" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "unable to update local ref" msgstr "no s'ha pogut actualitzar la referència local" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "forced update" msgstr "actualització forçada" -#: builtin/fetch.c:562 +#: builtin/fetch.c:563 msgid "(non-fast-forward)" msgstr "(sense avanç rà pid)" -#: builtin/fetch.c:595 builtin/fetch.c:828 +#: builtin/fetch.c:596 builtin/fetch.c:829 #, c-format msgid "cannot open %s: %s\n" msgstr "no es pot obrir %s: %s\n" -#: builtin/fetch.c:604 +#: builtin/fetch.c:605 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s no ha enviat tots els objectes necessaris\n" -#: builtin/fetch.c:622 +#: builtin/fetch.c:623 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "rebutja %s perquè no es permet que les arrels superficials s'actualitzin" -#: builtin/fetch.c:710 builtin/fetch.c:793 +#: builtin/fetch.c:711 builtin/fetch.c:794 #, c-format msgid "From %.*s\n" msgstr "De %.*s\n" -#: builtin/fetch.c:721 +#: builtin/fetch.c:722 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5351,55 +5387,55 @@ msgstr "" " intenteu executar 'git remote prune %s' per a eliminar\n" " qualsevulla branca antiga o conflictiva" -#: builtin/fetch.c:773 +#: builtin/fetch.c:774 #, c-format msgid " (%s will become dangling)" msgstr " (%s es tornarà penjant)" -#: builtin/fetch.c:774 +#: builtin/fetch.c:775 #, c-format msgid " (%s has become dangling)" msgstr " (%s s'ha tornat penjant)" -#: builtin/fetch.c:798 +#: builtin/fetch.c:799 msgid "[deleted]" msgstr "[suprimit]" -#: builtin/fetch.c:799 builtin/remote.c:1060 +#: builtin/fetch.c:800 builtin/remote.c:1060 msgid "(none)" msgstr "(cap)" -#: builtin/fetch.c:818 +#: builtin/fetch.c:819 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Refusant obtenir en la branca actual %s d'un dipòsit no nu" -#: builtin/fetch.c:837 +#: builtin/fetch.c:838 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "L'opció \"%s\" amb valor \"%s\" no és và lida per a %s" -#: builtin/fetch.c:840 +#: builtin/fetch.c:841 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "S'ignora l'opció \"%s\" per a %s\n" -#: builtin/fetch.c:896 +#: builtin/fetch.c:897 #, c-format msgid "Don't know how to fetch from %s" msgstr "No es sap com obtenir de %s" -#: builtin/fetch.c:1058 +#: builtin/fetch.c:1059 #, c-format msgid "Fetching %s\n" msgstr "Obtenint %s\n" -#: builtin/fetch.c:1060 builtin/remote.c:90 +#: builtin/fetch.c:1061 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "No s'ha pogut obtenir %s" -#: builtin/fetch.c:1078 +#: builtin/fetch.c:1079 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5407,39 +5443,40 @@ msgstr "" "Cap dipòsit remot especificat. Si us plau, especifiqueu o un URL o\n" "un nom remot del qual es deuen obtenir les revisions noves." -#: builtin/fetch.c:1101 +#: builtin/fetch.c:1102 msgid "You need to specify a tag name." msgstr "Necessiteu especificar un nom d'etiqueta." -#: builtin/fetch.c:1143 +#: builtin/fetch.c:1144 msgid "--depth and --unshallow cannot be used together" msgstr "--depth i --unshallow no es poden usar junts" -#: builtin/fetch.c:1145 +#: builtin/fetch.c:1146 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow en un dipòsit complet no té sentit" -#: builtin/fetch.c:1168 +#: builtin/fetch.c:1169 msgid "fetch --all does not take a repository argument" msgstr "fetch --all no accepta un parà metre de dipòsit" -#: builtin/fetch.c:1170 +#: builtin/fetch.c:1171 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all no té sentit amb especificacions de referència" -#: builtin/fetch.c:1181 +#: builtin/fetch.c:1182 #, c-format msgid "No such remote or remote group: %s" msgstr "No hi ha tal remot ni tal grup remot: %s" -#: builtin/fetch.c:1189 +#: builtin/fetch.c:1190 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Obtenir un grup i especificar referències no té sentit" #: builtin/fmt-merge-msg.c:13 -msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" +msgid "" +"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" -"git fmt-merge-msg [-m <missatge>] [--log[=<n>]|--no-log] [--file <fitxer>]" +"git fmt-merge-msg [-m <missatge>] [--log[=<n>] | --no-log] [--file <fitxer>]" #: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182 @@ -5468,52 +5505,52 @@ msgstr "usa <text> com a inici de missatge" msgid "file to read from" msgstr "fitxer del qual llegir" -#: builtin/for-each-ref.c:676 +#: builtin/for-each-ref.c:675 msgid "unable to parse format" msgstr "no s'ha pogut analitzar el format" -#: builtin/for-each-ref.c:1064 -msgid "git for-each-ref [options] [<pattern>]" -msgstr "git for-each-ref [opcions] [<patró>]" +#: builtin/for-each-ref.c:1063 +msgid "git for-each-ref [<options>] [<pattern>]" +msgstr "git for-each-ref [<opcions>] [<patró>]" -#: builtin/for-each-ref.c:1079 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for shells" msgstr "" "posa els marcadors de posició entre cometes adequades per als terminals" -#: builtin/for-each-ref.c:1081 +#: builtin/for-each-ref.c:1080 msgid "quote placeholders suitably for perl" msgstr "posa els marcadors de posició entre cometes adequades per a perl" -#: builtin/for-each-ref.c:1083 +#: builtin/for-each-ref.c:1082 msgid "quote placeholders suitably for python" msgstr "posa els marcadors de posició entre cometes adequades per a python" -#: builtin/for-each-ref.c:1085 +#: builtin/for-each-ref.c:1084 msgid "quote placeholders suitably for Tcl" msgstr "posa els marcadors de posició entre cometes adequades per a Tcl" -#: builtin/for-each-ref.c:1088 +#: builtin/for-each-ref.c:1087 msgid "show only <n> matched refs" msgstr "mostra només <n> referències coincidents" -#: builtin/for-each-ref.c:1089 builtin/replace.c:438 +#: builtin/for-each-ref.c:1088 builtin/replace.c:438 msgid "format" msgstr "format" -#: builtin/for-each-ref.c:1089 +#: builtin/for-each-ref.c:1088 msgid "format to use for the output" msgstr "format a usar en la sortida" -#: builtin/for-each-ref.c:1090 +#: builtin/for-each-ref.c:1089 msgid "key" msgstr "clau" -#: builtin/for-each-ref.c:1091 +#: builtin/for-each-ref.c:1090 msgid "field name to sort on" msgstr "nom de camp en el qual ordenar" -#: builtin/fsck.c:147 builtin/prune.c:136 +#: builtin/fsck.c:147 builtin/prune.c:137 msgid "Checking connectivity" msgstr "Comprovant connectivitat" @@ -5522,8 +5559,8 @@ msgid "Checking object directories" msgstr "Comprovant els directoris d'objecte" #: builtin/fsck.c:603 -msgid "git fsck [options] [<object>...]" -msgstr "git fsck [opcions] [<objecte>...]" +msgid "git fsck [<options>] [<object>...]" +msgstr "git fsck [<opcions>] [<objecte>...]" #: builtin/fsck.c:609 msgid "show unreachable objects" @@ -5570,8 +5607,8 @@ msgid "Checking objects" msgstr "Comprovant els objectes" #: builtin/gc.c:24 -msgid "git gc [options]" -msgstr "git gc [opcions]" +msgid "git gc [<options>]" +msgstr "git gc [<opcions>]" #: builtin/gc.c:79 #, c-format @@ -5630,8 +5667,8 @@ msgstr "" "los." #: builtin/grep.c:23 -msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" -msgstr "git grep [opcions] [-e] <patró> [<revisió>...] [[--] <camÃ>...]" +msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" +msgstr "git grep [<opcions>] [-e] <patró> [<revisió>...] [[--] <camÃ>...]" #: builtin/grep.c:218 #, c-format @@ -5671,8 +5708,8 @@ msgid "search in both tracked and untracked files" msgstr "cerca tant en fitxers seguits com en no seguits" #: builtin/grep.c:644 -msgid "search also in ignored files" -msgstr "cerca en els fitxers ignorats també" +msgid "ignore files specified via '.gitignore'" +msgstr "ignora els fitxers especificats mitjançant '.gitignore'" #: builtin/grep.c:647 msgid "show non-matching lines" @@ -5860,17 +5897,17 @@ msgstr "s'han donat ambdós --caches i arbres." #: builtin/hash-object.c:82 msgid "" -"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " -"<file>..." +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " +"[--] <file>..." msgstr "" -"git hash-object [-t <tipus>] [-w] [--path=<fitxer>|--no-filters] [--stdin] " +"git hash-object [-t <tipus>] [-w] [--path=<fitxer> | --no-filters] [--stdin] " "[--] <fitxer>..." #: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "git hash-object --stdin-paths < <llista-de-camins>" -#: builtin/hash-object.c:94 builtin/tag.c:610 +#: builtin/hash-object.c:94 builtin/tag.c:612 msgid "type" msgstr "tipus" @@ -5922,8 +5959,8 @@ msgid "show info page" msgstr "mostra la pà gina d'informació" #: builtin/help.c:52 -msgid "git help [--all] [--guides] [--man|--web|--info] [command]" -msgstr "git help [--all] [--guides] [--man|--web|--info] [ordre]" +msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" +msgstr "git help [--all] [--guides] [--man | --web | --info] [<ordre>]" #: builtin/help.c:64 #, c-format @@ -6131,8 +6168,8 @@ msgstr "hi ha una inconsistència seriosa d'inflació" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !" -#: builtin/index-pack.c:689 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:256 +#: builtin/index-pack.c:689 builtin/pack-objects.c:162 +#: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "no s'ha pogut llegir %s" @@ -6219,97 +6256,97 @@ msgid_plural "pack has %d unresolved deltas" msgstr[0] "El paquet té %d delta no resolta" msgstr[1] "El paquet té %d deltes no resoltes" -#: builtin/index-pack.c:1220 +#: builtin/index-pack.c:1219 #, c-format msgid "unable to deflate appended object (%d)" msgstr "no s'ha pogut desinflar l'objecte annexat (%d)" -#: builtin/index-pack.c:1299 +#: builtin/index-pack.c:1298 #, c-format msgid "local object %s is corrupt" msgstr "l'objecte local %s és corrupte" -#: builtin/index-pack.c:1323 +#: builtin/index-pack.c:1322 msgid "error while closing pack file" msgstr "error en tancar el fitxer de paquet" -#: builtin/index-pack.c:1336 +#: builtin/index-pack.c:1335 #, c-format msgid "cannot write keep file '%s'" msgstr "no es pot escriure el fitxer a retenir '%s'" -#: builtin/index-pack.c:1344 +#: builtin/index-pack.c:1343 #, c-format msgid "cannot close written keep file '%s'" msgstr "no es pot tancar el fitxer escrit a retenir '%s'" -#: builtin/index-pack.c:1357 +#: builtin/index-pack.c:1356 msgid "cannot store pack file" msgstr "no es pot emmagatzemar el fitxer de paquet" -#: builtin/index-pack.c:1368 +#: builtin/index-pack.c:1367 msgid "cannot store index file" msgstr "no es pot emmagatzemar el fitxer d'Ãndex" -#: builtin/index-pack.c:1401 +#: builtin/index-pack.c:1400 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "pack.indexversion=%<PRIu32> dolent" -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1406 #, c-format msgid "invalid number of threads specified (%d)" msgstr "s'ha especificat un nombre de fils no và lid (%d)" -#: builtin/index-pack.c:1411 builtin/index-pack.c:1590 +#: builtin/index-pack.c:1410 builtin/index-pack.c:1589 #, c-format msgid "no threads support, ignoring %s" msgstr "no hi ha suport de fils, ignorant %s" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1468 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "No es pot obrir el fitxer de paquet existent '%s'" -#: builtin/index-pack.c:1471 +#: builtin/index-pack.c:1470 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "No es pot obrir el fitxer d'Ãndex de paquets existent de '%s'" -#: builtin/index-pack.c:1518 +#: builtin/index-pack.c:1517 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "sense delta: %d objecte" msgstr[1] "sense delta: %d objectes" -#: builtin/index-pack.c:1525 +#: builtin/index-pack.c:1524 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "longitud de cadena = %d: %lu objecte" msgstr[1] "longitud de cadena = %d: %lu objectes" -#: builtin/index-pack.c:1554 +#: builtin/index-pack.c:1553 msgid "Cannot come back to cwd" msgstr "No es pot tornar al directori de treball actual" -#: builtin/index-pack.c:1602 builtin/index-pack.c:1605 -#: builtin/index-pack.c:1617 builtin/index-pack.c:1621 +#: builtin/index-pack.c:1601 builtin/index-pack.c:1604 +#: builtin/index-pack.c:1616 builtin/index-pack.c:1620 #, c-format msgid "bad %s" msgstr "%s dolent" -#: builtin/index-pack.c:1635 +#: builtin/index-pack.c:1634 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin no es pot usar sense --stdin" -#: builtin/index-pack.c:1639 builtin/index-pack.c:1648 +#: builtin/index-pack.c:1638 builtin/index-pack.c:1647 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "el nom de fitxer de paquet '%s' no acaba amb '.pack'" -#: builtin/index-pack.c:1656 +#: builtin/index-pack.c:1655 msgid "--verify with no packfile name given" msgstr "s'ha donat --verify sense nom de fitxer de paquet" @@ -6421,10 +6458,10 @@ msgstr " compartit" #: builtin/init-db.c:475 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" -"shared[=<permissions>]] [directory]" +"shared[=<permissions>]] [<directory>]" msgstr "" "git init [-q | --quiet] [--bare] [--template=<directori-de-plantilla>] [--" -"shared[=<permisos>]] [directori]" +"shared[=<permisos>]] [<directori>]" #: builtin/init-db.c:498 msgid "permissions" @@ -6487,8 +6524,8 @@ msgid "git log [<options>] [<revision range>] [[--] <path>...]" msgstr "git log [<opcions>] [<rang de revisions>] [[--] <camÃ>...]" #: builtin/log.c:42 -msgid "git show [options] <object>..." -msgstr "git show [opcions] <objecte>..." +msgid "git show [<options>] <object>..." +msgstr "git show [<opcions>] <objecte>..." #: builtin/log.c:81 #, c-format @@ -6501,7 +6538,7 @@ msgstr "omet la sortida de diferències" #: builtin/log.c:128 msgid "show source" -msgstr "mostra el fons" +msgstr "mostra el font" #: builtin/log.c:129 msgid "Use mail map file" @@ -6566,8 +6603,8 @@ msgid "insane in-reply-to: %s" msgstr "in-reply-to boig: %s" #: builtin/log.c:1026 -msgid "git format-patch [options] [<since> | <revision range>]" -msgstr "git format-patch [opcions] [<des de> | <rang de revisions>]" +msgid "git format-patch [<options>] [<since> | <revision-range>]" +msgstr "git format-patch [<opcions>] [<des-de> | <rang-de-revisions>]" #: builtin/log.c:1071 msgid "Two output directories?" @@ -6767,97 +6804,97 @@ msgstr "" msgid "Unknown commit %s" msgstr "Comissió desconeguda %s" -#: builtin/ls-files.c:401 -msgid "git ls-files [options] [<file>...]" -msgstr "git ls-files [opcions] [<fitxer>...]" +#: builtin/ls-files.c:358 +msgid "git ls-files [<options>] [<file>...]" +msgstr "git ls-files [<opcions>] [<fitxer>...]" -#: builtin/ls-files.c:458 +#: builtin/ls-files.c:415 msgid "identify the file status with tags" msgstr "identifica l'estat de fitxer amb etiquetes" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:417 msgid "use lowercase letters for 'assume unchanged' files" msgstr "usa lletres minúscules per als fitxers 'assume unchanged'" -#: builtin/ls-files.c:462 +#: builtin/ls-files.c:419 msgid "show cached files in the output (default)" msgstr "" "mostra en la sortida els fitxers desats en la memòria cau (per defecte)" -#: builtin/ls-files.c:464 +#: builtin/ls-files.c:421 msgid "show deleted files in the output" msgstr "mostra en la sortida els fitxers suprimits" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:423 msgid "show modified files in the output" msgstr "mostra en la sortida els fitxers modificats" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:425 msgid "show other files in the output" msgstr "mostra en la sortida els altres fitxers" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:427 msgid "show ignored files in the output" msgstr "mostra en la sortida els fitxers ignorats" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:430 msgid "show staged contents' object name in the output" msgstr "mostra en la sortida el nom d'objecte dels continguts allistats" -#: builtin/ls-files.c:475 +#: builtin/ls-files.c:432 msgid "show files on the filesystem that need to be removed" msgstr "mostra els fitxers en el sistema de fitxers que s'han d'eliminar" -#: builtin/ls-files.c:477 +#: builtin/ls-files.c:434 msgid "show 'other' directories' names only" msgstr "mostra només els noms dels directoris 'other'" -#: builtin/ls-files.c:480 +#: builtin/ls-files.c:437 msgid "don't show empty directories" msgstr "no mostris els directoris buits" -#: builtin/ls-files.c:483 +#: builtin/ls-files.c:440 msgid "show unmerged files in the output" msgstr "mostra en la sortida els fitxers sense fusionar" -#: builtin/ls-files.c:485 +#: builtin/ls-files.c:442 msgid "show resolve-undo information" msgstr "mostra la informació de resolució de desfet" -#: builtin/ls-files.c:487 +#: builtin/ls-files.c:444 msgid "skip files matching pattern" msgstr "salta els fitxers coincidents amb el patró" -#: builtin/ls-files.c:490 +#: builtin/ls-files.c:447 msgid "exclude patterns are read from <file>" msgstr "els patrons d'exclusió es llegeixen de <fitxer>" -#: builtin/ls-files.c:493 +#: builtin/ls-files.c:450 msgid "read additional per-directory exclude patterns in <file>" msgstr "llegeix els patrons addicionals d'exclusió per directori en <fitxer>" -#: builtin/ls-files.c:495 +#: builtin/ls-files.c:452 msgid "add the standard git exclusions" msgstr "afegeix les exclusions està ndards de git" -#: builtin/ls-files.c:498 +#: builtin/ls-files.c:455 msgid "make the output relative to the project top directory" msgstr "fes que la sortida sigui relativa al directori superior del projecte" -#: builtin/ls-files.c:501 +#: builtin/ls-files.c:458 msgid "if any <file> is not in the index, treat this as an error" msgstr "si qualsevol <fitxer> no és en l'Ãndex, tracta això com a error" -#: builtin/ls-files.c:502 +#: builtin/ls-files.c:459 msgid "tree-ish" msgstr "arbre" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:460 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "pretén que els camins eliminats després de <arbre> encara estiguin presents" -#: builtin/ls-files.c:505 +#: builtin/ls-files.c:462 msgid "show debugging data" msgstr "mostra les dades de depuració" @@ -6899,12 +6936,12 @@ msgstr "" "llista l'arbre sencer; no només el directori actual (implica --full-name)" #: builtin/merge.c:45 -msgid "git merge [options] [<commit>...]" -msgstr "git merge [opcions] [<comissió>...]" +msgid "git merge [<options>] [<commit>...]" +msgstr "git merge [<opcions>] [<comissió>...]" #: builtin/merge.c:46 -msgid "git merge [options] <msg> HEAD <commit>" -msgstr "git merge [opcions] <missatge> HEAD <comissió>" +msgid "git merge [<options>] <msg> HEAD <commit>" +msgstr "git merge [<opcions>] <missatge> HEAD <comissió>" #: builtin/merge.c:47 msgid "git merge --abort" @@ -7254,12 +7291,12 @@ msgstr "" "s'havia demanat\n" #: builtin/merge-base.c:29 -msgid "git merge-base [-a|--all] <commit> <commit>..." -msgstr "git merge-base [-a|--all] <comissió> <comissió>..." +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "git merge-base [-a | --all] <comissió> <comissió>..." #: builtin/merge-base.c:30 -msgid "git merge-base [-a|--all] --octopus <commit>..." -msgstr "git merge-base [-a|--all] --octopus <comissió>..." +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "git merge-base [-a | --all] --octopus <comissió>..." #: builtin/merge-base.c:31 msgid "git merge-base --independent <commit>..." @@ -7296,11 +7333,11 @@ msgstr "" #: builtin/merge-file.c:8 msgid "" -"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " -"file2" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" msgstr "" -"git merge-file [opcions] [-L nom1 [-L original [-L nom2]]] fitxer1 " -"fitxer_original fitxer2" +"git merge-file [<opcions>] [-L <nom1> [-L <original> [-L <nom2>]]] <fitxer1> " +"<fitxer-original> <fitxer2>" #: builtin/merge-file.c:33 msgid "send results to standard output" @@ -7331,8 +7368,8 @@ msgid "do not warn about conflicts" msgstr "no avisis de conflictes" #: builtin/merge-file.c:45 -msgid "set labels for file1/orig_file/file2" -msgstr "estableix les etiquetes per a fitxer1/fitxer_original/fitxer2" +msgid "set labels for file1/orig-file/file2" +msgstr "estableix les etiquetes per a fitxer1/fitxer-original/fitxer2" #: builtin/mktree.c:64 msgid "git mktree [-z] [--missing] [--batch]" @@ -7351,8 +7388,8 @@ msgid "allow creation of more than one tree" msgstr "permet la creació de més d'un arbre" #: builtin/mv.c:15 -msgid "git mv [options] <source>... <destination>" -msgstr "git mv [opcions] <font>... <destÃ>" +msgid "git mv [<options>] <source>... <destination>" +msgstr "git mv [<opcions>] <font>... <destÃ>" #: builtin/mv.c:69 #, c-format @@ -7439,22 +7476,22 @@ msgstr "%s, origen=%s, destÃ=%s" msgid "Renaming %s to %s\n" msgstr "Canviant el nom de %s a %s\n" -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:355 +#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359 #, c-format msgid "renaming '%s' failed" msgstr "el canvi del nom de '%s' ha fallat" #: builtin/name-rev.c:255 -msgid "git name-rev [options] <commit>..." -msgstr "git name-rev [opcions] <comissió>..." +msgid "git name-rev [<options>] <commit>..." +msgstr "git name-rev [<opcions>] <comissió>..." #: builtin/name-rev.c:256 -msgid "git name-rev [options] --all" -msgstr "git name-rev [opcions] --all" +msgid "git name-rev [<options>] --all" +msgstr "git name-rev [<opcions>] --all" #: builtin/name-rev.c:257 -msgid "git name-rev [options] --stdin" -msgstr "git name-rev [opcions] --stdin" +msgid "git name-rev [<options>] --stdin" +msgstr "git name-rev [<opcions>] --stdin" #: builtin/name-rev.c:309 msgid "print only names (no SHA-1)" @@ -7485,45 +7522,45 @@ msgid "dereference tags in the input (internal use)" msgstr "dereferencia les etiquetes en l'entrada (ús intern)" #: builtin/notes.c:24 -msgid "git notes [--ref <notes_ref>] [list [<object>]]" -msgstr "git notes [--ref <referència_de_notes>] [llista [<objecte>]]" +msgid "git notes [--ref <notes-ref>] [list [<object>]]" +msgstr "git notes [--ref <referència-de-notes>] [llista [<objecte>]]" #: builtin/notes.c:25 msgid "" -"git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" msgstr "" -"git notes [--ref <referència_de_notes>] add [-f] [--allow-empty] [-m " +"git notes [--ref <referència-de-notes>] add [-f] [--allow-empty] [-m " "<missatge> | -F <fitxer> | (-c | -C) <objecte>] [<objecte>]" #: builtin/notes.c:26 -msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" +msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "" -"git notes [--ref <referència_de_notes>] copy [-f] <d'objecte> <a-objecte>" +"git notes [--ref <referència-de-notes>] copy [-f] <d'objecte> <a-objecte>" #: builtin/notes.c:27 msgid "" -"git notes [--ref <notes_ref>] append [--allow-empty] [-m <msg> | -F <file> | " +"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" msgstr "" -"git notes [--ref <referència_de_notes>] append [--allow-empty] [-m " +"git notes [--ref <referència-de-notes>] append [--allow-empty] [-m " "<missatge> | -F <fitxer> | (-c | -C) <objecte>] [<objecte>]" #: builtin/notes.c:28 -msgid "git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]" +msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "" -"git notes [--ref <referència_de_notes>] edit [--allow-empty] [<objecte>]" +"git notes [--ref <referència-de-notes>] edit [--allow-empty] [<objecte>]" #: builtin/notes.c:29 -msgid "git notes [--ref <notes_ref>] show [<object>]" -msgstr "git notes [--ref <referència_de_notes>] show [<objecte>]" +msgid "git notes [--ref <notes-ref>] show [<object>]" +msgstr "git notes [--ref <referència-de-notes>] show [<objecte>]" #: builtin/notes.c:30 msgid "" -"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" +"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "" -"git notes [--ref <referència_de_notes>] merge [-v | -q] [-s <estratègia> ] " -"<referència_de_notes>" +"git notes [--ref <referència-de-notes>] merge [-v | -q] [-s <estratègia>] " +"<referència-de-notes>" #: builtin/notes.c:31 msgid "git notes merge --commit [-v | -q]" @@ -7534,16 +7571,16 @@ msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" #: builtin/notes.c:33 -msgid "git notes [--ref <notes_ref>] remove [<object>...]" -msgstr "git notes [--ref <referència_de_notes>] remove [<objecte>...]" +msgid "git notes [--ref <notes-ref>] remove [<object>...]" +msgstr "git notes [--ref <referència-de-notes>] remove [<objecte>...]" #: builtin/notes.c:34 -msgid "git notes [--ref <notes_ref>] prune [-n | -v]" -msgstr "git notes [--ref <referència_de_notes>] prune [-n | -v]" +msgid "git notes [--ref <notes-ref>] prune [-n | -v]" +msgstr "git notes [--ref <referència-de-notes>] prune [-n | -v]" #: builtin/notes.c:35 -msgid "git notes [--ref <notes_ref>] get-ref" -msgstr "git notes [--ref <referència_de_notes>] get-ref" +msgid "git notes [--ref <notes-ref>] get-ref" +msgstr "git notes [--ref <referència-de-notes>] get-ref" #: builtin/notes.c:40 msgid "git notes [list [<object>]]" @@ -7574,8 +7611,8 @@ msgid "git notes show [<object>]" msgstr "git notes show [<objecte>]" #: builtin/notes.c:71 -msgid "git notes merge [<options>] <notes_ref>" -msgstr "git notes merge [<opcions>] <referència_de_notes>" +msgid "git notes merge [<options>] <notes-ref>" +msgstr "git notes merge [<opcions>] <referència-de-notes>" #: builtin/notes.c:72 msgid "git notes merge --commit [<options>]" @@ -7814,8 +7851,8 @@ msgid "notes-ref" msgstr "referència de notes" #: builtin/notes.c:954 -msgid "use notes from <notes_ref>" -msgstr "usa les notes de <referència de notes>" +msgid "use notes from <notes-ref>" +msgstr "usa les notes de <referència-de-notes>" #: builtin/notes.c:989 builtin/remote.c:1621 #, c-format @@ -7834,197 +7871,197 @@ msgstr "" "git pack-objects [opcions...] nom-base [< llista-de-referències | < llista-" "de-objectes]" -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 +#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 #, c-format msgid "deflate error (%d)" msgstr "error de deflació (%d)" -#: builtin/pack-objects.c:773 +#: builtin/pack-objects.c:771 msgid "Writing objects" msgstr "Escrivint els objectes" -#: builtin/pack-objects.c:1015 +#: builtin/pack-objects.c:1013 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no " "s'estan empaquetant" -#: builtin/pack-objects.c:2175 +#: builtin/pack-objects.c:2173 msgid "Compressing objects" msgstr "Comprimint objectes" -#: builtin/pack-objects.c:2572 +#: builtin/pack-objects.c:2570 #, c-format msgid "unsupported index version %s" msgstr "versió d'Ãndex no compatible %s" -#: builtin/pack-objects.c:2576 +#: builtin/pack-objects.c:2574 #, c-format msgid "bad index version '%s'" msgstr "versió d'Ãndex dolenta '%s'" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2597 #, c-format msgid "option %s does not accept negative form" msgstr "l'opció %s no accepta la forma negativa" -#: builtin/pack-objects.c:2603 +#: builtin/pack-objects.c:2601 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "no s'ha pogut analitzar el valor '%s' per a l'opció %s" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2621 msgid "do not show progress meter" msgstr "no mostris l'indicador de progrés" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2623 msgid "show progress meter" msgstr "mostra l'indicador de progrés" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2625 msgid "show progress meter during object writing phase" msgstr "mostra l'indicador de progrés durant la fase d'escriptura d'objectes" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2628 msgid "similar to --all-progress when progress meter is shown" msgstr "similar a --all-progress quan l'indicador de progrés es mostra" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2629 msgid "version[,offset]" msgstr "versió[,desplaçament]" -#: builtin/pack-objects.c:2632 +#: builtin/pack-objects.c:2630 msgid "write the pack index file in the specified idx format version" msgstr "" "escriu el fitxer d'Ãndex de paquet en la versió de format d'Ãndex " "especificada" -#: builtin/pack-objects.c:2635 +#: builtin/pack-objects.c:2633 msgid "maximum size of each output pack file" msgstr "mida mà xima de cada fitxer de paquet de sortida" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2635 msgid "ignore borrowed objects from alternate object store" msgstr "" "ignora els objectes prestats d'un emmagatzemament d'objectes alternatiu" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:2637 msgid "ignore packed objects" msgstr "ignora els objectes empaquetats" -#: builtin/pack-objects.c:2641 +#: builtin/pack-objects.c:2639 msgid "limit pack window by objects" msgstr "limita la finestra d'empaquetament per objectes" -#: builtin/pack-objects.c:2643 +#: builtin/pack-objects.c:2641 msgid "limit pack window by memory in addition to object limit" msgstr "" "limita la finestra d'empaquetament per memòria a més del lÃmit d'objectes" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2643 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "longitud mà xima de la cadena de deltes permesa en el paquet resultant" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2645 msgid "reuse existing deltas" msgstr "reusa les deltes existents" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2647 msgid "reuse existing objects" msgstr "reusa els objectes existents" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2649 msgid "use OFS_DELTA objects" msgstr "usa objectes OFS_DELTA" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2651 msgid "use threads when searching for best delta matches" msgstr "usa fils en cercar les millores coincidències de delta" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2653 msgid "do not create an empty pack output" msgstr "no creïs una emissió de paquet buida" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2655 msgid "read revision arguments from standard input" msgstr "llegeix els parà metres de revisió des de l'entrada està ndard" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2657 msgid "limit the objects to those that are not yet packed" msgstr "limita els objectes als que encara no s'hagin empaquetat" -#: builtin/pack-objects.c:2662 +#: builtin/pack-objects.c:2660 msgid "include objects reachable from any reference" msgstr "inclou els objectes abastables de qualsevulla referència" -#: builtin/pack-objects.c:2665 +#: builtin/pack-objects.c:2663 msgid "include objects referred by reflog entries" msgstr "" "inclou els objectes als quals facin referència les entrades del registre de " "referències" -#: builtin/pack-objects.c:2668 +#: builtin/pack-objects.c:2666 msgid "include objects referred to by the index" msgstr "inclou els objectes als quals faci referència l'Ãndex" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2669 msgid "output pack to stdout" msgstr "emet el paquet a stdout" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2671 msgid "include tag objects that refer to objects to be packed" msgstr "" "inclou els objectes d'etiqueta que facin referència als objectes a empaquetar" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2673 msgid "keep unreachable objects" msgstr "retén els objectes inabastables" -#: builtin/pack-objects.c:2676 parse-options.h:140 +#: builtin/pack-objects.c:2674 parse-options.h:140 msgid "time" msgstr "hora" -#: builtin/pack-objects.c:2677 +#: builtin/pack-objects.c:2675 msgid "unpack unreachable objects newer than <time>" msgstr "desempaqueta els objectes inabastables més nous que <hora>" -#: builtin/pack-objects.c:2680 +#: builtin/pack-objects.c:2678 msgid "create thin packs" msgstr "crea paquets prims" -#: builtin/pack-objects.c:2682 +#: builtin/pack-objects.c:2680 msgid "create packs suitable for shallow fetches" msgstr "crea paquets adequats per als obteniments superficials" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2682 msgid "ignore packs that have companion .keep file" msgstr "ignora els paquets que tinguin un fitxer .keep corresponent" -#: builtin/pack-objects.c:2686 +#: builtin/pack-objects.c:2684 msgid "pack compression level" msgstr "nivell de compressió de paquet" -#: builtin/pack-objects.c:2688 +#: builtin/pack-objects.c:2686 msgid "do not hide commits by grafts" msgstr "no amaguis les comissions per empelt" -#: builtin/pack-objects.c:2690 +#: builtin/pack-objects.c:2688 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "usa un Ãndex de mapa de bits, si està disponible, per a accelerar el " "recompte d'objectes" -#: builtin/pack-objects.c:2692 +#: builtin/pack-objects.c:2690 msgid "write a bitmap index together with the pack index" msgstr "escriu un Ãndex de mapa de bits junt amb l'Ãndex de paquet" -#: builtin/pack-objects.c:2783 +#: builtin/pack-objects.c:2781 msgid "Counting objects" msgstr "Comptant els objectes" #: builtin/pack-refs.c:6 -msgid "git pack-refs [options]" -msgstr "git pack-refs [opcions]" +msgid "git pack-refs [<options>]" +msgstr "git pack-refs [<opcions>]" #: builtin/pack-refs.c:14 msgid "pack everything" @@ -8035,8 +8072,8 @@ msgid "prune loose refs (default)" msgstr "poda les referències soltes (per defecte)" #: builtin/prune-packed.c:7 -msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" -msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" +msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" +msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" #: builtin/prune-packed.c:40 msgid "Removing duplicate objects" @@ -8315,75 +8352,79 @@ msgstr "--mirror no es pot combinar amb especificacions de referència" msgid "--all and --mirror are incompatible" msgstr "--all i --mirror són incompatibles" -#: builtin/push.c:493 +#: builtin/push.c:502 msgid "repository" msgstr "dipòsit" -#: builtin/push.c:494 +#: builtin/push.c:503 msgid "push all refs" msgstr "envia totes les referències" -#: builtin/push.c:495 +#: builtin/push.c:504 msgid "mirror all refs" msgstr "reflecteix totes les referències" -#: builtin/push.c:497 +#: builtin/push.c:506 msgid "delete refs" msgstr "suprimeix les referències" -#: builtin/push.c:498 +#: builtin/push.c:507 msgid "push tags (can't be used with --all or --mirror)" msgstr "envia les etiquetes (no es pot usar amb --all o --mirror)" -#: builtin/push.c:501 +#: builtin/push.c:510 msgid "force updates" msgstr "força les actualitzacions" -#: builtin/push.c:503 +#: builtin/push.c:512 msgid "refname>:<expect" msgstr "nom-de-referència>:<esperat" -#: builtin/push.c:504 +#: builtin/push.c:513 msgid "require old value of ref to be at this value" msgstr "requereix que el valor antic de la referència sigui d'aquest valor" -#: builtin/push.c:507 +#: builtin/push.c:516 msgid "control recursive pushing of submodules" msgstr "controla la pujada recursiva dels submòduls" -#: builtin/push.c:509 +#: builtin/push.c:518 msgid "use thin pack" msgstr "usa el paquet prim" -#: builtin/push.c:510 builtin/push.c:511 +#: builtin/push.c:519 builtin/push.c:520 msgid "receive pack program" msgstr "programa que rep els paquets" -#: builtin/push.c:512 +#: builtin/push.c:521 msgid "set upstream for git pull/status" msgstr "estableix la font per a git pull/status" -#: builtin/push.c:515 +#: builtin/push.c:524 msgid "prune locally removed refs" msgstr "poda les referències eliminades localment" -#: builtin/push.c:517 +#: builtin/push.c:526 msgid "bypass pre-push hook" msgstr "evita el ganxo de prepujada" -#: builtin/push.c:518 +#: builtin/push.c:527 msgid "push missing but relevant tags" msgstr "puja les etiquetes absents però rellevants" -#: builtin/push.c:520 +#: builtin/push.c:529 msgid "GPG sign the push" msgstr "firma la pujada amb GPG" -#: builtin/push.c:529 +#: builtin/push.c:530 +msgid "request atomic transaction on remote side" +msgstr "demana una transacció atòmica al costat remot" + +#: builtin/push.c:539 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete és incompatible amb --all, --mirror i --tags" -#: builtin/push.c:531 +#: builtin/push.c:541 msgid "--delete doesn't make sense without any refs" msgstr "--delete no té sentit sense referències" @@ -8461,12 +8502,12 @@ msgstr "salta l'aplicació del filtre d'agafament escà s" msgid "debug unpack-trees" msgstr "depura unpack-trees" -#: builtin/reflog.c:499 +#: builtin/reflog.c:429 #, c-format msgid "%s' for '%s' is not a valid timestamp" msgstr "%s' per a '%s' no és una marca de temps và lida" -#: builtin/reflog.c:615 builtin/reflog.c:620 +#: builtin/reflog.c:546 builtin/reflog.c:551 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' no és una marca de temps và lida" @@ -8477,10 +8518,10 @@ msgstr "git remote [-v | --verbose]" #: builtin/remote.c:13 msgid "" -"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" +"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" -"git remote add [-t <branca>] [-m <mestra>] [-f] [--tags|--no-tags] [--" +"git remote add [-t <branca>] [-m <mestra>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <nom> <url>" #: builtin/remote.c:14 builtin/remote.c:33 @@ -8491,9 +8532,9 @@ msgstr "git remote rename <antic> <nou>" msgid "git remote remove <name>" msgstr "git remote remove <nom>" -#: builtin/remote.c:16 -msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" -msgstr "git remote set-head <nom> (-a | --auto | -d | --delete |<branca>)" +#: builtin/remote.c:16 builtin/remote.c:43 +msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" +msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branca>)" #: builtin/remote.c:17 msgid "git remote [-v | --verbose] show [-n] <name>" @@ -8529,10 +8570,6 @@ msgstr "git remote set-url --delete <nom> <url>" msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<opcions>] <nom> <url>" -#: builtin/remote.c:43 -msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" -msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branca>)" - #: builtin/remote.c:48 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <nom> <branca>..." @@ -8972,8 +9009,8 @@ msgid "be verbose; must be placed before a subcommand" msgstr "sigues detallat; s'ha de col·locar abans d'una subordre" #: builtin/repack.c:17 -msgid "git repack [options]" -msgstr "git repack [opcions]" +msgid "git repack [<options>]" +msgstr "git repack [<opcions>]" #: builtin/repack.c:159 msgid "pack everything in a single pack" @@ -9041,7 +9078,7 @@ msgstr "mida mà xima de cada fitxer de paquet" msgid "repack objects in packs marked with .keep" msgstr "reempaqueta els objectes en paquets marcats amb .keep" -#: builtin/repack.c:371 +#: builtin/repack.c:375 #, c-format msgid "removing '%s' failed" msgstr "la supressió de '%s' ha fallat" @@ -9133,8 +9170,8 @@ msgid "use this format" msgstr "usa aquest format" #: builtin/rerere.c:12 -msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" -msgstr "git rerere [clear | forget camÃ... | status | remaining | diff | gc]" +msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" +msgstr "git rerere [clear | forget <camÃ>... | status | remaining | diff | gc]" #: builtin/rerere.c:57 msgid "register clean resolutions in index" @@ -9274,8 +9311,8 @@ msgid "Could not write new index file." msgstr "No s'ha pogut escriure el fitxer d'Ãndex nou." #: builtin/rev-parse.c:361 -msgid "git rev-parse --parseopt [options] -- [<args>...]" -msgstr "git rev-parse --parseopt [opcions] -- [<parà metres>...]" +msgid "git rev-parse --parseopt [<options>] -- [<args>...]" +msgstr "git rev-parse --parseopt [<opcions>] -- [<parà metres>...]" #: builtin/rev-parse.c:366 msgid "keep the `--` passed as an arg" @@ -9291,30 +9328,30 @@ msgstr "emet en forma llarga enganxada" #: builtin/rev-parse.c:499 msgid "" -"git rev-parse --parseopt [options] -- [<args>...]\n" +"git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" -" or: git rev-parse [options] [<arg>...]\n" +" or: git rev-parse [<options>] [<arg>...]\n" "\n" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "" -"git rev-parse --parseopt [opcions] -- [<parà metres>...]\n" +"git rev-parse --parseopt [<opcions>] -- [<parà metres>...]\n" " or: git rev-parse --sq-quote [<parà metre>...]\n" -" or: git rev-parse [opcions] [<parà metre>...]\n" +" or: git rev-parse [<opcions>] [<parà metre>...]\n" "\n" "Executeu \"git rev-parse --parseopt -h\" per més informació sobre l'ús " "inicial." #: builtin/revert.c:22 -msgid "git revert [options] <commit-ish>..." -msgstr "git revert [opcions] <comissió>..." +msgid "git revert [<options>] <commit-ish>..." +msgstr "git revert [<opcions>] <comissió>..." #: builtin/revert.c:23 msgid "git revert <subcommand>" msgstr "git revert <subordre>" #: builtin/revert.c:28 -msgid "git cherry-pick [options] <commit-ish>..." -msgstr "git cherry-pick [opcions] <comissió>..." +msgid "git cherry-pick [<options>] <commit-ish>..." +msgstr "git cherry-pick [<opcions>] <comissió>..." #: builtin/revert.c:29 msgid "git cherry-pick <subcommand>" @@ -9394,8 +9431,8 @@ msgid "cherry-pick failed" msgstr "el recull de cireres ha fallat" #: builtin/rm.c:17 -msgid "git rm [options] [--] <file>..." -msgstr "git rm [opcions] [--] <fitxer>..." +msgid "git rm [<options>] [--] <file>..." +msgstr "git rm [<opcions>] [--] <fitxer>..." #: builtin/rm.c:65 msgid "" @@ -9498,8 +9535,8 @@ msgid "git rm: unable to remove %s" msgstr "git rm: no s'ha pogut eliminar %s" #: builtin/shortlog.c:13 -msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]" -msgstr "git shortlog [<opcions>] [<rang de revisions>] [[--] [<camÃ>...]]" +msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" +msgstr "git shortlog [<opcions>] [<rang-de-revisions>] [[--] [<camÃ>...]]" #: builtin/shortlog.c:131 #, c-format @@ -9529,19 +9566,19 @@ msgstr "Ajusta les lÃnies de la sortida" #: builtin/show-branch.c:9 msgid "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" -"\t\t [--current] [--color[=<when>] | --no-color] [--sparse]\n" -"\t\t [--more=<n> | --list | --independent | --merge-base]\n" -"\t [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" +"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" +"\t\t[--more=<n> | --list | --independent | --merge-base]\n" +"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" msgstr "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t [--current] [--color[=<quan>] | --no-color] [--sparse]\n" "\t\t [--more=<n> | --list | --independent | --merge-base]\n" "\t\t [--no-name | --sha1-name] [--topics] [(<revisió> | <glob>)...]" #: builtin/show-branch.c:13 -msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" -msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<referència>]" +msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" +msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<referència>]" #: builtin/show-branch.c:652 msgid "show remote-tracking and local branches" @@ -9609,11 +9646,11 @@ msgstr "mostra les <n> entrades més recents començant a la base" #: builtin/show-ref.c:10 msgid "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" msgstr "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [patró*] " +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<patró>...]" #: builtin/show-ref.c:11 msgid "git show-ref --exclude-existing[=pattern] < ref-list" @@ -9654,12 +9691,12 @@ msgid "show refs from stdin that aren't in local repository" msgstr "mostra les referències d'stdin que no siguin en el dipòsit local" #: builtin/symbolic-ref.c:7 -msgid "git symbolic-ref [options] name [ref]" -msgstr "git symbolic-ref [opcions] nom [referència]" +msgid "git symbolic-ref [<options>] <name> [<ref>]" +msgstr "git symbolic-ref [<opcions>] <nom> [<referència>]" #: builtin/symbolic-ref.c:8 -msgid "git symbolic-ref -d [-q] name" -msgstr "git symbolic-ref -d [-q] nom" +msgid "git symbolic-ref -d [-q] <name>" +msgstr "git symbolic-ref -d [-q] <nom>" #: builtin/symbolic-ref.c:40 msgid "suppress error message for non-symbolic (detached) refs" @@ -9683,9 +9720,10 @@ msgstr "raó de l'actualització" #: builtin/tag.c:22 msgid "" -"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " +"[<head>]" msgstr "" -"git tag [-a|-s|-u <id-de-clau>] [-f] [-m <missatge>|-F <fitxer>] <nom-" +"git tag [-a | -s | -u <id-de-clau>] [-f] [-m <missatge> | -F <fitxer>] <nom-" "d'etiqueta> [<cap>]" #: builtin/tag.c:23 @@ -9694,10 +9732,10 @@ msgstr "git tag -d <nom-d'etiqueta>..." #: builtin/tag.c:24 msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" "\t\t[<pattern>...]" msgstr "" -"git tag -l [-n[<nombre>]] [--contains <comissió>] \n" +"git tag -l [-n[<nombre>]] [--contains <comissió>]\n" "\t\t[--points-at <objecte>] [<patró>...]" #: builtin/tag.c:26 @@ -9841,18 +9879,18 @@ msgstr "usa una altra clau per a firmar l'etiqueta" msgid "replace the tag if exists" msgstr "reemplaça l'etiqueta si existeix" -#: builtin/tag.c:608 +#: builtin/tag.c:609 +msgid "Tag listing options" +msgstr "Opcions de llistat d'etiquetes" + +#: builtin/tag.c:610 msgid "show tag list in columns" msgstr "mostra la llista d'etiquetes en columnes" -#: builtin/tag.c:610 +#: builtin/tag.c:612 msgid "sort tags" msgstr "ordena les etiquetes" -#: builtin/tag.c:614 -msgid "Tag listing options" -msgstr "Opcions de llistat d'etiquetes" - #: builtin/tag.c:617 builtin/tag.c:623 msgid "print only tags that contain the commit" msgstr "imprimeix només les etiquetes que continguin la comissió" @@ -9909,138 +9947,138 @@ msgid "Unpacking objects" msgstr "Desempaquetant objectes" #: builtin/update-index.c:403 -msgid "git update-index [options] [--] [<file>...]" -msgstr "git update-index [opcions] [--] [<fitxer>...]" +msgid "git update-index [<options>] [--] [<file>...]" +msgstr "git update-index [<opcions>] [--] [<fitxer>...]" -#: builtin/update-index.c:756 +#: builtin/update-index.c:757 msgid "continue refresh even when index needs update" msgstr "" "continua l'actualització encara que l'Ãndex necessiti una actualització" -#: builtin/update-index.c:759 +#: builtin/update-index.c:760 msgid "refresh: ignore submodules" msgstr "actualitza: ignora els submòduls" -#: builtin/update-index.c:762 +#: builtin/update-index.c:763 msgid "do not ignore new files" msgstr "no ignoris els fitxers nous" -#: builtin/update-index.c:764 +#: builtin/update-index.c:765 msgid "let files replace directories and vice-versa" msgstr "deixa que els fitxers reemplacin els directoris i viceversa" -#: builtin/update-index.c:766 +#: builtin/update-index.c:767 msgid "notice files missing from worktree" msgstr "tingues en compte els fitxers absents de l'arbre de treball" -#: builtin/update-index.c:768 +#: builtin/update-index.c:769 msgid "refresh even if index contains unmerged entries" msgstr "actualitza encara que l'Ãndex contingui entrades no fusionades" -#: builtin/update-index.c:771 +#: builtin/update-index.c:772 msgid "refresh stat information" msgstr "actualitza la informació d'estadÃstiques" -#: builtin/update-index.c:775 +#: builtin/update-index.c:776 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "com --refresh, però ignora l'ajust assume-unchanged" -#: builtin/update-index.c:779 +#: builtin/update-index.c:780 msgid "<mode>,<object>,<path>" msgstr "<mode>,<objecte>,<camÃ>" -#: builtin/update-index.c:780 +#: builtin/update-index.c:781 msgid "add the specified entry to the index" msgstr "afegeix l'entrada especificada a l'Ãndex" -#: builtin/update-index.c:784 +#: builtin/update-index.c:785 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/update-index.c:785 +#: builtin/update-index.c:786 msgid "override the executable bit of the listed files" msgstr "passa per alt el bit executable dels fitxers llistats" -#: builtin/update-index.c:789 +#: builtin/update-index.c:790 msgid "mark files as \"not changing\"" msgstr "marca els fitxers com a \"not changing\"" -#: builtin/update-index.c:792 +#: builtin/update-index.c:793 msgid "clear assumed-unchanged bit" msgstr "neteja el bit assumed-unchanged" -#: builtin/update-index.c:795 +#: builtin/update-index.c:796 msgid "mark files as \"index-only\"" msgstr "marca els fitxers com a \"index-only\"" -#: builtin/update-index.c:798 +#: builtin/update-index.c:799 msgid "clear skip-worktree bit" msgstr "neteja el bit skip-worktree" -#: builtin/update-index.c:801 +#: builtin/update-index.c:802 msgid "add to index only; do not add content to object database" msgstr "" "només afegeix a l'Ãndex; no afegeixis el contingut a la base de dades " "d'objectes" -#: builtin/update-index.c:803 +#: builtin/update-index.c:804 msgid "remove named paths even if present in worktree" msgstr "" "elimina els camins anomenats encara que estiguin presents en l'arbre de " "treball" -#: builtin/update-index.c:805 +#: builtin/update-index.c:806 msgid "with --stdin: input lines are terminated by null bytes" msgstr "amb --stdin: les lÃnies d'entrada acaben amb octets nuls" -#: builtin/update-index.c:807 +#: builtin/update-index.c:808 msgid "read list of paths to be updated from standard input" msgstr "llegeix la llista de camins a actualitzar des de l'entrada està ndard" -#: builtin/update-index.c:811 +#: builtin/update-index.c:812 msgid "add entries from standard input to the index" msgstr "afegeix les entrades de l'entrada està ndard a l'Ãndex" -#: builtin/update-index.c:815 +#: builtin/update-index.c:816 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "reemplena les etapes #2 i #3 per als camins llistats" -#: builtin/update-index.c:819 +#: builtin/update-index.c:820 msgid "only update entries that differ from HEAD" msgstr "només actualitza les entrades que difereixin de HEAD" -#: builtin/update-index.c:823 +#: builtin/update-index.c:824 msgid "ignore files missing from worktree" msgstr "ignora els fitxers absents de l'arbre de treball" -#: builtin/update-index.c:826 +#: builtin/update-index.c:827 msgid "report actions to standard output" msgstr "informa de les accions en la sortida està ndard" -#: builtin/update-index.c:828 +#: builtin/update-index.c:829 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(per porcellanes) oblida't dels conflictes no resolts ni desats" -#: builtin/update-index.c:832 +#: builtin/update-index.c:833 msgid "write index in this format" msgstr "escriu l'Ãndex en aquest format" -#: builtin/update-index.c:834 +#: builtin/update-index.c:835 msgid "enable or disable split index" msgstr "habilita o inhabilita l'Ãndex dividit" #: builtin/update-ref.c:9 -msgid "git update-ref [options] -d <refname> [<oldval>]" -msgstr "git update-ref [opcions] -d <nom-de-referència> [<valor-antic>]" +msgid "git update-ref [<options>] -d <refname> [<old-val>]" +msgstr "git update-ref [<opcions>] -d <nom-de-referència> [<valor-antic>]" #: builtin/update-ref.c:10 -msgid "git update-ref [options] <refname> <newval> [<oldval>]" +msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" msgstr "" -"git update-ref [opcions] <nom-de-referència> <valor-nou> [<valor-antic>]" +"git update-ref [<opcions>] <nom-de-referència> <valor-nou> [<valor-antic>]" #: builtin/update-ref.c:11 -msgid "git update-ref [options] --stdin [-z]" -msgstr "git update-ref [opcions] --stdin [-z]" +msgid "git update-ref [<options>] --stdin [-z]" +msgstr "git update-ref [<opcions>] --stdin [-z]" #: builtin/update-ref.c:359 msgid "delete the reference" @@ -10067,16 +10105,16 @@ msgid "update the info files from scratch" msgstr "actualitza els fitxers d'informació des de zero" #: builtin/verify-commit.c:17 -msgid "git verify-commit [-v|--verbose] <commit>..." -msgstr "git verify-commit [-v|--verbose] <comissió>..." +msgid "git verify-commit [-v | --verbose] <commit>..." +msgstr "git verify-commit [-v | --verbose] <comissió>..." #: builtin/verify-commit.c:75 msgid "print commit contents" msgstr "imprimeix els continguts de la comissió" #: builtin/verify-pack.c:54 -msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." -msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <paquet>..." +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." +msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paquet>..." #: builtin/verify-pack.c:64 msgid "verbose" @@ -10087,8 +10125,8 @@ msgid "show statistics only" msgstr "mostra només estadÃstiques" #: builtin/verify-tag.c:17 -msgid "git verify-tag [-v|--verbose] <tag>..." -msgstr "git verify-tag [-v|--verbose] <etiqueta>..." +msgid "git verify-tag [-v | --verbose] <tag>..." +msgstr "git verify-tag [-v | --verbose] <etiqueta>..." #: builtin/verify-tag.c:73 msgid "print tag contents" @@ -10373,7 +10411,8 @@ msgstr "El cos de la comissió és:" #. input at this point. #: git-am.sh:807 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " -msgstr "Aplica? [y]es/[n]o/[e]dita/[v]isualitza el pedaç/[a]ccepta'ls tots " +msgstr "" +"Voleu aplicar-lo? [y]es/[n]o/[e]dita/[v]isualitza el pedaç/[a]ccepta'ls tots " #: git-am.sh:843 #, sh-format @@ -10448,7 +10487,7 @@ msgstr "HEAD dolent - Cal un HEAD" #: git-bisect.sh:130 #, sh-format msgid "" -"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." +"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." msgstr "" "L'agafament de '$start_head' ha fallat. Proveu 'git bisect reset <branca-" "và lida>'." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2015-01-21 14:21+0800\n" +"POT-Creation-Date: 2015-04-03 08:13+0800\n" "PO-Revision-Date: 2015-01-21 15:01+0800\n" "Last-Translator: Ralf Thielow <ralf.thielow@gmail.com>\n" "Language-Team: German <>\n" @@ -32,8 +32,8 @@ msgstr "" "und zu committen." #: archive.c:11 -msgid "git archive [options] <tree-ish> [<path>...]" -msgstr "git archive [Optionen] <Commit-Referenz> [<Pfad>...]" +msgid "git archive [<options>] <tree-ish> [<path>...]" +msgstr "git archive [<Optionen>] <Commit-Referenz> [<Pfad>...]" #: archive.c:12 msgid "git archive --list" @@ -41,10 +41,10 @@ msgstr "git archive --list" #: archive.c:13 msgid "" -"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" +"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" -"git archive --remote <Repository> [--exec <Programm>] [Optionen] <Commit-" -"Referenz> [Pfad...]" +"git archive --remote <Repository> [--exec <Programm>] [<Optionen>] <Commit-" +"Referenz> [<Pfad>...]" #: archive.c:14 msgid "git archive --remote <repo> [--exec <cmd>] --list" @@ -71,10 +71,10 @@ msgstr "Präfix" msgid "prepend prefix to each pathname in the archive" msgstr "einen Präfix vor jeden Pfadnamen in dem Archiv stellen" -#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2517 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986 +#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 +#: builtin/blame.c:2517 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:394 +#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 #: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151 msgid "file" msgstr "Datei" @@ -123,7 +123,7 @@ msgstr "Programm" msgid "path to the remote git-upload-archive command" msgstr "Pfad zum externen \"git-upload-archive\"-Programm" -#: attr.c:258 +#: attr.c:264 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -257,7 +257,7 @@ msgstr "'%s' sieht nicht wie eine v2 Paketdatei aus" msgid "unrecognized header: %s%s (%d)" msgstr "nicht erkannter Kopfbereich: %s%s (%d)" -#: bundle.c:87 builtin/commit.c:770 +#: bundle.c:87 builtin/commit.c:766 #, c-format msgid "could not open '%s'" msgstr "Konnte '%s' nicht öffnen" @@ -266,8 +266,8 @@ msgstr "Konnte '%s' nicht öffnen" msgid "Repository lacks these prerequisite commits:" msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:" -#: bundle.c:163 sequencer.c:645 sequencer.c:1100 builtin/blame.c:2706 -#: builtin/branch.c:652 builtin/commit.c:1049 builtin/log.c:330 +#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 +#: builtin/branch.c:659 builtin/commit.c:1045 builtin/log.c:330 #: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358 #: builtin/shortlog.c:158 msgid "revision walk setup failed" @@ -308,21 +308,21 @@ msgstr "\"rev-list\" abgebrochen" msgid "ref '%s' is excluded by the rev-list options" msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen" -#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "nicht erkanntes Argument: %s" -#: bundle.c:444 +#: bundle.c:443 msgid "Refusing to create empty bundle." msgstr "Erstellung eines leeren Pakets zurückgewiesen." -#: bundle.c:454 +#: bundle.c:453 #, c-format msgid "cannot create '%s'" msgstr "kann '%s' nicht erstellen" -#: bundle.c:475 +#: bundle.c:474 msgid "index-pack died" msgstr "Erstellung der Paketindexdatei abgebrochen" @@ -345,59 +345,59 @@ msgstr "%s %s ist kein Commit!" msgid "memory exhausted" msgstr "Speicher verbraucht" -#: config.c:469 config.c:471 +#: config.c:474 config.c:476 #, c-format msgid "bad config file line %d in %s" msgstr "Zeile %d in Konfigurationsdatei %s ist ungültig." -#: config.c:587 +#: config.c:592 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in %s: %s" -#: config.c:589 +#: config.c:594 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s': %s" -#: config.c:674 +#: config.c:679 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "Fehler beim Erweitern des Nutzerverzeichnisses in: '%s'" -#: config.c:752 config.c:763 +#: config.c:757 config.c:768 #, c-format msgid "bad zlib compression level %d" msgstr "ungültiger zlib Komprimierungsgrad %d" -#: config.c:885 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "Ungültiger Modus für Objekterstellung: %s" -#: config.c:1211 +#: config.c:1216 msgid "unable to parse command-line config" msgstr "" "Konnte die über die Kommandozeile angegebene Konfiguration nicht parsen." -#: config.c:1272 +#: config.c:1277 msgid "unknown error occured while reading the configuration files" msgstr "" "Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf." -#: config.c:1596 +#: config.c:1601 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" "Konnte Wert '%s' aus der über die Kommandozeile angegebenen\n" "Konfiguration nicht parsen." -#: config.c:1598 +#: config.c:1603 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "ungültige Konfigurationsvariable '%s' in Datei '%s' bei Zeile %d" -#: config.c:1657 +#: config.c:1662 #, c-format msgid "%s has multiple values" msgstr "%s hat mehrere Werte" @@ -489,7 +489,7 @@ msgstr[1] "vor %lu Jahren" msgid "failed to read orderfile '%s'" msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'." -#: diffcore-rename.c:516 +#: diffcore-rename.c:536 msgid "Performing inexact rename detection" msgstr "Führe Erkennung für ungenaue Umbenennung aus" @@ -518,16 +518,16 @@ msgstr "" "Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n" "%s" -#: diff.c:2957 +#: diff.c:2956 #, c-format msgid "external diff died, stopping at %s" msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s" -#: diff.c:3352 +#: diff.c:3351 msgid "--follow requires exactly one pathspec" msgstr "--follow erfordert genau eine Pfadspezifikation" -#: diff.c:3515 +#: diff.c:3514 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -536,7 +536,7 @@ msgstr "" "Fehler beim Parsen des --dirstat/-X Optionsparameters:\n" "%s" -#: diff.c:3529 +#: diff.c:3528 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'" @@ -616,7 +616,7 @@ msgstr "" #: help.c:373 #, c-format msgid "in %0.1f seconds automatically..." -msgstr "Automatische Ausführung in %0.1f Sekunden..." +msgstr "Automatische Ausführung in %0.1f Sekunden ..." #: help.c:380 #, c-format @@ -710,7 +710,7 @@ msgstr "Fehler beim Öffnen von '%s'" #: merge-recursive.c:797 #, c-format msgid "failed to symlink '%s'" -msgstr "Fehler beim Erstellen eines symbolischen Verweises für '%s'" +msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s'" #: merge-recursive.c:800 #, c-format @@ -891,27 +891,27 @@ msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen" msgid "Unprocessed path??? %s" msgstr "unverarbeiteter Pfad??? %s" -#: merge-recursive.c:1898 +#: merge-recursive.c:1901 msgid "Merging:" msgstr "Merge:" -#: merge-recursive.c:1911 +#: merge-recursive.c:1914 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "%u gemeinsamen Vorgänger-Commit gefunden" msgstr[1] "%u gemeinsame Vorgänger-Commits gefunden" -#: merge-recursive.c:1948 +#: merge-recursive.c:1951 msgid "merge returned no commit" msgstr "Merge hat keinen Commit zurückgegeben" -#: merge-recursive.c:2005 +#: merge-recursive.c:2008 #, c-format msgid "Could not parse object '%s'" msgstr "Konnte Objekt '%s' nicht parsen." -#: merge-recursive.c:2016 builtin/merge.c:667 +#: merge-recursive.c:2019 builtin/merge.c:667 msgid "Unable to write index." msgstr "Konnte Staging-Area nicht schreiben." @@ -1025,7 +1025,7 @@ msgstr "" #: pathspec.c:432 #, c-format msgid "pathspec '%s' is beyond a symbolic link" -msgstr "Pfadspezifikation '%s' ist hinter einem symbolischen Verweis" +msgstr "Pfadspezifikation '%s' ist hinter einer symbolischen Verknüpfung" #: pathspec.c:441 msgid "" @@ -1043,7 +1043,7 @@ msgstr "Konnte --pretty Format nicht parsen." msgid "done" msgstr "Fertig" -#: read-cache.c:1267 +#: read-cache.c:1275 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1052,7 +1052,7 @@ msgstr "" "index.version gesetzt, aber Wert ungültig.\n" "Verwende Version %i" -#: read-cache.c:1277 +#: read-cache.c:1285 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1141,24 +1141,33 @@ msgstr "" " (benutzen Sie \"git pull\", um Ihren Branch mit dem Remote-Branch " "zusammenzuführen)\n" -#: run-command.c:87 +#: revision.c:2348 +msgid "--first-parent is incompatible with --bisect" +msgstr "Die Optionen --first-parent und --bisect sind inkompatibel." + +#: run-command.c:83 msgid "open /dev/null failed" msgstr "Öffnen von /dev/null fehlgeschlagen" -#: run-command.c:89 +#: run-command.c:85 #, c-format msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) fehlgeschlagen" -#: send-pack.c:268 +#: send-pack.c:272 msgid "failed to sign the push certificate" msgstr "Fehler beim Signieren des \"push\"-Zertifikates" -#: send-pack.c:325 +#: send-pack.c:356 msgid "the receiving end does not support --signed push" msgstr "" "die Gegenseite unterstützt keinen signierten Versand (\"--signed push\")" +#: send-pack.c:366 +msgid "the receiving end does not support --atomic push" +msgstr "" +"die Gegenseite unterstützt keinen atomaren Versand (\"--atomic push\")" + #: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995 #: builtin/merge.c:1005 #, c-format @@ -1189,7 +1198,7 @@ msgstr "" "mit 'git add <Pfade>' oder 'git rm <Pfade>'und tragen Sie das Ergebnis mit\n" "'git commit' ein" -#: sequencer.c:211 sequencer.c:856 sequencer.c:939 +#: sequencer.c:211 sequencer.c:861 sequencer.c:944 #, c-format msgid "Could not write to %s" msgstr "Konnte nicht nach %s schreiben" @@ -1227,184 +1236,184 @@ msgstr "Konnte Commit von HEAD nicht auflösen\n" msgid "Unable to update cache tree\n" msgstr "Konnte Cache-Verzeichnis nicht aktualisieren\n" -#: sequencer.c:406 +#: sequencer.c:411 #, c-format msgid "Could not parse commit %s\n" msgstr "Konnte Commit %s nicht parsen\n" -#: sequencer.c:411 +#: sequencer.c:416 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Konnte Eltern-Commit %s nicht parsen\n" -#: sequencer.c:477 +#: sequencer.c:482 msgid "Your index file is unmerged." msgstr "Ihre Staging-Area-Datei ist nicht zusammengeführt." -#: sequencer.c:496 +#: sequencer.c:501 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "Commit %s ist ein Merge, aber die Option -m wurde nicht angegeben." -#: sequencer.c:504 +#: sequencer.c:509 #, c-format msgid "Commit %s does not have parent %d" msgstr "Commit %s hat keinen Elternteil %d" -#: sequencer.c:508 +#: sequencer.c:513 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "Hauptlinie wurde spezifiziert, aber Commit %s ist kein Merge." #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:521 +#: sequencer.c:526 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kann Eltern-Commit %s nicht parsen" -#: sequencer.c:525 +#: sequencer.c:530 #, c-format msgid "Cannot get commit message for %s" msgstr "Kann keine Commit-Beschreibung für %s bekommen" -#: sequencer.c:611 +#: sequencer.c:616 #, c-format msgid "could not revert %s... %s" -msgstr "Konnte \"revert\" nicht auf %s ausführen... %s" +msgstr "Konnte \"revert\" nicht auf %s... (%s) ausführen" -#: sequencer.c:612 +#: sequencer.c:617 #, c-format msgid "could not apply %s... %s" -msgstr "Konnte %s nicht anwenden... %s" +msgstr "Konnte %s... (%s) nicht anwenden" -#: sequencer.c:648 +#: sequencer.c:653 msgid "empty commit set passed" msgstr "leere Menge von Commits übergeben" -#: sequencer.c:656 +#: sequencer.c:661 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: Fehler beim Lesen der Staging-Area" -#: sequencer.c:660 +#: sequencer.c:665 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: Fehler beim Aktualisieren der Staging-Area" -#: sequencer.c:720 +#: sequencer.c:725 #, c-format msgid "Cannot %s during a %s" msgstr "Kann %s nicht während eines %s durchführen" -#: sequencer.c:742 +#: sequencer.c:747 #, c-format msgid "Could not parse line %d." msgstr "Konnte Zeile %d nicht parsen." -#: sequencer.c:747 +#: sequencer.c:752 msgid "No commits parsed." msgstr "Keine Commits geparst." -#: sequencer.c:760 +#: sequencer.c:765 #, c-format msgid "Could not open %s" msgstr "Konnte %s nicht öffnen" -#: sequencer.c:764 +#: sequencer.c:769 #, c-format msgid "Could not read %s." msgstr "Konnte %s nicht lesen." -#: sequencer.c:771 +#: sequencer.c:776 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Unbenutzbares Instruktionsblatt: %s" -#: sequencer.c:801 +#: sequencer.c:806 #, c-format msgid "Invalid key: %s" msgstr "Ungültiger Schlüssel: %s" -#: sequencer.c:804 +#: sequencer.c:809 #, c-format msgid "Invalid value for %s: %s" msgstr "Ungültiger Wert für %s: %s" -#: sequencer.c:816 +#: sequencer.c:821 #, c-format msgid "Malformed options sheet: %s" msgstr "Fehlerhaftes Optionsblatt: %s" -#: sequencer.c:837 +#: sequencer.c:842 msgid "a cherry-pick or revert is already in progress" msgstr "\"cherry-pick\" oder \"revert\" ist bereits im Gang" -#: sequencer.c:838 +#: sequencer.c:843 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "versuchen Sie \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:842 +#: sequencer.c:847 #, c-format msgid "Could not create sequencer directory %s" msgstr "Konnte \"sequencer\"-Verzeichnis %s nicht erstellen" -#: sequencer.c:858 sequencer.c:943 +#: sequencer.c:863 sequencer.c:948 #, c-format msgid "Error wrapping up %s." msgstr "Fehler beim Einpacken von %s." -#: sequencer.c:877 sequencer.c:1013 +#: sequencer.c:882 sequencer.c:1018 msgid "no cherry-pick or revert in progress" msgstr "kein \"cherry-pick\" oder \"revert\" im Gang" -#: sequencer.c:879 +#: sequencer.c:884 msgid "cannot resolve HEAD" msgstr "kann HEAD nicht auflösen" -#: sequencer.c:881 +#: sequencer.c:886 msgid "cannot abort from a branch yet to be born" msgstr "kann nicht abbrechen: bin auf einem Branch, der noch geboren wird" -#: sequencer.c:903 builtin/apply.c:4128 +#: sequencer.c:908 builtin/apply.c:4288 #, c-format msgid "cannot open %s: %s" msgstr "Kann %s nicht öffnen: %s" -#: sequencer.c:906 +#: sequencer.c:911 #, c-format msgid "cannot read %s: %s" msgstr "Kann %s nicht lesen: %s" -#: sequencer.c:907 +#: sequencer.c:912 msgid "unexpected end of file" msgstr "Unerwartetes Dateiende" -#: sequencer.c:913 +#: sequencer.c:918 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "gespeicherte \"pre-cherry-pick\" HEAD Datei '%s' ist beschädigt" -#: sequencer.c:936 +#: sequencer.c:941 #, c-format msgid "Could not format %s." msgstr "Konnte %s nicht formatieren." -#: sequencer.c:1081 +#: sequencer.c:1086 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden" -#: sequencer.c:1084 +#: sequencer.c:1089 #, c-format msgid "%s: bad revision" msgstr "%s: ungültiger Commit" -#: sequencer.c:1118 +#: sequencer.c:1123 msgid "Can't revert as initial commit" msgstr "Kann nicht als allerersten Commit einen Revert ausführen." -#: sequencer.c:1119 +#: sequencer.c:1124 msgid "Can't cherry-pick into empty head" msgstr "Kann nicht als allerersten Commit einen Cherry-Pick ausführen." @@ -1477,38 +1486,38 @@ msgstr "Konnte Eintrag '%s' nicht aus .gitmodules entfernen" msgid "staging updated .gitmodules failed" msgstr "Konnte aktualisierte .gitmodules-Datei nicht zum Commit vormerken" -#: submodule.c:1111 builtin/init-db.c:371 +#: submodule.c:1109 builtin/init-db.c:371 #, c-format msgid "Could not create git link %s" msgstr "Konnte git-Verweis %s nicht erstellen" -#: submodule.c:1122 +#: submodule.c:1120 #, c-format msgid "Could not set core.worktree in %s" msgstr "Konnte core.worktree in '%s' nicht setzen." -#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566 -#: trailer.c:570 +#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557 +#: trailer.c:561 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "unbekannter Wert '%s' für Schlüssel %s" -#: trailer.c:552 trailer.c:557 builtin/remote.c:290 +#: trailer.c:543 trailer.c:548 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "mehr als ein %s" -#: trailer.c:590 +#: trailer.c:581 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "leerer Anhang-Token in Anhang '%.*s'" -#: trailer.c:710 +#: trailer.c:701 #, c-format msgid "could not read input file '%s'" msgstr "Konnte Eingabe-Datei '%s' nicht lesen" -#: trailer.c:713 +#: trailer.c:704 msgid "could not read from stdin" msgstr "konnte nicht von der Standard-Eingabe lesen" @@ -1545,26 +1554,26 @@ msgstr "ungültige Portnummer" msgid "invalid '..' path segment" msgstr "ungültiges '..' Pfadsegment" -#: wrapper.c:509 +#: wrapper.c:523 #, c-format msgid "unable to access '%s': %s" msgstr "konnte nicht auf '%s' zugreifen: %s" -#: wrapper.c:530 +#: wrapper.c:544 #, c-format msgid "unable to access '%s'" msgstr "konnte nicht auf '%s' zugreifen" -#: wrapper.c:541 +#: wrapper.c:555 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "konnte aktuellen Benutzer nicht in Passwort-Datei finden: %s" -#: wrapper.c:542 +#: wrapper.c:556 msgid "no such user" msgstr "kein solcher Benutzer" -#: wrapper.c:550 +#: wrapper.c:564 msgid "unable to get current working directory" msgstr "Konnte aktuelles Arbeitsverzeichnis nicht bekommen." @@ -1601,11 +1610,11 @@ msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" " (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)" -#: wt-status.c:198 +#: wt-status.c:198 wt-status.c:878 msgid "Changes to be committed:" msgstr "zum Commit vorgemerkte Änderungen:" -#: wt-status.c:216 +#: wt-status.c:216 wt-status.c:887 msgid "Changes not staged for commit:" msgstr "Änderungen, die nicht zum Commit vorgemerkt sind:" @@ -1723,15 +1732,15 @@ msgstr "unversionierter Inhalt, " msgid "bug: unhandled diff status %c" msgstr "Fehler: unbehandelter Differenz-Status %c" -#: wt-status.c:758 +#: wt-status.c:753 msgid "Submodules changed but not updated:" msgstr "Submodule geändert, aber nicht aktualisiert:" -#: wt-status.c:760 +#: wt-status.c:755 msgid "Submodule changes to be committed:" msgstr "Änderungen in Submodul zum Committen:" -#: wt-status.c:839 +#: wt-status.c:835 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1739,75 +1748,75 @@ msgstr "" "Ändern Sie nicht die obige Zeile.\n" "Alles unterhalb von ihr wird entfernt." -#: wt-status.c:930 +#: wt-status.c:946 msgid "You have unmerged paths." msgstr "Sie haben nicht zusammengeführte Pfade." -#: wt-status.c:933 +#: wt-status.c:949 msgid " (fix conflicts and run \"git commit\")" msgstr " (beheben Sie die Konflikte und führen Sie \"git commit\" aus)" -#: wt-status.c:936 +#: wt-status.c:952 msgid "All conflicts fixed but you are still merging." msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge." -#: wt-status.c:939 +#: wt-status.c:955 msgid " (use \"git commit\" to conclude merge)" msgstr " (benutzen Sie \"git commit\", um den Merge abzuschließen)" -#: wt-status.c:949 +#: wt-status.c:965 msgid "You are in the middle of an am session." msgstr "Eine \"am\"-Sitzung ist im Gange." -#: wt-status.c:952 +#: wt-status.c:968 msgid "The current patch is empty." msgstr "Der aktuelle Patch ist leer." -#: wt-status.c:956 +#: wt-status.c:972 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" " (beheben Sie die Konflikte und führen Sie dann \"git am --continue\" aus)" -#: wt-status.c:958 +#: wt-status.c:974 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (benutzen Sie \"git am --skip\", um diesen Patch auszulassen)" -#: wt-status.c:960 +#: wt-status.c:976 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" " (benutzen Sie \"git am --abort\", um den ursprünglichen Branch " "wiederherzustellen)" -#: wt-status.c:1020 wt-status.c:1037 +#: wt-status.c:1036 wt-status.c:1053 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Sie sind gerade beim Rebase von Branch '%s' auf '%s'." -#: wt-status.c:1025 wt-status.c:1042 +#: wt-status.c:1041 wt-status.c:1058 msgid "You are currently rebasing." msgstr "Sie sind gerade beim Rebase." -#: wt-status.c:1028 +#: wt-status.c:1044 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" " (beheben Sie die Konflikte und führen Sie dann \"git rebase --continue\" " "aus)" -#: wt-status.c:1030 +#: wt-status.c:1046 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (benutzen Sie \"git rebase --skip\", um diesen Patch auszulassen)" -#: wt-status.c:1032 +#: wt-status.c:1048 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" " (benutzen Sie \"git rebase --abort\", um den ursprünglichen Branch " "auszuchecken)" -#: wt-status.c:1045 +#: wt-status.c:1061 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alle Konflikte behoben: führen Sie \"git rebase --continue\" aus)" -#: wt-status.c:1049 +#: wt-status.c:1065 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -1815,130 +1824,130 @@ msgstr "" "Sie teilen gerade einen Commit auf, während ein Rebase von Branch '%s' auf " "'%s' im Gange ist." -#: wt-status.c:1054 +#: wt-status.c:1070 msgid "You are currently splitting a commit during a rebase." msgstr "Sie teilen gerade einen Commit während eines Rebase auf." -#: wt-status.c:1057 +#: wt-status.c:1073 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Sobald Ihr Arbeitsverzeichnis unverändert ist, führen Sie \"git rebase --" "continue\" aus)" -#: wt-status.c:1061 +#: wt-status.c:1077 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Sie editieren gerade einen Commit während eines Rebase von Branch '%s' auf " "'%s'." -#: wt-status.c:1066 +#: wt-status.c:1082 msgid "You are currently editing a commit during a rebase." msgstr "Sie editieren gerade einen Commit während eines Rebase." -#: wt-status.c:1069 +#: wt-status.c:1085 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (benutzen Sie \"git commit --amend\", um den aktuellen Commit " "nachzubessern)" -#: wt-status.c:1071 +#: wt-status.c:1087 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (benutzen Sie \"git rebase --continue\" sobald Ihre Änderungen " "abgeschlossen sind)" -#: wt-status.c:1081 +#: wt-status.c:1097 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Sie führen gerade \"cherry-pick\" von Commit %s aus." -#: wt-status.c:1086 +#: wt-status.c:1102 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" " (beheben Sie die Konflikte und führen Sie dann \"git cherry-pick --continue" "\" aus)" -#: wt-status.c:1089 +#: wt-status.c:1105 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (alle Konflikte behoben: führen Sie \"git cherry-pick --continue\" aus)" -#: wt-status.c:1091 +#: wt-status.c:1107 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (benutzen Sie \"git cherry-pick --abort\", um die Cherry-Pick-Operation " "abzubrechen)" -#: wt-status.c:1100 +#: wt-status.c:1116 #, c-format msgid "You are currently reverting commit %s." msgstr "Sie sind gerade an einem Revert von Commit '%s'." -#: wt-status.c:1105 +#: wt-status.c:1121 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" " (beheben Sie die Konflikte und führen Sie dann \"git revert --continue\" " "aus)" -#: wt-status.c:1108 +#: wt-status.c:1124 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alle Konflikte behoben: führen Sie \"git revert --continue\" aus)" -#: wt-status.c:1110 +#: wt-status.c:1126 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (benutzen Sie \"git revert --abort\", um die Revert-Operation abzubrechen)" -#: wt-status.c:1121 +#: wt-status.c:1137 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Sie sind gerade bei einer binären Suche, gestartet von Branch '%s'." -#: wt-status.c:1125 +#: wt-status.c:1141 msgid "You are currently bisecting." msgstr "Sie sind gerade bei einer binären Suche." -#: wt-status.c:1128 +#: wt-status.c:1144 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (benutzen Sie \"git bisect reset\", um zum ursprünglichen Branch " "zurückzukehren)" -#: wt-status.c:1303 +#: wt-status.c:1321 msgid "On branch " msgstr "Auf Branch " -#: wt-status.c:1310 +#: wt-status.c:1328 msgid "rebase in progress; onto " msgstr "Rebase im Gange; auf " -#: wt-status.c:1317 +#: wt-status.c:1333 msgid "HEAD detached at " msgstr "HEAD losgelöst bei " -#: wt-status.c:1319 +#: wt-status.c:1335 msgid "HEAD detached from " msgstr "HEAD losgelöst von " -#: wt-status.c:1322 +#: wt-status.c:1338 msgid "Not currently on any branch." msgstr "Im Moment auf keinem Branch." -#: wt-status.c:1339 +#: wt-status.c:1355 msgid "Initial commit" msgstr "Initialer Commit" -#: wt-status.c:1353 +#: wt-status.c:1369 msgid "Untracked files" msgstr "Unversionierte Dateien" -#: wt-status.c:1355 +#: wt-status.c:1371 msgid "Ignored files" msgstr "Ignorierte Dateien" -#: wt-status.c:1359 +#: wt-status.c:1375 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1949,32 +1958,32 @@ msgstr "" "'status -uno' könnte das beschleunigen, aber Sie müssen darauf achten,\n" "neue Dateien selbstständig hinzuzufügen (siehe 'git help status')." -#: wt-status.c:1365 +#: wt-status.c:1381 #, c-format msgid "Untracked files not listed%s" msgstr "Unversionierte Dateien nicht aufgelistet%s" -#: wt-status.c:1367 +#: wt-status.c:1383 msgid " (use -u option to show untracked files)" msgstr " (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)" -#: wt-status.c:1373 +#: wt-status.c:1389 msgid "No changes" msgstr "Keine Änderungen" -#: wt-status.c:1378 +#: wt-status.c:1394 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "keine Änderungen zum Commit vorgemerkt (benutzen Sie \"git add\" und/oder " "\"git commit -a\")\n" -#: wt-status.c:1381 +#: wt-status.c:1397 #, c-format msgid "no changes added to commit\n" msgstr "keine Änderungen zum Commit vorgemerkt\n" -#: wt-status.c:1384 +#: wt-status.c:1400 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -1983,48 +1992,48 @@ msgstr "" "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien (benutzen " "Sie \"git add\" zum Versionieren)\n" -#: wt-status.c:1387 +#: wt-status.c:1403 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n" -#: wt-status.c:1390 +#: wt-status.c:1406 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "nichts zu committen (Erstellen/Kopieren Sie Dateien und benutzen Sie \"git " "add\" zum Versionieren)\n" -#: wt-status.c:1393 wt-status.c:1398 +#: wt-status.c:1409 wt-status.c:1414 #, c-format msgid "nothing to commit\n" msgstr "nichts zu committen\n" -#: wt-status.c:1396 +#: wt-status.c:1412 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "nichts zu committen (benutzen Sie die Option -u, um unversionierte Dateien " "anzuzeigen)\n" -#: wt-status.c:1400 +#: wt-status.c:1416 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n" -#: wt-status.c:1509 +#: wt-status.c:1525 msgid "HEAD (no branch)" msgstr "HEAD (kein Branch)" -#: wt-status.c:1515 +#: wt-status.c:1531 msgid "Initial commit on " msgstr "Initialer Commit auf " -#: wt-status.c:1547 +#: wt-status.c:1563 msgid "gone" msgstr "entfernt" -#: wt-status.c:1549 wt-status.c:1557 +#: wt-status.c:1565 wt-status.c:1573 msgid "behind " msgstr "hinterher " @@ -2034,15 +2043,15 @@ msgid "failed to unlink '%s'" msgstr "Konnte '%s' nicht entfernen." #: builtin/add.c:22 -msgid "git add [options] [--] <pathspec>..." -msgstr "git add [Optionen] [--] [<Pfadspezifikation>...]" +msgid "git add [<options>] [--] <pathspec>..." +msgstr "git add [<Optionen>] [--] <Pfadspezifikation>..." #: builtin/add.c:65 #, c-format msgid "unexpected diff status %c" msgstr "unerwarteter Differenz-Status %c" -#: builtin/add.c:70 builtin/commit.c:275 +#: builtin/add.c:70 builtin/commit.c:277 msgid "updating files failed" msgstr "Aktualisierung der Dateien fehlgeschlagen" @@ -2089,14 +2098,14 @@ msgstr "" "Die folgenden Pfade werden durch eine Ihrer \".gitignore\" Dateien " "ignoriert:\n" -#: 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:1372 +#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372 #: builtin/rm.c:269 msgid "dry run" msgstr "Probelauf" -#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19 -#: builtin/commit.c:1326 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19 +#: builtin/commit.c:1322 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 "erweiterte Ausgaben" @@ -2176,79 +2185,79 @@ msgstr "Nichts spezifiziert, nichts hinzugefügt.\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Wollten Sie vielleicht 'git add .' sagen?\n" -#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919 -#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 +#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920 +#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 msgid "index file corrupt" msgstr "Staging-Area-Datei beschädigt" -#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431 +#: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431 msgid "Unable to write new index file" msgstr "Konnte neue Staging-Area-Datei nicht schreiben." -#: builtin/apply.c:58 -msgid "git apply [options] [<patch>...]" -msgstr "git apply [Optionen] [<Patch>...]" +#: builtin/apply.c:59 +msgid "git apply [<options>] [<patch>...]" +msgstr "git apply [<Optionen>] [<Patch>...]" -#: builtin/apply.c:111 +#: builtin/apply.c:112 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "nicht erkannte Whitespace-Option: '%s'" -#: builtin/apply.c:126 +#: builtin/apply.c:127 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "nicht erkannte Option zum Ignorieren von Whitespace: '%s'" -#: builtin/apply.c:826 +#: builtin/apply.c:822 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Kann regulären Ausdruck für Zeitstempel %s nicht verarbeiten" -#: builtin/apply.c:835 +#: builtin/apply.c:831 #, c-format msgid "regexec returned %d for input: %s" msgstr "Ausführung des regulären Ausdrucks gab %d zurück. Eingabe: %s" -#: builtin/apply.c:916 +#: builtin/apply.c:912 #, c-format msgid "unable to find filename in patch at line %d" msgstr "Konnte keinen Dateinamen in Zeile %d des Patches finden." -#: builtin/apply.c:948 +#: builtin/apply.c:944 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply: ungültiges 'git-diff' - erwartete /dev/null, erhielt %s in Zeile " "%d" -#: builtin/apply.c:952 +#: builtin/apply.c:948 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply: ungültiges 'git-diff' - Inkonsistenter neuer Dateiname in Zeile %d" -#: builtin/apply.c:953 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply: ungültiges 'git-diff' - Inkonsistenter alter Dateiname in Zeile %d" -#: builtin/apply.c:960 +#: builtin/apply.c:956 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: ungültiges 'git-diff' - erwartete /dev/null in Zeile %d" -#: builtin/apply.c:1423 +#: builtin/apply.c:1419 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: unerwartete Zeile: %.*s" -#: builtin/apply.c:1480 +#: builtin/apply.c:1476 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s" -#: builtin/apply.c:1497 +#: builtin/apply.c:1493 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2263,65 +2272,65 @@ msgstr[1] "" "Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn " "%d vorangestellte Teile des Pfades entfernt werden (Zeile %d)" -#: builtin/apply.c:1657 +#: builtin/apply.c:1656 msgid "new file depends on old contents" msgstr "neue Datei hängt von alten Inhalten ab" -#: builtin/apply.c:1659 +#: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "entfernte Datei hat noch Inhalte" -#: builtin/apply.c:1685 +#: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" msgstr "fehlerhafter Patch bei Zeile %d" -#: builtin/apply.c:1721 +#: builtin/apply.c:1720 #, c-format msgid "new file %s depends on old contents" msgstr "neue Datei %s hängt von alten Inhalten ab" -#: builtin/apply.c:1723 +#: builtin/apply.c:1722 #, c-format msgid "deleted file %s still has contents" msgstr "entfernte Datei %s hat noch Inhalte" -#: builtin/apply.c:1726 +#: builtin/apply.c:1725 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt." -#: builtin/apply.c:1872 +#: builtin/apply.c:1871 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "fehlerhafter Binär-Patch bei Zeile %d: %.*s" -#: builtin/apply.c:1901 +#: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" msgstr "nicht erkannter Binär-Patch bei Zeile %d" -#: builtin/apply.c:2052 +#: builtin/apply.c:2051 #, c-format msgid "patch with only garbage at line %d" msgstr "Patch mit nutzlosen Informationen bei Zeile %d" -#: builtin/apply.c:2142 +#: builtin/apply.c:2141 #, c-format msgid "unable to read symlink %s" -msgstr "konnte symbolischen Verweis %s nicht lesen" +msgstr "konnte symbolische Verknüpfung %s nicht lesen" -#: builtin/apply.c:2146 +#: builtin/apply.c:2145 #, c-format msgid "unable to open or read %s" msgstr "konnte %s nicht öffnen oder lesen" -#: builtin/apply.c:2754 +#: builtin/apply.c:2778 #, c-format msgid "invalid start of line: '%c'" msgstr "Ungültiger Zeilenanfang: '%c'" -#: builtin/apply.c:2872 +#: builtin/apply.c:2897 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." @@ -2329,12 +2338,12 @@ msgstr[0] "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeile versetzt)" msgstr[1] "" "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeilen versetzt)" -#: builtin/apply.c:2884 +#: builtin/apply.c:2909 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Kontext reduziert zu (%ld/%ld), um Patch-Bereich bei %d anzuwenden" -#: builtin/apply.c:2890 +#: builtin/apply.c:2915 #, c-format msgid "" "while searching for:\n" @@ -2343,335 +2352,355 @@ msgstr "" "bei der Suche nach:\n" "%.*s" -#: builtin/apply.c:2909 +#: builtin/apply.c:2935 #, c-format msgid "missing binary patch data for '%s'" msgstr "keine Daten in Binär-Patch für '%s'" -#: builtin/apply.c:3010 +#: builtin/apply.c:3036 #, c-format msgid "binary patch does not apply to '%s'" msgstr "Konnte Binär-Patch nicht auf '%s' anwenden" -#: builtin/apply.c:3016 +#: builtin/apply.c:3042 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "Binär-Patch für '%s' erzeugt falsches Ergebnis (erwartete %s, bekam %s)" -#: builtin/apply.c:3037 +#: builtin/apply.c:3063 #, c-format msgid "patch failed: %s:%ld" msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld" -#: builtin/apply.c:3161 +#: builtin/apply.c:3187 #, c-format msgid "cannot checkout %s" msgstr "kann %s nicht auschecken" -#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260 +#: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288 #, c-format msgid "read of %s failed" msgstr "Konnte %s nicht lesen" -#: builtin/apply.c:3240 builtin/apply.c:3462 +#: builtin/apply.c:3240 +#, c-format +msgid "reading from '%s' beyond a symbolic link" +msgstr "'%s' ist hinter einer symbolischen Verknüpfung" + +#: builtin/apply.c:3268 builtin/apply.c:3490 #, c-format msgid "path %s has been renamed/deleted" msgstr "Pfad %s wurde umbenannt/gelöscht" -#: builtin/apply.c:3321 builtin/apply.c:3476 +#: builtin/apply.c:3349 builtin/apply.c:3504 #, c-format msgid "%s: does not exist in index" msgstr "%s ist nicht in der Staging-Area" -#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490 +#: builtin/apply.c:3353 builtin/apply.c:3496 builtin/apply.c:3518 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3330 builtin/apply.c:3484 +#: builtin/apply.c:3358 builtin/apply.c:3512 #, c-format msgid "%s: does not match index" msgstr "%s entspricht nicht der Version in der Staging-Area" -#: builtin/apply.c:3432 +#: builtin/apply.c:3460 msgid "removal patch leaves file contents" msgstr "Lösch-Patch hinterlässt Dateiinhalte" -#: builtin/apply.c:3501 +#: builtin/apply.c:3529 #, c-format msgid "%s: wrong type" msgstr "%s: falscher Typ" -#: builtin/apply.c:3503 +#: builtin/apply.c:3531 #, c-format msgid "%s has type %o, expected %o" msgstr "%s ist vom Typ %o, erwartete %o" -#: builtin/apply.c:3604 +#: builtin/apply.c:3690 builtin/apply.c:3692 +#, c-format +msgid "invalid path '%s'" +msgstr "Ungültiger Pfad '%s'" + +#: builtin/apply.c:3747 #, c-format msgid "%s: already exists in index" msgstr "%s ist bereits bereitgestellt" -#: builtin/apply.c:3607 +#: builtin/apply.c:3750 #, c-format msgid "%s: already exists in working directory" msgstr "%s existiert bereits im Arbeitsverzeichnis" -#: builtin/apply.c:3627 +#: builtin/apply.c:3770 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o)" -#: builtin/apply.c:3632 +#: builtin/apply.c:3775 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o) von %s" -#: builtin/apply.c:3640 +#: builtin/apply.c:3795 +#, c-format +msgid "affected file '%s' is beyond a symbolic link" +msgstr "betroffene Datei '%s' ist hinter einer symbolischen Verknüpfung" + +#: builtin/apply.c:3799 #, c-format msgid "%s: patch does not apply" msgstr "%s: Patch konnte nicht angewendet werden" -#: builtin/apply.c:3653 +#: builtin/apply.c:3813 #, c-format msgid "Checking patch %s..." -msgstr "Prüfe Patch %s..." +msgstr "Prüfe Patch %s ..." -#: builtin/apply.c:3746 builtin/checkout.c:231 builtin/reset.c:135 +#: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen" -#: builtin/apply.c:3889 +#: builtin/apply.c:4049 #, c-format msgid "unable to remove %s from index" msgstr "konnte %s nicht aus der Staging-Area entfernen" -#: builtin/apply.c:3918 +#: builtin/apply.c:4078 #, c-format msgid "corrupt patch for submodule %s" msgstr "fehlerhafter Patch für Submodul %s" -#: builtin/apply.c:3922 +#: builtin/apply.c:4082 #, c-format msgid "unable to stat newly created file '%s'" msgstr "konnte neu erstellte Datei '%s' nicht lesen" -#: builtin/apply.c:3927 +#: builtin/apply.c:4087 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "kann internen Speicher für eben erstellte Datei %s nicht erzeugen" -#: builtin/apply.c:3930 builtin/apply.c:4038 +#: builtin/apply.c:4090 builtin/apply.c:4198 #, c-format msgid "unable to add cache entry for %s" msgstr "kann für %s keinen Eintrag in den Zwischenspeicher hinzufügen" -#: builtin/apply.c:3963 +#: builtin/apply.c:4123 #, c-format msgid "closing file '%s'" msgstr "schließe Datei '%s'" -#: builtin/apply.c:4012 +#: builtin/apply.c:4172 #, c-format msgid "unable to write file '%s' mode %o" msgstr "konnte Datei '%s' mit Modus %o nicht schreiben" -#: builtin/apply.c:4099 +#: builtin/apply.c:4259 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s sauber angewendet" -#: builtin/apply.c:4107 +#: builtin/apply.c:4267 msgid "internal error" msgstr "interner Fehler" -#: builtin/apply.c:4110 +#: builtin/apply.c:4270 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Wende Patch %%s mit %d Zurückweisung an..." msgstr[1] "Wende Patch %%s mit %d Zurückweisungen an..." -#: builtin/apply.c:4120 +#: builtin/apply.c:4280 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "Verkürze Name von .rej Datei zu %.*s.rej" -#: builtin/apply.c:4141 +#: builtin/apply.c:4301 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Patch-Bereich #%d sauber angewendet." -#: builtin/apply.c:4144 +#: builtin/apply.c:4304 #, c-format msgid "Rejected hunk #%d." msgstr "Patch-Block #%d zurückgewiesen." -#: builtin/apply.c:4234 +#: builtin/apply.c:4394 msgid "unrecognized input" msgstr "nicht erkannte Eingabe" -#: builtin/apply.c:4245 +#: builtin/apply.c:4405 msgid "unable to read index file" msgstr "Konnte Staging-Area-Datei nicht lesen" -#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:92 -#: builtin/fetch.c:93 +#: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92 +#: builtin/fetch.c:92 msgid "path" msgstr "Pfad" -#: builtin/apply.c:4363 +#: builtin/apply.c:4523 msgid "don't apply changes matching the given path" msgstr "keine Änderungen im angegebenen Pfad anwenden" -#: builtin/apply.c:4366 +#: builtin/apply.c:4526 msgid "apply changes matching the given path" msgstr "Änderungen nur im angegebenen Pfad anwenden" -#: builtin/apply.c:4368 +#: builtin/apply.c:4528 msgid "num" msgstr "Anzahl" -#: builtin/apply.c:4369 +#: builtin/apply.c:4529 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" "<Anzahl> vorangestellte Schrägstriche von herkömmlichen Differenzpfaden " "entfernen" -#: builtin/apply.c:4372 +#: builtin/apply.c:4532 msgid "ignore additions made by the patch" msgstr "hinzugefügte Zeilen des Patches ignorieren" -#: builtin/apply.c:4374 +#: builtin/apply.c:4534 msgid "instead of applying the patch, output diffstat for the input" msgstr "" "anstatt der Anwendung des Patches, den \"diffstat\" für die Eingabe " "ausgegeben" -#: builtin/apply.c:4378 +#: builtin/apply.c:4538 msgid "show number of added and deleted lines in decimal notation" msgstr "" "die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation anzeigen" -#: builtin/apply.c:4380 +#: builtin/apply.c:4540 msgid "instead of applying the patch, output a summary for the input" msgstr "" "anstatt der Anwendung des Patches, eine Zusammenfassung für die Eingabe " "ausgeben" -#: builtin/apply.c:4382 +#: builtin/apply.c:4542 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" "anstatt der Anwendung des Patches, zeige ob Patch angewendet werden kann" -#: builtin/apply.c:4384 +#: builtin/apply.c:4544 msgid "make sure the patch is applicable to the current index" msgstr "" "sicherstellen, dass der Patch in der aktuellen Staging-Area angewendet " "werden kann" -#: builtin/apply.c:4386 +#: builtin/apply.c:4546 msgid "apply a patch without touching the working tree" msgstr "Patch anwenden, ohne Änderungen im Arbeitsverzeichnis vorzunehmen" -#: builtin/apply.c:4388 +#: builtin/apply.c:4548 +msgid "accept a patch that touches outside the working area" +msgstr "" +"Patch anwenden, der Änderungen außerhalb des Arbeitsverzeichnisses vornimmt" + +#: builtin/apply.c:4550 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)" -#: builtin/apply.c:4390 +#: builtin/apply.c:4552 msgid "attempt three-way merge if a patch does not apply" msgstr "versuche 3-Wege-Merge, wenn der Patch nicht angewendet werden konnte" -#: builtin/apply.c:4392 +#: builtin/apply.c:4554 msgid "build a temporary index based on embedded index information" msgstr "" "eine temporäre Staging-Area, basierend auf den integrierten Staging-Area-" "Informationen, erstellen" -#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455 +#: builtin/apply.c:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412 msgid "paths are separated with NUL character" msgstr "Pfade sind getrennt durch NUL Zeichen" -#: builtin/apply.c:4397 +#: builtin/apply.c:4559 msgid "ensure at least <n> lines of context match" msgstr "" "sicher stellen, dass mindestens <n> Zeilen des Kontextes übereinstimmen" -#: builtin/apply.c:4398 +#: builtin/apply.c:4560 msgid "action" msgstr "Aktion" -#: builtin/apply.c:4399 +#: builtin/apply.c:4561 msgid "detect new or modified lines that have whitespace errors" msgstr "neue oder geänderte Zeilen, die Whitespace-Fehler haben, ermitteln" -#: builtin/apply.c:4402 builtin/apply.c:4405 +#: builtin/apply.c:4564 builtin/apply.c:4567 msgid "ignore changes in whitespace when finding context" msgstr "Änderungen im Whitespace bei der Suche des Kontextes ignorieren" -#: builtin/apply.c:4408 +#: builtin/apply.c:4570 msgid "apply the patch in reverse" msgstr "den Patch in umgekehrter Reihenfolge anwenden" -#: builtin/apply.c:4410 +#: builtin/apply.c:4572 msgid "don't expect at least one line of context" msgstr "keinen Kontext erwarten" -#: builtin/apply.c:4412 +#: builtin/apply.c:4574 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" "zurückgewiesene Patch-Blöcke in entsprechenden *.rej Dateien hinterlassen" -#: builtin/apply.c:4414 +#: builtin/apply.c:4576 msgid "allow overlapping hunks" msgstr "sich überlappende Patch-Blöcke erlauben" -#: builtin/apply.c:4417 +#: builtin/apply.c:4579 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende tolerieren" -#: builtin/apply.c:4420 +#: builtin/apply.c:4582 msgid "do not trust the line counts in the hunk headers" msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen" -#: builtin/apply.c:4422 +#: builtin/apply.c:4584 msgid "root" msgstr "Wurzelverzeichnis" -#: builtin/apply.c:4423 +#: builtin/apply.c:4585 msgid "prepend <root> to all filenames" msgstr "<Wurzelverzeichnis> vor alle Dateinamen stellen" -#: builtin/apply.c:4445 +#: builtin/apply.c:4607 msgid "--3way outside a repository" msgstr "" "Die Option --3way kann nicht außerhalb eines Repositories verwendet werden." -#: builtin/apply.c:4453 +#: builtin/apply.c:4615 msgid "--index outside a repository" msgstr "" "Die Option --index kann nicht außerhalb eines Repositories verwendet werden." -#: builtin/apply.c:4456 +#: builtin/apply.c:4618 msgid "--cached outside a repository" msgstr "" "Die Option --cached kann nicht außerhalb eines Repositories verwendet werden." -#: builtin/apply.c:4472 +#: builtin/apply.c:4637 #, c-format msgid "can't open patch '%s'" msgstr "kann Patch '%s' nicht öffnen" -#: builtin/apply.c:4486 +#: builtin/apply.c:4651 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "unterdrückte %d Whitespace-Fehler" msgstr[1] "unterdrückte %d Whitespace-Fehler" -#: builtin/apply.c:4492 builtin/apply.c:4502 +#: builtin/apply.c:4657 builtin/apply.c:4667 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2726,105 +2755,105 @@ msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "BISECT_HEAD aktualisieren, anstatt den aktuellen Commit auszuchecken" #: builtin/blame.c:30 -msgid "git blame [options] [rev-opts] [rev] [--] file" -msgstr "git blame [Optionen] [rev-opts] [rev] [--] Datei" +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file" +msgstr "git blame [<Optionen>] [<rev-opts>] [<Commit>] [--] Datei" #: builtin/blame.c:35 -msgid "[rev-opts] are documented in git-rev-list(1)" -msgstr "[rev-opts] sind dokumentiert in git-rev-list(1)" +msgid "<rev-opts> are documented in git-rev-list(1)" +msgstr "<rev-opts> sind dokumentiert in git-rev-list(1)" -#: builtin/blame.c:2501 +#: builtin/blame.c:2500 msgid "Show blame entries as we find them, incrementally" msgstr "\"blame\"-Einträge schrittweise anzeigen, während wir sie generieren" -#: builtin/blame.c:2502 +#: builtin/blame.c:2501 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "leere SHA-1 für Grenz-Commits anzeigen (Standard: aus)" -#: builtin/blame.c:2503 +#: builtin/blame.c:2502 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Ursprungs-Commit nicht als Grenzen behandeln (Standard: aus)" -#: builtin/blame.c:2504 +#: builtin/blame.c:2503 msgid "Show work cost statistics" msgstr "Statistiken zum Arbeitsaufwand anzeigen" -#: builtin/blame.c:2505 +#: builtin/blame.c:2504 msgid "Show output score for blame entries" msgstr "Ausgabebewertung für \"blame\"-Einträge anzeigen" -#: builtin/blame.c:2506 +#: builtin/blame.c:2505 msgid "Show original filename (Default: auto)" msgstr "ursprünglichen Dateinamen anzeigen (Standard: auto)" -#: builtin/blame.c:2507 +#: builtin/blame.c:2506 msgid "Show original linenumber (Default: off)" msgstr "ursprüngliche Zeilennummer anzeigen (Standard: aus)" -#: builtin/blame.c:2508 +#: builtin/blame.c:2507 msgid "Show in a format designed for machine consumption" msgstr "Anzeige in einem Format für maschinelle Auswertung" -#: builtin/blame.c:2509 +#: builtin/blame.c:2508 msgid "Show porcelain format with per-line commit information" msgstr "" "Anzeige in Format für Fremdprogramme mit Commit-Informationen pro Zeile" -#: builtin/blame.c:2510 +#: builtin/blame.c:2509 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "Den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)" -#: builtin/blame.c:2511 +#: builtin/blame.c:2510 msgid "Show raw timestamp (Default: off)" msgstr "Unbearbeiteten Zeitstempel anzeigen (Standard: aus)" -#: builtin/blame.c:2512 +#: builtin/blame.c:2511 msgid "Show long commit SHA1 (Default: off)" msgstr "Langen Commit-SHA1 anzeigen (Standard: aus)" -#: builtin/blame.c:2513 +#: builtin/blame.c:2512 msgid "Suppress author name and timestamp (Default: off)" msgstr "Den Namen des Autors und den Zeitstempel unterdrücken (Standard: aus)" -#: builtin/blame.c:2514 +#: builtin/blame.c:2513 msgid "Show author email instead of name (Default: off)" msgstr "" "Anstatt des Namens die E-Mail-Adresse des Autors anzeigen (Standard: aus)" -#: builtin/blame.c:2515 +#: builtin/blame.c:2514 msgid "Ignore whitespace differences" msgstr "Unterschiede im Whitespace ignorieren" -#: builtin/blame.c:2516 +#: builtin/blame.c:2515 msgid "Spend extra cycles to find better match" msgstr "Länger arbeiten, um bessere Ãœbereinstimmungen zu finden" -#: builtin/blame.c:2517 +#: builtin/blame.c:2516 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Commits von <Datei> benutzen, anstatt \"git-rev-list\" aufzurufen" -#: builtin/blame.c:2518 +#: builtin/blame.c:2517 msgid "Use <file>'s contents as the final image" msgstr "Inhalte der <Datei>en als endgültiges Abbild benutzen" -#: builtin/blame.c:2519 builtin/blame.c:2520 +#: builtin/blame.c:2518 builtin/blame.c:2519 msgid "score" msgstr "Bewertung" -#: builtin/blame.c:2519 +#: builtin/blame.c:2518 msgid "Find line copies within and across files" msgstr "kopierte Zeilen innerhalb oder zwischen Dateien finden" -#: builtin/blame.c:2520 +#: builtin/blame.c:2519 msgid "Find line movements within and across files" msgstr "verschobene Zeilen innerhalb oder zwischen Dateien finden" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "Process only line range n,m, counting from 1" msgstr "nur Zeilen im Bereich n,m verarbeiten, gezählt von 1" @@ -2834,25 +2863,25 @@ msgstr "nur Zeilen im Bereich n,m verarbeiten, gezählt von 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:2602 +#: builtin/blame.c:2601 msgid "4 years, 11 months ago" msgstr "vor 4 Jahren, und 11 Monaten" #: builtin/branch.c:24 -msgid "git branch [options] [-r | -a] [--merged | --no-merged]" -msgstr "git branch [Optionen] [-r | -a] [--merged | --no-merged]" +msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" +msgstr "git branch [<Optionen>] [-r | -a] [--merged | --no-merged]" #: builtin/branch.c:25 -msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" -msgstr "git branch [Optionen] [-l] [-f] <Branchname> [<Startpunkt>]" +msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" +msgstr "git branch [<Optionen>] [-l] [-f] <Branchname> [<Startpunkt>]" #: builtin/branch.c:26 -msgid "git branch [options] [-r] (-d | -D) <branchname>..." -msgstr "git branch [Optionen] [-r] (-d | -D) <Branchname>..." +msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." +msgstr "git branch [<Optionen>] [-r] (-d | -D) <Branchname>..." #: builtin/branch.c:27 -msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" -msgstr "git branch [Optionen] (-m | -M) [<alterBranch>] <neuerBranch>" +msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" +msgstr "git branch [<Optionen>] (-m | -M) [<alter-Branch>] <neuer-Branch>" #: builtin/branch.c:152 #, c-format @@ -2994,199 +3023,204 @@ msgstr "(kein Branch, Rebase von Branch %s im Gange)" msgid "(no branch, bisect started on %s)" msgstr "(kein Branch, binäre Suche begonnen bei %s)" -#: builtin/branch.c:593 +#: builtin/branch.c:596 #, c-format -msgid "(detached from %s)" -msgstr "(losgelöst von %s)" +msgid "(HEAD detached at %s)" +msgstr "(HEAD losgelöst bei %s)" -#: builtin/branch.c:596 +#: builtin/branch.c:599 +#, c-format +msgid "(HEAD detached from %s)" +msgstr "(HEAD losgelöst von %s)" + +#: builtin/branch.c:603 msgid "(no branch)" msgstr "(kein Branch)" -#: builtin/branch.c:643 +#: builtin/branch.c:650 #, c-format msgid "object '%s' does not point to a commit" msgstr "Objekt '%s' zeigt auf keinen Commit" -#: builtin/branch.c:691 +#: builtin/branch.c:698 msgid "some refs could not be read" msgstr "Konnte einige Referenzen nicht lesen" -#: builtin/branch.c:704 +#: builtin/branch.c:711 msgid "cannot rename the current branch while not on any." msgstr "" "Kann aktuellen Branch nicht umbenennen, solange Sie sich auf keinem befinden." -#: builtin/branch.c:714 +#: builtin/branch.c:721 #, c-format msgid "Invalid branch name: '%s'" msgstr "Ungültiger Branchname: '%s'" -#: builtin/branch.c:729 +#: builtin/branch.c:736 msgid "Branch rename failed" msgstr "Umbenennung des Branches fehlgeschlagen" -#: builtin/branch.c:733 +#: builtin/branch.c:740 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "falsch benannten Branch '%s' umbenannt" -#: builtin/branch.c:737 +#: builtin/branch.c:744 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Branch umbenannt zu %s, aber HEAD ist nicht aktualisiert!" -#: builtin/branch.c:744 +#: builtin/branch.c:751 msgid "Branch is renamed, but update of config-file failed" msgstr "" "Branch ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist " "fehlgeschlagen." -#: builtin/branch.c:759 +#: builtin/branch.c:766 #, c-format msgid "malformed object name %s" msgstr "Missgebildeter Objektname %s" -#: builtin/branch.c:783 +#: builtin/branch.c:790 #, c-format msgid "could not write branch description template: %s" msgstr "Konnte Beschreibungsvorlage für Branch nicht schreiben: %s" -#: builtin/branch.c:813 +#: builtin/branch.c:820 msgid "Generic options" msgstr "Allgemeine Optionen" -#: builtin/branch.c:815 +#: builtin/branch.c:822 msgid "show hash and subject, give twice for upstream branch" msgstr "Hash und Betreff anzeigen; -vv: zusätzlich Upstream-Branch" -#: builtin/branch.c:816 +#: builtin/branch.c:823 msgid "suppress informational messages" msgstr "Informationsmeldungen unterdrücken" -#: builtin/branch.c:817 +#: builtin/branch.c:824 msgid "set up tracking mode (see git-pull(1))" msgstr "den Ãœbernahmemodus einstellen (siehe git-pull(1))" -#: builtin/branch.c:819 +#: builtin/branch.c:826 msgid "change upstream info" msgstr "Informationen zum Upstream-Branch ändern" -#: builtin/branch.c:823 +#: builtin/branch.c:830 msgid "use colored output" msgstr "farbige Ausgaben verwenden" -#: builtin/branch.c:824 +#: builtin/branch.c:831 msgid "act on remote-tracking branches" msgstr "auf Remote-Tracking-Branches wirken" -#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854 -#: builtin/branch.c:860 builtin/commit.c:1586 builtin/commit.c:1587 -#: builtin/commit.c:1588 builtin/commit.c:1589 builtin/tag.c:616 +#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861 +#: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583 +#: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616 #: builtin/tag.c:622 msgid "commit" msgstr "Commit" -#: builtin/branch.c:828 builtin/branch.c:834 +#: builtin/branch.c:835 builtin/branch.c:841 msgid "print only branches that contain the commit" msgstr "nur Branches ausgeben, welche diesen Commit beinhalten" -#: builtin/branch.c:840 +#: builtin/branch.c:847 msgid "Specific git-branch actions:" msgstr "spezifische Aktionen für \"git-branch\":" -#: builtin/branch.c:841 +#: builtin/branch.c:848 msgid "list both remote-tracking and local branches" msgstr "Remote-Tracking und lokale Branches auflisten" -#: builtin/branch.c:843 +#: builtin/branch.c:850 msgid "delete fully merged branch" msgstr "vollständig zusammengeführten Branch entfernen" -#: builtin/branch.c:844 +#: builtin/branch.c:851 msgid "delete branch (even if not merged)" msgstr "Branch löschen (auch wenn nicht zusammengeführt)" -#: builtin/branch.c:845 +#: builtin/branch.c:852 msgid "move/rename a branch and its reflog" msgstr "einen Branch und dessen Reflog verschieben/umbenennen" -#: builtin/branch.c:846 +#: builtin/branch.c:853 msgid "move/rename a branch, even if target exists" msgstr "" "einen Branch verschieben/umbenennen, auch wenn das Ziel bereits existiert" -#: builtin/branch.c:847 +#: builtin/branch.c:854 msgid "list branch names" msgstr "Branchnamen auflisten" -#: builtin/branch.c:848 +#: builtin/branch.c:855 msgid "create the branch's reflog" msgstr "das Reflog des Branches erzeugen" -#: builtin/branch.c:850 +#: builtin/branch.c:857 msgid "edit the description for the branch" msgstr "die Beschreibung für den Branch bearbeiten" -#: builtin/branch.c:851 +#: builtin/branch.c:858 msgid "force creation, move/rename, deletion" msgstr "Erstellung, Verschiebung/Umbenennung oder Löschung erzwingen" -#: builtin/branch.c:854 +#: builtin/branch.c:861 msgid "print only not merged branches" msgstr "nur Branches ausgeben, die nicht zusammengeführt sind" -#: builtin/branch.c:860 +#: builtin/branch.c:867 msgid "print only merged branches" msgstr "nur Branches ausgeben, die zusammengeführt sind" -#: builtin/branch.c:864 +#: builtin/branch.c:871 msgid "list branches in columns" msgstr "Branches in Spalten auflisten" -#: builtin/branch.c:877 +#: builtin/branch.c:884 msgid "Failed to resolve HEAD as a valid ref." msgstr "Konnte HEAD nicht als gültige Referenz auflösen." -#: builtin/branch.c:881 builtin/clone.c:637 +#: builtin/branch.c:888 builtin/clone.c:637 msgid "HEAD not found below refs/heads!" msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!" -#: builtin/branch.c:903 +#: builtin/branch.c:910 msgid "--column and --verbose are incompatible" msgstr "Die Optionen --column und --verbose sind inkompatibel." -#: builtin/branch.c:914 builtin/branch.c:953 +#: builtin/branch.c:921 builtin/branch.c:960 msgid "branch name required" msgstr "Branchname erforderlich" -#: builtin/branch.c:929 +#: builtin/branch.c:936 msgid "Cannot give description to detached HEAD" msgstr "zu losgelöstem HEAD kann keine Beschreibung hinterlegt werden" -#: builtin/branch.c:934 +#: builtin/branch.c:941 msgid "cannot edit description of more than one branch" msgstr "Beschreibung von mehr als einem Branch kann nicht bearbeitet werden" -#: builtin/branch.c:941 +#: builtin/branch.c:948 #, c-format msgid "No commit on branch '%s' yet." msgstr "Noch kein Commit in Branch '%s'." -#: builtin/branch.c:944 +#: builtin/branch.c:951 #, c-format msgid "No branch named '%s'." msgstr "Branch '%s' nicht vorhanden." -#: builtin/branch.c:959 +#: builtin/branch.c:966 msgid "too many branches for a rename operation" msgstr "zu viele Branches für eine Umbenennen-Operation angegeben" -#: builtin/branch.c:964 +#: builtin/branch.c:971 msgid "too many branches to set new upstream" msgstr "zu viele Branches angegeben, um Upstream-Branch zu setzen" -#: builtin/branch.c:968 +#: builtin/branch.c:975 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -3194,43 +3228,43 @@ msgstr "" "Konnte keinen neuen Upstream-Branch von HEAD zu %s setzen, da dieser auf\n" "keinen Branch zeigt." -#: builtin/branch.c:971 builtin/branch.c:993 builtin/branch.c:1014 +#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021 #, c-format msgid "no such branch '%s'" msgstr "Kein solcher Branch '%s'" -#: builtin/branch.c:975 +#: builtin/branch.c:982 #, c-format msgid "branch '%s' does not exist" msgstr "Branch '%s' existiert nicht" -#: builtin/branch.c:987 +#: builtin/branch.c:994 msgid "too many branches to unset upstream" msgstr "" "zu viele Branches angegeben, um Konfiguration zu Upstream-Branch zu entfernen" -#: builtin/branch.c:991 +#: builtin/branch.c:998 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "Konnte Konfiguration zu Upstream-Branch von HEAD nicht entfernen, da dieser\n" "auf keinen Branch zeigt." -#: builtin/branch.c:997 +#: builtin/branch.c:1004 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt" -#: builtin/branch.c:1011 +#: builtin/branch.c:1018 msgid "it does not make sense to create 'HEAD' manually" msgstr "'HEAD' darf nicht manuell erstellt werden" -#: builtin/branch.c:1017 +#: builtin/branch.c:1024 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "Die Optionen -a und -r bei 'git branch' können nicht gemeimsam mit einem " "Branchnamen verwendet werden." -#: builtin/branch.c:1020 +#: builtin/branch.c:1027 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3239,7 +3273,7 @@ msgstr "" "Die --set-upstream Option ist veraltet und wird entfernt. Benutzen Sie --" "track oder --set-upstream-to\n" -#: builtin/branch.c:1037 +#: builtin/branch.c:1044 #, c-format msgid "" "\n" @@ -3250,12 +3284,12 @@ msgstr "" "Wenn Sie wollten, dass '%s' den Branch '%s' als Upstream-Branch hat, führen " "Sie aus:\n" -#: builtin/branch.c:1038 +#: builtin/branch.c:1045 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1039 +#: builtin/branch.c:1046 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -3273,57 +3307,57 @@ msgstr "Um ein Paket zu erstellen wird ein Repository benötigt." msgid "Need a repository to unbundle." msgstr "Zum Entpacken wird ein Repository benötigt." -#: builtin/cat-file.c:328 -msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" -msgstr "git cat-file (-t|-s|-e|-p|<Art>|--textconv) <Objekt>" +#: builtin/cat-file.c:326 +msgid "git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>" +msgstr "git cat-file (-t | -s | -e | -p | <Art> | --textconv) <Objekt>" -#: builtin/cat-file.c:329 -msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" -msgstr "git cat-file (--batch|--batch-check) < <Liste_von_Objekten>" +#: builtin/cat-file.c:327 +msgid "git cat-file (--batch | --batch-check) < <list-of-objects>" +msgstr "git cat-file (--batch | --batch-check) < <Liste-von-Objekten>" -#: builtin/cat-file.c:366 +#: builtin/cat-file.c:364 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<Art> kann sein: blob, tree, commit, tag" -#: builtin/cat-file.c:367 +#: builtin/cat-file.c:365 msgid "show object type" msgstr "Objektart anzeigen" -#: builtin/cat-file.c:368 +#: builtin/cat-file.c:366 msgid "show object size" msgstr "Objektgröße anzeigen" -#: builtin/cat-file.c:370 +#: builtin/cat-file.c:368 msgid "exit with zero when there's no error" msgstr "mit Rückgabewert 0 beenden, wenn kein Fehler aufgetreten ist" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:369 msgid "pretty-print object's content" msgstr "ansprechende Anzeige des Objektinhaltes" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:371 msgid "for blob objects, run textconv on object's content" msgstr "eine Textkonvertierung auf den Inhalt von Blob-Objekten ausführen" -#: builtin/cat-file.c:375 +#: builtin/cat-file.c:373 msgid "show info and content of objects fed from the standard input" msgstr "" "Anzeige von Informationen und Inhalt von Objekten, gelesen von der Standard-" "Eingabe" -#: builtin/cat-file.c:378 +#: builtin/cat-file.c:376 msgid "show info about objects fed from the standard input" msgstr "" "Anzeige von Informationen über Objekte, gelesen von der Standard-Eingabe" #: builtin/check-attr.c:11 -msgid "git check-attr [-a | --all | attr...] [--] pathname..." -msgstr "git check-attr [-a | --all | Attribut...] [--] Pfadname..." +msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." +msgstr "git check-attr [-a | --all | <Attribut>...] [--] <Pfadname>..." #: builtin/check-attr.c:12 -msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" +msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>" msgstr "" -"git check-attr --stdin [-z] [-a | --all | Attribut...] < <Liste-von-Pfaden>" +"git check-attr --stdin [-z] [-a | --all | <Attribut>...] < <Liste-von-Pfaden>" #: builtin/check-attr.c:19 msgid "report all attributes set on file" @@ -3379,8 +3413,8 @@ msgid "--non-matching is only valid with --verbose" msgstr "--non-matching ist nur mit --verbose zulässig" #: builtin/check-mailmap.c:8 -msgid "git check-mailmap [options] <contact>..." -msgstr "git check-mailmap [Optionen] <Kontakt>..." +msgid "git check-mailmap [<options>] <contact>..." +msgstr "git check-mailmap [<Optionen>] <Kontakt>..." #: builtin/check-mailmap.c:13 msgid "also read contacts from stdin" @@ -3396,8 +3430,8 @@ msgid "no contacts specified" msgstr "keine Kontakte angegeben" #: builtin/checkout-index.c:126 -msgid "git checkout-index [options] [--] [<file>...]" -msgstr "git checkout-index [Optionen] [--] [<Datei>...]" +msgid "git checkout-index [<options>] [--] [<file>...]" +msgstr "git checkout-index [<Optionen>] [--] [<Datei>...]" #: builtin/checkout-index.c:188 msgid "check out all files in the index" @@ -3443,12 +3477,12 @@ msgid "copy out the files from named stage" msgstr "Dateien von dem benannten Stand kopieren" #: builtin/checkout.c:25 -msgid "git checkout [options] <branch>" -msgstr "git checkout [Optionen] <Branch>" +msgid "git checkout [<options>] <branch>" +msgstr "git checkout [<Optionen>] <Branch>" #: builtin/checkout.c:26 -msgid "git checkout [options] [<branch>] -- <file>..." -msgstr "git checkout [Optionen] [<Branch>] -- <Datei>..." +msgid "git checkout [<options>] [<branch>] -- <file>..." +msgstr "git checkout [<Optionen>] [<Branch>] -- <Datei>..." #: builtin/checkout.c:132 builtin/checkout.c:165 #, c-format @@ -3578,13 +3612,13 @@ msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" "to do so with:\n" "\n" -" git branch new_branch_name %s\n" +" git branch <new-branch-name> %s\n" "\n" msgstr "" "Wenn Sie diese durch einen neuen Branch behalten möchten, dann könnte jetzt\n" "ein guter Zeitpunkt sein dies zu tun mit:\n" "\n" -" git branch neuer_branch_name %s\n" +" git branch <neuer-Branchname> %s\n" "\n" #: builtin/checkout.c:777 @@ -3700,8 +3734,8 @@ msgid "do not limit pathspecs to sparse entries only" msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken" #: builtin/checkout.c:1130 -msgid "second guess 'git checkout no-such-branch'" -msgstr "second guess 'git checkout no-such-branch'" +msgid "second guess 'git checkout <no-such-branch>'" +msgstr "second guess 'git checkout <no-such-branch>'" #: builtin/checkout.c:1153 msgid "-b, -B and --orphan are mutually exclusive" @@ -3824,16 +3858,17 @@ msgstr "WARNUNG: Kann keine Einträge finden die Muster entsprechen: %s" msgid "Select items to delete" msgstr "Wählen Sie Einträge zum Löschen" -#: builtin/clean.c:757 +#. TRANSLATORS: Make sure to keep [y/N] as is +#: builtin/clean.c:758 #, c-format -msgid "remove %s? " -msgstr "'%s' löschen? " +msgid "Remove %s [y/N]? " +msgstr "'%s' löschen [y/N]? " -#: builtin/clean.c:782 +#: builtin/clean.c:783 msgid "Bye." msgstr "Tschüss." -#: builtin/clean.c:790 +#: builtin/clean.c:791 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -3851,62 +3886,62 @@ msgstr "" "help - diese Meldung anzeigen\n" "? - Hilfe zur Auswahl mittels Eingabe anzeigen" -#: builtin/clean.c:817 +#: builtin/clean.c:818 msgid "*** Commands ***" msgstr "*** Kommandos ***" -#: builtin/clean.c:818 +#: builtin/clean.c:819 msgid "What now" msgstr "Was nun" -#: builtin/clean.c:826 +#: builtin/clean.c:827 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Würde das folgende Element entfernen:" msgstr[1] "Würde die folgenden Elemente entfernen:" -#: builtin/clean.c:843 +#: builtin/clean.c:844 msgid "No more files to clean, exiting." msgstr "Keine Dateien mehr zum Löschen, beende." -#: builtin/clean.c:874 +#: builtin/clean.c:875 msgid "do not print names of files removed" msgstr "keine Namen von gelöschten Dateien ausgeben" -#: builtin/clean.c:876 +#: builtin/clean.c:877 msgid "force" msgstr "Aktion erzwingen" -#: builtin/clean.c:877 +#: builtin/clean.c:878 msgid "interactive cleaning" msgstr "interaktives Clean" -#: builtin/clean.c:879 +#: builtin/clean.c:880 msgid "remove whole directories" msgstr "ganze Verzeichnisse löschen" -#: 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 +#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185 msgid "pattern" msgstr "Muster" -#: builtin/clean.c:881 +#: builtin/clean.c:882 msgid "add <pattern> to ignore rules" msgstr "<Muster> zu den Regeln für ignorierte Pfade hinzufügen" -#: builtin/clean.c:882 +#: builtin/clean.c:883 msgid "remove ignored files, too" msgstr "auch ignorierte Dateien löschen" -#: builtin/clean.c:884 +#: builtin/clean.c:885 msgid "remove only ignored files" msgstr "nur ignorierte Dateien löschen" -#: builtin/clean.c:902 +#: builtin/clean.c:903 msgid "-x and -X cannot be used together" msgstr "Die Optionen -x und -X können nicht gemeinsam verwendet werden." -#: builtin/clean.c:906 +#: builtin/clean.c:907 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -3914,7 +3949,7 @@ msgstr "" "clean.requireForce auf \"true\" gesetzt und weder -i, -n noch -f gegeben; " "\"clean\" verweigert" -#: builtin/clean.c:909 +#: builtin/clean.c:910 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -3923,11 +3958,11 @@ msgstr "" "f gegeben; \"clean\" verweigert" #: builtin/clone.c:37 -msgid "git clone [options] [--] <repo> [<dir>]" -msgstr "git clone [Optionen] [--] <Repository> [<Verzeichnis>]" +msgid "git clone [<options>] [--] <repo> [<dir>]" +msgstr "git clone [<Optionen>] [--] <Repository> [<Verzeichnis>]" -#: builtin/clone.c:66 builtin/fetch.c:112 builtin/merge.c:224 -#: builtin/push.c:514 +#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224 +#: builtin/push.c:523 msgid "force progress reporting" msgstr "Fortschrittsanzeige erzwingen" @@ -3987,7 +4022,7 @@ msgstr "<Branch> auschecken, anstatt HEAD des Remote-Repositories" msgid "path to git-upload-pack on the remote" msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite" -#: builtin/clone.c:94 builtin/fetch.c:113 builtin/grep.c:659 +#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659 msgid "depth" msgstr "Tiefe" @@ -4091,7 +4126,7 @@ msgstr "Konnte zu klonenden Remote-Branch %s nicht finden." #: builtin/clone.c:561 #, c-format msgid "Checking connectivity... " -msgstr "Prüfe Konnektivität... " +msgstr "Prüfe Konnektivität ... " #: builtin/clone.c:564 msgid "remote did not send all necessary objects" @@ -4137,7 +4172,7 @@ msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel." msgid "repository '%s' does not exist" msgstr "Repository '%s' existiert nicht." -#: builtin/clone.c:815 builtin/fetch.c:1155 +#: builtin/clone.c:815 builtin/fetch.c:1156 #, c-format msgid "depth %s is not a positive number" msgstr "Tiefe %s ist keine positive Zahl" @@ -4152,63 +4187,63 @@ msgstr "Zielpfad '%s' existiert bereits und ist kein leeres Verzeichnis." msgid "working tree '%s' already exists." msgstr "Arbeitsverzeichnis '%s' existiert bereits." -#: builtin/clone.c:848 builtin/clone.c:860 +#: builtin/clone.c:850 builtin/clone.c:861 #, c-format msgid "could not create leading directories of '%s'" msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen." -#: builtin/clone.c:851 +#: builtin/clone.c:853 #, c-format -msgid "could not create work tree dir '%s'." -msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen." +msgid "could not create work tree dir '%s'" +msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen" -#: builtin/clone.c:870 +#: builtin/clone.c:871 #, c-format msgid "Cloning into bare repository '%s'...\n" -msgstr "Klone in Bare-Repository '%s'...\n" +msgstr "Klone in Bare-Repository '%s' ...\n" -#: builtin/clone.c:872 +#: builtin/clone.c:873 #, c-format msgid "Cloning into '%s'...\n" -msgstr "Klone nach '%s'...\n" +msgstr "Klone nach '%s' ...\n" -#: builtin/clone.c:897 +#: builtin/clone.c:898 msgid "--dissociate given, but there is no --reference" msgstr "--dissociate ohne --reference angegeben" -#: builtin/clone.c:912 +#: builtin/clone.c:913 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "Die Option --depth wird in lokalen Klonen ignoriert; benutzen Sie " "stattdessen file://" -#: builtin/clone.c:915 +#: builtin/clone.c:916 msgid "source repository is shallow, ignoring --local" msgstr "" "Quelle ist ein Repository mit unvollständiger Historie (shallow),ignoriere --" "local" -#: builtin/clone.c:920 +#: builtin/clone.c:921 msgid "--local is ignored" msgstr "--local wird ignoriert" -#: builtin/clone.c:924 +#: builtin/clone.c:925 #, c-format msgid "Don't know how to clone %s" msgstr "Weiß nicht wie %s zu klonen ist." -#: builtin/clone.c:975 builtin/clone.c:983 +#: builtin/clone.c:976 builtin/clone.c:984 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden" -#: builtin/clone.c:986 +#: builtin/clone.c:987 msgid "You appear to have cloned an empty repository." msgstr "Sie scheinen ein leeres Repository geklont zu haben." #: builtin/column.c:9 -msgid "git column [options]" -msgstr "git column [Optionen]" +msgid "git column [<options>]" +msgstr "git column [<Optionen>]" #: builtin/column.c:26 msgid "lookup config vars" @@ -4239,12 +4274,12 @@ msgid "--command must be the first argument" msgstr "Die Option --command muss an erster Stelle stehen." #: builtin/commit.c:37 -msgid "git commit [options] [--] <pathspec>..." -msgstr "git commit [Optionen] [--] <Pfadspezifikation>..." +msgid "git commit [<options>] [--] <pathspec>..." +msgstr "git commit [<Optionen>] [--] <Pfadspezifikation>..." #: builtin/commit.c:42 -msgid "git status [options] [--] <pathspec>..." -msgstr "git status [Optionen] [--] <Pfadspezifikation>..." +msgid "git status [<options>] [--] <pathspec>..." +msgstr "git status [<Optionen>] [--] <Pfadspezifikation>..." #: builtin/commit.c:47 msgid "" @@ -4345,71 +4380,71 @@ msgstr "" "Benutzen Sie anschließend \"git cherry-pick --continue\", um die\n" "Cherry-Pick-Operation mit den verbleibenden Commits fortzusetzen.\n" -#: builtin/commit.c:302 +#: builtin/commit.c:304 msgid "failed to unpack HEAD tree object" msgstr "Fehler beim Entpacken des \"Tree\"-Objektes von HEAD." -#: builtin/commit.c:342 +#: builtin/commit.c:344 msgid "unable to create temporary index" msgstr "Konnte temporäre Staging-Area nicht erstellen." -#: builtin/commit.c:348 +#: builtin/commit.c:350 msgid "interactive add failed" msgstr "interaktives Hinzufügen fehlgeschlagen" -#: builtin/commit.c:359 +#: builtin/commit.c:361 msgid "unable to write index file" msgstr "Konnte Staging-Area-Datei nicht schreiben." -#: builtin/commit.c:361 +#: builtin/commit.c:363 msgid "unable to update temporary index" msgstr "Konnte temporäre Staging-Area nicht aktualisieren." -#: builtin/commit.c:363 +#: builtin/commit.c:365 msgid "Failed to update main cache tree" msgstr "Konnte Haupt-Cache-Verzeichnis nicht aktualisieren" -#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461 +#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463 msgid "unable to write new_index file" msgstr "Konnte new_index Datei nicht schreiben" -#: builtin/commit.c:443 +#: builtin/commit.c:445 msgid "cannot do a partial commit during a merge." msgstr "Kann keinen Teil-Commit durchführen, während ein Merge im Gange ist." -#: builtin/commit.c:445 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a cherry-pick." msgstr "" "Kann keinen Teil-Commit durchführen, während \"cherry-pick\" im Gange ist." -#: builtin/commit.c:454 +#: builtin/commit.c:456 msgid "cannot read the index" msgstr "Kann Staging-Area nicht lesen" -#: builtin/commit.c:473 +#: builtin/commit.c:475 msgid "unable to write temporary index file" msgstr "Konnte temporäre Staging-Area-Datei nicht schreiben." -#: builtin/commit.c:584 +#: builtin/commit.c:580 #, c-format msgid "commit '%s' lacks author header" msgstr "Commit '%s' fehlt Autor-Kopfbereich" -#: builtin/commit.c:586 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' has malformed author line" msgstr "Commit '%s' hat fehlerhafte Autor-Zeile" -#: builtin/commit.c:605 +#: builtin/commit.c:601 msgid "malformed --author parameter" msgstr "Fehlerhafter --author Parameter" -#: builtin/commit.c:613 +#: builtin/commit.c:609 #, c-format msgid "invalid date format: %s" msgstr "Ungültiges Datumsformat: %s" -#: builtin/commit.c:657 +#: builtin/commit.c:653 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -4417,43 +4452,43 @@ msgstr "" "Konnte kein Kommentar-Zeichen auswählen, das nicht in\n" "der aktuellen Commit-Beschreibung verwendet wird." -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1084 +#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 #, c-format msgid "could not lookup commit %s" msgstr "Konnte Commit %s nicht nachschlagen" -#: builtin/commit.c:706 builtin/shortlog.c:273 +#: builtin/commit.c:702 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lese Log-Nachricht von Standard-Eingabe)\n" -#: builtin/commit.c:708 +#: builtin/commit.c:704 msgid "could not read log from standard input" msgstr "Konnte Log nicht von Standard-Eingabe lesen." -#: builtin/commit.c:712 +#: builtin/commit.c:708 #, c-format msgid "could not read log file '%s'" msgstr "Konnte Log-Datei '%s' nicht lesen" -#: builtin/commit.c:734 +#: builtin/commit.c:730 msgid "could not read MERGE_MSG" msgstr "Konnte MERGE_MSG nicht lesen" -#: builtin/commit.c:738 +#: builtin/commit.c:734 msgid "could not read SQUASH_MSG" msgstr "Konnte SQUASH_MSG nicht lesen" -#: builtin/commit.c:742 +#: builtin/commit.c:738 #, c-format msgid "could not read '%s'" msgstr "Konnte '%s' nicht lesen" -#: builtin/commit.c:789 +#: builtin/commit.c:785 msgid "could not write commit template" msgstr "Konnte Commit-Vorlage nicht schreiben" -#: builtin/commit.c:807 +#: builtin/commit.c:803 #, c-format msgid "" "\n" @@ -4468,7 +4503,7 @@ msgstr "" "\t%s\n" "und versuchen Sie es erneut.\n" -#: builtin/commit.c:812 +#: builtin/commit.c:808 #, c-format msgid "" "\n" @@ -4483,7 +4518,7 @@ msgstr "" "\t%s\n" "und versuchen Sie es erneut.\n" -#: builtin/commit.c:825 +#: builtin/commit.c:821 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4493,7 +4528,7 @@ msgstr "" "die mit '%c' beginnen, werden ignoriert, und eine leere Beschreibung\n" "bricht den Commit ab.\n" -#: builtin/commit.c:832 +#: builtin/commit.c:828 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4506,155 +4541,157 @@ msgstr "" "entfernen.\n" "Eine leere Beschreibung bricht den Commit ab.\n" -#: builtin/commit.c:852 +#: builtin/commit.c:848 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:860 +#: builtin/commit.c:856 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:867 +#: builtin/commit.c:863 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sCommit-Ersteller: %.*s <%.*s>" -#: builtin/commit.c:885 +#: builtin/commit.c:881 msgid "Cannot read index" msgstr "Kann Staging-Area nicht lesen" -#: builtin/commit.c:942 +#: builtin/commit.c:938 msgid "Error building trees" msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte" -#: builtin/commit.c:957 builtin/tag.c:495 +#: builtin/commit.c:953 builtin/tag.c:495 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" "Bitte liefern Sie eine Beschreibung entweder mit der Option -m oder -F.\n" -#: builtin/commit.c:1059 +#: builtin/commit.c:1055 #, c-format -msgid "No existing author found with '%s'" -msgstr "Kein existierender Autor mit '%s' gefunden." +msgid "--author '%s' is not 'Name <email>' and matches no existing author" +msgstr "" +"--author '%s' ist nicht im Format 'Name <E-Mail>' und stimmt mit keinem " +"vorhandenen Autor überein" -#: builtin/commit.c:1074 builtin/commit.c:1314 +#: builtin/commit.c:1070 builtin/commit.c:1310 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ungültiger Modus '%s' für unversionierte Dateien" -#: builtin/commit.c:1111 +#: builtin/commit.c:1107 msgid "--long and -z are incompatible" msgstr "Die Optionen --long und -z sind inkompatibel." -#: builtin/commit.c:1141 +#: builtin/commit.c:1137 msgid "Using both --reset-author and --author does not make sense" msgstr "" "Die Optionen --reset-author und --author können nicht gemeinsam verwendet " "werden." -#: builtin/commit.c:1150 +#: builtin/commit.c:1146 msgid "You have nothing to amend." msgstr "Sie haben nichts für \"--amend\"." -#: builtin/commit.c:1153 +#: builtin/commit.c:1149 msgid "You are in the middle of a merge -- cannot amend." msgstr "Ein Merge ist im Gange -- kann \"--amend\" nicht ausführen." -#: builtin/commit.c:1155 +#: builtin/commit.c:1151 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "\"cherry-pick\" ist im Gange -- kann \"--amend\" nicht ausführen." -#: builtin/commit.c:1158 +#: builtin/commit.c:1154 msgid "Options --squash and --fixup cannot be used together" msgstr "" "Die Optionen --squash und --fixup können nicht gemeinsam verwendet werden." -#: builtin/commit.c:1168 +#: builtin/commit.c:1164 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Es kann nur eine Option von -c/-C/-F/--fixup verwendet werden." -#: builtin/commit.c:1170 +#: builtin/commit.c:1166 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Die Option -m kann nicht mit -c/-C/-F/--fixup kombiniert werden." -#: builtin/commit.c:1178 +#: builtin/commit.c:1174 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" "Die Option --reset--author kann nur mit -C, -c oder --amend verwendet werden." -#: builtin/commit.c:1195 +#: builtin/commit.c:1191 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Es kann nur eine Option von --include/--only/--all/--interactive/--patch " "verwendet werden." -#: builtin/commit.c:1197 +#: builtin/commit.c:1193 msgid "No paths with --include/--only does not make sense." msgstr "" "Die Optionen --include und --only können nur mit der Angabe von Pfaden " "verwendet werden." -#: builtin/commit.c:1199 +#: builtin/commit.c:1195 msgid "Clever... amending the last one with dirty index." msgstr "" -"Klug... den letzten Commit mit einer geänderten Staging-Area nachbessern." +"Klug ... den letzten Commit mit einer geänderten Staging-Area nachbessern." -#: builtin/commit.c:1201 +#: builtin/commit.c:1197 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "Explizite Pfade ohne -i oder -o angegeben; nehme --only an" -#: builtin/commit.c:1213 builtin/tag.c:728 +#: builtin/commit.c:1209 builtin/tag.c:728 #, c-format msgid "Invalid cleanup mode %s" msgstr "Ungültiger \"cleanup\" Modus %s" -#: builtin/commit.c:1218 +#: builtin/commit.c:1214 msgid "Paths with -a does not make sense." -msgstr "Die Option -a kann nur mit der Angabe von Pfaden verwendet werden." +msgstr "Die Option -a kann nicht mit der Angabe von Pfaden verwendet werden." -#: builtin/commit.c:1328 builtin/commit.c:1608 +#: builtin/commit.c:1324 builtin/commit.c:1604 msgid "show status concisely" msgstr "Status im Kurzformat anzeigen" -#: builtin/commit.c:1330 builtin/commit.c:1610 +#: builtin/commit.c:1326 builtin/commit.c:1606 msgid "show branch information" msgstr "Branchinformationen anzeigen" -#: builtin/commit.c:1332 builtin/commit.c:1612 builtin/push.c:500 +#: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509 msgid "machine-readable output" msgstr "maschinenlesbare Ausgabe" -#: builtin/commit.c:1335 builtin/commit.c:1614 +#: builtin/commit.c:1331 builtin/commit.c:1610 msgid "show status in long format (default)" msgstr "Status im Langformat anzeigen (Standard)" -#: builtin/commit.c:1338 builtin/commit.c:1617 +#: builtin/commit.c:1334 builtin/commit.c:1613 msgid "terminate entries with NUL" msgstr "Einträge mit NUL-Zeichen abschließen" -#: builtin/commit.c:1340 builtin/commit.c:1620 builtin/fast-export.c:980 +#: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980 #: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "Modus" -#: builtin/commit.c:1341 builtin/commit.c:1620 +#: builtin/commit.c:1337 builtin/commit.c:1616 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "unversionierte Dateien anzeigen, optionale Modi: all, normal, no. (Standard: " "all)" -#: builtin/commit.c:1344 +#: builtin/commit.c:1340 msgid "show ignored files" msgstr "ignorierte Dateien anzeigen" -#: builtin/commit.c:1345 parse-options.h:153 +#: builtin/commit.c:1341 parse-options.h:153 msgid "when" msgstr "wann" -#: builtin/commit.c:1346 +#: builtin/commit.c:1342 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -4662,211 +4699,211 @@ msgstr "" "Änderungen in Submodulen ignorieren, optional wenn: all, dirty, untracked. " "(Standard: all)" -#: builtin/commit.c:1348 +#: builtin/commit.c:1344 msgid "list untracked files in columns" msgstr "unversionierte Dateien in Spalten auflisten" -#: builtin/commit.c:1435 +#: builtin/commit.c:1431 msgid "couldn't look up newly created commit" msgstr "Konnte neu erstellten Commit nicht nachschlagen." -#: builtin/commit.c:1437 +#: builtin/commit.c:1433 msgid "could not parse newly created commit" msgstr "Konnte neulich erstellten Commit nicht analysieren." -#: builtin/commit.c:1482 +#: builtin/commit.c:1478 msgid "detached HEAD" msgstr "losgelöster HEAD" -#: builtin/commit.c:1485 +#: builtin/commit.c:1481 msgid " (root-commit)" msgstr " (Basis-Commit)" -#: builtin/commit.c:1578 +#: builtin/commit.c:1574 msgid "suppress summary after successful commit" msgstr "Zusammenfassung nach erfolgreichem Commit unterdrücken" -#: builtin/commit.c:1579 +#: builtin/commit.c:1575 msgid "show diff in commit message template" msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen" -#: builtin/commit.c:1581 +#: builtin/commit.c:1577 msgid "Commit message options" msgstr "Optionen für Commit-Beschreibung" -#: builtin/commit.c:1582 builtin/tag.c:601 +#: builtin/commit.c:1578 builtin/tag.c:601 msgid "read message from file" msgstr "Beschreibung von Datei lesen" -#: builtin/commit.c:1583 +#: builtin/commit.c:1579 msgid "author" msgstr "Autor" -#: builtin/commit.c:1583 +#: builtin/commit.c:1579 msgid "override author for commit" msgstr "Autor eines Commits überschreiben" -#: builtin/commit.c:1584 builtin/gc.c:275 +#: builtin/commit.c:1580 builtin/gc.c:275 msgid "date" msgstr "Datum" -#: builtin/commit.c:1584 +#: builtin/commit.c:1580 msgid "override date for commit" msgstr "Datum eines Commits überschreiben" -#: builtin/commit.c:1585 builtin/merge.c:218 builtin/notes.c:391 +#: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391 #: builtin/notes.c:554 builtin/tag.c:599 msgid "message" msgstr "Beschreibung" -#: builtin/commit.c:1585 +#: builtin/commit.c:1581 msgid "commit message" msgstr "Commit-Beschreibung" -#: builtin/commit.c:1586 +#: builtin/commit.c:1582 msgid "reuse and edit message from specified commit" msgstr "Beschreibung des angegebenen Commits wiederverwenden und editieren" -#: builtin/commit.c:1587 +#: builtin/commit.c:1583 msgid "reuse message from specified commit" msgstr "Beschreibung des angegebenen Commits wiederverwenden" -#: builtin/commit.c:1588 +#: builtin/commit.c:1584 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "eine automatisch zusammengesetzte Beschreibung zum Nachbessern des " "angegebenen Commits verwenden" -#: builtin/commit.c:1589 +#: builtin/commit.c:1585 msgid "use autosquash formatted message to squash specified commit" msgstr "" "eine automatisch zusammengesetzte Beschreibung beim \"squash\" des " "angegebenen Commits verwenden" -#: builtin/commit.c:1590 +#: builtin/commit.c:1586 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "Sie als Autor des Commits setzen (verwendet mit -C/-c/--amend)" -#: builtin/commit.c:1591 builtin/log.c:1191 builtin/revert.c:86 +#: builtin/commit.c:1587 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "'Signed-off-by:'-Zeile hinzufügen" -#: builtin/commit.c:1592 +#: builtin/commit.c:1588 msgid "use specified template file" msgstr "angegebene Vorlagendatei verwenden" -#: builtin/commit.c:1593 +#: builtin/commit.c:1589 msgid "force edit of commit" msgstr "Bearbeitung des Commits erzwingen" -#: builtin/commit.c:1594 +#: builtin/commit.c:1590 msgid "default" msgstr "Standard" -#: builtin/commit.c:1594 builtin/tag.c:604 +#: builtin/commit.c:1590 builtin/tag.c:604 msgid "how to strip spaces and #comments from message" msgstr "" "wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen" -#: builtin/commit.c:1595 +#: builtin/commit.c:1591 msgid "include status in commit message template" msgstr "Status in die Commit-Beschreibungsvorlage einfügen" -#: builtin/commit.c:1596 builtin/merge.c:225 builtin/revert.c:92 +#: builtin/commit.c:1592 builtin/merge.c:225 builtin/revert.c:92 #: builtin/tag.c:605 msgid "key-id" msgstr "GPG-Schlüsselkennung" -#: builtin/commit.c:1597 builtin/merge.c:226 builtin/revert.c:93 +#: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93 msgid "GPG sign commit" msgstr "Commit mit GPG signieren" -#: builtin/commit.c:1600 +#: builtin/commit.c:1596 msgid "Commit contents options" msgstr "Optionen für Commit-Inhalt" -#: builtin/commit.c:1601 +#: builtin/commit.c:1597 msgid "commit all changed files" msgstr "alle geänderten Dateien committen" -#: builtin/commit.c:1602 +#: builtin/commit.c:1598 msgid "add specified files to index for commit" msgstr "die angegebenen Dateien zusätzlich zum Commit vormerken" -#: builtin/commit.c:1603 +#: builtin/commit.c:1599 msgid "interactively add files" msgstr "interaktives Hinzufügen von Dateien" -#: builtin/commit.c:1604 +#: builtin/commit.c:1600 msgid "interactively add changes" msgstr "interaktives Hinzufügen von Änderungen" -#: builtin/commit.c:1605 +#: builtin/commit.c:1601 msgid "commit only specified files" msgstr "nur die angegebenen Dateien committen" -#: builtin/commit.c:1606 +#: builtin/commit.c:1602 msgid "bypass pre-commit hook" msgstr "\"pre-commit hook\" umgehen" -#: builtin/commit.c:1607 +#: builtin/commit.c:1603 msgid "show what would be committed" msgstr "anzeigen, was committet werden würde" -#: builtin/commit.c:1618 +#: builtin/commit.c:1614 msgid "amend previous commit" msgstr "vorherigen Commit ändern" -#: builtin/commit.c:1619 +#: builtin/commit.c:1615 msgid "bypass post-rewrite hook" msgstr "\"post-rewrite hook\" umgehen" -#: builtin/commit.c:1624 +#: builtin/commit.c:1620 msgid "ok to record an empty change" msgstr "Aufzeichnung einer leeren Änderung erlauben" -#: builtin/commit.c:1626 +#: builtin/commit.c:1622 msgid "ok to record a change with an empty message" msgstr "Aufzeichnung einer Änderung mit einer leeren Beschreibung erlauben" -#: builtin/commit.c:1655 +#: builtin/commit.c:1651 msgid "could not parse HEAD commit" msgstr "Konnte Commit von HEAD nicht analysieren." -#: builtin/commit.c:1694 builtin/merge.c:519 +#: builtin/commit.c:1690 builtin/merge.c:519 #, c-format msgid "could not open '%s' for reading" msgstr "Konnte '%s' nicht zum Lesen öffnen." -#: builtin/commit.c:1701 +#: builtin/commit.c:1697 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Beschädigte MERGE_HEAD-Datei (%s)" -#: builtin/commit.c:1708 +#: builtin/commit.c:1704 msgid "could not read MERGE_MODE" msgstr "Konnte MERGE_MODE nicht lesen" -#: builtin/commit.c:1727 +#: builtin/commit.c:1723 #, c-format msgid "could not read commit message: %s" msgstr "Konnte Commit-Beschreibung nicht lesen: %s" -#: builtin/commit.c:1738 +#: builtin/commit.c:1734 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Commit abgebrochen; Sie haben die Beschreibung nicht editiert.\n" -#: builtin/commit.c:1743 +#: builtin/commit.c:1739 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Commit aufgrund leerer Beschreibung abgebrochen.\n" -#: builtin/commit.c:1758 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1754 builtin/merge.c:851 builtin/merge.c:876 msgid "failed to write commit object" msgstr "Fehler beim Schreiben des Commit-Objektes." -#: builtin/commit.c:1791 +#: builtin/commit.c:1787 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -4878,8 +4915,8 @@ msgstr "" "anschließend \"git reset HEAD\" zu Wiederherstellung aus." #: builtin/config.c:8 -msgid "git config [options]" -msgstr "git config [Optionen]" +msgid "git config [<options>]" +msgstr "git config [<Optionen>]" #: builtin/config.c:53 msgid "Config file location" @@ -5034,12 +5071,12 @@ msgid "print sizes in human readable format" msgstr "gibt Größenangaben in menschenlesbaren Format aus" #: builtin/describe.c:17 -msgid "git describe [options] <commit-ish>*" -msgstr "git describe [Optionen] <commit-ish>*" +msgid "git describe [<options>] [<commit-ish>...]" +msgstr "git describe [<Optionen>] [<Commit-Angabe>...]" #: builtin/describe.c:18 -msgid "git describe [options] --dirty" -msgstr "git describe [Optionen] --dirty" +msgid "git describe [<options>] --dirty" +msgstr "git describe [<Optionen>] --dirty" #: builtin/describe.c:217 #, c-format @@ -5178,7 +5215,7 @@ msgstr "Die Option --dirty kann nicht mit Commits verwendet werden." #: builtin/diff.c:86 #, c-format msgid "'%s': not a regular file or symlink" -msgstr "'%s': keine reguläre Datei oder symbolischer Verweis" +msgstr "'%s': keine reguläre Datei oder symbolische Verknüpfung" #: builtin/diff.c:237 #, c-format @@ -5256,183 +5293,183 @@ msgstr "Refspec auf exportierte Referenzen anwenden" msgid "anonymize output" msgstr "Ausgabe anonymisieren" -#: builtin/fetch.c:20 +#: builtin/fetch.c:19 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<Optionen>] [<Repository> [<Refspec>...]]" -#: builtin/fetch.c:21 +#: builtin/fetch.c:20 msgid "git fetch [<options>] <group>" msgstr "git fetch [<Optionen>] <Gruppe>" -#: builtin/fetch.c:22 +#: builtin/fetch.c:21 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<Optionen>] [(<Repository> | <Gruppe>)...]" -#: builtin/fetch.c:23 +#: builtin/fetch.c:22 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<Optionen>]" -#: builtin/fetch.c:90 +#: builtin/fetch.c:89 msgid "fetch from all remotes" msgstr "fordert von allen Remote-Repositories an" -#: builtin/fetch.c:92 +#: builtin/fetch.c:91 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "an .git/FETCH_HEAD anhängen, anstatt zu überschreiben" -#: builtin/fetch.c:94 +#: builtin/fetch.c:93 msgid "path to upload pack on remote end" msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite" -#: builtin/fetch.c:95 +#: builtin/fetch.c:94 msgid "force overwrite of local branch" msgstr "das Ãœberschreiben von lokalen Branches erzwingen" -#: builtin/fetch.c:97 +#: builtin/fetch.c:96 msgid "fetch from multiple remotes" msgstr "von mehreren Remote-Repositories anfordern" -#: builtin/fetch.c:99 +#: builtin/fetch.c:98 msgid "fetch all tags and associated objects" msgstr "alle Tags und verbundene Objekte anfordern" -#: builtin/fetch.c:101 +#: builtin/fetch.c:100 msgid "do not fetch all tags (--no-tags)" msgstr "nicht alle Tags anfordern (--no-tags)" -#: builtin/fetch.c:103 +#: builtin/fetch.c:102 msgid "prune remote-tracking branches no longer on remote" msgstr "" "Remote-Tracking-Branches entfernen, die sich nicht mehr im Remote-Repository " "befinden" -#: builtin/fetch.c:104 +#: builtin/fetch.c:103 msgid "on-demand" msgstr "bei-Bedarf" -#: builtin/fetch.c:105 +#: builtin/fetch.c:104 msgid "control recursive fetching of submodules" msgstr "rekursive Anforderungen von Submodulen kontrollieren" -#: builtin/fetch.c:109 +#: builtin/fetch.c:108 msgid "keep downloaded pack" msgstr "heruntergeladenes Paket behalten" -#: builtin/fetch.c:111 +#: builtin/fetch.c:110 msgid "allow updating of HEAD ref" msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben" -#: builtin/fetch.c:114 +#: builtin/fetch.c:113 msgid "deepen history of shallow clone" msgstr "" "die Historie eines Klons mit unvollständiger Historie (shallow) vertiefen" -#: builtin/fetch.c:116 +#: builtin/fetch.c:115 msgid "convert to a complete repository" msgstr "zu einem vollständigen Repository konvertieren" -#: builtin/fetch.c:118 builtin/log.c:1208 +#: builtin/fetch.c:117 builtin/log.c:1208 msgid "dir" msgstr "Verzeichnis" -#: builtin/fetch.c:119 +#: builtin/fetch.c:118 msgid "prepend this to submodule path output" msgstr "dies an die Ausgabe der Submodul-Pfade voranstellen" -#: builtin/fetch.c:122 +#: builtin/fetch.c:121 msgid "default mode for recursion" msgstr "Standard-Modus für Rekursion" -#: builtin/fetch.c:124 +#: builtin/fetch.c:123 msgid "accept refs that update .git/shallow" msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren" -#: builtin/fetch.c:125 +#: builtin/fetch.c:124 msgid "refmap" msgstr "Refmap" -#: builtin/fetch.c:126 +#: builtin/fetch.c:125 msgid "specify fetch refmap" msgstr "Refmap für 'fetch' angeben" -#: builtin/fetch.c:376 +#: builtin/fetch.c:375 msgid "Couldn't find remote ref HEAD" msgstr "Konnte Remote-Referenz von HEAD nicht finden." -#: builtin/fetch.c:454 +#: builtin/fetch.c:455 #, c-format msgid "object %s not found" msgstr "Objekt %s nicht gefunden" -#: builtin/fetch.c:459 +#: builtin/fetch.c:460 msgid "[up to date]" msgstr "[aktuell]" -#: builtin/fetch.c:473 +#: builtin/fetch.c:474 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "" "! %-*s %-*s -> %s (kann \"fetch\" im aktuellen Branch nicht ausführen)" -#: builtin/fetch.c:474 builtin/fetch.c:560 +#: builtin/fetch.c:475 builtin/fetch.c:561 msgid "[rejected]" msgstr "[zurückgewiesen]" -#: builtin/fetch.c:485 +#: builtin/fetch.c:486 msgid "[tag update]" msgstr "[Tag Aktualisierung]" -#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540 +#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541 msgid " (unable to update local ref)" msgstr " (kann lokale Referenz nicht aktualisieren)" -#: builtin/fetch.c:505 +#: builtin/fetch.c:506 msgid "[new tag]" msgstr "[neues Tag]" -#: builtin/fetch.c:508 +#: builtin/fetch.c:509 msgid "[new branch]" msgstr "[neuer Branch]" -#: builtin/fetch.c:511 +#: builtin/fetch.c:512 msgid "[new ref]" msgstr "[neue Referenz]" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "unable to update local ref" msgstr "kann lokale Referenz nicht aktualisieren" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "forced update" msgstr "Aktualisierung erzwungen" -#: builtin/fetch.c:562 +#: builtin/fetch.c:563 msgid "(non-fast-forward)" msgstr "(kein Vorspulen)" -#: builtin/fetch.c:595 builtin/fetch.c:828 +#: builtin/fetch.c:596 builtin/fetch.c:829 #, c-format msgid "cannot open %s: %s\n" msgstr "kann %s nicht öffnen: %s\n" -#: builtin/fetch.c:604 +#: builtin/fetch.c:605 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n" -#: builtin/fetch.c:622 +#: builtin/fetch.c:623 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "%s wurde zurückgewiesen, da Ursprungs-Commits von Repositoriesmit " "unvollständiger Historie (shallow) nicht aktualisiert werden dürfen." -#: builtin/fetch.c:710 builtin/fetch.c:793 +#: builtin/fetch.c:711 builtin/fetch.c:794 #, c-format msgid "From %.*s\n" msgstr "Von %.*s\n" -#: builtin/fetch.c:721 +#: builtin/fetch.c:722 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5441,57 +5478,57 @@ msgstr "" "Einige lokale Referenzen konnten nicht aktualisiert werden; versuchen Sie\n" "'git remote prune %s', um jeden älteren, widersprüchlichen Branch zu löschen." -#: builtin/fetch.c:773 +#: builtin/fetch.c:774 #, c-format msgid " (%s will become dangling)" msgstr " (%s wird unreferenziert)" -#: builtin/fetch.c:774 +#: builtin/fetch.c:775 #, c-format msgid " (%s has become dangling)" msgstr " (%s wurde unreferenziert)" -#: builtin/fetch.c:798 +#: builtin/fetch.c:799 msgid "[deleted]" msgstr "[gelöscht]" -#: builtin/fetch.c:799 builtin/remote.c:1060 +#: builtin/fetch.c:800 builtin/remote.c:1060 msgid "(none)" msgstr "(nichts)" -#: builtin/fetch.c:818 +#: builtin/fetch.c:819 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" "Der \"fetch\" in den aktuellen Branch %s von einem nicht-Bare-Repository " "wurde verweigert." -#: builtin/fetch.c:837 +#: builtin/fetch.c:838 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Option \"%s\" Wert \"%s\" ist nicht gültig für %s" -#: builtin/fetch.c:840 +#: builtin/fetch.c:841 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Option \"%s\" wird ignoriert für %s\n" -#: builtin/fetch.c:896 +#: builtin/fetch.c:897 #, c-format msgid "Don't know how to fetch from %s" msgstr "Weiß nicht wie von %s angefordert wird." -#: builtin/fetch.c:1058 +#: builtin/fetch.c:1059 #, c-format msgid "Fetching %s\n" msgstr "Fordere an von %s\n" -#: builtin/fetch.c:1060 builtin/remote.c:90 +#: builtin/fetch.c:1061 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "Konnte nicht von %s anfordern" -#: builtin/fetch.c:1078 +#: builtin/fetch.c:1079 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5500,44 +5537,46 @@ msgstr "" "oder den Namen des Remote-Repositories an, von welchem neue\n" "Commits angefordert werden sollen." -#: builtin/fetch.c:1101 +#: builtin/fetch.c:1102 msgid "You need to specify a tag name." msgstr "Sie müssen den Namen des Tags angeben." -#: builtin/fetch.c:1143 +#: builtin/fetch.c:1144 msgid "--depth and --unshallow cannot be used together" msgstr "" "Die Optionen --depth und --unshallow können nicht gemeinsam verwendet werden." -#: builtin/fetch.c:1145 +#: builtin/fetch.c:1146 msgid "--unshallow on a complete repository does not make sense" msgstr "" "Die Option --unshallow kann nicht in einem Repository mit unvollständiger " "Historie verwendet werden." -#: builtin/fetch.c:1168 +#: builtin/fetch.c:1169 msgid "fetch --all does not take a repository argument" msgstr "fetch --all akzeptiert kein Repository als Argument" -#: builtin/fetch.c:1170 +#: builtin/fetch.c:1171 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kann nicht mit Refspecs verwendet werden." -#: builtin/fetch.c:1181 +#: builtin/fetch.c:1182 #, c-format msgid "No such remote or remote group: %s" msgstr "Kein Remote-Repository (einzeln oder Gruppe): %s" -#: builtin/fetch.c:1189 +#: builtin/fetch.c:1190 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" "Das Abholen einer Gruppe von Remote-Repositories kann nicht mit der Angabe\n" "von Refspecs verwendet werden." #: builtin/fmt-merge-msg.c:13 -msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" +msgid "" +"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" -"git fmt-merge-msg [-m <Beschreibung>] [--log[=<n>]|--no-log] [--file <Datei>]" +"git fmt-merge-msg [-m <Beschreibung>] [--log[=<n>] | --no-log] [--file " +"<Datei>]" #: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182 @@ -5566,51 +5605,51 @@ msgstr "<Text> als Beschreibungsanfang verwenden" msgid "file to read from" msgstr "Datei zum Einlesen" -#: builtin/for-each-ref.c:676 +#: builtin/for-each-ref.c:675 msgid "unable to parse format" msgstr "Konnte Format nicht parsen." -#: builtin/for-each-ref.c:1064 -msgid "git for-each-ref [options] [<pattern>]" -msgstr "git for-each-ref [Optionen] [<Muster>]" +#: builtin/for-each-ref.c:1063 +msgid "git for-each-ref [<options>] [<pattern>]" +msgstr "git for-each-ref [<Optionen>] [<Muster>]" -#: builtin/for-each-ref.c:1079 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for shells" msgstr "Platzhalter als Shell-String formatieren" -#: builtin/for-each-ref.c:1081 +#: builtin/for-each-ref.c:1080 msgid "quote placeholders suitably for perl" msgstr "Platzhalter als Perl-String formatieren" -#: builtin/for-each-ref.c:1083 +#: builtin/for-each-ref.c:1082 msgid "quote placeholders suitably for python" msgstr "Platzhalter als Python-String formatieren" -#: builtin/for-each-ref.c:1085 +#: builtin/for-each-ref.c:1084 msgid "quote placeholders suitably for Tcl" msgstr "Platzhalter als Tcl-String formatieren" -#: builtin/for-each-ref.c:1088 +#: builtin/for-each-ref.c:1087 msgid "show only <n> matched refs" msgstr "nur <n> passende Referenzen anzeigen" -#: builtin/for-each-ref.c:1089 builtin/replace.c:438 +#: builtin/for-each-ref.c:1088 builtin/replace.c:438 msgid "format" msgstr "Format" -#: builtin/for-each-ref.c:1089 +#: builtin/for-each-ref.c:1088 msgid "format to use for the output" msgstr "für die Ausgabe zu verwendendes Format" -#: builtin/for-each-ref.c:1090 +#: builtin/for-each-ref.c:1089 msgid "key" msgstr "Schüssel" -#: builtin/for-each-ref.c:1091 +#: builtin/for-each-ref.c:1090 msgid "field name to sort on" msgstr "sortiere nach diesem Feld" -#: builtin/fsck.c:147 builtin/prune.c:136 +#: builtin/fsck.c:147 builtin/prune.c:137 msgid "Checking connectivity" msgstr "Prüfe Konnektivität" @@ -5619,8 +5658,8 @@ msgid "Checking object directories" msgstr "Prüfe Objekt-Verzeichnisse" #: builtin/fsck.c:603 -msgid "git fsck [options] [<object>...]" -msgstr "git fsck [Optionen] [<Objekt>...]" +msgid "git fsck [<options>] [<object>...]" +msgstr "git fsck [<Optionen>] [<Objekt>...]" #: builtin/fsck.c:609 msgid "show unreachable objects" @@ -5667,8 +5706,8 @@ msgid "Checking objects" msgstr "Prüfe Objekte" #: builtin/gc.c:24 -msgid "git gc [options]" -msgstr "git gc [Optionen]" +msgid "git gc [<options>]" +msgstr "git gc [<Optionen>]" #: builtin/gc.c:79 #, c-format @@ -5733,8 +5772,8 @@ msgstr "" "diese zu löschen." #: builtin/grep.c:23 -msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" -msgstr "git grep [Optionen] [-e] <Muster> [<Commit>...] [[--] <Pfad>...]" +msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" +msgstr "git grep [<Optionen>] [-e] <Muster> [<Commit>...] [[--] <Pfad>...]" #: builtin/grep.c:218 #, c-format @@ -5774,8 +5813,8 @@ msgid "search in both tracked and untracked files" msgstr "in versionierten und unversionierten Dateien suchen" #: builtin/grep.c:644 -msgid "search also in ignored files" -msgstr "auch in ignorierten Dateien suchen" +msgid "ignore files specified via '.gitignore'" +msgstr "Dateien, die über '.gitignore' angegeben sind, ignorieren" #: builtin/grep.c:647 msgid "show non-matching lines" @@ -5971,17 +6010,17 @@ msgstr "Die Option --cached kann nicht mit \"Tree\"-Objekten verwendet werden." #: builtin/hash-object.c:82 msgid "" -"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " -"<file>..." +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " +"[--] <file>..." msgstr "" -"git hash-object [-t <Art>] [-w] [--path=<Datei>|--no-filters] [--stdin] [--] " -"<Datei>..." +"git hash-object [-t <Art>] [-w] [--path=<Datei> | --no-filters] [--stdin] " +"[--] <Datei>..." #: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "git hash-object --stdin-paths < <Liste-von-Pfaden>" -#: builtin/hash-object.c:94 builtin/tag.c:610 +#: builtin/hash-object.c:94 builtin/tag.c:612 msgid "type" msgstr "Art" @@ -6033,8 +6072,8 @@ msgid "show info page" msgstr "Info-Seite anzeigen" #: builtin/help.c:52 -msgid "git help [--all] [--guides] [--man|--web|--info] [command]" -msgstr "git help [--all] [--guides] [--man|--web|--info] [Kommando]" +msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" +msgstr "git help [--all] [--guides] [--man | --web | --info] [<Kommando>]" #: builtin/help.c:64 #, c-format @@ -6243,8 +6282,8 @@ msgstr "ernsthafte Inkonsistenz nach Dekomprimierung" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1 KOLLISION MIT %s GEFUNDEN !" -#: builtin/index-pack.c:689 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:256 +#: builtin/index-pack.c:689 builtin/pack-objects.c:162 +#: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "kann %s nicht lesen" @@ -6331,97 +6370,97 @@ msgid_plural "pack has %d unresolved deltas" msgstr[0] "Paket hat %d unaufgelöste Unterschied" msgstr[1] "Paket hat %d unaufgelöste Unterschiede" -#: builtin/index-pack.c:1220 +#: builtin/index-pack.c:1219 #, c-format msgid "unable to deflate appended object (%d)" msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren" -#: builtin/index-pack.c:1299 +#: builtin/index-pack.c:1298 #, c-format msgid "local object %s is corrupt" msgstr "lokales Objekt %s ist beschädigt" -#: builtin/index-pack.c:1323 +#: builtin/index-pack.c:1322 msgid "error while closing pack file" msgstr "Fehler beim Schließen der Paketdatei" -#: builtin/index-pack.c:1336 +#: builtin/index-pack.c:1335 #, c-format msgid "cannot write keep file '%s'" msgstr "Kann Paketbeschreibungsdatei '%s' nicht schreiben" -#: builtin/index-pack.c:1344 +#: builtin/index-pack.c:1343 #, c-format msgid "cannot close written keep file '%s'" msgstr "Kann eben erstellte Paketbeschreibungsdatei '%s' nicht schließen" -#: builtin/index-pack.c:1357 +#: builtin/index-pack.c:1356 msgid "cannot store pack file" msgstr "Kann Paketdatei nicht speichern" -#: builtin/index-pack.c:1368 +#: builtin/index-pack.c:1367 msgid "cannot store index file" msgstr "Kann Indexdatei nicht speichern" -#: builtin/index-pack.c:1401 +#: builtin/index-pack.c:1400 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig" -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1406 #, c-format msgid "invalid number of threads specified (%d)" msgstr "ungültige Anzahl von Threads angegeben (%d)" -#: builtin/index-pack.c:1411 builtin/index-pack.c:1590 +#: builtin/index-pack.c:1410 builtin/index-pack.c:1589 #, c-format msgid "no threads support, ignoring %s" msgstr "keine Unterstützung von Threads, '%s' wird ignoriert" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1468 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kann existierende Paketdatei '%s' nicht öffnen" -#: builtin/index-pack.c:1471 +#: builtin/index-pack.c:1470 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Kann existierende Indexdatei für Paket '%s' nicht öffnen" -#: builtin/index-pack.c:1518 +#: builtin/index-pack.c:1517 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "kein Unterschied: %d Objekt" msgstr[1] "kein Unterschied: %d Objekte" -#: builtin/index-pack.c:1525 +#: builtin/index-pack.c:1524 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "Länge der Objekt-Liste = %d: %lu Objekt" msgstr[1] "Länge der Objekt-Liste = %d: %lu Objekte" -#: builtin/index-pack.c:1554 +#: builtin/index-pack.c:1553 msgid "Cannot come back to cwd" msgstr "Kann nicht zurück zu Arbeitsverzeichnis wechseln" -#: builtin/index-pack.c:1602 builtin/index-pack.c:1605 -#: builtin/index-pack.c:1617 builtin/index-pack.c:1621 +#: builtin/index-pack.c:1601 builtin/index-pack.c:1604 +#: builtin/index-pack.c:1616 builtin/index-pack.c:1620 #, c-format msgid "bad %s" msgstr "%s ist ungültig" -#: builtin/index-pack.c:1635 +#: builtin/index-pack.c:1634 msgid "--fix-thin cannot be used without --stdin" msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden." -#: builtin/index-pack.c:1639 builtin/index-pack.c:1648 +#: builtin/index-pack.c:1638 builtin/index-pack.c:1647 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'" -#: builtin/index-pack.c:1656 +#: builtin/index-pack.c:1655 msgid "--verify with no packfile name given" msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben." @@ -6458,12 +6497,12 @@ msgstr "kann Verweis '%s' nicht lesen" #: builtin/init-db.c:99 #, c-format msgid "insanely long symlink %s" -msgstr "zu langer symbolischer Verweis %s" +msgstr "zu lange symbolische Verknüpfung %s" #: builtin/init-db.c:102 #, c-format msgid "cannot symlink '%s' '%s'" -msgstr "kann symbolischen Verweis '%s' auf '%s' nicht erstellen" +msgstr "kann symbolische Verknüpfung '%s' auf '%s' nicht erstellen" #: builtin/init-db.c:106 #, c-format @@ -6533,10 +6572,10 @@ msgstr " gemeinsames" #: builtin/init-db.c:475 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" -"shared[=<permissions>]] [directory]" +"shared[=<permissions>]] [<directory>]" msgstr "" "git init [-q | --quiet] [--bare] [--template=<Vorlagenverzeichnis>] [--" -"shared[=<Berechtigungen>]] [Verzeichnis]" +"shared[=<Berechtigungen>]] [<Verzeichnis>]" #: builtin/init-db.c:498 msgid "permissions" @@ -6599,8 +6638,8 @@ msgid "git log [<options>] [<revision range>] [[--] <path>...]" msgstr "git log [<Optionen>] [<Commitbereich>] [[--] <Pfad>...]" #: builtin/log.c:42 -msgid "git show [options] <object>..." -msgstr "git show [Optionen] <Objekt>..." +msgid "git show [<options>] <object>..." +msgstr "git show [<Optionen>] <Objekt>..." #: builtin/log.c:81 #, c-format @@ -6678,8 +6717,8 @@ msgid "insane in-reply-to: %s" msgstr "ungültiges in-reply-to: %s" #: builtin/log.c:1026 -msgid "git format-patch [options] [<since> | <revision range>]" -msgstr "git format-patch [Optionen] [<seit> | <Commitbereich>]" +msgid "git format-patch [<options>] [<since> | <revision-range>]" +msgstr "git format-patch [<Optionen>] [<seit> | <Commitbereich>]" #: builtin/log.c:1071 msgid "Two output directories?" @@ -6880,102 +6919,102 @@ msgstr "" msgid "Unknown commit %s" msgstr "Unbekannter Commit %s" -#: builtin/ls-files.c:401 -msgid "git ls-files [options] [<file>...]" -msgstr "git ls-files [Optionen] [<Datei>...]" +#: builtin/ls-files.c:358 +msgid "git ls-files [<options>] [<file>...]" +msgstr "git ls-files [<Optionen>] [<Datei>...]" -#: builtin/ls-files.c:458 +#: builtin/ls-files.c:415 msgid "identify the file status with tags" msgstr "den Dateistatus mit Tags anzeigen" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:417 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" "Kleinbuchstaben für Dateien mit 'assume unchanged' Markierung verwenden" -#: builtin/ls-files.c:462 +#: builtin/ls-files.c:419 msgid "show cached files in the output (default)" msgstr "zwischengespeicherte Dateien in der Ausgabe anzeigen (Standard)" -#: builtin/ls-files.c:464 +#: builtin/ls-files.c:421 msgid "show deleted files in the output" msgstr "entfernte Dateien in der Ausgabe anzeigen" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:423 msgid "show modified files in the output" msgstr "geänderte Dateien in der Ausgabe anzeigen" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:425 msgid "show other files in the output" msgstr "sonstige Dateien in der Ausgabe anzeigen" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:427 msgid "show ignored files in the output" msgstr "ignorierte Dateien in der Ausgabe anzeigen" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:430 msgid "show staged contents' object name in the output" msgstr "" "Objektnamen von Inhalten, die zum Commit vorgemerkt sind, in der Ausgabe " "anzeigen" -#: builtin/ls-files.c:475 +#: builtin/ls-files.c:432 msgid "show files on the filesystem that need to be removed" msgstr "Dateien im Dateisystem, die gelöscht werden müssen, anzeigen" -#: builtin/ls-files.c:477 +#: builtin/ls-files.c:434 msgid "show 'other' directories' names only" msgstr "nur Namen von 'sonstigen' Verzeichnissen anzeigen" -#: builtin/ls-files.c:480 +#: builtin/ls-files.c:437 msgid "don't show empty directories" msgstr "keine leeren Verzeichnisse anzeigen" -#: builtin/ls-files.c:483 +#: builtin/ls-files.c:440 msgid "show unmerged files in the output" msgstr "nicht zusammengeführte Dateien in der Ausgabe anzeigen" -#: builtin/ls-files.c:485 +#: builtin/ls-files.c:442 msgid "show resolve-undo information" msgstr "'resolve-undo' Informationen anzeigen" -#: builtin/ls-files.c:487 +#: builtin/ls-files.c:444 msgid "skip files matching pattern" msgstr "Dateien auslassen, die einem Muster entsprechen" -#: builtin/ls-files.c:490 +#: builtin/ls-files.c:447 msgid "exclude patterns are read from <file>" msgstr "Muster, gelesen von <Datei>, ausschließen" -#: builtin/ls-files.c:493 +#: builtin/ls-files.c:450 msgid "read additional per-directory exclude patterns in <file>" msgstr "zusätzliche pro-Verzeichnis Auschlussmuster aus <Datei> auslesen" -#: builtin/ls-files.c:495 +#: builtin/ls-files.c:452 msgid "add the standard git exclusions" msgstr "die standardmäßigen Git-Ausschlüsse hinzufügen" -#: builtin/ls-files.c:498 +#: builtin/ls-files.c:455 msgid "make the output relative to the project top directory" msgstr "Ausgabe relativ zum Projektverzeichnis" -#: builtin/ls-files.c:501 +#: builtin/ls-files.c:458 msgid "if any <file> is not in the index, treat this as an error" msgstr "" "als Fehler behandeln, wenn sich eine <Datei> nicht in der Staging-Area " "befindet" -#: builtin/ls-files.c:502 +#: builtin/ls-files.c:459 msgid "tree-ish" msgstr "Commit-Referenz" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:460 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "vorgeben, dass Pfade, die seit <Commit-Referenz> gelöscht wurden, immer noch " "vorhanden sind" -#: builtin/ls-files.c:505 +#: builtin/ls-files.c:462 msgid "show debugging data" msgstr "Ausgaben zur Fehlersuche anzeigen" @@ -7018,12 +7057,12 @@ msgstr "" "(impliziert --full-name)" #: builtin/merge.c:45 -msgid "git merge [options] [<commit>...]" -msgstr "git merge [Optionen] [<Commit>...]" +msgid "git merge [<options>] [<commit>...]" +msgstr "git merge [<Optionen>] [<Commit>...]" #: builtin/merge.c:46 -msgid "git merge [options] <msg> HEAD <commit>" -msgstr "git merge [Optionen] <Beschreibung> HEAD <Commit>" +msgid "git merge [<options>] <msg> HEAD <commit>" +msgstr "git merge [<Optionen>] <Beschreibung> HEAD <Commit>" #: builtin/merge.c:47 msgid "git merge --abort" @@ -7335,7 +7374,7 @@ msgstr "Aktualisiere %s..%s\n" #: builtin/merge.c:1388 #, c-format msgid "Trying really trivial in-index merge...\n" -msgstr "Probiere wirklich trivialen \"in-index\"-Merge...\n" +msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n" #: builtin/merge.c:1395 #, c-format @@ -7349,12 +7388,12 @@ msgstr "Vorspulen nicht möglich, breche ab." #: builtin/merge.c:1450 builtin/merge.c:1529 #, c-format msgid "Rewinding the tree to pristine...\n" -msgstr "Rücklauf des Verzeichnisses bis zum Ursprung...\n" +msgstr "Rücklauf des Verzeichnisses bis zum Ursprung ...\n" #: builtin/merge.c:1454 #, c-format msgid "Trying merge strategy %s...\n" -msgstr "Probiere Merge-Strategie %s...\n" +msgstr "Probiere Merge-Strategie %s ...\n" #: builtin/merge.c:1520 #, c-format @@ -7378,12 +7417,12 @@ msgstr "" "Automatischer Merge abgeschlossen; halte, wie gewünscht, vor dem Commit an\n" #: builtin/merge-base.c:29 -msgid "git merge-base [-a|--all] <commit> <commit>..." -msgstr "git merge-base [-a|--all] <Commit> <Commit>..." +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "git merge-base [-a | --all] <Commit> <Commit>..." #: builtin/merge-base.c:30 -msgid "git merge-base [-a|--all] --octopus <commit>..." -msgstr "git merge-base [-a|--all] --octopus <Commit>..." +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "git merge-base [-a | --all] --octopus <Commit>..." #: builtin/merge-base.c:31 msgid "git merge-base --independent <commit>..." @@ -7419,11 +7458,11 @@ msgstr "<Commit> finden, von wo Reflog von <Referenz> abgespalten wurde" #: builtin/merge-file.c:8 msgid "" -"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " -"file2" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" msgstr "" -"git merge-file [Optionen] [-L Name1 [-L orig [-L Name2]]] Datei1 orig_Datei " -"Datei2" +"git merge-file [<Optionen>] [-L <Name1> [-L <orig> [-L <Name2>]]] <Datei1> " +"<orig-Datei> <Datei2>" #: builtin/merge-file.c:33 msgid "send results to standard output" @@ -7454,8 +7493,8 @@ msgid "do not warn about conflicts" msgstr "keine Warnung bei Konflikten" #: builtin/merge-file.c:45 -msgid "set labels for file1/orig_file/file2" -msgstr "Beschriftung für Datei1/orig_Datei/Datei2 setzen" +msgid "set labels for file1/orig-file/file2" +msgstr "Beschriftung für Datei1/orig-Datei/Datei2 setzen" #: builtin/mktree.c:64 msgid "git mktree [-z] [--missing] [--batch]" @@ -7474,8 +7513,8 @@ msgid "allow creation of more than one tree" msgstr "die Erstellung von mehr als einem \"Tree\"-Objekt erlauben" #: builtin/mv.c:15 -msgid "git mv [options] <source>... <destination>" -msgstr "git mv [Optionen] <Quelle>... <Ziel>" +msgid "git mv [<options>] <source>... <destination>" +msgstr "git mv [<Optionen>] <Quelle>... <Ziel>" #: builtin/mv.c:69 #, c-format @@ -7563,22 +7602,22 @@ msgstr "%s, Quelle=%s, Ziel=%s" msgid "Renaming %s to %s\n" msgstr "Benenne %s nach %s um\n" -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:355 +#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359 #, c-format msgid "renaming '%s' failed" msgstr "Umbenennung von '%s' fehlgeschlagen" #: builtin/name-rev.c:255 -msgid "git name-rev [options] <commit>..." -msgstr "git name-rev [Optionen] <Commit>..." +msgid "git name-rev [<options>] <commit>..." +msgstr "git name-rev [<Optionen>] <Commit>..." #: builtin/name-rev.c:256 -msgid "git name-rev [options] --all" -msgstr "git name-rev [Optionen] --all" +msgid "git name-rev [<options>] --all" +msgstr "git name-rev [<Optionen>] --all" #: builtin/name-rev.c:257 -msgid "git name-rev [options] --stdin" -msgstr "git name-rev [Optionen] --stdin" +msgid "git name-rev [<options>] --stdin" +msgstr "git name-rev [<Optionen>] --stdin" #: builtin/name-rev.c:309 msgid "print only names (no SHA-1)" @@ -7609,43 +7648,43 @@ msgid "dereference tags in the input (internal use)" msgstr "Tags in der Eingabe dereferenzieren (interne Verwendung)" #: builtin/notes.c:24 -msgid "git notes [--ref <notes_ref>] [list [<object>]]" +msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <Notiz-Referenz>] [list [<Objekt>]]" #: builtin/notes.c:25 msgid "" -"git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" msgstr "" "git notes [--ref <Notiz-Referenz>] add [-f] [--allow-empty] [-m " "<Beschreibung> | -F <Datei> | (-c | -C) <Objekt>] [<Objekt>]" #: builtin/notes.c:26 -msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" +msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "" "git notes [--ref <Notiz-Referenz>] copy [-f] <von-Objekt> <nach-Objekt>" #: builtin/notes.c:27 msgid "" -"git notes [--ref <notes_ref>] append [--allow-empty] [-m <msg> | -F <file> | " +"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" msgstr "" "git notes [--ref <Notiz-Referenz>] append [--allow-empty] [-m <Beschreibung> " "| -F <Datei> | (-c | -C) <Objekt>] [<Objekt>]" #: builtin/notes.c:28 -msgid "git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]" +msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "git notes [--ref <Notiz-Referenz>] edit [--allow-empty] [<Objekt>]" #: builtin/notes.c:29 -msgid "git notes [--ref <notes_ref>] show [<object>]" +msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "git notes [--ref <Notiz-Referenz>] show [<Objekt>]" #: builtin/notes.c:30 msgid "" -"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" +"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "" -"git notes [--ref <Notiz-Referenz>] merge [-v | -q] [-s <Strategie> ] <Notiz-" +"git notes [--ref <Notiz-Referenz>] merge [-v | -q] [-s <Strategie>] <Notiz-" "Referenz>" #: builtin/notes.c:31 @@ -7657,15 +7696,15 @@ msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" #: builtin/notes.c:33 -msgid "git notes [--ref <notes_ref>] remove [<object>...]" +msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref <Notiz-Referenz>] remove [<Objekt>...]" #: builtin/notes.c:34 -msgid "git notes [--ref <notes_ref>] prune [-n | -v]" +msgid "git notes [--ref <notes-ref>] prune [-n | -v]" msgstr "git notes [--ref <Notiz-Referenz>] prune [-n | -v]" #: builtin/notes.c:35 -msgid "git notes [--ref <notes_ref>] get-ref" +msgid "git notes [--ref <notes-ref>] get-ref" msgstr "git notes [--ref <Notiz-Referenz>] get-ref" #: builtin/notes.c:40 @@ -7697,7 +7736,7 @@ msgid "git notes show [<object>]" msgstr "git notes show [<Objekt>]" #: builtin/notes.c:71 -msgid "git notes merge [<options>] <notes_ref>" +msgid "git notes merge [<options>] <notes-ref>" msgstr "git notes merge [<Optionen>] <Notiz-Referenz>" #: builtin/notes.c:72 @@ -7939,7 +7978,7 @@ msgid "notes-ref" msgstr "Notiz-Referenz" #: builtin/notes.c:954 -msgid "use notes from <notes_ref>" +msgid "use notes from <notes-ref>" msgstr "Notizen von <Notiz-Referenz> verwenden" #: builtin/notes.c:989 builtin/remote.c:1621 @@ -7957,197 +7996,197 @@ msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" msgstr "" "git pack-objects [Optionen...] Basis-Name [< Referenzliste | < Objektliste]" -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 +#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 #, c-format msgid "deflate error (%d)" msgstr "Fehler beim Komprimieren (%d)" -#: builtin/pack-objects.c:773 +#: builtin/pack-objects.c:771 msgid "Writing objects" msgstr "Schreibe Objekte" -#: builtin/pack-objects.c:1015 +#: builtin/pack-objects.c:1013 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "Deaktiviere Schreiben des Bitmap-Index, da einige Objekte nicht in\n" "eine Pack-Datei geschrieben wurden" -#: builtin/pack-objects.c:2175 +#: builtin/pack-objects.c:2173 msgid "Compressing objects" msgstr "Komprimiere Objekte" -#: builtin/pack-objects.c:2572 +#: builtin/pack-objects.c:2570 #, c-format msgid "unsupported index version %s" msgstr "Nicht unterstützte Staging-Area-Version %s" -#: builtin/pack-objects.c:2576 +#: builtin/pack-objects.c:2574 #, c-format msgid "bad index version '%s'" msgstr "Ungültige Staging-Area-Version '%s'" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2597 #, c-format msgid "option %s does not accept negative form" msgstr "Option %s akzeptiert keine negative Form" -#: builtin/pack-objects.c:2603 +#: builtin/pack-objects.c:2601 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "konnte Wert '%s' für Option %s nicht parsen" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2621 msgid "do not show progress meter" msgstr "keine Fortschrittsanzeige anzeigen" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2623 msgid "show progress meter" msgstr "Fortschrittsanzeige anzeigen" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2625 msgid "show progress meter during object writing phase" msgstr "" "Forschrittsanzeige während der Phase des Schreibens der Objekte anzeigen" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2628 msgid "similar to --all-progress when progress meter is shown" msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2629 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2632 +#: builtin/pack-objects.c:2630 msgid "write the pack index file in the specified idx format version" msgstr "" "die Index-Datei des Paketes in der angegebenen Indexformat-Version schreiben" -#: builtin/pack-objects.c:2635 +#: builtin/pack-objects.c:2633 msgid "maximum size of each output pack file" msgstr "maximale Größe für jede ausgegebene Paketdatei" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2635 msgid "ignore borrowed objects from alternate object store" msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:2637 msgid "ignore packed objects" msgstr "gepackte Objekte ignorieren" -#: builtin/pack-objects.c:2641 +#: builtin/pack-objects.c:2639 msgid "limit pack window by objects" msgstr "Paketfenster durch Objekte begrenzen" -#: builtin/pack-objects.c:2643 +#: builtin/pack-objects.c:2641 msgid "limit pack window by memory in addition to object limit" msgstr "" "Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher begrenzen" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2643 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "maximale Länge der erlaubten Differenzverkettung im resultierenden Paket" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2645 msgid "reuse existing deltas" msgstr "existierende Unterschiede wiederverwenden" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2647 msgid "reuse existing objects" msgstr "existierende Objekte wiederverwenden" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2649 msgid "use OFS_DELTA objects" msgstr "OFS_DELTA Objekte verwenden" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2651 msgid "use threads when searching for best delta matches" msgstr "" "Threads bei der Suche nach den besten Ãœbereinstimmungen bei Unterschieden " "verwenden" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2653 msgid "do not create an empty pack output" msgstr "keine leeren Pakete erzeugen" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2655 msgid "read revision arguments from standard input" msgstr "Argumente bezüglich Commits von der Standard-Eingabe lesen" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2657 msgid "limit the objects to those that are not yet packed" msgstr "die Objekte zu solchen, die noch nicht gepackt wurden, begrenzen" -#: builtin/pack-objects.c:2662 +#: builtin/pack-objects.c:2660 msgid "include objects reachable from any reference" msgstr "Objekte einschließen, die von jeder Referenz erreichbar sind" -#: builtin/pack-objects.c:2665 +#: builtin/pack-objects.c:2663 msgid "include objects referred by reflog entries" msgstr "" "Objekte einschließen, die von Einträgen des Reflogs referenziert werden" -#: builtin/pack-objects.c:2668 +#: builtin/pack-objects.c:2666 msgid "include objects referred to by the index" msgstr "Objekte einschließen, die von der Staging-Area referenziert werden" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2669 msgid "output pack to stdout" msgstr "Paket in die Standard-Ausgabe schreiben" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2671 msgid "include tag objects that refer to objects to be packed" msgstr "Tag-Objekte einschließen, die auf gepackte Objekte referenzieren" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2673 msgid "keep unreachable objects" msgstr "nicht erreichbare Objekte behalten" -#: builtin/pack-objects.c:2676 parse-options.h:140 +#: builtin/pack-objects.c:2674 parse-options.h:140 msgid "time" msgstr "Zeit" -#: builtin/pack-objects.c:2677 +#: builtin/pack-objects.c:2675 msgid "unpack unreachable objects newer than <time>" msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind" -#: builtin/pack-objects.c:2680 +#: builtin/pack-objects.c:2678 msgid "create thin packs" msgstr "dünnere Pakete erzeugen" -#: builtin/pack-objects.c:2682 +#: builtin/pack-objects.c:2680 msgid "create packs suitable for shallow fetches" msgstr "" "Pakete geeignet für Abholung mit unvollständiger Historie (shallow) erzeugen" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2682 msgid "ignore packs that have companion .keep file" msgstr "Pakete ignorieren, die .keep Dateien haben" -#: builtin/pack-objects.c:2686 +#: builtin/pack-objects.c:2684 msgid "pack compression level" msgstr "Komprimierungsgrad für Paketierung" -#: builtin/pack-objects.c:2688 +#: builtin/pack-objects.c:2686 msgid "do not hide commits by grafts" msgstr "keine künstlichen Vorgänger-Commits (\"grafts\") verbergen" -#: builtin/pack-objects.c:2690 +#: builtin/pack-objects.c:2688 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "Bitmap-Index (falls verfügbar) zur Optimierung der Objektzählung benutzen" -#: builtin/pack-objects.c:2692 +#: builtin/pack-objects.c:2690 msgid "write a bitmap index together with the pack index" msgstr "Bitmap-Index zusammen mit Pack-Index schreiben" -#: builtin/pack-objects.c:2783 +#: builtin/pack-objects.c:2781 msgid "Counting objects" msgstr "Zähle Objekte" #: builtin/pack-refs.c:6 -msgid "git pack-refs [options]" -msgstr "git pack-refs [Optionen]" +msgid "git pack-refs [<options>]" +msgstr "git pack-refs [<Optionen>]" #: builtin/pack-refs.c:14 msgid "pack everything" @@ -8158,8 +8197,8 @@ msgid "prune loose refs (default)" msgstr "lose Referenzen entfernen (Standard)" #: builtin/prune-packed.c:7 -msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" -msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" +msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" +msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" #: builtin/prune-packed.c:40 msgid "Removing duplicate objects" @@ -8452,75 +8491,79 @@ msgstr "Die Option --mirror kann nicht mit Refspecs kombiniert werden." msgid "--all and --mirror are incompatible" msgstr "Die Optionen --all und --mirror sind inkompatibel." -#: builtin/push.c:493 +#: builtin/push.c:502 msgid "repository" msgstr "Repository" -#: builtin/push.c:494 +#: builtin/push.c:503 msgid "push all refs" msgstr "alle Referenzen versenden" -#: builtin/push.c:495 +#: builtin/push.c:504 msgid "mirror all refs" msgstr "alle Referenzen spiegeln" -#: builtin/push.c:497 +#: builtin/push.c:506 msgid "delete refs" msgstr "Referenzen löschen" -#: builtin/push.c:498 +#: builtin/push.c:507 msgid "push tags (can't be used with --all or --mirror)" msgstr "Tags versenden (kann nicht mit --all oder --mirror verwendet werden)" -#: builtin/push.c:501 +#: builtin/push.c:510 msgid "force updates" msgstr "Aktualisierung erzwingen" -#: builtin/push.c:503 +#: builtin/push.c:512 msgid "refname>:<expect" msgstr "Referenzname>:<Erwartungswert" -#: builtin/push.c:504 +#: builtin/push.c:513 msgid "require old value of ref to be at this value" msgstr "Referenz muss sich auf dem angegebenen Wert befinden" -#: builtin/push.c:507 +#: builtin/push.c:516 msgid "control recursive pushing of submodules" msgstr "rekursiven \"push\" von Submodulen steuern" -#: builtin/push.c:509 +#: builtin/push.c:518 msgid "use thin pack" msgstr "kleinere Pakete verwenden" -#: builtin/push.c:510 builtin/push.c:511 +#: builtin/push.c:519 builtin/push.c:520 msgid "receive pack program" msgstr "'receive pack' Programm" -#: builtin/push.c:512 +#: builtin/push.c:521 msgid "set upstream for git pull/status" msgstr "Upstream für \"git pull/status\" setzen" -#: builtin/push.c:515 +#: builtin/push.c:524 msgid "prune locally removed refs" msgstr "lokal gelöschte Referenzen entfernen" -#: builtin/push.c:517 +#: builtin/push.c:526 msgid "bypass pre-push hook" msgstr "\"pre-push hook\" umgehen" -#: builtin/push.c:518 +#: builtin/push.c:527 msgid "push missing but relevant tags" msgstr "fehlende, aber relevante Tags versenden" -#: builtin/push.c:520 +#: builtin/push.c:529 msgid "GPG sign the push" msgstr "signiert \"push\" mit GPG" -#: builtin/push.c:529 +#: builtin/push.c:530 +msgid "request atomic transaction on remote side" +msgstr "Referenzen atomar versenden" + +#: builtin/push.c:539 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "Die Option --delete ist inkompatibel mit --all, --mirror und --tags." -#: builtin/push.c:531 +#: builtin/push.c:541 msgid "--delete doesn't make sense without any refs" msgstr "Die Option --delete kann nur mit Referenzen verwendet werden." @@ -8599,12 +8642,12 @@ msgstr "Anwendung des Filters für spärliches Auschecken überspringen" msgid "debug unpack-trees" msgstr "Entpacken der Bäume protokollieren" -#: builtin/reflog.c:499 +#: builtin/reflog.c:429 #, c-format msgid "%s' for '%s' is not a valid timestamp" msgstr "'%s' für '%s' ist kein gültiger Zeitstempel" -#: builtin/reflog.c:615 builtin/reflog.c:620 +#: builtin/reflog.c:546 builtin/reflog.c:551 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' ist kein gültiger Zeitstempel" @@ -8615,10 +8658,10 @@ msgstr "git remote [-v | --verbose]" #: builtin/remote.c:13 msgid "" -"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" +"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" -"git remote add [-t <Branch>] [-m <master>] [-f] [--tags|--no-tags] [--" +"git remote add [-t <Branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <Name> <URL>" #: builtin/remote.c:14 builtin/remote.c:33 @@ -8629,8 +8672,8 @@ msgstr "git remote rename <alt> <neu>" msgid "git remote remove <name>" msgstr "git remote remove <Name>" -#: builtin/remote.c:16 -msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" +#: builtin/remote.c:16 builtin/remote.c:43 +msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <Name> (-a | --auto | -d | --delete | <Branch>)" #: builtin/remote.c:17 @@ -8667,10 +8710,6 @@ msgstr "git remote set-url --delete <Name> <URL>" msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<Optionen>] <Name> <URL>" -#: builtin/remote.c:43 -msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" -msgstr "git remote set-head <Name> (-a | --auto | -d | --delete | <Branch>)" - #: builtin/remote.c:48 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <Name> <Branch>..." @@ -9116,8 +9155,8 @@ msgid "be verbose; must be placed before a subcommand" msgstr "erweiterte Ausgaben; muss vor einem Unterkommando angegeben werden" #: builtin/repack.c:17 -msgid "git repack [options]" -msgstr "git repack [Optionen]" +msgid "git repack [<options>]" +msgstr "git repack [<Optionen>]" #: builtin/repack.c:159 msgid "pack everything in a single pack" @@ -9186,7 +9225,7 @@ msgid "repack objects in packs marked with .keep" msgstr "" "Objekte umpacken, die sich in mit .keep markierten Pack-Dateien befinden" -#: builtin/repack.c:371 +#: builtin/repack.c:375 #, c-format msgid "removing '%s' failed" msgstr "Löschen von '%s' fehlgeschlagen" @@ -9278,8 +9317,8 @@ msgid "use this format" msgstr "das angegebene Format benutzen" #: builtin/rerere.c:12 -msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" -msgstr "git rerere [clean | forget path... | status | remaining | diff | gc]" +msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" +msgstr "git rerere [clean | forget <Pfad>... | status | remaining | diff | gc]" #: builtin/rerere.c:57 msgid "register clean resolutions in index" @@ -9419,8 +9458,8 @@ msgid "Could not write new index file." msgstr "Konnte neue Staging-Area-Datei nicht schreiben." #: builtin/rev-parse.c:361 -msgid "git rev-parse --parseopt [options] -- [<args>...]" -msgstr "git rev-parse --parseopt [Optionen] -- [<Argumente>...]" +msgid "git rev-parse --parseopt [<options>] -- [<args>...]" +msgstr "git rev-parse --parseopt [<Optionen>] -- [<Argumente>...]" #: builtin/rev-parse.c:366 msgid "keep the `--` passed as an arg" @@ -9437,30 +9476,30 @@ msgstr "" #: builtin/rev-parse.c:499 msgid "" -"git rev-parse --parseopt [options] -- [<args>...]\n" +"git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" -" or: git rev-parse [options] [<arg>...]\n" +" or: git rev-parse [<options>] [<arg>...]\n" "\n" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "" -"git rev-parse --parseopt [Optionen] -- [<Argumente>...]\n" +"git rev-parse --parseopt [<Optionen>] -- [<Argumente>...]\n" " oder: git rev-parse --sq-quote [<Argumente>...]\n" -" oder: git rev-parse [Optionen] [<Argumente>...]\n" +" oder: git rev-parse [<Optionen>] [<Argumente>...]\n" "\n" "Führen Sie \"git rev-parse --parseopt -h\" für weitere Informationen bei " "erster Verwendung aus." #: builtin/revert.c:22 -msgid "git revert [options] <commit-ish>..." -msgstr "git revert [Optionen] <Commit-Angabe>..." +msgid "git revert [<options>] <commit-ish>..." +msgstr "git revert [<Optionen>] <Commit-Angabe>..." #: builtin/revert.c:23 msgid "git revert <subcommand>" msgstr "git revert <Unterkommando>" #: builtin/revert.c:28 -msgid "git cherry-pick [options] <commit-ish>..." -msgstr "git cherry-pick [Optionen] <Commit-Angabe>..." +msgid "git cherry-pick [<options>] <commit-ish>..." +msgstr "git cherry-pick [<Optionen>] <Commit-Angabe>..." #: builtin/revert.c:29 msgid "git cherry-pick <subcommand>" @@ -9540,8 +9579,8 @@ msgid "cherry-pick failed" msgstr "\"cherry-pick\" fehlgeschlagen" #: builtin/rm.c:17 -msgid "git rm [options] [--] <file>..." -msgstr "git rm [Optionen] [--] [<Datei>...]" +msgid "git rm [<options>] [--] <file>..." +msgstr "git rm [<Optionen>] [--] <Datei>..." #: builtin/rm.c:65 msgid "" @@ -9648,8 +9687,8 @@ msgid "git rm: unable to remove %s" msgstr "git rm: konnte %s nicht löschen" #: builtin/shortlog.c:13 -msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]" -msgstr "git shortlog [<Optionen>] [Commitbereich] [[--] <Pfad>...]" +msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" +msgstr "git shortlog [<Optionen>] [<Commitbereich>] [[--] [<Pfad>...]]" #: builtin/shortlog.c:131 #, c-format @@ -9678,19 +9717,19 @@ msgstr "Ausgabe mit Zeilenumbrüchen" #: builtin/show-branch.c:9 msgid "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" msgstr "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<Wann>] | --no-color] [--sparse]\n" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<Commit> | <glob>)...]" #: builtin/show-branch.c:13 -msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" -msgstr "git show-branch (-g|--reflog)[=<n>[,<Basis>]] [--list] [<Referenz>]" +msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" +msgstr "git show-branch (-g | --reflog)[=<n>[,<Basis>]] [--list] [<Referenz>]" #: builtin/show-branch.c:652 msgid "show remote-tracking and local branches" @@ -9759,11 +9798,11 @@ msgstr "die <n> jüngsten Einträge im Reflog, beginnend an der Basis, anzeigen" #: builtin/show-ref.c:10 msgid "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" msgstr "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<Muster>...] " #: builtin/show-ref.c:11 msgid "git show-ref --exclude-existing[=pattern] < ref-list" @@ -9806,12 +9845,12 @@ msgstr "" "Repository befinden" #: builtin/symbolic-ref.c:7 -msgid "git symbolic-ref [options] name [ref]" -msgstr "git symbolic-ref [Optionen] name [ref]" +msgid "git symbolic-ref [<options>] <name> [<ref>]" +msgstr "git symbolic-ref [<Optionen>] <Name> [<Referenz>]" #: builtin/symbolic-ref.c:8 -msgid "git symbolic-ref -d [-q] name" -msgstr "git symbolic-ref -d [-q] name" +msgid "git symbolic-ref -d [-q] <name>" +msgstr "git symbolic-ref -d [-q] <Name>" #: builtin/symbolic-ref.c:40 msgid "suppress error message for non-symbolic (detached) refs" @@ -9836,9 +9875,10 @@ msgstr "Grund für die Aktualisierung" #: builtin/tag.c:22 msgid "" -"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " +"[<head>]" msgstr "" -"git tag [-a|-s|-u <Schlüssel-id>] [-f] [-m <Beschreibung>|-F <Datei>] " +"git tag [-a | -s | -u <Schlüssel-id>] [-f] [-m <Beschreibung> | -F <Datei>] " "<Tagname> [<Commit>]" #: builtin/tag.c:23 @@ -9847,10 +9887,10 @@ msgstr "git tag -d <Tagname>..." #: builtin/tag.c:24 msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" "\t\t[<pattern>...]" msgstr "" -"git tag -l [-n[<Nummer>]] [--contains <Commit>] [--points-at <Objekt>] \n" +"git tag -l [-n[<Nummer>]] [--contains <Commit>] [--points-at <Objekt>]\n" "\t\t[<Muster>...]" #: builtin/tag.c:26 @@ -9994,18 +10034,18 @@ msgstr "einen anderen Schlüssel verwenden, um das Tag zu signieren" msgid "replace the tag if exists" msgstr "das Tag ersetzen, wenn es existiert" -#: builtin/tag.c:608 +#: builtin/tag.c:609 +msgid "Tag listing options" +msgstr "Optionen für Auflistung der Tags" + +#: builtin/tag.c:610 msgid "show tag list in columns" msgstr "Liste der Tags in Spalten anzeigen" -#: builtin/tag.c:610 +#: builtin/tag.c:612 msgid "sort tags" msgstr "Tags sortieren" -#: builtin/tag.c:614 -msgid "Tag listing options" -msgstr "Optionen für Auflistung der Tags" - #: builtin/tag.c:617 builtin/tag.c:623 msgid "print only tags that contain the commit" msgstr "nur Tags ausgeben, die diesen Commit beinhalten" @@ -10062,140 +10102,141 @@ msgid "Unpacking objects" msgstr "Entpacke Objekte" #: builtin/update-index.c:403 -msgid "git update-index [options] [--] [<file>...]" -msgstr "git update-index [Optionen] [--] [<Datei>...]" +msgid "git update-index [<options>] [--] [<file>...]" +msgstr "git update-index [<Optionen>] [--] [<Datei>...]" -#: builtin/update-index.c:756 +#: builtin/update-index.c:757 msgid "continue refresh even when index needs update" msgstr "" "Aktualisierung fortsetzen, auch wenn die Staging-Area aktualisiert werden " "muss" -#: builtin/update-index.c:759 +#: builtin/update-index.c:760 msgid "refresh: ignore submodules" msgstr "Aktualisierung: ignoriert Submodule" -#: builtin/update-index.c:762 +#: builtin/update-index.c:763 msgid "do not ignore new files" msgstr "keine neuen Dateien ignorieren" -#: builtin/update-index.c:764 +#: builtin/update-index.c:765 msgid "let files replace directories and vice-versa" msgstr "Dateien Verzeichnisse ersetzen lassen, und umgedreht" -#: builtin/update-index.c:766 +#: builtin/update-index.c:767 msgid "notice files missing from worktree" msgstr "fehlende Dateien im Arbeitsverzeichnis beachten" -#: builtin/update-index.c:768 +#: builtin/update-index.c:769 msgid "refresh even if index contains unmerged entries" msgstr "" "aktualisieren, auch wenn die Staging-Area nicht zusammengeführte Einträge " "beinhaltet" -#: builtin/update-index.c:771 +#: builtin/update-index.c:772 msgid "refresh stat information" msgstr "Dateiinformationen aktualisieren" -#: builtin/update-index.c:775 +#: builtin/update-index.c:776 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "wie --refresh, ignoriert aber \"assume-unchanged\" Einstellung" -#: builtin/update-index.c:779 +#: builtin/update-index.c:780 msgid "<mode>,<object>,<path>" msgstr "<Modus>,<Objekt>,<Pfad>" -#: builtin/update-index.c:780 +#: builtin/update-index.c:781 msgid "add the specified entry to the index" msgstr "den angegebenen Eintrag zum Commit vormerken" -#: builtin/update-index.c:784 +#: builtin/update-index.c:785 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/update-index.c:785 +#: builtin/update-index.c:786 msgid "override the executable bit of the listed files" msgstr "das \"ausführbar\"-Bit der aufgelisteten Dateien überschreiben" -#: builtin/update-index.c:789 +#: builtin/update-index.c:790 msgid "mark files as \"not changing\"" msgstr "diese Datei immer als unverändert betrachten" -#: builtin/update-index.c:792 +#: builtin/update-index.c:793 msgid "clear assumed-unchanged bit" msgstr "\"assumed-unchanged\"-Bit löschen" -#: builtin/update-index.c:795 +#: builtin/update-index.c:796 msgid "mark files as \"index-only\"" msgstr "Dateien als \"index-only\" markieren" -#: builtin/update-index.c:798 +#: builtin/update-index.c:799 msgid "clear skip-worktree bit" msgstr "\"skip-worktree\"-Bit löschen" -#: builtin/update-index.c:801 +#: builtin/update-index.c:802 msgid "add to index only; do not add content to object database" msgstr "" "die Änderungen nur zum Commit vormerken; Inhalt wird nicht der Objekt-" "Datenbank hinzugefügt" -#: builtin/update-index.c:803 +#: builtin/update-index.c:804 msgid "remove named paths even if present in worktree" msgstr "" "benannte Pfade löschen, auch wenn sie sich im Arbeitsverzeichnis befinden" -#: builtin/update-index.c:805 +#: builtin/update-index.c:806 msgid "with --stdin: input lines are terminated by null bytes" msgstr "mit --stdin: eingegebene Zeilen sind durch NUL-Bytes abgeschlossen" -#: builtin/update-index.c:807 +#: builtin/update-index.c:808 msgid "read list of paths to be updated from standard input" msgstr "Liste der zu aktualisierenden Pfade von der Standard-Eingabe lesen" -#: builtin/update-index.c:811 +#: builtin/update-index.c:812 msgid "add entries from standard input to the index" msgstr "Einträge von der Standard-Eingabe zum Commit vormerken" -#: builtin/update-index.c:815 +#: builtin/update-index.c:816 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" "wiederholtes Einpflegen der Zustände #2 und #3 für die aufgelisteten Pfade" -#: builtin/update-index.c:819 +#: builtin/update-index.c:820 msgid "only update entries that differ from HEAD" msgstr "nur Einträge aktualisieren, die unterschiedlich zu HEAD sind" -#: builtin/update-index.c:823 +#: builtin/update-index.c:824 msgid "ignore files missing from worktree" msgstr "fehlende Dateien im Arbeitsverzeichnis ignorieren" -#: builtin/update-index.c:826 +#: builtin/update-index.c:827 msgid "report actions to standard output" msgstr "die Aktionen in der Standard-Ausgabe ausgeben" -#: builtin/update-index.c:828 +#: builtin/update-index.c:829 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(für Fremdprogramme) keine gespeicherten, nicht aufgelöste Konflikte" -#: builtin/update-index.c:832 +#: builtin/update-index.c:833 msgid "write index in this format" msgstr "Staging-Area-Datei in diesem Format schreiben" -#: builtin/update-index.c:834 +#: builtin/update-index.c:835 msgid "enable or disable split index" msgstr "Aktivierung oder Deaktivierung des Splittings der Staging-Area" #: builtin/update-ref.c:9 -msgid "git update-ref [options] -d <refname> [<oldval>]" -msgstr "git update-ref [Optionen] -d <Referenzname> [<alterWert>]" +msgid "git update-ref [<options>] -d <refname> [<old-val>]" +msgstr "git update-ref [<Optionen>] -d <Referenzname> [<alter-Wert>]" #: builtin/update-ref.c:10 -msgid "git update-ref [options] <refname> <newval> [<oldval>]" -msgstr "git update-ref [Optionen] <Referenzname> <neuerWert> [<alterWert>]" +msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" +msgstr "" +"git update-ref [<Optionen>] <Referenzname> <neuer-Wert> [<alter-Wert>]" #: builtin/update-ref.c:11 -msgid "git update-ref [options] --stdin [-z]" -msgstr "git update-ref [Optionen] --stdin [-z]" +msgid "git update-ref [<options>] --stdin [-z]" +msgstr "git update-ref [<Optionen>] --stdin [-z]" #: builtin/update-ref.c:359 msgid "delete the reference" @@ -10222,16 +10263,16 @@ msgid "update the info files from scratch" msgstr "die Informationsdateien von Grund auf aktualisieren" #: builtin/verify-commit.c:17 -msgid "git verify-commit [-v|--verbose] <commit>..." -msgstr "git verify-commit [-v|--verbose] <Commit>..." +msgid "git verify-commit [-v | --verbose] <commit>..." +msgstr "git verify-commit [-v | --verbose] <Commit>..." #: builtin/verify-commit.c:75 msgid "print commit contents" msgstr "Commit-Inhalte ausgeben" #: builtin/verify-pack.c:54 -msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." -msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <Paket>..." +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." +msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <Paket>..." #: builtin/verify-pack.c:64 msgid "verbose" @@ -10242,8 +10283,8 @@ msgid "show statistics only" msgstr "nur Statistiken anzeigen" #: builtin/verify-tag.c:17 -msgid "git verify-tag [-v|--verbose] <tag>..." -msgstr "git verify-tag [-v|--verbose] <Tag>..." +msgid "git verify-tag [-v | --verbose] <tag>..." +msgstr "git verify-tag [-v | --verbose] <Tag>..." #: builtin/verify-tag.c:73 msgid "print tag contents" @@ -10334,7 +10375,7 @@ msgstr "zwei oder mehr Entwicklungszweige zusammenführen" #: common-cmds.h:20 msgid "Move or rename a file, a directory, or a symlink" msgstr "" -"eine Datei, ein Verzeichnis, oder einen symbolischen Verweis verschieben " +"eine Datei, ein Verzeichnis, oder eine symbolische Verknüpfung verschieben " "oder umbenennen" #: common-cmds.h:21 @@ -10450,7 +10491,7 @@ msgstr "" #: git-am.sh:166 msgid "Falling back to patching base and 3-way merge..." -msgstr "Falle zurück zum Patchen der Basis und des 3-Wege-Merges..." +msgstr "Falle zurück zum Patchen der Basis und des 3-Wege-Merges ..." #: git-am.sh:182 msgid "Failed to merge in the changes." @@ -10614,10 +10655,10 @@ msgstr "Ungültiger HEAD - HEAD wird benötigt" #: git-bisect.sh:130 #, sh-format msgid "" -"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." +"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." msgstr "" "Auschecken von '$start_head' fehlgeschlagen. Versuchen Sie 'git bisect reset " -"<gueltigerbranch>'." +"<gültiger-Branch>'." #: git-bisect.sh:140 msgid "won't bisect on cg-seek'ed tree" @@ -10943,7 +10984,7 @@ msgstr "Änderungen von $mb zu $onto:" msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Zunächst wird der Branch zurückgespult, um Ihre Änderungen\n" -"darauf neu anzuwenden..." +"darauf neu anzuwenden ..." #: git-rebase.sh:620 #, sh-format @@ -11397,6 +11438,22 @@ msgstr "Fehler bei Rekursion in Submodul-Pfad '$sm_path'" msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synchronisiere Submodul-URL für '$displaypath'" +#~ msgid "server does not support --atomic push" +#~ msgstr "" +#~ "die Gegenseite unterstützt keinen atomaren Versand (\"--atomic push\")" + +#~ msgid "(detached from %s)" +#~ msgstr "(losgelöst von %s)" + +#~ msgid "search also in ignored files" +#~ msgstr "auch in ignorierten Dateien suchen" + +#~ msgid "No existing author found with '%s'" +#~ msgstr "Kein existierender Autor mit '%s' gefunden." + +#~ msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" +#~ msgstr "git remote set-head <Name> (-a | --auto | -d | --delete | <Branch>)" + #~ msgid "no files added" #~ msgstr "keine Dateien hinzugefügt" @@ -73,8 +73,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2015-01-21 14:21+0800\n" -"PO-Revision-Date: 2015-01-21 14:57+0800\n" +"POT-Creation-Date: 2015-04-03 08:13+0800\n" +"PO-Revision-Date: 2015-04-04 18:03+0200\n" "Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n" "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n" "Language: fr\n" @@ -98,8 +98,8 @@ msgstr "" "nécessaire pour marquer la résolution et valider." #: archive.c:11 -msgid "git archive [options] <tree-ish> [<path>...]" -msgstr "git archive [options] <arbre ou apparenté> [<chemin>...]" +msgid "git archive [<options>] <tree-ish> [<path>...]" +msgstr "git archive [<options>] <arbre ou apparenté> [<chemin>...]" #: archive.c:12 msgid "git archive --list" @@ -107,9 +107,9 @@ msgstr "git archive --list" #: archive.c:13 msgid "" -"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" +"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" -"git archive --remote <dépôt> [--exec <commande>] [options] <arbre ou " +"git archive --remote <dépôt> [--exec <commande>] [<options>] <arbre ou " "apparenté> [<chemin>...]" #: archive.c:14 @@ -137,10 +137,10 @@ msgstr "préfixe" msgid "prepend prefix to each pathname in the archive" msgstr "préfixer chaque chemin de fichier dans l'archive" -#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2517 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986 +#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 +#: builtin/blame.c:2517 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:394 +#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 #: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151 msgid "file" msgstr "fichier" @@ -189,7 +189,7 @@ msgstr "commande" msgid "path to the remote git-upload-archive command" msgstr "chemin vers la commande distante git-upload-archive" -#: attr.c:258 +#: attr.c:264 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -325,7 +325,7 @@ msgstr "'%s' ne semble pas être un fichier bundle v2" msgid "unrecognized header: %s%s (%d)" msgstr "en-tête non reconnu : %s%s (%d)" -#: bundle.c:87 builtin/commit.c:770 +#: bundle.c:87 builtin/commit.c:766 #, c-format msgid "could not open '%s'" msgstr "impossible d'ouvrir '%s'" @@ -334,8 +334,8 @@ msgstr "impossible d'ouvrir '%s'" msgid "Repository lacks these prerequisite commits:" msgstr "Le dépôt ne dispose pas des commits prérequis suivants :" -#: bundle.c:163 sequencer.c:645 sequencer.c:1100 builtin/blame.c:2706 -#: builtin/branch.c:652 builtin/commit.c:1049 builtin/log.c:330 +#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 +#: builtin/branch.c:659 builtin/commit.c:1045 builtin/log.c:330 #: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358 #: builtin/shortlog.c:158 msgid "revision walk setup failed" @@ -376,21 +376,21 @@ msgstr "rev-list a disparu" msgid "ref '%s' is excluded by the rev-list options" msgstr "la référence '%s' est exclue par les options de rev-list" -#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "argument non reconnu : %s" -#: bundle.c:444 +#: bundle.c:443 msgid "Refusing to create empty bundle." msgstr "Refus de créer un colis vide." -#: bundle.c:454 +#: bundle.c:453 #, c-format msgid "cannot create '%s'" msgstr "impossible de créer '%s'" -#: bundle.c:475 +#: bundle.c:474 msgid "index-pack died" msgstr "l'index de groupe a disparu" @@ -413,58 +413,58 @@ msgstr "%s %s n'est pas un commit !" msgid "memory exhausted" msgstr "plus de mémoire" -#: config.c:469 config.c:471 +#: config.c:474 config.c:476 #, c-format msgid "bad config file line %d in %s" msgstr "ligne %d de fichier de config incorrecte dans %s" -#: config.c:587 +#: config.c:592 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s" -#: config.c:589 +#: config.c:594 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s" -#: config.c:674 +#: config.c:679 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'" -#: config.c:752 config.c:763 +#: config.c:757 config.c:768 #, c-format msgid "bad zlib compression level %d" msgstr "niveau de compression zlib incorrect %d" -#: config.c:885 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "mode invalide pour la création d'objet : %s" -#: config.c:1211 +#: config.c:1216 msgid "unable to parse command-line config" msgstr "lecture de la configuration de ligne de commande impossible" -#: config.c:1272 +#: config.c:1277 msgid "unknown error occured while reading the configuration files" msgstr "erreur inconnue pendant la lecture des fichiers de configuration" -#: config.c:1596 +#: config.c:1601 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" "impossible d'analyser '%s' depuis le configuration en ligne de commande" -#: config.c:1598 +#: config.c:1603 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" "variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d" -#: config.c:1657 +#: config.c:1662 #, c-format msgid "%s has multiple values" msgstr "%s a des valeurs multiples" @@ -556,7 +556,7 @@ msgstr[1] "il y a %lu ans" msgid "failed to read orderfile '%s'" msgstr "impossible de lire le fichier de commande '%s'" -#: diffcore-rename.c:516 +#: diffcore-rename.c:536 msgid "Performing inexact rename detection" msgstr "Détection de renommage inexact en cours" @@ -586,16 +586,16 @@ msgstr "" "Erreurs dans la variable de configuration 'diff.dirstat' :\n" "%s" -#: diff.c:2957 +#: diff.c:2956 #, c-format msgid "external diff died, stopping at %s" msgstr "l'application de diff externe a disparu, arrêt à %s" -#: diff.c:3352 +#: diff.c:3351 msgid "--follow requires exactly one pathspec" msgstr "--follow a besoin d'une spécification de chemin unique" -#: diff.c:3515 +#: diff.c:3514 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -604,7 +604,7 @@ msgstr "" "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n" "%s" -#: diff.c:3529 +#: diff.c:3528 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'" @@ -958,27 +958,27 @@ msgstr "échec de fusion des arbres %s et %s" msgid "Unprocessed path??? %s" msgstr "Chemin non traité ??? %s" -#: merge-recursive.c:1898 +#: merge-recursive.c:1901 msgid "Merging:" msgstr "Fusion :" -#: merge-recursive.c:1911 +#: merge-recursive.c:1914 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "%u ancêtre commun trouvé :" msgstr[1] "%u ancêtres communs trouvés :" -#: merge-recursive.c:1948 +#: merge-recursive.c:1951 msgid "merge returned no commit" msgstr "la fusion n'a pas retourné de commit" -#: merge-recursive.c:2005 +#: merge-recursive.c:2008 #, c-format msgid "Could not parse object '%s'" msgstr "Impossible d'analyser l'objet '%s'" -#: merge-recursive.c:2016 builtin/merge.c:667 +#: merge-recursive.c:2019 builtin/merge.c:667 msgid "Unable to write index." msgstr "Impossible d'écrire l'index." @@ -1109,7 +1109,7 @@ msgstr "impossible d'analyser le format --pretty" msgid "done" msgstr "fait" -#: read-cache.c:1267 +#: read-cache.c:1275 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1118,7 +1118,7 @@ msgstr "" "version d'index renseignée, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: read-cache.c:1277 +#: read-cache.c:1285 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1207,23 +1207,31 @@ msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n" -#: run-command.c:87 +#: revision.c:2348 +msgid "--first-parent is incompatible with --bisect" +msgstr "--first-parent est incompatible avec --bisect" + +#: run-command.c:83 msgid "open /dev/null failed" msgstr "échec de l'ouverture de /dev/null" -#: run-command.c:89 +#: run-command.c:85 #, c-format msgid "dup2(%d,%d) failed" msgstr "échec de dup2(%d,%d)" -#: send-pack.c:268 +#: send-pack.c:272 msgid "failed to sign the push certificate" msgstr "impossible de signer le certificat de poussée" -#: send-pack.c:325 +#: send-pack.c:356 msgid "the receiving end does not support --signed push" msgstr "Le receveur ne gère pas les poussées avec --signed" +#: send-pack.c:366 +msgid "the receiving end does not support --atomic push" +msgstr "Le receveur ne gère pas les poussées avec --atomic" + #: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995 #: builtin/merge.c:1005 #, c-format @@ -1254,7 +1262,7 @@ msgstr "" "avec 'git add <chemins>' ou 'git rm <chemins>'\n" "puis validez le résultat avec 'git commit'" -#: sequencer.c:211 sequencer.c:856 sequencer.c:939 +#: sequencer.c:211 sequencer.c:861 sequencer.c:944 #, c-format msgid "Could not write to %s" msgstr "Impossible d'écrire dans %s" @@ -1290,31 +1298,31 @@ msgstr "Impossible de résoudre le commit HEAD\n" msgid "Unable to update cache tree\n" msgstr "Impossible de mettre à jour l'arbre de cache\n" -#: sequencer.c:406 +#: sequencer.c:411 #, c-format msgid "Could not parse commit %s\n" msgstr "Impossible d'analyser le commit %s\n" -#: sequencer.c:411 +#: sequencer.c:416 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Impossible d'analyser le commit parent %s\n" -#: sequencer.c:477 +#: sequencer.c:482 msgid "Your index file is unmerged." msgstr "Votre fichier d'index n'est pas fusionné." -#: sequencer.c:496 +#: sequencer.c:501 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "Le commit %s est une fusion mais l'option -m n'a pas été spécifiée." -#: sequencer.c:504 +#: sequencer.c:509 #, c-format msgid "Commit %s does not have parent %d" msgstr "Le commit %s n'a pas le parent %d" -#: sequencer.c:508 +#: sequencer.c:513 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" @@ -1323,153 +1331,153 @@ msgstr "" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:521 +#: sequencer.c:526 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s : impossible d'analyser le commit parent %s" -#: sequencer.c:525 +#: sequencer.c:530 #, c-format msgid "Cannot get commit message for %s" msgstr "Impossible d'obtenir un message de validation pour %s" -#: sequencer.c:611 +#: sequencer.c:616 #, c-format msgid "could not revert %s... %s" msgstr "impossible d'annuler %s... %s" -#: sequencer.c:612 +#: sequencer.c:617 #, c-format msgid "could not apply %s... %s" msgstr "impossible d'appliquer %s... %s" -#: sequencer.c:648 +#: sequencer.c:653 msgid "empty commit set passed" msgstr "l'ensemble de commits spécifié est vide" -#: sequencer.c:656 +#: sequencer.c:661 #, c-format msgid "git %s: failed to read the index" msgstr "git %s : échec à la lecture de l'index" -#: sequencer.c:660 +#: sequencer.c:665 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s : échec du rafraîchissement de l'index" -#: sequencer.c:720 +#: sequencer.c:725 #, c-format msgid "Cannot %s during a %s" msgstr "Impossible de %s pendant un %s" -#: sequencer.c:742 +#: sequencer.c:747 #, c-format msgid "Could not parse line %d." msgstr "Impossible d'analyser la ligne %d." -#: sequencer.c:747 +#: sequencer.c:752 msgid "No commits parsed." msgstr "Aucun commit analysé." -#: sequencer.c:760 +#: sequencer.c:765 #, c-format msgid "Could not open %s" msgstr "Impossible d'ouvrir %s" -#: sequencer.c:764 +#: sequencer.c:769 #, c-format msgid "Could not read %s." msgstr "Impossible de lire %s." -#: sequencer.c:771 +#: sequencer.c:776 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Feuille d'instruction inutilisable : %s" -#: sequencer.c:801 +#: sequencer.c:806 #, c-format msgid "Invalid key: %s" msgstr "Clé invalide: %s" -#: sequencer.c:804 +#: sequencer.c:809 #, c-format msgid "Invalid value for %s: %s" msgstr "Valeur invalide pour %s : %s" -#: sequencer.c:816 +#: sequencer.c:821 #, c-format msgid "Malformed options sheet: %s" msgstr "Feuille d'options malformée : %s" -#: sequencer.c:837 +#: sequencer.c:842 msgid "a cherry-pick or revert is already in progress" msgstr "un picorage ou un retour est déjà en cours" -#: sequencer.c:838 +#: sequencer.c:843 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\"" -#: sequencer.c:842 +#: sequencer.c:847 #, c-format msgid "Could not create sequencer directory %s" msgstr "Impossible de créer le répertoire de séquenceur %s" -#: sequencer.c:858 sequencer.c:943 +#: sequencer.c:863 sequencer.c:948 #, c-format msgid "Error wrapping up %s." msgstr "Erreur lors de l'emballage de %s." -#: sequencer.c:877 sequencer.c:1013 +#: sequencer.c:882 sequencer.c:1018 msgid "no cherry-pick or revert in progress" msgstr "aucun picorage ou retour en cours" -#: sequencer.c:879 +#: sequencer.c:884 msgid "cannot resolve HEAD" msgstr "impossible de résoudre HEAD" -#: sequencer.c:881 +#: sequencer.c:886 msgid "cannot abort from a branch yet to be born" msgstr "impossible d'abandonner depuis une branche non encore créée" -#: sequencer.c:903 builtin/apply.c:4128 +#: sequencer.c:908 builtin/apply.c:4288 #, c-format msgid "cannot open %s: %s" msgstr "impossible d'ouvrir %s : %s" -#: sequencer.c:906 +#: sequencer.c:911 #, c-format msgid "cannot read %s: %s" msgstr "impossible de lire %s : %s" -#: sequencer.c:907 +#: sequencer.c:912 msgid "unexpected end of file" msgstr "fin de fichier inattendue" -#: sequencer.c:913 +#: sequencer.c:918 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu" -#: sequencer.c:936 +#: sequencer.c:941 #, c-format msgid "Could not format %s." msgstr "Impossible de formater %s." -#: sequencer.c:1081 +#: sequencer.c:1086 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s : impossible de picorer un %s" -#: sequencer.c:1084 +#: sequencer.c:1089 #, c-format msgid "%s: bad revision" msgstr "%s : mauvaise révision" -#: sequencer.c:1118 +#: sequencer.c:1123 msgid "Can't revert as initial commit" msgstr "Impossible d'annuler en tant que commit initial" -#: sequencer.c:1119 +#: sequencer.c:1124 msgid "Can't cherry-pick into empty head" msgstr "Impossible de picorer vers une HEAD vide" @@ -1543,38 +1551,38 @@ msgstr "Impossible de supprimer l'élément de .gitmodules pour %s" msgid "staging updated .gitmodules failed" msgstr "échec de la mise en index du .gitmodules mis à jour" -#: submodule.c:1111 builtin/init-db.c:371 +#: submodule.c:1109 builtin/init-db.c:371 #, c-format msgid "Could not create git link %s" msgstr "Impossible de créer le lien git %s" -#: submodule.c:1122 +#: submodule.c:1120 #, c-format msgid "Could not set core.worktree in %s" msgstr "Impossible de paramétrer core.worktree dans %s" -#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566 -#: trailer.c:570 +#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557 +#: trailer.c:561 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "valeur inconnue '%s' pour la clé '%s'" -#: trailer.c:552 trailer.c:557 builtin/remote.c:290 +#: trailer.c:543 trailer.c:548 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "plus d'un %s" -#: trailer.c:590 +#: trailer.c:581 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "symbole vide dans la ligne de fin '%.*s'" -#: trailer.c:710 +#: trailer.c:701 #, c-format msgid "could not read input file '%s'" msgstr "impossible de lire le fichier d'entrée '%s'" -#: trailer.c:713 +#: trailer.c:704 msgid "could not read from stdin" msgstr "Impossible de lire depuis l'entrée standard" @@ -1611,28 +1619,28 @@ msgstr "numéro de port invalide" msgid "invalid '..' path segment" msgstr "segment de chemin '..' invalide" -#: wrapper.c:509 +#: wrapper.c:523 #, c-format msgid "unable to access '%s': %s" msgstr "impossible d'accéder à '%s' : %s" -#: wrapper.c:530 +#: wrapper.c:544 #, c-format msgid "unable to access '%s'" msgstr "impossible d'accéder à '%s'" -#: wrapper.c:541 +#: wrapper.c:555 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "" "impossible de rechercher l'utilisateur actuel dans le fichier de mots de " "passe : %s" -#: wrapper.c:542 +#: wrapper.c:556 msgid "no such user" msgstr "utilisateur inconnu" -#: wrapper.c:550 +#: wrapper.c:564 msgid "unable to get current working directory" msgstr "impossible d'accéder au répertoire de travail courant" @@ -1663,11 +1671,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)" -#: wt-status.c:198 +#: wt-status.c:198 wt-status.c:878 msgid "Changes to be committed:" msgstr "Modifications qui seront validées :" -#: wt-status.c:216 +#: wt-status.c:216 wt-status.c:887 msgid "Changes not staged for commit:" msgstr "Modifications qui ne seront pas validées :" @@ -1782,15 +1790,15 @@ msgstr "contenu non suivi, " msgid "bug: unhandled diff status %c" msgstr "bogue : état de diff non géré %c" -#: wt-status.c:758 +#: wt-status.c:753 msgid "Submodules changed but not updated:" msgstr "Sous-modules modifiés mais non mis à jour :" -#: wt-status.c:760 +#: wt-status.c:755 msgid "Submodule changes to be committed:" msgstr "Changements du sous-module à valider :" -#: wt-status.c:839 +#: wt-status.c:835 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1798,68 +1806,68 @@ msgstr "" "Ne touchez pas à la ligne ci-dessus\n" "Tout se qui suit sera éliminé." -#: wt-status.c:930 +#: wt-status.c:946 msgid "You have unmerged paths." msgstr "Vous avez des chemins non fusionnés." -#: wt-status.c:933 +#: wt-status.c:949 msgid " (fix conflicts and run \"git commit\")" msgstr " (réglez les conflits puis lancez \"git commit\")" -#: wt-status.c:936 +#: wt-status.c:952 msgid "All conflicts fixed but you are still merging." msgstr "Tous les conflits sont réglés mais la fusion n'est pas terminée." -#: wt-status.c:939 +#: wt-status.c:955 msgid " (use \"git commit\" to conclude merge)" msgstr " (utilisez \"git commit\" pour terminer la fusion)" -#: wt-status.c:949 +#: wt-status.c:965 msgid "You are in the middle of an am session." msgstr "Vous êtes au milieu d'une session am." -#: wt-status.c:952 +#: wt-status.c:968 msgid "The current patch is empty." msgstr "Le patch actuel est vide." -#: wt-status.c:956 +#: wt-status.c:972 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (réglez les conflits puis lancez \"git am --continue\")" -#: wt-status.c:958 +#: wt-status.c:974 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (utilisez \"git am --skip\" pour sauter ce patch)" -#: wt-status.c:960 +#: wt-status.c:976 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)" -#: wt-status.c:1020 wt-status.c:1037 +#: wt-status.c:1036 wt-status.c:1053 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'." -#: wt-status.c:1025 wt-status.c:1042 +#: wt-status.c:1041 wt-status.c:1058 msgid "You are currently rebasing." msgstr "Vous êtes en train de rebaser." -#: wt-status.c:1028 +#: wt-status.c:1044 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (réglez les conflits puis lancez \"git rebase --continue\")" -#: wt-status.c:1030 +#: wt-status.c:1046 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)" -#: wt-status.c:1032 +#: wt-status.c:1048 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (utilisez \"git rebase --abort\" pour extraire la branche d'origine)" -#: wt-status.c:1045 +#: wt-status.c:1061 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")" -#: wt-status.c:1049 +#: wt-status.c:1065 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -1867,120 +1875,120 @@ msgstr "" "Vous êtes actuellement en train de fractionner un commit pendant un rebasage " "de la branche '%s' sur '%s'." -#: wt-status.c:1054 +#: wt-status.c:1070 msgid "You are currently splitting a commit during a rebase." msgstr "" "Vous êtes actuellement en train de fractionner un commit pendant un rebasage." -#: wt-status.c:1057 +#: wt-status.c:1073 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")" -#: wt-status.c:1061 +#: wt-status.c:1077 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la " "branche '%s' sur '%s'." -#: wt-status.c:1066 +#: wt-status.c:1082 msgid "You are currently editing a commit during a rebase." msgstr "" "Vous êtes actuellement en train d'éditer un commit pendant un rebasage." -#: wt-status.c:1069 +#: wt-status.c:1085 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)" -#: wt-status.c:1071 +#: wt-status.c:1087 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (utilisez \"git rebase --continue\" quand vous êtes satisfait de vos " "modifications)" -#: wt-status.c:1081 +#: wt-status.c:1097 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Vous êtes actuellement en train de picorer le commit %s." -#: wt-status.c:1086 +#: wt-status.c:1102 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")" -#: wt-status.c:1089 +#: wt-status.c:1105 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")" -#: wt-status.c:1091 +#: wt-status.c:1107 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)" -#: wt-status.c:1100 +#: wt-status.c:1116 #, c-format msgid "You are currently reverting commit %s." msgstr "Vous êtes actuellement en train de rétablir le commit %s." -#: wt-status.c:1105 +#: wt-status.c:1121 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (réglez les conflits puis lancez \"git revert --continue\")" -#: wt-status.c:1108 +#: wt-status.c:1124 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")" -#: wt-status.c:1110 +#: wt-status.c:1126 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)" -#: wt-status.c:1121 +#: wt-status.c:1137 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Vous êtes en cours de bissection, depuis la branche '%s'." -#: wt-status.c:1125 +#: wt-status.c:1141 msgid "You are currently bisecting." msgstr "Vous êtes en cours de bissection." -#: wt-status.c:1128 +#: wt-status.c:1144 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)" -#: wt-status.c:1303 +#: wt-status.c:1321 msgid "On branch " msgstr "Sur la branche " -#: wt-status.c:1310 +#: wt-status.c:1328 msgid "rebase in progress; onto " msgstr "rebasage en cours ; sur " -#: wt-status.c:1317 +#: wt-status.c:1333 msgid "HEAD detached at " msgstr "HEAD détachée sur " -#: wt-status.c:1319 +#: wt-status.c:1335 msgid "HEAD detached from " msgstr "HEAD détachée depuis " -#: wt-status.c:1322 +#: wt-status.c:1338 msgid "Not currently on any branch." msgstr "Actuellement sur aucun branche." -#: wt-status.c:1339 +#: wt-status.c:1355 msgid "Initial commit" msgstr "Validation initiale" -#: wt-status.c:1353 +#: wt-status.c:1369 msgid "Untracked files" msgstr "Fichiers non suivis" -#: wt-status.c:1355 +#: wt-status.c:1371 msgid "Ignored files" msgstr "Fichiers ignorés" -#: wt-status.c:1359 +#: wt-status.c:1375 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1992,32 +2000,32 @@ msgstr "" "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help " "status')." -#: wt-status.c:1365 +#: wt-status.c:1381 #, c-format msgid "Untracked files not listed%s" msgstr "Fichiers non suivis non affichés%s" -#: wt-status.c:1367 +#: wt-status.c:1383 msgid " (use -u option to show untracked files)" msgstr " (utilisez -u pour afficher les fichiers non suivis)" -#: wt-status.c:1373 +#: wt-status.c:1389 msgid "No changes" msgstr "Aucune modification" -#: wt-status.c:1378 +#: wt-status.c:1394 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou " "\"git commit -a\")\n" -#: wt-status.c:1381 +#: wt-status.c:1397 #, c-format msgid "no changes added to commit\n" msgstr "aucune modification ajoutée à la validation\n" -#: wt-status.c:1384 +#: wt-status.c:1400 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -2026,49 +2034,49 @@ msgstr "" "aucune modification ajoutée à la validation mais des fichiers non suivis " "sont présents (utilisez \"git add\" pour les suivre)\n" -#: wt-status.c:1387 +#: wt-status.c:1403 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "aucune modification ajoutée à la validation mais des fichiers non suivis " "sont présents\n" -#: wt-status.c:1390 +#: wt-status.c:1406 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les " "suivre)\n" -#: wt-status.c:1393 wt-status.c:1398 +#: wt-status.c:1409 wt-status.c:1414 #, c-format msgid "nothing to commit\n" msgstr "rien à valider\n" -#: wt-status.c:1396 +#: wt-status.c:1412 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n" -#: wt-status.c:1400 +#: wt-status.c:1416 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "rien à valider, la copie de travail est propre\n" -#: wt-status.c:1509 +#: wt-status.c:1525 msgid "HEAD (no branch)" msgstr "HEAD (aucune branche)" -#: wt-status.c:1515 +#: wt-status.c:1531 msgid "Initial commit on " msgstr "Validation initiale sur " # à priori on parle d'une branche ici -#: wt-status.c:1547 +#: wt-status.c:1563 msgid "gone" msgstr "disparue" -#: wt-status.c:1549 wt-status.c:1557 +#: wt-status.c:1565 wt-status.c:1573 msgid "behind " msgstr "derrière " @@ -2078,15 +2086,15 @@ msgid "failed to unlink '%s'" msgstr "échec lors de l'unlink de '%s'" #: builtin/add.c:22 -msgid "git add [options] [--] <pathspec>..." -msgstr "git add [options] [--] <chemin>..." +msgid "git add [<options>] [--] <pathspec>..." +msgstr "git add [<options>] [--] <chemin>..." #: builtin/add.c:65 #, c-format msgid "unexpected diff status %c" msgstr "status de diff inattendu %c" -#: builtin/add.c:70 builtin/commit.c:275 +#: builtin/add.c:70 builtin/commit.c:277 msgid "updating files failed" msgstr "échec de la mise à jour des fichiers" @@ -2131,14 +2139,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n" -#: builtin/add.c: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:1372 +#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372 #: builtin/rm.c:269 msgid "dry run" msgstr "simuler l'action" -#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19 -#: builtin/commit.c:1326 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19 +#: builtin/commit.c:1322 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 "mode verbeux" @@ -2218,82 +2226,82 @@ msgstr "Rien de spécifié, rien n'a été ajouté.\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Vous vouliez sûrement dire 'git add .' ?\n" -#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919 -#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 +#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920 +#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 msgid "index file corrupt" msgstr "fichier d'index corrompu" -#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431 +#: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431 msgid "Unable to write new index file" msgstr "Impossible d'écrire le nouveau fichier d'index" -#: builtin/apply.c:58 -msgid "git apply [options] [<patch>...]" -msgstr "git apply [options] [<patch>...]" +#: builtin/apply.c:59 +msgid "git apply [<options>] [<patch>...]" +msgstr "git apply [<options>] [<patch>...]" -#: builtin/apply.c:111 +#: builtin/apply.c:112 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "option d'espace non reconnue '%s'" -#: builtin/apply.c:126 +#: builtin/apply.c:127 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "option d'ignorance d'espace non reconnue '%s'" -#: builtin/apply.c:826 +#: builtin/apply.c:822 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Impossible de préparer la regexp d'horodatage %s" -#: builtin/apply.c:835 +#: builtin/apply.c:831 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec a retourné %d pour l'entrée : %s" -#: builtin/apply.c:916 +#: builtin/apply.c:912 #, c-format msgid "unable to find filename in patch at line %d" msgstr "nom de fichier du patch introuvable à la ligne %d" -#: builtin/apply.c:948 +#: builtin/apply.c:944 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la " "ligne %d" -#: builtin/apply.c:952 +#: builtin/apply.c:948 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant " "à la ligne %d" -#: builtin/apply.c:953 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply : mauvais format de git-diff - ancien nom de fichier inconsistant " "à la ligne %d" -#: builtin/apply.c:960 +#: builtin/apply.c:956 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" "git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d" -#: builtin/apply.c:1423 +#: builtin/apply.c:1419 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recomptage : ligne inattendue : %.*s" -#: builtin/apply.c:1480 +#: builtin/apply.c:1476 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "fragment de patch sans en-tête à la ligne %d : %.*s" -#: builtin/apply.c:1497 +#: builtin/apply.c:1493 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2308,77 +2316,77 @@ msgstr[1] "" "information de nom de fichier manquante dans l'en-tête de git diff lors de " "la suppression de %d composants de préfixe de chemin (ligne %d)" -#: builtin/apply.c:1657 +#: builtin/apply.c:1656 msgid "new file depends on old contents" msgstr "le nouveau fichier dépend de contenus anciens" -#: builtin/apply.c:1659 +#: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "le fichier supprimé a encore du contenu" -#: builtin/apply.c:1685 +#: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" msgstr "patch corrompu à la ligne %d" -#: builtin/apply.c:1721 +#: builtin/apply.c:1720 #, c-format msgid "new file %s depends on old contents" msgstr "le nouveau fichier %s dépend de contenus anciens" -#: builtin/apply.c:1723 +#: builtin/apply.c:1722 #, c-format msgid "deleted file %s still has contents" msgstr "le fichier supprimé %s a encore du contenu" -#: builtin/apply.c:1726 +#: builtin/apply.c:1725 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé" -#: builtin/apply.c:1872 +#: builtin/apply.c:1871 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "patch binaire corrompu à la ligne %d : %.*s" -#: builtin/apply.c:1901 +#: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" msgstr "patch binaire non reconnu à la ligne %d" -#: builtin/apply.c:2052 +#: builtin/apply.c:2051 #, c-format msgid "patch with only garbage at line %d" msgstr "patch totalement incompréhensible à la ligne %d" -#: builtin/apply.c:2142 +#: builtin/apply.c:2141 #, c-format msgid "unable to read symlink %s" msgstr "lecture du lien symbolique %s impossible" -#: builtin/apply.c:2146 +#: builtin/apply.c:2145 #, c-format msgid "unable to open or read %s" msgstr "ouverture ou lecture de %s impossible" -#: builtin/apply.c:2754 +#: builtin/apply.c:2778 #, c-format msgid "invalid start of line: '%c'" msgstr "début de ligne invalide : '%c'" -#: builtin/apply.c:2872 +#: builtin/apply.c:2897 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "La section n°%d a réussi à la ligne %d (offset %d ligne)." msgstr[1] "La section n°%d a réussi à la ligne %d (offset %d lignes)." -#: builtin/apply.c:2884 +#: builtin/apply.c:2909 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Contexte réduit à (%ld/%ld) pour appliquer le fragment à la ligne %d" -#: builtin/apply.c:2890 +#: builtin/apply.c:2915 #, c-format msgid "" "while searching for:\n" @@ -2387,328 +2395,347 @@ msgstr "" "pendant la recherche de :\n" "%.*s" -#: builtin/apply.c:2909 +#: builtin/apply.c:2935 #, c-format msgid "missing binary patch data for '%s'" msgstr "données de patch binaire manquantes pour '%s'" -#: builtin/apply.c:3010 +#: builtin/apply.c:3036 #, c-format msgid "binary patch does not apply to '%s'" msgstr "le patch binaire ne s'applique par correctement à '%s'" -#: builtin/apply.c:3016 +#: builtin/apply.c:3042 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s " "trouvé)" -#: builtin/apply.c:3037 +#: builtin/apply.c:3063 #, c-format msgid "patch failed: %s:%ld" msgstr "le patch a échoué : %s:%ld" -#: builtin/apply.c:3161 +#: builtin/apply.c:3187 #, c-format msgid "cannot checkout %s" msgstr "extraction de %s impossible" -#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260 +#: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288 #, c-format msgid "read of %s failed" msgstr "échec de la lecture de %s" -#: builtin/apply.c:3240 builtin/apply.c:3462 +#: builtin/apply.c:3240 +#, c-format +msgid "reading from '%s' beyond a symbolic link" +msgstr "lecture depuis '%s' au-delà d'un lien symbolique" + +#: builtin/apply.c:3268 builtin/apply.c:3490 #, c-format msgid "path %s has been renamed/deleted" msgstr "le chemin %s a été renommé/supprimé" -#: builtin/apply.c:3321 builtin/apply.c:3476 +#: builtin/apply.c:3349 builtin/apply.c:3504 #, c-format msgid "%s: does not exist in index" msgstr "%s : n'existe pas dans l'index" -#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490 +#: builtin/apply.c:3353 builtin/apply.c:3496 builtin/apply.c:3518 #, c-format msgid "%s: %s" msgstr "%s : %s" -#: builtin/apply.c:3330 builtin/apply.c:3484 +#: builtin/apply.c:3358 builtin/apply.c:3512 #, c-format msgid "%s: does not match index" msgstr "%s : ne correspond pas à l'index" -#: builtin/apply.c:3432 +#: builtin/apply.c:3460 msgid "removal patch leaves file contents" msgstr "le patch de suppression laisse un contenu dans le fichier" -#: builtin/apply.c:3501 +#: builtin/apply.c:3529 #, c-format msgid "%s: wrong type" msgstr "%s : type erroné" -#: builtin/apply.c:3503 +#: builtin/apply.c:3531 #, c-format msgid "%s has type %o, expected %o" msgstr "%s est de type %o, mais %o attendu" -#: builtin/apply.c:3604 +#: builtin/apply.c:3690 builtin/apply.c:3692 +#, c-format +msgid "invalid path '%s'" +msgstr "chemin invalide '%s'" + +#: builtin/apply.c:3747 #, c-format msgid "%s: already exists in index" msgstr "%s : existe déjà dans l'index" -#: builtin/apply.c:3607 +#: builtin/apply.c:3750 #, c-format msgid "%s: already exists in working directory" msgstr "%s : existe déjà dans la copie de travail" -#: builtin/apply.c:3627 +#: builtin/apply.c:3770 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)" -#: builtin/apply.c:3632 +#: builtin/apply.c:3775 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s" -#: builtin/apply.c:3640 +#: builtin/apply.c:3795 +#, c-format +msgid "affected file '%s' is beyond a symbolic link" +msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique" + +#: builtin/apply.c:3799 #, c-format msgid "%s: patch does not apply" msgstr "%s : le patch ne s'applique pas" -#: builtin/apply.c:3653 +#: builtin/apply.c:3813 #, c-format msgid "Checking patch %s..." msgstr "Vérification du patch %s..." -#: builtin/apply.c:3746 builtin/checkout.c:231 builtin/reset.c:135 +#: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "échec de make_cache_entry pour le chemin '%s'" -#: builtin/apply.c:3889 +#: builtin/apply.c:4049 #, c-format msgid "unable to remove %s from index" msgstr "suppression de %s dans l'index impossible" -#: builtin/apply.c:3918 +#: builtin/apply.c:4078 #, c-format msgid "corrupt patch for submodule %s" msgstr "patch corrompu pour le sous-module %s" -#: builtin/apply.c:3922 +#: builtin/apply.c:4082 #, c-format msgid "unable to stat newly created file '%s'" msgstr "stat du fichier nouvellement créé '%s' impossible" -#: builtin/apply.c:3927 +#: builtin/apply.c:4087 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "création du magasin de stockage pour le fichier nouvellement créé %s " "impossible" -#: builtin/apply.c:3930 builtin/apply.c:4038 +#: builtin/apply.c:4090 builtin/apply.c:4198 #, c-format msgid "unable to add cache entry for %s" msgstr "ajout de l'élément de cache %s impossible" -#: builtin/apply.c:3963 +#: builtin/apply.c:4123 #, c-format msgid "closing file '%s'" msgstr "fermeture du fichier '%s'" -#: builtin/apply.c:4012 +#: builtin/apply.c:4172 #, c-format msgid "unable to write file '%s' mode %o" msgstr "écriture du fichier '%s' mode %o impossible" -#: builtin/apply.c:4099 +#: builtin/apply.c:4259 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s appliqué proprement." -#: builtin/apply.c:4107 +#: builtin/apply.c:4267 msgid "internal error" msgstr "erreur interne" -#: builtin/apply.c:4110 +#: builtin/apply.c:4270 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Application du patch %%s avec %d rejet..." msgstr[1] "Application du patch %%s avec %d rejets..." -#: builtin/apply.c:4120 +#: builtin/apply.c:4280 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "troncature du nom de fichier .rej en %.*s.rej" -#: builtin/apply.c:4141 +#: builtin/apply.c:4301 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Section n°%d appliquée proprement." -#: builtin/apply.c:4144 +#: builtin/apply.c:4304 #, c-format msgid "Rejected hunk #%d." msgstr "Section n°%d rejetée." -#: builtin/apply.c:4234 +#: builtin/apply.c:4394 msgid "unrecognized input" msgstr "entrée non reconnue" -#: builtin/apply.c:4245 +#: builtin/apply.c:4405 msgid "unable to read index file" msgstr "lecture du fichier d'index impossible" -#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:92 -#: builtin/fetch.c:93 +#: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92 +#: builtin/fetch.c:92 msgid "path" msgstr "chemin" -#: builtin/apply.c:4363 +#: builtin/apply.c:4523 msgid "don't apply changes matching the given path" msgstr "ne pas appliquer les modifications qui correspondent au chemin donné" -#: builtin/apply.c:4366 +#: builtin/apply.c:4526 msgid "apply changes matching the given path" msgstr "appliquer les modifications qui correspondent au chemin donné" -#: builtin/apply.c:4368 +#: builtin/apply.c:4528 msgid "num" msgstr "num" -#: builtin/apply.c:4369 +#: builtin/apply.c:4529 msgid "remove <num> leading slashes from traditional diff paths" msgstr "supprimer <num> barres obliques des chemins traditionnels de diff" -#: builtin/apply.c:4372 +#: builtin/apply.c:4532 msgid "ignore additions made by the patch" msgstr "ignorer les additions réalisées par le patch" -#: builtin/apply.c:4374 +#: builtin/apply.c:4534 msgid "instead of applying the patch, output diffstat for the input" msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrée" -#: builtin/apply.c:4378 +#: builtin/apply.c:4538 msgid "show number of added and deleted lines in decimal notation" msgstr "" "afficher le nombre de lignes ajoutées et supprimées en notation décimale" -#: builtin/apply.c:4380 +#: builtin/apply.c:4540 msgid "instead of applying the patch, output a summary for the input" msgstr "au lieu d'appliquer le patch, afficher un résumer de l'entrée" -#: builtin/apply.c:4382 +#: builtin/apply.c:4542 msgid "instead of applying the patch, see if the patch is applicable" msgstr "au lieu d'appliquer le patch, voir si le patch est applicable" -#: builtin/apply.c:4384 +#: builtin/apply.c:4544 msgid "make sure the patch is applicable to the current index" msgstr "s'assurer que le patch est applicable sur l'index actuel" -#: builtin/apply.c:4386 +#: builtin/apply.c:4546 msgid "apply a patch without touching the working tree" msgstr "appliquer les patch sans toucher à la copie de travail" -#: builtin/apply.c:4388 +#: builtin/apply.c:4548 +msgid "accept a patch that touches outside the working area" +msgstr "accepter un patch qui touche hors de la copie de travail" + +#: builtin/apply.c:4550 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)" -#: builtin/apply.c:4390 +#: builtin/apply.c:4552 msgid "attempt three-way merge if a patch does not apply" msgstr "tenter une fusion à 3 points si le patch ne s'applique pas proprement" -#: builtin/apply.c:4392 +#: builtin/apply.c:4554 msgid "build a temporary index based on embedded index information" msgstr "" "construire un index temporaire fondé sur l'information de l'index embarqué" -#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455 +#: builtin/apply.c:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412 msgid "paths are separated with NUL character" msgstr "les chemins sont séparés par un caractère NUL" -#: builtin/apply.c:4397 +#: builtin/apply.c:4559 msgid "ensure at least <n> lines of context match" msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte" -#: builtin/apply.c:4398 +#: builtin/apply.c:4560 msgid "action" msgstr "action" -#: builtin/apply.c:4399 +#: builtin/apply.c:4561 msgid "detect new or modified lines that have whitespace errors" msgstr "" "détecter des lignes nouvelles ou modifiées qui contiennent des erreurs " "d'espace" -#: builtin/apply.c:4402 builtin/apply.c:4405 +#: builtin/apply.c:4564 builtin/apply.c:4567 msgid "ignore changes in whitespace when finding context" msgstr "ignorer des modifications d'espace lors de la recherche de contexte" -#: builtin/apply.c:4408 +#: builtin/apply.c:4570 msgid "apply the patch in reverse" msgstr "appliquer le patch en sens inverse" -#: builtin/apply.c:4410 +#: builtin/apply.c:4572 msgid "don't expect at least one line of context" msgstr "ne pas s'attendre à au moins une ligne de contexte" -#: builtin/apply.c:4412 +#: builtin/apply.c:4574 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants" -#: builtin/apply.c:4414 +#: builtin/apply.c:4576 msgid "allow overlapping hunks" msgstr "accepter les recouvrements de sections" -#: builtin/apply.c:4417 +#: builtin/apply.c:4579 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "tolérer des erreurs de détection de retours chariot manquants en fin de " "fichier" -#: builtin/apply.c:4420 +#: builtin/apply.c:4582 msgid "do not trust the line counts in the hunk headers" msgstr "ne pas se fier au compte de lignes dans les en-têtes de section" -#: builtin/apply.c:4422 +#: builtin/apply.c:4584 msgid "root" msgstr "racine" -#: builtin/apply.c:4423 +#: builtin/apply.c:4585 msgid "prepend <root> to all filenames" msgstr "préfixer tous les noms de fichier avec <root>" -#: builtin/apply.c:4445 +#: builtin/apply.c:4607 msgid "--3way outside a repository" msgstr "--3way hors d'un dépôt" -#: builtin/apply.c:4453 +#: builtin/apply.c:4615 msgid "--index outside a repository" msgstr "--index hors d'un dépôt" -#: builtin/apply.c:4456 +#: builtin/apply.c:4618 msgid "--cached outside a repository" msgstr "--cached hors d'un dépôt" -#: builtin/apply.c:4472 +#: builtin/apply.c:4637 #, c-format msgid "can't open patch '%s'" msgstr "ouverture impossible du patch '%s'" -#: builtin/apply.c:4486 +#: builtin/apply.c:4651 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d erreur d'espace ignorée" msgstr[1] "%d erreurs d'espace ignorées" -#: builtin/apply.c:4492 builtin/apply.c:4502 +#: builtin/apply.c:4657 builtin/apply.c:4667 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2763,107 +2790,107 @@ msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "mettre à jour BISECT_HEAD au lieu d'extraire le commit actuel" #: builtin/blame.c:30 -msgid "git blame [options] [rev-opts] [rev] [--] file" -msgstr "git blame [options] [options-de-révision] [rev] [--] fichier" +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file" +msgstr "git blame [<options>] [<options-de-révision>] [<rev>] [--] fichier" #: builtin/blame.c:35 -msgid "[rev-opts] are documented in git-rev-list(1)" -msgstr "[options-de-révision] sont documentés dans git-rev-list(1)" +msgid "<rev-opts> are documented in git-rev-list(1)" +msgstr "<options-de-révision> sont documentés dans git-rev-list(1)" -#: builtin/blame.c:2501 +#: builtin/blame.c:2500 msgid "Show blame entries as we find them, incrementally" msgstr "" "Montrer les éléments de blâme au fur et à mesure de leur découverte, de " "manière incrémentale" -#: builtin/blame.c:2502 +#: builtin/blame.c:2501 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Montrer un SHA-1 blanc pour les commits de limite (Défaut : désactivé)" -#: builtin/blame.c:2503 +#: builtin/blame.c:2502 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" "Ne pas traiter les commits racine comme des limites (Défaut : désactivé)" -#: builtin/blame.c:2504 +#: builtin/blame.c:2503 msgid "Show work cost statistics" msgstr "Montrer les statistiques de coût d'activité" -#: builtin/blame.c:2505 +#: builtin/blame.c:2504 msgid "Show output score for blame entries" msgstr "Montrer le score de sortie pour les éléments de blâme" -#: builtin/blame.c:2506 +#: builtin/blame.c:2505 msgid "Show original filename (Default: auto)" msgstr "Montrer les noms de fichier originaux (Défaut : auto)" -#: builtin/blame.c:2507 +#: builtin/blame.c:2506 msgid "Show original linenumber (Default: off)" msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)" -#: builtin/blame.c:2508 +#: builtin/blame.c:2507 msgid "Show in a format designed for machine consumption" msgstr "Afficher dans un format propice à la consommation par machine" -#: builtin/blame.c:2509 +#: builtin/blame.c:2508 msgid "Show porcelain format with per-line commit information" msgstr "Afficher en format porcelaine avec l'information de commit par ligne" -#: builtin/blame.c:2510 +#: builtin/blame.c:2509 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Utiliser le même mode de sortie que git-annotate (Défaut : désactivé)" -#: builtin/blame.c:2511 +#: builtin/blame.c:2510 msgid "Show raw timestamp (Default: off)" msgstr "Afficher les horodatages bruts (Défaut : désactivé)" -#: builtin/blame.c:2512 +#: builtin/blame.c:2511 msgid "Show long commit SHA1 (Default: off)" msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)" -#: builtin/blame.c:2513 +#: builtin/blame.c:2512 msgid "Suppress author name and timestamp (Default: off)" msgstr "Supprimer le nom de l'auteur et l'horodatage (Défaut : désactivé)" -#: builtin/blame.c:2514 +#: builtin/blame.c:2513 msgid "Show author email instead of name (Default: off)" msgstr "Afficher l'e-mail de l'auteur au lieu du nom (Défaut : désactivé)" -#: builtin/blame.c:2515 +#: builtin/blame.c:2514 msgid "Ignore whitespace differences" msgstr "Ignorer les différences d'espace" -#: builtin/blame.c:2516 +#: builtin/blame.c:2515 msgid "Spend extra cycles to find better match" msgstr "" "Dépenser des cycles supplémentaires pour trouver une meilleure correspondance" -#: builtin/blame.c:2517 +#: builtin/blame.c:2516 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" "Utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list" -#: builtin/blame.c:2518 +#: builtin/blame.c:2517 msgid "Use <file>'s contents as the final image" msgstr "Utiliser le contenu de <fichier> comme image finale" -#: builtin/blame.c:2519 builtin/blame.c:2520 +#: builtin/blame.c:2518 builtin/blame.c:2519 msgid "score" msgstr "score" -#: builtin/blame.c:2519 +#: builtin/blame.c:2518 msgid "Find line copies within and across files" msgstr "Trouver les copies de ligne dans et entre les fichiers" -#: builtin/blame.c:2520 +#: builtin/blame.c:2519 msgid "Find line movements within and across files" msgstr "Trouver les mouvements de ligne dans et entre les fichiers" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "Process only line range n,m, counting from 1" msgstr "" "Traiter seulement l'intervalle de ligne n,m en commençant le compte à 1" @@ -2874,25 +2901,26 @@ 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:2602 +#: builtin/blame.c:2601 msgid "4 years, 11 months ago" msgstr "il y a 10 ans et 11 mois" #: builtin/branch.c:24 -msgid "git branch [options] [-r | -a] [--merged | --no-merged]" -msgstr "git branch [options] [-r | -a] [--merged | --no-merged]" +msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" +msgstr "git branch [<options>] [-r | -a] [--merged | --no-merged]" #: builtin/branch.c:25 -msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" -msgstr "git branch [options] [-l] [-f] <nomdebranche> [<point-de-départ>]" +msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" +msgstr "git branch [<options] [-l] [-f] <nom-de-branche> [<point-de-départ>]" #: builtin/branch.c:26 -msgid "git branch [options] [-r] (-d | -D) <branchname>..." -msgstr "git branch [options] [-r] (-d | -D) <nomdebranche>..." +msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." +msgstr "git branch [<options>] [-r] (-d | -D) <nom-de-branche>..." #: builtin/branch.c:27 -msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" -msgstr "git branch [options] (-m | -M) [<anciennebranche>] <nouvellebranche>" +msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" +msgstr "" +"git branch [<options>] (-m | -M) [<ancienne-branche>] <nouvelle-branche>" #: builtin/branch.c:152 #, c-format @@ -3033,197 +3061,202 @@ msgstr "(aucune branche, rebasage de %s)" msgid "(no branch, bisect started on %s)" msgstr "(aucune branche, bisect a démarré sur %s)" -#: builtin/branch.c:593 +#: builtin/branch.c:596 +#, c-format +msgid "(HEAD detached at %s)" +msgstr "(HEAD détachée sur %s)" + +#: builtin/branch.c:599 #, c-format -msgid "(detached from %s)" -msgstr "(détaché de %s)" +msgid "(HEAD detached from %s)" +msgstr "(HEAD détachée depuis %s)" -#: builtin/branch.c:596 +#: builtin/branch.c:603 msgid "(no branch)" msgstr "(aucune branche)" -#: builtin/branch.c:643 +#: builtin/branch.c:650 #, c-format msgid "object '%s' does not point to a commit" msgstr "l'objet '%s' ne pointe pas sur un commit" -#: builtin/branch.c:691 +#: builtin/branch.c:698 msgid "some refs could not be read" msgstr "des références n'ont pas pu être lues" -#: builtin/branch.c:704 +#: builtin/branch.c:711 msgid "cannot rename the current branch while not on any." msgstr "impossible de renommer la branche actuelle, il n'y en a pas." -#: builtin/branch.c:714 +#: builtin/branch.c:721 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de branche invalide : '%s'" -#: builtin/branch.c:729 +#: builtin/branch.c:736 msgid "Branch rename failed" msgstr "Échec de renommage de la branche" -#: builtin/branch.c:733 +#: builtin/branch.c:740 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Renommage d'un branche mal nommée '%s'" -#: builtin/branch.c:737 +#: builtin/branch.c:744 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !" -#: builtin/branch.c:744 +#: builtin/branch.c:751 msgid "Branch is renamed, but update of config-file failed" msgstr "" "La branche est renommée, mais la mise à jour du fichier de configuration a " "échoué" -#: builtin/branch.c:759 +#: builtin/branch.c:766 #, c-format msgid "malformed object name %s" msgstr "nom d'objet malformé %s" -#: builtin/branch.c:783 +#: builtin/branch.c:790 #, c-format msgid "could not write branch description template: %s" msgstr "impossible d'écrire le modèle de description de branche : %s" -#: builtin/branch.c:813 +#: builtin/branch.c:820 msgid "Generic options" msgstr "Options génériques" -#: builtin/branch.c:815 +#: builtin/branch.c:822 msgid "show hash and subject, give twice for upstream branch" msgstr "afficher le hachage et le sujet, doublé pour la branche amont" -#: builtin/branch.c:816 +#: builtin/branch.c:823 msgid "suppress informational messages" msgstr "supprimer les messages d'information" -#: builtin/branch.c:817 +#: builtin/branch.c:824 msgid "set up tracking mode (see git-pull(1))" msgstr "régler le mode de suivi (voir git-pull(1))" -#: builtin/branch.c:819 +#: builtin/branch.c:826 msgid "change upstream info" msgstr "modifier l'information amont" -#: builtin/branch.c:823 +#: builtin/branch.c:830 msgid "use colored output" msgstr "utiliser la coloration dans la sortie" -#: builtin/branch.c:824 +#: builtin/branch.c:831 msgid "act on remote-tracking branches" msgstr "agir sur les branches de suivi distantes" -#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854 -#: builtin/branch.c:860 builtin/commit.c:1586 builtin/commit.c:1587 -#: builtin/commit.c:1588 builtin/commit.c:1589 builtin/tag.c:616 +#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861 +#: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583 +#: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616 #: builtin/tag.c:622 msgid "commit" msgstr "commit" -#: builtin/branch.c:828 builtin/branch.c:834 +#: builtin/branch.c:835 builtin/branch.c:841 msgid "print only branches that contain the commit" msgstr "afficher seulement les branches qui contiennent le commit" -#: builtin/branch.c:840 +#: builtin/branch.c:847 msgid "Specific git-branch actions:" msgstr "Actions spécifiques à git-branch :" -#: builtin/branch.c:841 +#: builtin/branch.c:848 msgid "list both remote-tracking and local branches" msgstr "afficher à la fois les branches de suivi et les branches locales" -#: builtin/branch.c:843 +#: builtin/branch.c:850 msgid "delete fully merged branch" msgstr "supprimer une branche totalement fusionnée" -#: builtin/branch.c:844 +#: builtin/branch.c:851 msgid "delete branch (even if not merged)" msgstr "supprimer une branche (même non fusionnée)" -#: builtin/branch.c:845 +#: builtin/branch.c:852 msgid "move/rename a branch and its reflog" msgstr "déplacer/renommer une branche et son reflog" -#: builtin/branch.c:846 +#: builtin/branch.c:853 msgid "move/rename a branch, even if target exists" msgstr "déplacer/renommer une branche, même si la cible existe" -#: builtin/branch.c:847 +#: builtin/branch.c:854 msgid "list branch names" msgstr "afficher les noms des branches" -#: builtin/branch.c:848 +#: builtin/branch.c:855 msgid "create the branch's reflog" msgstr "créer le reflog de la branche" -#: builtin/branch.c:850 +#: builtin/branch.c:857 msgid "edit the description for the branch" msgstr "éditer la description de la branche" -#: builtin/branch.c:851 +#: builtin/branch.c:858 msgid "force creation, move/rename, deletion" msgstr "forcer la création, le déplacement/renommage, ou la suppression" -#: builtin/branch.c:854 +#: builtin/branch.c:861 msgid "print only not merged branches" msgstr "afficher seulement les branches non fusionnées" -#: builtin/branch.c:860 +#: builtin/branch.c:867 msgid "print only merged branches" msgstr "afficher seulement les branches fusionnées" -#: builtin/branch.c:864 +#: builtin/branch.c:871 msgid "list branches in columns" msgstr "afficher les branches en colonnes" -#: builtin/branch.c:877 +#: builtin/branch.c:884 msgid "Failed to resolve HEAD as a valid ref." msgstr "Échec de résolution de HEAD comme référence valide." -#: builtin/branch.c:881 builtin/clone.c:637 +#: builtin/branch.c:888 builtin/clone.c:637 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trouvée sous refs/heads !" -#: builtin/branch.c:903 +#: builtin/branch.c:910 msgid "--column and --verbose are incompatible" msgstr "--column et --verbose sont incompatibles" -#: builtin/branch.c:914 builtin/branch.c:953 +#: builtin/branch.c:921 builtin/branch.c:960 msgid "branch name required" msgstr "le nom de branche est requis" -#: builtin/branch.c:929 +#: builtin/branch.c:936 msgid "Cannot give description to detached HEAD" msgstr "Impossible de décrire une HEAD détachée" -#: builtin/branch.c:934 +#: builtin/branch.c:941 msgid "cannot edit description of more than one branch" msgstr "impossible d'éditer la description de plus d'une branche" -#: builtin/branch.c:941 +#: builtin/branch.c:948 #, c-format msgid "No commit on branch '%s' yet." msgstr "Aucun commit sur la branche '%s'." -#: builtin/branch.c:944 +#: builtin/branch.c:951 #, c-format msgid "No branch named '%s'." msgstr "Aucune branche nommée '%s'." -#: builtin/branch.c:959 +#: builtin/branch.c:966 msgid "too many branches for a rename operation" msgstr "trop de branches pour une opération de renommage" -#: builtin/branch.c:964 +#: builtin/branch.c:971 msgid "too many branches to set new upstream" msgstr "trop de branches pour spécifier une branche amont" -#: builtin/branch.c:968 +#: builtin/branch.c:975 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -3231,41 +3264,41 @@ msgstr "" "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur " "aucune branche." -#: builtin/branch.c:971 builtin/branch.c:993 builtin/branch.c:1014 +#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021 #, c-format msgid "no such branch '%s'" msgstr "pas de branche '%s'" -#: builtin/branch.c:975 +#: builtin/branch.c:982 #, c-format msgid "branch '%s' does not exist" msgstr "la branche '%s' n'existe pas" -#: builtin/branch.c:987 +#: builtin/branch.c:994 msgid "too many branches to unset upstream" msgstr "trop de branches pour désactiver un amont" -#: builtin/branch.c:991 +#: builtin/branch.c:998 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "impossible de désactiver une branche amont de HEAD quand elle ne pointe sur " "aucune branche." -#: builtin/branch.c:997 +#: builtin/branch.c:1004 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La branche '%s' n'a aucune information de branche amont" -#: builtin/branch.c:1011 +#: builtin/branch.c:1018 msgid "it does not make sense to create 'HEAD' manually" msgstr "créer manuellement 'HEAD' n'a pas de sens" -#: builtin/branch.c:1017 +#: builtin/branch.c:1024 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche" -#: builtin/branch.c:1020 +#: builtin/branch.c:1027 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3274,7 +3307,7 @@ msgstr "" "l'option --set-upstream est obsolète et va disparaître. Utilisez plutôt --" "track ou --set-upstream-to\n" -#: builtin/branch.c:1037 +#: builtin/branch.c:1044 #, c-format msgid "" "\n" @@ -3285,12 +3318,12 @@ msgstr "" "Si vous vouliez que '%s' suive '%s', faîtes ceci :\n" "\n" -#: builtin/branch.c:1038 +#: builtin/branch.c:1045 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1039 +#: builtin/branch.c:1046 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -3308,55 +3341,55 @@ msgstr "La création d'un colis requiert un dépôt." msgid "Need a repository to unbundle." msgstr "Le dépaquetage d'un colis requiert un dépôt." -#: builtin/cat-file.c:328 -msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" -msgstr "git cat-file (-t|-s|-e|-p|<type>|--textconv) <objet>" +#: builtin/cat-file.c:326 +msgid "git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>" +msgstr "git cat-file (-t | -s | -e | -p | <type> | --textconv) <objet>" -#: builtin/cat-file.c:329 -msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" -msgstr "git cat-file (--batch|--batch-check) < <liste_d_objets>" +#: builtin/cat-file.c:327 +msgid "git cat-file (--batch | --batch-check) < <list-of-objects>" +msgstr "git cat-file (--batch | --batch-check) < <liste-d-objets>" -#: builtin/cat-file.c:366 +#: builtin/cat-file.c:364 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<type> peut être : blob, tree, commit ou tag" -#: builtin/cat-file.c:367 +#: builtin/cat-file.c:365 msgid "show object type" msgstr "afficher le type de l'objet" -#: builtin/cat-file.c:368 +#: builtin/cat-file.c:366 msgid "show object size" msgstr "afficher la taille de l'objet" -#: builtin/cat-file.c:370 +#: builtin/cat-file.c:368 msgid "exit with zero when there's no error" msgstr "sortir avec un code d'erreur nul quand il n'y a aucune erreur" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:369 msgid "pretty-print object's content" msgstr "afficher avec mise en forme le contenu de l'objet" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:371 msgid "for blob objects, run textconv on object's content" msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet" -#: builtin/cat-file.c:375 +#: builtin/cat-file.c:373 msgid "show info and content of objects fed from the standard input" msgstr "" "afficher l'information et le contenu des objets passés en entrée standard" -#: builtin/cat-file.c:378 +#: builtin/cat-file.c:376 msgid "show info about objects fed from the standard input" msgstr "afficher l'information des objets passés en entrée standard" #: builtin/check-attr.c:11 -msgid "git check-attr [-a | --all | attr...] [--] pathname..." -msgstr "git check-attr [-a | --all | attr...] [--] chemin..." +msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." +msgstr "git check-attr [-a | --all | <attr>...] [--] <chemin>..." #: builtin/check-attr.c:12 -msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" +msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>" msgstr "" -"git check-attr --stdin [-z] [-a | --all | attr...] < <liste-de-chemins>" +"git check-attr --stdin [-z] [-a | --all | <attr>...] < <liste-de-chemins>" #: builtin/check-attr.c:19 msgid "report all attributes set on file" @@ -3412,8 +3445,8 @@ msgid "--non-matching is only valid with --verbose" msgstr "--non-matching n'est valide qu'avec --verbose" #: builtin/check-mailmap.c:8 -msgid "git check-mailmap [options] <contact>..." -msgstr "git check-mailmap [options] <contact>..." +msgid "git check-mailmap [<options>] <contact>..." +msgstr "git check-mailmap [<options>] <contact>..." #: builtin/check-mailmap.c:13 msgid "also read contacts from stdin" @@ -3429,8 +3462,8 @@ msgid "no contacts specified" msgstr "aucun contact spécifié" #: builtin/checkout-index.c:126 -msgid "git checkout-index [options] [--] [<file>...]" -msgstr "git checkout-index [options] [--] [<fichier>...]" +msgid "git checkout-index [<options>] [--] [<file>...]" +msgstr "git checkout-index [<options>] [--] [<fichier>...]" #: builtin/checkout-index.c:188 msgid "check out all files in the index" @@ -3475,12 +3508,12 @@ msgid "copy out the files from named stage" msgstr "copier les fichiers depuis l'index nommé" #: builtin/checkout.c:25 -msgid "git checkout [options] <branch>" -msgstr "git checkout [options] <branche>" +msgid "git checkout [<options>] <branch>" +msgstr "git checkout [<options>] <branche>" #: builtin/checkout.c:26 -msgid "git checkout [options] [<branch>] -- <file>..." -msgstr "git checkout [options] [<branche>] -- <fichier>..." +msgid "git checkout [<options>] [<branch>] -- <file>..." +msgstr "git checkout [<options>] [<branche>] -- <fichier>..." #: builtin/checkout.c:132 builtin/checkout.c:165 #, c-format @@ -3611,14 +3644,14 @@ msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" "to do so with:\n" "\n" -" git branch new_branch_name %s\n" +" git branch <new-branch-name> %s\n" "\n" msgstr "" "Si vous souhaitez les garder en créant une nouvelle branche, c'est le bon " "moment\n" "pour le faire avec :\n" "\n" -"git branch nouvelle_branche %s\n" +"git branch <nouvelle-branche> %s\n" "\n" #: builtin/checkout.c:777 @@ -3734,8 +3767,8 @@ msgid "do not limit pathspecs to sparse entries only" msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux" #: builtin/checkout.c:1130 -msgid "second guess 'git checkout no-such-branch'" -msgstr "deuxième chance 'git checkout branche-inexistante'" +msgid "second guess 'git checkout <no-such-branch>'" +msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'" #: builtin/checkout.c:1153 msgid "-b, -B and --orphan are mutually exclusive" @@ -3858,16 +3891,17 @@ msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s" msgid "Select items to delete" msgstr "Sélectionner les éléments à supprimer" -#: builtin/clean.c:757 +#. TRANSLATORS: Make sure to keep [y/N] as is +#: builtin/clean.c:758 #, c-format -msgid "remove %s? " -msgstr "supprimer %s ? " +msgid "Remove %s [y/N]? " +msgstr "Supprimer %s [y/N] ? " -#: builtin/clean.c:782 +#: builtin/clean.c:783 msgid "Bye." msgstr "Au revoir." -#: builtin/clean.c:790 +#: builtin/clean.c:791 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -3885,62 +3919,62 @@ msgstr "" "help - cet écran\n" "? - aide pour la sélection en ligne" -#: builtin/clean.c:817 +#: builtin/clean.c:818 msgid "*** Commands ***" msgstr "*** Commandes ***" -#: builtin/clean.c:818 +#: builtin/clean.c:819 msgid "What now" msgstr "Et maintenant ?" -#: builtin/clean.c:826 +#: builtin/clean.c:827 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Supprimerait l'élément suivant :" msgstr[1] "Supprimerait les éléments suivants :" -#: builtin/clean.c:843 +#: builtin/clean.c:844 msgid "No more files to clean, exiting." msgstr "Plus de fichier à nettoyer, sortie." -#: builtin/clean.c:874 +#: builtin/clean.c:875 msgid "do not print names of files removed" msgstr "ne pas afficher les noms des fichiers supprimés" -#: builtin/clean.c:876 +#: builtin/clean.c:877 msgid "force" msgstr "forcer" -#: builtin/clean.c:877 +#: builtin/clean.c:878 msgid "interactive cleaning" msgstr "nettoyage interactif" -#: builtin/clean.c:879 +#: builtin/clean.c:880 msgid "remove whole directories" msgstr "supprimer les répertoires entiers" -#: 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 +#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185 msgid "pattern" msgstr "motif" -#: builtin/clean.c:881 +#: builtin/clean.c:882 msgid "add <pattern> to ignore rules" msgstr "ajouter <motif> aux règles ignore" -#: builtin/clean.c:882 +#: builtin/clean.c:883 msgid "remove ignored files, too" msgstr "supprimer les fichiers ignorés, aussi" -#: builtin/clean.c:884 +#: builtin/clean.c:885 msgid "remove only ignored files" msgstr "supprimer seulement les fichiers ignorés" -#: builtin/clean.c:902 +#: builtin/clean.c:903 msgid "-x and -X cannot be used together" msgstr "-x et -X ne peuvent pas être utilisés ensemble" -#: builtin/clean.c:906 +#: builtin/clean.c:907 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -3948,7 +3982,7 @@ msgstr "" "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de " "nettoyer" -#: builtin/clean.c:909 +#: builtin/clean.c:910 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -3957,11 +3991,11 @@ msgstr "" "nettoyer" #: builtin/clone.c:37 -msgid "git clone [options] [--] <repo> [<dir>]" -msgstr "git clone [options] [--] <dépôt> [<répertoire>]" +msgid "git clone [<options>] [--] <repo> [<dir>]" +msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]" -#: builtin/clone.c:66 builtin/fetch.c:112 builtin/merge.c:224 -#: builtin/push.c:514 +#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224 +#: builtin/push.c:523 msgid "force progress reporting" msgstr "forcer l'affichage de l'état d'avancement" @@ -4021,7 +4055,7 @@ msgstr "extraire <branche> au lieu de la HEAD du répertoire distant" msgid "path to git-upload-pack on the remote" msgstr "chemin vers git-upload-pack sur le serveur distant" -#: builtin/clone.c:94 builtin/fetch.c:113 builtin/grep.c:659 +#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659 msgid "depth" msgstr "profondeur" @@ -4167,7 +4201,7 @@ msgstr "--bare et --separate-git-dir sont incompatibles." msgid "repository '%s' does not exist" msgstr "le dépôt '%s' n'existe pas" -#: builtin/clone.c:815 builtin/fetch.c:1155 +#: builtin/clone.c:815 builtin/fetch.c:1156 #, c-format msgid "depth %s is not a positive number" msgstr "la profondeur %s n'est pas un entier positif" @@ -4183,60 +4217,60 @@ msgstr "" msgid "working tree '%s' already exists." msgstr "la copie de travail '%s' existe déjà ." -#: builtin/clone.c:848 builtin/clone.c:860 +#: builtin/clone.c:850 builtin/clone.c:861 #, c-format msgid "could not create leading directories of '%s'" msgstr "impossible de créer les répertoires de premier niveau dans '%s'" -#: builtin/clone.c:851 +#: builtin/clone.c:853 #, c-format -msgid "could not create work tree dir '%s'." -msgstr "impossible de créer le répertoire de la copie de travail '%s'." +msgid "could not create work tree dir '%s'" +msgstr "impossible de créer le répertoire de la copie de travail '%s'" -#: builtin/clone.c:870 +#: builtin/clone.c:871 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonage dans le dépôt nu '%s'\n" -#: builtin/clone.c:872 +#: builtin/clone.c:873 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonage dans '%s'...\n" -#: builtin/clone.c:897 +#: builtin/clone.c:898 msgid "--dissociate given, but there is no --reference" msgstr "--dissociate est spécifié, mais --reference est absent" -#: builtin/clone.c:912 +#: builtin/clone.c:913 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"." -#: builtin/clone.c:915 +#: builtin/clone.c:916 msgid "source repository is shallow, ignoring --local" msgstr "le dépôt source est superficiel, option --local ignorée" -#: builtin/clone.c:920 +#: builtin/clone.c:921 msgid "--local is ignored" msgstr "--local est ignoré" -#: builtin/clone.c:924 +#: builtin/clone.c:925 #, c-format msgid "Don't know how to clone %s" msgstr "Je ne sais pas cloner %s" -#: builtin/clone.c:975 builtin/clone.c:983 +#: builtin/clone.c:976 builtin/clone.c:984 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s" -#: builtin/clone.c:986 +#: builtin/clone.c:987 msgid "You appear to have cloned an empty repository." msgstr "Vous semblez avoir cloné un dépôt vide." #: builtin/column.c:9 -msgid "git column [options]" -msgstr "git column [options]" +msgid "git column [<options>]" +msgstr "git column [<options>]" #: builtin/column.c:26 msgid "lookup config vars" @@ -4267,12 +4301,12 @@ msgid "--command must be the first argument" msgstr "--command doit être le premier argument" #: builtin/commit.c:37 -msgid "git commit [options] [--] <pathspec>..." -msgstr "git commit [options] [--] <spécification-de-chemin>..." +msgid "git commit [<options>] [--] <pathspec>..." +msgstr "git commit [<options>] [--] <spécification-de-chemin>..." #: builtin/commit.c:42 -msgid "git status [options] [--] <pathspec>..." -msgstr "git status [options] [--] <spécification-de-chemin>..." +msgid "git status [<options>] [--] <pathspec>..." +msgstr "git status [<options>] [--] <spécification-de-chemin>..." #: builtin/commit.c:47 msgid "" @@ -4373,70 +4407,70 @@ msgstr "" "Puis \"git cherry-pick --continue\" continuera le picorage \n" "des commits restants.\n" -#: builtin/commit.c:302 +#: builtin/commit.c:304 msgid "failed to unpack HEAD tree object" msgstr "échec du dépaquetage de l'objet arbre HEAD" -#: builtin/commit.c:342 +#: builtin/commit.c:344 msgid "unable to create temporary index" msgstr "impossible de créer l'index temporaire" -#: builtin/commit.c:348 +#: builtin/commit.c:350 msgid "interactive add failed" msgstr "échec de l'ajout interactif" -#: builtin/commit.c:359 +#: builtin/commit.c:361 msgid "unable to write index file" msgstr "impossible d'écrire le fichier d'index" -#: builtin/commit.c:361 +#: builtin/commit.c:363 msgid "unable to update temporary index" msgstr "impossible de mettre à jour l'index temporaire" -#: builtin/commit.c:363 +#: builtin/commit.c:365 msgid "Failed to update main cache tree" msgstr "Impossible de mettre à jour l'arbre de cache principal" -#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461 +#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463 msgid "unable to write new_index file" msgstr "impossible d'écrire le fichier new_index" -#: builtin/commit.c:443 +#: builtin/commit.c:445 msgid "cannot do a partial commit during a merge." msgstr "impossible de faire une validation partielle pendant une fusion." -#: builtin/commit.c:445 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a cherry-pick." msgstr "impossible de faire une validation partielle pendant un picorage." -#: builtin/commit.c:454 +#: builtin/commit.c:456 msgid "cannot read the index" msgstr "impossible de lire l'index" -#: builtin/commit.c:473 +#: builtin/commit.c:475 msgid "unable to write temporary index file" msgstr "impossible d'écrire le fichier d'index temporaire" -#: builtin/commit.c:584 +#: builtin/commit.c:580 #, c-format msgid "commit '%s' lacks author header" msgstr "entête d'auteur manquant dans le commit '%s'" -#: builtin/commit.c:586 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' has malformed author line" msgstr "le commit '%s' a une ligne d'auteur malformée" -#: builtin/commit.c:605 +#: builtin/commit.c:601 msgid "malformed --author parameter" msgstr "paramètre --author mal formé" -#: builtin/commit.c:613 +#: builtin/commit.c:609 #, c-format msgid "invalid date format: %s" msgstr "format de date invalide : %s" -#: builtin/commit.c:657 +#: builtin/commit.c:653 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -4444,43 +4478,43 @@ msgstr "" "impossible de sélectionner un caractère de commentaire\n" "qui n'est pas utilisé dans le message de validation actuel" -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1084 +#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 #, c-format msgid "could not lookup commit %s" msgstr "impossible de rechercher le commit %s" -#: builtin/commit.c:706 builtin/shortlog.c:273 +#: builtin/commit.c:702 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lecture du message de journal depuis l'entrée standard)\n" -#: builtin/commit.c:708 +#: builtin/commit.c:704 msgid "could not read log from standard input" msgstr "impossible de lire le journal depuis l'entrée standard" -#: builtin/commit.c:712 +#: builtin/commit.c:708 #, c-format msgid "could not read log file '%s'" msgstr "impossible de lire le fichier de journal '%s'" -#: builtin/commit.c:734 +#: builtin/commit.c:730 msgid "could not read MERGE_MSG" msgstr "impossible de lire MERGE_MSG" -#: builtin/commit.c:738 +#: builtin/commit.c:734 msgid "could not read SQUASH_MSG" msgstr "impossible de lire SQUASH_MSG" -#: builtin/commit.c:742 +#: builtin/commit.c:738 #, c-format msgid "could not read '%s'" msgstr "impossible de lire '%s'" -#: builtin/commit.c:789 +#: builtin/commit.c:785 msgid "could not write commit template" msgstr "impossible d'écrire le modèle de commit" -#: builtin/commit.c:807 +#: builtin/commit.c:803 #, c-format msgid "" "\n" @@ -4495,7 +4529,7 @@ msgstr "" "\t%s\n" "et essayez à nouveau.\n" -#: builtin/commit.c:812 +#: builtin/commit.c:808 #, c-format msgid "" "\n" @@ -4510,7 +4544,7 @@ msgstr "" "\t%s\n" "et essayez à nouveau.\n" -#: builtin/commit.c:825 +#: builtin/commit.c:821 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4520,7 +4554,7 @@ msgstr "" "commençant par '%c' seront ignorées, et un message vide abandonne la " "validation.\n" -#: builtin/commit.c:832 +#: builtin/commit.c:828 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4531,147 +4565,149 @@ msgstr "" "commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n" "si vous le souhaitez. Un message vide abandonne la validation.\n" -#: builtin/commit.c:852 +#: builtin/commit.c:848 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAuteur : %.*s <%.*s>" -#: builtin/commit.c:860 +#: builtin/commit.c:856 #, c-format msgid "%sDate: %s" msgstr "%sDate : %s" -#: builtin/commit.c:867 +#: builtin/commit.c:863 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sValidateur : %.*s <%.*s>" -#: builtin/commit.c:885 +#: builtin/commit.c:881 msgid "Cannot read index" msgstr "Impossible de lire l'index" -#: builtin/commit.c:942 +#: builtin/commit.c:938 msgid "Error building trees" msgstr "Erreur lors de la construction des arbres" -#: builtin/commit.c:957 builtin/tag.c:495 +#: builtin/commit.c:953 builtin/tag.c:495 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n" -#: builtin/commit.c:1059 +#: builtin/commit.c:1055 #, c-format -msgid "No existing author found with '%s'" -msgstr "Aucun auteur existant trouvé avec '%s'" +msgid "--author '%s' is not 'Name <email>' and matches no existing author" +msgstr "" +"--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun " +"auteur existant" -#: builtin/commit.c:1074 builtin/commit.c:1314 +#: builtin/commit.c:1070 builtin/commit.c:1310 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fichier non suivi invalide '%s'" -#: builtin/commit.c:1111 +#: builtin/commit.c:1107 msgid "--long and -z are incompatible" msgstr "--long et -z sont incompatibles" -#: builtin/commit.c:1141 +#: builtin/commit.c:1137 msgid "Using both --reset-author and --author does not make sense" msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens" -#: builtin/commit.c:1150 +#: builtin/commit.c:1146 msgid "You have nothing to amend." msgstr "Il n'y a rien à corriger." -#: builtin/commit.c:1153 +#: builtin/commit.c:1149 msgid "You are in the middle of a merge -- cannot amend." msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)." -#: builtin/commit.c:1155 +#: builtin/commit.c:1151 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)." -#: builtin/commit.c:1158 +#: builtin/commit.c:1154 msgid "Options --squash and --fixup cannot be used together" msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble" -#: builtin/commit.c:1168 +#: builtin/commit.c:1164 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée." -#: builtin/commit.c:1170 +#: builtin/commit.c:1166 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F/--fixup." -#: builtin/commit.c:1178 +#: builtin/commit.c:1174 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend." -#: builtin/commit.c:1195 +#: builtin/commit.c:1191 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Une seule option parmi --include/--only/--all/--interactive/--patch peut " "être utilisée." -#: builtin/commit.c:1197 +#: builtin/commit.c:1193 msgid "No paths with --include/--only does not make sense." msgstr "Aucun chemin avec les options --include/--only n'a pas de sens." -#: builtin/commit.c:1199 +#: builtin/commit.c:1195 msgid "Clever... amending the last one with dirty index." msgstr "Malin... correction du dernier avec un index sale." -#: builtin/commit.c:1201 +#: builtin/commit.c:1197 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..." -#: builtin/commit.c:1213 builtin/tag.c:728 +#: builtin/commit.c:1209 builtin/tag.c:728 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de nettoyage invalide %s" -#: builtin/commit.c:1218 +#: builtin/commit.c:1214 msgid "Paths with -a does not make sense." msgstr "Spécifier des chemins avec l'option -a n'a pas de sens." -#: builtin/commit.c:1328 builtin/commit.c:1608 +#: builtin/commit.c:1324 builtin/commit.c:1604 msgid "show status concisely" msgstr "afficher le statut avec concision" -#: builtin/commit.c:1330 builtin/commit.c:1610 +#: builtin/commit.c:1326 builtin/commit.c:1606 msgid "show branch information" msgstr "afficher l'information de branche" -#: builtin/commit.c:1332 builtin/commit.c:1612 builtin/push.c:500 +#: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509 msgid "machine-readable output" msgstr "sortie pour traitement automatique" -#: builtin/commit.c:1335 builtin/commit.c:1614 +#: builtin/commit.c:1331 builtin/commit.c:1610 msgid "show status in long format (default)" msgstr "afficher le statut en format long (par défaut)" -#: builtin/commit.c:1338 builtin/commit.c:1617 +#: builtin/commit.c:1334 builtin/commit.c:1613 msgid "terminate entries with NUL" msgstr "terminer les éléments par NUL" -#: builtin/commit.c:1340 builtin/commit.c:1620 builtin/fast-export.c:980 +#: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980 #: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "mode" -#: builtin/commit.c:1341 builtin/commit.c:1620 +#: builtin/commit.c:1337 builtin/commit.c:1616 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, " "no. (Défaut : all)" -#: builtin/commit.c:1344 +#: builtin/commit.c:1340 msgid "show ignored files" msgstr "afficher les fichiers ignorés" -#: builtin/commit.c:1345 parse-options.h:153 +#: builtin/commit.c:1341 parse-options.h:153 msgid "when" msgstr "quand" -#: builtin/commit.c:1346 +#: builtin/commit.c:1342 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -4679,209 +4715,209 @@ msgstr "" "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all " "(tous), dirty (sale), untracked (non suivi). (Défaut : all)" -#: builtin/commit.c:1348 +#: builtin/commit.c:1344 msgid "list untracked files in columns" msgstr "afficher les fichiers non suivis en colonnes" -#: builtin/commit.c:1435 +#: builtin/commit.c:1431 msgid "couldn't look up newly created commit" msgstr "impossible de retrouver le commit nouvellement créé" -#: builtin/commit.c:1437 +#: builtin/commit.c:1433 msgid "could not parse newly created commit" msgstr "impossible d'analyser le commit nouvellement créé" -#: builtin/commit.c:1482 +#: builtin/commit.c:1478 msgid "detached HEAD" msgstr "HEAD détachée" -#: builtin/commit.c:1485 +#: builtin/commit.c:1481 msgid " (root-commit)" msgstr " (commit racine)" -#: builtin/commit.c:1578 +#: builtin/commit.c:1574 msgid "suppress summary after successful commit" msgstr "supprimer le résumé après une validation réussie" -#: builtin/commit.c:1579 +#: builtin/commit.c:1575 msgid "show diff in commit message template" msgstr "afficher les diff dans le modèle de message de validation" -#: builtin/commit.c:1581 +#: builtin/commit.c:1577 msgid "Commit message options" msgstr "Options du message de validation" -#: builtin/commit.c:1582 builtin/tag.c:601 +#: builtin/commit.c:1578 builtin/tag.c:601 msgid "read message from file" msgstr "lire le message depuis un fichier" -#: builtin/commit.c:1583 +#: builtin/commit.c:1579 msgid "author" msgstr "auteur" -#: builtin/commit.c:1583 +#: builtin/commit.c:1579 msgid "override author for commit" msgstr "remplacer l'auteur pour la validation" -#: builtin/commit.c:1584 builtin/gc.c:275 +#: builtin/commit.c:1580 builtin/gc.c:275 msgid "date" msgstr "date" -#: builtin/commit.c:1584 +#: builtin/commit.c:1580 msgid "override date for commit" msgstr "remplacer la date pour la validation" -#: builtin/commit.c:1585 builtin/merge.c:218 builtin/notes.c:391 +#: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391 #: builtin/notes.c:554 builtin/tag.c:599 msgid "message" msgstr "message" -#: builtin/commit.c:1585 +#: builtin/commit.c:1581 msgid "commit message" msgstr "message de validation" -#: builtin/commit.c:1586 +#: builtin/commit.c:1582 msgid "reuse and edit message from specified commit" msgstr "réutiliser et éditer le message du commit spécifié" -#: builtin/commit.c:1587 +#: builtin/commit.c:1583 msgid "reuse message from specified commit" msgstr "réutiliser le message du commit spécifié" -#: builtin/commit.c:1588 +#: builtin/commit.c:1584 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "utiliser un message au format autosquash pour corriger le commit spécifié" -#: builtin/commit.c:1589 +#: builtin/commit.c:1585 msgid "use autosquash formatted message to squash specified commit" msgstr "" "utiliser un message au format autosquash pour compresser le commit spécifié" -#: builtin/commit.c:1590 +#: builtin/commit.c:1586 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)" -#: builtin/commit.c:1591 builtin/log.c:1191 builtin/revert.c:86 +#: builtin/commit.c:1587 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "ajouter une entrée Signed-off-by :" -#: builtin/commit.c:1592 +#: builtin/commit.c:1588 msgid "use specified template file" msgstr "utiliser le fichier de modèle spécifié" -#: builtin/commit.c:1593 +#: builtin/commit.c:1589 msgid "force edit of commit" msgstr "forcer l'édition du commit" -#: builtin/commit.c:1594 +#: builtin/commit.c:1590 msgid "default" msgstr "défaut" -#: builtin/commit.c:1594 builtin/tag.c:604 +#: builtin/commit.c:1590 builtin/tag.c:604 msgid "how to strip spaces and #comments from message" msgstr "comment éliminer les espaces et les commentaires # du message" -#: builtin/commit.c:1595 +#: builtin/commit.c:1591 msgid "include status in commit message template" msgstr "inclure le statut dans le modèle de message de validation" -#: builtin/commit.c:1596 builtin/merge.c:225 builtin/revert.c:92 +#: builtin/commit.c:1592 builtin/merge.c:225 builtin/revert.c:92 #: builtin/tag.c:605 msgid "key-id" msgstr "id de clé" -#: builtin/commit.c:1597 builtin/merge.c:226 builtin/revert.c:93 +#: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93 msgid "GPG sign commit" msgstr "signer la validation avec GPG" -#: builtin/commit.c:1600 +#: builtin/commit.c:1596 msgid "Commit contents options" msgstr "Valider les options des contenus" -#: builtin/commit.c:1601 +#: builtin/commit.c:1597 msgid "commit all changed files" msgstr "valider tous les fichiers modifiés" -#: builtin/commit.c:1602 +#: builtin/commit.c:1598 msgid "add specified files to index for commit" msgstr "ajouter les fichiers spécifiés à l'index pour la validation" -#: builtin/commit.c:1603 +#: builtin/commit.c:1599 msgid "interactively add files" msgstr "ajouter des fichiers en mode interactif" -#: builtin/commit.c:1604 +#: builtin/commit.c:1600 msgid "interactively add changes" msgstr "ajouter les modifications en mode interactif" -#: builtin/commit.c:1605 +#: builtin/commit.c:1601 msgid "commit only specified files" msgstr "valider seulement les fichiers spécifiés" -#: builtin/commit.c:1606 +#: builtin/commit.c:1602 msgid "bypass pre-commit hook" msgstr "éviter d'utiliser le crochet pre-commit" -#: builtin/commit.c:1607 +#: builtin/commit.c:1603 msgid "show what would be committed" msgstr "afficher ce qui serait validé" -#: builtin/commit.c:1618 +#: builtin/commit.c:1614 msgid "amend previous commit" msgstr "corriger la validation précédente" -#: builtin/commit.c:1619 +#: builtin/commit.c:1615 msgid "bypass post-rewrite hook" msgstr "éviter d'utiliser le crochet post-rewrite" -#: builtin/commit.c:1624 +#: builtin/commit.c:1620 msgid "ok to record an empty change" msgstr "accepter d'enregistrer une modification vide" -#: builtin/commit.c:1626 +#: builtin/commit.c:1622 msgid "ok to record a change with an empty message" msgstr "accepter d'enregistrer une modification avec un message vide" -#: builtin/commit.c:1655 +#: builtin/commit.c:1651 msgid "could not parse HEAD commit" msgstr "impossible d'analyser le commit HEAD" -#: builtin/commit.c:1694 builtin/merge.c:519 +#: builtin/commit.c:1690 builtin/merge.c:519 #, c-format msgid "could not open '%s' for reading" msgstr "impossible d'ouvrir '%s' en lecture" -#: builtin/commit.c:1701 +#: builtin/commit.c:1697 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fichier MERGE_HEAD corrompu (%s)" -#: builtin/commit.c:1708 +#: builtin/commit.c:1704 msgid "could not read MERGE_MODE" msgstr "impossible de lire MERGE_MODE" -#: builtin/commit.c:1727 +#: builtin/commit.c:1723 #, c-format msgid "could not read commit message: %s" msgstr "impossible de lire le message de validation : %s" -#: builtin/commit.c:1738 +#: builtin/commit.c:1734 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Abandon de la validation ; vous n'avez pas édité le message\n" -#: builtin/commit.c:1743 +#: builtin/commit.c:1739 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Abandon de la validation du à un message de validation vide\n" -#: builtin/commit.c:1758 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1754 builtin/merge.c:851 builtin/merge.c:876 msgid "failed to write commit object" msgstr "échec de l'écriture de l'objet commit" -#: builtin/commit.c:1791 +#: builtin/commit.c:1787 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -4892,8 +4928,8 @@ msgstr "" "n'a pas été dépassé, puis lancez \"git reset HEAD\" pour réparer." #: builtin/config.c:8 -msgid "git config [options]" -msgstr "git config [options]" +msgid "git config [<options>]" +msgstr "git config [<options>]" #: builtin/config.c:53 msgid "Config file location" @@ -5049,12 +5085,12 @@ msgid "print sizes in human readable format" msgstr "affiche les tailles dans un format humainement lisible" #: builtin/describe.c:17 -msgid "git describe [options] <commit-ish>*" -msgstr "git describe [options] <commit ou apparenté>*" +msgid "git describe [<options>] [<commit-ish>...]" +msgstr "git describe [<options>] <commit ou apparenté>*" #: builtin/describe.c:18 -msgid "git describe [options] --dirty" -msgstr "git describe [options] --dirty" +msgid "git describe [<options>] --dirty" +msgstr "git describe [<options>] --dirty" #: builtin/describe.c:217 #, c-format @@ -5272,180 +5308,180 @@ msgstr "Appliquer le spécificateur de référence aux références exportées" msgid "anonymize output" msgstr "anonymise la sortie" -#: builtin/fetch.c:20 +#: builtin/fetch.c:19 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]" -#: builtin/fetch.c:21 +#: builtin/fetch.c:20 msgid "git fetch [<options>] <group>" msgstr "git fetch [<options>] <groupe>" -#: builtin/fetch.c:22 +#: builtin/fetch.c:21 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]" -#: builtin/fetch.c:23 +#: builtin/fetch.c:22 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<options>]" -#: builtin/fetch.c:90 +#: builtin/fetch.c:89 msgid "fetch from all remotes" msgstr "récupérer depuis tous le dépôts distants" -#: builtin/fetch.c:92 +#: builtin/fetch.c:91 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser" -#: builtin/fetch.c:94 +#: builtin/fetch.c:93 msgid "path to upload pack on remote end" msgstr "chemin vers lequel télécharger le paquet sur le poste distant" -#: builtin/fetch.c:95 +#: builtin/fetch.c:94 msgid "force overwrite of local branch" msgstr "forcer l'écrasement de la branche locale" -#: builtin/fetch.c:97 +#: builtin/fetch.c:96 msgid "fetch from multiple remotes" msgstr "récupérer depuis plusieurs dépôts distants" -#: builtin/fetch.c:99 +#: builtin/fetch.c:98 msgid "fetch all tags and associated objects" msgstr "récupérer toutes les étiquettes et leurs objets associés" -#: builtin/fetch.c:101 +#: builtin/fetch.c:100 msgid "do not fetch all tags (--no-tags)" msgstr "ne pas récupérer toutes les étiquettes (--no-tags)" -#: builtin/fetch.c:103 +#: builtin/fetch.c:102 msgid "prune remote-tracking branches no longer on remote" msgstr "" "éliminer les branches de suivi distant si la branche n'existe plus dans le " "dépôt distant" -#: builtin/fetch.c:104 +#: builtin/fetch.c:103 msgid "on-demand" msgstr "à la demande" -#: builtin/fetch.c:105 +#: builtin/fetch.c:104 msgid "control recursive fetching of submodules" msgstr "contrôler la récupération récursive dans les sous-modules" -#: builtin/fetch.c:109 +#: builtin/fetch.c:108 msgid "keep downloaded pack" msgstr "conserver le paquet téléchargé" -#: builtin/fetch.c:111 +#: builtin/fetch.c:110 msgid "allow updating of HEAD ref" msgstr "permettre la mise à jour de la référence HEAD" -#: builtin/fetch.c:114 +#: builtin/fetch.c:113 msgid "deepen history of shallow clone" msgstr "approfondir l'historique d'un clone superficiel" -#: builtin/fetch.c:116 +#: builtin/fetch.c:115 msgid "convert to a complete repository" msgstr "convertir en un dépôt complet" -#: builtin/fetch.c:118 builtin/log.c:1208 +#: builtin/fetch.c:117 builtin/log.c:1208 msgid "dir" msgstr "dir" -#: builtin/fetch.c:119 +#: builtin/fetch.c:118 msgid "prepend this to submodule path output" msgstr "préfixer ceci à la sortie du chemin du sous-module" -#: builtin/fetch.c:122 +#: builtin/fetch.c:121 msgid "default mode for recursion" msgstr "mode par défaut pour la récursion" -#: builtin/fetch.c:124 +#: builtin/fetch.c:123 msgid "accept refs that update .git/shallow" msgstr "accepter les références qui mettent à jour .git/shallow" -#: builtin/fetch.c:125 +#: builtin/fetch.c:124 msgid "refmap" msgstr "correspondance de référence" -#: builtin/fetch.c:126 +#: builtin/fetch.c:125 msgid "specify fetch refmap" msgstr "spécifier une correspondance de référence pour la récupération" -#: builtin/fetch.c:376 +#: builtin/fetch.c:375 msgid "Couldn't find remote ref HEAD" msgstr "impossible de trouver la référence HEAD distante" -#: builtin/fetch.c:454 +#: builtin/fetch.c:455 #, c-format msgid "object %s not found" msgstr "objet %s non trouvé" -#: builtin/fetch.c:459 +#: builtin/fetch.c:460 msgid "[up to date]" msgstr "[à jour]" -#: builtin/fetch.c:473 +#: builtin/fetch.c:474 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s (impossible de récupérer la branche actuelle)" -#: builtin/fetch.c:474 builtin/fetch.c:560 +#: builtin/fetch.c:475 builtin/fetch.c:561 msgid "[rejected]" msgstr "[rejeté]" -#: builtin/fetch.c:485 +#: builtin/fetch.c:486 msgid "[tag update]" msgstr "[mise à jour de l'étiquette]" -#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540 +#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541 msgid " (unable to update local ref)" msgstr " (impossible de mettre à jour la référence locale)" -#: builtin/fetch.c:505 +#: builtin/fetch.c:506 msgid "[new tag]" msgstr "[nouvelle étiquette]" -#: builtin/fetch.c:508 +#: builtin/fetch.c:509 msgid "[new branch]" msgstr "[nouvelle branche]" -#: builtin/fetch.c:511 +#: builtin/fetch.c:512 msgid "[new ref]" msgstr "[nouvelle référence]" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "unable to update local ref" msgstr "impossible de mettre à jour la référence locale" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "forced update" msgstr "mise à jour forcée" -#: builtin/fetch.c:562 +#: builtin/fetch.c:563 msgid "(non-fast-forward)" msgstr "(pas d'avance rapide)" -#: builtin/fetch.c:595 builtin/fetch.c:828 +#: builtin/fetch.c:596 builtin/fetch.c:829 #, c-format msgid "cannot open %s: %s\n" msgstr "impossible d'ouvrir %s : %s\n" -#: builtin/fetch.c:604 +#: builtin/fetch.c:605 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s n'a pas envoyé tous les objets nécessaires\n" -#: builtin/fetch.c:622 +#: builtin/fetch.c:623 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "%s rejeté parce que les racines superficielles ne sont pas mises à jour" -#: builtin/fetch.c:710 builtin/fetch.c:793 +#: builtin/fetch.c:711 builtin/fetch.c:794 #, c-format msgid "From %.*s\n" msgstr "Depuis %.*s\n" -#: builtin/fetch.c:721 +#: builtin/fetch.c:722 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5454,55 +5490,55 @@ msgstr "" "des références locales n'ont pas pu être mises à jour ; essayez de lancer\n" " 'git remote prune %s' pour supprimer des branches anciennes en conflit" -#: builtin/fetch.c:773 +#: builtin/fetch.c:774 #, c-format msgid " (%s will become dangling)" msgstr " (%s sera en suspens)" -#: builtin/fetch.c:774 +#: builtin/fetch.c:775 #, c-format msgid " (%s has become dangling)" msgstr " (%s est devenu en suspens)" -#: builtin/fetch.c:798 +#: builtin/fetch.c:799 msgid "[deleted]" msgstr "[supprimé]" -#: builtin/fetch.c:799 builtin/remote.c:1060 +#: builtin/fetch.c:800 builtin/remote.c:1060 msgid "(none)" msgstr "(aucun(e))" -#: builtin/fetch.c:818 +#: builtin/fetch.c:819 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu" -#: builtin/fetch.c:837 +#: builtin/fetch.c:838 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s" -#: builtin/fetch.c:840 +#: builtin/fetch.c:841 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "L'option \"%s\" est ignorée pour %s\n" -#: builtin/fetch.c:896 +#: builtin/fetch.c:897 #, c-format msgid "Don't know how to fetch from %s" msgstr "Je ne sais pas récupérer depuis %s" -#: builtin/fetch.c:1058 +#: builtin/fetch.c:1059 #, c-format msgid "Fetching %s\n" msgstr "Récupération de %s\n" -#: builtin/fetch.c:1060 builtin/remote.c:90 +#: builtin/fetch.c:1061 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "Impossible de récupérer %s" -#: builtin/fetch.c:1078 +#: builtin/fetch.c:1079 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5510,41 +5546,42 @@ msgstr "" "Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n" "distant depuis lesquels les nouvelles révisions devraient être récupérées." -#: builtin/fetch.c:1101 +#: builtin/fetch.c:1102 msgid "You need to specify a tag name." msgstr "Vous devez spécifier un nom d'étiquette." -#: builtin/fetch.c:1143 +#: builtin/fetch.c:1144 msgid "--depth and --unshallow cannot be used together" msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble" -#: builtin/fetch.c:1145 +#: builtin/fetch.c:1146 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow sur un dépôt complet n'a pas de sens" -#: builtin/fetch.c:1168 +#: builtin/fetch.c:1169 msgid "fetch --all does not take a repository argument" msgstr "fetch --all n'accepte pas d'argument de dépôt" -#: builtin/fetch.c:1170 +#: builtin/fetch.c:1171 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all n'a pas de sens avec des spécifications de référence" -#: builtin/fetch.c:1181 +#: builtin/fetch.c:1182 #, c-format msgid "No such remote or remote group: %s" msgstr "distant ou groupe distant inexistant : %s" -#: builtin/fetch.c:1189 +#: builtin/fetch.c:1190 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" "La récupération d'un groupe et les spécifications de référence n'ont pas de " "sens" #: builtin/fmt-merge-msg.c:13 -msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" +msgid "" +"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" -"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <fichier>]" +"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]" #: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182 @@ -5573,51 +5610,51 @@ msgstr "utiliser <texte> comme début de message" msgid "file to read from" msgstr "fichier d'où lire" -#: builtin/for-each-ref.c:676 +#: builtin/for-each-ref.c:675 msgid "unable to parse format" msgstr "impossible d'analyser le format" -#: builtin/for-each-ref.c:1064 -msgid "git for-each-ref [options] [<pattern>]" -msgstr "git for-each-ref [options] [<motif>]" +#: builtin/for-each-ref.c:1063 +msgid "git for-each-ref [<options>] [<pattern>]" +msgstr "git for-each-ref [<options>] [<motif>]" -#: builtin/for-each-ref.c:1079 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for shells" msgstr "échapper les champs réservés pour les interpréteurs de commandes" -#: builtin/for-each-ref.c:1081 +#: builtin/for-each-ref.c:1080 msgid "quote placeholders suitably for perl" msgstr "échapper les champs réservés pour perl" -#: builtin/for-each-ref.c:1083 +#: builtin/for-each-ref.c:1082 msgid "quote placeholders suitably for python" msgstr "échapper les champs réservés pour python" -#: builtin/for-each-ref.c:1085 +#: builtin/for-each-ref.c:1084 msgid "quote placeholders suitably for Tcl" msgstr "échapper les champs réservés pour compatibilité avec Tcl" -#: builtin/for-each-ref.c:1088 +#: builtin/for-each-ref.c:1087 msgid "show only <n> matched refs" msgstr "n'afficher que <n> références correspondant" -#: builtin/for-each-ref.c:1089 builtin/replace.c:438 +#: builtin/for-each-ref.c:1088 builtin/replace.c:438 msgid "format" msgstr "format" -#: builtin/for-each-ref.c:1089 +#: builtin/for-each-ref.c:1088 msgid "format to use for the output" msgstr "format à utiliser pour la sortie" -#: builtin/for-each-ref.c:1090 +#: builtin/for-each-ref.c:1089 msgid "key" msgstr "clé" -#: builtin/for-each-ref.c:1091 +#: builtin/for-each-ref.c:1090 msgid "field name to sort on" msgstr "nom du champ servant à trier" -#: builtin/fsck.c:147 builtin/prune.c:136 +#: builtin/fsck.c:147 builtin/prune.c:137 msgid "Checking connectivity" msgstr "Vérification de la connectivité" @@ -5626,8 +5663,8 @@ msgid "Checking object directories" msgstr "Vérification des répertoires d'objet" #: builtin/fsck.c:603 -msgid "git fsck [options] [<object>...]" -msgstr "git fsck [options] [<objet>...]" +msgid "git fsck [<options>] [<object>...]" +msgstr "git fsck [<options>] [<objet>...]" #: builtin/fsck.c:609 msgid "show unreachable objects" @@ -5675,8 +5712,8 @@ msgid "Checking objects" msgstr "Vérification des objets" #: builtin/gc.c:24 -msgid "git gc [options]" -msgstr "git gc [options]" +msgid "git gc [<options>]" +msgstr "git gc [<options>]" #: builtin/gc.c:79 #, c-format @@ -5739,8 +5776,8 @@ msgstr "" "supprimer." #: builtin/grep.c:23 -msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" -msgstr "git grep [options] [-e] <motif> [<révision>...] [[--] <chemin>...]" +msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" +msgstr "git grep [<options>] [-e] <motif> [<révision>...] [[--] <chemin>...]" #: builtin/grep.c:218 #, c-format @@ -5780,8 +5817,8 @@ msgid "search in both tracked and untracked files" msgstr "rechercher dans les fichiers suivis et non-suivis" #: builtin/grep.c:644 -msgid "search also in ignored files" -msgstr "rechercher aussi dans les fichiers ignorés" +msgid "ignore files specified via '.gitignore'" +msgstr "ignorer les fichiers spécifiés via '.gitignore'" #: builtin/grep.c:647 msgid "show non-matching lines" @@ -5974,17 +6011,17 @@ msgstr "--cached et des arbres sont fournis en même temps." #: builtin/hash-object.c:82 msgid "" -"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " -"<file>..." +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " +"[--] <file>..." msgstr "" -"git hash-object [-t <type>] [-w] [--path=<fichier>|--no-filters] [--stdin] " +"git hash-object [-t <type>] [-w] [--path=<fichier> | --no-filters] [--stdin] " "[--] <fichier>..." #: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "git hash-object --stdin-paths < <liste-de-chemins>" -#: builtin/hash-object.c:94 builtin/tag.c:610 +#: builtin/hash-object.c:94 builtin/tag.c:612 msgid "type" msgstr "type" @@ -6036,8 +6073,8 @@ msgid "show info page" msgstr "afficher la page info" #: builtin/help.c:52 -msgid "git help [--all] [--guides] [--man|--web|--info] [command]" -msgstr "git help [--all] [--guides] [--man|--web|--info] [commande]" +msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" +msgstr "git help [--all] [--guides] [--man | --web | --info] [<commande>]" #: builtin/help.c:64 #, c-format @@ -6246,8 +6283,8 @@ msgstr "grave incohérence dans la décompression (inflate)" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "COLLISION SHA1 TROUVÉE AVEC %s !" -#: builtin/index-pack.c:689 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:256 +#: builtin/index-pack.c:689 builtin/pack-objects.c:162 +#: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "impossible de lire %s" @@ -6335,97 +6372,97 @@ msgid_plural "pack has %d unresolved deltas" msgstr[0] "le paquet a %d delta non résolu" msgstr[1] "le paquet a %d deltas non résolus" -#: builtin/index-pack.c:1220 +#: builtin/index-pack.c:1219 #, c-format msgid "unable to deflate appended object (%d)" msgstr "impossible de compresser l'objet ajouté (%d)" -#: builtin/index-pack.c:1299 +#: builtin/index-pack.c:1298 #, c-format msgid "local object %s is corrupt" msgstr "l'objet local %s est corrompu" -#: builtin/index-pack.c:1323 +#: builtin/index-pack.c:1322 msgid "error while closing pack file" msgstr "erreur en fermeture du fichier paquet" -#: builtin/index-pack.c:1336 +#: builtin/index-pack.c:1335 #, c-format msgid "cannot write keep file '%s'" msgstr "impossible d'écrire le fichier \"keep\" '%s'" -#: builtin/index-pack.c:1344 +#: builtin/index-pack.c:1343 #, c-format msgid "cannot close written keep file '%s'" msgstr "impossible de fermer le fichier \"keep\" '%s'" -#: builtin/index-pack.c:1357 +#: builtin/index-pack.c:1356 msgid "cannot store pack file" msgstr "impossible de stocker le fichier paquet" -#: builtin/index-pack.c:1368 +#: builtin/index-pack.c:1367 msgid "cannot store index file" msgstr "impossible de stocker le fichier d'index" -#: builtin/index-pack.c:1401 +#: builtin/index-pack.c:1400 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "mauvais pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1406 #, c-format msgid "invalid number of threads specified (%d)" msgstr "nombre de fils spécifié invalide (%d)" -#: builtin/index-pack.c:1411 builtin/index-pack.c:1590 +#: builtin/index-pack.c:1410 builtin/index-pack.c:1589 #, c-format msgid "no threads support, ignoring %s" msgstr "pas de support des fils, ignore %s" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1468 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Impossible d'ouvrir le fichier paquet existant '%s'" -#: builtin/index-pack.c:1471 +#: builtin/index-pack.c:1470 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Impossible d'ouvrir le fichier paquet d'index existant pour '%s'" -#: builtin/index-pack.c:1518 +#: builtin/index-pack.c:1517 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "pas un delta : %d objet" msgstr[1] "pas un delta : %d objets" -#: builtin/index-pack.c:1525 +#: builtin/index-pack.c:1524 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "longueur chaînée = %d : %lu objet" msgstr[1] "longueur chaînée = %d : %lu objets" -#: builtin/index-pack.c:1554 +#: builtin/index-pack.c:1553 msgid "Cannot come back to cwd" msgstr "Impossible de revenir au répertoire de travail courant" -#: builtin/index-pack.c:1602 builtin/index-pack.c:1605 -#: builtin/index-pack.c:1617 builtin/index-pack.c:1621 +#: builtin/index-pack.c:1601 builtin/index-pack.c:1604 +#: builtin/index-pack.c:1616 builtin/index-pack.c:1620 #, c-format msgid "bad %s" msgstr "mauvais %s" -#: builtin/index-pack.c:1635 +#: builtin/index-pack.c:1634 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin ne peut pas être utilisé sans --stdin" -#: builtin/index-pack.c:1639 builtin/index-pack.c:1648 +#: builtin/index-pack.c:1638 builtin/index-pack.c:1647 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'" -#: builtin/index-pack.c:1656 +#: builtin/index-pack.c:1655 msgid "--verify with no packfile name given" msgstr "--verify sans nom de fichier paquet donné" @@ -6538,10 +6575,10 @@ msgstr " partagé" #: builtin/init-db.c:475 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" -"shared[=<permissions>]] [directory]" +"shared[=<permissions>]] [<directory>]" msgstr "" "git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--" -"shared[=<permissions>]] [répertoire]" +"shared[=<permissions>]] [<répertoire>]" #: builtin/init-db.c:498 msgid "permissions" @@ -6604,8 +6641,8 @@ msgid "git log [<options>] [<revision range>] [[--] <path>...]" msgstr "git log [<options>] [<plage de révisions>] [[--] <chemin>...]" #: builtin/log.c:42 -msgid "git show [options] <object>..." -msgstr "git show [options] <objet>..." +msgid "git show [<options>] <object>..." +msgstr "git show [<options>] <objet>..." #: builtin/log.c:81 #, c-format @@ -6685,8 +6722,8 @@ msgid "insane in-reply-to: %s" msgstr "in-reply-to aberrant : %s" #: builtin/log.c:1026 -msgid "git format-patch [options] [<since> | <revision range>]" -msgstr "git format-patch [options] [<depuis> | <plage de révisions>]" +msgid "git format-patch [<options>] [<since> | <revision-range>]" +msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]" #: builtin/log.c:1071 msgid "Two output directories?" @@ -6887,98 +6924,98 @@ msgstr "" msgid "Unknown commit %s" msgstr "Commit inconnu %s" -#: builtin/ls-files.c:401 -msgid "git ls-files [options] [<file>...]" -msgstr "git ls-files [options] [<fichier>...]" +#: builtin/ls-files.c:358 +msgid "git ls-files [<options>] [<file>...]" +msgstr "git ls-files [<options>] [<fichier>...]" -#: builtin/ls-files.c:458 +#: builtin/ls-files.c:415 msgid "identify the file status with tags" msgstr "identifier le statut de fichier avec les étiquettes" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:417 msgid "use lowercase letters for 'assume unchanged' files" msgstr "utiliser des minuscules pour les fichier 'assumés inchangés'" -#: builtin/ls-files.c:462 +#: builtin/ls-files.c:419 msgid "show cached files in the output (default)" msgstr "afficher les fichiers mis en cache dans la sortie (défaut)" -#: builtin/ls-files.c:464 +#: builtin/ls-files.c:421 msgid "show deleted files in the output" msgstr "afficher les fichiers supprimés dans la sortie" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:423 msgid "show modified files in the output" msgstr "afficher les fichiers modifiés dans la sortie" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:425 msgid "show other files in the output" msgstr "afficher les autres fichiers dans la sortie" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:427 msgid "show ignored files in the output" msgstr "afficher les fichiers ignorés dans la sortie" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:430 msgid "show staged contents' object name in the output" msgstr "afficher les nom des objets indexés dans la sortie" -#: builtin/ls-files.c:475 +#: builtin/ls-files.c:432 msgid "show files on the filesystem that need to be removed" msgstr "" "afficher les fichiers du système de fichiers qui ont besoin d'être supprimés" -#: builtin/ls-files.c:477 +#: builtin/ls-files.c:434 msgid "show 'other' directories' names only" msgstr "afficher seulement les noms des répertoires 'other'" -#: builtin/ls-files.c:480 +#: builtin/ls-files.c:437 msgid "don't show empty directories" msgstr "ne pas afficher les répertoires vides" -#: builtin/ls-files.c:483 +#: builtin/ls-files.c:440 msgid "show unmerged files in the output" msgstr "afficher les fichiers non fusionnés dans la sortie" -#: builtin/ls-files.c:485 +#: builtin/ls-files.c:442 msgid "show resolve-undo information" msgstr "afficher l'information resolv-undo" -#: builtin/ls-files.c:487 +#: builtin/ls-files.c:444 msgid "skip files matching pattern" msgstr "sauter les fichiers correspondant au motif" -#: builtin/ls-files.c:490 +#: builtin/ls-files.c:447 msgid "exclude patterns are read from <file>" msgstr "les motifs d'exclusion sont lus depuis <fichier>" -#: builtin/ls-files.c:493 +#: builtin/ls-files.c:450 msgid "read additional per-directory exclude patterns in <file>" msgstr "lire des motifs d'exclusion additionnels par répertoire dans <fichier>" -#: builtin/ls-files.c:495 +#: builtin/ls-files.c:452 msgid "add the standard git exclusions" msgstr "ajouter les exclusions git standard" -#: builtin/ls-files.c:498 +#: builtin/ls-files.c:455 msgid "make the output relative to the project top directory" msgstr "afficher en relatif par rapport au répertoire racine du projet" -#: builtin/ls-files.c:501 +#: builtin/ls-files.c:458 msgid "if any <file> is not in the index, treat this as an error" msgstr "si un <fichier> n'est pas dans l'index, traiter cela comme une erreur" -#: builtin/ls-files.c:502 +#: builtin/ls-files.c:459 msgid "tree-ish" msgstr "arbre ou apparenté" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:460 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "considérer que les chemins supprimés depuis <arbre ou apparenté> sont " "toujours présents" -#: builtin/ls-files.c:505 +#: builtin/ls-files.c:462 msgid "show debugging data" msgstr "afficher les données de débogage" @@ -7021,12 +7058,12 @@ msgstr "" "full-name)" #: builtin/merge.c:45 -msgid "git merge [options] [<commit>...]" -msgstr "git merge [options] [<commit>...]" +msgid "git merge [<options>] [<commit>...]" +msgstr "git merge [<options>] [<commit>...]" #: builtin/merge.c:46 -msgid "git merge [options] <msg> HEAD <commit>" -msgstr "git merge [options] <message> HEAD <commit>" +msgid "git merge [<options>] <msg> HEAD <commit>" +msgstr "git merge [<options>] <message> HEAD <commit>" #: builtin/merge.c:47 msgid "git merge --abort" @@ -7378,12 +7415,12 @@ msgstr "" "La fusion automatique a réussi ; stoppée avant la validation comme demandé\n" #: builtin/merge-base.c:29 -msgid "git merge-base [-a|--all] <commit> <commit>..." -msgstr "git merge-base [-a|--all] <validation> <validation>..." +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "git merge-base [-a | --all] <commit> <commit>..." #: builtin/merge-base.c:30 -msgid "git merge-base [-a|--all] --octopus <commit>..." -msgstr "git merge-base [-a|--all] --octopus <validation>..." +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "git merge-base [-a | --all] --octopus <commit>..." #: builtin/merge-base.c:31 msgid "git merge-base --independent <commit>..." @@ -7419,11 +7456,11 @@ msgstr "trouver où <validation> a divergé du reflog de <référence>" #: builtin/merge-file.c:8 msgid "" -"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " -"file2" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" msgstr "" -"git merge-file [options] [-L nom1 [-L orig [-L nom2]]] fichier1 orig_file " -"fichier2" +"git merge-file [<options>] [-L <nom1> [-L <orig> [-L <nom2>]]] <fichier1> " +"<fichier-orig> <fichier2>" #: builtin/merge-file.c:33 msgid "send results to standard output" @@ -7454,8 +7491,8 @@ msgid "do not warn about conflicts" msgstr "ne pas avertir à propos des conflits" #: builtin/merge-file.c:45 -msgid "set labels for file1/orig_file/file2" -msgstr "définir les labels pour fichier1/orig_file/fichier2" +msgid "set labels for file1/orig-file/file2" +msgstr "définir les labels pour fichier1/fichier-orig/fichier2" #: builtin/mktree.c:64 msgid "git mktree [-z] [--missing] [--batch]" @@ -7474,8 +7511,8 @@ msgid "allow creation of more than one tree" msgstr "autoriser la création de plus d'un arbre" #: builtin/mv.c:15 -msgid "git mv [options] <source>... <destination>" -msgstr "git mv [options] <source>... <destination>" +msgid "git mv [<options>] <source>... <destination>" +msgstr "git mv [<options>] <source>... <destination>" #: builtin/mv.c:69 #, c-format @@ -7562,22 +7599,22 @@ msgstr "%s, source=%s, destination=%s" msgid "Renaming %s to %s\n" msgstr "Renommage de %s en %s\n" -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:355 +#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359 #, c-format msgid "renaming '%s' failed" msgstr "le renommage de '%s' a échoué" #: builtin/name-rev.c:255 -msgid "git name-rev [options] <commit>..." -msgstr "git name-rev [options] <validation>..." +msgid "git name-rev [<options>] <commit>..." +msgstr "git name-rev [<options>] <validation>..." #: builtin/name-rev.c:256 -msgid "git name-rev [options] --all" -msgstr "git name-rev [options] --all" +msgid "git name-rev [<options>] --all" +msgstr "git name-rev [<options>] --all" #: builtin/name-rev.c:257 -msgid "git name-rev [options] --stdin" -msgstr "git name-rev [options] --stdin" +msgid "git name-rev [<options>] --stdin" +msgstr "git name-rev [<options>] --stdin" #: builtin/name-rev.c:309 msgid "print only names (no SHA-1)" @@ -7609,44 +7646,44 @@ msgid "dereference tags in the input (internal use)" msgstr "déréférencer les étiquettes en entrée (usage interne)" #: builtin/notes.c:24 -msgid "git notes [--ref <notes_ref>] [list [<object>]]" -msgstr "git notes [--ref <références_notes>] [list [<object>]]" +msgid "git notes [--ref <notes-ref>] [list [<object>]]" +msgstr "git notes [--ref <références-notes>] [list [<object>]]" #: builtin/notes.c:25 msgid "" -"git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" msgstr "" -"git notes [--ref <références_notes>] add [-f] [--allow-empty] [-m <message> " +"git notes [--ref <références-notes>] add [-f] [--allow-empty] [-m <message> " "| -F <fichier> | (-c | -C) <objet>] [<objet>]" #: builtin/notes.c:26 -msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" +msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "" -"git notes [--ref <références_notes>] copy [-f] <depuis-objet> <vers-objet>" +"git notes [--ref <références-notes>] copy [-f] <depuis-objet> <vers-objet>" #: builtin/notes.c:27 msgid "" -"git notes [--ref <notes_ref>] append [--allow-empty] [-m <msg> | -F <file> | " +"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" msgstr "" -"git notes [--ref <références_notes>] append [--allow-empty] [-m <message> | -" +"git notes [--ref <références-notes>] append [--allow-empty] [-m <message> | -" "F <fichier> | (-c | -C) <objet>] [<objet>]" #: builtin/notes.c:28 -msgid "git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]" -msgstr "git notes [--ref <références_notes>] edit [--allow-empty] [<objet>]" +msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" +msgstr "git notes [--ref <références-notes>] edit [--allow-empty] [<objet>]" #: builtin/notes.c:29 -msgid "git notes [--ref <notes_ref>] show [<object>]" -msgstr "git notes [--ref <références_notes>] show [<objet>]" +msgid "git notes [--ref <notes-ref>] show [<object>]" +msgstr "git notes [--ref <références-notes>] show [<objet>]" #: builtin/notes.c:30 msgid "" -"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" +"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "" -"git notes [--ref <références_notes>] merge [-v | -q] [-s <stratégie> ] " -"<références_notes>" +"git notes [--ref <références-notes>] merge [-v | -q] [-s <stratégie> ] " +"<références-notes>" #: builtin/notes.c:31 msgid "git notes merge --commit [-v | -q]" @@ -7657,16 +7694,16 @@ msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" #: builtin/notes.c:33 -msgid "git notes [--ref <notes_ref>] remove [<object>...]" -msgstr "git notes [--ref <références_notes>] remove [<objet>...]" +msgid "git notes [--ref <notes-ref>] remove [<object>...]" +msgstr "git notes [--ref <références-notes>] remove [<objet>...]" #: builtin/notes.c:34 -msgid "git notes [--ref <notes_ref>] prune [-n | -v]" -msgstr "git notes [--ref <références_notes>] prune [-n | -v]" +msgid "git notes [--ref <notes-ref>] prune [-n | -v]" +msgstr "git notes [--ref <références-notes>] prune [-n | -v]" #: builtin/notes.c:35 -msgid "git notes [--ref <notes_ref>] get-ref" -msgstr "git notes [--ref <références_notes>] get-ref" +msgid "git notes [--ref <notes-ref>] get-ref" +msgstr "git notes [--ref <références-notes>] get-ref" #: builtin/notes.c:40 msgid "git notes [list [<object>]]" @@ -7697,8 +7734,8 @@ msgid "git notes show [<object>]" msgstr "git notes show [<objet>]" #: builtin/notes.c:71 -msgid "git notes merge [<options>] <notes_ref>" -msgstr "git notes merge [<options>] <références_notes>" +msgid "git notes merge [<options>] <notes-ref>" +msgstr "git notes merge [<options>] <références-notes>" #: builtin/notes.c:72 msgid "git notes merge --commit [<options>]" @@ -7936,8 +7973,8 @@ msgid "notes-ref" msgstr "références-notes" #: builtin/notes.c:954 -msgid "use notes from <notes_ref>" -msgstr "utiliser les notes depuis <références_notes>" +msgid "use notes from <notes-ref>" +msgstr "utiliser les notes depuis <références-notes>" #: builtin/notes.c:989 builtin/remote.c:1621 #, c-format @@ -7954,196 +7991,196 @@ msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" msgstr "" "git pack-objects [options...] base-name [< liste-références | < liste-objets]" -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 +#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 #, c-format msgid "deflate error (%d)" msgstr "erreur de compression (%d)" -#: builtin/pack-objects.c:773 +#: builtin/pack-objects.c:771 msgid "Writing objects" msgstr "Écriture des objets" -#: builtin/pack-objects.c:1015 +#: builtin/pack-objects.c:1013 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "désactivation de l'écriture en bitmap car certains objets ne sont pas " "compressés" -#: builtin/pack-objects.c:2175 +#: builtin/pack-objects.c:2173 msgid "Compressing objects" msgstr "Compression des objets" -#: builtin/pack-objects.c:2572 +#: builtin/pack-objects.c:2570 #, c-format msgid "unsupported index version %s" msgstr "version d'index non supportée %s" -#: builtin/pack-objects.c:2576 +#: builtin/pack-objects.c:2574 #, c-format msgid "bad index version '%s'" msgstr "mauvaise version d'index '%s'" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2597 #, c-format msgid "option %s does not accept negative form" msgstr "l'option %s n'accepte pas de valeur négative" -#: builtin/pack-objects.c:2603 +#: builtin/pack-objects.c:2601 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "impossible d'analyser la valeur '%s' pour l'option %s" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2621 msgid "do not show progress meter" msgstr "ne pas afficher la barre de progression" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2623 msgid "show progress meter" msgstr "afficher la barre de progression" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2625 msgid "show progress meter during object writing phase" msgstr "afficher la barre de progression durant la phase d'écrite des objets" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2628 msgid "similar to --all-progress when progress meter is shown" msgstr "similaire à --all-progress quand la barre de progression est affichée" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2629 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2632 +#: builtin/pack-objects.c:2630 msgid "write the pack index file in the specified idx format version" msgstr "" "écrire le fichier d'index du paquet dans le format d'index de version " "spécifié" -#: builtin/pack-objects.c:2635 +#: builtin/pack-objects.c:2633 msgid "maximum size of each output pack file" msgstr "taille maximum de chaque fichier paquet en sortie" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2635 msgid "ignore borrowed objects from alternate object store" msgstr "ignorer les objets empruntés à un autre magasin d'objets" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:2637 msgid "ignore packed objects" msgstr "ignorer les objets empaquetés" -#: builtin/pack-objects.c:2641 +#: builtin/pack-objects.c:2639 msgid "limit pack window by objects" msgstr "limiter la fenêtre d'empaquetage par objets" -#: builtin/pack-objects.c:2643 +#: builtin/pack-objects.c:2641 msgid "limit pack window by memory in addition to object limit" msgstr "" "limiter la fenêtre d'empaquetage par mémoire en plus de la limite d'objets" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2643 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "longueur maximum de la chaîne de delta autorisée dans le paquet résultant" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2645 msgid "reuse existing deltas" msgstr "réutiliser les deltas existants" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2647 msgid "reuse existing objects" msgstr "réutiliser les objets existants" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2649 msgid "use OFS_DELTA objects" msgstr "utiliser les objets OFS_DELTA" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2651 msgid "use threads when searching for best delta matches" msgstr "" "utiliser des fils lors de la recherche pour une meilleurs correspondance des " "deltas" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2653 msgid "do not create an empty pack output" msgstr "ne pas créer un paquet vide" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2655 msgid "read revision arguments from standard input" msgstr "lire les paramètres de révision depuis l'entrée standard" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2657 msgid "limit the objects to those that are not yet packed" msgstr "limiter les objets à ceux qui ne sont pas encore empaquetés" -#: builtin/pack-objects.c:2662 +#: builtin/pack-objects.c:2660 msgid "include objects reachable from any reference" msgstr "inclure les objets accessibles depuis toute référence" -#: builtin/pack-objects.c:2665 +#: builtin/pack-objects.c:2663 msgid "include objects referred by reflog entries" msgstr "inclure les objets référencés par les éléments de reflog" -#: builtin/pack-objects.c:2668 +#: builtin/pack-objects.c:2666 msgid "include objects referred to by the index" msgstr "inclure les objets référencés par l'index" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2669 msgid "output pack to stdout" msgstr "afficher l'empaquetage sur la sortie standard" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2671 msgid "include tag objects that refer to objects to be packed" msgstr "inclure les objets d'étiquettes qui réfèrent à des objets à empaqueter" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2673 msgid "keep unreachable objects" msgstr "garder les objets inaccessibles" -#: builtin/pack-objects.c:2676 parse-options.h:140 +#: builtin/pack-objects.c:2674 parse-options.h:140 msgid "time" msgstr "heure" -#: builtin/pack-objects.c:2677 +#: builtin/pack-objects.c:2675 msgid "unpack unreachable objects newer than <time>" msgstr "dépaqueter les objets inaccessibles plus récents que <heure>" -#: builtin/pack-objects.c:2680 +#: builtin/pack-objects.c:2678 msgid "create thin packs" msgstr "créer des paquets légers" -#: builtin/pack-objects.c:2682 +#: builtin/pack-objects.c:2680 msgid "create packs suitable for shallow fetches" msgstr "créer des paquets permettant des récupérations superficielles" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2682 msgid "ignore packs that have companion .keep file" msgstr "ignorer les paquets qui ont un fichier .keep" -#: builtin/pack-objects.c:2686 +#: builtin/pack-objects.c:2684 msgid "pack compression level" msgstr "niveau de compression du paquet" -#: builtin/pack-objects.c:2688 +#: builtin/pack-objects.c:2686 msgid "do not hide commits by grafts" msgstr "ne pas cacher les validations par greffes" -#: builtin/pack-objects.c:2690 +#: builtin/pack-objects.c:2688 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "utiliser un index en bitmap si disponible pour accélerer le décompte des " "objets" -#: builtin/pack-objects.c:2692 +#: builtin/pack-objects.c:2690 msgid "write a bitmap index together with the pack index" msgstr "écrire un index en bitmap associé à l'index de paquet" -#: builtin/pack-objects.c:2783 +#: builtin/pack-objects.c:2781 msgid "Counting objects" msgstr "Décompte des objets" #: builtin/pack-refs.c:6 -msgid "git pack-refs [options]" -msgstr "git pack-refs [options]" +msgid "git pack-refs [<options>]" +msgstr "git pack-refs [<options>]" #: builtin/pack-refs.c:14 msgid "pack everything" @@ -8154,8 +8191,8 @@ msgid "prune loose refs (default)" msgstr "éliminer les références perdues (défaut)" #: builtin/prune-packed.c:7 -msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" -msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" +msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" +msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" #: builtin/prune-packed.c:40 msgid "Removing duplicate objects" @@ -8450,76 +8487,80 @@ msgstr "--mirror ne peut pas être combiné avec des spécifications de référe msgid "--all and --mirror are incompatible" msgstr "--all et --mirror sont incompatibles" -#: builtin/push.c:493 +#: builtin/push.c:502 msgid "repository" msgstr "dépôt" -#: builtin/push.c:494 +#: builtin/push.c:503 msgid "push all refs" msgstr "pousser toutes les références" -#: builtin/push.c:495 +#: builtin/push.c:504 msgid "mirror all refs" msgstr "refléter toutes les références" -#: builtin/push.c:497 +#: builtin/push.c:506 msgid "delete refs" msgstr "supprimer les références" -#: builtin/push.c:498 +#: builtin/push.c:507 msgid "push tags (can't be used with --all or --mirror)" msgstr "" "pousser les étiquettes (ne peut pas être utilisé avec --all ou --mirror)" -#: builtin/push.c:501 +#: builtin/push.c:510 msgid "force updates" msgstr "forcer les mises à jour" -#: builtin/push.c:503 +#: builtin/push.c:512 msgid "refname>:<expect" msgstr "nom de référence>:<attendu" -#: builtin/push.c:504 +#: builtin/push.c:513 msgid "require old value of ref to be at this value" msgstr "exiger que l'ancienne valeur de la référence soit à cette valeur" -#: builtin/push.c:507 +#: builtin/push.c:516 msgid "control recursive pushing of submodules" msgstr "contrôler la poussée récursive des sous-modules" -#: builtin/push.c:509 +#: builtin/push.c:518 msgid "use thin pack" msgstr "utiliser un empaquetage léger" -#: builtin/push.c:510 builtin/push.c:511 +#: builtin/push.c:519 builtin/push.c:520 msgid "receive pack program" msgstr "recevoir le programme d'empaquetage" -#: builtin/push.c:512 +#: builtin/push.c:521 msgid "set upstream for git pull/status" msgstr "définir la branche amont pour git pull/status" -#: builtin/push.c:515 +#: builtin/push.c:524 msgid "prune locally removed refs" msgstr "éliminer les références locales supprimées" -#: builtin/push.c:517 +#: builtin/push.c:526 msgid "bypass pre-push hook" msgstr "éviter d'utiliser le crochet pre-push" -#: builtin/push.c:518 +#: builtin/push.c:527 msgid "push missing but relevant tags" msgstr "pousser les étiquettes manquantes mais pertinentes" -#: builtin/push.c:520 +#: builtin/push.c:529 msgid "GPG sign the push" msgstr "signer la poussée avec GPG" -#: builtin/push.c:529 +#: builtin/push.c:530 +msgid "request atomic transaction on remote side" +msgstr "demande une transaction atomique sur le serveur distant" + +#: builtin/push.c:539 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete est incompatible avec --all, --mirror et --tags" -#: builtin/push.c:531 +#: builtin/push.c:541 msgid "--delete doesn't make sense without any refs" msgstr "--delete n'a pas de sens sans aucune référence" @@ -8598,12 +8639,12 @@ msgstr "sauter l'application du filtre d'extraction creuse" msgid "debug unpack-trees" msgstr "déboguer unpack-trees" -#: builtin/reflog.c:499 +#: builtin/reflog.c:429 #, c-format msgid "%s' for '%s' is not a valid timestamp" msgstr "%s' pour '%s' n'est pas un horodatage valide" -#: builtin/reflog.c:615 builtin/reflog.c:620 +#: builtin/reflog.c:546 builtin/reflog.c:551 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' n'est pas un horodatage valide" @@ -8614,11 +8655,11 @@ msgstr "git remote [-v | --verbose]" #: builtin/remote.c:13 msgid "" -"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" +"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" -"git remote add [-t <branche>] [-m <maîtresse>] [-f] [--tags|--no-tags] [--" -"mirror=<fetch|push>] <nom> <URL>" +"git remote add [-t <branche>] [-m <master>] [-f] [--tags | --no-tags] [--" +"mirror=<fetch|push>] <nom> <url>" #: builtin/remote.c:14 builtin/remote.c:33 msgid "git remote rename <old> <new>" @@ -8628,9 +8669,9 @@ msgstr "git remote rename <ancienne> <nouvelle>" msgid "git remote remove <name>" msgstr "git remote remove <nom>" -#: builtin/remote.c:16 -msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" -msgstr "git remote set-head <nom> (-a | --auto | -d | --delete |<branche>)" +#: builtin/remote.c:16 builtin/remote.c:43 +msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" +msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branche>)" #: builtin/remote.c:17 msgid "git remote [-v | --verbose] show [-n] <name>" @@ -8667,10 +8708,6 @@ msgstr "git remote set-url --delete <nom> <URL>" msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<options>] <nom> <URL>" -#: builtin/remote.c:43 -msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" -msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branche>)" - #: builtin/remote.c:48 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <nom> <branche>..." @@ -9114,8 +9151,8 @@ msgid "be verbose; must be placed before a subcommand" msgstr "être verbeux : doit être placé avant une sous-commande" #: builtin/repack.c:17 -msgid "git repack [options]" -msgstr "git repack [options]" +msgid "git repack [<options>]" +msgstr "git repack [<options>]" #: builtin/repack.c:159 msgid "pack everything in a single pack" @@ -9182,7 +9219,7 @@ msgstr "taille maximum de chaque fichier paquet" msgid "repack objects in packs marked with .keep" msgstr "réempaqueter les objets dans des paquets marqués avec .keep" -#: builtin/repack.c:371 +#: builtin/repack.c:375 #, c-format msgid "removing '%s' failed" msgstr "la suppression de '%s' a échoué" @@ -9274,8 +9311,9 @@ msgid "use this format" msgstr "utiliser ce format" #: builtin/rerere.c:12 -msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" -msgstr "git rerere [clear | forget chemin... | status | remaining | diff | gc]" +msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" +msgstr "" +"git rerere [clear | forget <chemin>... | status | remaining | diff | gc]" #: builtin/rerere.c:57 msgid "register clean resolutions in index" @@ -9417,8 +9455,8 @@ msgid "Could not write new index file." msgstr "Impossible d'écrire le nouveau fichier d'index." #: builtin/rev-parse.c:361 -msgid "git rev-parse --parseopt [options] -- [<args>...]" -msgstr "git rev-parse --parseopt [options] -- [<arguments>...]" +msgid "git rev-parse --parseopt [<options>] -- [<args>...]" +msgstr "git rev-parse --parseopt [<options>] -- [<arguments>...]" #: builtin/rev-parse.c:366 msgid "keep the `--` passed as an arg" @@ -9434,13 +9472,13 @@ msgstr "sortie en forme longue fixée" #: builtin/rev-parse.c:499 msgid "" -"git rev-parse --parseopt [options] -- [<args>...]\n" +"git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" -" or: git rev-parse [options] [<arg>...]\n" +" or: git rev-parse [<options>] [<arg>...]\n" "\n" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "" -"git rev-parse --parseopt [options] -- [<arguments>...]\n" +"git rev-parse --parseopt [<options>] -- [<arguments>...]\n" " ou : git rev-parse --sq-quote [<argument>...]\n" " ou : git rev-parse [options] [<argument>...]\n" "\n" @@ -9448,16 +9486,16 @@ msgstr "" "l'utilisation principale." #: builtin/revert.c:22 -msgid "git revert [options] <commit-ish>..." -msgstr "git revert [options] <commit ou apparenté>..." +msgid "git revert [<options>] <commit-ish>..." +msgstr "git revert [<options>] <commit ou apparenté>..." #: builtin/revert.c:23 msgid "git revert <subcommand>" msgstr "git revert <sous-commande>" #: builtin/revert.c:28 -msgid "git cherry-pick [options] <commit-ish>..." -msgstr "git cherry-pick [options] <commit ou apparenté>..." +msgid "git cherry-pick [<options>] <commit-ish>..." +msgstr "git cherry-pick [<options>] <commit ou apparenté>..." #: builtin/revert.c:29 msgid "git cherry-pick <subcommand>" @@ -9537,8 +9575,8 @@ msgid "cherry-pick failed" msgstr "le picorage a échoué" #: builtin/rm.c:17 -msgid "git rm [options] [--] <file>..." -msgstr "git rm [options] [--] <fichier>..." +msgid "git rm [<options>] [--] <file>..." +msgstr "git rm [<options>] [--] <fichier>..." #: builtin/rm.c:65 msgid "" @@ -9642,8 +9680,8 @@ msgid "git rm: unable to remove %s" msgstr "git rm : impossible de supprimer %s" #: builtin/shortlog.c:13 -msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]" -msgstr "git shortlog [<options>] [<intervalle révisions>] [[--] [<chemin>...]]" +msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" +msgstr "git shortlog [<options>] [<intervalle-révisions>] [[--] [<chemin>...]]" #: builtin/shortlog.c:131 #, c-format @@ -9674,19 +9712,19 @@ msgstr "Couper les lignes" #: builtin/show-branch.c:9 msgid "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" msgstr "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" +"git show-branch [-a | --all] [-r|--remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<quand>] | --no-color] [--sparse]\n" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<rév> | <glob>)...]" #: builtin/show-branch.c:13 -msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" -msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<référence>]" +msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" +msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<référence>]" #: builtin/show-branch.c:652 msgid "show remote-tracking and local branches" @@ -9756,11 +9794,11 @@ msgstr "" #: builtin/show-ref.c:10 msgid "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" msgstr "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [motif*] " +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<motif>...]" #: builtin/show-ref.c:11 msgid "git show-ref --exclude-existing[=pattern] < ref-list" @@ -9804,12 +9842,12 @@ msgstr "" "local" #: builtin/symbolic-ref.c:7 -msgid "git symbolic-ref [options] name [ref]" -msgstr "git symbolic-ref [options] nom [référence]" +msgid "git symbolic-ref [<options>] <name> [<ref>]" +msgstr "git symbolic-ref [<options>] nom [<référence>]" #: builtin/symbolic-ref.c:8 -msgid "git symbolic-ref -d [-q] name" -msgstr "git symbolic-ref -d [-q] nom" +msgid "git symbolic-ref -d [-q] <name>" +msgstr "git symbolic-ref -d [-q] <nom>" #: builtin/symbolic-ref.c:40 msgid "suppress error message for non-symbolic (detached) refs" @@ -9834,10 +9872,11 @@ msgstr "raison de la mise à jour" #: builtin/tag.c:22 msgid "" -"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" -msgstr "" -"git tag [-a|-s|-u <id-clé>] [-f] [-m <message>|-F <file>] <nométiquette> " +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " "[<head>]" +msgstr "" +"git tag [-a | -s | -u <id-clé>] [-f] [-m <message> | -F <file>] <nom-" +"étiquette> [<head>]" #: builtin/tag.c:23 msgid "git tag -d <tagname>..." @@ -9845,10 +9884,10 @@ msgstr "git tag -d <nométiquette>..." #: builtin/tag.c:24 msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" "\t\t[<pattern>...]" msgstr "" -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <objet>] \n" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <objet>]\n" "\t\t[<motif>...]" #: builtin/tag.c:26 @@ -9992,18 +10031,18 @@ msgstr "utiliser une autre clé pour signer l'étiquette" msgid "replace the tag if exists" msgstr "remplacer l'étiquette si elle existe" -#: builtin/tag.c:608 +#: builtin/tag.c:609 +msgid "Tag listing options" +msgstr "Options d'affichage des étiquettes" + +#: builtin/tag.c:610 msgid "show tag list in columns" msgstr "afficher la liste des étiquettes sous forme de colonnes" -#: builtin/tag.c:610 +#: builtin/tag.c:612 msgid "sort tags" msgstr "trier les étiquettes" -#: builtin/tag.c:614 -msgid "Tag listing options" -msgstr "Options d'affichage des étiquettes" - #: builtin/tag.c:617 builtin/tag.c:623 msgid "print only tags that contain the commit" msgstr "afficher seulement les étiquettes qui contiennent la validation" @@ -10060,138 +10099,138 @@ msgid "Unpacking objects" msgstr "Dépaquetage des objets" #: builtin/update-index.c:403 -msgid "git update-index [options] [--] [<file>...]" -msgstr "git update-index [options] [--] [<fichier>...]" +msgid "git update-index [<options>] [--] [<file>...]" +msgstr "git update-index [<options>] [--] [<fichier>...]" -#: builtin/update-index.c:756 +#: builtin/update-index.c:757 msgid "continue refresh even when index needs update" msgstr "continuer de rafraîchir même si l'index a besoin d'une mise à jour" -#: builtin/update-index.c:759 +#: builtin/update-index.c:760 msgid "refresh: ignore submodules" msgstr "rafraîchir : ignorer les sous-modules" -#: builtin/update-index.c:762 +#: builtin/update-index.c:763 msgid "do not ignore new files" msgstr "ne pas ignorer les nouveaux fichiers" -#: builtin/update-index.c:764 +#: builtin/update-index.c:765 msgid "let files replace directories and vice-versa" msgstr "laisser les fichiers remplacer des répertoires et vice-versa" -#: builtin/update-index.c:766 +#: builtin/update-index.c:767 msgid "notice files missing from worktree" msgstr "aviser des fichiers manquants dans la copie de travail" -#: builtin/update-index.c:768 +#: builtin/update-index.c:769 msgid "refresh even if index contains unmerged entries" msgstr "rafraîchir même si l'index contient des éléments non fusionnés" -#: builtin/update-index.c:771 +#: builtin/update-index.c:772 msgid "refresh stat information" msgstr "rafraîchir l'information de stat" -#: builtin/update-index.c:775 +#: builtin/update-index.c:776 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "comme --refresh, mais en ignorant l'option assume-unchanged" -#: builtin/update-index.c:779 +#: builtin/update-index.c:780 msgid "<mode>,<object>,<path>" msgstr "<mode>, <objet>, <chemin>" -#: builtin/update-index.c:780 +#: builtin/update-index.c:781 msgid "add the specified entry to the index" msgstr "ajouter l'élément spécifié dans l'index" -#: builtin/update-index.c:784 +#: builtin/update-index.c:785 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/update-index.c:785 +#: builtin/update-index.c:786 msgid "override the executable bit of the listed files" msgstr "outrepasser le bit exécutable pour les fichiers listés" -#: builtin/update-index.c:789 +#: builtin/update-index.c:790 msgid "mark files as \"not changing\"" msgstr "marquer les fichiers comme \"non changeants\"" -#: builtin/update-index.c:792 +#: builtin/update-index.c:793 msgid "clear assumed-unchanged bit" msgstr "mettre à zéro le bit supposé-non-modifié" -#: builtin/update-index.c:795 +#: builtin/update-index.c:796 msgid "mark files as \"index-only\"" msgstr "marquer les fichiers comme \"index seulement\"" -#: builtin/update-index.c:798 +#: builtin/update-index.c:799 msgid "clear skip-worktree bit" msgstr "mettre à zéro le bit sauter-la-copie-de travail" -#: builtin/update-index.c:801 +#: builtin/update-index.c:802 msgid "add to index only; do not add content to object database" msgstr "" "ajouter seulement à l'index ; ne pas ajouter le contenu dans la base de " "données des objets" -#: builtin/update-index.c:803 +#: builtin/update-index.c:804 msgid "remove named paths even if present in worktree" msgstr "" "supprimer les chemins nommés même s'ils sont présents dans la copie de " "travail" -#: builtin/update-index.c:805 +#: builtin/update-index.c:806 msgid "with --stdin: input lines are terminated by null bytes" msgstr "avec --stdin : les lignes en entrée sont terminées par des octets nuls" -#: builtin/update-index.c:807 +#: builtin/update-index.c:808 msgid "read list of paths to be updated from standard input" msgstr "lire la liste des chemins à mettre à jour depuis l'entrée standard" -#: builtin/update-index.c:811 +#: builtin/update-index.c:812 msgid "add entries from standard input to the index" msgstr "ajouter les éléments depuis l'entrée standard à l'index" -#: builtin/update-index.c:815 +#: builtin/update-index.c:816 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "repeupler les étapes n°2 et n°3 pour les chemins listés" -#: builtin/update-index.c:819 +#: builtin/update-index.c:820 msgid "only update entries that differ from HEAD" msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD" -#: builtin/update-index.c:823 +#: builtin/update-index.c:824 msgid "ignore files missing from worktree" msgstr "ignorer les fichiers manquants dans la copie de travail" -#: builtin/update-index.c:826 +#: builtin/update-index.c:827 msgid "report actions to standard output" msgstr "afficher les actions sur la sortie standard" -#: builtin/update-index.c:828 +#: builtin/update-index.c:829 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus" -#: builtin/update-index.c:832 +#: builtin/update-index.c:833 msgid "write index in this format" msgstr "écrire l'index dans ce format" -#: builtin/update-index.c:834 +#: builtin/update-index.c:835 msgid "enable or disable split index" msgstr "activer ou désactiver l'index divisé" #: builtin/update-ref.c:9 -msgid "git update-ref [options] -d <refname> [<oldval>]" -msgstr "git update-ref [options] -d <nomréférence> [<anciennevaleur>]" +msgid "git update-ref [<options>] -d <refname> [<old-val>]" +msgstr "git update-ref [<options>] -d <nom-référence> [<ancienne-valeur>]" #: builtin/update-ref.c:10 -msgid "git update-ref [options] <refname> <newval> [<oldval>]" +msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" msgstr "" -"git update-ref [options] <nomréférence> <nouvellevaleur> " -"[<anciennevaleur>]" +"git update-ref [<options>] <nom-référence> <nouvelle-valeur> [<ancienne-" +"valeur>]" #: builtin/update-ref.c:11 -msgid "git update-ref [options] --stdin [-z]" -msgstr "git update-ref [options] --stdin [-z]" +msgid "git update-ref [<options>] --stdin [-z]" +msgstr "git update-ref [<options>] --stdin [-z]" #: builtin/update-ref.c:359 msgid "delete the reference" @@ -10218,16 +10257,16 @@ msgid "update the info files from scratch" msgstr "mettre à jour les fichiers d'information à partir de zéro" #: builtin/verify-commit.c:17 -msgid "git verify-commit [-v|--verbose] <commit>..." -msgstr "git verify-commit [-v|--verbose] <commit>..." +msgid "git verify-commit [-v | --verbose] <commit>..." +msgstr "git verify-commit [-v | --verbose] <commit>..." #: builtin/verify-commit.c:75 msgid "print commit contents" msgstr "afficher le contenu du commit" #: builtin/verify-pack.c:54 -msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." -msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." +msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." #: builtin/verify-pack.c:64 msgid "verbose" @@ -10238,8 +10277,8 @@ msgid "show statistics only" msgstr "afficher seulement les statistiques" #: builtin/verify-tag.c:17 -msgid "git verify-tag [-v|--verbose] <tag>..." -msgstr "git verify-tag [-v|--verbose] <étiquette>..." +msgid "git verify-tag [-v | --verbose] <tag>..." +msgstr "git verify-tag [-v | --verbose] <étiquette>..." #: builtin/verify-tag.c:73 msgid "print tag contents" @@ -10600,10 +10639,10 @@ msgstr "Mauvaise HEAD - j'ai besoin d'une HEAD" #: git-bisect.sh:130 #, sh-format msgid "" -"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." +"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." msgstr "" -"L'extraction de '$start_head' a échoué. Essayez 'git bisect reset " -"<branchevalide>'." +"L'extraction de '$start_head' a échoué. Essayez 'git bisect reset <branche-" +"valide>'." #: git-bisect.sh:140 msgid "won't bisect on cg-seek'ed tree" @@ -11381,6 +11420,21 @@ msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'" msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synchronisation de l'URL sous-module pour '$displaypath'" +#~ msgid "server does not support --atomic push" +#~ msgstr "le serveur ne gère pas push --atomic" + +#~ msgid "(detached from %s)" +#~ msgstr "(détaché de %s)" + +#~ msgid "No existing author found with '%s'" +#~ msgstr "Aucun auteur existant trouvé avec '%s'" + +#~ msgid "search also in ignored files" +#~ msgstr "rechercher aussi dans les fichiers ignorés" + +#~ msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" +#~ msgstr "git remote set-head <nom> (-a | --auto | -d | --delete |<branche>)" + #~ msgid "no files added" #~ msgstr "aucun fichier ajouté" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2015-01-21 14:21+0800\n" +"POT-Creation-Date: 2015-04-03 08:13+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -30,7 +30,7 @@ msgid "" msgstr "" #: archive.c:11 -msgid "git archive [options] <tree-ish> [<path>...]" +msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "" #: archive.c:12 @@ -39,7 +39,7 @@ msgstr "" #: archive.c:13 msgid "" -"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" +"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" #: archive.c:14 @@ -67,10 +67,10 @@ msgstr "" msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2517 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986 +#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 +#: builtin/blame.c:2517 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:394 +#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 #: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151 msgid "file" msgstr "" @@ -119,7 +119,7 @@ msgstr "" msgid "path to the remote git-upload-archive command" msgstr "" -#: attr.c:258 +#: attr.c:264 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -236,7 +236,7 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:87 builtin/commit.c:770 +#: bundle.c:87 builtin/commit.c:766 #, c-format msgid "could not open '%s'" msgstr "" @@ -245,8 +245,8 @@ msgstr "" msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:163 sequencer.c:645 sequencer.c:1100 builtin/blame.c:2706 -#: builtin/branch.c:652 builtin/commit.c:1049 builtin/log.c:330 +#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 +#: builtin/branch.c:659 builtin/commit.c:1045 builtin/log.c:330 #: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358 #: builtin/shortlog.c:158 msgid "revision walk setup failed" @@ -287,21 +287,21 @@ msgstr "" msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "" -#: bundle.c:444 +#: bundle.c:443 msgid "Refusing to create empty bundle." msgstr "" -#: bundle.c:454 +#: bundle.c:453 #, c-format msgid "cannot create '%s'" msgstr "" -#: bundle.c:475 +#: bundle.c:474 msgid "index-pack died" msgstr "" @@ -324,55 +324,55 @@ msgstr "" msgid "memory exhausted" msgstr "" -#: config.c:469 config.c:471 +#: config.c:474 config.c:476 #, c-format msgid "bad config file line %d in %s" msgstr "" -#: config.c:587 +#: config.c:592 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" -#: config.c:589 +#: config.c:594 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "" -#: config.c:674 +#: config.c:679 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "" -#: config.c:752 config.c:763 +#: config.c:757 config.c:768 #, c-format msgid "bad zlib compression level %d" msgstr "" -#: config.c:885 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "" -#: config.c:1211 +#: config.c:1216 msgid "unable to parse command-line config" msgstr "" -#: config.c:1272 +#: config.c:1277 msgid "unknown error occured while reading the configuration files" msgstr "" -#: config.c:1596 +#: config.c:1601 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" -#: config.c:1598 +#: config.c:1603 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" -#: config.c:1657 +#: config.c:1662 #, c-format msgid "%s has multiple values" msgstr "" @@ -464,7 +464,7 @@ msgstr[1] "" msgid "failed to read orderfile '%s'" msgstr "" -#: diffcore-rename.c:516 +#: diffcore-rename.c:536 msgid "Performing inexact rename detection" msgstr "" @@ -490,23 +490,23 @@ msgid "" "%s" msgstr "" -#: diff.c:2957 +#: diff.c:2956 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:3352 +#: diff.c:3351 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:3515 +#: diff.c:3514 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:3529 +#: diff.c:3528 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" @@ -841,27 +841,27 @@ msgstr "" msgid "Unprocessed path??? %s" msgstr "" -#: merge-recursive.c:1898 +#: merge-recursive.c:1901 msgid "Merging:" msgstr "" -#: merge-recursive.c:1911 +#: merge-recursive.c:1914 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:1948 +#: merge-recursive.c:1951 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:2005 +#: merge-recursive.c:2008 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:2016 builtin/merge.c:667 +#: merge-recursive.c:2019 builtin/merge.c:667 msgid "Unable to write index." msgstr "" @@ -984,14 +984,14 @@ msgstr "" msgid "done" msgstr "" -#: read-cache.c:1267 +#: read-cache.c:1275 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1277 +#: read-cache.c:1285 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1069,23 +1069,31 @@ msgstr[1] "" msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: run-command.c:87 +#: revision.c:2348 +msgid "--first-parent is incompatible with --bisect" +msgstr "" + +#: run-command.c:83 msgid "open /dev/null failed" msgstr "" -#: run-command.c:89 +#: run-command.c:85 #, c-format msgid "dup2(%d,%d) failed" msgstr "" -#: send-pack.c:268 +#: send-pack.c:272 msgid "failed to sign the push certificate" msgstr "" -#: send-pack.c:325 +#: send-pack.c:356 msgid "the receiving end does not support --signed push" msgstr "" +#: send-pack.c:366 +msgid "the receiving end does not support --atomic push" +msgstr "" + #: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995 #: builtin/merge.c:1005 #, c-format @@ -1111,7 +1119,7 @@ msgid "" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:211 sequencer.c:856 sequencer.c:939 +#: sequencer.c:211 sequencer.c:861 sequencer.c:944 #, c-format msgid "Could not write to %s" msgstr "" @@ -1147,184 +1155,184 @@ msgstr "" msgid "Unable to update cache tree\n" msgstr "" -#: sequencer.c:406 +#: sequencer.c:411 #, c-format msgid "Could not parse commit %s\n" msgstr "" -#: sequencer.c:411 +#: sequencer.c:416 #, c-format msgid "Could not parse parent commit %s\n" msgstr "" -#: sequencer.c:477 +#: sequencer.c:482 msgid "Your index file is unmerged." msgstr "" -#: sequencer.c:496 +#: sequencer.c:501 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:504 +#: sequencer.c:509 #, c-format msgid "Commit %s does not have parent %d" msgstr "" -#: sequencer.c:508 +#: sequencer.c:513 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:521 +#: sequencer.c:526 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:525 +#: sequencer.c:530 #, c-format msgid "Cannot get commit message for %s" msgstr "" -#: sequencer.c:611 +#: sequencer.c:616 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:612 +#: sequencer.c:617 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:648 +#: sequencer.c:653 msgid "empty commit set passed" msgstr "" -#: sequencer.c:656 +#: sequencer.c:661 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:660 +#: sequencer.c:665 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:720 +#: sequencer.c:725 #, c-format msgid "Cannot %s during a %s" msgstr "" -#: sequencer.c:742 +#: sequencer.c:747 #, c-format msgid "Could not parse line %d." msgstr "" -#: sequencer.c:747 +#: sequencer.c:752 msgid "No commits parsed." msgstr "" -#: sequencer.c:760 +#: sequencer.c:765 #, c-format msgid "Could not open %s" msgstr "" -#: sequencer.c:764 +#: sequencer.c:769 #, c-format msgid "Could not read %s." msgstr "" -#: sequencer.c:771 +#: sequencer.c:776 #, c-format msgid "Unusable instruction sheet: %s" msgstr "" -#: sequencer.c:801 +#: sequencer.c:806 #, c-format msgid "Invalid key: %s" msgstr "" -#: sequencer.c:804 +#: sequencer.c:809 #, c-format msgid "Invalid value for %s: %s" msgstr "" -#: sequencer.c:816 +#: sequencer.c:821 #, c-format msgid "Malformed options sheet: %s" msgstr "" -#: sequencer.c:837 +#: sequencer.c:842 msgid "a cherry-pick or revert is already in progress" msgstr "" -#: sequencer.c:838 +#: sequencer.c:843 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" -#: sequencer.c:842 +#: sequencer.c:847 #, c-format msgid "Could not create sequencer directory %s" msgstr "" -#: sequencer.c:858 sequencer.c:943 +#: sequencer.c:863 sequencer.c:948 #, c-format msgid "Error wrapping up %s." msgstr "" -#: sequencer.c:877 sequencer.c:1013 +#: sequencer.c:882 sequencer.c:1018 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:879 +#: sequencer.c:884 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:881 +#: sequencer.c:886 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:903 builtin/apply.c:4128 +#: sequencer.c:908 builtin/apply.c:4288 #, c-format msgid "cannot open %s: %s" msgstr "" -#: sequencer.c:906 +#: sequencer.c:911 #, c-format msgid "cannot read %s: %s" msgstr "" -#: sequencer.c:907 +#: sequencer.c:912 msgid "unexpected end of file" msgstr "" -#: sequencer.c:913 +#: sequencer.c:918 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:936 +#: sequencer.c:941 #, c-format msgid "Could not format %s." msgstr "" -#: sequencer.c:1081 +#: sequencer.c:1086 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:1084 +#: sequencer.c:1089 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:1118 +#: sequencer.c:1123 msgid "Can't revert as initial commit" msgstr "" -#: sequencer.c:1119 +#: sequencer.c:1124 msgid "Can't cherry-pick into empty head" msgstr "" @@ -1383,38 +1391,38 @@ msgstr "" msgid "staging updated .gitmodules failed" msgstr "" -#: submodule.c:1111 builtin/init-db.c:371 +#: submodule.c:1109 builtin/init-db.c:371 #, c-format msgid "Could not create git link %s" msgstr "" -#: submodule.c:1122 +#: submodule.c:1120 #, c-format msgid "Could not set core.worktree in %s" msgstr "" -#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566 -#: trailer.c:570 +#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557 +#: trailer.c:561 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "" -#: trailer.c:552 trailer.c:557 builtin/remote.c:290 +#: trailer.c:543 trailer.c:548 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "" -#: trailer.c:590 +#: trailer.c:581 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "" -#: trailer.c:710 +#: trailer.c:701 #, c-format msgid "could not read input file '%s'" msgstr "" -#: trailer.c:713 +#: trailer.c:704 msgid "could not read from stdin" msgstr "" @@ -1451,26 +1459,26 @@ msgstr "" msgid "invalid '..' path segment" msgstr "" -#: wrapper.c:509 +#: wrapper.c:523 #, c-format msgid "unable to access '%s': %s" msgstr "" -#: wrapper.c:530 +#: wrapper.c:544 #, c-format msgid "unable to access '%s'" msgstr "" -#: wrapper.c:541 +#: wrapper.c:555 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "" -#: wrapper.c:542 +#: wrapper.c:556 msgid "no such user" msgstr "" -#: wrapper.c:550 +#: wrapper.c:564 msgid "unable to get current working directory" msgstr "" @@ -1499,11 +1507,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:198 +#: wt-status.c:198 wt-status.c:878 msgid "Changes to be committed:" msgstr "" -#: wt-status.c:216 +#: wt-status.c:216 wt-status.c:887 msgid "Changes not staged for commit:" msgstr "" @@ -1611,193 +1619,193 @@ msgstr "" msgid "bug: unhandled diff status %c" msgstr "" -#: wt-status.c:758 +#: wt-status.c:753 msgid "Submodules changed but not updated:" msgstr "" -#: wt-status.c:760 +#: wt-status.c:755 msgid "Submodule changes to be committed:" msgstr "" -#: wt-status.c:839 +#: wt-status.c:835 msgid "" "Do not touch the line above.\n" "Everything below will be removed." msgstr "" -#: wt-status.c:930 +#: wt-status.c:946 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:933 +#: wt-status.c:949 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:936 +#: wt-status.c:952 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:939 +#: wt-status.c:955 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:949 +#: wt-status.c:965 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:952 +#: wt-status.c:968 msgid "The current patch is empty." msgstr "" -#: wt-status.c:956 +#: wt-status.c:972 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:958 +#: wt-status.c:974 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:960 +#: wt-status.c:976 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:1020 wt-status.c:1037 +#: wt-status.c:1036 wt-status.c:1053 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1025 wt-status.c:1042 +#: wt-status.c:1041 wt-status.c:1058 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:1028 +#: wt-status.c:1044 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1030 +#: wt-status.c:1046 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1032 +#: wt-status.c:1048 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:1045 +#: wt-status.c:1061 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1049 +#: wt-status.c:1065 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1054 +#: wt-status.c:1070 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:1057 +#: wt-status.c:1073 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1061 +#: wt-status.c:1077 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1066 +#: wt-status.c:1082 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:1069 +#: wt-status.c:1085 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:1071 +#: wt-status.c:1087 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:1081 +#: wt-status.c:1097 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "" -#: wt-status.c:1086 +#: wt-status.c:1102 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1089 +#: wt-status.c:1105 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1091 +#: wt-status.c:1107 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: wt-status.c:1100 +#: wt-status.c:1116 #, c-format msgid "You are currently reverting commit %s." msgstr "" -#: wt-status.c:1105 +#: wt-status.c:1121 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" -#: wt-status.c:1108 +#: wt-status.c:1124 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" -#: wt-status.c:1110 +#: wt-status.c:1126 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -#: wt-status.c:1121 +#: wt-status.c:1137 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" -#: wt-status.c:1125 +#: wt-status.c:1141 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:1128 +#: wt-status.c:1144 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1303 +#: wt-status.c:1321 msgid "On branch " msgstr "" -#: wt-status.c:1310 +#: wt-status.c:1328 msgid "rebase in progress; onto " msgstr "" -#: wt-status.c:1317 +#: wt-status.c:1333 msgid "HEAD detached at " msgstr "" -#: wt-status.c:1319 +#: wt-status.c:1335 msgid "HEAD detached from " msgstr "" -#: wt-status.c:1322 +#: wt-status.c:1338 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1339 +#: wt-status.c:1355 msgid "Initial commit" msgstr "" -#: wt-status.c:1353 +#: wt-status.c:1369 msgid "Untracked files" msgstr "" -#: wt-status.c:1355 +#: wt-status.c:1371 msgid "Ignored files" msgstr "" -#: wt-status.c:1359 +#: wt-status.c:1375 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1805,74 +1813,74 @@ msgid "" "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1365 +#: wt-status.c:1381 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1367 +#: wt-status.c:1383 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1373 +#: wt-status.c:1389 msgid "No changes" msgstr "" -#: wt-status.c:1378 +#: wt-status.c:1394 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1381 +#: wt-status.c:1397 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1384 +#: wt-status.c:1400 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1387 +#: wt-status.c:1403 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1390 +#: wt-status.c:1406 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1393 wt-status.c:1398 +#: wt-status.c:1409 wt-status.c:1414 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1396 +#: wt-status.c:1412 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1400 +#: wt-status.c:1416 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "" -#: wt-status.c:1509 +#: wt-status.c:1525 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1515 +#: wt-status.c:1531 msgid "Initial commit on " msgstr "" -#: wt-status.c:1547 +#: wt-status.c:1563 msgid "gone" msgstr "" -#: wt-status.c:1549 wt-status.c:1557 +#: wt-status.c:1565 wt-status.c:1573 msgid "behind " msgstr "" @@ -1882,7 +1890,7 @@ msgid "failed to unlink '%s'" msgstr "" #: builtin/add.c:22 -msgid "git add [options] [--] <pathspec>..." +msgid "git add [<options>] [--] <pathspec>..." msgstr "" #: builtin/add.c:65 @@ -1890,7 +1898,7 @@ msgstr "" msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:70 builtin/commit.c:275 +#: builtin/add.c:70 builtin/commit.c:277 msgid "updating files failed" msgstr "" @@ -1934,14 +1942,14 @@ msgstr "" msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: 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:1372 +#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372 #: builtin/rm.c:269 msgid "dry run" msgstr "" -#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19 -#: builtin/commit.c:1326 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19 +#: builtin/commit.c:1322 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 "" @@ -2017,75 +2025,75 @@ msgstr "" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919 -#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 +#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920 +#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 msgid "index file corrupt" msgstr "" -#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431 +#: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431 msgid "Unable to write new index file" msgstr "" -#: builtin/apply.c:58 -msgid "git apply [options] [<patch>...]" +#: builtin/apply.c:59 +msgid "git apply [<options>] [<patch>...]" msgstr "" -#: builtin/apply.c:111 +#: builtin/apply.c:112 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "" -#: builtin/apply.c:126 +#: builtin/apply.c:127 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "" -#: builtin/apply.c:826 +#: builtin/apply.c:822 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" -#: builtin/apply.c:835 +#: builtin/apply.c:831 #, c-format msgid "regexec returned %d for input: %s" msgstr "" -#: builtin/apply.c:916 +#: builtin/apply.c:912 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" -#: builtin/apply.c:948 +#: builtin/apply.c:944 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -#: builtin/apply.c:952 +#: builtin/apply.c:948 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" -#: builtin/apply.c:953 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -#: builtin/apply.c:960 +#: builtin/apply.c:956 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: builtin/apply.c:1423 +#: builtin/apply.c:1419 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: builtin/apply.c:1480 +#: builtin/apply.c:1476 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: builtin/apply.c:1497 +#: builtin/apply.c:1493 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2096,394 +2104,413 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:1657 +#: builtin/apply.c:1656 msgid "new file depends on old contents" msgstr "" -#: builtin/apply.c:1659 +#: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "" -#: builtin/apply.c:1685 +#: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: builtin/apply.c:1721 +#: builtin/apply.c:1720 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: builtin/apply.c:1723 +#: builtin/apply.c:1722 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: builtin/apply.c:1726 +#: builtin/apply.c:1725 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: builtin/apply.c:1872 +#: builtin/apply.c:1871 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" -#: builtin/apply.c:1901 +#: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: builtin/apply.c:2052 +#: builtin/apply.c:2051 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: builtin/apply.c:2142 +#: builtin/apply.c:2141 #, c-format msgid "unable to read symlink %s" msgstr "" -#: builtin/apply.c:2146 +#: builtin/apply.c:2145 #, c-format msgid "unable to open or read %s" msgstr "" -#: builtin/apply.c:2754 +#: builtin/apply.c:2778 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: builtin/apply.c:2872 +#: builtin/apply.c:2897 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:2884 +#: builtin/apply.c:2909 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: builtin/apply.c:2890 +#: builtin/apply.c:2915 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: builtin/apply.c:2909 +#: builtin/apply.c:2935 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: builtin/apply.c:3010 +#: builtin/apply.c:3036 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: builtin/apply.c:3016 +#: builtin/apply.c:3042 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: builtin/apply.c:3037 +#: builtin/apply.c:3063 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: builtin/apply.c:3161 +#: builtin/apply.c:3187 #, c-format msgid "cannot checkout %s" msgstr "" -#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260 +#: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288 #, c-format msgid "read of %s failed" msgstr "" -#: builtin/apply.c:3240 builtin/apply.c:3462 +#: builtin/apply.c:3240 +#, c-format +msgid "reading from '%s' beyond a symbolic link" +msgstr "" + +#: builtin/apply.c:3268 builtin/apply.c:3490 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: builtin/apply.c:3321 builtin/apply.c:3476 +#: builtin/apply.c:3349 builtin/apply.c:3504 #, c-format msgid "%s: does not exist in index" msgstr "" -#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490 +#: builtin/apply.c:3353 builtin/apply.c:3496 builtin/apply.c:3518 #, c-format msgid "%s: %s" msgstr "" -#: builtin/apply.c:3330 builtin/apply.c:3484 +#: builtin/apply.c:3358 builtin/apply.c:3512 #, c-format msgid "%s: does not match index" msgstr "" -#: builtin/apply.c:3432 +#: builtin/apply.c:3460 msgid "removal patch leaves file contents" msgstr "" -#: builtin/apply.c:3501 +#: builtin/apply.c:3529 #, c-format msgid "%s: wrong type" msgstr "" -#: builtin/apply.c:3503 +#: builtin/apply.c:3531 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: builtin/apply.c:3604 +#: builtin/apply.c:3690 builtin/apply.c:3692 +#, c-format +msgid "invalid path '%s'" +msgstr "" + +#: builtin/apply.c:3747 #, c-format msgid "%s: already exists in index" msgstr "" -#: builtin/apply.c:3607 +#: builtin/apply.c:3750 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: builtin/apply.c:3627 +#: builtin/apply.c:3770 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: builtin/apply.c:3632 +#: builtin/apply.c:3775 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: builtin/apply.c:3640 +#: builtin/apply.c:3795 +#, c-format +msgid "affected file '%s' is beyond a symbolic link" +msgstr "" + +#: builtin/apply.c:3799 #, c-format msgid "%s: patch does not apply" msgstr "" -#: builtin/apply.c:3653 +#: builtin/apply.c:3813 #, c-format msgid "Checking patch %s..." msgstr "" -#: builtin/apply.c:3746 builtin/checkout.c:231 builtin/reset.c:135 +#: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: builtin/apply.c:3889 +#: builtin/apply.c:4049 #, c-format msgid "unable to remove %s from index" msgstr "" -#: builtin/apply.c:3918 +#: builtin/apply.c:4078 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: builtin/apply.c:3922 +#: builtin/apply.c:4082 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: builtin/apply.c:3927 +#: builtin/apply.c:4087 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: builtin/apply.c:3930 builtin/apply.c:4038 +#: builtin/apply.c:4090 builtin/apply.c:4198 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: builtin/apply.c:3963 +#: builtin/apply.c:4123 #, c-format msgid "closing file '%s'" msgstr "" -#: builtin/apply.c:4012 +#: builtin/apply.c:4172 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: builtin/apply.c:4099 +#: builtin/apply.c:4259 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: builtin/apply.c:4107 +#: builtin/apply.c:4267 msgid "internal error" msgstr "" -#: builtin/apply.c:4110 +#: builtin/apply.c:4270 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4120 +#: builtin/apply.c:4280 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: builtin/apply.c:4141 +#: builtin/apply.c:4301 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: builtin/apply.c:4144 +#: builtin/apply.c:4304 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: builtin/apply.c:4234 +#: builtin/apply.c:4394 msgid "unrecognized input" msgstr "" -#: builtin/apply.c:4245 +#: builtin/apply.c:4405 msgid "unable to read index file" msgstr "" -#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:92 -#: builtin/fetch.c:93 +#: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92 +#: builtin/fetch.c:92 msgid "path" msgstr "" -#: builtin/apply.c:4363 +#: builtin/apply.c:4523 msgid "don't apply changes matching the given path" msgstr "" -#: builtin/apply.c:4366 +#: builtin/apply.c:4526 msgid "apply changes matching the given path" msgstr "" -#: builtin/apply.c:4368 +#: builtin/apply.c:4528 msgid "num" msgstr "" -#: builtin/apply.c:4369 +#: builtin/apply.c:4529 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: builtin/apply.c:4372 +#: builtin/apply.c:4532 msgid "ignore additions made by the patch" msgstr "" -#: builtin/apply.c:4374 +#: builtin/apply.c:4534 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: builtin/apply.c:4378 +#: builtin/apply.c:4538 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: builtin/apply.c:4380 +#: builtin/apply.c:4540 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: builtin/apply.c:4382 +#: builtin/apply.c:4542 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: builtin/apply.c:4384 +#: builtin/apply.c:4544 msgid "make sure the patch is applicable to the current index" msgstr "" -#: builtin/apply.c:4386 +#: builtin/apply.c:4546 msgid "apply a patch without touching the working tree" msgstr "" -#: builtin/apply.c:4388 +#: builtin/apply.c:4548 +msgid "accept a patch that touches outside the working area" +msgstr "" + +#: builtin/apply.c:4550 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: builtin/apply.c:4390 +#: builtin/apply.c:4552 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: builtin/apply.c:4392 +#: builtin/apply.c:4554 msgid "build a temporary index based on embedded index information" msgstr "" -#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455 +#: builtin/apply.c:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412 msgid "paths are separated with NUL character" msgstr "" -#: builtin/apply.c:4397 +#: builtin/apply.c:4559 msgid "ensure at least <n> lines of context match" msgstr "" -#: builtin/apply.c:4398 +#: builtin/apply.c:4560 msgid "action" msgstr "" -#: builtin/apply.c:4399 +#: builtin/apply.c:4561 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: builtin/apply.c:4402 builtin/apply.c:4405 +#: builtin/apply.c:4564 builtin/apply.c:4567 msgid "ignore changes in whitespace when finding context" msgstr "" -#: builtin/apply.c:4408 +#: builtin/apply.c:4570 msgid "apply the patch in reverse" msgstr "" -#: builtin/apply.c:4410 +#: builtin/apply.c:4572 msgid "don't expect at least one line of context" msgstr "" -#: builtin/apply.c:4412 +#: builtin/apply.c:4574 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: builtin/apply.c:4414 +#: builtin/apply.c:4576 msgid "allow overlapping hunks" msgstr "" -#: builtin/apply.c:4417 +#: builtin/apply.c:4579 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: builtin/apply.c:4420 +#: builtin/apply.c:4582 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: builtin/apply.c:4422 +#: builtin/apply.c:4584 msgid "root" msgstr "" -#: builtin/apply.c:4423 +#: builtin/apply.c:4585 msgid "prepend <root> to all filenames" msgstr "" -#: builtin/apply.c:4445 +#: builtin/apply.c:4607 msgid "--3way outside a repository" msgstr "" -#: builtin/apply.c:4453 +#: builtin/apply.c:4615 msgid "--index outside a repository" msgstr "" -#: builtin/apply.c:4456 +#: builtin/apply.c:4618 msgid "--cached outside a repository" msgstr "" -#: builtin/apply.c:4472 +#: builtin/apply.c:4637 #, c-format msgid "can't open patch '%s'" msgstr "" -#: builtin/apply.c:4486 +#: builtin/apply.c:4651 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4492 builtin/apply.c:4502 +#: builtin/apply.c:4657 builtin/apply.c:4667 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2538,102 +2565,102 @@ msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "" #: builtin/blame.c:30 -msgid "git blame [options] [rev-opts] [rev] [--] file" +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file" msgstr "" #: builtin/blame.c:35 -msgid "[rev-opts] are documented in git-rev-list(1)" +msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "" -#: builtin/blame.c:2501 +#: builtin/blame.c:2500 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:2502 +#: builtin/blame.c:2501 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:2503 +#: builtin/blame.c:2502 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:2504 +#: builtin/blame.c:2503 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:2505 +#: builtin/blame.c:2504 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:2506 +#: builtin/blame.c:2505 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:2507 +#: builtin/blame.c:2506 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:2508 +#: builtin/blame.c:2507 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:2509 +#: builtin/blame.c:2508 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:2510 +#: builtin/blame.c:2509 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:2511 +#: builtin/blame.c:2510 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2512 +#: builtin/blame.c:2511 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:2513 +#: builtin/blame.c:2512 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2514 +#: builtin/blame.c:2513 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:2515 +#: builtin/blame.c:2514 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:2516 +#: builtin/blame.c:2515 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:2517 +#: builtin/blame.c:2516 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:2518 +#: builtin/blame.c:2517 msgid "Use <file>'s contents as the final image" msgstr "" -#: builtin/blame.c:2519 builtin/blame.c:2520 +#: builtin/blame.c:2518 builtin/blame.c:2519 msgid "score" msgstr "" -#: builtin/blame.c:2519 +#: builtin/blame.c:2518 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:2520 +#: builtin/blame.c:2519 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "n,m" msgstr "" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "Process only line range n,m, counting from 1" msgstr "" @@ -2643,24 +2670,24 @@ 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:2602 +#: builtin/blame.c:2601 msgid "4 years, 11 months ago" msgstr "" #: builtin/branch.c:24 -msgid "git branch [options] [-r | -a] [--merged | --no-merged]" +msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "" #: builtin/branch.c:25 -msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" +msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "" #: builtin/branch.c:26 -msgid "git branch [options] [-r] (-d | -D) <branchname>..." +msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "" #: builtin/branch.c:27 -msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" +msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "" #: builtin/branch.c:152 @@ -2795,239 +2822,244 @@ msgstr "" msgid "(no branch, bisect started on %s)" msgstr "" -#: builtin/branch.c:593 +#: builtin/branch.c:596 #, c-format -msgid "(detached from %s)" +msgid "(HEAD detached at %s)" msgstr "" -#: builtin/branch.c:596 +#: builtin/branch.c:599 +#, c-format +msgid "(HEAD detached from %s)" +msgstr "" + +#: builtin/branch.c:603 msgid "(no branch)" msgstr "" -#: builtin/branch.c:643 +#: builtin/branch.c:650 #, c-format msgid "object '%s' does not point to a commit" msgstr "" -#: builtin/branch.c:691 +#: builtin/branch.c:698 msgid "some refs could not be read" msgstr "" -#: builtin/branch.c:704 +#: builtin/branch.c:711 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:714 +#: builtin/branch.c:721 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:729 +#: builtin/branch.c:736 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:733 +#: builtin/branch.c:740 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:737 +#: builtin/branch.c:744 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:744 +#: builtin/branch.c:751 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:759 +#: builtin/branch.c:766 #, c-format msgid "malformed object name %s" msgstr "" -#: builtin/branch.c:783 +#: builtin/branch.c:790 #, c-format msgid "could not write branch description template: %s" msgstr "" -#: builtin/branch.c:813 +#: builtin/branch.c:820 msgid "Generic options" msgstr "" -#: builtin/branch.c:815 +#: builtin/branch.c:822 msgid "show hash and subject, give twice for upstream branch" msgstr "" -#: builtin/branch.c:816 +#: builtin/branch.c:823 msgid "suppress informational messages" msgstr "" -#: builtin/branch.c:817 +#: builtin/branch.c:824 msgid "set up tracking mode (see git-pull(1))" msgstr "" -#: builtin/branch.c:819 +#: builtin/branch.c:826 msgid "change upstream info" msgstr "" -#: builtin/branch.c:823 +#: builtin/branch.c:830 msgid "use colored output" msgstr "" -#: builtin/branch.c:824 +#: builtin/branch.c:831 msgid "act on remote-tracking branches" msgstr "" -#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854 -#: builtin/branch.c:860 builtin/commit.c:1586 builtin/commit.c:1587 -#: builtin/commit.c:1588 builtin/commit.c:1589 builtin/tag.c:616 +#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861 +#: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583 +#: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616 #: builtin/tag.c:622 msgid "commit" msgstr "" -#: builtin/branch.c:828 builtin/branch.c:834 +#: builtin/branch.c:835 builtin/branch.c:841 msgid "print only branches that contain the commit" msgstr "" -#: builtin/branch.c:840 +#: builtin/branch.c:847 msgid "Specific git-branch actions:" msgstr "" -#: builtin/branch.c:841 +#: builtin/branch.c:848 msgid "list both remote-tracking and local branches" msgstr "" -#: builtin/branch.c:843 +#: builtin/branch.c:850 msgid "delete fully merged branch" msgstr "" -#: builtin/branch.c:844 +#: builtin/branch.c:851 msgid "delete branch (even if not merged)" msgstr "" -#: builtin/branch.c:845 +#: builtin/branch.c:852 msgid "move/rename a branch and its reflog" msgstr "" -#: builtin/branch.c:846 +#: builtin/branch.c:853 msgid "move/rename a branch, even if target exists" msgstr "" -#: builtin/branch.c:847 +#: builtin/branch.c:854 msgid "list branch names" msgstr "" -#: builtin/branch.c:848 +#: builtin/branch.c:855 msgid "create the branch's reflog" msgstr "" -#: builtin/branch.c:850 +#: builtin/branch.c:857 msgid "edit the description for the branch" msgstr "" -#: builtin/branch.c:851 +#: builtin/branch.c:858 msgid "force creation, move/rename, deletion" msgstr "" -#: builtin/branch.c:854 +#: builtin/branch.c:861 msgid "print only not merged branches" msgstr "" -#: builtin/branch.c:860 +#: builtin/branch.c:867 msgid "print only merged branches" msgstr "" -#: builtin/branch.c:864 +#: builtin/branch.c:871 msgid "list branches in columns" msgstr "" -#: builtin/branch.c:877 +#: builtin/branch.c:884 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: builtin/branch.c:881 builtin/clone.c:637 +#: builtin/branch.c:888 builtin/clone.c:637 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:903 +#: builtin/branch.c:910 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:914 builtin/branch.c:953 +#: builtin/branch.c:921 builtin/branch.c:960 msgid "branch name required" msgstr "" -#: builtin/branch.c:929 +#: builtin/branch.c:936 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:934 +#: builtin/branch.c:941 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:941 +#: builtin/branch.c:948 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:944 +#: builtin/branch.c:951 #, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:959 +#: builtin/branch.c:966 msgid "too many branches for a rename operation" msgstr "" -#: builtin/branch.c:964 +#: builtin/branch.c:971 msgid "too many branches to set new upstream" msgstr "" -#: builtin/branch.c:968 +#: builtin/branch.c:975 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -#: builtin/branch.c:971 builtin/branch.c:993 builtin/branch.c:1014 +#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021 #, c-format msgid "no such branch '%s'" msgstr "" -#: builtin/branch.c:975 +#: builtin/branch.c:982 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:987 +#: builtin/branch.c:994 msgid "too many branches to unset upstream" msgstr "" -#: builtin/branch.c:991 +#: builtin/branch.c:998 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -#: builtin/branch.c:997 +#: builtin/branch.c:1004 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:1011 +#: builtin/branch.c:1018 msgid "it does not make sense to create 'HEAD' manually" msgstr "" -#: builtin/branch.c:1017 +#: builtin/branch.c:1024 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" -#: builtin/branch.c:1020 +#: builtin/branch.c:1027 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" "track or --set-upstream-to\n" msgstr "" -#: builtin/branch.c:1037 +#: builtin/branch.c:1044 #, c-format msgid "" "\n" @@ -3035,12 +3067,12 @@ msgid "" "\n" msgstr "" -#: builtin/branch.c:1038 +#: builtin/branch.c:1045 #, c-format msgid " git branch -d %s\n" msgstr "" -#: builtin/branch.c:1039 +#: builtin/branch.c:1046 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr "" @@ -3058,52 +3090,52 @@ msgstr "" msgid "Need a repository to unbundle." msgstr "" -#: builtin/cat-file.c:328 -msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" +#: builtin/cat-file.c:326 +msgid "git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>" msgstr "" -#: builtin/cat-file.c:329 -msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" +#: builtin/cat-file.c:327 +msgid "git cat-file (--batch | --batch-check) < <list-of-objects>" msgstr "" -#: builtin/cat-file.c:366 +#: builtin/cat-file.c:364 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/cat-file.c:367 +#: builtin/cat-file.c:365 msgid "show object type" msgstr "" -#: builtin/cat-file.c:368 +#: builtin/cat-file.c:366 msgid "show object size" msgstr "" -#: builtin/cat-file.c:370 +#: builtin/cat-file.c:368 msgid "exit with zero when there's no error" msgstr "" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:369 msgid "pretty-print object's content" msgstr "" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:371 msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/cat-file.c:375 +#: builtin/cat-file.c:373 msgid "show info and content of objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:378 +#: builtin/cat-file.c:376 msgid "show info about objects fed from the standard input" msgstr "" #: builtin/check-attr.c:11 -msgid "git check-attr [-a | --all | attr...] [--] pathname..." +msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "" #: builtin/check-attr.c:12 -msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" +msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>" msgstr "" #: builtin/check-attr.c:19 @@ -3159,7 +3191,7 @@ msgid "--non-matching is only valid with --verbose" msgstr "" #: builtin/check-mailmap.c:8 -msgid "git check-mailmap [options] <contact>..." +msgid "git check-mailmap [<options>] <contact>..." msgstr "" #: builtin/check-mailmap.c:13 @@ -3176,7 +3208,7 @@ msgid "no contacts specified" msgstr "" #: builtin/checkout-index.c:126 -msgid "git checkout-index [options] [--] [<file>...]" +msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "" #: builtin/checkout-index.c:188 @@ -3220,11 +3252,11 @@ msgid "copy out the files from named stage" msgstr "" #: builtin/checkout.c:25 -msgid "git checkout [options] <branch>" +msgid "git checkout [<options>] <branch>" msgstr "" #: builtin/checkout.c:26 -msgid "git checkout [options] [<branch>] -- <file>..." +msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "" #: builtin/checkout.c:132 builtin/checkout.c:165 @@ -3346,7 +3378,7 @@ msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" "to do so with:\n" "\n" -" git branch new_branch_name %s\n" +" git branch <new-branch-name> %s\n" "\n" msgstr "" @@ -3463,7 +3495,7 @@ msgid "do not limit pathspecs to sparse entries only" msgstr "" #: builtin/checkout.c:1130 -msgid "second guess 'git checkout no-such-branch'" +msgid "second guess 'git checkout <no-such-branch>'" msgstr "" #: builtin/checkout.c:1153 @@ -3569,16 +3601,17 @@ msgstr "" msgid "Select items to delete" msgstr "" -#: builtin/clean.c:757 +#. TRANSLATORS: Make sure to keep [y/N] as is +#: builtin/clean.c:758 #, c-format -msgid "remove %s? " +msgid "Remove %s [y/N]? " msgstr "" -#: builtin/clean.c:782 +#: builtin/clean.c:783 msgid "Bye." msgstr "" -#: builtin/clean.c:790 +#: builtin/clean.c:791 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -3589,79 +3622,79 @@ msgid "" "? - help for prompt selection" msgstr "" -#: builtin/clean.c:817 +#: builtin/clean.c:818 msgid "*** Commands ***" msgstr "" -#: builtin/clean.c:818 +#: builtin/clean.c:819 msgid "What now" msgstr "" -#: builtin/clean.c:826 +#: builtin/clean.c:827 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "" msgstr[1] "" -#: builtin/clean.c:843 +#: builtin/clean.c:844 msgid "No more files to clean, exiting." msgstr "" -#: builtin/clean.c:874 +#: builtin/clean.c:875 msgid "do not print names of files removed" msgstr "" -#: builtin/clean.c:876 +#: builtin/clean.c:877 msgid "force" msgstr "" -#: builtin/clean.c:877 +#: builtin/clean.c:878 msgid "interactive cleaning" msgstr "" -#: builtin/clean.c:879 +#: builtin/clean.c:880 msgid "remove whole directories" msgstr "" -#: 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 +#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185 msgid "pattern" msgstr "" -#: builtin/clean.c:881 +#: builtin/clean.c:882 msgid "add <pattern> to ignore rules" msgstr "" -#: builtin/clean.c:882 +#: builtin/clean.c:883 msgid "remove ignored files, too" msgstr "" -#: builtin/clean.c:884 +#: builtin/clean.c:885 msgid "remove only ignored files" msgstr "" -#: builtin/clean.c:902 +#: builtin/clean.c:903 msgid "-x and -X cannot be used together" msgstr "" -#: builtin/clean.c:906 +#: builtin/clean.c:907 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" -#: builtin/clean.c:909 +#: builtin/clean.c:910 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" #: builtin/clone.c:37 -msgid "git clone [options] [--] <repo> [<dir>]" +msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "" -#: builtin/clone.c:66 builtin/fetch.c:112 builtin/merge.c:224 -#: builtin/push.c:514 +#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224 +#: builtin/push.c:523 msgid "force progress reporting" msgstr "" @@ -3721,7 +3754,7 @@ msgstr "" msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:94 builtin/fetch.c:113 builtin/grep.c:659 +#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659 msgid "depth" msgstr "" @@ -3862,7 +3895,7 @@ msgstr "" msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:815 builtin/fetch.c:1155 +#: builtin/clone.c:815 builtin/fetch.c:1156 #, c-format msgid "depth %s is not a positive number" msgstr "" @@ -3877,58 +3910,58 @@ msgstr "" msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:848 builtin/clone.c:860 +#: builtin/clone.c:850 builtin/clone.c:861 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:851 +#: builtin/clone.c:853 #, c-format -msgid "could not create work tree dir '%s'." +msgid "could not create work tree dir '%s'" msgstr "" -#: builtin/clone.c:870 +#: builtin/clone.c:871 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:872 +#: builtin/clone.c:873 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:897 +#: builtin/clone.c:898 msgid "--dissociate given, but there is no --reference" msgstr "" -#: builtin/clone.c:912 +#: builtin/clone.c:913 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:915 +#: builtin/clone.c:916 msgid "source repository is shallow, ignoring --local" msgstr "" -#: builtin/clone.c:920 +#: builtin/clone.c:921 msgid "--local is ignored" msgstr "" -#: builtin/clone.c:924 +#: builtin/clone.c:925 #, c-format msgid "Don't know how to clone %s" msgstr "" -#: builtin/clone.c:975 builtin/clone.c:983 +#: builtin/clone.c:976 builtin/clone.c:984 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:986 +#: builtin/clone.c:987 msgid "You appear to have cloned an empty repository." msgstr "" #: builtin/column.c:9 -msgid "git column [options]" +msgid "git column [<options>]" msgstr "" #: builtin/column.c:26 @@ -3960,11 +3993,11 @@ msgid "--command must be the first argument" msgstr "" #: builtin/commit.c:37 -msgid "git commit [options] [--] <pathspec>..." +msgid "git commit [<options>] [--] <pathspec>..." msgstr "" #: builtin/commit.c:42 -msgid "git status [options] [--] <pathspec>..." +msgid "git status [<options>] [--] <pathspec>..." msgstr "" #: builtin/commit.c:47 @@ -4026,112 +4059,112 @@ msgid "" "the remaining commits.\n" msgstr "" -#: builtin/commit.c:302 +#: builtin/commit.c:304 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:342 +#: builtin/commit.c:344 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:348 +#: builtin/commit.c:350 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:359 +#: builtin/commit.c:361 msgid "unable to write index file" msgstr "" -#: builtin/commit.c:361 +#: builtin/commit.c:363 msgid "unable to update temporary index" msgstr "" -#: builtin/commit.c:363 +#: builtin/commit.c:365 msgid "Failed to update main cache tree" msgstr "" -#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461 +#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:443 +#: builtin/commit.c:445 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:445 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:454 +#: builtin/commit.c:456 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:473 +#: builtin/commit.c:475 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:584 +#: builtin/commit.c:580 #, c-format msgid "commit '%s' lacks author header" msgstr "" -#: builtin/commit.c:586 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' has malformed author line" msgstr "" -#: builtin/commit.c:605 +#: builtin/commit.c:601 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:613 +#: builtin/commit.c:609 #, c-format msgid "invalid date format: %s" msgstr "" -#: builtin/commit.c:657 +#: builtin/commit.c:653 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "" -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1084 +#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:706 builtin/shortlog.c:273 +#: builtin/commit.c:702 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:708 +#: builtin/commit.c:704 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:712 +#: builtin/commit.c:708 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:734 +#: builtin/commit.c:730 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:738 +#: builtin/commit.c:734 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:742 +#: builtin/commit.c:738 #, c-format msgid "could not read '%s'" msgstr "" -#: builtin/commit.c:789 +#: builtin/commit.c:785 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:807 +#: builtin/commit.c:803 #, c-format msgid "" "\n" @@ -4141,7 +4174,7 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:812 +#: builtin/commit.c:808 #, c-format msgid "" "\n" @@ -4151,14 +4184,14 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:825 +#: builtin/commit.c:821 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:832 +#: builtin/commit.c:828 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4166,348 +4199,348 @@ msgid "" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:852 +#: builtin/commit.c:848 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:860 +#: builtin/commit.c:856 #, c-format msgid "%sDate: %s" msgstr "" -#: builtin/commit.c:867 +#: builtin/commit.c:863 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:885 +#: builtin/commit.c:881 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:942 +#: builtin/commit.c:938 msgid "Error building trees" msgstr "" -#: builtin/commit.c:957 builtin/tag.c:495 +#: builtin/commit.c:953 builtin/tag.c:495 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:1059 +#: builtin/commit.c:1055 #, c-format -msgid "No existing author found with '%s'" +msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" -#: builtin/commit.c:1074 builtin/commit.c:1314 +#: builtin/commit.c:1070 builtin/commit.c:1310 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1111 +#: builtin/commit.c:1107 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1141 +#: builtin/commit.c:1137 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1150 +#: builtin/commit.c:1146 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1153 +#: builtin/commit.c:1149 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1155 +#: builtin/commit.c:1151 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1158 +#: builtin/commit.c:1154 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1168 +#: builtin/commit.c:1164 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1170 +#: builtin/commit.c:1166 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/commit.c:1178 +#: builtin/commit.c:1174 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1195 +#: builtin/commit.c:1191 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1197 +#: builtin/commit.c:1193 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:1199 +#: builtin/commit.c:1195 msgid "Clever... amending the last one with dirty index." msgstr "" -#: builtin/commit.c:1201 +#: builtin/commit.c:1197 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" -#: builtin/commit.c:1213 builtin/tag.c:728 +#: builtin/commit.c:1209 builtin/tag.c:728 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1218 +#: builtin/commit.c:1214 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1328 builtin/commit.c:1608 +#: builtin/commit.c:1324 builtin/commit.c:1604 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1330 builtin/commit.c:1610 +#: builtin/commit.c:1326 builtin/commit.c:1606 msgid "show branch information" msgstr "" -#: builtin/commit.c:1332 builtin/commit.c:1612 builtin/push.c:500 +#: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1335 builtin/commit.c:1614 +#: builtin/commit.c:1331 builtin/commit.c:1610 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1338 builtin/commit.c:1617 +#: builtin/commit.c:1334 builtin/commit.c:1613 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1340 builtin/commit.c:1620 builtin/fast-export.c:980 +#: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980 #: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "" -#: builtin/commit.c:1341 builtin/commit.c:1620 +#: builtin/commit.c:1337 builtin/commit.c:1616 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1344 +#: builtin/commit.c:1340 msgid "show ignored files" msgstr "" -#: builtin/commit.c:1345 parse-options.h:153 +#: builtin/commit.c:1341 parse-options.h:153 msgid "when" msgstr "" -#: builtin/commit.c:1346 +#: builtin/commit.c:1342 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1348 +#: builtin/commit.c:1344 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1435 +#: builtin/commit.c:1431 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1437 +#: builtin/commit.c:1433 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1482 +#: builtin/commit.c:1478 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1485 +#: builtin/commit.c:1481 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1578 +#: builtin/commit.c:1574 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1579 +#: builtin/commit.c:1575 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1581 +#: builtin/commit.c:1577 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1582 builtin/tag.c:601 +#: builtin/commit.c:1578 builtin/tag.c:601 msgid "read message from file" msgstr "" -#: builtin/commit.c:1583 +#: builtin/commit.c:1579 msgid "author" msgstr "" -#: builtin/commit.c:1583 +#: builtin/commit.c:1579 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1584 builtin/gc.c:275 +#: builtin/commit.c:1580 builtin/gc.c:275 msgid "date" msgstr "" -#: builtin/commit.c:1584 +#: builtin/commit.c:1580 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1585 builtin/merge.c:218 builtin/notes.c:391 +#: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391 #: builtin/notes.c:554 builtin/tag.c:599 msgid "message" msgstr "" -#: builtin/commit.c:1585 +#: builtin/commit.c:1581 msgid "commit message" msgstr "" -#: builtin/commit.c:1586 +#: builtin/commit.c:1582 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1587 +#: builtin/commit.c:1583 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1588 +#: builtin/commit.c:1584 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1589 +#: builtin/commit.c:1585 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1590 +#: builtin/commit.c:1586 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1591 builtin/log.c:1191 builtin/revert.c:86 +#: builtin/commit.c:1587 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1592 +#: builtin/commit.c:1588 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1593 +#: builtin/commit.c:1589 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1594 +#: builtin/commit.c:1590 msgid "default" msgstr "" -#: builtin/commit.c:1594 builtin/tag.c:604 +#: builtin/commit.c:1590 builtin/tag.c:604 msgid "how to strip spaces and #comments from message" msgstr "" -#: builtin/commit.c:1595 +#: builtin/commit.c:1591 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1596 builtin/merge.c:225 builtin/revert.c:92 +#: builtin/commit.c:1592 builtin/merge.c:225 builtin/revert.c:92 #: builtin/tag.c:605 msgid "key-id" msgstr "" -#: builtin/commit.c:1597 builtin/merge.c:226 builtin/revert.c:93 +#: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93 msgid "GPG sign commit" msgstr "" -#: builtin/commit.c:1600 +#: builtin/commit.c:1596 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1601 +#: builtin/commit.c:1597 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1602 +#: builtin/commit.c:1598 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1603 +#: builtin/commit.c:1599 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1604 +#: builtin/commit.c:1600 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1605 +#: builtin/commit.c:1601 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1606 +#: builtin/commit.c:1602 msgid "bypass pre-commit hook" msgstr "" -#: builtin/commit.c:1607 +#: builtin/commit.c:1603 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1618 +#: builtin/commit.c:1614 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1619 +#: builtin/commit.c:1615 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1624 +#: builtin/commit.c:1620 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1626 +#: builtin/commit.c:1622 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1655 +#: builtin/commit.c:1651 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1694 builtin/merge.c:519 +#: builtin/commit.c:1690 builtin/merge.c:519 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: builtin/commit.c:1701 +#: builtin/commit.c:1697 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1708 +#: builtin/commit.c:1704 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1727 +#: builtin/commit.c:1723 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1738 +#: builtin/commit.c:1734 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1743 +#: builtin/commit.c:1739 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1758 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1754 builtin/merge.c:851 builtin/merge.c:876 msgid "failed to write commit object" msgstr "" -#: builtin/commit.c:1791 +#: builtin/commit.c:1787 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -4515,7 +4548,7 @@ msgid "" msgstr "" #: builtin/config.c:8 -msgid "git config [options]" +msgid "git config [<options>]" msgstr "" #: builtin/config.c:53 @@ -4666,11 +4699,11 @@ msgid "print sizes in human readable format" msgstr "" #: builtin/describe.c:17 -msgid "git describe [options] <commit-ish>*" +msgid "git describe [<options>] [<commit-ish>...]" msgstr "" #: builtin/describe.c:18 -msgid "git describe [options] --dirty" +msgid "git describe [<options>] --dirty" msgstr "" #: builtin/describe.c:217 @@ -4880,268 +4913,269 @@ msgstr "" msgid "anonymize output" msgstr "" -#: builtin/fetch.c:20 +#: builtin/fetch.c:19 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/fetch.c:21 +#: builtin/fetch.c:20 msgid "git fetch [<options>] <group>" msgstr "" -#: builtin/fetch.c:22 +#: builtin/fetch.c:21 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "" -#: builtin/fetch.c:23 +#: builtin/fetch.c:22 msgid "git fetch --all [<options>]" msgstr "" -#: builtin/fetch.c:90 +#: builtin/fetch.c:89 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:92 +#: builtin/fetch.c:91 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:94 +#: builtin/fetch.c:93 msgid "path to upload pack on remote end" msgstr "" -#: builtin/fetch.c:95 +#: builtin/fetch.c:94 msgid "force overwrite of local branch" msgstr "" -#: builtin/fetch.c:97 +#: builtin/fetch.c:96 msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:99 +#: builtin/fetch.c:98 msgid "fetch all tags and associated objects" msgstr "" -#: builtin/fetch.c:101 +#: builtin/fetch.c:100 msgid "do not fetch all tags (--no-tags)" msgstr "" -#: builtin/fetch.c:103 +#: builtin/fetch.c:102 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:104 +#: builtin/fetch.c:103 msgid "on-demand" msgstr "" -#: builtin/fetch.c:105 +#: builtin/fetch.c:104 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:109 +#: builtin/fetch.c:108 msgid "keep downloaded pack" msgstr "" -#: builtin/fetch.c:111 +#: builtin/fetch.c:110 msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:114 +#: builtin/fetch.c:113 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:116 +#: builtin/fetch.c:115 msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:118 builtin/log.c:1208 +#: builtin/fetch.c:117 builtin/log.c:1208 msgid "dir" msgstr "" -#: builtin/fetch.c:119 +#: builtin/fetch.c:118 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:122 +#: builtin/fetch.c:121 msgid "default mode for recursion" msgstr "" -#: builtin/fetch.c:124 +#: builtin/fetch.c:123 msgid "accept refs that update .git/shallow" msgstr "" -#: builtin/fetch.c:125 +#: builtin/fetch.c:124 msgid "refmap" msgstr "" -#: builtin/fetch.c:126 +#: builtin/fetch.c:125 msgid "specify fetch refmap" msgstr "" -#: builtin/fetch.c:376 +#: builtin/fetch.c:375 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:454 +#: builtin/fetch.c:455 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:459 +#: builtin/fetch.c:460 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:473 +#: builtin/fetch.c:474 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "" -#: builtin/fetch.c:474 builtin/fetch.c:560 +#: builtin/fetch.c:475 builtin/fetch.c:561 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:485 +#: builtin/fetch.c:486 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540 +#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541 msgid " (unable to update local ref)" msgstr "" -#: builtin/fetch.c:505 +#: builtin/fetch.c:506 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:508 +#: builtin/fetch.c:509 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:511 +#: builtin/fetch.c:512 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "forced update" msgstr "" -#: builtin/fetch.c:562 +#: builtin/fetch.c:563 msgid "(non-fast-forward)" msgstr "" -#: builtin/fetch.c:595 builtin/fetch.c:828 +#: builtin/fetch.c:596 builtin/fetch.c:829 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: builtin/fetch.c:604 +#: builtin/fetch.c:605 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:622 +#: builtin/fetch.c:623 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:710 builtin/fetch.c:793 +#: builtin/fetch.c:711 builtin/fetch.c:794 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:721 +#: builtin/fetch.c:722 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -#: builtin/fetch.c:773 +#: builtin/fetch.c:774 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:774 +#: builtin/fetch.c:775 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:798 +#: builtin/fetch.c:799 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:799 builtin/remote.c:1060 +#: builtin/fetch.c:800 builtin/remote.c:1060 msgid "(none)" msgstr "" -#: builtin/fetch.c:818 +#: builtin/fetch.c:819 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:837 +#: builtin/fetch.c:838 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:840 +#: builtin/fetch.c:841 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:896 +#: builtin/fetch.c:897 #, c-format msgid "Don't know how to fetch from %s" msgstr "" -#: builtin/fetch.c:1058 +#: builtin/fetch.c:1059 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1060 builtin/remote.c:90 +#: builtin/fetch.c:1061 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1078 +#: builtin/fetch.c:1079 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -#: builtin/fetch.c:1101 +#: builtin/fetch.c:1102 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1143 +#: builtin/fetch.c:1144 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1145 +#: builtin/fetch.c:1146 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1168 +#: builtin/fetch.c:1169 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1170 +#: builtin/fetch.c:1171 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1181 +#: builtin/fetch.c:1182 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1189 +#: builtin/fetch.c:1190 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" #: builtin/fmt-merge-msg.c:13 -msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" +msgid "" +"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" #: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698 @@ -5171,51 +5205,51 @@ msgstr "" msgid "file to read from" msgstr "" -#: builtin/for-each-ref.c:676 +#: builtin/for-each-ref.c:675 msgid "unable to parse format" msgstr "" -#: builtin/for-each-ref.c:1064 -msgid "git for-each-ref [options] [<pattern>]" +#: builtin/for-each-ref.c:1063 +msgid "git for-each-ref [<options>] [<pattern>]" msgstr "" -#: builtin/for-each-ref.c:1079 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for shells" msgstr "" -#: builtin/for-each-ref.c:1081 +#: builtin/for-each-ref.c:1080 msgid "quote placeholders suitably for perl" msgstr "" -#: builtin/for-each-ref.c:1083 +#: builtin/for-each-ref.c:1082 msgid "quote placeholders suitably for python" msgstr "" -#: builtin/for-each-ref.c:1085 +#: builtin/for-each-ref.c:1084 msgid "quote placeholders suitably for Tcl" msgstr "" -#: builtin/for-each-ref.c:1088 +#: builtin/for-each-ref.c:1087 msgid "show only <n> matched refs" msgstr "" -#: builtin/for-each-ref.c:1089 builtin/replace.c:438 +#: builtin/for-each-ref.c:1088 builtin/replace.c:438 msgid "format" msgstr "" -#: builtin/for-each-ref.c:1089 +#: builtin/for-each-ref.c:1088 msgid "format to use for the output" msgstr "" -#: builtin/for-each-ref.c:1090 +#: builtin/for-each-ref.c:1089 msgid "key" msgstr "" -#: builtin/for-each-ref.c:1091 +#: builtin/for-each-ref.c:1090 msgid "field name to sort on" msgstr "" -#: builtin/fsck.c:147 builtin/prune.c:136 +#: builtin/fsck.c:147 builtin/prune.c:137 msgid "Checking connectivity" msgstr "" @@ -5224,7 +5258,7 @@ msgid "Checking object directories" msgstr "" #: builtin/fsck.c:603 -msgid "git fsck [options] [<object>...]" +msgid "git fsck [<options>] [<object>...]" msgstr "" #: builtin/fsck.c:609 @@ -5272,7 +5306,7 @@ msgid "Checking objects" msgstr "" #: builtin/gc.c:24 -msgid "git gc [options]" +msgid "git gc [<options>]" msgstr "" #: builtin/gc.c:79 @@ -5328,7 +5362,7 @@ msgid "" msgstr "" #: builtin/grep.c:23 -msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" +msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "" #: builtin/grep.c:218 @@ -5369,7 +5403,7 @@ msgid "search in both tracked and untracked files" msgstr "" #: builtin/grep.c:644 -msgid "search also in ignored files" +msgid "ignore files specified via '.gitignore'" msgstr "" #: builtin/grep.c:647 @@ -5554,15 +5588,15 @@ msgstr "" #: builtin/hash-object.c:82 msgid "" -"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " -"<file>..." +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " +"[--] <file>..." msgstr "" #: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "" -#: builtin/hash-object.c:94 builtin/tag.c:610 +#: builtin/hash-object.c:94 builtin/tag.c:612 msgid "type" msgstr "" @@ -5612,7 +5646,7 @@ msgid "show info page" msgstr "" #: builtin/help.c:52 -msgid "git help [--all] [--guides] [--man|--web|--info] [command]" +msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "" #: builtin/help.c:64 @@ -5817,8 +5851,8 @@ msgstr "" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:689 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:256 +#: builtin/index-pack.c:689 builtin/pack-objects.c:162 +#: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "" @@ -5905,97 +5939,97 @@ msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1220 +#: builtin/index-pack.c:1219 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1299 +#: builtin/index-pack.c:1298 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1323 +#: builtin/index-pack.c:1322 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1336 +#: builtin/index-pack.c:1335 #, c-format msgid "cannot write keep file '%s'" msgstr "" -#: builtin/index-pack.c:1344 +#: builtin/index-pack.c:1343 #, c-format msgid "cannot close written keep file '%s'" msgstr "" -#: builtin/index-pack.c:1357 +#: builtin/index-pack.c:1356 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1368 +#: builtin/index-pack.c:1367 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1401 +#: builtin/index-pack.c:1400 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "" -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1406 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/index-pack.c:1411 builtin/index-pack.c:1590 +#: builtin/index-pack.c:1410 builtin/index-pack.c:1589 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1468 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1471 +#: builtin/index-pack.c:1470 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1518 +#: builtin/index-pack.c:1517 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1525 +#: builtin/index-pack.c:1524 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1554 +#: builtin/index-pack.c:1553 msgid "Cannot come back to cwd" msgstr "" -#: builtin/index-pack.c:1602 builtin/index-pack.c:1605 -#: builtin/index-pack.c:1617 builtin/index-pack.c:1621 +#: builtin/index-pack.c:1601 builtin/index-pack.c:1604 +#: builtin/index-pack.c:1616 builtin/index-pack.c:1620 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1635 +#: builtin/index-pack.c:1634 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1639 builtin/index-pack.c:1648 +#: builtin/index-pack.c:1638 builtin/index-pack.c:1647 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1656 +#: builtin/index-pack.c:1655 msgid "--verify with no packfile name given" msgstr "" @@ -6107,7 +6141,7 @@ msgstr "" #: builtin/init-db.c:475 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" -"shared[=<permissions>]] [directory]" +"shared[=<permissions>]] [<directory>]" msgstr "" #: builtin/init-db.c:498 @@ -6167,7 +6201,7 @@ msgid "git log [<options>] [<revision range>] [[--] <path>...]" msgstr "" #: builtin/log.c:42 -msgid "git show [options] <object>..." +msgid "git show [<options>] <object>..." msgstr "" #: builtin/log.c:81 @@ -6246,7 +6280,7 @@ msgid "insane in-reply-to: %s" msgstr "" #: builtin/log.c:1026 -msgid "git format-patch [options] [<since> | <revision range>]" +msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "" #: builtin/log.c:1071 @@ -6443,95 +6477,95 @@ msgstr "" msgid "Unknown commit %s" msgstr "" -#: builtin/ls-files.c:401 -msgid "git ls-files [options] [<file>...]" +#: builtin/ls-files.c:358 +msgid "git ls-files [<options>] [<file>...]" msgstr "" -#: builtin/ls-files.c:458 +#: builtin/ls-files.c:415 msgid "identify the file status with tags" msgstr "" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:417 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" -#: builtin/ls-files.c:462 +#: builtin/ls-files.c:419 msgid "show cached files in the output (default)" msgstr "" -#: builtin/ls-files.c:464 +#: builtin/ls-files.c:421 msgid "show deleted files in the output" msgstr "" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:423 msgid "show modified files in the output" msgstr "" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:425 msgid "show other files in the output" msgstr "" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:427 msgid "show ignored files in the output" msgstr "" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:430 msgid "show staged contents' object name in the output" msgstr "" -#: builtin/ls-files.c:475 +#: builtin/ls-files.c:432 msgid "show files on the filesystem that need to be removed" msgstr "" -#: builtin/ls-files.c:477 +#: builtin/ls-files.c:434 msgid "show 'other' directories' names only" msgstr "" -#: builtin/ls-files.c:480 +#: builtin/ls-files.c:437 msgid "don't show empty directories" msgstr "" -#: builtin/ls-files.c:483 +#: builtin/ls-files.c:440 msgid "show unmerged files in the output" msgstr "" -#: builtin/ls-files.c:485 +#: builtin/ls-files.c:442 msgid "show resolve-undo information" msgstr "" -#: builtin/ls-files.c:487 +#: builtin/ls-files.c:444 msgid "skip files matching pattern" msgstr "" -#: builtin/ls-files.c:490 +#: builtin/ls-files.c:447 msgid "exclude patterns are read from <file>" msgstr "" -#: builtin/ls-files.c:493 +#: builtin/ls-files.c:450 msgid "read additional per-directory exclude patterns in <file>" msgstr "" -#: builtin/ls-files.c:495 +#: builtin/ls-files.c:452 msgid "add the standard git exclusions" msgstr "" -#: builtin/ls-files.c:498 +#: builtin/ls-files.c:455 msgid "make the output relative to the project top directory" msgstr "" -#: builtin/ls-files.c:501 +#: builtin/ls-files.c:458 msgid "if any <file> is not in the index, treat this as an error" msgstr "" -#: builtin/ls-files.c:502 +#: builtin/ls-files.c:459 msgid "tree-ish" msgstr "" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:460 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" -#: builtin/ls-files.c:505 +#: builtin/ls-files.c:462 msgid "show debugging data" msgstr "" @@ -6572,11 +6606,11 @@ msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" #: builtin/merge.c:45 -msgid "git merge [options] [<commit>...]" +msgid "git merge [<options>] [<commit>...]" msgstr "" #: builtin/merge.c:46 -msgid "git merge [options] <msg> HEAD <commit>" +msgid "git merge [<options>] <msg> HEAD <commit>" msgstr "" #: builtin/merge.c:47 @@ -6908,11 +6942,11 @@ msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" #: builtin/merge-base.c:29 -msgid "git merge-base [-a|--all] <commit> <commit>..." +msgid "git merge-base [-a | --all] <commit> <commit>..." msgstr "" #: builtin/merge-base.c:30 -msgid "git merge-base [-a|--all] --octopus <commit>..." +msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "" #: builtin/merge-base.c:31 @@ -6949,8 +6983,8 @@ msgstr "" #: builtin/merge-file.c:8 msgid "" -"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " -"file2" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" msgstr "" #: builtin/merge-file.c:33 @@ -6982,7 +7016,7 @@ msgid "do not warn about conflicts" msgstr "" #: builtin/merge-file.c:45 -msgid "set labels for file1/orig_file/file2" +msgid "set labels for file1/orig-file/file2" msgstr "" #: builtin/mktree.c:64 @@ -7002,7 +7036,7 @@ msgid "allow creation of more than one tree" msgstr "" #: builtin/mv.c:15 -msgid "git mv [options] <source>... <destination>" +msgid "git mv [<options>] <source>... <destination>" msgstr "" #: builtin/mv.c:69 @@ -7088,21 +7122,21 @@ msgstr "" msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:355 +#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359 #, c-format msgid "renaming '%s' failed" msgstr "" #: builtin/name-rev.c:255 -msgid "git name-rev [options] <commit>..." +msgid "git name-rev [<options>] <commit>..." msgstr "" #: builtin/name-rev.c:256 -msgid "git name-rev [options] --all" +msgid "git name-rev [<options>] --all" msgstr "" #: builtin/name-rev.c:257 -msgid "git name-rev [options] --stdin" +msgid "git name-rev [<options>] --stdin" msgstr "" #: builtin/name-rev.c:309 @@ -7134,36 +7168,36 @@ msgid "dereference tags in the input (internal use)" msgstr "" #: builtin/notes.c:24 -msgid "git notes [--ref <notes_ref>] [list [<object>]]" +msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "" #: builtin/notes.c:25 msgid "" -"git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" msgstr "" #: builtin/notes.c:26 -msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" +msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "" #: builtin/notes.c:27 msgid "" -"git notes [--ref <notes_ref>] append [--allow-empty] [-m <msg> | -F <file> | " +"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" msgstr "" #: builtin/notes.c:28 -msgid "git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]" +msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "" #: builtin/notes.c:29 -msgid "git notes [--ref <notes_ref>] show [<object>]" +msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "" #: builtin/notes.c:30 msgid "" -"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" +"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "" #: builtin/notes.c:31 @@ -7175,15 +7209,15 @@ msgid "git notes merge --abort [-v | -q]" msgstr "" #: builtin/notes.c:33 -msgid "git notes [--ref <notes_ref>] remove [<object>...]" +msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "" #: builtin/notes.c:34 -msgid "git notes [--ref <notes_ref>] prune [-n | -v]" +msgid "git notes [--ref <notes-ref>] prune [-n | -v]" msgstr "" #: builtin/notes.c:35 -msgid "git notes [--ref <notes_ref>] get-ref" +msgid "git notes [--ref <notes-ref>] get-ref" msgstr "" #: builtin/notes.c:40 @@ -7215,7 +7249,7 @@ msgid "git notes show [<object>]" msgstr "" #: builtin/notes.c:71 -msgid "git notes merge [<options>] <notes_ref>" +msgid "git notes merge [<options>] <notes-ref>" msgstr "" #: builtin/notes.c:72 @@ -7444,7 +7478,7 @@ msgid "notes-ref" msgstr "" #: builtin/notes.c:954 -msgid "use notes from <notes_ref>" +msgid "use notes from <notes-ref>" msgstr "" #: builtin/notes.c:989 builtin/remote.c:1621 @@ -7460,185 +7494,185 @@ msgstr "" msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" msgstr "" -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 +#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 #, c-format msgid "deflate error (%d)" msgstr "" -#: builtin/pack-objects.c:773 +#: builtin/pack-objects.c:771 msgid "Writing objects" msgstr "" -#: builtin/pack-objects.c:1015 +#: builtin/pack-objects.c:1013 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:2175 +#: builtin/pack-objects.c:2173 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:2572 +#: builtin/pack-objects.c:2570 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:2576 +#: builtin/pack-objects.c:2574 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2597 #, c-format msgid "option %s does not accept negative form" msgstr "" -#: builtin/pack-objects.c:2603 +#: builtin/pack-objects.c:2601 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2621 msgid "do not show progress meter" msgstr "" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2623 msgid "show progress meter" msgstr "" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2625 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2628 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2629 msgid "version[,offset]" msgstr "" -#: builtin/pack-objects.c:2632 +#: builtin/pack-objects.c:2630 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:2635 +#: builtin/pack-objects.c:2633 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2635 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:2637 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:2641 +#: builtin/pack-objects.c:2639 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:2643 +#: builtin/pack-objects.c:2641 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2643 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2645 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2647 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2649 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2651 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2653 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2655 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2657 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:2662 +#: builtin/pack-objects.c:2660 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:2665 +#: builtin/pack-objects.c:2663 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:2668 +#: builtin/pack-objects.c:2666 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2669 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2671 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2673 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:2676 parse-options.h:140 +#: builtin/pack-objects.c:2674 parse-options.h:140 msgid "time" msgstr "" -#: builtin/pack-objects.c:2677 +#: builtin/pack-objects.c:2675 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:2680 +#: builtin/pack-objects.c:2678 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:2682 +#: builtin/pack-objects.c:2680 msgid "create packs suitable for shallow fetches" msgstr "" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2682 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:2686 +#: builtin/pack-objects.c:2684 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:2688 +#: builtin/pack-objects.c:2686 msgid "do not hide commits by grafts" msgstr "" -#: builtin/pack-objects.c:2690 +#: builtin/pack-objects.c:2688 msgid "use a bitmap index if available to speed up counting objects" msgstr "" -#: builtin/pack-objects.c:2692 +#: builtin/pack-objects.c:2690 msgid "write a bitmap index together with the pack index" msgstr "" -#: builtin/pack-objects.c:2783 +#: builtin/pack-objects.c:2781 msgid "Counting objects" msgstr "" #: builtin/pack-refs.c:6 -msgid "git pack-refs [options]" +msgid "git pack-refs [<options>]" msgstr "" #: builtin/pack-refs.c:14 @@ -7650,7 +7684,7 @@ msgid "prune loose refs (default)" msgstr "" #: builtin/prune-packed.c:7 -msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" +msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" msgstr "" #: builtin/prune-packed.c:40 @@ -7852,75 +7886,79 @@ msgstr "" msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:493 +#: builtin/push.c:502 msgid "repository" msgstr "" -#: builtin/push.c:494 +#: builtin/push.c:503 msgid "push all refs" msgstr "" -#: builtin/push.c:495 +#: builtin/push.c:504 msgid "mirror all refs" msgstr "" -#: builtin/push.c:497 +#: builtin/push.c:506 msgid "delete refs" msgstr "" -#: builtin/push.c:498 +#: builtin/push.c:507 msgid "push tags (can't be used with --all or --mirror)" msgstr "" -#: builtin/push.c:501 +#: builtin/push.c:510 msgid "force updates" msgstr "" -#: builtin/push.c:503 +#: builtin/push.c:512 msgid "refname>:<expect" msgstr "" -#: builtin/push.c:504 +#: builtin/push.c:513 msgid "require old value of ref to be at this value" msgstr "" -#: builtin/push.c:507 +#: builtin/push.c:516 msgid "control recursive pushing of submodules" msgstr "" -#: builtin/push.c:509 +#: builtin/push.c:518 msgid "use thin pack" msgstr "" -#: builtin/push.c:510 builtin/push.c:511 +#: builtin/push.c:519 builtin/push.c:520 msgid "receive pack program" msgstr "" -#: builtin/push.c:512 +#: builtin/push.c:521 msgid "set upstream for git pull/status" msgstr "" -#: builtin/push.c:515 +#: builtin/push.c:524 msgid "prune locally removed refs" msgstr "" -#: builtin/push.c:517 +#: builtin/push.c:526 msgid "bypass pre-push hook" msgstr "" -#: builtin/push.c:518 +#: builtin/push.c:527 msgid "push missing but relevant tags" msgstr "" -#: builtin/push.c:520 +#: builtin/push.c:529 msgid "GPG sign the push" msgstr "" -#: builtin/push.c:529 +#: builtin/push.c:530 +msgid "request atomic transaction on remote side" +msgstr "" + +#: builtin/push.c:539 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:531 +#: builtin/push.c:541 msgid "--delete doesn't make sense without any refs" msgstr "" @@ -7995,12 +8033,12 @@ msgstr "" msgid "debug unpack-trees" msgstr "" -#: builtin/reflog.c:499 +#: builtin/reflog.c:429 #, c-format msgid "%s' for '%s' is not a valid timestamp" msgstr "" -#: builtin/reflog.c:615 builtin/reflog.c:620 +#: builtin/reflog.c:546 builtin/reflog.c:551 #, c-format msgid "'%s' is not a valid timestamp" msgstr "" @@ -8011,7 +8049,7 @@ msgstr "" #: builtin/remote.c:13 msgid "" -"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" +"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" @@ -8023,8 +8061,8 @@ msgstr "" msgid "git remote remove <name>" msgstr "" -#: builtin/remote.c:16 -msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" +#: builtin/remote.c:16 builtin/remote.c:43 +msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "" #: builtin/remote.c:17 @@ -8060,10 +8098,6 @@ msgstr "" msgid "git remote add [<options>] <name> <url>" msgstr "" -#: builtin/remote.c:43 -msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" -msgstr "" - #: builtin/remote.c:48 msgid "git remote set-branches <name> <branch>..." msgstr "" @@ -8487,7 +8521,7 @@ msgid "be verbose; must be placed before a subcommand" msgstr "" #: builtin/repack.c:17 -msgid "git repack [options]" +msgid "git repack [<options>]" msgstr "" #: builtin/repack.c:159 @@ -8554,7 +8588,7 @@ msgstr "" msgid "repack objects in packs marked with .keep" msgstr "" -#: builtin/repack.c:371 +#: builtin/repack.c:375 #, c-format msgid "removing '%s' failed" msgstr "" @@ -8644,7 +8678,7 @@ msgid "use this format" msgstr "" #: builtin/rerere.c:12 -msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" +msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "" #: builtin/rerere.c:57 @@ -8782,7 +8816,7 @@ msgid "Could not write new index file." msgstr "" #: builtin/rev-parse.c:361 -msgid "git rev-parse --parseopt [options] -- [<args>...]" +msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "" #: builtin/rev-parse.c:366 @@ -8799,15 +8833,15 @@ msgstr "" #: builtin/rev-parse.c:499 msgid "" -"git rev-parse --parseopt [options] -- [<args>...]\n" +"git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" -" or: git rev-parse [options] [<arg>...]\n" +" or: git rev-parse [<options>] [<arg>...]\n" "\n" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "" #: builtin/revert.c:22 -msgid "git revert [options] <commit-ish>..." +msgid "git revert [<options>] <commit-ish>..." msgstr "" #: builtin/revert.c:23 @@ -8815,7 +8849,7 @@ msgid "git revert <subcommand>" msgstr "" #: builtin/revert.c:28 -msgid "git cherry-pick [options] <commit-ish>..." +msgid "git cherry-pick [<options>] <commit-ish>..." msgstr "" #: builtin/revert.c:29 @@ -8896,7 +8930,7 @@ msgid "cherry-pick failed" msgstr "" #: builtin/rm.c:17 -msgid "git rm [options] [--] <file>..." +msgid "git rm [<options>] [--] <file>..." msgstr "" #: builtin/rm.c:65 @@ -8984,7 +9018,7 @@ msgid "git rm: unable to remove %s" msgstr "" #: builtin/shortlog.c:13 -msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]" +msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "" #: builtin/shortlog.c:131 @@ -9014,14 +9048,14 @@ msgstr "" #: builtin/show-branch.c:9 msgid "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" msgstr "" #: builtin/show-branch.c:13 -msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" +msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "" #: builtin/show-branch.c:652 @@ -9090,8 +9124,8 @@ msgstr "" #: builtin/show-ref.c:10 msgid "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" msgstr "" #: builtin/show-ref.c:11 @@ -9131,11 +9165,11 @@ msgid "show refs from stdin that aren't in local repository" msgstr "" #: builtin/symbolic-ref.c:7 -msgid "git symbolic-ref [options] name [ref]" +msgid "git symbolic-ref [<options>] <name> [<ref>]" msgstr "" #: builtin/symbolic-ref.c:8 -msgid "git symbolic-ref -d [-q] name" +msgid "git symbolic-ref -d [-q] <name>" msgstr "" #: builtin/symbolic-ref.c:40 @@ -9160,7 +9194,8 @@ msgstr "" #: builtin/tag.c:22 msgid "" -"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " +"[<head>]" msgstr "" #: builtin/tag.c:23 @@ -9169,7 +9204,7 @@ msgstr "" #: builtin/tag.c:24 msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" "\t\t[<pattern>...]" msgstr "" @@ -9305,16 +9340,16 @@ msgstr "" msgid "replace the tag if exists" msgstr "" -#: builtin/tag.c:608 -msgid "show tag list in columns" +#: builtin/tag.c:609 +msgid "Tag listing options" msgstr "" #: builtin/tag.c:610 -msgid "sort tags" +msgid "show tag list in columns" msgstr "" -#: builtin/tag.c:614 -msgid "Tag listing options" +#: builtin/tag.c:612 +msgid "sort tags" msgstr "" #: builtin/tag.c:617 builtin/tag.c:623 @@ -9373,131 +9408,131 @@ msgid "Unpacking objects" msgstr "" #: builtin/update-index.c:403 -msgid "git update-index [options] [--] [<file>...]" +msgid "git update-index [<options>] [--] [<file>...]" msgstr "" -#: builtin/update-index.c:756 +#: builtin/update-index.c:757 msgid "continue refresh even when index needs update" msgstr "" -#: builtin/update-index.c:759 +#: builtin/update-index.c:760 msgid "refresh: ignore submodules" msgstr "" -#: builtin/update-index.c:762 +#: builtin/update-index.c:763 msgid "do not ignore new files" msgstr "" -#: builtin/update-index.c:764 +#: builtin/update-index.c:765 msgid "let files replace directories and vice-versa" msgstr "" -#: builtin/update-index.c:766 +#: builtin/update-index.c:767 msgid "notice files missing from worktree" msgstr "" -#: builtin/update-index.c:768 +#: builtin/update-index.c:769 msgid "refresh even if index contains unmerged entries" msgstr "" -#: builtin/update-index.c:771 +#: builtin/update-index.c:772 msgid "refresh stat information" msgstr "" -#: builtin/update-index.c:775 +#: builtin/update-index.c:776 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" -#: builtin/update-index.c:779 +#: builtin/update-index.c:780 msgid "<mode>,<object>,<path>" msgstr "" -#: builtin/update-index.c:780 +#: builtin/update-index.c:781 msgid "add the specified entry to the index" msgstr "" -#: builtin/update-index.c:784 +#: builtin/update-index.c:785 msgid "(+/-)x" msgstr "" -#: builtin/update-index.c:785 +#: builtin/update-index.c:786 msgid "override the executable bit of the listed files" msgstr "" -#: builtin/update-index.c:789 +#: builtin/update-index.c:790 msgid "mark files as \"not changing\"" msgstr "" -#: builtin/update-index.c:792 +#: builtin/update-index.c:793 msgid "clear assumed-unchanged bit" msgstr "" -#: builtin/update-index.c:795 +#: builtin/update-index.c:796 msgid "mark files as \"index-only\"" msgstr "" -#: builtin/update-index.c:798 +#: builtin/update-index.c:799 msgid "clear skip-worktree bit" msgstr "" -#: builtin/update-index.c:801 +#: builtin/update-index.c:802 msgid "add to index only; do not add content to object database" msgstr "" -#: builtin/update-index.c:803 +#: builtin/update-index.c:804 msgid "remove named paths even if present in worktree" msgstr "" -#: builtin/update-index.c:805 +#: builtin/update-index.c:806 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" -#: builtin/update-index.c:807 +#: builtin/update-index.c:808 msgid "read list of paths to be updated from standard input" msgstr "" -#: builtin/update-index.c:811 +#: builtin/update-index.c:812 msgid "add entries from standard input to the index" msgstr "" -#: builtin/update-index.c:815 +#: builtin/update-index.c:816 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" -#: builtin/update-index.c:819 +#: builtin/update-index.c:820 msgid "only update entries that differ from HEAD" msgstr "" -#: builtin/update-index.c:823 +#: builtin/update-index.c:824 msgid "ignore files missing from worktree" msgstr "" -#: builtin/update-index.c:826 +#: builtin/update-index.c:827 msgid "report actions to standard output" msgstr "" -#: builtin/update-index.c:828 +#: builtin/update-index.c:829 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" -#: builtin/update-index.c:832 +#: builtin/update-index.c:833 msgid "write index in this format" msgstr "" -#: builtin/update-index.c:834 +#: builtin/update-index.c:835 msgid "enable or disable split index" msgstr "" #: builtin/update-ref.c:9 -msgid "git update-ref [options] -d <refname> [<oldval>]" +msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "" #: builtin/update-ref.c:10 -msgid "git update-ref [options] <refname> <newval> [<oldval>]" +msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" msgstr "" #: builtin/update-ref.c:11 -msgid "git update-ref [options] --stdin [-z]" +msgid "git update-ref [<options>] --stdin [-z]" msgstr "" #: builtin/update-ref.c:359 @@ -9525,7 +9560,7 @@ msgid "update the info files from scratch" msgstr "" #: builtin/verify-commit.c:17 -msgid "git verify-commit [-v|--verbose] <commit>..." +msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "" #: builtin/verify-commit.c:75 @@ -9533,7 +9568,7 @@ msgid "print commit contents" msgstr "" #: builtin/verify-pack.c:54 -msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "" #: builtin/verify-pack.c:64 @@ -9545,7 +9580,7 @@ msgid "show statistics only" msgstr "" #: builtin/verify-tag.c:17 -msgid "git verify-tag [-v|--verbose] <tag>..." +msgid "git verify-tag [-v | --verbose] <tag>..." msgstr "" #: builtin/verify-tag.c:73 @@ -9868,7 +9903,7 @@ msgstr "" #: git-bisect.sh:130 #, sh-format msgid "" -"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." +"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." msgstr "" #: git-bisect.sh:140 diff --git a/po/ru.po b/po/ru.po new file mode 100644 index 0000000..4356ae9 --- /dev/null +++ b/po/ru.po @@ -0,0 +1,10633 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Dimitriy Ryazantcev <DJm00n@mail.ru>, 2014-2015 +# insolor <insolor@gmail.com>, 2014 +# insolor <insolor@gmail.com>, 2014 +msgid "" +msgstr "" +"Project-Id-Version: Перевод Git на руÑÑкий Ñзык\n" +"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" +"POT-Creation-Date: 2015-04-03 08:13+0800\n" +"PO-Revision-Date: 2015-04-03 13:32+0000\n" +"Last-Translator: Dimitriy Ryazantcev <DJm00n@mail.ru>\n" +"Language-Team: Russian (http://www.transifex.com/projects/p/git-po-ru/language/ru/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ru\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: advice.c:55 +#, c-format +msgid "hint: %.*s\n" +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." +msgstr "ИÑправьте их в рабочем каталоге, затем запуÑтите «git add/rm <файл>»,\nчтобы пометить иÑправление и Ñделайте коммит." + +#: archive.c:11 +msgid "git archive [<options>] <tree-ish> [<path>...]" +msgstr "git archive [<опции>] <указатель-дерева> [<путь>…]" + +#: archive.c:12 +msgid "git archive --list" +msgstr "git archive --list" + +#: archive.c:13 +msgid "" +"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> " +"[<path>...]" +msgstr "git archive --remote <репозиторий> [--exec <команда>] [<опции>] <указатель-дерева> [<путь>…]" + +#: archive.c:14 +msgid "git archive --remote <repo> [--exec <cmd>] --list" +msgstr "git archive --remote <репозиторий> [--exec <команда>] --list" + +#: archive.c:342 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:427 +msgid "fmt" +msgstr "формат" + +#: archive.c:427 +msgid "archive format" +msgstr "формат архива" + +#: archive.c:428 builtin/log.c:1204 +msgid "prefix" +msgstr "префикÑ" + +#: archive.c:429 +msgid "prepend prefix to each pathname in the archive" +msgstr "добавлÑÑ‚ÑŒ Ð¿Ñ€ÐµÑ„Ð¸ÐºÑ Ð¿ÐµÑ€ÐµÐ´ каждым путем файла в архиве" + +#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 +#: builtin/blame.c:2517 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:446 builtin/ls-files.c:449 builtin/notes.c:394 +#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151 +msgid "file" +msgstr "файл" + +#: archive.c:431 builtin/archive.c:89 +msgid "write the archive to this file" +msgstr "запиÑÑŒ архива в Ñтот файл" + +#: archive.c:433 +msgid "read .gitattributes in working directory" +msgstr "читать .gitattributes в рабочем каталоге" + +#: archive.c:434 +msgid "report archived files on stderr" +msgstr "отчет об архивированных файлах в stderr" + +#: archive.c:435 +msgid "store only" +msgstr "только хранение" + +#: archive.c:436 +msgid "compress faster" +msgstr "Ñжимать быÑтрее" + +#: archive.c:444 +msgid "compress better" +msgstr "Ñжимать лучше" + +#: archive.c:447 +msgid "list supported archive formats" +msgstr "перечиÑлить поддерживаемые форматы архивов" + +#: archive.c:449 builtin/archive.c:90 builtin/clone.c:86 +msgid "repo" +msgstr "репозиторий" + +#: archive.c:450 builtin/archive.c:91 +msgid "retrieve the archive from remote repository <repo>" +msgstr "получить архив из внешнего <репозиториÑ>" + +#: archive.c:451 builtin/archive.c:92 builtin/notes.c:478 +msgid "command" +msgstr "комманда" + +#: archive.c:452 builtin/archive.c:93 +msgid "path to the remote git-upload-archive command" +msgstr "путь к команде git-upload-archive на машине Ñ Ð²Ð½ÐµÑˆÐ½Ð¸Ð¼ репозиторием" + +#: attr.c:264 +msgid "" +"Negative patterns are ignored in git attributes\n" +"Use '\\!' for literal leading exclamation." +msgstr "Отрицающие шаблоны в атрибутах git игнорируютÑÑ.\nИÑпользуйте «\\!» Ð´Ð»Ñ Ð±ÑƒÐºÐ²Ð°Ð»ÑŒÐ½Ð¾Ð³Ð¾ иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ñимвола в значении «воÑклицательный знак»." + +#: branch.c:60 +#, c-format +msgid "Not setting branch %s as its own upstream." +msgstr "Ðе уÑтанавливаю ветку %s, так так она принадлежит вышеÑтоÑщему репозиторию." + +#: branch.c:83 +#, c-format +msgid "Branch %s set up to track remote branch %s from %s by rebasing." +msgstr "Ветка %s отÑлеживает внешнюю ветку %s из %s перемещением." + +#: branch.c:84 +#, c-format +msgid "Branch %s set up to track remote branch %s from %s." +msgstr "Ветка %s отÑлеживает внешнюю ветку %s из %s." + +#: branch.c:88 +#, c-format +msgid "Branch %s set up to track local branch %s by rebasing." +msgstr "Ветка %s отÑлеживает локальную ветку %s перемещением." + +#: branch.c:89 +#, c-format +msgid "Branch %s set up to track local branch %s." +msgstr "Ветка %s отÑлеживает локальную ветку %s." + +#: branch.c:94 +#, c-format +msgid "Branch %s set up to track remote ref %s by rebasing." +msgstr "Ветка %s отÑлеживает внешнюю ÑÑылку %s перемещением." + +#: branch.c:95 +#, c-format +msgid "Branch %s set up to track remote ref %s." +msgstr "Ветка %s отÑлеживает внешнюю ÑÑылку %s." + +#: branch.c:99 +#, c-format +msgid "Branch %s set up to track local ref %s by rebasing." +msgstr "Ветка %s отÑлеживает локальную ÑÑылку %s перемещением." + +#: branch.c:100 +#, c-format +msgid "Branch %s set up to track local ref %s." +msgstr "Ветка %s отÑлеживает локальную ÑÑылку %s." + +#: branch.c:133 +#, c-format +msgid "Not tracking: ambiguous information for ref %s" +msgstr "Ðе отÑлеживаетÑÑ: Ð½ÐµÐ¾Ð´Ð½Ð¾Ð·Ð½Ð°Ñ‡Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð´Ð»Ñ ÑÑылки %s" + +#: branch.c:162 +#, c-format +msgid "'%s' is not a valid branch name." +msgstr "«%s» не ÑвлÑетÑÑ Ð´ÐµÐ¹Ñтвительным именем ветки." + +#: branch.c:167 +#, c-format +msgid "A branch named '%s' already exists." +msgstr "Ветка Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ «%s» уже ÑущеÑтвует." + +#: branch.c:175 +msgid "Cannot force update the current branch." +msgstr "Ðе удалоÑÑŒ принудительно обновить текущую ветку." + +#: branch.c:195 +#, c-format +msgid "" +"Cannot setup tracking information; starting point '%s' is not a branch." +msgstr "Ðе удалоÑÑŒ наÑтроить информацию отÑлеживаниÑ; ÑÑ‚Ð°Ñ€Ñ‚Ð¾Ð²Ð°Ñ Ñ‚Ð¾Ñ‡ÐºÐ° «%s» не ÑвлÑетÑÑ Ð²ÐµÑ‚ÐºÐ¾Ð¹." + +#: branch.c:197 +#, c-format +msgid "the requested upstream branch '%s' does not exist" +msgstr "Ð·Ð°Ð¿Ñ€Ð¾ÑˆÐµÐ½Ð½Ð°Ñ Ð²ÐµÑ‚ÐºÐ° вышеÑтоÑщего Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Â«%s» не ÑущеÑтвует" + +#: branch.c:199 +msgid "" +"\n" +"If you are planning on basing your work on an upstream\n" +"branch that already exists at the remote, you may need to\n" +"run \"git fetch\" to retrieve it.\n" +"\n" +"If you are planning to push out a new local branch that\n" +"will track its remote counterpart, you may want to use\n" +"\"git push -u\" to set the upstream config as you push." +msgstr "\nЕÑли вы планируете оÑновывать Ñвою работу на вышеÑтоÑщей ветке, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ ÑƒÐ¶Ðµ ÑущеÑтвует во внешнем репозитории, вам может потребоватьÑÑ Ð·Ð°Ð¿ÑƒÑтить «git fetch» Ð´Ð»Ñ ÐµÐµ получениÑ.\n\nЕÑли вы планируете отправить новую локальную ветку, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð±ÑƒÐ´ÐµÑ‚ отÑлеживатьÑÑ, во внешний репозиторий, вам может потребоватьÑÑ Ð·Ð°Ð¿ÑƒÑтить «git push -u» — чтобы Ñохранить наÑтройку вышеÑтоÑщего Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸." + +#: branch.c:243 +#, c-format +msgid "Not a valid object name: '%s'." +msgstr "ÐедопуÑтимое Ð¸Ð¼Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð°: «%s»." + +#: branch.c:263 +#, c-format +msgid "Ambiguous object name: '%s'." +msgstr "Ðеоднозначное Ð¸Ð¼Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð°: «%s»." + +#: branch.c:268 +#, c-format +msgid "Not a valid branch point: '%s'." +msgstr "ÐедопуÑÑ‚Ð¸Ð¼Ð°Ñ Ñ‚Ð¾Ñ‡ÐºÐ° ветки: «%s»." + +#: bundle.c:34 +#, c-format +msgid "'%s' does not look like a v2 bundle file" +msgstr "«%s» не похож на файл пакета верÑии 2" + +#: bundle.c:61 +#, c-format +msgid "unrecognized header: %s%s (%d)" +msgstr "неопознанный заголовок: %s%s (%d)" + +#: bundle.c:87 builtin/commit.c:766 +#, c-format +msgid "could not open '%s'" +msgstr "не удалоÑÑŒ открыть «%s»" + +#: bundle.c:139 +msgid "Repository lacks these prerequisite commits:" +msgstr "Ð’ репозитории отÑутÑтвуют необходимые коммиты:" + +#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 +#: builtin/branch.c:659 builtin/commit.c:1045 builtin/log.c:330 +#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358 +#: builtin/shortlog.c:158 +msgid "revision walk setup failed" +msgstr "Ñбой инициализации прохода по редакциÑм" + +#: bundle.c:185 +#, c-format +msgid "The bundle contains this ref:" +msgid_plural "The bundle contains these %d refs:" +msgstr[0] "Пакет Ñодержит Ñту %d ÑÑылку:" +msgstr[1] "Пакет Ñодержит Ñти %d ÑÑылки:" +msgstr[2] "Пакет Ñодержит Ñти %d ÑÑылок:" + +#: bundle.c:192 +msgid "The bundle records a complete history." +msgstr "Пакет Ñодержит полную иÑторию." + +#: bundle.c:194 +#, c-format +msgid "The bundle requires this ref:" +msgid_plural "The bundle requires these %d refs:" +msgstr[0] "Пакет требует Ñту %d ÑÑылку:" +msgstr[1] "Пакет требует Ñти %d ÑÑылки:" +msgstr[2] "Пакет требует Ñти %d ÑÑылок:" + +#: bundle.c:251 +msgid "Could not spawn pack-objects" +msgstr "Ðе удалоÑÑŒ Ñоздать объекты пакета" + +#: bundle.c:269 +msgid "pack-objects died" +msgstr "критичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° pack-objects" + +#: bundle.c:309 +msgid "rev-list died" +msgstr "критичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° rev-list" + +#: bundle.c:358 +#, c-format +msgid "ref '%s' is excluded by the rev-list options" +msgstr "ÑÑылка «%s» иÑключена в ÑоответÑтвии Ñ Ð¾Ð¿Ñ†Ð¸Ñми rev-list" + +#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#, c-format +msgid "unrecognized argument: %s" +msgstr "неопознанный аргумент: %s" + +#: bundle.c:443 +msgid "Refusing to create empty bundle." +msgstr "Отклонение ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿ÑƒÑтого пакета." + +#: bundle.c:453 +#, c-format +msgid "cannot create '%s'" +msgstr "не удалоÑÑŒ Ñоздать «%s»" + +#: bundle.c:474 +msgid "index-pack died" +msgstr "критичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° index-pack" + +#: color.c:260 +#, c-format +msgid "invalid color value: %.*s" +msgstr "недопуÑтимое значение цвета: %.*s" + +#: commit.c:40 +#, c-format +msgid "could not parse %s" +msgstr "не удалоÑÑŒ разобрать %s" + +#: commit.c:42 +#, c-format +msgid "%s %s is not a commit!" +msgstr "%s %s не ÑвлÑетÑÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¾Ð¼!" + +#: compat/obstack.c:406 compat/obstack.c:408 +msgid "memory exhausted" +msgstr "памÑÑ‚ÑŒ иÑчерпана" + +#: config.c:474 config.c:476 +#, c-format +msgid "bad config file line %d in %s" +msgstr "ошибка в %d Ñтроке файла конфигурации в %s" + +#: config.c:592 +#, c-format +msgid "bad numeric config value '%s' for '%s' in %s: %s" +msgstr "неправильное чиÑловое значение «%s» Ð´Ð»Ñ Â«%s» в %s: %s" + +#: config.c:594 +#, c-format +msgid "bad numeric config value '%s' for '%s': %s" +msgstr "неправильное чиÑловое значение «%s» Ð´Ð»Ñ Â«%s»: %s" + +#: config.c:679 +#, c-format +msgid "failed to expand user dir in: '%s'" +msgstr "Ñбой Ñ€Ð°Ð·Ð²Ð¾Ñ€Ð°Ñ‡Ð¸Ð²Ð°Ð½Ð¸Ñ Ð¿ÑƒÑ‚Ð¸ каталога пользователÑ: «%s»" + +#: config.c:757 config.c:768 +#, c-format +msgid "bad zlib compression level %d" +msgstr "неправильный уровень ÑÐ¶Ð°Ñ‚Ð¸Ñ zlib %d" + +#: config.c:890 +#, c-format +msgid "invalid mode for object creation: %s" +msgstr "недопуÑтимый режим ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð°: %s" + +#: config.c:1216 +msgid "unable to parse command-line config" +msgstr "не удалоÑÑŒ разобрать конфигурацию из командной Ñтроки" + +#: config.c:1277 +msgid "unknown error occured while reading the configuration files" +msgstr "произошла неизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° при чтении файлов конфигурации" + +#: config.c:1601 +#, c-format +msgid "unable to parse '%s' from command-line config" +msgstr "не удалоÑÑŒ разобрать «%s» в конфигурации из командной Ñтроки" + +#: config.c:1603 +#, c-format +msgid "bad config variable '%s' in file '%s' at line %d" +msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸ «%s» в файле «%s» на Ñтроке %d" + +#: config.c:1662 +#, 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:89 +#, c-format +msgid "failed write to rev-list: %s" +msgstr "Ñбой запиÑи в rev-list: %s" + +#: connected.c:97 +#, c-format +msgid "failed to close rev-list's stdin: %s" +msgstr "Ñбой Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ñтандартного ввода у rev-list: %s" + +#: date.c:95 +msgid "in the future" +msgstr "в будущем" + +#: date.c:101 +#, c-format +msgid "%lu second ago" +msgid_plural "%lu seconds ago" +msgstr[0] "%lu Ñекунду назад" +msgstr[1] "%lu Ñекунды назад" +msgstr[2] "%lu Ñекунд назад" + +#: date.c:108 +#, c-format +msgid "%lu minute ago" +msgid_plural "%lu minutes ago" +msgstr[0] "%lu минуту назад" +msgstr[1] "%lu минуты назад" +msgstr[2] "%lu минут назад" + +#: date.c:115 +#, c-format +msgid "%lu hour ago" +msgid_plural "%lu hours ago" +msgstr[0] "%lu Ñ‡Ð°Ñ Ð½Ð°Ð·Ð°Ð´" +msgstr[1] "%lu чаÑа назад" +msgstr[2] "%lu чаÑов назад" + +#: date.c:122 +#, c-format +msgid "%lu day ago" +msgid_plural "%lu days ago" +msgstr[0] "%lu день назад" +msgstr[1] "%lu Ð´Ð½Ñ Ð½Ð°Ð·Ð°Ð´" +msgstr[2] "%lu дней назад" + +#: date.c:128 +#, c-format +msgid "%lu week ago" +msgid_plural "%lu weeks ago" +msgstr[0] "%lu неделю назад" +msgstr[1] "%lu недели назад" +msgstr[2] "%lu недель назад" + +#: date.c:135 +#, c-format +msgid "%lu month ago" +msgid_plural "%lu months ago" +msgstr[0] "%lu меÑÑц назад" +msgstr[1] "%lu меÑÑца назад" +msgstr[2] "%lu меÑÑцев назад" + +#: date.c:146 +#, c-format +msgid "%lu year" +msgid_plural "%lu years" +msgstr[0] "%lu год" +msgstr[1] "%lu года" +msgstr[2] "%lu лет" + +#. TRANSLATORS: "%s" is "<n> years" +#: date.c:149 +#, c-format +msgid "%s, %lu month ago" +msgid_plural "%s, %lu months ago" +msgstr[0] "%s и %lu меÑÑц назад" +msgstr[1] "%s и %lu меÑÑца назад" +msgstr[2] "%s и %lu меÑÑцев назад" + +#: date.c:154 date.c:159 +#, c-format +msgid "%lu year ago" +msgid_plural "%lu years ago" +msgstr[0] "%lu год назад" +msgstr[1] "%lu года назад" +msgstr[2] "%lu лет назад" + +#: diffcore-order.c:24 +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "Ñбой Ñ‡Ñ‚ÐµÐ½Ð¸Ñ orderfile «%s»" + +#: diffcore-rename.c:536 +msgid "Performing inexact rename detection" +msgstr "ВыполнÑетÑÑ Ð½ÐµÑ‚Ð¾Ñ‡Ð½Ð¾Ðµ определение переименованиÑ" + +#: diff.c:114 +#, c-format +msgid " Failed to parse dirstat cut-off percentage '%s'\n" +msgstr " Сбой разбора величины Ñреза (cut-off) у dirstat «%s»\n" + +#: diff.c:119 +#, c-format +msgid " Unknown dirstat parameter '%s'\n" +msgstr "ÐеизвеÑтный параметр dirstat: «%s»\n" + +#: diff.c:214 +#, c-format +msgid "Unknown value for 'diff.submodule' config variable: '%s'" +msgstr "ÐеизвеÑтное Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹ «diff.submodule»: «%s»" + +#: diff.c:266 +#, c-format +msgid "" +"Found errors in 'diff.dirstat' config variable:\n" +"%s" +msgstr "Ðайдены ошибки в переменной «diff.dirstat»:\n%s" + +#: diff.c:2956 +#, c-format +msgid "external diff died, stopping at %s" +msgstr "критичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° при внешнем Ñравнении, оÑтанов на %s" + +#: diff.c:3351 +msgid "--follow requires exactly one pathspec" +msgstr "--follow требует ровно одной Ñпецификации пути" + +#: diff.c:3514 +#, c-format +msgid "" +"Failed to parse --dirstat/-X option parameter:\n" +"%s" +msgstr "Сбой разбора параметра опции --dirstat/-X :\n%s" + +#: diff.c:3528 +#, c-format +msgid "Failed to parse --submodule option parameter: '%s'" +msgstr "Сбой разбора параметра опции --submodule: «%s»" + +#: gpg-interface.c:129 gpg-interface.c:200 +msgid "could not run gpg." +msgstr "не удалоÑÑŒ запуÑтить gpg." + +#: gpg-interface.c:141 +msgid "gpg did not accept the data" +msgstr "gpg не принÑл данные" + +#: gpg-interface.c:152 +msgid "gpg failed to sign the data" +msgstr "gpg не удалоÑÑŒ подпиÑать данные" + +#: gpg-interface.c:185 +#, c-format +msgid "could not create temporary file '%s': %s" +msgstr "не удалоÑÑŒ Ñоздать временный файл «%s»: %s" + +#: gpg-interface.c:188 +#, c-format +msgid "failed writing detached signature to '%s': %s" +msgstr "Ñбой запиÑи отÑоединенной подпиÑи в «%s»: %s" + +#: grep.c:1718 +#, c-format +msgid "'%s': unable to read %s" +msgstr "«%s»: не удалоÑÑŒ прочеÑÑ‚ÑŒ %s" + +#: grep.c:1735 +#, c-format +msgid "'%s': %s" +msgstr "«%s»: %s" + +#: grep.c:1746 +#, c-format +msgid "'%s': short read %s" +msgstr "«%s»: Ñлишком мало данных прочитано %s" + +#: help.c:207 +#, c-format +msgid "available git commands in '%s'" +msgstr "доÑтупные команды git в «%s»" + +#: help.c:214 +msgid "git commands available from elsewhere on your $PATH" +msgstr "команды git, доÑтупные в других меÑтах вашего $PATH" + +#: help.c:230 +msgid "The most commonly used git commands are:" +msgstr "Самые чаÑто иÑпользуемые команды git:" + +#: help.c:289 +#, c-format +msgid "" +"'%s' appears to be a git command, but we were not\n" +"able to execute it. Maybe git-%s is broken?" +msgstr "«%s» похоже на команду git, но нам не удалоÑÑŒ ее запуÑтить. Возможно, git-%s не работает?" + +#: help.c:346 +msgid "Uh oh. Your system reports no Git commands at all." +msgstr "Ой-ёй! Ваша ÑиÑтема не Ñообщает ни о каких командах Git вообще." + +#: help.c:368 +#, c-format +msgid "" +"WARNING: You called a Git command named '%s', which does not exist.\n" +"Continuing under the assumption that you meant '%s'" +msgstr "Ð’ÐИМÐÐИЕ: Ð’Ñ‹ вызвали команду Git «%s», но такой не ÑущеÑтвует.\nПродолжаем Ñ Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÐ¼, что вы имели в виду «%s»" + +#: help.c:373 +#, c-format +msgid "in %0.1f seconds automatically..." +msgstr "через %0.1f Ñекунд автоматичеÑки…" + +#: help.c:380 +#, c-format +msgid "git: '%s' is not a git command. See 'git --help'." +msgstr "git: «%s» не ÑвлÑетÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ git. Смотрите «git --help»." + +#: help.c:384 help.c:444 +msgid "" +"\n" +"Did you mean this?" +msgid_plural "" +"\n" +"Did you mean one of these?" +msgstr[0] "\nВозможно, вы имели в виду Ñто?" +msgstr[1] "\nВозможно, вы имели в виду что-то из Ñтого?" +msgstr[2] "\nВозможно, вы имели в виду что-то из Ñтого?" + +#: help.c:440 +#, c-format +msgid "%s: %s - %s" +msgstr "%s: %s — %s" + +#: lockfile.c:283 +msgid "BUG: reopen a lockfile that is still open" +msgstr "БÐГ: повторное открытие файла блокировки, который уже открыт" + +#: lockfile.c:285 +msgid "BUG: reopen a lockfile that has been committed" +msgstr "БÐГ: повторное открытие файла блокировки, который уже был закоммичен" + +#: merge.c:41 +msgid "failed to read the cache" +msgstr "Ñбой Ñ‡Ñ‚ÐµÐ½Ð¸Ñ ÐºÑша" + +#: merge.c:94 builtin/checkout.c:374 builtin/checkout.c:580 +#: builtin/clone.c:662 +msgid "unable to write new index file" +msgstr "не удалоÑÑŒ запиÑать новый файл индекÑа" + +#: merge-recursive.c:189 +#, c-format +msgid "(bad commit)\n" +msgstr "(плохой коммит)\n" + +#: merge-recursive.c:209 +#, c-format +msgid "addinfo_cache failed for path '%s'" +msgstr "Ñбой addinfo_cache Ð´Ð»Ñ Ð¿ÑƒÑ‚Ð¸ «%s»" + +#: merge-recursive.c:270 +msgid "error building trees" +msgstr "ошибка при поÑтроении деревьев" + +#: merge-recursive.c:688 +#, c-format +msgid "failed to create path '%s'%s" +msgstr "не удалоÑÑŒ Ñоздать путь «%s»%s" + +#: merge-recursive.c:699 +#, c-format +msgid "Removing %s to make room for subdirectory\n" +msgstr "Удаление %s, чтобы оÑвободить меÑто Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð¾Ð²\n" + +#: merge-recursive.c:713 merge-recursive.c:734 +msgid ": perhaps a D/F conflict?" +msgstr ": возможно, конфликт каталогов/файлов?" + +#: merge-recursive.c:724 +#, c-format +msgid "refusing to lose untracked file at '%s'" +msgstr "отказ потери неотÑлеживаемого файла в «%s»" + +#: merge-recursive.c:764 +#, c-format +msgid "cannot read object %s '%s'" +msgstr "невозможно прочитать объект %s «%s»" + +#: merge-recursive.c:766 +#, c-format +msgid "blob expected for %s '%s'" +msgstr "ожидаетÑÑ Ð´Ð²Ð¾Ð¸Ñ‡Ð½Ñ‹Ð¹ объект Ð´Ð»Ñ %s «%s»" + +#: merge-recursive.c:789 builtin/clone.c:321 +#, c-format +msgid "failed to open '%s'" +msgstr "не удалоÑÑŒ открыть «%s»" + +#: merge-recursive.c:797 +#, c-format +msgid "failed to symlink '%s'" +msgstr "не удалоÑÑŒ Ñоздать Ñимвольную ÑÑылку «%s»" + +#: merge-recursive.c:800 +#, c-format +msgid "do not know what to do with %06o %s '%s'" +msgstr "не понÑтно, что делать Ñ %06o %s «%s»" + +#: merge-recursive.c:938 +msgid "Failed to execute internal merge" +msgstr "Ðе удалоÑÑŒ запуÑтить внутреннее ÑлиÑние" + +#: merge-recursive.c:942 +#, c-format +msgid "Unable to add %s to database" +msgstr "Ðе удалоÑÑŒ добавить %s в базу данных" + +#: merge-recursive.c:958 +msgid "unsupported object type in the tree" +msgstr "объект неподдерживаемого типа в дереве" + +#: merge-recursive.c:1033 merge-recursive.c:1047 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree." +msgstr "КОÐФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. ВерÑÐ¸Ñ %s из %s оÑтавлена в дереве." + +#: merge-recursive.c:1039 merge-recursive.c:1052 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree at %s." +msgstr "КОÐФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. ВерÑÐ¸Ñ %s из %s оÑтавлена в дереве на %s." + +#: merge-recursive.c:1093 +msgid "rename" +msgstr "переименование" + +#: merge-recursive.c:1093 +msgid "renamed" +msgstr "переименовано" + +#: merge-recursive.c:1149 +#, c-format +msgid "%s is a directory in %s adding as %s instead" +msgstr "%s — Ñто каталог в %s, добавлÑем как %s вмеÑто Ñтого" + +#: merge-recursive.c:1171 +#, c-format +msgid "" +"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename " +"\"%s\"->\"%s\" in \"%s\"%s" +msgstr "КОÐФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке «%s» и переименование «%s»→«%s» в ветке «%s»%s" + +#: merge-recursive.c:1176 +msgid " (left unresolved)" +msgstr " (оÑтавлено неразрешенным)" + +#: merge-recursive.c:1230 +#, 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:1260 +#, c-format +msgid "Renaming %s to %s and %s to %s instead" +msgstr "Переименовываю %s в %s и %s в %s вмеÑто Ñтого" + +#: merge-recursive.c:1459 +#, c-format +msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" +msgstr "КОÐФЛИКТ (переименование/добавление): Переименование «%s»→«%s» в ветке «%s» и добавление «%s» в ветке «%s»" + +#: merge-recursive.c:1469 +#, c-format +msgid "Adding merged %s" +msgstr "Добавление Ñлитого %s" + +#: merge-recursive.c:1474 merge-recursive.c:1672 +#, c-format +msgid "Adding as %s instead" +msgstr "Добавление вмеÑто Ñтого как %s" + +#: merge-recursive.c:1525 +#, c-format +msgid "cannot read object %s" +msgstr "невозможно прочитать объект «%s»" + +#: merge-recursive.c:1528 +#, c-format +msgid "object %s is not a blob" +msgstr "объект %s не ÑвлÑетÑÑ Ð´Ð²Ð¾Ð¸Ñ‡Ð½Ñ‹Ð¼ объектом" + +#: merge-recursive.c:1576 +msgid "modify" +msgstr "изменение" + +#: merge-recursive.c:1576 +msgid "modified" +msgstr "изменено" + +#: merge-recursive.c:1586 +msgid "content" +msgstr "Ñодержимое" + +#: merge-recursive.c:1593 +msgid "add/add" +msgstr "добавление/добавление" + +#: merge-recursive.c:1627 +#, c-format +msgid "Skipped %s (merged same as existing)" +msgstr "ПропуÑк %s (Ñлиты одинаковые Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÐºÐ°Ðº ÑущеÑтвующие)" + +#: merge-recursive.c:1641 +#, c-format +msgid "Auto-merging %s" +msgstr "ÐвтоÑлиÑние %s" + +#: merge-recursive.c:1645 git-submodule.sh:1150 +msgid "submodule" +msgstr "подмодуль" + +#: merge-recursive.c:1646 +#, c-format +msgid "CONFLICT (%s): Merge conflict in %s" +msgstr "КОÐФЛИКТ (%s): Конфликт ÑлиÑÐ½Ð¸Ñ Ð² %s" + +#: merge-recursive.c:1732 +#, c-format +msgid "Removing %s" +msgstr "Удаление %s" + +#: merge-recursive.c:1757 +msgid "file/directory" +msgstr "файл/каталог" + +#: merge-recursive.c:1763 +msgid "directory/file" +msgstr "каталог/файл" + +#: merge-recursive.c:1768 +#, 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:1778 +#, c-format +msgid "Adding %s" +msgstr "Добавление %s" + +#: merge-recursive.c:1795 +msgid "Fatal merge failure, shouldn't happen." +msgstr "КритичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° ÑлиÑниÑ, такого не должно ÑлучатьÑÑ." + +#: merge-recursive.c:1814 +msgid "Already up-to-date!" +msgstr "Уже обновлено!" + +#: merge-recursive.c:1823 +#, c-format +msgid "merging of trees %s and %s failed" +msgstr "Ñбой ÑлиÑÐ½Ð¸Ñ Ð´ÐµÑ€ÐµÐ²ÑŒÐµÐ² «%s» и «%s»" + +#: merge-recursive.c:1853 +#, c-format +msgid "Unprocessed path??? %s" +msgstr "Ðеобработанный путь??? %s" + +#: merge-recursive.c:1901 +msgid "Merging:" +msgstr "СлиÑние:" + +#: merge-recursive.c:1914 +#, c-format +msgid "found %u common ancestor:" +msgid_plural "found %u common ancestors:" +msgstr[0] "найден %u общий предок:" +msgstr[1] "найдено %u общих предка:" +msgstr[2] "найдено %u общих предков:" + +#: merge-recursive.c:1951 +msgid "merge returned no commit" +msgstr "ÑлиÑние не вернуло коммит" + +#: merge-recursive.c:2008 +#, c-format +msgid "Could not parse object '%s'" +msgstr "Ðе удалоÑÑŒ разобрать объект «%s»" + +#: merge-recursive.c:2019 builtin/merge.c:667 +msgid "Unable to write index." +msgstr "Ðе удаетÑÑ Ð·Ð°Ð¿Ð¸Ñать индекÑ." + +#: notes-utils.c:41 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð·Ð°ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¸Ñ‚ÑŒ неинициализированное или не имеющее ÑÑылок дерево заметок" + +#: notes-utils.c:82 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "Ðеправильное значение notes.rewriteMode: «%s»" + +#: notes-utils.c:92 +#, c-format +msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" +msgstr "Отказ в перезапиÑи заметок в %s (за пределами refs/notes/)" + +#. TRANSLATORS: The first %s is the name of the +#. environment variable, the second %s is its value +#: notes-utils.c:119 +#, c-format +msgid "Bad %s value: '%s'" +msgstr "Ðеправильное значение переменной %s: «%s»" + +#: object.c:241 +#, c-format +msgid "unable to parse object: %s" +msgstr "не удалоÑÑŒ разобрать объект: %s" + +#: parse-options.c:546 +msgid "..." +msgstr "…" + +#: 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:568 +#, c-format +msgid " or: %s" +msgstr " или: %s" + +#: parse-options.c:571 +#, c-format +msgid " %s" +msgstr " %s" + +#: parse-options.c:605 +msgid "-NUM" +msgstr "-КОЛИЧЕСТВО" + +#: pathspec.c:133 +msgid "global 'glob' and 'noglob' pathspec settings are incompatible" +msgstr "глобальные опции Ñпецификации пути «glob» и «noglob» Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно" + +#: pathspec.c:143 +msgid "" +"global 'literal' pathspec setting is incompatible with all other global " +"pathspec settings" +msgstr "Ð³Ð»Ð¾Ð±Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ Ñпецификации пути «literal» не ÑовмеÑтима Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð¸ глобальными Ñпецификаторами доÑтупа" + +#: pathspec.c:177 +msgid "invalid parameter for pathspec magic 'prefix'" +msgstr "неправильный параметр Ð´Ð»Ñ Ð¼Ð°Ð³Ð¸Ñ‡ÐµÑкого Ñлова «prefix» в Ñпецификации пути " + +#: pathspec.c:183 +#, c-format +msgid "Invalid pathspec magic '%.*s' in '%s'" +msgstr "неправильное магичеÑкое Ñлово «%.*s» в Ñпецификации пути «%s»" + +#: pathspec.c:187 +#, c-format +msgid "Missing ')' at the end of pathspec magic in '%s'" +msgstr "Пропущено «)» в конце магичеÑкого Ñлова Ñпецификации пути «%s»" + +#: pathspec.c:205 +#, c-format +msgid "Unimplemented pathspec magic '%c' in '%s'" +msgstr "Ðереализованное магичеÑкое Ñлово «%c» Ñпецификации пути «%s»" + +#: pathspec.c:230 +#, c-format +msgid "%s: 'literal' and 'glob' are incompatible" +msgstr "%s: «literal» и «glob» не ÑовмеÑтимы" + +#: pathspec.c:241 +#, c-format +msgid "%s: '%s' is outside repository" +msgstr "%s: «%s» вне репозиториÑ" + +#: pathspec.c:291 +#, c-format +msgid "Pathspec '%s' is in submodule '%.*s'" +msgstr "Ð¡Ð¿ÐµÑ†Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ Ð¿ÑƒÑ‚Ð¸ «%s» в подмодуле «%.*s»" + +#: pathspec.c:353 +#, c-format +msgid "%s: pathspec magic not supported by this command: %s" +msgstr "%s: магичеÑкие Ñлова в Ñпецификации пути не поддерживаютÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹: %s" + +#: pathspec.c:432 +#, c-format +msgid "pathspec '%s' is beyond a symbolic link" +msgstr "ÑÐ¿ÐµÑ†Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ Ð¿ÑƒÑ‚Ð¸ «%s» находитÑÑ Ð·Ð° ÑимволичеÑкой ÑÑылкой" + +#: pathspec.c:441 +msgid "" +"There is nothing to exclude from by :(exclude) patterns.\n" +"Perhaps you forgot to add either ':/' or '.' ?" +msgstr "Ðе указан шаблон Ð´Ð»Ñ Ð¸ÑÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ :(exclude).\nВозможно, вы забыли «:/» или «.» ?" + +#: pretty.c:968 +msgid "unable to parse --pretty format" +msgstr "не удалоÑÑŒ разобрать формат Ð´Ð»Ñ --pretty" + +#: progress.c:225 +msgid "done" +msgstr "готово" + +#: read-cache.c:1275 +#, c-format +msgid "" +"index.version set, but the value is invalid.\n" +"Using version %i" +msgstr "index.version указан, но значение недейÑтвительное.\nИÑпользую верÑию %i" + +#: read-cache.c:1285 +#, c-format +msgid "" +"GIT_INDEX_VERSION set, but the value is invalid.\n" +"Using version %i" +msgstr "GIT_INDEX_VERSION указан, но значение недейÑтвительное.\nИÑпользую верÑию %i" + +#: remote.c:782 +#, c-format +msgid "Cannot fetch both %s and %s to %s" +msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¸Ð·Ð²Ð»ÐµÑ‡ÑŒ одновременно %s и %s в %s" + +#: remote.c:786 +#, c-format +msgid "%s usually tracks %s, not %s" +msgstr "%s обычно отÑлеживает %s, а не %s" + +#: remote.c:790 +#, c-format +msgid "%s tracks both %s and %s" +msgstr "%s отÑлеживает и %s и %s" + +#: remote.c:798 +msgid "Internal error" +msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°" + +#: remote.c:1980 +#, c-format +msgid "Your branch is based on '%s', but the upstream is gone.\n" +msgstr "Ваша ветка базируетÑÑ Ð½Ð° «%s», но вышеÑтоÑщий репозиторий иÑчез.\n" + +#: remote.c:1984 +msgid " (use \"git branch --unset-upstream\" to fixup)\n" +msgstr "(Ð´Ð»Ñ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð·Ð°Ð¿ÑƒÑтите «git branch --unset-upstream»)\n" + +#: remote.c:1987 +#, c-format +msgid "Your branch is up-to-date with '%s'.\n" +msgstr "Ваша ветка обновлена в ÑоответÑтвии Ñ Â«%s».\n" + +#: remote.c:1991 +#, c-format +msgid "Your branch is ahead of '%s' by %d commit.\n" +msgid_plural "Your branch is ahead of '%s' by %d commits.\n" +msgstr[0] "Ваша ветка опережает «%s» на %d коммит.\n" +msgstr[1] "Ваша ветка опережает «%s» на %d коммита.\n" +msgstr[2] "Ваша ветка опережает «%s» на %d коммитов.\n" + +#: remote.c:1997 +msgid " (use \"git push\" to publish your local commits)\n" +msgstr " (иÑпользуйте «git push», чтобы опубликовать ваши локальные коммиты)\n" + +#: remote.c:2000 +#, c-format +msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" +msgid_plural "" +"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" +msgstr[0] "Ваша ветка отÑтает от «%s» на %d коммит и может быть перемотана вперед.\n" +msgstr[1] "Ваша ветка отÑтает от «%s» на %d коммита и может быть перемотана вперед.\n" +msgstr[2] "Ваша ветка отÑтает от «%s» на %d коммитов и может быть перемотана вперед.\n" + +#: remote.c:2008 +msgid " (use \"git pull\" to update your local branch)\n" +msgstr " (иÑпользуйте «git pull», чтобы обновить вашу локальную ветку)\n" + +#: remote.c:2011 +#, c-format +msgid "" +"Your branch and '%s' have diverged,\n" +"and have %d and %d different commit each, respectively.\n" +msgid_plural "" +"Your branch and '%s' have diverged,\n" +"and have %d and %d different commits each, respectively.\n" +msgstr[0] "Ваша ветка и «%s» разошлиÑÑŒ\nи теперь имеют %d и %d разный коммит в каждой ÑоответÑтвенно.\n" +msgstr[1] "Ваша ветка и «%s» разошлиÑÑŒ\nи теперь имеют %d и %d разных коммита в каждой ÑоответÑтвенно.\n" +msgstr[2] "Ваша ветка и «%s» разошлиÑÑŒ\nи теперь имеют %d и %d разных коммитов в каждой ÑоответÑтвенно.\n" + +#: remote.c:2021 +msgid " (use \"git pull\" to merge the remote branch into yours)\n" +msgstr " (иÑпользуйте «git pull», чтобы Ñлить внешнюю ветку в вашу)\n" + +#: revision.c:2348 +msgid "--first-parent is incompatible with --bisect" +msgstr "опцию --first-parent Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ --bisect" + +#: run-command.c:83 +msgid "open /dev/null failed" +msgstr "Ñбой Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ /dev/null" + +#: run-command.c:85 +#, c-format +msgid "dup2(%d,%d) failed" +msgstr "dup2(%d,%d) Ñбой" + +#: send-pack.c:272 +msgid "failed to sign the push certificate" +msgstr "Ñбой подпиÑÐ°Ð½Ð¸Ñ Ñертификата отправки" + +#: send-pack.c:356 +msgid "the receiving end does not support --signed push" +msgstr "Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°ÑŽÑ‰Ð°Ñ Ñторона не поддерживает отправку Ñ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹ --signed" + +#: send-pack.c:366 +msgid "the receiving end does not support --atomic push" +msgstr "Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°ÑŽÑ‰Ð°Ñ Ñторона не поддерживает отправку Ñ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹ --atomic" + +#: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995 +#: builtin/merge.c:1005 +#, c-format +msgid "Could not open '%s' for writing" +msgstr "Ðе удалоÑÑŒ открыть «%s» Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи" + +#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997 +#: builtin/merge.c:1010 +#, c-format +msgid "Could not write to '%s'" +msgstr "Ðе удалоÑÑŒ запиÑать в «%s»" + +#: sequencer.c:195 +msgid "" +"after resolving the conflicts, mark the corrected paths\n" +"with 'git add <paths>' or 'git rm <paths>'" +msgstr "поÑле Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚Ð¾Ð², пометьте иÑправленные пути\nÑ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «git add <пути>» или «git rm <пути>»" + +#: sequencer.c: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 "поÑле Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚Ð¾Ð², пометьте иÑправленные пути\nÑ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «git add <пути>» или «git rm <пути>»\nи Ñделайте коммит Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «git commit»" + +#: sequencer.c:211 sequencer.c:861 sequencer.c:944 +#, c-format +msgid "Could not write to %s" +msgstr "Ðе удалоÑÑŒ запиÑать в %s" + +#: sequencer.c:214 +#, c-format +msgid "Error wrapping up %s" +msgstr "Ошибка Ð¾Ð±Ð¾Ñ€Ð°Ñ‡Ð¸Ð²Ð°Ð½Ð¸Ñ %s" + +#: sequencer.c:229 +msgid "Your local changes would be overwritten by cherry-pick." +msgstr "Ваши локальные изменение будут перезапиÑаны отбором лучшего." + +#: sequencer.c:231 +msgid "Your local changes would be overwritten by revert." +msgstr "Ваши локальные изменение будут перезапиÑаны возвратом коммита." + +#: sequencer.c:234 +msgid "Commit your changes or stash them to proceed." +msgstr "Сделайте коммит или ÑпрÑчьте ваши Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ." + +#. TRANSLATORS: %s will be "revert" or "cherry-pick" +#: sequencer.c:321 +#, c-format +msgid "%s: Unable to write new index file" +msgstr "%s: Ðе удалоÑÑŒ запиÑать файл индекÑа" + +#: sequencer.c:339 +msgid "Could not resolve HEAD commit\n" +msgstr "Ðе удалоÑÑŒ определить HEAD коммит\n" + +#: sequencer.c:359 +msgid "Unable to update cache tree\n" +msgstr "Ðе удалоÑÑŒ обновить дерево кÑша\n" + +#: sequencer.c:411 +#, c-format +msgid "Could not parse commit %s\n" +msgstr "Ðе удалоÑÑŒ разобрать коммит %s\n" + +#: sequencer.c:416 +#, c-format +msgid "Could not parse parent commit %s\n" +msgstr "Ðе удалоÑÑŒ разобрать родительÑкую коммит %s\n" + +#: sequencer.c:482 +msgid "Your index file is unmerged." +msgstr "Ваш файл индекÑа не Ñлит." + +#: sequencer.c:501 +#, c-format +msgid "Commit %s is a merge but no -m option was given." +msgstr "Коммит %s — Ñто коммит-ÑлиÑние, но Ð¾Ð¿Ñ†Ð¸Ñ -m не указана." + +#: sequencer.c:509 +#, c-format +msgid "Commit %s does not have parent %d" +msgstr "У коммита %s нет предка %d" + +#: sequencer.c:513 +#, 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:526 +#, c-format +msgid "%s: cannot parse parent commit %s" +msgstr "%s: не удалоÑÑŒ разобрать родительÑкий коммит Ð´Ð»Ñ %s" + +#: sequencer.c:530 +#, c-format +msgid "Cannot get commit message for %s" +msgstr "Ðе удалоÑÑŒ получить Ñообщение коммита Ð´Ð»Ñ %s" + +#: sequencer.c:616 +#, c-format +msgid "could not revert %s... %s" +msgstr "не удалоÑÑŒ возвратить коммит %s… %s" + +#: sequencer.c:617 +#, c-format +msgid "could not apply %s... %s" +msgstr "не удалоÑÑŒ применить коммит %s… %s" + +#: sequencer.c:653 +msgid "empty commit set passed" +msgstr "передан пуÑтой набор коммитов" + +#: sequencer.c:661 +#, c-format +msgid "git %s: failed to read the index" +msgstr "git %s: Ñбой Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¸Ð½Ð´ÐµÐºÑа" + +#: sequencer.c:665 +#, c-format +msgid "git %s: failed to refresh the index" +msgstr "git %s: Ñбой Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸Ð½Ð´ÐµÐºÑа" + +#: sequencer.c:725 +#, c-format +msgid "Cannot %s during a %s" +msgstr "Ðе удалоÑÑŒ %s во Ð²Ñ€ÐµÐ¼Ñ %s" + +#: sequencer.c:747 +#, c-format +msgid "Could not parse line %d." +msgstr "Ðе удалоÑÑŒ разобрать Ñтроку %d." + +#: sequencer.c:752 +msgid "No commits parsed." +msgstr "Коммиты не разобраны." + +#: sequencer.c:765 +#, c-format +msgid "Could not open %s" +msgstr "Ðе удалоÑÑŒ открыть %s" + +#: sequencer.c:769 +#, c-format +msgid "Could not read %s." +msgstr "Ðе удалоÑÑŒ прочитать %s." + +#: sequencer.c:776 +#, c-format +msgid "Unusable instruction sheet: %s" +msgstr "ÐÐµÐ¿Ñ€Ð¸Ð³Ð¾Ð´Ð½Ð°Ñ Ð´Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ ÐºÐ°Ñ€Ñ‚Ð° Ñ Ð¸Ð½ÑтрукциÑми: %s" + +#: sequencer.c:806 +#, c-format +msgid "Invalid key: %s" +msgstr "ÐедейÑтвительный ключ: %s" + +#: sequencer.c:809 +#, c-format +msgid "Invalid value for %s: %s" +msgstr "Ðеправильное значение %s: %s" + +#: sequencer.c:821 +#, c-format +msgid "Malformed options sheet: %s" +msgstr "ИÑÐ¿Ð¾Ñ€Ñ‡ÐµÐ½Ð½Ð°Ñ ÐºÐ°Ñ€Ñ‚Ð° Ñ Ð¾Ð¿Ñ†Ð¸Ñми: %s" + +#: sequencer.c:842 +msgid "a cherry-pick or revert is already in progress" +msgstr "отбор лучшего или возврат коммита уже выполнÑетÑÑ" + +#: sequencer.c:843 +msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" +msgstr "попробуйте «git cherry-pick (--continue | --quit | --abort)»" + +#: sequencer.c:847 +#, c-format +msgid "Could not create sequencer directory %s" +msgstr "Ðе удалоÑÑŒ Ñоздать каталог Ð´Ð»Ñ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ ÑÐ»ÐµÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¾Ð² %s" + +#: sequencer.c:863 sequencer.c:948 +#, c-format +msgid "Error wrapping up %s." +msgstr "Ошибка Ð¾Ð±Ð¾Ñ€Ð°Ñ‡Ð¸Ð²Ð°Ð½Ð¸Ñ %s." + +#: sequencer.c:882 sequencer.c:1018 +msgid "no cherry-pick or revert in progress" +msgstr "отбор лучшего или возврат коммита не выполнÑетÑÑ" + +#: sequencer.c:884 +msgid "cannot resolve HEAD" +msgstr "не удалоÑÑŒ определить HEAD" + +#: sequencer.c:886 +msgid "cannot abort from a branch yet to be born" +msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¾Ñ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ Ð²ÐµÑ‚ÐºÐ¸, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ ÐµÑ‰Ðµ не Ñоздана" + +#: sequencer.c:908 builtin/apply.c:4288 +#, c-format +msgid "cannot open %s: %s" +msgstr "не удалоÑÑŒ открыть %s: %s" + +#: sequencer.c:911 +#, c-format +msgid "cannot read %s: %s" +msgstr "не удалоÑÑŒ прочитать %s: %s" + +#: sequencer.c:912 +msgid "unexpected end of file" +msgstr "неожиданный конец файла" + +#: sequencer.c:918 +#, c-format +msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" +msgstr "Ñохраненный файл Ñ HEAD перед отбором лучшего «%s» поврежден" + +#: sequencer.c:941 +#, c-format +msgid "Could not format %s." +msgstr "Ðе удалоÑÑŒ отформатировать %s." + +#: sequencer.c:1086 +#, c-format +msgid "%s: can't cherry-pick a %s" +msgstr "%s: не удалоÑÑŒ отобрать %s" + +#: sequencer.c:1089 +#, c-format +msgid "%s: bad revision" +msgstr "%s: Ð¿Ð»Ð¾Ñ…Ð°Ñ Ñ€ÐµÐ´Ð°ÐºÑ†Ð¸Ñ" + +#: sequencer.c:1123 +msgid "Can't revert as initial commit" +msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‚Ð¸Ñ‚ÑŒ изначальный коммит" + +#: sequencer.c:1124 +msgid "Can't cherry-pick into empty head" +msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ñ‚ÑŒ лучшее в пуÑтой HEAD" + +#: 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" +"may be created by mistake. For example,\n" +"\n" +" git checkout -b $br $(git rev-parse ...)\n" +"\n" +"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" +"examine these refs and maybe delete them. Turn this message off by\n" +"running \"git config advice.objectNameWarning false\"" +msgstr "Обычно Git не Ñоздает ÑÑылки, оканчивающиеÑÑ Ð½Ð° 40 шеÑтнадцатеричных\nÑимволов, потому, что они будут игнорироватьÑÑ, когда вы проÑто\nукажете Ñто 40-Ñимвольное шеÑтнадцатеричное чиÑло. Такие ÑÑылки\nмогли быть Ñозданы по ошибке. Ðапример, Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ:\n\n git checkout -b $br $(git rev-parse …)\n\n, еÑли «$br» оказалÑÑ Ð¿ÑƒÑтым, то ÑÑылка Ñ 40-Ñимвольным\nшеÑтнадцатеричным чиÑлом будет Ñоздана. ПожалуйÑта, проÑмотрите Ñти\nÑÑылки и, возможно, удалите их. Ð’Ñ‹ можете отключить Ñто Ñообщение\nзапуÑтив «git config advice.objectNameWarning false»" + +#: sha1_name.c:1068 +msgid "HEAD does not point to a branch" +msgstr "HEAD не указывает на ветку" + +#: sha1_name.c:1071 +#, c-format +msgid "No such branch: '%s'" +msgstr "Ðет такой ветки: «%s»" + +#: sha1_name.c:1073 +#, c-format +msgid "No upstream configured for branch '%s'" +msgstr "ВышеÑтоÑщий репозиторий не наÑтроен Ð´Ð»Ñ Ð²ÐµÑ‚ÐºÐ¸ «%s»" + +#: sha1_name.c:1077 +#, c-format +msgid "Upstream branch '%s' not stored as a remote-tracking branch" +msgstr "ВышеÑтоÑÑ‰Ð°Ñ Ð²ÐµÑ‚ÐºÐ° «%s» не Ñохранена как отÑÐ»ÐµÐ¶Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ Ð²ÐµÑ‚ÐºÐ°" + +#: submodule.c:64 submodule.c:98 +msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" +msgstr "Ðе удалоÑÑŒ изменить не Ñлитый .gitmodules, Ñначала разрешите конфликты" + +#: submodule.c:68 submodule.c:102 +#, c-format +msgid "Could not find section in .gitmodules where path=%s" +msgstr "Ðе удалоÑÑŒ найти раздел в .gitmodules, где путь равен %s" + +#: submodule.c:76 +#, c-format +msgid "Could not update .gitmodules entry %s" +msgstr " Ðе удалоÑÑŒ обновить .gitmodules запиÑÑŒ %s" + +#: submodule.c:109 +#, c-format +msgid "Could not remove .gitmodules entry for %s" +msgstr "Ðе удалоÑÑŒ удалить запиÑÑŒ в .gitmodules Ð´Ð»Ñ %s" + +#: submodule.c:120 +msgid "staging updated .gitmodules failed" +msgstr "Ñбой индекÑÐ¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð¾Ð³Ð¾ .gitmodules" + +#: submodule.c:1109 builtin/init-db.c:371 +#, c-format +msgid "Could not create git link %s" +msgstr "Ðе удалоÑÑŒ Ñоздать git ÑÑылку %s" + +#: submodule.c:1120 +#, c-format +msgid "Could not set core.worktree in %s" +msgstr "Ðе удалоÑÑŒ уÑтановить core.worktree в %s" + +#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557 +#: trailer.c:561 +#, c-format +msgid "unknown value '%s' for key '%s'" +msgstr "неизвеÑтное значение «%s» Ð´Ð»Ñ ÐºÐ»ÑŽÑ‡Ð° «%s»" + +#: trailer.c:543 trailer.c:548 builtin/remote.c:290 +#, c-format +msgid "more than one %s" +msgstr "больше одного %s" + +#: trailer.c:581 +#, c-format +msgid "empty trailer token in trailer '%.*s'" +msgstr "пуÑÑ‚Ð°Ñ Ð¿Ð¾ÑледнÑÑ Ð»ÐµÐºÑема в завершителе «%.*s»" + +#: trailer.c:701 +#, c-format +msgid "could not read input file '%s'" +msgstr "не удалоÑÑŒ прочитать входной файл «%s»" + +#: trailer.c:704 +msgid "could not read from stdin" +msgstr "не удалоÑÑŒ прочитать из Ñтандартного ввода" + +#: unpack-trees.c:202 +msgid "Checking out files" +msgstr "РаÑпаковка файлов" + +#: urlmatch.c:120 +msgid "invalid URL scheme name or missing '://' suffix" +msgstr "ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ð¸Ð¼Ñ URL Ñхемы или пропущен ÑÑƒÑ„Ñ„Ð¸ÐºÑ Â«://»" + +#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 +#, c-format +msgid "invalid %XX escape sequence" +msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ ÑƒÐ¿Ñ€Ð°Ð²Ð»ÑÑŽÑ‰Ð°Ñ Ð¿Ð¾ÑледовательноÑÑ‚ÑŒ %XX" + +#: urlmatch.c:172 +msgid "missing host and scheme is not 'file:'" +msgstr "пропущено Ð¸Ð¼Ñ Ñервера и Ñхема доÑтупа не «file:»" + +#: urlmatch.c:189 +msgid "a 'file:' URL may not have a port number" +msgstr "URL Ñо Ñхемой «file:» не может Ñодержать номер порта" + +#: urlmatch.c:199 +msgid "invalid characters in host name" +msgstr "неправильные Ñимволы в имени Ñервера" + +#: urlmatch.c:244 urlmatch.c:255 +msgid "invalid port number" +msgstr "неправильный номер порта" + +#: urlmatch.c:322 +msgid "invalid '..' path segment" +msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ñ‡Ð°ÑÑ‚ÑŒ пути «..»" + +#: wrapper.c:523 +#, c-format +msgid "unable to access '%s': %s" +msgstr "«%s» недоÑтупно: %s" + +#: wrapper.c:544 +#, c-format +msgid "unable to access '%s'" +msgstr "«%s» недоÑтупно" + +#: wrapper.c:555 +#, c-format +msgid "unable to look up current user in the passwd file: %s" +msgstr "не удалоÑÑŒ запроÑить текущего Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð² файле passwd: %s" + +#: wrapper.c:556 +msgid "no such user" +msgstr "нет такого пользователÑ" + +#: wrapper.c:564 +msgid "unable to get current working directory" +msgstr "не удалоÑÑŒ получить текущий рабочий каталог" + +#: wt-status.c:150 +msgid "Unmerged paths:" +msgstr "Ðе Ñлитые пути:" + +#: wt-status.c:177 wt-status.c:204 +#, c-format +msgid " (use \"git reset %s <file>...\" to unstage)" +msgstr " (иÑпользуйте «git reset %s <файл>…», чтобы убрать из индекÑа)" + +#: wt-status.c:179 wt-status.c:206 +msgid " (use \"git rm --cached <file>...\" to unstage)" +msgstr " (иÑпользуйте «git rm --cached <файл>…», чтобы убрать из индекÑа)" + +#: wt-status.c:183 +msgid " (use \"git add <file>...\" to mark resolution)" +msgstr " (иÑпользуйте «git add <файл>…», чтобы пометить разрешение конфликта)" + +#: wt-status.c:185 wt-status.c:189 +msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" +msgstr " (иÑпользуйте «git add/rm <файл>…», чтобы пометить выбранное разрешение конфликта)" + +#: wt-status.c:187 +msgid " (use \"git rm <file>...\" to mark resolution)" +msgstr " (иÑпользуйте «git rm <файл>…», чтобы пометить разрешение конфликта)" + +#: wt-status.c:198 wt-status.c:878 +msgid "Changes to be committed:" +msgstr "ИзменениÑ, которые будут включены в коммит:" + +#: wt-status.c:216 wt-status.c:887 +msgid "Changes not staged for commit:" +msgstr "ИзменениÑ, которые не в индекÑе Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°:" + +#: wt-status.c:220 +msgid " (use \"git add <file>...\" to update what will be committed)" +msgstr " (иÑпользуйте «git add <файл>…», чтобы добавить файл в индекÑ)" + +#: wt-status.c:222 +msgid " (use \"git add/rm <file>...\" to update what will be committed)" +msgstr " (иÑпользуйте «git add/rm <файл>…», чтобы добавить или удалить файл из индекÑа)" + +#: wt-status.c:223 +msgid "" +" (use \"git checkout -- <file>...\" to discard changes in working " +"directory)" +msgstr " (иÑпользуйте «git checkout -- <файл>…», чтобы отменить изменениÑ\n в рабочем каталоге)" + +#: wt-status.c:225 +msgid " (commit or discard the untracked or modified content in submodules)" +msgstr " (Ñделайте коммит или отмените Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² неотÑлеживаемом или измененном Ñодержимом в подмодулÑÑ…)" + +#: wt-status.c:237 +#, c-format +msgid " (use \"git %s <file>...\" to include in what will be committed)" +msgstr " (иÑпользуйте «git %s <файл>…», чтобы добавить в то, что будет включено в коммит)" + +#: wt-status.c:252 +msgid "both deleted:" +msgstr "оба удалены:" + +#: wt-status.c:254 +msgid "added by us:" +msgstr "добавлено нами:" + +#: wt-status.c:256 +msgid "deleted by them:" +msgstr "удалено ими:" + +#: wt-status.c:258 +msgid "added by them:" +msgstr "добавлено ими:" + +#: wt-status.c:260 +msgid "deleted by us:" +msgstr "удалено нами:" + +#: wt-status.c:262 +msgid "both added:" +msgstr "оба добавлены:" + +#: wt-status.c:264 +msgid "both modified:" +msgstr "оба измены:" + +#: wt-status.c:266 +#, c-format +msgid "bug: unhandled unmerged status %x" +msgstr "ошибка: необработанный ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ðµ Ñлитых изменений %x" + +#: wt-status.c:274 +msgid "new file:" +msgstr "новый файл:" + +#: wt-status.c:276 +msgid "copied:" +msgstr "Ñкопировано:" + +#: wt-status.c:278 +msgid "deleted:" +msgstr "удалено:" + +#: wt-status.c:280 +msgid "modified:" +msgstr "изменено:" + +#: wt-status.c:282 +msgid "renamed:" +msgstr "переименовано:" + +#: wt-status.c:284 +msgid "typechange:" +msgstr "изменен тип:" + +#: wt-status.c:286 +msgid "unknown:" +msgstr "неизвеÑтно:" + +#: wt-status.c:288 +msgid "unmerged:" +msgstr "не Ñлитые:" + +#: wt-status.c:370 +msgid "new commits, " +msgstr "новые коммиты, " + +#: wt-status.c:372 +msgid "modified content, " +msgstr "изменено Ñодержимое, " + +#: wt-status.c:374 +msgid "untracked content, " +msgstr "неотÑлеживаемое Ñодержимое, " + +#: wt-status.c:391 +#, c-format +msgid "bug: unhandled diff status %c" +msgstr "ошибка: необработанный ÑÑ‚Ð°Ñ‚ÑƒÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ %c" + +#: wt-status.c:753 +msgid "Submodules changed but not updated:" +msgstr "Измененные, но не обновленные подмодули:" + +#: wt-status.c:755 +msgid "Submodule changes to be committed:" +msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² подмодулÑÑ…, которые будут закоммичены:" + +#: wt-status.c:835 +msgid "" +"Do not touch the line above.\n" +"Everything below will be removed." +msgstr "Ðе трогайте Ñтроку выше Ñтой.\nÐ’ÑÑ‘, что ниже — будет удалено." + +#: wt-status.c:946 +msgid "You have unmerged paths." +msgstr "У Ð²Ð°Ñ ÐµÑÑ‚ÑŒ не Ñлитые пути." + +#: wt-status.c:949 +msgid " (fix conflicts and run \"git commit\")" +msgstr " (разрешите конфликты, затем запуÑтите «git commit»)" + +#: wt-status.c:952 +msgid "All conflicts fixed but you are still merging." +msgstr "Ð’Ñе конфликты иÑправлены, но вы вÑе еще в процеÑÑе ÑлиÑниÑ." + +#: wt-status.c:955 +msgid " (use \"git commit\" to conclude merge)" +msgstr " (иÑпользуйте «git commit», чтобы завершить ÑлиÑние)" + +#: wt-status.c:965 +msgid "You are in the middle of an am session." +msgstr "Ð’Ñ‹ в процеÑÑе ÑеÑÑии am." + +#: wt-status.c:968 +msgid "The current patch is empty." +msgstr "Текущий патч пуÑтой." + +#: wt-status.c:972 +msgid " (fix conflicts and then run \"git am --continue\")" +msgstr " (разрешите конфликты, затем запуÑтите «git am --continue»)" + +#: wt-status.c:974 +msgid " (use \"git am --skip\" to skip this patch)" +msgstr " (иÑпользуйте «git am --skip», чтобы пропуÑтить Ñтот патч)" + +#: wt-status.c:976 +msgid " (use \"git am --abort\" to restore the original branch)" +msgstr " (иÑпользуйте «git am --abort», чтобы воÑÑтановить оригинальную ветку)" + +#: wt-status.c:1036 wt-status.c:1053 +#, c-format +msgid "You are currently rebasing branch '%s' on '%s'." +msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰Ð°ÐµÑ‚Ðµ ветку «%s» над «%s»." + +#: wt-status.c:1041 wt-status.c:1058 +msgid "You are currently rebasing." +msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰Ð°ÐµÑ‚Ðµ ветку." + +#: wt-status.c:1044 +msgid " (fix conflicts and then run \"git rebase --continue\")" +msgstr " (разрешите конфликты, затем запуÑтите «git rebase --continue»)" + +#: wt-status.c:1046 +msgid " (use \"git rebase --skip\" to skip this patch)" +msgstr " (иÑпользуйте «git rebase --skip», чтобы пропуÑтить Ñтот патч)" + +#: wt-status.c:1048 +msgid " (use \"git rebase --abort\" to check out the original branch)" +msgstr " (иÑпользуйте «git rebase --abort», чтобы перейти на оригинальную ветку)" + +#: wt-status.c:1061 +msgid " (all conflicts fixed: run \"git rebase --continue\")" +msgstr " (вÑе конфликты разрешены: запуÑтите «git rebase --continue»)" + +#: wt-status.c:1065 +#, c-format +msgid "" +"You are currently splitting a commit while rebasing branch '%s' on '%s'." +msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ñ€Ð°Ð·Ð´ÐµÐ»Ñете коммит при перемещении ветки «%s» над «%s»." + +#: wt-status.c:1070 +msgid "You are currently splitting a commit during a rebase." +msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ñ€Ð°Ð·Ð´ÐµÐ»Ñете коммит при перемещении ветки." + +#: wt-status.c:1073 +msgid " (Once your working directory is clean, run \"git rebase --continue\")" +msgstr "(Как только ваш рабочий каталог будет чиÑтый, запуÑтите «git rebase --continue»)" + +#: wt-status.c:1077 +#, c-format +msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." +msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€ÑƒÐµÑ‚Ðµ коммит при перемещении ветки «%s» над «%s»." + +#: wt-status.c:1082 +msgid "You are currently editing a commit during a rebase." +msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€ÑƒÐµÑ‚Ðµ коммит при перемещении ветки." + +#: wt-status.c:1085 +msgid " (use \"git commit --amend\" to amend the current commit)" +msgstr " (иÑпользуйте «git commit --amend», чтобы иÑправить текущий коммит)" + +#: wt-status.c:1087 +msgid " (use \"git rebase --continue\" once you are satisfied with your changes)" +msgstr " (иÑпользуйте «git rebase --continue», когда будете довольны изменениÑми)" + +#: wt-status.c:1097 +#, c-format +msgid "You are currently cherry-picking commit %s." +msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ð¾Ñ‚Ð±Ð¸Ñ€Ð°ÐµÑ‚Ðµ лучший коммит %s." + +#: wt-status.c:1102 +msgid " (fix conflicts and run \"git cherry-pick --continue\")" +msgstr " (разрешите конфликты, затем запуÑтите «git cherry-pick --continue»)" + +#: wt-status.c:1105 +msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" +msgstr " (вÑе конфликты разрешены: запуÑтите «git cherry-pick --continue»)" + +#: wt-status.c:1107 +msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" +msgstr " (иÑпользуйте «git cherry-pick --abort», чтобы отменить операцию отбора лучшего)" + +#: wt-status.c:1116 +#, c-format +msgid "You are currently reverting commit %s." +msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‰Ð°ÐµÑ‚Ðµ коммит %s." + +#: wt-status.c:1121 +msgid " (fix conflicts and run \"git revert --continue\")" +msgstr " (разрешите конфликты, затем запуÑтите «git revert --continue»)" + +#: wt-status.c:1124 +msgid " (all conflicts fixed: run \"git revert --continue\")" +msgstr " (вÑе конфликты разрешены: запуÑтите «git revert --continue»)" + +#: wt-status.c:1126 +msgid " (use \"git revert --abort\" to cancel the revert operation)" +msgstr " (иÑпользуйте «git revert --abort», чтобы отменить операцию возврата)" + +#: wt-status.c:1137 +#, c-format +msgid "You are currently bisecting, started from branch '%s'." +msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ð² процеÑÑе двоичного поиÑка, начатого Ñ Ð²ÐµÑ‚ÐºÐ¸ «%s»." + +#: wt-status.c:1141 +msgid "You are currently bisecting." +msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ð² процеÑÑе двоичного поиÑка." + +#: wt-status.c:1144 +msgid " (use \"git bisect reset\" to get back to the original branch)" +msgstr " (иÑпользуйте «git bisect reset», чтобы вернутьÑÑ Ð½Ð° иÑходную ветку)" + +#: wt-status.c:1321 +msgid "On branch " +msgstr "Ðа ветке " + +#: wt-status.c:1328 +msgid "rebase in progress; onto " +msgstr "перемещение в процеÑÑе; над " + +#: wt-status.c:1333 +msgid "HEAD detached at " +msgstr "HEAD отделен на " + +#: wt-status.c:1335 +msgid "HEAD detached from " +msgstr "HEAD отделен Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñ " + +#: wt-status.c:1338 +msgid "Not currently on any branch." +msgstr "Ð¡ÐµÐ¹Ñ‡Ð°Ñ Ð½Ð¸ на одной из веток" + +#: wt-status.c:1355 +msgid "Initial commit" +msgstr "Ðачальный коммит" + +#: wt-status.c:1369 +msgid "Untracked files" +msgstr "ÐеотÑлеживаемые файлы" + +#: wt-status.c:1371 +msgid "Ignored files" +msgstr "Игнорируемые файлы" + +#: wt-status.c:1375 +#, c-format +msgid "" +"It took %.2f seconds to enumerate untracked files. 'status -uno'\n" +"may speed it up, but you have to be careful not to forget to add\n" +"new files yourself (see 'git help status')." +msgstr "%.2f Ñекунды занÑл вывод ÑпиÑка неотÑлеживаемых файлов. «status -uno» возможно может уÑкорить Ñто, но будьте внимательны, и не забудьте добавить новые файлы вручную (Ñмотрите «git help status» Ð´Ð»Ñ Ð¿Ð¾Ð´Ñ€Ð¾Ð±Ð½Ð¾Ñтей)." + +#: wt-status.c:1381 +#, c-format +msgid "Untracked files not listed%s" +msgstr "ÐеотÑлеживаемые файлы не показаны%s" + +#: wt-status.c:1383 +msgid " (use -u option to show untracked files)" +msgstr "(иÑпользуйте опцию «-u», чтобы показать неотÑлеживаемые файлы)" + +#: wt-status.c:1389 +msgid "No changes" +msgstr "Ðет изменений" + +#: wt-status.c:1394 +#, c-format +msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" +msgstr "нет изменений добавленных Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°\n(иÑпользуйте «git add» и/или «git commit -a»)\n" + +#: wt-status.c:1397 +#, c-format +msgid "no changes added to commit\n" +msgstr "нет изменений добавленных Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°\n" + +#: wt-status.c:1400 +#, c-format +msgid "" +"nothing added to commit but untracked files present (use \"git add\" to " +"track)\n" +msgstr "ничего не добавлено в коммит, но еÑÑ‚ÑŒ неотÑлеживаемые файлы (иÑпользуйте \"git add\", чтобы отÑлеживать их)\n" + +#: wt-status.c:1403 +#, c-format +msgid "nothing added to commit but untracked files present\n" +msgstr "ничего не добавлено в коммит, но еÑÑ‚ÑŒ неотÑлеживаемые файлы\n" + +#: wt-status.c:1406 +#, c-format +msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" +msgstr "нечего коммитить (Ñоздайте/Ñкопируйте файлы, затем запуÑтите «git add», чтобы отÑлеживать их)\n" + +#: wt-status.c:1409 wt-status.c:1414 +#, c-format +msgid "nothing to commit\n" +msgstr "нечего коммитить\n" + +#: wt-status.c:1412 +#, c-format +msgid "nothing to commit (use -u to show untracked files)\n" +msgstr "нечего коммитить (иÑпользуйте опцию «-u», чтобы показать неотÑлеживаемые файлы)\n" + +#: wt-status.c:1416 +#, c-format +msgid "nothing to commit, working directory clean\n" +msgstr "нечего коммитить, нет изменений в рабочем каталоге\n" + +#: wt-status.c:1525 +msgid "HEAD (no branch)" +msgstr "HEAD (нет ветки)" + +#: wt-status.c:1531 +msgid "Initial commit on " +msgstr "Ðачальный коммит на " + +#: wt-status.c:1563 +msgid "gone" +msgstr "иÑчез" + +#: wt-status.c:1565 wt-status.c:1573 +msgid "behind " +msgstr "позади" + +#: compat/precompose_utf8.c:55 builtin/clone.c:360 +#, c-format +msgid "failed to unlink '%s'" +msgstr "Ñбой отÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Â«%s»" + +#: builtin/add.c:22 +msgid "git add [<options>] [--] <pathspec>..." +msgstr "git add [<опции>] [--] <ÑпецификациÑ-пути>…" + +#: builtin/add.c:65 +#, c-format +msgid "unexpected diff status %c" +msgstr "неожиданный ÑÑ‚Ð°Ñ‚ÑƒÑ Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð¸Ð¹ %c" + +#: builtin/add.c:70 builtin/commit.c:277 +msgid "updating files failed" +msgstr "Ñбой при обновлении файлов" + +#: builtin/add.c:80 +#, c-format +msgid "remove '%s'\n" +msgstr "удалить «%s»\n" + +#: builtin/add.c:134 +msgid "Unstaged changes after refreshing the index:" +msgstr "ÐепроиндекÑированные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñле Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸Ð½Ð´ÐµÐºÑа:" + +#: builtin/add.c:194 builtin/rev-parse.c:785 +msgid "Could not read the index" +msgstr "Ðе удалоÑÑŒ прочитать индекÑ" + +#: builtin/add.c:205 +#, c-format +msgid "Could not open '%s' for writing." +msgstr "Ðе удалоÑÑŒ открыть «%s» Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи." + +#: builtin/add.c:209 +msgid "Could not write patch" +msgstr "Ðе удалоÑÑŒ запиÑать патч" + +#: builtin/add.c:214 +#, c-format +msgid "Could not stat '%s'" +msgstr "Ðе удалоÑÑŒ выполнить stat Ð´Ð»Ñ Â«%s»" + +#: builtin/add.c:216 +msgid "Empty patch. Aborted." +msgstr "ПуÑтой патч. ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð¿Ñ€ÐµÑ€Ð²Ð°Ð½Ð°." + +#: builtin/add.c:221 +#, c-format +msgid "Could not apply '%s'" +msgstr "Ðе удалоÑÑŒ применить «%s»" + +#: builtin/add.c:231 +msgid "The following paths are ignored by one of your .gitignore files:\n" +msgstr "Следующие пути игнорируютÑÑ Ð¾Ð´Ð½Ð¸Ð¼ из ваших файлов .gitignore:\n" + +#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372 +#: builtin/rm.c:269 +msgid "dry run" +msgstr "пробный запуÑк" + +#: builtin/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19 +#: builtin/commit.c:1322 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 "быть многоÑловнее" + +#: builtin/add.c:251 +msgid "interactive picking" +msgstr "интерактивный выбор" + +#: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286 +msgid "select hunks interactively" +msgstr "интерактивный выбор блоков" + +#: builtin/add.c:253 +msgid "edit current diff and apply" +msgstr "отредактировать текущий файл различий и применить его" + +#: builtin/add.c:254 +msgid "allow adding otherwise ignored files" +msgstr "разрешить добавление игнорируемых иначе файлов" + +#: builtin/add.c:255 +msgid "update tracked files" +msgstr "обновить отÑлеживаемые файлы" + +#: builtin/add.c:256 +msgid "record only the fact that the path will be added later" +msgstr "запиÑать только факт, что путь будет добавлен позже" + +#: builtin/add.c:257 +msgid "add changes from all tracked and untracked files" +msgstr "добавить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸Ð· вÑех отÑлеживаемых и неотÑлеживаемых файлов" + +#: builtin/add.c:260 +msgid "ignore paths removed in the working tree (same as --no-all)" +msgstr "игнорировать пути удаленные из рабочего каталога (тоже, что и --no-all)" + +#: builtin/add.c:262 +msgid "don't add, only refresh the index" +msgstr "не добавлÑÑ‚ÑŒ, только обновить индекÑ" + +#: builtin/add.c:263 +msgid "just skip files which cannot be added because of errors" +msgstr "пропуÑкать файлы, которые не могут быть добавлены из-за ошибок" + +#: builtin/add.c:264 +msgid "check if - even missing - files are ignored in dry run" +msgstr "удоÑтоверитьÑÑ, что даже недоÑтающие файлы будут проигнорированы при пробном запуÑке" + +#: builtin/add.c:286 +#, c-format +msgid "Use -f if you really want to add them.\n" +msgstr "ИÑпользуйте -f, еÑли вы дейÑтвительно хотите добавить их.\n" + +#: builtin/add.c:293 +msgid "adding files failed" +msgstr "ошибка при добавлении файлов" + +#: builtin/add.c:329 +msgid "-A and -u are mutually incompatible" +msgstr "-A и -u Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно" + +#: builtin/add.c:336 +msgid "Option --ignore-missing can only be used together with --dry-run" +msgstr "ÐžÐ¿Ñ†Ð¸Ñ --ignore-missing может иÑпользоватьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ вмеÑте Ñ --dry-run" + +#: builtin/add.c:357 +#, c-format +msgid "Nothing specified, nothing added.\n" +msgstr "Ðичего не указано, ничего не добавлено.\n" + +#: builtin/add.c:358 +#, c-format +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:920 +#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 +msgid "index file corrupt" +msgstr "файл индекÑа поврежден" + +#: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431 +msgid "Unable to write new index file" +msgstr "Ðе удалоÑÑŒ запиÑать новый файл индекÑа" + +#: builtin/apply.c:59 +msgid "git apply [<options>] [<patch>...]" +msgstr "git apply [<опции>] [<патч>…]" + +#: builtin/apply.c:112 +#, c-format +msgid "unrecognized whitespace option '%s'" +msgstr "Ð½ÐµÐ¾Ð¿Ð¾Ð·Ð½Ð°Ð½Ð½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð±ÐµÐ»Ð¾Ð² «%s»" + +#: builtin/apply.c:127 +#, c-format +msgid "unrecognized whitespace ignore option '%s'" +msgstr "Ð½ÐµÐ¾Ð¿Ð¾Ð·Ð½Ð°Ð½Ð½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ Ð´Ð»Ñ Ð¸Ð³Ð½Ð¾Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ñ€Ð¾Ð±ÐµÐ»Ð¾Ð² «%s»" + +#: builtin/apply.c:822 +#, c-format +msgid "Cannot prepare timestamp regexp %s" +msgstr "Ðе удалоÑÑŒ подготовить регулÑрное выражение Ð´Ð»Ñ Ð¼ÐµÑ‚ÐºÐ¸ времени %s" + +#: builtin/apply.c:831 +#, c-format +msgid "regexec returned %d for input: %s" +msgstr "regexec возвратил %d Ð´Ð»Ñ Ð²Ð²Ð¾Ð´Ð°: %s" + +#: builtin/apply.c:912 +#, c-format +msgid "unable to find filename in patch at line %d" +msgstr "не удалоÑÑŒ найти Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° в Ñтроке патча %d" + +#: builtin/apply.c:944 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" +msgstr "git apply: плохой git-diff — ожидалоÑÑŒ /dev/null, получено %s на Ñтроке %d" + +#: builtin/apply.c:948 +#, c-format +msgid "git apply: bad git-diff - inconsistent new filename on line %d" +msgstr "git apply: плохой git-diff — не ÑоглаÑующееÑÑ Ð½Ð¾Ð²Ð¾Ðµ Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° на Ñтроке %d" + +#: builtin/apply.c:949 +#, c-format +msgid "git apply: bad git-diff - inconsistent old filename on line %d" +msgstr "git apply: плохой git-diff — не ÑоглаÑующееÑÑ Ñтарое Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° на Ñтроке %d" + +#: builtin/apply.c:956 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null on line %d" +msgstr "git apply: плохой git-diff — ожидалоÑÑŒ /dev/null на Ñтроке %d" + +#: builtin/apply.c:1419 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recount: не Ð¾Ð¶Ð¸Ð´Ð°ÐµÐ¼Ð°Ñ Ñтрока: %.*s" + +#: builtin/apply.c:1476 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "фрагмент изменений без заголовка на Ñтроке %d: %.*s" + +#: builtin/apply.c:1493 +#, c-format +msgid "" +"git diff header lacks filename information when removing %d leading pathname" +" component (line %d)" +msgid_plural "" +"git diff header lacks filename information when removing %d leading pathname" +" components (line %d)" +msgstr[0] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущего компонента пути к файлу (Ñтрока %d)" +msgstr[1] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (Ñтрока %d)" +msgstr[2] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (Ñтрока %d)" + +#: builtin/apply.c:1656 +msgid "new file depends on old contents" +msgstr "новый файл завиÑит от Ñтарого Ñодержимого" + +#: builtin/apply.c:1658 +msgid "deleted file still has contents" +msgstr "удаленный файл вÑе еще имеет Ñодержимое" + +#: builtin/apply.c:1684 +#, c-format +msgid "corrupt patch at line %d" +msgstr "патч поврежден на Ñтроке %d" + +#: builtin/apply.c:1720 +#, c-format +msgid "new file %s depends on old contents" +msgstr "новый файл %s завиÑит от Ñтарого Ñодержимого" + +#: builtin/apply.c:1722 +#, c-format +msgid "deleted file %s still has contents" +msgstr "удаленный файл %s вÑе еще имеет Ñодержимое" + +#: builtin/apply.c:1725 +#, c-format +msgid "** warning: file %s becomes empty but is not deleted" +msgstr "** предупреждение: файл %s ÑтановитÑÑ Ð¿ÑƒÑтым, но не удалÑетÑÑ" + +#: builtin/apply.c:1871 +#, c-format +msgid "corrupt binary patch at line %d: %.*s" +msgstr "поврежденный двоичный патч на Ñтроке %d: %.*s" + +#: builtin/apply.c:1900 +#, c-format +msgid "unrecognized binary patch at line %d" +msgstr "неопознанный двоичный патч на Ñтроке %d" + +#: builtin/apply.c:2051 +#, c-format +msgid "patch with only garbage at line %d" +msgstr "патч Ñ Ð¼ÑƒÑором на Ñтроке %d" + +#: builtin/apply.c:2141 +#, c-format +msgid "unable to read symlink %s" +msgstr "не удалоÑÑŒ прочитать Ñимвольную ÑÑылку %s" + +#: builtin/apply.c:2145 +#, c-format +msgid "unable to open or read %s" +msgstr "не удалоÑÑŒ открыть или прочеÑÑ‚ÑŒ %s" + +#: builtin/apply.c:2778 +#, c-format +msgid "invalid start of line: '%c'" +msgstr "неправильное начало Ñтроки: «%c»" + +#: builtin/apply.c:2897 +#, c-format +msgid "Hunk #%d succeeded at %d (offset %d line)." +msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." +msgstr[0] "ЧаÑÑ‚ÑŒ #%d уÑпешно применена на %d (Ñо Ñдвигом в %d Ñтроку)." +msgstr[1] "ЧаÑÑ‚ÑŒ #%d уÑпешно применена на %d (Ñо Ñдвигом в %d Ñтроки)." +msgstr[2] "ЧаÑÑ‚ÑŒ #%d уÑпешно применена на %d (Ñо Ñдвигом в %d Ñтрок)." + +#: builtin/apply.c:2909 +#, c-format +msgid "Context reduced to (%ld/%ld) to apply fragment at %d" +msgstr "КонтекÑÑ‚ Ñужен до (%ld/%ld), чтобы применить фрагмент на %d Ñтроке" + +#: builtin/apply.c:2915 +#, c-format +msgid "" +"while searching for:\n" +"%.*s" +msgstr "при поиÑке:\n%.*s" + +#: builtin/apply.c:2935 +#, c-format +msgid "missing binary patch data for '%s'" +msgstr "пропущены данные двоичного патча Ð´Ð»Ñ Â«%s»" + +#: builtin/apply.c:3036 +#, c-format +msgid "binary patch does not apply to '%s'" +msgstr "не удалоÑÑŒ применить двоичный патч к «%s»" + +#: builtin/apply.c:3042 +#, c-format +msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" +msgstr "поÑле Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð´Ð²Ð¾Ð¸Ñ‡Ð½Ð¾Ð³Ð¾ патча Ð´Ð»Ñ Â«%s» был получен неправильный результат (ожидалоÑÑŒ %s, получено %s)" + +#: builtin/apply.c:3063 +#, c-format +msgid "patch failed: %s:%ld" +msgstr "ошибка Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹: %s:%ld" + +#: builtin/apply.c:3187 +#, c-format +msgid "cannot checkout %s" +msgstr "не удалоÑÑŒ перейти на %s" + +#: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288 +#, c-format +msgid "read of %s failed" +msgstr "ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ %s" + +#: builtin/apply.c:3240 +#, c-format +msgid "reading from '%s' beyond a symbolic link" +msgstr "чтение из «%s» за ÑимволичеÑкой ÑÑылкой" + +#: builtin/apply.c:3268 builtin/apply.c:3490 +#, c-format +msgid "path %s has been renamed/deleted" +msgstr "путь %s был переименован/удален" + +#: builtin/apply.c:3349 builtin/apply.c:3504 +#, c-format +msgid "%s: does not exist in index" +msgstr "%s: нет в индекÑе" + +#: builtin/apply.c:3353 builtin/apply.c:3496 builtin/apply.c:3518 +#, c-format +msgid "%s: %s" +msgstr "%s: %s" + +#: builtin/apply.c:3358 builtin/apply.c:3512 +#, c-format +msgid "%s: does not match index" +msgstr "%s: не Ñовпадает Ñ Ð¸Ð½Ð´ÐµÐºÑом" + +#: builtin/apply.c:3460 +msgid "removal patch leaves file contents" +msgstr "патч ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð½Ðµ удалил Ñодержимое файла" + +#: builtin/apply.c:3529 +#, c-format +msgid "%s: wrong type" +msgstr "%s: неправильный тип" + +#: builtin/apply.c:3531 +#, c-format +msgid "%s has type %o, expected %o" +msgstr "%s имеет тип %o, а ожидалÑÑ %o" + +#: builtin/apply.c:3690 builtin/apply.c:3692 +#, c-format +msgid "invalid path '%s'" +msgstr "неправильный путь «%s»" + +#: builtin/apply.c:3747 +#, c-format +msgid "%s: already exists in index" +msgstr "%s: уже ÑодержитÑÑ Ð² индекÑе" + +#: builtin/apply.c:3750 +#, c-format +msgid "%s: already exists in working directory" +msgstr "%s: уже ÑодержитÑÑ Ð² рабочем каталоге" + +#: builtin/apply.c:3770 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o)" +msgstr "новый режим доÑтупа (%o) Ð´Ð»Ñ %s не ÑоответÑтвует Ñтарому режиму доÑтупа (%o)" + +#: builtin/apply.c:3775 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o) of %s" +msgstr "новый режим доÑтупа (%o) Ð´Ð»Ñ %s не ÑоответÑтвует Ñтарому режиму доÑтупа (%o) Ð´Ð»Ñ %s" + +#: builtin/apply.c:3795 +#, c-format +msgid "affected file '%s' is beyond a symbolic link" +msgstr "затронутый файл «%s» находитÑÑ Ð·Ð° ÑимволичеÑкой ÑÑылкой" + +#: builtin/apply.c:3799 +#, c-format +msgid "%s: patch does not apply" +msgstr "%s: не удалоÑÑŒ применить патч" + +#: builtin/apply.c:3813 +#, c-format +msgid "Checking patch %s..." +msgstr "Проверка патча %s…" + +#: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "Ñбой make_cache_entry Ð´Ð»Ñ Ð¿ÑƒÑ‚Ð¸ «%s»" + +#: builtin/apply.c:4049 +#, c-format +msgid "unable to remove %s from index" +msgstr "не удалоÑÑŒ удалить %s из индекÑа" + +#: builtin/apply.c:4078 +#, c-format +msgid "corrupt patch for submodule %s" +msgstr "поврежденный патч Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ %s" + +#: builtin/apply.c:4082 +#, c-format +msgid "unable to stat newly created file '%s'" +msgstr "не удалоÑÑŒ выполнить stat Ð´Ð»Ñ Ñозданного файла «%s»" + +#: builtin/apply.c:4087 +#, c-format +msgid "unable to create backing store for newly created file %s" +msgstr "не удалоÑÑŒ Ñоздать вÑпомогательный файл Ð´Ð»Ñ Ñозданного файла %s" + +#: builtin/apply.c:4090 builtin/apply.c:4198 +#, c-format +msgid "unable to add cache entry for %s" +msgstr "не удалоÑÑŒ Ñоздать запиÑÑŒ в кÑше Ð´Ð»Ñ %s" + +#: builtin/apply.c:4123 +#, c-format +msgid "closing file '%s'" +msgstr "закрытие файла «%s»" + +#: builtin/apply.c:4172 +#, c-format +msgid "unable to write file '%s' mode %o" +msgstr "не удалоÑÑŒ запиÑать файл «%s» Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ð¾Ð¼ доÑтупа %o" + +#: builtin/apply.c:4259 +#, c-format +msgid "Applied patch %s cleanly." +msgstr "Патч %s применен без ошибок." + +#: builtin/apply.c:4267 +msgid "internal error" +msgstr "внутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°" + +#: builtin/apply.c:4270 +#, c-format +msgid "Applying patch %%s with %d reject..." +msgid_plural "Applying patch %%s with %d rejects..." +msgstr[0] "Применение патча %%s Ñ %d отказом…" +msgstr[1] "Применение патча %%s Ñ %d отказами…" +msgstr[2] "Применение патча %%s Ñ %d отказами…" + +#: builtin/apply.c:4280 +#, c-format +msgid "truncating .rej filename to %.*s.rej" +msgstr "уÑечение имени .rej файла до %.*s.rej" + +#: builtin/apply.c:4301 +#, c-format +msgid "Hunk #%d applied cleanly." +msgstr "Блок â„–%d применен без ошибок." + +#: builtin/apply.c:4304 +#, c-format +msgid "Rejected hunk #%d." +msgstr "Блок â„–%d отклонен." + +#: builtin/apply.c:4394 +msgid "unrecognized input" +msgstr "не раÑпознанный ввод" + +#: builtin/apply.c:4405 +msgid "unable to read index file" +msgstr "не удалоÑÑŒ прочитать файл индекÑа" + +#: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92 +#: builtin/fetch.c:92 +msgid "path" +msgstr "путь" + +#: builtin/apply.c:4523 +msgid "don't apply changes matching the given path" +msgstr "не применÑÑ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð¾ указанному пути" + +#: builtin/apply.c:4526 +msgid "apply changes matching the given path" +msgstr "применÑÑ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð¾ указанному пути" + +#: builtin/apply.c:4528 +msgid "num" +msgstr "количеÑтво" + +#: builtin/apply.c:4529 +msgid "remove <num> leading slashes from traditional diff paths" +msgstr "удалить <количеÑтво> ведущих коÑÑ‹Ñ… черт из традиционных путей ÑпиÑка изменений" + +#: builtin/apply.c:4532 +msgid "ignore additions made by the patch" +msgstr "игнорировать добавлениÑ, Ñделанные Ñтим патчем" + +#: builtin/apply.c:4534 +msgid "instead of applying the patch, output diffstat for the input" +msgstr "вмеÑто Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ‚Ñ‡Ð° вывеÑти ÑтатиÑтику добавлений и удалений Ð´Ð»Ñ Ð²Ð²Ð¾Ð´Ð°" + +#: builtin/apply.c:4538 +msgid "show number of added and deleted lines in decimal notation" +msgstr "показать количеÑтво добавленных и удаленных Ñтрок в деÑÑтичном предÑтавлении" + +#: builtin/apply.c:4540 +msgid "instead of applying the patch, output a summary for the input" +msgstr "вмеÑто Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ‚Ñ‡Ð° вывеÑти ÑтатиÑтику изменений Ð´Ð»Ñ Ð²Ð²Ð¾Ð´Ð°" + +#: builtin/apply.c:4542 +msgid "instead of applying the patch, see if the patch is applicable" +msgstr "вмеÑто Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ‚Ñ‡Ð° проверить подходит ли он" + +#: builtin/apply.c:4544 +msgid "make sure the patch is applicable to the current index" +msgstr "проверить, что патч применÑетÑÑ Ðº текущему индекÑу" + +#: builtin/apply.c:4546 +msgid "apply a patch without touching the working tree" +msgstr "применить патч, не изменÑÑ Ñ€Ð°Ð±Ð¾Ñ‡Ð¸Ð¹ каталог" + +#: builtin/apply.c:4548 +msgid "accept a patch that touches outside the working area" +msgstr "принÑÑ‚ÑŒ патч, который затрагивает файлы за рабочим каталогом" + +#: builtin/apply.c:4550 +msgid "also apply the patch (use with --stat/--summary/--check)" +msgstr "а также применить патч (иÑпользуйте Ñ --stat/--summary/--check)" + +#: builtin/apply.c:4552 +msgid "attempt three-way merge if a patch does not apply" +msgstr "попытатьÑÑ Ñделать трехходовое ÑлиÑние, еÑли патч не применÑетÑÑ" + +#: builtin/apply.c:4554 +msgid "build a temporary index based on embedded index information" +msgstr "поÑтроить временный индекÑ, оÑнованный на вÑтроенной информации об индекÑе" + +#: builtin/apply.c:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412 +msgid "paths are separated with NUL character" +msgstr "пути, отделенные ÐУЛЕВЫМ Ñимволом" + +#: builtin/apply.c:4559 +msgid "ensure at least <n> lines of context match" +msgstr "удоÑтоверитьÑÑ, что по крайней мере <n> Ñтрок контекÑта Ñовпадают" + +#: builtin/apply.c:4560 +msgid "action" +msgstr "дейÑтвие" + +#: builtin/apply.c:4561 +msgid "detect new or modified lines that have whitespace errors" +msgstr "определÑÑ‚ÑŒ новые или модифицированные Ñтроки, у которых еÑÑ‚ÑŒ ошибки в пробельных Ñимволах" + +#: builtin/apply.c:4564 builtin/apply.c:4567 +msgid "ignore changes in whitespace when finding context" +msgstr "игнорировать Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² пробельных Ñимволах при поиÑке контекÑта" + +#: builtin/apply.c:4570 +msgid "apply the patch in reverse" +msgstr "применить патч Ñ Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸ÐµÐ¼ изменений" + +#: builtin/apply.c:4572 +msgid "don't expect at least one line of context" +msgstr "не ожидать как минимум одной Ñтроки контекÑта" + +#: builtin/apply.c:4574 +msgid "leave the rejected hunks in corresponding *.rej files" +msgstr "оÑтавить отклоненные блоки изменений в ÑоответÑтвующих *.rej файлах" + +#: builtin/apply.c:4576 +msgid "allow overlapping hunks" +msgstr "разрешить перекрывающиеÑÑ Ð±Ð»Ð¾ÐºÐ¸ изменений" + +#: builtin/apply.c:4579 +msgid "tolerate incorrectly detected missing new-line at the end of file" +msgstr "разрешить некорректно определенные пропущенные пуÑтые Ñтроки в конце файла" + +#: builtin/apply.c:4582 +msgid "do not trust the line counts in the hunk headers" +msgstr "не доверÑÑ‚ÑŒ количеÑтву Ñтрок из заголовка блока изменений" + +#: builtin/apply.c:4584 +msgid "root" +msgstr "корень" + +#: builtin/apply.c:4585 +msgid "prepend <root> to all filenames" +msgstr "добавить <корень> Ñпереди ко вÑем именам файлов" + +#: builtin/apply.c:4607 +msgid "--3way outside a repository" +msgstr "--3way вне репозиториÑ" + +#: builtin/apply.c:4615 +msgid "--index outside a repository" +msgstr "--index вне репозиториÑ" + +#: builtin/apply.c:4618 +msgid "--cached outside a repository" +msgstr "--cached вне репозиториÑ" + +#: builtin/apply.c:4637 +#, c-format +msgid "can't open patch '%s'" +msgstr "не удалоÑÑŒ открыть патч «%s»" + +#: builtin/apply.c:4651 +#, c-format +msgid "squelched %d whitespace error" +msgid_plural "squelched %d whitespace errors" +msgstr[0] "пропущена %d ошибка в пробельных Ñимволах" +msgstr[1] "пропущено %d ошибки в пробельных Ñимволах" +msgstr[2] "пропущено %d ошибок в пробельных Ñимволах" + +#: builtin/apply.c:4657 builtin/apply.c:4667 +#, c-format +msgid "%d line adds whitespace errors." +msgid_plural "%d lines add whitespace errors." +msgstr[0] "%d Ñтрока добавила ошибки в пробельных Ñимволах." +msgstr[1] "%d Ñтроки добавили ошибки в пробельных Ñимволах." +msgstr[2] "%d Ñтрок добавили ошибки в пробельных Ñимволах." + +#: builtin/archive.c:17 +#, c-format +msgid "could not create archive file '%s'" +msgstr "не удалоÑÑŒ Ñоздать файл архива «%s»" + +#: builtin/archive.c:20 +msgid "could not redirect output" +msgstr "не удалоÑÑŒ перенаправить вывод" + +#: builtin/archive.c:37 +msgid "git archive: Remote with no URL" +msgstr "git archive: внешний репозиторий без URL" + +#: builtin/archive.c:58 +msgid "git archive: expected ACK/NAK, got EOF" +msgstr "git archive: ожидалÑÑ ACK/NAK, а получен EOF" + +#: builtin/archive.c:61 +#, c-format +msgid "git archive: NACK %s" +msgstr "git archive: NACK %s" + +#: builtin/archive.c:63 +#, c-format +msgid "remote error: %s" +msgstr "ошибка внешнего репозиториÑ: %s" + +#: builtin/archive.c:64 +msgid "git archive: protocol error" +msgstr "git archive: ошибка протокола" + +#: builtin/archive.c:68 +msgid "git archive: expected a flush" +msgstr "git archive: ожидалÑÑ ÑÐ±Ñ€Ð¾Ñ Ð±ÑƒÑ„ÐµÑ€Ð°" + +#: builtin/bisect--helper.c:7 +msgid "git bisect--helper --next-all [--no-checkout]" +msgstr "git bisect--helper --next-all [--no-checkout]" + +#: builtin/bisect--helper.c:17 +msgid "perform 'git bisect next'" +msgstr "выполнить «git bisect next»" + +#: builtin/bisect--helper.c:19 +msgid "update BISECT_HEAD instead of checking out the current commit" +msgstr "обновить BISECT_HEAD вмеÑто перехода на текущий коммит" + +#: builtin/blame.c:30 +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file" +msgstr "git blame [<опции>] [<опции-rev-list>] [<редакциÑ>] [--] файл" + +#: builtin/blame.c:35 +msgid "<rev-opts> are documented in git-rev-list(1)" +msgstr "<опции-rev-list> документированы в git-rev-list(1)" + +#: builtin/blame.c:2500 +msgid "Show blame entries as we find them, incrementally" +msgstr "Показать запиÑи авторÑтва поÑтепенно, в процеÑÑе нахождениÑ" + +#: builtin/blame.c:2501 +msgid "Show blank SHA-1 for boundary commits (Default: off)" +msgstr "Ðе показывать SHA-1 Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¾Ð², не входÑщих в границы запроÑа (По умолчанию: отключено)" + +#: builtin/blame.c:2502 +msgid "Do not treat root commits as boundaries (Default: off)" +msgstr "Ðе воÑпринимать корневые коммиты как граничные (По умолчанию: отключено)" + +#: builtin/blame.c:2503 +msgid "Show work cost statistics" +msgstr "Показать ÑтатиÑтику раÑходов на выполнение запроÑа" + +#: builtin/blame.c:2504 +msgid "Show output score for blame entries" +msgstr "Показать оценку Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñей авторÑтва" + +#: builtin/blame.c:2505 +msgid "Show original filename (Default: auto)" +msgstr "Показать оригинальное Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° (По умолчанию: автоматичеÑки)" + +#: builtin/blame.c:2506 +msgid "Show original linenumber (Default: off)" +msgstr "Показать оригинальные номера Ñтрок (По умолчанию: отключено)" + +#: builtin/blame.c:2507 +msgid "Show in a format designed for machine consumption" +msgstr "Показать в формате Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð½Ð¾Ð³Ð¾ разбора" + +#: builtin/blame.c:2508 +msgid "Show porcelain format with per-line commit information" +msgstr "Показать в машиночитаемом формате, Ñ Ð¿Ð¾Ñтрочной информацией о коммите" + +#: builtin/blame.c:2509 +msgid "Use the same output mode as git-annotate (Default: off)" +msgstr "ИÑпользовать такой же формат вывода, как и git-annotate (По умолчанию: отключено)" + +#: builtin/blame.c:2510 +msgid "Show raw timestamp (Default: off)" +msgstr "Показать необработанные временные метки (По умолчанию: отключено)" + +#: builtin/blame.c:2511 +msgid "Show long commit SHA1 (Default: off)" +msgstr "Показать длинный SHA1 идентификатор коммита (По умолчанию: отключено)" + +#: builtin/blame.c:2512 +msgid "Suppress author name and timestamp (Default: off)" +msgstr "Ðе показывать Ð¸Ð¼Ñ Ð°Ð²Ñ‚Ð¾Ñ€Ð° и временные метки (По умолчанию: отключено)" + +#: builtin/blame.c:2513 +msgid "Show author email instead of name (Default: off)" +msgstr "Показать почту автора вмеÑто имени (По умолчанию: отключено)" + +#: builtin/blame.c:2514 +msgid "Ignore whitespace differences" +msgstr "Игнорировать Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð¸Ñ Ð² пробелах" + +#: builtin/blame.c:2515 +msgid "Spend extra cycles to find better match" +msgstr "Потратить больше времени, Ð´Ð»Ñ Ð½Ð°Ñ…Ð¾Ð¶Ð´ÐµÐ½Ð¸Ñ Ð»ÑƒÑ‡ÑˆÐ¸Ñ… Ñовпадений" + +#: builtin/blame.c:2516 +msgid "Use revisions from <file> instead of calling git-rev-list" +msgstr "ИÑпользовать редакции из <файла> вмеÑто вызова git-rev-list" + +#: builtin/blame.c:2517 +msgid "Use <file>'s contents as the final image" +msgstr "ИÑпользовать Ñодержимое <файла> как финальный Ñнимок" + +#: builtin/blame.c:2518 builtin/blame.c:2519 +msgid "score" +msgstr "мин-длина" + +#: builtin/blame.c:2518 +msgid "Find line copies within and across files" +msgstr "Ðайти копирование Ñтрок в пределах и между файлами" + +#: builtin/blame.c:2519 +msgid "Find line movements within and across files" +msgstr "Ðайти Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ñтрок в пределах и между файлами" + +#: builtin/blame.c:2520 +msgid "n,m" +msgstr "начало,конец" + +#: builtin/blame.c:2520 +msgid "Process only line range n,m, counting from 1" +msgstr "Обработать только Ñтроки в диапазоне начало,конец, Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñ 1" + +#. TRANSLATORS: This string is used to tell us the maximum +#. display width for a relative timestamp in "git blame" +#. output. For C locale, "4 years, 11 months ago", which +#. takes 22 places, is the longest among various forms of +#. relative timestamps, but your language may need more or +#. fewer display columns. +#: builtin/blame.c:2601 +msgid "4 years, 11 months ago" +msgstr "4 года и 11 меÑÑцев назад" + +#: builtin/branch.c:24 +msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" +msgstr "git branch [<опции>] [-r | -a] [--merged | --no-merged]" + +#: builtin/branch.c:25 +msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" +msgstr "git branch [<опции>] [-l] [-f] <имÑ-ветки> [<точка-начала>]" + +#: builtin/branch.c:26 +msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." +msgstr "git branch [<опции>] [-r] (-d | -D) <имÑ-ветки>…" + +#: builtin/branch.c:27 +msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" +msgstr "git branch [<опции>] (-m | -M) [<ÑтараÑ-ветка>] <новаÑ-ветка>" + +#: builtin/branch.c:152 +#, c-format +msgid "" +"deleting branch '%s' that has been merged to\n" +" '%s', but not yet merged to HEAD." +msgstr "удаление ветки «%s», ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð±Ñ‹Ð»Ð° Ñлита Ñ\n «%s», но не Ñлита Ñ HEAD." + +#: builtin/branch.c:156 +#, c-format +msgid "" +"not deleting branch '%s' that is not yet merged to\n" +" '%s', even though it is merged to HEAD." +msgstr "не удаление ветки «%s», ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ ÐµÑ‰Ðµ не Ñлита Ñ\n «%s», Ñ…Ð¾Ñ‚Ñ ÑƒÐ¶Ðµ Ñлита Ñ HEAD." + +#: builtin/branch.c:170 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "Ðе удалоÑÑŒ найти объект коммита Ð´Ð»Ñ Â«%s»" + +#: builtin/branch.c:174 +#, c-format +msgid "" +"The branch '%s' is not fully merged.\n" +"If you are sure you want to delete it, run 'git branch -D %s'." +msgstr "Ветка «%s» не Ñлита полноÑтью.\nЕÑли вы уверены, что хотите ее удалить, запуÑтите «git branch -D %s»." + +#: builtin/branch.c:187 +msgid "Update of config-file failed" +msgstr "Ðе удалоÑÑŒ обновить файл конфигурации" + +#: builtin/branch.c:215 +msgid "cannot use -a with -d" +msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно ключи -a и -d" + +#: builtin/branch.c:221 +msgid "Couldn't look up commit object for HEAD" +msgstr "Ðе удалоÑÑŒ найти объект коммита Ð´Ð»Ñ HEAD" + +#: builtin/branch.c:229 +#, c-format +msgid "Cannot delete the branch '%s' which you are currently on." +msgstr "ÐÐµÐ»ÑŒÐ·Ñ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ ветку «%s», так как вы ÑÐµÐ¹Ñ‡Ð°Ñ Ð½Ð° ней находитеÑÑŒ." + +#: builtin/branch.c:245 +#, c-format +msgid "remote branch '%s' not found." +msgstr "внешнÑÑ Ð²ÐµÑ‚ÐºÐ° «%s» не найдена." + +#: builtin/branch.c:246 +#, c-format +msgid "branch '%s' not found." +msgstr "ветка «%s» не найдена." + +#: builtin/branch.c:260 +#, c-format +msgid "Error deleting remote branch '%s'" +msgstr "Ошибка ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð²Ð½ÐµÑˆÐ½ÐµÐ¹ ветки «%s»" + +#: builtin/branch.c:261 +#, c-format +msgid "Error deleting branch '%s'" +msgstr "Ошибка ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð²ÐµÑ‚ÐºÐ¸ «%s»" + +#: builtin/branch.c:268 +#, c-format +msgid "Deleted remote branch %s (was %s).\n" +msgstr "ВнешнÑÑ Ð²ÐµÑ‚ÐºÐ° %s удалена (была %s).\n" + +#: builtin/branch.c:269 +#, c-format +msgid "Deleted branch %s (was %s).\n" +msgstr "Ветка %s удалена (была %s).\n" + +#: builtin/branch.c:370 +#, c-format +msgid "branch '%s' does not point at a commit" +msgstr "ветка «%s» не указывает на коммит" + +#: builtin/branch.c:459 +#, c-format +msgid "[%s: gone]" +msgstr "[%s: пропал]" + +#: builtin/branch.c:464 +#, c-format +msgid "[%s]" +msgstr "[%s]" + +#: builtin/branch.c:469 +#, c-format +msgid "[%s: behind %d]" +msgstr "[%s: позади %d]" + +#: builtin/branch.c:471 +#, c-format +msgid "[behind %d]" +msgstr "[позади %d]" + +#: builtin/branch.c:475 +#, c-format +msgid "[%s: ahead %d]" +msgstr "[%s: впереди %d]" + +#: builtin/branch.c:477 +#, c-format +msgid "[ahead %d]" +msgstr "[впереди %d]" + +#: builtin/branch.c:480 +#, c-format +msgid "[%s: ahead %d, behind %d]" +msgstr "[%s: впереди %d, позади %d]" + +#: builtin/branch.c:483 +#, c-format +msgid "[ahead %d, behind %d]" +msgstr "[впереди %d, позади %d]" + +#: builtin/branch.c:496 +msgid " **** invalid ref ****" +msgstr " **** недейÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ ÑÑылка ****" + +#: builtin/branch.c:587 +#, c-format +msgid "(no branch, rebasing %s)" +msgstr "(нет ветки, перемещение %s)" + +#: builtin/branch.c:590 +#, c-format +msgid "(no branch, bisect started on %s)" +msgstr "(нет ветки, двоичный поиÑк начат на %s)" + +#: builtin/branch.c:596 +#, c-format +msgid "(HEAD detached at %s)" +msgstr "(HEAD отделён на %s)" + +#: builtin/branch.c:599 +#, c-format +msgid "(HEAD detached from %s)" +msgstr "(HEAD отделён Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñ %s)" + +#: builtin/branch.c:603 +msgid "(no branch)" +msgstr "(нет ветки)" + +#: builtin/branch.c:650 +#, c-format +msgid "object '%s' does not point to a commit" +msgstr "объект «%s» не указывает на коммит" + +#: builtin/branch.c:698 +msgid "some refs could not be read" +msgstr "не удаетÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ некоторые ÑÑылки" + +#: builtin/branch.c:711 +msgid "cannot rename the current branch while not on any." +msgstr "невозможно переименовать текущую ветку, еÑли вы не находитеÑÑŒ ни на одной из них." + +#: builtin/branch.c:721 +#, c-format +msgid "Invalid branch name: '%s'" +msgstr "ÐедейÑтвительное Ð¸Ð¼Ñ Ð²ÐµÑ‚ÐºÐ¸: «%s»" + +#: builtin/branch.c:736 +msgid "Branch rename failed" +msgstr "Сбой Ð¿ÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ Ð²ÐµÑ‚ÐºÐ¸" + +#: builtin/branch.c:740 +#, c-format +msgid "Renamed a misnamed branch '%s' away" +msgstr "Переименована неправильно Ð½Ð°Ð·Ð²Ð°Ð½Ð½Ð°Ñ Ð²ÐµÑ‚ÐºÐ° «%s»" + +#: builtin/branch.c:744 +#, c-format +msgid "Branch renamed to %s, but HEAD is not updated!" +msgstr "Ветка переименована в %s, но HEAD не обновлен!" + +#: builtin/branch.c:751 +msgid "Branch is renamed, but update of config-file failed" +msgstr "Ветка переименована, но произошел Ñбой Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð° конфигурации" + +#: builtin/branch.c:766 +#, c-format +msgid "malformed object name %s" +msgstr "плохое Ð¸Ð¼Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð° %s" + +#: builtin/branch.c:790 +#, c-format +msgid "could not write branch description template: %s" +msgstr "не удалоÑÑŒ запиÑать шаблон опиÑÐ°Ð½Ð¸Ñ Ð²ÐµÑ‚ÐºÐ¸: %s" + +#: builtin/branch.c:820 +msgid "Generic options" +msgstr "Общие параметры" + +#: builtin/branch.c:822 +msgid "show hash and subject, give twice for upstream branch" +msgstr "показывать хеш-Ñумму и тему, укажите дважды Ð´Ð»Ñ Ð²Ñ‹ÑˆÐµÑтоÑщей ветки" + +#: builtin/branch.c:823 +msgid "suppress informational messages" +msgstr "не выводить информационные ÑообщениÑ" + +#: builtin/branch.c:824 +msgid "set up tracking mode (see git-pull(1))" +msgstr "уÑтановить режим отÑÐ»ÐµÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ Ð²Ñ‹ÑˆÐµÑтоÑщей ветки (Ñм. git-pull(1))" + +#: builtin/branch.c:826 +msgid "change upstream info" +msgstr "изменить информацию о вышеÑтоÑщей ветке" + +#: builtin/branch.c:830 +msgid "use colored output" +msgstr "иÑпользовать цветной вывод" + +#: builtin/branch.c:831 +msgid "act on remote-tracking branches" +msgstr "выполнить дейÑÑ‚Ð²Ð¸Ñ Ð½Ð° отÑлеживаемых внешних ветках" + +#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861 +#: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583 +#: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616 +#: builtin/tag.c:622 +msgid "commit" +msgstr "коммит" + +#: builtin/branch.c:835 builtin/branch.c:841 +msgid "print only branches that contain the commit" +msgstr "вывод только веток, которые Ñодержат коммит" + +#: builtin/branch.c:847 +msgid "Specific git-branch actions:" +msgstr "Специфичные Ð´Ð»Ñ git-branch дейÑтвиÑ:" + +#: builtin/branch.c:848 +msgid "list both remote-tracking and local branches" +msgstr "показать ÑпиÑок и отÑлеживаемых и локальных веток" + +#: builtin/branch.c:850 +msgid "delete fully merged branch" +msgstr "удалить полноÑтью Ñлитую ветку" + +#: builtin/branch.c:851 +msgid "delete branch (even if not merged)" +msgstr "удалить ветку (даже никуда не Ñлитую)" + +#: builtin/branch.c:852 +msgid "move/rename a branch and its reflog" +msgstr "перемеÑтить/переименовать ветки и ее журнал ÑÑылок" + +#: builtin/branch.c:853 +msgid "move/rename a branch, even if target exists" +msgstr "перемеÑтить/переименовать ветку, даже еÑли целевое Ð¸Ð¼Ñ ÑƒÐ¶Ðµ ÑущеÑтвует" + +#: builtin/branch.c:854 +msgid "list branch names" +msgstr "показать ÑпиÑок имен веток" + +#: builtin/branch.c:855 +msgid "create the branch's reflog" +msgstr "Ñоздать журнал ÑÑылок ветки" + +#: builtin/branch.c:857 +msgid "edit the description for the branch" +msgstr "изменить опиÑание ветки" + +#: builtin/branch.c:858 +msgid "force creation, move/rename, deletion" +msgstr "принудительное Ñоздание, перемещение или удаление ветки" + +#: builtin/branch.c:861 +msgid "print only not merged branches" +msgstr "вывод только не Ñлитых веток" + +#: builtin/branch.c:867 +msgid "print only merged branches" +msgstr "вывод только Ñлитых веток" + +#: builtin/branch.c:871 +msgid "list branches in columns" +msgstr "показать ÑпиÑок веток по Ñтолбцам" + +#: builtin/branch.c:884 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "Ðе удалоÑÑŒ определить HEAD как дейÑтвительную ÑÑылку." + +#: builtin/branch.c:888 builtin/clone.c:637 +msgid "HEAD not found below refs/heads!" +msgstr "HEAD не найден в refs/heads!" + +#: builtin/branch.c:910 +msgid "--column and --verbose are incompatible" +msgstr "--column и --verbose Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно" + +#: builtin/branch.c:921 builtin/branch.c:960 +msgid "branch name required" +msgstr "требуетÑÑ Ð¸Ð¼Ñ Ð²ÐµÑ‚ÐºÐ¸" + +#: builtin/branch.c:936 +msgid "Cannot give description to detached HEAD" +msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð´Ð°Ñ‚ÑŒ опиÑание отделенному HEAD" + +#: builtin/branch.c:941 +msgid "cannot edit description of more than one branch" +msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ опиÑание более одной ветки за раз" + +#: builtin/branch.c:948 +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "Еще нет коммита на ветке «%s»." + +#: builtin/branch.c:951 +#, c-format +msgid "No branch named '%s'." +msgstr "Ðет ветки Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ «%s»." + +#: builtin/branch.c:966 +msgid "too many branches for a rename operation" +msgstr "Ñлишком много веток Ð´Ð»Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¸ переименованиÑ" + +#: builtin/branch.c:971 +msgid "too many branches to set new upstream" +msgstr "Ñлишком много веток Ð´Ð»Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð½Ð¾Ð²Ñ‹Ñ… вышеÑтоÑщих" + +#: builtin/branch.c:975 +#, c-format +msgid "" +"could not set upstream of HEAD to %s when it does not point to any branch." +msgstr "невозможно уÑтановить вышеÑтоÑщий репозиторий Ð´Ð»Ñ HEAD на %s, когда он не указывает ни на одну ветку." + +#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021 +#, c-format +msgid "no such branch '%s'" +msgstr "нет такой ветки «%s»" + +#: builtin/branch.c:982 +#, c-format +msgid "branch '%s' does not exist" +msgstr "ветка «%s» не ÑущеÑтвует" + +#: builtin/branch.c:994 +msgid "too many branches to unset upstream" +msgstr "Ñлишком много веток Ð´Ð»Ñ ÑƒÐ±Ð¸Ñ€Ð°Ð½Ð¸Ñ Ð²Ñ‹ÑˆÐµÑтоÑщих" + +#: builtin/branch.c:998 +msgid "could not unset upstream of HEAD when it does not point to any branch." +msgstr "невозможно убрать вышеÑтоÑщий репозиторий Ð´Ð»Ñ HEAD, когда он не указывает ни на одну ветку." + +#: builtin/branch.c:1004 +#, c-format +msgid "Branch '%s' has no upstream information" +msgstr "Ветка «%s» не имеет информации о вышеÑтоÑщей ветке" + +#: builtin/branch.c:1018 +msgid "it does not make sense to create 'HEAD' manually" +msgstr "не имеет ÑмыÑла Ñоздавать «HEAD» вручную" + +#: builtin/branch.c:1024 +msgid "-a and -r options to 'git branch' do not make sense with a branch name" +msgstr "параметры -a и -r Ð´Ð»Ñ Â«git branch» не имеют ÑмыÑла Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸ÐµÐ¼ имени ветки" + +#: builtin/branch.c:1027 +#, c-format +msgid "" +"The --set-upstream flag is deprecated and will be removed. Consider using " +"--track or --set-upstream-to\n" +msgstr "Флаг --set-upstream уÑтарел и будет удален в будущем. ВмеÑто него иÑпользуйте --track или --set-upstream-to\n" + +#: builtin/branch.c:1044 +#, c-format +msgid "" +"\n" +"If you wanted to make '%s' track '%s', do this:\n" +"\n" +msgstr "\nЕÑли вы хотите, чтобы «%s» отÑлеживала «%s», Ñделайте Ñледующее:\n\n" + +#: builtin/branch.c:1045 +#, c-format +msgid " git branch -d %s\n" +msgstr "git branch -d %s\n" + +#: builtin/branch.c:1046 +#, c-format +msgid " git branch --set-upstream-to %s\n" +msgstr " git branch --set-upstream-to %s\n" + +#: builtin/bundle.c:47 +#, c-format +msgid "%s is okay\n" +msgstr "%s в порÑдке\n" + +#: builtin/bundle.c:56 +msgid "Need a repository to create a bundle." +msgstr "ТребуетÑÑ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ð¹ Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ð°ÐºÐµÑ‚Ð°." + +#: builtin/bundle.c:60 +msgid "Need a repository to unbundle." +msgstr "ТребуетÑÑ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ð¹ Ð´Ð»Ñ Ñ€Ð°Ñпаковки." + +#: builtin/cat-file.c:326 +msgid "git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>" +msgstr "git cat-file (-t | -s | -e | -p | <тип> | --textconv) <объект>" + +#: builtin/cat-file.c:327 +msgid "git cat-file (--batch | --batch-check) < <list-of-objects>" +msgstr "git cat-file (--batch | --batch-check) < <ÑпиÑок-объектов>" + +#: builtin/cat-file.c:364 +msgid "<type> can be one of: blob, tree, commit, tag" +msgstr "<тип> может быть одним из: blob, tree, commit, tag" + +#: builtin/cat-file.c:365 +msgid "show object type" +msgstr "показать тип объекта" + +#: builtin/cat-file.c:366 +msgid "show object size" +msgstr "показать размер объекта" + +#: builtin/cat-file.c:368 +msgid "exit with zero when there's no error" +msgstr "выйти Ñ Ð½ÑƒÐ»ÐµÐ²Ñ‹Ð¼ кодом возврата, еÑли нет ошибки" + +#: builtin/cat-file.c:369 +msgid "pretty-print object's content" +msgstr "Ñтруктурированный вывод Ñодержимого объекта" + +#: builtin/cat-file.c:371 +msgid "for blob objects, run textconv on object's content" +msgstr "запуÑтить texconv на Ñодержимом двоичных объектов " + +#: builtin/cat-file.c:373 +msgid "show info and content of objects fed from the standard input" +msgstr "показать информацию и Ñодержимое объектов, переданных из Ñтандартного ввода" + +#: builtin/cat-file.c:376 +msgid "show info about objects fed from the standard input" +msgstr "показать информацию об объектах, переданных из Ñтандартного ввода" + +#: builtin/check-attr.c:11 +msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." +msgstr "git check-attr [-a | --all | <атрибут>…] [--] <путь>…" + +#: builtin/check-attr.c:12 +msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>" +msgstr "git check-attr --stdin [-z] [-a | --all | <атрибут>…] < <ÑпиÑок путей>" + +#: builtin/check-attr.c:19 +msgid "report all attributes set on file" +msgstr "вывеÑти вÑе атрибуты уÑтановленные Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð°" + +#: builtin/check-attr.c:20 +msgid "use .gitattributes only from the index" +msgstr "иÑпользовать только .gitattributes из индекÑа" + +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 +msgid "read file names from stdin" +msgstr "прочитать имена файлов из Ñтандартного ввода" + +#: builtin/check-attr.c:23 builtin/check-ignore.c:24 +msgid "terminate input and output records by a NUL character" +msgstr "окончание ввода и вывода запиÑей по ÐУЛЕВОМУ Ñимволу" + +#: builtin/check-ignore.c:18 builtin/checkout.c:1107 builtin/gc.c:274 +msgid "suppress progress reporting" +msgstr "не выводить прогреÑÑ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ" + +#: builtin/check-ignore.c:26 +msgid "show non-matching input paths" +msgstr "показать не Ñовпадающие введенные пути" + +#: builtin/check-ignore.c:28 +msgid "ignore index when checking" +msgstr "игнорировать Ð¸Ð½Ð´ÐµÐºÑ Ð¿Ñ€Ð¸ проверке" + +#: builtin/check-ignore.c:154 +msgid "cannot specify pathnames with --stdin" +msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ ÑƒÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ пути вмеÑте Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ --stdin" + +#: builtin/check-ignore.c:157 +msgid "-z only makes sense with --stdin" +msgstr "-z имеет ÑмыÑл только вмеÑте Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ --stdin" + +#: builtin/check-ignore.c:159 +msgid "no path specified" +msgstr "не указан путь" + +#: builtin/check-ignore.c:163 +msgid "--quiet is only valid with a single pathname" +msgstr "--quiet можно иÑпользовать только при указании одного пути" + +#: builtin/check-ignore.c:165 +msgid "cannot have both --quiet and --verbose" +msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно --quiet и --verbose" + +#: builtin/check-ignore.c:168 +msgid "--non-matching is only valid with --verbose" +msgstr "--non-matching можно иÑпользовать только вмеÑте Ñ --verbose" + +#: builtin/check-mailmap.c:8 +msgid "git check-mailmap [<options>] <contact>..." +msgstr "git check-mailmap [<опции>] <контакт>…" + +#: builtin/check-mailmap.c:13 +msgid "also read contacts from stdin" +msgstr "также читать контакты из Ñтандартного ввода" + +#: builtin/check-mailmap.c:24 +#, c-format +msgid "unable to parse contact: %s" +msgstr "не удалоÑÑŒ разобрать контакт: %s" + +#: builtin/check-mailmap.c:47 +msgid "no contacts specified" +msgstr "не указаны контакты" + +#: builtin/checkout-index.c:126 +msgid "git checkout-index [<options>] [--] [<file>...]" +msgstr "git checkout-index [<опции>] [--] [<файл>…]" + +#: builtin/checkout-index.c:188 +msgid "check out all files in the index" +msgstr "перейти на ÑоÑтоÑние вÑех файлов из индекÑа" + +#: builtin/checkout-index.c:189 +msgid "force overwrite of existing files" +msgstr "Ð¿Ñ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿Ð¸ÑÑŒ ÑущеÑтвующих файлов" + +#: builtin/checkout-index.c:191 +msgid "no warning for existing files and files not in index" +msgstr "не выводить Ð¿Ñ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ Ð´Ð»Ñ ÑущеÑтвующих и непроиндекÑированных файлов" + +#: builtin/checkout-index.c:193 +msgid "don't checkout new files" +msgstr "не Ñоздавать новые файлы" + +#: builtin/checkout-index.c:195 +msgid "update stat information in the index file" +msgstr "обновить ÑтатиÑтику доÑтупа в файле индекÑа" + +#: builtin/checkout-index.c:201 +msgid "read list of paths from the standard input" +msgstr "прочитать ÑпиÑок путей из Ñтандартного ввода" + +#: builtin/checkout-index.c:203 +msgid "write the content to temporary files" +msgstr "запиÑать Ñодержимое во временные файлы" + +#: builtin/checkout-index.c:204 builtin/column.c:30 +msgid "string" +msgstr "Ñтрока" + +#: builtin/checkout-index.c:205 +msgid "when creating files, prepend <string>" +msgstr "добавить Ñпереди <Ñтроку> при Ñоздании файлов" + +#: builtin/checkout-index.c:208 +msgid "copy out the files from named stage" +msgstr "копировать файлы из указанного индекÑа" + +#: builtin/checkout.c:25 +msgid "git checkout [<options>] <branch>" +msgstr "git checkout [<опции>] <ветка>" + +#: builtin/checkout.c:26 +msgid "git checkout [<options>] [<branch>] -- <file>..." +msgstr "git checkout [<опции>] [<ветка>] -- <файл>…" + +#: builtin/checkout.c:132 builtin/checkout.c:165 +#, c-format +msgid "path '%s' does not have our version" +msgstr "путь «%s» не имеет нашей верÑии" + +#: builtin/checkout.c:134 builtin/checkout.c:167 +#, c-format +msgid "path '%s' does not have their version" +msgstr "путь «%s» не имеет их верÑии" + +#: builtin/checkout.c:150 +#, c-format +msgid "path '%s' does not have all necessary versions" +msgstr "путь «%s» не имеет вÑех необходимых верÑий" + +#: builtin/checkout.c:194 +#, c-format +msgid "path '%s' does not have necessary versions" +msgstr "путь «%s» не имеет необходимых верÑий" + +#: builtin/checkout.c:211 +#, c-format +msgid "path '%s': cannot merge" +msgstr "путь «%s»: не удалоÑÑŒ Ñлить" + +#: builtin/checkout.c:228 +#, c-format +msgid "Unable to add merge result for '%s'" +msgstr "Ðе удалоÑÑŒ добавить результат ÑлиÑÐ½Ð¸Ñ Â«%s»" + +#: builtin/checkout.c:249 builtin/checkout.c:252 builtin/checkout.c:255 +#: builtin/checkout.c:258 +#, c-format +msgid "'%s' cannot be used with updating paths" +msgstr "«%s» Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать при обновлении путей" + +#: builtin/checkout.c:261 builtin/checkout.c:264 +#, c-format +msgid "'%s' cannot be used with %s" +msgstr "«%s» Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ %s" + +#: builtin/checkout.c:267 +#, c-format +msgid "Cannot update paths and switch to branch '%s' at the same time." +msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÑÑ‚ÑŒ пути и переключатьÑÑ Ð½Ð° ветку «%s» одновременно." + +#: builtin/checkout.c:278 builtin/checkout.c:467 +msgid "corrupt index file" +msgstr "файл индекÑа поврежден" + +#: builtin/checkout.c:338 builtin/checkout.c:345 +#, c-format +msgid "path '%s' is unmerged" +msgstr "путь «%s» не Ñлит" + +#: builtin/checkout.c:489 +msgid "you need to resolve your current index first" +msgstr "Ñначала нужно разрешить конфликты в вашем текущем индекÑе" + +#: builtin/checkout.c:615 +#, c-format +msgid "Can not do reflog for '%s'\n" +msgstr "Ðе удалоÑÑŒ Ñоздать журнал ÑÑылок Ð´Ð»Ñ Â«%s»\n" + +#: builtin/checkout.c:653 +msgid "HEAD is now at" +msgstr "HEAD ÑÐµÐ¹Ñ‡Ð°Ñ Ð½Ð°" + +#: builtin/checkout.c:660 +#, c-format +msgid "Reset branch '%s'\n" +msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ð²ÐµÑ‚ÐºÐ¸ «%s»\n" + +#: builtin/checkout.c:663 +#, c-format +msgid "Already on '%s'\n" +msgstr "Уже на «%s»\n" + +#: builtin/checkout.c:667 +#, c-format +msgid "Switched to and reset branch '%s'\n" +msgstr "Переключение и ÑÐ±Ñ€Ð¾Ñ Ð²ÐµÑ‚ÐºÐ¸ «%s»\n" + +#: builtin/checkout.c:669 builtin/checkout.c:1050 +#, c-format +msgid "Switched to a new branch '%s'\n" +msgstr "Переключено на новую ветку «%s»\n" + +#: builtin/checkout.c:671 +#, c-format +msgid "Switched to branch '%s'\n" +msgstr "Переключено на ветку «%s»\n" + +#: builtin/checkout.c:723 +#, c-format +msgid " ... and %d more.\n" +msgstr " … и еще %d.\n" + +#: builtin/checkout.c:729 +#, c-format +msgid "" +"Warning: you are leaving %d commit behind, not connected to\n" +"any of your branches:\n" +"\n" +"%s\n" +msgid_plural "" +"Warning: you are leaving %d commits behind, not connected to\n" +"any of your branches:\n" +"\n" +"%s\n" +msgstr[0] "Предупреждение: вы оÑтавлÑете позади %d коммит не Ñоединенную ни Ñ Ð¾Ð´Ð½Ð¾Ð¹ из ваших веток:\n\n%s\n" +msgstr[1] "Предупреждение: вы оÑтавлÑете позади %d коммита не Ñоединенные ни Ñ Ð¾Ð´Ð½Ð¾Ð¹ из ваших веток:\n\n%s\n" +msgstr[2] "Предупреждение: вы оÑтавлÑете позади %d коммитов не Ñоединенные ни Ñ Ð¾Ð´Ð½Ð¾Ð¹ из ваших веток:\n\n%s\n" + +#: builtin/checkout.c:747 +#, c-format +msgid "" +"If you want to keep them by creating a new branch, this may be a good time\n" +"to do so with:\n" +"\n" +" git branch <new-branch-name> %s\n" +"\n" +msgstr "ЕÑли вы хотите Ñохранить их Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð¹ ветки, то ÑÐµÐ¹Ñ‡Ð°Ñ Ñамое времÑ\nÑделать Ñто Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ:\n\n git branch <имÑ-новой-ветки> %s\n" + +#: builtin/checkout.c:777 +msgid "internal error in revision walk" +msgstr "внутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ° при хождении по редакциÑм" + +#: builtin/checkout.c:781 +msgid "Previous HEAD position was" +msgstr "ÐŸÑ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰Ð°Ñ Ð¿Ð¾Ð·Ð¸Ñ†Ð¸Ñ HEAD была" + +#: builtin/checkout.c:808 builtin/checkout.c:1045 +msgid "You are on a branch yet to be born" +msgstr "Ð’Ñ‹ находитеÑÑŒ на еще не Ñозданной ветке" + +#: builtin/checkout.c:952 +#, c-format +msgid "only one reference expected, %d given." +msgstr "ожидаетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ одна ÑÑылка, а передано %d." + +#: builtin/checkout.c:991 +#, c-format +msgid "invalid reference: %s" +msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ ÑÑылка: %s" + +#: builtin/checkout.c:1020 +#, c-format +msgid "reference is not a tree: %s" +msgstr "в дереве нет такой ÑÑылки: %s" + +#: builtin/checkout.c:1059 +msgid "paths cannot be used with switching branches" +msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать пути при переключении веток" + +#: builtin/checkout.c:1062 builtin/checkout.c:1066 +#, c-format +msgid "'%s' cannot be used with switching branches" +msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать «%s» при переключении веток" + +#: builtin/checkout.c:1070 builtin/checkout.c:1073 builtin/checkout.c:1078 +#: builtin/checkout.c:1081 +#, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "«%s» Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ Â«%s»" + +#: builtin/checkout.c:1086 +#, c-format +msgid "Cannot switch branch to a non-commit '%s'" +msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ ветку на не коммит «%s»" + +#: builtin/checkout.c:1108 builtin/checkout.c:1110 builtin/clone.c:90 +#: builtin/remote.c:159 builtin/remote.c:161 +msgid "branch" +msgstr "ветка" + +#: builtin/checkout.c:1109 +msgid "create and checkout a new branch" +msgstr "Ñоздать и перейти на новую ветку" + +#: builtin/checkout.c:1111 +msgid "create/reset and checkout a branch" +msgstr "Ñоздать/ÑброÑить и перейти на новую ветку" + +#: builtin/checkout.c:1112 +msgid "create reflog for new branch" +msgstr "Ñоздать журнал ÑÑылок Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð¹ ветки" + +#: builtin/checkout.c:1113 +msgid "detach the HEAD at named commit" +msgstr "отÑоединить HEAD на указанном коммите" + +#: builtin/checkout.c:1114 +msgid "set upstream info for new branch" +msgstr "уÑтановить информацию о вышеÑтоÑщей ветке Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð¹ ветки" + +#: builtin/checkout.c:1116 +msgid "new-branch" +msgstr "новаÑ-ветка" + +#: builtin/checkout.c:1116 +msgid "new unparented branch" +msgstr "Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ‚ÐºÐ° без родителей" + +#: builtin/checkout.c:1117 +msgid "checkout our version for unmerged files" +msgstr "перейти на нашу верÑию Ð´Ð»Ñ Ð½Ðµ Ñлитых файлов" + +#: builtin/checkout.c:1119 +msgid "checkout their version for unmerged files" +msgstr "перейти на их верÑию Ð´Ð»Ñ Ð½Ðµ Ñлитых файлов" + +#: builtin/checkout.c:1121 +msgid "force checkout (throw away local modifications)" +msgstr "принудительный переход (отбраÑывает вÑе локальные изменениÑ)" + +#: builtin/checkout.c:1122 +msgid "perform a 3-way merge with the new branch" +msgstr "выполнить трехходовое ÑлиÑние Ñ Ð½Ð¾Ð²Ð¾Ð¹ веткой" + +#: builtin/checkout.c:1123 builtin/merge.c:227 +msgid "update ignored files (default)" +msgstr "обновить игнорируемые файлы (по умолчанию)" + +#: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245 +msgid "style" +msgstr "Ñтиль" + +#: builtin/checkout.c:1125 +msgid "conflict style (merge or diff3)" +msgstr "Ñтиль конфликтов ÑлиÑÐ½Ð¸Ñ (merge или diff3)" + +#: builtin/checkout.c:1128 +msgid "do not limit pathspecs to sparse entries only" +msgstr "не ограничивать Ñпецификаторы пути только чаÑтичными запиÑÑми" + +#: builtin/checkout.c:1130 +msgid "second guess 'git checkout <no-such-branch>'" +msgstr "переÑмотр «git checkout <no-such-branch>»" + +#: builtin/checkout.c:1153 +msgid "-b, -B and --orphan are mutually exclusive" +msgstr "-b, -B и --orphan Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно" + +#: builtin/checkout.c:1170 +msgid "--track needs a branch name" +msgstr "--track требует Ð¸Ð¼Ñ Ð²ÐµÑ‚ÐºÐ¸" + +#: builtin/checkout.c:1175 +msgid "Missing branch name; try -b" +msgstr "Пропущено Ð¸Ð¼Ñ Ð²ÐµÑ‚ÐºÐ¸; попробуйте -b" + +#: builtin/checkout.c:1212 +msgid "invalid path specification" +msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ ÑÐ¿ÐµÑ†Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ Ð¿ÑƒÑ‚Ð¸" + +#: builtin/checkout.c:1219 +#, c-format +msgid "" +"Cannot update paths and switch to branch '%s' at the same time.\n" +"Did you intend to checkout '%s' which can not be resolved as commit?" +msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ пути и одновременно переключить на ветку «%s».\nÐ’Ñ‹ хотели переключитьÑÑ Ð½Ð° «%s», что не может быть определено как коммит?" + +#: builtin/checkout.c:1224 +#, c-format +msgid "git checkout: --detach does not take a path argument '%s'" +msgstr "git checkout: --detach не принимает путь «%s» как аргумент" + +#: builtin/checkout.c:1228 +msgid "" +"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" +"checking out of the index." +msgstr "git checkout: --ours/--theirs, --force and --merge Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно при применении ÑоÑтоÑÐ½Ð¸Ñ Ð¸Ð½Ð´ÐµÐºÑа." + +#: builtin/clean.c:26 +msgid "" +"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." +msgstr "git clean [-d] [-f] [-i] [-n] [-q] [-e <шаблон>] [-x | -X] [--] <пути>…" + +#: builtin/clean.c:30 +#, c-format +msgid "Removing %s\n" +msgstr "Удаление %s\n" + +#: builtin/clean.c:31 +#, c-format +msgid "Would remove %s\n" +msgstr "Будет удалено %s\n" + +#: builtin/clean.c:32 +#, c-format +msgid "Skipping repository %s\n" +msgstr "ПропуÑк Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ %s\n" + +#: builtin/clean.c:33 +#, c-format +msgid "Would skip repository %s\n" +msgstr "Будет пропущен репозиторий %s\n" + +#: builtin/clean.c:34 +#, c-format +msgid "failed to remove %s" +msgstr "Ñбой ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ %s" + +#: builtin/clean.c:295 +msgid "" +"Prompt help:\n" +"1 - select a numbered item\n" +"foo - select item based on unique prefix\n" +" - (empty) select nothing" +msgstr "Справка по выделению:\n1 - выбрать указанный Ñлемент\nfoo - выбрать Ñлемент Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ð¼ префикÑом\n - (пуÑто) не выбирать ничего" + +#: builtin/clean.c:299 +msgid "" +"Prompt help:\n" +"1 - select a single item\n" +"3-5 - select a range of items\n" +"2-3,6-9 - select multiple ranges\n" +"foo - select item based on unique prefix\n" +"-... - unselect specified items\n" +"* - choose all items\n" +" - (empty) finish selecting" +msgstr "Справка по выделению:\n1 - выбрать один Ñлемент\n3-5 - выбрать диапазон Ñлементов\n2-3,6-9 - выбрать неÑколько диапазонов\nfoo - выбрать Ñлемент Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ð¼ префикÑом\n-… - убрать выделение Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ñ… Ñлементов\n* - выбрать вÑе Ñлементы\n - (пуÑто) завершить выделение" + +#: builtin/clean.c:517 +#, c-format +msgid "Huh (%s)?" +msgstr "Хм (%s)?" + +#: builtin/clean.c:659 +#, c-format +msgid "Input ignore patterns>> " +msgstr "Шаблоны Ð¸Ð³Ð½Ð¾Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð²Ð²Ð¾Ð´Ð°>> " + +#: builtin/clean.c:696 +#, c-format +msgid "WARNING: Cannot find items matched by: %s" +msgstr "ПРЕДУПРЕЖДЕÐИЕ: Ðе удалоÑÑŒ найти Ñлементы ÑоответÑтвующие: %s" + +#: builtin/clean.c:717 +msgid "Select items to delete" +msgstr "Укажите Ñлементы Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ" + +#. TRANSLATORS: Make sure to keep [y/N] as is +#: builtin/clean.c:758 +#, c-format +msgid "Remove %s [y/N]? " +msgstr "Удалить %s [y - да/N - нет]? " + +#: builtin/clean.c:783 +msgid "Bye." +msgstr "До ÑвиданиÑ." + +#: builtin/clean.c:791 +msgid "" +"clean - start cleaning\n" +"filter by pattern - exclude items from deletion\n" +"select by numbers - select items to be deleted by numbers\n" +"ask each - confirm each deletion (like \"rm -i\")\n" +"quit - stop cleaning\n" +"help - this screen\n" +"? - help for prompt selection" +msgstr "clean - начать очиÑтку\nfilter by pattern - иÑключить удаление Ñлементов\nselect by numbers - иÑключить удаление Ñлементов по номерам\nask each - запрашивать подтверждение на удаление каждого Ñлемента (как «rm -i»)\nquit - прекратить очиÑтку\nhelp - Ñтот Ñкран\n? - Ñправка по выделению" + +#: builtin/clean.c:818 +msgid "*** Commands ***" +msgstr "*** Команды ***" + +#: builtin/clean.c:819 +msgid "What now" +msgstr "Что теперь" + +#: builtin/clean.c:827 +msgid "Would remove the following item:" +msgid_plural "Would remove the following items:" +msgstr[0] "Удалить Ñледующие Ñлементы:" +msgstr[1] "Удалить Ñледующие Ñлементы:" +msgstr[2] "Удалить Ñледующие Ñлементы:" + +#: builtin/clean.c:844 +msgid "No more files to clean, exiting." +msgstr "Больше нет файлов Ð´Ð»Ñ Ð¾Ñ‡Ð¸Ñтки, выходим." + +#: builtin/clean.c:875 +msgid "do not print names of files removed" +msgstr "не выводить имена удалÑемых файлов" + +#: builtin/clean.c:877 +msgid "force" +msgstr "принудительно" + +#: builtin/clean.c:878 +msgid "interactive cleaning" +msgstr "Ð¸Ð½Ñ‚ÐµÑ€Ð°ÐºÑ‚Ð¸Ð²Ð½Ð°Ñ Ð¾Ñ‡Ð¸Ñтка" + +#: builtin/clean.c:880 +msgid "remove whole directories" +msgstr "удалить каталоги полноÑтью" + +#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185 +msgid "pattern" +msgstr "шаблон" + +#: builtin/clean.c:882 +msgid "add <pattern> to ignore rules" +msgstr "добавить <шаблон> в правила игнорированиÑ" + +#: builtin/clean.c:883 +msgid "remove ignored files, too" +msgstr "также удалить игнорируемые файлы" + +#: builtin/clean.c:885 +msgid "remove only ignored files" +msgstr "удалить только игнорируемые файлы" + +#: builtin/clean.c:903 +msgid "-x and -X cannot be used together" +msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно -x и -X" + +#: builtin/clean.c:907 +msgid "" +"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to" +" clean" +msgstr "clean.requireForce уÑтановлен как true и ни одна из опций -i, -n или -f не указана; отказ очиÑтки" + +#: builtin/clean.c:910 +msgid "" +"clean.requireForce defaults to true and neither -i, -n, nor -f given; " +"refusing to clean" +msgstr "clean.requireForce уÑтановлен по умолчанию как true и ни одна из опций -i, -n или -f не указана; отказ очиÑтки" + +#: builtin/clone.c:37 +msgid "git clone [<options>] [--] <repo> [<dir>]" +msgstr "git clone [<опции>] [--] <репозиторий> [<каталог>]" + +#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224 +#: builtin/push.c:523 +msgid "force progress reporting" +msgstr "принудительно выводить прогреÑÑ" + +#: builtin/clone.c:68 +msgid "don't create a checkout" +msgstr "не переключать рабочую копию на HEAD" + +#: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496 +msgid "create a bare repository" +msgstr "Ñоздать голый репозиторий" + +#: builtin/clone.c:73 +msgid "create a mirror repository (implies bare)" +msgstr "Ñоздать зеркало Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ (включает в ÑÐµÐ±Ñ Ð¸ параметр bare)" + +#: builtin/clone.c:75 +msgid "to clone from a local repository" +msgstr "Ð´Ð»Ñ ÐºÐ»Ð¾Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð· локального репозиториÑ" + +#: builtin/clone.c:77 +msgid "don't use local hardlinks, always copy" +msgstr "не иÑпользовать жеÑткие ÑÑылки, вÑегда копировать файлы" + +#: builtin/clone.c:79 +msgid "setup as shared repository" +msgstr "наÑтроить как общедоÑтупный репозиторий" + +#: builtin/clone.c:81 builtin/clone.c:83 +msgid "initialize submodules in the clone" +msgstr "инициализировать подмодули в клоне" + +#: builtin/clone.c:84 builtin/init-db.c:493 +msgid "template-directory" +msgstr "каталог-шаблонов" + +#: builtin/clone.c:85 builtin/init-db.c:494 +msgid "directory from which templates will be used" +msgstr "каталог, шаблоны из которого будут иÑпользованы" + +#: builtin/clone.c:87 +msgid "reference repository" +msgstr "ÑÑылаемый репозиторий" + +#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44 +msgid "name" +msgstr "имÑ" + +#: builtin/clone.c:89 +msgid "use <name> instead of 'origin' to track upstream" +msgstr "иÑпользовать <имÑ> вмеÑто «origin» Ð´Ð»Ñ Ð¾Ñ‚ÑÐ»ÐµÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ Ð²Ñ‹ÑˆÐµÑтоÑщего репозиториÑ" + +#: builtin/clone.c:91 +msgid "checkout <branch> instead of the remote's HEAD" +msgstr "перейти на <ветку>, вмеÑто HEAD внешнего репозиториÑ" + +#: builtin/clone.c:93 +msgid "path to git-upload-pack on the remote" +msgstr "путь к git-upload-pack на внешнем репозитории" + +#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659 +msgid "depth" +msgstr "глубина" + +#: builtin/clone.c:95 +msgid "create a shallow clone of that depth" +msgstr "Ñделать чаÑтичный клон указанной глубины" + +#: builtin/clone.c:97 +msgid "clone only one branch, HEAD or --branch" +msgstr "клонировать только одну ветку, HEAD или --branch" + +#: builtin/clone.c:99 +msgid "use --reference only while cloning" +msgstr "иÑпользуйте --reference только при клонировании" + +#: builtin/clone.c:100 builtin/init-db.c:502 +msgid "gitdir" +msgstr "каталог-git" + +#: builtin/clone.c:101 builtin/init-db.c:503 +msgid "separate git dir from working tree" +msgstr "размеÑтить каталог git отдельно от рабочей копии" + +#: builtin/clone.c:102 +msgid "key=value" +msgstr "ключ=значение" + +#: builtin/clone.c:103 +msgid "set config inside the new repository" +msgstr "уÑтановить параметры внутри нового репозиториÑ" + +#: builtin/clone.c:256 +#, c-format +msgid "reference repository '%s' is not a local repository." +msgstr "ÑÑылаемый репозиторий «%s» не ÑвлÑетÑÑ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ‹Ð¼." + +#: builtin/clone.c:260 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "ÑÑылаемый репозиторий «%s» ÑвлÑетÑÑ Ñ‡Ð°Ñтичным" + +#: builtin/clone.c:263 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "ÑÑылаемый репозиторий «%s» ÑвлÑетÑÑ Ñращенным" + +#: builtin/clone.c:325 +#, c-format +msgid "failed to create directory '%s'" +msgstr "не удалоÑÑŒ Ñоздать каталог «%s»" + +#: builtin/clone.c:327 builtin/diff.c:84 +#, c-format +msgid "failed to stat '%s'" +msgstr "не удалоÑÑŒ выполнить stat «%s»" + +#: builtin/clone.c:329 +#, c-format +msgid "%s exists and is not a directory" +msgstr "%s уже ÑущеÑтвует и не ÑвлÑетÑÑ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð¾Ð¼" + +#: builtin/clone.c:343 +#, c-format +msgid "failed to stat %s\n" +msgstr "не удалоÑÑŒ выполнить stat %s\n" + +#: builtin/clone.c:365 +#, c-format +msgid "failed to create link '%s'" +msgstr "не удалоÑÑŒ Ñоздать ÑÑылку «%s»" + +#: builtin/clone.c:369 +#, c-format +msgid "failed to copy file to '%s'" +msgstr "не удалоÑÑŒ копировать файл в «%s»" + +#: builtin/clone.c:392 builtin/clone.c:566 +#, c-format +msgid "done.\n" +msgstr "готово.\n" + +#: builtin/clone.c:404 +msgid "" +"Clone succeeded, but checkout failed.\n" +"You can inspect what was checked out with 'git status'\n" +"and retry the checkout with 'git checkout -f HEAD'\n" +msgstr "Клонирование прошло уÑпешно, но во Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´Ð° на верÑию произошла ошибка.\nС помощь команды «git status» вы можете проÑмотреть, какие файлы были обновлены, а повторить попытку перехода на верÑию Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «git checkout -f HEAD»\n" + +#: builtin/clone.c:481 +#, c-format +msgid "Could not find remote branch %s to clone." +msgstr "Ðе удалоÑÑŒ найти внешнюю ветку %s Ð´Ð»Ñ ÐºÐ»Ð¾Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ." + +#: builtin/clone.c:561 +#, c-format +msgid "Checking connectivity... " +msgstr "Проверка ÑоединениÑ… " + +#: builtin/clone.c:564 +msgid "remote did not send all necessary objects" +msgstr "внешний репозиторий приÑлал не вÑе необходимые объекты" + +#: builtin/clone.c:628 +msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" +msgstr "внешний HEAD ÑÑылаетÑÑ Ð½Ð° неÑущеÑтвующую ÑÑылку, Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿ÐµÑ€ÐµÐ¹Ñ‚Ð¸ на такую верÑию.\n" + +#: builtin/clone.c:659 +msgid "unable to checkout working tree" +msgstr "не удалоÑÑŒ перейти на верÑию в рабочем каталоге" + +#: builtin/clone.c:746 +msgid "cannot repack to clean up" +msgstr "не удалоÑÑŒ выполнить перепаковку Ð´Ð»Ñ Ð¾Ñ‡Ð¸Ñтки" + +#: builtin/clone.c:748 +msgid "cannot unlink temporary alternates file" +msgstr "не удалоÑÑŒ отÑоединить временные альтернативные файлы" + +#: builtin/clone.c:778 +msgid "Too many arguments." +msgstr "Слишком много аргументов." + +#: builtin/clone.c:782 +msgid "You must specify a repository to clone." +msgstr "Ð’Ñ‹ должны указать репозиторий Ð´Ð»Ñ ÐºÐ»Ð¾Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ." + +#: builtin/clone.c:793 +#, c-format +msgid "--bare and --origin %s options are incompatible." +msgstr "--bare и --origin %s Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно." + +#: builtin/clone.c:796 +msgid "--bare and --separate-git-dir are incompatible." +msgstr "--bare и --separate-git-dir Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно." + +#: builtin/clone.c:809 +#, c-format +msgid "repository '%s' does not exist" +msgstr "репозиторий «%s» не ÑущеÑтвует" + +#: builtin/clone.c:815 builtin/fetch.c:1156 +#, c-format +msgid "depth %s is not a positive number" +msgstr "глубина %s не ÑвлÑетÑÑ Ð¿Ð¾Ð»Ð¾Ð¶Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¼ чиÑлом" + +#: builtin/clone.c:825 +#, c-format +msgid "destination path '%s' already exists and is not an empty directory." +msgstr "целевой путь «%s» уже ÑущеÑтвует и не ÑвлÑетÑÑ Ð¿ÑƒÑтым каталогом." + +#: builtin/clone.c:835 +#, c-format +msgid "working tree '%s' already exists." +msgstr "рабочий каталог «%s» уже ÑущеÑтвует." + +#: builtin/clone.c:850 builtin/clone.c:861 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "не удалоÑÑŒ Ñоздать родительÑкие каталоги Ð´Ð»Ñ Â«%s»" + +#: builtin/clone.c:853 +#, c-format +msgid "could not create work tree dir '%s'" +msgstr "не удалоÑÑŒ Ñоздать рабочий каталог «%s»" + +#: builtin/clone.c:871 +#, c-format +msgid "Cloning into bare repository '%s'...\n" +msgstr "Клонирование в голый репозиторий «%s»…\n" + +#: builtin/clone.c:873 +#, c-format +msgid "Cloning into '%s'...\n" +msgstr "Клонирование в «%s»…\n" + +#: builtin/clone.c:898 +msgid "--dissociate given, but there is no --reference" +msgstr "передана Ð¾Ð¿Ñ†Ð¸Ñ --dissociate, но не передана --reference" + +#: builtin/clone.c:913 +msgid "--depth is ignored in local clones; use file:// instead." +msgstr "--depth игнорируетÑÑ Ð½Ð° локальных клонах; вмеÑто Ñтого иÑпользуйте file://." + +#: builtin/clone.c:916 +msgid "source repository is shallow, ignoring --local" +msgstr "иÑходный репозиторий ÑвлÑетÑÑ Ñ‡Ð°Ñтичным, --local игнорируетÑÑ" + +#: builtin/clone.c:921 +msgid "--local is ignored" +msgstr "--local игнорируетÑÑ" + +#: builtin/clone.c:925 +#, c-format +msgid "Don't know how to clone %s" +msgstr "Ðе знаю как клонировать %s" + +#: builtin/clone.c:976 builtin/clone.c:984 +#, c-format +msgid "Remote branch %s not found in upstream %s" +msgstr "ВнешнÑÑ Ð²ÐµÑ‚ÐºÐ° %s не найдена в вышеÑтоÑщем репозитории %s" + +#: builtin/clone.c:987 +msgid "You appear to have cloned an empty repository." +msgstr "Похоже, что вы клонировали пуÑтой репозиторий." + +#: builtin/column.c:9 +msgid "git column [<options>]" +msgstr "git column [<опции>]" + +#: builtin/column.c:26 +msgid "lookup config vars" +msgstr "запроÑить переменные конфигурации" + +#: builtin/column.c:27 builtin/column.c:28 +msgid "layout to use" +msgstr "иÑпользовать Ñхему раÑположениÑ" + +#: builtin/column.c:29 +msgid "Maximum width" +msgstr "МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ ÑˆÐ¸Ñ€Ð¸Ð½Ð°" + +#: builtin/column.c:30 +msgid "Padding space on left border" +msgstr "РаÑÑтоÑние отÑтупа Ñлева" + +#: builtin/column.c:31 +msgid "Padding space on right border" +msgstr "РаÑÑтоÑние отÑтупа Ñправа" + +#: builtin/column.c:32 +msgid "Padding space between columns" +msgstr "РаÑÑтоÑние отÑтупа между колонками" + +#: builtin/column.c:51 +msgid "--command must be the first argument" +msgstr "параметр --command должен быть первым" + +#: builtin/commit.c:37 +msgid "git commit [<options>] [--] <pathspec>..." +msgstr "git commit [<опции>] [--] <ÑпецификациÑ-пути>…" + +#: builtin/commit.c:42 +msgid "git status [<options>] [--] <pathspec>..." +msgstr "git status [<опции>] [--] <ÑпецификациÑ-пути>…" + +#: 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\n git config --global --edit\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" +"You can suppress this message by setting them explicitly:\n" +"\n" +" git config --global user.name \"Your Name\"\n" +" git config --global user.email you@example.com\n" +"\n" +"After doing this, you may fix the identity used for this commit with:\n" +"\n" +" git commit --amend --reset-author\n" +msgstr "Ваше Ð¸Ð¼Ñ Ð¸Ð»Ð¸ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð°Ñ Ð¿Ð¾Ñ‡Ñ‚Ð° наÑтроены автоматичеÑки на оÑновании вашего\nимени Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸ имени машины. ПожалуйÑта, проверьте, что они \nопределены правильно.\nÐ’Ñ‹ можете отключить Ñто уведомление уÑтановив их напрÑмую:\n\n git config --global user.name \"Ваше ИмÑ\"\n git config --global user.email you@example.com\n\nПоÑле Ñтого, изменить авторÑтво Ñтой коммита можно будет Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ команды:\n\n git commit --amend --reset-author\n" + +#: 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" +"remove the commit entirely with \"git reset HEAD^\".\n" +msgstr "Ð’Ñ‹ попроÑили иÑправить поÑледний коммит, но Ð´ÐµÐ»Ð°Ñ Ñто вы Ñделаете\nпуÑтой коммит. Ð’Ñ‹ можете повторить Ñту команду Ñ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹ --allow-empty\nили вы можете удалить коммит полноÑтью Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ команды \n«git reset HEAD^».\n" + +#: 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" +"\n" +" git commit --allow-empty\n" +"\n" +msgstr "Предыдущий отбор лучшего теперь пуÑÑ‚, возможно поÑле Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚Ð¾Ð².\nЕÑли вы вÑе равно хотите Ñделать пуÑтой коммит, иÑпользуйте:\n\n git commit --allow-empty\n\n" + +#: builtin/commit.c:84 +msgid "Otherwise, please use 'git reset'\n" +msgstr "Ð’ противном Ñлучае, иÑпользуйте «git reset»\n" + +#: builtin/commit.c:87 +msgid "" +"If you wish to skip this commit, use:\n" +"\n" +" git reset\n" +"\n" +"Then \"git cherry-pick --continue\" will resume cherry-picking\n" +"the remaining commits.\n" +msgstr "ЕÑли вы хотите пропуÑтит Ñтот коммит, иÑпользуйте команду:\n\n git reset\n\nПоÑле Ñтого «git cherry-pick --continue» продолжит отбор лучшего\nв оÑтавшихÑÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°Ñ….\n" + +#: builtin/commit.c:304 +msgid "failed to unpack HEAD tree object" +msgstr "Ñбой раÑпаковки объекта дерева HEAD" + +#: builtin/commit.c:344 +msgid "unable to create temporary index" +msgstr "не удалоÑÑŒ Ñоздать временный индекÑ" + +#: builtin/commit.c:350 +msgid "interactive add failed" +msgstr "Ñбой интерактивного добавлениÑ" + +#: builtin/commit.c:361 +msgid "unable to write index file" +msgstr "не удалоÑÑŒ запиÑать индекÑ" + +#: builtin/commit.c:363 +msgid "unable to update temporary index" +msgstr "не удалоÑÑŒ обновить временный индекÑ" + +#: builtin/commit.c:365 +msgid "Failed to update main cache tree" +msgstr "Сбой при обновлении оÑновного кÑша дерева" + +#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463 +msgid "unable to write new_index file" +msgstr "не удалоÑÑŒ запиÑать файл new_index" + +#: builtin/commit.c:445 +msgid "cannot do a partial commit during a merge." +msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ñоздать чаÑтичный коммит во Ð²Ñ€ÐµÐ¼Ñ ÑлиÑниÑ." + +#: builtin/commit.c:447 +msgid "cannot do a partial commit during a cherry-pick." +msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ñоздать чаÑтичный коммит во Ð²Ñ€ÐµÐ¼Ñ Ð¾Ñ‚Ð±Ð¾Ñ€Ð° лучшего коммита." + +#: builtin/commit.c:456 +msgid "cannot read the index" +msgstr "не удалоÑÑŒ прочитать индекÑ" + +#: builtin/commit.c:475 +msgid "unable to write temporary index file" +msgstr "не удалоÑÑŒ запиÑать временный файл индекÑа" + +#: builtin/commit.c:580 +#, c-format +msgid "commit '%s' lacks author header" +msgstr "у коммита «%s» отÑутÑтвует автор в заголовке" + +#: builtin/commit.c:582 +#, c-format +msgid "commit '%s' has malformed author line" +msgstr "у коммита «%s» автор в неверном формате" + +#: builtin/commit.c:601 +msgid "malformed --author parameter" +msgstr "параметр --author в неверном формате" + +#: builtin/commit.c:609 +#, c-format +msgid "invalid date format: %s" +msgstr "неправильный формат даты: %s" + +#: builtin/commit.c:653 +msgid "" +"unable to select a comment character that is not used\n" +"in the current commit message" +msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð²Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ Ñимвол комментариÑ, который\nне иÑпользуетÑÑ Ð² текущем Ñообщении коммита" + +#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 +#, c-format +msgid "could not lookup commit %s" +msgstr "не удалоÑÑŒ запроÑить коммит %s" + +#: builtin/commit.c:702 builtin/shortlog.c:273 +#, c-format +msgid "(reading log message from standard input)\n" +msgstr "(чтение файла журнала из Ñтандартного ввода)\n" + +#: builtin/commit.c:704 +msgid "could not read log from standard input" +msgstr "не удалоÑÑŒ прочитать файл журнала из Ñтандартного ввода" + +#: builtin/commit.c:708 +#, c-format +msgid "could not read log file '%s'" +msgstr "не удалоÑÑŒ прочитать файл журнала «%s»" + +#: builtin/commit.c:730 +msgid "could not read MERGE_MSG" +msgstr "не удалоÑÑŒ прочитать MERGE_MSG" + +#: builtin/commit.c:734 +msgid "could not read SQUASH_MSG" +msgstr "не удалоÑÑŒ прочитать SQUASH_MSG" + +#: builtin/commit.c:738 +#, c-format +msgid "could not read '%s'" +msgstr "не удалоÑÑŒ прочитать «%s»" + +#: builtin/commit.c:785 +msgid "could not write commit template" +msgstr "не удалоÑÑŒ запиÑать шаблон опиÑÐ°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°" + +#: builtin/commit.c:803 +#, c-format +msgid "" +"\n" +"It looks like you may be committing a merge.\n" +"If this is not correct, please remove the file\n" +"\t%s\n" +"and try again.\n" +msgstr "\nПохоже, что вы пытаетеÑÑŒ закоммитить ÑлиÑние.\nЕÑли Ñто ошибка, пожалуйÑта удалите файл\n\t%s\nи попробуйте Ñнова.\n" + +#: builtin/commit.c:808 +#, c-format +msgid "" +"\n" +"It looks like you may be committing a cherry-pick.\n" +"If this is not correct, please remove the file\n" +"\t%s\n" +"and try again.\n" +msgstr "\nПохоже, что вы пытаетеÑÑŒ закоммитить отбор лучшего.\nЕÑли Ñто ошибка, пожалуйÑта удалите файл\n\t%s\nи попробуйте Ñнова.\n" + +#: builtin/commit.c:821 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be ignored, and an empty message aborts the commit.\n" +msgstr "ПожалуйÑта, введите Ñообщение коммита Ð´Ð»Ñ Ð²Ð°ÑˆÐ¸Ñ… изменений. Строки,\nначинающиеÑÑ Ñ Â«%c» будут проигнорированы, а пуÑтое Ñообщение\nотменÑет процеÑÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°.\n" + +#: builtin/commit.c:828 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" +msgstr "ПожалуйÑта, введите Ñообщение коммита Ð´Ð»Ñ Ð²Ð°ÑˆÐ¸Ñ… изменений. Строки,\nначинающиеÑÑ Ñ Â«%c» будут оÑтавлены; вы можете удалить их вручную,\nеÑли хотите. ПуÑтое Ñообщение отменÑет процеÑÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°.\n" + +#: builtin/commit.c:848 +#, c-format +msgid "%sAuthor: %.*s <%.*s>" +msgstr "%sÐвтор: %.*s <%.*s>" + +#: builtin/commit.c:856 +#, c-format +msgid "%sDate: %s" +msgstr "%sДата: %s" + +#: builtin/commit.c:863 +#, c-format +msgid "%sCommitter: %.*s <%.*s>" +msgstr "%sКоммитер: %.*s <%.*s>" + +#: builtin/commit.c:881 +msgid "Cannot read index" +msgstr "Ðе удалоÑÑŒ прочитать индекÑ" + +#: builtin/commit.c:938 +msgid "Error building trees" +msgstr "Ошибка при поÑтроении деревьев" + +#: builtin/commit.c:953 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:1055 +#, c-format +msgid "--author '%s' is not 'Name <email>' and matches no existing author" +msgstr "--author «%s» не в формате Â«Ð˜Ð¼Ñ <почта>» и не Ñовпадает Ñ ÑущеÑтвующим автором" + +#: builtin/commit.c:1070 builtin/commit.c:1310 +#, c-format +msgid "Invalid untracked files mode '%s'" +msgstr "Ðеправильный режим неотÑлеживаемых файлов «%s»" + +#: builtin/commit.c:1107 +msgid "--long and -z are incompatible" +msgstr "--long и -z Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно" + +#: builtin/commit.c:1137 +msgid "Using both --reset-author and --author does not make sense" +msgstr "Указание одновременно опций --reset-author и --author не имеет ÑмыÑла" + +#: builtin/commit.c:1146 +msgid "You have nothing to amend." +msgstr "Ðечего иÑправлÑÑ‚ÑŒ." + +#: builtin/commit.c:1149 +msgid "You are in the middle of a merge -- cannot amend." +msgstr "Ð’Ñ‹ в процеÑÑе ÑлиÑÐ½Ð¸Ñ â€” ÑÐµÐ¹Ñ‡Ð°Ñ Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸ÑправлÑÑ‚ÑŒ." + +#: builtin/commit.c:1151 +msgid "You are in the middle of a cherry-pick -- cannot amend." +msgstr "Ð’Ñ‹ в процеÑÑе отбора лучшего — ÑÐµÐ¹Ñ‡Ð°Ñ Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸ÑправлÑÑ‚ÑŒ." + +#: builtin/commit.c:1154 +msgid "Options --squash and --fixup cannot be used together" +msgstr "Опции --squash и --fixup не могут иÑпользоватьÑÑ Ð¾Ð´Ð½Ð¾Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð¾" + +#: builtin/commit.c:1164 +msgid "Only one of -c/-C/-F/--fixup can be used." +msgstr "Может иÑпользоватьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ одна из опций -c/-C/-F/--fixup." + +#: builtin/commit.c:1166 +msgid "Option -m cannot be combined with -c/-C/-F/--fixup." +msgstr "ÐžÐ¿Ñ†Ð¸Ñ -m не может иÑпользоватьÑÑ Ñ -c/-C/-F/--fixup." + +#: builtin/commit.c:1174 +msgid "--reset-author can be used only with -C, -c or --amend." +msgstr "--reset-author может иÑпользоватьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ одновременно Ñ Ð¾Ð¿Ñ†Ð¸Ñми -C, -c или --amend." + +#: builtin/commit.c:1191 +msgid "Only one of --include/--only/--all/--interactive/--patch can be used." +msgstr "Может иÑпользоватьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ одна из опций --include/--only/--all/--interactive/--patch." + +#: builtin/commit.c:1193 +msgid "No paths with --include/--only does not make sense." +msgstr "Указание путей каталогов Ñ Ð¾Ð¿Ñ†Ð¸Ñми --include/--only не имеет ÑмыÑла." + +#: builtin/commit.c:1195 +msgid "Clever... amending the last one with dirty index." +msgstr "Умно… отмена поÑледнего Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð½Ñ‹Ð¼ индекÑом." + +#: builtin/commit.c:1197 +msgid "Explicit paths specified without -i or -o; assuming --only paths..." +msgstr "Пути Ñвно указаны пути без опций -i или -o; предполагаю опцию --only…" + +#: builtin/commit.c:1209 builtin/tag.c:728 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "Ðеправильное значение режима очиÑтки %s" + +#: builtin/commit.c:1214 +msgid "Paths with -a does not make sense." +msgstr "С опцией -a указание пути не имеет ÑмыÑла." + +#: builtin/commit.c:1324 builtin/commit.c:1604 +msgid "show status concisely" +msgstr "кратко показать ÑтатуÑ" + +#: builtin/commit.c:1326 builtin/commit.c:1606 +msgid "show branch information" +msgstr "показать информацию о верÑии" + +#: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509 +msgid "machine-readable output" +msgstr "машиночитаемый вывод" + +#: builtin/commit.c:1331 builtin/commit.c:1610 +msgid "show status in long format (default)" +msgstr "показать ÑÑ‚Ð°Ñ‚ÑƒÑ Ð² длинном формате (по умолчанию)" + +#: builtin/commit.c:1334 builtin/commit.c:1613 +msgid "terminate entries with NUL" +msgstr "завершать запиÑи ÐУЛЕВЫМ байтом" + +#: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980 +#: builtin/fast-export.c:983 builtin/tag.c:603 +msgid "mode" +msgstr "режим" + +#: builtin/commit.c:1337 builtin/commit.c:1616 +msgid "show untracked files, optional modes: all, normal, no. (Default: all)" +msgstr "показать неотÑлеживаемые файлы, опциональные режимы: all (вÑе), normal (как обычно), no (нет). (По умолчанию: all)" + +#: builtin/commit.c:1340 +msgid "show ignored files" +msgstr "показать игнорируемые файлы" + +#: builtin/commit.c:1341 parse-options.h:153 +msgid "when" +msgstr "когда" + +#: builtin/commit.c:1342 +msgid "" +"ignore changes to submodules, optional when: all, dirty, untracked. " +"(Default: all)" +msgstr "игнорировать Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² подмодулÑÑ…, опционально когда: all (вÑегда), dirty (измененные), untracked (неотÑлеживаемые). (По умолчанию: all)" + +#: builtin/commit.c:1344 +msgid "list untracked files in columns" +msgstr "показать неотÑлеживаемые файлы по Ñтолбцам" + +#: builtin/commit.c:1431 +msgid "couldn't look up newly created commit" +msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñить новоÑозданный коммит" + +#: builtin/commit.c:1433 +msgid "could not parse newly created commit" +msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ñ€Ð°Ð·Ð¾Ð±Ñ€Ð°Ñ‚ÑŒ новоÑозданный коммит" + +#: builtin/commit.c:1478 +msgid "detached HEAD" +msgstr "отделенный HEAD" + +#: builtin/commit.c:1481 +msgid " (root-commit)" +msgstr " (корневой коммит)" + +#: builtin/commit.c:1574 +msgid "suppress summary after successful commit" +msgstr "не выводить Ñводку поÑле уÑпешного коммита" + +#: builtin/commit.c:1575 +msgid "show diff in commit message template" +msgstr "добавить ÑпиÑок изменений в шаблон ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°" + +#: builtin/commit.c:1577 +msgid "Commit message options" +msgstr "Опции ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°" + +#: builtin/commit.c:1578 builtin/tag.c:601 +msgid "read message from file" +msgstr "прочитать Ñообщение из файла" + +#: builtin/commit.c:1579 +msgid "author" +msgstr "автор" + +#: builtin/commit.c:1579 +msgid "override author for commit" +msgstr "подменить автора коммита" + +#: builtin/commit.c:1580 builtin/gc.c:275 +msgid "date" +msgstr "дата" + +#: builtin/commit.c:1580 +msgid "override date for commit" +msgstr "подменить дату коммита" + +#: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391 +#: builtin/notes.c:554 builtin/tag.c:599 +msgid "message" +msgstr "Ñообщение" + +#: builtin/commit.c:1581 +msgid "commit message" +msgstr "Ñообщение коммита" + +#: builtin/commit.c:1582 +msgid "reuse and edit message from specified commit" +msgstr "иÑпользовать и отредактировать Ñообщение от указанного коммита" + +#: builtin/commit.c:1583 +msgid "reuse message from specified commit" +msgstr "иÑпользовать Ñообщение указанного коммита" + +#: builtin/commit.c:1584 +msgid "use autosquash formatted message to fixup specified commit" +msgstr "иÑпользовать форматированное Ñообщение Ð°Ð²Ñ‚Ð¾ÑƒÐ¿Ð»Ð¾Ñ‚Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð³Ð¾ коммита" + +#: builtin/commit.c:1585 +msgid "use autosquash formatted message to squash specified commit" +msgstr "иÑпользовать форматированное Ñообщение Ð°Ð²Ñ‚Ð¾ÑƒÐ¿Ð»Ð¾Ñ‚Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ ÑƒÐ¿Ð»Ð¾Ñ‚Ð½ÐµÐ½Ð¸Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð³Ð¾ коммита" + +#: builtin/commit.c:1586 +msgid "the commit is authored by me now (used with -C/-c/--amend)" +msgstr "коммит теперь за моим авторÑтвом (Ñ Ð¸Ñпользованием -C/-c/--amend)" + +#: builtin/commit.c:1587 builtin/log.c:1191 builtin/revert.c:86 +msgid "add Signed-off-by:" +msgstr "добавить Signed-off-by:" + +#: builtin/commit.c:1588 +msgid "use specified template file" +msgstr "иÑпользовать указанный файл шаблона" + +#: builtin/commit.c:1589 +msgid "force edit of commit" +msgstr "принудительно редактировать коммит" + +#: builtin/commit.c:1590 +msgid "default" +msgstr "по-умолчанию" + +#: builtin/commit.c:1590 builtin/tag.c:604 +msgid "how to strip spaces and #comments from message" +msgstr "как удалÑÑ‚ÑŒ пробелы и #комментарии из ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°" + +#: builtin/commit.c:1591 +msgid "include status in commit message template" +msgstr "включить ÑÑ‚Ð°Ñ‚ÑƒÑ Ñ„Ð°Ð¹Ð»Ð¾Ð² в шаблон ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°" + +#: builtin/commit.c:1592 builtin/merge.c:225 builtin/revert.c:92 +#: builtin/tag.c:605 +msgid "key-id" +msgstr "key-id" + +#: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93 +msgid "GPG sign commit" +msgstr "подпиÑать коммит Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ GPG" + +#: builtin/commit.c:1596 +msgid "Commit contents options" +msgstr "Опции Ñодержимого коммита" + +#: builtin/commit.c:1597 +msgid "commit all changed files" +msgstr "закоммитить вÑе измененные файлы" + +#: builtin/commit.c:1598 +msgid "add specified files to index for commit" +msgstr "добавить указанные файлы в Ð¸Ð½Ð´ÐµÐºÑ Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°" + +#: builtin/commit.c:1599 +msgid "interactively add files" +msgstr "интерактивное добавление файлов" + +#: builtin/commit.c:1600 +msgid "interactively add changes" +msgstr "интерактивное добавление изменений" + +#: builtin/commit.c:1601 +msgid "commit only specified files" +msgstr "закоммитить только указанные файлы" + +#: builtin/commit.c:1602 +msgid "bypass pre-commit hook" +msgstr "пропуÑтить перехватчик перед-коммитом" + +#: builtin/commit.c:1603 +msgid "show what would be committed" +msgstr "показать, что будет закоммичено" + +#: builtin/commit.c:1614 +msgid "amend previous commit" +msgstr "иÑправить предыдущий коммит" + +#: builtin/commit.c:1615 +msgid "bypass post-rewrite hook" +msgstr "пропуÑтить перехватчик поÑле-перезапиÑи" + +#: builtin/commit.c:1620 +msgid "ok to record an empty change" +msgstr "разрешить запиÑÑŒ пуÑтого коммита" + +#: builtin/commit.c:1622 +msgid "ok to record a change with an empty message" +msgstr "разрешить запиÑÑŒ изменений Ñ Ð¿ÑƒÑтым Ñообщением" + +#: builtin/commit.c:1651 +msgid "could not parse HEAD commit" +msgstr "не удалоÑÑŒ разобрать HEAD коммит" + +#: builtin/commit.c:1690 builtin/merge.c:519 +#, c-format +msgid "could not open '%s' for reading" +msgstr "не удалоÑÑŒ открыть «%s» Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ" + +#: builtin/commit.c:1697 +#, c-format +msgid "Corrupt MERGE_HEAD file (%s)" +msgstr "Файл MERGE_HEAD поврежден (%s)" + +#: builtin/commit.c:1704 +msgid "could not read MERGE_MODE" +msgstr "не удалоÑÑŒ прочитать MERGE_MODE" + +#: builtin/commit.c:1723 +#, c-format +msgid "could not read commit message: %s" +msgstr "не удалоÑÑŒ открыть Ñообщение коммита: %s" + +#: builtin/commit.c:1734 +#, c-format +msgid "Aborting commit; you did not edit the message.\n" +msgstr "Отмена коммита; вы не изменили Ñообщение.\n" + +#: builtin/commit.c:1739 +#, c-format +msgid "Aborting commit due to empty commit message.\n" +msgstr "Отмена коммита из-за пуÑтого ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°.\n" + +#: builtin/commit.c:1754 builtin/merge.c:851 builtin/merge.c:876 +msgid "failed to write commit object" +msgstr "Ñбой запиÑи объекта коммита" + +#: builtin/commit.c:1787 +msgid "" +"Repository has been updated, but unable to write\n" +"new_index file. Check that disk is not full and quota is\n" +"not exceeded, and then \"git reset HEAD\" to recover." +msgstr "Репозиторий был обновлен, но не удалоÑÑŒ запиÑать файл new_index. УдоÑтоверьтеÑÑŒ, что на диÑке еÑÑ‚ÑŒ Ñвободное меÑто и квота не иÑчерпана, а поÑле Ñтого запуÑтите «git reset HEAD» Ð´Ð»Ñ Ð²Ð¾ÑÑтановлениÑ." + +#: builtin/config.c:8 +msgid "git config [<options>]" +msgstr "git config [<опции>]" + +#: builtin/config.c:53 +msgid "Config file location" +msgstr "Размещение файла конфигурации" + +#: builtin/config.c:54 +msgid "use global config file" +msgstr "иÑпользовать глобальный файл конфигурации" + +#: builtin/config.c:55 +msgid "use system config file" +msgstr "иÑпользовать ÑиÑтемный файл конфигурации" + +#: builtin/config.c:56 +msgid "use repository config file" +msgstr "иÑпользовать файл конфигурации репозиториÑ" + +#: builtin/config.c:57 +msgid "use given config file" +msgstr "иÑпользовать указанный файл конфигурации" + +#: builtin/config.c:58 +msgid "blob-id" +msgstr "идент-двоичн-объекта" + +#: builtin/config.c:58 +msgid "read config from given blob object" +msgstr "прочитать наÑтройки из указанного двоичного объекта" + +#: builtin/config.c:59 +msgid "Action" +msgstr "ДейÑтвие" + +#: builtin/config.c:60 +msgid "get value: name [value-regex]" +msgstr "получить значение: Ð¸Ð¼Ñ [шаблон-значений]" + +#: builtin/config.c:61 +msgid "get all values: key [value-regex]" +msgstr "получить вÑе значениÑ: ключ [шаблон-значений]" + +#: builtin/config.c:62 +msgid "get values for regexp: name-regex [value-regex]" +msgstr "получить Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾ шаблону: шаблон-имен [шаблон-значений]" + +#: builtin/config.c:63 +msgid "get value specific for the URL: section[.var] URL" +msgstr "получить значение, Ñпецифичное Ð´Ð»Ñ URL: раздел[.переменнаÑ] URL" + +#: builtin/config.c:64 +msgid "replace all matching variables: name value [value_regex]" +msgstr "заменить вÑе ÑоответÑтвующие переменные: Ð¸Ð¼Ñ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ [шаблон-значений]" + +#: builtin/config.c:65 +msgid "add a new variable: name value" +msgstr "добавить новую переменную: Ð¸Ð¼Ñ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ" + +#: builtin/config.c:66 +msgid "remove a variable: name [value-regex]" +msgstr "удалить переменную: Ð¸Ð¼Ñ [шаблон-значений]" + +#: builtin/config.c:67 +msgid "remove all matches: name [value-regex]" +msgstr "удалить вÑе Ñовпадающие: Ð¸Ð¼Ñ [шаблон-значений]" + +#: builtin/config.c:68 +msgid "rename section: old-name new-name" +msgstr "переименовать раздел: Ñтарое-Ð¸Ð¼Ñ Ð½Ð¾Ð²Ð¾Ðµ-имÑ" + +#: builtin/config.c:69 +msgid "remove a section: name" +msgstr "удалить раздел: имÑ" + +#: builtin/config.c:70 +msgid "list all" +msgstr "показать веÑÑŒ ÑпиÑок" + +#: builtin/config.c:71 +msgid "open an editor" +msgstr "открыть в редакторе" + +#: builtin/config.c:72 +msgid "find the color configured: slot [default]" +msgstr "найти наÑтроенный цвет: раздел [по-умолчанию]" + +#: builtin/config.c:73 +msgid "find the color setting: slot [stdout-is-tty]" +msgstr "проверить, ÑущеÑтвует ли наÑтроенный цвет: раздел [stdout-еÑÑ‚ÑŒ-tty]" + +#: builtin/config.c:74 +msgid "Type" +msgstr "Тип" + +#: builtin/config.c:75 +msgid "value is \"true\" or \"false\"" +msgstr "значение — Ñто «true» (правда) или «false» (ложь)" + +#: builtin/config.c:76 +msgid "value is decimal number" +msgstr "значение — Ñто деÑÑтичное чиÑло" + +#: builtin/config.c:77 +msgid "value is --bool or --int" +msgstr "значение — Ñто --bool или --int" + +#: builtin/config.c:78 +msgid "value is a path (file or directory name)" +msgstr "значение — Ñто путь (к файлу или каталогу)" + +#: builtin/config.c:79 +msgid "Other" +msgstr "Другое" + +#: builtin/config.c:80 +msgid "terminate values with NUL byte" +msgstr "завершать Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ ÐУЛЕВЫМ байтом" + +#: builtin/config.c:81 +msgid "respect include directives on lookup" +msgstr "учитывать директивы include (Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²) при запроÑе" + +#: builtin/config.c:316 +msgid "unable to parse default color value" +msgstr "не удалоÑÑŒ разобрать значение цвета по умолчанию" + +#: builtin/config.c:457 +#, 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:589 +#, 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:65 +msgid "print sizes in human readable format" +msgstr "вывод размеров в удобочитаемом Ð´Ð»Ñ Ñ‡ÐµÐ»Ð¾Ð²ÐµÐºÐ° виде" + +#: builtin/describe.c:17 +msgid "git describe [<options>] [<commit-ish>...]" +msgstr "git describe [<опции>] [<указатель-коммита>…]" + +#: builtin/describe.c:18 +msgid "git describe [<options>] --dirty" +msgstr "git describe [<опции>] --dirty" + +#: builtin/describe.c:217 +#, c-format +msgid "annotated tag %s not available" +msgstr "Ð°Ð½Ð½Ð¾Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¼ÐµÑ‚ÐºÐ° %s не доÑтупна" + +#: builtin/describe.c:221 +#, c-format +msgid "annotated tag %s has no embedded name" +msgstr "Ð°Ð½Ð½Ð¾Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¼ÐµÑ‚ÐºÐ° %s не Ñодержит вÑтроенного названиÑ" + +#: builtin/describe.c:223 +#, c-format +msgid "tag '%s' is really '%s' here" +msgstr "метка «%s» уже здеÑÑŒ «%s»" + +#: builtin/describe.c:250 builtin/log.c:452 +#, c-format +msgid "Not a valid object name %s" +msgstr "ÐедейÑтвительное Ð¸Ð¼Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð° %s" + +#: builtin/describe.c:253 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "%s не ÑвлÑетÑÑ Ð´ÐµÐ¹Ñтвительным объектом «%s»" + +#: builtin/describe.c:270 +#, c-format +msgid "no tag exactly matches '%s'" +msgstr "нет меток, точно ÑоответÑтвующих «%s»" + +#: builtin/describe.c:272 +#, c-format +msgid "searching to describe %s\n" +msgstr "поиÑк опиÑÐ°Ð½Ð¸Ñ Ð´Ð»Ñ %s\n" + +#: builtin/describe.c:319 +#, c-format +msgid "finished search at %s\n" +msgstr "поиÑк окончен на %s\n" + +#: builtin/describe.c:346 +#, c-format +msgid "" +"No annotated tags can describe '%s'.\n" +"However, there were unannotated tags: try --tags." +msgstr "Ðет аннотированных меток, которые могут опиÑать «%s».\nÐо имеютÑÑ Ð½ÐµÐ°Ð½Ð½Ð¾Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ðµ метки: попробуйте добавить параметр --tags." + +#: builtin/describe.c:350 +#, c-format +msgid "" +"No tags can describe '%s'.\n" +"Try --always, or create some tags." +msgstr "Ðет меток, которые могут опиÑать «%s….\nПопробуйте добавить параметр --always или Ñоздать какие-нибудь метки." + +#: builtin/describe.c:371 +#, c-format +msgid "traversed %lu commits\n" +msgstr "поÑещено %lu коммитов\n" + +#: builtin/describe.c:374 +#, c-format +msgid "" +"more than %i tags found; listed %i most recent\n" +"gave up search at %s\n" +msgstr "более %i меток найдено; показано поÑледние %i\nоÑтановлен поиÑк поÑле %s\n" + +#: builtin/describe.c:396 +msgid "find the tag that comes after the commit" +msgstr "поиÑк метки, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¸Ð´ÐµÑ‚ поÑле коммита" + +#: builtin/describe.c:397 +msgid "debug search strategy on stderr" +msgstr "вывод отладочной информации Ñтратегии поиÑка на Ñтандартный вывод" + +#: builtin/describe.c:398 +msgid "use any ref" +msgstr "иÑпользовать любую ÑÑылку" + +#: builtin/describe.c:399 +msgid "use any tag, even unannotated" +msgstr "иÑпользовать любую метку, даже неаннотированную" + +#: builtin/describe.c:400 +msgid "always use long format" +msgstr "вÑегда иÑпользовать длинный формат вывода" + +#: builtin/describe.c:401 +msgid "only follow first parent" +msgstr "Ñледовать только за первым родителем" + +#: builtin/describe.c:404 +msgid "only output exact matches" +msgstr "выводить только точные ÑовпадениÑ" + +#: builtin/describe.c:406 +msgid "consider <n> most recent tags (default: 10)" +msgstr "раÑÑматривать поÑледние <n> меток (по умолчанию: 10)" + +#: builtin/describe.c:408 +msgid "only consider tags matching <pattern>" +msgstr "раÑÑматривать только метки по <шаблону>" + +#: builtin/describe.c:410 builtin/name-rev.c:318 +msgid "show abbreviated commit object as fallback" +msgstr "еÑли не найдено, показать Ñокращенный номер ревизии коммита" + +#: builtin/describe.c:411 +msgid "mark" +msgstr "пометка" + +#: builtin/describe.c:412 +msgid "append <mark> on dirty working tree (default: \"-dirty\")" +msgstr "добавить <пометку> при измененном рабочем каталоге (по умолчанию: «-dirty»)" + +#: builtin/describe.c:430 +msgid "--long is incompatible with --abbrev=0" +msgstr "--long неÑовмеÑтимо Ñ --abbrev=0" + +#: builtin/describe.c:456 +msgid "No names found, cannot describe anything." +msgstr "Имена не найдены, не могу ничего опиÑать." + +#: builtin/describe.c:476 +msgid "--dirty is incompatible with commit-ishes" +msgstr "--dirty неÑовмеÑтимо Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸ÐµÐ¼ указателей коммитов" + +#: builtin/diff.c:86 +#, c-format +msgid "'%s': not a regular file or symlink" +msgstr "«%s»: не ÑвлÑетÑÑ Ð¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ð¼ файлом или Ñимвольной ÑÑылкой" + +#: builtin/diff.c:237 +#, c-format +msgid "invalid option: %s" +msgstr "неправильный параметр: %s" + +#: builtin/diff.c:358 +msgid "Not a git repository" +msgstr "Ðе ÑвлÑетÑÑ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸ÐµÐ¼ git" + +#: builtin/diff.c:401 +#, c-format +msgid "invalid object '%s' given." +msgstr "передан неправильный объект «%s»." + +#: builtin/diff.c:410 +#, c-format +msgid "more than two blobs given: '%s'" +msgstr "передано больше двух двоичных объектов: «%s»" + +#: builtin/diff.c:417 +#, c-format +msgid "unhandled object '%s' given." +msgstr "передан необработанный объект «%s»." + +#: builtin/fast-export.c:24 +msgid "git fast-export [rev-list-opts]" +msgstr "git fast-export [опции-rev-list]" + +#: builtin/fast-export.c:979 +msgid "show progress after <n> objects" +msgstr "показать прогреÑÑ Ð¿Ð¾Ñле <n> объектов" + +#: builtin/fast-export.c:981 +msgid "select handling of signed tags" +msgstr "выбор обработки подпиÑанных меток" + +#: builtin/fast-export.c:984 +msgid "select handling of tags that tag filtered objects" +msgstr "выбор обработки меток, которыми помечены отфильтрованные объекты" + +#: builtin/fast-export.c:987 +msgid "Dump marks to this file" +msgstr "ЗапиÑать пометки в Ñтот файл" + +#: builtin/fast-export.c:989 +msgid "Import marks from this file" +msgstr "Импортировать пометки из Ñтого файла" + +#: builtin/fast-export.c:991 +msgid "Fake a tagger when tags lack one" +msgstr "Подделать автора метки, еÑли у метки он отÑутÑтвует" + +#: builtin/fast-export.c:993 +msgid "Output full tree for each commit" +msgstr "ВывеÑти полное дерево Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ коммита" + +#: builtin/fast-export.c:995 +msgid "Use the done feature to terminate the stream" +msgstr "ИÑпользовать пометку Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ Ð² конце потока" + +#: builtin/fast-export.c:996 +msgid "Skip output of blob data" +msgstr "ПропуÑтить вывод данных двоичных объектов" + +#: builtin/fast-export.c:997 +msgid "refspec" +msgstr "ÑÐ¿ÐµÑ†Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ ÑÑылки" + +#: builtin/fast-export.c:998 +msgid "Apply refspec to exported refs" +msgstr "Применить Ñпецификацию ÑÑылки к ÑкÑпортируемым ÑÑылкам" + +#: builtin/fast-export.c:999 +msgid "anonymize output" +msgstr "Ñделать вывод анонимным" + +#: builtin/fetch.c:19 +msgid "git fetch [<options>] [<repository> [<refspec>...]]" +msgstr "git fetch [<опции>] [<репозиторий> [<ÑпецификациÑ-ÑÑылки>…]]" + +#: builtin/fetch.c:20 +msgid "git fetch [<options>] <group>" +msgstr "git fetch [<опции>] <группа>" + +#: builtin/fetch.c:21 +msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" +msgstr "git fetch --multiple [<опции>] [(<репозиторий> | <группа>)…]" + +#: builtin/fetch.c:22 +msgid "git fetch --all [<options>]" +msgstr "git fetch --all [<опции>]" + +#: builtin/fetch.c:89 +msgid "fetch from all remotes" +msgstr "извлечь Ñо вÑех внешних репозиториев" + +#: builtin/fetch.c:91 +msgid "append to .git/FETCH_HEAD instead of overwriting" +msgstr "допиÑать к .git/FETCH_HEAD вмеÑто перезапиÑи" + +#: builtin/fetch.c:93 +msgid "path to upload pack on remote end" +msgstr "путь к программе упаковки пакета на машине Ñ Ð²Ð½ÐµÑˆÐ½Ð¸Ð¼ репозиторием" + +#: builtin/fetch.c:94 +msgid "force overwrite of local branch" +msgstr "Ð¿Ñ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿Ð¸ÑÑŒ локальной ветки" + +#: builtin/fetch.c:96 +msgid "fetch from multiple remotes" +msgstr "извлечь Ñ Ð½ÐµÑкольких внешних репозиториев" + +#: builtin/fetch.c:98 +msgid "fetch all tags and associated objects" +msgstr "извлечь вÑе метки и ÑвÑзанные объекты" + +#: builtin/fetch.c:100 +msgid "do not fetch all tags (--no-tags)" +msgstr "не извлекать вÑе метки (--no-tags)" + +#: builtin/fetch.c:102 +msgid "prune remote-tracking branches no longer on remote" +msgstr "почиÑтить отÑлеживаемые внешние ветки, которых уже нет на внешнем репозитории" + +#: builtin/fetch.c:103 +msgid "on-demand" +msgstr "по требованию" + +#: builtin/fetch.c:104 +msgid "control recursive fetching of submodules" +msgstr "управление рекурÑивным извлечением подмодулей" + +#: builtin/fetch.c:108 +msgid "keep downloaded pack" +msgstr "оÑтавить загруженный пакет данных" + +#: builtin/fetch.c:110 +msgid "allow updating of HEAD ref" +msgstr "разрешить обновление ÑÑылки HEAD" + +#: builtin/fetch.c:113 +msgid "deepen history of shallow clone" +msgstr "Ð³Ð»ÑƒÐ±Ð¾ÐºÐ°Ñ Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ñ Ñ‡Ð°Ñтичного клона" + +#: builtin/fetch.c:115 +msgid "convert to a complete repository" +msgstr "преобразовать в полный репозиторий" + +#: builtin/fetch.c:117 builtin/log.c:1208 +msgid "dir" +msgstr "каталог" + +#: builtin/fetch.c:118 +msgid "prepend this to submodule path output" +msgstr "приÑоединÑÑ‚ÑŒ Ñто Ñпереди к выводу путей подмодулÑ" + +#: builtin/fetch.c:121 +msgid "default mode for recursion" +msgstr "режим по умолчанию Ð´Ð»Ñ Ñ€ÐµÐºÑƒÑ€Ñии" + +#: builtin/fetch.c:123 +msgid "accept refs that update .git/shallow" +msgstr "принимать ÑÑылки, которые обновлÑÑŽÑ‚ .git/shallow" + +#: builtin/fetch.c:124 +msgid "refmap" +msgstr "ÑоответÑтвие-ÑÑылок" + +#: builtin/fetch.c:125 +msgid "specify fetch refmap" +msgstr "указать ÑоответÑтвие ÑÑылок при извлечении" + +#: builtin/fetch.c:375 +msgid "Couldn't find remote ref HEAD" +msgstr "Ðе удалоÑÑŒ найти ÑÑылку HEAD на внешнем репозитории" + +#: builtin/fetch.c:455 +#, c-format +msgid "object %s not found" +msgstr "объект %s не найден" + +#: builtin/fetch.c:460 +msgid "[up to date]" +msgstr "[актуально]" + +#: builtin/fetch.c:474 +#, c-format +msgid "! %-*s %-*s -> %s (can't fetch in current branch)" +msgstr "! %-*s %-*s → %s (не удалоÑÑŒ извлечь в текущую ветку)" + +#: builtin/fetch.c:475 builtin/fetch.c:561 +msgid "[rejected]" +msgstr "[отклонено]" + +#: builtin/fetch.c:486 +msgid "[tag update]" +msgstr "[обновление метки]" + +#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541 +msgid " (unable to update local ref)" +msgstr " (не удалоÑÑŒ обновить локальную ÑÑылку)" + +#: builtin/fetch.c:506 +msgid "[new tag]" +msgstr "[Ð½Ð¾Ð²Ð°Ñ Ð¼ÐµÑ‚ÐºÐ°]" + +#: builtin/fetch.c:509 +msgid "[new branch]" +msgstr "[Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ‚ÐºÐ°]" + +#: builtin/fetch.c:512 +msgid "[new ref]" +msgstr "[Ð½Ð¾Ð²Ð°Ñ ÑÑылка]" + +#: builtin/fetch.c:557 +msgid "unable to update local ref" +msgstr "не удалоÑÑŒ обновить локальную ÑÑылку" + +#: builtin/fetch.c:557 +msgid "forced update" +msgstr "принудительное обновление" + +#: builtin/fetch.c:563 +msgid "(non-fast-forward)" +msgstr "(без перемотки вперед)" + +#: builtin/fetch.c:596 builtin/fetch.c:829 +#, c-format +msgid "cannot open %s: %s\n" +msgstr "не удалоÑÑŒ открыть %s: %s\n" + +#: builtin/fetch.c:605 +#, c-format +msgid "%s did not send all necessary objects\n" +msgstr "%s не отправил вÑе необходимые объекты\n" + +#: builtin/fetch.c:623 +#, c-format +msgid "reject %s because shallow roots are not allowed to be updated" +msgstr "%s отклонено из-за того, что чаÑтичные корни не разрешено обновлÑÑ‚ÑŒ" + +#: builtin/fetch.c:711 builtin/fetch.c:794 +#, c-format +msgid "From %.*s\n" +msgstr "Из %.*s\n" + +#: builtin/fetch.c:722 +#, c-format +msgid "" +"some local refs could not be updated; try running\n" +" 'git remote prune %s' to remove any old, conflicting branches" +msgstr "не удалоÑÑŒ обновить некоторые локальные ÑÑылки; попробуйте запуÑтить «git remote prune %s», чтобы почиÑтить Ñтарые, конфликтующие ветки" + +#: builtin/fetch.c:774 +#, c-format +msgid " (%s will become dangling)" +msgstr " (%s будет виÑÑщей веткой)" + +#: builtin/fetch.c:775 +#, c-format +msgid " (%s has become dangling)" +msgstr " (%s Ñтала виÑÑщей веткой)" + +#: builtin/fetch.c:799 +msgid "[deleted]" +msgstr "[удалено]" + +#: builtin/fetch.c:800 builtin/remote.c:1060 +msgid "(none)" +msgstr "(нет)" + +#: builtin/fetch.c:819 +#, c-format +msgid "Refusing to fetch into current branch %s of non-bare repository" +msgstr "Отказ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð² текущую ветку %s не голого репозиториÑ" + +#: builtin/fetch.c:838 +#, c-format +msgid "Option \"%s\" value \"%s\" is not valid for %s" +msgstr "Ðеправильное значение «%2$s» Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° «%1$s» Ð´Ð»Ñ %3$s" + +#: builtin/fetch.c:841 +#, c-format +msgid "Option \"%s\" is ignored for %s\n" +msgstr "Параметр «%s» игнорируетÑÑ Ð´Ð»Ñ %s\n" + +#: builtin/fetch.c:897 +#, c-format +msgid "Don't know how to fetch from %s" +msgstr "Ðе знаю как извлечь Ñ %s" + +#: builtin/fetch.c:1059 +#, c-format +msgid "Fetching %s\n" +msgstr "Извлечение из %s\n" + +#: builtin/fetch.c:1061 builtin/remote.c:90 +#, c-format +msgid "Could not fetch %s" +msgstr "Ðе удалоÑÑŒ извлечь %s" + +#: builtin/fetch.c:1079 +msgid "" +"No remote repository specified. Please, specify either a URL or a\n" +"remote name from which new revisions should be fetched." +msgstr "Ðе указан внешний репозиторий. Укажите URL или Ð¸Ð¼Ñ Ð²Ð½ÐµÑˆÐ½ÐµÐ³Ð¾ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ð¸Ð· которого должны извлекатьÑÑ Ð½Ð¾Ð²Ñ‹Ðµ редакции." + +#: builtin/fetch.c:1102 +msgid "You need to specify a tag name." +msgstr "Вам нужно указать Ð¸Ð¼Ñ Ð¼ÐµÑ‚ÐºÐ¸." + +#: builtin/fetch.c:1144 +msgid "--depth and --unshallow cannot be used together" +msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно --depth и --unshallow" + +#: builtin/fetch.c:1146 +msgid "--unshallow on a complete repository does not make sense" +msgstr "--unshallow не имеет ÑмыÑла на полном репозитории" + +#: builtin/fetch.c:1169 +msgid "fetch --all does not take a repository argument" +msgstr "fetch --all не принимает Ð¸Ð¼Ñ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ ÐºÐ°Ðº аргумент" + +#: builtin/fetch.c:1171 +msgid "fetch --all does not make sense with refspecs" +msgstr "fetch --all не имеет ÑмыÑла при указании Ñпецификаций ÑÑылок" + +#: builtin/fetch.c:1182 +#, c-format +msgid "No such remote or remote group: %s" +msgstr "Ðет такого внешнего Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ð¸Ð»Ð¸ группы: %s" + +#: builtin/fetch.c:1190 +msgid "Fetching a group and specifying refspecs does not make sense" +msgstr "Получение группы и указание Ñпецификаций ÑÑылок не имеет ÑмыÑла" + +#: builtin/fmt-merge-msg.c:13 +msgid "" +"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" +msgstr "git fmt-merge-msg [-m <Ñообщение>] [--log[=<n>] | --no-log] [--file <файл>]" + +#: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698 +#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182 +#: builtin/show-branch.c:657 builtin/show-ref.c:178 builtin/tag.c:590 +#: parse-options.h:132 parse-options.h:239 +msgid "n" +msgstr "n" + +#: builtin/fmt-merge-msg.c:663 +msgid "populate log with at most <n> entries from shortlog" +msgstr "отправить в журнал <n> запиÑей из короткого журнала" + +#: builtin/fmt-merge-msg.c:666 +msgid "alias for --log (deprecated)" +msgstr "Ñокращение Ð´Ð»Ñ --log (уÑтаревшее)" + +#: builtin/fmt-merge-msg.c:669 +msgid "text" +msgstr "текÑÑ‚" + +#: builtin/fmt-merge-msg.c:670 +msgid "use <text> as start of message" +msgstr "иÑпользовать <текÑÑ‚> как начальное Ñообщение" + +#: builtin/fmt-merge-msg.c:671 +msgid "file to read from" +msgstr "файл Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ" + +#: builtin/for-each-ref.c:675 +msgid "unable to parse format" +msgstr "не удалоÑÑŒ разобрать формат" + +#: builtin/for-each-ref.c:1063 +msgid "git for-each-ref [<options>] [<pattern>]" +msgstr "git for-each-ref [<опции>] [<шаблон>]" + +#: builtin/for-each-ref.c:1078 +msgid "quote placeholders suitably for shells" +msgstr "выводить указатели меÑта Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð² подходÑщем формате Ð´Ð»Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð³Ð¾ процеÑÑора" + +#: builtin/for-each-ref.c:1080 +msgid "quote placeholders suitably for perl" +msgstr "выводить указатели меÑта Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð² подходÑщем формате Ð´Ð»Ñ perl" + +#: builtin/for-each-ref.c:1082 +msgid "quote placeholders suitably for python" +msgstr "выводить указатели меÑта Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð² подходÑщем формате Ð´Ð»Ñ python" + +#: builtin/for-each-ref.c:1084 +msgid "quote placeholders suitably for Tcl" +msgstr "выводить указатели меÑта Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð² подходÑщем формате Ð´Ð»Ñ Tcl" + +#: builtin/for-each-ref.c:1087 +msgid "show only <n> matched refs" +msgstr "показать только <n> Ñовпадающих ÑÑылок" + +#: builtin/for-each-ref.c:1088 builtin/replace.c:438 +msgid "format" +msgstr "формат" + +#: builtin/for-each-ref.c:1088 +msgid "format to use for the output" +msgstr "иÑпользовать формат Ð´Ð»Ñ Ð²Ñ‹Ð²Ð¾Ð´Ð°" + +#: builtin/for-each-ref.c:1089 +msgid "key" +msgstr "ключ" + +#: builtin/for-each-ref.c:1090 +msgid "field name to sort on" +msgstr "Ð¸Ð¼Ñ Ð¿Ð¾Ð»Ñ, по которому выполнить Ñортировку" + +#: builtin/fsck.c:147 builtin/prune.c:137 +msgid "Checking connectivity" +msgstr "Проверка ÑоединениÑ" + +#: builtin/fsck.c:540 +msgid "Checking object directories" +msgstr "Проверка каталогов объектов" + +#: builtin/fsck.c:603 +msgid "git fsck [<options>] [<object>...]" +msgstr "git fsck [<опции>] [<объект>…]" + +#: builtin/fsck.c:609 +msgid "show unreachable objects" +msgstr "показать недоÑтупные объекты" + +#: builtin/fsck.c:610 +msgid "show dangling objects" +msgstr "показать объекты, на которые нет ÑÑылок" + +#: builtin/fsck.c:611 +msgid "report tags" +msgstr "вывеÑти отчет по меткам" + +#: builtin/fsck.c:612 +msgid "report root nodes" +msgstr "вывеÑти отчет по корневым узлам" + +#: builtin/fsck.c:613 +msgid "make index objects head nodes" +msgstr "воÑпринимать объекты в индекÑе как корневые узлы" + +#: builtin/fsck.c:614 +msgid "make reflogs head nodes (default)" +msgstr "Ñоздать корневые узлы журналов ÑÑылок (по умолчанию)" + +#: builtin/fsck.c:615 +msgid "also consider packs and alternate objects" +msgstr "также проверÑÑ‚ÑŒ пакеты и альтернативные объекты" + +#: builtin/fsck.c:616 +msgid "enable more strict checking" +msgstr "иÑпользовать более Ñтрогую проверку" + +#: builtin/fsck.c:618 +msgid "write dangling objects in .git/lost-found" +msgstr "запиÑать объекты на которые нет ÑÑылок в .git/lost-found" + +#: builtin/fsck.c:619 builtin/prune.c:108 +msgid "show progress" +msgstr "показать прогреÑÑ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ" + +#: builtin/fsck.c:669 +msgid "Checking objects" +msgstr "Проверка объектов" + +#: builtin/gc.c:24 +msgid "git gc [<options>]" +msgstr "git gc [<опции>]" + +#: builtin/gc.c:79 +#, c-format +msgid "Invalid gc.pruneexpire: '%s'" +msgstr "Ðеправильный gc.pruneexpire: «%s»" + +#: builtin/gc.c:107 +#, c-format +msgid "insanely long object directory %.*s" +msgstr "Ñлишком длинный путь к каталогу объекта %.*s" + +#: builtin/gc.c:276 +msgid "prune unreferenced objects" +msgstr "почиÑтить объекты, на которые нет ÑÑылок" + +#: builtin/gc.c:278 +msgid "be more thorough (increased runtime)" +msgstr "проверÑÑ‚ÑŒ более внимательно (занимает больше времени)" + +#: builtin/gc.c:279 +msgid "enable auto-gc mode" +msgstr "включить режим auto-gc" + +#: builtin/gc.c:280 +msgid "force running gc even if there may be another gc running" +msgstr "принудительно запуÑтить gc, даже еÑÑ‚ÑŒ Ð´Ñ€ÑƒÐ³Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ gc уже запущена" + +#: builtin/gc.c:321 +#, c-format +msgid "Auto packing the repository in background for optimum performance.\n" +msgstr "ÐвтоматичеÑÐºÐ°Ñ ÑƒÐ¿Ð°ÐºÐ¾Ð²ÐºÐ° Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ð² фоне, Ð´Ð»Ñ Ð¾Ð¿Ñ‚Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ð¹ производительноÑти.\n" + +#: builtin/gc.c:323 +#, c-format +msgid "Auto packing the repository for optimum performance.\n" +msgstr "ÐвтоматичеÑÐºÐ°Ñ ÑƒÐ¿Ð°ÐºÐ¾Ð²ÐºÐ° репозиториÑ, Ð´Ð»Ñ Ð¾Ð¿Ñ‚Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ð¹ производительноÑти.\n" + +#: builtin/gc.c:324 +#, c-format +msgid "See \"git help gc\" for manual housekeeping.\n" +msgstr "Смотрите «git help gc» руководÑтва по ручной очиÑтке.\n" + +#: builtin/gc.c:342 +#, c-format +msgid "" +"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" +msgstr "gc уже запущен на Ñтом компьютере «%s» pid %<PRIuMAX> (еÑли нет, иÑпользуйте --force)" + +#: builtin/gc.c:364 +msgid "" +"There are too many unreachable loose objects; run 'git prune' to remove " +"them." +msgstr "ИмеетÑÑ Ñлишком много объектов, на которые нет ÑÑылок; запуÑтите «git prune» Ð´Ð»Ñ Ð¸Ñ… удалениÑ." + +#: builtin/grep.c:23 +msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" +msgstr "git grep [<опции>] [-e] <шаблон> [<редакциÑ>…] [[--] <путь>…]" + +#: builtin/grep.c:218 +#, c-format +msgid "grep: failed to create thread: %s" +msgstr "grep: Ñбой ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ð¾Ñ‚Ð¾ÐºÐ°: %s" + +#: builtin/grep.c:441 builtin/grep.c:476 +#, c-format +msgid "unable to read tree (%s)" +msgstr "не удалоÑÑŒ прочитать дерево (%s)" + +#: builtin/grep.c:491 +#, c-format +msgid "unable to grep from object of type %s" +msgstr "не удалоÑÑŒ выполнить grep из объекта типа %s" + +#: builtin/grep.c:547 +#, c-format +msgid "switch `%c' expects a numerical value" +msgstr "параметр «%c» ожидает чиÑловое значение" + +#: builtin/grep.c:564 +#, c-format +msgid "cannot open '%s'" +msgstr "не удалоÑÑŒ открыть «%s»" + +#: builtin/grep.c:638 +msgid "search in index instead of in the work tree" +msgstr "иÑкать в индекÑе, а не в рабочем каталоге" + +#: builtin/grep.c:640 +msgid "find in contents not managed by git" +msgstr "иÑкать в Ñодержимом не управлÑемым git" + +#: builtin/grep.c:642 +msgid "search in both tracked and untracked files" +msgstr "иÑкать и в отÑлеживаемых, и в неотÑлеживаемых файлах" + +#: builtin/grep.c:644 +msgid "ignore files specified via '.gitignore'" +msgstr "игнорировать файлы указанные в «.gitignore»" + +#: builtin/grep.c:647 +msgid "show non-matching lines" +msgstr "иÑкать в неÑовпадающих Ñтроках" + +#: builtin/grep.c:649 +msgid "case insensitive matching" +msgstr "без учета региÑтра" + +#: builtin/grep.c:651 +msgid "match patterns only at word boundaries" +msgstr "иÑкать ÑÐ¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð° только на границах Ñлов" + +#: builtin/grep.c:653 +msgid "process binary files as text" +msgstr "обработка двоичных файлов как текÑта" + +#: builtin/grep.c:655 +msgid "don't match patterns in binary files" +msgstr "не иÑкать ÑÐ¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð° в двоичных файлах" + +#: builtin/grep.c:658 +msgid "process binary files with textconv filters" +msgstr "обрабатыватьÑÑ Ð´Ð²Ð¾Ð¸Ñ‡Ð½Ñ‹Ðµ файлы Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ фильтров textconv" + +#: builtin/grep.c:660 +msgid "descend at most <depth> levels" +msgstr "на глубине макÑиму <глубина> уровней" + +#: builtin/grep.c:664 +msgid "use extended POSIX regular expressions" +msgstr "иÑпользовать раÑширенные регулÑрные Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ POSIX" + +#: builtin/grep.c:667 +msgid "use basic POSIX regular expressions (default)" +msgstr "иÑпользовать базовые регулÑрные Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ POSIX (по умолчанию)" + +#: builtin/grep.c:670 +msgid "interpret patterns as fixed strings" +msgstr "интерпретировать шаблоны как фикÑированные Ñтроки" + +#: builtin/grep.c:673 +msgid "use Perl-compatible regular expressions" +msgstr "иÑпользовать Perl-ÑовмеÑтимые регулÑрные выражениÑ" + +#: builtin/grep.c:676 +msgid "show line numbers" +msgstr "вывеÑти номера Ñтрок" + +#: builtin/grep.c:677 +msgid "don't show filenames" +msgstr "не выводить имена файлов" + +#: builtin/grep.c:678 +msgid "show filenames" +msgstr "выводить имена файлов" + +#: builtin/grep.c:680 +msgid "show filenames relative to top directory" +msgstr "выводить имена файлов отноÑительно каталога репозиториÑ" + +#: builtin/grep.c:682 +msgid "show only filenames instead of matching lines" +msgstr "выводить только имена файлов, а не Ñовпадающие Ñтроки" + +#: builtin/grep.c:684 +msgid "synonym for --files-with-matches" +msgstr "Ñиноним Ð´Ð»Ñ --files-with-matches" + +#: builtin/grep.c:687 +msgid "show only the names of files without match" +msgstr "выводить только неÑовпадающие имена файлов" + +#: builtin/grep.c:689 +msgid "print NUL after filenames" +msgstr "выводить двоичный ÐОЛЬ поÑле ÑпиÑка имен файлов" + +#: builtin/grep.c:691 +msgid "show the number of matches instead of matching lines" +msgstr "выводить количеÑтво Ñовпадений, а не Ñовпадающие Ñтроки" + +#: builtin/grep.c:692 +msgid "highlight matches" +msgstr "подÑвечивать ÑовпадениÑ" + +#: builtin/grep.c:694 +msgid "print empty line between matches from different files" +msgstr "выводить пуÑтую Ñтроку поÑле Ñовпадений из разных файлов" + +#: builtin/grep.c:696 +msgid "show filename only once above matches from same file" +msgstr "выводить Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° только раз на неÑколько Ñовпадений в одном файле" + +#: builtin/grep.c:699 +msgid "show <n> context lines before and after matches" +msgstr "показать <n> Ñтрок контекÑта перед и поÑле ÑовпадениÑ" + +#: builtin/grep.c:702 +msgid "show <n> context lines before matches" +msgstr "показать <n> Ñтрок контекÑта перед Ñовпадением" + +#: builtin/grep.c:704 +msgid "show <n> context lines after matches" +msgstr "показать <n> Ñтрок контекÑта поÑле ÑовпадениÑ" + +#: builtin/grep.c:705 +msgid "shortcut for -C NUM" +msgstr "тоже, что и -C КОЛИЧЕСТВО" + +#: builtin/grep.c:708 +msgid "show a line with the function name before matches" +msgstr "показать Ñтроку Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ функции перед Ñовпадением" + +#: builtin/grep.c:710 +msgid "show the surrounding function" +msgstr "показать окружающую функцию" + +#: builtin/grep.c:713 +msgid "read patterns from file" +msgstr "прочитать шаблоны из файла" + +#: builtin/grep.c:715 +msgid "match <pattern>" +msgstr "поиÑк ÑоответÑтвий Ñ <шаблоном>" + +#: builtin/grep.c:717 +msgid "combine patterns specified with -e" +msgstr "объединить шаблоны указанные Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ -e" + +#: builtin/grep.c:729 +msgid "indicate hit with exit status without output" +msgstr "ничего не выводить, указать на Ñовпадение Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ кода выхода" + +#: builtin/grep.c:731 +msgid "show only matches from files that match all patterns" +msgstr "показать только ÑÐ¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ Ð¸Ð· файлов в которых Ñовпадают вÑе шаблоны" + +#: builtin/grep.c:733 +msgid "show parse tree for grep expression" +msgstr "показать дерево разбора Ð´Ð»Ñ Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð¸Ñка" + +#: builtin/grep.c:737 +msgid "pager" +msgstr "пейджер" + +#: builtin/grep.c:737 +msgid "show matching files in the pager" +msgstr "показать Ñовпадающие файлы Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ программы-пейджера" + +#: builtin/grep.c:740 +msgid "allow calling of grep(1) (ignored by this build)" +msgstr "разрешить вызов grep(1) (игнорируетÑÑ Ð² Ñтой Ñборке)" + +#: builtin/grep.c:741 builtin/show-ref.c:187 +msgid "show usage" +msgstr "показать иÑпользование" + +#: builtin/grep.c:808 +msgid "no pattern given." +msgstr "не задан шаблон." + +#: builtin/grep.c:866 +msgid "--open-files-in-pager only works on the worktree" +msgstr "--open-files-in-pager работает только в рабочем каталоге" + +#: builtin/grep.c:892 +msgid "--cached or --untracked cannot be used with --no-index." +msgstr "--cached или --untracked Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ --no-index." + +#: builtin/grep.c:897 +msgid "--no-index or --untracked cannot be used with revs." +msgstr "--no-index или --untracked Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸ÐµÐ¼ ревизии." + +#: builtin/grep.c:900 +msgid "--[no-]exclude-standard cannot be used for tracked contents." +msgstr "--[no-]exclude-standard не может иÑпользоватьÑÑ Ð´Ð»Ñ Ð¾Ñ‚Ñлеживаемого Ñодержимого." + +#: builtin/grep.c:908 +msgid "both --cached and trees are given." +msgstr "указано одновременно --cached и дерево." + +#: builtin/hash-object.c:82 +msgid "" +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " +"[--] <file>..." +msgstr "git hash-object [-t <тип>] [-w] [--path=<файл> | --no-filters] [--stdin] [--] <файл>…" + +#: builtin/hash-object.c:83 +msgid "git hash-object --stdin-paths < <list-of-paths>" +msgstr "git hash-object --stdin-paths < <ÑпиÑок-путей>" + +#: builtin/hash-object.c:94 builtin/tag.c:612 +msgid "type" +msgstr "тип" + +#: builtin/hash-object.c:94 +msgid "object type" +msgstr "тип объекта" + +#: builtin/hash-object.c:95 +msgid "write the object into the object database" +msgstr "запиÑÑŒ объекта в базу данных объектов" + +#: builtin/hash-object.c:97 +msgid "read the object from stdin" +msgstr "прочитать объект из Ñтандартного ввода" + +#: builtin/hash-object.c:99 +msgid "store file as is without filters" +msgstr "Ñохранить файл без иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð¾Ð²" + +#: 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 "обработать файл так, будто он находитÑÑ Ð¿Ð¾ указанному пути" + +#: builtin/help.c:41 +msgid "print all available commands" +msgstr "вывеÑти ÑпиÑок вÑех доÑтупных команд" + +#: builtin/help.c:42 +msgid "print list of useful guides" +msgstr "вывеÑти ÑпиÑок полезных руководÑтв" + +#: builtin/help.c:43 +msgid "show man page" +msgstr "открыть руководÑтво в формате man" + +#: builtin/help.c:44 +msgid "show manual in web browser" +msgstr "открыть руководÑтво в веб-браузере" + +#: builtin/help.c:46 +msgid "show info page" +msgstr "открыть руководÑтво в формате info" + +#: builtin/help.c:52 +msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" +msgstr "git help [--all] [--guides] [--man | --web | --info] [<команда>]" + +#: builtin/help.c:64 +#, c-format +msgid "unrecognized help format '%s'" +msgstr "неопознанный формат руководÑтва «%s»" + +#: builtin/help.c:91 +msgid "Failed to start emacsclient." +msgstr "Сбой при запуÑке emacsclient." + +#: builtin/help.c:104 +msgid "Failed to parse emacsclient version." +msgstr "Сбой при определении верÑии emacsclient." + +#: builtin/help.c:112 +#, c-format +msgid "emacsclient version '%d' too old (< 22)." +msgstr "верÑÐ¸Ñ emacsclient «%d» Ñлишком ÑÑ‚Ð°Ñ€Ð°Ñ (< 22)." + +#: 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:215 +#, c-format +msgid "" +"'%s': path for unsupported man viewer.\n" +"Please consider using 'man.<tool>.cmd' instead." +msgstr "«%s»: путь Ð´Ð»Ñ Ð½ÐµÐ¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÐµÐ¼Ð¾Ð¹ программы проÑмотра man.\nВмеÑто Ñтого иÑпользуйте «man.<программа>.cmd»." + +#: builtin/help.c:227 +#, c-format +msgid "" +"'%s': cmd for supported man viewer.\n" +"Please consider using 'man.<tool>.path' instead." +msgstr "«%s»: команда Ð´Ð»Ñ Ð½ÐµÐ¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÐµÐ¼Ð¾Ð¹ программы проÑмотра man.\nВмеÑто Ñтого иÑпользуйте «man.<программа>.path»." + +#: builtin/help.c:354 +#, c-format +msgid "'%s': unknown man viewer." +msgstr "«%s»: неизвеÑÑ‚Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° проÑмотра man." + +#: builtin/help.c:371 +msgid "no man viewer handled the request" +msgstr "программа проÑмотра man не обработала запроÑ" + +#: builtin/help.c:379 +msgid "no info viewer handled the request" +msgstr "программа проÑмотра info не обработала запроÑ" + +#: builtin/help.c:428 +msgid "Defining attributes per path" +msgstr "Определение атрибутов Ð´Ð»Ñ Ð¿ÑƒÑ‚ÐµÐ¹ файлов или каталогов" + +#: builtin/help.c:429 +msgid "Everyday Git With 20 Commands Or So" +msgstr "ПовÑедневный Git Ñ 20 командами или около того" + +#: builtin/help.c:430 +msgid "A Git glossary" +msgstr "ГлоÑÑарий Git" + +#: builtin/help.c:431 +msgid "Specifies intentionally untracked files to ignore" +msgstr "Указание Ñпециально игнорируемых файлов" + +#: builtin/help.c:432 +msgid "Defining submodule properties" +msgstr "Определение ÑвойÑтв подмодулей" + +#: builtin/help.c:433 +msgid "Specifying revisions and ranges for Git" +msgstr "Указание редакций и диапазонов Ð´Ð»Ñ Git" + +#: builtin/help.c:434 +msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" +msgstr "Учебное введение в Git (Ð´Ð»Ñ Ð²ÐµÑ€Ñии 1.5.1 или новее)" + +#: builtin/help.c:435 +msgid "An overview of recommended workflows with Git" +msgstr "Обзор рекомендуемых поÑледовательноÑтей выполнÑемых дейÑтвий Ñ Git" + +#: builtin/help.c:447 +msgid "The common Git guides are:\n" +msgstr "ОÑновные руководÑтва Git:\n" + +#: builtin/help.c:468 builtin/help.c:485 +#, c-format +msgid "usage: %s%s" +msgstr "иÑпользование: %s%s" + +#: builtin/help.c:501 +#, c-format +msgid "`git %s' is aliased to `%s'" +msgstr "«git %s» — Ñто Ñокращение Ð´Ð»Ñ Â«%s»" + +#: builtin/index-pack.c:150 +#, c-format +msgid "unable to open %s" +msgstr "не удалоÑÑŒ открыть %s" + +#: builtin/index-pack.c:200 +#, c-format +msgid "object type mismatch at %s" +msgstr "неÑоответÑтвие типа объекта на %s" + +#: builtin/index-pack.c:220 +#, c-format +msgid "did not receive expected object %s" +msgstr "ожидаемый объект не получен на %s" + +#: builtin/index-pack.c:223 +#, c-format +msgid "object %s: expected type %s, found %s" +msgstr "объект %s: ожидаемый тип %s, получен %s" + +#: builtin/index-pack.c:265 +#, c-format +msgid "cannot fill %d byte" +msgid_plural "cannot fill %d bytes" +msgstr[0] "не удалоÑÑŒ заполнить %d байт" +msgstr[1] "не удалоÑÑŒ заполнить %d байта" +msgstr[2] "не удалоÑÑŒ заполнить %d байтов" + +#: builtin/index-pack.c:275 +msgid "early EOF" +msgstr "неожиданный конец файла" + +#: builtin/index-pack.c:276 +msgid "read error on input" +msgstr "ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð²Ð²Ð¾Ð´Ð°" + +#: builtin/index-pack.c:288 +msgid "used more bytes than were available" +msgstr "иÑпользовано больше байт, чем было доÑтупно" + +#: builtin/index-pack.c:295 +msgid "pack too large for current definition of off_t" +msgstr "пакет Ñлишком большой Ð´Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ³Ð¾ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ off_t" + +#: builtin/index-pack.c:311 +#, c-format +msgid "unable to create '%s'" +msgstr "не удалоÑÑŒ Ñоздать «%s»" + +#: builtin/index-pack.c:316 +#, c-format +msgid "cannot open packfile '%s'" +msgstr "не удалоÑÑŒ открыть файл пакета «%s»" + +#: builtin/index-pack.c:330 +msgid "pack signature mismatch" +msgstr "неÑоответÑтвие подпиÑи пакета" + +#: builtin/index-pack.c:332 +#, c-format +msgid "pack version %<PRIu32> unsupported" +msgstr "верÑÐ¸Ñ Ð¿Ð°ÐºÐµÑ‚Ð° %<PRIu32> не поддерживаетÑÑ" + +#: builtin/index-pack.c:350 +#, c-format +msgid "pack has bad object at offset %lu: %s" +msgstr "в пакете ÑодержитÑÑ Ð¿Ð¾Ð²Ñ€ÐµÐ¶Ð´ÐµÐ½Ð½Ñ‹Ð¹ объект по Ñмещению %lu: %s" + +#: builtin/index-pack.c:471 +#, c-format +msgid "inflate returned %d" +msgstr "программа ÑÐ¶Ð°Ñ‚Ð¸Ñ Ð²ÐµÑ€Ð½ÑƒÐ»Ð° %d" + +#: builtin/index-pack.c:520 +msgid "offset value overflow for delta base object" +msgstr "переполнение Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ ÑÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ñƒ базового объекта дельты" + +#: builtin/index-pack.c:528 +msgid "delta base offset is out of bound" +msgstr "Ñмещение базовой дельты вышло за допуÑтимые пределы" + +#: builtin/index-pack.c:536 +#, c-format +msgid "unknown object type %d" +msgstr "неизвеÑтный тип объекта %d" + +#: builtin/index-pack.c:567 +msgid "cannot pread pack file" +msgstr "не удалоÑÑŒ выполнить pread Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð° пакета" + +#: 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 байта отÑутÑтвует" +msgstr[2] "преждевременное окончание файла пакета, %lu байтов отÑутÑтвует" + +#: builtin/index-pack.c:595 +msgid "serious inflate inconsistency" +msgstr "Ñерьезное неÑоответÑтвие при раÑпаковке" + +#: 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 !" + +#: builtin/index-pack.c:689 builtin/pack-objects.c:162 +#: builtin/pack-objects.c:254 +#, c-format +msgid "unable to read %s" +msgstr "не удалоÑÑŒ прочитать %s" + +#: builtin/index-pack.c:755 +#, c-format +msgid "cannot read existing object %s" +msgstr "не удалоÑÑŒ прочитать ÑущеÑтвующий объект %s" + +#: builtin/index-pack.c:769 +#, c-format +msgid "invalid blob object %s" +msgstr "неправильный файл двоичного объекта %s" + +#: builtin/index-pack.c:783 +#, c-format +msgid "invalid %s" +msgstr "неправильный %s" + +#: builtin/index-pack.c:787 +msgid "Error in object" +msgstr "Ошибка в объекте" + +#: builtin/index-pack.c:789 +#, c-format +msgid "Not all child objects of %s are reachable" +msgstr "Ðе вÑе дочерние объекты %s доÑтижимы" + +#: builtin/index-pack.c:861 builtin/index-pack.c:890 +msgid "failed to apply delta" +msgstr "Ñбой при применении дельты" + +#: builtin/index-pack.c:1055 +msgid "Receiving objects" +msgstr "Получение объектов" + +#: builtin/index-pack.c:1055 +msgid "Indexing objects" +msgstr "ИндекÑирование объектов" + +#: builtin/index-pack.c:1081 +msgid "pack is corrupted (SHA1 mismatch)" +msgstr "пакет поврежден (неÑоответÑтвие SHA1)" + +#: builtin/index-pack.c:1086 +msgid "cannot fstat packfile" +msgstr "не удалоÑÑŒ выполнить fstat Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð° пакета" + +#: builtin/index-pack.c:1089 +msgid "pack has junk at the end" +msgstr "файл пакета Ñодержит муÑор в конце" + +#: builtin/index-pack.c:1100 +msgid "confusion beyond insanity in parse_pack_objects()" +msgstr "Ð±ÐµÐ·ÑƒÐ¼Ð½Ð°Ñ Ð¿ÑƒÑ‚Ð°Ð½Ð¸Ñ†Ð° в parse_pack_objects()" + +#: builtin/index-pack.c:1123 +msgid "Resolving deltas" +msgstr "Определение изменений" + +#: builtin/index-pack.c:1133 +#, c-format +msgid "unable to create thread: %s" +msgstr "не удалоÑÑŒ Ñоздать поток: %s" + +#: builtin/index-pack.c:1175 +msgid "confusion beyond insanity" +msgstr "Ð±ÐµÐ·ÑƒÐ¼Ð½Ð°Ñ Ð¿ÑƒÑ‚Ð°Ð½Ð¸Ñ†Ð°" + +#: builtin/index-pack.c:1181 +#, c-format +msgid "completed with %d local objects" +msgstr "завершено Ñ %d локальными объектами" + +#: builtin/index-pack.c:1191 +#, c-format +msgid "Unexpected tail checksum for %s (disk corruption?)" +msgstr "ÐÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ð°Ñ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒÐ½Ð°Ñ Ñумма в конце %s (диÑк поврежден?)" + +#: 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 неразрешенные дельты" +msgstr[2] "пакет Ñодержит %d неразрешенных дельт" + +#: builtin/index-pack.c:1219 +#, c-format +msgid "unable to deflate appended object (%d)" +msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ñжать приÑоединенный объект (%d)" + +#: builtin/index-pack.c:1298 +#, c-format +msgid "local object %s is corrupt" +msgstr "локальный объект %s поврежден" + +#: builtin/index-pack.c:1322 +msgid "error while closing pack file" +msgstr "ошибка при закрытии файла пакета" + +#: builtin/index-pack.c:1335 +#, c-format +msgid "cannot write keep file '%s'" +msgstr "не удалоÑÑŒ запиÑать файл ÑƒÐ´ÐµÑ€Ð¶Ð°Ð½Ð¸Ñ Â«%s»" + +#: builtin/index-pack.c:1343 +#, c-format +msgid "cannot close written keep file '%s'" +msgstr "не удалоÑÑŒ закрыть запиÑанный файл ÑƒÐ´ÐµÑ€Ð¶Ð°Ð½Ð¸Ñ Â«%s»" + +#: builtin/index-pack.c:1356 +msgid "cannot store pack file" +msgstr "не удалоÑÑŒ Ñохранить файл пакета" + +#: builtin/index-pack.c:1367 +msgid "cannot store index file" +msgstr "не удалоÑÑŒ Ñохранить файл индекÑа" + +#: builtin/index-pack.c:1400 +#, c-format +msgid "bad pack.indexversion=%<PRIu32>" +msgstr "плохой pack.indexversion=%<PRIu32>" + +#: builtin/index-pack.c:1406 +#, c-format +msgid "invalid number of threads specified (%d)" +msgstr "указано неправильное количеÑтво потоков (%d)" + +#: builtin/index-pack.c:1410 builtin/index-pack.c:1589 +#, c-format +msgid "no threads support, ignoring %s" +msgstr "нет поддержки потоков, игнорирование %s" + +#: builtin/index-pack.c:1468 +#, c-format +msgid "Cannot open existing pack file '%s'" +msgstr "Ðе удалоÑÑŒ открыть ÑущеÑтвующий файл пакета «%s»" + +#: builtin/index-pack.c:1470 +#, c-format +msgid "Cannot open existing pack idx file for '%s'" +msgstr "Ðе удалоÑÑŒ открыть ÑущеÑтвующий файл индекÑа Ð´Ð»Ñ Â«%s»" + +#: builtin/index-pack.c:1517 +#, c-format +msgid "non delta: %d object" +msgid_plural "non delta: %d objects" +msgstr[0] "не дельты: %d объект" +msgstr[1] "не дельты: %d объекта" +msgstr[2] "не дельты: %d объектов" + +#: builtin/index-pack.c:1524 +#, c-format +msgid "chain length = %d: %lu object" +msgid_plural "chain length = %d: %lu objects" +msgstr[0] "длина цепочки = %d: %lu объект" +msgstr[1] "длина цепочки = %d: %lu объекта" +msgstr[2] "длина цепочки = %d: %lu объектов" + +#: builtin/index-pack.c:1553 +msgid "Cannot come back to cwd" +msgstr "Ðе удалоÑÑŒ вернутьÑÑ Ð² текущий рабочий каталог" + +#: builtin/index-pack.c:1601 builtin/index-pack.c:1604 +#: builtin/index-pack.c:1616 builtin/index-pack.c:1620 +#, c-format +msgid "bad %s" +msgstr "плохой %s" + +#: builtin/index-pack.c:1634 +msgid "--fix-thin cannot be used without --stdin" +msgstr "--fix-thin Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать без --stdin" + +#: builtin/index-pack.c:1638 builtin/index-pack.c:1647 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "Ð¸Ð¼Ñ Ð¿Ð°ÐºÐµÑ‚Ð° «%s» не оканчиваетÑÑ Ð½Ð° «.pack»" + +#: builtin/index-pack.c:1655 +msgid "--verify with no packfile name given" +msgstr "--verify без ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð¸Ð¼ÐµÐ½Ð¸ файла пакета" + +#: builtin/init-db.c:35 +#, c-format +msgid "Could not make %s writable by group" +msgstr "Ðе удалоÑÑŒ предоÑтавить доÑтуп к %s на запиÑÑŒ" + +#: builtin/init-db.c:62 +#, c-format +msgid "insanely long template name %s" +msgstr "Ñлишком длинное Ð¸Ð¼Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð° %s" + +#: builtin/init-db.c:67 +#, c-format +msgid "cannot stat '%s'" +msgstr "не удалоÑÑŒ выполнить stat Ð´Ð»Ñ Â«%s»" + +#: builtin/init-db.c:73 +#, c-format +msgid "cannot stat template '%s'" +msgstr "не удалоÑÑŒ выполнить stat Ð´Ð»Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð° «%s»" + +#: builtin/init-db.c:80 +#, c-format +msgid "cannot opendir '%s'" +msgstr "не удалоÑÑŒ выполнить opendir Ð´Ð»Ñ Â«%s»" + +#: builtin/init-db.c:97 +#, c-format +msgid "cannot readlink '%s'" +msgstr "не удалоÑÑŒ выполнить readlink Ð´Ð»Ñ Â«%s»" + +#: builtin/init-db.c:99 +#, c-format +msgid "insanely long symlink %s" +msgstr "Ñлишком Ð´Ð»Ð¸Ð½Ð½Ð°Ñ ÑÐ¸Ð¼Ð²Ð¾Ð»ÑŒÐ½Ð°Ñ ÑÑылка %s" + +#: builtin/init-db.c:102 +#, c-format +msgid "cannot symlink '%s' '%s'" +msgstr "не удалоÑÑŒ Ñоздать Ñимвольную ÑÑылку «%s» на «%s»" + +#: builtin/init-db.c:106 +#, c-format +msgid "cannot copy '%s' to '%s'" +msgstr "не удалоÑÑŒ Ñкопировать файл «%s» в «%s»" + +#: builtin/init-db.c:110 +#, c-format +msgid "ignoring template %s" +msgstr "игнорирование шаблона %s" + +#: builtin/init-db.c:136 +#, c-format +msgid "insanely long template path %s" +msgstr "Ñлишком длинный путь шаблона %s" + +#: builtin/init-db.c:144 +#, c-format +msgid "templates not found %s" +msgstr "шаблоны не найдены %s" + +#: builtin/init-db.c:157 +#, c-format +msgid "not copying templates of a wrong format version %d from '%s'" +msgstr "не копирую шаблоны в неправильной верÑии формата %d из «%s»" + +#: builtin/init-db.c:197 +#, c-format +msgid "insane git directory %s" +msgstr "Ñлишком длинный путь к каталогу git %s" + +#: builtin/init-db.c:331 builtin/init-db.c:334 +#, c-format +msgid "%s already exists" +msgstr "%s уже ÑущеÑтвует" + +#: builtin/init-db.c:363 +#, c-format +msgid "unable to handle file type %d" +msgstr "не удаетÑÑ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ñ‚ÑŒ файл типа %d" + +#: builtin/init-db.c:366 +#, c-format +msgid "unable to move %s to %s" +msgstr "не удаетÑÑ Ð¿ÐµÑ€ÐµÐ¼ÐµÑтить файл %s в %s" + +#. TRANSLATORS: The first '%s' is either "Reinitialized +#. existing" or "Initialized empty", the second " shared" or +#. "", and the last '%s%s' is the verbatim directory name. +#: builtin/init-db.c:426 +#, c-format +msgid "%s%s Git repository in %s%s\n" +msgstr "%s%s репозиторий Git в %s%s\n" + +#: builtin/init-db.c:427 +msgid "Reinitialized existing" +msgstr "Ð ÐµÐ¸Ð½Ð¸Ñ†Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ ÑущеÑтвующего" + +#: builtin/init-db.c:427 +msgid "Initialized empty" +msgstr "Инициализирован пуÑтой" + +#: builtin/init-db.c:428 +msgid " shared" +msgstr " общий" + +#: builtin/init-db.c:475 +msgid "" +"git init [-q | --quiet] [--bare] [--template=<template-directory>] " +"[--shared[=<permissions>]] [<directory>]" +msgstr "git init [-q | --quiet] [--bare] [--template=<каталог-шаблонов>] [--shared[=<права-доÑтупа>]] [<каталог>]" + +#: builtin/init-db.c:498 +msgid "permissions" +msgstr "права-доÑтупа" + +#: builtin/init-db.c:499 +msgid "specify that the git repository is to be shared amongst several users" +msgstr "укажите, еÑли репозиторий git будет иÑпользоватьÑÑ Ð½ÐµÑколькими пользователÑми" + +#: builtin/init-db.c:501 builtin/prune-packed.c:57 builtin/repack.c:171 +msgid "be quiet" +msgstr "тихий режим" + +#: builtin/init-db.c:533 builtin/init-db.c:538 +#, c-format +msgid "cannot mkdir %s" +msgstr "не удалоÑÑŒ выполнить mkdir %s" + +#: builtin/init-db.c:542 +#, c-format +msgid "cannot chdir to %s" +msgstr "не удалоÑÑŒ выполнить chdir в %s" + +#: builtin/init-db.c:563 +#, c-format +msgid "" +"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" +"dir=<directory>)" +msgstr "%s (или --work-tree=<каталог>) Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать без ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ %s (или --git-dir=<каталог>)" + +#: builtin/init-db.c:591 +#, 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>...]" +msgstr "git log [<опции>] [<диапазон-редакций>] [[--] <путь>…]" + +#: builtin/log.c:42 +msgid "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 "не выводить различиÑ" + +#: builtin/log.c:128 +msgid "show source" +msgstr "показать иÑточник" + +#: builtin/log.c:129 +msgid "Use mail map file" +msgstr "ИÑпользовать файл ÑоответÑÑ‚Ð²Ð¸Ñ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… адреÑов" + +#: builtin/log.c:130 +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: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:588 +#, c-format +msgid "Unknown type: %d" +msgstr "ÐеизвеÑтный тип объекта: %d" + +#: builtin/log.c:689 +msgid "format.headers without value" +msgstr "в format.headers не указано значение" + +#: builtin/log.c:773 +msgid "name of output directory is too long" +msgstr "Ñлишком длинное Ð¸Ð¼Ñ Ð²Ñ‹Ñ…Ð¾Ð´Ð½Ð¾Ð³Ð¾ каталога" + +#: builtin/log.c:789 +#, c-format +msgid "Cannot open patch file %s" +msgstr "Ðу удалоÑÑŒ открыть файл изменений %s" + +#: builtin/log.c:803 +msgid "Need exactly one range." +msgstr "Ðужен только один диапазон." + +#: builtin/log.c:811 +msgid "Not a range." +msgstr "Ðе ÑвлÑетÑÑ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½Ð¾Ð¼." + +#: builtin/log.c:919 +msgid "Cover letter needs email format" +msgstr "Сопроводительное пиÑьмо должно быть в формате Ñлектронной почты" + +#: builtin/log.c:998 +#, c-format +msgid "insane in-reply-to: %s" +msgstr "ошибка в поле in-reply-to: %s" + +#: builtin/log.c:1026 +msgid "git format-patch [<options>] [<since> | <revision-range>]" +msgstr "git format-patch [<опции>] [<начинаÑ-Ñ> | <диапазон-редакций>]" + +#: builtin/log.c:1071 +msgid "Two output directories?" +msgstr "Два выходных каталога?" + +#: builtin/log.c:1186 +msgid "use [PATCH n/m] even with a single patch" +msgstr "выводить [PATCH n/m] даже когда один патч" + +#: builtin/log.c:1189 +msgid "use [PATCH] even with multiple patches" +msgstr "выводить [PATCH] даже когда неÑколько патчей" + +#: builtin/log.c:1193 +msgid "print patches to standard out" +msgstr "выводить патчи на Ñтандартный вывод" + +#: builtin/log.c:1195 +msgid "generate a cover letter" +msgstr "генерировать Ñопроводительное пиÑьмо" + +#: builtin/log.c:1197 +msgid "use simple number sequence for output file names" +msgstr "иÑпользовать проÑтую поÑледовательноÑÑ‚ÑŒ чиÑел Ð´Ð»Ñ Ð¸Ð¼ÐµÐ½ выходных файлов" + +#: builtin/log.c:1198 +msgid "sfx" +msgstr "ÑуффикÑ" + +#: builtin/log.c:1199 +msgid "use <sfx> instead of '.patch'" +msgstr "иÑпользовать ÑÑƒÑ„Ñ„Ð¸ÐºÑ <ÑуффикÑ> вмеÑто «.patch»" + +#: builtin/log.c:1201 +msgid "start numbering patches at <n> instead of 1" +msgstr "начать нумерацию патчей Ñ <n>, а не Ñ 1" + +#: builtin/log.c:1203 +msgid "mark the series as Nth re-roll" +msgstr "пометить Ñерию как Ñнную попытку" + +#: builtin/log.c:1205 +msgid "Use [<prefix>] instead of [PATCH]" +msgstr "ИÑпользовать [<префикÑ>] вмеÑто [PATCH]" + +#: builtin/log.c:1208 +msgid "store resulting files in <dir>" +msgstr "Ñохранить результирующие файлы в <каталог>" + +#: builtin/log.c:1211 +msgid "don't strip/add [PATCH]" +msgstr "не обрезать/добавлÑÑ‚ÑŒ [PATCH]" + +#: builtin/log.c:1214 +msgid "don't output binary diffs" +msgstr "не выводить двоичные различиÑ" + +#: builtin/log.c:1216 +msgid "don't include a patch matching a commit upstream" +msgstr "не включать патч, еÑли коммит уже еÑÑ‚ÑŒ в вышеÑтоÑщей ветке" + +#: builtin/log.c:1218 +msgid "show patch format instead of default (patch + stat)" +msgstr "выводить в формате патча, а не в Ñтандартном (патч + ÑтатиÑтика)" + +#: builtin/log.c:1220 +msgid "Messaging" +msgstr "Передача Ñообщений" + +#: builtin/log.c:1221 +msgid "header" +msgstr "заголовок" + +#: builtin/log.c:1222 +msgid "add email header" +msgstr "добавить заголовок ÑообщениÑ" + +#: builtin/log.c:1223 builtin/log.c:1225 +msgid "email" +msgstr "почта" + +#: builtin/log.c:1223 +msgid "add To: header" +msgstr "добавить заголовок To:" + +#: builtin/log.c:1225 +msgid "add Cc: header" +msgstr "добавить заголовок Cc:" + +#: builtin/log.c:1227 +msgid "ident" +msgstr "идентификатор" + +#: builtin/log.c:1228 +msgid "set From address to <ident> (or committer ident if absent)" +msgstr "уÑтановить Ð°Ð´Ñ€ÐµÑ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÐµÐ»Ñ Ð½Ð° <идентификатор> (или на идентификатор коммитера, еÑли отÑутÑтвует)" + +#: builtin/log.c:1230 +msgid "message-id" +msgstr "идентификатор-ÑообщениÑ" + +#: builtin/log.c:1231 +msgid "make first mail a reply to <message-id>" +msgstr "Ñделать первое пиÑьмо ответом на <идентификатор-ÑообщениÑ>" + +#: builtin/log.c:1232 builtin/log.c:1235 +msgid "boundary" +msgstr "вложение" + +#: builtin/log.c:1233 +msgid "attach the patch" +msgstr "приложить патч" + +#: builtin/log.c:1236 +msgid "inline the patch" +msgstr "включить патч в текÑÑ‚ пиÑьма" + +#: builtin/log.c:1240 +msgid "enable message threading, styles: shallow, deep" +msgstr "включить в пиÑьмах иерархичноÑÑ‚ÑŒ, Ñтили: shallow (чаÑтичную), deep (глубокую)" + +#: builtin/log.c:1242 +msgid "signature" +msgstr "подпиÑÑŒ" + +#: builtin/log.c:1243 +msgid "add a signature" +msgstr "добавить подпиÑÑŒ" + +#: builtin/log.c:1245 +msgid "add a signature from a file" +msgstr "добавить подпиÑÑŒ из файла" + +#: builtin/log.c:1246 +msgid "don't print the patch filenames" +msgstr "не выводить имена файлов патчей" + +#: builtin/log.c:1320 +#, c-format +msgid "invalid ident line: %s" +msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ñтрока идентификации: %s" + +#: builtin/log.c:1335 +msgid "-n and -k are mutually exclusive." +msgstr "-n и -k Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно" + +#: builtin/log.c:1337 +msgid "--subject-prefix and -k are mutually exclusive." +msgstr "--subject-prefix и -k Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно." + +#: builtin/log.c:1345 +msgid "--name-only does not make sense" +msgstr "--name-only не имеет ÑмыÑла" + +#: builtin/log.c:1347 +msgid "--name-status does not make sense" +msgstr "--name-status не имеет ÑмыÑла" + +#: builtin/log.c:1349 +msgid "--check does not make sense" +msgstr "--check не имеет ÑмыÑла" + +#: builtin/log.c:1372 +msgid "standard output, or directory, which one?" +msgstr "Ñтандартный вывод или каталог?" + +#: builtin/log.c:1374 +#, c-format +msgid "Could not create directory '%s'" +msgstr "Ðе удалоÑÑŒ Ñоздать каталог «%s»" + +#: builtin/log.c:1472 +#, c-format +msgid "unable to read signature file '%s'" +msgstr "не удалоÑÑŒ прочитать файл подпиÑи «%s»" + +#: builtin/log.c:1535 +msgid "Failed to create output files" +msgstr "Сбой при Ñоздании выходных файлов" + +#: builtin/log.c:1583 +msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" +msgstr "git cherry [-v] [<вышеÑтоÑщаÑ-ветка> [<голова> [<ограничение>]]]" + +#: builtin/log.c:1638 +#, c-format +msgid "" +"Could not find a tracked remote branch, please specify <upstream> " +"manually.\n" +msgstr "Ðе удалоÑÑŒ найти отÑлеживаемую внешнюю ветку, укажите <вышеÑтоÑщую-ветку> вручную.\n" + +#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665 +#, c-format +msgid "Unknown commit %s" +msgstr "ÐеизвеÑтный коммит %s" + +#: builtin/ls-files.c:358 +msgid "git ls-files [<options>] [<file>...]" +msgstr "git ls-files [<опции>] [<файл>…]" + +#: builtin/ls-files.c:415 +msgid "identify the file status with tags" +msgstr "выводить имена файлов Ñ Ð¼ÐµÑ‚ÐºÐ°Ð¼Ð¸" + +#: builtin/ls-files.c:417 +msgid "use lowercase letters for 'assume unchanged' files" +msgstr "иÑпользовать Ñимволы в нижнем региÑтре Ð´Ð»Ñ Â«Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ð»Ð¾Ð¶Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ без изменений» файлов" + +#: builtin/ls-files.c:419 +msgid "show cached files in the output (default)" +msgstr "показывать кÑшированные файлы при выводе (по умолчанию)" + +#: builtin/ls-files.c:421 +msgid "show deleted files in the output" +msgstr "показывать удаленные файлы при выводе" + +#: builtin/ls-files.c:423 +msgid "show modified files in the output" +msgstr "показывать измененные файлы при выводе" + +#: builtin/ls-files.c:425 +msgid "show other files in the output" +msgstr "показывать другие файлы при выводе" + +#: builtin/ls-files.c:427 +msgid "show ignored files in the output" +msgstr "показывать игнорируемые файлы при выводе" + +#: builtin/ls-files.c:430 +msgid "show staged contents' object name in the output" +msgstr "показывать Ð¸Ð¼Ñ Ð¸Ð½Ð´ÐµÐºÑированного объекта на выводе" + +#: builtin/ls-files.c:432 +msgid "show files on the filesystem that need to be removed" +msgstr "показывать файлы в файловой ÑиÑтеме, которые должны быть удалены" + +#: builtin/ls-files.c:434 +msgid "show 'other' directories' names only" +msgstr "показывать только имена у «других» каталогов" + +#: builtin/ls-files.c:437 +msgid "don't show empty directories" +msgstr "не показывать пуÑтые каталоги" + +#: builtin/ls-files.c:440 +msgid "show unmerged files in the output" +msgstr "показывать не Ñлитые файлы на выводе" + +#: builtin/ls-files.c:442 +msgid "show resolve-undo information" +msgstr "показывать информации о разрешении конфликтов и отмене" + +#: builtin/ls-files.c:444 +msgid "skip files matching pattern" +msgstr "пропуÑтить файлы, ÑоответÑтвующие шаблону" + +#: builtin/ls-files.c:447 +msgid "exclude patterns are read from <file>" +msgstr "прочитать шаблоны иÑÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¸Ð· <файл>" + +#: builtin/ls-files.c:450 +msgid "read additional per-directory exclude patterns in <file>" +msgstr "прочитать дополнительные покаталожные шаблоны иÑÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¸Ð· <файл>" + +#: builtin/ls-files.c:452 +msgid "add the standard git exclusions" +msgstr "добавить Ñтандартные иÑÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ git" + +#: builtin/ls-files.c:455 +msgid "make the output relative to the project top directory" +msgstr "выводить пути отноÑительно корневого каталога проекта" + +#: builtin/ls-files.c:458 +msgid "if any <file> is not in the index, treat this as an error" +msgstr "еÑли какой-либо <файл> не в индекÑе, Ñчитать Ñто ошибкой" + +#: builtin/ls-files.c:459 +msgid "tree-ish" +msgstr "указатель-дерева" + +#: builtin/ls-files.c:460 +msgid "pretend that paths removed since <tree-ish> are still present" +msgstr "притворитьÑÑ, что пути удалены, Ñ‚.к. <указатель-дерева> еще ÑущеÑтвует" + +#: builtin/ls-files.c:462 +msgid "show debugging data" +msgstr "показать отладочную информацию" + +#: builtin/ls-tree.c:28 +msgid "git ls-tree [<options>] <tree-ish> [<path>...]" +msgstr "git ls-tree [<опции>] <указатель-дерева> [<путь>…]" + +#: builtin/ls-tree.c:127 +msgid "only show trees" +msgstr "выводить только деревьÑ" + +#: builtin/ls-tree.c:129 +msgid "recurse into subtrees" +msgstr "проходить рекурÑивно в поддеревьÑ" + +#: builtin/ls-tree.c:131 +msgid "show trees when recursing" +msgstr "выводить Ð´ÐµÑ€ÐµÐ²ÑŒÑ Ð¿Ñ€Ð¸ рекурÑивном проходе" + +#: builtin/ls-tree.c:134 +msgid "terminate entries with NUL byte" +msgstr "разделÑÑ‚ÑŒ запиÑи Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ ÐУЛЕВОГО байта" + +#: builtin/ls-tree.c:135 +msgid "include object size" +msgstr "включить размер объекта" + +#: builtin/ls-tree.c:137 builtin/ls-tree.c:139 +msgid "list only filenames" +msgstr "выводить только имена файлов" + +#: builtin/ls-tree.c:142 +msgid "use full path names" +msgstr "иÑпользовать полные пути" + +#: builtin/ls-tree.c:144 +msgid "list entire tree; not just current directory (implies --full-name)" +msgstr "вывеÑти полное дерево; не только текущий каталог (включает в ÑÐµÐ±Ñ --full-name)" + +#: builtin/merge.c:45 +msgid "git merge [<options>] [<commit>...]" +msgstr "git merge [<опции>] [<коммит>…]" + +#: builtin/merge.c:46 +msgid "git merge [<options>] <msg> HEAD <commit>" +msgstr "git merge [<опции>] <Ñообщение> HEAD <коммит>" + +#: builtin/merge.c:47 +msgid "git merge --abort" +msgstr "git merge --abort" + +#: builtin/merge.c:100 +msgid "switch `m' requires a value" +msgstr "при указании параметра «m» требуетÑÑ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ значение" + +#: builtin/merge.c:137 +#, c-format +msgid "Could not find merge strategy '%s'.\n" +msgstr "Ðе удалоÑÑŒ найти Ñтратегию ÑлиÑÐ½Ð¸Ñ Â«%s».\n" + +#: builtin/merge.c:138 +#, c-format +msgid "Available strategies are:" +msgstr "ДоÑтупные Ñтратегии:" + +#: builtin/merge.c:143 +#, c-format +msgid "Available custom strategies are:" +msgstr "ДоÑтупные пользовательÑкие Ñтратегии:" + +#: builtin/merge.c:193 +msgid "do not show a diffstat at the end of the merge" +msgstr "не выводить ÑтатиÑтику изменений поÑле Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ ÑлиÑниÑ" + +#: builtin/merge.c:196 +msgid "show a diffstat at the end of the merge" +msgstr "вывеÑти ÑтатиÑтику изменений поÑле Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ ÑлиÑниÑ" + +#: builtin/merge.c:197 +msgid "(synonym to --stat)" +msgstr "(Ñиноним Ð´Ð»Ñ --stat)" + +#: builtin/merge.c:199 +msgid "add (at most <n>) entries from shortlog to merge commit message" +msgstr "добавить (макÑимум <n>) запиÑей из короткого журнала в Ñообщение коммита у ÑлиÑниÑ" + +#: builtin/merge.c:202 +msgid "create a single commit instead of doing a merge" +msgstr "Ñоздать один коммит, вмеÑто Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÑлиÑниÑ" + +#: builtin/merge.c:204 +msgid "perform a commit if the merge succeeds (default)" +msgstr "Ñделать коммит, еÑли ÑлиÑние прошло уÑпешно (по умолчанию)" + +#: builtin/merge.c:206 +msgid "edit message before committing" +msgstr "отредактировать Ñообщение перед выполнением коммита" + +#: builtin/merge.c:207 +msgid "allow fast-forward (default)" +msgstr "разрешить перемотку вперед (по умолчанию)" + +#: builtin/merge.c:209 +msgid "abort if fast-forward is not possible" +msgstr "отменить выполнение ÑлиÑниÑ, еÑли перемотка вперед не возможна" + +#: builtin/merge.c:213 +msgid "Verify that the named commit has a valid GPG signature" +msgstr "Проверить, что указанный коммит имеет верную Ñлектронную подпиÑÑŒ GPG" + +#: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89 +msgid "strategy" +msgstr "ÑтратегиÑ" + +#: builtin/merge.c:215 +msgid "merge strategy to use" +msgstr "иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÐ¼Ð°Ñ ÑÑ‚Ñ€Ð°Ñ‚ÐµÐ³Ð¸Ñ ÑлиÑниÑ" + +#: builtin/merge.c:216 +msgid "option=value" +msgstr "опциÑ=значение" + +#: builtin/merge.c:217 +msgid "option for selected merge strategy" +msgstr "опции Ð´Ð»Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð¾Ð¹ Ñтратегии ÑлиÑниÑ" + +#: builtin/merge.c:219 +msgid "merge commit message (for a non-fast-forward merge)" +msgstr "Ñообщение коммита Ð´Ð»Ñ ÑлиÑÐ½Ð¸Ñ (Ð´Ð»Ñ ÑлиÑÐ½Ð¸Ñ Ð±ÐµÐ· перемотки вперед)" + +#: builtin/merge.c:223 +msgid "abort the current in-progress merge" +msgstr "отменить выполнение проиÑходÑщего ÑлиÑниÑ" + +#: builtin/merge.c:251 +msgid "could not run stash." +msgstr "не удалоÑÑŒ выполнить stash." + +#: builtin/merge.c:256 +msgid "stash failed" +msgstr "Ñбой при выполнении stash" + +#: builtin/merge.c:261 +#, c-format +msgid "not a valid object: %s" +msgstr "неправильный объект: %s" + +#: builtin/merge.c:280 builtin/merge.c:297 +msgid "read-tree failed" +msgstr "Ñбой при выполнении read-tree" + +#: builtin/merge.c:327 +msgid " (nothing to squash)" +msgstr " (нечего уплотнÑÑ‚ÑŒ)" + +#: builtin/merge.c:340 +#, c-format +msgid "Squash commit -- not updating HEAD\n" +msgstr "Уплотнение коммита — не обновлÑÑ HEAD\n" + +#: builtin/merge.c:372 +msgid "Writing SQUASH_MSG" +msgstr "ЗапиÑÑŒ SQUASH_MSG" + +#: builtin/merge.c:374 +msgid "Finishing SQUASH_MSG" +msgstr "Завершение SQUASH_MSG" + +#: builtin/merge.c:397 +#, c-format +msgid "No merge message -- not updating HEAD\n" +msgstr "Ðет ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ ÑлиÑÐ½Ð¸Ñ â€” не обновлÑем HEAD\n" + +#: builtin/merge.c:447 +#, c-format +msgid "'%s' does not point to a commit" +msgstr "«%s» не указывает на коммит" + +#: builtin/merge.c:559 +#, c-format +msgid "Bad branch.%s.mergeoptions string: %s" +msgstr "ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ñтрока branch.%s.mergeoptions: %s" + +#: builtin/merge.c:654 +msgid "git write-tree failed to write a tree" +msgstr "git write-tree не удалоÑÑŒ запиÑать дерево" + +#: builtin/merge.c:678 +msgid "Not handling anything other than two heads merge." +msgstr "Ðе обрабатываю ничего, кроме ÑлиÑÐ½Ð¸Ñ Ð´Ð²ÑƒÑ… указателей на коммиты." + +#: builtin/merge.c:692 +#, c-format +msgid "Unknown option for merge-recursive: -X%s" +msgstr "ÐеизвеÑтный параметр merge-recursive: -X%s" + +#: builtin/merge.c:705 +#, c-format +msgid "unable to write %s" +msgstr "не удалоÑÑŒ запиÑать %s" + +#: builtin/merge.c:794 +#, c-format +msgid "Could not read from '%s'" +msgstr "Ðе удалоÑÑŒ прочеÑÑ‚ÑŒ из «%s»" + +#: builtin/merge.c:803 +#, c-format +msgid "Not committing merge; use 'git commit' to complete the merge.\n" +msgstr "Ðе выполнÑÑŽ коммит ÑлиÑниÑ; иÑпользуйте «git commit» Ð´Ð»Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ ÑлиÑниÑ.\n" + +#: builtin/merge.c:809 +#, c-format +msgid "" +"Please enter a commit message to explain why this merge is necessary,\n" +"especially if it merges an updated upstream into a topic branch.\n" +"\n" +"Lines starting with '%c' will be ignored, and an empty message aborts\n" +"the commit.\n" +msgstr "ПожалуйÑта, введите Ñообщение коммита, Ð´Ð»Ñ Ð¾Ð±ÑŠÑÑнениÑ, зачем нужно\nÑто ÑлиÑние, оÑобенно, еÑли Ñто ÑлиÑние обновленной вышеÑтоÑщей\nветки в тематичеÑкую ветку.\n\nСтроки, начинающиеÑÑ Ñ Â«%c» будут проигнорированы, а пуÑтое\nÑообщение отменÑет процеÑÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°.\n" + +#: builtin/merge.c:833 +msgid "Empty commit message." +msgstr "ПуÑтое Ñообщение коммита." + +#: builtin/merge.c:845 +#, c-format +msgid "Wonderful.\n" +msgstr "ПрекраÑно.\n" + +#: builtin/merge.c:900 +#, c-format +msgid "Automatic merge failed; fix conflicts and then commit the result.\n" +msgstr "Ðе удалоÑÑŒ провеÑти автоматичеÑкое ÑлиÑние; иÑправьте конфликты и Ñделайте коммит результата.\n" + +#: builtin/merge.c:916 +#, c-format +msgid "'%s' is not a commit" +msgstr "«%s» не ÑвлÑетÑÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¾Ð¼" + +#: builtin/merge.c:957 +msgid "No current branch." +msgstr "Ðет текущей ветки." + +#: builtin/merge.c:959 +msgid "No remote for the current branch." +msgstr "У текущей ветки нет внешнего репозиториÑ." + +#: builtin/merge.c:961 +msgid "No default upstream defined for the current branch." +msgstr "Ð”Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ ветки не указана вышеÑтоÑÑ‰Ð°Ñ Ð²ÐµÑ‚ÐºÐ° по умолчанию." + +#: builtin/merge.c:966 +#, c-format +msgid "No remote-tracking branch for %s from %s" +msgstr "Ðе указана внешнÑÑ Ð¾Ñ‚ÑÐ»ÐµÐ¶Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ Ð²ÐµÑ‚ÐºÐ° Ð´Ð»Ñ %s на %s" + +#: builtin/merge.c:1122 +msgid "There is no merge to abort (MERGE_HEAD missing)." +msgstr "Ðет ÑлиÑниÑ, которое можно отменить (отÑутÑтвует файл MERGE_HEAD)." + +#: builtin/merge.c:1138 +msgid "" +"You have not concluded your merge (MERGE_HEAD exists).\n" +"Please, commit your changes before you merge." +msgstr "Ð’Ñ‹ не завершили ÑлиÑние (приÑутÑтвует файл MERGE_HEAD).\nВыполните коммит ваших изменений, перед ÑлиÑнием." + +#: builtin/merge.c:1141 git-pull.sh:34 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "Ð’Ñ‹ не завершили ÑлиÑние (приÑутÑтвует файл MERGE_HEAD)." + +#: builtin/merge.c:1145 +msgid "" +"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" +"Please, commit your changes before you merge." +msgstr "Ð’Ñ‹ не завершили отбор лучшего (приÑутÑтвует файл CHERRY_PICK_HEAD).\nПожалуйÑта, выполните коммит ваших изменений, перед ÑлиÑнием." + +#: builtin/merge.c:1148 +msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." +msgstr "Ð’Ñ‹ не завершили отбор лучшего (приÑутÑтвует файл CHERRY_PICK_HEAD)." + +#: builtin/merge.c:1157 +msgid "You cannot combine --squash with --no-ff." +msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно --squash и --no-ff." + +#: builtin/merge.c:1166 +msgid "No commit specified and merge.defaultToUpstream not set." +msgstr "Коммит не указан и параметр merge.defaultToUpstream не уÑтановлен." + +#: builtin/merge.c:1198 +msgid "Can merge only exactly one commit into empty head" +msgstr "Можно Ñлить Ñтрого один коммит в пуÑтой HEAD." + +#: builtin/merge.c:1201 +msgid "Squash commit into empty head not supported yet" +msgstr "Уплотнение коммита в пуÑтой HEAD еще не поддерживаетÑÑ" + +#: builtin/merge.c:1203 +msgid "Non-fast-forward commit does not make sense into an empty head" +msgstr "Коммит, не ÑвлÑющийÑÑ Ð¿ÐµÑ€ÐµÐ¼Ð¾Ñ‚ÐºÐ¾Ð¹ вперед, нет ÑмыÑла делать в пуÑтой HEAD." + +#: builtin/merge.c:1208 +#, c-format +msgid "%s - not something we can merge" +msgstr "%s не ÑвлÑетÑÑ Ñ‚ÐµÐ¼, что можно Ñлить" + +#: builtin/merge.c:1259 +#, c-format +msgid "Commit %s has an untrusted GPG signature, allegedly by %s." +msgstr "Коммит %s Ñодержит не доверенную GPG подпиÑÑŒ, предположительно от %s." + +#: builtin/merge.c:1262 +#, c-format +msgid "Commit %s has a bad GPG signature allegedly by %s." +msgstr "Коммит %s Ñодержит плохую GPG подпиÑÑŒ, предположительно от %s." + +#: builtin/merge.c:1265 +#, c-format +msgid "Commit %s does not have a GPG signature." +msgstr "Коммит %s не Ñодержит GPG подпиÑÑŒ." + +#: builtin/merge.c:1268 +#, c-format +msgid "Commit %s has a good GPG signature by %s\n" +msgstr "Коммит %s Ñодержит дейÑтвительную GPG подпиÑÑŒ, от %s.\n" + +#: builtin/merge.c:1349 +#, c-format +msgid "Updating %s..%s\n" +msgstr "Обновление %s..%s\n" + +#: builtin/merge.c:1388 +#, c-format +msgid "Trying really trivial in-index merge...\n" +msgstr "Попытка тривиального ÑлиÑÐ½Ð¸Ñ Ð² индекÑе…\n" + +#: builtin/merge.c:1395 +#, c-format +msgid "Nope.\n" +msgstr "Ðе вышло.\n" + +#: builtin/merge.c:1427 +msgid "Not possible to fast-forward, aborting." +msgstr "Перемотка вперед не возможна, отмена." + +#: builtin/merge.c:1450 builtin/merge.c:1529 +#, c-format +msgid "Rewinding the tree to pristine...\n" +msgstr "Перемотка дерева к иÑходному ÑоÑтоÑнию…\n" + +#: builtin/merge.c:1454 +#, c-format +msgid "Trying merge strategy %s...\n" +msgstr "Попытка ÑлиÑÐ½Ð¸Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ñтратегии %s…\n" + +#: builtin/merge.c:1520 +#, c-format +msgid "No merge strategy handled the merge.\n" +msgstr "Ðи одна ÑÑ‚Ñ€Ð°Ñ‚ÐµÐ³Ð¸Ñ ÑлиÑÐ½Ð¸Ñ Ð½Ðµ обработала ÑлиÑние.\n" + +#: builtin/merge.c:1522 +#, c-format +msgid "Merge with strategy %s failed.\n" +msgstr "Сбой при ÑлиÑнии Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ñтратегии %s.\n" + +#: builtin/merge.c:1531 +#, c-format +msgid "Using the %s to prepare resolving by hand.\n" +msgstr "ИÑпользую %s Ð´Ð»Ñ Ð¿Ð¾Ð´Ð³Ð¾Ñ‚Ð¾Ð²ÐºÐ¸ ручного Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚Ð¾Ð².\n" + +#: builtin/merge.c:1543 +#, c-format +msgid "Automatic merge went well; stopped before committing as requested\n" +msgstr "ÐвтоматичеÑкое ÑлиÑние прошло уÑпешно; как и запрашивали, оÑтановлено перед выполнением коммита\n" + +#: builtin/merge-base.c:29 +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "git merge-base [-a | --all] <коммит> <коммит>…" + +#: builtin/merge-base.c:30 +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "git merge-base [-a | --all] --octopus <коммит>…" + +#: builtin/merge-base.c:31 +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <коммит>…" + +#: builtin/merge-base.c:32 +msgid "git merge-base --is-ancestor <commit> <commit>" +msgstr "git merge-base --is-ancestor <коммит> <коммит>" + +#: builtin/merge-base.c:33 +msgid "git merge-base --fork-point <ref> [<commit>]" +msgstr "git merge-base --fork-point <ÑÑылка> [<коммит>]" + +#: builtin/merge-base.c:214 +msgid "output all common ancestors" +msgstr "вывеÑти вÑех общих предков" + +#: builtin/merge-base.c:216 +msgid "find ancestors for a single n-way merge" +msgstr "вывеÑти предков Ð´Ð»Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ многоходового ÑлиÑниÑ" + +#: builtin/merge-base.c:218 +msgid "list revs not reachable from others" +msgstr "вывеÑти ÑпиÑок ревизий, которые не доÑтижимы из друг друга" + +#: builtin/merge-base.c:220 +msgid "is the first one ancestor of the other?" +msgstr "ÑвлÑетÑÑ Ð¿ÐµÑ€Ð²Ñ‹Ð¼ предком второго указанного коммита?" + +#: builtin/merge-base.c:222 +msgid "find where <commit> forked from reflog of <ref>" +msgstr "найти журнале ÑÑылок <ÑÑылка> где именно <коммит> разветвилÑÑ" + +#: builtin/merge-file.c:8 +msgid "" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" +msgstr "git merge-file [<опции>] [-L имÑ1 [-L orig [-L имÑ2]]] <файл1> <ориг-файл> <файл2>" + +#: builtin/merge-file.c:33 +msgid "send results to standard output" +msgstr "вывеÑти результат на Ñтандартный вывод" + +#: builtin/merge-file.c:34 +msgid "use a diff3 based merge" +msgstr "иÑпользовать diff3 ÑлиÑние" + +#: builtin/merge-file.c:35 +msgid "for conflicts, use our version" +msgstr "при возникновении конфликтов, иÑпользовать нашу верÑию" + +#: builtin/merge-file.c:37 +msgid "for conflicts, use their version" +msgstr "при возникновении конфликтов, иÑпользовать их верÑию" + +#: builtin/merge-file.c:39 +msgid "for conflicts, use a union version" +msgstr "при возникновении конфликтов, иÑпользовать обе верÑии" + +#: builtin/merge-file.c:42 +msgid "for conflicts, use this marker size" +msgstr "при возникновении конфликтов, иÑпользовать Ñтот размер маркера" + +#: builtin/merge-file.c:43 +msgid "do not warn about conflicts" +msgstr "не предупреждать о конфликтах" + +#: builtin/merge-file.c:45 +msgid "set labels for file1/orig-file/file2" +msgstr "уÑтановить метки Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»1/ориг-файл/файл2" + +#: builtin/mktree.c:64 +msgid "git mktree [-z] [--missing] [--batch]" +msgstr "git mktree [-z] [--missing] [--batch]" + +#: builtin/mktree.c:150 +msgid "input is NUL terminated" +msgstr "ввод отделенный ÐУЛЕВЫМИ Ñимволами" + +#: builtin/mktree.c:151 builtin/write-tree.c:24 +msgid "allow missing objects" +msgstr "допуÑтить отÑутÑтвие объектов" + +#: builtin/mktree.c:152 +msgid "allow creation of more than one tree" +msgstr "допуÑтить Ñоздание более одного дерева" + +#: builtin/mv.c:15 +msgid "git mv [<options>] <source>... <destination>" +msgstr "git mv [<опции>] <иÑточник>… <назначение>" + +#: 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" + +#: 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:112 +msgid "skip move/rename errors" +msgstr "пропуÑкать ошибки при перемещении/переименовании" + +#: 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:166 +msgid "bad source" +msgstr "плохой иÑточник" + +#: builtin/mv.c:169 +msgid "can not move directory into itself" +msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÑтить каталог в Ñамого ÑебÑ" + +#: builtin/mv.c:172 +msgid "cannot move directory over file" +msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÑтить каталог в файл" + +#: builtin/mv.c:181 +msgid "source directory is empty" +msgstr "иÑходный каталог пуÑÑ‚" + +#: builtin/mv.c:206 +msgid "not under version control" +msgstr "не под верÑионным контролем" + +#: builtin/mv.c:209 +msgid "destination exists" +msgstr "целевой путь уже ÑущеÑтвует" + +#: builtin/mv.c:217 +#, c-format +msgid "overwriting '%s'" +msgstr "перезапиÑÑŒ «%s»" + +#: builtin/mv.c:220 +msgid "Cannot overwrite" +msgstr "Ðе удалоÑÑŒ перезапиÑать" + +#: builtin/mv.c:223 +msgid "multiple sources for the same target" +msgstr "неÑколько иÑточников Ð´Ð»Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ целевого пути" + +#: builtin/mv.c:225 +msgid "destination directory does not exist" +msgstr "целевой каталог не ÑущеÑтвует" + +#: builtin/mv.c:232 +#, c-format +msgid "%s, source=%s, destination=%s" +msgstr "%s, откуда=%s, куда=%s" + +#: builtin/mv.c:253 +#, c-format +msgid "Renaming %s to %s\n" +msgstr "Переименование %s в %s\n" + +#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359 +#, c-format +msgid "renaming '%s' failed" +msgstr "Ñбой при переименовании «%s»" + +#: builtin/name-rev.c:255 +msgid "git name-rev [<options>] <commit>..." +msgstr "git name-rev [<опции>] <коммит>…" + +#: builtin/name-rev.c:256 +msgid "git name-rev [<options>] --all" +msgstr "git name-rev [<опции>] --all" + +#: builtin/name-rev.c:257 +msgid "git name-rev [<options>] --stdin" +msgstr "git name-rev [<опции>] --stdin" + +#: builtin/name-rev.c:309 +msgid "print only names (no SHA-1)" +msgstr "выводить только имена (без SHA-1)" + +#: builtin/name-rev.c:310 +msgid "only use tags to name the commits" +msgstr "иÑпользовать только метки Ð´Ð»Ñ Ð¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¾Ð²" + +#: builtin/name-rev.c:312 +msgid "only use refs matching <pattern>" +msgstr "иÑпользовать только ÑÑылки, ÑоответÑтвующие <шаблону> " + +#: builtin/name-rev.c:314 +msgid "list all commits reachable from all refs" +msgstr "вывеÑти ÑпиÑок вÑех коммитов, доÑтижимых Ñо вÑех ÑÑылок" + +#: builtin/name-rev.c:315 +msgid "read from stdin" +msgstr "прочитать из Ñтандартного ввода" + +#: builtin/name-rev.c:316 +msgid "allow to print `undefined` names (default)" +msgstr "разрешить вывод «undefined», еÑли не найдено (по умолчанию)" + +#: builtin/name-rev.c:322 +msgid "dereference tags in the input (internal use)" +msgstr "разыменовывать введенные метки (Ð´Ð»Ñ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐ³Ð¾ иÑпользованиÑ)" + +#: builtin/notes.c:24 +msgid "git notes [--ref <notes-ref>] [list [<object>]]" +msgstr "git notes [--ref <ÑÑылка-на-заметку>] [list [<объект>]]" + +#: builtin/notes.c:25 +msgid "" +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file>" +" | (-c | -C) <object>] [<object>]" +msgstr "git notes [--ref <ÑÑылка-на-заметку>] add [-f] [--allow-empty] [-m <Ñообщение> | -F <файл> | (-c | -C) <объект>] [<объект>]" + +#: builtin/notes.c:26 +msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" +msgstr "git notes [--ref <ÑÑылка-на-заметку>] copy [-f] <из-объекта> <в-объект>" + +#: builtin/notes.c:27 +msgid "" +"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> |" +" (-c | -C) <object>] [<object>]" +msgstr "git notes [--ref <ÑÑылка-на-заметку>] append [--allow-empty] [-m <Ñообщение> | -F <файл> | (-c | -C) <объект>] [<объект>]" + +#: builtin/notes.c:28 +msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" +msgstr "git notes [--ref <ÑÑылка-на-заметку>] edit [--allow-empty] [<объект>]" + +#: builtin/notes.c:29 +msgid "git notes [--ref <notes-ref>] show [<object>]" +msgstr "git notes [--ref <ÑÑылка-на-заметку>] show [<объект>]" + +#: builtin/notes.c:30 +msgid "" +"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" +msgstr "git notes [--ref <ÑÑылка-на-заметку>] merge [-v | -q] [-s <ÑтратегиÑ>] <ÑÑылка-на-заметку>" + +#: builtin/notes.c:31 +msgid "git notes merge --commit [-v | -q]" +msgstr "git notes merge --commit [-v | -q]" + +#: builtin/notes.c:32 +msgid "git notes merge --abort [-v | -q]" +msgstr "git notes merge --abort [-v | -q]" + +#: builtin/notes.c:33 +msgid "git notes [--ref <notes-ref>] remove [<object>...]" +msgstr "git notes [--ref <ÑÑылка-на-заметку>] remove [<объект>…]" + +#: builtin/notes.c:34 +msgid "git notes [--ref <notes-ref>] prune [-n | -v]" +msgstr "git notes [--ref <ÑÑылка-на-заметку>] prune [-n | -v]" + +#: builtin/notes.c:35 +msgid "git notes [--ref <notes-ref>] get-ref" +msgstr "git notes [--ref <ÑÑылка-на-заметку>] get-ref" + +#: builtin/notes.c:40 +msgid "git notes [list [<object>]]" +msgstr "git notes [list [<объект>]]" + +#: builtin/notes.c:45 +msgid "git notes add [<options>] [<object>]" +msgstr "git notes add [<опции>] [<объект>]" + +#: builtin/notes.c:50 +msgid "git notes copy [<options>] <from-object> <to-object>" +msgstr "git notes copy [<опции>] <из-объекта> <в-объект>" + +#: builtin/notes.c:51 +msgid "git notes copy --stdin [<from-object> <to-object>]..." +msgstr "git notes copy --stdin [<из-объекта> <в-объект>]…" + +#: builtin/notes.c:56 +msgid "git notes append [<options>] [<object>]" +msgstr "git notes append [<опции>] [<объект>]" + +#: builtin/notes.c:61 +msgid "git notes edit [<object>]" +msgstr "git notes edit [<объект>]" + +#: builtin/notes.c:66 +msgid "git notes show [<object>]" +msgstr "git notes show [<объект>]" + +#: builtin/notes.c:71 +msgid "git notes merge [<options>] <notes-ref>" +msgstr "git notes merge [<опции>] <ÑÑылка-на-заметку>" + +#: builtin/notes.c:72 +msgid "git notes merge --commit [<options>]" +msgstr "git notes merge --commit [<опции>]" + +#: builtin/notes.c:73 +msgid "git notes merge --abort [<options>]" +msgstr "git notes merge --abort [<опции>]" + +#: builtin/notes.c:78 +msgid "git notes remove [<object>]" +msgstr "git notes remove [<опции>]" + +#: builtin/notes.c:83 +msgid "git notes prune [<options>]" +msgstr "git notes prune [<опции>]" + +#: builtin/notes.c:88 +msgid "git notes get-ref" +msgstr "git notes get-ref" + +#: builtin/notes.c:146 +#, c-format +msgid "unable to start 'show' for object '%s'" +msgstr "не удалоÑÑŒ запуÑтить «show» Ð´Ð»Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð° «%s»" + +#: builtin/notes.c:150 +msgid "could not read 'show' output" +msgstr "не удалоÑÑŒ прочитать вывод «show»" + +#: builtin/notes.c:158 +#, c-format +msgid "failed to finish 'show' for object '%s'" +msgstr "не удалоÑÑŒ завершить «show» Ð´Ð»Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð° «%s»" + +#: builtin/notes.c:173 builtin/tag.c:477 +#, c-format +msgid "could not create file '%s'" +msgstr "не удалоÑÑŒ Ñоздать файл «%s»" + +#: builtin/notes.c:192 +msgid "Please supply the note contents using either -m or -F option" +msgstr "ПожалуйÑта, укажите Ñодержимое заметки, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð¾Ð¿Ñ†Ð¸ÑŽ -m или -F" + +#: builtin/notes.c:201 +msgid "unable to write note object" +msgstr "не удалоÑÑŒ запиÑать объект заметки" + +#: builtin/notes.c:203 +#, c-format +msgid "The note contents have been left in %s" +msgstr "Содержимое заметки оÑталоÑÑŒ в %s" + +#: builtin/notes.c:231 builtin/tag.c:693 +#, c-format +msgid "cannot read '%s'" +msgstr "не удалоÑÑŒ прочитать «%s»" + +#: builtin/notes.c:233 builtin/tag.c:696 +#, c-format +msgid "could not open or read '%s'" +msgstr "не удалоÑÑŒ открыть или прочитать «%s»" + +#: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305 +#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506 +#: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652 +#: builtin/notes.c:854 builtin/tag.c:709 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "Ðе удалоÑÑŒ разрешить «%s» как ÑÑылку." + +#: builtin/notes.c:255 +#, c-format +msgid "Failed to read object '%s'." +msgstr "Ðе удалоÑÑŒ прочитать объект «%s»." + +#: builtin/notes.c:259 +#, c-format +msgid "Cannot read note data from non-blob object '%s'." +msgstr "Ðе удалоÑÑŒ прочитать данные заметки из недвоичного объекта «%s»." + +#: builtin/notes.c:299 +#, c-format +msgid "Malformed input line: '%s'." +msgstr "ÐŸÐ»Ð¾Ñ…Ð°Ñ Ñтрока ввода: «%s»." + +#: builtin/notes.c:314 +#, c-format +msgid "Failed to copy notes from '%s' to '%s'" +msgstr "Ðе удалоÑÑŒ Ñкопировать заметку из «%s» в «%s»" + +#: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489 +#: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645 +#: builtin/notes.c:919 +msgid "too many parameters" +msgstr "передано Ñлишком много параметров" + +#: builtin/notes.c:371 builtin/notes.c:658 +#, c-format +msgid "No note found for object %s." +msgstr "Ðе найдена заметка Ð´Ð»Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð° %s." + +#: builtin/notes.c:392 builtin/notes.c:555 +msgid "note contents as a string" +msgstr "текÑтовое Ñодержимое заметки" + +#: builtin/notes.c:395 builtin/notes.c:558 +msgid "note contents in a file" +msgstr "Ñодержимое заметки в файле" + +#: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560 +#: builtin/notes.c:563 builtin/tag.c:628 +msgid "object" +msgstr "объект" + +#: builtin/notes.c:398 builtin/notes.c:561 +msgid "reuse and edit specified note object" +msgstr "иÑпользовать и отредактировать указанный объект заметки" + +#: builtin/notes.c:401 builtin/notes.c:564 +msgid "reuse specified note object" +msgstr "иÑпользовать указанный объект заметки" + +#: builtin/notes.c:404 builtin/notes.c:567 +msgid "allow storing empty note" +msgstr "разрешить Ñохранение пуÑтой заметки" + +#: builtin/notes.c:405 builtin/notes.c:476 +msgid "replace existing notes" +msgstr "заменить ÑущеÑтвующие заметки" + +#: builtin/notes.c:430 +#, c-format +msgid "" +"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "Ðе удалоÑÑŒ добавить заметку. Ðайдена ÑущеÑÑ‚Ð²ÑƒÑŽÑ‰Ð°Ñ Ð·Ð°Ð¼ÐµÑ‚ÐºÐ° у объекта %s. ИÑпользуйте параметр «-f» Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿Ð¸Ñи ÑущеÑтвующих заметок." + +#: builtin/notes.c:445 builtin/notes.c:524 +#, c-format +msgid "Overwriting existing notes for object %s\n" +msgstr "ПерезапиÑÑŒ ÑущеÑтвующих заметок у объекта %s\n" + +#: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859 +#, c-format +msgid "Removing note for object %s\n" +msgstr "Удаление заметки у объекта %s\n" + +#: builtin/notes.c:477 +msgid "read objects from stdin" +msgstr "прочитать объекты из Ñтандартного ввода" + +#: builtin/notes.c:479 +msgid "load rewriting config for <command> (implies --stdin)" +msgstr "загрузить наÑтройки перезапиÑи Ð´Ð»Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹ <команда> (включает в ÑÐµÐ±Ñ --stdin)" + +#: builtin/notes.c:497 +msgid "too few parameters" +msgstr "передано Ñлишком мало параметров" + +#: builtin/notes.c:518 +#, c-format +msgid "" +"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite" +" existing notes" +msgstr "Ðе удалоÑÑŒ Ñкопировать заметку. Ðайдена ÑущеÑÑ‚Ð²ÑƒÑŽÑ‰Ð°Ñ Ð·Ð°Ð¼ÐµÑ‚ÐºÐ° у объекта %s. ИÑпользуйте параметр «-f» Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿Ð¸Ñи ÑущеÑтвующих заметок." + +#: builtin/notes.c:530 +#, c-format +msgid "Missing notes on source object %s. Cannot copy." +msgstr "Ðет заметок у иÑходного объекта %s. ÐÐµÐ»ÑŒÐ·Ñ Ñкопировать." + +#: builtin/notes.c:582 +#, c-format +msgid "" +"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" +"Please use 'git notes add -f -m/-F/-c/-C' instead.\n" +msgstr "Опции -m/-F/-c/-C Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹ «edit» уÑтарели.\nИÑпользуйте вмеÑто них «git notes add -f -m/-F/-c/-C».\n" + +#: builtin/notes.c:750 +msgid "General options" +msgstr "Общие опции" + +#: builtin/notes.c:752 +msgid "Merge options" +msgstr "Опции ÑлиÑниÑ" + +#: builtin/notes.c:754 +msgid "" +"resolve notes conflicts using the given strategy " +"(manual/ours/theirs/union/cat_sort_uniq)" +msgstr "разрешить конфликты заметок Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ указанной Ñтратегии (manual/ours/theirs/union/cat_sort_uniq)" + +#: builtin/notes.c:756 +msgid "Committing unmerged notes" +msgstr "Коммит не Ñлитых заметок" + +#: builtin/notes.c:758 +msgid "finalize notes merge by committing unmerged notes" +msgstr "завершить ÑлиÑние заметок коммитом не Ñлитых заметок" + +#: builtin/notes.c:760 +msgid "Aborting notes merge resolution" +msgstr "Отмена Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÑлиÑÐ½Ð¸Ñ Ð·Ð°Ð¼ÐµÑ‚Ð¾Ðº" + +#: builtin/notes.c:762 +msgid "abort notes merge" +msgstr "отменить ÑлиÑние заметок" + +#: builtin/notes.c:857 +#, c-format +msgid "Object %s has no note\n" +msgstr "У объекта %s нет заметки\n" + +#: builtin/notes.c:869 +msgid "attempt to remove non-existent note is not an error" +msgstr "попытка ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð½ÐµÑущеÑтвующей заметки не ÑвлÑетÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ¾Ð¹" + +#: builtin/notes.c:872 +msgid "read object names from the standard input" +msgstr "прочитать имена объектов из Ñтандартного ввода" + +#: builtin/notes.c:953 +msgid "notes-ref" +msgstr "ÑÑылка-на-заметку" + +#: builtin/notes.c:954 +msgid "use notes from <notes-ref>" +msgstr "иÑпользовать заметку из <ÑÑылка-на-заметку>" + +#: builtin/notes.c:989 builtin/remote.c:1621 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¿Ð¾Ð´ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°: %s" + +#: builtin/pack-objects.c:28 +msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" +msgstr "git pack-objects --stdout [опции…] [< ÑпиÑок-ÑÑылок | < ÑпиÑок-объектов]" + +#: 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 +#, c-format +msgid "deflate error (%d)" +msgstr "ошибка ÑÐ¶Ð°Ñ‚Ð¸Ñ (%d)" + +#: builtin/pack-objects.c:771 +msgid "Writing objects" +msgstr "ЗапиÑÑŒ объектов" + +#: builtin/pack-objects.c:1013 +msgid "disabling bitmap writing, as some objects are not being packed" +msgstr "отключение запиÑи битовых карт, так как некоторые объекты не были упакованы" + +#: builtin/pack-objects.c:2173 +msgid "Compressing objects" +msgstr "Сжатие объектов" + +#: builtin/pack-objects.c:2570 +#, c-format +msgid "unsupported index version %s" +msgstr "Ð½ÐµÐ¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ð¸Ð½Ð´ÐµÐºÑа %s" + +#: builtin/pack-objects.c:2574 +#, c-format +msgid "bad index version '%s'" +msgstr "Ð¿Ð»Ð¾Ñ…Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ð¸Ð½Ð´ÐµÐºÑа «%s»" + +#: builtin/pack-objects.c:2597 +#, c-format +msgid "option %s does not accept negative form" +msgstr "Ð¾Ð¿Ñ†Ð¸Ñ %s не принимает отрицательные значениÑ" + +#: builtin/pack-objects.c:2601 +#, c-format +msgid "unable to parse value '%s' for option %s" +msgstr "не удалоÑÑŒ разобрать значение «%s» Ð´Ð»Ñ Ð¾Ð¿Ñ†Ð¸Ð¸ %s" + +#: builtin/pack-objects.c:2621 +msgid "do not show progress meter" +msgstr "не выводить прогреÑÑ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ" + +#: builtin/pack-objects.c:2623 +msgid "show progress meter" +msgstr "показать прогреÑÑ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ" + +#: builtin/pack-objects.c:2625 +msgid "show progress meter during object writing phase" +msgstr "показать прогреÑÑ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð·Ð°Ð¿Ð¸Ñи объектов" + +#: builtin/pack-objects.c:2628 +msgid "similar to --all-progress when progress meter is shown" +msgstr "похоже на --all-progress при включенном прогреÑÑе выполнениÑ" + +#: builtin/pack-objects.c:2629 +msgid "version[,offset]" +msgstr "верÑиÑ[,Ñмещение]" + +#: builtin/pack-objects.c:2630 +msgid "write the pack index file in the specified idx format version" +msgstr "запиÑать файл индекÑа пакета в указанной верÑии формата" + +#: builtin/pack-objects.c:2633 +msgid "maximum size of each output pack file" +msgstr "макÑимальный размер каждого выходного файла пакета" + +#: builtin/pack-objects.c:2635 +msgid "ignore borrowed objects from alternate object store" +msgstr "игнорировать чужие объекты, взÑтые из альтернативного хранилища объектов" + +#: builtin/pack-objects.c:2637 +msgid "ignore packed objects" +msgstr "игнорировать упакованные объекты" + +#: builtin/pack-objects.c:2639 +msgid "limit pack window by objects" +msgstr "ограничить окно пакета по количеÑтву объектов" + +#: builtin/pack-objects.c:2641 +msgid "limit pack window by memory in addition to object limit" +msgstr "дополнительно к количеÑтву объектов ограничить окно пакета по памÑти" + +#: builtin/pack-objects.c:2643 +msgid "maximum length of delta chain allowed in the resulting pack" +msgstr "макÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° цепочки дельт в результирующем пакете" + +#: builtin/pack-objects.c:2645 +msgid "reuse existing deltas" +msgstr "иÑпользовать повторно ÑущеÑтвующие дельты" + +#: builtin/pack-objects.c:2647 +msgid "reuse existing objects" +msgstr "иÑпользовать повторно ÑущеÑтвующие объекты" + +#: builtin/pack-objects.c:2649 +msgid "use OFS_DELTA objects" +msgstr "иÑпользовать объекты OFS_DELTA" + +#: builtin/pack-objects.c:2651 +msgid "use threads when searching for best delta matches" +msgstr "иÑпользовать многопоточноÑÑ‚ÑŒ при поиÑке лучших Ñовпадений дельт" + +#: builtin/pack-objects.c:2653 +msgid "do not create an empty pack output" +msgstr "не Ñоздавать пуÑтые выходные пакеты" + +#: builtin/pack-objects.c:2655 +msgid "read revision arguments from standard input" +msgstr "прочитать аргументы редакций из Ñтандартного ввода" + +#: builtin/pack-objects.c:2657 +msgid "limit the objects to those that are not yet packed" +msgstr "ограничитьÑÑ Ð¾Ð±ÑŠÐµÐºÑ‚Ð°Ð¼Ð¸, которые еще не упакованы" + +#: builtin/pack-objects.c:2660 +msgid "include objects reachable from any reference" +msgstr "включить объекты, которые доÑтижимы по любой из ÑÑылок" + +#: builtin/pack-objects.c:2663 +msgid "include objects referred by reflog entries" +msgstr "включить объекты, на которые ÑÑылаютÑÑ Ð·Ð°Ð¿Ð¸Ñи журнала ÑÑылок" + +#: builtin/pack-objects.c:2666 +msgid "include objects referred to by the index" +msgstr "включить объекты, на которые ÑÑылаетÑÑ Ð¸Ð½Ð´ÐµÐºÑ" + +#: builtin/pack-objects.c:2669 +msgid "output pack to stdout" +msgstr "вывеÑти пакет на Ñтандартный вывод" + +#: builtin/pack-objects.c:2671 +msgid "include tag objects that refer to objects to be packed" +msgstr "включить объекты меток, которые ÑÑылаютÑÑ Ð½Ð° упаковываемые объекты" + +#: builtin/pack-objects.c:2673 +msgid "keep unreachable objects" +msgstr "ÑохранÑÑ‚ÑŒ ÑÑылки на недоÑтупные объекты" + +#: builtin/pack-objects.c:2674 parse-options.h:140 +msgid "time" +msgstr "времÑ" + +#: builtin/pack-objects.c:2675 +msgid "unpack unreachable objects newer than <time>" +msgstr "раÑпаковать недоÑтупные объекты, которые новее, чем <времÑ>" + +#: builtin/pack-objects.c:2678 +msgid "create thin packs" +msgstr "Ñоздавать тонкие пакеты" + +#: builtin/pack-objects.c:2680 +msgid "create packs suitable for shallow fetches" +msgstr "Ñоздавать пакеты, подходÑщие Ð´Ð»Ñ Ñ‡Ð°Ñтичных извлечений" + +#: builtin/pack-objects.c:2682 +msgid "ignore packs that have companion .keep file" +msgstr "игнорировать пакеты, Ñ€Ñдом Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼Ð¸ лежит .keep файл" + +#: builtin/pack-objects.c:2684 +msgid "pack compression level" +msgstr "уровень ÑÐ¶Ð°Ñ‚Ð¸Ñ Ð¿Ð°ÐºÐµÑ‚Ð°" + +#: builtin/pack-objects.c:2686 +msgid "do not hide commits by grafts" +msgstr "не Ñкрывать коммиты ÑращениÑми" + +#: builtin/pack-objects.c:2688 +msgid "use a bitmap index if available to speed up counting objects" +msgstr "по возможноÑти иÑпользовать Ð¸Ð½Ð´ÐµÐºÑ Ð² битовых картах, Ð´Ð»Ñ ÑƒÑÐºÐ¾Ñ€ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð´Ñчета объектов" + +#: builtin/pack-objects.c:2690 +msgid "write a bitmap index together with the pack index" +msgstr "запиÑÑŒ индекÑа в битовых картах вмеÑте Ñ Ð¸Ð½Ð´ÐµÐºÑом пакета" + +#: builtin/pack-objects.c:2781 +msgid "Counting objects" +msgstr "ПодÑчет объектов" + +#: builtin/pack-refs.c:6 +msgid "git pack-refs [<options>]" +msgstr "git pack-refs [<опции>]" + +#: builtin/pack-refs.c:14 +msgid "pack everything" +msgstr "паковать вÑÑ‘" + +#: builtin/pack-refs.c:15 +msgid "prune loose refs (default)" +msgstr "почиÑтить Ñлабые ÑÑылки (по умолчанию)" + +#: builtin/prune-packed.c:7 +msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" +msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" + +#: builtin/prune-packed.c:40 +msgid "Removing duplicate objects" +msgstr "Удаление дублирующихÑÑ Ð¾Ð±ÑŠÐµÐºÑ‚Ð¾Ð²" + +#: builtin/prune.c:12 +msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" +msgstr "git prune [-n] [-v] [--expire <времÑ>] [--] [<имÑ-ветки>…]" + +#: builtin/prune.c:106 +msgid "do not remove, show only" +msgstr "не удалÑÑ‚ÑŒ, только показать ÑпиÑок" + +#: builtin/prune.c:107 +msgid "report pruned objects" +msgstr "вывеÑти ÑпиÑок удаленных объектов" + +#: builtin/prune.c:110 +msgid "expire objects older than <time>" +msgstr "удалить объекты Ñтарее чем <дата-окончаниÑ>" + +#: builtin/push.c:14 +msgid "git push [<options>] [<repository> [<refspec>...]]" +msgstr "git push [<опции>] [<репозиторий> [<ÑпецификациÑ-ÑÑылки>…]]" + +#: builtin/push.c:85 +msgid "tag shorthand without <tag>" +msgstr "указано Ñокращение tag, но не указана Ñама <метка>" + +#: builtin/push.c:95 +msgid "--delete only accepts plain target ref names" +msgstr "Ð¾Ð¿Ñ†Ð¸Ñ --delete принимает только проÑтые целевые имена ÑÑылок" + +#: builtin/push.c:139 +msgid "" +"\n" +"To choose either option permanently, see push.default in 'git help config'." +msgstr "\nЧтобы выбрать любую из опций на поÑтоÑнной оÑнове, Ñмотрите push.default в «git help config»." + +#: builtin/push.c:142 +#, c-format +msgid "" +"The upstream branch of your current branch does not match\n" +"the name of your current branch. To push to the upstream branch\n" +"on the remote, use\n" +"\n" +" git push %s HEAD:%s\n" +"\n" +"To push to the branch of the same name on the remote, use\n" +"\n" +" git push %s %s\n" +"%s" +msgstr "Ð˜Ð¼Ñ Ð²Ñ‹ÑˆÐµÑтоÑщей ветки и вашей текущей ветки различаютÑÑ. Чтобы отправить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² вышеÑтоÑщую ветку на внешнем репозитории, иÑпользуйте:\n\n git push %s HEAD:%s\n\nЧтобы отправить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² ветку Ñ Ñ‚Ð°ÐºÐ¸Ð¼ же именем на внешнем репозитории, иÑпользуйте:\n\n git push %s %s\n%s" + +#: builtin/push.c:157 +#, c-format +msgid "" +"You are not currently on a branch.\n" +"To push the history leading to the current (detached HEAD)\n" +"state now, use\n" +"\n" +" git push %s HEAD:<name-of-remote-branch>\n" +msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ð½Ðµ находитеÑÑŒ ни на одной из веток.\nЧтобы отправить иÑторию, ведущую к текущему (отделенный HEAD) ÑоÑтоÑнию, иÑпользуйте\n\n git push %s HEAD:<имÑ-внешней-ветки>\n" + +#: builtin/push.c:171 +#, c-format +msgid "" +"The current branch %s has no upstream branch.\n" +"To push the current branch and set the remote as upstream, use\n" +"\n" +" git push --set-upstream %s %s\n" +msgstr "Ð¢ÐµÐºÑƒÑ‰Ð°Ñ Ð²ÐµÑ‚ÐºÐ° %s не имеет вышеÑтоÑщей ветки.\nЧтобы отправить текущую ветку и уÑтановить внешнюю ветку как вышеÑтоÑщую Ð´Ð»Ñ Ñтой ветки, иÑпользуйте\n\n git push --set-upstream %s %s\n" + +#: builtin/push.c:179 +#, c-format +msgid "" +"The current branch %s has multiple upstream branches, refusing to push." +msgstr "Ваша Ñ‚ÐµÐºÑƒÑ‰Ð°Ñ Ð²ÐµÑ‚ÐºÐ° %s имеет неÑколько вышеÑтоÑщих веток, отказ в отправке изменений." + +#: builtin/push.c:182 +#, c-format +msgid "" +"You are pushing to remote '%s', which is not the upstream of\n" +"your current branch '%s', without telling me what to push\n" +"to update which remote branch." +msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»Ñете Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð½Ð° внешний репозиторий «%s», который не ÑвлÑетÑÑ Ð²Ñ‹ÑˆÐµÑтоÑщим Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ¹ текущей ветки «%s», без ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ñ‚Ð¾Ð³Ð¾, что отправлÑÑ‚ÑŒ и в какую внешнюю ветку." + +#: builtin/push.c:205 +msgid "" +"push.default is unset; its implicit value has changed in\n" +"Git 2.0 from 'matching' to 'simple'. To squelch this message\n" +"and maintain the traditional behavior, use:\n" +"\n" +" git config --global push.default matching\n" +"\n" +"To squelch this message and adopt the new behavior now, use:\n" +"\n" +" git config --global push.default simple\n" +"\n" +"When push.default is set to 'matching', git will push local branches\n" +"to the remote branches that already exist with the same name.\n" +"\n" +"Since Git 2.0, Git defaults to the more conservative 'simple'\n" +"behavior, which only pushes the current branch to the corresponding\n" +"remote branch that 'git pull' uses to update the current branch.\n" +"\n" +"See 'git help config' and search for 'push.default' for further information.\n" +"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" +"'current' instead of 'simple' if you sometimes use older versions of Git)" +msgstr "push.default не уÑтановлен; его неÑвное значение было изменено в Git верÑии 2.0 Ñ Â«matching» на «simple». Чтобы прекратить вывод Ñтого ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¸ Ñохранить Ñтарое поведение, иÑпользуйте:\n\n git config --global push.default matching\n\nЧтобы прекратить вывод Ñтого ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¸ иÑпользовать новое поведение, иÑпользуйте:\n\n git config --global push.default simple\n\nКогда push.default уÑтановлено в «matching», git будет отправлÑÑ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ‹Ñ… веток в ÑущеÑтвующие внешние ветки Ñ Ñ‚Ð°ÐºÐ¸Ð¼ же именем.\n\nÐÐ°Ñ‡Ð¸Ð½Ð°Ñ Ñ Git верÑии 2.0, по умолчанию иÑпользуетÑÑ Ð±Ð¾Ð»ÐµÐµ конÑервативное поведение «simple», которое отправлÑет Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ ветки в ÑоответÑтвующую внешнюю ветку, из которой «git pull» забирает изменениÑ.\n\nСмотрите «git help config» и ищите «push.default» Ð´Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ информации.\n(режим «simple» поÑвилÑÑ Ð² Git верÑии 1.7.11. ИÑпользуйте похожий режим «current» вмеÑто «simple», еÑли вы иногда иÑпользуете Ñтарые верÑии Git)" + +#: builtin/push.c:272 +msgid "You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "Ð’Ñ‹ не указали Ñпецификацию ÑÑылки Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸, а push.default указан как \"nothing\"." + +#: builtin/push.c:279 +msgid "" +"Updates were rejected because the tip of your current branch is behind\n" +"its remote counterpart. Integrate the remote changes (e.g.\n" +"'git pull ...') before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." +msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð±Ñ‹Ð»Ð¸ отклонены, так как верхушка вашей текущей ветки\nпозади ее внешней чаÑти. Заберите и Ñлейте внешние Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ \n(например, Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «git pull …») перед повторной попыткой отправки\nизменений.\nÐ”Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ информации Ñмотрите «Note about fast-forwards»\nв «git push --help»." + +#: builtin/push.c:285 +msgid "" +"Updates were rejected because a pushed branch tip is behind its remote\n" +"counterpart. Check out this branch and integrate the remote changes\n" +"(e.g. 'git pull ...') before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." +msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð±Ñ‹Ð»Ð¸ отклонены, так как верхушка отправлÑемой ветки\nпозади ее внешней чаÑти. ПереключитеÑÑŒ на ветку и заберите внешние\nÐ¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ (например, Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «git pull …») перед повторной\nпопыткой отправки изменений.\nÐ”Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ информации Ñмотрите «Note about fast-forwards»\nв «git push --help»." + +#: builtin/push.c:291 +msgid "" +"Updates were rejected because the remote contains work that you do\n" +"not have locally. This is usually caused by another repository pushing\n" +"to the same ref. You may want to first integrate the remote changes\n" +"(e.g., 'git pull ...') before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." +msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð±Ñ‹Ð»Ð¸ отклонены, так как внешний репозиторий Ñодержит\nизменениÑ, которых у Ð²Ð°Ñ Ð½ÐµÑ‚ в вашем локальном репозитории.\nОбычно, Ñто ÑвÑзанно Ñ Ñ‚ÐµÐ¼, что кто-то уже отправил Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² \nто же меÑто. Перед повторной отправкой ваших изменений, вам нужно\nзабрать и Ñлить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸Ð· внешнего Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ñебе\n(например, Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «git pull …»).\nÐ”Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ информации Ñмотрите «Note about fast-forwards»\nв «git push --help»." + +#: builtin/push.c:298 +msgid "Updates were rejected because the tag already exists in the remote." +msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð±Ñ‹Ð»Ð¸ отклонены, так как метка уже ÑущеÑтвует во внешнем репозитории." + +#: builtin/push.c:301 +msgid "" +"You cannot update a remote ref that points at a non-commit object,\n" +"or update a remote ref to make it point at a non-commit object,\n" +"without using the '--force' option.\n" +msgstr "Ð’Ñ‹ не можете обновить внешнюю ÑÑылку, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ ÑƒÐºÐ°Ð·Ñ‹Ð²Ð°ÐµÑ‚ на объект, не ÑвлÑющийÑÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¾Ð¼ или обновить внешнюю ÑÑылку так, чтобы она указывала на объект, не ÑвлÑющийÑÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¾Ð¼, без ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð¾Ð¿Ñ†Ð¸Ð¸ «--force».\n" + +#: builtin/push.c:360 +#, c-format +msgid "Pushing to %s\n" +msgstr "Отправка в %s\n" + +#: builtin/push.c:364 +#, c-format +msgid "failed to push some refs to '%s'" +msgstr "не удалоÑÑŒ отправить некоторые ÑÑылки в «%s»" + +#: builtin/push.c:394 +#, c-format +msgid "bad repository '%s'" +msgstr "плохой Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Â«%s»" + +#: builtin/push.c:395 +msgid "" +"No configured push destination.\n" +"Either specify the URL from the command-line or configure a remote repository using\n" +"\n" +" git remote add <name> <url>\n" +"\n" +"and then push using the remote name\n" +"\n" +" git push <name>\n" +msgstr "Ðе наÑтроена точка Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸.\nЛибо укажите URL Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ коммандной Ñтроки, либо наÑтройте внешний репозиторий Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ\n\n git remote add <имÑ> <адреÑ>\n\nа затем отправьте Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ имени внешнего репозиториÑ\n\n git push <имÑ>\n" + +#: builtin/push.c:410 +msgid "--all and --tags are incompatible" +msgstr "--all и --tags Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно" + +#: builtin/push.c:411 +msgid "--all can't be combined with refspecs" +msgstr "--all Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать вмеÑте Ñо ÑпецификациÑми ÑÑылок" + +#: builtin/push.c:416 +msgid "--mirror and --tags are incompatible" +msgstr "--mirror и --tags Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно" + +#: builtin/push.c:417 +msgid "--mirror can't be combined with refspecs" +msgstr "--mirror Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать вмеÑте Ñо ÑпецификациÑми ÑÑылок" + +#: builtin/push.c:422 +msgid "--all and --mirror are incompatible" +msgstr "--all и --mirror Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно" + +#: builtin/push.c:502 +msgid "repository" +msgstr "репозиторий" + +#: builtin/push.c:503 +msgid "push all refs" +msgstr "отправить вÑе ÑÑылки" + +#: builtin/push.c:504 +msgid "mirror all refs" +msgstr "Ñделать зеркало вÑех ÑÑылок" + +#: builtin/push.c:506 +msgid "delete refs" +msgstr "удалить ÑÑылки" + +#: builtin/push.c:507 +msgid "push tags (can't be used with --all or --mirror)" +msgstr "отправить метки (Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать вмеÑте Ñ --all или --mirror)" + +#: builtin/push.c:510 +msgid "force updates" +msgstr "принудительное обновление" + +#: builtin/push.c:512 +msgid "refname>:<expect" +msgstr "имÑ-ÑÑылки>:<ожидаетÑÑ" + +#: builtin/push.c:513 +msgid "require old value of ref to be at this value" +msgstr "требовать, чтобы Ñтарое значение ÑÑылки было ожидаемым" + +#: builtin/push.c:516 +msgid "control recursive pushing of submodules" +msgstr "управление рекурÑивной отправкой подмодулей" + +#: builtin/push.c:518 +msgid "use thin pack" +msgstr "иÑпользовать тонкие пакеты" + +#: builtin/push.c:519 builtin/push.c:520 +msgid "receive pack program" +msgstr "путь к программе упаковки на Ñервере" + +#: builtin/push.c:521 +msgid "set upstream for git pull/status" +msgstr "уÑтановить вышеÑтоÑщую ветку Ð´Ð»Ñ git pull/status" + +#: builtin/push.c:524 +msgid "prune locally removed refs" +msgstr "почиÑтить локально удаленные ÑÑылки" + +#: builtin/push.c:526 +msgid "bypass pre-push hook" +msgstr "пропуÑтить перехватчик перед-отправкой" + +#: builtin/push.c:527 +msgid "push missing but relevant tags" +msgstr "отправить пропущенные, но нужные метки" + +#: builtin/push.c:529 +msgid "GPG sign the push" +msgstr "подпиÑать отправку Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ GPG" + +#: builtin/push.c:530 +msgid "request atomic transaction on remote side" +msgstr "запроÑить выполнение атомарной транзакции на внешней Ñтороне" + +#: builtin/push.c:539 +msgid "--delete is incompatible with --all, --mirror and --tags" +msgstr "--delete неÑовмеÑтимо Ñ --all, --mirror и --tags" + +#: builtin/push.c:541 +msgid "--delete doesn't make sense without any refs" +msgstr "--delete не имеет ÑмыÑла без ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ ÑÑылок" + +#: builtin/read-tree.c:37 +msgid "" +"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>]" +" [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] " +"[--index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" +msgstr "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<префикÑ>] [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-output=<файл>] (--empty | <указатель-дерева-1> [<указатель-дерева-2> [<указатель-дерева-3>]])" + +#: builtin/read-tree.c:110 +msgid "write resulting index to <file>" +msgstr "запиÑать результирующий Ð¸Ð½Ð´ÐµÐºÑ Ð² <файл>" + +#: builtin/read-tree.c:113 +msgid "only empty the index" +msgstr "проÑто очиÑтить индекÑ" + +#: builtin/read-tree.c:115 +msgid "Merging" +msgstr "СлиÑние" + +#: builtin/read-tree.c:117 +msgid "perform a merge in addition to a read" +msgstr "выполнить ÑлиÑние в дополнение к чтению" + +#: builtin/read-tree.c:119 +msgid "3-way merge if no file level merging required" +msgstr "трехходовое ÑлиÑние, еÑли не требуетÑÑ ÑлиÑние на уровне файлов" + +#: builtin/read-tree.c:121 +msgid "3-way merge in presence of adds and removes" +msgstr "трехходовое ÑлиÑние в Ñлучае приÑутÑÑ‚Ð²Ð¸Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ð¹ или удалений файлов" + +#: builtin/read-tree.c:123 +msgid "same as -m, but discard unmerged entries" +msgstr "тоже, что и -m, но отменÑет Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð½Ðµ Ñлитых запиÑей" + +#: builtin/read-tree.c:124 +msgid "<subdirectory>/" +msgstr "<подкаталог>/" + +#: builtin/read-tree.c:125 +msgid "read the tree into the index under <subdirectory>/" +msgstr "прочитать дерево в Ð¸Ð½Ð´ÐµÐºÑ Ð² <подкаталог>/" + +#: builtin/read-tree.c:128 +msgid "update working tree with merge result" +msgstr "обновить рабочий каталог результатом ÑлиÑниÑ" + +#: builtin/read-tree.c:130 +msgid "gitignore" +msgstr "gitignore" + +#: builtin/read-tree.c:131 +msgid "allow explicitly ignored files to be overwritten" +msgstr "разрешить перезапиÑÑŒ Ñвно игнорируемых файлов" + +#: builtin/read-tree.c:134 +msgid "don't check the working tree after merging" +msgstr "не проверÑÑ‚ÑŒ рабочий каталог поÑле ÑлиÑниÑ" + +#: builtin/read-tree.c:135 +msgid "don't update the index or the work tree" +msgstr "не обновлÑÑ‚ÑŒ Ð¸Ð½Ð´ÐµÐºÑ Ð¸Ð»Ð¸ рабочий каталог" + +#: builtin/read-tree.c:137 +msgid "skip applying sparse checkout filter" +msgstr "пропуÑтить применение фильтра чаÑтичного перехода" + +#: builtin/read-tree.c:139 +msgid "debug unpack-trees" +msgstr "отладка unpack-trees" + +#: builtin/reflog.c:429 +#, c-format +msgid "%s' for '%s' is not a valid timestamp" +msgstr "«%s» Ð´Ð»Ñ Â«%s» не ÑвлÑетÑÑ Ð´Ð¾Ð¿ÑƒÑтимой меткой даты/времени" + +#: builtin/reflog.c:546 builtin/reflog.c:551 +#, c-format +msgid "'%s' is not a valid timestamp" +msgstr "«%s» не ÑвлÑетÑÑ Ð´Ð¾Ð¿ÑƒÑтимой меткой даты/времени" + +#: builtin/remote.c:12 +msgid "git remote [-v | --verbose]" +msgstr "git remote [-v | --verbose]" + +#: builtin/remote.c:13 +msgid "" +"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] " +"[--mirror=<fetch|push>] <name> <url>" +msgstr "git remote add [-t <ветка>] [-m <маÑтер-ветка>] [-f] [--tags | --no-tags] [--mirror=<fetch|push>] <имÑ> <адреÑ>" + +#: builtin/remote.c:14 builtin/remote.c:33 +msgid "git remote rename <old> <new>" +msgstr "git remote rename <Ñтарое-название> <новое-название>" + +#: builtin/remote.c:15 builtin/remote.c:38 +msgid "git remote remove <name>" +msgstr "git remote remove <имÑ>" + +#: builtin/remote.c:16 builtin/remote.c:43 +msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" +msgstr "git remote set-head <имÑ> (-a | --auto | -d | --delete | <ветка>)" + +#: builtin/remote.c:17 +msgid "git remote [-v | --verbose] show [-n] <name>" +msgstr "git remote [-v | --verbose] show [-n] <имÑ>" + +#: builtin/remote.c:18 +msgid "git remote prune [-n | --dry-run] <name>" +msgstr "git remote prune [-n | --dry-run] <имÑ>" + +#: builtin/remote.c:19 +msgid "" +"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" +msgstr "git remote [-v | --verbose] update [-p | --prune] [(<группа> | <имÑ-внешнего-репозиториÑ>)…]" + +#: builtin/remote.c:20 +msgid "git remote set-branches [--add] <name> <branch>..." +msgstr "git remote set-branches [--add] <имÑ> <ветка>…" + +#: builtin/remote.c:21 builtin/remote.c:69 +msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" +msgstr "git remote set-url [--push] <имÑ> <новый-url> [<Ñтарый-url>]" + +#: builtin/remote.c:22 builtin/remote.c:70 +msgid "git remote set-url --add <name> <newurl>" +msgstr "git remote set-url --add <имÑ> <новый-url>" + +#: builtin/remote.c:23 builtin/remote.c:71 +msgid "git remote set-url --delete <name> <url>" +msgstr "git remote set-url --delete <имÑ> <url>" + +#: builtin/remote.c:28 +msgid "git remote add [<options>] <name> <url>" +msgstr "git remote add [<опции>] <имÑ> <url>" + +#: builtin/remote.c:48 +msgid "git remote set-branches <name> <branch>..." +msgstr "git remote set-branches <имÑ> <ветка>…" + +#: builtin/remote.c:49 +msgid "git remote set-branches --add <name> <branch>..." +msgstr "git remote set-branches --add <имÑ> <ветка>…" + +#: builtin/remote.c:54 +msgid "git remote show [<options>] <name>" +msgstr "git remote show [<опции>] <имÑ>" + +#: builtin/remote.c:59 +msgid "git remote prune [<options>] <name>" +msgstr "git remote prune [<опции>] <имÑ>" + +#: builtin/remote.c:64 +msgid "git remote update [<options>] [<group> | <remote>]..." +msgstr "git remote update [<опции>] [<группа> | <имÑ-внешнего-репозиториÑ>]…" + +#: builtin/remote.c:88 +#, c-format +msgid "Updating %s" +msgstr "Обновление %s" + +#: builtin/remote.c:120 +msgid "" +"--mirror is dangerous and deprecated; please\n" +"\t use --mirror=fetch or --mirror=push instead" +msgstr "ключ --mirror небезопаÑен и не рекомендуетÑÑ Ðº иÑпользованию;\nиÑпользуйте вмеÑто него --mirror=fetch или --mirror=push" + +#: builtin/remote.c:137 +#, c-format +msgid "unknown mirror argument: %s" +msgstr "неизвеÑтный аргумент Ð´Ð»Ñ mirror: %s" + +#: builtin/remote.c:153 +msgid "fetch the remote branches" +msgstr "извлечь внешние ветки" + +#: builtin/remote.c:155 +msgid "import all tags and associated objects when fetching" +msgstr "импортировать вÑе метки и аÑÑоциированные объекты при извлечении" + +#: builtin/remote.c:158 +msgid "or do not fetch any tag at all (--no-tags)" +msgstr "или не извлекать метки вообще (--no-tags)" + +#: builtin/remote.c:160 +msgid "branch(es) to track" +msgstr "отÑлеживаемые ветки" + +#: builtin/remote.c:161 +msgid "master branch" +msgstr "маÑтер ветка" + +#: builtin/remote.c:162 +msgid "push|fetch" +msgstr "push|fetch" + +#: builtin/remote.c:163 +msgid "set up remote as a mirror to push to or fetch from" +msgstr "наÑтроить внешний репозиторий как зеркало Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ или Ð¸Ð·Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹" + +#: builtin/remote.c:175 +msgid "specifying a master branch makes no sense with --mirror" +msgstr "указание маÑтер ветки не имеет ÑмыÑла Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ --mirror" + +#: builtin/remote.c:177 +msgid "specifying branches to track makes sense only with fetch mirrors" +msgstr "указание отÑлеживаемых веток имеет ÑмыÑл только при зеркальном извлечении" + +#: builtin/remote.c:187 builtin/remote.c:643 +#, c-format +msgid "remote %s already exists." +msgstr "внешний репозиторий %s уже ÑущеÑтвует" + +#: builtin/remote.c:191 builtin/remote.c:647 +#, c-format +msgid "'%s' is not a valid remote name" +msgstr "«%s» не ÑвлÑетÑÑ Ð´Ð¾Ð¿ÑƒÑтимым именем внешнего репозиториÑ." + +#: builtin/remote.c:235 +#, c-format +msgid "Could not setup master '%s'" +msgstr "Ðе удалоÑÑŒ наÑтроить маÑтер ветку «%s»" + +#: builtin/remote.c:335 +#, c-format +msgid "Could not get fetch map for refspec %s" +msgstr "Ðе удалоÑÑŒ извлечь карту Ð´Ð»Ñ Ñпецификации ÑÑылки %s" + +#: builtin/remote.c:436 builtin/remote.c:444 +msgid "(matching)" +msgstr "(ÑоответÑтвующаÑ)" + +#: builtin/remote.c:448 +msgid "(delete)" +msgstr "(удаленнаÑ)" + +#: builtin/remote.c:592 builtin/remote.c:598 builtin/remote.c:604 +#, c-format +msgid "Could not append '%s' to '%s'" +msgstr "Ðе удалоÑÑŒ добавить «%s» к «%s»" + +#: builtin/remote.c:636 builtin/remote.c:795 builtin/remote.c:895 +#, c-format +msgid "No such remote: %s" +msgstr "Ðет такого внешнего репозиториÑ: %s" + +#: builtin/remote.c:653 +#, c-format +msgid "Could not rename config section '%s' to '%s'" +msgstr "Ðе удалоÑÑŒ переименовать Ñекцию конфигурации Ñ Â«%s» на «%s»" + +#: builtin/remote.c:659 builtin/remote.c:847 +#, c-format +msgid "Could not remove config section '%s'" +msgstr "Ðе удалоÑÑŒ удалить Ñекцию файла конфигурации «%s»" + +#: builtin/remote.c:674 +#, c-format +msgid "" +"Not updating non-default fetch refspec\n" +"\t%s\n" +"\tPlease update the configuration manually if necessary." +msgstr "Ðе обновлÑÑŽ неÑтандартную Ñпецификацию ÑÑылки Ð´Ð»Ñ Ð¸Ð·Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ\n\t%s\n\tПожалуйÑта, еÑли требуетÑÑ, обновите конфигурацию вручную." + +#: builtin/remote.c:680 +#, c-format +msgid "Could not append '%s'" +msgstr "Ðе удалоÑÑŒ добавить «%s»" + +#: builtin/remote.c:691 +#, c-format +msgid "Could not set '%s'" +msgstr "Ðе удалоÑÑŒ уÑтановить «%s»" + +#: builtin/remote.c:713 +#, c-format +msgid "deleting '%s' failed" +msgstr "не удалоÑÑŒ удалить «%s»" + +#: builtin/remote.c:747 +#, c-format +msgid "creating '%s' failed" +msgstr "не удалоÑÑŒ Ñоздать «%s»" + +#: builtin/remote.c:766 +#, c-format +msgid "Could not remove branch %s" +msgstr "Ðе удалоÑÑŒ удалить ветку «%s»" + +#: builtin/remote.c:833 +msgid "" +"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" +"to delete it, use:" +msgid_plural "" +"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" +"to delete them, use:" +msgstr[0] "Примечание: Ðекоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, иÑпользуйте:" +msgstr[1] "Примечание: Ðекоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, иÑпользуйте:" +msgstr[2] "Примечание: Ðекоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, иÑпользуйте:" + +#: builtin/remote.c:948 +#, c-format +msgid " new (next fetch will store in remotes/%s)" +msgstr " Ð½Ð¾Ð²Ð°Ñ (Ñледующее извлечение Ñохранит ее в remotes/%s)" + +#: builtin/remote.c:951 +msgid " tracked" +msgstr " отÑлеживаетÑÑ" + +#: builtin/remote.c:953 +msgid " stale (use 'git remote prune' to remove)" +msgstr " недейÑтвительна (иÑпользуйте «git remote prune», чтобы удалить)" + +#: builtin/remote.c:955 +msgid " ???" +msgstr " ???" + +#: builtin/remote.c:996 +#, c-format +msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" +msgstr "неправильный параметр конфигурации branch.%s.merge; невозможно перемеÑтить более чем над 1 веткой" + +#: builtin/remote.c:1003 +#, c-format +msgid "rebases onto remote %s" +msgstr "будет перемещена над внешней веткой %s" + +#: builtin/remote.c:1006 +#, c-format +msgid " merges with remote %s" +msgstr " будет Ñлита Ñ Ð²Ð½ÐµÑˆÐ½ÐµÐ¹ веткой %s" + +#: builtin/remote.c:1007 +msgid " and with remote" +msgstr " и Ñ Ð²Ð½ÐµÑˆÐ½ÐµÐ¹ веткой" + +#: builtin/remote.c:1009 +#, c-format +msgid "merges with remote %s" +msgstr "будет Ñлита Ñ Ð²Ð½ÐµÑˆÐ½ÐµÐ¹ веткой %s" + +#: builtin/remote.c:1010 +msgid " and with remote" +msgstr " и Ñ Ð²Ð½ÐµÑˆÐ½ÐµÐ¹ веткой" + +#: builtin/remote.c:1056 +msgid "create" +msgstr "Ñоздана" + +#: builtin/remote.c:1059 +msgid "delete" +msgstr "удалена" + +#: builtin/remote.c:1063 +msgid "up to date" +msgstr "уже актуальна" + +#: builtin/remote.c:1066 +msgid "fast-forwardable" +msgstr "возможна перемотка вперед" + +#: builtin/remote.c:1069 +msgid "local out of date" +msgstr "Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð°Ñ Ð²ÐµÑ‚ÐºÐ° уÑтарела" + +#: builtin/remote.c:1076 +#, c-format +msgid " %-*s forces to %-*s (%s)" +msgstr " %-*s будет принудительно отправлена в %-*s (%s)" + +#: builtin/remote.c:1079 +#, c-format +msgid " %-*s pushes to %-*s (%s)" +msgstr " %-*s будет отправлена в %-*s (%s)" + +#: builtin/remote.c:1083 +#, c-format +msgid " %-*s forces to %s" +msgstr " %-*s будет принудительно отправлена в %s" + +#: builtin/remote.c:1086 +#, c-format +msgid " %-*s pushes to %s" +msgstr " %-*s будет отправлена в %s" + +#: builtin/remote.c:1154 +msgid "do not query remotes" +msgstr "не опрашивать внешние репозитории" + +#: builtin/remote.c:1181 +#, c-format +msgid "* remote %s" +msgstr "* внешний репозиторий %s" + +#: builtin/remote.c:1182 +#, c-format +msgid " Fetch URL: %s" +msgstr " URL Ð´Ð»Ñ Ð¸Ð·Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ: %s" + +#: builtin/remote.c:1183 builtin/remote.c:1334 +msgid "(no URL)" +msgstr "(нет URL)" + +#: builtin/remote.c:1192 builtin/remote.c:1194 +#, c-format +msgid " Push URL: %s" +msgstr " URL Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸: %s" + +#: builtin/remote.c:1196 builtin/remote.c:1198 builtin/remote.c:1200 +#, c-format +msgid " HEAD branch: %s" +msgstr " HEAD ветка: %s" + +#: builtin/remote.c:1202 +#, c-format +msgid " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" +msgstr " HEAD ветка (HEAD внешнего Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ð½ÐµÐ¾Ð´Ð½Ð¾Ð·Ð½Ð°Ñ‡Ð½Ñ‹Ð¹, может быть одним из):\n" + +#: builtin/remote.c:1214 +#, c-format +msgid " Remote branch:%s" +msgid_plural " Remote branches:%s" +msgstr[0] " ВнешнÑÑ Ð²ÐµÑ‚ÐºÐ°:%s" +msgstr[1] " Внешние ветки:%s" +msgstr[2] " Внешние ветки:%s" + +#: builtin/remote.c:1217 builtin/remote.c:1244 +msgid " (status not queried)" +msgstr " (ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ðµ запрошен)" + +#: builtin/remote.c:1226 +msgid " Local branch configured for 'git pull':" +msgid_plural " Local branches configured for 'git pull':" +msgstr[0] " Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ð°Ñ Ð²ÐµÑ‚ÐºÐ°, наÑÑ‚Ñ€Ð¾ÐµÐ½Ð½Ð°Ñ Ð´Ð»Ñ Â«git pull»:" +msgstr[1] " Локальные ветки, наÑтроенные Ð´Ð»Ñ Â«git pull»:" +msgstr[2] " Локальные ветки, наÑтроенные Ð´Ð»Ñ Â«git pull»:" + +#: builtin/remote.c:1234 +msgid " Local refs will be mirrored by 'git push'" +msgstr " Локальные ÑÑылки, зеркалируемые Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «git push»" + +#: builtin/remote.c:1241 +#, 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:" +msgstr[2] " Локальные ÑÑылки, наÑтроенные Ð´Ð»Ñ Â«git push»%s:" + +#: builtin/remote.c:1262 +msgid "set refs/remotes/<name>/HEAD according to remote" +msgstr "уÑтановить refs/remotes/<имÑ>/HEAD в завиÑимоÑти от внешнего репозиториÑ" + +#: builtin/remote.c:1264 +msgid "delete refs/remotes/<name>/HEAD" +msgstr "удалить refs/remotes/<имÑ>/HEAD" + +#: builtin/remote.c:1279 +msgid "Cannot determine remote HEAD" +msgstr "Ðе удалоÑÑŒ определить внешний HEAD" + +#: builtin/remote.c:1281 +msgid "Multiple remote HEAD branches. Please choose one explicitly with:" +msgstr "ÐеÑколько внешних HEAD веток. Укажите Ñвно одну из них:" + +#: builtin/remote.c:1291 +#, c-format +msgid "Could not delete %s" +msgstr "Ðе удалоÑÑŒ удалить %s" + +#: builtin/remote.c:1299 +#, c-format +msgid "Not a valid ref: %s" +msgstr "ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ ÑÑылка: %s" + +#: builtin/remote.c:1301 +#, c-format +msgid "Could not setup %s" +msgstr "Ðе удалоÑÑŒ наÑтроить %s" + +#: builtin/remote.c:1319 +#, c-format +msgid " %s will become dangling!" +msgstr " %s будет виÑÑщей веткой!" + +#: builtin/remote.c:1320 +#, c-format +msgid " %s has become dangling!" +msgstr " %s Ñтала виÑÑщей веткой!" + +#: builtin/remote.c:1330 +#, c-format +msgid "Pruning %s" +msgstr "Удаление %s" + +#: builtin/remote.c:1331 +#, c-format +msgid "URL: %s" +msgstr "URL: %s" + +#: builtin/remote.c:1354 +#, c-format +msgid " * [would prune] %s" +msgstr " * [будет удалена] %s" + +#: builtin/remote.c:1357 +#, c-format +msgid " * [pruned] %s" +msgstr " * [удалена] %s" + +#: builtin/remote.c:1402 +msgid "prune remotes after fetching" +msgstr "почиÑтить внешние репозитории поÑле извлечениÑ" + +#: builtin/remote.c:1468 builtin/remote.c:1542 +#, c-format +msgid "No such remote '%s'" +msgstr "Ðет такого внешнего Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Â«%s»" + +#: builtin/remote.c:1488 +msgid "add branch" +msgstr "добавить ветку" + +#: builtin/remote.c:1495 +msgid "no remote specified" +msgstr "не указан внешний репозиторий" + +#: builtin/remote.c:1517 +msgid "manipulate push URLs" +msgstr "управление URL отправки" + +#: builtin/remote.c:1519 +msgid "add URL" +msgstr "добавить URL" + +#: builtin/remote.c:1521 +msgid "delete URLs" +msgstr "удалить URL" + +#: builtin/remote.c:1528 +msgid "--add --delete doesn't make sense" +msgstr "--add Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ --delete" + +#: builtin/remote.c:1568 +#, c-format +msgid "Invalid old URL pattern: %s" +msgstr "Ðеправильный шаблон Ñтарого URL: %s" + +#: builtin/remote.c:1576 +#, c-format +msgid "No such URL found: %s" +msgstr "Ðе найдены ÑÐ¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ URL: %s" + +#: builtin/remote.c:1578 +msgid "Will not delete all non-push URLs" +msgstr "ÐÐµÐ»ÑŒÐ·Ñ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ вÑе URL не-отправки" + +#: builtin/remote.c:1592 +msgid "be verbose; must be placed before a subcommand" +msgstr "быть многоÑловнее; должно ÑтоÑÑ‚ÑŒ перед подкомандой" + +#: builtin/repack.c:17 +msgid "git repack [<options>]" +msgstr "git repack [<опции>]" + +#: builtin/repack.c:159 +msgid "pack everything in a single pack" +msgstr "упаковать вÑÑ‘ в один пакет" + +#: builtin/repack.c:161 +msgid "same as -a, and turn unreachable objects loose" +msgstr "тоже, что и -a, но дополнительно отброÑить недоÑтижимые объекты" + +#: builtin/repack.c:164 +msgid "remove redundant packs, and run git-prune-packed" +msgstr "удалите лишние пакеты и запуÑтите git-prune-packed" + +#: builtin/repack.c:166 +msgid "pass --no-reuse-delta to git-pack-objects" +msgstr "передать опцию --no-reuse-delta в git-pack-objects" + +#: builtin/repack.c:168 +msgid "pass --no-reuse-object to git-pack-objects" +msgstr "передать опцию --no-reuse-object в git-pack-objects" + +#: builtin/repack.c:170 +msgid "do not run git-update-server-info" +msgstr "не запуÑкать git-update-server-info" + +#: builtin/repack.c:173 +msgid "pass --local to git-pack-objects" +msgstr "передать опцию --local в git-pack-objects" + +#: builtin/repack.c:175 +msgid "write bitmap index" +msgstr "запиÑÑŒ индекÑа в битовых картах" + +#: builtin/repack.c:176 +msgid "approxidate" +msgstr "примернаÑ-дата" + +#: builtin/repack.c:177 +msgid "with -A, do not loosen objects older than this" +msgstr "Ñ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹ -A, не отбраÑывать объекты Ñтарее, чем указано" + +#: builtin/repack.c:179 +msgid "size of the window used for delta compression" +msgstr "размер окна, иÑпользуемый Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¿Ñ€ÐµÑÑии дельт" + +#: builtin/repack.c:180 builtin/repack.c:184 +msgid "bytes" +msgstr "количеÑтво-байт" + +#: builtin/repack.c:181 +msgid "same as the above, but limit memory size instead of entries count" +msgstr "тоже, что и выше, но ограничить размер памÑти, а не количеÑтво запиÑей" + +#: builtin/repack.c:183 +msgid "limits the maximum delta depth" +msgstr "ограничение на макÑимальную глубину дельт" + +#: builtin/repack.c:185 +msgid "maximum size of each packfile" +msgstr "макÑимальный размер каждого из файлов пакета" + +#: builtin/repack.c:187 +msgid "repack objects in packs marked with .keep" +msgstr "переупаковать объекты в пакеты, помеченные файлом .keep" + +#: builtin/repack.c:375 +#, c-format +msgid "removing '%s' failed" +msgstr "не удалоÑÑŒ удалить «%s»" + +#: builtin/replace.c:19 +msgid "git replace [-f] <object> <replacement>" +msgstr "git replace [-f] <объект> <замена>" + +#: builtin/replace.c:20 +msgid "git replace [-f] --edit <object>" +msgstr "git replace [-f] --edit <объект>" + +#: builtin/replace.c:21 +msgid "git replace [-f] --graft <commit> [<parent>...]" +msgstr "git replace [-f] --graft <коммит> [<родитель>…]" + +#: builtin/replace.c:22 +msgid "git replace -d <object>..." +msgstr "git replace -d <объект>…" + +#: builtin/replace.c:23 +msgid "git replace [--format=<format>] [-l [<pattern>]]" +msgstr "git replace [--format=<формат>] [-l [<шаблон>]]" + +#: 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:355 +#, c-format +msgid "bad mergetag in commit '%s'" +msgstr "Ð¿Ð»Ð¾Ñ…Ð°Ñ Ð¼ÐµÑ‚ÐºÐ° ÑлиÑÐ½Ð¸Ñ Ð² коммите «%s»" + +#: builtin/replace.c:357 +#, c-format +msgid "malformed mergetag in commit '%s'" +msgstr "Ð¿Ð¾Ð²Ñ€ÐµÐ¶Ð´ÐµÐ½Ð½Ð°Ñ Ð¼ÐµÑ‚ÐºÐ° ÑлиÑÐ½Ð¸Ñ Ð² коммите «%s»" + +#: builtin/replace.c:368 +#, c-format +msgid "" +"original commit '%s' contains mergetag '%s' that is discarded; use --edit " +"instead of --graft" +msgstr "оригинальный коммит «%s» Ñодержит метку ÑлиÑÐ½Ð¸Ñ Â«%s», ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð±Ñ‹Ð»Ð° отброшена; иÑпользуйте --edit вмеÑто --graft" + +#: builtin/replace.c:401 +#, c-format +msgid "the original commit '%s' has a gpg signature." +msgstr "оригинальный коммит «%s» Ñодержит подпиÑÑŒ gpg." + +#: builtin/replace.c:402 +msgid "the signature will be removed in the replacement commit!" +msgstr "подпиÑÑŒ будет удалена в замененном коммите!" + +#: builtin/replace.c:408 +#, c-format +msgid "could not write replacement commit for: '%s'" +msgstr "не удалоÑÑŒ запиÑать замену Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°: «%s»" + +#: builtin/replace.c:432 +msgid "list replace refs" +msgstr "вывеÑти ÑпиÑок заменÑемых ÑÑылок" + +#: builtin/replace.c:433 +msgid "delete replace refs" +msgstr "удаление заменÑемых ÑÑылок" + +#: builtin/replace.c:434 +msgid "edit existing object" +msgstr "изменение ÑущеÑтвующего объекта" + +#: builtin/replace.c:435 +msgid "change a commit's parents" +msgstr "изменение Ñ€Ð¾Ð´Ð¸Ñ‚ÐµÐ»Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°" + +#: builtin/replace.c:436 +msgid "replace the ref if it exists" +msgstr "замена ÑÑылки, еÑли она ÑущеÑтвует" + +#: builtin/replace.c:437 +msgid "do not pretty-print contents for --edit" +msgstr "не делать Ñтруктурированный вывод Ñодержимого Ð´Ð»Ñ --edit" + +#: builtin/replace.c:438 +msgid "use this format" +msgstr "иÑпользовать Ñтот формат" + +#: builtin/rerere.c:12 +msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" +msgstr "git rerere [clear | forget <путь>… | status | remaining | diff | gc]" + +#: builtin/rerere.c:57 +msgid "register clean resolutions in index" +msgstr "запиÑать чиÑтые Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚Ð¾Ð² в индекÑ" + +#: 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:27 +msgid "git reset [-q] <tree-ish> [--] <paths>..." +msgstr "git reset [-q] <указатель-дерева> [--] <пути>…" + +#: builtin/reset.c:28 +msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +msgstr "git reset --patch [<указатель-дерева>] [--] [<пути>…]" + +#: builtin/reset.c:34 +msgid "mixed" +msgstr "Ñмешанный" + +#: builtin/reset.c:34 +msgid "soft" +msgstr "мÑгкий" + +#: builtin/reset.c:34 +msgid "hard" +msgstr "жеÑткий" + +#: builtin/reset.c:34 +msgid "merge" +msgstr "ÑлиÑнием" + +#: builtin/reset.c:34 +msgid "keep" +msgstr "оÑтавлением" + +#: builtin/reset.c:74 +msgid "You do not have a valid HEAD." +msgstr "У Ð²Ð°Ñ Ð½ÐµÑ‚ верного HEAD." + +#: builtin/reset.c:76 +msgid "Failed to find tree of HEAD." +msgstr "Ðе удалоÑÑŒ найти дерево у HEAD." + +#: builtin/reset.c:82 +#, c-format +msgid "Failed to find tree of %s." +msgstr "Ðе удалоÑÑŒ найти дерево у %s." + +#: builtin/reset.c:100 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD ÑÐµÐ¹Ñ‡Ð°Ñ Ð½Ð° %s" + +#: builtin/reset.c:183 +#, c-format +msgid "Cannot do a %s reset in the middle of a merge." +msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ ÑÐ±Ñ€Ð¾Ñ Ð² режиме «%s» во Ð²Ñ€ÐµÐ¼Ñ ÑлиÑниÑ." + +#: builtin/reset.c:276 +msgid "be quiet, only report errors" +msgstr "тихий режим, выводить только ошибки" + +#: builtin/reset.c:278 +msgid "reset HEAD and index" +msgstr "ÑброÑить HEAD и индекÑ" + +#: builtin/reset.c:279 +msgid "reset only HEAD" +msgstr "ÑброÑить только HEAD" + +#: builtin/reset.c:281 builtin/reset.c:283 +msgid "reset HEAD, index and working tree" +msgstr "ÑброÑить HEAD, Ð¸Ð½Ð´ÐµÐºÑ Ð¸ рабочий каталог" + +#: builtin/reset.c:285 +msgid "reset HEAD but keep local changes" +msgstr "ÑброÑить HEAD, но оÑтавить локальные изменениÑ" + +#: builtin/reset.c:288 +msgid "record only the fact that removed paths will be added later" +msgstr "запиÑать только факт того, что удаленные пути будут добавлены позже" + +#: builtin/reset.c:305 +#, c-format +msgid "Failed to resolve '%s' as a valid revision." +msgstr "Ðе удалоÑÑŒ раÑпознать «%s» как дейÑтвительную редакцию." + +#: builtin/reset.c:308 builtin/reset.c:316 +#, c-format +msgid "Could not parse object '%s'." +msgstr "Ðе удалоÑÑŒ разобрать объект «%s»." + +#: builtin/reset.c:313 +#, c-format +msgid "Failed to resolve '%s' as a valid tree." +msgstr "Ðе удалоÑÑŒ раÑпознать «%s» как дейÑтвительное дерево." + +#: builtin/reset.c:322 +msgid "--patch is incompatible with --{hard,mixed,soft}" +msgstr "--patch Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ --{hard,mixed,soft}" + +#: builtin/reset.c:331 +msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." +msgstr "иÑпользование опции --mixed Ñ Ð¿ÑƒÑ‚Ñми уÑтарело; иÑпользуйте «git reset -- <пути>» instead." + +#: builtin/reset.c:333 +#, c-format +msgid "Cannot do %s reset with paths." +msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ ÑÐ±Ñ€Ð¾Ñ Ð² режиме «%s» вмеÑте Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸ÐµÐ¼ пути." + +#: builtin/reset.c:343 +#, c-format +msgid "%s reset is not allowed in a bare repository" +msgstr "ÑÐ±Ñ€Ð¾Ñ Â«%s» разрешен только Ñ Ð³Ð¾Ð»Ñ‹Ð¼ репозиторием" + +#: builtin/reset.c:347 +msgid "-N can only be used with --mixed" +msgstr "-N можно иÑпользовать вмеÑте Ñ --mixed" + +#: builtin/reset.c:364 +msgid "Unstaged changes after reset:" +msgstr "ÐепроиндекÑированные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñле ÑброÑа:" + +#: builtin/reset.c:370 +#, c-format +msgid "Could not reset index file to revision '%s'." +msgstr "Ðе удалоÑÑŒ ÑброÑить файл индекÑа на редакцию «%s»." + +#: builtin/reset.c:374 +msgid "Could not write new index file." +msgstr "Ðе удалоÑÑŒ запиÑать новый файл индекÑа." + +#: builtin/rev-parse.c:361 +msgid "git rev-parse --parseopt [<options>] -- [<args>...]" +msgstr "git rev-parse --parseopt [<опции>] -- [<аргументы>…]" + +#: builtin/rev-parse.c:366 +msgid "keep the `--` passed as an arg" +msgstr "передавать далее «--» как аргумент" + +#: builtin/rev-parse.c:368 +msgid "stop parsing after the first non-option argument" +msgstr "оÑтановить разбор поÑле первого аргумента не ÑвлÑющегоÑÑ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹" + +#: builtin/rev-parse.c:371 +msgid "output in stuck long form" +msgstr "выводить аргументы в длинном формате" + +#: builtin/rev-parse.c:499 +msgid "" +"git rev-parse --parseopt [<options>] -- [<args>...]\n" +" or: git rev-parse --sq-quote [<arg>...]\n" +" or: git rev-parse [<options>] [<arg>...]\n" +"\n" +"Run \"git rev-parse --parseopt -h\" for more information on the first usage." +msgstr "git rev-parse --parseopt [<опции>] -- [<аргументы>…]\n or: git rev-parse --sq-quote [<аргумент>…]\n or: git rev-parse [<опции>] [<аргумент>…]\n\nЗапуÑтите команду «git rev-parse --parseopt -h» Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð´Ñ€Ð¾Ð±Ð½Ð¾Ð¹ информации о первом иÑпользовании." + +#: builtin/revert.c:22 +msgid "git revert [<options>] <commit-ish>..." +msgstr "git revert [<опции>] <указатель-коммита>…" + +#: builtin/revert.c:23 +msgid "git revert <subcommand>" +msgstr "git revert <подкоманда>" + +#: builtin/revert.c:28 +msgid "git cherry-pick [<options>] <commit-ish>..." +msgstr "git cherry-pick [<опции>] <указатель-коммита>…" + +#: builtin/revert.c:29 +msgid "git cherry-pick <subcommand>" +msgstr "git cherry-pick <подкоманда>" + +#: builtin/revert.c:71 +#, c-format +msgid "%s: %s cannot be used with %s" +msgstr "%s: %s Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ %s" + +#: builtin/revert.c:80 +msgid "end revert or cherry-pick sequence" +msgstr "конец поÑледовательноÑти отбора лучшего или возврата коммита" + +#: builtin/revert.c:81 +msgid "resume revert or cherry-pick sequence" +msgstr "продолжить поÑледовательноÑÑ‚ÑŒ отбора лучшего или возврата коммита" + +#: builtin/revert.c:82 +msgid "cancel revert or cherry-pick sequence" +msgstr "отмена поÑледовательноÑти отбора лучшего или возврата коммита" + +#: builtin/revert.c:83 +msgid "don't automatically commit" +msgstr "не коммитить автоматичеÑки" + +#: builtin/revert.c:84 +msgid "edit the commit message" +msgstr "изменить Ñообщение коммита" + +#: builtin/revert.c:87 +msgid "parent number" +msgstr "номер родителÑ" + +#: builtin/revert.c:89 +msgid "merge strategy" +msgstr "ÑÑ‚Ñ€Ð°Ñ‚ÐµÐ³Ð¸Ñ ÑлиÑниÑ" + +#: builtin/revert.c:90 +msgid "option" +msgstr "опциÑ" + +#: builtin/revert.c:91 +msgid "option for merge strategy" +msgstr "Ð¾Ð¿Ñ†Ð¸Ñ Ð´Ð»Ñ Ñтратегии ÑлиÑниÑ" + +#: builtin/revert.c:104 +msgid "append commit name" +msgstr "добавить Ð¸Ð¼Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°" + +#: builtin/revert.c:105 +msgid "allow fast-forward" +msgstr "разрешить перемотку вперед" + +#: builtin/revert.c:106 +msgid "preserve initially empty commits" +msgstr "Ñохранить изначально пуÑтые коммиты" + +#: builtin/revert.c:107 +msgid "allow commits with empty messages" +msgstr "разрешить коммиты Ñ Ð¿ÑƒÑтыми ÑообщениÑми" + +#: builtin/revert.c:108 +msgid "keep redundant, empty commits" +msgstr "оÑтавить избыточные, пуÑтые коммиты" + +#: builtin/revert.c:112 +msgid "program error" +msgstr "ошибка в программе" + +#: builtin/revert.c:197 +msgid "revert failed" +msgstr "Ñбой возврата коммита" + +#: builtin/revert.c:212 +msgid "cherry-pick failed" +msgstr "Ñбой при отборе лучшего" + +#: builtin/rm.c:17 +msgid "git rm [<options>] [--] <file>..." +msgstr "git rm [<опции>] [--] <файл>…" + +#: builtin/rm.c:65 +msgid "" +"the following submodule (or one of its nested submodules)\n" +"uses a .git directory:" +msgid_plural "" +"the following submodules (or one of their nested submodules)\n" +"use a .git directory:" +msgstr[0] "Ñледующий подмодуль (или один из вложенных подмодулей)\nиÑпользует каталог .git:" +msgstr[1] "Ñледующие подмодули (или один из вложенных подмодулей)\nиÑпользуют каталог .git:" +msgstr[2] "Ñледующие подмодули (или один из вложенных подмодулей)\nиÑпользуют каталог .git:" + +#: builtin/rm.c:71 +msgid "" +"\n" +"(use 'rm -rf' if you really want to remove it including all of its history)" +msgstr "\n(иÑпользуйте «rm -rf», еÑли вы дейÑтвительно хотите удалить его, Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ Ð²ÑÑŽ его иÑторию)" + +#: builtin/rm.c:231 +msgid "" +"the following file has staged content different from both the\n" +"file and the HEAD:" +msgid_plural "" +"the following files have staged content different from both the\n" +"file and the HEAD:" +msgstr[0] "Ñледующие файлы Ñодержат проиндекÑированные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¾Ñ‚Ð»Ð¸Ñ‡Ð°ÑŽÑ‰Ð¸ÐµÑÑ Ð¸ от файла, и от HEAD:" +msgstr[1] "Ñледующие файлы Ñодержат проиндекÑированные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¾Ñ‚Ð»Ð¸Ñ‡Ð°ÑŽÑ‰Ð¸ÐµÑÑ Ð¸ от файла, и от HEAD:" +msgstr[2] "Ñледующие файлы Ñодержат проиндекÑированные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¾Ñ‚Ð»Ð¸Ñ‡Ð°ÑŽÑ‰Ð¸ÐµÑÑ Ð¸ от файла, и от HEAD:" + +#: builtin/rm.c:236 +msgid "" +"\n" +"(use -f to force removal)" +msgstr "\n(иÑпользуйте опцию «-f» Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð³Ð¾ удалениÑ)" + +#: builtin/rm.c:240 +msgid "the following file has changes staged in the index:" +msgid_plural "the following files have changes staged in the index:" +msgstr[0] "Ñледующие файлы Ñодержат проиндекÑированные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² индекÑе:" +msgstr[1] "Ñледующие файлы Ñодержат проиндекÑированные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² индекÑе:" +msgstr[2] "Ñледующие файлы Ñодержат проиндекÑированные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² индекÑе:" + +#: builtin/rm.c:244 builtin/rm.c:255 +msgid "" +"\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "\n(иÑпользуйте опцию «--cached» Ð´Ð»Ñ Ð¾ÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð°, или «-f» Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð³Ð¾ удалениÑ)" + +#: builtin/rm.c:252 +msgid "the following file has local modifications:" +msgid_plural "the following files have local modifications:" +msgstr[0] "Ñледующие файлы Ñодержат локальные изменениÑ:" +msgstr[1] "Ñледующие файлы Ñодержат локальные изменениÑ:" +msgstr[2] "Ñледующие файлы Ñодержат локальные изменениÑ:" + +#: builtin/rm.c:270 +msgid "do not list removed files" +msgstr "не выводить ÑпиÑок удаленных файлов" + +#: builtin/rm.c:271 +msgid "only remove from the index" +msgstr "удалить только из индекÑа" + +#: builtin/rm.c:272 +msgid "override the up-to-date check" +msgstr "пропуÑтить проверку актуальноÑти" + +#: builtin/rm.c:273 +msgid "allow recursive removal" +msgstr "разрешить рекурÑивное удаление" + +#: builtin/rm.c:275 +msgid "exit with a zero status even if nothing matched" +msgstr "выход Ñ Ð½ÑƒÐ»ÐµÐ²Ñ‹Ð¼ кодом возврата, даже еÑли ничего не найдено" + +#: builtin/rm.c:318 +msgid "Please, stage your changes to .gitmodules or stash them to proceed" +msgstr "ПожалуйÑта, проиндекÑируйте ваши Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² .gitmodules или ÑпрÑчьте их, чтобы продолжить" + +#: builtin/rm.c:336 +#, c-format +msgid "not removing '%s' recursively without -r" +msgstr "не удалÑÑŽ рекурÑивно «%s» без ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð¾Ð¿Ñ†Ð¸Ð¸ -r" + +#: builtin/rm.c:375 +#, c-format +msgid "git rm: unable to remove %s" +msgstr "git rm: не удалоÑÑŒ удалить %s" + +#: builtin/shortlog.c:13 +msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" +msgstr "git shortlog [<опции>] [<диапазон-редакций>] [[--] [<путь>…]]" + +#: builtin/shortlog.c:131 +#, c-format +msgid "Missing author: %s" +msgstr "Пропущен автор: %s" + +#: builtin/shortlog.c:230 +msgid "sort output according to the number of commits per author" +msgstr "отÑортировать вывод по количеÑтву коммитов у автора" + +#: builtin/shortlog.c:232 +msgid "Suppress commit descriptions, only provides commit count" +msgstr "Ðе выводить опиÑÐ°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¾Ð², а только их количеÑтво" + +#: builtin/shortlog.c:234 +msgid "Show the email address of each author" +msgstr "Показать почту каждого из авторов" + +#: builtin/shortlog.c:235 +msgid "w[,i1[,i2]]" +msgstr "w[,i1[,i2]]" + +#: builtin/shortlog.c:236 +msgid "Linewrap output" +msgstr "ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ñтрок на выводе" + +#: builtin/show-branch.c:9 +msgid "" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" +"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" +"\t\t[--more=<n> | --list | --independent | --merge-base]\n" +"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" +msgstr "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n\t\t[--current] [--color[=<когда>] | --no-color] [--sparse]\n\t\t[--more=<n> | --list | --independent | --merge-base]\n\t\t[--no-name | --sha1-name] [--topics] [(<редакциÑ> | <шаблон>)...]" + +#: builtin/show-branch.c:13 +msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" +msgstr "git show-branch (-g | --reflog)[=<n>[,<база>]] [--list] [<ÑÑылка>]" + +#: builtin/show-branch.c:652 +msgid "show remote-tracking and local branches" +msgstr "показать ÑпиÑок и отÑлеживаемых внешних и локальных веток" + +#: builtin/show-branch.c:654 +msgid "show remote-tracking branches" +msgstr "показать ÑпиÑок отÑлеживаемых внешних веток" + +#: builtin/show-branch.c:656 +msgid "color '*!+-' corresponding to the branch" +msgstr "окрашивать «*!+-» в ÑоответÑтвии Ñ Ð²ÐµÑ‚ÐºÐ¾Ð¹" + +#: builtin/show-branch.c:658 +msgid "show <n> more commits after the common ancestor" +msgstr "показать <n> коммитов поÑле общего предка" + +#: builtin/show-branch.c:660 +msgid "synonym to more=-1" +msgstr "Ñиноним Ð´Ð»Ñ more=-1" + +#: builtin/show-branch.c:661 +msgid "suppress naming strings" +msgstr "не выводить именованые Ñтроки" + +#: builtin/show-branch.c:663 +msgid "include the current branch" +msgstr "включить в вывод текущую ветку" + +#: builtin/show-branch.c:665 +msgid "name commits with their object names" +msgstr "именовать коммиты их именами объектов" + +#: builtin/show-branch.c:667 +msgid "show possible merge bases" +msgstr "вывеÑти возможные базы ÑлиÑниÑ" + +#: builtin/show-branch.c:669 +msgid "show refs unreachable from any other ref" +msgstr "вывеÑти ÑÑылки, недоÑтупные из любых других ÑÑылок" + +#: builtin/show-branch.c:671 +msgid "show commits in topological order" +msgstr "вывеÑти коммиты в топологичеÑком порÑдке" + +#: builtin/show-branch.c:674 +msgid "show only commits not on the first branch" +msgstr "вывеÑти только коммиты, отÑуцтвующие в первой ветке" + +#: builtin/show-branch.c:676 +msgid "show merges reachable from only one tip" +msgstr "вывеÑти ÑлиÑниÑ, доÑтижимые только из одной из верхушек" + +#: builtin/show-branch.c:678 +msgid "topologically sort, maintaining date order where possible" +msgstr "топологичеÑÐºÐ°Ñ Ñортировка, Ñ Ñохранением порÑдка дат, еÑли возможно" + +#: builtin/show-branch.c:681 +msgid "<n>[,<base>]" +msgstr "<n>[,<база>]" + +#: builtin/show-branch.c:682 +msgid "show <n> most recent ref-log entries starting at base" +msgstr "показать <n> поÑледних запиÑей в журнале ÑÑылок, Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñ Ð±Ð°Ð·Ñ‹" + +#: builtin/show-ref.c:10 +msgid "" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | " +"--hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" +msgstr "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<шаблон>…]" + +#: builtin/show-ref.c:11 +msgid "git show-ref --exclude-existing[=pattern] < ref-list" +msgstr "git show-ref --exclude-existing[=шаблон] < ref-list" + +#: builtin/show-ref.c:168 +msgid "only show tags (can be combined with heads)" +msgstr "вывеÑти только метки (можно иÑпользовать одновременно Ñ --heads)" + +#: builtin/show-ref.c:169 +msgid "only show heads (can be combined with tags)" +msgstr "вывеÑти только головы (можно иÑпользовать одновременно Ñ --tags)" + +#: builtin/show-ref.c:170 +msgid "stricter reference checking, requires exact ref path" +msgstr "более ÑÑ‚Ñ€Ð¾Ð³Ð°Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ° ÑÑылок, требует точный путь ÑÑылки" + +#: builtin/show-ref.c:173 builtin/show-ref.c:175 +msgid "show the HEAD reference, even if it would be filtered out" +msgstr "вывеÑти ÑÑылку HEAD, даже еÑли она будет отфильтрована" + +#: builtin/show-ref.c:177 +msgid "dereference tags into object IDs" +msgstr "разыменовать метки в идентификаторы объектов" + +#: builtin/show-ref.c:179 +msgid "only show SHA1 hash using <n> digits" +msgstr "иÑпользовать <n> цифр Ð´Ð»Ñ Ð²Ñ‹Ð²Ð¾Ð´Ð° SHA-1" + +#: builtin/show-ref.c:183 +msgid "do not print results to stdout (useful with --verify)" +msgstr "не печатать результат на Ñтандартный вывод (полезно Ñ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹ «--verify»)" + +#: builtin/show-ref.c:185 +msgid "show refs from stdin that aren't in local repository" +msgstr "вывеÑти ÑÑылки Ñо Ñтандартного ввода, которых нет в локальном репозитории" + +#: builtin/symbolic-ref.c:7 +msgid "git symbolic-ref [<options>] <name> [<ref>]" +msgstr "git symbolic-ref [<опции>] <имÑ> [<ÑÑылка>]" + +#: builtin/symbolic-ref.c:8 +msgid "git symbolic-ref -d [-q] <name>" +msgstr "git symbolic-ref -d [-q] <имÑ>" + +#: builtin/symbolic-ref.c:40 +msgid "suppress error message for non-symbolic (detached) refs" +msgstr "не выводить ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾Ð± ошибках Ð´Ð»Ñ Ð½ÐµÑимвольных (отÑоединенных) ÑÑылок" + +#: builtin/symbolic-ref.c:41 +msgid "delete symbolic ref" +msgstr "удалить Ñимвольные ÑÑылки" + +#: builtin/symbolic-ref.c:42 +msgid "shorten ref output" +msgstr "укороченный вывод ÑÑылок" + +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358 +msgid "reason" +msgstr "причина" + +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358 +msgid "reason of the update" +msgstr "причина обновлениÑ" + +#: builtin/tag.c:22 +msgid "" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " +"[<head>]" +msgstr "git tag [-a | -s | -u <идентификатор-ключа>] [-f] [-m <Ñообщение> | -F <файл>] <имÑ-метки> [<редакциÑ>]" + +#: builtin/tag.c:23 +msgid "git tag -d <tagname>..." +msgstr "git tag -d <имÑ-метки>…" + +#: builtin/tag.c:24 +msgid "" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" +"\t\t[<pattern>...]" +msgstr "git tag -l [-n[<количеÑтво>]] [--contains <коммит>] [--points-at <объект>]\n\t\t[<шаблон>…]" + +#: builtin/tag.c:26 +msgid "git tag -v <tagname>..." +msgstr "git tag -v <имÑ-метки>…" + +#: builtin/tag.c:69 +#, c-format +msgid "malformed object at '%s'" +msgstr "Поврежденный объект «%s»" + +#: builtin/tag.c:301 +#, c-format +msgid "tag name too long: %.*s..." +msgstr "Ñлишком длинное Ð¸Ð¼Ñ Ð¼ÐµÑ‚ÐºÐ¸: %.*s…" + +#: builtin/tag.c:306 +#, c-format +msgid "tag '%s' not found." +msgstr "метка «%s» не найдена." + +#: builtin/tag.c:321 +#, c-format +msgid "Deleted tag '%s' (was %s)\n" +msgstr "Метка «%s» удалена (была %s)\n" + +#: builtin/tag.c:333 +#, c-format +msgid "could not verify the tag '%s'" +msgstr "не удалоÑÑŒ проверить метку «%s»" + +#: builtin/tag.c:343 +#, c-format +msgid "" +"\n" +"Write a message for tag:\n" +" %s\n" +"Lines starting with '%c' will be ignored.\n" +msgstr "\nВведите Ñообщение Ð´Ð»Ñ Ð¼ÐµÑ‚ÐºÐ¸:\n %s\nСтроки, начинающиеÑÑ Ñ Â«%c» будут проигнорированы.\n" + +#: builtin/tag.c:347 +#, c-format +msgid "" +"\n" +"Write a message for tag:\n" +" %s\n" +"Lines starting with '%c' will be kept; you may remove them yourself if you want to.\n" +msgstr "\nВведите Ñообщение Ð´Ð»Ñ Ð¼ÐµÑ‚ÐºÐ¸:\n %s\nСтроки, начинающиеÑÑ Ñ Â«%c» будут оÑтавлены; вы можете удалить их вручную, еÑли хотите.\n" + +#: builtin/tag.c:371 +#, c-format +msgid "unsupported sort specification '%s'" +msgstr "неподдерживаемый ÑпоÑоб Ñортировки «%s»" + +#: builtin/tag.c:373 +#, c-format +msgid "unsupported sort specification '%s' in variable '%s'" +msgstr "неподдерживаемый ÑпоÑоб Ñортировки «%s» в переменной «%s»" + +#: builtin/tag.c:428 +msgid "unable to sign the tag" +msgstr "не удалоÑÑŒ подпиÑать метку" + +#: builtin/tag.c:430 +msgid "unable to write tag file" +msgstr "не удалоÑÑŒ запиÑать файл метки" + +#: builtin/tag.c:455 +msgid "bad object type." +msgstr "неправильный тип объекта" + +#: builtin/tag.c:468 +msgid "tag header too big." +msgstr "заголовок метки Ñлишком большой." + +#: builtin/tag.c:504 +msgid "no tag message?" +msgstr "нет опиÑÐ°Ð½Ð¸Ñ Ð¼ÐµÑ‚ÐºÐ¸?" + +#: builtin/tag.c:510 +#, c-format +msgid "The tag message has been left in %s\n" +msgstr "Сообщение метки было оÑтавлено в %s\n" + +#: builtin/tag.c:559 +msgid "switch 'points-at' requires an object" +msgstr "при указании параметра «points-at» требуетÑÑ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ объект" + +#: builtin/tag.c:561 +#, c-format +msgid "malformed object name '%s'" +msgstr "Поврежденное Ð¸Ð¼Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð° «%s»" + +#: builtin/tag.c:589 +msgid "list tag names" +msgstr "ÑпиÑок названий меток" + +#: builtin/tag.c:591 +msgid "print <n> lines of each tag message" +msgstr "печатать <n> Ñтрок опиÑÐ°Ð½Ð¸Ñ Ð¾Ñ‚ каждой метки" + +#: builtin/tag.c:593 +msgid "delete tags" +msgstr "удалить метки" + +#: builtin/tag.c:594 +msgid "verify tags" +msgstr "проверить метки" + +#: builtin/tag.c:596 +msgid "Tag creation options" +msgstr "ÐаÑтройки ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¼ÐµÑ‚ÐºÐ¸" + +#: builtin/tag.c:598 +msgid "annotated tag, needs a message" +msgstr "Ð´Ð»Ñ Ð°Ð½Ð½Ð¾Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð¾Ð¹ метки нужно Ñообщение" + +#: builtin/tag.c:600 +msgid "tag message" +msgstr "опиÑание метки" + +#: builtin/tag.c:602 +msgid "annotated and GPG-signed tag" +msgstr "Ð°Ð½Ð½Ð¾Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¸ подпиÑÐ°Ð½Ð½Ð°Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ GPG метка" + +#: builtin/tag.c:606 +msgid "use another key to sign the tag" +msgstr "иÑпользовать другой ключ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ Ð¼ÐµÑ‚ÐºÐ¸" + +#: builtin/tag.c:607 +msgid "replace the tag if exists" +msgstr "замена метки, еÑли она ÑущеÑтвует" + +#: builtin/tag.c:609 +msgid "Tag listing options" +msgstr "ÐаÑтройки вывода ÑпиÑка меток" + +#: builtin/tag.c:610 +msgid "show tag list in columns" +msgstr "показать ÑпиÑок меток по Ñтолбцам" + +#: builtin/tag.c:612 +msgid "sort tags" +msgstr "отÑортировать метки" + +#: builtin/tag.c:617 builtin/tag.c:623 +msgid "print only tags that contain the commit" +msgstr "вывод только меток, которые Ñодержат коммит" + +#: builtin/tag.c:629 +msgid "print only tags of the object" +msgstr "вывод только меток, определенного объекта" + +#: builtin/tag.c:655 +msgid "--column and -n are incompatible" +msgstr "--column и -n Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно" + +#: builtin/tag.c:667 +msgid "--sort and -n are incompatible" +msgstr "--sort и -n Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно" + +#: builtin/tag.c:674 +msgid "-n option is only allowed with -l." +msgstr "опцию -n можно иÑпользовать только вмеÑте Ñ -l." + +#: builtin/tag.c:676 +msgid "--contains option is only allowed with -l." +msgstr "опцию --contains можно иÑпользовать только вмеÑте Ñ -l." + +#: builtin/tag.c:678 +msgid "--points-at option is only allowed with -l." +msgstr "опцию --points-at можно иÑпользовать только вмеÑте Ñ -l." + +#: builtin/tag.c:686 +msgid "only one -F or -m option is allowed." +msgstr "-F и -m Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно." + +#: builtin/tag.c:706 +msgid "too many params" +msgstr "передано Ñлишком много параметров" + +#: builtin/tag.c:712 +#, c-format +msgid "'%s' is not a valid tag name." +msgstr "«%s» не ÑвлÑетÑÑ Ð´Ð¾Ð¿ÑƒÑтимым именем метки." + +#: builtin/tag.c:717 +#, c-format +msgid "tag '%s' already exists" +msgstr "метка «%s» уже ÑущеÑтвует" + +#: builtin/tag.c:741 +#, c-format +msgid "Updated tag '%s' (was %s)\n" +msgstr "Метка «%s» обновлена (была %s)\n" + +#: builtin/unpack-objects.c:489 +msgid "Unpacking objects" +msgstr "РаÑпаковка объектов" + +#: builtin/update-index.c:403 +msgid "git update-index [<options>] [--] [<file>...]" +msgstr "git update-index [<опции>] [--] [<файл>…]" + +#: builtin/update-index.c:757 +msgid "continue refresh even when index needs update" +msgstr "продолжить обновление, даже еÑли Ð¸Ð½Ð´ÐµÐºÑ Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ обновлениÑ" + +#: builtin/update-index.c:760 +msgid "refresh: ignore submodules" +msgstr "обновление: игнорировать подмодули" + +#: builtin/update-index.c:763 +msgid "do not ignore new files" +msgstr "не игнорировать новые файлы" + +#: builtin/update-index.c:765 +msgid "let files replace directories and vice-versa" +msgstr "разрешить файлам заменÑÑ‚ÑŒ каталоги и наоборот" + +#: builtin/update-index.c:767 +msgid "notice files missing from worktree" +msgstr "замечать файлы отÑутÑтвующие в рабочем каталоге" + +#: builtin/update-index.c:769 +msgid "refresh even if index contains unmerged entries" +msgstr "обновить, даже еÑли в индекÑе имеютÑÑ Ð½Ðµ Ñлитые запиÑи" + +#: builtin/update-index.c:772 +msgid "refresh stat information" +msgstr "обновить информацию о ÑтатуÑе файлов" + +#: builtin/update-index.c:776 +msgid "like --refresh, but ignore assume-unchanged setting" +msgstr "как --refresh, но игнорировать наÑтройку assume-unchanged" + +#: builtin/update-index.c:780 +msgid "<mode>,<object>,<path>" +msgstr "<режим доÑтупа>,<объект>,<путь>" + +#: builtin/update-index.c:781 +msgid "add the specified entry to the index" +msgstr "добавить указанную запиÑÑŒ в индекÑ" + +#: builtin/update-index.c:785 +msgid "(+/-)x" +msgstr "(+/-)x" + +#: builtin/update-index.c:786 +msgid "override the executable bit of the listed files" +msgstr "переопределить бит Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð½Ð° указанных файлах" + +#: builtin/update-index.c:790 +msgid "mark files as \"not changing\"" +msgstr "пометить файлы как \"не измененные\"" + +#: builtin/update-index.c:793 +msgid "clear assumed-unchanged bit" +msgstr "убрать пометку assumed-unchanged" + +#: builtin/update-index.c:796 +msgid "mark files as \"index-only\"" +msgstr "пометить файлы как \"только в индекÑе\"" + +#: builtin/update-index.c:799 +msgid "clear skip-worktree bit" +msgstr "убрать пометку skip-worktree" + +#: builtin/update-index.c:802 +msgid "add to index only; do not add content to object database" +msgstr "только добавить в индекÑ; не добавлÑÑ‚ÑŒ Ñодержимое в базу данных объектов" + +#: builtin/update-index.c:804 +msgid "remove named paths even if present in worktree" +msgstr "удалить указанные пути, даже еÑли они ÑущеÑтвуют в рабочем каталоге" + +#: builtin/update-index.c:806 +msgid "with --stdin: input lines are terminated by null bytes" +msgstr "Ñ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹ --stdin: Ñтроки на вводе отделÑÑŽÑ‚ÑÑ ÐУЛЕВЫМ байтом" + +#: builtin/update-index.c:808 +msgid "read list of paths to be updated from standard input" +msgstr "прочитать ÑпиÑок обновлÑемых путей из Ñтандартного ввода" + +#: builtin/update-index.c:812 +msgid "add entries from standard input to the index" +msgstr "добавить запиÑи из Ñтандатрного ввода в индекÑ" + +#: builtin/update-index.c:816 +msgid "repopulate stages #2 and #3 for the listed paths" +msgstr "заново заполнить Ð¸Ð½Ð´ÐµÐºÑ #2 и #3 Ð´Ð»Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ñ… путей" + +#: builtin/update-index.c:820 +msgid "only update entries that differ from HEAD" +msgstr "обновить только запиÑи, которые отличаютÑÑ Ð¾Ñ‚ HEAD" + +#: builtin/update-index.c:824 +msgid "ignore files missing from worktree" +msgstr "игнорировать файлы, отÑутÑтвующие в рабочем каталоге" + +#: builtin/update-index.c:827 +msgid "report actions to standard output" +msgstr "вывеÑти выполнÑемые дейÑÑ‚Ð²Ð¸Ñ Ð½Ð° Ñтандартный вывод" + +#: builtin/update-index.c:829 +msgid "(for porcelains) forget saved unresolved conflicts" +msgstr "(Ð´Ð»Ñ Ð¼Ð°ÑˆÐ¸Ð½Ð½Ð¾Ð¹ обработки) забыть Ñохраненные неразрешенные конфликты" + +#: builtin/update-index.c:833 +msgid "write index in this format" +msgstr "запиÑать Ð¸Ð½Ð´ÐµÐºÑ Ð² указанном формате" + +#: builtin/update-index.c:835 +msgid "enable or disable split index" +msgstr "разрешить или запретить раздельный индекÑ" + +#: builtin/update-ref.c:9 +msgid "git update-ref [<options>] -d <refname> [<old-val>]" +msgstr "git update-ref [<опции>] -d <имÑ-ÑÑылки> [<Ñтарое-значение>]" + +#: builtin/update-ref.c:10 +msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" +msgstr "git update-ref [<опции>] <имÑ-ÑÑылки> <новое-значение> [<Ñтарое-значение>]" + +#: builtin/update-ref.c:11 +msgid "git update-ref [<options>] --stdin [-z]" +msgstr "git update-ref [<опции>] --stdin [-z]" + +#: builtin/update-ref.c:359 +msgid "delete the reference" +msgstr "удалить ÑÑылку" + +#: builtin/update-ref.c:361 +msgid "update <refname> not the one it points to" +msgstr "обновить <имÑ-ÑÑылки> а не то, на что она указывает" + +#: builtin/update-ref.c:362 +msgid "stdin has NUL-terminated arguments" +msgstr "ввод отделенный ÐУЛЕВЫМИ Ñимволами" + +#: builtin/update-ref.c:363 +msgid "read updates from stdin" +msgstr "прочитать Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸Ð· Ñтандартного ввода" + +#: builtin/update-server-info.c:6 +msgid "git update-server-info [--force]" +msgstr "git update-server-info [--force]" + +#: builtin/update-server-info.c:14 +msgid "update the info files from scratch" +msgstr "обновить информацию о Ñерверах Ñ Ð½ÑƒÐ»Ñ" + +#: builtin/verify-commit.c:17 +msgid "git verify-commit [-v | --verbose] <commit>..." +msgstr "git verify-commit [-v | --verbose] <коммит>…" + +#: builtin/verify-commit.c:75 +msgid "print commit contents" +msgstr "вывеÑти Ñодержимое коммита" + +#: 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:64 +msgid "verbose" +msgstr "быть многоÑловнее" + +#: builtin/verify-pack.c:66 +msgid "show statistics only" +msgstr "вывеÑти только ÑтатиÑтику" + +#: builtin/verify-tag.c:17 +msgid "git verify-tag [-v | --verbose] <tag>..." +msgstr "git verify-tag [-v | --verbose] <метка>…" + +#: builtin/verify-tag.c:73 +msgid "print tag contents" +msgstr "вывеÑти Ñодержимое метки" + +#: builtin/write-tree.c:13 +msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" +msgstr "git write-tree [--missing-ok] [--prefix=<префикÑ>/]" + +#: builtin/write-tree.c:26 +msgid "<prefix>/" +msgstr "<префикÑ>/" + +#: builtin/write-tree.c:27 +msgid "write tree object for a subdirectory <prefix>" +msgstr "вывеÑти объект дерева Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð° Ñ <префикÑ>" + +#: builtin/write-tree.c:30 +msgid "only useful for debugging" +msgstr "иÑпользуетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ при отладке" + +#: credential-cache--daemon.c:267 +msgid "print debugging messages to stderr" +msgstr "вывод отладочных Ñообщений на stderr" + +#: git.c:14 +msgid "" +"'git help -a' and 'git help -g' list available subcommands and some\n" +"concept guides. See 'git help <command>' or 'git help <concept>'\n" +"to read about a specific subcommand or concept." +msgstr "«git help -а» и «git help -g» выводит ÑпиÑок доÑтупных подкоманд и\nнекоторые руководÑтва по темам. ЗапуÑтите «git help <команда>» или\n«git help <термин>», чтобы прочеÑÑ‚ÑŒ о конкретных подкоманде или теме." + +#: common-cmds.h:8 +msgid "Add file contents to the index" +msgstr "Добавление Ñодержимого файла в индекÑ" + +#: common-cmds.h:9 +msgid "Find by binary search the change that introduced a bug" +msgstr "Двоичный поиÑк изменениÑ, которое вноÑит ошибку" + +#: common-cmds.h:10 +msgid "List, create, or delete branches" +msgstr "Вывод ÑпиÑка, Ñоздание или удаление веток" + +#: common-cmds.h:11 +msgid "Checkout a branch or paths to the working tree" +msgstr "Переход на ветку или коммит по пути в рабочем каталоге" + +#: common-cmds.h:12 +msgid "Clone a repository into a new directory" +msgstr "Клонирование Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ð² новый каталог" + +#: common-cmds.h:13 +msgid "Record changes to the repository" +msgstr "ЗапиÑÑŒ изменений в репозиторий" + +#: common-cmds.h:14 +msgid "Show changes between commits, commit and working tree, etc" +msgstr "Вывод разницы между коммитами, коммитом и рабочим каталогом и Ñ‚.д." + +#: common-cmds.h:15 +msgid "Download objects and refs from another repository" +msgstr "Загрузка объектов и ÑÑылок из другого репозиториÑ" + +#: common-cmds.h:16 +msgid "Print lines matching a pattern" +msgstr "Вывод Ñтрок, ÑоответÑтвующих шаблону" + +#: common-cmds.h:17 +msgid "Create an empty Git repository or reinitialize an existing one" +msgstr "Создание пуÑтого Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Git или Ñ€ÐµÐ¸Ð½Ð¸Ñ†Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ ÑущеÑтвующего" + +#: common-cmds.h:18 +msgid "Show commit logs" +msgstr "Вывод иÑтории коммитов" + +#: common-cmds.h:19 +msgid "Join two or more development histories together" +msgstr "Объединение одной или неÑкольких иÑторий разработки вмеÑте" + +#: common-cmds.h:20 +msgid "Move or rename a file, a directory, or a symlink" +msgstr "Перемещение или переименование файла, каталога или Ñимвольной ÑÑылки" + +#: common-cmds.h:21 +msgid "Fetch from and integrate with another repository or a local branch" +msgstr "Извлечение изменений и объединение Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼ репозиторием или локальной веткой" + +#: common-cmds.h:22 +msgid "Update remote refs along with associated objects" +msgstr "Обновление внешних ÑÑылок и ÑвÑзанных объектов" + +#: common-cmds.h:23 +msgid "Forward-port local commits to the updated upstream head" +msgstr "Перемещение локальных коммитов над обновленной вышеÑтоÑщей веткой" + +#: common-cmds.h:24 +msgid "Reset current HEAD to the specified state" +msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ³Ð¾ ÑоÑтоÑÐ½Ð¸Ñ HEAD на указанное ÑоÑтоÑние" + +#: common-cmds.h:25 +msgid "Remove files from the working tree and from the index" +msgstr "Удаление файлов из рабочего каталога и индекÑа" + +#: common-cmds.h:26 +msgid "Show various types of objects" +msgstr "Вывод различных типов объектов" + +#: common-cmds.h:27 +msgid "Show the working tree status" +msgstr "Вывод ÑоÑтоÑÐ½Ð¸Ñ Ñ€Ð°Ð±Ð¾Ñ‡ÐµÐ³Ð¾ каталога" + +#: common-cmds.h:28 +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 "тихий режим" + +#: parse-options.h:240 +msgid "use <n> digits to display SHA-1s" +msgstr "иÑпользовать <n> цифр Ð´Ð»Ñ Ð²Ñ‹Ð²Ð¾Ð´Ð° SHA-1" + +#: rerere.h:27 +msgid "update the index with reused conflict resolution if possible" +msgstr "обновить Ð¸Ð½Ð´ÐµÐºÑ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ переиÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚Ð°, еÑли возможно" + +#: git-am.sh:53 +msgid "You need to set your committer info first" +msgstr "Сначала нужно указать вашу информацию о коммитере" + +#: git-am.sh:98 +msgid "" +"You seem to have moved HEAD since the last 'am' failure.\n" +"Not rewinding to ORIG_HEAD" +msgstr "Похоже, что вы перемеÑтили HEAD Ñ Ð¼Ð¾Ð¼ÐµÐ½Ñ‚Ð° поÑледней ошибки Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Â«am».\nПеремотка на ORIG_HEAD не выполнÑетÑÑ" + +#: git-am.sh:108 +#, sh-format +msgid "" +"When you have resolved this problem, run \"$cmdline --continue\".\n" +"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" +"To restore the original branch and stop patching, run \"$cmdline --abort\"." +msgstr "Когда вы разрешите Ñтот конфликт, запуÑтите «$cmdline --continue».\nЕÑли вы хотите пропуÑтить Ñтот патч, то запуÑтите «$cmdline --skip».\nЧтобы перейти на оригинальную ветку и оÑтановить применение изменений, запуÑтите «$cmdline --abort»." + +#: git-am.sh:124 +msgid "Cannot fall back to three-way merge." +msgstr "Ðе удалоÑÑŒ откатитьÑÑ Ðº трехходовому ÑлиÑнию." + +#: git-am.sh:140 +msgid "Repository lacks necessary blobs to fall back on 3-way merge." +msgstr "Ð’ репозитории отÑутÑтвуют двоичные объекты, необходимые Ð´Ð»Ñ Ð¾Ñ‚ÐºÐ°Ñ‚Ð° к трехходовому ÑлиÑнию." + +#: git-am.sh:142 +msgid "Using index info to reconstruct a base tree..." +msgstr "ИÑпользую Ð¸Ð½Ð´ÐµÐºÑ Ð´Ð»Ñ Ñ€ÐµÐºÐ¾Ð½Ñтрукции базового дерева…" + +#: git-am.sh:157 +msgid "" +"Did you hand edit your patch?\n" +"It does not apply to blobs recorded in its index." +msgstr "Ð’Ñ‹ вручную изменÑли патч?\nОн не накладываетÑÑ Ð±ÐµÐ· ошибок на двоичные объекты, запиÑанные в его заголовке." + +#: git-am.sh:166 +msgid "Falling back to patching base and 3-way merge..." +msgstr "Откат к применению изменений к базовому коммиту Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ трехходового ÑлиÑниÑ…" + +#: git-am.sh:182 +msgid "Failed to merge in the changes." +msgstr "Ðе удалоÑÑŒ Ñлить изменениÑ." + +#: git-am.sh:277 +msgid "Only one StGIT patch series can be applied at once" +msgstr "Только ÑÐµÑ€Ð¸Ñ Ð¿Ð°Ñ‚Ñ‡ÐµÐ¹ StGIT может быть применена за раз" + +#: git-am.sh:364 +#, sh-format +msgid "Patch format $patch_format is not supported." +msgstr "Ðеподдерживаемый формат патча $patch_format." + +#: git-am.sh:366 +msgid "Patch format detection failed." +msgstr "Сбой Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð° патча." + +#: git-am.sh:398 +msgid "" +"The -b/--binary option has been a no-op for long time, and\n" +"it will be removed. Please do not use it anymore." +msgstr "ÐžÐ¿Ñ†Ð¸Ñ -b/--binary уже долгое Ð²Ñ€ÐµÐ¼Ñ Ð½Ð¸Ñ‡ÐµÐ³Ð¾ не делает и будет удалена Ñ Ñледующих верÑиÑÑ… Git. ПожалуйÑта, не иÑпользуйте ее." + +#: git-am.sh:496 +#, sh-format +msgid "previous rebase directory $dotest still exists but mbox given." +msgstr "предыдущий каталог Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ $dotest еще ÑущеÑтвует, но передан mbox." + +#: git-am.sh:501 +msgid "Please make up your mind. --skip or --abort?" +msgstr "ПожалуйÑта, определитеÑÑŒ: --skip или --abort?" + +#: git-am.sh:537 +#, sh-format +msgid "" +"Stray $dotest directory found.\n" +"Use \"git am --abort\" to remove it." +msgstr "Ðайден забытый каталог $dotest.\nИÑпользуйте «git am --abort», чтобы удалить его." + +#: git-am.sh:545 +msgid "Resolve operation not in progress, we are not resuming." +msgstr "ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚Ð¾Ð² не в процеÑÑе выполнениÑ, не продолжаем." + +#: git-am.sh:612 +#, sh-format +msgid "Dirty index: cannot apply patches (dirty: $files)" +msgstr "Ð˜Ð½Ð´ÐµÐºÑ Ð½Ðµ пуÑтой: Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÑÑ‚ÑŒ патчи (в индекÑе: $files)" + +#: git-am.sh:722 +#, sh-format +msgid "" +"Patch is empty. Was it split wrong?\n" +"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" +"To restore the original branch and stop patching run \"$cmdline --abort\"." +msgstr "Патч пуÑÑ‚. Возможно, он был неправильно разделен?\nЕÑли вы хотите пропуÑтить Ñтот патч, то вмеÑто Ñтого запуÑтите «$cmdline --skip».\nЧтобы перейти на оригинальную ветку и оÑтановить применение изменений, запуÑтите «$cmdline --abort»." + +#: git-am.sh:749 +msgid "Patch does not have a valid e-mail address." +msgstr "Патч не Ñодержит дейÑтвительный Ð°Ð´Ñ€ÐµÑ Ñлектронной почты." + +#: git-am.sh:796 +msgid "cannot be interactive without stdin connected to a terminal." +msgstr "не удалоÑÑŒ иÑпользовать интерактивное поведение, без stdin подключенного к терминалу." + +#: git-am.sh:800 +msgid "Commit Body is:" +msgstr "Тело коммита:" + +#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] +#. in your translation. The program will only accept English +#. input at this point. +#: git-am.sh:807 +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " +msgstr "Применить? [y] - да/[n] - нет/[e] - редактировать/[v] - проÑмотреть патч/[a] - применить вÑе " + +#: git-am.sh:843 +#, sh-format +msgid "Applying: $FIRSTLINE" +msgstr "Применение: $FIRSTLINE" + +#: git-am.sh:864 +msgid "" +"No changes - did you forget to use 'git add'?\n" +"If there is nothing left to stage, chances are that something else\n" +"already introduced the same changes; you might want to skip this patch." +msgstr "Ðет изменений — возможно, вы забыли вызвать «git add»?\nЕÑли ничего не оÑталоÑÑŒ Ð´Ð»Ñ Ð¸Ð½Ð´ÐµÐºÑации, то, Ñкорее вÑего, что-то другое уже Ñделало те же изменениÑ; возможно, вам Ñледует пропуÑтить Ñтот патч." + +#: git-am.sh:872 +msgid "" +"You still have unmerged paths in your index\n" +"did you forget to use 'git add'?" +msgstr "У Ð²Ð°Ñ Ð²Ñе еще имеютÑÑ Ð½Ðµ Ñлитые пути в индекÑе.\nВозможно, вы забыли вызвать «git add»?" + +#: git-am.sh:888 +msgid "No changes -- Patch already applied." +msgstr "Ðет изменений — Патч уже применен." + +#: git-am.sh:898 +#, sh-format +msgid "Patch failed at $msgnum $FIRSTLINE" +msgstr "Ошибка Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ на Ñтроке $msgnum $FIRSTLINE" + +#: git-am.sh:901 +#, sh-format +msgid "" +"The copy of the patch that failed is found in:\n" +" $dotest/patch" +msgstr "Копию изменений, которые не удалоÑÑŒ применить, вы можете найти в:\n $dotest/patch" + +#: git-am.sh:919 +msgid "applying to an empty history" +msgstr "применение к пуÑтой иÑтории" + +#: git-bisect.sh:48 +msgid "You need to start by \"git bisect start\"" +msgstr "Вам нужно начать Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «git bisect start»" + +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#: git-bisect.sh:54 +msgid "Do you want me to do it for you [Y/n]? " +msgstr "Ð’Ñ‹ уверены, что хотите, чтобы Ñ Ñделал Ñто [Y - да/n - нет]? " + +#: git-bisect.sh:95 +#, sh-format +msgid "unrecognised option: '$arg'" +msgstr "Ð½ÐµÐ¾Ð¿Ð¾Ð·Ð½Ð°Ð½Ð½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ: «$arg»" + +#: git-bisect.sh:99 +#, sh-format +msgid "'$arg' does not appear to be a valid revision" +msgstr "«$arg» не похоже на дейÑтвительную редакцию" + +#: git-bisect.sh:117 +msgid "Bad HEAD - I need a HEAD" +msgstr "Плохой указатель HEAD — Ðеобходим указатель HEAD" + +#: git-bisect.sh:130 +#, sh-format +msgid "" +"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." +msgstr "Сбой перехода на «$start_head». Попробуйте выполнить «git bisect reset <ÑущеÑтвующаÑ-ветка>»." + +#: git-bisect.sh:140 +msgid "won't bisect on cg-seek'ed tree" +msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ двоичный поиÑк на дереве поÑле cg-seek" + +#: git-bisect.sh:144 +msgid "Bad HEAD - strange symbolic ref" +msgstr "Плохой указатель HEAD — ÑÑ‚Ñ€Ð°Ð½Ð½Ð°Ñ ÑÐ¸Ð¼Ð²Ð¾Ð»ÑŒÐ½Ð°Ñ ÑÑылка" + +#: git-bisect.sh:189 +#, sh-format +msgid "Bad bisect_write argument: $state" +msgstr "Плохой аргумент bisect_write: $state" + +#: git-bisect.sh:218 +#, sh-format +msgid "Bad rev input: $arg" +msgstr "Плохой ввод номера редакции: $arg" + +#: git-bisect.sh:232 +msgid "Please call 'bisect_state' with at least one argument." +msgstr "ПожалуйÑта, вызывайте «bisect_state» как минимум Ñ Ð¾Ð´Ð½Ð¸Ð¼ аргументом." + +#: git-bisect.sh:244 +#, sh-format +msgid "Bad rev input: $rev" +msgstr "Плохой ввод номера редакции: $rev" + +#: git-bisect.sh:253 +msgid "'git bisect bad' can take only one argument." +msgstr "«git bisect bad» может принимать только один аргумент." + +#: git-bisect.sh:276 +msgid "Warning: bisecting only with a bad commit." +msgstr "Предупреждение: попытка двоичного поиÑка Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸ÐµÐ¼ только плохого коммита." + +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#: git-bisect.sh:282 +msgid "Are you sure [Y/n]? " +msgstr "Ð’Ñ‹ уверены [Y - да/n - нет]? " + +#: git-bisect.sh:292 +msgid "" +"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».)" + +#: git-bisect.sh:295 +msgid "" +"You need to start by \"git bisect start\".\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».)" + +#: git-bisect.sh:366 git-bisect.sh:493 +msgid "We are not bisecting." +msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ð½Ðµ в процеÑÑе бинарного поиÑка." + +#: git-bisect.sh:373 +#, sh-format +msgid "'$invalid' is not a valid commit" +msgstr "«$invalid» не ÑвлÑетÑÑ Ð´ÐµÐ¹Ñтвительным коммитом" + +#: git-bisect.sh:382 +#, sh-format +msgid "" +"Could not check out original HEAD '$branch'.\n" +"Try 'git bisect reset <commit>'." +msgstr "Ðе удалоÑÑŒ перейти на оригинальную ветку HEAD «$branch».\nПопробуйте запуÑтить «git bisect reset <коммит>»." + +#: git-bisect.sh:409 +msgid "No logfile given" +msgstr "Ðе передан файл журнала" + +#: git-bisect.sh:410 +#, sh-format +msgid "cannot read $file for replaying" +msgstr "не удалоÑÑŒ прочитать $file Ð´Ð»Ñ Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð° изменений" + +#: git-bisect.sh:427 +msgid "?? what are you talking about?" +msgstr "?? вы о чем?" + +#: git-bisect.sh:439 +#, sh-format +msgid "running $command" +msgstr "запуÑкаю $command" + +#: git-bisect.sh:446 +#, sh-format +msgid "" +"bisect run failed:\n" +"exit code $res from '$command' is < 0 or >= 128" +msgstr "не удалоÑÑŒ выполнить двоичный поиÑк:\nкод Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ $res от «$command» оказалÑÑ < 0 или >= 128" + +#: git-bisect.sh:472 +msgid "bisect run cannot continue any more" +msgstr "bisect run больше не может продолжать" + +#: git-bisect.sh:478 +#, sh-format +msgid "" +"bisect run failed:\n" +"'bisect_state $state' exited with error code $res" +msgstr "не удалоÑÑŒ выполнить двоичный поиÑк:\n«bisect_state $state» завершилÑÑ Ñ ÐºÐ¾Ð´Ð¾Ð¼ ошибки $res" + +#: git-bisect.sh:485 +msgid "bisect run success" +msgstr "bisect run выполнен уÑпешно" + +#: git-pull.sh:21 +msgid "" +"Pull is not possible because you have unmerged files.\n" +"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n" +"as appropriate to mark resolution and make a commit." +msgstr "Ðевозможно выполнить получение, так как у Ð²Ð°Ñ Ð¸Ð¼ÐµÑŽÑ‚ÑÑ Ð½Ðµ Ñлитые файлы.\nИÑправьте их в рабочем каталоге, затем запуÑтите «git add/rm <файл>»,\nчтобы пометить иÑправление и Ñделайте коммит." + +#: 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 "обновление еще не начавшейÑÑ Ð²ÐµÑ‚ÐºÐ¸ Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñми, добавленными в индекÑ" + +#: git-pull.sh:269 +#, sh-format +msgid "" +"Warning: fetch updated the current branch head.\n" +"Warning: fast-forwarding your working tree from\n" +"Warning: commit $orig_head." +msgstr "Предупреждение: извлечение обновило голову вашей текущей ветки.\nПредупреждение: перемотка вашего рабочего каталога\nПредупреждение: Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð° $orig_head." + +#: git-pull.sh:294 +msgid "Cannot merge multiple branches into empty head" +msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ñлить неÑколько веток в пуÑтую указатель на коммит" + +#: git-pull.sh:298 +msgid "Cannot rebase onto multiple branches" +msgstr "Ðевозможно перемеÑтить над неÑколькими ветками" + +#: git-rebase.sh:57 +msgid "" +"When you have resolved this problem, run \"git rebase --continue\".\n" +"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" +"To check out the original branch and stop rebasing, run \"git rebase --abort\"." +msgstr "Когда вы разрешите Ñтот конфликт, запуÑтите «git rebase --continue».\nЕÑли вы хотите пропуÑтить Ñтот патч, то запуÑтите «git rebase --skip».\nЧтобы перейти на оригинальную ветку и оÑтановить перемещение, запуÑтите «git rebase --abort»." + +#: git-rebase.sh:165 +msgid "Applied autostash." +msgstr "Применено автоматичеÑкое прÑтанье." + +#: git-rebase.sh:168 +#, sh-format +msgid "Cannot store $stash_sha1" +msgstr "Ðе удалоÑÑŒ Ñохранить $stash_sha1" + +#: git-rebase.sh:169 +msgid "" +"Applying autostash resulted in conflicts.\n" +"Your changes are safe in the stash.\n" +"You can run \"git stash pop\" or \"git stash drop\" at any time.\n" +msgstr "Применение автоматичеÑкого прÑÑ‚Ð°Ð½ÑŒÑ Ð²Ñ‹Ð·Ð²Ð°Ð»Ð¾ конфликты.\nВаши Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÑпрÑтаны и в безопаÑноÑти.\nÐ’Ñ‹ можете выполнить «git stash pop» или «git stash drop» в любой момент.\n" + +#: git-rebase.sh:208 +msgid "The pre-rebase hook refused to rebase." +msgstr "Перехватчик пре-Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¾Ñ‚ÐºÐ°Ð·Ð°Ð» в перемещении." + +#: git-rebase.sh:213 +msgid "It looks like git-am is in progress. Cannot rebase." +msgstr "Похоже, git-am выполнÑетÑÑ. Перемещение невозможно." + +#: git-rebase.sh:351 +msgid "The --exec option must be used with the --interactive option" +msgstr "ÐžÐ¿Ñ†Ð¸Ñ --exec должна иÑпользоватьÑÑ Ð²Ð¼ÐµÑте Ñ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹ --interactive" + +#: git-rebase.sh:356 +msgid "No rebase in progress?" +msgstr "Ðет Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð² процеÑÑе?" + +#: git-rebase.sh:367 +msgid "The --edit-todo action can only be used during interactive rebase." +msgstr "ДейÑтвие --edit-todo может иÑпользоватьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ при интерактивном перемещении." + +#: git-rebase.sh:374 +msgid "Cannot read HEAD" +msgstr "Ðе удалоÑÑŒ прочитать HEAD" + +#: git-rebase.sh:377 +msgid "" +"You must edit all merge conflicts and then\n" +"mark them as resolved using git add" +msgstr "Ð’Ñ‹ должны отредактировать вÑе\nконфликты ÑлиÑниÑ, а потом пометить\nих как разрешенные Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ git add" + +#: git-rebase.sh:395 +#, sh-format +msgid "Could not move back to $head_name" +msgstr "Ðе удалоÑÑŒ перейти назад на $head_name" + +#: git-rebase.sh:414 +#, sh-format +msgid "" +"It seems that there is already a $state_dir_base directory, and\n" +"I wonder if you are in the middle of another rebase. If that is the\n" +"case, please try\n" +"\t$cmd_live_rebase\n" +"If that is not the case, please\n" +"\t$cmd_clear_stale_rebase\n" +"and run me again. I am stopping in case you still have something\n" +"valuable there." +msgstr "Похоже, каталог $state_dir_base уже ÑущеÑтвует и Ñ Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ð»Ð°Ð³Ð°ÑŽ, что вы в процеÑÑе другого перемещениÑ. ЕÑли Ñто так, попробуйте\n\t$cmd_live_rebase\nЕÑли нет\n\t$cmd_clear_stale_rebase\nи запуÑтите Ð¼ÐµÐ½Ñ Ñнова. Я оÑтанавливаюÑÑŒ, чтобы вы не потерÑли что-то важное." + +#: git-rebase.sh:465 +#, sh-format +msgid "invalid upstream $upstream_name" +msgstr "недейÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð²Ñ‹ÑˆÐµÑтоÑÑ‰Ð°Ñ Ð²ÐµÑ‚ÐºÐ° $upstream_name" + +#: git-rebase.sh:489 +#, sh-format +msgid "$onto_name: there are more than one merge bases" +msgstr "$onto_name: имеетÑÑ Ð±Ð¾Ð»ÑŒÑˆÐµ одной базы ÑлиÑниÑ" + +#: git-rebase.sh:492 git-rebase.sh:496 +#, sh-format +msgid "$onto_name: there is no merge base" +msgstr "$onto_name: нет базы ÑлиÑниÑ" + +#: git-rebase.sh:501 +#, sh-format +msgid "Does not point to a valid commit: $onto_name" +msgstr "Ðе указаывает на дейÑтвительный коммит: $onto_name" + +#: git-rebase.sh:524 +#, sh-format +msgid "fatal: no such branch: $branch_name" +msgstr "критичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°: нет такой ветки: $branch_name" + +#: git-rebase.sh:557 +msgid "Cannot autostash" +msgstr "Ðе удалоÑÑŒ выполнить автоматичеÑкое прÑтанье" + +#: git-rebase.sh:562 +#, sh-format +msgid "Created autostash: $stash_abbrev" +msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑки ÑпрÑтаны: $stash_abbrev" + +#: git-rebase.sh:566 +msgid "Please commit or stash them." +msgstr "Сделайте коммит или ÑпрÑчьте их." + +#: git-rebase.sh:586 +#, sh-format +msgid "Current branch $branch_name is up to date." +msgstr "Ð¢ÐµÐºÑƒÑ‰Ð°Ñ Ð²ÐµÑ‚ÐºÐ° $branch_name уже ÑвежаÑ." + +#: git-rebase.sh:590 +#, sh-format +msgid "Current branch $branch_name is up to date, rebase forced." +msgstr "Ð¢ÐµÐºÑƒÑ‰Ð°Ñ Ð²ÐµÑ‚ÐºÐ° $branch_name уже ÑвежаÑ, принудительное перемещение." + +#: git-rebase.sh:601 +#, sh-format +msgid "Changes from $mb to $onto:" +msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¾Ñ‚ $mb до $onto:" + +#: git-rebase.sh:610 +msgid "First, rewinding head to replay your work on top of it..." +msgstr "Сначала перематываем указатель текущего коммита, чтобы применить ваши Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð²ÐµÑ€Ñ… него…" + +#: git-rebase.sh:620 +#, sh-format +msgid "Fast-forwarded $branch_name to $onto_name." +msgstr "Перемотана вперед $branch_name до $onto_name." + +#: git-stash.sh:51 +msgid "git stash clear with parameters is unimplemented" +msgstr "git stash очиÑтка Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð°Ð¼Ð¸ не реализована" + +#: git-stash.sh:74 +msgid "You do not have the initial commit yet" +msgstr "У Ð²Ð°Ñ ÐµÑ‰Ðµ нет начального коммита" + +#: git-stash.sh:89 +msgid "Cannot save the current index state" +msgstr "Ðе удалоÑÑŒ Ñохранить текущее ÑоÑтоÑние индекÑа" + +#: git-stash.sh:124 git-stash.sh:137 +msgid "Cannot save the current worktree state" +msgstr "Ðе удалоÑÑŒ Ñохранить текущее ÑоÑтоÑние рабочего каталога" + +#: git-stash.sh:141 +msgid "No changes selected" +msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð½Ðµ выбраны" + +#: git-stash.sh:144 +msgid "Cannot remove temporary index (can't happen)" +msgstr "Ðе удалоÑÑŒ удалить временный Ð¸Ð½Ð´ÐµÐºÑ (не должно ÑлучатьÑÑ)" + +#: git-stash.sh:157 +msgid "Cannot record working tree state" +msgstr "Ðе удалоÑÑŒ запиÑать ÑоÑтоÑние рабочего каталога" + +#: git-stash.sh:191 +#, sh-format +msgid "Cannot update $ref_stash with $w_commit" +msgstr "Ðе удалоÑÑŒ обновить $ref_stash Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ $w_commit" + +#. TRANSLATORS: $option is an invalid option, like +#. `--blah-blah'. The 7 spaces at the beginning of the +#. second line correspond to "error: ". So you should line +#. up the second line with however many characters the +#. translation of "error: " takes in your language. E.g. in +#. English this is: +#. $ git stash save --blah-blah 2>&1 | head -n 2 +#. error: unknown option for 'stash save': --blah-blah +#. To provide a message, use git stash save -- '--blah-blah' +#: git-stash.sh:238 +#, sh-format +msgid "" +"error: unknown option for 'stash save': $option\n" +" To provide a message, use git stash save -- '$option'" +msgstr "ошибка: неизвеÑÑ‚Ð½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ Ð´Ð»Ñ Â«stash save»: $option\n Ð”Ð»Ñ Ð¿Ñ€ÐµÐ´Ð¾ÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð¸Ñ ÑообщениÑ, иÑпользуйте git stash save -- '$option'" + +#: git-stash.sh:259 +msgid "No local changes to save" +msgstr "Ðет локальных изменений Ð´Ð»Ñ ÑохранениÑ" + +#: git-stash.sh:263 +msgid "Cannot initialize stash" +msgstr "Ðе удалоÑÑŒ инициализировать ÑпрÑтанные изменениÑ" + +#: git-stash.sh:267 +msgid "Cannot save the current status" +msgstr "Ðе удалоÑÑŒ Ñохранить текущий ÑтатуÑ" + +#: git-stash.sh:285 +msgid "Cannot remove worktree changes" +msgstr "Ðе удалоÑÑŒ удалить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ€Ð°Ð±Ð¾Ñ‡ÐµÐ³Ð¾ каталога" + +#: git-stash.sh:384 +msgid "No stash found." +msgstr "Ðе найдены ÑпрÑтанные изменениÑ." + +#: git-stash.sh:391 +#, sh-format +msgid "Too many revisions specified: $REV" +msgstr "Передано Ñлишком много редакций: $REV" + +#: git-stash.sh:397 +#, sh-format +msgid "$reference is not a valid reference" +msgstr "$reference не ÑвлÑетÑÑ Ð´ÐµÐ¹Ñтвительной ÑÑылкой" + +#: git-stash.sh:425 +#, sh-format +msgid "'$args' is not a stash-like commit" +msgstr "«$args» не похоже на коммит Ñо ÑпрÑтанными изменениÑми" + +#: git-stash.sh:436 +#, sh-format +msgid "'$args' is not a stash reference" +msgstr "«$args» не ÑвлÑетÑÑ ÑÑылкой на ÑпрÑтанные изменениÑ" + +#: git-stash.sh:444 +msgid "unable to refresh index" +msgstr "не удалоÑÑŒ обновить индекÑ" + +#: git-stash.sh:448 +msgid "Cannot apply a stash in the middle of a merge" +msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¿Ñ€Ð¸Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ ÑпрÑтанные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÑлиÑниÑ" + +#: git-stash.sh:456 +msgid "Conflicts in index. Try without --index." +msgstr "Конфликты в индекÑе. Попробуйте без --index." + +#: git-stash.sh:458 +msgid "Could not save index tree" +msgstr "Ðе удалоÑÑŒ Ñохранить дерево индекÑа" + +#: git-stash.sh:492 +msgid "Cannot unstage modified files" +msgstr "Ðевозможно убрать из индекÑа измененные файлы" + +#: git-stash.sh:507 +msgid "Index was not unstashed." +msgstr "Ð˜Ð½Ð´ÐµÐºÑ Ð½Ðµ был доÑтат из ÑпрÑтанных изменений." + +#: git-stash.sh:530 +#, sh-format +msgid "Dropped ${REV} ($s)" +msgstr "Отброшено ${REV} ($s)" + +#: git-stash.sh:531 +#, sh-format +msgid "${REV}: Could not drop stash entry" +msgstr "${REV}: Ðе удалоÑÑŒ отброÑить запиÑÑŒ из ÑпрÑтанных изменений" + +#: git-stash.sh:539 +msgid "No branch name specified" +msgstr "Ðе указано Ð¸Ð¼Ñ Ð²ÐµÑ‚ÐºÐ¸" + +#: git-stash.sh:611 +msgid "(To restore them type \"git stash apply\")" +msgstr "(Чтобы воÑÑтановить их, наберите «git stash apply»)" + +#: git-submodule.sh:95 +#, sh-format +msgid "cannot strip one component off url '$remoteurl'" +msgstr "не удалоÑÑŒ отрезать один компонент адреÑа «$remoteurl»" + +#: git-submodule.sh:237 +#, sh-format +msgid "No submodule mapping found in .gitmodules for path '$sm_path'" +msgstr "Ðе найдено ÑоответÑтвие подмодулей в .gitmodules Ð´Ð»Ñ Ð¿ÑƒÑ‚Ð¸ «$sm_path»" + +#: git-submodule.sh:287 +#, sh-format +msgid "Clone of '$url' into submodule path '$sm_path' failed" +msgstr "Ðе удалоÑÑŒ клонировать «$url» в подмодуль по пути «$sm_path»" + +#: git-submodule.sh:296 +#, sh-format +msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" +msgstr "Каталог Git «$a» ÑвлÑетÑÑ Ñ‡Ð°Ñтью пути Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$b» или наоборот" + +#: git-submodule.sh:406 +msgid "Relative path can only be used from the toplevel of the working tree" +msgstr "ОтноÑительный путь можно иÑпользовать только находÑÑÑŒ на вершине рабочего каталога" + +#: git-submodule.sh:416 +#, sh-format +msgid "repo URL: '$repo' must be absolute or begin with ./|../" +msgstr "URL репозиториÑ: «$repo» должен быть абÑолютным или начинатьÑÑ Ñ ./|../" + +#: git-submodule.sh:433 +#, sh-format +msgid "'$sm_path' already exists in the index" +msgstr "«$sm_path» уже ÑодержитÑÑ Ð² индекÑе" + +#: git-submodule.sh:437 +#, sh-format +msgid "" +"The following path is ignored by one of your .gitignore files:\n" +"$sm_path\n" +"Use -f if you really want to add it." +msgstr "Следующие пути игнорируютÑÑ Ð¾Ð´Ð½Ð¸Ð¼ из ваших файлов .gitignore:\n$sm_path\nИÑпользуйте опцию -f, еÑли вы дейÑтвительно хотите его добавить." + +#: git-submodule.sh:455 +#, sh-format +msgid "Adding existing repo at '$sm_path' to the index" +msgstr "ДобавлÑÑŽ ÑущеÑтвующий репозиторий из «$sm_path» в индекÑ" + +#: git-submodule.sh:457 +#, sh-format +msgid "'$sm_path' already exists and is not a valid git repo" +msgstr "«$sm_path» уже ÑущеÑтвует и не ÑвлÑетÑÑ Ð´ÐµÐ¹Ñтвительным репозиторием git" + +#: git-submodule.sh:465 +#, sh-format +msgid "A git directory for '$sm_name' is found locally with remote(s):" +msgstr "Каталог git Ð´Ð»Ñ Â«$sm_name» найден локально на внешних репозиториÑÑ…:" + +#: git-submodule.sh:467 +#, sh-format +msgid "" +"If you want to reuse this local git directory instead of cloning again from" +msgstr "ЕÑли вы хотите переиÑпользовать локальный каталог git вмеÑто повторного ÐºÐ»Ð¾Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð·" + +#: git-submodule.sh:469 +#, sh-format +msgid "" +"use the '--force' option. If the local git directory is not the correct repo" +msgstr ", то иÑпользуйте опцию «--force». ЕÑли локальный каталог git не ÑвлÑетÑÑ Ð´ÐµÐ¹Ñтвительным репозиторием" + +#: git-submodule.sh:470 +#, sh-format +msgid "" +"or you are unsure what this means choose another name with the '--name' " +"option." +msgstr "или еÑли вы не понÑли, что Ñто значит, то проÑто иÑпользуйте другое Ð¸Ð¼Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ опции «--name»." + +#: git-submodule.sh:472 +#, sh-format +msgid "Reactivating local git directory for submodule '$sm_name'." +msgstr "ВоÑÑтановление локального каталога git Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$sm_name»." + +#: git-submodule.sh:484 +#, sh-format +msgid "Unable to checkout submodule '$sm_path'" +msgstr "Ðе удалоÑÑŒ перейти на ÑоÑтоÑние у Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$sm_path»" + +#: git-submodule.sh:489 +#, sh-format +msgid "Failed to add submodule '$sm_path'" +msgstr "Сбой Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$sm_path»" + +#: git-submodule.sh:498 +#, sh-format +msgid "Failed to register submodule '$sm_path'" +msgstr "Ðе удалоÑÑŒ зарегиÑтрировать подмодуль «$sm_path»" + +#: git-submodule.sh:542 +#, sh-format +msgid "Entering '$prefix$displaypath'" +msgstr "Заходим в «$prefix$displaypath»" + +#: git-submodule.sh:562 +#, sh-format +msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." +msgstr "ОÑтанавливаемÑÑ Ð½Ð° «$prefix$displaypath»; Ñценарий вернул не нулевой код возврата." + +#: git-submodule.sh:608 +#, sh-format +msgid "No url found for submodule path '$displaypath' in .gitmodules" +msgstr "ÐÐ´Ñ€ÐµÑ Ð´Ð»Ñ Ð¿ÑƒÑ‚Ð¸ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$displaypath» не найден в .gitmodules" + +#: git-submodule.sh:617 +#, sh-format +msgid "Failed to register url for submodule path '$displaypath'" +msgstr "Сбой региÑтрации адреÑе Ð´Ð»Ñ Ð¿ÑƒÑ‚Ð¸ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$displaypath»" + +#: git-submodule.sh:619 +#, sh-format +msgid "Submodule '$name' ($url) registered for path '$displaypath'" +msgstr "Подмодуль «$name» ($url) зарегиÑтрирован Ð´Ð»Ñ Ð¿ÑƒÑ‚Ð¸ «$displaypath»" + +#: git-submodule.sh:636 +#, sh-format +msgid "Failed to register update mode for submodule path '$displaypath'" +msgstr "Сбой региÑтрации режима Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¿ÑƒÑ‚Ð¸ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$displaypath»" + +#: git-submodule.sh:674 +#, sh-format +msgid "Use '.' if you really want to deinitialize all submodules" +msgstr "ИÑпользуйте «.», еÑли вы дейÑтвительно хотите деинициализировать вÑе подмодули" + +#: git-submodule.sh:691 +#, sh-format +msgid "Submodule work tree '$displaypath' contains a .git directory" +msgstr "Рабочий каталог Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$displaypath» Ñодержит каталог .git" + +#: git-submodule.sh:692 +#, sh-format +msgid "" +"(use 'rm -rf' if you really want to remove it including all of its history)" +msgstr "(иÑпользуйте «rm -rf», еÑли вы дейÑтвительно хотите удалить его, Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ Ð²ÑÑŽ его иÑторию)" + +#: git-submodule.sh:698 +#, sh-format +msgid "" +"Submodule work tree '$displaypath' contains local modifications; use '-f' to" +" discard them" +msgstr "Рабочий каталог Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$displaypath» Ñодержит локальные изменениÑ; иÑпользуйте «-f», чтобы отменить их" + +#: git-submodule.sh:701 +#, sh-format +msgid "Cleared directory '$displaypath'" +msgstr "Очищен каталог «$displaypath»" + +#: git-submodule.sh:702 +#, sh-format +msgid "Could not remove submodule work tree '$displaypath'" +msgstr "Ðе удалоÑÑŒ удалить рабочий каталог Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$displaypath»" + +#: git-submodule.sh:705 +#, sh-format +msgid "Could not create empty submodule directory '$displaypath'" +msgstr "Ðе удалоÑÑŒ Ñоздать пуÑтой каталог Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$displaypath»" + +#: git-submodule.sh:714 +#, sh-format +msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" +msgstr "Подмодуль «$name» ($url) был ÑнÑÑ‚ Ñ Ñ€ÐµÐ³Ð¸Ñтрации по пути «$displaypath»" + +#: git-submodule.sh:830 +#, sh-format +msgid "" +"Submodule path '$displaypath' not initialized\n" +"Maybe you want to use 'update --init'?" +msgstr "Подмодуль по пути «$displaypath» не инициализирован\nВозможно, вам нужно иÑпользовать «update --init»?" + +#: git-submodule.sh:843 +#, sh-format +msgid "Unable to find current revision in submodule path '$displaypath'" +msgstr "Ðе удалоÑÑŒ найти текущую редакцию Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$displaypath»" + +#: git-submodule.sh:852 +#, sh-format +msgid "Unable to fetch in submodule path '$sm_path'" +msgstr "Ðе удалоÑÑŒ выполнить извлечение Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$sm_path»" + +#: git-submodule.sh:876 +#, sh-format +msgid "Unable to fetch in submodule path '$displaypath'" +msgstr "Ðе удалоÑÑŒ выполнить извлечение Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$displaypath»" + +#: git-submodule.sh:890 +#, sh-format +msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" +msgstr "Ðе удалоÑÑŒ выполнить переход на ÑоÑтоÑние «$sha1» Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$displaypath»" + +#: git-submodule.sh:891 +#, sh-format +msgid "Submodule path '$displaypath': checked out '$sha1'" +msgstr "Подмодуль по пути «$displaypath»: забрано ÑоÑтоÑние «$sha1»" + +#: git-submodule.sh:895 +#, sh-format +msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" +msgstr "Ðе удалоÑÑŒ перемеÑтить «$sha1» Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$displaypath»" + +#: git-submodule.sh:896 +#, sh-format +msgid "Submodule path '$displaypath': rebased into '$sha1'" +msgstr "Подмодуль по пути «$displaypath»: перемещен над «$sha1»" + +#: git-submodule.sh:901 +#, sh-format +msgid "Unable to merge '$sha1' in submodule path '$displaypath'" +msgstr "Ðе удалоÑÑŒ выполнить ÑлиÑние Ñ Â«$sha1» Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$displaypath»" + +#: git-submodule.sh:902 +#, sh-format +msgid "Submodule path '$displaypath': merged in '$sha1'" +msgstr "Подмодуль по пути «$displaypath»: Ñлито Ñ Â«$sha1»" + +#: git-submodule.sh:907 +#, sh-format +msgid "" +"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" +msgstr "Сбой Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Â«$command $sha1» Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$prefix$sm_path»" + +#: git-submodule.sh:908 +#, sh-format +msgid "Submodule path '$prefix$sm_path': '$command $sha1'" +msgstr "Подмодуль по пути «$prefix$sm_path»: «$command $sha1»" + +#: git-submodule.sh:938 +#, sh-format +msgid "Failed to recurse into submodule path '$displaypath'" +msgstr "Ðе удалоÑÑŒ выполнить рекурÑивно Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$displaypath»" + +#: git-submodule.sh:1046 +msgid "The --cached option cannot be used with the --files option" +msgstr "Опцию --cached Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹ --files" + +#: git-submodule.sh:1098 +#, sh-format +msgid "unexpected mode $mod_dst" +msgstr "неизвеÑтный режим $mod_dst" + +#: git-submodule.sh:1118 +#, sh-format +msgid " Warn: $display_name doesn't contain commit $sha1_src" +msgstr " Предупреждение: $display_name не Ñодержит коммит $sha1_src" + +#: git-submodule.sh:1121 +#, sh-format +msgid " Warn: $display_name doesn't contain commit $sha1_dst" +msgstr " Предупреждение: $display_name не Ñодержит коммит $sha1_dst" + +#: git-submodule.sh:1124 +#, sh-format +msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" +msgstr " Предупреждение: $display_name не Ñодержит коммиты $sha1_src и $sha1_dst" + +#: git-submodule.sh:1149 +msgid "blob" +msgstr "двоичный объект" + +#: git-submodule.sh:1267 +#, sh-format +msgid "Failed to recurse into submodule path '$sm_path'" +msgstr "Ðе удалоÑÑŒ выполнить рекурÑивно Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$sm_path»" + +#: git-submodule.sh:1331 +#, sh-format +msgid "Synchronizing submodule url for '$displaypath'" +msgstr "Ð¡Ð¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ url Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$displaypath»" @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git 2.0.0\n" +"Project-Id-Version: git 2.4.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2015-01-21 14:21+0800\n" -"PO-Revision-Date: 2015-01-21 14:57+0800\n" +"POT-Creation-Date: 2015-04-03 08:13+0800\n" +"PO-Revision-Date: 2015-04-07 08:44+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -16,6 +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: Gtranslator 2.91.6\n" #: advice.c:55 #, c-format @@ -31,8 +32,8 @@ msgstr "" "som lämpligt för att ange lösning och checka in." #: archive.c:11 -msgid "git archive [options] <tree-ish> [<path>...]" -msgstr "git archive [flaggor] <träd-igt> [<sökväg>...]" +msgid "git archive [<options>] <tree-ish> [<path>...]" +msgstr "git archive [<flaggor>] <träd-igt> [<sökväg>...]" #: archive.c:12 msgid "git archive --list" @@ -40,9 +41,9 @@ msgstr "git archive --list" #: archive.c:13 msgid "" -"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" +"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" -"git archive --remote <arkiv> [--exec <kmd>] [flaggor] <träd-igt> " +"git archive --remote <arkiv> [--exec <kmd>] [<flaggor>] <träd-igt> " "[<sökväg>...]" #: archive.c:14 @@ -70,10 +71,10 @@ msgstr "prefix" msgid "prepend prefix to each pathname in the archive" msgstr "lägg till prefix till varje sökväg i arkivet" -#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2517 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986 +#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 +#: builtin/blame.c:2517 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:394 +#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 #: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151 msgid "file" msgstr "fil" @@ -122,7 +123,7 @@ msgstr "kommando" msgid "path to the remote git-upload-archive command" msgstr "sökväg till kommandot git-upload-archive pÃ¥ fjärren" -#: attr.c:258 +#: attr.c:264 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -251,7 +252,7 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil" msgid "unrecognized header: %s%s (%d)" msgstr "okänt huvud: %s%s (%d)" -#: bundle.c:87 builtin/commit.c:770 +#: bundle.c:87 builtin/commit.c:766 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" @@ -260,8 +261,8 @@ msgstr "kunde inte öppna \"%s\"" msgid "Repository lacks these prerequisite commits:" msgstr "Arkivet saknar dessa nödvändiga incheckningar:" -#: bundle.c:163 sequencer.c:645 sequencer.c:1100 builtin/blame.c:2706 -#: builtin/branch.c:652 builtin/commit.c:1049 builtin/log.c:330 +#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 +#: builtin/branch.c:659 builtin/commit.c:1045 builtin/log.c:330 #: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358 #: builtin/shortlog.c:158 msgid "revision walk setup failed" @@ -302,21 +303,21 @@ msgstr "rev-list dog" msgid "ref '%s' is excluded by the rev-list options" msgstr "referensen \"%s\" exkluderas av argumenten till rev-list" -#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" -#: bundle.c:444 +#: bundle.c:443 msgid "Refusing to create empty bundle." msgstr "Vägrar skapa ett tomt paket (bundle)." -#: bundle.c:454 +#: bundle.c:453 #, c-format msgid "cannot create '%s'" msgstr "kan inte skapa \"%s\"" -#: bundle.c:475 +#: bundle.c:474 msgid "index-pack died" msgstr "index-pack dog" @@ -339,55 +340,55 @@ msgstr "%s %s är inte en incheckning!" msgid "memory exhausted" msgstr "minnet slut" -#: config.c:469 config.c:471 +#: config.c:474 config.c:476 #, c-format msgid "bad config file line %d in %s" msgstr "felaktig konfigurationsfil rad %d i %s" -#: config.c:587 +#: config.c:592 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s" -#: config.c:589 +#: config.c:594 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s" -#: config.c:674 +#: config.c:679 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "misslyckades expandera användarkatalog i: \"%s\"" -#: config.c:752 config.c:763 +#: config.c:757 config.c:768 #, c-format msgid "bad zlib compression level %d" msgstr "felaktigt zlib-komprimeringsgrad %d" -#: config.c:885 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "felaktigt läge för skapande av objekt: %s" -#: config.c:1211 +#: config.c:1216 msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" -#: config.c:1272 +#: config.c:1277 msgid "unknown error occured while reading the configuration files" msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna" -#: config.c:1596 +#: config.c:1601 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "kunde inte tolka värdet \"%s\" frÃ¥n kommandoradskonfiguration" -#: config.c:1598 +#: config.c:1603 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" pÃ¥ rad %d" -#: config.c:1657 +#: config.c:1662 #, c-format msgid "%s has multiple values" msgstr "%s har flera värden" @@ -479,7 +480,7 @@ msgstr[1] "%lu Ã¥r sedan" msgid "failed to read orderfile '%s'" msgstr "kunde inte läsa orderfilen \"%s\"" -#: diffcore-rename.c:516 +#: diffcore-rename.c:536 msgid "Performing inexact rename detection" msgstr "Utför onöjaktig namnbytesdetektering" @@ -507,16 +508,16 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:2957 +#: diff.c:2956 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:3352 +#: diff.c:3351 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:3515 +#: diff.c:3514 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -525,7 +526,7 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:3529 +#: diff.c:3528 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\"" @@ -876,27 +877,27 @@ msgstr "sammanslagning av träden %s och %s misslyckades" msgid "Unprocessed path??? %s" msgstr "Obehandlad sökväg??? %s" -#: merge-recursive.c:1898 +#: merge-recursive.c:1901 msgid "Merging:" msgstr "SlÃ¥r ihop:" -#: merge-recursive.c:1911 +#: merge-recursive.c:1914 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "hittade %u gemensam förfader:" msgstr[1] "hittade %u gemensamma förfäder:" -#: merge-recursive.c:1948 +#: merge-recursive.c:1951 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:2005 +#: merge-recursive.c:2008 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:2016 builtin/merge.c:667 +#: merge-recursive.c:2019 builtin/merge.c:667 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." @@ -1024,7 +1025,7 @@ msgstr "kunde inte tolka format för --pretty" msgid "done" msgstr "klart" -#: read-cache.c:1267 +#: read-cache.c:1275 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1033,7 +1034,7 @@ msgstr "" "index.version satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1277 +#: read-cache.c:1285 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1119,23 +1120,31 @@ msgstr[1] "" msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (använd \"git pull\" för att slÃ¥ ihop fjärrgrenen med din egen)\n" -#: run-command.c:87 +#: revision.c:2348 +msgid "--first-parent is incompatible with --bisect" +msgstr "--first-parent är inkompatibelt med --bisect" + +#: run-command.c:83 msgid "open /dev/null failed" msgstr "misslyckades öppna /dev/null" -#: run-command.c:89 +#: run-command.c:85 #, c-format msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) misslyckades" -#: send-pack.c:268 +#: send-pack.c:272 msgid "failed to sign the push certificate" msgstr "misslyckades underteckna push-certifikatet" -#: send-pack.c:325 +#: send-pack.c:356 msgid "the receiving end does not support --signed push" msgstr "mottagarsidan stöder inte push med --signed" +#: send-pack.c:366 +msgid "the receiving end does not support --atomic push" +msgstr "mottagarsidan stöder inte push med --atomic" + #: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995 #: builtin/merge.c:1005 #, c-format @@ -1166,7 +1175,7 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:211 sequencer.c:856 sequencer.c:939 +#: sequencer.c:211 sequencer.c:861 sequencer.c:944 #, c-format msgid "Could not write to %s" msgstr "Kunde inte skriva till %s" @@ -1202,184 +1211,184 @@ msgstr "Kunde inte bestämma HEAD:s incheckning\n" msgid "Unable to update cache tree\n" msgstr "Kan inte uppdatera cacheträd\n" -#: sequencer.c:406 +#: sequencer.c:411 #, c-format msgid "Could not parse commit %s\n" msgstr "Kunde inte tolka incheckningen %s\n" -#: sequencer.c:411 +#: sequencer.c:416 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Kunde inte tolka föräldraincheckningen %s\n" -#: sequencer.c:477 +#: sequencer.c:482 msgid "Your index file is unmerged." msgstr "Din indexfil har inte slagits ihop." -#: sequencer.c:496 +#: sequencer.c:501 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "Incheckning %s är en sammanslagning, men flaggan -m angavs inte." -#: sequencer.c:504 +#: sequencer.c:509 #, c-format msgid "Commit %s does not have parent %d" msgstr "Incheckning %s har inte förälder %d" -#: sequencer.c:508 +#: sequencer.c:513 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "Huvudlinje angavs, men incheckningen %s är inte en sammanslagning" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:521 +#: sequencer.c:526 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:525 +#: sequencer.c:530 #, c-format msgid "Cannot get commit message for %s" msgstr "Kan inte hämta incheckningsmeddelande för %s" -#: sequencer.c:611 +#: sequencer.c:616 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte Ã¥ngra %s... %s" -#: sequencer.c:612 +#: sequencer.c:617 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:648 +#: sequencer.c:653 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: sequencer.c:656 +#: sequencer.c:661 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:660 +#: sequencer.c:665 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:720 +#: sequencer.c:725 #, c-format msgid "Cannot %s during a %s" msgstr "kan inte %s under en %s" -#: sequencer.c:742 +#: sequencer.c:747 #, c-format msgid "Could not parse line %d." msgstr "Kan inte tolka rad %d." -#: sequencer.c:747 +#: sequencer.c:752 msgid "No commits parsed." msgstr "Inga incheckningar lästes." -#: sequencer.c:760 +#: sequencer.c:765 #, c-format msgid "Could not open %s" msgstr "Kunde inte öppna %s" -#: sequencer.c:764 +#: sequencer.c:769 #, c-format msgid "Could not read %s." msgstr "kunde inte läsa %s." -#: sequencer.c:771 +#: sequencer.c:776 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Oanvändbart manus: %s" -#: sequencer.c:801 +#: sequencer.c:806 #, c-format msgid "Invalid key: %s" msgstr "Felaktig nyckel: %s" -#: sequencer.c:804 +#: sequencer.c:809 #, c-format msgid "Invalid value for %s: %s" msgstr "Felaktigt värde för %s: %s" -#: sequencer.c:816 +#: sequencer.c:821 #, c-format msgid "Malformed options sheet: %s" msgstr "Trasigt manus: %s" -#: sequencer.c:837 +#: sequencer.c:842 msgid "a cherry-pick or revert is already in progress" msgstr "en \"cherry-pick\" eller \"revert\" pÃ¥gÃ¥r redan" -#: sequencer.c:838 +#: sequencer.c:843 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:842 +#: sequencer.c:847 #, c-format msgid "Could not create sequencer directory %s" msgstr "Kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:858 sequencer.c:943 +#: sequencer.c:863 sequencer.c:948 #, c-format msgid "Error wrapping up %s." msgstr "Fel vid ombrytning av %s." -#: sequencer.c:877 sequencer.c:1013 +#: sequencer.c:882 sequencer.c:1018 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pÃ¥gÃ¥r" -#: sequencer.c:879 +#: sequencer.c:884 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:881 +#: sequencer.c:886 msgid "cannot abort from a branch yet to be born" msgstr "kan inte avbryta frÃ¥n en gren som ännu inte är född" -#: sequencer.c:903 builtin/apply.c:4128 +#: sequencer.c:908 builtin/apply.c:4288 #, c-format msgid "cannot open %s: %s" msgstr "kan inte öppna %s: %s" -#: sequencer.c:906 +#: sequencer.c:911 #, c-format msgid "cannot read %s: %s" msgstr "kan inte läsa %s: %s" -#: sequencer.c:907 +#: sequencer.c:912 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:913 +#: sequencer.c:918 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "sparad HEAD-fil frÃ¥n före \"cherry-pick\", \"%s\", är trasig" -#: sequencer.c:936 +#: sequencer.c:941 #, c-format msgid "Could not format %s." msgstr "Kunde inte formatera %s." -#: sequencer.c:1081 +#: sequencer.c:1086 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: kan inte göra \"cherry-pick\" pÃ¥ typen \"%s\"" -#: sequencer.c:1084 +#: sequencer.c:1089 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:1118 +#: sequencer.c:1123 msgid "Can't revert as initial commit" msgstr "Kan inte Ã¥ngra som första incheckning" -#: sequencer.c:1119 +#: sequencer.c:1124 msgid "Can't cherry-pick into empty head" msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud" @@ -1449,38 +1458,38 @@ msgstr "Kunde inte ta bort .gitmodules-posten för %s" msgid "staging updated .gitmodules failed" msgstr "misslyckades köa uppdaterad .gitmodules" -#: submodule.c:1111 builtin/init-db.c:371 +#: submodule.c:1109 builtin/init-db.c:371 #, c-format msgid "Could not create git link %s" msgstr "Kunde inte skapa gitlänk %s" -#: submodule.c:1122 +#: submodule.c:1120 #, c-format msgid "Could not set core.worktree in %s" msgstr "Kunde inte sätta core.worktree i %s" -#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566 -#: trailer.c:570 +#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557 +#: trailer.c:561 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "okänt värde \"%s\" för nyckeln \"%s\"" -#: trailer.c:552 trailer.c:557 builtin/remote.c:290 +#: trailer.c:543 trailer.c:548 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "mer än en %s" -#: trailer.c:590 +#: trailer.c:581 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "tom släpradssymbol i släpraden \"%.*s\"" -#: trailer.c:710 +#: trailer.c:701 #, c-format msgid "could not read input file '%s'" msgstr "kunde inte läsa indatafilen \"%s\"" -#: trailer.c:713 +#: trailer.c:704 msgid "could not read from stdin" msgstr "Kunde inte läsa frÃ¥n standard in" @@ -1517,26 +1526,26 @@ msgstr "felaktigt portnummer" msgid "invalid '..' path segment" msgstr "felaktigt \"..\"-sökvägssegment" -#: wrapper.c:509 +#: wrapper.c:523 #, c-format msgid "unable to access '%s': %s" msgstr "kan inte komma Ã¥t \"%s\": %s" -#: wrapper.c:530 +#: wrapper.c:544 #, c-format msgid "unable to access '%s'" msgstr "kan inte komma Ã¥t \"%s\"" -#: wrapper.c:541 +#: wrapper.c:555 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "kan inte slÃ¥ upp aktuell användare i passwd-filen: %s" -#: wrapper.c:542 +#: wrapper.c:556 msgid "no such user" msgstr "okänd användare" -#: wrapper.c:550 +#: wrapper.c:564 msgid "unable to get current working directory" msgstr "kan inte hämta aktuell arbetskatalog" @@ -1565,11 +1574,11 @@ msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning) msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (använd \"git rm <fil>...\" för att ange lösning)" -#: wt-status.c:198 +#: wt-status.c:198 wt-status.c:878 msgid "Changes to be committed:" msgstr "Ändringar att checka in:" -#: wt-status.c:216 +#: wt-status.c:216 wt-status.c:887 msgid "Changes not staged for commit:" msgstr "Ändringar ej i incheckningskön:" @@ -1683,15 +1692,15 @@ msgstr "ospÃ¥rat innehÃ¥ll, " msgid "bug: unhandled diff status %c" msgstr "programfel: diff-status %c ej hanterad" -#: wt-status.c:758 +#: wt-status.c:753 msgid "Submodules changed but not updated:" msgstr "Undermoduler ändrade men inte uppdaterade:" -#: wt-status.c:760 +#: wt-status.c:755 msgid "Submodule changes to be committed:" msgstr "Undermodulers ändringar att checka in:" -#: wt-status.c:839 +#: wt-status.c:835 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1699,68 +1708,68 @@ msgstr "" "Rör inte raden ovan.\n" "Allt nedan kommer tas bort." -#: wt-status.c:930 +#: wt-status.c:946 msgid "You have unmerged paths." msgstr "Du har ej sammanslagna sökvägar." -#: wt-status.c:933 +#: wt-status.c:949 msgid " (fix conflicts and run \"git commit\")" msgstr " (rätta konflikter och kör \"git commit\")" -#: wt-status.c:936 +#: wt-status.c:952 msgid "All conflicts fixed but you are still merging." msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning." -#: wt-status.c:939 +#: wt-status.c:955 msgid " (use \"git commit\" to conclude merge)" msgstr " (använd \"git commit\" för att slutföra sammanslagningen)" -#: wt-status.c:949 +#: wt-status.c:965 msgid "You are in the middle of an am session." msgstr "Du är i mitten av en körning av \"git am\"." -#: wt-status.c:952 +#: wt-status.c:968 msgid "The current patch is empty." msgstr "Aktuell patch är tom." -#: wt-status.c:956 +#: wt-status.c:972 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (rätta konflikter och kör sedan \"git am --continue\")" -#: wt-status.c:958 +#: wt-status.c:974 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (använd \"git am --skip\" för att hoppa över patchen)" -#: wt-status.c:960 +#: wt-status.c:976 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (använd \"git am --abort\" för att Ã¥terställa ursprungsgrenen)" -#: wt-status.c:1020 wt-status.c:1037 +#: wt-status.c:1036 wt-status.c:1053 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Du hÃ¥ller pÃ¥ att ombasera grenen \"%s\" ovanpÃ¥ \"%s\"." -#: wt-status.c:1025 wt-status.c:1042 +#: wt-status.c:1041 wt-status.c:1058 msgid "You are currently rebasing." msgstr "Du hÃ¥ller pÃ¥ med en ombasering." -#: wt-status.c:1028 +#: wt-status.c:1044 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")" -#: wt-status.c:1030 +#: wt-status.c:1046 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)" -#: wt-status.c:1032 +#: wt-status.c:1048 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)" -#: wt-status.c:1045 +#: wt-status.c:1061 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alla konflikter rättade: kör \"git rebase --continue\")" -#: wt-status.c:1049 +#: wt-status.c:1065 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -1768,118 +1777,118 @@ msgstr "" "Du hÃ¥ller pÃ¥ att dela upp en incheckning medan du ombaserar grenen \"%s\" " "ovanpÃ¥ \"%s\"." -#: wt-status.c:1054 +#: wt-status.c:1070 msgid "You are currently splitting a commit during a rebase." msgstr "Du hÃ¥ller pÃ¥ att dela upp en incheckning i en ombasering." -#: wt-status.c:1057 +#: wt-status.c:1073 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " (SÃ¥ fort din arbetskatalog är ren, kör \"git rebase --continue\")" -#: wt-status.c:1061 +#: wt-status.c:1077 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Du hÃ¥ller pÃ¥ att redigera en incheckning medan du ombaserar grenen \"%s\" " "ovanpÃ¥ \"%s\"." -#: wt-status.c:1066 +#: wt-status.c:1082 msgid "You are currently editing a commit during a rebase." msgstr "Du hÃ¥ller pÃ¥ att redigera en incheckning under en ombasering." -#: wt-status.c:1069 +#: wt-status.c:1085 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (använd \"git commit --amend\" för att lägga till pÃ¥ aktuell incheckning)" -#: wt-status.c:1071 +#: wt-status.c:1087 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)" -#: wt-status.c:1081 +#: wt-status.c:1097 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Du hÃ¥ller pÃ¥ med en \"cherry-pick\" av incheckningen %s." -#: wt-status.c:1086 +#: wt-status.c:1102 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")" -#: wt-status.c:1089 +#: wt-status.c:1105 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")" -#: wt-status.c:1091 +#: wt-status.c:1107 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-" "operationen)" -#: wt-status.c:1100 +#: wt-status.c:1116 #, c-format msgid "You are currently reverting commit %s." msgstr "Du hÃ¥ller pÃ¥ med att Ã¥ngra incheckningen %s." -#: wt-status.c:1105 +#: wt-status.c:1121 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (rätta konflikter och kör sedan \"git revert --continue\")" -#: wt-status.c:1108 +#: wt-status.c:1124 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alla konflikter rättade: kör \"git revert --continue\")" -#: wt-status.c:1110 +#: wt-status.c:1126 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (använd \"git revert --abort\" för att avbryta Ã¥ngrandet)" -#: wt-status.c:1121 +#: wt-status.c:1137 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Du hÃ¥ller pÃ¥ med en \"bisect\", startad frÃ¥n grenen \"%s\"." -#: wt-status.c:1125 +#: wt-status.c:1141 msgid "You are currently bisecting." msgstr "Du hÃ¥ller pÃ¥ med en \"bisect\"." -#: wt-status.c:1128 +#: wt-status.c:1144 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)" -#: wt-status.c:1303 +#: wt-status.c:1321 msgid "On branch " msgstr "PÃ¥ grenen " -#: wt-status.c:1310 +#: wt-status.c:1328 msgid "rebase in progress; onto " msgstr "ombasering pÃ¥gÃ¥r; ovanpÃ¥" -#: wt-status.c:1317 +#: wt-status.c:1333 msgid "HEAD detached at " msgstr "HEAD frÃ¥nkopplad vid " -#: wt-status.c:1319 +#: wt-status.c:1335 msgid "HEAD detached from " msgstr "HEAD frÃ¥nkopplad frÃ¥n " -#: wt-status.c:1322 +#: wt-status.c:1338 msgid "Not currently on any branch." msgstr "Inte pÃ¥ nÃ¥gon gren för närvarande." -#: wt-status.c:1339 +#: wt-status.c:1355 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:1353 +#: wt-status.c:1369 msgid "Untracked files" msgstr "OspÃ¥rade filer" -#: wt-status.c:1355 +#: wt-status.c:1371 msgid "Ignored files" msgstr "Ignorerade filer" -#: wt-status.c:1359 +#: wt-status.c:1375 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1891,32 +1900,32 @@ msgstr "" "lägga till nya filer själv (se \"git help status\")." # %s är nästa sträng eller tom. -#: wt-status.c:1365 +#: wt-status.c:1381 #, c-format msgid "Untracked files not listed%s" msgstr "OspÃ¥rade filer visas ej%s" -#: wt-status.c:1367 +#: wt-status.c:1383 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospÃ¥rade filer)" -#: wt-status.c:1373 +#: wt-status.c:1389 msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:1378 +#: wt-status.c:1394 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a" "\")\n" -#: wt-status.c:1381 +#: wt-status.c:1397 #, c-format msgid "no changes added to commit\n" msgstr "inga ändringar att checka in\n" -#: wt-status.c:1384 +#: wt-status.c:1400 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -1925,44 +1934,44 @@ msgstr "" "inget köat för incheckning, men ospÃ¥rade filer finns (spÃ¥ra med \"git add" "\")\n" -#: wt-status.c:1387 +#: wt-status.c:1403 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "inget köat för incheckning, men ospÃ¥rade filer finns\n" -#: wt-status.c:1390 +#: wt-status.c:1406 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "inget att checka in (skapa/kopiera filer och spÃ¥ra med \"git add\")\n" -#: wt-status.c:1393 wt-status.c:1398 +#: wt-status.c:1409 wt-status.c:1414 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1396 +#: wt-status.c:1412 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "inget att checka in (använd -u för att visa ospÃ¥rade filer)\n" -#: wt-status.c:1400 +#: wt-status.c:1416 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1509 +#: wt-status.c:1525 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1515 +#: wt-status.c:1531 msgid "Initial commit on " msgstr "Första incheckning pÃ¥ " -#: wt-status.c:1547 +#: wt-status.c:1563 msgid "gone" msgstr "försvunnen" -#: wt-status.c:1549 wt-status.c:1557 +#: wt-status.c:1565 wt-status.c:1573 msgid "behind " msgstr "efter " @@ -1972,15 +1981,15 @@ msgid "failed to unlink '%s'" msgstr "misslyckades ta bort länken \"%s\"" #: builtin/add.c:22 -msgid "git add [options] [--] <pathspec>..." -msgstr "git add [flaggor] [--] <sökväg>..." +msgid "git add [<options>] [--] <pathspec>..." +msgstr "git add [<flaggor>] [--] <sökväg>..." #: builtin/add.c:65 #, c-format msgid "unexpected diff status %c" msgstr "diff-status %c förväntades inte" -#: builtin/add.c:70 builtin/commit.c:275 +#: builtin/add.c:70 builtin/commit.c:277 msgid "updating files failed" msgstr "misslyckades uppdatera filer" @@ -2024,14 +2033,14 @@ msgstr "Kunde inte tillämpa \"%s\"" msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n" -#: builtin/add.c: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:1372 +#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372 #: builtin/rm.c:269 msgid "dry run" msgstr "testkörning" -#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19 -#: builtin/commit.c:1326 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19 +#: builtin/commit.c:1322 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 "var pratsam" @@ -2107,75 +2116,75 @@ msgstr "Inget angivet, inget tillagt.\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Kanske menade du att skriva \"git add .\"?\n" -#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919 -#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 +#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920 +#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 msgid "index file corrupt" msgstr "indexfilen trasig" -#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431 +#: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" -#: builtin/apply.c:58 -msgid "git apply [options] [<patch>...]" -msgstr "git apply [flaggor] [<patch>...]" +#: builtin/apply.c:59 +msgid "git apply [<options>] [<patch>...]" +msgstr "git apply [<flaggor>] [<patch>...]" -#: builtin/apply.c:111 +#: builtin/apply.c:112 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "okänt alternativ för whitespace: \"%s\"" -#: builtin/apply.c:126 +#: builtin/apply.c:127 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "okänt alternativ för ignore-whitespace: \"%s\"" -#: builtin/apply.c:826 +#: builtin/apply.c:822 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s" -#: builtin/apply.c:835 +#: builtin/apply.c:831 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec returnerade %d för indata: %s" -#: builtin/apply.c:916 +#: builtin/apply.c:912 #, c-format msgid "unable to find filename in patch at line %d" msgstr "kan inte hitta filnamn i patchen pÃ¥ rad %d" -#: builtin/apply.c:948 +#: builtin/apply.c:944 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply: dÃ¥lig git-diff - förväntade /dev/null, fick %s pÃ¥ rad %d" -#: builtin/apply.c:952 +#: builtin/apply.c:948 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply: dÃ¥lig git-diff - motsägande nytt filnamn pÃ¥ rad %d" -#: builtin/apply.c:953 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply: dÃ¥lig git-diff - motsägande gammalt filnamn pÃ¥ rad %d" -#: builtin/apply.c:960 +#: builtin/apply.c:956 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: dÃ¥lig git-diff - förväntade /dev/null pÃ¥ rad %d" -#: builtin/apply.c:1423 +#: builtin/apply.c:1419 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: förväntade rad: %.*s" -#: builtin/apply.c:1480 +#: builtin/apply.c:1476 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "patch-fragment utan huvud pÃ¥ rad %d: %.*s" -#: builtin/apply.c:1497 +#: builtin/apply.c:1493 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2191,77 +2200,77 @@ msgstr[1] "" "sökvägskomponenter\n" "tas bort (rad %d)" -#: builtin/apply.c:1657 +#: builtin/apply.c:1656 msgid "new file depends on old contents" msgstr "ny fil beror pÃ¥ gammalt innehÃ¥ll" -#: builtin/apply.c:1659 +#: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "borttagen fil har fortfarande innehÃ¥ll" -#: builtin/apply.c:1685 +#: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" msgstr "trasig patch pÃ¥ rad %d" -#: builtin/apply.c:1721 +#: builtin/apply.c:1720 #, c-format msgid "new file %s depends on old contents" msgstr "nya filen %s beror pÃ¥ gammalt innehÃ¥ll" -#: builtin/apply.c:1723 +#: builtin/apply.c:1722 #, c-format msgid "deleted file %s still has contents" msgstr "borttagna filen %s har fortfarande innehÃ¥ll" -#: builtin/apply.c:1726 +#: builtin/apply.c:1725 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** varning: filen %s blir tom men har inte tagits bort" -#: builtin/apply.c:1872 +#: builtin/apply.c:1871 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "trasig binärpatch pÃ¥ rad %d: %.*s" -#: builtin/apply.c:1901 +#: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" msgstr "binärpatchen pÃ¥ rad %d känns inte igen" -#: builtin/apply.c:2052 +#: builtin/apply.c:2051 #, c-format msgid "patch with only garbage at line %d" msgstr "patch med bara skräp pÃ¥ rad %d" -#: builtin/apply.c:2142 +#: builtin/apply.c:2141 #, c-format msgid "unable to read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: builtin/apply.c:2146 +#: builtin/apply.c:2145 #, c-format msgid "unable to open or read %s" msgstr "kunde inte öppna eller läsa %s" -#: builtin/apply.c:2754 +#: builtin/apply.c:2778 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning pÃ¥ rad: \"%c\"" -#: builtin/apply.c:2872 +#: builtin/apply.c:2897 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "Stycke %d lyckades pÃ¥ %d (offset %d rad)." msgstr[1] "Stycke %d lyckades pÃ¥ %d (offset %d rader)." -#: builtin/apply.c:2884 +#: builtin/apply.c:2909 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d" -#: builtin/apply.c:2890 +#: builtin/apply.c:2915 #, c-format msgid "" "while searching for:\n" @@ -2270,317 +2279,336 @@ msgstr "" "vid sökning efter:\n" "%.*s" -#: builtin/apply.c:2909 +#: builtin/apply.c:2935 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binära patchdata för \"%s\"" -#: builtin/apply.c:3010 +#: builtin/apply.c:3036 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binärpatchen kan inte tillämpas pÃ¥ \"%s\"" -#: builtin/apply.c:3016 +#: builtin/apply.c:3042 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "binärpatchen pÃ¥ \"%s\" ger felaktigt resultat (förväntade %s, fick %s)" -#: builtin/apply.c:3037 +#: builtin/apply.c:3063 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: builtin/apply.c:3161 +#: builtin/apply.c:3187 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260 +#: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288 #, c-format msgid "read of %s failed" msgstr "misslyckades läsa %s" -#: builtin/apply.c:3240 builtin/apply.c:3462 +#: builtin/apply.c:3240 +#, c-format +msgid "reading from '%s' beyond a symbolic link" +msgstr "läser frÃ¥n \"%s\" som är pÃ¥ andra sidan av en symbolisk länk" + +#: builtin/apply.c:3268 builtin/apply.c:3490 #, c-format msgid "path %s has been renamed/deleted" msgstr "sökvägen %s har ändrat namn/tagits bort" -#: builtin/apply.c:3321 builtin/apply.c:3476 +#: builtin/apply.c:3349 builtin/apply.c:3504 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490 +#: builtin/apply.c:3353 builtin/apply.c:3496 builtin/apply.c:3518 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3330 builtin/apply.c:3484 +#: builtin/apply.c:3358 builtin/apply.c:3512 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: builtin/apply.c:3432 +#: builtin/apply.c:3460 msgid "removal patch leaves file contents" msgstr "patch för borttagning lämnar kvar filinnehÃ¥ll" -#: builtin/apply.c:3501 +#: builtin/apply.c:3529 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: builtin/apply.c:3503 +#: builtin/apply.c:3531 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: builtin/apply.c:3604 +#: builtin/apply.c:3690 builtin/apply.c:3692 +#, c-format +msgid "invalid path '%s'" +msgstr "ogiltig sökväg: %s" + +#: builtin/apply.c:3747 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: builtin/apply.c:3607 +#: builtin/apply.c:3750 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: builtin/apply.c:3627 +#: builtin/apply.c:3770 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)" -#: builtin/apply.c:3632 +#: builtin/apply.c:3775 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s" -#: builtin/apply.c:3640 +#: builtin/apply.c:3795 +#, c-format +msgid "affected file '%s' is beyond a symbolic link" +msgstr "den berörda filen \"%s\" är pÃ¥ andra sidan av en symbolisk länk" + +#: builtin/apply.c:3799 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: builtin/apply.c:3653 +#: builtin/apply.c:3813 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: builtin/apply.c:3746 builtin/checkout.c:231 builtin/reset.c:135 +#: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" -#: builtin/apply.c:3889 +#: builtin/apply.c:4049 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s frÃ¥n indexet" -#: builtin/apply.c:3918 +#: builtin/apply.c:4078 #, c-format msgid "corrupt patch for submodule %s" msgstr "trasig patch för undermodulen %s" -#: builtin/apply.c:3922 +#: builtin/apply.c:4082 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status pÃ¥ nyligen skapade filen \"%s\"" -#: builtin/apply.c:3927 +#: builtin/apply.c:4087 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s" -#: builtin/apply.c:3930 builtin/apply.c:4038 +#: builtin/apply.c:4090 builtin/apply.c:4198 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: builtin/apply.c:3963 +#: builtin/apply.c:4123 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: builtin/apply.c:4012 +#: builtin/apply.c:4172 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: builtin/apply.c:4099 +#: builtin/apply.c:4259 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: builtin/apply.c:4107 +#: builtin/apply.c:4267 msgid "internal error" msgstr "internt fel" -#: builtin/apply.c:4110 +#: builtin/apply.c:4270 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Tillämpade patchen %%s med %d refuserad..." msgstr[1] "Tillämpade patchen %%s med %d refuserade..." -#: builtin/apply.c:4120 +#: builtin/apply.c:4280 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: builtin/apply.c:4141 +#: builtin/apply.c:4301 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: builtin/apply.c:4144 +#: builtin/apply.c:4304 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: builtin/apply.c:4234 +#: builtin/apply.c:4394 msgid "unrecognized input" msgstr "indata känns inte igen" -#: builtin/apply.c:4245 +#: builtin/apply.c:4405 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:92 -#: builtin/fetch.c:93 +#: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92 +#: builtin/fetch.c:92 msgid "path" msgstr "sökväg" -#: builtin/apply.c:4363 +#: builtin/apply.c:4523 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: builtin/apply.c:4366 +#: builtin/apply.c:4526 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: builtin/apply.c:4368 +#: builtin/apply.c:4528 msgid "num" msgstr "antal" -#: builtin/apply.c:4369 +#: builtin/apply.c:4529 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ta bort <antal> inledande snedstreck frÃ¥n traditionella diff-sökvägar" -#: builtin/apply.c:4372 +#: builtin/apply.c:4532 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: builtin/apply.c:4374 +#: builtin/apply.c:4534 msgid "instead of applying the patch, output diffstat for the input" msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata" -#: builtin/apply.c:4378 +#: builtin/apply.c:4538 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: builtin/apply.c:4380 +#: builtin/apply.c:4540 msgid "instead of applying the patch, output a summary for the input" msgstr "istället för att tillämpa patchen, skriv ut en summering av indata" -#: builtin/apply.c:4382 +#: builtin/apply.c:4542 msgid "instead of applying the patch, see if the patch is applicable" msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas" -#: builtin/apply.c:4384 +#: builtin/apply.c:4544 msgid "make sure the patch is applicable to the current index" msgstr "se till att patchen kan tillämpas pÃ¥ aktuellt index" -#: builtin/apply.c:4386 +#: builtin/apply.c:4546 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: builtin/apply.c:4388 +#: builtin/apply.c:4548 +msgid "accept a patch that touches outside the working area" +msgstr "godta en patch som rör filer utanför arbetskatalogen" + +#: builtin/apply.c:4550 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa ocksÃ¥ patchen (använd med --stat/--summary/--check)" -#: builtin/apply.c:4390 +#: builtin/apply.c:4552 msgid "attempt three-way merge if a patch does not apply" msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas" -#: builtin/apply.c:4392 +#: builtin/apply.c:4554 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat pÃ¥ inbyggd indexinformation" -#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455 +#: builtin/apply.c:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: builtin/apply.c:4397 +#: builtin/apply.c:4559 msgid "ensure at least <n> lines of context match" msgstr "se till att Ã¥tminstone <n> rader sammanhang är lika" -#: builtin/apply.c:4398 +#: builtin/apply.c:4560 msgid "action" msgstr "Ã¥tgärd" -#: builtin/apply.c:4399 +#: builtin/apply.c:4561 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: builtin/apply.c:4402 builtin/apply.c:4405 +#: builtin/apply.c:4564 builtin/apply.c:4567 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: builtin/apply.c:4408 +#: builtin/apply.c:4570 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: builtin/apply.c:4410 +#: builtin/apply.c:4572 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: builtin/apply.c:4412 +#: builtin/apply.c:4574 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: builtin/apply.c:4414 +#: builtin/apply.c:4576 msgid "allow overlapping hunks" msgstr "tillÃ¥t överlappande stycken" -#: builtin/apply.c:4417 +#: builtin/apply.c:4579 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: builtin/apply.c:4420 +#: builtin/apply.c:4582 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte pÃ¥ antalet linjer i styckehuvuden" -#: builtin/apply.c:4422 +#: builtin/apply.c:4584 msgid "root" msgstr "rot" -#: builtin/apply.c:4423 +#: builtin/apply.c:4585 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" -#: builtin/apply.c:4445 +#: builtin/apply.c:4607 msgid "--3way outside a repository" msgstr "--3way utanför arkiv" -#: builtin/apply.c:4453 +#: builtin/apply.c:4615 msgid "--index outside a repository" msgstr "--index utanför arkiv" -#: builtin/apply.c:4456 +#: builtin/apply.c:4618 msgid "--cached outside a repository" msgstr "--cached utanför arkiv" -#: builtin/apply.c:4472 +#: builtin/apply.c:4637 #, c-format msgid "can't open patch '%s'" msgstr "kan inte öppna patchen \"%s\"" -#: builtin/apply.c:4486 +#: builtin/apply.c:4651 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "undertryckte %d fel i blanksteg" msgstr[1] "undertryckte %d fel i blanksteg" -#: builtin/apply.c:4492 builtin/apply.c:4502 +#: builtin/apply.c:4657 builtin/apply.c:4667 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2635,102 +2663,102 @@ msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning" #: builtin/blame.c:30 -msgid "git blame [options] [rev-opts] [rev] [--] file" -msgstr "git blame [flaggor] [rev-flaggor] [rev] [--] fil" +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file" +msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] fil" #: builtin/blame.c:35 -msgid "[rev-opts] are documented in git-rev-list(1)" -msgstr "[rev-flaggor] dokumenteras i git-rev-list(1)" +msgid "<rev-opts> are documented in git-rev-list(1)" +msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)" -#: builtin/blame.c:2501 +#: builtin/blame.c:2500 msgid "Show blame entries as we find them, incrementally" msgstr "Visa klandringsposter när vi hittar dem, interaktivt" -#: builtin/blame.c:2502 +#: builtin/blame.c:2501 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)" -#: builtin/blame.c:2503 +#: builtin/blame.c:2502 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Behandla inte rotincheckningar som gränser (Standard: av)" -#: builtin/blame.c:2504 +#: builtin/blame.c:2503 msgid "Show work cost statistics" msgstr "Visa statistik över arbetskostnad" -#: builtin/blame.c:2505 +#: builtin/blame.c:2504 msgid "Show output score for blame entries" msgstr "Visa utdatapoäng för klandringsposter" -#: builtin/blame.c:2506 +#: builtin/blame.c:2505 msgid "Show original filename (Default: auto)" msgstr "Visa originalfilnamn (Standard: auto)" -#: builtin/blame.c:2507 +#: builtin/blame.c:2506 msgid "Show original linenumber (Default: off)" msgstr "Visa ursprungligt radnummer (Standard: av)" -#: builtin/blame.c:2508 +#: builtin/blame.c:2507 msgid "Show in a format designed for machine consumption" msgstr "Visa i ett format avsett för maskinkonsumtion" -#: builtin/blame.c:2509 +#: builtin/blame.c:2508 msgid "Show porcelain format with per-line commit information" msgstr "Visa porslinsformat med per-rad-incheckningsinformation" -#: builtin/blame.c:2510 +#: builtin/blame.c:2509 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Använd samma utdataläge som git-annotate (Standard: av)" -#: builtin/blame.c:2511 +#: builtin/blame.c:2510 msgid "Show raw timestamp (Default: off)" msgstr "Visa rÃ¥ tidsstämpel (Standard: av)" -#: builtin/blame.c:2512 +#: builtin/blame.c:2511 msgid "Show long commit SHA1 (Default: off)" msgstr "Visa lÃ¥ng inchecknings-SHA1 (Standard: av)" -#: builtin/blame.c:2513 +#: builtin/blame.c:2512 msgid "Suppress author name and timestamp (Default: off)" msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)" -#: builtin/blame.c:2514 +#: builtin/blame.c:2513 msgid "Show author email instead of name (Default: off)" msgstr "Visa författarens e-post istället för namn (Standard: av)" -#: builtin/blame.c:2515 +#: builtin/blame.c:2514 msgid "Ignore whitespace differences" msgstr "Ignorera ändringar i blanksteg" -#: builtin/blame.c:2516 +#: builtin/blame.c:2515 msgid "Spend extra cycles to find better match" msgstr "Slösa extra cykler med att hitta bättre träff" -#: builtin/blame.c:2517 +#: builtin/blame.c:2516 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Använd revisioner frÃ¥n <fil> istället för att anropa git-rev-list" -#: builtin/blame.c:2518 +#: builtin/blame.c:2517 msgid "Use <file>'s contents as the final image" msgstr "Använd <fil>s innehÃ¥ll som slutgiltig bild" -#: builtin/blame.c:2519 builtin/blame.c:2520 +#: builtin/blame.c:2518 builtin/blame.c:2519 msgid "score" msgstr "poäng" -#: builtin/blame.c:2519 +#: builtin/blame.c:2518 msgid "Find line copies within and across files" msgstr "Hitta kopierade rader inuti och mellan filer" -#: builtin/blame.c:2520 +#: builtin/blame.c:2519 msgid "Find line movements within and across files" msgstr "Hitta flyttade rader inuti och mellan filer" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "Process only line range n,m, counting from 1" msgstr "Behandla endast radintervallet n,m, med början pÃ¥ 1" @@ -2740,25 +2768,25 @@ msgstr "Behandla endast radintervallet n,m, med början pÃ¥ 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:2602 +#: builtin/blame.c:2601 msgid "4 years, 11 months ago" msgstr "4 Ã¥r, 11 mÃ¥nader sedan" #: builtin/branch.c:24 -msgid "git branch [options] [-r | -a] [--merged | --no-merged]" -msgstr "git branch [flaggor] [-r | -a] [--merged | --no-merged]" +msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" +msgstr "git branch [<flaggor>] [-r | -a] [--merged | --no-merged]" #: builtin/branch.c:25 -msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" -msgstr "git branch [flaggor] [-l] [-f] <grennamn> [<startpunkt>]" +msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" +msgstr "git branch [<flaggor>] [-l] [-f] <grennamn> [<startpunkt>]" #: builtin/branch.c:26 -msgid "git branch [options] [-r] (-d | -D) <branchname>..." -msgstr "git branch [flaggor] [-r] (-d | -D) <grennamn>..." +msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." +msgstr "git branch [<flaggor>] [-r] (-d | -D) <grennamn>..." #: builtin/branch.c:27 -msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" -msgstr "git branch [flaggor] (-m | -M) [<gammal_gren>] <ny_gren>" +msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" +msgstr "git branch [<flaggor>] (-m | -M) [<gammal_gren>] <ny_gren>" #: builtin/branch.c:152 #, c-format @@ -2898,237 +2926,242 @@ msgstr "(ingen gren, ombaserar %s)" msgid "(no branch, bisect started on %s)" msgstr "(ingen gren, \"bisect\" startad pÃ¥ %s)" -#: builtin/branch.c:593 +#: builtin/branch.c:596 +#, c-format +msgid "(HEAD detached at %s)" +msgstr "(HEAD frÃ¥nkopplat vid %s)" + +#: builtin/branch.c:599 #, c-format -msgid "(detached from %s)" -msgstr "(frÃ¥nkopplad frÃ¥n %s)" +msgid "(HEAD detached from %s)" +msgstr "(HEAD frÃ¥nkopplat frÃ¥n %s)" -#: builtin/branch.c:596 +#: builtin/branch.c:603 msgid "(no branch)" msgstr "(ingen gren)" -#: builtin/branch.c:643 +#: builtin/branch.c:650 #, c-format msgid "object '%s' does not point to a commit" msgstr "objektet \"%s\" pekar pÃ¥ en incheckning" -#: builtin/branch.c:691 +#: builtin/branch.c:698 msgid "some refs could not be read" msgstr "vissa referenser kunde inte läsas" -#: builtin/branch.c:704 +#: builtin/branch.c:711 msgid "cannot rename the current branch while not on any." msgstr "" "kunde inte byta namn pÃ¥ aktuell gren när du inte befinner dig pÃ¥ nÃ¥gon." -#: builtin/branch.c:714 +#: builtin/branch.c:721 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn pÃ¥ gren: \"%s\"" -#: builtin/branch.c:729 +#: builtin/branch.c:736 msgid "Branch rename failed" msgstr "Misslyckades byta namn pÃ¥ gren" -#: builtin/branch.c:733 +#: builtin/branch.c:740 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn pÃ¥ en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:737 +#: builtin/branch.c:744 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!" -#: builtin/branch.c:744 +#: builtin/branch.c:751 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:759 +#: builtin/branch.c:766 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: builtin/branch.c:783 +#: builtin/branch.c:790 #, c-format msgid "could not write branch description template: %s" msgstr "kunde inte skriva grenbeskrivningsmall: %s" -#: builtin/branch.c:813 +#: builtin/branch.c:820 msgid "Generic options" msgstr "Allmänna flaggor" -#: builtin/branch.c:815 +#: builtin/branch.c:822 msgid "show hash and subject, give twice for upstream branch" msgstr "visa hash och ärenderad, ange tvÃ¥ gÃ¥nger för uppströmsgren" -#: builtin/branch.c:816 +#: builtin/branch.c:823 msgid "suppress informational messages" msgstr "undertryck informationsmeddelanden" -#: builtin/branch.c:817 +#: builtin/branch.c:824 msgid "set up tracking mode (see git-pull(1))" msgstr "ställ in spÃ¥rningsläge (se git-pull(1))" -#: builtin/branch.c:819 +#: builtin/branch.c:826 msgid "change upstream info" msgstr "ändra uppströmsinformation" -#: builtin/branch.c:823 +#: builtin/branch.c:830 msgid "use colored output" msgstr "använd färgad utdata" -#: builtin/branch.c:824 +#: builtin/branch.c:831 msgid "act on remote-tracking branches" msgstr "arbeta pÃ¥ fjärrspÃ¥rande grenar" -#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854 -#: builtin/branch.c:860 builtin/commit.c:1586 builtin/commit.c:1587 -#: builtin/commit.c:1588 builtin/commit.c:1589 builtin/tag.c:616 +#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861 +#: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583 +#: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616 #: builtin/tag.c:622 msgid "commit" msgstr "incheckning" -#: builtin/branch.c:828 builtin/branch.c:834 +#: builtin/branch.c:835 builtin/branch.c:841 msgid "print only branches that contain the commit" msgstr "visa endast grenar som innehÃ¥ller incheckningen" -#: builtin/branch.c:840 +#: builtin/branch.c:847 msgid "Specific git-branch actions:" msgstr "Specifika git-branch-Ã¥tgärder:" -#: builtin/branch.c:841 +#: builtin/branch.c:848 msgid "list both remote-tracking and local branches" msgstr "visa bÃ¥de fjärrspÃ¥rande och lokala grenar" -#: builtin/branch.c:843 +#: builtin/branch.c:850 msgid "delete fully merged branch" msgstr "ta bort helt sammanslagen gren" -#: builtin/branch.c:844 +#: builtin/branch.c:851 msgid "delete branch (even if not merged)" msgstr "ta bort gren (även om inte helt sammanslagen)" -#: builtin/branch.c:845 +#: builtin/branch.c:852 msgid "move/rename a branch and its reflog" msgstr "flytta/ta bort en gren och dess reflogg" -#: builtin/branch.c:846 +#: builtin/branch.c:853 msgid "move/rename a branch, even if target exists" msgstr "flytta/ta bort en gren, även om mÃ¥let finns" -#: builtin/branch.c:847 +#: builtin/branch.c:854 msgid "list branch names" msgstr "lista namn pÃ¥ grenar" -#: builtin/branch.c:848 +#: builtin/branch.c:855 msgid "create the branch's reflog" msgstr "skapa grenens reflogg" -#: builtin/branch.c:850 +#: builtin/branch.c:857 msgid "edit the description for the branch" msgstr "redigera beskrivning för grenen" -#: builtin/branch.c:851 +#: builtin/branch.c:858 msgid "force creation, move/rename, deletion" msgstr "tvinga skapande, flytt/namnändring, borttagande" -#: builtin/branch.c:854 +#: builtin/branch.c:861 msgid "print only not merged branches" msgstr "visa endast ej sammanslagna grenar" -#: builtin/branch.c:860 +#: builtin/branch.c:867 msgid "print only merged branches" msgstr "visa endast sammanslagna grenar" -#: builtin/branch.c:864 +#: builtin/branch.c:871 msgid "list branches in columns" msgstr "visa grenar i spalter" -#: builtin/branch.c:877 +#: builtin/branch.c:884 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slÃ¥ upp HEAD som giltig referens" -#: builtin/branch.c:881 builtin/clone.c:637 +#: builtin/branch.c:888 builtin/clone.c:637 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:903 +#: builtin/branch.c:910 msgid "--column and --verbose are incompatible" msgstr "--column och --verbose är inkompatibla" -#: builtin/branch.c:914 builtin/branch.c:953 +#: builtin/branch.c:921 builtin/branch.c:960 msgid "branch name required" msgstr "grennamn krävs" -#: builtin/branch.c:929 +#: builtin/branch.c:936 msgid "Cannot give description to detached HEAD" msgstr "Kan inte beskriva frÃ¥nkopplad HEAD" -#: builtin/branch.c:934 +#: builtin/branch.c:941 msgid "cannot edit description of more than one branch" msgstr "kan inte redigera beskrivning för mer än en gren" -#: builtin/branch.c:941 +#: builtin/branch.c:948 #, c-format msgid "No commit on branch '%s' yet." msgstr "Inga incheckningar pÃ¥ grenen \"%s\" ännu" -#: builtin/branch.c:944 +#: builtin/branch.c:951 #, c-format msgid "No branch named '%s'." msgstr "Ingen gren vid namnet \"%s\"." -#: builtin/branch.c:959 +#: builtin/branch.c:966 msgid "too many branches for a rename operation" msgstr "för mÃ¥nga grenar för namnbyte" -#: builtin/branch.c:964 +#: builtin/branch.c:971 msgid "too many branches to set new upstream" msgstr "för mÃ¥nga grenar för att byta uppström" -#: builtin/branch.c:968 +#: builtin/branch.c:975 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" "kunde inte sätta uppström för HEAD till %s när det inte pekar mot nÃ¥gon gren." -#: builtin/branch.c:971 builtin/branch.c:993 builtin/branch.c:1014 +#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021 #, c-format msgid "no such branch '%s'" msgstr "okänd gren \"%s\"" -#: builtin/branch.c:975 +#: builtin/branch.c:982 #, c-format msgid "branch '%s' does not exist" msgstr "grenen \"%s\" finns inte" -#: builtin/branch.c:987 +#: builtin/branch.c:994 msgid "too many branches to unset upstream" msgstr "för mÃ¥nga grenar för att ta bort uppström" -#: builtin/branch.c:991 +#: builtin/branch.c:998 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "kunde inte ta bort uppström för HEAD när det inte pekar mot nÃ¥gon gren." -#: builtin/branch.c:997 +#: builtin/branch.c:1004 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Grenen \"%s\" har ingen uppströmsinformation" -#: builtin/branch.c:1011 +#: builtin/branch.c:1018 msgid "it does not make sense to create 'HEAD' manually" msgstr "kan inte skapa \"HEAD\" manuellt" -#: builtin/branch.c:1017 +#: builtin/branch.c:1024 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "flaggorna -a och -r pÃ¥ \"git branch\" kan inte anges tillsammans med ett " "grennamn" -#: builtin/branch.c:1020 +#: builtin/branch.c:1027 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3137,7 +3170,7 @@ msgstr "" "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track " "eller --set-upstream-to\n" -#: builtin/branch.c:1037 +#: builtin/branch.c:1044 #, c-format msgid "" "\n" @@ -3148,12 +3181,12 @@ msgstr "" "Om du vill göra sÃ¥ att \"%s\" spÃ¥rar \"%s\" gör du sÃ¥ här:\n" "\n" -#: builtin/branch.c:1038 +#: builtin/branch.c:1045 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1039 +#: builtin/branch.c:1046 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -3171,53 +3204,53 @@ msgstr "Behöver ett arkiv för att skapa ett paket (bundle)." msgid "Need a repository to unbundle." msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)." -#: builtin/cat-file.c:328 -msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" -msgstr "git cat-file (-t|-s|-e|-p|<typ>|--textconv) <objekt>" +#: builtin/cat-file.c:326 +msgid "git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>" +msgstr "git cat-file (-t | -s | -e | -p | <typ> | --textconv) <objekt>" -#: builtin/cat-file.c:329 -msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" -msgstr "git cat-file (--batch|--batch-check) < <objektlista>" +#: builtin/cat-file.c:327 +msgid "git cat-file (--batch | --batch-check) < <list-of-objects>" +msgstr "git cat-file (--batch | --batch-check) < <objektlista>" -#: builtin/cat-file.c:366 +#: builtin/cat-file.c:364 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<typ> kan vara en av: blob, tree, commit, tag" -#: builtin/cat-file.c:367 +#: builtin/cat-file.c:365 msgid "show object type" msgstr "visa objekttyp" -#: builtin/cat-file.c:368 +#: builtin/cat-file.c:366 msgid "show object size" msgstr "visa objektstorlek" -#: builtin/cat-file.c:370 +#: builtin/cat-file.c:368 msgid "exit with zero when there's no error" msgstr "avsluta med noll när det inte uppstÃ¥tt nÃ¥got fel" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:369 msgid "pretty-print object's content" msgstr "visa objektets innehÃ¥ll snyggt" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:371 msgid "for blob objects, run textconv on object's content" msgstr "för blob-objekt, kör textconv pÃ¥ objektets innehÃ¥ll" -#: builtin/cat-file.c:375 +#: builtin/cat-file.c:373 msgid "show info and content of objects fed from the standard input" msgstr "visa information och innehÃ¥ll för objekt som listas pÃ¥ standard in" -#: builtin/cat-file.c:378 +#: builtin/cat-file.c:376 msgid "show info about objects fed from the standard input" msgstr "visa information för objekt som listas pÃ¥ standard in" #: builtin/check-attr.c:11 -msgid "git check-attr [-a | --all | attr...] [--] pathname..." -msgstr "git check-attr [-a | --all | attr...] [--] sökväg..." +msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." +msgstr "git check-attr [-a | --all | <attr>...] [--] <sökväg>..." #: builtin/check-attr.c:12 -msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" -msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <sökvägslista>" +msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>" +msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...] < <sökvägslista>" #: builtin/check-attr.c:19 msgid "report all attributes set on file" @@ -3272,8 +3305,8 @@ msgid "--non-matching is only valid with --verbose" msgstr "--non-matching är endast giltig med --verbose" #: builtin/check-mailmap.c:8 -msgid "git check-mailmap [options] <contact>..." -msgstr "git check-mailmap [flaggor] <kontakt>..." +msgid "git check-mailmap [<options>] <contact>..." +msgstr "git check-mailmap [<flaggor>] <kontakt>..." #: builtin/check-mailmap.c:13 msgid "also read contacts from stdin" @@ -3289,8 +3322,8 @@ msgid "no contacts specified" msgstr "inga kontakter angavs" #: builtin/checkout-index.c:126 -msgid "git checkout-index [options] [--] [<file>...]" -msgstr "git checkout-index [flaggor] [--] [<fil>...]" +msgid "git checkout-index [<options>] [--] [<file>...]" +msgstr "git checkout-index [<flaggor>] [--] [<fil>...]" #: builtin/checkout-index.c:188 msgid "check out all files in the index" @@ -3333,12 +3366,12 @@ msgid "copy out the files from named stage" msgstr "kopiera ut filer frÃ¥n namngiven etapp" #: builtin/checkout.c:25 -msgid "git checkout [options] <branch>" -msgstr "git checkout [flaggor] <gren>" +msgid "git checkout [<options>] <branch>" +msgstr "git checkout [<flaggor>] <gren>" #: builtin/checkout.c:26 -msgid "git checkout [options] [<branch>] -- <file>..." -msgstr "git checkout [flaggor] [<gren>] -- <fil>..." +msgid "git checkout [<options>] [<branch>] -- <file>..." +msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..." #: builtin/checkout.c:132 builtin/checkout.c:165 #, c-format @@ -3467,13 +3500,13 @@ msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" "to do so with:\n" "\n" -" git branch new_branch_name %s\n" +" git branch <new-branch-name> %s\n" "\n" msgstr "" "Om du vill behÃ¥lla dem genom att skapa en ny gren är nu en bra tidpunkt\n" "att göra sÃ¥, med:\n" "\n" -" git branch nytt_grennamn %s\n" +" git branch <nytt_grennamn> %s\n" "\n" #: builtin/checkout.c:777 @@ -3589,8 +3622,8 @@ msgid "do not limit pathspecs to sparse entries only" msgstr "begränsa inte sökvägar till endast glesa poster" #: builtin/checkout.c:1130 -msgid "second guess 'git checkout no-such-branch'" -msgstr "förutspÃ¥ \"git checkout gren-saknas\"" +msgid "second guess 'git checkout <no-such-branch>'" +msgstr "förutspÃ¥ \"git checkout <gren-saknas>\"" #: builtin/checkout.c:1153 msgid "-b, -B and --orphan are mutually exclusive" @@ -3713,16 +3746,17 @@ msgstr "VARNING: Hittar inte poster som motsvarar: %s" msgid "Select items to delete" msgstr "Välj poster att ta bort" -#: builtin/clean.c:757 +#. TRANSLATORS: Make sure to keep [y/N] as is +#: builtin/clean.c:758 #, c-format -msgid "remove %s? " -msgstr "ta bort %s?" +msgid "Remove %s [y/N]? " +msgstr "Ta bort %s [Y=ja / N=nej]?" -#: builtin/clean.c:782 +#: builtin/clean.c:783 msgid "Bye." msgstr "Hej dÃ¥." -#: builtin/clean.c:790 +#: builtin/clean.c:791 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -3740,62 +3774,62 @@ msgstr "" "help - denna skärm\n" "? - hjälp för kommandoval" -#: builtin/clean.c:817 +#: builtin/clean.c:818 msgid "*** Commands ***" msgstr "*** Kommandon ***" -#: builtin/clean.c:818 +#: builtin/clean.c:819 msgid "What now" msgstr "Vad nu" -#: builtin/clean.c:826 +#: builtin/clean.c:827 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Skulle ta bort följande post:" msgstr[1] "Skulle ta bort följande poster:" -#: builtin/clean.c:843 +#: builtin/clean.c:844 msgid "No more files to clean, exiting." msgstr "Inga fler filer att städa, avslutar." -#: builtin/clean.c:874 +#: builtin/clean.c:875 msgid "do not print names of files removed" msgstr "skriv inte ut namn pÃ¥ borttagna filer" -#: builtin/clean.c:876 +#: builtin/clean.c:877 msgid "force" msgstr "tvinga" -#: builtin/clean.c:877 +#: builtin/clean.c:878 msgid "interactive cleaning" msgstr "städa interaktivt" -#: builtin/clean.c:879 +#: builtin/clean.c:880 msgid "remove whole directories" msgstr "ta bort hela kataloger" -#: 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 +#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185 msgid "pattern" msgstr "mönster" -#: builtin/clean.c:881 +#: builtin/clean.c:882 msgid "add <pattern> to ignore rules" msgstr "lägg till <mönster> till ignoreringsregler" -#: builtin/clean.c:882 +#: builtin/clean.c:883 msgid "remove ignored files, too" msgstr "ta även bort ignorerade filer" -#: builtin/clean.c:884 +#: builtin/clean.c:885 msgid "remove only ignored files" msgstr "ta endast bort ignorerade filer" -#: builtin/clean.c:902 +#: builtin/clean.c:903 msgid "-x and -X cannot be used together" msgstr "-x och -X kan inte användas samtidigt" -#: builtin/clean.c:906 +#: builtin/clean.c:907 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -3803,7 +3837,7 @@ msgstr "" "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar " "städa" -#: builtin/clean.c:909 +#: builtin/clean.c:910 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -3812,11 +3846,11 @@ msgstr "" "angavs; vägrar städa" #: builtin/clone.c:37 -msgid "git clone [options] [--] <repo> [<dir>]" -msgstr "git clone [flaggor] [--] <arkiv> [<kat>]" +msgid "git clone [<options>] [--] <repo> [<dir>]" +msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]" -#: builtin/clone.c:66 builtin/fetch.c:112 builtin/merge.c:224 -#: builtin/push.c:514 +#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224 +#: builtin/push.c:523 msgid "force progress reporting" msgstr "tvinga förloppsrapportering" @@ -3876,7 +3910,7 @@ msgstr "checka ut <gren> istället för fjärrens HEAD" msgid "path to git-upload-pack on the remote" msgstr "sökväg till git-upload-pack pÃ¥ fjärren" -#: builtin/clone.c:94 builtin/fetch.c:113 builtin/grep.c:659 +#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659 msgid "depth" msgstr "djup" @@ -4023,7 +4057,7 @@ msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:815 builtin/fetch.c:1155 +#: builtin/clone.c:815 builtin/fetch.c:1156 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" @@ -4038,59 +4072,59 @@ msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog." msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:848 builtin/clone.c:860 +#: builtin/clone.c:850 builtin/clone.c:861 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:851 +#: builtin/clone.c:853 #, c-format -msgid "could not create work tree dir '%s'." +msgid "could not create work tree dir '%s'" msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:870 +#: builtin/clone.c:871 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:872 +#: builtin/clone.c:873 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:897 +#: builtin/clone.c:898 msgid "--dissociate given, but there is no --reference" msgstr "--dissociate angavs, men --reference har inte angivits" -#: builtin/clone.c:912 +#: builtin/clone.c:913 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället" -#: builtin/clone.c:915 +#: builtin/clone.c:916 msgid "source repository is shallow, ignoring --local" msgstr "källarkivet är grunt, ignorerar --local" -#: builtin/clone.c:920 +#: builtin/clone.c:921 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:924 +#: builtin/clone.c:925 #, c-format msgid "Don't know how to clone %s" msgstr "Vet inte hur man klonar %s" -#: builtin/clone.c:975 builtin/clone.c:983 +#: builtin/clone.c:976 builtin/clone.c:984 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:986 +#: builtin/clone.c:987 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." #: builtin/column.c:9 -msgid "git column [options]" -msgstr "git column [flaggor]" +msgid "git column [<options>]" +msgstr "git column [<flaggor>]" #: builtin/column.c:26 msgid "lookup config vars" @@ -4121,12 +4155,12 @@ msgid "--command must be the first argument" msgstr "--command mÃ¥ste vara första argument" #: builtin/commit.c:37 -msgid "git commit [options] [--] <pathspec>..." -msgstr "git commit [flaggor] [--] <sökväg>..." +msgid "git commit [<options>] [--] <pathspec>..." +msgstr "git commit [<flaggor>] [--] <sökväg>..." #: builtin/commit.c:42 -msgid "git status [options] [--] <pathspec>..." -msgstr "git status [flaggor] [--] <sökväg>..." +msgid "git status [<options>] [--] <pathspec>..." +msgstr "git status [<flaggor>] [--] <sökväg>..." #: builtin/commit.c:47 msgid "" @@ -4224,70 +4258,70 @@ msgstr "" "\"git cherry-pick --continue\" kommer därefter att Ã¥teruppta\n" "cherry-pick för Ã¥terstÃ¥ende incheckningar.\n" -#: builtin/commit.c:302 +#: builtin/commit.c:304 msgid "failed to unpack HEAD tree object" msgstr "misslyckades packa upp HEAD:s trädobjekt" -#: builtin/commit.c:342 +#: builtin/commit.c:344 msgid "unable to create temporary index" msgstr "kunde inte skapa temporär indexfil" -#: builtin/commit.c:348 +#: builtin/commit.c:350 msgid "interactive add failed" msgstr "interaktiv tilläggning misslyckades" -#: builtin/commit.c:359 +#: builtin/commit.c:361 msgid "unable to write index file" msgstr "kan inte skriva indexfil" -#: builtin/commit.c:361 +#: builtin/commit.c:363 msgid "unable to update temporary index" msgstr "kan inte uppdatera temporärt index" -#: builtin/commit.c:363 +#: builtin/commit.c:365 msgid "Failed to update main cache tree" msgstr "Misslyckades uppdatera huvud-cacheträdet" -#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461 +#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463 msgid "unable to write new_index file" msgstr "kunde inte skriva filen new_index" -#: builtin/commit.c:443 +#: builtin/commit.c:445 msgid "cannot do a partial commit during a merge." msgstr "kan inte utföra en delvis incheckning under en sammanslagning." -#: builtin/commit.c:445 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a cherry-pick." msgstr "kan inte utföra en delvis incheckning under en cherry-pick." -#: builtin/commit.c:454 +#: builtin/commit.c:456 msgid "cannot read the index" msgstr "kan inte läsa indexet" -#: builtin/commit.c:473 +#: builtin/commit.c:475 msgid "unable to write temporary index file" msgstr "kunde inte skriva temporär indexfil" -#: builtin/commit.c:584 +#: builtin/commit.c:580 #, c-format msgid "commit '%s' lacks author header" msgstr "incheckningen \"%s\" saknar författarhuvud" -#: builtin/commit.c:586 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' has malformed author line" msgstr "incheckningen \"%s\" har felformaterat författarhuvud" -#: builtin/commit.c:605 +#: builtin/commit.c:601 msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:613 +#: builtin/commit.c:609 #, c-format msgid "invalid date format: %s" msgstr "felaktigt datumformat: %s" -#: builtin/commit.c:657 +#: builtin/commit.c:653 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -4295,43 +4329,43 @@ msgstr "" "kunde inte välja ett kommentarstecken som inte använts\n" "i det befintliga incheckningsmeddelandet" -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1084 +#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slÃ¥ upp incheckningen %s" -#: builtin/commit.c:706 builtin/shortlog.c:273 +#: builtin/commit.c:702 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande frÃ¥n standard in)\n" -#: builtin/commit.c:708 +#: builtin/commit.c:704 msgid "could not read log from standard input" msgstr "kunde inte läsa logg frÃ¥n standard in" -#: builtin/commit.c:712 +#: builtin/commit.c:708 #, c-format msgid "could not read log file '%s'" msgstr "kunde inte läsa loggfilen \"%s\"" -#: builtin/commit.c:734 +#: builtin/commit.c:730 msgid "could not read MERGE_MSG" msgstr "kunde inte läsa MERGE_MSG" -#: builtin/commit.c:738 +#: builtin/commit.c:734 msgid "could not read SQUASH_MSG" msgstr "kunde inte läsa SQUASH_MSG" -#: builtin/commit.c:742 +#: builtin/commit.c:738 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/commit.c:789 +#: builtin/commit.c:785 msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" -#: builtin/commit.c:807 +#: builtin/commit.c:803 #, c-format msgid "" "\n" @@ -4346,7 +4380,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:812 +#: builtin/commit.c:808 #, c-format msgid "" "\n" @@ -4361,7 +4395,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:825 +#: builtin/commit.c:821 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4371,7 +4405,7 @@ msgstr "" "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter " "incheckningen.\n" -#: builtin/commit.c:832 +#: builtin/commit.c:828 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4382,144 +4416,145 @@ msgstr "" "med \"%c\" kommer behÃ¥llas; du kan själv ta bort dem om du vill.\n" "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/commit.c:852 +#: builtin/commit.c:848 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sFörfattare: %.*s <%.*s>" -#: builtin/commit.c:860 +#: builtin/commit.c:856 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:867 +#: builtin/commit.c:863 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sIncheckare: %.*s <%.*s>" -#: builtin/commit.c:885 +#: builtin/commit.c:881 msgid "Cannot read index" msgstr "Kan inte läsa indexet" -#: builtin/commit.c:942 +#: builtin/commit.c:938 msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:957 builtin/tag.c:495 +#: builtin/commit.c:953 builtin/tag.c:495 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Ange meddelandet en av flaggorna -m eller -F.\n" -#: builtin/commit.c:1059 +#: builtin/commit.c:1055 #, c-format -msgid "No existing author found with '%s'" -msgstr "Hittade ingen befintlig författare med \"%s\"" +msgid "--author '%s' is not 'Name <email>' and matches no existing author" +msgstr "" +"--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare" -#: builtin/commit.c:1074 builtin/commit.c:1314 +#: builtin/commit.c:1070 builtin/commit.c:1310 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospÃ¥rade filer: \"%s\"" -#: builtin/commit.c:1111 +#: builtin/commit.c:1107 msgid "--long and -z are incompatible" msgstr "--long och -z är inkompatibla" -#: builtin/commit.c:1141 +#: builtin/commit.c:1137 msgid "Using both --reset-author and --author does not make sense" msgstr "Kan inte använda bÃ¥de --reset-author och --author" -#: builtin/commit.c:1150 +#: builtin/commit.c:1146 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:1153 +#: builtin/commit.c:1149 msgid "You are in the middle of a merge -- cannot amend." msgstr "Du är i mitten av en sammanslagning -- kan inte utöka." -#: builtin/commit.c:1155 +#: builtin/commit.c:1151 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Du är i mitten av en cherry-pick -- kan inte utöka." -#: builtin/commit.c:1158 +#: builtin/commit.c:1154 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" -#: builtin/commit.c:1168 +#: builtin/commit.c:1164 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Endast en av -c/-C/-F/--fixup kan användas." -#: builtin/commit.c:1170 +#: builtin/commit.c:1166 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup." -#: builtin/commit.c:1178 +#: builtin/commit.c:1174 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author kan endast användas med -C, -c eller --amend." -#: builtin/commit.c:1195 +#: builtin/commit.c:1191 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Endast en av --include/--only/--all/--interactive/--patch kan användas." -#: builtin/commit.c:1197 +#: builtin/commit.c:1193 msgid "No paths with --include/--only does not make sense." msgstr "Du mÃ¥ste ange sökvägar tillsammans med --include/--only." -#: builtin/commit.c:1199 +#: builtin/commit.c:1195 msgid "Clever... amending the last one with dirty index." msgstr "Smart... utöka den senaste med smutsigt index." -#: builtin/commit.c:1201 +#: builtin/commit.c:1197 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..." -#: builtin/commit.c:1213 builtin/tag.c:728 +#: builtin/commit.c:1209 builtin/tag.c:728 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" -#: builtin/commit.c:1218 +#: builtin/commit.c:1214 msgid "Paths with -a does not make sense." msgstr "Kan inte ange sökvägar med -a." -#: builtin/commit.c:1328 builtin/commit.c:1608 +#: builtin/commit.c:1324 builtin/commit.c:1604 msgid "show status concisely" msgstr "visa koncis status" -#: builtin/commit.c:1330 builtin/commit.c:1610 +#: builtin/commit.c:1326 builtin/commit.c:1606 msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1332 builtin/commit.c:1612 builtin/push.c:500 +#: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509 msgid "machine-readable output" msgstr "maskinläsbar utdata" -#: builtin/commit.c:1335 builtin/commit.c:1614 +#: builtin/commit.c:1331 builtin/commit.c:1610 msgid "show status in long format (default)" msgstr "visa status i lÃ¥ngt format (standard)" -#: builtin/commit.c:1338 builtin/commit.c:1617 +#: builtin/commit.c:1334 builtin/commit.c:1613 msgid "terminate entries with NUL" msgstr "terminera poster med NUL" -#: builtin/commit.c:1340 builtin/commit.c:1620 builtin/fast-export.c:980 +#: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980 #: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "läge" -#: builtin/commit.c:1341 builtin/commit.c:1620 +#: builtin/commit.c:1337 builtin/commit.c:1616 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "visa ospÃ¥rade filer, valfria lägen: alla, normal, no. (Standard: all)" -#: builtin/commit.c:1344 +#: builtin/commit.c:1340 msgid "show ignored files" msgstr "visa ignorerade filer" -#: builtin/commit.c:1345 parse-options.h:153 +#: builtin/commit.c:1341 parse-options.h:153 msgid "when" msgstr "när" -#: builtin/commit.c:1346 +#: builtin/commit.c:1342 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -4527,209 +4562,209 @@ msgstr "" "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1348 +#: builtin/commit.c:1344 msgid "list untracked files in columns" msgstr "visa ospÃ¥rade filer i spalter" -#: builtin/commit.c:1435 +#: builtin/commit.c:1431 msgid "couldn't look up newly created commit" msgstr "kunde inte slÃ¥ upp en precis skapad incheckning" -#: builtin/commit.c:1437 +#: builtin/commit.c:1433 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: builtin/commit.c:1482 +#: builtin/commit.c:1478 msgid "detached HEAD" msgstr "frÃ¥nkopplad HEAD" -#: builtin/commit.c:1485 +#: builtin/commit.c:1481 msgid " (root-commit)" msgstr " (rotincheckning)" -#: builtin/commit.c:1578 +#: builtin/commit.c:1574 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgÃ¥ngsrik incheckning" -#: builtin/commit.c:1579 +#: builtin/commit.c:1575 msgid "show diff in commit message template" msgstr "visa diff i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1581 +#: builtin/commit.c:1577 msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1582 builtin/tag.c:601 +#: builtin/commit.c:1578 builtin/tag.c:601 msgid "read message from file" msgstr "läs meddelande frÃ¥n fil" -#: builtin/commit.c:1583 +#: builtin/commit.c:1579 msgid "author" msgstr "författare" -#: builtin/commit.c:1583 +#: builtin/commit.c:1579 msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1584 builtin/gc.c:275 +#: builtin/commit.c:1580 builtin/gc.c:275 msgid "date" msgstr "datum" -#: builtin/commit.c:1584 +#: builtin/commit.c:1580 msgid "override date for commit" msgstr "överstyr datum för incheckningen" -#: builtin/commit.c:1585 builtin/merge.c:218 builtin/notes.c:391 +#: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391 #: builtin/notes.c:554 builtin/tag.c:599 msgid "message" msgstr "meddelande" -#: builtin/commit.c:1585 +#: builtin/commit.c:1581 msgid "commit message" msgstr "incheckningsmeddelande" -#: builtin/commit.c:1586 +#: builtin/commit.c:1582 msgid "reuse and edit message from specified commit" msgstr "Ã¥teranvänd och redigera meddelande frÃ¥n angiven incheckning" -#: builtin/commit.c:1587 +#: builtin/commit.c:1583 msgid "reuse message from specified commit" msgstr "Ã¥teranvänd meddelande frÃ¥n angiven incheckning" -#: builtin/commit.c:1588 +#: builtin/commit.c:1584 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "använd autosquash-formaterat meddelande för att fixa angiven incheckning" -#: builtin/commit.c:1589 +#: builtin/commit.c:1585 msgid "use autosquash formatted message to squash specified commit" msgstr "" "använd autosquash-formaterat meddelande för att slÃ¥ ihop med angiven " "incheckning" -#: builtin/commit.c:1590 +#: builtin/commit.c:1586 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)" -#: builtin/commit.c:1591 builtin/log.c:1191 builtin/revert.c:86 +#: builtin/commit.c:1587 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "lägg till Signed-off-by:" -#: builtin/commit.c:1592 +#: builtin/commit.c:1588 msgid "use specified template file" msgstr "använd angiven mallfil" -#: builtin/commit.c:1593 +#: builtin/commit.c:1589 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1594 +#: builtin/commit.c:1590 msgid "default" msgstr "standard" -#: builtin/commit.c:1594 builtin/tag.c:604 +#: builtin/commit.c:1590 builtin/tag.c:604 msgid "how to strip spaces and #comments from message" msgstr "hur blanksteg och #kommentarer skall tas bort frÃ¥n meddelande" -#: builtin/commit.c:1595 +#: builtin/commit.c:1591 msgid "include status in commit message template" msgstr "inkludera status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1596 builtin/merge.c:225 builtin/revert.c:92 +#: builtin/commit.c:1592 builtin/merge.c:225 builtin/revert.c:92 #: builtin/tag.c:605 msgid "key-id" msgstr "nyckel-id" -#: builtin/commit.c:1597 builtin/merge.c:226 builtin/revert.c:93 +#: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93 msgid "GPG sign commit" msgstr "GPG-signera incheckning" -#: builtin/commit.c:1600 +#: builtin/commit.c:1596 msgid "Commit contents options" msgstr "Alternativ för incheckningens innehÃ¥ll" -#: builtin/commit.c:1601 +#: builtin/commit.c:1597 msgid "commit all changed files" msgstr "checka in alla ändrade filer" -#: builtin/commit.c:1602 +#: builtin/commit.c:1598 msgid "add specified files to index for commit" msgstr "lägg till angivna filer till indexet för incheckning" -#: builtin/commit.c:1603 +#: builtin/commit.c:1599 msgid "interactively add files" msgstr "lägg till filer interaktivt" -#: builtin/commit.c:1604 +#: builtin/commit.c:1600 msgid "interactively add changes" msgstr "lägg till ändringar interaktivt" -#: builtin/commit.c:1605 +#: builtin/commit.c:1601 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1606 +#: builtin/commit.c:1602 msgid "bypass pre-commit hook" msgstr "förbigÃ¥ pre-commit-krok" -#: builtin/commit.c:1607 +#: builtin/commit.c:1603 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1618 +#: builtin/commit.c:1614 msgid "amend previous commit" msgstr "lägg till föregÃ¥ende incheckning" -#: builtin/commit.c:1619 +#: builtin/commit.c:1615 msgid "bypass post-rewrite hook" msgstr "förbigÃ¥ post-rewrite-krok" -#: builtin/commit.c:1624 +#: builtin/commit.c:1620 msgid "ok to record an empty change" msgstr "ok att registrera en tom ändring" -#: builtin/commit.c:1626 +#: builtin/commit.c:1622 msgid "ok to record a change with an empty message" msgstr "ok att registrera en ändring med tomt meddelande" -#: builtin/commit.c:1655 +#: builtin/commit.c:1651 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: builtin/commit.c:1694 builtin/merge.c:519 +#: builtin/commit.c:1690 builtin/merge.c:519 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" -#: builtin/commit.c:1701 +#: builtin/commit.c:1697 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1708 +#: builtin/commit.c:1704 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1727 +#: builtin/commit.c:1723 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1738 +#: builtin/commit.c:1734 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1743 +#: builtin/commit.c:1739 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter pÃ¥ grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1758 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1754 builtin/merge.c:851 builtin/merge.c:876 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: builtin/commit.c:1791 +#: builtin/commit.c:1787 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -4741,8 +4776,8 @@ msgstr "" "\"git reset HEAD\" för att Ã¥terställa." #: builtin/config.c:8 -msgid "git config [options]" -msgstr "git config [flaggor]" +msgid "git config [<options>]" +msgstr "git config [<flaggor>]" #: builtin/config.c:53 msgid "Config file location" @@ -4897,12 +4932,12 @@ msgid "print sizes in human readable format" msgstr "skriv storlekar i människoläsbart format" #: builtin/describe.c:17 -msgid "git describe [options] <commit-ish>*" -msgstr "git describe [flaggor] <incheckning-igt>*" +msgid "git describe [<options>] [<commit-ish>...]" +msgstr "git describe [<flaggor>] [<incheckning-igt>...]" #: builtin/describe.c:18 -msgid "git describe [options] --dirty" -msgstr "git describe [flaggor] --dirty" +msgid "git describe [<options>] --dirty" +msgstr "git describe [<flaggor>] --dirty" #: builtin/describe.c:217 #, c-format @@ -5117,177 +5152,177 @@ msgstr "Applicera referensspecifikation pÃ¥ exporterade referenser" msgid "anonymize output" msgstr "anonymisera utdata" -#: builtin/fetch.c:20 +#: builtin/fetch.c:19 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/fetch.c:21 +#: builtin/fetch.c:20 msgid "git fetch [<options>] <group>" msgstr "git fetch [<flaggor>] <grupp>" -#: builtin/fetch.c:22 +#: builtin/fetch.c:21 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]" -#: builtin/fetch.c:23 +#: builtin/fetch.c:22 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<flaggor>]" -#: builtin/fetch.c:90 +#: builtin/fetch.c:89 msgid "fetch from all remotes" msgstr "hämta frÃ¥n alla fjärrar" -#: builtin/fetch.c:92 +#: builtin/fetch.c:91 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över" -#: builtin/fetch.c:94 +#: builtin/fetch.c:93 msgid "path to upload pack on remote end" msgstr "sökväg till upload pack pÃ¥ fjärren" -#: builtin/fetch.c:95 +#: builtin/fetch.c:94 msgid "force overwrite of local branch" msgstr "tvinga överskrivning av lokal gren" -#: builtin/fetch.c:97 +#: builtin/fetch.c:96 msgid "fetch from multiple remotes" msgstr "hämta frÃ¥n flera fjärrar" -#: builtin/fetch.c:99 +#: builtin/fetch.c:98 msgid "fetch all tags and associated objects" msgstr "hämta alla taggar och associerade objekt" -#: builtin/fetch.c:101 +#: builtin/fetch.c:100 msgid "do not fetch all tags (--no-tags)" msgstr "hämta inte alla taggar (--no-tags)" -#: builtin/fetch.c:103 +#: builtin/fetch.c:102 msgid "prune remote-tracking branches no longer on remote" msgstr "rensa fjärrspÃ¥rande grenar ej längre pÃ¥ fjärren" -#: builtin/fetch.c:104 +#: builtin/fetch.c:103 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:105 +#: builtin/fetch.c:104 msgid "control recursive fetching of submodules" msgstr "styr rekursiv hämtning av undermoduler" -#: builtin/fetch.c:109 +#: builtin/fetch.c:108 msgid "keep downloaded pack" msgstr "behÃ¥ll hämtade paket" -#: builtin/fetch.c:111 +#: builtin/fetch.c:110 msgid "allow updating of HEAD ref" msgstr "tillÃ¥t uppdatering av HEAD-referens" -#: builtin/fetch.c:114 +#: builtin/fetch.c:113 msgid "deepen history of shallow clone" msgstr "fördjupa historik för grund klon" -#: builtin/fetch.c:116 +#: builtin/fetch.c:115 msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" -#: builtin/fetch.c:118 builtin/log.c:1208 +#: builtin/fetch.c:117 builtin/log.c:1208 msgid "dir" msgstr "kat" -#: builtin/fetch.c:119 +#: builtin/fetch.c:118 msgid "prepend this to submodule path output" msgstr "lägg till i början av undermodulens sökvägsutdata" -#: builtin/fetch.c:122 +#: builtin/fetch.c:121 msgid "default mode for recursion" msgstr "standardläge för rekursion" -#: builtin/fetch.c:124 +#: builtin/fetch.c:123 msgid "accept refs that update .git/shallow" msgstr "tar emot referenser som uppdaterar .git/shallow" -#: builtin/fetch.c:125 +#: builtin/fetch.c:124 msgid "refmap" msgstr "referenskarta" -#: builtin/fetch.c:126 +#: builtin/fetch.c:125 msgid "specify fetch refmap" msgstr "ange referenskarta för \"fetch\"" -#: builtin/fetch.c:376 +#: builtin/fetch.c:375 msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:454 +#: builtin/fetch.c:455 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:459 +#: builtin/fetch.c:460 msgid "[up to date]" msgstr "[à jour]" -#: builtin/fetch.c:473 +#: builtin/fetch.c:474 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s (kan inte hämta i aktuell gren)" -#: builtin/fetch.c:474 builtin/fetch.c:560 +#: builtin/fetch.c:475 builtin/fetch.c:561 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:485 +#: builtin/fetch.c:486 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540 +#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541 msgid " (unable to update local ref)" msgstr " (kunde inte uppdatera lokal ref)" -#: builtin/fetch.c:505 +#: builtin/fetch.c:506 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:508 +#: builtin/fetch.c:509 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:511 +#: builtin/fetch.c:512 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:562 +#: builtin/fetch.c:563 msgid "(non-fast-forward)" msgstr "(ej snabbspolad)" -#: builtin/fetch.c:595 builtin/fetch.c:828 +#: builtin/fetch.c:596 builtin/fetch.c:829 #, c-format msgid "cannot open %s: %s\n" msgstr "kan inte öppna %s: %s\n" -#: builtin/fetch.c:604 +#: builtin/fetch.c:605 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s sände inte alla nödvändiga objekt\n" -#: builtin/fetch.c:622 +#: builtin/fetch.c:623 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "avvisa %s dÃ¥ grunda rötter inte kan uppdateras" -#: builtin/fetch.c:710 builtin/fetch.c:793 +#: builtin/fetch.c:711 builtin/fetch.c:794 #, c-format msgid "From %.*s\n" msgstr "FrÃ¥n %.*s\n" -#: builtin/fetch.c:721 +#: builtin/fetch.c:722 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5296,55 +5331,55 @@ msgstr "" "vissa lokala referenser kunde inte uppdateras; testa att köra\n" " \"git remote prune %s\" för att ta bort gamla grenar som stÃ¥r i konflikt" -#: builtin/fetch.c:773 +#: builtin/fetch.c:774 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:774 +#: builtin/fetch.c:775 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:798 +#: builtin/fetch.c:799 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:799 builtin/remote.c:1060 +#: builtin/fetch.c:800 builtin/remote.c:1060 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:818 +#: builtin/fetch.c:819 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv" -#: builtin/fetch.c:837 +#: builtin/fetch.c:838 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s" -#: builtin/fetch.c:840 +#: builtin/fetch.c:841 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:896 +#: builtin/fetch.c:897 #, c-format msgid "Don't know how to fetch from %s" msgstr "Vet inte hur man hämtar frÃ¥n %s" -#: builtin/fetch.c:1058 +#: builtin/fetch.c:1059 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:1060 builtin/remote.c:90 +#: builtin/fetch.c:1061 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:1078 +#: builtin/fetch.c:1079 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5352,39 +5387,40 @@ msgstr "" "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet pÃ¥ ett\n" "fjärrarkiv som nya incheckningar skall hämtas frÃ¥n." -#: builtin/fetch.c:1101 +#: builtin/fetch.c:1102 msgid "You need to specify a tag name." msgstr "Du mÃ¥ste ange namnet pÃ¥ en tagg." -#: builtin/fetch.c:1143 +#: builtin/fetch.c:1144 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte användas samtidigt" -#: builtin/fetch.c:1145 +#: builtin/fetch.c:1146 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas pÃ¥ ett komplett arkiv" -#: builtin/fetch.c:1168 +#: builtin/fetch.c:1169 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet pÃ¥ ett arkiv som argument" -#: builtin/fetch.c:1170 +#: builtin/fetch.c:1171 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1181 +#: builtin/fetch.c:1182 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1189 +#: builtin/fetch.c:1190 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta frÃ¥n grupp och ange referensspecifikationer" #: builtin/fmt-merge-msg.c:13 -msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" +msgid "" +"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" -"git fmt-merge-msg [-m <meddelande>] [--log[=<n>]|--no-log] [--file <fil>]" +"git fmt-merge-msg [-m <meddelande>] [--log[=<n>] | --no-log] [--file <fil>]" #: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182 @@ -5413,53 +5449,53 @@ msgstr "inled meddelande med <text>" msgid "file to read from" msgstr "fil att läsa frÃ¥n" -#: builtin/for-each-ref.c:676 +#: builtin/for-each-ref.c:675 msgid "unable to parse format" msgstr "kan inte tolka formatet" -#: builtin/for-each-ref.c:1064 -msgid "git for-each-ref [options] [<pattern>]" -msgstr "git for-each-ref [flaggor] [<mönster>]" +#: builtin/for-each-ref.c:1063 +msgid "git for-each-ref [<options>] [<pattern>]" +msgstr "git for-each-ref [<flaggor>] [<mönster>]" -#: builtin/for-each-ref.c:1079 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for shells" msgstr "citera platshÃ¥llare passande för skal" -#: builtin/for-each-ref.c:1081 +#: builtin/for-each-ref.c:1080 msgid "quote placeholders suitably for perl" msgstr "citera platshÃ¥llare passande för perl" -#: builtin/for-each-ref.c:1083 +#: builtin/for-each-ref.c:1082 msgid "quote placeholders suitably for python" msgstr "citera platshÃ¥llare passande för python" -#: builtin/for-each-ref.c:1085 +#: builtin/for-each-ref.c:1084 msgid "quote placeholders suitably for Tcl" msgstr "citera platshÃ¥llare passande för Tcl" -#: builtin/for-each-ref.c:1088 +#: builtin/for-each-ref.c:1087 msgid "show only <n> matched refs" msgstr "visa endast <n> träffade refs" -#: builtin/for-each-ref.c:1089 builtin/replace.c:438 +#: builtin/for-each-ref.c:1088 builtin/replace.c:438 msgid "format" msgstr "format" -#: builtin/for-each-ref.c:1089 +#: builtin/for-each-ref.c:1088 msgid "format to use for the output" msgstr "format att använda för utdata" -#: builtin/for-each-ref.c:1090 +#: builtin/for-each-ref.c:1089 msgid "key" msgstr "nyckel" -#: builtin/for-each-ref.c:1091 +#: builtin/for-each-ref.c:1090 msgid "field name to sort on" msgstr "fältnamn att sortera pÃ¥" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: builtin/fsck.c:147 builtin/prune.c:136 +#: builtin/fsck.c:147 builtin/prune.c:137 msgid "Checking connectivity" msgstr "Kontrollerar konnektivitet" @@ -5468,8 +5504,8 @@ msgid "Checking object directories" msgstr "Kontrollerar objektkataloger" #: builtin/fsck.c:603 -msgid "git fsck [options] [<object>...]" -msgstr "git fsck [flaggor] [<objekt>...]" +msgid "git fsck [<options>] [<object>...]" +msgstr "git fsck [<flaggor>] [<objekt>...]" #: builtin/fsck.c:609 msgid "show unreachable objects" @@ -5516,8 +5552,8 @@ msgid "Checking objects" msgstr "Kontrollerar objekt" #: builtin/gc.c:24 -msgid "git gc [options]" -msgstr "git gc [flaggor]" +msgid "git gc [<options>]" +msgstr "git gc [<flaggor>]" #: builtin/gc.c:79 #, c-format @@ -5576,8 +5612,8 @@ msgstr "" "dem." #: builtin/grep.c:23 -msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" -msgstr "git grep [flaggor] [-e] <mönster> [<rev>...] [[--] <sökväg>...]" +msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" +msgstr "git grep [<flaggor>] [-e] <mönster> [<rev>...] [[--] <sökväg>...]" #: builtin/grep.c:218 #, c-format @@ -5617,8 +5653,8 @@ msgid "search in both tracked and untracked files" msgstr "sök i bÃ¥de spÃ¥rade och ospÃ¥rade filer" #: builtin/grep.c:644 -msgid "search also in ignored files" -msgstr "sök även i ignorerade filer" +msgid "ignore files specified via '.gitignore'" +msgstr "ignorera filer angivna i \".gitignore\"" #: builtin/grep.c:647 msgid "show non-matching lines" @@ -5802,17 +5838,17 @@ msgstr "bÃ¥de --cached och träd angavs." #: builtin/hash-object.c:82 msgid "" -"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " -"<file>..." +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " +"[--] <file>..." msgstr "" -"git hash-object [-t <typ>] [-w] [--path=<fil>|--no-filters] [--stdin] [--] " +"git hash-object [-t <typ>] [-w] [--path=<fil> | --no-filters] [--stdin] [--] " "<fil>..." #: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "git hash-object --stdin-paths < <sökvägslista>" -#: builtin/hash-object.c:94 builtin/tag.c:610 +#: builtin/hash-object.c:94 builtin/tag.c:612 msgid "type" msgstr "typ" @@ -5863,8 +5899,8 @@ msgid "show info page" msgstr "visa info-sida" #: builtin/help.c:52 -msgid "git help [--all] [--guides] [--man|--web|--info] [command]" -msgstr "git help [--all] [--guides] [--man|--web|--info] [kommando]" +msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" +msgstr "git help [--all] [--guides] [--man | --web | --info] [<kommando>]" #: builtin/help.c:64 #, c-format @@ -6072,8 +6108,8 @@ msgstr "allvarlig inflate-inkonsekvens" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !" -#: builtin/index-pack.c:689 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:256 +#: builtin/index-pack.c:689 builtin/pack-objects.c:162 +#: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "kunde inte läsa %s" @@ -6160,97 +6196,97 @@ msgid_plural "pack has %d unresolved deltas" msgstr[0] "paketet har %d oanalyserat delta" msgstr[1] "paketet har %d oanalyserade delta" -#: builtin/index-pack.c:1220 +#: builtin/index-pack.c:1219 #, c-format msgid "unable to deflate appended object (%d)" msgstr "kunde inte utföra \"deflate\" pÃ¥ tillagt objekt (%d)" -#: builtin/index-pack.c:1299 +#: builtin/index-pack.c:1298 #, c-format msgid "local object %s is corrupt" msgstr "lokalt objekt %s är trasigt" -#: builtin/index-pack.c:1323 +#: builtin/index-pack.c:1322 msgid "error while closing pack file" msgstr "fel vid stängning av paketfil" -#: builtin/index-pack.c:1336 +#: builtin/index-pack.c:1335 #, c-format msgid "cannot write keep file '%s'" msgstr "kan inte ta skriva \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1344 +#: builtin/index-pack.c:1343 #, c-format msgid "cannot close written keep file '%s'" msgstr "akn inte stänga skriven \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1357 +#: builtin/index-pack.c:1356 msgid "cannot store pack file" msgstr "kan inte spara paketfil" -#: builtin/index-pack.c:1368 +#: builtin/index-pack.c:1367 msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1401 +#: builtin/index-pack.c:1400 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "felaktig pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1406 #, c-format msgid "invalid number of threads specified (%d)" msgstr "felaktigt antal trÃ¥dar angivet (%d)" -#: builtin/index-pack.c:1411 builtin/index-pack.c:1590 +#: builtin/index-pack.c:1410 builtin/index-pack.c:1589 #, c-format msgid "no threads support, ignoring %s" msgstr "trÃ¥dstöd saknas, ignorerar %s" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1468 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kan inte öppna befintlig paketfil \"%s\"" -#: builtin/index-pack.c:1471 +#: builtin/index-pack.c:1470 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\"" -#: builtin/index-pack.c:1518 +#: builtin/index-pack.c:1517 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "icke-delta: %d objekt" msgstr[1] "icke-delta: %d objekt" -#: builtin/index-pack.c:1525 +#: builtin/index-pack.c:1524 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "kedjelängd = %d: %lu objekt" msgstr[1] "kedjelängd = %d: %lu objekt" -#: builtin/index-pack.c:1554 +#: builtin/index-pack.c:1553 msgid "Cannot come back to cwd" msgstr "Kan inte gÃ¥ tillbaka till arbetskatalogen (cwd)" -#: builtin/index-pack.c:1602 builtin/index-pack.c:1605 -#: builtin/index-pack.c:1617 builtin/index-pack.c:1621 +#: builtin/index-pack.c:1601 builtin/index-pack.c:1604 +#: builtin/index-pack.c:1616 builtin/index-pack.c:1620 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1635 +#: builtin/index-pack.c:1634 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte användas med --stdin" -#: builtin/index-pack.c:1639 builtin/index-pack.c:1648 +#: builtin/index-pack.c:1638 builtin/index-pack.c:1647 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" -#: builtin/index-pack.c:1656 +#: builtin/index-pack.c:1655 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" @@ -6361,11 +6397,11 @@ msgstr " delat" #: builtin/init-db.c:475 msgid "" -"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" -"shared[=<permissions>]] [directory]" +"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared" +"[=<permissions>]] [<directory>]" msgstr "" -"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--" -"shared[=<behörigheter>]] [katalog]" +"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--shared" +"[=<behörigheter>]] [<katalog>]" #: builtin/init-db.c:498 msgid "permissions" @@ -6408,8 +6444,8 @@ msgid "" "git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] " "[<file>...]" msgstr "" -"git interpret-trailers [--trim-empty] [(--trailer " -"<symbol>[(=|:)<värde>])...] [<fil>...]" +"git interpret-trailers [--trim-empty] [(--trailer <symbol>[(=|:)" +"<värde>])...] [<fil>...]" #: builtin/interpret-trailers.c:25 msgid "trim empty trailers" @@ -6428,8 +6464,8 @@ msgid "git log [<options>] [<revision range>] [[--] <path>...]" msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" #: builtin/log.c:42 -msgid "git show [options] <object>..." -msgstr "git show [flaggor] <objekt>..." +msgid "git show [<options>] <object>..." +msgstr "git show [<flaggor>] <objekt>..." #: builtin/log.c:81 #, c-format @@ -6507,8 +6543,8 @@ msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" #: builtin/log.c:1026 -msgid "git format-patch [options] [<since> | <revision range>]" -msgstr "git format-patch [flaggor] [<sedan> | <revisionsintervall>]" +msgid "git format-patch [<options>] [<since> | <revision-range>]" +msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]" #: builtin/log.c:1071 msgid "Two output directories?" @@ -6704,95 +6740,95 @@ msgstr "Kunde inte hitta en spÃ¥rad fjärrgren, ange <uppström> manuellt.\n" msgid "Unknown commit %s" msgstr "Okänd incheckning %s" -#: builtin/ls-files.c:401 -msgid "git ls-files [options] [<file>...]" -msgstr "git ls-files [flaggor] [<fil>...]" +#: builtin/ls-files.c:358 +msgid "git ls-files [<options>] [<file>...]" +msgstr "git ls-files [<flaggor>] [<fil>...]" -#: builtin/ls-files.c:458 +#: builtin/ls-files.c:415 msgid "identify the file status with tags" msgstr "identifiera filstatus med taggar" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:417 msgid "use lowercase letters for 'assume unchanged' files" msgstr "använd smÃ¥ bokstäver för \"anta oförändrade\"-filer" -#: builtin/ls-files.c:462 +#: builtin/ls-files.c:419 msgid "show cached files in the output (default)" msgstr "visa cachade filer i utdata (standard)" -#: builtin/ls-files.c:464 +#: builtin/ls-files.c:421 msgid "show deleted files in the output" msgstr "visa borttagna filer i utdata" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:423 msgid "show modified files in the output" msgstr "visa modifierade filer i utdata" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:425 msgid "show other files in the output" msgstr "visa andra filer i utdata" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:427 msgid "show ignored files in the output" msgstr "visa ignorerade filer i utdata" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:430 msgid "show staged contents' object name in the output" msgstr "visa köat innehÃ¥lls objektnamn i utdata" -#: builtin/ls-files.c:475 +#: builtin/ls-files.c:432 msgid "show files on the filesystem that need to be removed" msgstr "visa filer i filsystemet som behöver tas bort" -#: builtin/ls-files.c:477 +#: builtin/ls-files.c:434 msgid "show 'other' directories' names only" msgstr "visa endast namn för \"andra\" kataloger" -#: builtin/ls-files.c:480 +#: builtin/ls-files.c:437 msgid "don't show empty directories" msgstr "visa inte tomma kataloger" -#: builtin/ls-files.c:483 +#: builtin/ls-files.c:440 msgid "show unmerged files in the output" msgstr "visa ej sammanslagna filer i utdata" -#: builtin/ls-files.c:485 +#: builtin/ls-files.c:442 msgid "show resolve-undo information" msgstr "visa \"resolve-undo\"-information" -#: builtin/ls-files.c:487 +#: builtin/ls-files.c:444 msgid "skip files matching pattern" msgstr "hoppa över filer som motsvarar mönster" -#: builtin/ls-files.c:490 +#: builtin/ls-files.c:447 msgid "exclude patterns are read from <file>" msgstr "exkludera mönster som läses frÃ¥n <fil>" -#: builtin/ls-files.c:493 +#: builtin/ls-files.c:450 msgid "read additional per-directory exclude patterns in <file>" msgstr "läs ytterligare per-katalog-exkluderingsmönster frÃ¥n <fil>" -#: builtin/ls-files.c:495 +#: builtin/ls-files.c:452 msgid "add the standard git exclusions" msgstr "lägg till git:s standardexkluderingar" -#: builtin/ls-files.c:498 +#: builtin/ls-files.c:455 msgid "make the output relative to the project top directory" msgstr "gör utdata relativ till projektets toppkatalog" -#: builtin/ls-files.c:501 +#: builtin/ls-files.c:458 msgid "if any <file> is not in the index, treat this as an error" msgstr "om en <fil> inte är indexet, betrakta det som ett fel" -#: builtin/ls-files.c:502 +#: builtin/ls-files.c:459 msgid "tree-ish" msgstr "träd-igt" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:460 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "lÃ¥tsas att sökvägar borttagna sedan <träd-igt> fortfarande finns" -#: builtin/ls-files.c:505 +#: builtin/ls-files.c:462 msgid "show debugging data" msgstr "visa felsökningsutdata" @@ -6833,12 +6869,12 @@ msgid "list entire tree; not just current directory (implies --full-name)" msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)" #: builtin/merge.c:45 -msgid "git merge [options] [<commit>...]" -msgstr "git merge [flaggor] [<incheckning>...]" +msgid "git merge [<options>] [<commit>...]" +msgstr "git merge [<flaggor>] [<incheckning>...]" #: builtin/merge.c:46 -msgid "git merge [options] <msg> HEAD <commit>" -msgstr "git merge [flaggor] <meddelande> HEAD <incheckning>" +msgid "git merge [<options>] <msg> HEAD <commit>" +msgstr "git merge [<flaggor>] <meddelande> HEAD <incheckning>" #: builtin/merge.c:47 msgid "git merge --abort" @@ -7186,12 +7222,12 @@ msgstr "" "Automatisk sammanslagning lyckades; stoppar före incheckning som önskat\n" #: builtin/merge-base.c:29 -msgid "git merge-base [-a|--all] <commit> <commit>..." -msgstr "git merge-base [-a|--all] <incheckning> <incheckning>..." +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "git merge-base [-a | --all] <incheckning> <incheckning>..." #: builtin/merge-base.c:30 -msgid "git merge-base [-a|--all] --octopus <commit>..." -msgstr "git merge-base [-a|--all] --octopus <incheckning>..." +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "git merge-base [-a | --all] --octopus <incheckning>..." #: builtin/merge-base.c:31 msgid "git merge-base --independent <commit>..." @@ -7227,10 +7263,11 @@ msgstr "se var <incheckning> grenades av frÃ¥n referensloggen frÃ¥n <ref>" #: builtin/merge-file.c:8 msgid "" -"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " -"file2" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" msgstr "" -"git merge-file [alternativ] [-L namn1 [-L orig [-L namn2]]] fil1 origfil fil2" +"git merge-file [<alternativ>] [-L <namn1> [-L <orig> [-L <namn2>]]] <fil1> " +"<origfil> <fil2>" #: builtin/merge-file.c:33 msgid "send results to standard output" @@ -7261,7 +7298,7 @@ msgid "do not warn about conflicts" msgstr "varna inte om konflikter" #: builtin/merge-file.c:45 -msgid "set labels for file1/orig_file/file2" +msgid "set labels for file1/orig-file/file2" msgstr "sätt etiketter för fil1/origfil/fil2" #: builtin/mktree.c:64 @@ -7281,8 +7318,8 @@ msgid "allow creation of more than one tree" msgstr "tillÃ¥t skapa mer än ett träd" #: builtin/mv.c:15 -msgid "git mv [options] <source>... <destination>" -msgstr "git mv [flaggor] <källa>... <mÃ¥l>" +msgid "git mv [<options>] <source>... <destination>" +msgstr "git mv [<flaggor>] <källa>... <mÃ¥l>" #: builtin/mv.c:69 #, c-format @@ -7368,22 +7405,22 @@ msgstr "%s, källa=%s, mÃ¥l=%s" msgid "Renaming %s to %s\n" msgstr "Byter namn pÃ¥ %s till %s\n" -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:355 +#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn pÃ¥ \"%s\"" #: builtin/name-rev.c:255 -msgid "git name-rev [options] <commit>..." -msgstr "git name-rev [flaggor] <incheckning>..." +msgid "git name-rev [<options>] <commit>..." +msgstr "git name-rev [<flaggor>] <incheckning>..." #: builtin/name-rev.c:256 -msgid "git name-rev [options] --all" -msgstr "git name-rev [flaggor] --all" +msgid "git name-rev [<options>] --all" +msgstr "git name-rev [<flaggor>] --all" #: builtin/name-rev.c:257 -msgid "git name-rev [options] --stdin" -msgstr "git name-rev [flaggor] --stdin" +msgid "git name-rev [<options>] --stdin" +msgstr "git name-rev [<flaggor>] --stdin" #: builtin/name-rev.c:309 msgid "print only names (no SHA-1)" @@ -7414,43 +7451,43 @@ msgid "dereference tags in the input (internal use)" msgstr "avreferera taggar i indata (används internt)" #: builtin/notes.c:24 -msgid "git notes [--ref <notes_ref>] [list [<object>]]" +msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <anteckningsref>] [list [<objekt>]]" #: builtin/notes.c:25 msgid "" -"git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" msgstr "" "git notes [--ref <anteckningsref>] add [-f] [--allow-empty] [-m <medd> | -F " "<fil> | (-c | -C) <objekt>] [<objekt>]" #: builtin/notes.c:26 -msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" +msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "" "git notes [--ref <anteckningsref>] copy [-f] <frÃ¥n-objekt> <till-objekt>" #: builtin/notes.c:27 msgid "" -"git notes [--ref <notes_ref>] append [--allow-empty] [-m <msg> | -F <file> | " +"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" msgstr "" "git notes [--ref <anteckningsref>] append [--allow-empty] [-m <medd> | -F " "<fil> | (-c | -C) <objekt>] [<objekt>]" #: builtin/notes.c:28 -msgid "git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]" +msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "git notes [--ref <anteckningsref>] edit [--allow-empty] [<objekt>]" #: builtin/notes.c:29 -msgid "git notes [--ref <notes_ref>] show [<object>]" +msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "git notes [--ref <anteckningsref>] show [<objekt>]" #: builtin/notes.c:30 msgid "" -"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" +"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "" -"git notes [--ref <anteckningsref>] merge [-v | -q] [-s <strategi> ] " +"git notes [--ref <anteckningsref>] merge [-v | -q] [-s <strategi>] " "<anteckningsref>" #: builtin/notes.c:31 @@ -7462,15 +7499,15 @@ msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" #: builtin/notes.c:33 -msgid "git notes [--ref <notes_ref>] remove [<object>...]" +msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref <anteckningsref>] remove [<objekt>...]" #: builtin/notes.c:34 -msgid "git notes [--ref <notes_ref>] prune [-n | -v]" +msgid "git notes [--ref <notes-ref>] prune [-n | -v]" msgstr "git notes [--ref <anteckningsref>] prune [-n | -v]" #: builtin/notes.c:35 -msgid "git notes [--ref <notes_ref>] get-ref" +msgid "git notes [--ref <notes-ref>] get-ref" msgstr "git notes [--ref <anteckningsref>] get-ref" #: builtin/notes.c:40 @@ -7502,7 +7539,7 @@ msgid "git notes show [<object>]" msgstr "git notes show [<objekt>]" #: builtin/notes.c:71 -msgid "git notes merge [<options>] <notes_ref>" +msgid "git notes merge [<options>] <notes-ref>" msgstr "git notes merge [<flaggor>] <anteckningsref>" #: builtin/notes.c:72 @@ -7741,7 +7778,7 @@ msgid "notes-ref" msgstr "anteckningar-ref" #: builtin/notes.c:954 -msgid "use notes from <notes_ref>" +msgid "use notes from <notes-ref>" msgstr "använd anteckningar frÃ¥n <anteckningsref>" #: builtin/notes.c:989 builtin/remote.c:1621 @@ -7757,186 +7794,186 @@ msgstr "git pack-objects --stdout [flaggor...] [< reflista | < objektlista]" msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" msgstr "git pack-objects [flaggor...] basnamn [< reflista | < objektlista]" -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 +#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 #, c-format msgid "deflate error (%d)" msgstr "fel i deflate (%d)" -#: builtin/pack-objects.c:773 +#: builtin/pack-objects.c:771 msgid "Writing objects" msgstr "Skriver objekt" -#: builtin/pack-objects.c:1015 +#: builtin/pack-objects.c:1013 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "inaktiverar skrivning av bitkarta dÃ¥ nÃ¥gra objekt inte packas" -#: builtin/pack-objects.c:2175 +#: builtin/pack-objects.c:2173 msgid "Compressing objects" msgstr "Komprimerar objekt" -#: builtin/pack-objects.c:2572 +#: builtin/pack-objects.c:2570 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:2576 +#: builtin/pack-objects.c:2574 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2597 #, c-format msgid "option %s does not accept negative form" msgstr "flaggan %s godtar inte negativ form" -#: builtin/pack-objects.c:2603 +#: builtin/pack-objects.c:2601 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "kunde inte tolka värdet \"%s\" för flaggan %s" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2621 msgid "do not show progress meter" msgstr "visa inte förloppsindikator" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2623 msgid "show progress meter" msgstr "visa förloppsindikator" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2625 msgid "show progress meter during object writing phase" msgstr "visa förloppsindikator under objektskrivningsfasen" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2628 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress när förloppsmätaren visas" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2629 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2632 +#: builtin/pack-objects.c:2630 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:2635 +#: builtin/pack-objects.c:2633 msgid "maximum size of each output pack file" msgstr "maximal storlek pÃ¥ varje utdatapaketfil" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2635 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lÃ¥nade objekt frÃ¥n alternativa objektlager" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:2637 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:2641 +#: builtin/pack-objects.c:2639 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:2643 +#: builtin/pack-objects.c:2641 msgid "limit pack window by memory in addition to object limit" msgstr "begränsa paketfönster efter minne förutom objektgräns" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2643 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "maximal längd pÃ¥ deltakedja tillÃ¥ten i slutligt paket" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2645 msgid "reuse existing deltas" msgstr "Ã¥teranvänd befintliga delta" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2647 msgid "reuse existing objects" msgstr "Ã¥teranvänd befintliga objekt" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2649 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2651 msgid "use threads when searching for best delta matches" msgstr "använd trÃ¥dar vid sökning efter bästa deltaträffar" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2653 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2655 msgid "read revision arguments from standard input" msgstr "läs revisionsargument frÃ¥n standard in" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2657 msgid "limit the objects to those that are not yet packed" msgstr "begränsa objekt till de som ännu inte packats" -#: builtin/pack-objects.c:2662 +#: builtin/pack-objects.c:2660 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nÃ¥s frÃ¥n nÃ¥gon referens" -#: builtin/pack-objects.c:2665 +#: builtin/pack-objects.c:2663 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras frÃ¥n referensloggposter" -#: builtin/pack-objects.c:2668 +#: builtin/pack-objects.c:2666 msgid "include objects referred to by the index" msgstr "inkludera objekt som refereras frÃ¥n indexet" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2669 msgid "output pack to stdout" msgstr "skriv paket pÃ¥ standard ut" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2671 msgid "include tag objects that refer to objects to be packed" msgstr "inkludera taggobjekt som refererar objekt som skall packas" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2673 msgid "keep unreachable objects" msgstr "behÃ¥ll onÃ¥bara objekt" -#: builtin/pack-objects.c:2676 parse-options.h:140 +#: builtin/pack-objects.c:2674 parse-options.h:140 msgid "time" msgstr "tid" -#: builtin/pack-objects.c:2677 +#: builtin/pack-objects.c:2675 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onÃ¥bara objekt nyare än <tid>" -#: builtin/pack-objects.c:2680 +#: builtin/pack-objects.c:2678 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:2682 +#: builtin/pack-objects.c:2680 msgid "create packs suitable for shallow fetches" msgstr "skapa packfiler lämpade för grunda hämtningar" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2682 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhörande .keep-fil" -#: builtin/pack-objects.c:2686 +#: builtin/pack-objects.c:2684 msgid "pack compression level" msgstr "komprimeringsgrad för paket" -#: builtin/pack-objects.c:2688 +#: builtin/pack-objects.c:2686 msgid "do not hide commits by grafts" msgstr "göm inte incheckningar med ympningar (\"grafts\")" -#: builtin/pack-objects.c:2690 +#: builtin/pack-objects.c:2688 msgid "use a bitmap index if available to speed up counting objects" msgstr "använd bitkartindex om tillgängligt för att räkna objekt snabbare" -#: builtin/pack-objects.c:2692 +#: builtin/pack-objects.c:2690 msgid "write a bitmap index together with the pack index" msgstr "använd bitkartindex tillsammans med packindexet" -#: builtin/pack-objects.c:2783 +#: builtin/pack-objects.c:2781 msgid "Counting objects" msgstr "Räknar objekt" #: builtin/pack-refs.c:6 -msgid "git pack-refs [options]" -msgstr "git pack-refs [flaggor]" +msgid "git pack-refs [<options>]" +msgstr "git pack-refs [<flaggor>]" #: builtin/pack-refs.c:14 msgid "pack everything" @@ -7947,8 +7984,8 @@ msgid "prune loose refs (default)" msgstr "ta bort lösa referenser (standard)" #: builtin/prune-packed.c:7 -msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" -msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" +msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" +msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" #: builtin/prune-packed.c:40 msgid "Removing duplicate objects" @@ -8224,75 +8261,79 @@ msgstr "--mirror kan inte kombineras med referensspecifikationer" msgid "--all and --mirror are incompatible" msgstr "--all och --mirror är inkompatibla" -#: builtin/push.c:493 +#: builtin/push.c:502 msgid "repository" msgstr "arkiv" -#: builtin/push.c:494 +#: builtin/push.c:503 msgid "push all refs" msgstr "sänd alla referenser" -#: builtin/push.c:495 +#: builtin/push.c:504 msgid "mirror all refs" msgstr "spegla alla referenser" -#: builtin/push.c:497 +#: builtin/push.c:506 msgid "delete refs" msgstr "ta bort referenser" -#: builtin/push.c:498 +#: builtin/push.c:507 msgid "push tags (can't be used with --all or --mirror)" msgstr "sänd taggar (kan inte användas med --all eller --mirror)" -#: builtin/push.c:501 +#: builtin/push.c:510 msgid "force updates" msgstr "tvinga uppdateringar" -#: builtin/push.c:503 +#: builtin/push.c:512 msgid "refname>:<expect" msgstr "refnamn>:<förvänta" -#: builtin/push.c:504 +#: builtin/push.c:513 msgid "require old value of ref to be at this value" msgstr "kräv att ref:s tidigare värde är detta" -#: builtin/push.c:507 +#: builtin/push.c:516 msgid "control recursive pushing of submodules" msgstr "styr rekursiv insändning av undermoduler" -#: builtin/push.c:509 +#: builtin/push.c:518 msgid "use thin pack" msgstr "använd tunna paket" -#: builtin/push.c:510 builtin/push.c:511 +#: builtin/push.c:519 builtin/push.c:520 msgid "receive pack program" msgstr "program för att ta emot paket" -#: builtin/push.c:512 +#: builtin/push.c:521 msgid "set upstream for git pull/status" msgstr "ställ in uppström för git pull/status" -#: builtin/push.c:515 +#: builtin/push.c:524 msgid "prune locally removed refs" msgstr "ta bort lokalt borttagna referenser" -#: builtin/push.c:517 +#: builtin/push.c:526 msgid "bypass pre-push hook" msgstr "förbigÃ¥ pre-push-krok" -#: builtin/push.c:518 +#: builtin/push.c:527 msgid "push missing but relevant tags" msgstr "sänd in saknade men relevanta taggar" -#: builtin/push.c:520 +#: builtin/push.c:529 msgid "GPG sign the push" msgstr "GPG-signera insändningen" -#: builtin/push.c:529 +#: builtin/push.c:530 +msgid "request atomic transaction on remote side" +msgstr "begär atomiska transaktioner pÃ¥ fjärrsidan" + +#: builtin/push.c:539 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete är inkompatibel med --all, --mirror och --tags" -#: builtin/push.c:531 +#: builtin/push.c:541 msgid "--delete doesn't make sense without any refs" msgstr "--delete kan inte användas utan referenser" @@ -8370,12 +8411,12 @@ msgstr "hoppa över att applicera filter för gles utcheckning" msgid "debug unpack-trees" msgstr "felsök unpack-trees" -#: builtin/reflog.c:499 +#: builtin/reflog.c:429 #, c-format msgid "%s' for '%s' is not a valid timestamp" msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel" -#: builtin/reflog.c:615 builtin/reflog.c:620 +#: builtin/reflog.c:546 builtin/reflog.c:551 #, c-format msgid "'%s' is not a valid timestamp" msgstr "\"%s\" är inte en giltig tidsstämpel" @@ -8386,10 +8427,10 @@ msgstr "git remote [-v | --verbose]" #: builtin/remote.c:13 msgid "" -"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" +"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" -"git remote add [-t <gren>] [-m <master>] [-f] [--tags|--no-tags] [--" +"git remote add [-t <gren>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <namn> <url>" #: builtin/remote.c:14 builtin/remote.c:33 @@ -8400,8 +8441,8 @@ msgstr "git remote rename <gammal> <ny>" msgid "git remote remove <name>" msgstr "git remote remove <namn>" -#: builtin/remote.c:16 -msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" +#: builtin/remote.c:16 builtin/remote.c:43 +msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)" #: builtin/remote.c:17 @@ -8438,10 +8479,6 @@ msgstr "git remote set-url --delete <namn> <url>" msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<flaggor>] <namn> <url>" -#: builtin/remote.c:43 -msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" -msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)" - #: builtin/remote.c:48 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <namn> <gren>..." @@ -8874,8 +8911,8 @@ msgid "be verbose; must be placed before a subcommand" msgstr "var pratsam; mÃ¥ste skrivas före ett underkommando" #: builtin/repack.c:17 -msgid "git repack [options]" -msgstr "git repack [flaggor]" +msgid "git repack [<options>]" +msgstr "git repack [<flaggor>]" #: builtin/repack.c:159 msgid "pack everything in a single pack" @@ -8941,7 +8978,7 @@ msgstr "maximal storlek pÃ¥ varje paketfil" msgid "repack objects in packs marked with .keep" msgstr "packa om objekt i paket märkta med .keep" -#: builtin/repack.c:371 +#: builtin/repack.c:375 #, c-format msgid "removing '%s' failed" msgstr "misslyckades ta bort \"%s\"" @@ -9033,8 +9070,8 @@ msgid "use this format" msgstr "använd detta format" #: builtin/rerere.c:12 -msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" -msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]" +msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" +msgstr "git rerere [clear | forget <path>... | status | remaining | diff | gc]" #: builtin/rerere.c:57 msgid "register clean resolutions in index" @@ -9173,8 +9210,8 @@ msgid "Could not write new index file." msgstr "Kunde inte skriva ny indexfil." #: builtin/rev-parse.c:361 -msgid "git rev-parse --parseopt [options] -- [<args>...]" -msgstr "git rev-parse --parseopt [options] -- [<argument>...]" +msgid "git rev-parse --parseopt [<options>] -- [<args>...]" +msgstr "git rev-parse --parseopt [<options>] -- [<argument>...]" #: builtin/rev-parse.c:366 msgid "keep the `--` passed as an arg" @@ -9190,30 +9227,30 @@ msgstr "utdata fast i lÃ¥ng form" #: builtin/rev-parse.c:499 msgid "" -"git rev-parse --parseopt [options] -- [<args>...]\n" +"git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" -" or: git rev-parse [options] [<arg>...]\n" +" or: git rev-parse [<options>] [<arg>...]\n" "\n" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "" -"git rev-parse --parseopt [flaggor] -- [<argument>...]\n" +"git rev-parse --parseopt [<flaggor>] -- [<argument>...]\n" " eller: git rev-parse --sq-quote [<argument>...]\n" -" eller: git rev-parse [flaggor] [<argument>...]\n" +" eller: git rev-parse [<flaggor>] [<argument>...]\n" "\n" "Kör \"git rev-parse --parseopt -h\" för mer information om den första " "varianten." #: builtin/revert.c:22 -msgid "git revert [options] <commit-ish>..." -msgstr "git revert [flaggor] <incheckning-igt>..." +msgid "git revert [<options>] <commit-ish>..." +msgstr "git revert [<flaggor>] <incheckning-igt>..." #: builtin/revert.c:23 msgid "git revert <subcommand>" msgstr "git revert <underkommando>" #: builtin/revert.c:28 -msgid "git cherry-pick [options] <commit-ish>..." -msgstr "git cherry-pick [flaggor] <incheckning-igt>..." +msgid "git cherry-pick [<options>] <commit-ish>..." +msgstr "git cherry-pick [<flaggor>] <incheckning-igt>..." #: builtin/revert.c:29 msgid "git cherry-pick <subcommand>" @@ -9293,8 +9330,8 @@ msgid "cherry-pick failed" msgstr "\"cherry-pick\" misslyckades" #: builtin/rm.c:17 -msgid "git rm [options] [--] <file>..." -msgstr "git rm [flaggor] [--] <fil>..." +msgid "git rm [<options>] [--] <file>..." +msgstr "git rm [<flaggor>] [--] <fil>..." #: builtin/rm.c:65 msgid "" @@ -9394,7 +9431,7 @@ msgid "git rm: unable to remove %s" msgstr "git rm: kan inte ta bort %s" #: builtin/shortlog.c:13 -msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]" +msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "git shortlog [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" #: builtin/shortlog.c:131 @@ -9424,19 +9461,19 @@ msgstr "Radbryt utdata" #: builtin/show-branch.c:9 msgid "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" msgstr "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<när>] | --no-color] [--sparse]\n" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <mönster>)...]" #: builtin/show-branch.c:13 -msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" -msgstr "git show-branch (-g|--reflog)[=<n>[,<bas>]] [--list] [<ref>]" +msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" +msgstr "git show-branch (-g | --reflog)[=<n>[,<bas>]] [--list] [<ref>]" #: builtin/show-branch.c:652 msgid "show remote-tracking and local branches" @@ -9504,11 +9541,11 @@ msgstr "visa <n> nyaste refloggposter med början pÃ¥ bas" #: builtin/show-ref.c:10 msgid "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" msgstr "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [mönster*] " +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<mönster>...]" #: builtin/show-ref.c:11 msgid "git show-ref --exclude-existing[=pattern] < ref-list" @@ -9547,12 +9584,12 @@ msgid "show refs from stdin that aren't in local repository" msgstr "visa referenser frÃ¥n standard in som inte finns i lokalt arkiv" #: builtin/symbolic-ref.c:7 -msgid "git symbolic-ref [options] name [ref]" -msgstr "git symbolic-ref [flaggor] namn [ref]" +msgid "git symbolic-ref [<options>] <name> [<ref>]" +msgstr "git symbolic-ref [<flaggor>] <namn> [<ref>]" #: builtin/symbolic-ref.c:8 -msgid "git symbolic-ref -d [-q] name" -msgstr "git symbolic-ref -d [-q] namn" +msgid "git symbolic-ref -d [-q] <name>" +msgstr "git symbolic-ref -d [-q] <namn>" #: builtin/symbolic-ref.c:40 msgid "suppress error message for non-symbolic (detached) refs" @@ -9577,9 +9614,11 @@ msgstr "skäl till uppdateringen" #: builtin/tag.c:22 msgid "" -"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " +"[<head>]" msgstr "" -"git tag [-a|-s|-u <nyckel-id>] [-f] [-m <medd>|-F <fil>] <taggnamn> [<huvud>]" +"git tag [-a | -s | -u <nyckel-id>] [-f] [-m <medd> | -F <fil>] <taggnamn> " +"[<huvud>]" #: builtin/tag.c:23 msgid "git tag -d <tagname>..." @@ -9587,10 +9626,10 @@ msgstr "git tag -d <taggnamn>..." #: builtin/tag.c:24 msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" "\t\t[<pattern>...]" msgstr "" -"git tag -l [-n[<antal>]] [--contains <incheckning>] [--points-at <objekt>] \n" +"git tag -l [-n[<antal>]] [--contains <incheckning>] [--points-at <objekt>]\n" "\t\t[<mönster>...]" #: builtin/tag.c:26 @@ -9734,18 +9773,18 @@ msgstr "använd annan nyckel för att signera taggen" msgid "replace the tag if exists" msgstr "ersätt taggen om den finns" -#: builtin/tag.c:608 +#: builtin/tag.c:609 +msgid "Tag listing options" +msgstr "Alternativ för listning av taggar" + +#: builtin/tag.c:610 msgid "show tag list in columns" msgstr "lista taggar i spalter" -#: builtin/tag.c:610 +#: builtin/tag.c:612 msgid "sort tags" msgstr "sortera taggar" -#: builtin/tag.c:614 -msgid "Tag listing options" -msgstr "Alternativ för listning av taggar" - #: builtin/tag.c:617 builtin/tag.c:623 msgid "print only tags that contain the commit" msgstr "visa endast taggar som innehÃ¥ller incheckningen" @@ -9802,132 +9841,132 @@ msgid "Unpacking objects" msgstr "Packar upp objekt" #: builtin/update-index.c:403 -msgid "git update-index [options] [--] [<file>...]" -msgstr "git update-index [flaggor] [--] [<fil>...]" +msgid "git update-index [<options>] [--] [<file>...]" +msgstr "git update-index [<flaggor>] [--] [<fil>...]" -#: builtin/update-index.c:756 +#: builtin/update-index.c:757 msgid "continue refresh even when index needs update" msgstr "fortsätt uppdatera även när index inte är à jour" -#: builtin/update-index.c:759 +#: builtin/update-index.c:760 msgid "refresh: ignore submodules" msgstr "refresh: ignorera undermoduler" -#: builtin/update-index.c:762 +#: builtin/update-index.c:763 msgid "do not ignore new files" msgstr "ignorera inte nya filer" -#: builtin/update-index.c:764 +#: builtin/update-index.c:765 msgid "let files replace directories and vice-versa" msgstr "lÃ¥t filer ersätta kataloger och omvänt" -#: builtin/update-index.c:766 +#: builtin/update-index.c:767 msgid "notice files missing from worktree" msgstr "lägg märke till filer som saknas i arbetskatalogen" -#: builtin/update-index.c:768 +#: builtin/update-index.c:769 msgid "refresh even if index contains unmerged entries" msgstr "uppdatera även om indexet innehÃ¥ller ej sammanslagna poster" -#: builtin/update-index.c:771 +#: builtin/update-index.c:772 msgid "refresh stat information" msgstr "uppdatera statusinformation" -#: builtin/update-index.c:775 +#: builtin/update-index.c:776 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "som --refresh, men ignorera assume-unchanged-inställning" -#: builtin/update-index.c:779 +#: builtin/update-index.c:780 msgid "<mode>,<object>,<path>" msgstr "<läge>,<objekt>,<sökväg>" -#: builtin/update-index.c:780 +#: builtin/update-index.c:781 msgid "add the specified entry to the index" msgstr "lägg till angiven post i indexet" -#: builtin/update-index.c:784 +#: builtin/update-index.c:785 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/update-index.c:785 +#: builtin/update-index.c:786 msgid "override the executable bit of the listed files" msgstr "överstyr exekveringsbiten för angivna filer" -#: builtin/update-index.c:789 +#: builtin/update-index.c:790 msgid "mark files as \"not changing\"" msgstr "markera filer som \"ändras inte\"" -#: builtin/update-index.c:792 +#: builtin/update-index.c:793 msgid "clear assumed-unchanged bit" msgstr "rensa \"assume-unchanged\"-biten" -#: builtin/update-index.c:795 +#: builtin/update-index.c:796 msgid "mark files as \"index-only\"" msgstr "markera filer som \"endast index\"" -#: builtin/update-index.c:798 +#: builtin/update-index.c:799 msgid "clear skip-worktree bit" msgstr "töm \"skip-worktree\"-biten" -#: builtin/update-index.c:801 +#: builtin/update-index.c:802 msgid "add to index only; do not add content to object database" msgstr "lägg endast till indexet; lägg inte till innehÃ¥llet i objektdatabasen" -#: builtin/update-index.c:803 +#: builtin/update-index.c:804 msgid "remove named paths even if present in worktree" msgstr "ta bort namngivna sökvägar även om de finns i arbetskatalogen" -#: builtin/update-index.c:805 +#: builtin/update-index.c:806 msgid "with --stdin: input lines are terminated by null bytes" msgstr "med --stdin: indatarader termineras med null-byte" -#: builtin/update-index.c:807 +#: builtin/update-index.c:808 msgid "read list of paths to be updated from standard input" msgstr "läs lista över sökvägar att uppdatera frÃ¥n standard in" -#: builtin/update-index.c:811 +#: builtin/update-index.c:812 msgid "add entries from standard input to the index" msgstr "lägg poster frÃ¥n standard in till indexet" -#: builtin/update-index.c:815 +#: builtin/update-index.c:816 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "Ã¥terfyll etapp 2 och 3 frÃ¥n angivna sökvägar" -#: builtin/update-index.c:819 +#: builtin/update-index.c:820 msgid "only update entries that differ from HEAD" msgstr "uppdatera endast poster som skiljer sig frÃ¥n HEAD" -#: builtin/update-index.c:823 +#: builtin/update-index.c:824 msgid "ignore files missing from worktree" msgstr "ignorera filer som saknas i arbetskatalogen" -#: builtin/update-index.c:826 +#: builtin/update-index.c:827 msgid "report actions to standard output" msgstr "rapportera Ã¥tgärder pÃ¥ standard ut" -#: builtin/update-index.c:828 +#: builtin/update-index.c:829 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(för porslin) glöm sparade olösta konflikter" -#: builtin/update-index.c:832 +#: builtin/update-index.c:833 msgid "write index in this format" msgstr "skriv index i detta format" -#: builtin/update-index.c:834 +#: builtin/update-index.c:835 msgid "enable or disable split index" msgstr "aktivera eller inaktivera delat index" #: builtin/update-ref.c:9 -msgid "git update-ref [options] -d <refname> [<oldval>]" -msgstr "git update-ref [flaggor] -d <refnamn> [<gammaltvärde>]" +msgid "git update-ref [<options>] -d <refname> [<old-val>]" +msgstr "git update-ref [<flaggor>] -d <refnamn> [<gammaltvärde>]" #: builtin/update-ref.c:10 -msgid "git update-ref [options] <refname> <newval> [<oldval>]" -msgstr "git update-ref [flaggor] <refnamn> <gammaltvärde> [<nyttvärde>]" +msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" +msgstr "git update-ref [<flaggor>] <refnamn> <gammaltvärde> [<nyttvärde>]" #: builtin/update-ref.c:11 -msgid "git update-ref [options] --stdin [-z]" -msgstr "git update-ref [flaggor] --stdin [-z]" +msgid "git update-ref [<options>] --stdin [-z]" +msgstr "git update-ref [<flaggor>] --stdin [-z]" #: builtin/update-ref.c:359 msgid "delete the reference" @@ -9954,16 +9993,16 @@ msgid "update the info files from scratch" msgstr "uppdatera informationsfilerna frÃ¥n grunden" #: builtin/verify-commit.c:17 -msgid "git verify-commit [-v|--verbose] <commit>..." -msgstr "git verify-commit [-v|--verbose] <incheckning>..." +msgid "git verify-commit [-v | --verbose] <commit>..." +msgstr "git verify-commit [-v | --verbose] <incheckning>..." #: builtin/verify-commit.c:75 msgid "print commit contents" msgstr "visa innehÃ¥ll för incheckning" #: builtin/verify-pack.c:54 -msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." -msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <paket>..." +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." +msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paket>..." #: builtin/verify-pack.c:64 msgid "verbose" @@ -9974,8 +10013,8 @@ msgid "show statistics only" msgstr "visa endast statistik" #: builtin/verify-tag.c:17 -msgid "git verify-tag [-v|--verbose] <tag>..." -msgstr "git verify-tag [-v|--verbose] <tagg>..." +msgid "git verify-tag [-v | --verbose] <tag>..." +msgstr "git verify-tag [-v | --verbose] <tagg>..." #: builtin/verify-tag.c:73 msgid "print tag contents" @@ -10325,10 +10364,10 @@ msgstr "Felaktigt HEAD - Jag behöver ett HEAD" #: git-bisect.sh:130 #, sh-format msgid "" -"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." +"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." msgstr "" "Misslyckades checka ut \"$start_head\". Försök \"git bisect reset " -"<giltiggren>\"" +"<giltig_gren>\"" # cogito-relaterat #: git-bisect.sh:140 @@ -11083,6 +11122,21 @@ msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\"" msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synkroniserar undermodul-url för \"$displaypath\"" +#~ msgid "server does not support --atomic push" +#~ msgstr "servern stöder inte push med --atomic" + +#~ msgid "(detached from %s)" +#~ msgstr "(frÃ¥nkopplad frÃ¥n %s)" + +#~ msgid "No existing author found with '%s'" +#~ msgstr "Hittade ingen befintlig författare med \"%s\"" + +#~ msgid "search also in ignored files" +#~ msgstr "sök även i ignorerade filer" + +#~ msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" +#~ msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)" + #~ msgid "no files added" #~ msgstr "inga filer har lagts till" @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git v2.3.0\n" +"Project-Id-Version: git v2.4.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2015-01-21 14:21+0800\n" -"PO-Revision-Date: 2015-01-21 14:58+0800\n" +"POT-Creation-Date: 2015-04-03 08:13+0800\n" +"PO-Revision-Date: 2015-04-03 08:51+0700\n" "Last-Translator: Trần Ngá»c Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" "Language: vi\n" @@ -37,8 +37,8 @@ msgstr "" "dà nh riêng cho việc đánh dấu cần giải quyết và tạo lần chuyển giao." #: archive.c:11 -msgid "git archive [options] <tree-ish> [<path>...]" -msgstr "git archive [các-tùy-chá»n] <tree-ish> [<Ä‘Æ°á»ng-dẫn>…]" +msgid "git archive [<options>] <tree-ish> [<path>...]" +msgstr "git archive [<các-tùy-chá»n>] <tree-ish> [<Ä‘Æ°á»ng-dẫn>…]" #: archive.c:12 msgid "git archive --list" @@ -46,10 +46,10 @@ msgstr "git archive --list" #: archive.c:13 msgid "" -"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" +"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" -"git archive --remote <kho> [--exec <lệnh>] [các-tùy-chá»n] <tree-ish> [<Ä‘Æ°á»ng-" -"dẫn>…]" +"git archive --remote <kho> [--exec <lệnh>] [<các-tùy-chá»n>] <tree-ish> " +"[<Ä‘Æ°á»ng-dẫn>…]" #: archive.c:14 msgid "git archive --remote <repo> [--exec <cmd>] --list" @@ -76,10 +76,10 @@ msgstr "tiá»n_tố" msgid "prepend prefix to each pathname in the archive" msgstr "nối thêm tiá»n tố và o từng Ä‘Æ°á»ng dẫn táºp tin trong kho lÆ°u" -#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2517 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986 +#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 +#: builtin/blame.c:2517 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:394 +#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 #: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151 msgid "file" msgstr "táºp_tin" @@ -128,7 +128,7 @@ msgstr "lệnh" msgid "path to the remote git-upload-archive command" msgstr "Ä‘Æ°á»ng dẫn đến lệnh git-upload-pack trên máy chủ" -#: attr.c:258 +#: attr.c:264 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -258,7 +258,7 @@ msgstr "“%s†không giống nhÆ° táºp tin v2 bundle (định dạng dump cá msgid "unrecognized header: %s%s (%d)" msgstr "phần đầu không được thừa nháºn: %s%s (%d)" -#: bundle.c:87 builtin/commit.c:770 +#: bundle.c:87 builtin/commit.c:766 #, c-format msgid "could not open '%s'" msgstr "không thể mở “%sâ€" @@ -267,8 +267,8 @@ msgstr "không thể mở “%sâ€" msgid "Repository lacks these prerequisite commits:" msgstr "Kho chứa thiếu những lần chuyển giao tiên quyết nà y:" -#: bundle.c:163 sequencer.c:645 sequencer.c:1100 builtin/blame.c:2706 -#: builtin/branch.c:652 builtin/commit.c:1049 builtin/log.c:330 +#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 +#: builtin/branch.c:659 builtin/commit.c:1045 builtin/log.c:330 #: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358 #: builtin/shortlog.c:158 msgid "revision walk setup failed" @@ -307,21 +307,21 @@ msgstr "rev-list đã chết" msgid "ref '%s' is excluded by the rev-list options" msgstr "th.chiếu “%s†bị loại trừ bởi các tùy chá»n rev-list" -#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "đối số không được thừa nháºn: %s" -#: bundle.c:444 +#: bundle.c:443 msgid "Refusing to create empty bundle." msgstr "Từ chối tạo má»™t bundle trống rá»—ng." -#: bundle.c:454 +#: bundle.c:453 #, c-format msgid "cannot create '%s'" msgstr "không thể tạo “%sâ€" -#: bundle.c:475 +#: bundle.c:474 msgid "index-pack died" msgstr "mục lục gói đã chết" @@ -344,55 +344,55 @@ msgstr "%s %s không phải là má»™t lần chuyển giao!" msgid "memory exhausted" msgstr "hết bá»™ nhá»›" -#: config.c:469 config.c:471 +#: config.c:474 config.c:476 #, c-format msgid "bad config file line %d in %s" msgstr "táºp tin cấu hình sai tại dòng %d trong %s" -#: config.c:587 +#: config.c:592 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "sai giá trị bằng số của cấu hình “%s†cho “%s†trong %s: %s" -#: config.c:589 +#: config.c:594 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "sai giá trị bằng số của cấu hình “%s†cho “%sâ€: %s" -#: config.c:674 +#: config.c:679 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "gặp lá»—i mở rá»™ng thÆ° mục ngÆ°á»i dùng trong: “%sâ€" -#: config.c:752 config.c:763 +#: config.c:757 config.c:768 #, c-format msgid "bad zlib compression level %d" msgstr "mức nén zlib %d là sai" -#: config.c:885 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "chế Ä‘á»™ không hợp lệ đối vá»›i việc tạo đối tượng: %s" -#: config.c:1211 +#: config.c:1216 msgid "unable to parse command-line config" msgstr "không thể phân tÃch cấu hình dòng lệnh" -#: config.c:1272 +#: config.c:1277 msgid "unknown error occured while reading the configuration files" msgstr "đã có lá»—i chÆ°a biết xảy ra trong khi Ä‘á»c các táºp tin cấu hình" -#: config.c:1596 +#: config.c:1601 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "không thể phân tÃch “%s†từ cấu hình dòng lệnh" -#: config.c:1598 +#: config.c:1603 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "sai biến cấu hình “%s†trong táºp tin “%s†tại dòng %d" -#: config.c:1657 +#: config.c:1662 #, c-format msgid "%s has multiple values" msgstr "%s có Ä‘a giá trị" @@ -475,7 +475,7 @@ msgstr[0] "%lu năm trÆ°á»›c" msgid "failed to read orderfile '%s'" msgstr "gặp lá»—i khi Ä‘á»c táºp-tin-thứ-tá»± “%sâ€" -#: diffcore-rename.c:516 +#: diffcore-rename.c:536 msgid "Performing inexact rename detection" msgstr "Äang thá»±c hiện dò tìm đổi tên không chÃnh xác" @@ -503,16 +503,16 @@ msgstr "" "Tìm thấy các lá»—i trong biến cấu hình “diff.dirstatâ€:\n" "%s" -#: diff.c:2957 +#: diff.c:2956 #, c-format msgid "external diff died, stopping at %s" msgstr "phần má»m diff ở bên ngoà i đã chết, dừng tại %s" -#: diff.c:3352 +#: diff.c:3351 msgid "--follow requires exactly one pathspec" msgstr "--follow cần chÃnh xác má»™t đặc tả Ä‘Æ°á»ng dẫn" -#: diff.c:3515 +#: diff.c:3514 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -521,7 +521,7 @@ msgstr "" "Gặp lá»—i khi phân tÃch đối số tùy chá»n --dirstat/-X:\n" "%s" -#: diff.c:3529 +#: diff.c:3528 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Gặp lá»—i khi phân tÃch đối số tùy chá»n --submodule: “%sâ€" @@ -871,26 +871,26 @@ msgstr "hòa trá»™n cây (tree) %s và %s gặp lá»—i" msgid "Unprocessed path??? %s" msgstr "ÄÆ°á»ng dẫn chÆ°a được xá» lý??? %s" -#: merge-recursive.c:1898 +#: merge-recursive.c:1901 msgid "Merging:" msgstr "Äang trá»™n:" -#: merge-recursive.c:1911 +#: merge-recursive.c:1914 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "tìm thấy %u tổ tiên chung:" -#: merge-recursive.c:1948 +#: merge-recursive.c:1951 msgid "merge returned no commit" msgstr "hòa trá»™n không trả vá» lần chuyển giao nà o" -#: merge-recursive.c:2005 +#: merge-recursive.c:2008 #, c-format msgid "Could not parse object '%s'" msgstr "Không thể phân tÃch đối tượng “%sâ€" -#: merge-recursive.c:2016 builtin/merge.c:667 +#: merge-recursive.c:2019 builtin/merge.c:667 msgid "Unable to write index." msgstr "Không thể ghi bảng mục lục" @@ -1020,7 +1020,7 @@ msgstr "không thể phân tÃch định dạng --pretty" msgid "done" msgstr "xong" -#: read-cache.c:1267 +#: read-cache.c:1275 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1029,7 +1029,7 @@ msgstr "" "index.version được đặt, nhÆ°ng giá trị của nó lại không hợp lệ.\n" "Dùng phiên bản %i" -#: read-cache.c:1277 +#: read-cache.c:1285 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1088,7 +1088,7 @@ msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" msgstr[0] "" -"Nhánh của bạn ở đằng sau “%s†%d lần chuyển giao, và có thể được fast-" +"Nhánh của bạn đứng đằng sau “%s†%d lần chuyển giao, và có thể được fast-" "forward.\n" #: remote.c:2008 @@ -1114,23 +1114,31 @@ msgstr "" " (dùng \"git pull\" để hòa trá»™n nhánh trên máy chủ và o trong nhánh của " "bạn)\n" -#: run-command.c:87 +#: revision.c:2348 +msgid "--first-parent is incompatible with --bisect" +msgstr "--first-parent xung khắc vá»›i --bisect" + +#: run-command.c:83 msgid "open /dev/null failed" msgstr "gặp lá»—i khi mở “/dev/nullâ€" -#: run-command.c:89 +#: run-command.c:85 #, c-format msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) gặp lá»—i" -#: send-pack.c:268 +#: send-pack.c:272 msgid "failed to sign the push certificate" msgstr "gặp lá»—i khi ký chứng thá»±c đẩy" -#: send-pack.c:325 +#: send-pack.c:356 msgid "the receiving end does not support --signed push" msgstr "kết thúc nháºn không há»— trợ đẩy --signed" +#: send-pack.c:366 +msgid "the receiving end does not support --atomic push" +msgstr "kết thúc nháºn không há»— trợ đẩy --atomic" + #: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995 #: builtin/merge.c:1005 #, c-format @@ -1161,7 +1169,7 @@ msgstr "" "vá»›i lệnh “git add <Ä‘Æ°á»ng_dẫn>†hoặc “git rm <Ä‘Æ°á»ng_dẫn>â€\n" "và chuyển giao kết quả bằng lệnh “git commitâ€" -#: sequencer.c:211 sequencer.c:856 sequencer.c:939 +#: sequencer.c:211 sequencer.c:861 sequencer.c:944 #, c-format msgid "Could not write to %s" msgstr "Không thể ghi và o %s" @@ -1197,31 +1205,31 @@ msgstr "Không thể phân giải commit (lần chuyển giao) HEAD\n" msgid "Unable to update cache tree\n" msgstr "Không thể cáºp nháºt cây bá»™ nhá»› đệm\n" -#: sequencer.c:406 +#: sequencer.c:411 #, c-format msgid "Could not parse commit %s\n" -msgstr "Không thể phân tÃch commit (lần chuyển giao) %s\n" +msgstr "Không thể phân tÃch lần chuyển giao %s\n" -#: sequencer.c:411 +#: sequencer.c:416 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Không thể phân tÃch lần chuyển giao cha mẹ “%sâ€\n" -#: sequencer.c:477 +#: sequencer.c:482 msgid "Your index file is unmerged." msgstr "Táºp tin lÆ°u mục lục của bạn không được hòa trá»™n." -#: sequencer.c:496 +#: sequencer.c:501 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "Lần chuyển giao %s là má»™t lần hòa trá»™n nhÆ°ng không Ä‘Æ°a ra tùy chá»n -m." -#: sequencer.c:504 +#: sequencer.c:509 #, c-format msgid "Commit %s does not have parent %d" msgstr "Lần chuyển giao %s không có cha mẹ %d" -#: sequencer.c:508 +#: sequencer.c:513 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" @@ -1230,153 +1238,153 @@ msgstr "" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:521 +#: sequencer.c:526 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: không thể phân tÃch lần chuyển giao mẹ của %s" -#: sequencer.c:525 +#: sequencer.c:530 #, c-format msgid "Cannot get commit message for %s" msgstr "Không thể lấy ghi chú lần chuyển giao cho %s" -#: sequencer.c:611 +#: sequencer.c:616 #, c-format msgid "could not revert %s... %s" msgstr "không thể revert %s… %s" -#: sequencer.c:612 +#: sequencer.c:617 #, c-format msgid "could not apply %s... %s" -msgstr "không thể apply (áp dụng miếng vá) %s… %s" +msgstr "không thể áp dụng miếng vá %s… %s" -#: sequencer.c:648 +#: sequencer.c:653 msgid "empty commit set passed" msgstr "lần chuyển giao trống rá»—ng đặt là hợp quy cách" -#: sequencer.c:656 +#: sequencer.c:661 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: gặp lá»—i Ä‘á»c bảng mục lục" -#: sequencer.c:660 +#: sequencer.c:665 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: gặp lá»—i khi là m tÆ°Æ¡i má»›i bảng mục lục" -#: sequencer.c:720 +#: sequencer.c:725 #, c-format msgid "Cannot %s during a %s" msgstr "Không thể %s trong khi %s" -#: sequencer.c:742 +#: sequencer.c:747 #, c-format msgid "Could not parse line %d." msgstr "Không phân tÃch được dòng %d." -#: sequencer.c:747 +#: sequencer.c:752 msgid "No commits parsed." msgstr "Không có lần chuyển giao nà o được phân tÃch." -#: sequencer.c:760 +#: sequencer.c:765 #, c-format msgid "Could not open %s" msgstr "Không thể mở %s" -#: sequencer.c:764 +#: sequencer.c:769 #, c-format msgid "Could not read %s." msgstr "Không thể Ä‘á»c %s." -#: sequencer.c:771 +#: sequencer.c:776 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Bảng chỉ thị không thể dùng được: %s" -#: sequencer.c:801 +#: sequencer.c:806 #, c-format msgid "Invalid key: %s" msgstr "Khóa không đúng: %s" -#: sequencer.c:804 +#: sequencer.c:809 #, c-format msgid "Invalid value for %s: %s" msgstr "Giá trị không hợp lệ %s: %s" -#: sequencer.c:816 +#: sequencer.c:821 #, c-format msgid "Malformed options sheet: %s" msgstr "Bảng tùy chá»n dị hình: %s" -#: sequencer.c:837 +#: sequencer.c:842 msgid "a cherry-pick or revert is already in progress" msgstr "có má»™t thao tác “cherry-pick†hoặc “revert†đang được thá»±c hiện" -#: sequencer.c:838 +#: sequencer.c:843 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "hãy thá» \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:842 +#: sequencer.c:847 #, c-format msgid "Could not create sequencer directory %s" msgstr "Không thể tạo thÆ° mục xếp dãy %s" -#: sequencer.c:858 sequencer.c:943 +#: sequencer.c:863 sequencer.c:948 #, c-format msgid "Error wrapping up %s." msgstr "Lá»—i bao bá»c %s." -#: sequencer.c:877 sequencer.c:1013 +#: sequencer.c:882 sequencer.c:1018 msgid "no cherry-pick or revert in progress" msgstr "không cherry-pick hay revert trong tiến trình" -#: sequencer.c:879 +#: sequencer.c:884 msgid "cannot resolve HEAD" msgstr "không thể phân giải HEAD" -#: sequencer.c:881 +#: sequencer.c:886 msgid "cannot abort from a branch yet to be born" msgstr "không thể hủy bá» từ má»™t nhánh mà nó còn chÆ°a được tạo ra" -#: sequencer.c:903 builtin/apply.c:4128 +#: sequencer.c:908 builtin/apply.c:4288 #, c-format msgid "cannot open %s: %s" msgstr "không thể mở %s: %s" -#: sequencer.c:906 +#: sequencer.c:911 #, c-format msgid "cannot read %s: %s" msgstr "không thể Ä‘á»c %s: %s" -#: sequencer.c:907 +#: sequencer.c:912 msgid "unexpected end of file" msgstr "gặp kết thúc táºp tin Ä‘á»™t xuất" -#: sequencer.c:913 +#: sequencer.c:918 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "táºp tin HEAD “pre-cherry-pick†đã lÆ°u “%s†bị há»ng" -#: sequencer.c:936 +#: sequencer.c:941 #, c-format msgid "Could not format %s." msgstr "Không thể định dạng “%sâ€." -#: sequencer.c:1081 +#: sequencer.c:1086 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: không thể cherry-pick má»™t %s" -#: sequencer.c:1084 +#: sequencer.c:1089 #, c-format msgid "%s: bad revision" msgstr "%s: Ä‘iểm xét duyệt sai" -#: sequencer.c:1118 +#: sequencer.c:1123 msgid "Can't revert as initial commit" msgstr "Không thể revert má»™t lần chuyển giao khởi tạo" -#: sequencer.c:1119 +#: sequencer.c:1124 msgid "Can't cherry-pick into empty head" msgstr "Không thể cherry-pick và o má»™t đầu (head) trống rá»—ng" @@ -1449,38 +1457,38 @@ msgstr "Không thể gỡ bá» mục .gitmodules dà nh cho %s" msgid "staging updated .gitmodules failed" msgstr "gặp lá»—i khi tổ chức .gitmodules đã cáºp nháºt" -#: submodule.c:1111 builtin/init-db.c:371 +#: submodule.c:1109 builtin/init-db.c:371 #, c-format msgid "Could not create git link %s" msgstr "Không thể tạo liên kết git “%sâ€" -#: submodule.c:1122 +#: submodule.c:1120 #, c-format msgid "Could not set core.worktree in %s" msgstr "Không thể đặt “core.worktree†trong “%sâ€." -#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566 -#: trailer.c:570 +#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557 +#: trailer.c:561 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "không hiểu giá trị “%s†cho khóa “%sâ€" -#: trailer.c:552 trailer.c:557 builtin/remote.c:290 +#: trailer.c:543 trailer.c:548 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "nhiá»u hÆ¡n má»™t %s" -#: trailer.c:590 +#: trailer.c:581 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "thẻ thừa trống rá»—ng trong phần thừa “%.*sâ€" -#: trailer.c:710 +#: trailer.c:701 #, c-format msgid "could not read input file '%s'" msgstr "không Ä‘á»c được táºp tin đầu và o “%sâ€" -#: trailer.c:713 +#: trailer.c:704 msgid "could not read from stdin" msgstr "không thể Ä‘á»c từ đầu và o tiêu chuẩn" @@ -1517,26 +1525,26 @@ msgstr "tên cổng không hợp lệ" msgid "invalid '..' path segment" msgstr "Ä‘oạn Ä‘Æ°á»ng dẫn “..†không hợp lệ" -#: wrapper.c:509 +#: wrapper.c:523 #, c-format msgid "unable to access '%s': %s" msgstr "không thể truy cáºp “%sâ€: %s" -#: wrapper.c:530 +#: wrapper.c:544 #, c-format msgid "unable to access '%s'" msgstr "không thể truy cáºp “%sâ€" -#: wrapper.c:541 +#: wrapper.c:555 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "không tìm thấy ngÆ°á»i dùng hiện tại trong táºp tin passwd: %s" -#: wrapper.c:542 +#: wrapper.c:556 msgid "no such user" msgstr "không có ngÆ°á»i dùng nhÆ° váºy" -#: wrapper.c:550 +#: wrapper.c:564 msgid "unable to get current working directory" msgstr "Không thể lấy thÆ° mục là m việc hiện hà nh" @@ -1567,11 +1575,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (dùng \"git rm <táºp-tin>…\" để đánh dấu là cần giải quyết)" -#: wt-status.c:198 +#: wt-status.c:198 wt-status.c:878 msgid "Changes to be committed:" msgstr "Những thay đổi sẽ được chuyển giao:" -#: wt-status.c:216 +#: wt-status.c:216 wt-status.c:887 msgid "Changes not staged for commit:" msgstr "Các thay đổi chÆ°a được đặt lên bệ phóng để chuyển giao:" @@ -1685,15 +1693,15 @@ msgstr "ná»™i dung chÆ°a được theo dõi, " msgid "bug: unhandled diff status %c" msgstr "lá»—i: không thể tiếp nháºn trạng thái lệnh diff %c" -#: wt-status.c:758 +#: wt-status.c:753 msgid "Submodules changed but not updated:" msgstr "Những mô-Ä‘un-con đã bị thay đổi nhÆ°ng chÆ°a được cáºp nháºt:" -#: wt-status.c:760 +#: wt-status.c:755 msgid "Submodule changes to be committed:" msgstr "Những mô-Ä‘un-con thay đổi đã được chuyển giao:" -#: wt-status.c:839 +#: wt-status.c:835 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1701,72 +1709,72 @@ msgstr "" "Không Ä‘á»™ng đến Ä‘Æ°á»ng ở trên.\n" "Má»i thứ phÃa dÆ°á»›i sẽ được xóa bá»." -#: wt-status.c:930 +#: wt-status.c:946 msgid "You have unmerged paths." msgstr "Bạn có những Ä‘Æ°á»ng dẫn chÆ°a được hòa trá»™n." -#: wt-status.c:933 +#: wt-status.c:949 msgid " (fix conflicts and run \"git commit\")" msgstr " (sá»a các xung Ä‘á»™t rồi chạy \"git commit\")" -#: wt-status.c:936 +#: wt-status.c:952 msgid "All conflicts fixed but you are still merging." msgstr "Tất cả các xung Ä‘á»™t đã được giải quyết nhÆ°ng bạn vẫn Ä‘ang hòa trá»™n." -#: wt-status.c:939 +#: wt-status.c:955 msgid " (use \"git commit\" to conclude merge)" msgstr " (dùng \"git commit\" để hoà n tất việc hòa trá»™n)" -#: wt-status.c:949 +#: wt-status.c:965 msgid "You are in the middle of an am session." msgstr "Bạn Ä‘ang ở giữa của má»™t phiên “amâ€." -#: wt-status.c:952 +#: wt-status.c:968 msgid "The current patch is empty." msgstr "Miếng vá hiện tại bị trống rá»—ng." -#: wt-status.c:956 +#: wt-status.c:972 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (sá»a các xung Ä‘á»™t và sau đó chạy lệnh \"git am --continue\")" -#: wt-status.c:958 +#: wt-status.c:974 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (dùng \"git am --skip\" để bá» qua miếng vá nà y)" -#: wt-status.c:960 +#: wt-status.c:976 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (dùng \"git am --abort\" để phục hồi lại nhánh nguyên thủy)" -#: wt-status.c:1020 wt-status.c:1037 +#: wt-status.c:1036 wt-status.c:1053 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Bạn hiện nay Ä‘ang thá»±c hiện việc “rebase†nhánh “%s†trên “%sâ€." -#: wt-status.c:1025 wt-status.c:1042 +#: wt-status.c:1041 wt-status.c:1058 msgid "You are currently rebasing." msgstr "Bạn hiện nay Ä‘ang thá»±c hiện việc “rebase†(“cải tổâ€)." -#: wt-status.c:1028 +#: wt-status.c:1044 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" " (sá»a các xung Ä‘á»™t và sau đó chạy lệnh “cải tổ†\"git rebase --continue\")" -#: wt-status.c:1030 +#: wt-status.c:1046 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (dùng lệnh “cải tổ†\"git rebase --skip\" để bá» qua lần vá nà y)" -#: wt-status.c:1032 +#: wt-status.c:1048 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" " (dùng lệnh “cải tổ†\"git rebase --abort\" để check-out nhánh nguyên thủy)" -#: wt-status.c:1045 +#: wt-status.c:1061 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" " (khi tất cả các xung Ä‘á»™t đã sá»a xong: chạy lệnh “cải tổ†\"git rebase --" "continue\")" -#: wt-status.c:1049 +#: wt-status.c:1065 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -1774,126 +1782,126 @@ msgstr "" "Bạn hiện nay Ä‘ang thá»±c hiện việc chia tách má»™t lần chuyển giao trong khi " "Ä‘ang “rebase†nhánh “%s†trên “%sâ€." -#: wt-status.c:1054 +#: wt-status.c:1070 msgid "You are currently splitting a commit during a rebase." msgstr "" "Bạn hiện tại Ä‘ang cắt đôi má»™t lần chuyển giao trong khi Ä‘ang thá»±c hiện việc " "rebase." -#: wt-status.c:1057 +#: wt-status.c:1073 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Má»™t khi thÆ° mục là m việc của bạn đã gá»n gà ng, chạy lệnh “cải tổ†\"git " "rebase --continue\")" -#: wt-status.c:1061 +#: wt-status.c:1077 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Bạn hiện nay Ä‘ang thá»±c hiện việc sá»a chữa má»™t lần chuyển giao trong khi Ä‘ang " "rebase nhánh “%s†trên “%sâ€." -#: wt-status.c:1066 +#: wt-status.c:1082 msgid "You are currently editing a commit during a rebase." msgstr "Bạn hiện Ä‘ang sá»a má»™t lần chuyển giao trong khi bạn thá»±c hiện rebase." -#: wt-status.c:1069 +#: wt-status.c:1085 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (dùng \"git commit --amend\" để “tu bổ†lần chuyển giao hiện tại)" -#: wt-status.c:1071 +#: wt-status.c:1087 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (chạy lệnh “cải tổ†\"git rebase --continue\" má»™t khi bạn cảm thấy hà i " "lòng vá» những thay đổi của mình)" -#: wt-status.c:1081 +#: wt-status.c:1097 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Bạn hiện nay Ä‘ang thá»±c hiện việc cherry-pick lần chuyển giao %s." -#: wt-status.c:1086 +#: wt-status.c:1102 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" " (sá»a các xung Ä‘á»™t và sau đó chạy lệnh \"git cherry-pick --continue\")" -#: wt-status.c:1089 +#: wt-status.c:1105 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (khi tất cả các xung Ä‘á»™t đã sá»a xong: chạy lệnh \"git cherry-pick --" "continue\")" -#: wt-status.c:1091 +#: wt-status.c:1107 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (dùng \"git cherry-pick --abort\" để hủy bá» thao tác cherry-pick)" -#: wt-status.c:1100 +#: wt-status.c:1116 #, c-format msgid "You are currently reverting commit %s." msgstr "Bạn hiện nay Ä‘ang thá»±c hiện thao tác revert lần chuyển giao “%sâ€." -#: wt-status.c:1105 +#: wt-status.c:1121 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (sá»a các xung Ä‘á»™t và sau đó chạy lệnh \"git revert --continue\")" -#: wt-status.c:1108 +#: wt-status.c:1124 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" " (khi tất cả các xung Ä‘á»™t đã sá»a xong: chạy lệnh \"git revert --continue\")" -#: wt-status.c:1110 +#: wt-status.c:1126 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (dùng \"git revert --abort\" để hủy bá» thao tác revert)" -#: wt-status.c:1121 +#: wt-status.c:1137 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" "Bạn hiện nay Ä‘ang thá»±c hiện thao tác di chuyển ná»a bÆ°á»›c (bisect), bắt đầu từ " "nhánh “%sâ€." -#: wt-status.c:1125 +#: wt-status.c:1141 msgid "You are currently bisecting." msgstr "Bạn hiện tại Ä‘ang thá»±c hiện việc bisect (di chuyển ná»a bÆ°á»›c)." -#: wt-status.c:1128 +#: wt-status.c:1144 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (dùng \"git bisect reset\" để quay trở lại nhánh nguyên thủy)" -#: wt-status.c:1303 +#: wt-status.c:1321 msgid "On branch " msgstr "Trên nhánh " -#: wt-status.c:1310 +#: wt-status.c:1328 msgid "rebase in progress; onto " msgstr "rebase Ä‘ang được thá»±c hiện: lên trên " -#: wt-status.c:1317 +#: wt-status.c:1333 msgid "HEAD detached at " msgstr "HEAD được tách rá»i tại " -#: wt-status.c:1319 +#: wt-status.c:1335 msgid "HEAD detached from " msgstr "HEAD được tách rá»i từ " -#: wt-status.c:1322 +#: wt-status.c:1338 msgid "Not currently on any branch." msgstr "Hiện tại chẳng ở nhánh nà o cả." -#: wt-status.c:1339 +#: wt-status.c:1355 msgid "Initial commit" msgstr "Lần chuyển giao khởi tạo" -#: wt-status.c:1353 +#: wt-status.c:1369 msgid "Untracked files" msgstr "Những táºp tin chÆ°a được theo dõi" -#: wt-status.c:1355 +#: wt-status.c:1371 msgid "Ignored files" msgstr "Những táºp tin bị lá» Ä‘i" -#: wt-status.c:1359 +#: wt-status.c:1375 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1905,32 +1913,32 @@ msgstr "" "có lẽ là m nó nhanh hÆ¡n, nhÆ°ng bạn phải cẩn tháºn đừng quên mình phải\n" "tá»± thêm các táºp tin má»›i (xem “git help statusâ€.." -#: wt-status.c:1365 +#: wt-status.c:1381 #, c-format msgid "Untracked files not listed%s" msgstr "Những táºp tin chÆ°a được theo dõi không được liệt kê ra %s" -#: wt-status.c:1367 +#: wt-status.c:1383 msgid " (use -u option to show untracked files)" msgstr " (dùng tùy chá»n -u để hiển thị các táºp tin chÆ°a được theo dõi)" -#: wt-status.c:1373 +#: wt-status.c:1389 msgid "No changes" msgstr "Không có thay đổi nà o" -#: wt-status.c:1378 +#: wt-status.c:1394 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "không có thay đổi nà o được thêm và o để chuyển giao (dùng \"git add\" và /hoặc " "\"git commit -a\")\n" -#: wt-status.c:1381 +#: wt-status.c:1397 #, c-format msgid "no changes added to commit\n" msgstr "không có thay đổi nà o được thêm và o để chuyển giao\n" -#: wt-status.c:1384 +#: wt-status.c:1400 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -1939,49 +1947,49 @@ msgstr "" "không có gì được thêm và o lần chuyển giao nhÆ°ng có những táºp tin chÆ°a được " "theo dõi hiện diện (dùng \"git add\" để Ä‘Æ°a và o theo dõi)\n" -#: wt-status.c:1387 +#: wt-status.c:1403 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "không có gì được thêm và o lần chuyển giao nhÆ°ng có những táºp tin chÆ°a được " "theo dõi hiện diện\n" -#: wt-status.c:1390 +#: wt-status.c:1406 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "không có gì để chuyển giao (tạo/sao-chép các táºp tin và dùng \"git add\" để " "Ä‘Æ°a và o theo dõi)\n" -#: wt-status.c:1393 wt-status.c:1398 +#: wt-status.c:1409 wt-status.c:1414 #, c-format msgid "nothing to commit\n" msgstr "không có gì để chuyển giao\n" -#: wt-status.c:1396 +#: wt-status.c:1412 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "không có gì để chuyển giao (dùng -u xem các táºp tin chÆ°a được theo dõi)\n" -#: wt-status.c:1400 +#: wt-status.c:1416 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "không có gì để chuyển giao, thÆ° mục là m việc sạch sẽ\n" -#: wt-status.c:1509 +#: wt-status.c:1525 msgid "HEAD (no branch)" msgstr "HEAD (không nhánh)" -#: wt-status.c:1515 +#: wt-status.c:1531 msgid "Initial commit on " msgstr "Lần chuyển giao khởi tạo trên " -#: wt-status.c:1547 +#: wt-status.c:1563 msgid "gone" msgstr "đã ra Ä‘i" -#: wt-status.c:1549 wt-status.c:1557 +#: wt-status.c:1565 wt-status.c:1573 msgid "behind " msgstr "đằng sau " @@ -1991,15 +1999,15 @@ msgid "failed to unlink '%s'" msgstr "gặp lá»—i khi bá» liên kết (unlink) “%sâ€" #: builtin/add.c:22 -msgid "git add [options] [--] <pathspec>..." -msgstr "git add [các-tùy-chá»n] [--] <pathspec>…" +msgid "git add [<options>] [--] <pathspec>..." +msgstr "git add [<các-tùy-chá»n>] [--] <pathspec>…" #: builtin/add.c:65 #, c-format msgid "unexpected diff status %c" msgstr "trạng thái lệnh diff không nhÆ° mong đợi %c" -#: builtin/add.c:70 builtin/commit.c:275 +#: builtin/add.c:70 builtin/commit.c:277 msgid "updating files failed" msgstr "Cáºp nháºt táºp tin gặp lá»—i" @@ -2046,14 +2054,14 @@ msgstr "" "Các Ä‘Æ°á»ng dẫn theo sau đây sẽ bị lá» Ä‘i bởi má»™t trong các táºp tin .gitignore " "của bạn:\n" -#: builtin/add.c: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:1372 +#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372 #: builtin/rm.c:269 msgid "dry run" msgstr "chạy thá»" -#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19 -#: builtin/commit.c:1326 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19 +#: builtin/commit.c:1322 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 "chi tiết" @@ -2133,78 +2141,78 @@ msgstr "Không có gì được chỉ ra, không có gì được thêm và o.\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Có lẽ ý bạn là “git add .†phải không?\n" -#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919 -#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 +#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920 +#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 msgid "index file corrupt" msgstr "táºp tin ghi bảng mục lục bị há»ng" -#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431 +#: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431 msgid "Unable to write new index file" msgstr "Không thể ghi táºp tin lÆ°u bảng mục lục má»›i" -#: builtin/apply.c:58 -msgid "git apply [options] [<patch>...]" -msgstr "git apply [các-tùy-chá»n] [<miếng-vá>…]" +#: builtin/apply.c:59 +msgid "git apply [<options>] [<patch>...]" +msgstr "git apply [<các-tùy-chá»n>] [<miếng-vá>…]" -#: builtin/apply.c:111 +#: builtin/apply.c:112 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "không nháºn ra tùy chá»n vá» khoảng trắng “%sâ€" -#: builtin/apply.c:126 +#: builtin/apply.c:127 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "không nháºn ra tùy chá»n bá» qua khoảng trắng “%sâ€" -#: builtin/apply.c:826 +#: builtin/apply.c:822 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" "Không thể chuẩn bị biểu thức chÃnh qui dấu vết thá»i gian (timestamp regexp) " "%s" -#: builtin/apply.c:835 +#: builtin/apply.c:831 #, c-format msgid "regexec returned %d for input: %s" msgstr "thi hà nh biểu thức chÃnh quy trả vá» %d cho đầu và o: %s" -#: builtin/apply.c:916 +#: builtin/apply.c:912 #, c-format msgid "unable to find filename in patch at line %d" msgstr "không thể tìm thấy tên táºp tin trong miếng vá tại dòng %d" -#: builtin/apply.c:948 +#: builtin/apply.c:944 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply: git-diff sai - cần /dev/null, nhÆ°ng lại nháºn được %s trên dòng %d" -#: builtin/apply.c:952 +#: builtin/apply.c:948 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply: git-diff sai - tên táºp tin má»›i không nhất quán trên dòng %d" -#: builtin/apply.c:953 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply: git-diff sai - tên táºp tin cÅ© không nhất quán trên dòng %d" -#: builtin/apply.c:960 +#: builtin/apply.c:956 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: git-diff sai - cần “/dev/null†trên dòng %d" -#: builtin/apply.c:1423 +#: builtin/apply.c:1419 #, c-format msgid "recount: unexpected line: %.*s" msgstr "chi tiết: dòng không cần: %.*s" -#: builtin/apply.c:1480 +#: builtin/apply.c:1476 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "miếng vá phân mảnh mà không có phần đầu tại dòng %d: %.*s" -#: builtin/apply.c:1497 +#: builtin/apply.c:1493 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2216,76 +2224,76 @@ msgstr[0] "" "phần đầu diff cho git thiếu thông tin tên táºp tin khi gỡ bá» Ä‘i %d trong " "thà nh phần dẫn đầu tên của Ä‘Æ°á»ng dẫn (dòng %d)" -#: builtin/apply.c:1657 +#: builtin/apply.c:1656 msgid "new file depends on old contents" msgstr "táºp tin má»›i phụ thuá»™c và o ná»™i dung cÅ©" -#: builtin/apply.c:1659 +#: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "táºp tin đã xóa vẫn còn ná»™i dung" -#: builtin/apply.c:1685 +#: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" msgstr "miếng vá há»ng tại dòng %d" -#: builtin/apply.c:1721 +#: builtin/apply.c:1720 #, c-format msgid "new file %s depends on old contents" msgstr "táºp tin má»›i %s phụ thuá»™c và o ná»™i dung cÅ©" -#: builtin/apply.c:1723 +#: builtin/apply.c:1722 #, c-format msgid "deleted file %s still has contents" msgstr "táºp tin đã xóa %s vẫn còn ná»™i dung" -#: builtin/apply.c:1726 +#: builtin/apply.c:1725 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** cảnh báo: táºp tin %s trở nên trống rá»—ng nhÆ°ng không bị xóa" -#: builtin/apply.c:1872 +#: builtin/apply.c:1871 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "miếng vá định dạng nhị phân sai há»ng tại dòng %d: %.*s" -#: builtin/apply.c:1901 +#: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" msgstr "miếng vá định dạng nhị phân không được nháºn ra tại dòng %d" -#: builtin/apply.c:2052 +#: builtin/apply.c:2051 #, c-format msgid "patch with only garbage at line %d" msgstr "vá chỉ vá»›i “rác†tại dòng %d" -#: builtin/apply.c:2142 +#: builtin/apply.c:2141 #, c-format msgid "unable to read symlink %s" msgstr "không thể Ä‘á»c liên kết má»m %s" -#: builtin/apply.c:2146 +#: builtin/apply.c:2145 #, c-format msgid "unable to open or read %s" msgstr "không thể mở hay Ä‘á»c %s" -#: builtin/apply.c:2754 +#: builtin/apply.c:2778 #, c-format msgid "invalid start of line: '%c'" msgstr "sai khởi đầu dòng: “%câ€" -#: builtin/apply.c:2872 +#: builtin/apply.c:2897 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "Khối dữ liệu #%d thà nh công tại %d (offset %d dòng)." -#: builtin/apply.c:2884 +#: builtin/apply.c:2909 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Ná»™i dung bị giảm xuống còn (%ld/%ld) để áp dụng mảnh dữ liệu tại %d" -#: builtin/apply.c:2890 +#: builtin/apply.c:2915 #, c-format msgid "" "while searching for:\n" @@ -2294,322 +2302,341 @@ msgstr "" "trong khi Ä‘ang tìm kiếm cho:\n" "%.*s" -#: builtin/apply.c:2909 +#: builtin/apply.c:2935 #, c-format msgid "missing binary patch data for '%s'" msgstr "thiếu dữ liệu của miếng vá định dạng nhị phân cho “%sâ€" -#: builtin/apply.c:3010 +#: builtin/apply.c:3036 #, c-format msgid "binary patch does not apply to '%s'" msgstr "miếng vá định dạng nhị phân không được áp dụng cho “%sâ€" -#: builtin/apply.c:3016 +#: builtin/apply.c:3042 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "vá nhị phân cho “%s†tạo ra kết quả không chÃnh xác (mong chá» %s, lại nháºn " "%s)" -#: builtin/apply.c:3037 +#: builtin/apply.c:3063 #, c-format msgid "patch failed: %s:%ld" msgstr "gặp lá»—i khi vá: %s:%ld" -#: builtin/apply.c:3161 +#: builtin/apply.c:3187 #, c-format msgid "cannot checkout %s" msgstr "không thể lấy ra %s" -#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260 +#: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288 #, c-format msgid "read of %s failed" msgstr "Ä‘á»c %s gặp lá»—i" -#: builtin/apply.c:3240 builtin/apply.c:3462 +#: builtin/apply.c:3240 +#, c-format +msgid "reading from '%s' beyond a symbolic link" +msgstr "Ä‘á»c từ “%s†vượt ra ngoà i liên kết má»m" + +#: builtin/apply.c:3268 builtin/apply.c:3490 #, c-format msgid "path %s has been renamed/deleted" msgstr "Ä‘Æ°á»ng dẫn %s đã bị xóa hoặc đổi tên" -#: builtin/apply.c:3321 builtin/apply.c:3476 +#: builtin/apply.c:3349 builtin/apply.c:3504 #, c-format msgid "%s: does not exist in index" msgstr "%s: không tồn tại trong bảng mục lục" -#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490 +#: builtin/apply.c:3353 builtin/apply.c:3496 builtin/apply.c:3518 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3330 builtin/apply.c:3484 +#: builtin/apply.c:3358 builtin/apply.c:3512 #, c-format msgid "%s: does not match index" msgstr "%s: không khá»›p trong mục lục" -#: builtin/apply.c:3432 +#: builtin/apply.c:3460 msgid "removal patch leaves file contents" msgstr "loại bá» miếng vá để lại ná»™i dung táºp tin" -#: builtin/apply.c:3501 +#: builtin/apply.c:3529 #, c-format msgid "%s: wrong type" msgstr "%s: sai kiểu" -#: builtin/apply.c:3503 +#: builtin/apply.c:3531 #, c-format msgid "%s has type %o, expected %o" msgstr "%s có kiểu %o, cần %o" -#: builtin/apply.c:3604 +#: builtin/apply.c:3690 builtin/apply.c:3692 +#, c-format +msgid "invalid path '%s'" +msgstr "Ä‘Æ°á»ng dẫn không hợp lệ “%sâ€" + +#: builtin/apply.c:3747 #, c-format msgid "%s: already exists in index" msgstr "%s: đã có từ trÆ°á»›c trong bảng mục lục" -#: builtin/apply.c:3607 +#: builtin/apply.c:3750 #, c-format msgid "%s: already exists in working directory" msgstr "%s: đã sẵn có trong thÆ° mục Ä‘ang là m việc" -#: builtin/apply.c:3627 +#: builtin/apply.c:3770 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "chế Ä‘á»™ má»›i (%o) của %s không khá»›p vá»›i chế Ä‘á»™ cÅ© (%o)" -#: builtin/apply.c:3632 +#: builtin/apply.c:3775 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "chế Ä‘á»™ má»›i (%o) của %s không khá»›p vá»›i chế Ä‘á»™ cÅ© (%o) của %s" -#: builtin/apply.c:3640 +#: builtin/apply.c:3795 +#, c-format +msgid "affected file '%s' is beyond a symbolic link" +msgstr "táºp tin chịu tác Ä‘á»™ng “%s†vượt ra ngoà i liên kết má»m" + +#: builtin/apply.c:3799 #, c-format msgid "%s: patch does not apply" msgstr "%s: miếng vá không được áp dụng" -#: builtin/apply.c:3653 +#: builtin/apply.c:3813 #, c-format msgid "Checking patch %s..." msgstr "Äang kiểm tra miếng vá %s…" -#: builtin/apply.c:3746 builtin/checkout.c:231 builtin/reset.c:135 +#: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry gặp lá»—i đối vá»›i Ä‘Æ°á»ng dẫn “%sâ€" -#: builtin/apply.c:3889 +#: builtin/apply.c:4049 #, c-format msgid "unable to remove %s from index" msgstr "không thể gỡ bá» %s từ mục lục" -#: builtin/apply.c:3918 +#: builtin/apply.c:4078 #, c-format msgid "corrupt patch for submodule %s" msgstr "miếng vá sai há»ng cho mô-Ä‘un-con %s" -#: builtin/apply.c:3922 +#: builtin/apply.c:4082 #, c-format msgid "unable to stat newly created file '%s'" msgstr "không thể lấy thống ká» vá» táºp tin %s má»›i hÆ¡n đã được tạo" -#: builtin/apply.c:3927 +#: builtin/apply.c:4087 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "không thể tạo “kho lÆ°u đằng sau†cho táºp tin được tạo má»›i hÆ¡n %s" -#: builtin/apply.c:3930 builtin/apply.c:4038 +#: builtin/apply.c:4090 builtin/apply.c:4198 #, c-format msgid "unable to add cache entry for %s" msgstr "không thể thêm mục nhá»› đệm cho %s" -#: builtin/apply.c:3963 +#: builtin/apply.c:4123 #, c-format msgid "closing file '%s'" msgstr "Ä‘ang đóng táºp tin “%sâ€" -#: builtin/apply.c:4012 +#: builtin/apply.c:4172 #, c-format msgid "unable to write file '%s' mode %o" msgstr "không thể ghi và o táºp tin “%s†chế Ä‘á»™ %o" -#: builtin/apply.c:4099 +#: builtin/apply.c:4259 #, c-format msgid "Applied patch %s cleanly." msgstr "Äã áp dụng miếng vá %s má»™t cách sạch sẽ." -#: builtin/apply.c:4107 +#: builtin/apply.c:4267 msgid "internal error" msgstr "lá»—i ná»™i bá»™" -#: builtin/apply.c:4110 +#: builtin/apply.c:4270 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Äang áp dụng miếng vá %%s vá»›i %d lần từ chối…" -#: builtin/apply.c:4120 +#: builtin/apply.c:4280 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "Ä‘ang cắt ngắn tên táºp tin .rej thà nh %.*s.rej" -#: builtin/apply.c:4141 +#: builtin/apply.c:4301 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Khối nhá»› #%d được áp dụng gá»n gà ng." -#: builtin/apply.c:4144 +#: builtin/apply.c:4304 #, c-format msgid "Rejected hunk #%d." msgstr "Ä‘oạn dữ liệu #%d bị từ chối." -#: builtin/apply.c:4234 +#: builtin/apply.c:4394 msgid "unrecognized input" msgstr "không thừa nháºn đầu và o" -#: builtin/apply.c:4245 +#: builtin/apply.c:4405 msgid "unable to read index file" msgstr "không thể Ä‘á»c táºp tin lÆ°u bảng mục lục" -#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:92 -#: builtin/fetch.c:93 +#: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92 +#: builtin/fetch.c:92 msgid "path" msgstr "Ä‘Æ°á»ng-dẫn" -#: builtin/apply.c:4363 +#: builtin/apply.c:4523 msgid "don't apply changes matching the given path" msgstr "không áp dụng các thay đổi khá»›p vá»›i Ä‘Æ°á»ng dẫn đã cho" -#: builtin/apply.c:4366 +#: builtin/apply.c:4526 msgid "apply changes matching the given path" msgstr "áp dụng các thay đổi khá»›p vá»›i Ä‘Æ°á»ng dẫn đã cho" -#: builtin/apply.c:4368 +#: builtin/apply.c:4528 msgid "num" msgstr "số" -#: builtin/apply.c:4369 +#: builtin/apply.c:4529 msgid "remove <num> leading slashes from traditional diff paths" msgstr "gỡ bá» <số> dấu gạch chéo dẫn đầu từ Ä‘Æ°á»ng dẫn diff cổ Ä‘iển" -#: builtin/apply.c:4372 +#: builtin/apply.c:4532 msgid "ignore additions made by the patch" msgstr "lá» Ä‘i phần bổ xung được tạo ra bởi miếng vá" -#: builtin/apply.c:4374 +#: builtin/apply.c:4534 msgid "instead of applying the patch, output diffstat for the input" msgstr "" "thay vì áp dụng má»™t miếng vá, kết xuất kết quả từ lệnh diffstat cho đầu ra" -#: builtin/apply.c:4378 +#: builtin/apply.c:4538 msgid "show number of added and deleted lines in decimal notation" msgstr "" "hiển thị số lượng các dòng được thêm và o và xóa Ä‘i theo ký hiệu tháºp phân" -#: builtin/apply.c:4380 +#: builtin/apply.c:4540 msgid "instead of applying the patch, output a summary for the input" msgstr "thay vì áp dụng má»™t miếng vá, kết xuất kết quả cho đầu và o" -#: builtin/apply.c:4382 +#: builtin/apply.c:4542 msgid "instead of applying the patch, see if the patch is applicable" msgstr "thay vì áp dụng miếng vá, hãy xem xem miếng vá có thÃch hợp không" -#: builtin/apply.c:4384 +#: builtin/apply.c:4544 msgid "make sure the patch is applicable to the current index" msgstr "hãy chắc chắn là miếng vá thÃch hợp vá»›i bảng mục lục hiện hà nh" -#: builtin/apply.c:4386 +#: builtin/apply.c:4546 msgid "apply a patch without touching the working tree" msgstr "áp dụng má»™t miếng vá mà không Ä‘á»™ng chạm đến cây là m việc" -#: builtin/apply.c:4388 +#: builtin/apply.c:4548 +msgid "accept a patch that touches outside the working area" +msgstr "chấp nháºn má»™t miếng vá mà không Ä‘á»™ng chạm đến cây là m việc" + +#: builtin/apply.c:4550 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" "đồng thá»i áp dụng miếng vá (dùng vá»›i tùy chá»n --stat/--summary/--check)" -#: builtin/apply.c:4390 +#: builtin/apply.c:4552 msgid "attempt three-way merge if a patch does not apply" msgstr "thá» hòa trá»™n kiểu three-way nếu việc vá không thể thá»±c hiện được" -#: builtin/apply.c:4392 +#: builtin/apply.c:4554 msgid "build a temporary index based on embedded index information" msgstr "" "xây dá»±ng bảng mục lục tạm thá»i trên cÆ¡ sở thông tin bảng mục lục được nhúng" -#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455 +#: builtin/apply.c:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412 msgid "paths are separated with NUL character" msgstr "các Ä‘Æ°á»ng dẫn bị ngăn cách bởi ký tá»± NULL" -#: builtin/apply.c:4397 +#: builtin/apply.c:4559 msgid "ensure at least <n> lines of context match" msgstr "đảm bảo rằng có Ãt nhất <n> dòng ná»™i dung khá»›p" -#: builtin/apply.c:4398 +#: builtin/apply.c:4560 msgid "action" msgstr "hà nh Ä‘á»™ng" -#: builtin/apply.c:4399 +#: builtin/apply.c:4561 msgid "detect new or modified lines that have whitespace errors" msgstr "tìm thấy má»™t dòng má»›i hoặc bị sá»a đổi mà nó có lá»—i do khoảng trắng" -#: builtin/apply.c:4402 builtin/apply.c:4405 +#: builtin/apply.c:4564 builtin/apply.c:4567 msgid "ignore changes in whitespace when finding context" msgstr "lá» Ä‘i sá»± thay đổi do khoảng trắng gây ra khi quét ná»™i dung" -#: builtin/apply.c:4408 +#: builtin/apply.c:4570 msgid "apply the patch in reverse" msgstr "áp dụng miếng vá theo chiá»u ngược" -#: builtin/apply.c:4410 +#: builtin/apply.c:4572 msgid "don't expect at least one line of context" msgstr "đừng hy vá»ng có Ãt nhất má»™t dòng ná»™i dung" -#: builtin/apply.c:4412 +#: builtin/apply.c:4574 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "để lại khối dữ liệu bị từ chối trong các táºp tin *.rej tÆ°Æ¡ng ứng" -#: builtin/apply.c:4414 +#: builtin/apply.c:4576 msgid "allow overlapping hunks" msgstr "cho phép chồng khối nhá»›" -#: builtin/apply.c:4417 +#: builtin/apply.c:4579 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "đã dò tìm thấy dung sai không chÃnh xác thiếu dòng má»›i tại cuối táºp tin" -#: builtin/apply.c:4420 +#: builtin/apply.c:4582 msgid "do not trust the line counts in the hunk headers" msgstr "không tin số lượng dòng trong phần đầu khối dữ liệu" -#: builtin/apply.c:4422 +#: builtin/apply.c:4584 msgid "root" msgstr "root" -#: builtin/apply.c:4423 +#: builtin/apply.c:4585 msgid "prepend <root> to all filenames" msgstr "treo thêm <root> và o tất cả các tên táºp tin" -#: builtin/apply.c:4445 +#: builtin/apply.c:4607 msgid "--3way outside a repository" msgstr "--3way ở ngoà i má»™t kho chứa" -#: builtin/apply.c:4453 +#: builtin/apply.c:4615 msgid "--index outside a repository" msgstr "--index ở ngoà i má»™t kho chứa" -#: builtin/apply.c:4456 +#: builtin/apply.c:4618 msgid "--cached outside a repository" msgstr "--cached ở ngoà i má»™t kho chứa" -#: builtin/apply.c:4472 +#: builtin/apply.c:4637 #, c-format msgid "can't open patch '%s'" msgstr "không thể mở miếng vá “%sâ€" -#: builtin/apply.c:4486 +#: builtin/apply.c:4651 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "đã chấm dứt %d lá»—i khoảng trắng" -#: builtin/apply.c:4492 builtin/apply.c:4502 +#: builtin/apply.c:4657 builtin/apply.c:4667 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2664,104 +2691,104 @@ msgstr "" "cáºp nháºt BISECT_HEAD thay vì lấy ra (checking out) lần chuyển giao hiện hà nh" #: builtin/blame.c:30 -msgid "git blame [options] [rev-opts] [rev] [--] file" -msgstr "git blame [các-tùy-chá»n] [rev-opts] [rev] [--] táºp-tin" +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file" +msgstr "git blame [<các-tùy-chá»n>] [rev-opts] [rev] [--] táºp-tin" #: builtin/blame.c:35 -msgid "[rev-opts] are documented in git-rev-list(1)" -msgstr "[rev-opts] được mô tả trong git-rev-list(1)" +msgid "<rev-opts> are documented in git-rev-list(1)" +msgstr "<rev-opts> được mô tả trong tà i liệu git-rev-list(1)" -#: builtin/blame.c:2501 +#: builtin/blame.c:2500 msgid "Show blame entries as we find them, incrementally" msgstr "Hiển thị các mục “blame†nhÆ° là chúng ta thấy chúng, tăng dần" -#: builtin/blame.c:2502 +#: builtin/blame.c:2501 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" "Hiển thị SHA-1 trắng cho những lần chuyển giao biên giá»›i (Mặc định: off)" -#: builtin/blame.c:2503 +#: builtin/blame.c:2502 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Không coi các lần chuyển giao gốc là giá»›i hạn (Mặc định: off)" -#: builtin/blame.c:2504 +#: builtin/blame.c:2503 msgid "Show work cost statistics" msgstr "Hiển thị thống kê công sức là m việc" -#: builtin/blame.c:2505 +#: builtin/blame.c:2504 msgid "Show output score for blame entries" msgstr "Hiển thị kết xuất Ä‘iểm số có các mục tin “blameâ€" -#: builtin/blame.c:2506 +#: builtin/blame.c:2505 msgid "Show original filename (Default: auto)" msgstr "Hiển thị tên táºp tin gốc (Mặc định: auto)" -#: builtin/blame.c:2507 +#: builtin/blame.c:2506 msgid "Show original linenumber (Default: off)" msgstr "Hiển thị số dòng gốc (Mặc định: off)" -#: builtin/blame.c:2508 +#: builtin/blame.c:2507 msgid "Show in a format designed for machine consumption" msgstr "Hiển thị ở định dạng đã thiết kế cho sá»± tiêu dùng bằng máy" -#: builtin/blame.c:2509 +#: builtin/blame.c:2508 msgid "Show porcelain format with per-line commit information" msgstr "Hiển thị định dạng “porcelain†vá»›i thông tin chuyển giao má»—i dòng" -#: builtin/blame.c:2510 +#: builtin/blame.c:2509 msgid "Use the same output mode as git-annotate (Default: off)" -msgstr "Dùng cùng chế Ä‘á»™ xuất ra vóigit-annotate (Mặc định: off)" +msgstr "Dùng cùng chế Ä‘á»™ xuất ra vá»›i git-annotate (Mặc định: off)" -#: builtin/blame.c:2511 +#: builtin/blame.c:2510 msgid "Show raw timestamp (Default: off)" msgstr "Hiển thị dấu vết thá»i gian dạng thô (Mặc định: off)" -#: builtin/blame.c:2512 +#: builtin/blame.c:2511 msgid "Show long commit SHA1 (Default: off)" msgstr "Hiển thị SHA1 của lần chuyển giao dạng dà i (Mặc định: off)" -#: builtin/blame.c:2513 +#: builtin/blame.c:2512 msgid "Suppress author name and timestamp (Default: off)" msgstr "Không hiển thị tên tác giả và dấu vết thá»i gian (Mặc định: off)" -#: builtin/blame.c:2514 +#: builtin/blame.c:2513 msgid "Show author email instead of name (Default: off)" msgstr "Hiển thị thÆ° Ä‘iện tá» của tác giả thay vì tên (Mặc định: off)" -#: builtin/blame.c:2515 +#: builtin/blame.c:2514 msgid "Ignore whitespace differences" msgstr "Bá» qua các khác biệt do khoảng trắng gây ra" -#: builtin/blame.c:2516 +#: builtin/blame.c:2515 msgid "Spend extra cycles to find better match" msgstr "Tiêu thụ thêm năng tà i nguyên máy móc để tìm kiếm tốt hÆ¡n nữa" -#: builtin/blame.c:2517 +#: builtin/blame.c:2516 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" "Sá» dụng Ä‘iểm xét duyệt (revision) từ <táºp tin> thay vì gá»i “git-rev-listâ€" -#: builtin/blame.c:2518 +#: builtin/blame.c:2517 msgid "Use <file>'s contents as the final image" msgstr "Sá» dụng ná»™i dung của <táºp tin> nhÆ° là ảnh cuối cùng" -#: builtin/blame.c:2519 builtin/blame.c:2520 +#: builtin/blame.c:2518 builtin/blame.c:2519 msgid "score" msgstr "Ä‘iểm số" -#: builtin/blame.c:2519 +#: builtin/blame.c:2518 msgid "Find line copies within and across files" msgstr "Tìm các bản sao chép dòng trong và ngang qua táºp tin" -#: builtin/blame.c:2520 +#: builtin/blame.c:2519 msgid "Find line movements within and across files" msgstr "Tìm các di chuyển dòng trong và ngang qua táºp tin" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "Process only line range n,m, counting from 1" msgstr "Xá» lý chỉ dòng vùng n,m, tÃnh từ 1" @@ -2771,25 +2798,25 @@ msgstr "Xá» lý chỉ dòng vùng n,m, tÃnh từ 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:2602 +#: builtin/blame.c:2601 msgid "4 years, 11 months ago" msgstr "4 năm, 11 tháng trÆ°á»›c" #: builtin/branch.c:24 -msgid "git branch [options] [-r | -a] [--merged | --no-merged]" -msgstr "git branch [các-tùy-chá»n] [-r | -a] [--merged | --no-merged]" +msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" +msgstr "git branch [<các-tùy-chá»n>] [-r | -a] [--merged | --no-merged]" #: builtin/branch.c:25 -msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" -msgstr "git branch [các-tùy-chá»n] [-l] [-f] <tên-nhánh> [<Ä‘iểm-đầu>]" +msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" +msgstr "git branch [<các-tùy-chá»n>] [-l] [-f] <tên-nhánh> [<Ä‘iểm-đầu>]" #: builtin/branch.c:26 -msgid "git branch [options] [-r] (-d | -D) <branchname>..." -msgstr "git branch [các-tùy-chá»n] [-r] (-d | -D) <tên-nhánh> …" +msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." +msgstr "git branch [<các-tùy-chá»n>] [-r] (-d | -D) <tên-nhánh> …" #: builtin/branch.c:27 -msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" -msgstr "git branch [các-tùy-chá»n] (-m | -M) [<nhánh-cÅ©>] <nhánh-má»›i>" +msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" +msgstr "git branch [<các-tùy-chá»n>] (-m | -M) [<nhánh-cÅ©>] <nhánh-má»›i>" #: builtin/branch.c:152 #, c-format @@ -2888,7 +2915,7 @@ msgstr "[%s]" #: builtin/branch.c:469 #, c-format msgid "[%s: behind %d]" -msgstr "[%s: đằng sau %d]" +msgstr "[%s: đứng sau %d]" #: builtin/branch.c:471 #, c-format @@ -2929,195 +2956,200 @@ msgstr "(không nhánh, Ä‘ang cải tổ %s)" msgid "(no branch, bisect started on %s)" msgstr "(không nhánh, di chuyển ná»a bÆ°á»›c được bắt đầu tại %s)" -#: builtin/branch.c:593 +#: builtin/branch.c:596 #, c-format -msgid "(detached from %s)" -msgstr "(được tách rá»i từ %s)" +msgid "(HEAD detached at %s)" +msgstr "(HEAD được tách rá»i tại %s)" -#: builtin/branch.c:596 +#: builtin/branch.c:599 +#, c-format +msgid "(HEAD detached from %s)" +msgstr "(HEAD được tách rá»i từ %s)" + +#: builtin/branch.c:603 msgid "(no branch)" msgstr "(không nhánh)" -#: builtin/branch.c:643 +#: builtin/branch.c:650 #, c-format msgid "object '%s' does not point to a commit" msgstr "đối tượng “%s†không chỉ đến má»™t lần chuyển giao nà o cả" -#: builtin/branch.c:691 +#: builtin/branch.c:698 msgid "some refs could not be read" msgstr "má»™t số tham chiếu đã không thể Ä‘á»c được" -#: builtin/branch.c:704 +#: builtin/branch.c:711 msgid "cannot rename the current branch while not on any." msgstr "không thể đổi tên nhánh hiện hà nh trong khi nó chẳng ở đâu cả." -#: builtin/branch.c:714 +#: builtin/branch.c:721 #, c-format msgid "Invalid branch name: '%s'" msgstr "Tên nhánh không hợp lệ: “%sâ€" -#: builtin/branch.c:729 +#: builtin/branch.c:736 msgid "Branch rename failed" msgstr "Gặp lá»—i khi đổi tên nhánh" -#: builtin/branch.c:733 +#: builtin/branch.c:740 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Äã đổi tên nhánh khuyết danh “%s†đi" -#: builtin/branch.c:737 +#: builtin/branch.c:744 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Nhánh bị đổi tên thà nh %s, nhÆ°ng HEAD lại không được cáºp nháºt!" -#: builtin/branch.c:744 +#: builtin/branch.c:751 msgid "Branch is renamed, but update of config-file failed" msgstr "Nhánh bị đổi tên, nhÆ°ng cáºp nháºt táºp tin cấu hình gặp lá»—i" -#: builtin/branch.c:759 +#: builtin/branch.c:766 #, c-format msgid "malformed object name %s" msgstr "tên đối tượng dị hình %s" -#: builtin/branch.c:783 +#: builtin/branch.c:790 #, c-format msgid "could not write branch description template: %s" msgstr "không thể ghi và o mẫu mô tả nhánh: %s" -#: builtin/branch.c:813 +#: builtin/branch.c:820 msgid "Generic options" msgstr "Tùy chá»n chung" -#: builtin/branch.c:815 +#: builtin/branch.c:822 msgid "show hash and subject, give twice for upstream branch" msgstr "hiển thị mã băm và chủ Ä‘á», Ä‘Æ°a ra hai lần cho nhánh thượng nguồn" -#: builtin/branch.c:816 +#: builtin/branch.c:823 msgid "suppress informational messages" msgstr "không xuất các thông tin" -#: builtin/branch.c:817 +#: builtin/branch.c:824 msgid "set up tracking mode (see git-pull(1))" msgstr "cà i đặt chế Ä‘á»™ theo dõi (xem git-pull(1))" -#: builtin/branch.c:819 +#: builtin/branch.c:826 msgid "change upstream info" msgstr "thay đổi thông tin thượng nguồn" -#: builtin/branch.c:823 +#: builtin/branch.c:830 msgid "use colored output" msgstr "tô mà u kết xuất" -#: builtin/branch.c:824 +#: builtin/branch.c:831 msgid "act on remote-tracking branches" msgstr "thao tác trên nhánh “remote-trackingâ€" -#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854 -#: builtin/branch.c:860 builtin/commit.c:1586 builtin/commit.c:1587 -#: builtin/commit.c:1588 builtin/commit.c:1589 builtin/tag.c:616 +#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861 +#: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583 +#: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616 #: builtin/tag.c:622 msgid "commit" msgstr "lần_chuyển_giao" -#: builtin/branch.c:828 builtin/branch.c:834 +#: builtin/branch.c:835 builtin/branch.c:841 msgid "print only branches that contain the commit" msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao" -#: builtin/branch.c:840 +#: builtin/branch.c:847 msgid "Specific git-branch actions:" msgstr "Hà nh Ä‘á»™ng git-branch:" -#: builtin/branch.c:841 +#: builtin/branch.c:848 msgid "list both remote-tracking and local branches" msgstr "liệt kê cả nhánh “remote-tracking†và ná»™i bá»™" -#: builtin/branch.c:843 +#: builtin/branch.c:850 msgid "delete fully merged branch" msgstr "xóa má»™t toà n bá»™ nhánh đã hòa trá»™n" -#: builtin/branch.c:844 +#: builtin/branch.c:851 msgid "delete branch (even if not merged)" msgstr "xóa nhánh (cho dù là chÆ°a được hòa trá»™n)" -#: builtin/branch.c:845 +#: builtin/branch.c:852 msgid "move/rename a branch and its reflog" msgstr "di chuyển hay đổi tên má»™t nhánh và reflog của nó" -#: builtin/branch.c:846 +#: builtin/branch.c:853 msgid "move/rename a branch, even if target exists" msgstr "di chuyển hoặc đổi tên má»™t nhánh ngay cả khi Ä‘Ãch đã có sẵn" -#: builtin/branch.c:847 +#: builtin/branch.c:854 msgid "list branch names" msgstr "liệt kê các tên nhánh" -#: builtin/branch.c:848 +#: builtin/branch.c:855 msgid "create the branch's reflog" msgstr "tạo reflog của nhánh" -#: builtin/branch.c:850 +#: builtin/branch.c:857 msgid "edit the description for the branch" msgstr "sá»a mô tả cho nhánh" -#: builtin/branch.c:851 +#: builtin/branch.c:858 msgid "force creation, move/rename, deletion" msgstr "buá»™c tạo, di chuyển/đổi tên, xóa" -#: builtin/branch.c:854 +#: builtin/branch.c:861 msgid "print only not merged branches" msgstr "chỉ hiển thị các nhánh chÆ°a được hòa trá»™n" -#: builtin/branch.c:860 +#: builtin/branch.c:867 msgid "print only merged branches" msgstr "chỉ hiển thị các nhánh đã hòa trá»™n" -#: builtin/branch.c:864 +#: builtin/branch.c:871 msgid "list branches in columns" msgstr "liệt kê các nhánh trong các cá»™t" -#: builtin/branch.c:877 +#: builtin/branch.c:884 msgid "Failed to resolve HEAD as a valid ref." msgstr "Gặp lá»—i khi phân giải HEAD nhÆ° là má»™t tham chiếu hợp lệ." -#: builtin/branch.c:881 builtin/clone.c:637 +#: builtin/branch.c:888 builtin/clone.c:637 msgid "HEAD not found below refs/heads!" msgstr "không tìm thấy HEAD ở dÆ°á»›i refs/heads!" -#: builtin/branch.c:903 +#: builtin/branch.c:910 msgid "--column and --verbose are incompatible" msgstr "tùy chá»n --column và --verbose xung khắc nhau" -#: builtin/branch.c:914 builtin/branch.c:953 +#: builtin/branch.c:921 builtin/branch.c:960 msgid "branch name required" msgstr "cần chỉ ra tên nhánh" -#: builtin/branch.c:929 +#: builtin/branch.c:936 msgid "Cannot give description to detached HEAD" msgstr "Không thể Ä‘Æ°a ra mô tả HEAD đã tách rá»i" -#: builtin/branch.c:934 +#: builtin/branch.c:941 msgid "cannot edit description of more than one branch" msgstr "không thể sá»a mô tả cho nhiá»u hÆ¡n má»™t nhánh" -#: builtin/branch.c:941 +#: builtin/branch.c:948 #, c-format msgid "No commit on branch '%s' yet." msgstr "Vẫn chÆ°a chuyển giao trên nhánh “%sâ€." -#: builtin/branch.c:944 +#: builtin/branch.c:951 #, c-format msgid "No branch named '%s'." msgstr "Không có nhánh nà o có tên “%sâ€." -#: builtin/branch.c:959 +#: builtin/branch.c:966 msgid "too many branches for a rename operation" msgstr "quá nhiá»u nhánh dà nh cho thao tác đổi tên" -#: builtin/branch.c:964 +#: builtin/branch.c:971 msgid "too many branches to set new upstream" msgstr "quá nhiá»u nhánh được đặt cho thượng nguồn má»›i" -#: builtin/branch.c:968 +#: builtin/branch.c:975 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -3125,40 +3157,40 @@ msgstr "" "không thể đặt thượng nguồn của HEAD thà nh %s khi mà nó chẳng chỉ đến nhánh " "nà o cả." -#: builtin/branch.c:971 builtin/branch.c:993 builtin/branch.c:1014 +#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021 #, c-format msgid "no such branch '%s'" msgstr "không có nhánh nà o nhÆ° thế “%sâ€" -#: builtin/branch.c:975 +#: builtin/branch.c:982 #, c-format msgid "branch '%s' does not exist" msgstr "chÆ°a có nhánh “%sâ€" -#: builtin/branch.c:987 +#: builtin/branch.c:994 msgid "too many branches to unset upstream" msgstr "quá nhiá»u nhánh để bỠđặt thượng nguồn" -#: builtin/branch.c:991 +#: builtin/branch.c:998 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "không thể bỠđặt thượng nguồn của HEAD không chỉ đến má»™t nhánh nà o cả." -#: builtin/branch.c:997 +#: builtin/branch.c:1004 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Nhánh “%s†không có thông tin thượng nguồn" -#: builtin/branch.c:1011 +#: builtin/branch.c:1018 msgid "it does not make sense to create 'HEAD' manually" msgstr "không hợp lý khi tạo “HEAD†thủ công" -#: builtin/branch.c:1017 +#: builtin/branch.c:1024 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "hai tùy chá»n -a và -r áp dụng cho lệnh “git branch†không hợp lý đối vá»›i tên " "nhánh" -#: builtin/branch.c:1020 +#: builtin/branch.c:1027 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3167,7 +3199,7 @@ msgstr "" "Cá» --set-upstream đã lạc háºu và sẽ bị xóa bá». Nên dùng --track hoặc --set-" "upstream-to\n" -#: builtin/branch.c:1037 +#: builtin/branch.c:1044 #, c-format msgid "" "\n" @@ -3178,12 +3210,12 @@ msgstr "" "Nếu bạn muốn “%s†theo dõi “%sâ€, thá»±c hiện lệnh sau:\n" "\n" -#: builtin/branch.c:1038 +#: builtin/branch.c:1045 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1039 +#: builtin/branch.c:1046 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -3201,55 +3233,55 @@ msgstr "Cần má»™t kho chứa để có thể tạo má»™t bundle." msgid "Need a repository to unbundle." msgstr "Cần má»™t kho chứa để có thể giải nén má»™t bundle." -#: builtin/cat-file.c:328 -msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" -msgstr "git cat-file (-t|-s|-e|-p|<kiểu>|--textconv) <đối_tượng>" +#: builtin/cat-file.c:326 +msgid "git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>" +msgstr "git cat-file (-t | -s | -e | -p | <kiểu> | --textconv) <đối_tượng>" -#: builtin/cat-file.c:329 -msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" -msgstr "git cat-file (--batch|--batch-check) < <danh-sách-đối-tượng>" +#: builtin/cat-file.c:327 +msgid "git cat-file (--batch | --batch-check) < <list-of-objects>" +msgstr "git cat-file (--batch | --batch-check) < <danh-sách-đối-tượng>" -#: builtin/cat-file.c:366 +#: builtin/cat-file.c:364 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<kiểu> là má»™t trong số: blob, tree, commit hoặc tag" -#: builtin/cat-file.c:367 +#: builtin/cat-file.c:365 msgid "show object type" msgstr "hiển thị kiểu đối tượng" -#: builtin/cat-file.c:368 +#: builtin/cat-file.c:366 msgid "show object size" msgstr "hiển thị kÃch thÆ°á»›c đối tượng" -#: builtin/cat-file.c:370 +#: builtin/cat-file.c:368 msgid "exit with zero when there's no error" msgstr "thoát vá»›i 0 khi không có lá»—i" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:369 msgid "pretty-print object's content" msgstr "in ná»™i dung đối tượng dạng dá»… Ä‘á»c" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:371 msgid "for blob objects, run textconv on object's content" msgstr "vá»›i đối tượng blob, chạy lệnh textconv trên ná»™i dung của đối tượng" -#: builtin/cat-file.c:375 +#: builtin/cat-file.c:373 msgid "show info and content of objects fed from the standard input" msgstr "" "hiển thị thông tin và ná»™i dung của các đối tượng lấy từ đầu và o tiêu chuẩn" -#: builtin/cat-file.c:378 +#: builtin/cat-file.c:376 msgid "show info about objects fed from the standard input" msgstr "hiển thị các thông tin vỠđối tượng fed từ đầu và o tiêu chuẩn" #: builtin/check-attr.c:11 -msgid "git check-attr [-a | --all | attr...] [--] pathname..." -msgstr "git check-attr [-a | --all | attr…] [--] tên-Ä‘Æ°á»ng-dẫn…" +msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." +msgstr "git check-attr [-a | --all | <attr>…] [--] tên-Ä‘Æ°á»ng-dẫn…" #: builtin/check-attr.c:12 -msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" +msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>" msgstr "" -"git check-attr --stdin [-z] [-a | --all | attr…] < <danh-sách-Ä‘Æ°á»ng-dẫn>" +"git check-attr --stdin [-z] [-a | --all | <attr>…] < <danh-sách-Ä‘Æ°á»ng-dẫn>" #: builtin/check-attr.c:19 msgid "report all attributes set on file" @@ -3304,8 +3336,8 @@ msgid "--non-matching is only valid with --verbose" msgstr "tùy-chá»n --non-matching chỉ hợp lệ khi dùng vá»›i --verbose" #: builtin/check-mailmap.c:8 -msgid "git check-mailmap [options] <contact>..." -msgstr "git check-mailmap [các-tùy-chá»n] <danh-bạ>…" +msgid "git check-mailmap [<options>] <contact>..." +msgstr "git check-mailmap [<các-tùy-chá»n>] <danh-bạ>…" #: builtin/check-mailmap.c:13 msgid "also read contacts from stdin" @@ -3321,8 +3353,8 @@ msgid "no contacts specified" msgstr "chÆ°a chỉ ra danh bạ" #: builtin/checkout-index.c:126 -msgid "git checkout-index [options] [--] [<file>...]" -msgstr "git checkout-index [các-tùy-chá»n] [--] [<táºp-tin>…]" +msgid "git checkout-index [<options>] [--] [<file>...]" +msgstr "git checkout-index [<các-tùy-chá»n>] [--] [<táºp-tin>…]" #: builtin/checkout-index.c:188 msgid "check out all files in the index" @@ -3366,12 +3398,12 @@ msgid "copy out the files from named stage" msgstr "sao chép ra các táºp tin từ bệ phóng có tên" #: builtin/checkout.c:25 -msgid "git checkout [options] <branch>" -msgstr "git checkout [các-tùy-chá»n] <nhánh>" +msgid "git checkout [<options>] <branch>" +msgstr "git checkout [<các-tùy-chá»n>] <nhánh>" #: builtin/checkout.c:26 -msgid "git checkout [options] [<branch>] -- <file>..." -msgstr "git checkout [các-tùy-chá»n] [<nhánh>] -- <táºp-tin>…" +msgid "git checkout [<options>] [<branch>] -- <file>..." +msgstr "git checkout [<các-tùy-chá»n>] [<nhánh>] -- <táºp-tin>…" #: builtin/checkout.c:132 builtin/checkout.c:165 #, c-format @@ -3497,14 +3529,13 @@ msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" "to do so with:\n" "\n" -" git branch new_branch_name %s\n" +" git branch <new-branch-name> %s\n" "\n" msgstr "" -"Nếu bạn muốn giữ chúng bằng cách tạo ra má»™t nhánh má»›i, đây có lẽ là má»™t thá»i " -"Ä‘iểm thÃch hợp\n" -"để là m thế bằng lệnh:\n" +"Nếu bạn muốn giữ chúng bằng cách tạo ra má»™t nhánh má»›i, đây có lẽ là \n" +"má»™t thá»i Ä‘iểm thÃch hợp để là m thế bằng lệnh:\n" "\n" -" git branch tên_nhánh_má»›i %s\n" +" git branch <tên_nhánh_má»›i> %s\n" "\n" #: builtin/checkout.c:777 @@ -3622,8 +3653,8 @@ msgid "do not limit pathspecs to sparse entries only" msgstr "không giá»›i hạn đặc tả Ä‘Æ°á»ng dẫn thà nh chỉ các mục thÆ°a thá»›t" #: builtin/checkout.c:1130 -msgid "second guess 'git checkout no-such-branch'" -msgstr "gợi ý thứ hai “git checkout không-nhánh-nà o-nhÆ°-váºyâ€" +msgid "second guess 'git checkout <no-such-branch>'" +msgstr "gợi ý thứ hai \"git checkout <không-nhánh-nà o-nhÆ°-váºy>\"" #: builtin/checkout.c:1153 msgid "-b, -B and --orphan are mutually exclusive" @@ -3746,16 +3777,17 @@ msgstr "CẢNH BÃO: Không tìm thấy các mục được khá»›p bởi: %s" msgid "Select items to delete" msgstr "Chá»n mục muốn xóa" -#: builtin/clean.c:757 +#. TRANSLATORS: Make sure to keep [y/N] as is +#: builtin/clean.c:758 #, c-format -msgid "remove %s? " -msgstr "gỡ bỠ“%sâ€? " +msgid "Remove %s [y/N]? " +msgstr "Xóa bỠ“%s†[y/N]? " -#: builtin/clean.c:782 +#: builtin/clean.c:783 msgid "Bye." msgstr "Tạm biệt." -#: builtin/clean.c:790 +#: builtin/clean.c:791 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -3773,61 +3805,61 @@ msgstr "" "help - hiển thị chÃnh trợ giúp nà y\n" "? - trợ giúp dà nh cho chá»n bằng cách nhắc" -#: builtin/clean.c:817 +#: builtin/clean.c:818 msgid "*** Commands ***" msgstr "*** Lệnh ***" -#: builtin/clean.c:818 +#: builtin/clean.c:819 msgid "What now" msgstr "Giá» thì sao" -#: builtin/clean.c:826 +#: builtin/clean.c:827 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Có muốn gỡ bá» (các) mục sau đây không:" -#: builtin/clean.c:843 +#: builtin/clean.c:844 msgid "No more files to clean, exiting." msgstr "Không còn táºp-tin nà o để dá»n dẹp, Ä‘ang thoát ra." -#: builtin/clean.c:874 +#: builtin/clean.c:875 msgid "do not print names of files removed" msgstr "không hiển thị tên của các táºp tin đã gỡ bá»" -#: builtin/clean.c:876 +#: builtin/clean.c:877 msgid "force" msgstr "ép buá»™c" -#: builtin/clean.c:877 +#: builtin/clean.c:878 msgid "interactive cleaning" msgstr "dá»n bằng kiểu tÆ°Æ¡ng tác" -#: builtin/clean.c:879 +#: builtin/clean.c:880 msgid "remove whole directories" msgstr "gỡ bá» toà n bá»™ thÆ° mục" -#: 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 +#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185 msgid "pattern" msgstr "mẫu" -#: builtin/clean.c:881 +#: builtin/clean.c:882 msgid "add <pattern> to ignore rules" msgstr "thêm <mẫu> và o trong qui tắc bá» qua" -#: builtin/clean.c:882 +#: builtin/clean.c:883 msgid "remove ignored files, too" msgstr "đồng thá»i gỡ bá» cả các táºp tin bị bá» qua" -#: builtin/clean.c:884 +#: builtin/clean.c:885 msgid "remove only ignored files" msgstr "chỉ gỡ bá» những táºp tin bị bá» qua" -#: builtin/clean.c:902 +#: builtin/clean.c:903 msgid "-x and -X cannot be used together" msgstr "-x và -X không thể dùng cùng nhau" -#: builtin/clean.c:906 +#: builtin/clean.c:907 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -3835,7 +3867,7 @@ msgstr "" "clean.requireForce được đặt thà nh true và không Ä‘Æ°a ra tùy chá»n -i, -n mà " "cÅ©ng không -f; từ chối lệnh dá»n dẹp (clean)" -#: builtin/clean.c:909 +#: builtin/clean.c:910 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -3844,11 +3876,11 @@ msgstr "" "mà cÅ©ng không -f; từ chối lệnh dá»n dẹp (clean)" #: builtin/clone.c:37 -msgid "git clone [options] [--] <repo> [<dir>]" -msgstr "git clone [các-tùy-chá»n] [--] <kho> [<t.mục>]" +msgid "git clone [<options>] [--] <repo> [<dir>]" +msgstr "git clone [<các-tùy-chá»n>] [--] <kho> [<t.mục>]" -#: builtin/clone.c:66 builtin/fetch.c:112 builtin/merge.c:224 -#: builtin/push.c:514 +#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224 +#: builtin/push.c:523 msgid "force progress reporting" msgstr "ép buá»™c báo cáo tiến triển công việc" @@ -3908,7 +3940,7 @@ msgstr "lấy ra <nhánh> thay cho HEAD của máy chủ" msgid "path to git-upload-pack on the remote" msgstr "Ä‘Æ°á»ng dẫn đến git-upload-pack trên máy chủ" -#: builtin/clone.c:94 builtin/fetch.c:113 builtin/grep.c:659 +#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659 msgid "depth" msgstr "Ä‘á»™-sâu" @@ -4052,7 +4084,7 @@ msgstr "tùy chá»n --bare và --separate-git-dir xung khắc nhau." msgid "repository '%s' does not exist" msgstr "kho chứa “%s†chÆ°a tồn tại" -#: builtin/clone.c:815 builtin/fetch.c:1155 +#: builtin/clone.c:815 builtin/fetch.c:1156 #, c-format msgid "depth %s is not a positive number" msgstr "Ä‘á»™ sâu %s không phải là má»™t số nguyên dÆ°Æ¡ng" @@ -4067,59 +4099,59 @@ msgstr "Ä‘Æ°á»ng dẫn Ä‘Ãch “%s†đã có từ trÆ°á»›c và không phải msgid "working tree '%s' already exists." msgstr "cây là m việc “%s†đã sẵn tồn tại rồi." -#: builtin/clone.c:848 builtin/clone.c:860 +#: builtin/clone.c:850 builtin/clone.c:861 #, c-format msgid "could not create leading directories of '%s'" msgstr "không thể tạo các thÆ° mục dẫn đầu của “%sâ€" -#: builtin/clone.c:851 +#: builtin/clone.c:853 #, c-format -msgid "could not create work tree dir '%s'." -msgstr "không thể tạo cây thÆ° mục là m việc dir “%sâ€." +msgid "could not create work tree dir '%s'" +msgstr "không thể tạo cây thÆ° mục là m việc dir “%sâ€" -#: builtin/clone.c:870 +#: builtin/clone.c:871 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Äang nhân bản thà nh kho chứa bare “%sâ€â€¦\n" -#: builtin/clone.c:872 +#: builtin/clone.c:873 #, c-format msgid "Cloning into '%s'...\n" msgstr "Äang nhân bản thà nh “%sâ€â€¦\n" -#: builtin/clone.c:897 +#: builtin/clone.c:898 msgid "--dissociate given, but there is no --reference" msgstr "đã Ä‘Æ°a ra --dissociate, nhÆ°ng ở đây lại không có --reference" -#: builtin/clone.c:912 +#: builtin/clone.c:913 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth bị lá» Ä‘i khi nhân bản ná»™i bá»™; hãy sá» dụng file:// để thay thế." -#: builtin/clone.c:915 +#: builtin/clone.c:916 msgid "source repository is shallow, ignoring --local" msgstr "kho nguồn là nông, nên bá» qua --local" -#: builtin/clone.c:920 +#: builtin/clone.c:921 msgid "--local is ignored" msgstr "--local bị lá» Ä‘i" -#: builtin/clone.c:924 +#: builtin/clone.c:925 #, c-format msgid "Don't know how to clone %s" msgstr "Không biết là m cách nà o để nhân bản (clone) %s" -#: builtin/clone.c:975 builtin/clone.c:983 +#: builtin/clone.c:976 builtin/clone.c:984 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Nhánh máy chủ %s không tìm thấy trong thượng nguồn %s" -#: builtin/clone.c:986 +#: builtin/clone.c:987 msgid "You appear to have cloned an empty repository." msgstr "Bạn hình nhÆ° là đã nhân bản má»™t kho trống rá»—ng." #: builtin/column.c:9 -msgid "git column [options]" -msgstr "git column [các-tùy-chá»n]" +msgid "git column [<options>]" +msgstr "git column [<các-tùy-chá»n>]" #: builtin/column.c:26 msgid "lookup config vars" @@ -4150,12 +4182,12 @@ msgid "--command must be the first argument" msgstr "--command phải là đối số đầu tiên" #: builtin/commit.c:37 -msgid "git commit [options] [--] <pathspec>..." -msgstr "git commit [các-tùy-chá»n] [--] <pathspec>…" +msgid "git commit [<options>] [--] <pathspec>..." +msgstr "git commit [<các-tùy-chá»n>] [--] <pathspec>…" #: builtin/commit.c:42 -msgid "git status [options] [--] <pathspec>..." -msgstr "git status [các-tùy-chá»n] [--] <pathspec>…" +msgid "git status [<options>] [--] <pathspec>..." +msgstr "git status [<các-tùy-chá»n>] [--] <pathspec>…" #: builtin/commit.c:47 msgid "" @@ -4264,72 +4296,72 @@ msgstr "" "Thế thì \"git cherry-pick --continue\" sẽ phục hồi lại việc cherry-pick\n" "những lần chuyển giao còn lại.\n" -#: builtin/commit.c:302 +#: builtin/commit.c:304 msgid "failed to unpack HEAD tree object" msgstr "gặp lá»—i khi tháo dỡ HEAD đối tượng cây" -#: builtin/commit.c:342 +#: builtin/commit.c:344 msgid "unable to create temporary index" msgstr "không thể tạo bảng mục lục tạm thá»i" -#: builtin/commit.c:348 +#: builtin/commit.c:350 msgid "interactive add failed" msgstr "gặp lá»—i khi thêm bằng cách tÆ°Æ¡ng" -#: builtin/commit.c:359 +#: builtin/commit.c:361 msgid "unable to write index file" msgstr "không thể ghi táºp tin lÆ°u mục lục" -#: builtin/commit.c:361 +#: builtin/commit.c:363 msgid "unable to update temporary index" msgstr "không thể cáºp nháºt bảng mục lục tạm thá»i" -#: builtin/commit.c:363 +#: builtin/commit.c:365 msgid "Failed to update main cache tree" msgstr "Gặp lá»—i khi cáºp nháºt cây bá»™ nhá»› đệm" -#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461 +#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463 msgid "unable to write new_index file" msgstr "không thể ghi táºp tin lÆ°u bảng mục lục má»›i (new_index)" -#: builtin/commit.c:443 +#: builtin/commit.c:445 msgid "cannot do a partial commit during a merge." msgstr "" "không thể thá»±c hiện việc chuyển giao cục bá»™ trong khi Ä‘ang được hòa trá»™n." -#: builtin/commit.c:445 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a cherry-pick." msgstr "" "không thể thá»±c hiện việc chuyển giao bá»™ pháºn trong khi Ä‘ang cherry-pick." -#: builtin/commit.c:454 +#: builtin/commit.c:456 msgid "cannot read the index" msgstr "không Ä‘á»c được bảng mục lục" -#: builtin/commit.c:473 +#: builtin/commit.c:475 msgid "unable to write temporary index file" msgstr "không thể ghi táºp tin lÆ°u bảng mục lục tạm thá»i" -#: builtin/commit.c:584 +#: builtin/commit.c:580 #, c-format msgid "commit '%s' lacks author header" msgstr "lần chuyển giao “%s†thiếu phần tác giả ở đầu" -#: builtin/commit.c:586 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' has malformed author line" msgstr "lần chuyển giao “%s†có phần tác giả ở đầu dị dạng" -#: builtin/commit.c:605 +#: builtin/commit.c:601 msgid "malformed --author parameter" msgstr "đối số cho --author bị dị hình" -#: builtin/commit.c:613 +#: builtin/commit.c:609 #, c-format msgid "invalid date format: %s" msgstr "ngà y tháng không hợp lệ: %s" -#: builtin/commit.c:657 +#: builtin/commit.c:653 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -4337,43 +4369,43 @@ msgstr "" "không thể chá»n má»™t ký tá»± ghi chú cái mà không được dùng\n" "trong phần ghi chú hiện tại" -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1084 +#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 #, c-format msgid "could not lookup commit %s" msgstr "không thể tìm kiếm commit (lần chuyển giao) %s" -#: builtin/commit.c:706 builtin/shortlog.c:273 +#: builtin/commit.c:702 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "(Ä‘ang Ä‘á»c thông Ä‘iệp nháºt ký từ đầu và o tiêu chuẩn)\n" -#: builtin/commit.c:708 +#: builtin/commit.c:704 msgid "could not read log from standard input" msgstr "không thể Ä‘á»c nháºt ký từ đầu và o tiêu chuẩn" -#: builtin/commit.c:712 +#: builtin/commit.c:708 #, c-format msgid "could not read log file '%s'" msgstr "không Ä‘á»c được tệp nháºt ký “%sâ€" -#: builtin/commit.c:734 +#: builtin/commit.c:730 msgid "could not read MERGE_MSG" msgstr "không thể Ä‘á»c MERGE_MSG" -#: builtin/commit.c:738 +#: builtin/commit.c:734 msgid "could not read SQUASH_MSG" msgstr "không thể Ä‘á»c SQUASH_MSG" -#: builtin/commit.c:742 +#: builtin/commit.c:738 #, c-format msgid "could not read '%s'" msgstr "Không thể Ä‘á»c “%sâ€." -#: builtin/commit.c:789 +#: builtin/commit.c:785 msgid "could not write commit template" msgstr "không thể ghi mẫu chuyển giao" -#: builtin/commit.c:807 +#: builtin/commit.c:803 #, c-format msgid "" "\n" @@ -4388,7 +4420,7 @@ msgstr "" "\t%s\n" "và thá» lại.\n" -#: builtin/commit.c:812 +#: builtin/commit.c:808 #, c-format msgid "" "\n" @@ -4403,7 +4435,7 @@ msgstr "" "\t%s\n" "và thá» lại.\n" -#: builtin/commit.c:825 +#: builtin/commit.c:821 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4414,7 +4446,7 @@ msgstr "" "bắt đầu bằng “%c†sẽ được bá» qua, nếu phần chú thÃch rá»—ng sẽ hủy bá» lần " "chuyển giao.\n" -#: builtin/commit.c:832 +#: builtin/commit.c:828 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4426,154 +4458,156 @@ msgstr "" "bắt đầu bằng “%c†sẽ được bá» qua; bạn có thể xóa chúng Ä‘i nếu muốn thế.\n" "Phần chú thÃch nà y nếu trống rá»—ng sẽ hủy bá» lần chuyển giao.\n" -#: builtin/commit.c:852 +#: builtin/commit.c:848 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sTác giả: %.*s <%.*s>" -#: builtin/commit.c:860 +#: builtin/commit.c:856 #, c-format msgid "%sDate: %s" msgstr "%sNgà y tháng: %s" -#: builtin/commit.c:867 +#: builtin/commit.c:863 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sNgÆ°á»i chuyển giao: %.*s <%.*s>" -#: builtin/commit.c:885 +#: builtin/commit.c:881 msgid "Cannot read index" msgstr "Không Ä‘á»c được bảng mục lục" -#: builtin/commit.c:942 +#: builtin/commit.c:938 msgid "Error building trees" msgstr "Gặp lá»—i khi xây dá»±ng cây" -#: builtin/commit.c:957 builtin/tag.c:495 +#: builtin/commit.c:953 builtin/tag.c:495 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Xin hãy cung cấp lá»i chú giải hoặc là dùng tùy chá»n -m hoặc là -F.\n" -#: builtin/commit.c:1059 +#: builtin/commit.c:1055 #, c-format -msgid "No existing author found with '%s'" -msgstr "Không tìm thấy tác giả có sẵn vá»›i “%sâ€" +msgid "--author '%s' is not 'Name <email>' and matches no existing author" +msgstr "" +"--author “%s†không phải là “Há» và tên <thÆ° Ä‘iện tá»l>†và không khá»›p bất kỳ " +"tác giả nà o sẵn có" -#: builtin/commit.c:1074 builtin/commit.c:1314 +#: builtin/commit.c:1070 builtin/commit.c:1310 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Chế Ä‘á»™ cho các táºp tin chÆ°a được theo dõi không hợp lệ “%sâ€" -#: builtin/commit.c:1111 +#: builtin/commit.c:1107 msgid "--long and -z are incompatible" msgstr "hai tùy chá»n -long và -z không tÆ°Æ¡ng thÃch vá»›i nhau" -#: builtin/commit.c:1141 +#: builtin/commit.c:1137 msgid "Using both --reset-author and --author does not make sense" msgstr "Sá» dụng cả hai tùy chá»n --reset-author và --author không hợp lý" -#: builtin/commit.c:1150 +#: builtin/commit.c:1146 msgid "You have nothing to amend." msgstr "Không có gì để mà “tu bổ†cả." -#: builtin/commit.c:1153 +#: builtin/commit.c:1149 msgid "You are in the middle of a merge -- cannot amend." msgstr "" "Bạn Ä‘ang ở giữa của quá trình hòa trá»™n -- không thể thá»±c hiện việc “tu bổâ€." -#: builtin/commit.c:1155 +#: builtin/commit.c:1151 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" "Bạn Ä‘ang ở giữa của quá trình cherry-pick -- không thể thá»±c hiện việc “tu " "bổâ€." -#: builtin/commit.c:1158 +#: builtin/commit.c:1154 msgid "Options --squash and --fixup cannot be used together" msgstr "Các tùy chá»n --squash và --fixup không thể sá» dụng cùng vá»›i nhau" -#: builtin/commit.c:1168 +#: builtin/commit.c:1164 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" "Chỉ được dùng má»™t trong số tùy chá»n trong số các tùy chá»n -c/-C/-F/--fixup" -#: builtin/commit.c:1170 +#: builtin/commit.c:1166 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Tùy chá»n -m không thể được tổ hợp cùng vá»›i -c/-C/-F/--fixup." -#: builtin/commit.c:1178 +#: builtin/commit.c:1174 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" "--reset-author chỉ có thể được sá» dụng vá»›i tùy chá»n -C, -c hay --amend." -#: builtin/commit.c:1195 +#: builtin/commit.c:1191 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Chỉ má»™t trong các tùy chá»n --include/--only/--all/--interactive/--patch được " "sá» dụng." -#: builtin/commit.c:1197 +#: builtin/commit.c:1193 msgid "No paths with --include/--only does not make sense." msgstr "Không Ä‘Æ°á»ng dẫn vá»›i các tùy chá»n --include/--only không hợp lý." -#: builtin/commit.c:1199 +#: builtin/commit.c:1195 msgid "Clever... amending the last one with dirty index." msgstr "Giá»i… “tu bổ†cái cuối vá»›i bảng mục lục bẩn." -#: builtin/commit.c:1201 +#: builtin/commit.c:1197 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" "Những Ä‘Æ°á»ng dẫn rõ rà ng được chỉ ra không có tùy chá»n -i cÅ©ng không -o; coi " "là --only những Ä‘Æ°á»ng dẫn" -#: builtin/commit.c:1213 builtin/tag.c:728 +#: builtin/commit.c:1209 builtin/tag.c:728 #, c-format msgid "Invalid cleanup mode %s" msgstr "Chế Ä‘á»™ dá»n dẹp không hợp lệ %s" -#: builtin/commit.c:1218 +#: builtin/commit.c:1214 msgid "Paths with -a does not make sense." msgstr "Các Ä‘Æ°á»ng dẫn vá»›i tùy chá»n -a không hợp lý." -#: builtin/commit.c:1328 builtin/commit.c:1608 +#: builtin/commit.c:1324 builtin/commit.c:1604 msgid "show status concisely" msgstr "hiển thị trạng thái ở dạng súc tÃch" -#: builtin/commit.c:1330 builtin/commit.c:1610 +#: builtin/commit.c:1326 builtin/commit.c:1606 msgid "show branch information" msgstr "hiển thị thông tin nhánh" -#: builtin/commit.c:1332 builtin/commit.c:1612 builtin/push.c:500 +#: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509 msgid "machine-readable output" msgstr "kết xuất dạng máy-có-thể-Ä‘á»c" -#: builtin/commit.c:1335 builtin/commit.c:1614 +#: builtin/commit.c:1331 builtin/commit.c:1610 msgid "show status in long format (default)" msgstr "hiển thị trạng thái ở định dạng dà i (mặc định)" -#: builtin/commit.c:1338 builtin/commit.c:1617 +#: builtin/commit.c:1334 builtin/commit.c:1613 msgid "terminate entries with NUL" msgstr "chấm dứt các mục bằng NUL" -#: builtin/commit.c:1340 builtin/commit.c:1620 builtin/fast-export.c:980 +#: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980 #: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "chế Ä‘á»™" -#: builtin/commit.c:1341 builtin/commit.c:1620 +#: builtin/commit.c:1337 builtin/commit.c:1616 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "hiển thị các táºp tin chÆ°a được theo dõi dấu vết, các chế Ä‘á»™ tùy chá»n: all, " "normal, no. (Mặc định: all)" -#: builtin/commit.c:1344 +#: builtin/commit.c:1340 msgid "show ignored files" msgstr "hiển thị các táºp tin ẩn" -#: builtin/commit.c:1345 parse-options.h:153 +#: builtin/commit.c:1341 parse-options.h:153 msgid "when" msgstr "khi" -#: builtin/commit.c:1346 +#: builtin/commit.c:1342 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -4581,213 +4615,213 @@ msgstr "" "bá» qua các thay đổi trong mô-Ä‘un-con, tùy chá»n khi: all, dirty, untracked. " "(Mặc định: all)" -#: builtin/commit.c:1348 +#: builtin/commit.c:1344 msgid "list untracked files in columns" msgstr "hiển thị danh sách các táºp-tin chÆ°a được theo dõi trong các cá»™t" -#: builtin/commit.c:1435 +#: builtin/commit.c:1431 msgid "couldn't look up newly created commit" msgstr "không thể tìm thấy lần chuyển giao má»›i hÆ¡n đã được tạo" -#: builtin/commit.c:1437 +#: builtin/commit.c:1433 msgid "could not parse newly created commit" msgstr "" "không thể phân tÃch cú pháp của đối tượng chuyển giao má»›i hÆ¡n đã được tạo" -#: builtin/commit.c:1482 +#: builtin/commit.c:1478 msgid "detached HEAD" msgstr "đã rá»i khá»i HEAD" -#: builtin/commit.c:1485 +#: builtin/commit.c:1481 msgid " (root-commit)" msgstr " (root-commit)" -#: builtin/commit.c:1578 +#: builtin/commit.c:1574 msgid "suppress summary after successful commit" msgstr "không hiển thị tổng kết sau khi chuyển giao thà nh công" -#: builtin/commit.c:1579 +#: builtin/commit.c:1575 msgid "show diff in commit message template" msgstr "hiển thị sá»± khác biệt trong mẫu tin nhắn chuyển giao" -#: builtin/commit.c:1581 +#: builtin/commit.c:1577 msgid "Commit message options" msgstr "Các tùy chá»n ghi chú commit" -#: builtin/commit.c:1582 builtin/tag.c:601 +#: builtin/commit.c:1578 builtin/tag.c:601 msgid "read message from file" msgstr "Ä‘á»c chú thÃch từ táºp tin" -#: builtin/commit.c:1583 +#: builtin/commit.c:1579 msgid "author" msgstr "tác giả" -#: builtin/commit.c:1583 +#: builtin/commit.c:1579 msgid "override author for commit" msgstr "ghi đè tác giả cho commit" -#: builtin/commit.c:1584 builtin/gc.c:275 +#: builtin/commit.c:1580 builtin/gc.c:275 msgid "date" msgstr "ngà y tháng" -#: builtin/commit.c:1584 +#: builtin/commit.c:1580 msgid "override date for commit" msgstr "ghi đè ngà y tháng cho lần chuyển giao" -#: builtin/commit.c:1585 builtin/merge.c:218 builtin/notes.c:391 +#: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391 #: builtin/notes.c:554 builtin/tag.c:599 msgid "message" msgstr "chú thÃch" -#: builtin/commit.c:1585 +#: builtin/commit.c:1581 msgid "commit message" msgstr "chú thÃch của lần chuyển giao" -#: builtin/commit.c:1586 +#: builtin/commit.c:1582 msgid "reuse and edit message from specified commit" msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho nhÆ°ng có cho sá»a chữa" -#: builtin/commit.c:1587 +#: builtin/commit.c:1583 msgid "reuse message from specified commit" msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho" -#: builtin/commit.c:1588 +#: builtin/commit.c:1584 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "dùng ghi chú có định dạng autosquash để sá»a chữa lần chuyển giao đã chỉ ra" -#: builtin/commit.c:1589 +#: builtin/commit.c:1585 msgid "use autosquash formatted message to squash specified commit" msgstr "" "dùng lá»i nhắn có định dạng tá»± Ä‘á»™ng nén để nén lại các lần chuyển giao đã chỉ " "ra" -#: builtin/commit.c:1590 +#: builtin/commit.c:1586 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "lần chuyển giao nháºn tôi là tác giả (được dùng vá»›i tùy chá»n -C/-c/--amend)" -#: builtin/commit.c:1591 builtin/log.c:1191 builtin/revert.c:86 +#: builtin/commit.c:1587 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "(nên dùng) thêm dòng Signed-off-by:" -#: builtin/commit.c:1592 +#: builtin/commit.c:1588 msgid "use specified template file" msgstr "sá» dụng táºp tin mẫu đã cho" -#: builtin/commit.c:1593 +#: builtin/commit.c:1589 msgid "force edit of commit" msgstr "ép buá»™c sá»a lần commit" -#: builtin/commit.c:1594 +#: builtin/commit.c:1590 msgid "default" msgstr "mặc định" -#: builtin/commit.c:1594 builtin/tag.c:604 +#: builtin/commit.c:1590 builtin/tag.c:604 msgid "how to strip spaces and #comments from message" msgstr "là m thế nà o để cắt bá» khoảng trắng và #ghichú từ mẩu tin nhắn" -#: builtin/commit.c:1595 +#: builtin/commit.c:1591 msgid "include status in commit message template" msgstr "bao gồm các trạng thái trong mẫu ghi chú chuyển giao" -#: builtin/commit.c:1596 builtin/merge.c:225 builtin/revert.c:92 +#: builtin/commit.c:1592 builtin/merge.c:225 builtin/revert.c:92 #: builtin/tag.c:605 msgid "key-id" msgstr "mã-số-khóa" -#: builtin/commit.c:1597 builtin/merge.c:226 builtin/revert.c:93 +#: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93 msgid "GPG sign commit" msgstr "ký lần chuyển giao dùng GPG" -#: builtin/commit.c:1600 +#: builtin/commit.c:1596 msgid "Commit contents options" msgstr "Các tùy ná»™i dung ghi chú commit" -#: builtin/commit.c:1601 +#: builtin/commit.c:1597 msgid "commit all changed files" msgstr "chuyển giao tất cả các táºp tin có thay đổi" -#: builtin/commit.c:1602 +#: builtin/commit.c:1598 msgid "add specified files to index for commit" msgstr "thêm các táºp tin đã chỉ ra và o bảng mục lục để chuyển giao" -#: builtin/commit.c:1603 +#: builtin/commit.c:1599 msgid "interactively add files" msgstr "thêm các táºp-tin bằng tÆ°Æ¡ng tác" -#: builtin/commit.c:1604 +#: builtin/commit.c:1600 msgid "interactively add changes" msgstr "thêm các thay đổi bằng tÆ°Æ¡ng tác" -#: builtin/commit.c:1605 +#: builtin/commit.c:1601 msgid "commit only specified files" msgstr "chỉ chuyển giao các táºp tin đã chỉ ra" -#: builtin/commit.c:1606 +#: builtin/commit.c:1602 msgid "bypass pre-commit hook" msgstr "vòng qua móc (hook) pre-commit" -#: builtin/commit.c:1607 +#: builtin/commit.c:1603 msgid "show what would be committed" msgstr "hiển thị xem cái gì có thể được chuyển giao" -#: builtin/commit.c:1618 +#: builtin/commit.c:1614 msgid "amend previous commit" msgstr "“tu bổ†(amend) lần commit trÆ°á»›c" -#: builtin/commit.c:1619 +#: builtin/commit.c:1615 msgid "bypass post-rewrite hook" msgstr "vòng qua móc (hook) post-rewrite" -#: builtin/commit.c:1624 +#: builtin/commit.c:1620 msgid "ok to record an empty change" msgstr "ok để ghi lại má»™t thay đổi trống rá»—ng" -#: builtin/commit.c:1626 +#: builtin/commit.c:1622 msgid "ok to record a change with an empty message" msgstr "ok để ghi các thay đổi vá»›i lá»i nhắn trống rá»—ng" -#: builtin/commit.c:1655 +#: builtin/commit.c:1651 msgid "could not parse HEAD commit" msgstr "không thể phân tÃch commit (lần chuyển giao) HEAD" -#: builtin/commit.c:1694 builtin/merge.c:519 +#: builtin/commit.c:1690 builtin/merge.c:519 #, c-format msgid "could not open '%s' for reading" msgstr "không thể mở “%s†để Ä‘á»c" -#: builtin/commit.c:1701 +#: builtin/commit.c:1697 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Táºp tin MERGE_HEAD sai há»ng (%s)" -#: builtin/commit.c:1708 +#: builtin/commit.c:1704 msgid "could not read MERGE_MODE" msgstr "không thể Ä‘á»c MERGE_MODE" -#: builtin/commit.c:1727 +#: builtin/commit.c:1723 #, c-format msgid "could not read commit message: %s" msgstr "không thể Ä‘á»c phần chú thÃch (message) của llần chuyển giao: %s" -#: builtin/commit.c:1738 +#: builtin/commit.c:1734 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" "Äang bá» qua việc chuyển giao; bạn đã không biên soạn phần chú thÃch " "(message).\n" -#: builtin/commit.c:1743 +#: builtin/commit.c:1739 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Bãi bá» việc chuyển giao bởi vì phần chú thÃch của nó trống rá»—ng.\n" -#: builtin/commit.c:1758 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1754 builtin/merge.c:851 builtin/merge.c:876 msgid "failed to write commit object" msgstr "gặp lá»—i khi ghi đối tượng chuyển giao" -#: builtin/commit.c:1791 +#: builtin/commit.c:1787 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -4799,8 +4833,8 @@ msgstr "" "và sau đó \"git reset HEAD\" để khắc phục." #: builtin/config.c:8 -msgid "git config [options]" -msgstr "git config [các-tùy-chá»n]" +msgid "git config [<options>]" +msgstr "git config [<các-tùy-chá»n>]" #: builtin/config.c:53 msgid "Config file location" @@ -4955,12 +4989,12 @@ msgid "print sizes in human readable format" msgstr "hiển thị kÃch cỡ theo định dạng dà nh cho ngÆ°á»i Ä‘á»c" #: builtin/describe.c:17 -msgid "git describe [options] <commit-ish>*" -msgstr "git describe [các-tùy-chá»n] <commit-ish>*" +msgid "git describe [<options>] [<commit-ish>...]" +msgstr "git describe [<các-tùy-chá»n>] <commit-ish>*" #: builtin/describe.c:18 -msgid "git describe [options] --dirty" -msgstr "git describe [các-tùy-chá»n] --dirty" +msgid "git describe [<options>] --dirty" +msgstr "git describe [<các-tùy-chá»n>] --dirty" #: builtin/describe.c:217 #, c-format @@ -5175,179 +5209,179 @@ msgstr "Ãp dụng refspec cho refs đã xuất" msgid "anonymize output" msgstr "kết xuất anonymize" -#: builtin/fetch.c:20 +#: builtin/fetch.c:19 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<các-tùy-chá»n>] [<kho-chứa> [<refspec>…]]" -#: builtin/fetch.c:21 +#: builtin/fetch.c:20 msgid "git fetch [<options>] <group>" msgstr "git fetch [<các-tùy-chá»n>] [<nhóm>" -#: builtin/fetch.c:22 +#: builtin/fetch.c:21 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<các-tùy-chá»n>] [(<kho> | <nhóm>)…]" -#: builtin/fetch.c:23 +#: builtin/fetch.c:22 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<các-tùy-chá»n>]" -#: builtin/fetch.c:90 +#: builtin/fetch.c:89 msgid "fetch from all remotes" msgstr "lấy vá» từ tất cả các máy chủ" -#: builtin/fetch.c:92 +#: builtin/fetch.c:91 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "nối thêm và o .git/FETCH_HEAD thay vì ghi đè lên nó" -#: builtin/fetch.c:94 +#: builtin/fetch.c:93 msgid "path to upload pack on remote end" msgstr "Ä‘Æ°á»ng dẫn đến gói tải lên trên máy chủ cuối" -#: builtin/fetch.c:95 +#: builtin/fetch.c:94 msgid "force overwrite of local branch" msgstr "ép buá»™c ghi đè lên nhánh ná»™i bá»™" -#: builtin/fetch.c:97 +#: builtin/fetch.c:96 msgid "fetch from multiple remotes" msgstr "lấy từ nhiá»u máy chủ cùng lúc" -#: builtin/fetch.c:99 +#: builtin/fetch.c:98 msgid "fetch all tags and associated objects" msgstr "lấy tất cả các thẻ cùng vá»›i các đối tượng liên quan đến nó" -#: builtin/fetch.c:101 +#: builtin/fetch.c:100 msgid "do not fetch all tags (--no-tags)" msgstr "không lấy tất cả các thẻ (--no-tags)" -#: builtin/fetch.c:103 +#: builtin/fetch.c:102 msgid "prune remote-tracking branches no longer on remote" msgstr "" "cắt cụt (prune) các nhánh “remote-tracking†không còn tồn tại trên máy chủ " "nữa" -#: builtin/fetch.c:104 +#: builtin/fetch.c:103 msgid "on-demand" msgstr "khi-cần" -#: builtin/fetch.c:105 +#: builtin/fetch.c:104 msgid "control recursive fetching of submodules" msgstr "Ä‘iá»u khiển việc lấy vỠđệ quy trong các mô-Ä‘un-con" -#: builtin/fetch.c:109 +#: builtin/fetch.c:108 msgid "keep downloaded pack" msgstr "giữ lại gói đã tải vá»" -#: builtin/fetch.c:111 +#: builtin/fetch.c:110 msgid "allow updating of HEAD ref" msgstr "cho phép cáºp nháºt th.chiếu HEAD" -#: builtin/fetch.c:114 +#: builtin/fetch.c:113 msgid "deepen history of shallow clone" msgstr "là m sâu hÆ¡n lịch sá» của bản sao" -#: builtin/fetch.c:116 +#: builtin/fetch.c:115 msgid "convert to a complete repository" msgstr "chuyển đổi hoà n toà n sang kho git" -#: builtin/fetch.c:118 builtin/log.c:1208 +#: builtin/fetch.c:117 builtin/log.c:1208 msgid "dir" msgstr "tmục" -#: builtin/fetch.c:119 +#: builtin/fetch.c:118 msgid "prepend this to submodule path output" msgstr "soạn sẵn cái nà y cho kết xuất Ä‘Æ°á»ng dẫn mô-Ä‘un-con" -#: builtin/fetch.c:122 +#: builtin/fetch.c:121 msgid "default mode for recursion" msgstr "chế Ä‘á»™ mặc định cho đệ qui" -#: builtin/fetch.c:124 +#: builtin/fetch.c:123 msgid "accept refs that update .git/shallow" msgstr "chấp nháºn tham chiếu cáºp nháºt .git/shallow" -#: builtin/fetch.c:125 +#: builtin/fetch.c:124 msgid "refmap" msgstr "refmap" -#: builtin/fetch.c:126 +#: builtin/fetch.c:125 msgid "specify fetch refmap" msgstr "chỉ ra refmap cần lấy vá»" -#: builtin/fetch.c:376 +#: builtin/fetch.c:375 msgid "Couldn't find remote ref HEAD" msgstr "Không thể tìm thấy máy chủ cho tham chiếu HEAD" -#: builtin/fetch.c:454 +#: builtin/fetch.c:455 #, c-format msgid "object %s not found" msgstr "Không tìm thấy đối tượng %s" -#: builtin/fetch.c:459 +#: builtin/fetch.c:460 msgid "[up to date]" msgstr "[đã cáºp nháºt]" -#: builtin/fetch.c:473 +#: builtin/fetch.c:474 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s (không thể fetch (lấy) vá» nhánh hiện hà nh)" -#: builtin/fetch.c:474 builtin/fetch.c:560 +#: builtin/fetch.c:475 builtin/fetch.c:561 msgid "[rejected]" msgstr "[Bị từ chối]" -#: builtin/fetch.c:485 +#: builtin/fetch.c:486 msgid "[tag update]" msgstr "[cáºp nháºt thẻ]" -#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540 +#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541 msgid " (unable to update local ref)" msgstr " (không thể cáºp nháºt tham chiếu ná»™i bá»™)" -#: builtin/fetch.c:505 +#: builtin/fetch.c:506 msgid "[new tag]" msgstr "[thẻ má»›i]" -#: builtin/fetch.c:508 +#: builtin/fetch.c:509 msgid "[new branch]" msgstr "[nhánh má»›i]" -#: builtin/fetch.c:511 +#: builtin/fetch.c:512 msgid "[new ref]" msgstr "[ref (tham chiếu) má»›i]" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "unable to update local ref" msgstr "không thể cáºp nháºt tham chiếu ná»™i bá»™" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "forced update" msgstr "cưỡng bức cáºp nháºt" -#: builtin/fetch.c:562 +#: builtin/fetch.c:563 msgid "(non-fast-forward)" msgstr "(non-fast-forward)" -#: builtin/fetch.c:595 builtin/fetch.c:828 +#: builtin/fetch.c:596 builtin/fetch.c:829 #, c-format msgid "cannot open %s: %s\n" msgstr "không thể mở %s: %s\n" -#: builtin/fetch.c:604 +#: builtin/fetch.c:605 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s đã không gá»i tất cả các đối tượng cần thiết\n" -#: builtin/fetch.c:622 +#: builtin/fetch.c:623 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "từ chối %s bởi vì các gốc nông thì không được phép cáºp nháºt" -#: builtin/fetch.c:710 builtin/fetch.c:793 +#: builtin/fetch.c:711 builtin/fetch.c:794 #, c-format msgid "From %.*s\n" msgstr "Từ %.*s\n" -#: builtin/fetch.c:721 +#: builtin/fetch.c:722 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5356,57 +5390,57 @@ msgstr "" "má»™t số tham chiếu ná»™i bá»™ không thể được cáºp nháºt; hãy thá» chạy\n" " “git remote prune %s†để bá» Ä‘i những nhánh cÅ©, hay bị xung Ä‘á»™t" -#: builtin/fetch.c:773 +#: builtin/fetch.c:774 #, c-format msgid " (%s will become dangling)" msgstr " (%s sẽ trở thà nh không đầu (không được quản lý))" -#: builtin/fetch.c:774 +#: builtin/fetch.c:775 #, c-format msgid " (%s has become dangling)" msgstr " (%s đã trở thà nh không đầu (không được quản lý))" -#: builtin/fetch.c:798 +#: builtin/fetch.c:799 msgid "[deleted]" msgstr "[đã xóa]" -#: builtin/fetch.c:799 builtin/remote.c:1060 +#: builtin/fetch.c:800 builtin/remote.c:1060 msgid "(none)" msgstr "(không)" -#: builtin/fetch.c:818 +#: builtin/fetch.c:819 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" "Từ chối việc lấy và o trong nhánh hiện tại %s của má»™t kho chứa không phải kho " "trần (bare)" -#: builtin/fetch.c:837 +#: builtin/fetch.c:838 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Tùy chá»n \"%s\" có giá trị \"%s\" là không hợp lệ cho %s" -#: builtin/fetch.c:840 +#: builtin/fetch.c:841 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Tùy chá»n \"%s\" bị bá» qua vá»›i %s\n" -#: builtin/fetch.c:896 +#: builtin/fetch.c:897 #, c-format msgid "Don't know how to fetch from %s" msgstr "Không biết là m cách nà o để lấy vá» từ %s" -#: builtin/fetch.c:1058 +#: builtin/fetch.c:1059 #, c-format msgid "Fetching %s\n" msgstr "Äang lấy “%s†vá»\n" -#: builtin/fetch.c:1060 builtin/remote.c:90 +#: builtin/fetch.c:1061 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "không thể “%s†vá»" -#: builtin/fetch.c:1078 +#: builtin/fetch.c:1079 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5414,39 +5448,41 @@ msgstr "" "ChÆ°a chỉ ra kho chứa máy chủ. Xin hãy chỉ định hoặc là URL hoặc\n" "tên máy chủ từ cái mà những Ä‘iểm xét duyệt má»›i có thể được fetch (lấy vá»)." -#: builtin/fetch.c:1101 +#: builtin/fetch.c:1102 msgid "You need to specify a tag name." msgstr "Bạn phải định rõ tên thẻ." -#: builtin/fetch.c:1143 +#: builtin/fetch.c:1144 msgid "--depth and --unshallow cannot be used together" msgstr "tùy chá»n --depth và --unshallow không thể sá» dụng cùng vá»›i nhau" -#: builtin/fetch.c:1145 +#: builtin/fetch.c:1146 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow trên kho hoà n chỉnh là không hợp lý" -#: builtin/fetch.c:1168 +#: builtin/fetch.c:1169 msgid "fetch --all does not take a repository argument" msgstr "lệnh lấy vá» \"fetch --all\" không lấy đối số kho chứa" -#: builtin/fetch.c:1170 +#: builtin/fetch.c:1171 msgid "fetch --all does not make sense with refspecs" msgstr "lệnh lấy vá» \"fetch --all\" không hợp lý vá»›i refspecs" -#: builtin/fetch.c:1181 +#: builtin/fetch.c:1182 #, c-format msgid "No such remote or remote group: %s" msgstr "không có nhóm máy chủ hay máy chủ nhÆ° thế: %s" -#: builtin/fetch.c:1189 +#: builtin/fetch.c:1190 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Việc lấy vá» cả má»™t nhóm và chỉ định refspecs không hợp lý" #: builtin/fmt-merge-msg.c:13 -msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" +msgid "" +"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" -"git fmt-merge-msg [-m <chú_thÃch>] [--log[=<n>]|--no-log] [--file <táºp-tin>]" +"git fmt-merge-msg [-m <chú_thÃch>] [--log[=<n>] | --no-log] [--file <táºp-" +"tin>]" #: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182 @@ -5475,51 +5511,51 @@ msgstr "dùng <văn bản thÆ°á»ng> để bắt đầu ghi chú" msgid "file to read from" msgstr "táºp tin để Ä‘á»c dữ liệu từ đó" -#: builtin/for-each-ref.c:676 +#: builtin/for-each-ref.c:675 msgid "unable to parse format" msgstr "không thể phân tÃch định dạng" -#: builtin/for-each-ref.c:1064 -msgid "git for-each-ref [options] [<pattern>]" -msgstr "git for-each-ref [các-tùy-chá»n] [<mẫu>]" +#: builtin/for-each-ref.c:1063 +msgid "git for-each-ref [<options>] [<pattern>]" +msgstr "git for-each-ref [<các-tùy-chá»n>] [<mẫu>]" -#: builtin/for-each-ref.c:1079 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for shells" msgstr "trÃch dẫn để phù hợp cho hệ vá» (shell)" -#: builtin/for-each-ref.c:1081 +#: builtin/for-each-ref.c:1080 msgid "quote placeholders suitably for perl" msgstr "trÃch dẫn để phù hợp cho perl" -#: builtin/for-each-ref.c:1083 +#: builtin/for-each-ref.c:1082 msgid "quote placeholders suitably for python" msgstr "trÃch dẫn để phù hợp cho python" -#: builtin/for-each-ref.c:1085 +#: builtin/for-each-ref.c:1084 msgid "quote placeholders suitably for Tcl" msgstr "trÃch dẫn để phù hợp cho Tcl" -#: builtin/for-each-ref.c:1088 +#: builtin/for-each-ref.c:1087 msgid "show only <n> matched refs" msgstr "hiển thị chỉ <n> tham chiếu khá»›p" -#: builtin/for-each-ref.c:1089 builtin/replace.c:438 +#: builtin/for-each-ref.c:1088 builtin/replace.c:438 msgid "format" msgstr "định dạng" -#: builtin/for-each-ref.c:1089 +#: builtin/for-each-ref.c:1088 msgid "format to use for the output" msgstr "định dạng sẽ dùng cho đầu ra" -#: builtin/for-each-ref.c:1090 +#: builtin/for-each-ref.c:1089 msgid "key" msgstr "khóa" -#: builtin/for-each-ref.c:1091 +#: builtin/for-each-ref.c:1090 msgid "field name to sort on" msgstr "tên trÆ°á»ng cần sắp xếp" -#: builtin/fsck.c:147 builtin/prune.c:136 +#: builtin/fsck.c:147 builtin/prune.c:137 msgid "Checking connectivity" msgstr "Äang kiểm tra kết nối" @@ -5528,8 +5564,8 @@ msgid "Checking object directories" msgstr "Äang kiểm tra các thÆ° mục đối tượng" #: builtin/fsck.c:603 -msgid "git fsck [options] [<object>...]" -msgstr "git fsck [các-tùy-chá»n] [<đối-tượng>…]" +msgid "git fsck [<options>] [<object>...]" +msgstr "git fsck [<các-tùy-chá»n>] [<đối-tượng>…]" #: builtin/fsck.c:609 msgid "show unreachable objects" @@ -5576,8 +5612,8 @@ msgid "Checking objects" msgstr "Äang kiểm tra các đối tượng" #: builtin/gc.c:24 -msgid "git gc [options]" -msgstr "git gc [các-tùy-chá»n]" +msgid "git gc [<options>]" +msgstr "git gc [<các-tùy-chá»n>]" #: builtin/gc.c:79 #, c-format @@ -5638,8 +5674,8 @@ msgstr "" "để xóa bá» chúng Ä‘i." #: builtin/grep.c:23 -msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" -msgstr "git grep [các-tùy-chá»n] [-e] <mẫu> [<rev>…] [[--] <Ä‘Æ°á»ng-dẫn>…]" +msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" +msgstr "git grep [<các-tùy-chá»n>] [-e] <mẫu> [<rev>…] [[--] <Ä‘Æ°á»ng-dẫn>…]" #: builtin/grep.c:218 #, c-format @@ -5679,8 +5715,8 @@ msgid "search in both tracked and untracked files" msgstr "tìm kiếm các táºp tin được và chÆ°a được theo dõi dấu vết" #: builtin/grep.c:644 -msgid "search also in ignored files" -msgstr "tìm cả trong các táºp tin đã bị lá» Ä‘i" +msgid "ignore files specified via '.gitignore'" +msgstr "các táºp tin bị bá» qua được chỉ định thông qua “.gitignoreâ€" #: builtin/grep.c:647 msgid "show non-matching lines" @@ -5867,17 +5903,17 @@ msgstr "cả hai --cached và các cây phải được chỉ ra." #: builtin/hash-object.c:82 msgid "" -"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " -"<file>..." +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " +"[--] <file>..." msgstr "" -"git hash-object [-t <kiểu>] [-w] [--path=<táºp-tin>|--no-filters] [--stdin] " +"git hash-object [-t <kiểu>] [-w] [--path=<táºp-tin> | --no-filters] [--stdin] " "[--] <táºp-tin>…" #: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "git hash-object --stdin-paths < <danh-sách-Ä‘Æ°á»ng-dẫn>" -#: builtin/hash-object.c:94 builtin/tag.c:610 +#: builtin/hash-object.c:94 builtin/tag.c:612 msgid "type" msgstr "kiểu" @@ -5927,8 +5963,8 @@ msgid "show info page" msgstr "hiện trang info" #: builtin/help.c:52 -msgid "git help [--all] [--guides] [--man|--web|--info] [command]" -msgstr "git help [--all] [--guides] [--man|--web|--info] [lệnh]" +msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" +msgstr "git help [--all] [--guides] [--man | --web | --info] [<lệnh>]" #: builtin/help.c:64 #, c-format @@ -6134,8 +6170,8 @@ msgstr "sá»± mâu thuẫn xả nén nghiêm trá»ng" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "Sá»° VA CHẠM SHA1 Äà XẢY RA VỚI %s!" -#: builtin/index-pack.c:689 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:256 +#: builtin/index-pack.c:689 builtin/pack-objects.c:162 +#: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "không thể Ä‘á»c %s" @@ -6221,95 +6257,95 @@ msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "gói có %d delta chÆ°a được giải quyết" -#: builtin/index-pack.c:1220 +#: builtin/index-pack.c:1219 #, c-format msgid "unable to deflate appended object (%d)" msgstr "không thể xả nén đối tượng nối thêm (%d)" -#: builtin/index-pack.c:1299 +#: builtin/index-pack.c:1298 #, c-format msgid "local object %s is corrupt" msgstr "đối tượng ná»™i bá»™ %s bị há»ng" -#: builtin/index-pack.c:1323 +#: builtin/index-pack.c:1322 msgid "error while closing pack file" msgstr "gặp lá»—i trong khi đóng táºp tin gói" -#: builtin/index-pack.c:1336 +#: builtin/index-pack.c:1335 #, c-format msgid "cannot write keep file '%s'" msgstr "không thể ghi táºp tin giữ lại “%sâ€" -#: builtin/index-pack.c:1344 +#: builtin/index-pack.c:1343 #, c-format msgid "cannot close written keep file '%s'" msgstr "không thể đóng táºp tin giữ lại đã được ghi “%sâ€" -#: builtin/index-pack.c:1357 +#: builtin/index-pack.c:1356 msgid "cannot store pack file" msgstr "không thể lÆ°u táºp tin gói" -#: builtin/index-pack.c:1368 +#: builtin/index-pack.c:1367 msgid "cannot store index file" msgstr "không thể lÆ°u trữ táºp tin ghi mục lục" -#: builtin/index-pack.c:1401 +#: builtin/index-pack.c:1400 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "sai pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1406 #, c-format msgid "invalid number of threads specified (%d)" msgstr "số tuyến chỉ ra không hợp lệ (%d)" -#: builtin/index-pack.c:1411 builtin/index-pack.c:1590 +#: builtin/index-pack.c:1410 builtin/index-pack.c:1589 #, c-format msgid "no threads support, ignoring %s" msgstr "không há»— trợ Ä‘a tuyến, bá» qua %s" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1468 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Không thể mở táºp tin gói đã sẵn có “%sâ€" -#: builtin/index-pack.c:1471 +#: builtin/index-pack.c:1470 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Không thể mở táºp tin idx của gói cho “%sâ€" -#: builtin/index-pack.c:1518 +#: builtin/index-pack.c:1517 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "không delta: %d đối tượng" -#: builtin/index-pack.c:1525 +#: builtin/index-pack.c:1524 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "chiá»u dà i xÃch = %d: %lu đối tượng" -#: builtin/index-pack.c:1554 +#: builtin/index-pack.c:1553 msgid "Cannot come back to cwd" msgstr "Không thể quay lại cwd" -#: builtin/index-pack.c:1602 builtin/index-pack.c:1605 -#: builtin/index-pack.c:1617 builtin/index-pack.c:1621 +#: builtin/index-pack.c:1601 builtin/index-pack.c:1604 +#: builtin/index-pack.c:1616 builtin/index-pack.c:1620 #, c-format msgid "bad %s" msgstr "%s sai" -#: builtin/index-pack.c:1635 +#: builtin/index-pack.c:1634 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin không thể được dùng mà không có --stdin" -#: builtin/index-pack.c:1639 builtin/index-pack.c:1648 +#: builtin/index-pack.c:1638 builtin/index-pack.c:1647 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "tên táºp tin táºp tin gói “%s†không được kết thúc bằng Ä‘uôi “.packâ€" -#: builtin/index-pack.c:1656 +#: builtin/index-pack.c:1655 msgid "--verify with no packfile name given" msgstr "dùng tùy chá»n --verify mà không Ä‘Æ°a ra tên packfile" @@ -6420,8 +6456,8 @@ msgstr " đã chia sẻ" #: builtin/init-db.c:475 msgid "" -"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" -"shared[=<permissions>]] [directory]" +"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared" +"[=<permissions>]] [<directory>]" msgstr "" "git init [-q | --quiet] [--bare] [--template=<thÆ°-mục-tạm>] [--shared[=<các-" "quyá»n>]] [thÆ°-mục]" @@ -6487,8 +6523,8 @@ msgid "git log [<options>] [<revision range>] [[--] <path>...]" msgstr "git log [<các-tùy-chá»n>] [<vùng xem xét>] [[--] <Ä‘Æ°á»ng-dẫn>…]" #: builtin/log.c:42 -msgid "git show [options] <object>..." -msgstr "git show [các-tùy-chá»n] <đối-tượng>…" +msgid "git show [<options>] <object>..." +msgstr "git show [<các-tùy-chá»n>] <đối-tượng>…" #: builtin/log.c:81 #, c-format @@ -6566,8 +6602,8 @@ msgid "insane in-reply-to: %s" msgstr "in-reply-to Ä‘iên rồ: %s" #: builtin/log.c:1026 -msgid "git format-patch [options] [<since> | <revision range>]" -msgstr "git format-patch [các-tùy-chá»n] [<kể-từ> | <vùng-xem-xét>]" +msgid "git format-patch [<options>] [<since> | <revision-range>]" +msgstr "git format-patch [<các-tùy-chá»n>] [<kể-từ> | <vùng-xem-xét>]" #: builtin/log.c:1071 msgid "Two output directories?" @@ -6766,98 +6802,98 @@ msgstr "" msgid "Unknown commit %s" msgstr "Không hiểu lần chuyển giao %s" -#: builtin/ls-files.c:401 -msgid "git ls-files [options] [<file>...]" -msgstr "git ls-files [các-tùy-chá»n] [<táºp-tin>…]" +#: builtin/ls-files.c:358 +msgid "git ls-files [<options>] [<file>...]" +msgstr "git ls-files [<các-tùy-chá»n>] [<táºp-tin>…]" -#: builtin/ls-files.c:458 +#: builtin/ls-files.c:415 msgid "identify the file status with tags" msgstr "nháºn dạng các trạng thái táºp tin vá»›i thẻ" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:417 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" "dùng chữ cái viết thÆ°á»ng cho các táºp tin “assume unchanged†(giả định không " "thay đổi)" -#: builtin/ls-files.c:462 +#: builtin/ls-files.c:419 msgid "show cached files in the output (default)" msgstr "hiển thị các táºp tin được nhá»› tạm và o đầu ra (mặc định)" -#: builtin/ls-files.c:464 +#: builtin/ls-files.c:421 msgid "show deleted files in the output" msgstr "hiển thị các táºp tin đã xóa trong kết xuất" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:423 msgid "show modified files in the output" msgstr "hiển thị các táºp tin đã bị sá»a đổi ra kết xuất" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:425 msgid "show other files in the output" msgstr "hiển thị các táºp tin khác trong kết xuất" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:427 msgid "show ignored files in the output" msgstr "hiển thị các táºp tin bị bá» qua trong kết xuất" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:430 msgid "show staged contents' object name in the output" msgstr "hiển thị tên đối tượng của ná»™i dung được đặt lên bệ phóng ra kết xuất" -#: builtin/ls-files.c:475 +#: builtin/ls-files.c:432 msgid "show files on the filesystem that need to be removed" msgstr "hiển thị các táºp tin trên hệ thống táºp tin mà nó cần được gỡ bá»" -#: builtin/ls-files.c:477 +#: builtin/ls-files.c:434 msgid "show 'other' directories' names only" msgstr "chỉ hiển thị tên của các thÆ° mục “khácâ€" -#: builtin/ls-files.c:480 +#: builtin/ls-files.c:437 msgid "don't show empty directories" msgstr "không hiển thị thÆ° mục rá»—ng" -#: builtin/ls-files.c:483 +#: builtin/ls-files.c:440 msgid "show unmerged files in the output" msgstr "hiển thị các táºp tin chÆ°a hòa trá»™n trong kết xuất" -#: builtin/ls-files.c:485 +#: builtin/ls-files.c:442 msgid "show resolve-undo information" msgstr "hiển thị thông tin resolve-undo" -#: builtin/ls-files.c:487 +#: builtin/ls-files.c:444 msgid "skip files matching pattern" msgstr "bá» qua những táºp tin khá»›p vá»›i má»™t mẫu" -#: builtin/ls-files.c:490 +#: builtin/ls-files.c:447 msgid "exclude patterns are read from <file>" msgstr "mẫu loại trừ được Ä‘á»c từ <táºp tin>" -#: builtin/ls-files.c:493 +#: builtin/ls-files.c:450 msgid "read additional per-directory exclude patterns in <file>" msgstr "Ä‘á»c thêm các mẫu ngoại trừ má»—i thÆ° mục trong <táºp tin>" -#: builtin/ls-files.c:495 +#: builtin/ls-files.c:452 msgid "add the standard git exclusions" msgstr "thêm loại trừ tiêu chuẩn kiểu git" -#: builtin/ls-files.c:498 +#: builtin/ls-files.c:455 msgid "make the output relative to the project top directory" msgstr "là m cho kết xuất liên quan đến thÆ° mục ở mức cao nhất (gốc) của dá»± án" -#: builtin/ls-files.c:501 +#: builtin/ls-files.c:458 msgid "if any <file> is not in the index, treat this as an error" msgstr "nếu <táºp tin> bất kỳ không ở trong bảng mục lục, xá» lý nó nhÆ° má»™t lá»—i" -#: builtin/ls-files.c:502 +#: builtin/ls-files.c:459 msgid "tree-ish" msgstr "tree-ish" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:460 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "giả định rằng các Ä‘Æ°á»ng dẫn đã bị gỡ bá» kể từ <tree-ish> nay vẫn hiện diện" -#: builtin/ls-files.c:505 +#: builtin/ls-files.c:462 msgid "show debugging data" msgstr "hiển thị dữ liệu gỡ lá»—i" @@ -6898,12 +6934,12 @@ msgid "list entire tree; not just current directory (implies --full-name)" msgstr "liệt kê cây mục tin; không chỉ thÆ° mục hiện hà nh (ngụ ý --full-name)" #: builtin/merge.c:45 -msgid "git merge [options] [<commit>...]" -msgstr "git merge [các-tùy-chá»n] [<commit>…]" +msgid "git merge [<options>] [<commit>...]" +msgstr "git merge [<các-tùy-chá»n>] [<commit>…]" #: builtin/merge.c:46 -msgid "git merge [options] <msg> HEAD <commit>" -msgstr "git merge [các-tùy-chá»n] <tin-nhắn> HEAD <commit>" +msgid "git merge [<options>] <msg> HEAD <commit>" +msgstr "git merge [<các-tùy-chá»n>] <tin-nhắn> HEAD <commit>" #: builtin/merge.c:47 msgid "git merge --abort" @@ -7143,7 +7179,7 @@ msgstr "" #: builtin/merge.c:1141 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." -msgstr "Bạn chÆ°a kết thúc việc hòa trá»™ng (MERGE_HEAD vẫn tồn tại)." +msgstr "Bạn chÆ°a kết thúc việc hòa trá»™n (MERGE_HEAD vẫn tồn tại)." #: builtin/merge.c:1145 msgid "" @@ -7257,12 +7293,12 @@ msgstr "" "cầu\n" #: builtin/merge-base.c:29 -msgid "git merge-base [-a|--all] <commit> <commit>..." -msgstr "git merge-base [-a|--all] <commit> <lần_chuyển_giao>…" +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "git merge-base [-a | --all] <lần_chuyển_giao> <lần_chuyển_giao>…" #: builtin/merge-base.c:30 -msgid "git merge-base [-a|--all] --octopus <commit>..." -msgstr "git merge-base [-a|--all] --octopus <lần_chuyển_giao>…" +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "git merge-base [-a | --all] --octopus <lần_chuyển_giao>…" #: builtin/merge-base.c:31 msgid "git merge-base --independent <commit>..." @@ -7298,11 +7334,11 @@ msgstr "tìm xem <commit> được rẽ nhánh ở đâu từ reflog của <th.c #: builtin/merge-file.c:8 msgid "" -"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " -"file2" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" msgstr "" -"git merge-file [các-tùy-chá»n] [-L tên1 [-L gốc [-L tên2]]] táºp-tin1 táºp-tin-" -"gốc táºp-tin2" +"git merge-file [<các-tùy-chá»n>] [-L <tên1> [-L <gốc> [-L <tên2>]]] <táºp-" +"tin1> <táºp-tin-gốc> <táºp-tin2>" #: builtin/merge-file.c:33 msgid "send results to standard output" @@ -7333,7 +7369,7 @@ msgid "do not warn about conflicts" msgstr "không cảnh báo vá» các xung Ä‘á»™t xảy ra" #: builtin/merge-file.c:45 -msgid "set labels for file1/orig_file/file2" +msgid "set labels for file1/orig-file/file2" msgstr "đặt nhãn cho táºp-tin-1/táºp-tin-gốc/táºp-tin-2" #: builtin/mktree.c:64 @@ -7353,8 +7389,8 @@ msgid "allow creation of more than one tree" msgstr "cho phép tạo nhiá»u hÆ¡n má»™t cây" #: builtin/mv.c:15 -msgid "git mv [options] <source>... <destination>" -msgstr "git mv [các-tùy-chá»n] <nguồn>… <Ä‘Ãch>" +msgid "git mv [<options>] <source>... <destination>" +msgstr "git mv [<các-tùy-chá»n>] <nguồn>… <Ä‘Ãch>" #: builtin/mv.c:69 #, c-format @@ -7440,22 +7476,22 @@ msgstr "%s, nguồn=%s, Ä‘Ãch=%s" msgid "Renaming %s to %s\n" msgstr "Äổi tên %s thà nh %s\n" -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:355 +#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359 #, c-format msgid "renaming '%s' failed" msgstr "gặp lá»—i khi đổi tên “%sâ€" #: builtin/name-rev.c:255 -msgid "git name-rev [options] <commit>..." -msgstr "git name-rev [các-tùy-chá»n] <commit>…" +msgid "git name-rev [<options>] <commit>..." +msgstr "git name-rev [<các-tùy-chá»n>] <commit>…" #: builtin/name-rev.c:256 -msgid "git name-rev [options] --all" -msgstr "git name-rev [các-tùy-chá»n] --all" +msgid "git name-rev [<options>] --all" +msgstr "git name-rev [<các-tùy-chá»n>] --all" #: builtin/name-rev.c:257 -msgid "git name-rev [options] --stdin" -msgstr "git name-rev [các-tùy-chá»n] --stdin" +msgid "git name-rev [<options>] --stdin" +msgstr "git name-rev [<các-tùy-chá»n>] --stdin" #: builtin/name-rev.c:309 msgid "print only names (no SHA-1)" @@ -7487,42 +7523,42 @@ msgid "dereference tags in the input (internal use)" msgstr "bãi bá» tham chiếu các thẻ trong đầu và o (dùng ná»™i bá»™)" #: builtin/notes.c:24 -msgid "git notes [--ref <notes_ref>] [list [<object>]]" -msgstr "git notes [--ref <notes_ref>] [list [<đối-tượng>]]" +msgid "git notes [--ref <notes-ref>] [list [<object>]]" +msgstr "git notes [--ref <notes-ref>] [list [<đối-tượng>]]" #: builtin/notes.c:25 msgid "" -"git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" msgstr "" -"git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <lá»i-nhắn> | -F " +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <lá»i-nhắn> | -F " "<táºp-tin> | (-c | -C) <đối-tượng>] [<đối-tượng>]" #: builtin/notes.c:26 -msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" -msgstr "git notes [--ref <notes_ref>] copy [-f] <từ-đối-tượng> <đến-đối-tượng>" +msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" +msgstr "git notes [--ref <notes-ref>] copy [-f] <từ-đối-tượng> <đến-đối-tượng>" #: builtin/notes.c:27 msgid "" -"git notes [--ref <notes_ref>] append [--allow-empty] [-m <msg> | -F <file> | " +"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" msgstr "" -"git notes [--ref <notes_ref>] append [--allow-empty] [-m <lá»i-nhắn> | -F " +"git notes [--ref <notes-ref>] append [--allow-empty] [-m <lá»i-nhắn> | -F " "<táºp-tin> | (-c | -C) <đối-tượng>] [<đối-tượng>]" #: builtin/notes.c:28 -msgid "git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]" -msgstr "git notes [--ref <notes_ref>] edit [--allow-empty] [<đối-tượng>]" +msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" +msgstr "git notes [--ref <notes-ref>] edit [--allow-empty] [<đối-tượng>]" #: builtin/notes.c:29 -msgid "git notes [--ref <notes_ref>] show [<object>]" -msgstr "git notes [--ref <notes_ref>] show [<đối-tượng>]" +msgid "git notes [--ref <notes-ref>] show [<object>]" +msgstr "git notes [--ref <notes-ref>] show [<đối-tượng>]" #: builtin/notes.c:30 msgid "" -"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" +"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "" -"git notes [--ref <notes_ref>] merge [-v | -q] [-s <chiến-lược> ] <notes_ref>" +"git notes [--ref <notes-ref>] merge [-v | -q] [-s <chiến-lược> ] <notes-ref>" #: builtin/notes.c:31 msgid "git notes merge --commit [-v | -q]" @@ -7533,16 +7569,16 @@ msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" #: builtin/notes.c:33 -msgid "git notes [--ref <notes_ref>] remove [<object>...]" -msgstr "git notes [--ref <notes_ref>] remove [<đối-tượng>…]" +msgid "git notes [--ref <notes-ref>] remove [<object>...]" +msgstr "git notes [--ref <notes-ref>] remove [<đối-tượng>…]" #: builtin/notes.c:34 -msgid "git notes [--ref <notes_ref>] prune [-n | -v]" -msgstr "git notes [--ref <notes_ref>] prune [-n | -v]" +msgid "git notes [--ref <notes-ref>] prune [-n | -v]" +msgstr "git notes [--ref <notes-ref>] prune [-n | -v]" #: builtin/notes.c:35 -msgid "git notes [--ref <notes_ref>] get-ref" -msgstr "git notes [--ref <notes_ref>] get-ref" +msgid "git notes [--ref <notes-ref>] get-ref" +msgstr "git notes [--ref <notes-ref>] get-ref" #: builtin/notes.c:40 msgid "git notes [list [<object>]]" @@ -7573,8 +7609,8 @@ msgid "git notes show [<object>]" msgstr "git notes show [<đối tượng>]" #: builtin/notes.c:71 -msgid "git notes merge [<options>] <notes_ref>" -msgstr "git notes merge [<các-tùy-chá»n>] <notes_ref>" +msgid "git notes merge [<options>] <notes-ref>" +msgstr "git notes merge [<các-tùy-chá»n>] <notes-ref>" #: builtin/notes.c:72 msgid "git notes merge --commit [<options>]" @@ -7813,8 +7849,8 @@ msgid "notes-ref" msgstr "notes-ref" #: builtin/notes.c:954 -msgid "use notes from <notes_ref>" -msgstr "dùng “notes†từ <notes_ref>" +msgid "use notes from <notes-ref>" +msgstr "dùng “notes†từ <notes-ref>" #: builtin/notes.c:989 builtin/remote.c:1621 #, c-format @@ -7833,187 +7869,187 @@ msgstr "" "git pack-objects [các-tùy-chá»n…] base-name [< danh-sách-ref | < danh-sách-" "đối-tượng]" -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 +#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 #, c-format msgid "deflate error (%d)" msgstr "lá»—i giải nén (%d)" -#: builtin/pack-objects.c:773 +#: builtin/pack-objects.c:771 msgid "Writing objects" msgstr "Äang ghi lại các đối tượng" -#: builtin/pack-objects.c:1015 +#: builtin/pack-objects.c:1013 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "tắt ghi bitmap, nhÆ° váºy má»™t số đối tượng sẽ không được đóng gói" -#: builtin/pack-objects.c:2175 +#: builtin/pack-objects.c:2173 msgid "Compressing objects" msgstr "Äang nén các đối tượng" -#: builtin/pack-objects.c:2572 +#: builtin/pack-objects.c:2570 #, c-format msgid "unsupported index version %s" msgstr "phiên bản mục lục không được há»— trợ %s" -#: builtin/pack-objects.c:2576 +#: builtin/pack-objects.c:2574 #, c-format msgid "bad index version '%s'" msgstr "phiên bản mục lục sai “%sâ€" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2597 #, c-format msgid "option %s does not accept negative form" msgstr "tùy chá»n %s không chấp nháºn dạng thức âm" -#: builtin/pack-objects.c:2603 +#: builtin/pack-objects.c:2601 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "không thể phân tÃch giá trị “%s†cho tùy chá»n %s" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2621 msgid "do not show progress meter" msgstr "không hiển thị bá»™ Ä‘o tiến trình" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2623 msgid "show progress meter" msgstr "hiển thị bá»™ Ä‘o tiến trình" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2625 msgid "show progress meter during object writing phase" msgstr "hiển thị bá»™ Ä‘o tiến triển trong suốt pha ghi đối tượng" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2628 msgid "similar to --all-progress when progress meter is shown" msgstr "tÆ°Æ¡ng tá»± --all-progress khi bá»™ Ä‘o tiến trình được xuất hiện" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2629 msgid "version[,offset]" msgstr "phiên bản[,offset]" -#: builtin/pack-objects.c:2632 +#: builtin/pack-objects.c:2630 msgid "write the pack index file in the specified idx format version" msgstr "ghi táºp tin bảng mục lục gói (pack) ở phiên bản định dạng idx đã cho" -#: builtin/pack-objects.c:2635 +#: builtin/pack-objects.c:2633 msgid "maximum size of each output pack file" msgstr "kcÃh thÆ°á»›c tối Ä‘a cho táºp tin gói được tạo" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2635 msgid "ignore borrowed objects from alternate object store" msgstr "bá» qua các đối tượng vay mượn từ kho đối tượng thay thế" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:2637 msgid "ignore packed objects" msgstr "bá» qua các đối tượng đóng gói" -#: builtin/pack-objects.c:2641 +#: builtin/pack-objects.c:2639 msgid "limit pack window by objects" msgstr "giá»›i hạn cá»a sổ đóng gói theo đối tượng" -#: builtin/pack-objects.c:2643 +#: builtin/pack-objects.c:2641 msgid "limit pack window by memory in addition to object limit" msgstr "giá»›i hạn cá»a sổ đóng gói theo bá»™ nhá»› cá»™ng thêm vá»›i giá»›i hạn đối tượng" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2643 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "Ä‘á»™ dà i tối Ä‘a của chuá»—i móc xÃch “delta†được phép trong gói kết quả" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2645 msgid "reuse existing deltas" msgstr "dùng lại các delta sẵn có" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2647 msgid "reuse existing objects" msgstr "dùng lại các đối tượng sẵn có" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2649 msgid "use OFS_DELTA objects" msgstr "dùng các đối tượng OFS_DELTA" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2651 msgid "use threads when searching for best delta matches" msgstr "sá» dụng các tuyến trình khi tìm kiếm cho các mẫu khá»›p delta tốt nhất" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2653 msgid "do not create an empty pack output" msgstr "không thể tạo kết xuất gói trống rá»—ng" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2655 msgid "read revision arguments from standard input" msgstr " Ä‘á»c tham số “revision†từ thiết bị nháºp chuẩn" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2657 msgid "limit the objects to those that are not yet packed" msgstr "giá»›i hạn các đối tượng thà nh những cái mà chúng vẫn chÆ°a được đóng gói" -#: builtin/pack-objects.c:2662 +#: builtin/pack-objects.c:2660 msgid "include objects reachable from any reference" msgstr "bao gồm các đối tượng có thể Ä‘á»c được từ bất kỳ tham chiếu nà o" -#: builtin/pack-objects.c:2665 +#: builtin/pack-objects.c:2663 msgid "include objects referred by reflog entries" msgstr "bao gồm các đối tượng được tham chiếu bởi các mục reflog" -#: builtin/pack-objects.c:2668 +#: builtin/pack-objects.c:2666 msgid "include objects referred to by the index" msgstr "bao gồm các đối tượng được tham chiếu bởi mục lục" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2669 msgid "output pack to stdout" msgstr "xuất gói ra đầu ra tiêu chuẩn" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2671 msgid "include tag objects that refer to objects to be packed" msgstr "bao gồm các đối tượng tham chiếu đến các đối tượng được đóng gói" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2673 msgid "keep unreachable objects" msgstr "giữ lại các đối tượng không thể Ä‘á»c được" -#: builtin/pack-objects.c:2676 parse-options.h:140 +#: builtin/pack-objects.c:2674 parse-options.h:140 msgid "time" msgstr "thá»i-gian" -#: builtin/pack-objects.c:2677 +#: builtin/pack-objects.c:2675 msgid "unpack unreachable objects newer than <time>" msgstr "" "xả nén (gỡ khá»i gói) các đối tượng không thể Ä‘á»c được má»›i hÆ¡n <thá»i-gian>" -#: builtin/pack-objects.c:2680 +#: builtin/pack-objects.c:2678 msgid "create thin packs" msgstr "tạo gói nhẹ" -#: builtin/pack-objects.c:2682 +#: builtin/pack-objects.c:2680 msgid "create packs suitable for shallow fetches" msgstr "tạo gói để phù hợp cho lấy vá» nông (shallow)" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2682 msgid "ignore packs that have companion .keep file" msgstr "bá» qua các gói mà nó có táºp tin .keep Ä‘i kèm" -#: builtin/pack-objects.c:2686 +#: builtin/pack-objects.c:2684 msgid "pack compression level" msgstr "mức nén gói" -#: builtin/pack-objects.c:2688 +#: builtin/pack-objects.c:2686 msgid "do not hide commits by grafts" msgstr "không ẩn các lần chuyển giao bởi “graftsâ€" -#: builtin/pack-objects.c:2690 +#: builtin/pack-objects.c:2688 msgid "use a bitmap index if available to speed up counting objects" msgstr "dùng mục lục ánh xạ nếu có thể được để nâng cao tốc Ä‘á»™ đếm đối tượng" -#: builtin/pack-objects.c:2692 +#: builtin/pack-objects.c:2690 msgid "write a bitmap index together with the pack index" msgstr "ghi má»™t mục lục ánh xạ cùng vá»›i mục lục gói" -#: builtin/pack-objects.c:2783 +#: builtin/pack-objects.c:2781 msgid "Counting objects" msgstr "Äang đếm các đối tượng" #: builtin/pack-refs.c:6 -msgid "git pack-refs [options]" -msgstr "git pack-refs [các-tùy-chá»n]" +msgid "git pack-refs [<options>]" +msgstr "git pack-refs [<các-tùy-chá»n>]" #: builtin/pack-refs.c:14 msgid "pack everything" @@ -8024,8 +8060,8 @@ msgid "prune loose refs (default)" msgstr "prune (cắt cụt) những tham chiếu bị mất (mặc định)" #: builtin/prune-packed.c:7 -msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" -msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" +msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" +msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" #: builtin/prune-packed.c:40 msgid "Removing duplicate objects" @@ -8306,75 +8342,79 @@ msgstr "--mirror không thể được tổ hợp cùng vá»›i đặc tả Ä‘Æ°á» msgid "--all and --mirror are incompatible" msgstr "--all và --mirror xung khắc nhau" -#: builtin/push.c:493 +#: builtin/push.c:502 msgid "repository" msgstr "kho" -#: builtin/push.c:494 +#: builtin/push.c:503 msgid "push all refs" msgstr "đẩy tất cả các tham chiếu" -#: builtin/push.c:495 +#: builtin/push.c:504 msgid "mirror all refs" msgstr "mirror tất cả các tham chiếu" -#: builtin/push.c:497 +#: builtin/push.c:506 msgid "delete refs" msgstr "xóa các tham chiếu" -#: builtin/push.c:498 +#: builtin/push.c:507 msgid "push tags (can't be used with --all or --mirror)" msgstr "đẩy các thẻ (không dùng cùng vá»›i --all hay --mirror)" -#: builtin/push.c:501 +#: builtin/push.c:510 msgid "force updates" msgstr "ép buá»™c cáºp nháºt" -#: builtin/push.c:503 +#: builtin/push.c:512 msgid "refname>:<expect" msgstr "tên-tham-chiếu>:<cần" -#: builtin/push.c:504 +#: builtin/push.c:513 msgid "require old value of ref to be at this value" msgstr "yêu cầu giá-trị cÅ© của tham chiếu thì là giá-trị nà y" -#: builtin/push.c:507 +#: builtin/push.c:516 msgid "control recursive pushing of submodules" msgstr "Ä‘iá»u khiển việc đẩy lên (push) đệ qui của mô-Ä‘un-con" -#: builtin/push.c:509 +#: builtin/push.c:518 msgid "use thin pack" msgstr "tạo gói nhẹ" -#: builtin/push.c:510 builtin/push.c:511 +#: builtin/push.c:519 builtin/push.c:520 msgid "receive pack program" msgstr "chÆ°Æ¡ng trình nháºn gói" -#: builtin/push.c:512 +#: builtin/push.c:521 msgid "set upstream for git pull/status" msgstr "đặt thượng nguồn cho git pull/status" -#: builtin/push.c:515 +#: builtin/push.c:524 msgid "prune locally removed refs" msgstr "xén tỉa những tham chiếu bị gỡ bá»" -#: builtin/push.c:517 +#: builtin/push.c:526 msgid "bypass pre-push hook" msgstr "vòng qua móc tiá»n-đẩy (pre-push)" -#: builtin/push.c:518 +#: builtin/push.c:527 msgid "push missing but relevant tags" msgstr "push phần bị thiếu nhÆ°ng các thẻ lại thÃch hợp" -#: builtin/push.c:520 +#: builtin/push.c:529 msgid "GPG sign the push" msgstr "ký lần đẩy dùng GPG" -#: builtin/push.c:529 +#: builtin/push.c:530 +msgid "request atomic transaction on remote side" +msgstr "yêu cầu giao dịch hạt nhân bên phÃa máy chủ" + +#: builtin/push.c:539 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete là xung khắc vá»›i các tùy chá»n --all, --mirror và --tags" -#: builtin/push.c:531 +#: builtin/push.c:541 msgid "--delete doesn't make sense without any refs" msgstr "--delete không hợp lý nếu không có bất kỳ tham chiếu nà o" @@ -8454,12 +8494,12 @@ msgstr "bá» qua áp dụng bá»™ lá»c lấy ra (checkout) thÆ°a thá»›t" msgid "debug unpack-trees" msgstr "gỡ lá»—i “unpack-treesâ€" -#: builtin/reflog.c:499 +#: builtin/reflog.c:429 #, c-format msgid "%s' for '%s' is not a valid timestamp" msgstr "giá trị %s dà nh cho “%s†không phải là dấu vết thá»i gian hợp lệ" -#: builtin/reflog.c:615 builtin/reflog.c:620 +#: builtin/reflog.c:546 builtin/reflog.c:551 #, c-format msgid "'%s' is not a valid timestamp" msgstr "“%s†không phải là dấu thá»i gian hợp lệ" @@ -8470,7 +8510,7 @@ msgstr "git remote [-v | --verbose]" #: builtin/remote.c:13 msgid "" -"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" +"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" "git remote add [-t <nhánh>] [-m <master>] [-f] [--tags|--no-tags] [--" @@ -8484,8 +8524,8 @@ msgstr "git remote rename <tên-cÅ©> <tên-má»›i>" msgid "git remote remove <name>" msgstr "git remote remove <tên>" -#: builtin/remote.c:16 -msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" +#: builtin/remote.c:16 builtin/remote.c:43 +msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <tên> (-a | --auto | -d | --delete | <nhánh>)" #: builtin/remote.c:17 @@ -8522,10 +8562,6 @@ msgstr "git remote set-url --delete <tên> <url>" msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<các-tùy-chá»n>] <tên> <url>" -#: builtin/remote.c:43 -msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" -msgstr "git remote set-head <tên> (-a | --auto | -d | --delete | <nhánh>)" - #: builtin/remote.c:48 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <tên> <nhánh>…" @@ -8953,8 +8989,8 @@ msgid "be verbose; must be placed before a subcommand" msgstr "chi tiết; phải được đặt trÆ°á»›c má»™t lệnh-con" #: builtin/repack.c:17 -msgid "git repack [options]" -msgstr "git repack [các-tùy-chá»n]" +msgid "git repack [<options>]" +msgstr "git repack [<các-tùy-chá»n>]" #: builtin/repack.c:159 msgid "pack everything in a single pack" @@ -9020,7 +9056,7 @@ msgstr "kcÃh thÆ°á»›c tối Ä‘a cho từng táºp tin gói" msgid "repack objects in packs marked with .keep" msgstr "đóng gói lại các đối tượng trong các gói đã đánh dấu bằng .keep" -#: builtin/repack.c:371 +#: builtin/repack.c:375 #, c-format msgid "removing '%s' failed" msgstr "gặp lá»—i khi xóa bỠ“%sâ€" @@ -9112,8 +9148,9 @@ msgid "use this format" msgstr "dùng định dạng nà y" #: builtin/rerere.c:12 -msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" -msgstr "git rerere [clear | forget path… | status | remaining | diff | gc]" +msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" +msgstr "" +"git rerere [clear | forget <Ä‘Æ°á»ng dẫn>… | status | remaining | diff | gc]" #: builtin/rerere.c:57 msgid "register clean resolutions in index" @@ -9253,8 +9290,8 @@ msgid "Could not write new index file." msgstr "Không thể ghi táºp tin lÆ°u bảng mục lục má»›i." #: builtin/rev-parse.c:361 -msgid "git rev-parse --parseopt [options] -- [<args>...]" -msgstr "git rev-parse --parseopt [các-tùy-chá»n] -- [<th.số>…]" +msgid "git rev-parse --parseopt [<options>] -- [<args>...]" +msgstr "git rev-parse --parseopt [<các-tùy-chá»n>] -- [<các tham số>…]" #: builtin/rev-parse.c:366 msgid "keep the `--` passed as an arg" @@ -9270,29 +9307,29 @@ msgstr "kết xuất trong định dạng gáºy dà i" #: builtin/rev-parse.c:499 msgid "" -"git rev-parse --parseopt [options] -- [<args>...]\n" +"git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" -" or: git rev-parse [options] [<arg>...]\n" +" or: git rev-parse [<options>] [<arg>...]\n" "\n" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "" -"git rev-parse --parseopt [các-tùy-chá»n] -- [<Ä‘.số>…]\n" +"git rev-parse --parseopt [<các-tùy-chá»n>] -- [<các đối số>…]\n" " hoặc: git rev-parse --sq-quote [<Ä‘.số>…]\n" -" hoặc: git rev-parse [các-tùy-chá»n] [<Ä‘.số>…]\n" +" hoặc: git rev-parse [<các-tùy-chá»n>] [<Ä‘.số>…]\n" "\n" "Chạy lệnh \"git rev-parse --parseopt -h\" để có thêm thông tin vá» cách dùng." #: builtin/revert.c:22 -msgid "git revert [options] <commit-ish>..." -msgstr "git revert [các-tùy-chá»n] <commit-ish>…" +msgid "git revert [<options>] <commit-ish>..." +msgstr "git revert [<các-tùy-chá»n>] <commit-ish>…" #: builtin/revert.c:23 msgid "git revert <subcommand>" msgstr "git revert <lệnh-con>" #: builtin/revert.c:28 -msgid "git cherry-pick [options] <commit-ish>..." -msgstr "git cherry-pick [các-tùy-chá»n] <commit-ish>…" +msgid "git cherry-pick [<options>] <commit-ish>..." +msgstr "git cherry-pick [<các-tùy-chá»n>] <commit-ish>…" #: builtin/revert.c:29 msgid "git cherry-pick <subcommand>" @@ -9372,8 +9409,8 @@ msgid "cherry-pick failed" msgstr "cherry-pick gặp lá»—i" #: builtin/rm.c:17 -msgid "git rm [options] [--] <file>..." -msgstr "git rm [các-tùy-chá»n] [--] <táºp-tin>…" +msgid "git rm [<options>] [--] <file>..." +msgstr "git rm [<các-tùy-chá»n>] [--] <táºp-tin>…" #: builtin/rm.c:65 msgid "" @@ -9469,8 +9506,8 @@ msgid "git rm: unable to remove %s" msgstr "git rm: không thể gỡ bá» %s" #: builtin/shortlog.c:13 -msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]" -msgstr "git shortlog [các-tùy-chá»n] [<vùng-xét-duyệt>] [[--] [<Ä‘Æ°á»ng-dẫn>…]]" +msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" +msgstr "git shortlog [<các-tùy-chá»n>] [<vùng-xét-duyệt>] [[--] [<Ä‘Æ°á»ng-dẫn>…]]" #: builtin/shortlog.c:131 #, c-format @@ -9499,19 +9536,19 @@ msgstr "Ngắt dòng khi quá dà i" #: builtin/show-branch.c:9 msgid "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" msgstr "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<khi>] | --no-color] [--sparse]\n" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)…]" #: builtin/show-branch.c:13 -msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" -msgstr "git show-branch (-g|--reflog)[=<n>[,<ná»n>]] [--list] [<ref>]" +msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" +msgstr "git show-branch (-g | --reflog)[=<n>[,<ná»n>]] [--list] [<ref>]" #: builtin/show-branch.c:652 msgid "show remote-tracking and local branches" @@ -9579,11 +9616,11 @@ msgstr "hiển thị <n> các mục “ref-log†gần nhất kể từ ná»n ( #: builtin/show-ref.c:10 msgid "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" msgstr "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [mẫu*] " +"git show-ref [-q | --quiet] [--verify] [--head] [-d|--dereference] [-s|--hash" +"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<mẫu>…] " #: builtin/show-ref.c:11 msgid "git show-ref --exclude-existing[=pattern] < ref-list" @@ -9626,12 +9663,12 @@ msgstr "" "bá»™" #: builtin/symbolic-ref.c:7 -msgid "git symbolic-ref [options] name [ref]" -msgstr "git symbolic-ref [các-tùy-chá»n] tên [t.chiếu]" +msgid "git symbolic-ref [<options>] <name> [<ref>]" +msgstr "git symbolic-ref [<các-tùy-chá»n>] <tên> [<t.chiếu>]" #: builtin/symbolic-ref.c:8 -msgid "git symbolic-ref -d [-q] name" -msgstr "git symbolic-ref -d [-q] tên" +msgid "git symbolic-ref -d [-q] <name>" +msgstr "git symbolic-ref -d [-q] <tên>" #: builtin/symbolic-ref.c:40 msgid "suppress error message for non-symbolic (detached) refs" @@ -9655,9 +9692,11 @@ msgstr "lý do cáºp nháºt" #: builtin/tag.c:22 msgid "" -"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " +"[<head>]" msgstr "" -"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <táºp-tin>] <tên-thẻ> [<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg>|-F <táºp-tin>] <tên-thẻ> " +"[<head>]" #: builtin/tag.c:23 msgid "git tag -d <tagname>..." @@ -9665,10 +9704,11 @@ msgstr "git tag -d <tên-thẻ>…" #: builtin/tag.c:24 msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" "\t\t[<pattern>...]" msgstr "" -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <đối-tượng>] \n" +"git tag -l [-n[<số>]] [--contains <lần_chuyển_giao>] [--points-at <đối-" +"tượng>]\n" "\t\t[<mẫu>…]" #: builtin/tag.c:26 @@ -9693,7 +9733,7 @@ msgstr "không tìm thấy tìm thấy thẻ “%sâ€." #: builtin/tag.c:321 #, c-format msgid "Deleted tag '%s' (was %s)\n" -msgstr "Thẻ đã bị xóa “%s†(trÆ°á»›c là %s)\n" +msgstr "Thẻ đã bị xóa “%s†(từng là %s)\n" #: builtin/tag.c:333 #, c-format @@ -9723,7 +9763,7 @@ msgid "" "want to.\n" msgstr "" "\n" -"Viết các ghi chú cho (thẻ) tag\n" +"Viết các ghi chú cho thẻ:\n" " %s\n" "Những dòng được bắt đầu bằng “%c†sẽ được giữ lại; bạn có thể xóa chúng Ä‘i " "nếu muốn.\n" @@ -9812,18 +9852,18 @@ msgstr "dùng kháo khác để ký thẻ" msgid "replace the tag if exists" msgstr "thay thế nếu tag đó đã có trÆ°á»›c" -#: builtin/tag.c:608 +#: builtin/tag.c:609 +msgid "Tag listing options" +msgstr "Các tùy chá»n liệt kê thẻ" + +#: builtin/tag.c:610 msgid "show tag list in columns" msgstr "hiển thị danh sách thẻ trong các cá»™t" -#: builtin/tag.c:610 +#: builtin/tag.c:612 msgid "sort tags" msgstr "sắp xếp các thẻ" -#: builtin/tag.c:614 -msgid "Tag listing options" -msgstr "Các tùy chá»n liệt kê thẻ" - #: builtin/tag.c:617 builtin/tag.c:623 msgid "print only tags that contain the commit" msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao" @@ -9880,136 +9920,136 @@ msgid "Unpacking objects" msgstr "Äang giải nén các đối tượng" #: builtin/update-index.c:403 -msgid "git update-index [options] [--] [<file>...]" -msgstr "git update-index [các-tùy-chá»n] [<táºp-tin>…]" +msgid "git update-index [<options>] [--] [<file>...]" +msgstr "git update-index [<các-tùy-chá»n>] [--] [<táºp-tin>…]" -#: builtin/update-index.c:756 +#: builtin/update-index.c:757 msgid "continue refresh even when index needs update" msgstr "tiếp tục là m má»›i ngay cả khi bảng mục lục cần được cáºp nháºt" -#: builtin/update-index.c:759 +#: builtin/update-index.c:760 msgid "refresh: ignore submodules" msgstr "refresh: lá» Ä‘i mô-Ä‘un-con" -#: builtin/update-index.c:762 +#: builtin/update-index.c:763 msgid "do not ignore new files" msgstr "không bá» qua các táºp tin má»›i tạo" -#: builtin/update-index.c:764 +#: builtin/update-index.c:765 msgid "let files replace directories and vice-versa" msgstr "để các táºp tin thay thế các thÆ° mục và “vice-versaâ€" -#: builtin/update-index.c:766 +#: builtin/update-index.c:767 msgid "notice files missing from worktree" msgstr "thông báo các táºp-tin thiếu trong thÆ°-mục là m việc" -#: builtin/update-index.c:768 +#: builtin/update-index.c:769 msgid "refresh even if index contains unmerged entries" msgstr "" "là m tÆ°Æ¡i má»›i tháºm chà khi bảng mục lục chứa các mục tin chÆ°a được hòa trá»™n" -#: builtin/update-index.c:771 +#: builtin/update-index.c:772 msgid "refresh stat information" msgstr "lấy lại thông tin thống kê" -#: builtin/update-index.c:775 +#: builtin/update-index.c:776 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "giống --refresh, nhÆ°ng bá» qua các cà i đặt “assume-unchangedâ€" -#: builtin/update-index.c:779 +#: builtin/update-index.c:780 msgid "<mode>,<object>,<path>" msgstr "<chế_Ä‘á»™>,<đối_tượng>,<Ä‘Æ°á»ng_dẫn>" -#: builtin/update-index.c:780 +#: builtin/update-index.c:781 msgid "add the specified entry to the index" msgstr "thêm các táºp tin đã chỉ ra và o bảng mục lục" -#: builtin/update-index.c:784 +#: builtin/update-index.c:785 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/update-index.c:785 +#: builtin/update-index.c:786 msgid "override the executable bit of the listed files" msgstr "ghi đè lên bÃt thi hà nh của các táºp tin được liệt kê" -#: builtin/update-index.c:789 +#: builtin/update-index.c:790 msgid "mark files as \"not changing\"" msgstr "Äánh dấu các táºp tin là \"không thay đổi\"" -#: builtin/update-index.c:792 +#: builtin/update-index.c:793 msgid "clear assumed-unchanged bit" msgstr "xóa bÃt assumed-unchanged (giả định là không thay đổi)" -#: builtin/update-index.c:795 +#: builtin/update-index.c:796 msgid "mark files as \"index-only\"" msgstr "đánh dấu các táºp tin là “chỉ-Ä‘á»câ€" -#: builtin/update-index.c:798 +#: builtin/update-index.c:799 msgid "clear skip-worktree bit" msgstr "xóa bÃt skip-worktree" -#: builtin/update-index.c:801 +#: builtin/update-index.c:802 msgid "add to index only; do not add content to object database" msgstr "" "chỉ thêm và o bảng mục lục; không thêm ná»™i dung và o cÆ¡ sở dữ liệu đối tượng" -#: builtin/update-index.c:803 +#: builtin/update-index.c:804 msgid "remove named paths even if present in worktree" msgstr "" "gỡ bá» các Ä‘Æ°á»ng dẫn được đặt tên tháºm chà cả khi nó hiện diện trong thÆ° mục " "là m việc" -#: builtin/update-index.c:805 +#: builtin/update-index.c:806 msgid "with --stdin: input lines are terminated by null bytes" msgstr "vá»›i tùy chá»n --stdin: các dòng đầu và o được chấm dứt bởi ký tá»± null" -#: builtin/update-index.c:807 +#: builtin/update-index.c:808 msgid "read list of paths to be updated from standard input" msgstr "Ä‘á»c danh sách Ä‘Æ°á»ng dẫn cần cáºp nháºt từ đầu và o tiêu chuẩn" -#: builtin/update-index.c:811 +#: builtin/update-index.c:812 msgid "add entries from standard input to the index" msgstr "không thể Ä‘á»c các mục từ đầu và o tiêu chuẩn và o bảng mục lục" -#: builtin/update-index.c:815 +#: builtin/update-index.c:816 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "phục hồi các trạng thái #2 và #3 cho các Ä‘Æ°á»ng dẫn được liệt kê" -#: builtin/update-index.c:819 +#: builtin/update-index.c:820 msgid "only update entries that differ from HEAD" msgstr "chỉ cáºp nháºt các mục tin mà nó khác biệt so vá»›i HEAD" -#: builtin/update-index.c:823 +#: builtin/update-index.c:824 msgid "ignore files missing from worktree" msgstr "bá» qua các táºp-tin thiếu trong thÆ°-mục là m việc" -#: builtin/update-index.c:826 +#: builtin/update-index.c:827 msgid "report actions to standard output" msgstr "báo cáo các thao tác ra thiết bị xuất chuẩn" -#: builtin/update-index.c:828 +#: builtin/update-index.c:829 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(cho “porcelainsâ€) quên các xung Ä‘á»™t chÆ°a được giải quyết đã ghi" -#: builtin/update-index.c:832 +#: builtin/update-index.c:833 msgid "write index in this format" msgstr "ghi mục lục ở định dạng nà y" -#: builtin/update-index.c:834 +#: builtin/update-index.c:835 msgid "enable or disable split index" msgstr "báºt/tắt chia cắt bảng mục lục" #: builtin/update-ref.c:9 -msgid "git update-ref [options] -d <refname> [<oldval>]" -msgstr "git update-ref [các-tùy-chá»n] -d <refname> [<biến-cÅ©>]" +msgid "git update-ref [<options>] -d <refname> [<old-val>]" +msgstr "git update-ref [<các-tùy-chá»n>] -d <refname> [<biến-cÅ©>]" #: builtin/update-ref.c:10 -msgid "git update-ref [options] <refname> <newval> [<oldval>]" -msgstr "git update-ref [các-tùy-chá»n] <refname> <biến-má»›i> [<biến-cÅ©>]" +msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" +msgstr "git update-ref [<các-tùy-chá»n>] <refname> <biến-má»›i> [<biến-cÅ©>]" #: builtin/update-ref.c:11 -msgid "git update-ref [options] --stdin [-z]" -msgstr "git update-ref [các-tùy-chá»n] --stdin [-z]" +msgid "git update-ref [<options>] --stdin [-z]" +msgstr "git update-ref [<các-tùy-chá»n>] --stdin [-z]" #: builtin/update-ref.c:359 msgid "delete the reference" @@ -10036,16 +10076,16 @@ msgid "update the info files from scratch" msgstr "cáºp nháºt các táºp tin thông tin từ Ä‘iểm xuất phát" #: builtin/verify-commit.c:17 -msgid "git verify-commit [-v|--verbose] <commit>..." -msgstr "git verify-commit [-v|--verbose] <lần_chuyển_giao>…" +msgid "git verify-commit [-v | --verbose] <commit>..." +msgstr "git verify-commit [-v | --verbose] <lần_chuyển_giao>…" #: builtin/verify-commit.c:75 msgid "print commit contents" msgstr "hiển thị ná»™i dung của lần chuyển giao" #: builtin/verify-pack.c:54 -msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." -msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <gói>…" +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." +msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <gói>…" #: builtin/verify-pack.c:64 msgid "verbose" @@ -10056,8 +10096,8 @@ msgid "show statistics only" msgstr "chỉ hiển thị thống kê" #: builtin/verify-tag.c:17 -msgid "git verify-tag [-v|--verbose] <tag>..." -msgstr "git verify-tag [-v|--verbose] <thẻ>…" +msgid "git verify-tag [-v | --verbose] <tag>..." +msgstr "git verify-tag [-v | --verbose] <thẻ>…" #: builtin/verify-tag.c:73 msgid "print tag contents" @@ -10416,14 +10456,14 @@ msgstr "HEAD sai - Tôi cần má»™t HEAD" #: git-bisect.sh:130 #, sh-format msgid "" -"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." +"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." msgstr "" -"Việc checkout “$start_head†gặp lá»—i. Hãy thỠ“git bisect reset " -"<nhánh_hợp_lệ>â€." +"Việc lấy “$start_head†ra gặp lá»—i. Hãy thá» \"git bisect reset <nhánh_hợp_lệ>" +"\"." #: git-bisect.sh:140 msgid "won't bisect on cg-seek'ed tree" -msgstr "sẽ không bisect trêm cây được cg-seek" +msgstr "sẽ không di chuyển ná»a bÆ°á»›c trên cây được cg-seek" #: git-bisect.sh:144 msgid "Bad HEAD - strange symbolic ref" @@ -11194,6 +11234,21 @@ msgstr "Gặp lá»—i khi đệ quy và o trong Ä‘Æ°á»ng dẫn mô-Ä‘un-con “$sm msgid "Synchronizing submodule url for '$displaypath'" msgstr "Url Mô-Ä‘un-con đồng bá»™ hóa cho “$displaypathâ€" +#~ msgid "server does not support --atomic push" +#~ msgstr "máy phục vụ không há»— trợ đẩy lên --atomic" + +#~ msgid "(detached from %s)" +#~ msgstr "(được tách rá»i từ %s)" + +#~ msgid "No existing author found with '%s'" +#~ msgstr "Không tìm thấy tác giả có sẵn vá»›i “%sâ€" + +#~ msgid "search also in ignored files" +#~ msgstr "tìm cả trong các táºp tin đã bị lá» Ä‘i" + +#~ msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" +#~ msgstr "git remote set-head <tên> (-a | --auto | -d | --delete | <nhánh>)" + #~ msgid "no files added" #~ msgstr "chÆ°a có táºp tin nà o được thêm và o" diff --git a/po/zh_CN.po b/po/zh_CN.po index 2b8d2cb..dd2948c 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -2,7 +2,7 @@ # Git 软件包的简体ä¸æ–‡ç¿»è¯‘. # Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com> # This file is distributed under the same license as the Git package. -# Contributers: +# Contributors: # - Jiang Xin <worldhello.net AT gmail.com> # - Riku <lu.riku AT gmail.com> # - Zhuang Ya <zhuangya AT me.com> @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2015-01-21 14:21+0800\n" -"PO-Revision-Date: 2015-01-21 14:58+0800\n" +"POT-Creation-Date: 2015-04-03 08:13+0800\n" +"PO-Revision-Date: 2015-04-03 08:35+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/gotgit/git/>\n" "Language: zh_CN\n" @@ -36,8 +36,8 @@ msgstr "" "解决方案并æ交。" #: archive.c:11 -msgid "git archive [options] <tree-ish> [<path>...]" -msgstr "git archive [选项] <æ ‘æˆ–æ交> [<路径>...]" +msgid "git archive [<options>] <tree-ish> [<path>...]" +msgstr "git archive [<选项>] <æ ‘æˆ–æ交> [<路径>...]" #: archive.c:12 msgid "git archive --list" @@ -45,9 +45,9 @@ msgstr "git archive --list" #: archive.c:13 msgid "" -"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" +"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" -"git archive --remote <版本库> [--exec <命令>] [选项] <æ ‘æˆ–æ交> [<路径>...]" +"git archive --remote <版本库> [--exec <命令>] [<选项>] <æ ‘æˆ–æ交> [<路径>...]" #: archive.c:14 msgid "git archive --remote <repo> [--exec <cmd>] --list" @@ -74,10 +74,10 @@ msgstr "å‰ç¼€" msgid "prepend prefix to each pathname in the archive" msgstr "为归档ä¸æ¯ä¸ªè·¯å¾„ååŠ ä¸Šå‰ç¼€" -#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2517 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986 +#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 +#: builtin/blame.c:2517 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:394 +#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 #: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151 msgid "file" msgstr "文件" @@ -126,7 +126,7 @@ msgstr "命令" msgid "path to the remote git-upload-archive command" msgstr "远程 git-upload-archive 命令的路径" -#: attr.c:258 +#: attr.c:264 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -251,7 +251,7 @@ msgstr "'%s' ä¸åƒæ˜¯ä¸€ä¸ª v2 版本的包文件" msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头：%s%s (%d)" -#: bundle.c:87 builtin/commit.c:770 +#: bundle.c:87 builtin/commit.c:766 #, c-format msgid "could not open '%s'" msgstr "ä¸èƒ½æ‰“å¼€ '%s'" @@ -260,8 +260,8 @@ msgstr "ä¸èƒ½æ‰“å¼€ '%s'" msgid "Repository lacks these prerequisite commits:" msgstr "版本库缺少这些必备的æ交：" -#: bundle.c:163 sequencer.c:645 sequencer.c:1100 builtin/blame.c:2706 -#: builtin/branch.c:652 builtin/commit.c:1049 builtin/log.c:330 +#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 +#: builtin/branch.c:659 builtin/commit.c:1045 builtin/log.c:330 #: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358 #: builtin/shortlog.c:158 msgid "revision walk setup failed" @@ -302,21 +302,21 @@ msgstr "rev-list 终æ¢" msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 选项排除" -#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的å‚数：%s" -#: bundle.c:444 +#: bundle.c:443 msgid "Refusing to create empty bundle." msgstr "ä¸èƒ½åˆ›å»ºç©ºåŒ…。" -#: bundle.c:454 +#: bundle.c:453 #, c-format msgid "cannot create '%s'" msgstr "ä¸èƒ½åˆ›å»º '%s'" -#: bundle.c:475 +#: bundle.c:474 msgid "index-pack died" msgstr "index-pack 终æ¢" @@ -339,55 +339,55 @@ msgstr "%s %s ä¸æ˜¯ä¸€ä¸ªæ交!" msgid "memory exhausted" msgstr "内å˜è€—å°½" -#: config.c:469 config.c:471 +#: config.c:474 config.c:476 #, c-format msgid "bad config file line %d in %s" msgstr "é…置文件 %2$s 出错于第 %1$d è¡Œ" -#: config.c:587 +#: config.c:592 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "文件 %3$s ä¸é…ç½®å˜é‡ '%2$s' çš„æ•°å—å–值 '%1$s' 设置错误: %4$s" -#: config.c:589 +#: config.c:594 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "é…ç½®å˜é‡ '%2$s' çš„æ•°å—å–值 '%1$s' 设置错误: %3$s" -#: config.c:674 +#: config.c:679 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "æ— æ³•æ‰©å±• '%s' ä¸çš„用户目录" -#: config.c:752 config.c:763 +#: config.c:757 config.c:768 #, c-format msgid "bad zlib compression level %d" msgstr "错误的 zlib 压缩级别 %d" -#: config.c:885 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "æ— æ•ˆçš„å¯¹è±¡åˆ›å»ºæ¨¡å¼ï¼š%s" -#: config.c:1211 +#: config.c:1216 msgid "unable to parse command-line config" msgstr "æ— æ³•è§£æžå‘½ä»¤è¡Œä¸çš„é…ç½®" -#: config.c:1272 +#: config.c:1277 msgid "unknown error occured while reading the configuration files" msgstr "在读å–é…置文件时é‡åˆ°æœªçŸ¥é”™è¯¯" -#: config.c:1596 +#: config.c:1601 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "æ— æ³•è§£æžå‘½ä»¤è¡Œé…ç½®ä¸çš„ '%s'" -#: config.c:1598 +#: config.c:1603 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "在文件 '%2$s' 的第 %3$d è¡Œå‘现错误的é…ç½®å˜é‡ '%1$s'" -#: config.c:1657 +#: config.c:1662 #, c-format msgid "%s has multiple values" msgstr "%s 有多个å–值" @@ -479,7 +479,7 @@ msgstr[1] "%lu å¹´å‰" msgid "failed to read orderfile '%s'" msgstr "æ— æ³•è¯»å–排åºæ–‡ä»¶ '%s'" -#: diffcore-rename.c:516 +#: diffcore-rename.c:536 msgid "Performing inexact rename detection" msgstr "æ£åœ¨è¿›è¡Œéžç²¾ç¡®çš„é‡å‘½å检测" @@ -509,16 +509,16 @@ msgstr "" "å‘现é…ç½®å˜é‡ 'diff.dirstat' ä¸çš„错误：\n" "%s" -#: diff.c:2957 +#: diff.c:2956 #, c-format msgid "external diff died, stopping at %s" msgstr "外部 diff 退出，åœæ¢åœ¨ %s" -#: diff.c:3352 +#: diff.c:3351 msgid "--follow requires exactly one pathspec" msgstr "--follow å‚æ•°åŽåªè·Ÿä¸€ä¸ª pathspec" -#: diff.c:3515 +#: diff.c:3514 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -527,7 +527,7 @@ msgstr "" "æ— æ³•è§£æž --dirstat/-X 选项的å‚数：\n" "%s" -#: diff.c:3529 +#: diff.c:3528 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "æ— æ³•è§£æž --submodule 选项的å‚数：'%s'" @@ -878,27 +878,27 @@ msgstr "æ— æ³•åˆå¹¶æ ‘ %s å’Œ %s" msgid "Unprocessed path??? %s" msgstr "未处ç†çš„路径??? %s" -#: merge-recursive.c:1898 +#: merge-recursive.c:1901 msgid "Merging:" msgstr "åˆå¹¶ï¼š" -#: merge-recursive.c:1911 +#: 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:1948 +#: merge-recursive.c:1951 msgid "merge returned no commit" msgstr "åˆå¹¶æœªè¿”回æ交" -#: merge-recursive.c:2005 +#: merge-recursive.c:2008 #, c-format msgid "Could not parse object '%s'" msgstr "ä¸èƒ½è§£æžå¯¹è±¡ '%s'" -#: merge-recursive.c:2016 builtin/merge.c:667 +#: merge-recursive.c:2019 builtin/merge.c:667 msgid "Unable to write index." msgstr "ä¸èƒ½å†™å…¥ç´¢å¼•ã€‚" @@ -1024,7 +1024,7 @@ msgstr "ä¸èƒ½è§£æž --pretty æ ¼å¼" msgid "done" msgstr "完æˆ" -#: read-cache.c:1267 +#: read-cache.c:1275 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1033,7 +1033,7 @@ msgstr "" "设置了 index.version，但是å–å€¼æ— æ•ˆã€‚\n" "使用版本 %i" -#: read-cache.c:1277 +#: read-cache.c:1285 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1119,23 +1119,31 @@ msgstr[1] "" msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " （使用 \"git pull\" æ¥åˆå¹¶è¿œç¨‹åˆ†æ”¯ï¼‰\n" -#: run-command.c:87 +#: revision.c:2348 +msgid "--first-parent is incompatible with --bisect" +msgstr "--first-parent 与 --bisect ä¸å…¼å®¹" + +#: run-command.c:83 msgid "open /dev/null failed" msgstr "ä¸èƒ½æ‰“å¼€ /dev/null" -#: run-command.c:89 +#: run-command.c:85 #, c-format msgid "dup2(%d,%d) failed" msgstr "ä¸èƒ½è°ƒç”¨ dup2(%d,%d)" -#: send-pack.c:268 +#: send-pack.c:272 msgid "failed to sign the push certificate" msgstr "æ— æ³•ä¸ºæŽ¨é€è¯ä¹¦ç¾å" -#: send-pack.c:325 +#: send-pack.c:356 msgid "the receiving end does not support --signed push" msgstr "接收端ä¸æ”¯æŒç¾å推é€" +#: send-pack.c:366 +msgid "the receiving end does not support --atomic push" +msgstr "接收端ä¸æ”¯æŒåŽŸå推é€" + #: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995 #: builtin/merge.c:1005 #, c-format @@ -1165,7 +1173,7 @@ msgstr "" "冲çªè§£å†³å®Œæ¯•åŽï¼Œç”¨ 'git add <路径>' 或 'git rm <路径>'\n" "对修æ£åŽçš„文件åšæ ‡è®°ï¼Œç„¶åŽç”¨ 'git commit' æ交" -#: sequencer.c:211 sequencer.c:856 sequencer.c:939 +#: sequencer.c:211 sequencer.c:861 sequencer.c:944 #, c-format msgid "Could not write to %s" msgstr "ä¸èƒ½å†™å…¥ %s" @@ -1201,184 +1209,184 @@ msgstr "ä¸èƒ½è§£æž HEAD æ交\n" msgid "Unable to update cache tree\n" msgstr "ä¸èƒ½æ›´æ–°ç¼“å˜\n" -#: sequencer.c:406 +#: sequencer.c:411 #, c-format msgid "Could not parse commit %s\n" msgstr "ä¸èƒ½è§£æžæ交 %s\n" -#: sequencer.c:411 +#: sequencer.c:416 #, c-format msgid "Could not parse parent commit %s\n" msgstr "ä¸èƒ½è§£æžçˆ¶æ交 %s\n" -#: sequencer.c:477 +#: sequencer.c:482 msgid "Your index file is unmerged." msgstr "您的索引文件未完æˆåˆå¹¶ã€‚" -#: sequencer.c:496 +#: sequencer.c:501 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "æ交 %s 是一个åˆå¹¶æ交但未æä¾› -m 选项。" -#: sequencer.c:504 +#: sequencer.c:509 #, c-format msgid "Commit %s does not have parent %d" msgstr "æ交 %s 没有父æ交 %d" -#: sequencer.c:508 +#: sequencer.c:513 #, 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:521 +#: sequencer.c:526 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s：ä¸èƒ½è§£æžçˆ¶æ交 %s" -#: sequencer.c:525 +#: sequencer.c:530 #, c-format msgid "Cannot get commit message for %s" msgstr "ä¸èƒ½å¾—到 %s çš„æ交说明" -#: sequencer.c:611 +#: sequencer.c:616 #, c-format msgid "could not revert %s... %s" msgstr "ä¸èƒ½è¿˜åŽŸ %s... %s" -#: sequencer.c:612 +#: sequencer.c:617 #, c-format msgid "could not apply %s... %s" msgstr "ä¸èƒ½åº”用 %s... %s" -#: sequencer.c:648 +#: sequencer.c:653 msgid "empty commit set passed" msgstr "æ供了空的æ交集" -#: sequencer.c:656 +#: sequencer.c:661 #, c-format msgid "git %s: failed to read the index" msgstr "git %sï¼šæ— æ³•è¯»å–索引" -#: sequencer.c:660 +#: sequencer.c:665 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %sï¼šæ— æ³•åˆ·æ–°ç´¢å¼•" -#: sequencer.c:720 +#: sequencer.c:725 #, c-format msgid "Cannot %s during a %s" msgstr "æ— æ³• %s 在一个 %s 过程ä¸" -#: sequencer.c:742 +#: sequencer.c:747 #, c-format msgid "Could not parse line %d." msgstr "ä¸èƒ½è§£æžç¬¬ %d 行。" -#: sequencer.c:747 +#: sequencer.c:752 msgid "No commits parsed." msgstr "没有æ交被解æžã€‚" -#: sequencer.c:760 +#: sequencer.c:765 #, c-format msgid "Could not open %s" msgstr "ä¸èƒ½æ‰“å¼€ %s" -#: sequencer.c:764 +#: sequencer.c:769 #, c-format msgid "Could not read %s." msgstr "ä¸èƒ½è¯»å– %s。" -#: sequencer.c:771 +#: sequencer.c:776 #, c-format msgid "Unusable instruction sheet: %s" msgstr "æ— ç”¨çš„æŒ‡ä»¤è¡¨å•ï¼š%s" -#: sequencer.c:801 +#: sequencer.c:806 #, c-format msgid "Invalid key: %s" msgstr "æ— æ•ˆé”®å：%s" -#: sequencer.c:804 +#: sequencer.c:809 #, c-format msgid "Invalid value for %s: %s" msgstr "%s çš„å€¼æ— æ•ˆï¼š%s" -#: sequencer.c:816 +#: sequencer.c:821 #, c-format msgid "Malformed options sheet: %s" msgstr "éžæ³•çš„选项表å•ï¼š%s" -#: sequencer.c:837 +#: sequencer.c:842 msgid "a cherry-pick or revert is already in progress" msgstr "一个拣选或还原æ“作已在进行" -#: sequencer.c:838 +#: sequencer.c:843 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "å°è¯• \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:842 +#: sequencer.c:847 #, c-format msgid "Could not create sequencer directory %s" msgstr "ä¸èƒ½åˆ›å»ºåºåˆ—目录 %s" -#: sequencer.c:858 sequencer.c:943 +#: sequencer.c:863 sequencer.c:948 #, c-format msgid "Error wrapping up %s." msgstr "错误收尾 %s。" -#: sequencer.c:877 sequencer.c:1013 +#: sequencer.c:882 sequencer.c:1018 msgid "no cherry-pick or revert in progress" msgstr "拣选或还原æ“作并未进行" -#: sequencer.c:879 +#: sequencer.c:884 msgid "cannot resolve HEAD" msgstr "ä¸èƒ½è§£æž HEAD" -#: sequencer.c:881 +#: sequencer.c:886 msgid "cannot abort from a branch yet to be born" msgstr "ä¸èƒ½ä»Žå°šæœªå»ºç«‹çš„分支终æ¢" -#: sequencer.c:903 builtin/apply.c:4128 +#: sequencer.c:908 builtin/apply.c:4288 #, c-format msgid "cannot open %s: %s" msgstr "ä¸èƒ½æ‰“å¼€ %s：%s" -#: sequencer.c:906 +#: sequencer.c:911 #, c-format msgid "cannot read %s: %s" msgstr "ä¸èƒ½è¯»å– %s：%s" -#: sequencer.c:907 +#: sequencer.c:912 msgid "unexpected end of file" msgstr "æ„外的文件结æŸ" -#: sequencer.c:913 +#: sequencer.c:918 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "ä¿å˜æ‹£é€‰æ交å‰çš„ HEAD 文件 '%s' æŸå" -#: sequencer.c:936 +#: sequencer.c:941 #, c-format msgid "Could not format %s." msgstr "ä¸èƒ½æ ¼å¼åŒ– %s。" -#: sequencer.c:1081 +#: sequencer.c:1086 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s：ä¸èƒ½æ‹£é€‰ä¸€ä¸ª%s" -#: sequencer.c:1084 +#: sequencer.c:1089 #, c-format msgid "%s: bad revision" msgstr "%s：错误的版本" -#: sequencer.c:1118 +#: sequencer.c:1123 msgid "Can't revert as initial commit" msgstr "ä¸èƒ½ä½œä¸ºåˆå§‹æ交还原" -#: sequencer.c:1119 +#: sequencer.c:1124 msgid "Can't cherry-pick into empty head" msgstr "ä¸èƒ½æ‹£é€‰åˆ°ç©ºåˆ†æ”¯" @@ -1445,38 +1453,38 @@ msgstr "æ— æ³•ç§»é™¤ %s çš„ .gitmodules æ¡ç›®" msgid "staging updated .gitmodules failed" msgstr "å°†æ›´æ–°åŽ .gitmodules æ·»åŠ æš‚å˜åŒºå¤±è´¥" -#: submodule.c:1111 builtin/init-db.c:371 +#: submodule.c:1109 builtin/init-db.c:371 #, c-format msgid "Could not create git link %s" msgstr "ä¸èƒ½åˆ›å»º git link %s" -#: submodule.c:1122 +#: submodule.c:1120 #, c-format msgid "Could not set core.worktree in %s" msgstr "ä¸èƒ½åœ¨ %s ä¸è®¾ç½® core.worktree" -#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566 -#: trailer.c:570 +#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557 +#: trailer.c:561 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "é”® '%2$s' 的未知å–值 '%1$s'" -#: trailer.c:552 trailer.c:557 builtin/remote.c:290 +#: trailer.c:543 trailer.c:548 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "多于一个 %s" -#: trailer.c:590 +#: trailer.c:581 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "ç¾å '%.*s' 的键为空" -#: trailer.c:710 +#: trailer.c:701 #, c-format msgid "could not read input file '%s'" msgstr "ä¸èƒ½è¯»å–输入文件 '%s'" -#: trailer.c:713 +#: trailer.c:704 msgid "could not read from stdin" msgstr "ä¸èƒ½è‡ªæ ‡å‡†è¾“入读å–" @@ -1513,26 +1521,26 @@ msgstr "æ— æ•ˆçš„ç«¯å£å·" msgid "invalid '..' path segment" msgstr "æ— æ•ˆçš„ '..' 路径片段" -#: wrapper.c:509 +#: wrapper.c:523 #, c-format msgid "unable to access '%s': %s" msgstr "ä¸èƒ½è®¿é—® '%s'：%s" -#: wrapper.c:530 +#: wrapper.c:544 #, c-format msgid "unable to access '%s'" msgstr "ä¸èƒ½è®¿é—® '%s'" -#: wrapper.c:541 +#: wrapper.c:555 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "æ— æ³•åœ¨å£ä»¤æ–‡ä»¶ä¸æŸ¥è¯¢åˆ°å½“å‰ç”¨æˆ·ï¼š%s" -#: wrapper.c:542 +#: wrapper.c:556 msgid "no such user" msgstr "æ— æ¤ç”¨æˆ·" -#: wrapper.c:550 +#: wrapper.c:564 msgid "unable to get current working directory" msgstr "ä¸èƒ½èŽ·å–当å‰å·¥ä½œç›®å½•" @@ -1566,11 +1574,11 @@ msgstr " （酌情使用 \"git add/rm <文件>...\" æ ‡è®°è§£å†³æ–¹æ¡ˆï¼‰" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " （使用 \"git rm <文件>...\" æ ‡è®°è§£å†³æ–¹æ¡ˆï¼‰" -#: wt-status.c:198 +#: wt-status.c:198 wt-status.c:878 msgid "Changes to be committed:" msgstr "è¦æ交的å˜æ›´ï¼š" -#: wt-status.c:216 +#: wt-status.c:216 wt-status.c:887 msgid "Changes not staged for commit:" msgstr "尚未暂å˜ä»¥å¤‡æ交的å˜æ›´ï¼š" @@ -1686,15 +1694,15 @@ msgstr "未跟踪的内容, " msgid "bug: unhandled diff status %c" msgstr "bugï¼šæ— æ³•å¤„ç†çš„å·®å¼‚çŠ¶æ€ %c" -#: wt-status.c:758 +#: wt-status.c:753 msgid "Submodules changed but not updated:" msgstr "å模组已修改但尚未更新：" -#: wt-status.c:760 +#: wt-status.c:755 msgid "Submodule changes to be committed:" msgstr "è¦æ交的å模组å˜æ›´ï¼š" -#: wt-status.c:839 +#: wt-status.c:835 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1702,198 +1710,198 @@ msgstr "" "ä¸è¦æ”¹åŠ¨ä¸Šé¢çš„一行。\n" "下é¢çš„所有内容å‡å°†è¢«åˆ 除。" -#: wt-status.c:930 +#: wt-status.c:946 msgid "You have unmerged paths." msgstr "您有尚未åˆå¹¶çš„路径。" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:933 +#: wt-status.c:949 msgid " (fix conflicts and run \"git commit\")" msgstr " （解决冲çªå¹¶è¿è¡Œ \"git commit\"）" -#: wt-status.c:936 +#: wt-status.c:952 msgid "All conflicts fixed but you are still merging." msgstr "所有冲çªå·²è§£å†³ä½†æ‚¨ä»å¤„于åˆå¹¶ä¸ã€‚" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:939 +#: wt-status.c:955 msgid " (use \"git commit\" to conclude merge)" msgstr " （使用 \"git commit\" 结æŸåˆå¹¶ï¼‰" -#: wt-status.c:949 +#: wt-status.c:965 msgid "You are in the middle of an am session." msgstr "您æ£å¤„于 am æ“作过程ä¸ã€‚" -#: wt-status.c:952 +#: wt-status.c:968 msgid "The current patch is empty." msgstr "当å‰çš„è¡¥ä¸ä¸ºç©ºã€‚" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:956 +#: wt-status.c:972 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " （解决冲çªï¼Œç„¶åŽè¿è¡Œ \"git am --continue\"）" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:958 +#: wt-status.c:974 msgid " (use \"git am --skip\" to skip this patch)" msgstr " （使用 \"git am --skip\" 跳过æ¤è¡¥ä¸ï¼‰" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:960 +#: wt-status.c:976 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " （使用 \"git am --abort\" æ¢å¤åŽŸæœ‰åˆ†æ”¯ï¼‰" -#: wt-status.c:1020 wt-status.c:1037 +#: wt-status.c:1036 wt-status.c:1053 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' å˜åŸºåˆ° '%s' çš„æ“作。" -#: wt-status.c:1025 wt-status.c:1042 +#: wt-status.c:1041 wt-status.c:1058 msgid "You are currently rebasing." msgstr "您在执行å˜åŸºæ“作。" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1028 +#: wt-status.c:1044 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " （解决冲çªï¼Œç„¶åŽè¿è¡Œ \"git rebase --continue\"）" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1030 +#: wt-status.c:1046 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " （使用 \"git rebase --skip\" 跳过æ¤è¡¥ä¸ï¼‰" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1032 +#: wt-status.c:1048 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " （使用 \"git rebase --abort\" 以检出原有分支）" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1045 +#: wt-status.c:1061 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " （所有冲çªå·²è§£å†³ï¼šè¿è¡Œ \"git rebase --continue\"）" -#: wt-status.c:1049 +#: wt-status.c:1065 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' å˜åŸºåˆ° '%s' çš„æ“作时拆分æ交。" -#: wt-status.c:1054 +#: wt-status.c:1070 msgid "You are currently splitting a commit during a rebase." msgstr "您在执行å˜åŸºæ“作时拆分æ交。" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1057 +#: wt-status.c:1073 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " （一旦您工作目录æ交干净åŽï¼Œè¿è¡Œ \"git rebase --continue\"）" -#: wt-status.c:1061 +#: wt-status.c:1077 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' å˜åŸºåˆ° '%s' çš„æ“作时编辑æ交。" -#: wt-status.c:1066 +#: wt-status.c:1082 msgid "You are currently editing a commit during a rebase." msgstr "您在执行å˜åŸºæ“作时编辑æ交。" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1069 +#: wt-status.c:1085 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " （使用 \"git commit --amend\" 修补当å‰æ交）" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1071 +#: wt-status.c:1087 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " （当您对您的修改满æ„åŽæ‰§è¡Œ \"git rebase --continue\"）" -#: wt-status.c:1081 +#: wt-status.c:1097 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "您在执行拣选æ交 %s çš„æ“作。" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1086 +#: wt-status.c:1102 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " （解决冲çªå¹¶è¿è¡Œ \"git cherry-pick --continue\"）" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1089 +#: wt-status.c:1105 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " （所有冲çªå·²è§£å†³ï¼šè¿è¡Œ \"git cherry-pick --continue\"）" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1091 +#: wt-status.c:1107 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " （使用 \"git cherry-pick --abort\" 以å–消拣选æ“作）" -#: wt-status.c:1100 +#: wt-status.c:1116 #, c-format msgid "You are currently reverting commit %s." msgstr "您在执行å转æ交 %s çš„æ“作。" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1105 +#: wt-status.c:1121 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " （解决冲çªå¹¶è¿è¡Œ \"git revert --continue\"）" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1108 +#: wt-status.c:1124 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " （所有冲çªå·²è§£å†³ï¼šè¿è¡Œ \"git revert --continue\"）" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1110 +#: wt-status.c:1126 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " （使用 \"git revert --abort\" 以å–消å转æ交æ“作）" -#: wt-status.c:1121 +#: wt-status.c:1137 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "您在执行从分支 '%s' 开始的二分查找æ“作。" -#: wt-status.c:1125 +#: wt-status.c:1141 msgid "You are currently bisecting." msgstr "您在执行二分查找æ“作。" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1128 +#: wt-status.c:1144 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " （使用 \"git bisect reset\" 以回到原有分支）" -#: wt-status.c:1303 +#: wt-status.c:1321 msgid "On branch " msgstr "ä½äºŽåˆ†æ”¯ " -#: wt-status.c:1310 +#: wt-status.c:1328 msgid "rebase in progress; onto " msgstr "å˜åŸºæ“作æ£åœ¨è¿›è¡Œä¸ï¼›è‡³ " -#: wt-status.c:1317 +#: wt-status.c:1333 msgid "HEAD detached at " msgstr "头指针分离于 " -#: wt-status.c:1319 +#: wt-status.c:1335 msgid "HEAD detached from " msgstr "头指针分离自 " -#: wt-status.c:1322 +#: wt-status.c:1338 msgid "Not currently on any branch." msgstr "当å‰ä¸åœ¨ä»»ä½•åˆ†æ”¯ä¸Šã€‚" -#: wt-status.c:1339 +#: wt-status.c:1355 msgid "Initial commit" msgstr "åˆå§‹æ交" -#: wt-status.c:1353 +#: wt-status.c:1369 msgid "Untracked files" msgstr "未跟踪的文件" -#: wt-status.c:1355 +#: wt-status.c:1371 msgid "Ignored files" msgstr "忽略的文件" -#: wt-status.c:1359 +#: wt-status.c:1375 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1903,80 +1911,80 @@ msgstr "" "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能æ高速度，\n" "但您需è¦å°å¿ƒä¸è¦å¿˜äº†æ·»åŠ 新文件（å‚è§ 'git help status'）。" -#: wt-status.c:1365 +#: wt-status.c:1381 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者：ä¸æ–‡å—符串拼接，å¯åˆ 除å‰å¯¼ç©ºæ ¼ -#: wt-status.c:1367 +#: wt-status.c:1383 msgid " (use -u option to show untracked files)" msgstr "（使用 -u å‚数显示未跟踪的文件）" -#: wt-status.c:1373 +#: wt-status.c:1389 msgid "No changes" msgstr "没有修改" -#: wt-status.c:1378 +#: wt-status.c:1394 #, 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:1381 +#: wt-status.c:1397 #, c-format msgid "no changes added to commit\n" msgstr "ä¿®æ”¹å°šæœªåŠ å…¥æ交\n" -#: wt-status.c:1384 +#: wt-status.c:1400 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "æ交为空，但是å˜åœ¨å°šæœªè·Ÿè¸ªçš„文件（使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1387 +#: wt-status.c:1403 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "æ交为空，但是å˜åœ¨å°šæœªè·Ÿè¸ªçš„文件\n" # 译者：ä¸æ–‡å—符串拼接，å¯åˆ 除å‰å¯¼ç©ºæ ¼ -#: wt-status.c:1390 +#: wt-status.c:1406 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "æ— æ–‡ä»¶è¦æ交（创建/æ‹·è´æ–‡ä»¶å¹¶ä½¿ç”¨ \"git add\" 建立跟踪）\n" -#: wt-status.c:1393 wt-status.c:1398 +#: wt-status.c:1409 wt-status.c:1414 #, c-format msgid "nothing to commit\n" msgstr "æ— æ–‡ä»¶è¦æ交\n" # 译者：ä¸æ–‡å—符串拼接，å¯åˆ 除å‰å¯¼ç©ºæ ¼ -#: wt-status.c:1396 +#: wt-status.c:1412 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "æ— æ–‡ä»¶è¦æ交（使用 -u 显示未跟踪的文件）\n" # 译者：ä¸æ–‡å—符串拼接，å¯åˆ 除å‰å¯¼ç©ºæ ¼ -#: wt-status.c:1400 +#: wt-status.c:1416 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "æ— æ–‡ä»¶è¦æ交，干净的工作区\n" -#: wt-status.c:1509 +#: wt-status.c:1525 msgid "HEAD (no branch)" msgstr "HEAD（éžåˆ†æ”¯ï¼‰" # 译者：注æ„ä¿æŒå¥å°¾ç©ºæ ¼ -#: wt-status.c:1515 +#: wt-status.c:1531 msgid "Initial commit on " msgstr "åˆå§‹æ交于 " -#: wt-status.c:1547 +#: wt-status.c:1563 msgid "gone" msgstr "丢失" # 译者：注æ„ä¿æŒå¥å°¾ç©ºæ ¼ -#: wt-status.c:1549 wt-status.c:1557 +#: wt-status.c:1565 wt-status.c:1573 msgid "behind " msgstr "è½åŽ " @@ -1986,15 +1994,15 @@ msgid "failed to unlink '%s'" msgstr "æ— æ³•åˆ é™¤ '%s'" #: builtin/add.c:22 -msgid "git add [options] [--] <pathspec>..." -msgstr "git add [选项] [--] <路径规则>..." +msgid "git add [<options>] [--] <pathspec>..." +msgstr "git add [<选项>] [--] <路径规则>..." #: builtin/add.c:65 #, c-format msgid "unexpected diff status %c" msgstr "æ„å¤–çš„å·®å¼‚çŠ¶æ€ %c" -#: builtin/add.c:70 builtin/commit.c:275 +#: builtin/add.c:70 builtin/commit.c:277 msgid "updating files failed" msgstr "更新文件失败" @@ -2038,14 +2046,14 @@ msgstr "ä¸èƒ½åº”用 '%s'" 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:110 -#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1372 +#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372 #: builtin/rm.c:269 msgid "dry run" msgstr "æ¼”ä¹ " -#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19 -#: builtin/commit.c:1326 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19 +#: builtin/commit.c:1322 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 "冗长输出" @@ -2121,75 +2129,75 @@ msgstr "æ²¡æœ‰æŒ‡å®šæ–‡ä»¶ï¼Œä¹Ÿæ²¡æœ‰æ–‡ä»¶è¢«æ·»åŠ ã€‚\n" 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:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 +#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920 +#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 msgid "index file corrupt" msgstr "索引文件æŸå" -#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431 +#: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431 msgid "Unable to write new index file" msgstr "æ— æ³•å†™å…¥æ–°ç´¢å¼•æ–‡ä»¶" -#: builtin/apply.c:58 -msgid "git apply [options] [<patch>...]" -msgstr "git apply [选项] [<è¡¥ä¸>...]" +#: builtin/apply.c:59 +msgid "git apply [<options>] [<patch>...]" +msgstr "git apply [<选项>] [<è¡¥ä¸>...]" -#: builtin/apply.c:111 +#: builtin/apply.c:112 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "未能识别的空白å—符选项 '%s'" -#: builtin/apply.c:126 +#: builtin/apply.c:127 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "未能识别的空白å—符忽略选项 '%s'" -#: builtin/apply.c:826 +#: builtin/apply.c:822 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "æ— æ³•å‡†å¤‡æ—¶é—´æˆ³æ£åˆ™è¡¨è¾¾å¼ %s" -#: builtin/apply.c:835 +#: builtin/apply.c:831 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec 返回 %d，输入为：%s" -#: builtin/apply.c:916 +#: builtin/apply.c:912 #, c-format msgid "unable to find filename in patch at line %d" msgstr "ä¸èƒ½åœ¨è¡¥ä¸çš„第 %d 行找到文件å" -#: builtin/apply.c:948 +#: builtin/apply.c:944 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s" -#: builtin/apply.c:952 +#: builtin/apply.c:948 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上新文件åä¸ä¸€è‡´" -#: builtin/apply.c:953 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件åä¸ä¸€è‡´" -#: builtin/apply.c:960 +#: builtin/apply.c:956 #, 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:1423 +#: builtin/apply.c:1419 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount：æ„外的行：%.*s" -#: builtin/apply.c:1480 +#: builtin/apply.c:1476 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "第 %d 行的补ä¸ç‰‡æ®µæ²¡æœ‰å¤´ä¿¡æ¯ï¼š%.*s" -#: builtin/apply.c:1497 +#: builtin/apply.c:1493 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2200,77 +2208,77 @@ msgid_plural "" msgstr[0] "当移除 %d 个å‰å¯¼è·¯å¾„åŽ git diff 头缺ä¹æ–‡ä»¶åä¿¡æ¯ï¼ˆç¬¬ %d 行）" msgstr[1] "当移除 %d 个å‰å¯¼è·¯å¾„åŽ git diff 头缺ä¹æ–‡ä»¶åä¿¡æ¯ï¼ˆç¬¬ %d 行）" -#: builtin/apply.c:1657 +#: builtin/apply.c:1656 msgid "new file depends on old contents" msgstr "新文件ä¾èµ–旧内容" -#: builtin/apply.c:1659 +#: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "åˆ é™¤çš„æ–‡ä»¶ä»æœ‰å†…容" -#: builtin/apply.c:1685 +#: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" msgstr "è¡¥ä¸åœ¨ç¬¬ %d è¡ŒæŸå" -#: builtin/apply.c:1721 +#: builtin/apply.c:1720 #, c-format msgid "new file %s depends on old contents" msgstr "新文件 %s ä¾èµ–旧内容" -#: builtin/apply.c:1723 +#: builtin/apply.c:1722 #, c-format msgid "deleted file %s still has contents" msgstr "åˆ é™¤çš„æ–‡ä»¶ %s ä»æœ‰å†…容" -#: builtin/apply.c:1726 +#: builtin/apply.c:1725 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** è¦å‘Šï¼šæ–‡ä»¶ %s æˆä¸ºç©ºæ–‡ä»¶ä½†å¹¶æœªåˆ 除" -#: builtin/apply.c:1872 +#: builtin/apply.c:1871 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补ä¸åœ¨ç¬¬ %d è¡ŒæŸå：%.*s" -#: builtin/apply.c:1901 +#: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" msgstr "未能识别的二进制补ä¸ä½äºŽç¬¬ %d è¡Œ" -#: builtin/apply.c:2052 +#: builtin/apply.c:2051 #, c-format msgid "patch with only garbage at line %d" msgstr "è¡¥ä¸æ–‡ä»¶çš„第 %d è¡Œåªæœ‰åžƒåœ¾æ•°æ®" -#: builtin/apply.c:2142 +#: builtin/apply.c:2141 #, c-format msgid "unable to read symlink %s" msgstr "æ— æ³•è¯»å–符å·é“¾æŽ¥ %s" -#: builtin/apply.c:2146 +#: builtin/apply.c:2145 #, c-format msgid "unable to open or read %s" msgstr "ä¸èƒ½æ‰“å¼€æˆ–è¯»å– %s" -#: builtin/apply.c:2754 +#: builtin/apply.c:2778 #, c-format msgid "invalid start of line: '%c'" msgstr "æ— æ•ˆçš„è¡Œé¦–å—符：'%c'" -#: builtin/apply.c:2872 +#: builtin/apply.c:2897 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "å— #%d æˆåŠŸåº”用于 %d（å移 %d 行）" msgstr[1] "å— #%d æˆåŠŸåº”用于 %d（å移 %d 行）" -#: builtin/apply.c:2884 +#: builtin/apply.c:2909 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文å‡å°‘到（%ld/%ld）以在第 %d 行应用补ä¸ç‰‡æ®µ" -#: builtin/apply.c:2890 +#: builtin/apply.c:2915 #, c-format msgid "" "while searching for:\n" @@ -2279,317 +2287,336 @@ msgstr "" "当查询：\n" "%.*s" -#: builtin/apply.c:2909 +#: builtin/apply.c:2935 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补ä¸æ•°æ®" -#: builtin/apply.c:3010 +#: builtin/apply.c:3036 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补ä¸æœªåº”用到 '%s'" -#: builtin/apply.c:3016 +#: builtin/apply.c:3042 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二进制补ä¸äº§ç”Ÿäº†ä¸æ£ç¡®çš„结果（应为 %s，å´ä¸º %s）" -#: builtin/apply.c:3037 +#: builtin/apply.c:3063 #, c-format msgid "patch failed: %s:%ld" msgstr "打补ä¸å¤±è´¥ï¼š%s:%ld" -#: builtin/apply.c:3161 +#: builtin/apply.c:3187 #, c-format msgid "cannot checkout %s" msgstr "ä¸èƒ½æ£€å‡º %s" -#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260 +#: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288 #, c-format msgid "read of %s failed" msgstr "è¯»å– %s 失败" -#: builtin/apply.c:3240 builtin/apply.c:3462 +#: builtin/apply.c:3240 +#, c-format +msgid "reading from '%s' beyond a symbolic link" +msgstr "读å–ä½äºŽç¬¦å·é“¾æŽ¥ä¸çš„ '%s'" + +#: builtin/apply.c:3268 builtin/apply.c:3490 #, c-format msgid "path %s has been renamed/deleted" msgstr "路径 %s å·²ç»è¢«é‡å‘½å/åˆ é™¤" -#: builtin/apply.c:3321 builtin/apply.c:3476 +#: builtin/apply.c:3349 builtin/apply.c:3504 #, c-format msgid "%s: does not exist in index" msgstr "%s：ä¸å˜åœ¨äºŽç´¢å¼•ä¸" -#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490 +#: builtin/apply.c:3353 builtin/apply.c:3496 builtin/apply.c:3518 #, c-format msgid "%s: %s" msgstr "%s：%s" -#: builtin/apply.c:3330 builtin/apply.c:3484 +#: builtin/apply.c:3358 builtin/apply.c:3512 #, c-format msgid "%s: does not match index" msgstr "%s：和索引ä¸åŒ¹é…" -#: builtin/apply.c:3432 +#: builtin/apply.c:3460 msgid "removal patch leaves file contents" msgstr "移除补ä¸ä»ç•™ä¸‹äº†æ–‡ä»¶å†…容" -#: builtin/apply.c:3501 +#: builtin/apply.c:3529 #, c-format msgid "%s: wrong type" msgstr "%s：错误类型" -#: builtin/apply.c:3503 +#: builtin/apply.c:3531 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o，应为 %o" -#: builtin/apply.c:3604 +#: builtin/apply.c:3690 builtin/apply.c:3692 +#, c-format +msgid "invalid path '%s'" +msgstr "æ— æ•ˆè·¯å¾„ '%s'" + +#: builtin/apply.c:3747 #, c-format msgid "%s: already exists in index" msgstr "%s：已ç»å˜åœ¨äºŽç´¢å¼•ä¸" -#: builtin/apply.c:3607 +#: builtin/apply.c:3750 #, c-format msgid "%s: already exists in working directory" msgstr "%s：已ç»å˜åœ¨äºŽå·¥ä½œåŒºä¸" -#: builtin/apply.c:3627 +#: builtin/apply.c:3770 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模å¼ï¼ˆ%1$o）和旧模å¼ï¼ˆ%3$o）ä¸åŒ¹é…" -#: builtin/apply.c:3632 +#: builtin/apply.c:3775 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "%2$s 的新模å¼ï¼ˆ%1$o）和 %4$s 的旧模å¼ï¼ˆ%3$o）ä¸åŒ¹é…" -#: builtin/apply.c:3640 +#: builtin/apply.c:3795 +#, c-format +msgid "affected file '%s' is beyond a symbolic link" +msgstr "å—å½±å“的文件 '%s' ä½äºŽç¬¦å·é“¾æŽ¥ä¸" + +#: builtin/apply.c:3799 #, c-format msgid "%s: patch does not apply" msgstr "%s：补ä¸æœªåº”用" -#: builtin/apply.c:3653 +#: builtin/apply.c:3813 #, c-format msgid "Checking patch %s..." msgstr "æ£€æŸ¥è¡¥ä¸ %s..." -#: builtin/apply.c:3746 builtin/checkout.c:231 builtin/reset.c:135 +#: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' çš„ make_cache_entry æ“作失败" -#: builtin/apply.c:3889 +#: builtin/apply.c:4049 #, c-format msgid "unable to remove %s from index" msgstr "ä¸èƒ½ä»Žç´¢å¼•ä¸ç§»é™¤ %s" -#: builtin/apply.c:3918 +#: builtin/apply.c:4078 #, c-format msgid "corrupt patch for submodule %s" msgstr "å模组 %s æŸåçš„è¡¥ä¸" -#: builtin/apply.c:3922 +#: builtin/apply.c:4082 #, c-format msgid "unable to stat newly created file '%s'" msgstr "ä¸èƒ½æžšä¸¾æ–°å»ºæ–‡ä»¶ '%s' 的状æ€" -#: builtin/apply.c:3927 +#: builtin/apply.c:4087 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "ä¸èƒ½ä¸ºæ–°å»ºæ–‡ä»¶ %s 创建åŽç«¯å˜å‚¨" -#: builtin/apply.c:3930 builtin/apply.c:4038 +#: builtin/apply.c:4090 builtin/apply.c:4198 #, c-format msgid "unable to add cache entry for %s" msgstr "æ— æ³•ä¸º %s æ·»åŠ ç¼“å˜æ¡ç›®" -#: builtin/apply.c:3963 +#: builtin/apply.c:4123 #, c-format msgid "closing file '%s'" msgstr "å…³é—文件 '%s'" -#: builtin/apply.c:4012 +#: builtin/apply.c:4172 #, c-format msgid "unable to write file '%s' mode %o" msgstr "ä¸èƒ½å†™æ–‡ä»¶ '%s' æƒé™ %o" -#: builtin/apply.c:4099 +#: builtin/apply.c:4259 #, c-format msgid "Applied patch %s cleanly." msgstr "æˆåŠŸåº”ç”¨è¡¥ä¸ %s。" -#: builtin/apply.c:4107 +#: builtin/apply.c:4267 msgid "internal error" msgstr "内部错误" -#: builtin/apply.c:4110 +#: builtin/apply.c:4270 #, 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:4120 +#: builtin/apply.c:4280 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "æˆªçŸ .rej 文件å为 %.*s.rej" -#: builtin/apply.c:4141 +#: builtin/apply.c:4301 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段æˆåŠŸåº”用。" -#: builtin/apply.c:4144 +#: builtin/apply.c:4304 #, c-format msgid "Rejected hunk #%d." msgstr "æ‹’ç»ç¬¬ #%d 个片段。" -#: builtin/apply.c:4234 +#: builtin/apply.c:4394 msgid "unrecognized input" msgstr "未能识别的输入" -#: builtin/apply.c:4245 +#: builtin/apply.c:4405 msgid "unable to read index file" msgstr "æ— æ³•è¯»å–索引文件" -#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:92 -#: builtin/fetch.c:93 +#: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92 +#: builtin/fetch.c:92 msgid "path" msgstr "路径" -#: builtin/apply.c:4363 +#: builtin/apply.c:4523 msgid "don't apply changes matching the given path" msgstr "ä¸è¦åº”用与给出路径å‘匹é…çš„å˜æ›´" -#: builtin/apply.c:4366 +#: builtin/apply.c:4526 msgid "apply changes matching the given path" msgstr "应用与给出路径å‘匹é…çš„å˜æ›´" -#: builtin/apply.c:4368 +#: builtin/apply.c:4528 msgid "num" msgstr "æ•°å—" -#: builtin/apply.c:4369 +#: builtin/apply.c:4529 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ä»Žä¼ ç»Ÿçš„ diff 路径ä¸ç§»é™¤æŒ‡å®šæ•°é‡çš„å‰å¯¼æ–œçº¿" -#: builtin/apply.c:4372 +#: builtin/apply.c:4532 msgid "ignore additions made by the patch" msgstr "忽略补ä¸ä¸çš„æ·»åŠ çš„æ–‡ä»¶" -#: builtin/apply.c:4374 +#: builtin/apply.c:4534 msgid "instead of applying the patch, output diffstat for the input" msgstr "ä¸åº”用补ä¸ï¼Œè€Œæ˜¯æ˜¾ç¤ºè¾“入的差异统计（diffstat）" -#: builtin/apply.c:4378 +#: builtin/apply.c:4538 msgid "show number of added and deleted lines in decimal notation" msgstr "以åè¿›åˆ¶æ•°æ˜¾ç¤ºæ·»åŠ å’Œåˆ é™¤çš„è¡Œæ•°" -#: builtin/apply.c:4380 +#: builtin/apply.c:4540 msgid "instead of applying the patch, output a summary for the input" msgstr "ä¸åº”用补ä¸ï¼Œè€Œæ˜¯æ˜¾ç¤ºè¾“入的概è¦" -#: builtin/apply.c:4382 +#: builtin/apply.c:4542 msgid "instead of applying the patch, see if the patch is applicable" msgstr "ä¸åº”用补ä¸ï¼Œè€Œæ˜¯æŸ¥çœ‹è¡¥ä¸æ˜¯å¦å¯åº”用" -#: builtin/apply.c:4384 +#: builtin/apply.c:4544 msgid "make sure the patch is applicable to the current index" msgstr "确认补ä¸å¯ä»¥åº”用到当å‰ç´¢å¼•" -#: builtin/apply.c:4386 +#: builtin/apply.c:4546 msgid "apply a patch without touching the working tree" msgstr "应用补ä¸è€Œä¸ä¿®æ”¹å·¥ä½œåŒº" -#: builtin/apply.c:4388 +#: builtin/apply.c:4548 +msgid "accept a patch that touches outside the working area" +msgstr "接å—修改工作区之外文件的补ä¸" + +#: builtin/apply.c:4550 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "还应用æ¤è¡¥ä¸ï¼ˆä¸Ž --stat/--summary/--check 选项åŒæ—¶ä½¿ç”¨ï¼‰" -#: builtin/apply.c:4390 +#: builtin/apply.c:4552 msgid "attempt three-way merge if a patch does not apply" msgstr "如果一个补ä¸ä¸èƒ½åº”用则å°è¯•ä¸‰è·¯åˆå¹¶" -#: builtin/apply.c:4392 +#: builtin/apply.c:4554 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信æ¯" -#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455 +#: builtin/apply.c:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412 msgid "paths are separated with NUL character" msgstr "路径以 NUL å—符分隔" -#: builtin/apply.c:4397 +#: builtin/apply.c:4559 msgid "ensure at least <n> lines of context match" msgstr "ç¡®ä¿è‡³å°‘åŒ¹é… <n> 行上下文" -#: builtin/apply.c:4398 +#: builtin/apply.c:4560 msgid "action" msgstr "动作" -#: builtin/apply.c:4399 +#: builtin/apply.c:4561 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行ä¸é—´çš„空白å—符滥用" -#: builtin/apply.c:4402 builtin/apply.c:4405 +#: builtin/apply.c:4564 builtin/apply.c:4567 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白å—符的å˜æ›´" -#: builtin/apply.c:4408 +#: builtin/apply.c:4570 msgid "apply the patch in reverse" msgstr "åå‘应用补ä¸" -#: builtin/apply.c:4410 +#: builtin/apply.c:4572 msgid "don't expect at least one line of context" msgstr "æ— éœ€è‡³å°‘ä¸€è¡Œä¸Šä¸‹æ–‡" -#: builtin/apply.c:4412 +#: builtin/apply.c:4574 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒ç»çš„è¡¥ä¸ç‰‡æ®µä¿å˜åœ¨å¯¹åº”çš„ *.rej 文件ä¸" -#: builtin/apply.c:4414 +#: builtin/apply.c:4576 msgid "allow overlapping hunks" msgstr "å…许é‡å çš„è¡¥ä¸ç‰‡æ®µ" -#: builtin/apply.c:4417 +#: builtin/apply.c:4579 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "å…许ä¸æ£ç¡®çš„文件末尾æ¢è¡Œç¬¦" -#: builtin/apply.c:4420 +#: builtin/apply.c:4582 msgid "do not trust the line counts in the hunk headers" msgstr "ä¸ä¿¡ä»»è¡¥ä¸ç‰‡æ®µçš„头信æ¯ä¸çš„è¡Œå·" -#: builtin/apply.c:4422 +#: builtin/apply.c:4584 msgid "root" msgstr "æ ¹ç›®å½•" -#: builtin/apply.c:4423 +#: builtin/apply.c:4585 msgid "prepend <root> to all filenames" msgstr "为所有文件åå‰æ·»åŠ <æ ¹ç›®å½•>" -#: builtin/apply.c:4445 +#: builtin/apply.c:4607 msgid "--3way outside a repository" msgstr "--3way 在一个版本库之外" -#: builtin/apply.c:4453 +#: builtin/apply.c:4615 msgid "--index outside a repository" msgstr "--index 在一个版本库之外" -#: builtin/apply.c:4456 +#: builtin/apply.c:4618 msgid "--cached outside a repository" msgstr "--cached 在一个版本库之外" -#: builtin/apply.c:4472 +#: builtin/apply.c:4637 #, c-format msgid "can't open patch '%s'" msgstr "ä¸èƒ½æ‰“å¼€è¡¥ä¸ '%s'" -#: builtin/apply.c:4486 +#: builtin/apply.c:4651 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下ä»æœ‰ %d 个空白å—符误用" msgstr[1] "抑制下ä»æœ‰ %d 个空白å—符误用" -#: builtin/apply.c:4492 builtin/apply.c:4502 +#: builtin/apply.c:4657 builtin/apply.c:4667 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2644,102 +2671,102 @@ msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "æ›´æ–° BISECT_HEAD 而éžæ£€å‡ºå½“å‰æ交" #: builtin/blame.c:30 -msgid "git blame [options] [rev-opts] [rev] [--] file" -msgstr "git blame [选项] [版本选项] [版本] [--] 文件" +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file" +msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] 文件" #: builtin/blame.c:35 -msgid "[rev-opts] are documented in git-rev-list(1)" -msgstr "[版本选项] 的文档记录在 git-rev-list(1) ä¸" +msgid "<rev-opts> are documented in git-rev-list(1)" +msgstr "<版本选项> 的文档记录在 git-rev-list(1) ä¸" -#: builtin/blame.c:2501 +#: builtin/blame.c:2500 msgid "Show blame entries as we find them, incrementally" msgstr "增é‡å¼åœ°æ˜¾ç¤ºå‘现的 blame æ¡ç›®" -#: builtin/blame.c:2502 +#: builtin/blame.c:2501 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "边界æ交显示空的 SHA-1（默认：关é—）" -#: builtin/blame.c:2503 +#: builtin/blame.c:2502 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "ä¸æŠŠæ ¹æ交作为边界（默认：关é—）" -#: builtin/blame.c:2504 +#: builtin/blame.c:2503 msgid "Show work cost statistics" msgstr "显示命令消耗统计" -#: builtin/blame.c:2505 +#: builtin/blame.c:2504 msgid "Show output score for blame entries" msgstr "æ˜¾ç¤ºåˆ¤æ– blame æ¡ç›®ä½ç§»çš„得分诊æ–ä¿¡æ¯" -#: builtin/blame.c:2506 +#: builtin/blame.c:2505 msgid "Show original filename (Default: auto)" msgstr "显示原始文件å（默认：自动）" -#: builtin/blame.c:2507 +#: builtin/blame.c:2506 msgid "Show original linenumber (Default: off)" msgstr "显示原始的行å·ï¼ˆé»˜è®¤ï¼šå…³é—）" -#: builtin/blame.c:2508 +#: builtin/blame.c:2507 msgid "Show in a format designed for machine consumption" msgstr "显示为一个适åˆæœºå™¨è¯»å–çš„æ ¼å¼" -#: builtin/blame.c:2509 +#: builtin/blame.c:2508 msgid "Show porcelain format with per-line commit information" msgstr "为æ¯ä¸€è¡Œæ˜¾ç¤ºæœºå™¨é€‚用的æ交信æ¯" -#: builtin/blame.c:2510 +#: builtin/blame.c:2509 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "使用和 git-annotate 相åŒçš„输出模å¼ï¼ˆé»˜è®¤ï¼šå…³é—）" -#: builtin/blame.c:2511 +#: builtin/blame.c:2510 msgid "Show raw timestamp (Default: off)" msgstr "显示原始时间戳（默认：关é—）" -#: builtin/blame.c:2512 +#: builtin/blame.c:2511 msgid "Show long commit SHA1 (Default: off)" msgstr "显示长的SHA1æ交å·ï¼ˆé»˜è®¤ï¼šå…³é—）" -#: builtin/blame.c:2513 +#: builtin/blame.c:2512 msgid "Suppress author name and timestamp (Default: off)" msgstr "éšè—作者åå—和时间戳（默认：关é—）" -#: builtin/blame.c:2514 +#: builtin/blame.c:2513 msgid "Show author email instead of name (Default: off)" msgstr "显示作者的邮箱而ä¸æ˜¯åå—（默认：关é—）" -#: builtin/blame.c:2515 +#: builtin/blame.c:2514 msgid "Ignore whitespace differences" msgstr "忽略空白差异" -#: builtin/blame.c:2516 +#: builtin/blame.c:2515 msgid "Spend extra cycles to find better match" msgstr "花费é¢å¤–的循环æ¥æ‰¾åˆ°æ›´å¥½çš„匹é…" -#: builtin/blame.c:2517 +#: builtin/blame.c:2516 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "使用æ¥è‡ª <文件> 的修订集而ä¸æ˜¯è°ƒç”¨ git-rev-list" -#: builtin/blame.c:2518 +#: builtin/blame.c:2517 msgid "Use <file>'s contents as the final image" msgstr "使用 <文件> 的内容作为最终的图片" -#: builtin/blame.c:2519 builtin/blame.c:2520 +#: builtin/blame.c:2518 builtin/blame.c:2519 msgid "score" msgstr "得分" -#: builtin/blame.c:2519 +#: builtin/blame.c:2518 msgid "Find line copies within and across files" msgstr "找到文件内åŠè·¨æ–‡ä»¶çš„行拷è´" -#: builtin/blame.c:2520 +#: builtin/blame.c:2519 msgid "Find line movements within and across files" msgstr "找到文件内åŠè·¨æ–‡ä»¶çš„行移动" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "Process only line range n,m, counting from 1" msgstr "åªå¤„ç†è¡ŒèŒƒå›´åœ¨ n å’Œ m 之间的，从 1 开始" @@ -2749,25 +2776,25 @@ msgstr "åªå¤„ç†è¡ŒèŒƒå›´åœ¨ n å’Œ m 之间的，从 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:2602 +#: builtin/blame.c:2601 msgid "4 years, 11 months ago" msgstr "4 å¹´ 11 个月å‰" #: builtin/branch.c:24 -msgid "git branch [options] [-r | -a] [--merged | --no-merged]" -msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]" +msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" +msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]" #: builtin/branch.c:25 -msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" -msgstr "git branch [选项] [-l] [-f] <分支å> [<起始点>]" +msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" +msgstr "git branch [<选项>] [-l] [-f] <分支å> [<起始点>]" #: builtin/branch.c:26 -msgid "git branch [options] [-r] (-d | -D) <branchname>..." -msgstr "git branch [选项] [-r] (-d | -D) <分支å>..." +msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." +msgstr "git branch [<选项>] [-r] (-d | -D) <分支å>..." #: builtin/branch.c:27 -msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" -msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>" +msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" +msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" # 译者：ä¿æŒåŽŸæ¢è¡Œæ ¼å¼ï¼Œåœ¨è¾“出时 %s 的替代内容会让å—符串å˜é•¿ #: builtin/branch.c:152 @@ -2909,232 +2936,237 @@ msgstr "（éžåˆ†æ”¯ï¼Œæ£å˜åŸº %s）" msgid "(no branch, bisect started on %s)" msgstr "（éžåˆ†æ”¯ï¼ŒäºŒåˆ†æŸ¥æ‰¾å¼€å§‹äºŽ %s）" -#: builtin/branch.c:593 +#: builtin/branch.c:596 #, c-format -msgid "(detached from %s)" -msgstr "（分离自 %s）" +msgid "(HEAD detached at %s)" +msgstr "（头指针分离于 %s）" -#: builtin/branch.c:596 +#: builtin/branch.c:599 +#, c-format +msgid "(HEAD detached from %s)" +msgstr "（头指针分离自 %s）" + +#: builtin/branch.c:603 msgid "(no branch)" msgstr "（éžåˆ†æ”¯ï¼‰" -#: builtin/branch.c:643 +#: builtin/branch.c:650 #, c-format msgid "object '%s' does not point to a commit" msgstr "对象 '%s' 没有指å‘一个æ交" -#: builtin/branch.c:691 +#: builtin/branch.c:698 msgid "some refs could not be read" msgstr "一些引用ä¸èƒ½è¯»å–" -#: builtin/branch.c:704 +#: builtin/branch.c:711 msgid "cannot rename the current branch while not on any." msgstr "æ— æ³•é‡å‘½å当å‰åˆ†æ”¯å› 为ä¸å¤„于任何分支上。" -#: builtin/branch.c:714 +#: builtin/branch.c:721 #, c-format msgid "Invalid branch name: '%s'" msgstr "æ— æ•ˆçš„åˆ†æ”¯å：'%s'" -#: builtin/branch.c:729 +#: builtin/branch.c:736 msgid "Branch rename failed" msgstr "分支é‡å‘½å失败" -#: builtin/branch.c:733 +#: builtin/branch.c:740 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "é‡å‘½å掉一个错误命å的旧分支 '%s'" -#: builtin/branch.c:737 +#: builtin/branch.c:744 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "分支é‡å‘½å为 %s，但 HEAD 没有更新ï¼" -#: builtin/branch.c:744 +#: builtin/branch.c:751 msgid "Branch is renamed, but update of config-file failed" msgstr "分支被é‡å‘½å，但更新 config 文件失败" -#: builtin/branch.c:759 +#: builtin/branch.c:766 #, c-format msgid "malformed object name %s" msgstr "éžæ³•çš„对象å %s" -#: builtin/branch.c:783 +#: builtin/branch.c:790 #, c-format msgid "could not write branch description template: %s" msgstr "ä¸èƒ½å†™åˆ†æ”¯æ述模版：%s" -#: builtin/branch.c:813 +#: builtin/branch.c:820 msgid "Generic options" msgstr "通用选项" -#: builtin/branch.c:815 +#: builtin/branch.c:822 msgid "show hash and subject, give twice for upstream branch" msgstr "显示哈希值和主题，若å‚数出现两次则显示上游分支" -#: builtin/branch.c:816 +#: builtin/branch.c:823 msgid "suppress informational messages" msgstr "ä¸æ˜¾ç¤ºä¿¡æ¯" -#: builtin/branch.c:817 +#: builtin/branch.c:824 msgid "set up tracking mode (see git-pull(1))" msgstr "设置跟踪模å¼ï¼ˆå‚è§ git-pull(1)）" -#: builtin/branch.c:819 +#: builtin/branch.c:826 msgid "change upstream info" msgstr "改å˜ä¸Šæ¸¸ä¿¡æ¯" -#: builtin/branch.c:823 +#: builtin/branch.c:830 msgid "use colored output" msgstr "使用彩色输出" -#: builtin/branch.c:824 +#: builtin/branch.c:831 msgid "act on remote-tracking branches" msgstr "作用于远程跟踪分支" -#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854 -#: builtin/branch.c:860 builtin/commit.c:1586 builtin/commit.c:1587 -#: builtin/commit.c:1588 builtin/commit.c:1589 builtin/tag.c:616 +#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861 +#: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583 +#: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616 #: builtin/tag.c:622 msgid "commit" msgstr "æ交" -#: builtin/branch.c:828 builtin/branch.c:834 +#: builtin/branch.c:835 builtin/branch.c:841 msgid "print only branches that contain the commit" msgstr "åªæ‰“å°åŒ…å«è¯¥æ交的分支" -#: builtin/branch.c:840 +#: builtin/branch.c:847 msgid "Specific git-branch actions:" msgstr "具体的 git-branch 动作：" -#: builtin/branch.c:841 +#: builtin/branch.c:848 msgid "list both remote-tracking and local branches" msgstr "列出远程跟踪åŠæœ¬åœ°åˆ†æ”¯" -#: builtin/branch.c:843 +#: builtin/branch.c:850 msgid "delete fully merged branch" msgstr "åˆ é™¤å®Œå…¨åˆå¹¶çš„分支" -#: builtin/branch.c:844 +#: builtin/branch.c:851 msgid "delete branch (even if not merged)" msgstr "åˆ é™¤åˆ†æ”¯ï¼ˆå³ä½¿æ²¡æœ‰åˆå¹¶ï¼‰" -#: builtin/branch.c:845 +#: builtin/branch.c:852 msgid "move/rename a branch and its reflog" msgstr "移动/é‡å‘½å一个分支，以åŠå®ƒçš„引用日志" -#: builtin/branch.c:846 +#: builtin/branch.c:853 msgid "move/rename a branch, even if target exists" msgstr "移动/é‡å‘½å一个分支，å³ä½¿ç›®æ ‡å·²å˜åœ¨" -#: builtin/branch.c:847 +#: builtin/branch.c:854 msgid "list branch names" msgstr "列出分支å" -#: builtin/branch.c:848 +#: builtin/branch.c:855 msgid "create the branch's reflog" msgstr "创建分支的引用日志" -#: builtin/branch.c:850 +#: builtin/branch.c:857 msgid "edit the description for the branch" msgstr "æ ‡è®°åˆ†æ”¯çš„æè¿°" -#: builtin/branch.c:851 +#: builtin/branch.c:858 msgid "force creation, move/rename, deletion" msgstr "强制创建ã€ç§»åŠ¨/é‡å‘½åã€åˆ 除" -#: builtin/branch.c:854 +#: builtin/branch.c:861 msgid "print only not merged branches" msgstr "åªæ‰“å°æ²¡æœ‰åˆå¹¶çš„分支" -#: builtin/branch.c:860 +#: builtin/branch.c:867 msgid "print only merged branches" msgstr "åªæ‰“å°åˆå¹¶çš„分支" -#: builtin/branch.c:864 +#: builtin/branch.c:871 msgid "list branches in columns" msgstr "以列的方å¼æ˜¾ç¤ºåˆ†æ”¯" -#: builtin/branch.c:877 +#: builtin/branch.c:884 msgid "Failed to resolve HEAD as a valid ref." msgstr "æ— æ³•å°† HEAD 解æžä¸ºæœ‰æ•ˆå¼•ç”¨ã€‚" -#: builtin/branch.c:881 builtin/clone.c:637 +#: builtin/branch.c:888 builtin/clone.c:637 msgid "HEAD not found below refs/heads!" msgstr "HEAD 没有ä½äºŽ /refs/heads 之下ï¼" -#: builtin/branch.c:903 +#: builtin/branch.c:910 msgid "--column and --verbose are incompatible" msgstr "--column å’Œ --verbose ä¸å…¼å®¹" -#: builtin/branch.c:914 builtin/branch.c:953 +#: builtin/branch.c:921 builtin/branch.c:960 msgid "branch name required" msgstr "å¿…é¡»æ供分支å" -#: builtin/branch.c:929 +#: builtin/branch.c:936 msgid "Cannot give description to detached HEAD" msgstr "ä¸èƒ½å‘分离头指针æä¾›æè¿°" -#: builtin/branch.c:934 +#: builtin/branch.c:941 msgid "cannot edit description of more than one branch" msgstr "ä¸èƒ½ä¸ºä¸€ä¸ªä»¥ä¸Šçš„分支编辑æè¿°" -#: builtin/branch.c:941 +#: builtin/branch.c:948 #, c-format msgid "No commit on branch '%s' yet." msgstr "分支 '%s' å°šæ— æ交。" -#: builtin/branch.c:944 +#: builtin/branch.c:951 #, c-format msgid "No branch named '%s'." msgstr "没有分支 '%s'。" -#: builtin/branch.c:959 +#: builtin/branch.c:966 msgid "too many branches for a rename operation" msgstr "为é‡å‘½åæ“作æ供了太多的分支å" -#: builtin/branch.c:964 +#: builtin/branch.c:971 msgid "too many branches to set new upstream" msgstr "为设置新上游æ供了太多的分支å" -#: builtin/branch.c:968 +#: builtin/branch.c:975 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "æ— æ³•è®¾ç½® HEAD 的上游为 %sï¼Œå› ä¸º HEAD 没有指å‘任何分支。" -#: builtin/branch.c:971 builtin/branch.c:993 builtin/branch.c:1014 +#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021 #, c-format msgid "no such branch '%s'" msgstr "没有æ¤åˆ†æ”¯ '%s'" -#: builtin/branch.c:975 +#: builtin/branch.c:982 #, c-format msgid "branch '%s' does not exist" msgstr "分支 '%s' ä¸å˜åœ¨" -#: builtin/branch.c:987 +#: builtin/branch.c:994 msgid "too many branches to unset upstream" msgstr "为å–消上游设置æ“作æ供了太多的分支å" -#: builtin/branch.c:991 +#: builtin/branch.c:998 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "æ— æ³•å–消 HEAD çš„ä¸Šæ¸¸è®¾ç½®å› ä¸ºå®ƒæ²¡æœ‰æŒ‡å‘一个分支" -#: builtin/branch.c:997 +#: builtin/branch.c:1004 #, c-format msgid "Branch '%s' has no upstream information" msgstr "分支 '%s' 没有上游信æ¯" -#: builtin/branch.c:1011 +#: builtin/branch.c:1018 msgid "it does not make sense to create 'HEAD' manually" msgstr "手工创建 'HEAD' 没有æ„义" -#: builtin/branch.c:1017 +#: builtin/branch.c:1024 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "'git branch' çš„ -a å’Œ -r 选项带一个分支åå‚数没有æ„义" -#: builtin/branch.c:1020 +#: builtin/branch.c:1027 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3142,7 +3174,7 @@ msgid "" msgstr "" "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n" -#: builtin/branch.c:1037 +#: builtin/branch.c:1044 #, c-format msgid "" "\n" @@ -3153,12 +3185,12 @@ msgstr "" "å¦‚æžœä½ æƒ³ç”¨ '%s' 跟踪 '%s', 这么åšï¼š\n" "\n" -#: builtin/branch.c:1038 +#: builtin/branch.c:1045 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1039 +#: builtin/branch.c:1046 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -3176,53 +3208,53 @@ msgstr "需è¦ä¸€ä¸ªç‰ˆæœ¬åº“æ¥åˆ›å»ºåŒ…。" msgid "Need a repository to unbundle." msgstr "需è¦ä¸€ä¸ªç‰ˆæœ¬åº“æ¥è§£åŒ…。" -#: builtin/cat-file.c:328 -msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" -msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>" +#: builtin/cat-file.c:326 +msgid "git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>" +msgstr "git cat-file (-t | -s | -e | -p | <类型> | --textconv) <对象>" -#: builtin/cat-file.c:329 -msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" -msgstr "git cat-file (--batch|--batch-check) < <对象列表>" +#: builtin/cat-file.c:327 +msgid "git cat-file (--batch | --batch-check) < <list-of-objects>" +msgstr "git cat-file (--batch | --batch-check) < <对象列表>" -#: builtin/cat-file.c:366 +#: builtin/cat-file.c:364 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<类型> å¯ä»¥æ˜¯å…¶ä¸ä¹‹ä¸€ï¼šblobã€treeã€commitã€tag" -#: builtin/cat-file.c:367 +#: builtin/cat-file.c:365 msgid "show object type" msgstr "显示对象类型" -#: builtin/cat-file.c:368 +#: builtin/cat-file.c:366 msgid "show object size" msgstr "显示对象大å°" -#: builtin/cat-file.c:370 +#: builtin/cat-file.c:368 msgid "exit with zero when there's no error" msgstr "当没有错误时退出并返回零" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:369 msgid "pretty-print object's content" msgstr "美观地打å°å¯¹è±¡çš„内容" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:371 msgid "for blob objects, run textconv on object's content" msgstr "对于数æ®ï¼ˆblob）对象，对其内容执行 textconv" -#: builtin/cat-file.c:375 +#: builtin/cat-file.c:373 msgid "show info and content of objects fed from the standard input" msgstr "æ˜¾ç¤ºä»Žæ ‡å‡†è¾“å…¥æ供的对象的信æ¯å’Œå†…容" -#: builtin/cat-file.c:378 +#: builtin/cat-file.c:376 msgid "show info about objects fed from the standard input" msgstr "æ˜¾ç¤ºä»Žæ ‡å‡†è¾“å…¥æ供的对象的信æ¯" #: builtin/check-attr.c:11 -msgid "git check-attr [-a | --all | attr...] [--] pathname..." -msgstr "git check-attr [-a | --all | attr...] [--] 路径å..." +msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." +msgstr "git check-attr [-a | --all | <属性>...] [--] <路径å>..." #: builtin/check-attr.c:12 -msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" -msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>" +msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>" +msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...] < <路径列表>" #: builtin/check-attr.c:19 msgid "report all attributes set on file" @@ -3277,8 +3309,8 @@ msgid "--non-matching is only valid with --verbose" msgstr "--non-matching 选项åªåœ¨ä½¿ç”¨ --verbose 时有效" #: builtin/check-mailmap.c:8 -msgid "git check-mailmap [options] <contact>..." -msgstr "git check-mailmap [选项] <è”系地å€>..." +msgid "git check-mailmap [<options>] <contact>..." +msgstr "git check-mailmap [<选项>] <è”系地å€>..." #: builtin/check-mailmap.c:13 msgid "also read contacts from stdin" @@ -3294,8 +3326,8 @@ msgid "no contacts specified" msgstr "未指定è”系地å€" #: builtin/checkout-index.c:126 -msgid "git checkout-index [options] [--] [<file>...]" -msgstr "git checkout-index [选项] [--] [<文件>...]" +msgid "git checkout-index [<options>] [--] [<file>...]" +msgstr "git checkout-index [<选项>] [--] [<文件>...]" #: builtin/checkout-index.c:188 msgid "check out all files in the index" @@ -3338,12 +3370,12 @@ msgid "copy out the files from named stage" msgstr "从指定暂å˜åŒºä¸æ‹·å‡ºæ–‡ä»¶" #: builtin/checkout.c:25 -msgid "git checkout [options] <branch>" -msgstr "git checkout [选项] <分支>" +msgid "git checkout [<options>] <branch>" +msgstr "git checkout [<选项>] <分支>" #: builtin/checkout.c:26 -msgid "git checkout [options] [<branch>] -- <file>..." -msgstr "git checkout [选项] [<分支>] -- <文件>..." +msgid "git checkout [<options>] [<branch>] -- <file>..." +msgstr "git checkout [<选项>] [<分支>] -- <文件>..." #: builtin/checkout.c:132 builtin/checkout.c:165 #, c-format @@ -3471,13 +3503,13 @@ msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" "to do so with:\n" "\n" -" git branch new_branch_name %s\n" +" git branch <new-branch-name> %s\n" "\n" msgstr "" "如果您想è¦é€šè¿‡åˆ›å»ºæ–°åˆ†æ”¯ä¿å˜ä»–们，这å¯èƒ½æ˜¯ä¸€ä¸ªå¥½æ—¶å€™ã€‚\n" "如下æ“作：\n" "\n" -" git branch new_branch_name %s\n" +" git branch <新分支å> %s\n" "\n" #: builtin/checkout.c:777 @@ -3593,8 +3625,8 @@ msgid "do not limit pathspecs to sparse entries only" msgstr "对路径ä¸åšç¨€ç–检出的é™åˆ¶" #: builtin/checkout.c:1130 -msgid "second guess 'git checkout no-such-branch'" -msgstr "å†è€…猜测'git checkout no-such-branch'" +msgid "second guess 'git checkout <no-such-branch>'" +msgstr "二次猜测'git checkout <æ— æ¤åˆ†æ”¯>'" #: builtin/checkout.c:1153 msgid "-b, -B and --orphan are mutually exclusive" @@ -3715,16 +3747,17 @@ msgstr "è¦å‘Šï¼šæ— 法找到和 %s 匹é…çš„æ¡ç›®" msgid "Select items to delete" msgstr "选择è¦åˆ 除的æ¡ç›®" -#: builtin/clean.c:757 +#. TRANSLATORS: Make sure to keep [y/N] as is +#: builtin/clean.c:758 #, c-format -msgid "remove %s? " -msgstr "åˆ é™¤ %s？" +msgid "Remove %s [y/N]? " +msgstr "åˆ é™¤ %s [y/N]？" -#: builtin/clean.c:782 +#: builtin/clean.c:783 msgid "Bye." msgstr "å†è§ã€‚" -#: builtin/clean.c:790 +#: builtin/clean.c:791 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -3742,69 +3775,69 @@ msgstr "" "help - 显示本帮助\n" "? - 显示如何在æ示符下选择的帮助" -#: builtin/clean.c:817 +#: builtin/clean.c:818 msgid "*** Commands ***" msgstr "*** 命令 ***" -#: builtin/clean.c:818 +#: builtin/clean.c:819 msgid "What now" msgstr "请选择" -#: builtin/clean.c:826 +#: builtin/clean.c:827 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "å°†åˆ é™¤å¦‚ä¸‹æ¡ç›®ï¼š" msgstr[1] "å°†åˆ é™¤å¦‚ä¸‹æ¡ç›®ï¼š" -#: builtin/clean.c:843 +#: builtin/clean.c:844 msgid "No more files to clean, exiting." msgstr "没有è¦æ¸…ç†çš„文件，退出。" -#: builtin/clean.c:874 +#: builtin/clean.c:875 msgid "do not print names of files removed" msgstr "ä¸æ‰“å°åˆ 除文件的å称" -#: builtin/clean.c:876 +#: builtin/clean.c:877 msgid "force" msgstr "强制" -#: builtin/clean.c:877 +#: builtin/clean.c:878 msgid "interactive cleaning" msgstr "交互å¼æ¸…除" -#: builtin/clean.c:879 +#: builtin/clean.c:880 msgid "remove whole directories" msgstr "åˆ é™¤æ•´ä¸ªç›®å½•" -#: 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 +#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185 msgid "pattern" msgstr "模å¼" -#: builtin/clean.c:881 +#: builtin/clean.c:882 msgid "add <pattern> to ignore rules" msgstr "æ·»åŠ <模å¼>到忽略规则" -#: builtin/clean.c:882 +#: builtin/clean.c:883 msgid "remove ignored files, too" msgstr "ä¹Ÿåˆ é™¤å¿½ç•¥çš„æ–‡ä»¶" -#: builtin/clean.c:884 +#: builtin/clean.c:885 msgid "remove only ignored files" msgstr "åªåˆ 除忽略的文件" -#: builtin/clean.c:902 +#: builtin/clean.c:903 msgid "-x and -X cannot be used together" msgstr "-x å’Œ -X ä¸èƒ½åŒæ—¶ä½¿ç”¨" -#: builtin/clean.c:906 +#: builtin/clean.c:907 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" "clean.requireForce 设置为 true 且未æä¾› -iã€-n 或 -f 选项，拒ç»æ‰§è¡Œæ¸…ç†åŠ¨ä½œ" -#: builtin/clean.c:909 +#: builtin/clean.c:910 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -3812,11 +3845,11 @@ msgstr "" "clean.requireForce 默认为 true 且未æä¾› -iã€-n 或 -f 选项，拒ç»æ‰§è¡Œæ¸…ç†åŠ¨ä½œ" #: builtin/clone.c:37 -msgid "git clone [options] [--] <repo> [<dir>]" -msgstr "git clone [选项] [--] <版本库> [<路径>]" +msgid "git clone [<options>] [--] <repo> [<dir>]" +msgstr "git clone [<选项>] [--] <版本库> [<路径>]" -#: builtin/clone.c:66 builtin/fetch.c:112 builtin/merge.c:224 -#: builtin/push.c:514 +#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224 +#: builtin/push.c:523 msgid "force progress reporting" msgstr "强制显示进度报告" @@ -3876,7 +3909,7 @@ msgstr "检出<分支>而ä¸æ˜¯è¿œç¨‹HEAD" msgid "path to git-upload-pack on the remote" msgstr "远程 git-upload-pack 路径" -#: builtin/clone.c:94 builtin/fetch.c:113 builtin/grep.c:659 +#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659 msgid "depth" msgstr "深度" @@ -4020,7 +4053,7 @@ msgstr "--bare å’Œ --separate-git-dir 选项ä¸å…¼å®¹ã€‚" msgid "repository '%s' does not exist" msgstr "版本库 '%s' ä¸å˜åœ¨" -#: builtin/clone.c:815 builtin/fetch.c:1155 +#: builtin/clone.c:815 builtin/fetch.c:1156 #, c-format msgid "depth %s is not a positive number" msgstr "深度 %s ä¸æ˜¯ä¸€ä¸ªæ£æ•°" @@ -4035,59 +4068,59 @@ msgstr "ç›®æ ‡è·¯å¾„ '%s' å·²ç»å˜åœ¨ï¼Œå¹¶ä¸”ä¸æ˜¯ä¸€ä¸ªç©ºç›®å½•ã€‚" msgid "working tree '%s' already exists." msgstr "工作区 '%s' å·²ç»å˜åœ¨ã€‚" -#: builtin/clone.c:848 builtin/clone.c:860 +#: builtin/clone.c:850 builtin/clone.c:861 #, c-format msgid "could not create leading directories of '%s'" msgstr "ä¸èƒ½ä¸º '%s' 创建先导目录" -#: builtin/clone.c:851 +#: builtin/clone.c:853 #, c-format -msgid "could not create work tree dir '%s'." -msgstr "ä¸èƒ½ä¸º '%s' 创建工作区目录。" +msgid "could not create work tree dir '%s'" +msgstr "ä¸èƒ½åˆ›å»ºå·¥ä½œåŒºç›®å½• '%s'" -#: builtin/clone.c:870 +#: builtin/clone.c:871 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "克隆到纯版本库 '%s'...\n" -#: builtin/clone.c:872 +#: builtin/clone.c:873 #, c-format msgid "Cloning into '%s'...\n" msgstr "æ£å…‹éš†åˆ° '%s'...\n" -#: builtin/clone.c:897 +#: builtin/clone.c:898 msgid "--dissociate given, but there is no --reference" msgstr "æ供了å‚æ•° --dissociate，但未æä¾› --reference" -#: builtin/clone.c:912 +#: builtin/clone.c:913 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth 在本地克隆被忽略，改为 file:// å议试试。" -#: builtin/clone.c:915 +#: builtin/clone.c:916 msgid "source repository is shallow, ignoring --local" msgstr "æºç‰ˆæœ¬åº“是浅克隆，忽略 --local" -#: builtin/clone.c:920 +#: builtin/clone.c:921 msgid "--local is ignored" msgstr "--local 被忽略" -#: builtin/clone.c:924 +#: builtin/clone.c:925 #, c-format msgid "Don't know how to clone %s" msgstr "ä¸çŸ¥é“如何克隆 %s" -#: builtin/clone.c:975 builtin/clone.c:983 +#: builtin/clone.c:976 builtin/clone.c:984 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未å‘现" -#: builtin/clone.c:986 +#: builtin/clone.c:987 msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空版本库。" #: builtin/column.c:9 -msgid "git column [options]" -msgstr "git column [选项]" +msgid "git column [<options>]" +msgstr "git column [<选项>]" #: builtin/column.c:26 msgid "lookup config vars" @@ -4118,12 +4151,12 @@ msgid "--command must be the first argument" msgstr "--command 必须是第一个å‚æ•°" #: builtin/commit.c:37 -msgid "git commit [options] [--] <pathspec>..." -msgstr "git commit [选项] [--] <路径规则>..." +msgid "git commit [<options>] [--] <pathspec>..." +msgstr "git commit [<选项>] [--] <路径规则>..." #: builtin/commit.c:42 -msgid "git status [options] [--] <pathspec>..." -msgstr "git status [选项] [--] <路径规则>..." +msgid "git status [<options>] [--] <pathspec>..." +msgstr "git status [<选项>] [--] <路径规则>..." #: builtin/commit.c:47 msgid "" @@ -4215,112 +4248,112 @@ msgstr "" "然åŽæ‰§è¡Œ \"git cherry-pick --continue\" 继ç»å¯¹å…¶ä½™æ交执行拣选\n" "æ“作。\n" -#: builtin/commit.c:302 +#: builtin/commit.c:304 msgid "failed to unpack HEAD tree object" msgstr "æ— æ³•è§£åŒ… HEAD æ ‘å¯¹è±¡" -#: builtin/commit.c:342 +#: builtin/commit.c:344 msgid "unable to create temporary index" msgstr "ä¸èƒ½åˆ›å»ºä¸´æ—¶ç´¢å¼•" -#: builtin/commit.c:348 +#: builtin/commit.c:350 msgid "interactive add failed" msgstr "交互å¼æ·»åŠ 失败" -#: builtin/commit.c:359 +#: builtin/commit.c:361 msgid "unable to write index file" msgstr "æ— æ³•å†™å…¥ç´¢å¼•æ–‡ä»¶" -#: builtin/commit.c:361 +#: builtin/commit.c:363 msgid "unable to update temporary index" msgstr "æ— æ³•æ›´æ–°ä¸´æ—¶ç´¢å¼•" -#: builtin/commit.c:363 +#: builtin/commit.c:365 msgid "Failed to update main cache tree" msgstr "ä¸èƒ½æ›´æ–°æ ‘的主缓å˜" -#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461 +#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463 msgid "unable to write new_index file" msgstr "æ— æ³•å†™ new_index 文件" -#: builtin/commit.c:443 +#: builtin/commit.c:445 msgid "cannot do a partial commit during a merge." msgstr "在åˆå¹¶è¿‡ç¨‹ä¸ä¸èƒ½åšéƒ¨åˆ†æ交。" -#: builtin/commit.c:445 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a cherry-pick." msgstr "在拣选过程ä¸ä¸èƒ½åšéƒ¨åˆ†æ交。" -#: builtin/commit.c:454 +#: builtin/commit.c:456 msgid "cannot read the index" msgstr "æ— æ³•è¯»å–索引" -#: builtin/commit.c:473 +#: builtin/commit.c:475 msgid "unable to write temporary index file" msgstr "æ— æ³•å†™ä¸´æ—¶ç´¢å¼•æ–‡ä»¶" -#: builtin/commit.c:584 +#: builtin/commit.c:580 #, c-format msgid "commit '%s' lacks author header" msgstr "æ交 '%s' 缺少作者信æ¯" -#: builtin/commit.c:586 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' has malformed author line" msgstr "æ交 '%s' 有éžæ³•çš„作者信æ¯" -#: builtin/commit.c:605 +#: builtin/commit.c:601 msgid "malformed --author parameter" msgstr "éžæ³•çš„ --author å‚æ•°" -#: builtin/commit.c:613 +#: builtin/commit.c:609 #, c-format msgid "invalid date format: %s" msgstr "æ— æ•ˆçš„æ—¥æœŸæ ¼å¼ï¼š%s" -#: builtin/commit.c:657 +#: builtin/commit.c:653 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "æ— æ³•é€‰æ‹©ä¸€ä¸ªæœªè¢«å½“å‰æ交说明使用的注释å—符" -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1084 +#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 #, c-format msgid "could not lookup commit %s" msgstr "ä¸èƒ½æŸ¥è¯¢æ交 %s" -#: builtin/commit.c:706 builtin/shortlog.c:273 +#: builtin/commit.c:702 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "（æ£ä»Žæ ‡å‡†è¾“å…¥ä¸è¯»å–日志信æ¯ï¼‰\n" -#: builtin/commit.c:708 +#: builtin/commit.c:704 msgid "could not read log from standard input" msgstr "ä¸èƒ½ä»Žæ ‡å‡†è¾“å…¥ä¸è¯»å–日志信æ¯" -#: builtin/commit.c:712 +#: builtin/commit.c:708 #, c-format msgid "could not read log file '%s'" msgstr "ä¸èƒ½è¯»å–日志文件 '%s'" -#: builtin/commit.c:734 +#: builtin/commit.c:730 msgid "could not read MERGE_MSG" msgstr "ä¸èƒ½è¯»å– MERGE_MSG" -#: builtin/commit.c:738 +#: builtin/commit.c:734 msgid "could not read SQUASH_MSG" msgstr "ä¸èƒ½è¯»å– SQUASH_MSG" -#: builtin/commit.c:742 +#: builtin/commit.c:738 #, c-format msgid "could not read '%s'" msgstr "ä¸èƒ½è¯»å– '%s'" -#: builtin/commit.c:789 +#: builtin/commit.c:785 msgid "could not write commit template" msgstr "ä¸èƒ½å†™æ交模版" -#: builtin/commit.c:807 +#: builtin/commit.c:803 #, c-format msgid "" "\n" @@ -4334,7 +4367,7 @@ msgstr "" "\t%s\n" "然åŽé‡è¯•ã€‚\n" -#: builtin/commit.c:812 +#: builtin/commit.c:808 #, c-format msgid "" "\n" @@ -4348,7 +4381,7 @@ msgstr "" "\t%s\n" "然åŽé‡è¯•ã€‚\n" -#: builtin/commit.c:825 +#: builtin/commit.c:821 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4357,7 +4390,7 @@ msgstr "" "请为您的å˜æ›´è¾“å…¥æ交说明。以 '%c' 开始的行将被忽略，而一个空的æ交\n" "说明将会终æ¢æ交。\n" -#: builtin/commit.c:832 +#: builtin/commit.c:828 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4368,353 +4401,353 @@ msgstr "" "也å¯ä»¥åˆ 除它们。一个空的æ交说明将会终æ¢æ交。\n" # 译者：为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ -#: builtin/commit.c:852 +#: builtin/commit.c:848 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%s作者： %.*s <%.*s>" # 译者：为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ -#: builtin/commit.c:860 +#: builtin/commit.c:856 #, c-format msgid "%sDate: %s" msgstr "%s日期： %s" # 译者：为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ -#: builtin/commit.c:867 +#: builtin/commit.c:863 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sæ交者：%.*s <%.*s>" -#: builtin/commit.c:885 +#: builtin/commit.c:881 msgid "Cannot read index" msgstr "æ— æ³•è¯»å–索引" -#: builtin/commit.c:942 +#: builtin/commit.c:938 msgid "Error building trees" msgstr "æ— æ³•åˆ›å»ºæ ‘å¯¹è±¡" -#: builtin/commit.c:957 builtin/tag.c:495 +#: builtin/commit.c:953 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:1059 +#: builtin/commit.c:1055 #, c-format -msgid "No existing author found with '%s'" -msgstr "æ²¡æœ‰æ‰¾åˆ°åŒ¹é… '%s' 的作者" +msgid "--author '%s' is not 'Name <email>' and matches no existing author" +msgstr "--author '%s' ä¸æ˜¯ 'Name <email>' æ ¼å¼ï¼Œä¸”未能在现有作者ä¸æ‰¾åˆ°åŒ¹é…" -#: builtin/commit.c:1074 builtin/commit.c:1314 +#: builtin/commit.c:1070 builtin/commit.c:1310 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "æ— æ•ˆçš„æœªè¿½è¸ªæ–‡ä»¶å‚æ•° '%s'" -#: builtin/commit.c:1111 +#: builtin/commit.c:1107 msgid "--long and -z are incompatible" msgstr "--long å’Œ -z 选项ä¸å…¼å®¹" -#: builtin/commit.c:1141 +#: builtin/commit.c:1137 msgid "Using both --reset-author and --author does not make sense" msgstr "åŒæ—¶ä½¿ç”¨ --reset-author å’Œ --author 没有æ„义" -#: builtin/commit.c:1150 +#: builtin/commit.c:1146 msgid "You have nothing to amend." msgstr "您没有å¯ä¿®è¡¥çš„æ交。" -#: builtin/commit.c:1153 +#: builtin/commit.c:1149 msgid "You are in the middle of a merge -- cannot amend." msgstr "您æ£å¤„于一个åˆå¹¶è¿‡ç¨‹ä¸ -- æ— æ³•ä¿®è¡¥æ交。" -#: builtin/commit.c:1155 +#: builtin/commit.c:1151 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您æ£å¤„äºŽä¸€ä¸ªæ‹£é€‰è¿‡ç¨‹ä¸ -- æ— æ³•ä¿®è¡¥æ交。" -#: builtin/commit.c:1158 +#: builtin/commit.c:1154 msgid "Options --squash and --fixup cannot be used together" msgstr "选项 --squash å’Œ --fixup ä¸èƒ½åŒæ—¶ä½¿ç”¨" -#: builtin/commit.c:1168 +#: builtin/commit.c:1164 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "åªèƒ½ç”¨ä¸€ä¸ª -c/-C/-F/--fixup 选项。" -#: builtin/commit.c:1170 +#: builtin/commit.c:1166 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "选项 -m ä¸èƒ½å’Œ -c/-C/-F/--fixup åŒæ—¶ä½¿ç”¨ã€‚" -#: builtin/commit.c:1178 +#: builtin/commit.c:1174 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author åªèƒ½å’Œ -Cã€-c 或 --amend åŒæ—¶ä½¿ç”¨ã€‚" -#: builtin/commit.c:1195 +#: builtin/commit.c:1191 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "åªèƒ½ç”¨ä¸€ä¸ª --include/--only/--all/--interactive/--patch 选项。" -#: builtin/commit.c:1197 +#: builtin/commit.c:1193 msgid "No paths with --include/--only does not make sense." msgstr "å‚æ•° --include/--only ä¸è·Ÿè·¯å¾„没有æ„义。" -#: builtin/commit.c:1199 +#: builtin/commit.c:1195 msgid "Clever... amending the last one with dirty index." msgstr "èªæ˜Ž... 在索引ä¸å¹²å‡€ä¸‹ä¿®è¡¥æœ€åŽçš„æ交。" -#: builtin/commit.c:1201 +#: builtin/commit.c:1197 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "指定了明确的路径而没有使用 -i 或 -o 选项，认为是 --only paths..." -#: builtin/commit.c:1213 builtin/tag.c:728 +#: builtin/commit.c:1209 builtin/tag.c:728 #, c-format msgid "Invalid cleanup mode %s" msgstr "æ— æ•ˆçš„æ¸…ç†æ¨¡å¼ %s" -#: builtin/commit.c:1218 +#: builtin/commit.c:1214 msgid "Paths with -a does not make sense." msgstr "路径和 -a 选项åŒæ—¶ä½¿ç”¨æ²¡æœ‰æ„义。" -#: builtin/commit.c:1328 builtin/commit.c:1608 +#: builtin/commit.c:1324 builtin/commit.c:1604 msgid "show status concisely" msgstr "以简æ´çš„æ ¼å¼æ˜¾ç¤ºçŠ¶æ€" -#: builtin/commit.c:1330 builtin/commit.c:1610 +#: builtin/commit.c:1326 builtin/commit.c:1606 msgid "show branch information" msgstr "显示分支信æ¯" -#: builtin/commit.c:1332 builtin/commit.c:1612 builtin/push.c:500 +#: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509 msgid "machine-readable output" msgstr "机器å¯è¯»çš„输出" -#: builtin/commit.c:1335 builtin/commit.c:1614 +#: builtin/commit.c:1331 builtin/commit.c:1610 msgid "show status in long format (default)" msgstr "ä»¥é•¿æ ¼å¼æ˜¾ç¤ºçŠ¶æ€ï¼ˆé»˜è®¤ï¼‰" -#: builtin/commit.c:1338 builtin/commit.c:1617 +#: builtin/commit.c:1334 builtin/commit.c:1613 msgid "terminate entries with NUL" msgstr "æ¡ç›®ä»¥NULå—符结尾" -#: builtin/commit.c:1340 builtin/commit.c:1620 builtin/fast-export.c:980 +#: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980 #: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "模å¼" -#: builtin/commit.c:1341 builtin/commit.c:1620 +#: builtin/commit.c:1337 builtin/commit.c:1616 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "显示未跟踪的文件，“模å¼â€çš„å¯é€‰å‚数：allã€normalã€no。（默认：all）" -#: builtin/commit.c:1344 +#: builtin/commit.c:1340 msgid "show ignored files" msgstr "显示忽略的文件" -#: builtin/commit.c:1345 parse-options.h:153 +#: builtin/commit.c:1341 parse-options.h:153 msgid "when" msgstr "何时" -#: builtin/commit.c:1346 +#: builtin/commit.c:1342 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "忽略å模组的更改，“何时â€çš„å¯é€‰å‚数：allã€dirtyã€untracked。（默认：all）" -#: builtin/commit.c:1348 +#: builtin/commit.c:1344 msgid "list untracked files in columns" msgstr "以列的方å¼æ˜¾ç¤ºæœªè·Ÿè¸ªçš„文件" -#: builtin/commit.c:1435 +#: builtin/commit.c:1431 msgid "couldn't look up newly created commit" msgstr "æ— æ³•æ‰¾åˆ°æ–°åˆ›å»ºçš„æ交" -#: builtin/commit.c:1437 +#: builtin/commit.c:1433 msgid "could not parse newly created commit" msgstr "ä¸èƒ½è§£æžæ–°åˆ›å»ºçš„æ交" -#: builtin/commit.c:1482 +#: builtin/commit.c:1478 msgid "detached HEAD" msgstr "分离头指针" # 译者：ä¸æ–‡å—符串拼接，å¯åˆ 除å‰å¯¼ç©ºæ ¼ -#: builtin/commit.c:1485 +#: builtin/commit.c:1481 msgid " (root-commit)" msgstr "ï¼ˆæ ¹æ交）" -#: builtin/commit.c:1578 +#: builtin/commit.c:1574 msgid "suppress summary after successful commit" msgstr "æ交æˆåŠŸåŽä¸æ˜¾ç¤ºæ¦‚è¿°ä¿¡æ¯" -#: builtin/commit.c:1579 +#: builtin/commit.c:1575 msgid "show diff in commit message template" msgstr "在æ交说明模æ¿é‡Œæ˜¾ç¤ºå·®å¼‚" -#: builtin/commit.c:1581 +#: builtin/commit.c:1577 msgid "Commit message options" msgstr "æ交说明选项" -#: builtin/commit.c:1582 builtin/tag.c:601 +#: builtin/commit.c:1578 builtin/tag.c:601 msgid "read message from file" msgstr "从文件ä¸è¯»å–æ交说明" -#: builtin/commit.c:1583 +#: builtin/commit.c:1579 msgid "author" msgstr "作者" -#: builtin/commit.c:1583 +#: builtin/commit.c:1579 msgid "override author for commit" msgstr "æ交时覆盖作者" -#: builtin/commit.c:1584 builtin/gc.c:275 +#: builtin/commit.c:1580 builtin/gc.c:275 msgid "date" msgstr "日期" -#: builtin/commit.c:1584 +#: builtin/commit.c:1580 msgid "override date for commit" msgstr "æ交时覆盖日期" -#: builtin/commit.c:1585 builtin/merge.c:218 builtin/notes.c:391 +#: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391 #: builtin/notes.c:554 builtin/tag.c:599 msgid "message" msgstr "说明" -#: builtin/commit.c:1585 +#: builtin/commit.c:1581 msgid "commit message" msgstr "æ交说明" -#: builtin/commit.c:1586 +#: builtin/commit.c:1582 msgid "reuse and edit message from specified commit" msgstr "é‡ç”¨å¹¶ç¼–辑指定æ交的æ交说明" -#: builtin/commit.c:1587 +#: builtin/commit.c:1583 msgid "reuse message from specified commit" msgstr "é‡ç”¨æŒ‡å®šæ交的æ交说明" -#: builtin/commit.c:1588 +#: builtin/commit.c:1584 msgid "use autosquash formatted message to fixup specified commit" msgstr "使用 autosquash æ ¼å¼çš„æ交说明用以修æ£æŒ‡å®šçš„æ交" -#: builtin/commit.c:1589 +#: builtin/commit.c:1585 msgid "use autosquash formatted message to squash specified commit" msgstr "使用 autosquash æ ¼å¼çš„æ交说明用以压缩至指定的æ交" -#: builtin/commit.c:1590 +#: builtin/commit.c:1586 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "现在将该æ交的作者改为我（和 -C/-c/--amend å‚数共用）" -#: builtin/commit.c:1591 builtin/log.c:1191 builtin/revert.c:86 +#: builtin/commit.c:1587 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "æ·»åŠ Signed-off-by: ç¾å" -#: builtin/commit.c:1592 +#: builtin/commit.c:1588 msgid "use specified template file" msgstr "使用指定的模æ¿æ–‡ä»¶" -#: builtin/commit.c:1593 +#: builtin/commit.c:1589 msgid "force edit of commit" msgstr "强制编辑æ交" # 译者：å¯é€‰å€¼ï¼Œä¸èƒ½ç¿»è¯‘（或是原文ä¸ç¬”误，应为 mode） -#: builtin/commit.c:1594 +#: builtin/commit.c:1590 msgid "default" msgstr "default" -#: builtin/commit.c:1594 builtin/tag.c:604 +#: builtin/commit.c:1590 builtin/tag.c:604 msgid "how to strip spaces and #comments from message" msgstr "è®¾ç½®å¦‚ä½•åˆ é™¤æäº¤è¯´æ˜Žé‡Œçš„ç©ºæ ¼å’Œ#注释" -#: builtin/commit.c:1595 +#: builtin/commit.c:1591 msgid "include status in commit message template" msgstr "在æ交说明模æ¿é‡ŒåŒ…å«çŠ¶æ€ä¿¡æ¯" -#: builtin/commit.c:1596 builtin/merge.c:225 builtin/revert.c:92 +#: builtin/commit.c:1592 builtin/merge.c:225 builtin/revert.c:92 #: builtin/tag.c:605 msgid "key-id" msgstr "key-id" -#: builtin/commit.c:1597 builtin/merge.c:226 builtin/revert.c:93 +#: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93 msgid "GPG sign commit" msgstr "GPG æ交ç¾å" -#: builtin/commit.c:1600 +#: builtin/commit.c:1596 msgid "Commit contents options" msgstr "æ交内容选项" -#: builtin/commit.c:1601 +#: builtin/commit.c:1597 msgid "commit all changed files" msgstr "æ交所有改动的文件" -#: builtin/commit.c:1602 +#: builtin/commit.c:1598 msgid "add specified files to index for commit" msgstr "æ·»åŠ æŒ‡å®šçš„æ–‡ä»¶åˆ°ç´¢å¼•åŒºç‰å¾…æ交" -#: builtin/commit.c:1603 +#: builtin/commit.c:1599 msgid "interactively add files" msgstr "交互å¼æ·»åŠ 文件" -#: builtin/commit.c:1604 +#: builtin/commit.c:1600 msgid "interactively add changes" msgstr "交互å¼æ·»åŠ å˜æ›´" -#: builtin/commit.c:1605 +#: builtin/commit.c:1601 msgid "commit only specified files" msgstr "åªæ交指定的文件" -#: builtin/commit.c:1606 +#: builtin/commit.c:1602 msgid "bypass pre-commit hook" msgstr "绕过 pre-commit é’©å" -#: builtin/commit.c:1607 +#: builtin/commit.c:1603 msgid "show what would be committed" msgstr "显示将è¦æ交的内容" -#: builtin/commit.c:1618 +#: builtin/commit.c:1614 msgid "amend previous commit" msgstr "修改先å‰çš„æ交" -#: builtin/commit.c:1619 +#: builtin/commit.c:1615 msgid "bypass post-rewrite hook" msgstr "绕过 post-rewrite é’©å" -#: builtin/commit.c:1624 +#: builtin/commit.c:1620 msgid "ok to record an empty change" msgstr "å…许一个空æ交" -#: builtin/commit.c:1626 +#: builtin/commit.c:1622 msgid "ok to record a change with an empty message" msgstr "å…许空的æ交说明" -#: builtin/commit.c:1655 +#: builtin/commit.c:1651 msgid "could not parse HEAD commit" msgstr "ä¸èƒ½è§£æž HEAD æ交" -#: builtin/commit.c:1694 builtin/merge.c:519 +#: builtin/commit.c:1690 builtin/merge.c:519 #, c-format msgid "could not open '%s' for reading" msgstr "ä¸èƒ½ä¸ºè¯»å…¥æ‰“å¼€ '%s'" -#: builtin/commit.c:1701 +#: builtin/commit.c:1697 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "æŸåçš„ MERGE_HEAD 文件（%s）" -#: builtin/commit.c:1708 +#: builtin/commit.c:1704 msgid "could not read MERGE_MODE" msgstr "ä¸èƒ½è¯»å– MERGE_MODE" -#: builtin/commit.c:1727 +#: builtin/commit.c:1723 #, c-format msgid "could not read commit message: %s" msgstr "ä¸èƒ½è¯»å–æ交说明：%s" -#: builtin/commit.c:1738 +#: builtin/commit.c:1734 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终æ¢æ交；您未更改æ¥è‡ªæ¨¡ç‰ˆçš„æ交说明。\n" -#: builtin/commit.c:1743 +#: builtin/commit.c:1739 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终æ¢æäº¤å› ä¸ºæ交说明为空。\n" -#: builtin/commit.c:1758 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1754 builtin/merge.c:851 builtin/merge.c:876 msgid "failed to write commit object" msgstr "æ— æ³•å†™æ交对象" -#: builtin/commit.c:1791 +#: builtin/commit.c:1787 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -4724,8 +4757,8 @@ msgstr "" "或ç£ç›˜é…é¢å·²è€—尽，然åŽæ‰§è¡Œ \"git reset HEAD\" æ¢å¤ã€‚" #: builtin/config.c:8 -msgid "git config [options]" -msgstr "git config [选项]" +msgid "git config [<options>]" +msgstr "git config [<选项>]" #: builtin/config.c:53 msgid "Config file location" @@ -4880,12 +4913,12 @@ msgid "print sizes in human readable format" msgstr "以用户å¯è¯»çš„æ ¼å¼æ˜¾ç¤ºå¤§å°" #: builtin/describe.c:17 -msgid "git describe [options] <commit-ish>*" -msgstr "git describe [选项] <æ交å·>*" +msgid "git describe [<options>] [<commit-ish>...]" +msgstr "git describe [<选项>] [<æ交å·>...]" #: builtin/describe.c:18 -msgid "git describe [options] --dirty" -msgstr "git describe [选项] --dirty" +msgid "git describe [<options>] --dirty" +msgstr "git describe [<选项>] --dirty" #: builtin/describe.c:217 #, c-format @@ -5100,179 +5133,179 @@ msgstr "对导出的引用应用引用表达å¼" msgid "anonymize output" msgstr "匿å输出" -#: builtin/fetch.c:20 +#: builtin/fetch.c:19 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]" -#: builtin/fetch.c:21 +#: builtin/fetch.c:20 msgid "git fetch [<options>] <group>" msgstr "git fetch [<选项>] <组>" -#: builtin/fetch.c:22 +#: builtin/fetch.c:21 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]" -#: builtin/fetch.c:23 +#: builtin/fetch.c:22 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<选项>]" -#: builtin/fetch.c:90 +#: builtin/fetch.c:89 msgid "fetch from all remotes" msgstr "从所有的远程抓å–" -#: builtin/fetch.c:92 +#: builtin/fetch.c:91 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "è¿½åŠ åˆ° .git/FETCH_HEAD 而ä¸æ˜¯è¦†ç›–它" -#: builtin/fetch.c:94 +#: builtin/fetch.c:93 msgid "path to upload pack on remote end" msgstr "ä¸Šä¼ åŒ…åˆ°è¿œç¨‹çš„è·¯å¾„" -#: builtin/fetch.c:95 +#: builtin/fetch.c:94 msgid "force overwrite of local branch" msgstr "强制覆盖本地分支" -#: builtin/fetch.c:97 +#: builtin/fetch.c:96 msgid "fetch from multiple remotes" msgstr "从多个远程抓å–" -#: builtin/fetch.c:99 +#: builtin/fetch.c:98 msgid "fetch all tags and associated objects" msgstr "抓å–所有的 tags 和关è”对象" -#: builtin/fetch.c:101 +#: builtin/fetch.c:100 msgid "do not fetch all tags (--no-tags)" msgstr "ä¸æŠ“å–任何 tags (--no-tags)" -#: builtin/fetch.c:103 +#: builtin/fetch.c:102 msgid "prune remote-tracking branches no longer on remote" msgstr "清除远程已ç»ä¸å˜åœ¨çš„分支的跟踪分支" # 译者：å¯é€‰å€¼ï¼Œä¸èƒ½ç¿»è¯‘ -#: builtin/fetch.c:104 +#: builtin/fetch.c:103 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:105 +#: builtin/fetch.c:104 msgid "control recursive fetching of submodules" msgstr "控制å模组的递归抓å–" -#: builtin/fetch.c:109 +#: builtin/fetch.c:108 msgid "keep downloaded pack" msgstr "ä¿æŒä¸‹è½½åŒ…" -#: builtin/fetch.c:111 +#: builtin/fetch.c:110 msgid "allow updating of HEAD ref" msgstr "å…许更新 HEAD 引用" -#: builtin/fetch.c:114 +#: builtin/fetch.c:113 msgid "deepen history of shallow clone" msgstr "深化浅克隆的历å²" -#: builtin/fetch.c:116 +#: builtin/fetch.c:115 msgid "convert to a complete repository" msgstr "转æ¢ä¸ºä¸€ä¸ªå®Œæ•´çš„版本库" -#: builtin/fetch.c:118 builtin/log.c:1208 +#: builtin/fetch.c:117 builtin/log.c:1208 msgid "dir" msgstr "目录" -#: builtin/fetch.c:119 +#: builtin/fetch.c:118 msgid "prepend this to submodule path output" msgstr "在å模组路径输出的å‰é¢åŠ 上æ¤ç›®å½•" -#: builtin/fetch.c:122 +#: builtin/fetch.c:121 msgid "default mode for recursion" msgstr "递归的默认模å¼" -#: builtin/fetch.c:124 +#: builtin/fetch.c:123 msgid "accept refs that update .git/shallow" msgstr "接å—æ›´æ–° .git/shallow 的引用" -#: builtin/fetch.c:125 +#: builtin/fetch.c:124 msgid "refmap" msgstr "å¼•ç”¨æ˜ å°„" -#: builtin/fetch.c:126 +#: builtin/fetch.c:125 msgid "specify fetch refmap" msgstr "指定获å–æ“ä½œçš„å¼•ç”¨æ˜ å°„" -#: builtin/fetch.c:376 +#: builtin/fetch.c:375 msgid "Couldn't find remote ref HEAD" msgstr "æ— æ³•å‘现远程 HEAD 引用" -#: builtin/fetch.c:454 +#: builtin/fetch.c:455 #, c-format msgid "object %s not found" msgstr "对象 %s 未å‘现" -#: builtin/fetch.c:459 +#: builtin/fetch.c:460 msgid "[up to date]" msgstr "[最新]" -#: builtin/fetch.c:473 +#: builtin/fetch.c:474 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s （在当å‰åˆ†æ”¯ä¸‹ä¸èƒ½èŽ·å–）" -#: builtin/fetch.c:474 builtin/fetch.c:560 +#: builtin/fetch.c:475 builtin/fetch.c:561 msgid "[rejected]" msgstr "[已拒ç»]" -#: builtin/fetch.c:485 +#: builtin/fetch.c:486 msgid "[tag update]" msgstr "[tagæ›´æ–°]" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540 +#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541 msgid " (unable to update local ref)" msgstr " （ä¸èƒ½æ›´æ–°æœ¬åœ°å¼•ç”¨ï¼‰" -#: builtin/fetch.c:505 +#: builtin/fetch.c:506 msgid "[new tag]" msgstr "[æ–°tag]" -#: builtin/fetch.c:508 +#: builtin/fetch.c:509 msgid "[new branch]" msgstr "[新分支]" -#: builtin/fetch.c:511 +#: builtin/fetch.c:512 msgid "[new ref]" msgstr "[新引用]" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "unable to update local ref" msgstr "ä¸èƒ½æ›´æ–°æœ¬åœ°å¼•ç”¨" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "forced update" msgstr "强制更新" -#: builtin/fetch.c:562 +#: builtin/fetch.c:563 msgid "(non-fast-forward)" msgstr "（éžå¿«è¿›å¼ï¼‰" -#: builtin/fetch.c:595 builtin/fetch.c:828 +#: builtin/fetch.c:596 builtin/fetch.c:829 #, c-format msgid "cannot open %s: %s\n" msgstr "æ— æ³•æ‰“å¼€ %s：%s\n" -#: builtin/fetch.c:604 +#: builtin/fetch.c:605 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未å‘é€æ‰€æœ‰å¿…须的对象\n" -#: builtin/fetch.c:622 +#: builtin/fetch.c:623 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "æ‹’ç» %s å› ä¸ºæµ…å…‹éš†ä¸å…许被更新" -#: builtin/fetch.c:710 builtin/fetch.c:793 +#: builtin/fetch.c:711 builtin/fetch.c:794 #, c-format msgid "From %.*s\n" msgstr "æ¥è‡ª %.*s\n" -#: builtin/fetch.c:721 +#: builtin/fetch.c:722 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5282,93 +5315,94 @@ msgstr "" " 'git remote prune %s' æ¥åˆ 除旧的ã€æœ‰å†²çªçš„分支" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: builtin/fetch.c:773 +#: builtin/fetch.c:774 #, c-format msgid " (%s will become dangling)" msgstr " （%s å°†æˆä¸ºæ‘‡æ‘†çŠ¶æ€ï¼‰" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: builtin/fetch.c:774 +#: builtin/fetch.c:775 #, c-format msgid " (%s has become dangling)" msgstr " （%s å·²æˆä¸ºæ‘‡æ‘†çŠ¶æ€ï¼‰" -#: builtin/fetch.c:798 +#: builtin/fetch.c:799 msgid "[deleted]" msgstr "[å·²åˆ é™¤]" -#: builtin/fetch.c:799 builtin/remote.c:1060 +#: builtin/fetch.c:800 builtin/remote.c:1060 msgid "(none)" msgstr "ï¼ˆæ— ï¼‰" -#: builtin/fetch.c:818 +#: builtin/fetch.c:819 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "æ‹’ç»èŽ·å–到éžçº¯ç‰ˆæœ¬åº“的当å‰åˆ†æ”¯ %s" -#: builtin/fetch.c:837 +#: builtin/fetch.c:838 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s æ˜¯æ— æ•ˆçš„" -#: builtin/fetch.c:840 +#: builtin/fetch.c:841 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "选项 \"%s\" 为 %s 所忽略\n" -#: builtin/fetch.c:896 +#: builtin/fetch.c:897 #, c-format msgid "Don't know how to fetch from %s" msgstr "ä¸çŸ¥é“如何从 %s 获å–" -#: builtin/fetch.c:1058 +#: builtin/fetch.c:1059 #, c-format msgid "Fetching %s\n" msgstr "æ£åœ¨èŽ·å– %s\n" -#: builtin/fetch.c:1060 builtin/remote.c:90 +#: builtin/fetch.c:1061 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "ä¸èƒ½èŽ·å– %s" -#: builtin/fetch.c:1078 +#: builtin/fetch.c:1079 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "未指定远程版本库。请通过一个URL或远程版本库å指定，用以获å–æ–°æ交。" -#: builtin/fetch.c:1101 +#: builtin/fetch.c:1102 msgid "You need to specify a tag name." msgstr "您需è¦æŒ‡å®šä¸€ä¸ª tag å称。" -#: builtin/fetch.c:1143 +#: builtin/fetch.c:1144 msgid "--depth and --unshallow cannot be used together" msgstr "--depth å’Œ --unshallow ä¸èƒ½åŒæ—¶ä½¿ç”¨" -#: builtin/fetch.c:1145 +#: builtin/fetch.c:1146 msgid "--unshallow on a complete repository does not make sense" msgstr "对于一个完整的版本库，å‚æ•° --unshallow 没有æ„义" -#: builtin/fetch.c:1168 +#: builtin/fetch.c:1169 msgid "fetch --all does not take a repository argument" msgstr "fetch --all ä¸èƒ½å¸¦ä¸€ä¸ªç‰ˆæœ¬åº“å‚æ•°" -#: builtin/fetch.c:1170 +#: builtin/fetch.c:1171 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 带引用规则没有任何æ„义" -#: builtin/fetch.c:1181 +#: builtin/fetch.c:1182 #, c-format msgid "No such remote or remote group: %s" msgstr "æ²¡æœ‰è¿™æ ·çš„è¿œç¨‹æˆ–è¿œç¨‹ç»„ï¼š%s" -#: builtin/fetch.c:1189 +#: builtin/fetch.c:1190 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "获å–组并指定引用规则没有æ„义" #: builtin/fmt-merge-msg.c:13 -msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" -msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>]|--no-log] [--file <文件>]" +msgid "" +"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" +msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]" #: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182 @@ -5397,51 +5431,51 @@ msgstr "使用 <文本> 作为æ交说明的开始" msgid "file to read from" msgstr "从文件ä¸è¯»å–" -#: builtin/for-each-ref.c:676 +#: builtin/for-each-ref.c:675 msgid "unable to parse format" msgstr "ä¸èƒ½è§£æžæ ¼å¼" -#: builtin/for-each-ref.c:1064 -msgid "git for-each-ref [options] [<pattern>]" -msgstr "git for-each-ref [选项] [<模å¼>]" +#: builtin/for-each-ref.c:1063 +msgid "git for-each-ref [<options>] [<pattern>]" +msgstr "git for-each-ref [<选项>] [<模å¼>]" -#: builtin/for-each-ref.c:1079 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for shells" msgstr "引用å ä½ç¬¦é€‚用于 shells" -#: builtin/for-each-ref.c:1081 +#: builtin/for-each-ref.c:1080 msgid "quote placeholders suitably for perl" msgstr "引用å ä½ç¬¦é€‚用于 perl" -#: builtin/for-each-ref.c:1083 +#: builtin/for-each-ref.c:1082 msgid "quote placeholders suitably for python" msgstr "引用å ä½ç¬¦é€‚用于 python" -#: builtin/for-each-ref.c:1085 +#: builtin/for-each-ref.c:1084 msgid "quote placeholders suitably for Tcl" msgstr "引用å ä½ç¬¦é€‚用于 Tcl" -#: builtin/for-each-ref.c:1088 +#: builtin/for-each-ref.c:1087 msgid "show only <n> matched refs" msgstr "åªæ˜¾ç¤º <n> 个匹é…的引用" -#: builtin/for-each-ref.c:1089 builtin/replace.c:438 +#: builtin/for-each-ref.c:1088 builtin/replace.c:438 msgid "format" msgstr "æ ¼å¼" -#: builtin/for-each-ref.c:1089 +#: builtin/for-each-ref.c:1088 msgid "format to use for the output" msgstr "è¾“å‡ºæ ¼å¼" -#: builtin/for-each-ref.c:1090 +#: builtin/for-each-ref.c:1089 msgid "key" msgstr "key" -#: builtin/for-each-ref.c:1091 +#: builtin/for-each-ref.c:1090 msgid "field name to sort on" msgstr "排åºçš„å—段å" -#: builtin/fsck.c:147 builtin/prune.c:136 +#: builtin/fsck.c:147 builtin/prune.c:137 msgid "Checking connectivity" msgstr "检查连接ä¸" @@ -5450,8 +5484,8 @@ msgid "Checking object directories" msgstr "检查对象目录ä¸" #: builtin/fsck.c:603 -msgid "git fsck [options] [<object>...]" -msgstr "git fsck [选项] [<对象>...]" +msgid "git fsck [<options>] [<object>...]" +msgstr "git fsck [<选项>] [<对象>...]" #: builtin/fsck.c:609 msgid "show unreachable objects" @@ -5498,8 +5532,8 @@ msgid "Checking objects" msgstr "检查对象ä¸" #: builtin/gc.c:24 -msgid "git gc [options]" -msgstr "git gc [选项]" +msgid "git gc [<options>]" +msgstr "git gc [<选项>]" #: builtin/gc.c:79 #, c-format @@ -5555,8 +5589,8 @@ msgid "" msgstr "有太多ä¸å¯è¾¾çš„æ¾æ•£å¯¹è±¡ï¼Œè¿è¡Œ 'git prune' åˆ é™¤å®ƒä»¬ã€‚" #: builtin/grep.c:23 -msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" -msgstr "git grep [选项] [-e] <模å¼> [<版本>...] [[--] <路径>...]" +msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" +msgstr "git grep [<选项>] [-e] <模å¼> [<版本>...] [[--] <路径>...]" #: builtin/grep.c:218 #, c-format @@ -5597,8 +5631,8 @@ msgid "search in both tracked and untracked files" msgstr "在跟踪和未跟踪的文件ä¸æœç´¢" #: builtin/grep.c:644 -msgid "search also in ignored files" -msgstr "也在忽略的文件ä¸æœç´¢" +msgid "ignore files specified via '.gitignore'" +msgstr "忽略 '.gitignore' 包å«çš„文件" #: builtin/grep.c:647 msgid "show non-matching lines" @@ -5782,17 +5816,17 @@ msgstr "åŒæ—¶ç»™å‡ºäº† --cached å’Œæ ‘å¯¹è±¡ã€‚" #: builtin/hash-object.c:82 msgid "" -"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " -"<file>..." +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " +"[--] <file>..." msgstr "" -"git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] " -"<文件>..." +"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] " +"[--] <文件>..." #: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "git hash-object --stdin-paths < <路径列表>" -#: builtin/hash-object.c:94 builtin/tag.c:610 +#: builtin/hash-object.c:94 builtin/tag.c:612 msgid "type" msgstr "类型" @@ -5842,8 +5876,8 @@ msgid "show info page" msgstr "显示 info 手册" #: builtin/help.c:52 -msgid "git help [--all] [--guides] [--man|--web|--info] [command]" -msgstr "git help [--all] [--guides] [--man|--web|--info] [命令]" +msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" +msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]" #: builtin/help.c:64 #, c-format @@ -6051,8 +6085,8 @@ msgstr "解压缩严é‡çš„ä¸ä¸€è‡´" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "å‘现 %s 出现 SHA1 冲çªï¼" -#: builtin/index-pack.c:689 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:256 +#: builtin/index-pack.c:689 builtin/pack-objects.c:162 +#: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "ä¸èƒ½è¯» %s" @@ -6139,97 +6173,97 @@ msgid_plural "pack has %d unresolved deltas" msgstr[0] "包有 %d 个未解决的 delta" msgstr[1] "包有 %d 个未解决的 delta" -#: builtin/index-pack.c:1220 +#: builtin/index-pack.c:1219 #, c-format msgid "unable to deflate appended object (%d)" msgstr "ä¸èƒ½åŽ‹ç¼©é™„åŠ å¯¹è±¡ï¼ˆ%d）" -#: builtin/index-pack.c:1299 +#: builtin/index-pack.c:1298 #, c-format msgid "local object %s is corrupt" msgstr "本地对象 %s å·²æŸå" -#: builtin/index-pack.c:1323 +#: builtin/index-pack.c:1322 msgid "error while closing pack file" msgstr "å…³é—包文件时出错" -#: builtin/index-pack.c:1336 +#: builtin/index-pack.c:1335 #, c-format msgid "cannot write keep file '%s'" msgstr "æ— æ³•å†™ä¿ç•™æ–‡ä»¶ '%s'" -#: builtin/index-pack.c:1344 +#: builtin/index-pack.c:1343 #, c-format msgid "cannot close written keep file '%s'" msgstr "æ— æ³•å…³é—ä¿ç•™æ–‡ä»¶ '%s'" -#: builtin/index-pack.c:1357 +#: builtin/index-pack.c:1356 msgid "cannot store pack file" msgstr "æ— æ³•å˜å‚¨åŒ…文件" -#: builtin/index-pack.c:1368 +#: builtin/index-pack.c:1367 msgid "cannot store index file" msgstr "æ— æ³•å˜å‚¨ç´¢å¼•æ–‡ä»¶" -#: builtin/index-pack.c:1401 +#: builtin/index-pack.c:1400 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "åçš„ pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1406 #, c-format msgid "invalid number of threads specified (%d)" msgstr "æŒ‡å®šçš„çº¿ç¨‹æ•°æ— æ•ˆï¼ˆ%d）" -#: builtin/index-pack.c:1411 builtin/index-pack.c:1590 +#: builtin/index-pack.c:1410 builtin/index-pack.c:1589 #, c-format msgid "no threads support, ignoring %s" msgstr "没有线程支æŒï¼Œå¿½ç•¥ %s" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1468 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "æ— æ³•æ‰“å¼€çŽ°å˜åŒ…文件 '%s'" -#: builtin/index-pack.c:1471 +#: builtin/index-pack.c:1470 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "æ— æ³•ä¸º %s 打开包索引文件" -#: builtin/index-pack.c:1518 +#: builtin/index-pack.c:1517 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "éž delta：%d 个对象" msgstr[1] "éž delta：%d 个对象" -#: builtin/index-pack.c:1525 +#: builtin/index-pack.c:1524 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "链长 = %d: %lu 对象" msgstr[1] "链长 = %d: %lu 对象" -#: builtin/index-pack.c:1554 +#: builtin/index-pack.c:1553 msgid "Cannot come back to cwd" msgstr "æ— æ³•è¿”å›žå½“å‰å·¥ä½œç›®å½•" -#: builtin/index-pack.c:1602 builtin/index-pack.c:1605 -#: builtin/index-pack.c:1617 builtin/index-pack.c:1621 +#: builtin/index-pack.c:1601 builtin/index-pack.c:1604 +#: builtin/index-pack.c:1616 builtin/index-pack.c:1620 #, c-format msgid "bad %s" msgstr "错误选项 %s" -#: builtin/index-pack.c:1635 +#: builtin/index-pack.c:1634 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin ä¸èƒ½å’Œ --stdin åŒæ—¶ä½¿ç”¨" -#: builtin/index-pack.c:1639 builtin/index-pack.c:1648 +#: builtin/index-pack.c:1638 builtin/index-pack.c:1647 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "包å '%s' 没有以 '.pack' 结尾" -#: builtin/index-pack.c:1656 +#: builtin/index-pack.c:1655 msgid "--verify with no packfile name given" msgstr "--verify 没有æ供包åå‚æ•°" @@ -6342,10 +6376,10 @@ msgstr "共享" #: builtin/init-db.c:475 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" -"shared[=<permissions>]] [directory]" +"shared[=<permissions>]] [<directory>]" msgstr "" "git init [-q | --quiet] [--bare] [--template=<模æ¿ç›®å½•>] [--shared[=<æƒé™>]] " -"[目录]" +"[<目录>]" #: builtin/init-db.c:498 msgid "permissions" @@ -6406,8 +6440,8 @@ msgid "git log [<options>] [<revision range>] [[--] <path>...]" msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" #: builtin/log.c:42 -msgid "git show [options] <object>..." -msgstr "git show [选项] <对象>..." +msgid "git show [<options>] <object>..." +msgstr "git show [<选项>] <对象>..." #: builtin/log.c:81 #, c-format @@ -6485,8 +6519,8 @@ msgid "insane in-reply-to: %s" msgstr "ä¸æ£å¸¸çš„ in-reply-to：%s" #: builtin/log.c:1026 -msgid "git format-patch [options] [<since> | <revision range>]" -msgstr "git format-patch [选项] [<从> | <版本范围>]" +msgid "git format-patch [<options>] [<since> | <revision-range>]" +msgstr "git format-patch [<选项>] [<从> | <版本范围>]" #: builtin/log.c:1071 msgid "Two output directories?" @@ -6682,95 +6716,95 @@ msgstr "ä¸èƒ½æ‰¾åˆ°è·Ÿè¸ªçš„远程分支，请手工指定 <上游>。\n" msgid "Unknown commit %s" msgstr "未知æ交 %s" -#: builtin/ls-files.c:401 -msgid "git ls-files [options] [<file>...]" -msgstr "git ls-files [选项] [<文件>...]" +#: builtin/ls-files.c:358 +msgid "git ls-files [<options>] [<file>...]" +msgstr "git ls-files [<选项>] [<文件>...]" -#: builtin/ls-files.c:458 +#: builtin/ls-files.c:415 msgid "identify the file status with tags" msgstr "ç”¨æ ‡ç¾æ ‡è¯†æ–‡ä»¶çš„状æ€" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:417 msgid "use lowercase letters for 'assume unchanged' files" msgstr "使用å°å†™å—æ¯è¡¨ç¤º 'å‡è®¾æœªæ”¹å˜çš„' 文件" -#: builtin/ls-files.c:462 +#: builtin/ls-files.c:419 msgid "show cached files in the output (default)" msgstr "显示缓å˜çš„文件（默认）" -#: builtin/ls-files.c:464 +#: builtin/ls-files.c:421 msgid "show deleted files in the output" msgstr "æ˜¾ç¤ºå·²åˆ é™¤çš„æ–‡ä»¶" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:423 msgid "show modified files in the output" msgstr "显示已修改的文件" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:425 msgid "show other files in the output" msgstr "显示其它文件" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:427 msgid "show ignored files in the output" msgstr "显示忽略的文件" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:430 msgid "show staged contents' object name in the output" msgstr "显示暂å˜åŒºå†…容的对象å称" -#: builtin/ls-files.c:475 +#: builtin/ls-files.c:432 msgid "show files on the filesystem that need to be removed" msgstr "显示文件系统需è¦åˆ 除的文件" -#: builtin/ls-files.c:477 +#: builtin/ls-files.c:434 msgid "show 'other' directories' names only" msgstr "åªæ˜¾ç¤ºâ€œå…¶ä»–â€ç›®å½•çš„å称" -#: builtin/ls-files.c:480 +#: builtin/ls-files.c:437 msgid "don't show empty directories" msgstr "ä¸æ˜¾ç¤ºç©ºç›®å½•" -#: builtin/ls-files.c:483 +#: builtin/ls-files.c:440 msgid "show unmerged files in the output" msgstr "显示未åˆå¹¶çš„文件" -#: builtin/ls-files.c:485 +#: builtin/ls-files.c:442 msgid "show resolve-undo information" msgstr "显示 resolve-undo ä¿¡æ¯" -#: builtin/ls-files.c:487 +#: builtin/ls-files.c:444 msgid "skip files matching pattern" msgstr "匹é…排除文件的模å¼" -#: builtin/ls-files.c:490 +#: builtin/ls-files.c:447 msgid "exclude patterns are read from <file>" msgstr "从 <文件> ä¸è¯»å–排除模å¼" -#: builtin/ls-files.c:493 +#: builtin/ls-files.c:450 msgid "read additional per-directory exclude patterns in <file>" msgstr "从 <文件> 读å–é¢å¤–çš„æ¯ä¸ªç›®å½•çš„排除模å¼" -#: builtin/ls-files.c:495 +#: builtin/ls-files.c:452 msgid "add the standard git exclusions" msgstr "æ·»åŠ æ ‡å‡†çš„ git 排除" -#: builtin/ls-files.c:498 +#: builtin/ls-files.c:455 msgid "make the output relative to the project top directory" msgstr "显示相对于顶级目录的文件å" -#: builtin/ls-files.c:501 +#: builtin/ls-files.c:458 msgid "if any <file> is not in the index, treat this as an error" msgstr "如果任何 <文件> 都ä¸åœ¨ç´¢å¼•åŒºï¼Œè§†ä¸ºé”™è¯¯" -#: builtin/ls-files.c:502 +#: builtin/ls-files.c:459 msgid "tree-ish" msgstr "æ ‘æˆ–æ交" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:460 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "å‡è£…自从 <æ ‘æˆ–æ交> 之åŽåˆ 除的路径ä»ç„¶å˜åœ¨" -#: builtin/ls-files.c:505 +#: builtin/ls-files.c:462 msgid "show debugging data" msgstr "显示调试数æ®" @@ -6811,12 +6845,12 @@ msgid "list entire tree; not just current directory (implies --full-name)" msgstr "åˆ—å‡ºæ•´ä¸ªæ ‘ï¼›ä¸ä»…仅当å‰ç›®å½•ï¼ˆéšå« --full-name）" #: builtin/merge.c:45 -msgid "git merge [options] [<commit>...]" -msgstr "git merge [选项] [<æ交>...]" +msgid "git merge [<options>] [<commit>...]" +msgstr "git merge [<选项>] [<æ交>...]" #: builtin/merge.c:46 -msgid "git merge [options] <msg> HEAD <commit>" -msgstr "git merge [选项] <说明> HEAD <æ交>" +msgid "git merge [<options>] <msg> HEAD <commit>" +msgstr "git merge [<选项>] <说明> HEAD <æ交>" #: builtin/merge.c:47 msgid "git merge --abort" @@ -7156,12 +7190,12 @@ msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动åˆå¹¶è¿›å±•é¡ºåˆ©ï¼ŒæŒ‰è¦æ±‚在æ交å‰åœæ¢\n" #: builtin/merge-base.c:29 -msgid "git merge-base [-a|--all] <commit> <commit>..." -msgstr "git merge-base [-a|--all] <æ交> <æ交>..." +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "git merge-base [-a | --all] <æ交> <æ交>..." #: builtin/merge-base.c:30 -msgid "git merge-base [-a|--all] --octopus <commit>..." -msgstr "git merge-base [-a|--all] --octopus <æ交>..." +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "git merge-base [-a | --all] --octopus <æ交>..." #: builtin/merge-base.c:31 msgid "git merge-base --independent <commit>..." @@ -7197,10 +7231,11 @@ msgstr "查找 <æ交> 从<引用>日志的何处分支的" #: builtin/merge-file.c:8 msgid "" -"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " -"file2" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" msgstr "" -"git merge-file [选项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2" +"git merge-file [<选项>] [-L <文件1> [-L <åˆå§‹> [-L <åå—2>]]] <文件1> <åˆå§‹æ–‡" +"件> <文件2>" #: builtin/merge-file.c:33 msgid "send results to standard output" @@ -7231,8 +7266,8 @@ msgid "do not warn about conflicts" msgstr "ä¸è¦è¦å‘Šå†²çª" #: builtin/merge-file.c:45 -msgid "set labels for file1/orig_file/file2" -msgstr "为 file1/orig_file/file2 è®¾ç½®æ ‡ç¾" +msgid "set labels for file1/orig-file/file2" +msgstr "为 文件1/åˆå§‹æ–‡ä»¶/文件2 è®¾ç½®æ ‡ç¾" #: builtin/mktree.c:64 msgid "git mktree [-z] [--missing] [--batch]" @@ -7251,8 +7286,8 @@ msgid "allow creation of more than one tree" msgstr "å…è®¸åˆ›å»ºä¸€ä¸ªä»¥ä¸Šçš„æ ‘" #: builtin/mv.c:15 -msgid "git mv [options] <source>... <destination>" -msgstr "git mv [选项] <æº>... <ç›®æ ‡>" +msgid "git mv [<options>] <source>... <destination>" +msgstr "git mv [<选项>] <æº>... <ç›®æ ‡>" #: builtin/mv.c:69 #, c-format @@ -7337,22 +7372,22 @@ msgstr "%s，æº=%sï¼Œç›®æ ‡=%s" msgid "Renaming %s to %s\n" msgstr "é‡å‘½å %s 至 %s\n" -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:355 +#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359 #, c-format msgid "renaming '%s' failed" msgstr "é‡å‘½å '%s' 失败" #: builtin/name-rev.c:255 -msgid "git name-rev [options] <commit>..." -msgstr "git name-rev [选项] <æ交>..." +msgid "git name-rev [<options>] <commit>..." +msgstr "git name-rev [<选项>] <æ交>..." #: builtin/name-rev.c:256 -msgid "git name-rev [options] --all" -msgstr "git name-rev [选项] --all" +msgid "git name-rev [<options>] --all" +msgstr "git name-rev [<选项>] --all" #: builtin/name-rev.c:257 -msgid "git name-rev [options] --stdin" -msgstr "git name-rev [选项] --stdin" +msgid "git name-rev [<options>] --stdin" +msgstr "git name-rev [<选项>] --stdin" #: builtin/name-rev.c:309 msgid "print only names (no SHA-1)" @@ -7383,40 +7418,40 @@ msgid "dereference tags in the input (internal use)" msgstr "åå‘解æžè¾“å…¥ä¸çš„ tags（内部使用）" #: builtin/notes.c:24 -msgid "git notes [--ref <notes_ref>] [list [<object>]]" +msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <注解引用>] [list [<对象>]]" #: builtin/notes.c:25 msgid "" -"git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" msgstr "" "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> " "| (-c | -C) <对象>] [<对象>]" #: builtin/notes.c:26 -msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" +msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "git notes [--ref <注解引用>] copy [-f] <æºå¯¹è±¡> <ç›®æ ‡å¯¹è±¡>" #: builtin/notes.c:27 msgid "" -"git notes [--ref <notes_ref>] append [--allow-empty] [-m <msg> | -F <file> | " +"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" msgstr "" "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | " "(-c | -C) <对象>] [<对象>]" #: builtin/notes.c:28 -msgid "git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]" +msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]" #: builtin/notes.c:29 -msgid "git notes [--ref <notes_ref>] show [<object>]" +msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "git notes [--ref <注解引用>] show [<对象>]" #: builtin/notes.c:30 msgid "" -"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" +"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <ç–ç•¥> ] <注解引用>" #: builtin/notes.c:31 @@ -7428,15 +7463,15 @@ msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" #: builtin/notes.c:33 -msgid "git notes [--ref <notes_ref>] remove [<object>...]" +msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref <注解引用>] remove [<对象>...]" #: builtin/notes.c:34 -msgid "git notes [--ref <notes_ref>] prune [-n | -v]" +msgid "git notes [--ref <notes-ref>] prune [-n | -v]" msgstr "git notes [--ref <注解引用>] prune [-n | -v]" #: builtin/notes.c:35 -msgid "git notes [--ref <notes_ref>] get-ref" +msgid "git notes [--ref <notes-ref>] get-ref" msgstr "git notes [--ref <注解引用>] get-ref" #: builtin/notes.c:40 @@ -7468,7 +7503,7 @@ msgid "git notes show [<object>]" msgstr "git notes show [<对象>]" #: builtin/notes.c:71 -msgid "git notes merge [<options>] <notes_ref>" +msgid "git notes merge [<options>] <notes-ref>" msgstr "git notes merge [<选项>] <注解引用>" #: builtin/notes.c:72 @@ -7699,7 +7734,7 @@ msgid "notes-ref" msgstr "注解引用" #: builtin/notes.c:954 -msgid "use notes from <notes_ref>" +msgid "use notes from <notes-ref>" msgstr "从 <注解引用> 使用注解" #: builtin/notes.c:989 builtin/remote.c:1621 @@ -7715,186 +7750,186 @@ msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]" msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]" -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 +#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 #, c-format msgid "deflate error (%d)" msgstr "压缩错误 (%d)" -#: builtin/pack-objects.c:773 +#: builtin/pack-objects.c:771 msgid "Writing objects" msgstr "写入对象ä¸" -#: builtin/pack-objects.c:1015 +#: builtin/pack-objects.c:1013 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "ç¦ç”¨ bitmap å†™å…¥ï¼Œå› ä¸ºä¸€äº›å¯¹è±¡å°†ä¸ä¼šè¢«æ‰“包" -#: builtin/pack-objects.c:2175 +#: builtin/pack-objects.c:2173 msgid "Compressing objects" msgstr "压缩对象ä¸" -#: builtin/pack-objects.c:2572 +#: builtin/pack-objects.c:2570 #, c-format msgid "unsupported index version %s" msgstr "ä¸æ”¯æŒçš„索引版本 %s" -#: builtin/pack-objects.c:2576 +#: builtin/pack-objects.c:2574 #, c-format msgid "bad index version '%s'" msgstr "å的索引版本 '%s'" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2597 #, c-format msgid "option %s does not accept negative form" msgstr "选项 %s ä¸æŽ¥å—å¦å®šæ ¼å¼" -#: builtin/pack-objects.c:2603 +#: builtin/pack-objects.c:2601 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "ä¸èƒ½è§£æžé€‰é¡¹ %1$s 的值 '%2$s'" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2621 msgid "do not show progress meter" msgstr "ä¸æ˜¾ç¤ºè¿›åº¦è¡¨" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2623 msgid "show progress meter" msgstr "显示进度表" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2625 msgid "show progress meter during object writing phase" msgstr "在对象写入阶段显示进度表" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2628 msgid "similar to --all-progress when progress meter is shown" msgstr "当进度表显示时类似于 --all-progress" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2629 msgid "version[,offset]" msgstr "版本[,å移]" -#: builtin/pack-objects.c:2632 +#: builtin/pack-objects.c:2630 msgid "write the pack index file in the specified idx format version" msgstr "用指定的 idx æ ¼å¼ç‰ˆæœ¬æ¥å†™åŒ…索引文件" -#: builtin/pack-objects.c:2635 +#: builtin/pack-objects.c:2633 msgid "maximum size of each output pack file" msgstr "æ¯ä¸ªè¾“出包的最大尺寸" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2635 msgid "ignore borrowed objects from alternate object store" msgstr "忽略从替代对象å˜å‚¨é‡Œå€Ÿç”¨å¯¹è±¡" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:2637 msgid "ignore packed objects" msgstr "忽略包对象" -#: builtin/pack-objects.c:2641 +#: builtin/pack-objects.c:2639 msgid "limit pack window by objects" msgstr "é™åˆ¶æ‰“包窗å£çš„对象数" -#: builtin/pack-objects.c:2643 +#: builtin/pack-objects.c:2641 msgid "limit pack window by memory in addition to object limit" msgstr "除对象数é‡é™åˆ¶å¤–设置打包窗å£çš„内å˜é™åˆ¶" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2643 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "打包å…许的 delta 链的最大长度" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2645 msgid "reuse existing deltas" msgstr "é‡ç”¨å·²å˜åœ¨çš„ deltas" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2647 msgid "reuse existing objects" msgstr "é‡ç”¨å·²å˜åœ¨çš„对象" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2649 msgid "use OFS_DELTA objects" msgstr "使用 OFS_DELTA 对象" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2651 msgid "use threads when searching for best delta matches" msgstr "使用线程查询最佳 delta 匹é…" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2653 msgid "do not create an empty pack output" msgstr "ä¸åˆ›å»ºç©ºçš„包输出" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2655 msgid "read revision arguments from standard input" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å–版本å·å‚æ•°" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2657 msgid "limit the objects to those that are not yet packed" msgstr "é™åˆ¶é‚£äº›å°šæœªæ‰“包的对象" -#: builtin/pack-objects.c:2662 +#: builtin/pack-objects.c:2660 msgid "include objects reachable from any reference" msgstr "包括å¯ä»¥ä»Žä»»ä½•å¼•ç”¨è®¿é—®åˆ°çš„对象" -#: builtin/pack-objects.c:2665 +#: builtin/pack-objects.c:2663 msgid "include objects referred by reflog entries" msgstr "包括被引用日志引用到的对象" -#: builtin/pack-objects.c:2668 +#: builtin/pack-objects.c:2666 msgid "include objects referred to by the index" msgstr "包括被索引引用到的对象" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2669 msgid "output pack to stdout" msgstr "è¾“å‡ºåŒ…åˆ°æ ‡å‡†è¾“å‡º" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2671 msgid "include tag objects that refer to objects to be packed" msgstr "包括引用了打包对象的 tag" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2673 msgid "keep unreachable objects" msgstr "ç»´æŒä¸å¯è¾¾çš„对象" -#: builtin/pack-objects.c:2676 parse-options.h:140 +#: builtin/pack-objects.c:2674 parse-options.h:140 msgid "time" msgstr "时间" -#: builtin/pack-objects.c:2677 +#: builtin/pack-objects.c:2675 msgid "unpack unreachable objects newer than <time>" msgstr "将比给定 <时间> æ–°çš„æ— æ³•è®¿é—®çš„å¯¹è±¡è§£åŒ…" -#: builtin/pack-objects.c:2680 +#: builtin/pack-objects.c:2678 msgid "create thin packs" msgstr "创建精简包" -#: builtin/pack-objects.c:2682 +#: builtin/pack-objects.c:2680 msgid "create packs suitable for shallow fetches" msgstr "创建适åˆæµ…克隆版本库获å–的包" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2682 msgid "ignore packs that have companion .keep file" msgstr "忽略é…有 .keep 文件的包" -#: builtin/pack-objects.c:2686 +#: builtin/pack-objects.c:2684 msgid "pack compression level" msgstr "打包压缩级别" -#: builtin/pack-objects.c:2688 +#: builtin/pack-objects.c:2686 msgid "do not hide commits by grafts" msgstr "显示被å«æŽ¥éšè—çš„æ交" -#: builtin/pack-objects.c:2690 +#: builtin/pack-objects.c:2688 msgid "use a bitmap index if available to speed up counting objects" msgstr "使用 bitmap 索引（如果有的è¯ï¼‰ä»¥æ高对象计数时的速度" -#: builtin/pack-objects.c:2692 +#: builtin/pack-objects.c:2690 msgid "write a bitmap index together with the pack index" msgstr "在建立包索引的åŒæ—¶åˆ›å»º bitmap 索引" -#: builtin/pack-objects.c:2783 +#: builtin/pack-objects.c:2781 msgid "Counting objects" msgstr "对象计数ä¸" #: builtin/pack-refs.c:6 -msgid "git pack-refs [options]" -msgstr "git pack-refs [选项]" +msgid "git pack-refs [<options>]" +msgstr "git pack-refs [<选项>]" #: builtin/pack-refs.c:14 msgid "pack everything" @@ -7905,8 +7940,8 @@ msgid "prune loose refs (default)" msgstr "清除æ¾æ•£çš„引用（默认）" #: builtin/prune-packed.c:7 -msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" -msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" +msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" +msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" #: builtin/prune-packed.c:40 msgid "Removing duplicate objects" @@ -8167,75 +8202,79 @@ msgstr "--mirror ä¸èƒ½å’Œå¼•ç”¨è§„则åŒæ—¶ä½¿ç”¨" msgid "--all and --mirror are incompatible" msgstr "--all å’Œ --mirror ä¸å…¼å®¹" -#: builtin/push.c:493 +#: builtin/push.c:502 msgid "repository" msgstr "版本库" -#: builtin/push.c:494 +#: builtin/push.c:503 msgid "push all refs" msgstr "推é€æ‰€æœ‰å¼•ç”¨" -#: builtin/push.c:495 +#: builtin/push.c:504 msgid "mirror all refs" msgstr "é•œåƒæ‰€æœ‰å¼•ç”¨" -#: builtin/push.c:497 +#: builtin/push.c:506 msgid "delete refs" msgstr "åˆ é™¤å¼•ç”¨" -#: builtin/push.c:498 +#: builtin/push.c:507 msgid "push tags (can't be used with --all or --mirror)" msgstr "æŽ¨é€ tags（ä¸èƒ½ä½¿ç”¨ --all or --mirror）" -#: builtin/push.c:501 +#: builtin/push.c:510 msgid "force updates" msgstr "强制更新" -#: builtin/push.c:503 +#: builtin/push.c:512 msgid "refname>:<expect" msgstr "引用å>:<期望值" -#: builtin/push.c:504 +#: builtin/push.c:513 msgid "require old value of ref to be at this value" msgstr "è¦æ±‚引用旧的å–值为设定值" -#: builtin/push.c:507 +#: builtin/push.c:516 msgid "control recursive pushing of submodules" msgstr "控制å模组的递归推é€" -#: builtin/push.c:509 +#: builtin/push.c:518 msgid "use thin pack" msgstr "使用精简打包" -#: builtin/push.c:510 builtin/push.c:511 +#: builtin/push.c:519 builtin/push.c:520 msgid "receive pack program" msgstr "接收包程åº" -#: builtin/push.c:512 +#: builtin/push.c:521 msgid "set upstream for git pull/status" msgstr "设置 git pull/status 的上游" -#: builtin/push.c:515 +#: builtin/push.c:524 msgid "prune locally removed refs" msgstr "æ¸…é™¤æœ¬åœ°åˆ é™¤çš„å¼•ç”¨" -#: builtin/push.c:517 +#: builtin/push.c:526 msgid "bypass pre-push hook" msgstr "绕过 pre-push é’©å" -#: builtin/push.c:518 +#: builtin/push.c:527 msgid "push missing but relevant tags" msgstr "推é€ç¼ºå¤±çš„有关的 tags" -#: builtin/push.c:520 +#: builtin/push.c:529 msgid "GPG sign the push" msgstr "用 GPG 为推é€ç¾å" -#: builtin/push.c:529 +#: builtin/push.c:530 +msgid "request atomic transaction on remote side" +msgstr "需è¦è¿œç«¯æ”¯æŒåŽŸå事务" + +#: builtin/push.c:539 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete 与 --allã€--mirror åŠ --tags ä¸å…¼å®¹" -#: builtin/push.c:531 +#: builtin/push.c:541 msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用没有æ„义" @@ -8313,12 +8352,12 @@ msgstr "跳过应用稀ç–检出过滤器" msgid "debug unpack-trees" msgstr "调试 unpack-trees" -#: builtin/reflog.c:499 +#: builtin/reflog.c:429 #, c-format msgid "%s' for '%s' is not a valid timestamp" msgstr "'%2$s' 的值 '%1$s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„时间戳" -#: builtin/reflog.c:615 builtin/reflog.c:620 +#: builtin/reflog.c:546 builtin/reflog.c:551 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„时间戳" @@ -8329,10 +8368,10 @@ msgstr "git remote [-v | --verbose]" #: builtin/remote.c:13 msgid "" -"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" +"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" -"git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--" +"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <å称> <地å€>" #: builtin/remote.c:14 builtin/remote.c:33 @@ -8343,9 +8382,9 @@ msgstr "git remote rename <æ—§å称> <æ–°å称>" msgid "git remote remove <name>" msgstr "git remote remove <å称>" -#: builtin/remote.c:16 -msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" -msgstr "git remote set-head <å称> (-a | --auto | -d | --delete |<分支>)" +#: builtin/remote.c:16 builtin/remote.c:43 +msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" +msgstr "git remote set-head <å称> (-a | --auto | -d | --delete | <分支>)" #: builtin/remote.c:17 msgid "git remote [-v | --verbose] show [-n] <name>" @@ -8380,10 +8419,6 @@ msgstr "git remote set-url --delete <å称> <地å€>" msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<选项>] <å称> <地å€>" -#: builtin/remote.c:43 -msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" -msgstr "git remote set-head <å称> (-a | --auto | -d | --delete | <分支>)" - #: builtin/remote.c:48 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <å称> <分支>..." @@ -8815,8 +8850,8 @@ msgid "be verbose; must be placed before a subcommand" msgstr "冗长输出；必须置于å命令之å‰" #: builtin/repack.c:17 -msgid "git repack [options]" -msgstr "git repack [选项]" +msgid "git repack [<options>]" +msgstr "git repack [<选项>]" #: builtin/repack.c:159 msgid "pack everything in a single pack" @@ -8882,7 +8917,7 @@ msgstr "æ¯ä¸ªåŒ…的最大尺寸" msgid "repack objects in packs marked with .keep" msgstr "å¯¹æ ‡è®°ä¸º .keep 的包ä¸çš„对象é‡æ–°æ‰“包" -#: builtin/repack.c:371 +#: builtin/repack.c:375 #, c-format msgid "removing '%s' failed" msgstr "åˆ é™¤ '%s' 失败" @@ -8972,8 +9007,8 @@ msgid "use this format" msgstr "使用æ¤æ ¼å¼" #: builtin/rerere.c:12 -msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" -msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]" +msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" +msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]" #: builtin/rerere.c:57 msgid "register clean resolutions in index" @@ -9113,8 +9148,8 @@ msgid "Could not write new index file." msgstr "ä¸èƒ½å†™å…¥æ–°çš„索引文件。" #: builtin/rev-parse.c:361 -msgid "git rev-parse --parseopt [options] -- [<args>...]" -msgstr "git rev-parse --parseopt [选项] -- [<å‚æ•°>...]" +msgid "git rev-parse --parseopt [<options>] -- [<args>...]" +msgstr "git rev-parse --parseopt [<选项>] -- [<å‚æ•°>...]" #: builtin/rev-parse.c:366 msgid "keep the `--` passed as an arg" @@ -9130,29 +9165,29 @@ msgstr "ä»¥å›ºå®šé•¿æ ¼å¼è¾“出" #: builtin/rev-parse.c:499 msgid "" -"git rev-parse --parseopt [options] -- [<args>...]\n" +"git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" -" or: git rev-parse [options] [<arg>...]\n" +" or: git rev-parse [<options>] [<arg>...]\n" "\n" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "" -"git rev-parse --parseopt [选项] -- [<å‚æ•°>...]\n" +"git rev-parse --parseopt [<选项>] -- [<å‚æ•°>...]\n" " 或者：git rev-parse --sq-quote [<å‚æ•°>...]\n" -" 或者：git rev-parse [选项] [<å‚æ•°>...]\n" +" 或者：git rev-parse [<选项>] [<å‚æ•°>...]\n" "\n" "åˆæ¬¡ä½¿ç”¨æ—¶æ‰§è¡Œ \"git rev-parse --parseopt -h\" æ¥èŽ·å¾—更多信æ¯ã€‚" #: builtin/revert.c:22 -msgid "git revert [options] <commit-ish>..." -msgstr "git revert [选项] <æ交å·>..." +msgid "git revert [<options>] <commit-ish>..." +msgstr "git revert [<选项>] <æ交å·>..." #: builtin/revert.c:23 msgid "git revert <subcommand>" msgstr "git revert <å命令>" #: builtin/revert.c:28 -msgid "git cherry-pick [options] <commit-ish>..." -msgstr "git cherry-pick [选项] <æ交å·>..." +msgid "git cherry-pick [<options>] <commit-ish>..." +msgstr "git cherry-pick [<选项>] <æ交å·>..." #: builtin/revert.c:29 msgid "git cherry-pick <subcommand>" @@ -9232,8 +9267,8 @@ msgid "cherry-pick failed" msgstr "拣选失败" #: builtin/rm.c:17 -msgid "git rm [options] [--] <file>..." -msgstr "git rm [选项] [--] <文件>..." +msgid "git rm [<options>] [--] <file>..." +msgstr "git rm [<选项>] [--] <文件>..." #: builtin/rm.c:65 msgid "" @@ -9326,7 +9361,7 @@ msgid "git rm: unable to remove %s" msgstr "git rm：ä¸èƒ½åˆ 除 %s" #: builtin/shortlog.c:13 -msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]" +msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]" #: builtin/shortlog.c:131 @@ -9356,19 +9391,19 @@ msgstr "折行输出" #: builtin/show-branch.c:9 msgid "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" msgstr "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通é…符>)...]" #: builtin/show-branch.c:13 -msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" -msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<引用>]" +msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" +msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]" #: builtin/show-branch.c:652 msgid "show remote-tracking and local branches" @@ -9436,11 +9471,11 @@ msgstr "显示从 base 开始的 <n> æ¡æœ€è¿‘的引用日志记录" #: builtin/show-ref.c:10 msgid "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" msgstr "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模å¼>...]" #: builtin/show-ref.c:11 msgid "git show-ref --exclude-existing[=pattern] < ref-list" @@ -9479,12 +9514,12 @@ msgid "show refs from stdin that aren't in local repository" msgstr "æ˜¾ç¤ºä»Žæ ‡å‡†è¾“å…¥ä¸è¯»å…¥çš„ä¸åœ¨æœ¬åœ°ç‰ˆæœ¬åº“ä¸çš„引用" #: builtin/symbolic-ref.c:7 -msgid "git symbolic-ref [options] name [ref]" -msgstr "git symbolic-ref [选项] å称 [引用]" +msgid "git symbolic-ref [<options>] <name> [<ref>]" +msgstr "git symbolic-ref [<选项>] <å称> [<引用>]" #: builtin/symbolic-ref.c:8 -msgid "git symbolic-ref -d [-q] name" -msgstr "git symbolic-ref -d [-q] å称" +msgid "git symbolic-ref -d [-q] <name>" +msgstr "git symbolic-ref -d [-q] <å称>" #: builtin/symbolic-ref.c:40 msgid "suppress error message for non-symbolic (detached) refs" @@ -9508,8 +9543,10 @@ msgstr "æ›´æ–°çš„åŽŸå› " #: builtin/tag.c:22 msgid "" -"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" -msgstr "git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <æ ‡ç¾å> [<头>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " +"[<head>]" +msgstr "" +"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <æ ‡ç¾å> [<头>]" #: builtin/tag.c:23 msgid "git tag -d <tagname>..." @@ -9517,11 +9554,10 @@ msgstr "git tag -d <æ ‡ç¾å>..." #: builtin/tag.c:24 msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" "\t\t[<pattern>...]" msgstr "" -"git tag -l [-n[<æ•°å—>]] [--contains <æ交>] [--points-at <对象>] \n" -"\t\t[<模å¼>...]" +"git tag -l [-n[<æ•°å—>]] [--contains <æ交>] [--points-at <对象>] [<模å¼>...]" #: builtin/tag.c:26 msgid "git tag -v <tagname>..." @@ -9663,18 +9699,18 @@ msgstr "使用å¦å¤–çš„ç§é’¥ç¾å tag" msgid "replace the tag if exists" msgstr "如果å˜åœ¨ï¼Œæ›¿æ¢çŽ°æœ‰çš„ tag" -#: builtin/tag.c:608 +#: builtin/tag.c:609 +msgid "Tag listing options" +msgstr "Tag 列表选项" + +#: builtin/tag.c:610 msgid "show tag list in columns" msgstr "以列的方å¼æ˜¾ç¤º tag" -#: builtin/tag.c:610 +#: builtin/tag.c:612 msgid "sort tags" msgstr "æŽ’åº tags" -#: builtin/tag.c:614 -msgid "Tag listing options" -msgstr "Tag 列表选项" - #: builtin/tag.c:617 builtin/tag.c:623 msgid "print only tags that contain the commit" msgstr "åªæ‰“å°åŒ…å«æ交的tags" @@ -9731,132 +9767,132 @@ msgid "Unpacking objects" msgstr "展开对象ä¸" #: builtin/update-index.c:403 -msgid "git update-index [options] [--] [<file>...]" -msgstr "git update-index [选项] [--] [<文件>...]" +msgid "git update-index [<options>] [--] [<file>...]" +msgstr "git update-index [<选项>] [--] [<文件>...]" -#: builtin/update-index.c:756 +#: builtin/update-index.c:757 msgid "continue refresh even when index needs update" msgstr "当索引需è¦æ›´æ–°æ—¶ç»§ç»åˆ·æ–°" -#: builtin/update-index.c:759 +#: builtin/update-index.c:760 msgid "refresh: ignore submodules" msgstr "刷新：忽略å模组" -#: builtin/update-index.c:762 +#: builtin/update-index.c:763 msgid "do not ignore new files" msgstr "ä¸å¿½ç•¥æ–°çš„文件" -#: builtin/update-index.c:764 +#: builtin/update-index.c:765 msgid "let files replace directories and vice-versa" msgstr "让文件替æ¢ç›®å½•ï¼ˆå之亦然）" -#: builtin/update-index.c:766 +#: builtin/update-index.c:767 msgid "notice files missing from worktree" msgstr "通知文件从工作区丢失" -#: builtin/update-index.c:768 +#: builtin/update-index.c:769 msgid "refresh even if index contains unmerged entries" msgstr "å³ä½¿ç´¢å¼•åŒºåŒ…å«æœªåˆå¹¶çš„æ¡ç›®ä¹Ÿæ‰§è¡Œåˆ·æ–°" -#: builtin/update-index.c:771 +#: builtin/update-index.c:772 msgid "refresh stat information" msgstr "刷新统计信æ¯" -#: builtin/update-index.c:775 +#: builtin/update-index.c:776 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置" -#: builtin/update-index.c:779 +#: builtin/update-index.c:780 msgid "<mode>,<object>,<path>" msgstr "<å˜å–模å¼>,<对象>,<路径>" -#: builtin/update-index.c:780 +#: builtin/update-index.c:781 msgid "add the specified entry to the index" msgstr "æ·»åŠ æŒ‡å®šçš„æ¡ç›®åˆ°ç´¢å¼•åŒº" -#: builtin/update-index.c:784 +#: builtin/update-index.c:785 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/update-index.c:785 +#: builtin/update-index.c:786 msgid "override the executable bit of the listed files" msgstr "覆盖列表里文件的å¯æ‰§è¡Œä½" -#: builtin/update-index.c:789 +#: builtin/update-index.c:790 msgid "mark files as \"not changing\"" msgstr "æŠŠæ–‡ä»¶æ ‡è®°ä¸º \"没有å˜æ›´\"" -#: builtin/update-index.c:792 +#: builtin/update-index.c:793 msgid "clear assumed-unchanged bit" msgstr "清除 assumed-unchanged ä½" -#: builtin/update-index.c:795 +#: builtin/update-index.c:796 msgid "mark files as \"index-only\"" msgstr "æŠŠæ–‡ä»¶æ ‡è®°ä¸º \"仅索引\"" -#: builtin/update-index.c:798 +#: builtin/update-index.c:799 msgid "clear skip-worktree bit" msgstr "清除 skip-worktree ä½" -#: builtin/update-index.c:801 +#: builtin/update-index.c:802 msgid "add to index only; do not add content to object database" msgstr "åªæ·»åŠ 到索引区；ä¸æ·»åŠ 对象到对象库" -#: builtin/update-index.c:803 +#: builtin/update-index.c:804 msgid "remove named paths even if present in worktree" msgstr "å³ä½¿å˜åœ¨å·¥ä½œåŒºé‡Œï¼Œä¹Ÿåˆ 除路径" -#: builtin/update-index.c:805 +#: builtin/update-index.c:806 msgid "with --stdin: input lines are terminated by null bytes" msgstr "æºå¸¦ --stdin：输入的行以 null å—符终æ¢" -#: builtin/update-index.c:807 +#: builtin/update-index.c:808 msgid "read list of paths to be updated from standard input" msgstr "ä»Žæ ‡å‡†è¾“å…¥ä¸è¯»å–需è¦æ›´æ–°çš„路径列表" -#: builtin/update-index.c:811 +#: builtin/update-index.c:812 msgid "add entries from standard input to the index" msgstr "ä»Žæ ‡å‡†è¾“å…¥æ·»åŠ æ¡ç›®åˆ°ç´¢å¼•åŒº" -#: builtin/update-index.c:815 +#: builtin/update-index.c:816 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "为指定文件é‡æ–°ç”Ÿæˆç¬¬2和第3æš‚å˜åŒº" -#: builtin/update-index.c:819 +#: builtin/update-index.c:820 msgid "only update entries that differ from HEAD" msgstr "åªæ›´æ–°ä¸Ž HEAD ä¸åŒçš„æ¡ç›®" -#: builtin/update-index.c:823 +#: builtin/update-index.c:824 msgid "ignore files missing from worktree" msgstr "忽略工作区丢失的文件" -#: builtin/update-index.c:826 +#: builtin/update-index.c:827 msgid "report actions to standard output" msgstr "åœ¨æ ‡å‡†è¾“å‡ºæ˜¾ç¤ºæ“作" -#: builtin/update-index.c:828 +#: builtin/update-index.c:829 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(for porcelains) 忘记ä¿å˜çš„未解决的冲çª" -#: builtin/update-index.c:832 +#: builtin/update-index.c:833 msgid "write index in this format" msgstr "以这ç§æ ¼å¼å†™å…¥ç´¢å¼•åŒº" -#: builtin/update-index.c:834 +#: builtin/update-index.c:835 msgid "enable or disable split index" msgstr "å¯ç”¨æˆ–ç¦ç”¨ç´¢å¼•æ‹†åˆ†" #: builtin/update-ref.c:9 -msgid "git update-ref [options] -d <refname> [<oldval>]" -msgstr "git update-ref [选项] -d <引用å> [<旧值>]" +msgid "git update-ref [<options>] -d <refname> [<old-val>]" +msgstr "git update-ref [<选项>] -d <引用å> [<旧值>]" #: builtin/update-ref.c:10 -msgid "git update-ref [options] <refname> <newval> [<oldval>]" -msgstr "git update-ref [选项] <引用å> <新值> [<旧值>]" +msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" +msgstr "git update-ref [<选项>] <引用å> <新值> [<旧值>]" #: builtin/update-ref.c:11 -msgid "git update-ref [options] --stdin [-z]" -msgstr "git update-ref [选项] --stdin [-z]" +msgid "git update-ref [<options>] --stdin [-z]" +msgstr "git update-ref [<选项>] --stdin [-z]" #: builtin/update-ref.c:359 msgid "delete the reference" @@ -9883,16 +9919,16 @@ msgid "update the info files from scratch" msgstr "从头开始更新文件信æ¯" #: builtin/verify-commit.c:17 -msgid "git verify-commit [-v|--verbose] <commit>..." -msgstr "git verify-commit [-v|--verbose] <æ交>..." +msgid "git verify-commit [-v | --verbose] <commit>..." +msgstr "git verify-commit [-v | --verbose] <æ交>..." #: builtin/verify-commit.c:75 msgid "print commit contents" msgstr "打å°æ交内容" #: builtin/verify-pack.c:54 -msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." -msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <包>..." +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." +msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..." #: builtin/verify-pack.c:64 msgid "verbose" @@ -9903,8 +9939,8 @@ msgid "show statistics only" msgstr "åªæ˜¾ç¤ºç»Ÿè®¡" #: builtin/verify-tag.c:17 -msgid "git verify-tag [-v|--verbose] <tag>..." -msgstr "git verify-tag [-v|--verbose] <æ ‡ç¾>..." +msgid "git verify-tag [-v | --verbose] <tag>..." +msgstr "git verify-tag [-v | --verbose] <æ ‡ç¾>..." #: builtin/verify-tag.c:73 msgid "print tag contents" @@ -10248,7 +10284,7 @@ msgstr "åçš„ HEAD - 我需è¦ä¸€ä¸ª HEAD" #: git-bisect.sh:130 #, sh-format msgid "" -"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." +"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." msgstr "检出 '$start_head' 失败。å°è¯• 'git bisect reset <有效分支>'。" #: git-bisect.sh:140 @@ -10981,385 +11017,3 @@ msgstr "æ— æ³•é€’å½’è¿›å模组路径 '$sm_path'" #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "为 '$displaypath' åŒæ¥å模组 url" - -#~ msgid "no files added" -#~ msgstr "æ²¡æœ‰æ–‡ä»¶è¢«æ·»åŠ " - -#~ msgid "force creation (when already exists)" -#~ msgstr "强制创建（当已ç»å˜åœ¨ï¼‰" - -#~ msgid "Malformed ident string: '%s'" -#~ msgstr "éžæ³•çš„身份å—符串：'%s'" - -#~ msgid "slot" -#~ msgstr "slot" - -#~ 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：ä¸èƒ½æ›´æ–°å¼•ç”¨" - -#~ msgid "commit has empty message" -#~ msgstr "æ交说明为空" - -#~ msgid "Failed to chdir: %s" -#~ msgstr "æ— æ³•åˆ‡æ¢ç›®å½•ï¼š%s" - -#~ msgid "key id" -#~ msgstr "key id" - -#~ msgid "Tracking not set up: name too long: %s" -#~ msgstr "跟踪未设置：åå—太长：%s" - -#~ msgid "bug" -#~ msgstr "bug" - -# 译者：注æ„ä¿æŒå¥å°¾ç©ºæ ¼ -#~ msgid "ahead " -#~ msgstr "领先 " - -# 译者：注æ„ä¿æŒå¥å°¾ç©ºæ ¼ -#~ msgid ", behind " -#~ msgstr "，è½åŽ " - -#~ msgid "could not find .gitmodules in index" -#~ msgstr "æ— æ³•åœ¨ç´¢å¼•ä¸æ‰¾åˆ° .gitmodules" - -#~ msgid "reading updated .gitmodules failed" -#~ msgstr "读å–æ›´æ–°åŽçš„ .gitmodules 失败" - -#~ msgid "unable to stat updated .gitmodules" -#~ msgstr "ä¸èƒ½æžšä¸¾æ›´æ–°åŽçš„ .gitmodules" - -#~ msgid "unable to remove .gitmodules from index" -#~ msgstr "ä¸èƒ½ä»Žç´¢å¼•ä¸ç§»é™¤ .gitmodules" - -#~ msgid "adding updated .gitmodules failed" -#~ msgstr "æ·»åŠ æ›´æ–°åŽçš„ .gitmodules 失败" - -# 译者：å—符串首行行首è¦æ·»åŠ “warning: â€å—串，故æ¤é¦–è¡Œè¦è¾ƒå…¶ä½™è¡ŒçŸ -#~ msgid "" -#~ "The behavior of 'git add %s (or %s)' with no path argument from a\n" -#~ "subdirectory of the tree will change in Git 2.0 and should not be used " -#~ "anymore.\n" -#~ "To add content for the whole tree, run:\n" -#~ "\n" -#~ " git add %s :/\n" -#~ " (or git add %s :/)\n" -#~ "\n" -#~ "To restrict the command to the current directory, run:\n" -#~ "\n" -#~ " git add %s .\n" -#~ " (or git add %s .)\n" -#~ "\n" -#~ "With the current Git version, the command is restricted to the current " -#~ "directory.\n" -#~ msgstr "" -#~ "在 Git 2.0 版本，ä½äºŽä¸€ä¸ªå目录下ä¸å¸¦ä»»ä½•è·¯å¾„å‚数地执行命令\n" -#~ "'git add %s (或 %s)' 的行为将被改å˜ï¼Œä¸è¦å†ç»§ç»ä½¿ç”¨äº†ã€‚\n" -#~ "如果è¦æ·»åŠ æ•´ä¸ªç›®å½•æ ‘çš„å†…å®¹ï¼Œæ‰§è¡Œï¼š\n" -#~ "\n" -#~ " git add %s :/\n" -#~ " (或 git add %s :/)\n" -#~ "\n" -#~ "如果è¦é™åˆ¶è¯¥å‘½ä»¤åªä½œç”¨äºŽå½“å‰ç›®å½•ï¼Œæ‰§è¡Œï¼š\n" -#~ "\n" -#~ " git add %s .\n" -#~ " (或 git add %s .)\n" -#~ "\n" -#~ "对于当å‰ç‰ˆæœ¬çš„ Git，这æ¡å‘½ä»¤åªä½œç”¨äºŽå½“å‰ç›®å½•ã€‚\n" - -#~ msgid "" -#~ "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n" -#~ "whose behaviour will change in Git 2.0 with respect to paths you " -#~ "removed.\n" -#~ "Paths like '%s' that are\n" -#~ "removed from your working tree are ignored with this version of Git.\n" -#~ "\n" -#~ "* 'git add --ignore-removal <pathspec>', which is the current default,\n" -#~ " ignores paths you removed from your working tree.\n" -#~ "\n" -#~ "* 'git add --all <pathspec>' will let you also record the removals.\n" -#~ "\n" -#~ "Run 'git status' to check the paths you removed from your working tree.\n" -#~ msgstr "" -#~ "您在è¿è¡Œ 'git add' 时没有指定 '-A (--all)' 或 '--ignore-removal'，\n" -#~ "针对其ä¸æœ¬åœ°ç§»é™¤è·¯å¾„的行为将在 Git 2.0 版本库å‘生å˜åŒ–。\n" -#~ "åƒæœ¬åœ°å·¥ä½œåŒºç§»é™¤çš„路径 '%s'\n" -#~ "在æ¤ç‰ˆæœ¬çš„ Git ä¸è¢«å¿½ç•¥ã€‚\n" -#~ "\n" -#~ "* 'git add --ignore-removal <路径规则>'，是当å‰ç‰ˆæœ¬çš„默认æ“作，\n" -#~ " 忽略您本地工作区ä¸ç§»é™¤çš„文件。\n" -#~ "\n" -#~ "* 'git add --all <路径规则>' 将让您åŒæ—¶å¯¹åˆ 除æ“作进行记录。\n" -#~ "\n" -#~ "è¿è¡Œ 'git status' æ¥æ£€æŸ¥æ‚¨æœ¬åœ°å·¥ä½œåŒºä¸ç§»é™¤çš„路径。\n" - -#~ msgid "" -#~ "Auto packing the repository for optimum performance. You may also\n" -#~ "run \"git gc\" manually. See \"git help gc\" for more information.\n" -#~ msgstr "" -#~ "自动打包版本库以求最佳性能。您还å¯ä»¥æ‰‹åŠ¨è¿è¡Œ \"git gc\"。\n" -#~ "å‚è§ \"git help gc\" 以获å–更多信æ¯ã€‚\n" - -#~ msgid "" -#~ "Updates were rejected because a pushed branch tip is behind its remote\n" -#~ "counterpart. If you did not intend to push that branch, you may want to\n" -#~ "specify branches to push or set the 'push.default' configuration " -#~ "variable\n" -#~ "to 'simple', 'current' or 'upstream' to push only the current branch." -#~ msgstr "" -#~ "更新被拒ç»ï¼Œå› 为推é€çš„一个分支的最新æ交è½åŽäºŽå…¶å¯¹åº”的远程分支。\n" -#~ "如果您并éžæœ‰æ„推é€è¯¥åˆ†æ”¯ï¼Œæ‚¨å¯ä»¥åœ¨æŽ¨é€æ—¶æŒ‡å®šè¦æŽ¨é€çš„分支，或者将\n" -#~ "é…ç½®å˜é‡ 'push.default' 设置为 'simple'ã€'current' 或 'upstream'\n" -#~ "以便åªæŽ¨é€å½“å‰åˆ†æ”¯ã€‚" - -# 译者：为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ -#~ msgid "copied: %s -> %s" -#~ msgstr "æ‹·è´ï¼š %s -> %s" - -# 译者：为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ -#~ msgid "deleted: %s" -#~ msgstr "åˆ é™¤ï¼š %s" - -# 译者：为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ -#~ msgid "modified: %s" -#~ msgstr "修改： %s" - -# 译者：为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ -#~ msgid "renamed: %s -> %s" -#~ msgstr "é‡å‘½å： %s -> %s" - -# 译者：为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ -#~ msgid "unmerged: %s" -#~ msgstr "未åˆå¹¶ï¼š %s" - -# 译者：å—符串首行行首è¦æ·»åŠ “warning: â€å—串，故æ¤é¦–è¡Œè¦è¾ƒå…¶ä½™è¡ŒçŸ -#~ msgid "" -#~ "push.default is unset; its implicit value is changing in\n" -#~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" -#~ "and maintain the current behavior after the default changes, use:\n" -#~ "\n" -#~ " git config --global push.default matching\n" -#~ "\n" -#~ "To squelch this message and adopt the new behavior now, use:\n" -#~ "\n" -#~ " git config --global push.default simple\n" -#~ "\n" -#~ "See 'git help config' and search for 'push.default' for further " -#~ "information.\n" -#~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" -#~ "'current' instead of 'simple' if you sometimes use older versions of Git)" -#~ msgstr "" -#~ "push.default 未设置，它的默认值将在 Git 2.0 ç”± 'matching'\n" -#~ "改å˜ä¸º 'simple'。若è¦ä¸å†æ˜¾ç¤ºæœ¬ä¿¡æ¯å¹¶ä¿æŒä¼ ç»Ÿä¹ æƒ¯ï¼Œè¿›è¡Œå¦‚ä¸‹è®¾ç½®ï¼š\n" -#~ "\n" -#~ " git config --global push.default matching\n" -#~ "\n" -#~ "è‹¥è¦ä¸å†æ˜¾ç¤ºæœ¬ä¿¡æ¯å¹¶ä»ŽçŽ°åœ¨å¼€å§‹é‡‡ç”¨æ–°çš„ä½¿ç”¨ä¹ æƒ¯ï¼Œè®¾ç½®ï¼š\n" -#~ "\n" -#~ " git config --global push.default simple\n" -#~ "\n" -#~ "å‚è§ 'git help config' 并查找 'push.default' 以获å–更多信æ¯ã€‚\n" -#~ "（'simple' 模å¼ç”± Git 1.7.11 版本引入。如果您有时è¦ä½¿ç”¨è€ç‰ˆæœ¬çš„ Git，\n" -#~ "为ä¿æŒå…¼å®¹ï¼Œè¯·ç”¨ 'current' 代替 'simple'）" - -#~ msgid "input paths are terminated by a null character" -#~ msgstr "输入路径以nullå—符终æ¢" - -#~ msgid "" -#~ "The following untracked files would NOT be saved but need to be removed " -#~ "by stash save:" -#~ msgstr "如下未跟踪文件将ä¸ä¼šè¢«ä¿å˜ä½†æ˜¯å°†ä¼šå› 为进度ä¿å˜è€Œéœ€è¦è¢«åˆ 除：" - -#~ msgid "" -#~ "Aborting. Consider using either the --force or --include-untracked option." -#~ msgstr "终æ¢ã€‚考虑使用 --force 或者 --include-untracked 选项。" - -#~ msgid "" -#~ "the following submodule (or one of its nested submodule)\n" -#~ "uses a .git directory:" -#~ msgid_plural "" -#~ "the following submodules (or one of its nested submodule)\n" -#~ "use a .git directory:" -#~ msgstr[0] "如下å模组（或一个其嵌套的å模组）使用了一个 .git 目录：" -#~ msgstr[1] "如下å模组（或一个其嵌套的å模组）使用了一个 .git 目录：" - -# 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#~ msgid " (fix conflicts and then run \"git am --resolved\")" -#~ msgstr " （解决冲çªï¼Œç„¶åŽè¿è¡Œ \"git am --resolved\"）" - -# 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#~ msgid " (all conflicts fixed: run \"git commit\")" -#~ msgstr " （解决所有冲çªåŽï¼Œæ‰§è¡Œ \"git commit\"）" - -#~ msgid "more than %d trees given: '%s'" -#~ msgstr "æ供了超过 %d ä¸ªæ ‘å¯¹è±¡ï¼š'%s'" - -#~ msgid "You cannot combine --no-ff with --ff-only." -#~ msgstr "您ä¸èƒ½å°† --no-ff 与 --ff-only åŒæ—¶ä½¿ç”¨ã€‚" - -#~ msgid "" -#~ "submodule '%s' (or one of its nested submodules) uses a .git directory\n" -#~ "(use 'rm -rf' if you really want to remove it including all of its " -#~ "history)" -#~ msgstr "" -#~ "å模组 '%s'（或者它的一个嵌套å模组）使用一个 .git 目录\n" -#~ "（使用 'rm -rf' å‘½ä»¤å¦‚æžœæ‚¨çœŸçš„æƒ³åˆ é™¤å®ƒåŠå…¶å…¨éƒ¨åŽ†å²ï¼‰" - -#~ msgid "" -#~ "'%s' has changes staged in the index\n" -#~ "(use --cached to keep the file, or -f to force removal)" -#~ msgstr "" -#~ "'%s' 有å˜æ›´å·²æš‚å˜è‡³ç´¢å¼•ä¸\n" -#~ "（使用 --cached ä¿å˜æ–‡ä»¶ï¼Œæˆ–用 -f å¼ºåˆ¶åˆ é™¤ï¼‰" - -#~ msgid "show commits where no parent comes before its children" -#~ msgstr "显示æ交时以时间为åºä¸”父æ交ä¸èƒ½é¢†å…ˆåæ交" - -#~ msgid "show the HEAD reference" -#~ msgstr "显示 HEAD 引用" - -#~ msgid "Submodule '$name' ($url) registered for path '$sm_path'" -#~ msgstr "å模组 '$name' ($url) 已为路径 '$sm_path' 注册" - -#~ msgid "Change flags" -#~ msgstr "修改å‚æ•°" - -#~ msgid "" -#~ "NOTE: no more files to clean; press \"t\" to toggle flags of git-clean." -#~ msgstr "注æ„：没有è¦æ¸…ç†çš„文件；å°è¯•æŒ‰ \"t\" åˆ‡æ¢ git-clean 的选项。" - -#~ msgid "Failed to recurse into submodule path '$prefix$sm_path'" -#~ msgstr "æ— æ³•é€’å½’è¿›å模组路径 '$prefix$sm_path'" - -#~ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]" -#~ msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<æ交å·>... ]" - -#~ msgid "See 'git help <command>' for more information on a specific command." -#~ msgstr "å‚è§ 'git help <命令>' 以获得该特定命令的详细信æ¯ã€‚" - -#~ msgid "BUG: impossible combination of %d and %p" -#~ msgstr "BUG: æ— æ³•ç»„åˆ %d å’Œ %p" - -# 译者：以下三æ¡å®žé™…ä¸ºä¸€ä¸ªæ®µè½ -#~ msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'" -#~ msgstr "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno'" - -# 译者：为对é½ï¼Œä¸‹é¢ä¸¤å¥å†…容有调整 -#~ msgid "may speed it up, but you have to be careful not to forget to add" -#~ msgstr "也许能æ高速度，但您需è¦å°å¿ƒä¸è¦å¿˜äº†æ·»åŠ 新文件" - -#~ msgid "new files yourself (see 'git help status')." -#~ msgstr "（å‚è§ 'git help status'）。" - -#~ msgid "use any ref in .git/refs" -#~ msgstr "使用 .git/refs 里的任æ„引用" - -#~ msgid "use any tag in .git/refs/tags" -#~ msgstr "使用 .git/refs/tags é‡Œçš„ä»»æ„ tag" - -#~ msgid "bad object %s" -#~ msgstr "å对象 %s" - -#~ msgid "bogus committer info %s" -#~ msgstr "虚å‡çš„æäº¤è€…ä¿¡æ¯ %s" - -#~ msgid "can't fdopen 'show' output fd" -#~ msgstr "ä¸èƒ½æ‰“å¼€ 'show' 输出文件å¥æŸ„" - -#~ msgid "failed to close pipe to 'show' for object '%s'" -#~ msgstr "æ— æ³•ä¸ºå¯¹è±¡ '%s' çš„ 'show' å…³é—管é“" - -#~ msgid " 0 files changed" -#~ msgstr " 0 个文件被修改" - -#~ msgid " %d file changed" -#~ msgid_plural " %d files changed" -#~ msgstr[0] " %d 个文件被修改" -#~ msgstr[1] " %d 个文件被修改" - -#~ msgid ", %d insertion(+)" -#~ msgid_plural ", %d insertions(+)" -#~ msgstr[0] "，æ’å…¥ %d è¡Œ(+)" -#~ msgstr[1] "，æ’å…¥ %d è¡Œ(+)" - -#~ msgid ", %d deletion(-)" -#~ msgid_plural ", %d deletions(-)" -#~ msgstr[0] "ï¼Œåˆ é™¤ %d è¡Œ(-)" -#~ msgstr[1] "ï¼Œåˆ é™¤ %d è¡Œ(-)" - -#~ msgid "You do not have a valid HEAD" -#~ msgstr "您没有一个有效的 HEAD" - -#~ msgid "oops" -#~ msgstr "å“Žå“Ÿ" - -#~ msgid "Would not remove %s\n" -#~ msgstr "ä¸ä¼šåˆ 除 %s\n" - -#~ msgid "Not removing %s\n" -#~ msgstr "æœªåˆ é™¤ %s\n" - -#~ msgid "git remote set-head <name> (-a | -d | <branch>])" -#~ msgstr "git remote set-head <å称> (-a | -d | <分支>])" - -#~ msgid "Could not read index" -#~ msgstr "ä¸èƒ½è¯»å–索引" - -# 译者：ä¸æ–‡å—符串拼接，å¯åˆ 除å‰å¯¼ç©ºæ ¼ -#~ msgid " (use \"git add\" to track)" -#~ msgstr "（使用 \"git add\" 建立跟踪）" - -#~ msgid "--detach cannot be used with -b/-B/--orphan" -#~ msgstr "--detach ä¸èƒ½å’Œ -b/-B/--orphan åŒæ—¶ä½¿ç”¨" - -#~ msgid "--detach cannot be used with -t" -#~ msgstr "--detach ä¸èƒ½å’Œ -t åŒæ—¶ä½¿ç”¨" - -#~ msgid "--orphan and -b|-B are mutually exclusive" -#~ msgstr "--orphan å’Œ -b|-B 互斥" - -#~ msgid "--orphan cannot be used with -t" -#~ msgstr "--orphan ä¸èƒ½å’Œ -t åŒæ—¶ä½¿ç”¨" - -#~ msgid "git checkout: -f and -m are incompatible" -#~ msgstr "git checkout：-f å’Œ -m ä¸å…¼å®¹" - -#~ msgid "" -#~ "git checkout: updating paths is incompatible with switching branches." -#~ msgstr "git checkout：更新路径和切æ¢åˆ†æ”¯ä¸å…¼å®¹ã€‚" - -#~ msgid "diff setup failed" -#~ msgstr "diff 设置失败" - -#~ msgid "merge-recursive: disk full?" -#~ msgstr "merge-recursive：ç£ç›˜å·²æ»¡ï¼Ÿ" - -#~ msgid "diff_setup_done failed" -#~ msgstr "diff_setup_done 失败" @@ -72,6 +72,12 @@ static void clear_progress_signal(void) progress_update = 0; } +static int is_foreground_fd(int fd) +{ + int tpgrp = tcgetpgrp(fd); + return tpgrp < 0 || tpgrp == getpgid(0); +} + static int display(struct progress *progress, unsigned n, const char *done) { const char *eol, *tp; @@ -98,16 +104,21 @@ static int display(struct progress *progress, unsigned n, const char *done) unsigned percent = n * 100 / progress->total; if (percent != progress->last_percent || progress_update) { progress->last_percent = percent; - fprintf(stderr, "%s: %3u%% (%u/%u)%s%s", - progress->title, percent, n, - progress->total, tp, eol); - fflush(stderr); + if (is_foreground_fd(fileno(stderr)) || done) { + fprintf(stderr, "%s: %3u%% (%u/%u)%s%s", + progress->title, percent, n, + progress->total, tp, eol); + fflush(stderr); + } progress_update = 0; return 1; } } else if (progress_update) { - fprintf(stderr, "%s: %u%s%s", progress->title, n, tp, eol); - fflush(stderr); + if (is_foreground_fd(fileno(stderr)) || done) { + fprintf(stderr, "%s: %u%s%s", + progress->title, n, tp, eol); + fflush(stderr); + } progress_update = 0; return 1; } diff --git a/reachable.c b/reachable.c index a647267..69fa685 100644 --- a/reachable.c +++ b/reachable.c @@ -142,10 +142,12 @@ int add_unseen_recent_objects_to_traversal(struct rev_info *revs, data.revs = revs; data.timestamp = timestamp; - r = for_each_loose_object(add_recent_loose, &data); + r = for_each_loose_object(add_recent_loose, &data, + FOR_EACH_OBJECT_LOCAL_ONLY); if (r) return r; - return for_each_packed_object(add_recent_packed, &data); + return for_each_packed_object(add_recent_packed, &data, + FOR_EACH_OBJECT_LOCAL_ONLY); } void mark_reachable_objects(struct rev_info *revs, int mark_reflog, diff --git a/read-cache.c b/read-cache.c index 705469e..723d48d 100644 --- a/read-cache.c +++ b/read-cache.c @@ -698,15 +698,18 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st, alias = index_file_exists(istate, ce->name, ce_namelen(ce), ignore_case); if (alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) { /* Nothing changed, really */ - free(ce); if (!S_ISGITLINK(alias->ce_mode)) ce_mark_uptodate(alias); alias->ce_flags |= CE_ADDED; + + free(ce); return 0; } if (!intent_only) { - if (index_path(ce->sha1, path, st, HASH_WRITE_OBJECT)) + if (index_path(ce->sha1, path, st, HASH_WRITE_OBJECT)) { + free(ce); return error("unable to index file %s", path); + } } else set_object_name_for_intent_to_add_entry(ce); @@ -721,9 +724,11 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st, ce->ce_mode == alias->ce_mode); if (pretend) - ; - else if (add_index_entry(istate, ce, add_option)) - return error("unable to add %s to index",path); + free(ce); + else if (add_index_entry(istate, ce, add_option)) { + free(ce); + return error("unable to add %s to index", path); + } if (verbose && !was_same) printf("add '%s'\n", path); return 0; @@ -760,12 +765,9 @@ struct cache_entry *make_cache_entry(unsigned int mode, ce->ce_mode = create_ce_mode(mode); ret = refresh_cache_entry(ce, refresh_options); - if (!ret) { + if (ret != ce) free(ce); - return NULL; - } else { - return ret; - } + return ret; } int ce_same_name(const struct cache_entry *a, const struct cache_entry *b) @@ -1508,18 +1510,25 @@ static struct cache_entry *create_from_disk(struct ondisk_cache_entry *ondisk, return ce; } -static void check_ce_order(struct cache_entry *ce, struct cache_entry *next_ce) +static void check_ce_order(struct index_state *istate) { - int name_compare = strcmp(ce->name, next_ce->name); - if (0 < name_compare) - die("unordered stage entries in index"); - if (!name_compare) { - if (!ce_stage(ce)) - die("multiple stage entries for merged file '%s'", - ce->name); - if (ce_stage(ce) > ce_stage(next_ce)) - die("unordered stage entries for '%s'", - ce->name); + unsigned int i; + + for (i = 1; i < istate->cache_nr; i++) { + struct cache_entry *ce = istate->cache[i - 1]; + struct cache_entry *next_ce = istate->cache[i]; + int name_compare = strcmp(ce->name, next_ce->name); + + if (0 < name_compare) + die("unordered stage entries in index"); + if (!name_compare) { + if (!ce_stage(ce)) + die("multiple stage entries for merged file '%s'", + ce->name); + if (ce_stage(ce) > ce_stage(next_ce)) + die("unordered stage entries for '%s'", + ce->name); + } } } @@ -1584,9 +1593,6 @@ int do_read_index(struct index_state *istate, const char *path, int must_exist) ce = create_from_disk(disk_ce, &consumed, previous_name); set_index_entry(istate, i, ce); - if (i > 0) - check_ce_order(istate->cache[i - 1], ce); - src_offset += consumed; } strbuf_release(&previous_name_buf); @@ -1630,11 +1636,10 @@ int read_index_from(struct index_state *istate, const char *path) ret = do_read_index(istate, path, 0); split_index = istate->split_index; - if (!split_index) - return ret; - - if (is_null_sha1(split_index->base_sha1)) + if (!split_index || is_null_sha1(split_index->base_sha1)) { + check_ce_order(istate); return ret; + } if (split_index->base) discard_index(split_index->base); @@ -1650,6 +1655,7 @@ int read_index_from(struct index_state *istate, const char *path) sha1_to_hex(split_index->base_sha1)), sha1_to_hex(split_index->base->sha1)); merge_base_index(istate); + check_ce_order(istate); return ret; } @@ -11,7 +11,6 @@ struct ref_lock { char *orig_ref_name; struct lock_file *lk; unsigned char old_sha1[20]; - int lock_fd; }; /* @@ -58,6 +57,12 @@ static unsigned char refname_disposition[256] = { #define REF_HAVE_OLD 0x10 /* + * Used as a flag in ref_update::flags when the lockfile needs to be + * committed. + */ +#define REF_NEEDS_COMMIT 0x20 + +/* * Try to read one refname component from the front of refname. * Return the length of the component found, or -1 if the component is * not legal. It is legal if it is something reasonable to have under @@ -263,7 +268,7 @@ struct ref_dir { * presence of an empty subdirectory does not block the creation of a * similarly-named reference. (The fact that reference names with the * same leading components can conflict *with each other* is a - * separate issue that is regulated by is_refname_available().) + * separate issue that is regulated by verify_refname_available().) * * Please note that the name field contains the fully-qualified * reference (or subdirectory) name. Space could be saved by only @@ -344,8 +349,6 @@ static struct ref_entry *create_ref_entry(const char *refname, if (check_name && check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) die("Reference has invalid format: '%s'", refname); - if (!check_name && !refname_is_safe(refname)) - die("Reference has invalid name: '%s'", refname); len = strlen(refname) + 1; ref = xmalloc(sizeof(struct ref_entry) + len); hashcpy(ref->u.value.sha1, sha1); @@ -841,121 +844,181 @@ static void prime_ref_dir(struct ref_dir *dir) } } -static int entry_matches(struct ref_entry *entry, const struct string_list *list) -{ - return list && string_list_has_string(list, entry->name); -} - struct nonmatching_ref_data { const struct string_list *skip; - struct ref_entry *found; + const char *conflicting_refname; }; static int nonmatching_ref_fn(struct ref_entry *entry, void *vdata) { struct nonmatching_ref_data *data = vdata; - if (entry_matches(entry, data->skip)) + if (data->skip && string_list_has_string(data->skip, entry->name)) return 0; - data->found = entry; + data->conflicting_refname = entry->name; return 1; } -static void report_refname_conflict(struct ref_entry *entry, - const char *refname) -{ - error("'%s' exists; cannot create '%s'", entry->name, refname); -} - /* - * Return true iff a reference named refname could be created without - * conflicting with the name of an existing reference in dir. If - * skip is non-NULL, ignore potential conflicts with refs in skip - * (e.g., because they are scheduled for deletion in the same - * operation). + * Return 0 if a reference named refname could be created without + * conflicting with the name of an existing reference in dir. + * Otherwise, return a negative value and write an explanation to err. + * If extras is non-NULL, it is a list of additional refnames with + * which refname is not allowed to conflict. If skip is non-NULL, + * ignore potential conflicts with refs in skip (e.g., because they + * are scheduled for deletion in the same operation). Behavior is + * undefined if the same name is listed in both extras and skip. * * Two reference names conflict if one of them exactly matches the - * leading components of the other; e.g., "foo/bar" conflicts with - * both "foo" and with "foo/bar/baz" but not with "foo/bar" or - * "foo/barbados". + * leading components of the other; e.g., "refs/foo/bar" conflicts + * with both "refs/foo" and with "refs/foo/bar/baz" but not with + * "refs/foo/bar" or "refs/foo/barbados". * - * skip must be sorted. + * extras and skip must be sorted. */ -static int is_refname_available(const char *refname, - const struct string_list *skip, - struct ref_dir *dir) +static int verify_refname_available(const char *refname, + const struct string_list *extras, + const struct string_list *skip, + struct ref_dir *dir, + struct strbuf *err) { const char *slash; - size_t len; int pos; - char *dirname; + struct strbuf dirname = STRBUF_INIT; + int ret = -1; + /* + * For the sake of comments in this function, suppose that + * refname is "refs/foo/bar". + */ + + assert(err); + + strbuf_grow(&dirname, strlen(refname) + 1); for (slash = strchr(refname, '/'); slash; slash = strchr(slash + 1, '/')) { + /* Expand dirname to the new prefix, not including the trailing slash: */ + strbuf_add(&dirname, refname + dirname.len, slash - refname - dirname.len); + /* - * We are still at a leading dir of the refname; we are - * looking for a conflict with a leaf entry. - * - * If we find one, we still must make sure it is - * not in "skip". + * We are still at a leading dir of the refname (e.g., + * "refs/foo"; if there is a reference with that name, + * it is a conflict, *unless* it is in skip. */ - pos = search_ref_dir(dir, refname, slash - refname); - if (pos >= 0) { - struct ref_entry *entry = dir->entries[pos]; - if (entry_matches(entry, skip)) - return 1; - report_refname_conflict(entry, refname); - return 0; + if (dir) { + pos = search_ref_dir(dir, dirname.buf, dirname.len); + if (pos >= 0 && + (!skip || !string_list_has_string(skip, dirname.buf))) { + /* + * We found a reference whose name is + * a proper prefix of refname; e.g., + * "refs/foo", and is not in skip. + */ + strbuf_addf(err, "'%s' exists; cannot create '%s'", + dirname.buf, refname); + goto cleanup; + } } + if (extras && string_list_has_string(extras, dirname.buf) && + (!skip || !string_list_has_string(skip, dirname.buf))) { + strbuf_addf(err, "cannot process '%s' and '%s' at the same time", + refname, dirname.buf); + goto cleanup; + } /* * Otherwise, we can try to continue our search with - * the next component; if we come up empty, we know - * there is nothing under this whole prefix. + * the next component. So try to look up the + * directory, e.g., "refs/foo/". If we come up empty, + * we know there is nothing under this whole prefix, + * but even in that case we still have to continue the + * search for conflicts with extras. */ - pos = search_ref_dir(dir, refname, slash + 1 - refname); - if (pos < 0) - return 1; - - dir = get_ref_dir(dir->entries[pos]); + strbuf_addch(&dirname, '/'); + if (dir) { + pos = search_ref_dir(dir, dirname.buf, dirname.len); + if (pos < 0) { + /* + * There was no directory "refs/foo/", + * so there is nothing under this + * whole prefix. So there is no need + * to continue looking for conflicting + * references. But we need to continue + * looking for conflicting extras. + */ + dir = NULL; + } else { + dir = get_ref_dir(dir->entries[pos]); + } + } } /* - * We are at the leaf of our refname; we want to - * make sure there are no directories which match it. + * We are at the leaf of our refname (e.g., "refs/foo/bar"). + * There is no point in searching for a reference with that + * name, because a refname isn't considered to conflict with + * itself. But we still need to check for references whose + * names are in the "refs/foo/bar/" namespace, because they + * *do* conflict. */ - len = strlen(refname); - dirname = xmallocz(len + 1); - sprintf(dirname, "%s/", refname); - pos = search_ref_dir(dir, dirname, len + 1); - free(dirname); + strbuf_addstr(&dirname, refname + dirname.len); + strbuf_addch(&dirname, '/'); + + if (dir) { + pos = search_ref_dir(dir, dirname.buf, dirname.len); + + if (pos >= 0) { + /* + * We found a directory named "$refname/" + * (e.g., "refs/foo/bar/"). It is a problem + * iff it contains any ref that is not in + * "skip". + */ + struct nonmatching_ref_data data; + + data.skip = skip; + data.conflicting_refname = NULL; + dir = get_ref_dir(dir->entries[pos]); + sort_ref_dir(dir); + if (do_for_each_entry_in_dir(dir, 0, nonmatching_ref_fn, &data)) { + strbuf_addf(err, "'%s' exists; cannot create '%s'", + data.conflicting_refname, refname); + goto cleanup; + } + } + } - if (pos >= 0) { + if (extras) { /* - * We found a directory named "refname". It is a - * problem iff it contains any ref that is not - * in "skip". + * Check for entries in extras that start with + * "$refname/". We do that by looking for the place + * where "$refname/" would be inserted in extras. If + * there is an entry at that position that starts with + * "$refname/" and is not in skip, then we have a + * conflict. */ - struct ref_entry *entry = dir->entries[pos]; - struct ref_dir *dir = get_ref_dir(entry); - struct nonmatching_ref_data data; + for (pos = string_list_find_insert_index(extras, dirname.buf, 0); + pos < extras->nr; pos++) { + const char *extra_refname = extras->items[pos].string; - data.skip = skip; - sort_ref_dir(dir); - if (!do_for_each_entry_in_dir(dir, 0, nonmatching_ref_fn, &data)) - return 1; + if (!starts_with(extra_refname, dirname.buf)) + break; - report_refname_conflict(data.found, refname); - return 0; + if (!skip || !string_list_has_string(skip, extra_refname)) { + strbuf_addf(err, "cannot process '%s' and '%s' at the same time", + refname, extra_refname); + goto cleanup; + } + } } - /* - * There is no point in searching for another leaf - * node which matches it; such an entry would be the - * ref we are looking for, not a conflict. - */ - return 1; + /* No conflicts were found */ + ret = 0; + +cleanup: + strbuf_release(&dirname); + return ret; } struct packed_ref_cache { @@ -1178,6 +1241,8 @@ static void read_packed_refs(FILE *f, struct ref_dir *dir) int flag = REF_ISPACKED; if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) { + if (!refname_is_safe(refname)) + die("packed refname is dangerous: %s", refname); hashclr(sha1); flag |= REF_BAD_NAME | REF_ISBROKEN; } @@ -1323,6 +1388,8 @@ static void read_loose_refs(const char *dirname, struct ref_dir *dir) } if (check_refname_format(refname.buf, REFNAME_ALLOW_ONELEVEL)) { + if (!refname_is_safe(refname.buf)) + die("loose refname is dangerous: %s", refname.buf); hashclr(sha1); flag |= REF_BAD_NAME | REF_ISBROKEN; } @@ -1382,7 +1449,7 @@ static int resolve_gitlink_ref_recursive(struct ref_cache *refs, { int fd, len; char buffer[128], *p; - char *path; + const char *path; if (recursion > MAXDEPTH || strlen(refname) > MAXREFLEN) return -1; @@ -1475,7 +1542,11 @@ static int resolve_missing_loose_ref(const char *refname, } /* This function needs to return a meaningful errno on failure */ -const char *resolve_ref_unsafe(const char *refname, int resolve_flags, unsigned char *sha1, int *flags) +static const char *resolve_ref_unsafe_1(const char *refname, + int resolve_flags, + unsigned char *sha1, + int *flags, + struct strbuf *sb_path) { int depth = MAXDEPTH; ssize_t len; @@ -1506,7 +1577,7 @@ const char *resolve_ref_unsafe(const char *refname, int resolve_flags, unsigned bad_name = 1; } for (;;) { - char path[PATH_MAX]; + const char *path; struct stat st; char *buf; int fd; @@ -1516,7 +1587,9 @@ const char *resolve_ref_unsafe(const char *refname, int resolve_flags, unsigned return NULL; } - git_snpath(path, sizeof(path), "%s", refname); + strbuf_reset(sb_path); + strbuf_git_path(sb_path, "%s", refname); + path = sb_path->buf; /* * We might have to loop back here to avoid a race @@ -1643,6 +1716,16 @@ const char *resolve_ref_unsafe(const char *refname, int resolve_flags, unsigned } } +const char *resolve_ref_unsafe(const char *refname, int resolve_flags, + unsigned char *sha1, int *flags) +{ + struct strbuf sb_path = STRBUF_INIT; + const char *ret = resolve_ref_unsafe_1(refname, resolve_flags, + sha1, flags, &sb_path); + strbuf_release(&sb_path); + return ret; +} + char *resolve_refdup(const char *ref, int resolve_flags, unsigned char *sha1, int *flags) { return xstrdup_or_null(resolve_ref_unsafe(ref, resolve_flags, sha1, flags)); @@ -1934,6 +2017,11 @@ static int do_for_each_ref(struct ref_cache *refs, const char *base, data.fn = fn; data.cb_data = cb_data; + if (ref_paranoia < 0) + ref_paranoia = git_env_bool("GIT_REF_PARANOIA", 0); + if (ref_paranoia) + data.flags |= DO_FOR_EACH_INCLUDE_BROKEN; + return do_for_each_entry(refs, base, do_one_ref, &data); } @@ -2266,10 +2354,12 @@ int dwim_log(const char *str, int len, unsigned char *sha1, char **log) */ static struct ref_lock *lock_ref_sha1_basic(const char *refname, const unsigned char *old_sha1, + const struct string_list *extras, const struct string_list *skip, - unsigned int flags, int *type_p) + unsigned int flags, int *type_p, + struct strbuf *err) { - char *ref_file; + const char *ref_file; const char *orig_refname = refname; struct ref_lock *lock; int last_errno = 0; @@ -2278,8 +2368,9 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname, int resolve_flags = 0; int attempts_remaining = 3; + assert(err); + lock = xcalloc(1, sizeof(struct ref_lock)); - lock->lock_fd = -1; if (mustexist) resolve_flags |= RESOLVE_REF_READING; @@ -2300,7 +2391,12 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname, ref_file = git_path("%s", orig_refname); if (remove_empty_directories(ref_file)) { last_errno = errno; - error("there are still refs under '%s'", orig_refname); + + if (!verify_refname_available(orig_refname, extras, skip, + get_loose_refs(&ref_cache), err)) + strbuf_addf(err, "there are still refs under '%s'", + orig_refname); + goto error_return; } refname = resolve_ref_unsafe(orig_refname, resolve_flags, @@ -2310,8 +2406,12 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname, *type_p = type; if (!refname) { last_errno = errno; - error("unable to resolve reference %s: %s", - orig_refname, strerror(errno)); + if (last_errno != ENOTDIR || + !verify_refname_available(orig_refname, extras, skip, + get_loose_refs(&ref_cache), err)) + strbuf_addf(err, "unable to resolve reference %s: %s", + orig_refname, strerror(last_errno)); + goto error_return; } /* @@ -2321,7 +2421,8 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname, * our refname. */ if (is_null_sha1(lock->old_sha1) && - !is_refname_available(refname, skip, get_packed_refs(&ref_cache))) { + verify_refname_available(refname, extras, skip, + get_packed_refs(&ref_cache), err)) { last_errno = ENOTDIR; goto error_return; } @@ -2338,7 +2439,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname, ref_file = git_path("%s", refname); retry: - switch (safe_create_leading_directories(ref_file)) { + switch (safe_create_leading_directories_const(ref_file)) { case SCLD_OK: break; /* success */ case SCLD_VANISHED: @@ -2347,12 +2448,11 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname, /* fall through */ default: last_errno = errno; - error("unable to create directory for %s", ref_file); + strbuf_addf(err, "unable to create directory for %s", ref_file); goto error_return; } - lock->lock_fd = hold_lock_file_for_update(lock->lk, ref_file, lflags); - if (lock->lock_fd < 0) { + if (hold_lock_file_for_update(lock->lk, ref_file, lflags) < 0) { last_errno = errno; if (errno == ENOENT && --attempts_remaining > 0) /* @@ -2362,10 +2462,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname, */ goto retry; else { - struct strbuf err = STRBUF_INIT; - unable_to_lock_message(ref_file, errno, &err); - error("%s", err.buf); - strbuf_release(&err); + unable_to_lock_message(ref_file, errno, err); goto error_return; } } @@ -2408,9 +2505,19 @@ static int write_packed_entry_fn(struct ref_entry *entry, void *cb_data) /* This should return a meaningful errno on failure */ int lock_packed_refs(int flags) { + static int timeout_configured = 0; + static int timeout_value = 1000; + struct packed_ref_cache *packed_ref_cache; - if (hold_lock_file_for_update(&packlock, git_path("packed-refs"), flags) < 0) + if (!timeout_configured) { + git_config_get_int("core.packedrefstimeout", &timeout_value); + timeout_configured = 1; + } + + if (hold_lock_file_for_update_timeout( + &packlock, git_path("packed-refs"), + flags, timeout_value) < 0) return -1; /* * Get the current packed-refs while holding the lock. If the @@ -2616,68 +2723,10 @@ int pack_refs(unsigned int flags) return 0; } -/* - * If entry is no longer needed in packed-refs, add it to the string - * list pointed to by cb_data. Reasons for deleting entries: - * - * - Entry is broken. - * - Entry is overridden by a loose ref. - * - Entry does not point at a valid object. - * - * In the first and third cases, also emit an error message because these - * are indications of repository corruption. - */ -static int curate_packed_ref_fn(struct ref_entry *entry, void *cb_data) -{ - struct string_list *refs_to_delete = cb_data; - - if (entry->flag & REF_ISBROKEN) { - /* This shouldn't happen to packed refs. */ - error("%s is broken!", entry->name); - string_list_append(refs_to_delete, entry->name); - return 0; - } - if (!has_sha1_file(entry->u.value.sha1)) { - unsigned char sha1[20]; - int flags; - - if (read_ref_full(entry->name, 0, sha1, &flags)) - /* We should at least have found the packed ref. */ - die("Internal error"); - if ((flags & REF_ISSYMREF) || !(flags & REF_ISPACKED)) { - /* - * This packed reference is overridden by a - * loose reference, so it is OK that its value - * is no longer valid; for example, it might - * refer to an object that has been garbage - * collected. For this purpose we don't even - * care whether the loose reference itself is - * invalid, broken, symbolic, etc. Silently - * remove the packed reference. - */ - string_list_append(refs_to_delete, entry->name); - return 0; - } - /* - * There is no overriding loose reference, so the fact - * that this reference doesn't refer to a valid object - * indicates some kind of repository corruption. - * Report the problem, then omit the reference from - * the output. - */ - error("%s does not point to a valid object!", entry->name); - string_list_append(refs_to_delete, entry->name); - return 0; - } - - return 0; -} - int repack_without_refs(struct string_list *refnames, struct strbuf *err) { struct ref_dir *packed; - struct string_list refs_to_delete = STRING_LIST_INIT_DUP; - struct string_list_item *refname, *ref_to_delete; + struct string_list_item *refname; int ret, needs_repacking = 0, removed = 0; assert(err); @@ -2713,13 +2762,6 @@ int repack_without_refs(struct string_list *refnames, struct strbuf *err) return 0; } - /* Remove any other accumulated cruft */ - do_for_each_entry_in_dir(packed, 0, curate_packed_ref_fn, &refs_to_delete); - for_each_string_list_item(ref_to_delete, &refs_to_delete) { - if (remove_entry(packed, ref_to_delete->string) == -1) - die("internal error"); - } - /* Write what remains */ ret = commit_packed_refs(); if (ret) @@ -2781,7 +2823,7 @@ static int rename_tmp_log(const char *newrefname) int attempts_remaining = 4; retry: - switch (safe_create_leading_directories(git_path("logs/%s", newrefname))) { + switch (safe_create_leading_directories_const(git_path("logs/%s", newrefname))) { case SCLD_OK: break; /* success */ case SCLD_VANISHED: @@ -2824,17 +2866,25 @@ static int rename_tmp_log(const char *newrefname) static int rename_ref_available(const char *oldname, const char *newname) { struct string_list skip = STRING_LIST_INIT_NODUP; + struct strbuf err = STRBUF_INIT; int ret; string_list_insert(&skip, oldname); - ret = is_refname_available(newname, &skip, get_packed_refs(&ref_cache)) - && is_refname_available(newname, &skip, get_loose_refs(&ref_cache)); + ret = !verify_refname_available(newname, NULL, &skip, + get_packed_refs(&ref_cache), &err) + && !verify_refname_available(newname, NULL, &skip, + get_loose_refs(&ref_cache), &err); + if (!ret) + error("%s", err.buf); + string_list_clear(&skip, 0); + strbuf_release(&err); return ret; } -static int write_ref_sha1(struct ref_lock *lock, const unsigned char *sha1, - const char *logmsg); +static int write_ref_to_lockfile(struct ref_lock *lock, const unsigned char *sha1); +static int commit_ref_update(struct ref_lock *lock, + const unsigned char *sha1, const char *logmsg); int rename_ref(const char *oldrefname, const char *newrefname, const char *logmsg) { @@ -2844,6 +2894,7 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms struct stat loginfo; int log = !lstat(git_path("logs/%s", oldrefname), &loginfo); const char *symref = NULL; + struct strbuf err = STRBUF_INIT; if (log && S_ISLNK(loginfo.st_mode)) return error("reflog for %s is a symlink", oldrefname); @@ -2886,13 +2937,16 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms logmoved = log; - lock = lock_ref_sha1_basic(newrefname, NULL, NULL, 0, NULL); + lock = lock_ref_sha1_basic(newrefname, NULL, NULL, NULL, 0, NULL, &err); if (!lock) { - error("unable to lock %s for update", newrefname); + error("unable to rename '%s' to '%s': %s", oldrefname, newrefname, err.buf); + strbuf_release(&err); goto rollback; } hashcpy(lock->old_sha1, orig_sha1); - if (write_ref_sha1(lock, orig_sha1, logmsg)) { + + if (write_ref_to_lockfile(lock, orig_sha1) || + commit_ref_update(lock, orig_sha1, logmsg)) { error("unable to write current sha1 into %s", newrefname); goto rollback; } @@ -2900,15 +2954,17 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms return 0; rollback: - lock = lock_ref_sha1_basic(oldrefname, NULL, NULL, 0, NULL); + lock = lock_ref_sha1_basic(oldrefname, NULL, NULL, NULL, 0, NULL, &err); if (!lock) { - error("unable to lock %s for rollback", oldrefname); + error("unable to lock %s for rollback: %s", oldrefname, err.buf); + strbuf_release(&err); goto rollbacklog; } flag = log_all_ref_updates; log_all_ref_updates = 0; - if (write_ref_sha1(lock, orig_sha1, NULL)) + if (write_ref_to_lockfile(lock, orig_sha1) || + commit_ref_update(lock, orig_sha1, NULL)) error("unable to write current sha1 into %s", oldrefname); log_all_ref_updates = flag; @@ -2928,7 +2984,6 @@ static int close_ref(struct ref_lock *lock) { if (close_lock_file(lock->lk)) return -1; - lock->lock_fd = -1; return 0; } @@ -2936,7 +2991,6 @@ static int commit_ref(struct ref_lock *lock) { if (commit_lock_file(lock->lk)) return -1; - lock->lock_fd = -1; return 0; } @@ -2967,11 +3021,15 @@ static int copy_msg(char *buf, const char *msg) } /* This function must set a meaningful errno on failure */ -int log_ref_setup(const char *refname, char *logfile, int bufsize) +int log_ref_setup(const char *refname, struct strbuf *sb_logfile) { int logfd, oflags = O_APPEND | O_WRONLY; + char *logfile; - git_snpath(logfile, bufsize, "logs/%s", refname); + strbuf_git_path(sb_logfile, "logs/%s", refname); + logfile = sb_logfile->buf; + /* make sure the rest of the function can't change "logfile" */ + sb_logfile = NULL; if (log_all_ref_updates && (starts_with(refname, "refs/heads/") || starts_with(refname, "refs/remotes/") || @@ -3042,18 +3100,22 @@ static int log_ref_write_fd(int fd, const unsigned char *old_sha1, return 0; } -static int log_ref_write(const char *refname, const unsigned char *old_sha1, - const unsigned char *new_sha1, const char *msg) +static int log_ref_write_1(const char *refname, const unsigned char *old_sha1, + const unsigned char *new_sha1, const char *msg, + struct strbuf *sb_log_file) { int logfd, result, oflags = O_APPEND | O_WRONLY; - char log_file[PATH_MAX]; + char *log_file; if (log_all_ref_updates < 0) log_all_ref_updates = !is_bare_repository(); - result = log_ref_setup(refname, log_file, sizeof(log_file)); + result = log_ref_setup(refname, sb_log_file); if (result) return result; + log_file = sb_log_file->buf; + /* make sure the rest of the function can't change "log_file" */ + sb_log_file = NULL; logfd = open(log_file, oflags); if (logfd < 0) @@ -3076,17 +3138,26 @@ static int log_ref_write(const char *refname, const unsigned char *old_sha1, return 0; } +static int log_ref_write(const char *refname, const unsigned char *old_sha1, + const unsigned char *new_sha1, const char *msg) +{ + struct strbuf sb = STRBUF_INIT; + int ret = log_ref_write_1(refname, old_sha1, new_sha1, msg, &sb); + strbuf_release(&sb); + return ret; +} + int is_branch(const char *refname) { return !strcmp(refname, "HEAD") || starts_with(refname, "refs/heads/"); } /* - * Write sha1 into the ref specified by the lock. Make sure that errno - * is sane on error. + * Write sha1 into the open lockfile, then close the lockfile. On + * errors, rollback the lockfile and set errno to reflect the problem. */ -static int write_ref_sha1(struct ref_lock *lock, - const unsigned char *sha1, const char *logmsg) +static int write_ref_to_lockfile(struct ref_lock *lock, + const unsigned char *sha1) { static char term = '\n'; struct object *o; @@ -3106,8 +3177,8 @@ static int write_ref_sha1(struct ref_lock *lock, errno = EINVAL; return -1; } - if (write_in_full(lock->lock_fd, sha1_to_hex(sha1), 40) != 40 || - write_in_full(lock->lock_fd, &term, 1) != 1 || + if (write_in_full(lock->lk->fd, sha1_to_hex(sha1), 40) != 40 || + write_in_full(lock->lk->fd, &term, 1) != 1 || close_ref(lock) < 0) { int save_errno = errno; error("Couldn't write %s", lock->lk->filename.buf); @@ -3115,6 +3186,17 @@ static int write_ref_sha1(struct ref_lock *lock, errno = save_errno; return -1; } + return 0; +} + +/* + * Commit a change to a loose reference that has already been written + * to the loose reference lockfile. Also update the reflogs if + * necessary, using the specified lockmsg (which can be NULL). + */ +static int commit_ref_update(struct ref_lock *lock, + const unsigned char *sha1, const char *logmsg) +{ clear_loose_ref_cache(&ref_cache); if (log_ref_write(lock->ref_name, lock->old_sha1, sha1, logmsg) < 0 || (strcmp(lock->ref_name, lock->orig_ref_name) && @@ -3755,25 +3837,18 @@ int update_ref(const char *msg, const char *refname, return 0; } -static int ref_update_compare(const void *r1, const void *r2) -{ - const struct ref_update * const *u1 = r1; - const struct ref_update * const *u2 = r2; - return strcmp((*u1)->refname, (*u2)->refname); -} - -static int ref_update_reject_duplicates(struct ref_update **updates, int n, +static int ref_update_reject_duplicates(struct string_list *refnames, struct strbuf *err) { - int i; + int i, n = refnames->nr; assert(err); for (i = 1; i < n; i++) - if (!strcmp(updates[i - 1]->refname, updates[i]->refname)) { + if (!strcmp(refnames->items[i - 1].string, refnames->items[i].string)) { strbuf_addf(err, "Multiple updates for ref '%s' not allowed.", - updates[i]->refname); + refnames->items[i].string); return 1; } return 0; @@ -3787,6 +3862,7 @@ int ref_transaction_commit(struct ref_transaction *transaction, struct ref_update **updates = transaction->updates; struct string_list refs_to_delete = STRING_LIST_INIT_NODUP; struct string_list_item *ref_to_delete; + struct string_list affected_refnames = STRING_LIST_INIT_NODUP; assert(err); @@ -3798,63 +3874,101 @@ int ref_transaction_commit(struct ref_transaction *transaction, return 0; } - /* Copy, sort, and reject duplicate refs */ - qsort(updates, n, sizeof(*updates), ref_update_compare); - if (ref_update_reject_duplicates(updates, n, err)) { + /* Fail if a refname appears more than once in the transaction: */ + for (i = 0; i < n; i++) + string_list_append(&affected_refnames, updates[i]->refname); + string_list_sort(&affected_refnames); + if (ref_update_reject_duplicates(&affected_refnames, err)) { ret = TRANSACTION_GENERIC_ERROR; goto cleanup; } - /* Acquire all locks while verifying old values */ + /* + * Acquire all locks, verify old values if provided, check + * that new values are valid, and write new values to the + * lockfiles, ready to be activated. Only keep one lockfile + * open at a time to avoid running out of file descriptors. + */ for (i = 0; i < n; i++) { struct ref_update *update = updates[i]; - unsigned int flags = update->flags; - if ((flags & REF_HAVE_NEW) && is_null_sha1(update->new_sha1)) - flags |= REF_DELETING; + if ((update->flags & REF_HAVE_NEW) && + is_null_sha1(update->new_sha1)) + update->flags |= REF_DELETING; update->lock = lock_ref_sha1_basic( update->refname, ((update->flags & REF_HAVE_OLD) ? update->old_sha1 : NULL), - NULL, - flags, - &update->type); + &affected_refnames, NULL, + update->flags, + &update->type, + err); if (!update->lock) { + char *reason; + ret = (errno == ENOTDIR) ? TRANSACTION_NAME_CONFLICT : TRANSACTION_GENERIC_ERROR; - strbuf_addf(err, "Cannot lock the ref '%s'.", - update->refname); + reason = strbuf_detach(err, NULL); + strbuf_addf(err, "Cannot lock ref '%s': %s", + update->refname, reason); + free(reason); goto cleanup; } - } - - /* Perform updates first so live commits remain referenced */ - for (i = 0; i < n; i++) { - struct ref_update *update = updates[i]; - int flags = update->flags; - - if ((flags & REF_HAVE_NEW) && !is_null_sha1(update->new_sha1)) { + if ((update->flags & REF_HAVE_NEW) && + !(update->flags & REF_DELETING)) { int overwriting_symref = ((update->type & REF_ISSYMREF) && (update->flags & REF_NODEREF)); - if (!overwriting_symref - && !hashcmp(update->lock->old_sha1, update->new_sha1)) { + if (!overwriting_symref && + !hashcmp(update->lock->old_sha1, update->new_sha1)) { /* * The reference already has the desired * value, so we don't need to write it. */ - unlock_ref(update->lock); + } else if (write_ref_to_lockfile(update->lock, + update->new_sha1)) { + /* + * The lock was freed upon failure of + * write_ref_to_lockfile(): + */ + update->lock = NULL; + strbuf_addf(err, "Cannot update the ref '%s'.", + update->refname); + ret = TRANSACTION_GENERIC_ERROR; + goto cleanup; + } else { + update->flags |= REF_NEEDS_COMMIT; + } + } + if (!(update->flags & REF_NEEDS_COMMIT)) { + /* + * We didn't have to write anything to the lockfile. + * Close it to free up the file descriptor: + */ + if (close_ref(update->lock)) { + strbuf_addf(err, "Couldn't close %s.lock", + update->refname); + goto cleanup; + } + } + } + + /* Perform updates first so live commits remain referenced */ + for (i = 0; i < n; i++) { + struct ref_update *update = updates[i]; + + if (update->flags & REF_NEEDS_COMMIT) { + if (commit_ref_update(update->lock, + update->new_sha1, update->msg)) { + /* freed by commit_ref_update(): */ update->lock = NULL; - } else if (write_ref_sha1(update->lock, update->new_sha1, - update->msg)) { - update->lock = NULL; /* freed by write_ref_sha1 */ strbuf_addf(err, "Cannot update the ref '%s'.", update->refname); ret = TRANSACTION_GENERIC_ERROR; goto cleanup; } else { - /* freed by write_ref_sha1(): */ + /* freed by commit_ref_update(): */ update->lock = NULL; } } @@ -3863,15 +3977,14 @@ int ref_transaction_commit(struct ref_transaction *transaction, /* Perform deletes now that updates are safely completed */ for (i = 0; i < n; i++) { struct ref_update *update = updates[i]; - int flags = update->flags; - if ((flags & REF_HAVE_NEW) && is_null_sha1(update->new_sha1)) { + if (update->flags & REF_DELETING) { if (delete_ref_loose(update->lock, update->type, err)) { ret = TRANSACTION_GENERIC_ERROR; goto cleanup; } - if (!(flags & REF_ISPRUNING)) + if (!(update->flags & REF_ISPRUNING)) string_list_append(&refs_to_delete, update->lock->ref_name); } @@ -3892,6 +4005,7 @@ cleanup: if (updates[i]->lock) unlock_ref(updates[i]->lock); string_list_clear(&refs_to_delete, 0); + string_list_clear(&affected_refnames, 0); return ret; } @@ -4081,6 +4195,7 @@ int reflog_expire(const char *refname, const unsigned char *sha1, char *log_file; int status = 0; int type; + struct strbuf err = STRBUF_INIT; memset(&cb, 0, sizeof(cb)); cb.flags = flags; @@ -4092,9 +4207,12 @@ int reflog_expire(const char *refname, const unsigned char *sha1, * reference itself, plus we might need to update the * reference if --updateref was specified: */ - lock = lock_ref_sha1_basic(refname, sha1, NULL, 0, &type); - if (!lock) - return error("cannot lock ref '%s'", refname); + lock = lock_ref_sha1_basic(refname, sha1, NULL, NULL, 0, &type, &err); + if (!lock) { + error("cannot lock ref '%s': %s", refname, err.buf); + strbuf_release(&err); + return -1; + } if (!reflog_exists(refname)) { unlock_ref(lock); return 0; @@ -4144,9 +4262,9 @@ int reflog_expire(const char *refname, const unsigned char *sha1, status |= error("couldn't write %s: %s", log_file, strerror(errno)); } else if (update && - (write_in_full(lock->lock_fd, + (write_in_full(lock->lk->fd, sha1_to_hex(cb.last_kept_sha1), 40) != 40 || - write_str_in_full(lock->lock_fd, "\n") != 1 || + write_str_in_full(lock->lk->fd, "\n") != 1 || close_ref(lock) < 0)) { status |= error("couldn't write %s", lock->lk->filename.buf); @@ -191,7 +191,7 @@ extern int peel_ref(const char *refname, unsigned char *sha1); /* * Setup reflog before using. Set errno to something meaningful on failure. */ -int log_ref_setup(const char *refname, char *logfile, int bufsize); +int log_ref_setup(const char *refname, struct strbuf *logfile); /** Reads log for the value of ref during at_time. **/ extern int read_ref_at(const char *refname, unsigned int flags, diff --git a/remote-curl.c b/remote-curl.c index deb4bfe..af7b678 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -567,7 +567,6 @@ retry: git_zstream stream; int ret; - memset(&stream, 0, sizeof(stream)); git_deflate_init_gzip(&stream, Z_BEST_COMPRESSION); gzip_size = git_deflate_bound(&stream, rpc->len); gzip_body = xmalloc(gzip_size); @@ -659,6 +659,8 @@ int rerere_forget(struct pathspec *pathspec) return error("Could not read index"); fd = setup_rerere(&merge_rr, RERERE_NOAUTOUPDATE); + if (fd < 0) + return 0; unmerge_cache(pathspec); find_conflict(&conflict); @@ -345,14 +345,24 @@ static struct commit *handle_commit(struct rev_info *revs, die("%s is unknown object", name); } -static int everybody_uninteresting(struct commit_list *orig) +static int everybody_uninteresting(struct commit_list *orig, + struct commit **interesting_cache) { struct commit_list *list = orig; + + if (*interesting_cache) { + struct commit *commit = *interesting_cache; + if (!(commit->object.flags & UNINTERESTING)) + return 0; + } + while (list) { struct commit *commit = list->item; list = list->next; if (commit->object.flags & UNINTERESTING) continue; + if (interesting_cache) + *interesting_cache = commit; return 0; } return 1; @@ -940,7 +950,8 @@ static void cherry_pick_list(struct commit_list *list, struct rev_info *revs) /* How many extra uninteresting commits we want to see.. */ #define SLOP 5 -static int still_interesting(struct commit_list *src, unsigned long date, int slop) +static int still_interesting(struct commit_list *src, unsigned long date, int slop, + struct commit **interesting_cache) { /* * No source list at all? We're definitely done.. @@ -959,7 +970,7 @@ static int still_interesting(struct commit_list *src, unsigned long date, int sl * Does the source list still have interesting commits in * it? Definitely not done.. */ - if (!everybody_uninteresting(src)) + if (!everybody_uninteresting(src, interesting_cache)) return SLOP; /* Ok, we're closing in.. */ @@ -1078,6 +1089,7 @@ static int limit_list(struct rev_info *revs) struct commit_list *newlist = NULL; struct commit_list **p = &newlist; struct commit_list *bottom = NULL; + struct commit *interesting_cache = NULL; if (revs->ancestry_path) { bottom = collect_bottom_commits(list); @@ -1094,6 +1106,9 @@ static int limit_list(struct rev_info *revs) list = list->next; free(entry); + if (commit == interesting_cache) + interesting_cache = NULL; + if (revs->max_age != -1 && (commit->date < revs->max_age)) obj->flags |= UNINTERESTING; if (add_parents_to_list(revs, commit, &list, NULL) < 0) @@ -1102,7 +1117,7 @@ static int limit_list(struct rev_info *revs) mark_parents_uninteresting(commit); if (revs->show_all) p = &commit_list_insert(commit, p)->next; - slop = still_interesting(list, date, slop); + slop = still_interesting(list, date, slop, &interesting_cache); if (slop) continue; /* If showing all, add the whole pending list to the end */ @@ -2339,9 +2354,14 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s if (revs->reflog_info && revs->graph) die("cannot combine --walk-reflogs with --graph"); + if (revs->no_walk && revs->graph) + die("cannot combine --no-walk with --graph"); if (!revs->reflog_info && revs->grep_filter.use_reflog_filter) die("cannot use --grep-reflog without --walk-reflogs"); + if (revs->first_parent_only && revs->bisect) + die(_("--first-parent is incompatible with --bisect")); + return left; } diff --git a/run-command.c b/run-command.c index 0b432cc..4d73e90 100644 --- a/run-command.c +++ b/run-command.c @@ -4,10 +4,6 @@ #include "sigchain.h" #include "argv-array.h" -#ifndef SHELL_PATH -# define SHELL_PATH "/bin/sh" -#endif - void child_process_init(struct child_process *child) { memset(child, 0, sizeof(*child)); @@ -561,7 +557,12 @@ int finish_command(struct child_process *cmd) int run_command(struct child_process *cmd) { - int code = start_command(cmd); + int code; + + if (cmd->out < 0 || cmd->err < 0) + die("BUG: run_command with a pipe can cause deadlock"); + + code = start_command(cmd); if (code) return code; return finish_command(cmd); @@ -794,9 +795,9 @@ int finish_async(struct async *async) #endif } -char *find_hook(const char *name) +const char *find_hook(const char *name) { - char *path = git_path("hooks/%s", name); + const char *path = git_path("hooks/%s", name); if (access(path, X_OK) < 0) path = NULL; @@ -833,3 +834,19 @@ int run_hook_le(const char *const *env, const char *name, ...) return ret; } + +int capture_command(struct child_process *cmd, struct strbuf *buf, size_t hint) +{ + cmd->out = -1; + if (start_command(cmd) < 0) + return -1; + + if (strbuf_read(buf, cmd->out, hint) < 0) { + close(cmd->out); + finish_command(cmd); /* throw away exit code */ + return -1; + } + + close(cmd->out); + return finish_command(cmd); +} diff --git a/run-command.h b/run-command.h index d6868dc..1103805 100644 --- a/run-command.h +++ b/run-command.h @@ -52,7 +52,7 @@ int start_command(struct child_process *); int finish_command(struct child_process *); int run_command(struct child_process *); -extern char *find_hook(const char *name); +extern const char *find_hook(const char *name); LAST_ARG_MUST_BE_NULL extern int run_hook_le(const char *const *env, const char *name, ...); extern int run_hook_ve(const char *const *env, const char *name, va_list args); @@ -71,6 +71,19 @@ int run_command_v_opt(const char **argv, int opt); */ int run_command_v_opt_cd_env(const char **argv, int opt, const char *dir, const char *const *env); +/** + * Execute the given command, capturing its stdout in the given strbuf. + * Returns -1 if starting the command fails or reading fails, and otherwise + * returns the exit code of the command. The output collected in the + * buffer is kept even if the command returns a non-zero exit. The hint field + * gives a starting size for the strbuf allocation. + * + * The fields of "cmd" should be set up as they would for a normal run_command + * invocation. But note that there is no need to set cmd->out; the function + * sets it up for the caller. + */ +int capture_command(struct child_process *cmd, struct strbuf *buf, size_t hint); + /* * The purpose of the following functions is to feed a pipe by running * a function asynchronously and providing output that the caller reads. diff --git a/send-pack.c b/send-pack.c index 9d2b0c5..2a64fec 100644 --- a/send-pack.c +++ b/send-pack.c @@ -182,7 +182,7 @@ static int advertise_shallow_grafts_cb(const struct commit_graft *graft, void *c { struct strbuf *sb = cb; if (graft->nr_parent == -1) - packet_buf_write(sb, "shallow %s\n", sha1_to_hex(graft->sha1)); + packet_buf_write(sb, "shallow %s\n", oid_to_hex(&graft->oid)); return 0; } @@ -308,6 +308,28 @@ static int atomic_push_failure(struct send_pack_args *args, failing_ref->name, failing_ref->status); } +#define NONCE_LEN_LIMIT 256 + +static void reject_invalid_nonce(const char *nonce, int len) +{ + int i = 0; + + if (NONCE_LEN_LIMIT <= len) + die("the receiving end asked to sign an invalid nonce <%.*s>", + len, nonce); + + for (i = 0; i < len; i++) { + int ch = nonce[i] & 0xFF; + if (isalnum(ch) || + ch == '-' || ch == '.' || + ch == '/' || ch == '+' || + ch == '=' || ch == '_') + continue; + die("the receiving end asked to sign an invalid nonce <%.*s>", + len, nonce); + } +} + int send_pack(struct send_pack_args *args, int fd[], struct child_process *conn, struct ref *remote_refs, @@ -354,6 +376,7 @@ int send_pack(struct send_pack_args *args, push_cert_nonce = server_feature_value("push-cert", &len); if (!push_cert_nonce) die(_("the receiving end does not support --signed push")); + reject_invalid_nonce(push_cert_nonce, len); push_cert_nonce = xmemdupz(push_cert_nonce, len); } @@ -363,7 +386,7 @@ int send_pack(struct send_pack_args *args, return 0; } if (args->atomic && !atomic_supported) - die(_("server does not support --atomic push")); + die(_("the receiving end does not support --atomic push")); use_atomic = atomic_supported && args->atomic; diff --git a/sequencer.c b/sequencer.c index 32aa05e..c4f4b7d 100644 --- a/sequencer.c +++ b/sequencer.c @@ -373,6 +373,7 @@ static int run_git_commit(const char *defmsg, struct replay_opts *opts, { struct argv_array array; int rc; + const char *value; argv_array_init(&array); argv_array_push(&array, "commit"); @@ -385,6 +386,10 @@ static int run_git_commit(const char *defmsg, struct replay_opts *opts, if (!opts->edit) { argv_array_push(&array, "-F"); argv_array_push(&array, defmsg); + if (!opts->signoff && + !opts->record_origin && + git_config_get_value("commit.cleanup", &value)) + argv_array_push(&array, "--cleanup=verbatim"); } if (allow_empty) @@ -140,7 +140,9 @@ int check_filename(const char *prefix, const char *arg) if (arg[2] == '\0') /* ":/" is root dir, always exists */ return 1; name = arg + 2; - } else if (prefix) + } else if (!no_wildcard(arg)) + return 1; + else if (prefix) name = prefix_filename(prefix, strlen(prefix), arg); else name = arg; @@ -224,6 +226,36 @@ void verify_non_filename(const char *prefix, const char *arg) "'git <command> [<revision>...] -- [<file>...]'", arg); } +int get_common_dir(struct strbuf *sb, const char *gitdir) +{ + struct strbuf data = STRBUF_INIT; + struct strbuf path = STRBUF_INIT; + const char *git_common_dir = getenv(GIT_COMMON_DIR_ENVIRONMENT); + int ret = 0; + if (git_common_dir) { + strbuf_addstr(sb, git_common_dir); + return 1; + } + strbuf_addf(&path, "%s/commondir", gitdir); + if (file_exists(path.buf)) { + if (strbuf_read_file(&data, path.buf, 0) <= 0) + die_errno(_("failed to read %s"), path.buf); + while (data.len && (data.buf[data.len - 1] == '\n' || + data.buf[data.len - 1] == '\r')) + data.len--; + data.buf[data.len] = '\0'; + strbuf_reset(&path); + if (!is_absolute_path(data.buf)) + strbuf_addf(&path, "%s/", gitdir); + strbuf_addbuf(&path, &data); + strbuf_addstr(sb, real_path(path.buf)); + ret = 1; + } else + strbuf_addstr(sb, gitdir); + strbuf_release(&data); + strbuf_release(&path); + return ret; +} /* * Test if it looks like we're at a git directory. @@ -238,31 +270,40 @@ void verify_non_filename(const char *prefix, const char *arg) */ int is_git_directory(const char *suspect) { - char path[PATH_MAX]; - size_t len = strlen(suspect); + struct strbuf path = STRBUF_INIT; + int ret = 0; + size_t len; + + /* Check worktree-related signatures */ + strbuf_addf(&path, "%s/HEAD", suspect); + if (validate_headref(path.buf)) + goto done; - if (PATH_MAX <= len + strlen("/objects")) - die("Too long path: %.*s", 60, suspect); - strcpy(path, suspect); + strbuf_reset(&path); + get_common_dir(&path, suspect); + len = path.len; + + /* Check non-worktree-related signatures */ if (getenv(DB_ENVIRONMENT)) { if (access(getenv(DB_ENVIRONMENT), X_OK)) - return 0; + goto done; } else { - strcpy(path + len, "/objects"); - if (access(path, X_OK)) - return 0; + strbuf_setlen(&path, len); + strbuf_addstr(&path, "/objects"); + if (access(path.buf, X_OK)) + goto done; } - strcpy(path + len, "/refs"); - if (access(path, X_OK)) - return 0; + strbuf_setlen(&path, len); + strbuf_addstr(&path, "/refs"); + if (access(path.buf, X_OK)) + goto done; - strcpy(path + len, "/HEAD"); - if (validate_headref(path)) - return 0; - - return 1; + ret = 1; +done: + strbuf_release(&path); + return ret; } int is_inside_git_dir(void) @@ -304,9 +345,28 @@ void setup_work_tree(void) initialized = 1; } +static int check_repo_format(const char *var, const char *value, void *cb) +{ + if (strcmp(var, "core.repositoryformatversion") == 0) + repository_format_version = git_config_int(var, value); + else if (strcmp(var, "core.sharedrepository") == 0) + shared_repository = git_config_perm(var, value); + return 0; +} + static int check_repository_format_gently(const char *gitdir, int *nongit_ok) { - char repo_config[PATH_MAX+1]; + struct strbuf sb = STRBUF_INIT; + const char *repo_config; + config_fn_t fn; + int ret = 0; + + if (get_common_dir(&sb, gitdir)) + fn = check_repo_format; + else + fn = check_repository_format_version; + strbuf_addstr(&sb, "/config"); + repo_config = sb.buf; /* * git_config() can't be used here because it calls git_pathdup() @@ -317,8 +377,7 @@ static int check_repository_format_gently(const char *gitdir, int *nongit_ok) * Use a gentler version of git_config() to check if this repo * is a good one. */ - snprintf(repo_config, PATH_MAX, "%s/config", gitdir); - git_config_early(check_repository_format_version, NULL, repo_config); + git_config_early(fn, NULL, repo_config); if (GIT_REPO_VERSION < repository_format_version) { if (!nongit_ok) die ("Expected git repo version <= %d, found %d", @@ -327,9 +386,21 @@ static int check_repository_format_gently(const char *gitdir, int *nongit_ok) GIT_REPO_VERSION, repository_format_version); warning("Please upgrade Git"); *nongit_ok = -1; - return -1; + ret = -1; } - return 0; + strbuf_release(&sb); + return ret; +} + +static void update_linked_gitdir(const char *gitfile, const char *gitdir) +{ + struct strbuf path = STRBUF_INIT; + struct stat st; + + strbuf_addf(&path, "%s/gitfile", gitdir); + if (stat(path.buf, &st) || st.st_mtime + 24 * 3600 < time(NULL)) + write_file(path.buf, 0, "%s\n", gitfile); + strbuf_release(&path); } /* @@ -380,6 +451,8 @@ const char *read_gitfile(const char *path) if (!is_git_directory(dir)) die("Not a git repository: %s", dir); + + update_linked_gitdir(path, dir); path = real_path(dir); free(buf); @@ -799,11 +872,10 @@ int git_config_perm(const char *var, const char *value) int check_repository_format_version(const char *var, const char *value, void *cb) { - if (strcmp(var, "core.repositoryformatversion") == 0) - repository_format_version = git_config_int(var, value); - else if (strcmp(var, "core.sharedrepository") == 0) - shared_repository = git_config_perm(var, value); - else if (strcmp(var, "core.bare") == 0) { + int ret = check_repo_format(var, value, cb); + if (ret) + return ret; + if (strcmp(var, "core.bare") == 0) { is_bare_repository_cfg = git_config_bool(var, value); if (is_bare_repository_cfg == 1) inside_work_tree = -1; diff --git a/sha1_file.c b/sha1_file.c index 69a60ec..ccc6dac 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -405,7 +405,7 @@ void add_to_alternates_file(const char *reference) { struct lock_file *lock = xcalloc(1, sizeof(struct lock_file)); int fd = hold_lock_file_for_append(lock, git_path("objects/info/alternates"), LOCK_DIE_ON_ERROR); - char *alt = mkpath("%s\n", reference); + const char *alt = mkpath("%s\n", reference); write_or_die(fd, alt, strlen(alt)); if (commit_lock_file(lock)) die("could not close alternates file"); @@ -1564,6 +1564,40 @@ int unpack_sha1_header(git_zstream *stream, unsigned char *map, unsigned long ma return git_inflate(stream, 0); } +static int unpack_sha1_header_to_strbuf(git_zstream *stream, unsigned char *map, + unsigned long mapsize, void *buffer, + unsigned long bufsiz, struct strbuf *header) +{ + int status; + + status = unpack_sha1_header(stream, map, mapsize, buffer, bufsiz); + + /* + * Check if entire header is unpacked in the first iteration. + */ + if (memchr(buffer, '\0', stream->next_out - (unsigned char *)buffer)) + return 0; + + /* + * buffer[0..bufsiz] was not large enough. Copy the partial + * result out to header, and then append the result of further + * reading the stream. + */ + strbuf_add(header, buffer, stream->next_out - (unsigned char *)buffer); + stream->next_out = buffer; + stream->avail_out = bufsiz; + + do { + status = git_inflate(stream, 0); + strbuf_add(header, buffer, stream->next_out - (unsigned char *)buffer); + if (memchr(buffer, '\0', stream->next_out - (unsigned char *)buffer)) + return 0; + stream->next_out = buffer; + stream->avail_out = bufsiz; + } while (status != Z_STREAM_END); + return -1; +} + static void *unpack_sha1_rest(git_zstream *stream, void *buffer, unsigned long size, const unsigned char *sha1) { int bytes = strlen(buffer) + 1; @@ -1614,27 +1648,38 @@ static void *unpack_sha1_rest(git_zstream *stream, void *buffer, unsigned long s * too permissive for what we want to check. So do an anal * object header parse by hand. */ -int parse_sha1_header(const char *hdr, unsigned long *sizep) +static int parse_sha1_header_extended(const char *hdr, struct object_info *oi, + unsigned int flags) { - char type[10]; - int i; + const char *type_buf = hdr; unsigned long size; + int type, type_len = 0; /* - * The type can be at most ten bytes (including the - * terminating '\0' that we add), and is followed by + * The type can be of any size but is followed by * a space. */ - i = 0; for (;;) { char c = *hdr++; if (c == ' ') break; - type[i++] = c; - if (i >= sizeof(type)) - return -1; + type_len++; } - type[i] = 0; + + type = type_from_string_gently(type_buf, type_len, 1); + if (oi->typename) + strbuf_add(oi->typename, type_buf, type_len); + /* + * Set type to 0 if its an unknown object and + * we're obtaining the type using '--allow-unkown-type' + * option. + */ + if ((flags & LOOKUP_UNKNOWN_OBJECT) && (type < 0)) + type = 0; + else if (type < 0) + die("invalid object type"); + if (oi->typep) + *oi->typep = type; /* * The length must follow immediately, and be in canonical @@ -1652,12 +1697,24 @@ int parse_sha1_header(const char *hdr, unsigned long *sizep) size = size * 10 + c; } } - *sizep = size; + + if (oi->sizep) + *oi->sizep = size; /* * The length must be followed by a zero byte */ - return *hdr ? -1 : type_from_string(type); + return *hdr ? -1 : type; +} + +int parse_sha1_header(const char *hdr, unsigned long *sizep) +{ + struct object_info oi; + + oi.sizep = sizep; + oi.typename = NULL; + oi.typep = NULL; + return parse_sha1_header_extended(hdr, &oi, LOOKUP_REPLACE_OBJECT); } static void *unpack_sha1_file(void *map, unsigned long mapsize, enum object_type *type, unsigned long *size, const unsigned char *sha1) @@ -2473,10 +2530,8 @@ static int fill_pack_entry(const unsigned char *sha1, * answer, as it may have been deleted since the index was * loaded! */ - if (!is_pack_valid(p)) { - warning("packfile %s cannot be accessed", p->pack_name); + if (!is_pack_valid(p)) return 0; - } e->offset = offset; e->p = p; hashcpy(e->sha1, sha1); @@ -2524,13 +2579,15 @@ struct packed_git *find_sha1_pack(const unsigned char *sha1, } static int sha1_loose_object_info(const unsigned char *sha1, - struct object_info *oi) + struct object_info *oi, + int flags) { - int status; - unsigned long mapsize, size; + int status = 0; + unsigned long mapsize; void *map; git_zstream stream; char hdr[32]; + struct strbuf hdrbuf = STRBUF_INIT; if (oi->delta_base_sha1) hashclr(oi->delta_base_sha1); @@ -2543,7 +2600,7 @@ static int sha1_loose_object_info(const unsigned char *sha1, * return value implicitly indicates whether the * object even exists. */ - if (!oi->typep && !oi->sizep) { + if (!oi->typep && !oi->typename && !oi->sizep) { struct stat st; if (stat_sha1_file(sha1, &st) < 0) return -1; @@ -2557,17 +2614,26 @@ static int sha1_loose_object_info(const unsigned char *sha1, return -1; if (oi->disk_sizep) *oi->disk_sizep = mapsize; - if (unpack_sha1_header(&stream, map, mapsize, hdr, sizeof(hdr)) < 0) + if ((flags & LOOKUP_UNKNOWN_OBJECT)) { + if (unpack_sha1_header_to_strbuf(&stream, map, mapsize, hdr, sizeof(hdr), &hdrbuf) < 0) + status = error("unable to unpack %s header with --allow-unknown-type", + sha1_to_hex(sha1)); + } else if (unpack_sha1_header(&stream, map, mapsize, hdr, sizeof(hdr)) < 0) status = error("unable to unpack %s header", sha1_to_hex(sha1)); - else if ((status = parse_sha1_header(hdr, &size)) < 0) + if (status < 0) + ; /* Do nothing */ + else if (hdrbuf.len) { + if ((status = parse_sha1_header_extended(hdrbuf.buf, oi, flags)) < 0) + status = error("unable to parse %s header with --allow-unknown-type", + sha1_to_hex(sha1)); + } else if ((status = parse_sha1_header_extended(hdr, oi, flags)) < 0) status = error("unable to parse %s header", sha1_to_hex(sha1)); - else if (oi->sizep) - *oi->sizep = size; git_inflate_end(&stream); munmap(map, mapsize); - if (oi->typep) + if (status && oi->typep) *oi->typep = status; + strbuf_release(&hdrbuf); return 0; } @@ -2576,6 +2642,7 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi, struct cached_object *co; struct pack_entry e; int rtype; + enum object_type real_type; const unsigned char *real = lookup_replace_object_extended(sha1, flags); co = find_cached_object(real); @@ -2588,13 +2655,15 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi, *(oi->disk_sizep) = 0; if (oi->delta_base_sha1) hashclr(oi->delta_base_sha1); + if (oi->typename) + strbuf_addstr(oi->typename, typename(co->type)); oi->whence = OI_CACHED; return 0; } if (!find_pack_entry(real, &e)) { /* Most likely it's a loose object. */ - if (!sha1_loose_object_info(real, oi)) { + if (!sha1_loose_object_info(real, oi, flags)) { oi->whence = OI_LOOSE; return 0; } @@ -2605,9 +2674,18 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi, return -1; } + /* + * packed_object_info() does not follow the delta chain to + * find out the real type, unless it is given oi->typep. + */ + if (oi->typename && !oi->typep) + oi->typep = &real_type; + rtype = packed_object_info(e.p, e.offset, oi); if (rtype < 0) { mark_bad_packed_object(e.p, real); + if (oi->typep == &real_type) + oi->typep = NULL; return sha1_object_info_extended(real, oi, 0); } else if (in_delta_base_cache(e.p, e.offset)) { oi->whence = OI_DBCACHED; @@ -2618,6 +2696,10 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi, oi->u.packed.is_delta = (rtype == OBJ_REF_DELTA || rtype == OBJ_OFS_DELTA); } + if (oi->typename) + strbuf_addstr(oi->typename, typename(*oi->typep)); + if (oi->typep == &real_type) + oi->typep = NULL; return 0; } @@ -2943,7 +3025,6 @@ static int write_loose_object(const unsigned char *sha1, char *hdr, int hdrlen, } /* Set it up */ - memset(&stream, 0, sizeof(stream)); git_deflate_init(&stream, zlib_compression_level); stream.next_out = compressed; stream.avail_out = sizeof(compressed); @@ -3000,12 +3081,18 @@ static int freshen_loose_object(const unsigned char *sha1) static int freshen_packed_object(const unsigned char *sha1) { struct pack_entry e; - return find_pack_entry(sha1, &e) && freshen_file(e.p->pack_name); + if (!find_pack_entry(sha1, &e)) + return 0; + if (e.p->freshened) + return 1; + if (!freshen_file(e.p->pack_name)) + return 0; + e.p->freshened = 1; + return 1; } -int write_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *returnsha1) +int write_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *sha1) { - unsigned char sha1[20]; char hdr[32]; int hdrlen; @@ -3013,13 +3100,32 @@ int write_sha1_file(const void *buf, unsigned long len, const char *type, unsign * it out into .git/objects/??/?{38} file. */ write_sha1_file_prepare(buf, len, type, sha1, hdr, &hdrlen); - if (returnsha1) - hashcpy(returnsha1, sha1); - if (freshen_loose_object(sha1) || freshen_packed_object(sha1)) + if (freshen_packed_object(sha1) || freshen_loose_object(sha1)) return 0; return write_loose_object(sha1, hdr, hdrlen, buf, len, 0); } +int hash_sha1_file_literally(const void *buf, unsigned long len, const char *type, + unsigned char *sha1, unsigned flags) +{ + char *header; + int hdrlen, status = 0; + + /* type string, SP, %lu of the length plus NUL must fit this */ + header = xmalloc(strlen(type) + 32); + write_sha1_file_prepare(buf, len, type, sha1, header, &hdrlen); + + if (!(flags & HASH_WRITE_OBJECT)) + goto cleanup; + if (freshen_packed_object(sha1) || freshen_loose_object(sha1)) + goto cleanup; + status = write_loose_object(sha1, header, hdrlen, buf, len, 0); + +cleanup: + free(header); + return status; +} + int force_object_loose(const unsigned char *sha1, time_t mtime) { void *buf; @@ -3419,7 +3525,7 @@ static int loose_from_alt_odb(struct alternate_object_database *alt, return r; } -int for_each_loose_object(each_loose_object_fn cb, void *data) +int for_each_loose_object(each_loose_object_fn cb, void *data, unsigned flags) { struct loose_alt_odb_data alt; int r; @@ -3429,6 +3535,9 @@ int for_each_loose_object(each_loose_object_fn cb, void *data) if (r) return r; + if (flags & FOR_EACH_OBJECT_LOCAL_ONLY) + return 0; + alt.cb = cb; alt.data = data; return foreach_alt_odb(loose_from_alt_odb, &alt); @@ -3453,13 +3562,15 @@ static int for_each_object_in_pack(struct packed_git *p, each_packed_object_fn c return r; } -int for_each_packed_object(each_packed_object_fn cb, void *data) +int for_each_packed_object(each_packed_object_fn cb, void *data, unsigned flags) { struct packed_git *p; int r = 0; prepare_packed_git(); for (p = packed_git; p; p = p->next) { + if ((flags & FOR_EACH_OBJECT_LOCAL_ONLY) && !p->pack_local) + continue; r = for_each_object_in_pack(p, cb, data); if (r) break; diff --git a/sha1_name.c b/sha1_name.c index 95f9f8f..6d10f05 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -757,7 +757,7 @@ static int get_describe_name(const char *name, int len, unsigned char *sha1) for (cp = name + len - 1; name + 2 <= cp; cp--) { char ch = *cp; - if (hexval(ch) & ~0377) { + if (!isxdigit(ch)) { /* We must be looking at g in "SOMETHING-g" * for it to be describe output. */ @@ -31,7 +31,7 @@ int register_shallow(const unsigned char *sha1) xmalloc(sizeof(struct commit_graft)); struct commit *commit = lookup_commit(sha1); - hashcpy(graft->sha1, sha1); + hashcpy(graft->oid.hash, sha1); graft->nr_parent = -1; if (commit && commit->object.parsed) commit->parents = NULL; @@ -159,11 +159,11 @@ struct write_shallow_data { static int write_one_shallow(const struct commit_graft *graft, void *cb_data) { struct write_shallow_data *data = cb_data; - const char *hex = sha1_to_hex(graft->sha1); + const char *hex = oid_to_hex(&graft->oid); if (graft->nr_parent != -1) return 0; if (data->flags & SEEN_ONLY) { - struct commit *c = lookup_commit(graft->sha1); + struct commit *c = lookup_commit(graft->oid.hash); if (!c || !(c->object.flags & SEEN)) { if (data->flags & VERBOSE) printf("Removing %s from .git/shallow\n", @@ -282,7 +282,7 @@ static int advertise_shallow_grafts_cb(const struct commit_graft *graft, void *c { int fd = *(int *)cb; if (graft->nr_parent == -1) - packet_write(fd, "shallow %s\n", sha1_to_hex(graft->sha1)); + packet_write(fd, "shallow %s\n", oid_to_hex(&graft->oid)); return 0; } @@ -435,6 +435,47 @@ int strbuf_getcwd(struct strbuf *sb) return -1; } +#ifdef HAVE_GETDELIM +int strbuf_getwholeline(struct strbuf *sb, FILE *fp, int term) +{ + ssize_t r; + + if (feof(fp)) + return EOF; + + strbuf_reset(sb); + + /* Translate slopbuf to NULL, as we cannot call realloc on it */ + if (!sb->alloc) + sb->buf = NULL; + r = getdelim(&sb->buf, &sb->alloc, term, fp); + + if (r > 0) { + sb->len = r; + return 0; + } + assert(r == -1); + + /* + * Normally we would have called xrealloc, which will try to free + * memory and recover. But we have no way to tell getdelim() to do so. + * Worse, we cannot try to recover ENOMEM ourselves, because we have + * no idea how many bytes were read by getdelim. + * + * Dying here is reasonable. It mirrors what xrealloc would do on + * catastrophic memory failure. We skip the opportunity to free pack + * memory and retry, but that's unlikely to help for a malloc small + * enough to hold a single line of input, anyway. + */ + if (errno == ENOMEM) + die("Out of memory, getdelim failed"); + + /* Restore slopbuf that we moved out of the way before */ + if (!sb->buf) + strbuf_init(sb, 0); + return EOF; +} +#else int strbuf_getwholeline(struct strbuf *sb, FILE *fp, int term) { int ch; @@ -443,18 +484,22 @@ int strbuf_getwholeline(struct strbuf *sb, FILE *fp, int term) return EOF; strbuf_reset(sb); - while ((ch = fgetc(fp)) != EOF) { - strbuf_grow(sb, 1); + flockfile(fp); + while ((ch = getc_unlocked(fp)) != EOF) { + if (!strbuf_avail(sb)) + strbuf_grow(sb, 1); sb->buf[sb->len++] = ch; if (ch == term) break; } + funlockfile(fp); if (ch == EOF && sb->len == 0) return EOF; sb->buf[sb->len] = '\0'; return 0; } +#endif int strbuf_getline(struct strbuf *sb, FILE *fp, int term) { @@ -205,7 +205,8 @@ extern int strbuf_cmp(const struct strbuf *, const struct strbuf *); */ static inline void strbuf_addch(struct strbuf *sb, int c) { - strbuf_grow(sb, 1); + if (!strbuf_avail(sb)) + strbuf_grow(sb, 1); sb->buf[sb->len++] = c; sb->buf[sb->len] = '\0'; } diff --git a/streaming.c b/streaming.c index 2ff036a..811fcc2 100644 --- a/streaming.c +++ b/streaming.c @@ -507,8 +507,11 @@ int stream_blob_to_fd(int fd, unsigned const char *sha1, struct stream_filter *f int result = -1; st = open_istream(sha1, &type, &sz, filter); - if (!st) + if (!st) { + if (filter) + free_stream_filter(filter); return result; + } if (type != OBJ_BLOB) goto close_and_exit; for (;;) { diff --git a/submodule.c b/submodule.c index d37d400..d491e6a 100644 --- a/submodule.c +++ b/submodule.c @@ -576,12 +576,10 @@ static int is_submodule_commit_present(const char *path, unsigned char sha1[20]) cp.env = local_repo_env; cp.git_cmd = 1; cp.no_stdin = 1; - cp.out = -1; cp.dir = path; - if (!run_command(&cp) && !strbuf_read(&buf, cp.out, 1024)) + if (!capture_command(&cp, &buf, 1024) && !buf.len) is_present = 1; - close(cp.out); strbuf_release(&buf); } return is_present; @@ -1102,16 +1100,11 @@ void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir) struct strbuf file_name = STRBUF_INIT; struct strbuf rel_path = STRBUF_INIT; const char *real_work_tree = xstrdup(real_path(work_tree)); - FILE *fp; /* Update gitfile */ strbuf_addf(&file_name, "%s/.git", work_tree); - fp = fopen(file_name.buf, "w"); - if (!fp) - die(_("Could not create git link %s"), file_name.buf); - fprintf(fp, "gitdir: %s\n", relative_path(git_dir, real_work_tree, - &rel_path)); - fclose(fp); + write_file(file_name.buf, 1, "gitdir: %s\n", + relative_path(git_dir, real_work_tree, &rel_path)); /* Update core.worktree setting */ strbuf_reset(&file_name); @@ -168,6 +168,16 @@ appropriately before running "make". Using this option with a RAM-based filesystem (such as tmpfs) can massively speed up the test suite. +--chain-lint:: +--no-chain-lint:: + If --chain-lint is enabled, the test harness will check each + test to make sure that it properly "&&-chains" all commands (so + that a failure in the middle does not go unnoticed by the final + exit code of the test). This check is performed in addition to + running the tests themselves. You may also enable or disable + this feature by setting the GIT_TEST_CHAIN_LINT environment + variable to "1" or "0", respectively. + You can also set the GIT_TEST_INSTALLED environment variable to the bindir of an existing git installation to test that installation. You still need to have built this git sandbox, from which various diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh index 071e4d7..f5c0175 100644 --- a/t/annotate-tests.sh +++ b/t/annotate-tests.sh @@ -405,7 +405,7 @@ test_expect_success 'setup -L :regex' ' mv hello.c hello.orig && echo "#include <stdio.h>" >hello.c && cat hello.orig >>hello.c && - tr Q "\\t" >>hello.c <<-\EOF + tr Q "\\t" >>hello.c <<-\EOF && void mail() { Qputs("mail"); diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh index 5aa8adc..7548225 100644 --- a/t/lib-git-p4.sh +++ b/t/lib-git-p4.sh @@ -69,7 +69,7 @@ start_p4d() { ( cd "$db" && { - p4d -q -p $P4DPORT & + p4d -q -p $P4DPORT "$@" & echo $! >"$pidfile" } ) && diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index d154d1e..e971446 100644 --- a/t/lib-httpd.sh +++ b/t/lib-httpd.sh @@ -30,6 +30,18 @@ # Copyright (c) 2008 Clemens Buchacher <drizzd@aon.at> # +if test -n "$NO_CURL" +then + skip_all='skipping test, git built without http support' + test_done +fi + +if test -n "$NO_EXPAT" && test -n "$LIB_HTTPD_DAV" +then + skip_all='skipping test, git built without expat support' + test_done +fi + test_tristate GIT_TEST_HTTPD if test "$GIT_TEST_HTTPD" = false then @@ -79,6 +91,7 @@ HTTPD_DOCUMENT_ROOT_PATH=$HTTPD_ROOT_PATH/www # hack to suppress apache PassEnv warnings GIT_VALGRIND=$GIT_VALGRIND; export GIT_VALGRIND GIT_VALGRIND_OPTIONS=$GIT_VALGRIND_OPTIONS; export GIT_VALGRIND_OPTIONS +GIT_TRACE=$GIT_TRACE; export GIT_TRACE if ! test -x "$LIB_HTTPD_PATH" then diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf index 03a4c2e..0b81a00 100644 --- a/t/lib-httpd/apache.conf +++ b/t/lib-httpd/apache.conf @@ -70,6 +70,7 @@ PassEnv GIT_VALGRIND PassEnv GIT_VALGRIND_OPTIONS PassEnv GNUPGHOME PassEnv ASAN_OPTIONS +PassEnv GIT_TRACE Alias /dumb/ www/ Alias /auth/dumb/ www/auth/dumb/ diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh index a8c9574..5cf74ed 100644 --- a/t/perf/perf-lib.sh +++ b/t/perf/perf-lib.sh @@ -91,7 +91,7 @@ test_perf_create_repo_from () { */objects|*/hooks|*/config) ;; *) - cp -R "$stuff" . || break + cp -R "$stuff" . || exit 1 ;; esac done && diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh index f10ba4a..79b9074 100755 --- a/t/t0000-basic.sh +++ b/t/t0000-basic.sh @@ -253,7 +253,7 @@ test_expect_success 'test --verbose' ' test_expect_success "failing test" false test_done EOF - mv test-verbose/out test-verbose/out+ + mv test-verbose/out test-verbose/out+ && grep -v "^Initialized empty" test-verbose/out+ >test-verbose/out && check_sub_test_lib_test test-verbose <<-\EOF > expecting success: true @@ -974,7 +974,7 @@ test_expect_success 'writing this tree with --missing-ok' ' ################################################################ test_expect_success 'git read-tree followed by write-tree should be idempotent' ' - rm -f .git/index + rm -f .git/index && git read-tree $tree && test -f .git/index && newtree=$(git write-tree) && diff --git a/t/t0005-signals.sh b/t/t0005-signals.sh index aeea50c..e7f27eb 100755 --- a/t/t0005-signals.sh +++ b/t/t0005-signals.sh @@ -10,8 +10,8 @@ one EOF test_expect_success 'sigchain works' ' - test-sigchain >actual - case "$?" in + { test-sigchain >actual; ret=$?; } && + case "$ret" in 143) true ;; # POSIX w/ SIGTERM=15 271) true ;; # ksh w/ SIGTERM=15 3) true ;; # Windows @@ -40,12 +40,12 @@ test_expect_success 'create blob' ' ' test_expect_success !MINGW 'a constipated git dies with SIGPIPE' ' - OUT=$( ((large_git; echo $? 1>&3) | :) 3>&1 ) + OUT=$( ((large_git; echo $? 1>&3) | :) 3>&1 ) && test "$OUT" -eq 141 ' test_expect_success !MINGW 'a constipated git dies with SIGPIPE even if parent ignores it' ' - OUT=$( ((trap "" PIPE; large_git; echo $? 1>&3) | :) 3>&1 ) + OUT=$( ((trap "" PIPE; large_git; echo $? 1>&3) | :) 3>&1 ) && test "$OUT" -eq 141 ' diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh index 8dc6939..4ef5ed4 100755 --- a/t/t0008-ignores.sh +++ b/t/t0008-ignores.sh @@ -831,4 +831,14 @@ test_expect_success !MINGW,!CYGWIN 'correct handling of backslashes' ' test_cmp err.expect err ' +test_expect_success 'info/exclude trumps core.excludesfile' ' + echo >>global-excludes usually-ignored && + echo >>.git/info/exclude "!usually-ignored" && + >usually-ignored && + echo "?? usually-ignored" >expect && + + git status --porcelain usually-ignored >actual && + test_cmp expect actual +' + test_done diff --git a/t/t0011-hashmap.sh b/t/t0011-hashmap.sh index f97c805..9c217d9 100755 --- a/t/t0011-hashmap.sh +++ b/t/t0011-hashmap.sh @@ -218,7 +218,7 @@ test_expect_success 'grow / shrink' ' echo size >> in && echo 64 51 >> expect && echo put key52 value52 >> in && - echo NULL >> expect + echo NULL >> expect && echo size >> in && echo 256 52 >> expect && for n in $(test_seq 12) diff --git a/t/t0020-crlf.sh b/t/t0020-crlf.sh index d2e51a8..f94120a 100755 --- a/t/t0020-crlf.sh +++ b/t/t0020-crlf.sh @@ -8,6 +8,13 @@ has_cr() { tr '\015' Q <"$1" | grep Q >/dev/null } +# add or remove CRs to disk file in-place +# usage: munge_cr <append|remove> <file> +munge_cr () { + "${1}_cr" <"$2" >tmp && + mv tmp "$2" +} + test_expect_success setup ' git config core.autocrlf false && @@ -28,9 +35,7 @@ test_expect_success setup ' for w in Some extra lines here; do echo $w; done >>one && git diff >patch.file && patched=$(git hash-object --stdin <one) && - git read-tree --reset -u HEAD && - - echo happy. + git read-tree --reset -u HEAD ' test_expect_success 'safecrlf: autocrlf=input, all CRLF' ' @@ -100,22 +105,11 @@ test_expect_success 'update with autocrlf=input' ' rm -f tmp one dir/two three && git read-tree --reset -u HEAD && git config core.autocrlf input && - - for f in one dir/two - do - append_cr <$f >tmp && mv -f tmp $f && - git update-index -- $f || { - echo Oops - false - break - } - done && - + munge_cr append one && + munge_cr append dir/two && + git update-index -- one dir/two && differs=$(git diff-index --cached HEAD) && - test -z "$differs" || { - echo Oops "$differs" - false - } + verbose test -z "$differs" ' @@ -124,22 +118,11 @@ test_expect_success 'update with autocrlf=true' ' rm -f tmp one dir/two three && git read-tree --reset -u HEAD && git config core.autocrlf true && - - for f in one dir/two - do - append_cr <$f >tmp && mv -f tmp $f && - git update-index -- $f || { - echo "Oops $f" - false - break - } - done && - + munge_cr append one && + munge_cr append dir/two && + git update-index -- one dir/two && differs=$(git diff-index --cached HEAD) && - test -z "$differs" || { - echo Oops "$differs" - false - } + verbose test -z "$differs" ' @@ -148,23 +131,13 @@ test_expect_success 'checkout with autocrlf=true' ' rm -f tmp one dir/two three && git config core.autocrlf true && git read-tree --reset -u HEAD && - - for f in one dir/two - do - remove_cr <"$f" >tmp && mv -f tmp $f && - git update-index -- $f || { - echo "Eh? $f" - false - break - } - done && + munge_cr remove one && + munge_cr remove dir/two && + git update-index -- one dir/two && test "$one" = $(git hash-object --stdin <one) && test "$two" = $(git hash-object --stdin <dir/two) && differs=$(git diff-index --cached HEAD) && - test -z "$differs" || { - echo Oops "$differs" - false - } + verbose test -z "$differs" ' test_expect_success 'checkout with autocrlf=input' ' @@ -172,25 +145,13 @@ test_expect_success 'checkout with autocrlf=input' ' rm -f tmp one dir/two three && git config core.autocrlf input && git read-tree --reset -u HEAD && - - for f in one dir/two - do - if has_cr "$f" - then - echo "Eh? $f" - false - break - else - git update-index -- $f - fi - done && + test_must_fail has_cr one && + test_must_fail has_cr two && + git update-index -- one dir/two && test "$one" = $(git hash-object --stdin <one) && test "$two" = $(git hash-object --stdin <dir/two) && differs=$(git diff-index --cached HEAD) && - test -z "$differs" || { - echo Oops "$differs" - false - } + verbose test -z "$differs" ' test_expect_success 'apply patch (autocrlf=input)' ' @@ -200,10 +161,7 @@ test_expect_success 'apply patch (autocrlf=input)' ' git read-tree --reset -u HEAD && git apply patch.file && - test "$patched" = "$(git hash-object --stdin <one)" || { - echo "Eh? apply without index" - false - } + verbose test "$patched" = "$(git hash-object --stdin <one)" ' test_expect_success 'apply patch --cached (autocrlf=input)' ' @@ -213,10 +171,7 @@ test_expect_success 'apply patch --cached (autocrlf=input)' ' git read-tree --reset -u HEAD && git apply --cached patch.file && - test "$patched" = $(git rev-parse :one) || { - echo "Eh? apply with --cached" - false - } + verbose test "$patched" = $(git rev-parse :one) ' test_expect_success 'apply patch --index (autocrlf=input)' ' @@ -226,11 +181,8 @@ test_expect_success 'apply patch --index (autocrlf=input)' ' git read-tree --reset -u HEAD && git apply --index patch.file && - test "$patched" = $(git rev-parse :one) && - test "$patched" = $(git hash-object --stdin <one) || { - echo "Eh? apply with --index" - false - } + verbose test "$patched" = $(git rev-parse :one) && + verbose test "$patched" = $(git hash-object --stdin <one) ' test_expect_success 'apply patch (autocrlf=true)' ' @@ -240,10 +192,7 @@ test_expect_success 'apply patch (autocrlf=true)' ' git read-tree --reset -u HEAD && git apply patch.file && - test "$patched" = "$(remove_cr <one | git hash-object --stdin)" || { - echo "Eh? apply without index" - false - } + verbose test "$patched" = "$(remove_cr <one | git hash-object --stdin)" ' test_expect_success 'apply patch --cached (autocrlf=true)' ' @@ -253,10 +202,7 @@ test_expect_success 'apply patch --cached (autocrlf=true)' ' git read-tree --reset -u HEAD && git apply --cached patch.file && - test "$patched" = $(git rev-parse :one) || { - echo "Eh? apply without index" - false - } + verbose test "$patched" = $(git rev-parse :one) ' test_expect_success 'apply patch --index (autocrlf=true)' ' @@ -266,11 +212,8 @@ test_expect_success 'apply patch --index (autocrlf=true)' ' git read-tree --reset -u HEAD && git apply --index patch.file && - test "$patched" = $(git rev-parse :one) && - test "$patched" = "$(remove_cr <one | git hash-object --stdin)" || { - echo "Eh? apply with --index" - false - } + verbose test "$patched" = $(git rev-parse :one) && + verbose test "$patched" = "$(remove_cr <one | git hash-object --stdin)" ' test_expect_success '.gitattributes says two is binary' ' @@ -280,29 +223,9 @@ test_expect_success '.gitattributes says two is binary' ' git config core.autocrlf true && git read-tree --reset -u HEAD && - if has_cr dir/two - then - echo "Huh?" - false - else - : happy - fi && - - if has_cr one - then - : happy - else - echo "Huh?" - false - fi && - - if has_cr three - then - echo "Huh?" - false - else - : happy - fi + test_must_fail has_cr dir/two && + verbose has_cr one && + test_must_fail has_cr three ' test_expect_success '.gitattributes says two is input' ' @@ -311,13 +234,7 @@ test_expect_success '.gitattributes says two is input' ' echo "two crlf=input" >.gitattributes && git read-tree --reset -u HEAD && - if has_cr dir/two - then - echo "Huh?" - false - else - : happy - fi + test_must_fail has_cr dir/two ' test_expect_success '.gitattributes says two and three are text' ' @@ -326,21 +243,8 @@ test_expect_success '.gitattributes says two and three are text' ' echo "t* crlf" >.gitattributes && git read-tree --reset -u HEAD && - if has_cr dir/two - then - : happy - else - echo "Huh?" - false - fi && - - if has_cr three - then - : happy - else - echo "Huh?" - false - fi + verbose has_cr dir/two && + verbose has_cr three ' test_expect_success 'in-tree .gitattributes (1)' ' @@ -352,17 +256,8 @@ test_expect_success 'in-tree .gitattributes (1)' ' rm -rf tmp one dir .gitattributes patch.file three && git read-tree --reset -u HEAD && - if has_cr one - then - echo "Eh? one should not have CRLF" - false - else - : happy - fi && - has_cr three || { - echo "Eh? three should still have CRLF" - false - } + test_must_fail has_cr one && + verbose has_cr three ' test_expect_success 'in-tree .gitattributes (2)' ' @@ -371,17 +266,8 @@ test_expect_success 'in-tree .gitattributes (2)' ' git read-tree --reset HEAD && git checkout-index -f -q -u -a && - if has_cr one - then - echo "Eh? one should not have CRLF" - false - else - : happy - fi && - has_cr three || { - echo "Eh? three should still have CRLF" - false - } + test_must_fail has_cr one && + verbose has_cr three ' test_expect_success 'in-tree .gitattributes (3)' ' @@ -391,17 +277,8 @@ test_expect_success 'in-tree .gitattributes (3)' ' git checkout-index -u .gitattributes && git checkout-index -u one dir/two three && - if has_cr one - then - echo "Eh? one should not have CRLF" - false - else - : happy - fi && - has_cr three || { - echo "Eh? three should still have CRLF" - false - } + test_must_fail has_cr one && + verbose has_cr three ' test_expect_success 'in-tree .gitattributes (4)' ' @@ -411,17 +288,8 @@ test_expect_success 'in-tree .gitattributes (4)' ' git checkout-index -u one dir/two three && git checkout-index -u .gitattributes && - if has_cr one - then - echo "Eh? one should not have CRLF" - false - else - : happy - fi && - has_cr three || { - echo "Eh? three should still have CRLF" - false - } + test_must_fail has_cr one && + verbose has_cr three ' test_expect_success 'checkout with existing .gitattributes' ' diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh index ca7d2a6..e0200b9 100755 --- a/t/t0021-conversion.sh +++ b/t/t0021-conversion.sh @@ -204,6 +204,16 @@ test_expect_success 'filtering large input to small output should use little mem GIT_MMAP_LIMIT=1m GIT_ALLOC_LIMIT=1m git add 30MB ' +test_expect_success 'filter that does not read is fine' ' + test-genrandom foo $((128 * 1024 + 1)) >big && + echo "big filter=epipe" >.gitattributes && + git config filter.epipe.clean "echo xyzzy" && + git add big && + git cat-file blob :big >actual && + echo xyzzy >expect && + test_cmp expect actual +' + test_expect_success EXPENSIVE 'filter large file' ' git config filter.largefile.smudge cat && git config filter.largefile.clean cat && diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh index 452320d..1a56e5e 100755 --- a/t/t0027-auto-crlf.sh +++ b/t/t0027-auto-crlf.sh @@ -57,28 +57,35 @@ create_gitattributes () { check_warning () { case "$1" in - LF_CRLF) grep "LF will be replaced by CRLF" $2;; - CRLF_LF) grep "CRLF will be replaced by LF" $2;; - '') - >expect - grep "will be replaced by" $2 >actual - test_cmp expect actual - ;; - *) false ;; + LF_CRLF) echo "warning: LF will be replaced by CRLF" >"$2".expect ;; + CRLF_LF) echo "warning: CRLF will be replaced by LF" >"$2".expect ;; + '') >"$2".expect ;; + *) echo >&2 "Illegal 1": "$1" ; return false ;; esac + grep "will be replaced by" "$2" | sed -e "s/\(.*\) in [^ ]*$/\1/" >"$2".actual + test_cmp "$2".expect "$2".actual } -create_file_in_repo () { +commit_check_warn () { crlf=$1 attr=$2 lfname=$3 crlfname=$4 - lfmixcrlf=$5 - lfmixcr=$6 - crlfnul=$7 - create_gitattributes "$attr" && + repoMIX=$5 + lfmixcrlf=$6 + lfmixcr=$7 + crlfnul=$8 pfx=crlf_${crlf}_attr_${attr} - for f in LF CRLF LF_mix_CR CRLF_mix_LF CRLF_nul + # Special handling for repoMIX: It should already be in the repo + # with CRLF + f=repoMIX + fname=${pfx}_$f.txt + echo >.gitattributes && + cp $f $fname && + git -c core.autocrlf=false add $fname 2>"${pfx}_$f.err" && + git commit -m "repoMIX" && + create_gitattributes "$attr" && + for f in LF CRLF repoMIX LF_mix_CR CRLF_mix_LF LF_nul CRLF_nul do fname=${pfx}_$f.txt && cp $f $fname && @@ -109,7 +116,7 @@ check_files_in_repo () { } -check_files_in_ws () { +checkout_files () { eol=$1 crlf=$2 attr=$3 @@ -122,7 +129,7 @@ check_files_in_ws () { git config core.autocrlf $crlf && pfx=eol_${eol}_crlf_${crlf}_attr_${attr}_ && src=crlf_false_attr__ && - for f in LF CRLF LF_mix_CR CRLF_mix_LF CRLF_nul + for f in LF CRLF LF_mix_CR CRLF_mix_LF LF_nul do rm $src$f.txt && if test -z "$eol"; then @@ -144,8 +151,8 @@ check_files_in_ws () { test_expect_success "checkout core.eol=$eol core.autocrlf=$crlf gitattributes=$attr file=LF_mix_CR" " compare_ws_file $pfx $lfmixcr ${src}LF_mix_CR.txt " - test_expect_success "checkout core.eol=$eol core.autocrlf=$crlf gitattributes=$attr file=CRLF_nul" " - compare_ws_file $pfx $crlfnul ${src}CRLF_nul.txt + test_expect_success "checkout core.eol=$eol core.autocrlf=$crlf gitattributes=$attr file=LF_nul" " + compare_ws_file $pfx $crlfnul ${src}LF_nul.txt " } @@ -157,6 +164,7 @@ test_expect_success 'setup master' ' git commit -m "add .gitattributes" "" && printf "line1\nline2\nline3" >LF && printf "line1\r\nline2\r\nline3" >CRLF && + printf "line1\r\nline2\nline3" >repoMIX && printf "line1\r\nline2\nline3" >CRLF_mix_LF && printf "line1\nline2\rline3" >LF_mix_CR && printf "line1\r\nline2\rline3" >CRLF_mix_CR && @@ -169,40 +177,55 @@ test_expect_success 'setup master' ' warn_LF_CRLF="LF will be replaced by CRLF" warn_CRLF_LF="CRLF will be replaced by LF" -test_expect_success 'add files empty attr' ' - create_file_in_repo false "" "" "" "" "" "" && - create_file_in_repo true "" "LF_CRLF" "" "LF_CRLF" "" "" && - create_file_in_repo input "" "" "CRLF_LF" "CRLF_LF" "" "" +# WILC stands for "Warn if (this OS) converts LF into CRLF". +# WICL: Warn if CRLF becomes LF +# WAMIX: Mixed line endings: either CRLF->LF or LF->CRLF +if test_have_prereq NATIVE_CRLF +then + WILC=LF_CRLF + WICL= + WAMIX=LF_CRLF +else + WILC= + WICL=CRLF_LF + WAMIX=CRLF_LF +fi + +# attr LF CRLF repoMIX CRLFmixLF LFmixCR CRLFNUL +test_expect_success 'commit files empty attr' ' + commit_check_warn false "" "" "" "" "" "" "" && + commit_check_warn true "" "LF_CRLF" "" "LF_CRLF" "LF_CRLF" "" "" && + commit_check_warn input "" "" "CRLF_LF" "CRLF_LF" "CRLF_LF" "" "" ' -test_expect_success 'add files attr=auto' ' - create_file_in_repo false "auto" "" "CRLF_LF" "CRLF_LF" "" "" && - create_file_in_repo true "auto" "LF_CRLF" "" "LF_CRLF" "" "" && - create_file_in_repo input "auto" "" "CRLF_LF" "CRLF_LF" "" "" +test_expect_success 'commit files attr=auto' ' + commit_check_warn false "auto" "$WILC" "$WICL" "$WAMIX" "$WAMIX" "" "" && + commit_check_warn true "auto" "LF_CRLF" "" "LF_CRLF" "LF_CRLF" "" "" && + commit_check_warn input "auto" "" "CRLF_LF" "CRLF_LF" "CRLF_LF" "" "" ' -test_expect_success 'add files attr=text' ' - create_file_in_repo false "text" "" "CRLF_LF" "CRLF_LF" "" "CRLF_LF" && - create_file_in_repo true "text" "LF_CRLF" "" "LF_CRLF" "LF_CRLF" "" && - create_file_in_repo input "text" "" "CRLF_LF" "CRLF_LF" "" "CRLF_LF" +test_expect_success 'commit files attr=text' ' + commit_check_warn false "text" "$WILC" "$WICL" "$WAMIX" "$WAMIX" "$WILC" "$WICL" && + commit_check_warn true "text" "LF_CRLF" "" "LF_CRLF" "LF_CRLF" "LF_CRLF" "" && + commit_check_warn input "text" "" "CRLF_LF" "CRLF_LF" "CRLF_LF" "" "CRLF_LF" ' -test_expect_success 'add files attr=-text' ' - create_file_in_repo false "-text" "" "" "" "" "" && - create_file_in_repo true "-text" "" "" "" "" "" && - create_file_in_repo input "-text" "" "" "" "" "" +test_expect_success 'commit files attr=-text' ' + commit_check_warn false "-text" "" "" "" "" "" "" && + commit_check_warn true "-text" "" "" "" "" "" "" && + commit_check_warn input "-text" "" "" "" "" "" "" ' -test_expect_success 'add files attr=lf' ' - create_file_in_repo false "lf" "" "CRLF_LF" "CRLF_LF" "" "CRLF_LF" && - create_file_in_repo true "lf" "" "CRLF_LF" "CRLF_LF" "" "CRLF_LF" && - create_file_in_repo input "lf" "" "CRLF_LF" "CRLF_LF" "" "CRLF_LF" +test_expect_success 'commit files attr=lf' ' + commit_check_warn false "lf" "" "CRLF_LF" "CRLF_LF" "CRLF_LF" "" "CRLF_LF" && + commit_check_warn true "lf" "" "CRLF_LF" "CRLF_LF" "CRLF_LF" "" "CRLF_LF" && + commit_check_warn input "lf" "" "CRLF_LF" "CRLF_LF" "CRLF_LF" "" "CRLF_LF" ' -test_expect_success 'add files attr=crlf' ' - create_file_in_repo false "crlf" "LF_CRLF" "" "LF_CRLF" "LF_CRLF" "" && - create_file_in_repo true "crlf" "LF_CRLF" "" "LF_CRLF" "LF_CRLF" "" && - create_file_in_repo input "crlf" "LF_CRLF" "" "LF_CRLF" "LF_CRLF" "" +test_expect_success 'commit files attr=crlf' ' + commit_check_warn false "crlf" "LF_CRLF" "" "LF_CRLF" "LF_CRLF" "LF_CRLF" "" && + commit_check_warn true "crlf" "LF_CRLF" "" "LF_CRLF" "LF_CRLF" "LF_CRLF" "" && + commit_check_warn input "crlf" "LF_CRLF" "" "LF_CRLF" "LF_CRLF" "LF_CRLF" "" ' test_expect_success 'create files cleanup' ' @@ -237,7 +260,7 @@ test_expect_success 'commit -text' ' ################################################################################ # Check how files in the repo are changed when they are checked out # How to read the table below: -# - check_files_in_ws will check multiple files with a combination of settings +# - checkout_files will check multiple files with a combination of settings # and attributes (core.autocrlf=input is forbidden with core.eol=crlf) # - parameter $1 : core.eol lf | crlf # - parameter $2 : core.autocrlf false | true | input @@ -249,87 +272,89 @@ test_expect_success 'commit -text' ' # - parameter $8 : reference for a file with CRLF and a NUL (should be handled as binary when auto) # What we have in the repo: -# ----------------- EOL in repo ---------------- -# LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul +# ----------------- EOL in repo ---------------- +# LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul # settings with checkout: # core. core. .gitattr # eol acrlf # ---------------------------------------------- # What we want to have in the working tree: -if test_have_prereq MINGW +if test_have_prereq NATIVE_CRLF then MIX_CRLF_LF=CRLF MIX_LF_CR=CRLF_mix_CR NL=CRLF +LFNUL=CRLF_nul else MIX_CRLF_LF=CRLF_mix_LF MIX_LF_CR=LF_mix_CR NL=LF +LFNUL=LF_nul fi export CRLF_MIX_LF_CR MIX NL -check_files_in_ws lf false "" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws lf true "" CRLF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws lf input "" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws lf false "auto" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws lf true "auto" CRLF CRLF CRLF LF_mix_CR CRLF_nul -check_files_in_ws lf input "auto" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws lf false "text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws lf true "text" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul -check_files_in_ws lf input "text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws lf false "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws lf true "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws lf input "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws lf false "lf" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws lf true "lf" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws lf input "lf" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws lf false "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul -check_files_in_ws lf true "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul -check_files_in_ws lf input "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul - -check_files_in_ws crlf false "" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws crlf true "" CRLF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws crlf false "auto" CRLF CRLF CRLF LF_mix_CR CRLF_nul -check_files_in_ws crlf true "auto" CRLF CRLF CRLF LF_mix_CR CRLF_nul -check_files_in_ws crlf false "text" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul -check_files_in_ws crlf true "text" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul -check_files_in_ws crlf false "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws crlf true "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws crlf false "lf" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws crlf true "lf" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws crlf false "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul -check_files_in_ws crlf true "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul - -check_files_in_ws "" false "" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws "" true "" CRLF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws "" input "" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws "" false "auto" $NL CRLF $MIX_CRLF_LF LF_mix_CR CRLF_nul -check_files_in_ws "" true "auto" CRLF CRLF CRLF LF_mix_CR CRLF_nul -check_files_in_ws "" input "auto" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws "" false "text" $NL CRLF $MIX_CRLF_LF $MIX_LF_CR CRLF_nul -check_files_in_ws "" true "text" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul -check_files_in_ws "" input "text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws "" false "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws "" true "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws "" input "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws "" false "lf" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws "" true "lf" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws "" input "lf" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws "" false "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul -check_files_in_ws "" true "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul -check_files_in_ws "" input "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul - -check_files_in_ws native false "" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws native true "" CRLF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws native false "auto" $NL CRLF $MIX_CRLF_LF LF_mix_CR CRLF_nul -check_files_in_ws native true "auto" CRLF CRLF CRLF LF_mix_CR CRLF_nul -check_files_in_ws native false "text" $NL CRLF $MIX_CRLF_LF $MIX_LF_CR CRLF_nul -check_files_in_ws native true "text" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul -check_files_in_ws native false "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws native true "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws native false "lf" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws native true "lf" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_files_in_ws native false "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul -check_files_in_ws native true "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul +checkout_files lf false "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files lf true "" CRLF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files lf input "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files lf false "auto" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files lf true "auto" CRLF CRLF CRLF LF_mix_CR LF_nul +checkout_files lf input "auto" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files lf false "text" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files lf true "text" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul +checkout_files lf input "text" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files lf false "-text" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files lf true "-text" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files lf input "-text" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files lf false "lf" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files lf true "lf" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files lf input "lf" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files lf false "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul +checkout_files lf true "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul +checkout_files lf input "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul + +checkout_files crlf false "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files crlf true "" CRLF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files crlf false "auto" CRLF CRLF CRLF LF_mix_CR LF_nul +checkout_files crlf true "auto" CRLF CRLF CRLF LF_mix_CR LF_nul +checkout_files crlf false "text" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul +checkout_files crlf true "text" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul +checkout_files crlf false "-text" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files crlf true "-text" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files crlf false "lf" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files crlf true "lf" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files crlf false "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul +checkout_files crlf true "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul + +checkout_files "" false "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files "" true "" CRLF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files "" input "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files "" false "auto" $NL CRLF $MIX_CRLF_LF LF_mix_CR LF_nul +checkout_files "" true "auto" CRLF CRLF CRLF LF_mix_CR LF_nul +checkout_files "" input "auto" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files "" false "text" $NL CRLF $MIX_CRLF_LF $MIX_LF_CR $LFNUL +checkout_files "" true "text" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul +checkout_files "" input "text" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files "" false "-text" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files "" true "-text" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files "" input "-text" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files "" false "lf" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files "" true "lf" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files "" input "lf" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files "" false "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul +checkout_files "" true "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul +checkout_files "" input "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul + +checkout_files native false "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files native true "" CRLF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files native false "auto" $NL CRLF $MIX_CRLF_LF LF_mix_CR LF_nul +checkout_files native true "auto" CRLF CRLF CRLF LF_mix_CR LF_nul +checkout_files native false "text" $NL CRLF $MIX_CRLF_LF $MIX_LF_CR $LFNUL +checkout_files native true "text" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul +checkout_files native false "-text" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files native true "-text" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files native false "lf" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files native true "lf" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul +checkout_files native false "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul +checkout_files native true "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul test_done diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh index a90c86b..b044785 100755 --- a/t/t0040-parse-options.sh +++ b/t/t0040-parse-options.sh @@ -172,12 +172,9 @@ test_expect_success 'long options' ' ' test_expect_success 'missing required value' ' - test-parse-options -s; - test $? = 129 && - test-parse-options --string; - test $? = 129 && - test-parse-options --file; - test $? = 129 + test_expect_code 129 test-parse-options -s && + test_expect_code 129 test-parse-options --string && + test_expect_code 129 test-parse-options --file ' cat > expect << EOF @@ -227,8 +224,7 @@ test_expect_success 'unambiguously abbreviated option with "="' ' ' test_expect_success 'ambiguously abbreviated option' ' - test-parse-options --strin 123; - test $? = 129 + test_expect_code 129 test-parse-options --strin 123 ' cat > expect << EOF diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh index 988c392..b29d749 100755 --- a/t/t0050-filesystem.sh +++ b/t/t0050-filesystem.sh @@ -33,16 +33,20 @@ test_expect_success "detection of case insensitive filesystem during repo init" ' else test_expect_success "detection of case insensitive filesystem during repo init" ' - test_must_fail git config --bool core.ignorecase >/dev/null || - test $(git config --bool core.ignorecase) = false + { + test_must_fail git config --bool core.ignorecase >/dev/null || + test $(git config --bool core.ignorecase) = false + } ' fi if test_have_prereq SYMLINKS then test_expect_success "detection of filesystem w/o symlink support during repo init" ' - test_must_fail git config --bool core.symlinks || - test "$(git config --bool core.symlinks)" = true + { + test_must_fail git config --bool core.symlinks || + test "$(git config --bool core.symlinks)" = true + } ' else test_expect_success "detection of filesystem w/o symlink support during repo init" ' diff --git a/t/t0056-git-C.sh b/t/t0056-git-C.sh index 99c0377..2630e75 100755 --- a/t/t0056-git-C.sh +++ b/t/t0056-git-C.sh @@ -14,6 +14,16 @@ test_expect_success '"git -C <path>" runs git from the directory <path>' ' test_cmp expected actual ' +test_expect_success '"git -C <path>" with an empty <path> is a no-op' ' + ( + mkdir -p dir1/subdir && + cd dir1/subdir && + git -C "" rev-parse --show-prefix >actual && + echo subdir/ >expect && + test_cmp expect actual + ) +' + test_expect_success 'Multiple -C options: "-C dir1 -C dir2" is equivalent to "-C dir1/dir2"' ' test_create_repo dir1/dir2 && echo 1 >dir1/dir2/b.txt && diff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh index c0143a0..93605f4 100755 --- a/t/t0060-path-utils.sh +++ b/t/t0060-path-utils.sh @@ -19,6 +19,14 @@ relative_path() { "test \"\$(test-path-utils relative_path '$1' '$2')\" = '$expected'" } +test_git_path() { + test_expect_success "git-path $1 $2 => $3" " + $1 git rev-parse --git-path $2 >actual && + echo $3 >expect && + test_cmp expect actual + " +} + # On Windows, we are using MSYS's bash, which mangles the paths. # Absolute paths are anchored at the MSYS installation directory, # which means that the path / accounts for this many characters: @@ -244,4 +252,32 @@ relative_path "<null>" "<empty>" ./ relative_path "<null>" "<null>" ./ relative_path "<null>" /foo/a/b ./ +test_git_path A=B info/grafts .git/info/grafts +test_git_path GIT_GRAFT_FILE=foo info/grafts foo +test_git_path GIT_GRAFT_FILE=foo info/////grafts foo +test_git_path GIT_INDEX_FILE=foo index foo +test_git_path GIT_INDEX_FILE=foo index/foo .git/index/foo +test_git_path GIT_INDEX_FILE=foo index2 .git/index2 +test_expect_success 'setup fake objects directory foo' 'mkdir foo' +test_git_path GIT_OBJECT_DIRECTORY=foo objects foo +test_git_path GIT_OBJECT_DIRECTORY=foo objects/foo foo/foo +test_git_path GIT_OBJECT_DIRECTORY=foo objects2 .git/objects2 +test_expect_success 'setup common repository' 'git --git-dir=bar init' +test_git_path GIT_COMMON_DIR=bar index .git/index +test_git_path GIT_COMMON_DIR=bar HEAD .git/HEAD +test_git_path GIT_COMMON_DIR=bar logs/HEAD .git/logs/HEAD +test_git_path GIT_COMMON_DIR=bar objects bar/objects +test_git_path GIT_COMMON_DIR=bar objects/bar bar/objects/bar +test_git_path GIT_COMMON_DIR=bar info/exclude bar/info/exclude +test_git_path GIT_COMMON_DIR=bar info/grafts bar/info/grafts +test_git_path GIT_COMMON_DIR=bar info/sparse-checkout .git/info/sparse-checkout +test_git_path GIT_COMMON_DIR=bar remotes/bar bar/remotes/bar +test_git_path GIT_COMMON_DIR=bar branches/bar bar/branches/bar +test_git_path GIT_COMMON_DIR=bar logs/refs/heads/master bar/logs/refs/heads/master +test_git_path GIT_COMMON_DIR=bar refs/heads/master bar/refs/heads/master +test_git_path GIT_COMMON_DIR=bar hooks/me bar/hooks/me +test_git_path GIT_COMMON_DIR=bar config bar/config +test_git_path GIT_COMMON_DIR=bar packed-refs bar/packed-refs +test_git_path GIT_COMMON_DIR=bar shallow bar/shallow + test_done diff --git a/t/t0062-revision-walking.sh b/t/t0062-revision-walking.sh index 3d98eb8..113c728 100755 --- a/t/t0062-revision-walking.sh +++ b/t/t0062-revision-walking.sh @@ -26,7 +26,7 @@ test_expect_success 'setup' ' ' test_expect_success 'revision walking can be done twice' ' - test-revision-walking run-twice > run_twice_actual + test-revision-walking run-twice >run_twice_actual && test_cmp run_twice_expected run_twice_actual ' diff --git a/t/t0201-gettext-fallbacks.sh b/t/t0201-gettext-fallbacks.sh index 5d80a98..90da1c7 100755 --- a/t/t0201-gettext-fallbacks.sh +++ b/t/t0201-gettext-fallbacks.sh @@ -50,17 +50,17 @@ test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate v test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces' ' cmdline="git am" && - export cmdline; + export cmdline && printf "When you have resolved this problem, run git am --resolved." >expect && - eval_gettext "When you have resolved this problem, run \$cmdline --resolved." >actual + eval_gettext "When you have resolved this problem, run \$cmdline --resolved." >actual && test_i18ncmp expect actual ' test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces and quotes' ' cmdline="git am" && - export cmdline; + export cmdline && printf "When you have resolved this problem, run \"git am --resolved\"." >expect && - eval_gettext "When you have resolved this problem, run \"\$cmdline --resolved\"." >actual + eval_gettext "When you have resolved this problem, run \"\$cmdline --resolved\"." >actual && test_i18ncmp expect actual ' diff --git a/t/t0302-credential-store.sh b/t/t0302-credential-store.sh index f61b40c..0979df9 100755 --- a/t/t0302-credential-store.sh +++ b/t/t0302-credential-store.sh @@ -6,4 +6,118 @@ test_description='credential-store tests' helper_test store +test_expect_success 'when xdg file does not exist, xdg file not created' ' + test_path_is_missing "$HOME/.config/git/credentials" && + test -s "$HOME/.git-credentials" +' + +test_expect_success 'setup xdg file' ' + rm -f "$HOME/.git-credentials" && + mkdir -p "$HOME/.config/git" && + >"$HOME/.config/git/credentials" +' + +helper_test store + +test_expect_success 'when xdg file exists, home file not created' ' + test -s "$HOME/.config/git/credentials" && + test_path_is_missing "$HOME/.git-credentials" +' + +test_expect_success 'setup custom xdg file' ' + rm -f "$HOME/.git-credentials" && + rm -f "$HOME/.config/git/credentials" && + mkdir -p "$HOME/xdg/git" && + >"$HOME/xdg/git/credentials" +' + +XDG_CONFIG_HOME="$HOME/xdg" +export XDG_CONFIG_HOME +helper_test store +unset XDG_CONFIG_HOME + +test_expect_success 'if custom xdg file exists, home and xdg files not created' ' + test_when_finished "rm -f $HOME/xdg/git/credentials" && + test -s "$HOME/xdg/git/credentials" && + test_path_is_missing "$HOME/.git-credentials" && + test_path_is_missing "$HOME/.config/git/credentials" +' + +test_expect_success 'get: use home file if both home and xdg files have matches' ' + echo "https://home-user:home-pass@example.com" >"$HOME/.git-credentials" && + mkdir -p "$HOME/.config/git" && + echo "https://xdg-user:xdg-pass@example.com" >"$HOME/.config/git/credentials" && + check fill store <<-\EOF + protocol=https + host=example.com + -- + protocol=https + host=example.com + username=home-user + password=home-pass + -- + EOF +' + +test_expect_success 'get: use xdg file if home file has no matches' ' + >"$HOME/.git-credentials" && + mkdir -p "$HOME/.config/git" && + echo "https://xdg-user:xdg-pass@example.com" >"$HOME/.config/git/credentials" && + check fill store <<-\EOF + protocol=https + host=example.com + -- + protocol=https + host=example.com + username=xdg-user + password=xdg-pass + -- + EOF +' + +test_expect_success POSIXPERM 'get: use xdg file if home file is unreadable' ' + echo "https://home-user:home-pass@example.com" >"$HOME/.git-credentials" && + chmod -r "$HOME/.git-credentials" && + mkdir -p "$HOME/.config/git" && + echo "https://xdg-user:xdg-pass@example.com" >"$HOME/.config/git/credentials" && + check fill store <<-\EOF + protocol=https + host=example.com + -- + protocol=https + host=example.com + username=xdg-user + password=xdg-pass + -- + EOF +' + +test_expect_success 'store: if both xdg and home files exist, only store in home file' ' + >"$HOME/.git-credentials" && + mkdir -p "$HOME/.config/git" && + >"$HOME/.config/git/credentials" && + check approve store <<-\EOF && + protocol=https + host=example.com + username=store-user + password=store-pass + EOF + echo "https://store-user:store-pass@example.com" >expected && + test_cmp expected "$HOME/.git-credentials" && + test_must_be_empty "$HOME/.config/git/credentials" +' + + +test_expect_success 'erase: erase matching credentials from both xdg and home files' ' + echo "https://home-user:home-pass@example.com" >"$HOME/.git-credentials" && + mkdir -p "$HOME/.config/git" && + echo "https://xdg-user:xdg-pass@example.com" >"$HOME/.config/git/credentials" && + check reject store <<-\EOF && + protocol=https + host=example.com + EOF + test_must_be_empty "$HOME/.git-credentials" && + test_must_be_empty "$HOME/.config/git/credentials" +' + test_done diff --git a/t/t1002-read-tree-m-u-2way.sh b/t/t1002-read-tree-m-u-2way.sh index fed877b..e3bf821 100755 --- a/t/t1002-read-tree-m-u-2way.sh +++ b/t/t1002-read-tree-m-u-2way.sh @@ -75,8 +75,8 @@ test_expect_success \ echo yomin >yomin && git update-index --add yomin && read_tree_u_must_succeed -m -u $treeH $treeM && - git ls-files --stage >4.out || return 1 - git diff -U0 --no-index M.out 4.out >4diff.out + git ls-files --stage >4.out && + test_might_fail git diff -U0 --no-index M.out 4.out >4diff.out && compare_change 4diff.out expected && check_cache_at yomin clean && sum bozbar frotz nitfol >actual4.sum && @@ -94,8 +94,8 @@ test_expect_success \ git update-index --add yomin && echo yomin yomin >yomin && read_tree_u_must_succeed -m -u $treeH $treeM && - git ls-files --stage >5.out || return 1 - git diff -U0 --no-index M.out 5.out >5diff.out + git ls-files --stage >5.out && + test_might_fail git diff -U0 --no-index M.out 5.out >5diff.out && compare_change 5diff.out expected && check_cache_at yomin dirty && sum bozbar frotz nitfol >actual5.sum && diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh index a72e700..4f225db 100755 --- a/t/t1006-cat-file.sh +++ b/t/t1006-cat-file.sh @@ -47,6 +47,18 @@ $content" test_cmp expect actual ' + test_expect_success "Type of $type is correct using --allow-unknown-type" ' + echo $type >expect && + git cat-file -t --allow-unknown-type $sha1 >actual && + test_cmp expect actual + ' + + test_expect_success "Size of $type is correct using --allow-unknown-type" ' + echo $size >expect && + git cat-file -s --allow-unknown-type $sha1 >actual && + test_cmp expect actual + ' + test -z "$content" || test_expect_success "Content of $type is correct" ' maybe_remove_timestamp "$content" $no_ts >expect && @@ -274,7 +286,7 @@ test_expect_success 'setup blobs which are likely to delta' ' ' test_expect_success 'confirm that neither loose blob is a delta' ' - cat >expect <<-EOF + cat >expect <<-EOF && $_z40 $_z40 EOF @@ -296,4 +308,37 @@ test_expect_success '%(deltabase) reports packed delta bases' ' } ' +bogus_type="bogus" +bogus_content="bogus" +bogus_size=$(strlen "$bogus_content") +bogus_sha1=$(echo_without_newline "$bogus_content" | git hash-object -t $bogus_type --literally -w --stdin) + +test_expect_success "Type of broken object is correct" ' + echo $bogus_type >expect && + git cat-file -t --allow-unknown-type $bogus_sha1 >actual && + test_cmp expect actual +' + +test_expect_success "Size of broken object is correct" ' + echo $bogus_size >expect && + git cat-file -s --allow-unknown-type $bogus_sha1 >actual && + test_cmp expect actual +' +bogus_type="abcdefghijklmnopqrstuvwxyz1234679" +bogus_content="bogus" +bogus_size=$(strlen "$bogus_content") +bogus_sha1=$(echo_without_newline "$bogus_content" | git hash-object -t $bogus_type --literally -w --stdin) + +test_expect_success "Type of broken object is correct when type is large" ' + echo $bogus_type >expect && + git cat-file -t --allow-unknown-type $bogus_sha1 >actual && + test_cmp expect actual +' + +test_expect_success "Size of large broken object is correct when type is large" ' + echo $bogus_size >expect && + git cat-file -s --allow-unknown-type $bogus_sha1 >actual && + test_cmp expect actual +' + test_done diff --git a/t/t1007-hash-object.sh b/t/t1007-hash-object.sh index f83df8e..7d2baa1 100755 --- a/t/t1007-hash-object.sh +++ b/t/t1007-hash-object.sh @@ -201,4 +201,23 @@ test_expect_success 'corrupt tag' ' test_must_fail git hash-object -t tag --stdin </dev/null ' +test_expect_success 'hash-object complains about bogus type name' ' + test_must_fail git hash-object -t bogus --stdin </dev/null +' + +test_expect_success 'hash-object complains about truncated type name' ' + test_must_fail git hash-object -t bl --stdin </dev/null +' + +test_expect_success '--literally' ' + t=1234567890 && + echo example | git hash-object -t $t --literally --stdin +' + +test_expect_success '--literally with extra-long type' ' + t=12345678901234567890123456789012345678901234567890 && + t="$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t" && + echo example | git hash-object -t $t --literally --stdin +' + test_done diff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh index 2edb4f2..8e22b03 100755 --- a/t/t1020-subdirectory.sh +++ b/t/t1020-subdirectory.sh @@ -162,16 +162,20 @@ test_expect_success 'no file/rev ambiguity check inside .git' ' ) ' -test_expect_success 'no file/rev ambiguity check inside a bare repo' ' +test_expect_success 'no file/rev ambiguity check inside a bare repo (explicit GIT_DIR)' ' + test_when_finished "rm -fr foo.git" && git clone -s --bare .git foo.git && ( cd foo.git && + # older Git needed help by exporting GIT_DIR=. + # to realize that it is inside a bare repository. + # We keep this test around for regression testing. GIT_DIR=. git show -s HEAD ) ' -# This still does not work as it should... -: test_expect_success 'no file/rev ambiguity check inside a bare repo' ' +test_expect_success 'no file/rev ambiguity check inside a bare repo' ' + test_when_finished "rm -fr foo.git" && git clone -s --bare .git foo.git && ( cd foo.git && @@ -180,7 +184,6 @@ test_expect_success 'no file/rev ambiguity check inside a bare repo' ' ' test_expect_success SYMLINKS 'detection should not be fooled by a symlink' ' - rm -fr foo.git && git clone -s .git another && ln -s another yetanother && ( diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh index 938fc8b..66dd286 100755 --- a/t/t1300-repo-config.sh +++ b/t/t1300-repo-config.sh @@ -677,7 +677,7 @@ test_expect_success 'invalid unit' ' echo 1auto >expect && git config aninvalid.unit >actual && test_cmp expect actual && - cat >expect <<-\EOF + cat >expect <<-\EOF && fatal: bad numeric config value '\''1auto'\'' for '\''aninvalid.unit'\'' in .git/config: invalid unit EOF test_must_fail git config --int --get aninvalid.unit 2>actual && @@ -1165,7 +1165,7 @@ test_expect_failure 'adding a key into an empty section reuses header' ' Qkey = value EOF - git config section.key value + git config section.key value && test_cmp expect .git/config ' diff --git a/t/t1301-shared-repo.sh b/t/t1301-shared-repo.sh index 7eecfb8..ac10875 100755 --- a/t/t1301-shared-repo.sh +++ b/t/t1301-shared-repo.sh @@ -12,12 +12,11 @@ setfacl -k . 2>/dev/null # User must have read permissions to the repo -> failure on --shared=0400 test_expect_success 'shared = 0400 (faulty permission u-w)' ' + test_when_finished "rm -rf sub" && mkdir sub && ( - cd sub && git init --shared=0400 + cd sub && + test_must_fail git init --shared=0400 ) - ret="$?" - rm -rf sub - test $ret != "0" ' modebits () { @@ -33,7 +32,7 @@ do git init --shared=1 && test 1 = "$(git config core.sharedrepository)" ) && - actual=$(ls -l sub/.git/HEAD) + actual=$(ls -l sub/.git/HEAD) && case "$actual" in -rw-rw-r--*) : happy @@ -90,10 +89,8 @@ do rm -f .git/info/refs && git update-server-info && actual="$(modebits .git/info/refs)" && - test "x$actual" = "x-$y" || { - ls -lt .git/info - false - } + verbose test "x$actual" = "x-$y" + ' umask 077 && @@ -102,10 +99,7 @@ do rm -f .git/info/refs && git update-server-info && actual="$(modebits .git/info/refs)" && - test "x$actual" = "x-$x" || { - ls -lt .git/info - false - } + verbose test "x$actual" = "x-$x" ' diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh index 6805b9e..ba89f4c 100755 --- a/t/t1400-update-ref.sh +++ b/t/t1400-update-ref.sh @@ -519,7 +519,7 @@ test_expect_success 'stdin create ref works with path with space to blob' ' test_expect_success 'stdin update ref fails with wrong old value' ' echo "update $c $m $m~1" >stdin && test_must_fail git update-ref --stdin <stdin 2>err && - grep "fatal: Cannot lock the ref '"'"'$c'"'"'" err && + grep "fatal: Cannot lock ref '"'"'$c'"'"'" err && test_must_fail git rev-parse --verify -q $c ' @@ -555,7 +555,7 @@ test_expect_success 'stdin update ref works with right old value' ' test_expect_success 'stdin delete ref fails with wrong old value' ' echo "delete $a $m~1" >stdin && test_must_fail git update-ref --stdin <stdin 2>err && - grep "fatal: Cannot lock the ref '"'"'$a'"'"'" err && + grep "fatal: Cannot lock ref '"'"'$a'"'"'" err && git rev-parse $m >expect && git rev-parse $a >actual && test_cmp expect actual @@ -688,7 +688,7 @@ test_expect_success 'stdin update refs fails with wrong old value' ' update $c '' EOF test_must_fail git update-ref --stdin <stdin 2>err && - grep "fatal: Cannot lock the ref '"'"'$c'"'"'" err && + grep "fatal: Cannot lock ref '"'"'$c'"'"'" err && git rev-parse $m >expect && git rev-parse $a >actual && test_cmp expect actual && @@ -883,7 +883,7 @@ test_expect_success 'stdin -z create ref works with path with space to blob' ' test_expect_success 'stdin -z update ref fails with wrong old value' ' printf $F "update $c" "$m" "$m~1" >stdin && test_must_fail git update-ref -z --stdin <stdin 2>err && - grep "fatal: Cannot lock the ref '"'"'$c'"'"'" err && + grep "fatal: Cannot lock ref '"'"'$c'"'"'" err && test_must_fail git rev-parse --verify -q $c ' @@ -899,7 +899,7 @@ test_expect_success 'stdin -z create ref fails when ref exists' ' git rev-parse "$c" >expect && printf $F "create $c" "$m~1" >stdin && test_must_fail git update-ref -z --stdin <stdin 2>err && - grep "fatal: Cannot lock the ref '"'"'$c'"'"'" err && + grep "fatal: Cannot lock ref '"'"'$c'"'"'" err && git rev-parse "$c" >actual && test_cmp expect actual ' @@ -930,7 +930,7 @@ test_expect_success 'stdin -z update ref works with right old value' ' test_expect_success 'stdin -z delete ref fails with wrong old value' ' printf $F "delete $a" "$m~1" >stdin && test_must_fail git update-ref -z --stdin <stdin 2>err && - grep "fatal: Cannot lock the ref '"'"'$a'"'"'" err && + grep "fatal: Cannot lock ref '"'"'$a'"'"'" err && git rev-parse $m >expect && git rev-parse $a >actual && test_cmp expect actual @@ -1045,7 +1045,7 @@ test_expect_success 'stdin -z update refs fails with wrong old value' ' git update-ref $c $m && printf $F "update $a" "$m" "$m" "update $b" "$m" "$m" "update $c" "$m" "$Z" >stdin && test_must_fail git update-ref -z --stdin <stdin 2>err && - grep "fatal: Cannot lock the ref '"'"'$c'"'"'" err && + grep "fatal: Cannot lock ref '"'"'$c'"'"'" err && git rev-parse $m >expect && git rev-parse $a >actual && test_cmp expect actual && @@ -1065,4 +1065,32 @@ test_expect_success 'stdin -z delete refs works with packed and loose refs' ' test_must_fail git rev-parse --verify -q $c ' +run_with_limited_open_files () { + (ulimit -n 32 && "$@") +} + +test_lazy_prereq ULIMIT_FILE_DESCRIPTORS 'run_with_limited_open_files true' + +test_expect_success ULIMIT_FILE_DESCRIPTORS 'large transaction creating branches does not burst open file limit' ' +( + for i in $(test_seq 33) + do + echo "create refs/heads/$i HEAD" + done >large_input && + run_with_limited_open_files git update-ref --stdin <large_input && + git rev-parse --verify -q refs/heads/33 +) +' + +test_expect_success ULIMIT_FILE_DESCRIPTORS 'large transaction deleting branches does not burst open file limit' ' +( + for i in $(test_seq 33) + do + echo "delete refs/heads/$i HEAD" + done >large_input && + run_with_limited_open_files git update-ref --stdin <large_input && + test_must_fail git rev-parse --verify -q refs/heads/33 +) +' + test_done diff --git a/t/t1403-show-ref.sh b/t/t1403-show-ref.sh index 3e500ed..7e10bcf 100755 --- a/t/t1403-show-ref.sh +++ b/t/t1403-show-ref.sh @@ -28,7 +28,7 @@ test_expect_success 'show-ref' ' >expect && - test_must_fail git show-ref D >actual + test_must_fail git show-ref D >actual && test_cmp expect actual ' @@ -62,7 +62,7 @@ test_expect_success 'show-ref --verify' ' test_must_fail git show-ref --verify tags/A >actual && test_cmp expect actual && - test_must_fail git show-ref --verify D >actual + test_must_fail git show-ref --verify D >actual && test_cmp expect actual ' @@ -78,7 +78,7 @@ test_expect_success 'show-ref --verify -q' ' test_must_fail git show-ref --verify -q tags/A >actual && test_cmp expect actual && - test_must_fail git show-ref --verify -q D >actual + test_must_fail git show-ref --verify -q D >actual && test_cmp expect actual ' @@ -105,10 +105,10 @@ test_expect_success 'show-ref -d' ' test_cmp expect actual && git show-ref -d refs/heads/master >actual && - test_cmp expect actual + test_cmp expect actual && git show-ref -d --verify refs/heads/master >actual && - test_cmp expect actual + test_cmp expect actual && >expect && diff --git a/t/t1404-update-ref-df-conflicts.sh b/t/t1404-update-ref-df-conflicts.sh new file mode 100755 index 0000000..66bafb5 --- /dev/null +++ b/t/t1404-update-ref-df-conflicts.sh @@ -0,0 +1,107 @@ +#!/bin/sh + +test_description='Test git update-ref with D/F conflicts' +. ./test-lib.sh + +test_update_rejected () { + prefix="$1" && + before="$2" && + pack="$3" && + create="$4" && + error="$5" && + printf "create $prefix/%s $C\n" $before | + git update-ref --stdin && + git for-each-ref $prefix >unchanged && + if $pack + then + git pack-refs --all + fi && + printf "create $prefix/%s $C\n" $create >input && + test_must_fail git update-ref --stdin <input 2>output.err && + grep -F "$error" output.err && + git for-each-ref $prefix >actual && + test_cmp unchanged actual +} + +Q="'" + +test_expect_success 'setup' ' + + git commit --allow-empty -m Initial && + C=$(git rev-parse HEAD) + +' + +test_expect_success 'existing loose ref is a simple prefix of new' ' + + prefix=refs/1l && + test_update_rejected $prefix "a c e" false "b c/x d" \ + "$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x$Q" + +' + +test_expect_success 'existing packed ref is a simple prefix of new' ' + + prefix=refs/1p && + test_update_rejected $prefix "a c e" true "b c/x d" \ + "$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x$Q" + +' + +test_expect_success 'existing loose ref is a deeper prefix of new' ' + + prefix=refs/2l && + test_update_rejected $prefix "a c e" false "b c/x/y d" \ + "$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x/y$Q" + +' + +test_expect_success 'existing packed ref is a deeper prefix of new' ' + + prefix=refs/2p && + test_update_rejected $prefix "a c e" true "b c/x/y d" \ + "$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x/y$Q" + +' + +test_expect_success 'new ref is a simple prefix of existing loose' ' + + prefix=refs/3l && + test_update_rejected $prefix "a c/x e" false "b c d" \ + "$Q$prefix/c/x$Q exists; cannot create $Q$prefix/c$Q" + +' + +test_expect_success 'new ref is a simple prefix of existing packed' ' + + prefix=refs/3p && + test_update_rejected $prefix "a c/x e" true "b c d" \ + "$Q$prefix/c/x$Q exists; cannot create $Q$prefix/c$Q" + +' + +test_expect_success 'new ref is a deeper prefix of existing loose' ' + + prefix=refs/4l && + test_update_rejected $prefix "a c/x/y e" false "b c d" \ + "$Q$prefix/c/x/y$Q exists; cannot create $Q$prefix/c$Q" + +' + +test_expect_success 'new ref is a deeper prefix of existing packed' ' + + prefix=refs/4p && + test_update_rejected $prefix "a c/x/y e" true "b c d" \ + "$Q$prefix/c/x/y$Q exists; cannot create $Q$prefix/c$Q" + +' + +test_expect_success 'one new ref is a simple prefix of another' ' + + prefix=refs/5 && + test_update_rejected $prefix "a e" false "b c c/x d" \ + "cannot process $Q$prefix/c$Q and $Q$prefix/c/x$Q at the same time" + +' + +test_done diff --git a/t/t1430-bad-ref-name.sh b/t/t1430-bad-ref-name.sh index 468e856..16d0b8b 100755 --- a/t/t1430-bad-ref-name.sh +++ b/t/t1430-bad-ref-name.sh @@ -68,6 +68,14 @@ test_expect_success 'branch -D cannot delete non-ref in .git dir' ' test_cmp expect .git/my-private-file ' +test_expect_success 'branch -D cannot delete ref in .git dir' ' + git rev-parse HEAD >.git/my-private-file && + git rev-parse HEAD >expect && + git branch foo/legit && + test_must_fail git branch -D foo////./././../../../my-private-file && + test_cmp expect .git/my-private-file +' + test_expect_success 'branch -D cannot delete absolute path' ' git branch -f extra && test_must_fail git branch -D "$(pwd)/.git/refs/heads/extra" && diff --git a/t/t1501-worktree.sh b/t/t1501-worktree.sh index 8f36aa9..cc5b870 100755 --- a/t/t1501-worktree.sh +++ b/t/t1501-worktree.sh @@ -346,4 +346,81 @@ test_expect_success 'relative $GIT_WORK_TREE and git subprocesses' ' test_cmp expected actual ' +test_expect_success 'Multi-worktree setup' ' + mkdir work && + mkdir -p repo.git/repos/foo && + cp repo.git/HEAD repo.git/index repo.git/repos/foo && + test_might_fail cp repo.git/sharedindex.* repo.git/repos/foo && + sane_unset GIT_DIR GIT_CONFIG GIT_WORK_TREE +' + +test_expect_success 'GIT_DIR set (1)' ' + echo "gitdir: repo.git/repos/foo" >gitfile && + echo ../.. >repo.git/repos/foo/commondir && + ( + cd work && + GIT_DIR=../gitfile git rev-parse --git-common-dir >actual && + test-path-utils real_path "$TRASH_DIRECTORY/repo.git" >expect && + test_cmp expect actual + ) +' + +test_expect_success 'GIT_DIR set (2)' ' + echo "gitdir: repo.git/repos/foo" >gitfile && + echo "$(pwd)/repo.git" >repo.git/repos/foo/commondir && + ( + cd work && + GIT_DIR=../gitfile git rev-parse --git-common-dir >actual && + test-path-utils real_path "$TRASH_DIRECTORY/repo.git" >expect && + test_cmp expect actual + ) +' + +test_expect_success 'Auto discovery' ' + echo "gitdir: repo.git/repos/foo" >.git && + echo ../.. >repo.git/repos/foo/commondir && + ( + cd work && + git rev-parse --git-common-dir >actual && + test-path-utils real_path "$TRASH_DIRECTORY/repo.git" >expect && + test_cmp expect actual && + echo haha >data1 && + git add data1 && + git ls-files --full-name :/ | grep data1 >actual && + echo work/data1 >expect && + test_cmp expect actual + ) +' + +test_expect_success '$GIT_DIR/common overrides core.worktree' ' + mkdir elsewhere && + git --git-dir=repo.git config core.worktree "$TRASH_DIRECTORY/elsewhere" && + echo "gitdir: repo.git/repos/foo" >.git && + echo ../.. >repo.git/repos/foo/commondir && + ( + cd work && + git rev-parse --git-common-dir >actual && + test-path-utils real_path "$TRASH_DIRECTORY/repo.git" >expect && + test_cmp expect actual && + echo haha >data2 && + git add data2 && + git ls-files --full-name :/ | grep data2 >actual && + echo work/data2 >expect && + test_cmp expect actual + ) +' + +test_expect_success '$GIT_WORK_TREE overrides $GIT_DIR/common' ' + echo "gitdir: repo.git/repos/foo" >.git && + echo ../.. >repo.git/repos/foo/commondir && + ( + cd work && + echo haha >data3 && + git --git-dir=../.git --work-tree=. add data3 && + git ls-files --full-name -- :/ | grep data3 >actual && + echo data3 >expect && + test_cmp expect actual + ) +' + test_done diff --git a/t/t1509/prepare-chroot.sh b/t/t1509/prepare-chroot.sh index 6269117..6d47e2c 100755 --- a/t/t1509/prepare-chroot.sh +++ b/t/t1509/prepare-chroot.sh @@ -14,25 +14,45 @@ xmkdir() { R="$1" +[ "$(id -u)" -eq 0 ] && die "This script should not be run as root, what if it does rm -rf /?" [ -n "$R" ] || die "usage: prepare-chroot.sh <root>" [ -x git ] || die "This script needs to be executed at git source code's top directory" -[ -x /bin/busybox ] || die "You need busybox" +if [ -x /bin/busybox ]; then + BB=/bin/busybox +elif [ -x /usr/bin/busybox ]; then + BB=/usr/bin/busybox +else + die "You need busybox" +fi xmkdir "$R" "$R/bin" "$R/etc" "$R/lib" "$R/dev" -[ -c "$R/dev/null" ] || die "/dev/null is missing. Do mknod $R/dev/null c 1 3 && chmod 666 $R/dev/null" +touch "$R/dev/null" echo "root:x:0:0:root:/:/bin/sh" > "$R/etc/passwd" echo "$(id -nu):x:$(id -u):$(id -g)::$(pwd)/t:/bin/sh" >> "$R/etc/passwd" echo "root::0:root" > "$R/etc/group" echo "$(id -ng)::$(id -g):$(id -nu)" >> "$R/etc/group" -[ -x "$R/bin/busybox" ] || cp /bin/busybox "$R/bin/busybox" -[ -x "$R/bin/sh" ] || ln -s /bin/busybox "$R/bin/sh" -[ -x "$R/bin/su" ] || ln -s /bin/busybox "$R/bin/su" +[ -x "$R$BB" ] || cp $BB "$R/bin/busybox" +for cmd in sh su ls expr tr basename rm mkdir mv id uname dirname cat true sed diff; do + ln -f -s /bin/busybox "$R/bin/$cmd" +done mkdir -p "$R$(pwd)" rsync --exclude-from t/t1509/excludes -Ha . "$R$(pwd)" -ldd git | grep '/' | sed 's,.*\s\(/[^ ]*\).*,\1,' | while read i; do - mkdir -p "$R$(dirname $i)" - cp "$i" "$R/$i" +# Fake perl to reduce dependency, t1509 does not use perl, but some +# env might slip through, see test-lib.sh, unset.*PERL_PATH +sed 's|^PERL_PATH=.*|PERL_PATH=/bin/true|' GIT-BUILD-OPTIONS > "$R$(pwd)/GIT-BUILD-OPTIONS" +for cmd in git $BB;do + ldd $cmd | grep '/' | sed 's,.*\s\(/[^ ]*\).*,\1,' | while read i; do + mkdir -p "$R$(dirname $i)" + cp "$i" "$R/$i" + done done -echo "Execute this in root: 'chroot $R /bin/su - $(id -nu)'" +cat <<EOF +All is set up in $R, execute t1509 with the following commands: + +sudo chroot $R /bin/su - $(id -nu) +IKNOWWHATIAMDOING=YES ./t1509-root-worktree.sh -v -i + +When you are done, simply delete $R to clean up +EOF diff --git a/t/t1510-repo-setup.sh b/t/t1510-repo-setup.sh index e1b2a99..33c1a58 100755 --- a/t/t1510-repo-setup.sh +++ b/t/t1510-repo-setup.sh @@ -106,6 +106,7 @@ setup_env () { expect () { cat >"$1/expected" <<-EOF setup: git_dir: $2 + setup: git_common_dir: $2 setup: worktree: $3 setup: cwd: $4 setup: prefix: $5 diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh index 94fb473..193d55c 100755 --- a/t/t1700-split-index.sh +++ b/t/t1700-split-index.sh @@ -10,9 +10,18 @@ sane_unset GIT_TEST_SPLIT_INDEX test_expect_success 'enable split index' ' git update-index --split-index && test-dump-split-index .git/index >actual && + indexversion=$(test-index-version <.git/index) && + if test "$indexversion" = "4" + then + own=432ef4b63f32193984f339431fd50ca796493569 + base=508851a7f0dfa8691e9f69c7f055865389012491 + else + own=8299b0bcd1ac364e5f1d7768efb62fa2da79a339 + base=39d890139ee5356c7ef572216cebcd27aa41f9df + fi && cat >expect <<EOF && -own 8299b0bcd1ac364e5f1d7768efb62fa2da79a339 -base 39d890139ee5356c7ef572216cebcd27aa41f9df +own $own +base $base replacements: deletions: EOF @@ -30,7 +39,7 @@ EOF test-dump-split-index .git/index | sed "/^own/d" >actual && cat >expect <<EOF && -base 39d890139ee5356c7ef572216cebcd27aa41f9df +base $base 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 one replacements: deletions: @@ -182,7 +191,7 @@ test_expect_success 'unify index, two files remain' ' 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 one 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 two EOF - test_cmp ls-files.expect ls-files.actual + test_cmp ls-files.expect ls-files.actual && test-dump-split-index .git/index | sed "/^own/d" >actual && cat >expect <<EOF && diff --git a/t/t2025-checkout-to.sh b/t/t2025-checkout-to.sh new file mode 100755 index 0000000..f8e4df4 --- /dev/null +++ b/t/t2025-checkout-to.sh @@ -0,0 +1,129 @@ +#!/bin/sh + +test_description='test git checkout --to' + +. ./test-lib.sh + +test_expect_success 'setup' ' + test_commit init +' + +test_expect_success 'checkout --to not updating paths' ' + test_must_fail git checkout --to -- init.t +' + +test_expect_success 'checkout --to an existing worktree' ' + mkdir -p existing/subtree && + test_must_fail git checkout --detach --to existing master +' + +test_expect_success 'checkout --to an existing empty worktree' ' + mkdir existing_empty && + git checkout --detach --to existing_empty master +' + +test_expect_success 'checkout --to refuses to checkout locked branch' ' + test_must_fail git checkout --to zere master && + ! test -d zere && + ! test -d .git/worktrees/zere +' + +test_expect_success 'checkout --to a new worktree' ' + git rev-parse HEAD >expect && + git checkout --detach --to here master && + ( + cd here && + test_cmp ../init.t init.t && + test_must_fail git symbolic-ref HEAD && + git rev-parse HEAD >actual && + test_cmp ../expect actual && + git fsck + ) +' + +test_expect_success 'checkout --to a new worktree from a subdir' ' + ( + mkdir sub && + cd sub && + git checkout --detach --to here master && + cd here && + test_cmp ../../init.t init.t + ) +' + +test_expect_success 'checkout --to from a linked checkout' ' + ( + cd here && + git checkout --detach --to nested-here master && + cd nested-here && + git fsck + ) +' + +test_expect_success 'checkout --to a new worktree creating new branch' ' + git checkout --to there -b newmaster master && + ( + cd there && + test_cmp ../init.t init.t && + git symbolic-ref HEAD >actual && + echo refs/heads/newmaster >expect && + test_cmp expect actual && + git fsck + ) +' + +test_expect_success 'die the same branch is already checked out' ' + ( + cd here && + test_must_fail git checkout newmaster + ) +' + +test_expect_success 'not die the same branch is already checked out' ' + ( + cd here && + git checkout --ignore-other-worktrees --to anothernewmaster newmaster + ) +' + +test_expect_success 'not die on re-checking out current branch' ' + ( + cd there && + git checkout newmaster + ) +' + +test_expect_success 'checkout --to from a bare repo' ' + ( + git clone --bare . bare && + cd bare && + git checkout --to ../there2 -b bare-master master + ) +' + +test_expect_success 'checkout from a bare repo without --to' ' + ( + cd bare && + test_must_fail git checkout master + ) +' + +test_expect_success 'checkout with grafts' ' + test_when_finished rm .git/info/grafts && + test_commit abc && + SHA1=`git rev-parse HEAD` && + test_commit def && + test_commit xyz && + echo "`git rev-parse HEAD` $SHA1" >.git/info/grafts && + cat >expected <<-\EOF && + xyz + abc + EOF + git log --format=%s -2 >actual && + test_cmp expected actual && + git checkout --detach --to grafted master && + git --git-dir=grafted/.git log --format=%s -2 >actual && + test_cmp expected actual +' + +test_done diff --git a/t/t2026-prune-linked-checkouts.sh b/t/t2026-prune-linked-checkouts.sh new file mode 100755 index 0000000..1821a48 --- /dev/null +++ b/t/t2026-prune-linked-checkouts.sh @@ -0,0 +1,96 @@ +#!/bin/sh + +test_description='prune $GIT_DIR/worktrees' + +. ./test-lib.sh + +test_expect_success initialize ' + git commit --allow-empty -m init +' + +test_expect_success 'prune --worktrees on normal repo' ' + git prune --worktrees && + test_must_fail git prune --worktrees abc +' + +test_expect_success 'prune files inside $GIT_DIR/worktrees' ' + mkdir .git/worktrees && + : >.git/worktrees/abc && + git prune --worktrees --verbose >actual && + cat >expect <<EOF && +Removing worktrees/abc: not a valid directory +EOF + test_i18ncmp expect actual && + ! test -f .git/worktrees/abc && + ! test -d .git/worktrees +' + +test_expect_success 'prune directories without gitdir' ' + mkdir -p .git/worktrees/def/abc && + : >.git/worktrees/def/def && + cat >expect <<EOF && +Removing worktrees/def: gitdir file does not exist +EOF + git prune --worktrees --verbose >actual && + test_i18ncmp expect actual && + ! test -d .git/worktrees/def && + ! test -d .git/worktrees +' + +test_expect_success SANITY 'prune directories with unreadable gitdir' ' + mkdir -p .git/worktrees/def/abc && + : >.git/worktrees/def/def && + : >.git/worktrees/def/gitdir && + chmod u-r .git/worktrees/def/gitdir && + git prune --worktrees --verbose >actual && + test_i18ngrep "Removing worktrees/def: unable to read gitdir file" actual && + ! test -d .git/worktrees/def && + ! test -d .git/worktrees +' + +test_expect_success 'prune directories with invalid gitdir' ' + mkdir -p .git/worktrees/def/abc && + : >.git/worktrees/def/def && + : >.git/worktrees/def/gitdir && + git prune --worktrees --verbose >actual && + test_i18ngrep "Removing worktrees/def: invalid gitdir file" actual && + ! test -d .git/worktrees/def && + ! test -d .git/worktrees +' + +test_expect_success 'prune directories with gitdir pointing to nowhere' ' + mkdir -p .git/worktrees/def/abc && + : >.git/worktrees/def/def && + echo "$(pwd)"/nowhere >.git/worktrees/def/gitdir && + git prune --worktrees --verbose >actual && + test_i18ngrep "Removing worktrees/def: gitdir file points to non-existent location" actual && + ! test -d .git/worktrees/def && + ! test -d .git/worktrees +' + +test_expect_success 'not prune locked checkout' ' + test_when_finished rm -r .git/worktrees && + mkdir -p .git/worktrees/ghi && + : >.git/worktrees/ghi/locked && + git prune --worktrees && + test -d .git/worktrees/ghi +' + +test_expect_success 'not prune recent checkouts' ' + test_when_finished rm -r .git/worktrees && + mkdir zz && + mkdir -p .git/worktrees/jlm && + echo "$(pwd)"/zz >.git/worktrees/jlm/gitdir && + rmdir zz && + git prune --worktrees --verbose --expire=2.days.ago && + test -d .git/worktrees/jlm +' + +test_expect_success 'not prune proper checkouts' ' + test_when_finished rm -r .git/worktrees && + git checkout "--to=$PWD/nop" --detach master && + git prune --worktrees && + test -d .git/worktrees/nop +' + +test_done diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh index 2a4a749..7c641bf 100755 --- a/t/t2203-add-intent.sh +++ b/t/t2203-add-intent.sh @@ -5,10 +5,24 @@ test_description='Intent to add' . ./test-lib.sh test_expect_success 'intent to add' ' + test_commit 1 && + git rm 1.t && + echo hello >1.t && echo hello >file && echo hello >elif && git add -N file && - git add elif + git add elif && + git add -N 1.t +' + +test_expect_success 'git status' ' + git status --porcelain | grep -v actual >actual && + cat >expect <<-\EOF && + DA 1.t + A elif + A file + EOF + test_cmp expect actual ' test_expect_success 'check result of "add -N"' ' @@ -43,7 +57,8 @@ test_expect_success 'i-t-a entry is simply ignored' ' git add -N nitfol && git commit -m second && test $(git ls-tree HEAD -- nitfol | wc -l) = 0 && - test $(git diff --name-only HEAD -- nitfol | wc -l) = 1 + test $(git diff --name-only HEAD -- nitfol | wc -l) = 0 && + test $(git diff --name-only -- nitfol | wc -l) = 1 ' test_expect_success 'can commit with an unrelated i-t-a entry in index' ' @@ -72,13 +87,13 @@ test_expect_success 'cache-tree invalidates i-t-a paths' ' : >dir/bar && git add -N dir/bar && git diff --cached --name-only >actual && - echo dir/bar >expect && + >expect && test_cmp expect actual && git write-tree >/dev/null && git diff --cached --name-only >actual && - echo dir/bar >expect && + >expect && test_cmp expect actual ' diff --git a/t/t3001-ls-files-others-exclude.sh b/t/t3001-ls-files-others-exclude.sh index b2798fe..3fc484e 100755 --- a/t/t3001-ls-files-others-exclude.sh +++ b/t/t3001-ls-files-others-exclude.sh @@ -294,7 +294,7 @@ one/a.1 one/two/a.1 three/a.1 EOF - git ls-files -o -i --exclude "**/a.1" >actual + git ls-files -o -i --exclude "**/a.1" >actual && test_cmp expect actual ' diff --git a/t/t3010-ls-files-killed-modified.sh b/t/t3010-ls-files-killed-modified.sh index 6d3b828..580e158 100755 --- a/t/t3010-ls-files-killed-modified.sh +++ b/t/t3010-ls-files-killed-modified.sh @@ -55,14 +55,11 @@ test_expect_success 'git update-index --add to add various paths.' ' : >path9 && date >path10 && git update-index --add -- path0 path?/file? pathx/ju path7 path8 path9 path10 && - for i in 1 2 - do - git init submod$i && - ( - cd submod$i && git commit --allow-empty -m "empty $i" - ) || break - done && - git update-index --add submod[12] + git init submod1 && + git -C submod1 commit --allow-empty -m "empty 1" && + git init submod2 && + git -C submod2 commit --allow-empty -m "empty 2" && + git update-index --add submod[12] && ( cd submod1 && git commit --allow-empty -m "empty 1 (updated)" @@ -99,12 +96,12 @@ test_expect_success 'git ls-files -k to show killed files.' ' ' test_expect_success 'git ls-files -k output (w/o icase)' ' - git ls-files -k >.output + git ls-files -k >.output && test_cmp .expected .output ' test_expect_success 'git ls-files -k output (w/ icase)' ' - git -c core.ignorecase=true ls-files -k >.output + git -c core.ignorecase=true ls-files -k >.output && test_cmp .expected .output ' diff --git a/t/t3031-merge-criscross.sh b/t/t3031-merge-criscross.sh index 7f41607..e59b0a3 100755 --- a/t/t3031-merge-criscross.sh +++ b/t/t3031-merge-criscross.sh @@ -32,7 +32,7 @@ test_expect_success 'setup repo with criss-cross history' ' do echo $n > data/$n && n=$(($n+1)) || - break + return 1 done && # check them in diff --git a/t/t3033-merge-toplevel.sh b/t/t3033-merge-toplevel.sh new file mode 100755 index 0000000..46aadc4 --- /dev/null +++ b/t/t3033-merge-toplevel.sh @@ -0,0 +1,136 @@ +#!/bin/sh + +test_description='"git merge" top-level frontend' + +. ./test-lib.sh + +t3033_reset () { + git checkout -B master two && + git branch -f left three && + git branch -f right four +} + +test_expect_success setup ' + test_commit one && + git branch left && + git branch right && + test_commit two && + git checkout left && + test_commit three && + git checkout right && + test_commit four && + git checkout master +' + +# Local branches + +test_expect_success 'merge an octopus into void' ' + t3033_reset && + git checkout --orphan test && + git rm -fr . && + test_must_fail git merge left right && + test_must_fail git rev-parse --verify HEAD && + git diff --quiet && + test_must_fail git rev-parse HEAD +' + +test_expect_success 'merge an octopus, fast-forward (ff)' ' + t3033_reset && + git reset --hard one && + git merge left right && + # one is ancestor of three (left) and four (right) + test_must_fail git rev-parse --verify HEAD^3 && + git rev-parse HEAD^1 HEAD^2 | sort >actual && + git rev-parse three four | sort >expect && + test_cmp expect actual +' + +test_expect_success 'merge octopus, non-fast-forward (ff)' ' + t3033_reset && + git reset --hard one && + git merge --no-ff left right && + # one is ancestor of three (left) and four (right) + test_must_fail git rev-parse --verify HEAD^4 && + git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual && + git rev-parse one three four | sort >expect && + test_cmp expect actual +' + +test_expect_success 'merge octopus, fast-forward (does not ff)' ' + t3033_reset && + git merge left right && + # two (master) is not an ancestor of three (left) and four (right) + test_must_fail git rev-parse --verify HEAD^4 && + git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual && + git rev-parse two three four | sort >expect && + test_cmp expect actual +' + +test_expect_success 'merge octopus, non-fast-forward' ' + t3033_reset && + git merge --no-ff left right && + test_must_fail git rev-parse --verify HEAD^4 && + git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual && + git rev-parse two three four | sort >expect && + test_cmp expect actual +' + +# The same set with FETCH_HEAD + +test_expect_success 'merge FETCH_HEAD octopus into void' ' + t3033_reset && + git checkout --orphan test && + git rm -fr . && + git fetch . left right && + test_must_fail git merge FETCH_HEAD && + test_must_fail git rev-parse --verify HEAD && + git diff --quiet && + test_must_fail git rev-parse HEAD +' + +test_expect_success 'merge FETCH_HEAD octopus fast-forward (ff)' ' + t3033_reset && + git reset --hard one && + git fetch . left right && + git merge FETCH_HEAD && + # one is ancestor of three (left) and four (right) + test_must_fail git rev-parse --verify HEAD^3 && + git rev-parse HEAD^1 HEAD^2 | sort >actual && + git rev-parse three four | sort >expect && + test_cmp expect actual +' + +test_expect_success 'merge FETCH_HEAD octopus non-fast-forward (ff)' ' + t3033_reset && + git reset --hard one && + git fetch . left right && + git merge --no-ff FETCH_HEAD && + # one is ancestor of three (left) and four (right) + test_must_fail git rev-parse --verify HEAD^4 && + git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual && + git rev-parse one three four | sort >expect && + test_cmp expect actual +' + +test_expect_success 'merge FETCH_HEAD octopus fast-forward (does not ff)' ' + t3033_reset && + git fetch . left right && + git merge FETCH_HEAD && + # two (master) is not an ancestor of three (left) and four (right) + test_must_fail git rev-parse --verify HEAD^4 && + git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual && + git rev-parse two three four | sort >expect && + test_cmp expect actual +' + +test_expect_success 'merge FETCH_HEAD octopus non-fast-forward' ' + t3033_reset && + git fetch . left right && + git merge --no-ff FETCH_HEAD && + test_must_fail git rev-parse --verify HEAD^4 && + git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual && + git rev-parse two three four | sort >expect && + test_cmp expect actual +' + +test_done diff --git a/t/t3060-ls-files-with-tree.sh b/t/t3060-ls-files-with-tree.sh index 61c1f53..44f378c 100755 --- a/t/t3060-ls-files-with-tree.sh +++ b/t/t3060-ls-files-with-tree.sh @@ -18,22 +18,16 @@ test_expect_success setup ' echo file >expected && mkdir sub && - bad= && for n in 0 1 2 3 4 5 do for m in 0 1 2 3 4 5 6 7 8 9 do num=00$n$m && >sub/file-$num && - echo file-$num >>expected || { - bad=t - break - } - done && test -z "$bad" || { - bad=t - break - } - done && test -z "$bad" && + echo file-$num >>expected || + return 1 + done + done && git add . && git commit -m "add a bunch of files" && diff --git a/t/t3202-show-branch-octopus.sh b/t/t3202-show-branch-octopus.sh index 0a5d5e6..6adf478 100755 --- a/t/t3202-show-branch-octopus.sh +++ b/t/t3202-show-branch-octopus.sh @@ -19,7 +19,7 @@ test_expect_success 'setup' ' > file$i && git add file$i && test_tick && - git commit -m branch$i || break + git commit -m branch$i || return 1 done ' diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh index ba4f98e..f51d0f3 100755 --- a/t/t3203-branch-output.sh +++ b/t/t3203-branch-output.sh @@ -96,7 +96,7 @@ test_expect_success 'git branch -v pattern does not show branch summaries' ' test_expect_success 'git branch shows detached HEAD properly' ' cat >expect <<EOF && -* (detached from $(git rev-parse --short HEAD^0)) +* (HEAD detached at $(git rev-parse --short HEAD^0)) branch-one branch-two master @@ -106,4 +106,41 @@ EOF test_i18ncmp expect actual ' +test_expect_success 'git branch shows detached HEAD properly after moving' ' + cat >expect <<EOF && +* (HEAD detached from $(git rev-parse --short HEAD)) + branch-one + branch-two + master +EOF + git reset --hard HEAD^1 && + git branch >actual && + test_i18ncmp expect actual +' + +test_expect_success 'git branch shows detached HEAD properly from tag' ' + cat >expect <<EOF && +* (HEAD detached at fromtag) + branch-one + branch-two + master +EOF + git tag fromtag master && + git checkout fromtag && + git branch >actual && + test_i18ncmp expect actual +' + +test_expect_success 'git branch shows detached HEAD properly after moving from tag' ' + cat >expect <<EOF && +* (HEAD detached from fromtag) + branch-one + branch-two + master +EOF + git reset --hard HEAD^1 && + git branch >actual && + test_i18ncmp expect actual +' + test_done diff --git a/t/t3210-pack-refs.sh b/t/t3210-pack-refs.sh index aa9eb3a..8aae98d 100755 --- a/t/t3210-pack-refs.sh +++ b/t/t3210-pack-refs.sh @@ -187,4 +187,21 @@ test_expect_success 'notice d/f conflict with existing ref' ' test_must_fail git branch foo/bar/baz/lots/of/extra/components ' +test_expect_success 'timeout if packed-refs.lock exists' ' + LOCK=.git/packed-refs.lock && + >"$LOCK" && + test_when_finished "rm -f $LOCK" && + test_must_fail git pack-refs --all --prune +' + +test_expect_success 'retry acquiring packed-refs.lock' ' + LOCK=.git/packed-refs.lock && + >"$LOCK" && + test_when_finished "wait; rm -f $LOCK" && + { + ( sleep 1 ; rm -f $LOCK ) & + } && + git -c core.packedrefstimeout=3000 pack-refs --all --prune +' + test_done diff --git a/t/t3305-notes-fanout.sh b/t/t3305-notes-fanout.sh index b1ea64b..54460be 100755 --- a/t/t3305-notes-fanout.sh +++ b/t/t3305-notes-fanout.sh @@ -51,15 +51,12 @@ test_expect_success 'deleting most notes with git-notes' ' num_notes=250 && i=0 && git rev-list HEAD | - while read sha1 + while test $i -lt $num_notes && read sha1 do i=$(($i + 1)) && - if test $i -gt $num_notes - then - break - fi && test_tick && - git notes remove "$sha1" + git notes remove "$sha1" || + exit 1 done ' diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh index 5a27ec9..8f64505 100755 --- a/t/t3402-rebase-merge.sh +++ b/t/t3402-rebase-merge.sh @@ -47,7 +47,7 @@ test_expect_success setup ' ' test_expect_success 'reference merge' ' - git merge -s recursive "reference merge" HEAD master + git merge -s recursive -m "reference merge" master ' PRE_REBASE=$(git rev-parse test-rebase) diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index a31f7e0..ac429a0 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -950,7 +950,7 @@ test_expect_success 'rebase --edit-todo can be used to modify todo' ' set_fake_editor && FAKE_LINES="edit 1 2 3" git rebase -i HEAD~3 && FAKE_LINES="2 1" git rebase --edit-todo && - git rebase --continue + git rebase --continue && test M = $(git cat-file commit HEAD^ | sed -ne \$p) && test L = $(git cat-file commit HEAD | sed -ne \$p) ' @@ -1007,7 +1007,7 @@ test_expect_success 'rebase -i with --strategy and -X' ' ' test_expect_success 'rebase -i error on commits with \ in message' ' - current_head=$(git rev-parse HEAD) + current_head=$(git rev-parse HEAD) && test_when_finished "git rebase --abort; git reset --hard $current_head; rm -f error" && test_commit TO-REMOVE will-conflict old-content && test_commit "\temp" will-conflict new-content dummy && @@ -1046,4 +1046,60 @@ test_expect_success 'respect core.abbrev' ' test 4 = $(grep -c "pick [0-9a-f]\{12,\}" todo-list) ' +test_expect_success 'todo count' ' + write_script dump-raw.sh <<-\EOF && + cat "$1" + EOF + test_set_editor "$(pwd)/dump-raw.sh" && + git rebase -i HEAD~4 >actual && + grep "^# Rebase ..* onto ..* ([0-9]" actual +' + +test_expect_success 'rebase -i commits that overwrite untracked files (pick)' ' + git checkout --force branch2 && + git clean -f && + set_fake_editor && + FAKE_LINES="edit 1 2" git rebase -i A && + test_cmp_rev HEAD F && + test_path_is_missing file6 && + >file6 && + test_must_fail git rebase --continue && + test_cmp_rev HEAD F && + rm file6 && + git rebase --continue && + test_cmp_rev HEAD I +' + +test_expect_success 'rebase -i commits that overwrite untracked files (squash)' ' + git checkout --force branch2 && + git clean -f && + git tag original-branch2 && + set_fake_editor && + FAKE_LINES="edit 1 squash 2" git rebase -i A && + test_cmp_rev HEAD F && + test_path_is_missing file6 && + >file6 && + test_must_fail git rebase --continue && + test_cmp_rev HEAD F && + rm file6 && + git rebase --continue && + test $(git cat-file commit HEAD | sed -ne \$p) = I && + git reset --hard original-branch2 +' + +test_expect_success 'rebase -i commits that overwrite untracked files (no ff)' ' + git checkout --force branch2 && + git clean -f && + set_fake_editor && + FAKE_LINES="edit 1 2" git rebase -i --no-ff A && + test $(git cat-file commit HEAD | sed -ne \$p) = F && + test_path_is_missing file6 && + >file6 && + test_must_fail git rebase --continue && + test $(git cat-file commit HEAD | sed -ne \$p) = F && + rm file6 && + git rebase --continue && + test $(git cat-file commit HEAD | sed -ne \$p) = I +' + test_done diff --git a/t/t3405-rebase-malformed.sh b/t/t3405-rebase-malformed.sh index 19eddad..ff8c360 100755 --- a/t/t3405-rebase-malformed.sh +++ b/t/t3405-rebase-malformed.sh @@ -24,7 +24,7 @@ test_expect_success setup ' git add file1 file2 && test_tick && git commit -m "Initial commit" && - git branch diff-in-message + git branch diff-in-message && git checkout -b multi-line-subject && cat F >file2 && @@ -36,7 +36,7 @@ test_expect_success setup ' git checkout diff-in-message && echo "commit log message containing a diff" >G && - echo "" >>G + echo "" >>G && cat G >file2 && git add file2 && git diff --cached >>G && diff --git a/t/t3425-rebase-topology-merges.sh b/t/t3425-rebase-topology-merges.sh index 1d195fb..846f85c 100755 --- a/t/t3425-rebase-topology-merges.sh +++ b/t/t3425-rebase-topology-merges.sh @@ -24,7 +24,7 @@ test_expect_success 'setup of non-linear-history' ' test_commit c && git checkout b && test_commit d && - test_commit e + test_commit e && git checkout c && test_commit g && @@ -33,7 +33,7 @@ test_expect_success 'setup of non-linear-history' ' cherry_pick gp g && test_commit i && git checkout b && - test_commit f + test_commit f && git checkout d && test_commit n && diff --git a/t/t3511-cherry-pick-x.sh b/t/t3511-cherry-pick-x.sh index f977279..b7dff09 100755 --- a/t/t3511-cherry-pick-x.sh +++ b/t/t3511-cherry-pick-x.sh @@ -36,6 +36,20 @@ mesg_with_cherry_footer="$mesg_with_footer_sob (cherry picked from commit da39a3ee5e6b4b0d3255bfef95601890afd80709) Tested-by: C.U. Thor <cuthor@example.com>" +mesg_unclean="$mesg_one_line + + +leading empty lines + + +consecutive empty lines + +# hash tag comment + +trailing empty lines + + +" test_expect_success setup ' git config advice.detachedhead false && @@ -53,6 +67,10 @@ test_expect_success setup ' test_commit "$mesg_with_footer_sob" foo b mesg-with-footer-sob && git reset --hard initial && test_commit "$mesg_with_cherry_footer" foo b mesg-with-cherry-footer && + git reset --hard initial && + test_config commit.cleanup verbatim && + test_commit "$mesg_unclean" foo b mesg-unclean && + test_unconfig commit.cleanup && pristine_detach initial && test_commit conflicting unrelated ' @@ -216,4 +234,14 @@ test_expect_success 'cherry-pick -x -s treats "(cherry picked from..." line as p test_cmp expect actual ' +test_expect_success 'cherry-pick preserves commit message' ' + pristine_detach initial && + printf "$mesg_unclean" >expect && + git log -1 --pretty=format:%B mesg-unclean >actual && + test_cmp expect actual && + git cherry-pick mesg-unclean && + git log -1 --pretty=format:%B >actual && + test_cmp expect actual +' + test_done diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index e00d7d2..9d90d2c 100755 --- a/t/t3600-rm.sh +++ b/t/t3600-rm.sh @@ -38,37 +38,37 @@ test_expect_success \ test_expect_success \ 'Test that git rm --cached foo succeeds if the index matches the file' \ - 'echo content > foo - git add foo + 'echo content >foo && + git add foo && git rm --cached foo' test_expect_success \ 'Test that git rm --cached foo succeeds if the index matches the file' \ - 'echo content > foo - git add foo - git commit -m foo - echo "other content" > foo + 'echo content >foo && + git add foo && + git commit -m foo && + echo "other content" >foo && git rm --cached foo' test_expect_success \ 'Test that git rm --cached foo fails if the index matches neither the file nor HEAD' ' - echo content > foo - git add foo - git commit -m foo - echo "other content" > foo - git add foo - echo "yet another content" > foo + echo content >foo && + git add foo && + git commit -m foo --allow-empty && + echo "other content" >foo && + git add foo && + echo "yet another content" >foo && test_must_fail git rm --cached foo ' test_expect_success \ 'Test that git rm --cached -f foo works in case where --cached only did not' \ - 'echo content > foo - git add foo - git commit -m foo - echo "other content" > foo - git add foo - echo "yet another content" > foo + 'echo content >foo && + git add foo && + git commit -m foo --allow-empty && + echo "other content" >foo && + git add foo && + echo "yet another content" >foo && git rm --cached -f foo' test_expect_success \ @@ -170,7 +170,7 @@ test_expect_success 'but with -f it should work.' ' git rm -f foo baz && test ! -f foo && test ! -f baz && - test_must_fail git ls-files --error-unmatch foo + test_must_fail git ls-files --error-unmatch foo && test_must_fail git ls-files --error-unmatch baz ' @@ -183,7 +183,7 @@ test_expect_success 'refuse to remove cached empty file with modifications' ' test_expect_success 'remove intent-to-add file without --force' ' echo content >intent-to-add && - git add -N intent-to-add + git add -N intent-to-add && git rm --cached intent-to-add ' @@ -201,7 +201,7 @@ test_expect_success 'Recursive without -r fails' ' ' test_expect_success 'Recursive with -r but dirty' ' - echo qfwfq >>frotz/nitfol + echo qfwfq >>frotz/nitfol && test_must_fail git rm -r frotz && test -d frotz && test -f frotz/nitfol diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh index 24ddd8a..deae948 100755 --- a/t/t3701-add-interactive.sh +++ b/t/t3701-add-interactive.sh @@ -326,15 +326,34 @@ test_expect_success 'split hunk "add -p (edit)"' ' # 2. Correct version applies the (not)edited version, and asks # about the next hunk, against which we say q and program # exits. - for a in s e q n q q - do - echo $a - done | + printf "%s\n" s e q n q q | EDITOR=: git add -p && git diff >actual && ! grep "^+15" actual ' +test_expect_failure 'split hunk "add -p (no, yes, edit)"' ' + cat >test <<-\EOF && + 5 + 10 + 20 + 21 + 30 + 31 + 40 + 50 + 60 + EOF + git reset && + # test sequence is s(plit), n(o), y(es), e(dit) + # q n q q is there to make sure we exit at the end. + printf "%s\n" s n y e q n q q | + EDITOR=: git add -p 2>error && + test_must_be_empty error && + git diff >actual && + ! grep "^+31" actual +' + test_expect_success 'patch mode ignores unmerged entries' ' git reset --hard && test_commit conflict && diff --git a/t/t3702-add-edit.sh b/t/t3702-add-edit.sh index 4ee47cc..3cb74ca 100755 --- a/t/t3702-add-edit.sh +++ b/t/t3702-add-edit.sh @@ -118,4 +118,11 @@ test_expect_success 'add -e' ' ' +test_expect_success 'add -e notices editor failure' ' + git reset --hard && + echo change >>file && + test_must_fail env GIT_EDITOR=false git add -e && + test_expect_code 1 git diff --exit-code +' + test_done diff --git a/t/t3901-i18n-patch.sh b/t/t3901-i18n-patch.sh index a392f3d..75cf3ff 100755 --- a/t/t3901-i18n-patch.sh +++ b/t/t3901-i18n-patch.sh @@ -9,7 +9,7 @@ test_description='i18n settings and format-patch | am pipe' check_encoding () { # Make sure characters are not corrupted - cnt="$1" header="$2" i=1 j=0 bad=0 + cnt="$1" header="$2" i=1 j=0 while test "$i" -le $cnt do git format-patch --encoding=UTF-8 --stdout HEAD~$i..HEAD~$j | @@ -20,14 +20,10 @@ check_encoding () { grep "^encoding ISO8859-1" ;; *) grep "^encoding ISO8859-1"; test "$?" != 0 ;; - esac || { - bad=1 - break - } + esac || return 1 j=$i i=$(($i+1)) done - (exit $bad) } test_expect_success setup ' diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index 1e29962..0746eee 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -10,6 +10,8 @@ test_description='Test git stash' test_expect_success 'stash some dirty working directory' ' echo 1 > file && git add file && + echo unrelated >other-file && + git add other-file && test_tick && git commit -m initial && echo 2 > file && @@ -43,10 +45,15 @@ test_expect_success 'applying bogus stash does nothing' ' test_cmp expect file ' +test_expect_success 'apply requires a clean index' ' + test_when_finished "git reset --hard" && + echo changed >other-file && + git add other-file && + test_must_fail git stash apply +' + test_expect_success 'apply does not need clean working directory' ' echo 4 >other-file && - git add other-file && - echo 5 >other-file && git stash apply && echo 3 >expect && test_cmp expect file @@ -695,8 +702,8 @@ test_expect_success 'setup stash with index and worktree changes' ' ' test_expect_success 'stash list implies --first-parent -m' ' - cat >expect <<-\EOF && - stash@{0}: WIP on master: b27a2bc subdir + cat >expect <<-EOF && + stash@{0} diff --git a/file b/file index 257cc56..d26b33d 100644 @@ -706,13 +713,13 @@ test_expect_success 'stash list implies --first-parent -m' ' -foo +working EOF - git stash list -p >actual && + git stash list --format=%gd -p >actual && test_cmp expect actual ' test_expect_success 'stash list --cc shows combined diff' ' cat >expect <<-\EOF && - stash@{0}: WIP on master: b27a2bc subdir + stash@{0} diff --cc file index 257cc56,9015a7a..d26b33d @@ -723,7 +730,7 @@ test_expect_success 'stash list --cc shows combined diff' ' -index ++working EOF - git stash list -p --cc >actual && + git stash list --format=%gd -p --cc >actual && test_cmp expect actual ' diff --git a/t/t3904-stash-patch.sh b/t/t3904-stash-patch.sh index 70655c1..38e7300 100755 --- a/t/t3904-stash-patch.sh +++ b/t/t3904-stash-patch.sh @@ -1,9 +1,15 @@ #!/bin/sh -test_description='git checkout --patch' +test_description='stash -p' . ./lib-patch-mode.sh -test_expect_success PERL 'setup' ' +if ! test_have_prereq PERL +then + skip_all='skipping stash -p tests, perl not available' + test_done +fi + +test_expect_success 'setup' ' mkdir dir && echo parent > dir/foo && echo dummy > bar && @@ -20,7 +26,7 @@ test_expect_success PERL 'setup' ' # note: order of files with unstaged changes: HEAD bar dir/foo -test_expect_success PERL 'saying "n" does nothing' ' +test_expect_success 'saying "n" does nothing' ' set_state HEAD HEADfile_work HEADfile_index && set_state dir/foo work index && (echo n; echo n; echo n) | test_must_fail git stash save -p && @@ -29,7 +35,7 @@ test_expect_success PERL 'saying "n" does nothing' ' verify_state dir/foo work index ' -test_expect_success PERL 'git stash -p' ' +test_expect_success 'git stash -p' ' (echo y; echo n; echo y) | git stash save -p && verify_state HEAD committed HEADfile_index && verify_saved_state bar && @@ -41,7 +47,7 @@ test_expect_success PERL 'git stash -p' ' verify_state dir/foo work head ' -test_expect_success PERL 'git stash -p --no-keep-index' ' +test_expect_success 'git stash -p --no-keep-index' ' set_state HEAD HEADfile_work HEADfile_index && set_state bar bar_work bar_index && set_state dir/foo work index && @@ -56,7 +62,7 @@ test_expect_success PERL 'git stash -p --no-keep-index' ' verify_state dir/foo work index ' -test_expect_success PERL 'git stash --no-keep-index -p' ' +test_expect_success 'git stash --no-keep-index -p' ' set_state HEAD HEADfile_work HEADfile_index && set_state bar bar_work bar_index && set_state dir/foo work index && @@ -71,8 +77,31 @@ test_expect_success PERL 'git stash --no-keep-index -p' ' verify_state dir/foo work index ' -test_expect_success PERL 'none of this moved HEAD' ' +test_expect_success 'none of this moved HEAD' ' verify_saved_head ' +test_expect_failure 'stash -p with split hunk' ' + git reset --hard && + cat >test <<-\EOF && + aaa + bbb + ccc + EOF + git add test && + git commit -m "initial" && + cat >test <<-\EOF && + aaa + added line 1 + bbb + added line 2 + ccc + EOF + printf "%s\n" s n y q | + test_might_fail git stash -p 2>error && + ! test_must_be_empty error && + grep "added line 1" test && + ! grep "added line 2" test +' + test_done diff --git a/t/t4011-diff-symlink.sh b/t/t4011-diff-symlink.sh index 13e7f62..7452fce 100755 --- a/t/t4011-diff-symlink.sh +++ b/t/t4011-diff-symlink.sh @@ -139,11 +139,13 @@ test_expect_success SYMLINKS 'setup symlinks with attributes' ' test_expect_success SYMLINKS 'symlinks do not respect userdiff config by path' ' cat >expect <<-\EOF && diff --git a/file.bin b/file.bin - index e69de29..d95f3ad 100644 - Binary files a/file.bin and b/file.bin differ + new file mode 100644 + index 0000000..d95f3ad + Binary files /dev/null and b/file.bin differ diff --git a/link.bin b/link.bin - index e69de29..dce41ec 120000 - --- a/link.bin + new file mode 120000 + index 0000000..dce41ec + --- /dev/null +++ b/link.bin @@ -0,0 +1 @@ +file.bin diff --git a/t/t4013/diff.log_--decorate=full_--all b/t/t4013/diff.log_--decorate=full_--all index 44d4525..b345b2e 100644 --- a/t/t4013/diff.log_--decorate=full_--all +++ b/t/t4013/diff.log_--decorate=full_--all @@ -5,7 +5,7 @@ Date: Mon Jun 26 00:06:00 2006 +0000 Rearranged lines in dir/sub -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD, refs/heads/master) +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> refs/heads/master) Merge: 9a6d494 c7a2ab9 Author: A U Thor <author@example.com> Date: Mon Jun 26 00:04:00 2006 +0000 diff --git a/t/t4013/diff.log_--decorate_--all b/t/t4013/diff.log_--decorate_--all index 27d3eab..3aa16a9 100644 --- a/t/t4013/diff.log_--decorate_--all +++ b/t/t4013/diff.log_--decorate_--all @@ -5,7 +5,7 @@ Date: Mon Jun 26 00:06:00 2006 +0000 Rearranged lines in dir/sub -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD, master) +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> master) Merge: 9a6d494 c7a2ab9 Author: A U Thor <author@example.com> Date: Mon Jun 26 00:04:00 2006 +0000 diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 256affc..c39e500 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -802,7 +802,7 @@ test_expect_success '--no-signature suppresses format.signaturefile ' ' ' test_expect_success '--signature-file overrides format.signaturefile' ' - cat >other-mail-signature <<-\EOF + cat >other-mail-signature <<-\EOF && Use this other signature instead of mail-signature. EOF test_config format.signaturefile mail-signature && diff --git a/t/t4022-diff-rewrite.sh b/t/t4022-diff-rewrite.sh index 2d030a4..cb51d9f 100755 --- a/t/t4022-diff-rewrite.sh +++ b/t/t4022-diff-rewrite.sh @@ -20,10 +20,7 @@ test_expect_success setup ' test_expect_success 'detect rewrite' ' actual=$(git diff-files -B --summary test) && - expr "$actual" : " rewrite test ([0-9]*%)$" || { - echo "Eh? <<$actual>>" - false - } + verbose expr "$actual" : " rewrite test ([0-9]*%)$" ' diff --git a/t/t4024-diff-optimize-common.sh b/t/t4024-diff-optimize-common.sh index c4d733f..7e76018 100755 --- a/t/t4024-diff-optimize-common.sh +++ b/t/t4024-diff-optimize-common.sh @@ -139,7 +139,7 @@ test_expect_success setup ' ( printf C; zs $n ) >file-c$n && ( echo D; zs $n ) >file-d$n && - expect_pattern $n || break + expect_pattern $n || return 1 done >expect ' diff --git a/t/t4026-color.sh b/t/t4026-color.sh index 4d20fea..2b32c4f 100755 --- a/t/t4026-color.sh +++ b/t/t4026-color.sh @@ -111,9 +111,9 @@ test_expect_success 'unknown color slots are ignored (branch)' ' ' test_expect_success 'unknown color slots are ignored (status)' ' - git config color.status.nosuchslotwilleverbedefined white || exit - git status - case $? in 0|1) : ok ;; *) false ;; esac + git config color.status.nosuchslotwilleverbedefined white && + { git status; ret=$?; } && + case $ret in 0|1) : ok ;; *) false ;; esac ' test_done diff --git a/t/t4035-diff-quiet.sh b/t/t4035-diff-quiet.sh index e8ae2a0..461f4bb 100755 --- a/t/t4035-diff-quiet.sh +++ b/t/t4035-diff-quiet.sh @@ -29,67 +29,65 @@ test_expect_success 'setup' ' ' test_expect_success 'git diff-tree HEAD^ HEAD' ' - git diff-tree --quiet HEAD^ HEAD >cnt - test $? = 1 && test_line_count = 0 cnt + test_expect_code 1 git diff-tree --quiet HEAD^ HEAD >cnt && + test_line_count = 0 cnt ' test_expect_success 'git diff-tree HEAD^ HEAD -- a' ' - git diff-tree --quiet HEAD^ HEAD -- a >cnt - test $? = 0 && test_line_count = 0 cnt + test_expect_code 0 git diff-tree --quiet HEAD^ HEAD -- a >cnt && + test_line_count = 0 cnt ' test_expect_success 'git diff-tree HEAD^ HEAD -- b' ' - git diff-tree --quiet HEAD^ HEAD -- b >cnt - test $? = 1 && test_line_count = 0 cnt + test_expect_code 1 git diff-tree --quiet HEAD^ HEAD -- b >cnt && + test_line_count = 0 cnt ' # this diff outputs one line: sha1 of the given head test_expect_success 'echo HEAD | git diff-tree --stdin' ' - echo $(git rev-parse HEAD) | git diff-tree --quiet --stdin >cnt - test $? = 1 && test_line_count = 1 cnt + echo $(git rev-parse HEAD) | + test_expect_code 1 git diff-tree --quiet --stdin >cnt && + test_line_count = 1 cnt ' test_expect_success 'git diff-tree HEAD HEAD' ' - git diff-tree --quiet HEAD HEAD >cnt - test $? = 0 && test_line_count = 0 cnt + test_expect_code 0 git diff-tree --quiet HEAD HEAD >cnt && + test_line_count = 0 cnt ' test_expect_success 'git diff-files' ' - git diff-files --quiet >cnt - test $? = 0 && test_line_count = 0 cnt + test_expect_code 0 git diff-files --quiet >cnt && + test_line_count = 0 cnt ' test_expect_success 'git diff-index --cached HEAD' ' - git diff-index --quiet --cached HEAD >cnt - test $? = 0 && test_line_count = 0 cnt + test_expect_code 0 git diff-index --quiet --cached HEAD >cnt && + test_line_count = 0 cnt ' test_expect_success 'git diff-index --cached HEAD^' ' - git diff-index --quiet --cached HEAD^ >cnt - test $? = 1 && test_line_count = 0 cnt + test_expect_code 1 git diff-index --quiet --cached HEAD^ >cnt && + test_line_count = 0 cnt ' test_expect_success 'git diff-index --cached HEAD^' ' echo text >>b && echo 3 >c && - git add . && { - git diff-index --quiet --cached HEAD^ >cnt - test $? = 1 && test_line_count = 0 cnt - } + git add . && + test_expect_code 1 git diff-index --quiet --cached HEAD^ >cnt && + test_line_count = 0 cnt ' test_expect_success 'git diff-tree -Stext HEAD^ HEAD -- b' ' - git commit -m "text in b" && { - git diff-tree --quiet -Stext HEAD^ HEAD -- b >cnt - test $? = 1 && test_line_count = 0 cnt - } + git commit -m "text in b" && + test_expect_code 1 git diff-tree --quiet -Stext HEAD^ HEAD -- b >cnt && + test_line_count = 0 cnt ' test_expect_success 'git diff-tree -Snot-found HEAD^ HEAD -- b' ' - git diff-tree --quiet -Snot-found HEAD^ HEAD -- b >cnt - test $? = 0 && test_line_count = 0 cnt + test_expect_code 0 git diff-tree --quiet -Snot-found HEAD^ HEAD -- b >cnt && + test_line_count = 0 cnt ' test_expect_success 'git diff-files' ' - echo 3 >>c && { - git diff-files --quiet >cnt - test $? = 1 && test_line_count = 0 cnt - } + echo 3 >>c && + test_expect_code 1 git diff-files --quiet >cnt && + test_line_count = 0 cnt ' + test_expect_success 'git diff-index --cached HEAD' ' - git update-index c && { - git diff-index --quiet --cached HEAD >cnt - test $? = 1 && test_line_count = 0 cnt - } + git update-index c && + test_expect_code 1 git diff-index --quiet --cached HEAD >cnt && + test_line_count = 0 cnt ' test_expect_success 'git diff, one file outside repo' ' diff --git a/t/t4041-diff-submodule-option.sh b/t/t4041-diff-submodule-option.sh index e432896..2d9731b 100755 --- a/t/t4041-diff-submodule-option.sh +++ b/t/t4041-diff-submodule-option.sh @@ -528,10 +528,12 @@ test_expect_success 'diff --submodule with objects referenced by alternates' ' sha1_before=$(git rev-parse --short HEAD) echo b >b && git add b && - git commit -m b - sha1_after=$(git rev-parse --short HEAD) - echo "Submodule sub $sha1_before..$sha1_after: - > b" >../expected + git commit -m b && + sha1_after=$(git rev-parse --short HEAD) && + { + echo "Submodule sub $sha1_before..$sha1_after:" && + echo " > b" + } >../expected ) && (cd super && (cd sub && @@ -539,7 +541,7 @@ test_expect_success 'diff --submodule with objects referenced by alternates' ' git checkout origin/master ) && git diff --submodule > ../actual - ) + ) && test_cmp expected actual ' diff --git a/t/t4046-diff-unmerged.sh b/t/t4046-diff-unmerged.sh index 25d50a6..d0f1447 100755 --- a/t/t4046-diff-unmerged.sh +++ b/t/t4046-diff-unmerged.sh @@ -8,7 +8,7 @@ test_expect_success setup ' do blob=$(echo $i | git hash-object --stdin) && eval "blob$i=$blob" && - eval "m$i=\"100644 \$blob$i $i\"" || break + eval "m$i=\"100644 \$blob$i $i\"" || return 1 done && paths= && for b in o x @@ -24,9 +24,9 @@ test_expect_success setup ' case "$b" in x) echo "$m1$p" ;; esac && case "$o" in x) echo "$m2$p" ;; esac && case "$t" in x) echo "$m3$p" ;; esac || - break - done || break - done || break + return 1 + done + done done >ls-files-s.expect && git update-index --index-info <ls-files-s.expect && git ls-files -s >ls-files-s.actual && diff --git a/t/t4047-diff-dirstat.sh b/t/t4047-diff-dirstat.sh index 0d50dce..3b8b792 100755 --- a/t/t4047-diff-dirstat.sh +++ b/t/t4047-diff-dirstat.sh @@ -374,7 +374,7 @@ test_expect_success 'later options override earlier options:' ' git diff --dirstat=files,10,cumulative,changes,noncumulative,3 -M HEAD^..HEAD >actual_diff_dirstat_M && test_cmp expect_diff_dirstat_M actual_diff_dirstat_M && git diff --dirstat=files,10,cumulative,changes,noncumulative,3 -C -C HEAD^..HEAD >actual_diff_dirstat_CC && - test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC + test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC && git diff --dirstat=files --dirstat=10 --dirstat=cumulative --dirstat=changes --dirstat=noncumulative -X3 HEAD^..HEAD >actual_diff_dirstat && test_cmp expect_diff_dirstat actual_diff_dirstat && git diff --dirstat=files --dirstat=10 --dirstat=cumulative --dirstat=changes --dirstat=noncumulative -X3 -M HEAD^..HEAD >actual_diff_dirstat_M && diff --git a/t/t4049-diff-stat-count.sh b/t/t4049-diff-stat-count.sh index 5b594e8..a341217 100755 --- a/t/t4049-diff-stat-count.sh +++ b/t/t4049-diff-stat-count.sh @@ -18,7 +18,7 @@ test_expect_success 'mode-only change show as a 0-line change' ' test_chmod +x b d && echo a >a && echo c >c && - cat >expect <<-\EOF + cat >expect <<-\EOF && a | 1 + b | 0 ... @@ -33,7 +33,7 @@ test_expect_success 'binary changes do not count in lines' ' echo a >a && echo c >c && cat "$TEST_DIRECTORY"/test-binary-1.png >d && - cat >expect <<-\EOF + cat >expect <<-\EOF && a | 1 + c | 1 + ... @@ -55,7 +55,7 @@ test_expect_success 'exclude unmerged entries from total file count' ' done | git update-index --index-info && echo d >d && - cat >expect <<-\EOF + cat >expect <<-\EOF && a | 1 + b | 1 + ... diff --git a/t/t4052-stat-output.sh b/t/t4052-stat-output.sh index b68afef..9f563db 100755 --- a/t/t4052-stat-output.sh +++ b/t/t4052-stat-output.sh @@ -94,15 +94,15 @@ EOF while read verb expect cmd args do test_expect_success "$cmd $verb COLUMNS (big change)" ' - COLUMNS=200 git $cmd $args >output + COLUMNS=200 git $cmd $args >output && grep " | " output >actual && test_cmp "$expect" actual ' - test "$cmd" != diff || continue + case "$cmd" in diff|show) continue;; esac test_expect_success "$cmd --graph $verb COLUMNS (big change)" ' - COLUMNS=200 git $cmd $args --graph >output + COLUMNS=200 git $cmd $args --graph >output && grep " | " output >actual && test_cmp "$expect-graph" actual ' @@ -122,15 +122,15 @@ EOF while read verb expect cmd args do test_expect_success "$cmd $verb not enough COLUMNS (big change)" ' - COLUMNS=40 git $cmd $args >output + COLUMNS=40 git $cmd $args >output && grep " | " output >actual && test_cmp "$expect" actual ' - test "$cmd" != diff || continue + case "$cmd" in diff|show) continue;; esac test_expect_success "$cmd --graph $verb not enough COLUMNS (big change)" ' - COLUMNS=40 git $cmd $args --graph >output + COLUMNS=40 git $cmd $args --graph >output && grep " | " output >actual && test_cmp "$expect-graph" actual ' @@ -150,15 +150,15 @@ EOF while read verb expect cmd args do test_expect_success "$cmd $verb statGraphWidth config" ' - git -c diff.statGraphWidth=26 $cmd $args >output + git -c diff.statGraphWidth=26 $cmd $args >output && grep " | " output >actual && test_cmp "$expect" actual ' - test "$cmd" != diff || continue + case "$cmd" in diff|show) continue;; esac test_expect_success "$cmd --graph $verb statGraphWidth config" ' - git -c diff.statGraphWidth=26 $cmd $args --graph >output + git -c diff.statGraphWidth=26 $cmd $args --graph >output && grep " | " output >actual && test_cmp "$expect-graph" actual ' @@ -179,33 +179,33 @@ EOF while read cmd args do test_expect_success "$cmd --stat=width with big change" ' - git $cmd $args --stat=40 >output + git $cmd $args --stat=40 >output && grep " | " output >actual && test_cmp expect actual ' test_expect_success "$cmd --stat-width=width with big change" ' - git $cmd $args --stat-width=40 >output + git $cmd $args --stat-width=40 >output && grep " | " output >actual && test_cmp expect actual ' test_expect_success "$cmd --stat-graph-width with big change" ' - git $cmd $args --stat-graph-width=26 >output + git $cmd $args --stat-graph-width=26 >output && grep " | " output >actual && test_cmp expect actual ' - test "$cmd" != diff || continue + case "$cmd" in diff|show) continue;; esac test_expect_success "$cmd --stat-width=width --graph with big change" ' - git $cmd $args --stat-width=40 --graph >output + git $cmd $args --stat-width=40 --graph >output && grep " | " output >actual && test_cmp expect-graph actual ' test_expect_success "$cmd --stat-graph-width --graph with big change" ' - git $cmd $args --stat-graph-width=26 --graph >output + git $cmd $args --stat-graph-width=26 --graph >output && grep " | " output >actual && test_cmp expect-graph actual ' @@ -236,7 +236,7 @@ do test_cmp expect actual ' - test "$cmd" != diff || continue + case "$cmd" in diff|show) continue;; esac test_expect_success "$cmd --stat=width --graph with big change is balanced" ' git $cmd $args --stat-width=60 --graph >output && @@ -265,15 +265,15 @@ EOF while read verb expect cmd args do test_expect_success "$cmd $verb COLUMNS (long filename)" ' - COLUMNS=200 git $cmd $args >output + COLUMNS=200 git $cmd $args >output && grep " | " output >actual && test_cmp "$expect" actual ' - test "$cmd" != diff || continue + case "$cmd" in diff|show) continue;; esac test_expect_success "$cmd --graph $verb COLUMNS (long filename)" ' - COLUMNS=200 git $cmd $args --graph >output + COLUMNS=200 git $cmd $args --graph >output && grep " | " output >actual && test_cmp "$expect-graph" actual ' @@ -294,16 +294,16 @@ while read verb expect cmd args do test_expect_success COLUMNS_CAN_BE_1 \ "$cmd $verb prefix greater than COLUMNS (big change)" ' - COLUMNS=1 git $cmd $args >output + COLUMNS=1 git $cmd $args >output && grep " | " output >actual && test_cmp "$expect" actual ' - test "$cmd" != diff || continue + case "$cmd" in diff|show) continue;; esac test_expect_success COLUMNS_CAN_BE_1 \ "$cmd --graph $verb prefix greater than COLUMNS (big change)" ' - COLUMNS=1 git $cmd $args --graph >output + COLUMNS=1 git $cmd $args --graph >output && grep " | " output >actual && test_cmp "$expect-graph" actual ' @@ -320,7 +320,7 @@ EOF test_expect_success 'merge --stat respects COLUMNS (big change)' ' git checkout -b branch HEAD^^ && COLUMNS=100 git merge --stat --no-ff master^ >output && - grep " | " output >actual + grep " | " output >actual && test_cmp expect actual ' @@ -329,7 +329,7 @@ cat >expect <<'EOF' EOF test_expect_success 'merge --stat respects COLUMNS (long filename)' ' COLUMNS=100 git merge --stat --no-ff master >output && - grep " | " output >actual + grep " | " output >actual && test_cmp expect actual ' diff --git a/t/t4053-diff-no-index.sh b/t/t4053-diff-no-index.sh index 2ab3c48..6eb8321 100755 --- a/t/t4053-diff-no-index.sh +++ b/t/t4053-diff-no-index.sh @@ -17,8 +17,8 @@ test_expect_success 'setup' ' ' test_expect_success 'git diff --no-index directories' ' - git diff --no-index a b >cnt - test $? = 1 && test_line_count = 14 cnt + test_expect_code 1 git diff --no-index a b >cnt && + test_line_count = 14 cnt ' test_expect_success 'git diff --no-index relative path outside repo' ' @@ -55,4 +55,38 @@ test_expect_success 'git diff --no-index executed outside repo gives correct err ) ' +test_expect_success 'diff D F and diff F D' ' + ( + cd repo && + echo in-repo >a && + echo non-repo >../non/git/a && + mkdir sub && + echo sub-repo >sub/a && + + test_must_fail git diff --no-index sub/a ../non/git/a >expect && + test_must_fail git diff --no-index sub/a ../non/git/ >actual && + test_cmp expect actual && + + test_must_fail git diff --no-index a ../non/git/a >expect && + test_must_fail git diff --no-index a ../non/git/ >actual && + test_cmp expect actual && + + test_must_fail git diff --no-index ../non/git/a a >expect && + test_must_fail git diff --no-index ../non/git a >actual && + test_cmp expect actual + ) +' + +test_expect_success 'turning a file into a directory' ' + ( + cd non/git && + mkdir d e e/sub && + echo 1 >d/sub && + echo 2 >e/sub/file && + printf "D\td/sub\nA\te/sub/file\n" >expect && + test_must_fail git diff --no-index --name-status d e >actual && + test_cmp expect actual + ) +' + test_done diff --git a/t/t4054-diff-bogus-tree.sh b/t/t4054-diff-bogus-tree.sh index 0843c87..1d6efab 100755 --- a/t/t4054-diff-bogus-tree.sh +++ b/t/t4054-diff-bogus-tree.sh @@ -16,7 +16,7 @@ test_expect_success 'create bogus tree' ' test_expect_success 'create tree with matching file' ' echo bar >foo && git add foo && - good_tree=$(git write-tree) + good_tree=$(git write-tree) && blob=$(git rev-parse :foo) ' diff --git a/t/t4104-apply-boundary.sh b/t/t4104-apply-boundary.sh index c617c2a..32e3b0e 100755 --- a/t/t4104-apply-boundary.sh +++ b/t/t4104-apply-boundary.sh @@ -18,7 +18,7 @@ test_expect_success setup ' cat victim >original && git update-index --add victim && - : add to the head + # add to the head for i in a b '"$L"' y do echo $i @@ -27,7 +27,7 @@ test_expect_success setup ' git diff victim >add-a-patch.with && git diff --unified=0 >add-a-patch.without && - : insert at line two + # insert at line two for i in b a '"$L"' y do echo $i @@ -36,7 +36,7 @@ test_expect_success setup ' git diff victim >insert-a-patch.with && git diff --unified=0 >insert-a-patch.without && - : modify at the head + # modify at the head for i in a '"$L"' y do echo $i @@ -45,16 +45,16 @@ test_expect_success setup ' git diff victim >mod-a-patch.with && git diff --unified=0 >mod-a-patch.without && - : remove from the head + # remove from the head for i in '"$L"' y do echo $i done >victim && cat victim >del-a-expect && - git diff victim >del-a-patch.with + git diff victim >del-a-patch.with && git diff --unified=0 >del-a-patch.without && - : add to the tail + # add to the tail for i in b '"$L"' y z do echo $i @@ -63,7 +63,7 @@ test_expect_success setup ' git diff victim >add-z-patch.with && git diff --unified=0 >add-z-patch.without && - : modify at the tail + # modify at the tail for i in b '"$L"' z do echo $i @@ -72,16 +72,16 @@ test_expect_success setup ' git diff victim >mod-z-patch.with && git diff --unified=0 >mod-z-patch.without && - : remove from the tail + # remove from the tail for i in b '"$L"' do echo $i done >victim && cat victim >del-z-expect && - git diff victim >del-z-patch.with - git diff --unified=0 >del-z-patch.without && + git diff victim >del-z-patch.with && + git diff --unified=0 >del-z-patch.without - : done + # done ' for with in with without @@ -95,10 +95,7 @@ do test_expect_success "apply $kind-patch $with context" ' cat original >victim && git update-index victim && - git apply --index '"$u$kind-patch.$with"' || { - cat '"$kind-patch.$with"' - (exit 1) - } && + git apply --index '"$u$kind-patch.$with"' && test_cmp '"$kind"'-expect victim ' done @@ -113,10 +110,7 @@ do test_expect_success "apply non-git $kind-patch without context" ' cat original >victim && git update-index victim && - git apply --unidiff-zero --index '"$kind-ng.without"' || { - cat '"$kind-ng.without"' - (exit 1) - } && + git apply --unidiff-zero --index '"$kind-ng.without"' && test_cmp '"$kind"'-expect victim ' done diff --git a/t/t4117-apply-reject.sh b/t/t4117-apply-reject.sh index 8e15ecb..d80187d 100755 --- a/t/t4117-apply-reject.sh +++ b/t/t4117-apply-reject.sh @@ -56,23 +56,13 @@ test_expect_success 'apply --reject is incompatible with --3way' ' test_expect_success 'apply without --reject should fail' ' - if git apply patch.1 - then - echo "Eh? Why?" - exit 1 - fi - + test_must_fail git apply patch.1 && test_cmp file1 saved.file1 ' test_expect_success 'apply without --reject should fail' ' - if git apply --verbose patch.1 - then - echo "Eh? Why?" - exit 1 - fi - + test_must_fail git apply --verbose patch.1 && test_cmp file1 saved.file1 ' @@ -81,21 +71,11 @@ test_expect_success 'apply with --reject should fail but update the file' ' cat saved.file1 >file1 && rm -f file1.rej file2.rej && - if git apply --reject patch.1 - then - echo "succeeds with --reject?" - exit 1 - fi - + test_must_fail git apply --reject patch.1 && test_cmp file1 expected && cat file1.rej && - - if test -f file2.rej - then - echo "file2 should not have been touched" - exit 1 - fi + test_path_is_missing file2.rej ' test_expect_success 'apply with --reject should fail but update the file' ' @@ -103,25 +83,12 @@ test_expect_success 'apply with --reject should fail but update the file' ' cat saved.file1 >file1 && rm -f file1.rej file2.rej file2 && - if git apply --reject patch.2 >rejects - then - echo "succeeds with --reject?" - exit 1 - fi - - test -f file1 && { - echo "file1 still exists?" - exit 1 - } + test_must_fail git apply --reject patch.2 >rejects && + test_path_is_missing file1 && test_cmp file2 expected && cat file2.rej && - - if test -f file1.rej - then - echo "file2 should not have been touched" - exit 1 - fi + test_path_is_missing file1.rej ' @@ -130,25 +97,12 @@ test_expect_success 'the same test with --verbose' ' cat saved.file1 >file1 && rm -f file1.rej file2.rej file2 && - if git apply --reject --verbose patch.2 >rejects - then - echo "succeeds with --reject?" - exit 1 - fi - - test -f file1 && { - echo "file1 still exists?" - exit 1 - } + test_must_fail git apply --reject --verbose patch.2 >rejects && + test_path_is_missing file1 && test_cmp file2 expected && cat file2.rej && - - if test -f file1.rej - then - echo "file2 should not have been touched" - exit 1 - fi + test_path_is_missing file1.rej ' diff --git a/t/t4124-apply-ws-rule.sh b/t/t4124-apply-ws-rule.sh index c6474de..d350065 100755 --- a/t/t4124-apply-ws-rule.sh +++ b/t/t4124-apply-ws-rule.sh @@ -99,9 +99,8 @@ test_expect_success 'whitespace=warn, default rule' ' test_expect_success 'whitespace=error-all, default rule' ' - apply_patch --whitespace=error-all && return 1 - test -s target && return 1 - : happy + test_must_fail apply_patch --whitespace=error-all && + ! test -s target ' diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh index 1176bcc..8d90634 100755 --- a/t/t4151-am-abort.sh +++ b/t/t4151-am-abort.sh @@ -20,7 +20,7 @@ test_expect_success setup ' echo $i >otherfile-$i && git add otherfile-$i && test_tick && - git commit -a -m $i || break + git commit -a -m $i || return 1 done && git format-patch --no-numbered initial && git checkout -b side initial && diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 5f2b290..1b2e981 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -113,11 +113,7 @@ test_expect_success 'diff-filter=M' ' actual=$(git log --pretty="format:%s" --diff-filter=M HEAD) && expect=$(echo second) && - test "$actual" = "$expect" || { - echo Oops - echo "Actual: $actual" - false - } + verbose test "$actual" = "$expect" ' @@ -125,11 +121,7 @@ test_expect_success 'diff-filter=D' ' actual=$(git log --pretty="format:%s" --diff-filter=D HEAD) && expect=$(echo sixth ; echo third) && - test "$actual" = "$expect" || { - echo Oops - echo "Actual: $actual" - false - } + verbose test "$actual" = "$expect" ' @@ -137,11 +129,7 @@ test_expect_success 'diff-filter=R' ' actual=$(git log -M --pretty="format:%s" --diff-filter=R HEAD) && expect=$(echo third) && - test "$actual" = "$expect" || { - echo Oops - echo "Actual: $actual" - false - } + verbose test "$actual" = "$expect" ' @@ -149,11 +137,7 @@ test_expect_success 'diff-filter=C' ' actual=$(git log -C -C --pretty="format:%s" --diff-filter=C HEAD) && expect=$(echo fourth) && - test "$actual" = "$expect" || { - echo Oops - echo "Actual: $actual" - false - } + verbose test "$actual" = "$expect" ' @@ -161,11 +145,7 @@ test_expect_success 'git log --follow' ' actual=$(git log --follow --pretty="format:%s" ichi) && expect=$(echo third ; echo second ; echo initial) && - test "$actual" = "$expect" || { - echo Oops - echo "Actual: $actual" - false - } + verbose test "$actual" = "$expect" ' @@ -481,7 +461,7 @@ test_expect_success 'log.decorate configuration' ' git log --oneline --no-decorate >actual && test_cmp expect.none actual && git log --oneline --decorate >actual && - test_cmp expect.short actual + test_cmp expect.short actual && test_unconfig log.decorate && git log --pretty=raw >expect.raw && @@ -887,4 +867,8 @@ test_expect_success GPG 'log --graph --show-signature for merged tag' ' grep "^| | gpg: Good signature" actual ' +test_expect_success 'log --graph --no-walk is forbidden' ' + test_must_fail git log --graph --no-walk +' + test_done diff --git a/t/t4207-log-decoration-colors.sh b/t/t4207-log-decoration-colors.sh index 925f577..f8008b6 100755 --- a/t/t4207-log-decoration-colors.sh +++ b/t/t4207-log-decoration-colors.sh @@ -44,15 +44,15 @@ test_expect_success setup ' ' cat >expected <<EOF -${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_HEAD}HEAD${c_reset}${c_commit},\ - ${c_tag}tag: v1.0${c_reset}${c_commit},\ - ${c_tag}tag: B${c_reset}${c_commit},\ - ${c_branch}master${c_reset}${c_commit})${c_reset} B -${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_tag}tag: A1${c_reset}${c_commit},\ - ${c_remoteBranch}other/master${c_reset}${c_commit})${c_reset} A1 -${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_stash}refs/stash${c_reset}${c_commit})${c_reset}\ +${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_HEAD}HEAD${c_reset}${c_commit} ->\ + ${c_reset}${c_branch}master${c_reset}${c_commit},\ + ${c_reset}${c_tag}tag: v1.0${c_reset}${c_commit},\ + ${c_reset}${c_tag}tag: B${c_reset}${c_commit})${c_reset} B +${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_tag}tag: A1${c_reset}${c_commit},\ + ${c_reset}${c_remoteBranch}other/master${c_reset}${c_commit})${c_reset} A1 +${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_stash}refs/stash${c_reset}${c_commit})${c_reset}\ On master: Changes to A.t -${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_tag}tag: A${c_reset}${c_commit})${c_reset} A +${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_tag}tag: A${c_reset}${c_commit})${c_reset} A EOF # We want log to show all, but the second parent to refs/stash is irrelevant diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh index 0901b30..4451127 100755 --- a/t/t4211-line-log.sh +++ b/t/t4211-line-log.sh @@ -54,14 +54,14 @@ canned_test "-L 4:a.c -L 8,12:a.c simple" multiple-superset canned_test "-L 8,12:a.c -L 4:a.c simple" multiple-superset test_bad_opts "-L" "switch.*requires a value" -test_bad_opts "-L b.c" "argument.*not of the form" -test_bad_opts "-L 1:" "argument.*not of the form" +test_bad_opts "-L b.c" "argument not .start,end:file" +test_bad_opts "-L 1:" "argument not .start,end:file" test_bad_opts "-L 1:nonexistent" "There is no path" test_bad_opts "-L 1:simple" "There is no path" -test_bad_opts "-L '/foo:b.c'" "argument.*not of the form" +test_bad_opts "-L '/foo:b.c'" "argument not .start,end:file" test_bad_opts "-L 1000:b.c" "has only.*lines" test_bad_opts "-L 1,1000:b.c" "has only.*lines" -test_bad_opts "-L :b.c" "argument.*not of the form" +test_bad_opts "-L :b.c" "argument not .start,end:file" test_bad_opts "-L :foo:b.c" "no match" test_expect_success '-L X (X == nlines)' ' diff --git a/t/t4212-log-corrupt.sh b/t/t4212-log-corrupt.sh index 67bd8ec..22aa8b7 100755 --- a/t/t4212-log-corrupt.sh +++ b/t/t4212-log-corrupt.sh @@ -61,7 +61,7 @@ test_expect_success 'unparsable dates produce sentinel value' ' test_expect_success 'unparsable dates produce sentinel value (%ad)' ' commit=$(munge_author_date HEAD totally_bogus) && echo >expect && - git log -1 --format=%ad $commit >actual + git log -1 --format=%ad $commit >actual && test_cmp expect actual ' diff --git a/t/t5003-archive-zip.sh b/t/t5003-archive-zip.sh index c929db5..14744b2 100755 --- a/t/t5003-archive-zip.sh +++ b/t/t5003-archive-zip.sh @@ -33,6 +33,37 @@ check_zip() { test_expect_success UNZIP " validate file contents" " diff -r a ${dir_with_prefix}a " + + dir=eol_$1 + dir_with_prefix=$dir/$2 + extracted=${dir_with_prefix}a + original=a + + test_expect_success UNZIP " extract ZIP archive with EOL conversion" ' + (mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile) + ' + + test_expect_success UNZIP " validate that text files are converted" " + test_cmp_bin $extracted/text.cr $extracted/text.crlf && + test_cmp_bin $extracted/text.cr $extracted/text.lf + " + + test_expect_success UNZIP " validate that binary files are unchanged" " + test_cmp_bin $original/binary.cr $extracted/binary.cr && + test_cmp_bin $original/binary.crlf $extracted/binary.crlf && + test_cmp_bin $original/binary.lf $extracted/binary.lf + " + + test_expect_success UNZIP " validate that diff files are converted" " + test_cmp_bin $extracted/diff.cr $extracted/diff.crlf && + test_cmp_bin $extracted/diff.cr $extracted/diff.lf + " + + test_expect_success UNZIP " validate that -diff files are unchanged" " + test_cmp_bin $original/nodiff.cr $extracted/nodiff.cr && + test_cmp_bin $original/nodiff.crlf $extracted/nodiff.crlf && + test_cmp_bin $original/nodiff.lf $extracted/nodiff.lf + " } test_expect_success \ @@ -41,6 +72,18 @@ test_expect_success \ echo simple textfile >a/a && mkdir a/bin && cp /bin/sh a/bin && + printf "text\r" >a/text.cr && + printf "text\r\n" >a/text.crlf && + printf "text\n" >a/text.lf && + printf "text\r" >a/nodiff.cr && + printf "text\r\n" >a/nodiff.crlf && + printf "text\n" >a/nodiff.lf && + printf "\0\r" >a/binary.cr && + printf "\0\r\n" >a/binary.crlf && + printf "\0\n" >a/binary.lf && + printf "\0\r" >a/diff.cr && + printf "\0\r\n" >a/diff.crlf && + printf "\0\n" >a/diff.lf && printf "A\$Format:%s\$O" "$SUBSTFORMAT" >a/substfile1 && printf "A not substituted O" >a/substfile2 && (p=long_path_to_a_file && cd a && @@ -66,7 +109,9 @@ test_expect_success 'add files to repository' ' GIT_COMMITTER_DATE="2005-05-27 22:00" git commit -m initial ' -test_expect_success 'setup export-subst' ' +test_expect_success 'setup export-subst and diff attributes' ' + echo "a/nodiff.* -diff" >>.git/info/attributes && + echo "a/diff.* diff" >>.git/info/attributes && echo "substfile?" export-subst >>.git/info/attributes && git log --max-count=1 "--pretty=format:A${SUBSTFORMAT}O" HEAD \ >a/substfile1 diff --git a/t/t5004-archive-corner-cases.sh b/t/t5004-archive-corner-cases.sh index 305bcac..654adda 100755 --- a/t/t5004-archive-corner-cases.sh +++ b/t/t5004-archive-corner-cases.sh @@ -66,8 +66,10 @@ test_expect_success UNZIP 'zip archive of empty tree is empty' ' # handle the empty repo at all, making our later check of its exit code # a no-op). But we cannot do anything reasonable except skip the test # on such platforms anyway, and this is the moral equivalent. - "$GIT_UNZIP" "$TEST_DIRECTORY"/t5004/empty.zip - expect_code=$? + { + "$GIT_UNZIP" "$TEST_DIRECTORY"/t5004/empty.zip + expect_code=$? + } && git archive --format=zip HEAD >empty.zip && make_dir extract && diff --git a/t/t5100-mailinfo.sh b/t/t5100-mailinfo.sh index 60df10f..e97cfb2 100755 --- a/t/t5100-mailinfo.sh +++ b/t/t5100-mailinfo.sh @@ -34,7 +34,7 @@ do if test -f "$TEST_DIRECTORY"/t5100/msg$mail--no-inbody-headers then check_mailinfo $mail --no-inbody-headers - fi + fi && if test -f "$TEST_DIRECTORY"/t5100/msg$mail--message-id then check_mailinfo $mail --message-id diff --git a/t/t5312-prune-corruption.sh b/t/t5312-prune-corruption.sh new file mode 100755 index 0000000..8e98b44 --- /dev/null +++ b/t/t5312-prune-corruption.sh @@ -0,0 +1,114 @@ +#!/bin/sh + +test_description=' +Test pruning of repositories with minor corruptions. The goal +here is that we should always be erring on the side of safety. So +if we see, for example, a ref with a bogus name, it is OK either to +bail out or to proceed using it as a reachable tip, but it is _not_ +OK to proceed as if it did not exist. Otherwise we might silently +delete objects that cannot be recovered. +' +. ./test-lib.sh + +test_expect_success 'disable reflogs' ' + git config core.logallrefupdates false && + rm -rf .git/logs +' + +test_expect_success 'create history reachable only from a bogus-named ref' ' + test_tick && git commit --allow-empty -m master && + base=$(git rev-parse HEAD) && + test_tick && git commit --allow-empty -m bogus && + bogus=$(git rev-parse HEAD) && + git cat-file commit $bogus >saved && + echo $bogus >.git/refs/heads/bogus..name && + git reset --hard HEAD^ +' + +test_expect_success 'pruning does not drop bogus object' ' + test_when_finished "git hash-object -w -t commit saved" && + test_might_fail git prune --expire=now && + verbose git cat-file -e $bogus +' + +test_expect_success 'put bogus object into pack' ' + git tag reachable $bogus && + git repack -ad && + git tag -d reachable && + verbose git cat-file -e $bogus +' + +test_expect_success 'destructive repack keeps packed object' ' + test_might_fail git repack -Ad --unpack-unreachable=now && + verbose git cat-file -e $bogus && + test_might_fail git repack -ad && + verbose git cat-file -e $bogus +' + +# subsequent tests will have different corruptions +test_expect_success 'clean up bogus ref' ' + rm .git/refs/heads/bogus..name +' + +# We create two new objects here, "one" and "two". Our +# master branch points to "two", which is deleted, +# corrupting the repository. But we'd like to make sure +# that the otherwise unreachable "one" is not pruned +# (since it is the user's best bet for recovering +# from the corruption). +# +# Note that we also point HEAD somewhere besides "two", +# as we want to make sure we test the case where we +# pick up the reference to "two" by iterating the refs, +# not by resolving HEAD. +test_expect_success 'create history with missing tip commit' ' + test_tick && git commit --allow-empty -m one && + recoverable=$(git rev-parse HEAD) && + git cat-file commit $recoverable >saved && + test_tick && git commit --allow-empty -m two && + missing=$(git rev-parse HEAD) && + git checkout --detach $base && + rm .git/objects/$(echo $missing | sed "s,..,&/,") && + test_must_fail git cat-file -e $missing +' + +test_expect_success 'pruning with a corrupted tip does not drop history' ' + test_when_finished "git hash-object -w -t commit saved" && + test_might_fail git prune --expire=now && + verbose git cat-file -e $recoverable +' + +test_expect_success 'pack-refs does not silently delete broken loose ref' ' + git pack-refs --all --prune && + echo $missing >expect && + git rev-parse refs/heads/master >actual && + test_cmp expect actual +' + +# we do not want to count on running pack-refs to +# actually pack it, as it is perfectly reasonable to +# skip processing a broken ref +test_expect_success 'create packed-refs file with broken ref' ' + rm -f .git/refs/heads/master && + cat >.git/packed-refs <<-EOF && + $missing refs/heads/master + $recoverable refs/heads/other + EOF + echo $missing >expect && + git rev-parse refs/heads/master >actual && + test_cmp expect actual +' + +test_expect_success 'pack-refs does not silently delete broken packed ref' ' + git pack-refs --all --prune && + git rev-parse refs/heads/master >actual && + test_cmp expect actual +' + +test_expect_success 'pack-refs does not drop broken refs during deletion' ' + git update-ref -d refs/heads/other && + git rev-parse refs/heads/master >actual && + test_cmp expect actual +' + +test_done diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh index bd37f04..3a9b775 100755 --- a/t/t5500-fetch-pack.sh +++ b/t/t5500-fetch-pack.sh @@ -414,7 +414,7 @@ test_expect_success 'setup tests for the --stdin parameter' ' do git tag $head $head done && - cat >input <<-\EOF + cat >input <<-\EOF && refs/heads/C refs/heads/A refs/heads/D @@ -576,13 +576,16 @@ do do for h in host user@host user@[::1] user@::1 do - test_expect_success "fetch-pack --diag-url $p://$h/$r" ' - check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r" - ' - # "/~" -> "~" conversion - test_expect_success "fetch-pack --diag-url $p://$h/~$r" ' - check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r" - ' + for c in "" : + do + test_expect_success "fetch-pack --diag-url $p://$h$c/$r" ' + check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r" + ' + # "/~" -> "~" conversion + test_expect_success "fetch-pack --diag-url $p://$h$c/~$r" ' + check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r" + ' + done done for h in host User@host User@[::1] do diff --git a/t/t5503-tagfollow.sh b/t/t5503-tagfollow.sh index f30c038..4ca48f0 100755 --- a/t/t5503-tagfollow.sh +++ b/t/t5503-tagfollow.sh @@ -139,8 +139,8 @@ EOF ' test_expect_success 'new clone fetch master and tags' ' - git branch -D cat - rm -f $U + test_might_fail git branch -D cat && + rm -f $U && ( mkdir clone2 && cd clone2 && diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index 17c6330..7a8499c 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -579,7 +579,7 @@ test_expect_success 'update with arguments' ' cd one && for b in $(git branch -r) do - git branch -r -d $b || break + git branch -r -d $b || exit 1 done && git remote add manduca ../mirror && git remote add megaloprepus ../mirror && @@ -622,7 +622,7 @@ test_expect_success 'update default' ' cd one && for b in $(git branch -r) do - git branch -r -d $b || break + git branch -r -d $b || exit 1 done && git config remote.drosophila.skipDefaultUpdate true && git remote update default && @@ -642,7 +642,7 @@ test_expect_success 'update default (overridden, with funny whitespace)' ' cd one && for b in $(git branch -r) do - git branch -r -d $b || break + git branch -r -d $b || exit 1 done && git config remotes.default "$(printf "\t drosophila \n")" && git remote update default && @@ -656,7 +656,7 @@ test_expect_success 'update (with remotes.default defined)' ' cd one && for b in $(git branch -r) do - git branch -r -d $b || break + git branch -r -d $b || exit 1 done && git config remotes.default "drosophila" && git remote update && diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index d78f320..0ba9db0 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh @@ -124,7 +124,7 @@ test_expect_success 'fetch --prune handles overlapping refspecs' ' git rev-parse origin/master && git rev-parse origin/pr/42 && - git config --unset-all remote.origin.fetch + git config --unset-all remote.origin.fetch && git config remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* && git config --add remote.origin.fetch refs/heads/*:refs/remotes/origin/* && @@ -596,7 +596,7 @@ test_configured_prune () { test_unconfig remote.origin.prune && git fetch && git rev-parse --verify refs/remotes/origin/newbranch - ) + ) && # now remove it git branch -d newbranch && diff --git a/t/t5512-ls-remote.sh b/t/t5512-ls-remote.sh index 321c3e5..3bd9759 100755 --- a/t/t5512-ls-remote.sh +++ b/t/t5512-ls-remote.sh @@ -103,8 +103,10 @@ test_expect_success 'confuses pattern as remote when no remote specified' ' ' test_expect_success 'die with non-2 for wrong repository even with --exit-code' ' - git ls-remote --exit-code ./no-such-repository ;# not && - status=$? && + { + git ls-remote --exit-code ./no-such-repository + status=$? + } && test $status != 2 && test $status != 0 ' diff --git a/t/t5514-fetch-multiple.sh b/t/t5514-fetch-multiple.sh index 0f81409..4b4b667 100755 --- a/t/t5514-fetch-multiple.sh +++ b/t/t5514-fetch-multiple.sh @@ -120,7 +120,7 @@ test_expect_success 'git fetch --all (skipFetchAll)' ' (cd test4 && for b in $(git branch -r) do - git branch -r -d $b || break + git branch -r -d $b || exit 1 done && git remote add three ../three && git config remote.three.skipFetchAll true && @@ -144,7 +144,7 @@ test_expect_success 'git fetch --multiple (ignoring skipFetchAll)' ' (cd test4 && for b in $(git branch -r) do - git branch -r -d $b || break + git branch -r -d $b || exit 1 done && git fetch --multiple one two three && git branch -r > output && diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index 630885d..8a5f236 100755 --- a/t/t5516-fetch-push.sh +++ b/t/t5516-fetch-push.sh @@ -1107,9 +1107,16 @@ test_expect_success 'fetch exact SHA1' ' git config uploadpack.allowtipsha1inwant true ) && - git fetch -v ../testrepo $the_commit:refs/heads/copy && - result=$(git rev-parse --verify refs/heads/copy) && - test "$the_commit" = "$result" + git fetch -v ../testrepo $the_commit:refs/heads/copy master:refs/heads/extra && + cat >expect <<-EOF && + $the_commit + $the_first_commit + EOF + { + git rev-parse --verify refs/heads/copy && + git rev-parse --verify refs/heads/extra + } >actual && + test_cmp expect actual ) ' @@ -1430,8 +1437,22 @@ test_expect_success 'receive.denyCurrentBranch = updateInstead' ' test $(git -C .. rev-parse HEAD^^) = $(git rev-parse HEAD) && git diff --quiet && test fifth = "$(cat path3)" - ) + ) && + # (5) push into void + rm -fr void && + git init void && + ( + cd void && + git config receive.denyCurrentBranch updateInstead + ) && + git push void master && + ( + cd void && + test $(git -C .. rev-parse master) = $(git rev-parse HEAD) && + git diff --quiet && + git diff --cached --quiet + ) ' test_expect_success 'updateInstead with push-to-checkout hook' ' @@ -1494,6 +1515,45 @@ test_expect_success 'updateInstead with push-to-checkout hook' ' test "$(cat path5)" = irrelevant && test "$(git diff --name-only --cached HEAD)" = path5 && test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD) + ) && + + # push into void + rm -fr void && + git init void && + ( + cd void && + git config receive.denyCurrentBranch updateInstead && + write_script .git/hooks/push-to-checkout <<-\EOF + if git rev-parse --quiet --verify HEAD + then + has_head=yes + echo >&2 updating from $(git rev-parse HEAD) + else + has_head=no + echo >&2 pushing into void + fi + echo >&2 updating to "$1" + + git update-index -q --refresh && + case "$has_head" in + yes) + git read-tree -u -m HEAD "$1" ;; + no) + git read-tree -u -m "$1" ;; + esac || { + status=$? + echo >&2 read-tree failed + exit $status + } + EOF + ) && + + git push void master && + ( + cd void && + git diff --quiet && + git diff --cached --quiet && + test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD) ) ' diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 227d293..7efd45b 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -9,36 +9,27 @@ modify () { mv "$2.x" "$2" } -D=`pwd` - test_expect_success setup ' - echo file >file && git add file && git commit -a -m original - ' test_expect_success 'pulling into void' ' - mkdir cloned && - cd cloned && - git init && - git pull .. -' - -cd "$D" - -test_expect_success 'checking the results' ' + git init cloned && + ( + cd cloned && + git pull .. + ) && test -f file && test -f cloned/file && test_cmp file cloned/file ' test_expect_success 'pulling into void using master:master' ' - mkdir cloned-uho && + git init cloned-uho && ( cd cloned-uho && - git init && git pull .. master:master ) && test -f file && @@ -71,7 +62,6 @@ test_expect_success 'pulling into void does not overwrite staged files' ' ) ' - test_expect_success 'pulling into void does not remove new staged files' ' git init cloned-staged-new && ( @@ -86,6 +76,15 @@ test_expect_success 'pulling into void does not remove new staged files' ' ) ' +test_expect_success 'pulling into void must not create an octopus' ' + git init cloned-octopus && + ( + cd cloned-octopus && + test_must_fail git pull .. master master && + ! test -f file + ) +' + test_expect_success 'test . as a remote' ' git branch copy master && diff --git a/t/t5524-pull-msg.sh b/t/t5524-pull-msg.sh index 8cccecc..c278ada 100755 --- a/t/t5524-pull-msg.sh +++ b/t/t5524-pull-msg.sh @@ -17,6 +17,9 @@ test_expect_success setup ' git commit -m "add bfile" ) && test_tick && test_tick && + echo "second" >afile && + git add afile && + git commit -m "second commit" && echo "original $dollar" >afile && git add afile && git commit -m "do not clobber $dollar signs" @@ -32,4 +35,18 @@ test_expect_success pull ' ) ' +test_expect_success '--log=1 limits shortlog length' ' +( + cd cloned && + git reset --hard HEAD^ && + test "$(cat afile)" = original && + test "$(cat bfile)" = added && + git pull --log=1 && + git log -3 && + git cat-file commit HEAD >result && + grep Dollar result && + ! grep "second commit" result +) +' + test_done diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh index ca5b027..a4532b0 100755 --- a/t/t5526-fetch-submodules.sh +++ b/t/t5526-fetch-submodules.sh @@ -216,7 +216,7 @@ test_expect_success "Recursion stops when no new submodule commits are fetched" head2=$(git rev-parse --short HEAD) && echo "Fetching submodule submodule" > expect.out.sub && echo "From $pwd/." > expect.err.sub && - echo " $head1..$head2 master -> origin/master" >> expect.err.sub + echo " $head1..$head2 master -> origin/master" >>expect.err.sub && head -2 expect.err >> expect.err.sub && ( cd downstream && @@ -315,7 +315,7 @@ test_expect_success "'--recurse-submodules=on-demand' doesn't recurse when no ne ) && head1=$(git rev-parse --short HEAD^) && git add subdir/deepsubmodule && - git commit -m "new deepsubmodule" + git commit -m "new deepsubmodule" && head2=$(git rev-parse --short HEAD) && echo "From $pwd/submodule" > ../expect.err.sub && echo " $head1..$head2 master -> origin/master" >> ../expect.err.sub @@ -337,7 +337,7 @@ test_expect_success "'--recurse-submodules=on-demand' recurses as deep as necess head2=$(git rev-parse --short HEAD) && tail -2 expect.err > expect.err.deepsub && echo "From $pwd/." > expect.err && - echo " $head1..$head2 master -> origin/master" >> expect.err + echo " $head1..$head2 master -> origin/master" >>expect.err && cat expect.err.sub >> expect.err && cat expect.err.deepsub >> expect.err && ( @@ -387,7 +387,7 @@ test_expect_success "'fetch.recurseSubmodules=on-demand' overrides global config git commit -m "new submodule" && head2=$(git rev-parse --short HEAD) && echo "From $pwd/." > expect.err.2 && - echo " $head1..$head2 master -> origin/master" >> expect.err.2 + echo " $head1..$head2 master -> origin/master" >>expect.err.2 && head -2 expect.err >> expect.err.2 && ( cd downstream && @@ -415,7 +415,7 @@ test_expect_success "'submodule.<sub>.fetchRecurseSubmodules=on-demand' override git commit -m "new submodule" && head2=$(git rev-parse --short HEAD) && echo "From $pwd/." > expect.err.2 && - echo " $head1..$head2 master -> origin/master" >> expect.err.2 + echo " $head1..$head2 master -> origin/master" >>expect.err.2 && head -2 expect.err >> expect.err.2 && ( cd downstream && diff --git a/t/t5528-push-default.sh b/t/t5528-push-default.sh index cc74519..73f4bb6 100755 --- a/t/t5528-push-default.sh +++ b/t/t5528-push-default.sh @@ -26,7 +26,7 @@ check_pushed_commit () { # $2 = expected target branch for the push # $3 = [optional] repo to check for actual output (repo1 by default) test_push_success () { - git ${1:+-c push.default="$1"} push && + git ${1:+-c} ${1:+push.default="$1"} push && check_pushed_commit HEAD "$2" "$3" } @@ -34,7 +34,7 @@ test_push_success () { # check that push fails and does not modify any remote branch test_push_failure () { git --git-dir=repo1 log --no-walk --format='%h %s' --all >expect && - test_must_fail git ${1:+-c push.default="$1"} push && + test_must_fail git ${1:+-c} ${1:+push.default="$1"} push && git --git-dir=repo1 log --no-walk --format='%h %s' --all >actual && test_cmp expect actual } diff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep-submodule-push.sh index 445bb5f..6507487 100755 --- a/t/t5531-deep-submodule-push.sh +++ b/t/t5531-deep-submodule-push.sh @@ -104,7 +104,7 @@ test_expect_success 'push fails when commit on multiple branches if one branch h ' test_expect_success 'push succeeds if submodule has no remote and is on the first superproject commit' ' - git init --bare a + git init --bare a && git clone a a1 && ( cd a1 && diff --git a/t/t5533-push-cas.sh b/t/t5533-push-cas.sh index ba20d83..c402d8d 100755 --- a/t/t5533-push-cas.sh +++ b/t/t5533-push-cas.sh @@ -14,7 +14,7 @@ setup_srcdst_basic () { } test_expect_success setup ' - : create template repository + # create template repository test_commit A && test_commit B && test_commit C @@ -159,7 +159,7 @@ test_expect_success 'cover everything with default force-with-lease (protected)' ( cd src && git branch naster master^ - ) + ) && git ls-remote src refs/heads/\* >expect && ( cd dst && @@ -174,7 +174,7 @@ test_expect_success 'cover everything with default force-with-lease (allowed)' ' ( cd src && git branch naster master^ - ) + ) && ( cd dst && git fetch && diff --git a/t/t5539-fetch-http-shallow.sh b/t/t5539-fetch-http-shallow.sh index b461188..37a4335 100755 --- a/t/t5539-fetch-http-shallow.sh +++ b/t/t5539-fetch-http-shallow.sh @@ -3,12 +3,6 @@ test_description='fetch/clone from a shallow clone over http' . ./test-lib.sh - -if test -n "$NO_CURL"; then - skip_all='skipping test, git built without http support' - test_done -fi - . "$TEST_DIRECTORY"/lib-httpd.sh start_httpd diff --git a/t/t5540-http-push-webdav.sh b/t/t5540-http-push-webdav.sh index 8d7b3c5..88ff5a4 100755 --- a/t/t5540-http-push-webdav.sh +++ b/t/t5540-http-push-webdav.sh @@ -169,7 +169,7 @@ test_expect_failure 'push to password-protected repository (no user in URL)' ' test_commit pw-nouser && set_askpass user@host pass@host && git push "$HTTPD_URL/auth/dumb/test_repo.git" HEAD && - expect_askpass both user@host + expect_askpass both user@host && git rev-parse --verify HEAD >expect && git --git-dir="$HTTPD_DOCUMENT_ROOT_PATH/auth/dumb/test_repo.git" \ rev-parse --verify HEAD >actual && diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh index d2c681e..fd7d06b 100755 --- a/t/t5541-http-push-smart.sh +++ b/t/t5541-http-push-smart.sh @@ -6,11 +6,6 @@ test_description='test smart pushing over http via http-backend' . ./test-lib.sh -if test -n "$NO_CURL"; then - skip_all='skipping test, git built without http support' - test_done -fi - ROOT_PATH="$PWD" . "$TEST_DIRECTORY"/lib-gpg.sh . "$TEST_DIRECTORY"/lib-httpd.sh @@ -158,7 +153,7 @@ test_http_push_nonff "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git \ test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper' ' # create a dissimilarly-named remote ref so that git is unable to match the # two refs (viz. local, remote) unless an explicit refspec is provided. - git push origin master:retsam + git push origin master:retsam && echo "change changed" > path2 && git commit -a -m path2 --amend && @@ -324,12 +319,6 @@ test_expect_success 'push into half-auth-complete requires password' ' test_cmp expect actual ' -run_with_limited_cmdline () { - (ulimit -s 128 && "$@") -} - -test_lazy_prereq CMDLINE_LIMIT 'run_with_limited_cmdline true' - test_expect_success CMDLINE_LIMIT 'push 2000 tags over http' ' sha1=$(git rev-parse HEAD) && test_seq 2000 | diff --git a/t/t5542-push-http-shallow.sh b/t/t5542-push-http-shallow.sh index 2a691e0..5165833 100755 --- a/t/t5542-push-http-shallow.sh +++ b/t/t5542-push-http-shallow.sh @@ -3,12 +3,6 @@ test_description='push from/to a shallow clone over http' . ./test-lib.sh - -if test -n "$NO_CURL"; then - say 'skipping test, git built without http support' - test_done -fi - . "$TEST_DIRECTORY"/lib-httpd.sh start_httpd diff --git a/t/t5550-http-fetch-dumb.sh b/t/t5550-http-fetch-dumb.sh index 2731ad4..87a7aa0 100755 --- a/t/t5550-http-fetch-dumb.sh +++ b/t/t5550-http-fetch-dumb.sh @@ -2,12 +2,6 @@ test_description='test dumb fetching over http via static file' . ./test-lib.sh - -if test -n "$NO_CURL"; then - skip_all='skipping test, git built without http support' - test_done -fi - . "$TEST_DIRECTORY"/lib-httpd.sh start_httpd @@ -15,7 +9,7 @@ test_expect_success 'setup repository' ' git config push.default matching && echo content1 >file && git add file && - git commit -m one + git commit -m one && echo content2 >file && git add file && git commit -m two @@ -184,8 +178,8 @@ test_expect_success 'fetch can handle previously-fetched .idx files' ' ' test_expect_success 'did not use upload-pack service' ' - grep '/git-upload-pack' <"$HTTPD_ROOT_PATH"/access.log >act - : >exp + test_might_fail grep '/git-upload-pack' <"$HTTPD_ROOT_PATH"/access.log >act && + : >exp && test_cmp exp act ' diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh index 6cbc12d..2b29311 100755 --- a/t/t5551-http-fetch-smart.sh +++ b/t/t5551-http-fetch-smart.sh @@ -2,12 +2,6 @@ test_description='test smart fetching over http via http-backend' . ./test-lib.sh - -if test -n "$NO_CURL"; then - skip_all='skipping test, git built without http support' - test_done -fi - . "$TEST_DIRECTORY"/lib-httpd.sh start_httpd @@ -83,7 +77,7 @@ test_expect_success 'clone http repository' ' test_expect_success 'fetch changes via http' ' echo content >>file && git commit -a -m two && - git push public + git push public && (cd clone && git pull) && test_cmp file clone/file ' @@ -169,7 +163,7 @@ test_expect_success 'GIT_SMART_HTTP can disable smart http' ' ' test_expect_success 'invalid Content-Type rejected' ' - test_must_fail git clone $HTTPD_URL/broken_smart/repo.git 2>actual + test_must_fail git clone $HTTPD_URL/broken_smart/repo.git 2>actual && grep "not valid:" actual ' @@ -209,14 +203,25 @@ test_expect_success 'cookies stored in http.cookiefile when http.savecookies set git config http.cookiefile cookies.txt && git config http.savecookies true && git ls-remote $HTTPD_URL/smart_cookies/repo.git master && - tail -3 cookies.txt > cookies_tail.txt + tail -3 cookies.txt >cookies_tail.txt && test_cmp expect_cookies.txt cookies_tail.txt ' -test_expect_success EXPENSIVE 'create 50,000 tags in the repo' ' +test_expect_success 'transfer.hiderefs works over smart-http' ' + test_commit hidden && + test_commit visible && + git push public HEAD^:refs/heads/a HEAD:refs/heads/b && + git --git-dir="$HTTPD_DOCUMENT_ROOT_PATH/repo.git" \ + config transfer.hiderefs refs/heads/a && + git clone --bare "$HTTPD_URL/smart/repo.git" hidden.git && + test_must_fail git -C hidden.git rev-parse --verify a && + git -C hidden.git rev-parse --verify b +' + +test_expect_success 'create 2,000 tags in the repo' ' ( cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" && - for i in `test_seq 50000` + for i in $(test_seq 2000) do echo "commit refs/heads/too-many-refs" echo "mark :$i" @@ -237,13 +242,22 @@ test_expect_success EXPENSIVE 'create 50,000 tags in the repo' ' ) ' -test_expect_success EXPENSIVE 'clone the 50,000 tag repo to check OS command line overflow' ' - git clone $HTTPD_URL/smart/repo.git too-many-refs && +test_expect_success CMDLINE_LIMIT \ + 'clone the 2,000 tag repo to check OS command line overflow' ' + run_with_limited_cmdline git clone $HTTPD_URL/smart/repo.git too-many-refs && ( cd too-many-refs && - test $(git for-each-ref refs/tags | wc -l) = 50000 + git for-each-ref refs/tags >actual && + test_line_count = 2000 actual ) ' +test_expect_success 'large fetch-pack requests can be split across POSTs' ' + GIT_CURL_VERBOSE=1 git -c http.postbuffer=65536 \ + clone --bare "$HTTPD_URL/smart/repo.git" split.git 2>err && + grep "^> POST" err >posts && + test_line_count = 2 posts +' + stop_httpd test_done diff --git a/t/t5561-http-backend.sh b/t/t5561-http-backend.sh index d23fb02..19afe96 100755 --- a/t/t5561-http-backend.sh +++ b/t/t5561-http-backend.sh @@ -2,12 +2,6 @@ test_description='test git-http-backend' . ./test-lib.sh - -if test -n "$NO_CURL"; then - skip_all='skipping test, git built without http support' - test_done -fi - . "$TEST_DIRECTORY"/lib-httpd.sh start_httpd diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh index 02b40b1..bfdaf75 100755 --- a/t/t5601-clone.sh +++ b/t/t5601-clone.sh @@ -296,6 +296,12 @@ setup_ssh_wrapper () { ' } +copy_ssh_wrapper_as () { + cp "$TRASH_DIRECTORY/ssh-wrapper" "$1" && + GIT_SSH="$1" && + export GIT_SSH +} + expect_ssh () { test_when_finished ' (cd "$TRASH_DIRECTORY" && rm -f ssh-expect && >ssh-output) @@ -332,9 +338,36 @@ test_expect_success !MINGW,!CYGWIN 'clone local path foo:bar' ' test_expect_success 'bracketed hostnames are still ssh' ' git clone "[myhost:123]:src" ssh-bracket-clone && - expect_ssh myhost '-p 123' src + expect_ssh "-p 123" myhost src +' + +test_expect_success 'uplink is not treated as putty' ' + copy_ssh_wrapper_as "$TRASH_DIRECTORY/uplink" && + git clone "[myhost:123]:src" ssh-bracket-clone-uplink && + expect_ssh "-p 123" myhost src +' + +test_expect_success 'plink is treated specially (as putty)' ' + copy_ssh_wrapper_as "$TRASH_DIRECTORY/plink" && + git clone "[myhost:123]:src" ssh-bracket-clone-plink-0 && + expect_ssh "-P 123" myhost src +' + +test_expect_success 'plink.exe is treated specially (as putty)' ' + copy_ssh_wrapper_as "$TRASH_DIRECTORY/plink.exe" && + git clone "[myhost:123]:src" ssh-bracket-clone-plink-1 && + expect_ssh "-P 123" myhost src +' + +test_expect_success 'tortoiseplink is like putty, with extra arguments' ' + copy_ssh_wrapper_as "$TRASH_DIRECTORY/tortoiseplink" && + git clone "[myhost:123]:src" ssh-bracket-clone-plink-2 && + expect_ssh "-batch -P 123" myhost src ' +# Reset the GIT_SSH environment variable for clone tests. +setup_ssh_wrapper + counter=0 # $1 url # $2 none|host @@ -387,14 +420,17 @@ do done #with ssh:// scheme -test_expect_success 'clone ssh://host.xz/home/user/repo' ' - test_clone_url "ssh://host.xz/home/user/repo" host.xz "/home/user/repo" -' - -# from home directory -test_expect_success 'clone ssh://host.xz/~repo' ' - test_clone_url "ssh://host.xz/~repo" host.xz "~repo" +#ignore trailing colon +for tcol in "" : +do + test_expect_success "clone ssh://host.xz$tcol/home/user/repo" ' + test_clone_url "ssh://host.xz$tcol/home/user/repo" host.xz /home/user/repo + ' + # from home directory + test_expect_success "clone ssh://host.xz$tcol/~repo" ' + test_clone_url "ssh://host.xz$tcol/~repo" host.xz "~repo" ' +done # with port number test_expect_success 'clone ssh://host.xz:22/home/user/repo' ' @@ -407,9 +443,9 @@ test_expect_success 'clone ssh://host.xz:22/~repo' ' ' #IPv6 -for tuah in ::1 [::1] user@::1 user@[::1] [user@::1] +for tuah in ::1 [::1] [::1]: user@::1 user@[::1] user@[::1]: [user@::1] [user@::1]: do - ehost=$(echo $tuah | tr -d "[]") + ehost=$(echo $tuah | sed -e "s/1]:/1]/ "| tr -d "[]") test_expect_success "clone ssh://$tuah/home/user/repo" " test_clone_url ssh://$tuah/home/user/repo $ehost /home/user/repo " diff --git a/t/t5709-clone-refspec.sh b/t/t5709-clone-refspec.sh index 6f1ea98..7ace253 100755 --- a/t/t5709-clone-refspec.sh +++ b/t/t5709-clone-refspec.sh @@ -147,7 +147,7 @@ test_expect_success '--single-branch with detached' ' git for-each-ref refs/remotes/origin | sed -e "/HEAD$/d" \ -e "s|/remotes/origin/|/heads/|" >../actual - ) + ) && # nothing >expect && test_cmp expect actual diff --git a/t/t6000-rev-list-misc.sh b/t/t6000-rev-list-misc.sh index 2602086..3e752ce 100755 --- a/t/t6000-rev-list-misc.sh +++ b/t/t6000-rev-list-misc.sh @@ -42,7 +42,7 @@ test_expect_success 'rev-list --objects with pathspecs and copied files' ' test_tick && git commit -m that && - ONE=$(git rev-parse HEAD:one) + ONE=$(git rev-parse HEAD:one) && git rev-list --objects HEAD two >output && grep "$ONE two/three" output && ! grep one output @@ -85,7 +85,7 @@ test_expect_success 'rev-list can show index objects' ' # - we do not show the root tree; since we updated the index, it # does not have a valid cache tree # - cat >expect <<-\EOF + cat >expect <<-\EOF && 8e4020bb5a8d8c873b25de15933e75cc0fc275df one d9d3a7417b9605cfd88ee6306b28dadc29e6ab08 only-in-index 9200b628cf9dc883a85a7abc8d6e6730baee589c two @@ -96,4 +96,8 @@ test_expect_success 'rev-list can show index objects' ' test_cmp expect actual ' +test_expect_success '--bisect and --first-parent can not be combined' ' + test_must_fail git rev-list --bisect --first-parent HEAD +' + test_done diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh index a02a45a..b77d4c9 100755 --- a/t/t6006-rev-list-format.sh +++ b/t/t6006-rev-list-format.sh @@ -45,7 +45,7 @@ test_expect_success 'setup' ' head2=$(git rev-parse --verify HEAD) && head2_short=$(git rev-parse --verify --short $head2) && tree2=$(git rev-parse --verify HEAD:) && - tree2_short=$(git rev-parse --verify --short $tree2) + tree2_short=$(git rev-parse --verify --short $tree2) && git config --unset i18n.commitEncoding ' @@ -358,10 +358,7 @@ test_expect_success 'empty email' ' test_tick && C=$(GIT_AUTHOR_EMAIL= git commit-tree HEAD^{tree} </dev/null) && A=$(git show --pretty=format:%an,%ae,%ad%n -s $C) && - test "$A" = "A U Thor,,Thu Apr 7 15:14:13 2005 -0700" || { - echo "Eh? $A" >failure - false - } + verbose test "$A" = "A U Thor,,Thu Apr 7 15:14:13 2005 -0700" ' test_expect_success 'del LF before empty (1)' ' diff --git a/t/t6012-rev-list-simplify.sh b/t/t6012-rev-list-simplify.sh index fde5e71..b89cd6b 100755 --- a/t/t6012-rev-list-simplify.sh +++ b/t/t6012-rev-list-simplify.sh @@ -95,10 +95,7 @@ check_outcome () { git log --pretty="$FMT" --parents $param | unnote >actual && sed -e "s/^.* \([^ ]*\) .*/\1/" >check <actual && - test_cmp expect check || { - cat actual - false - } + test_cmp expect check ' } @@ -121,10 +118,7 @@ test_expect_success 'full history simplification without parent' ' git log --pretty="$FMT" --full-history E -- lost | unnote >actual && sed -e "s/^.* \([^ ]*\) .*/\1/" >check <actual && - test_cmp expect check || { - cat actual - false - } + test_cmp expect check ' test_expect_success '--full-diff is not affected by --parents' ' diff --git a/t/t6014-rev-list-all.sh b/t/t6014-rev-list-all.sh index 991ab4a..c9bedd2 100755 --- a/t/t6014-rev-list-all.sh +++ b/t/t6014-rev-list-all.sh @@ -35,4 +35,8 @@ test_expect_success 'repack does not lose detached HEAD' ' ' +test_expect_success 'rev-list --graph --no-walk is forbidden' ' + test_must_fail git rev-list --graph --no-walk HEAD +' + test_done diff --git a/t/t6020-merge-df.sh b/t/t6020-merge-df.sh index 27c3d73..2af1bee 100755 --- a/t/t6020-merge-df.sh +++ b/t/t6020-merge-df.sh @@ -24,7 +24,7 @@ test_expect_success 'prepare repository' ' ' test_expect_success 'Merge with d/f conflicts' ' - test_expect_code 1 git merge "merge msg" B master + test_expect_code 1 git merge -m "merge msg" master ' test_expect_success 'F/D conflict' ' diff --git a/t/t6021-merge-criss-cross.sh b/t/t6021-merge-criss-cross.sh index d15b313..213deec 100755 --- a/t/t6021-merge-criss-cross.sh +++ b/t/t6021-merge-criss-cross.sh @@ -48,7 +48,7 @@ echo "1 " > file && git commit -m "C3" file && git branch C3 && -git merge "pre E3 merge" B A && +git merge -m "pre E3 merge" A && echo "1 2 3 changed in E3, branch B. New file size @@ -61,7 +61,7 @@ echo "1 " > file && git commit -m "E3" file && git checkout A && -git merge "pre D8 merge" A C3 && +git merge -m "pre D8 merge" C3 && echo "1 2 3 changed in C3, branch B @@ -73,7 +73,7 @@ echo "1 9" > file && git commit -m D8 file' -test_expect_success 'Criss-cross merge' 'git merge "final merge" A B' +test_expect_success 'Criss-cross merge' 'git merge -m "final merge" B' cat > file-expect <<EOF 1 diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh index a89dfbe..05ebba7 100755 --- a/t/t6022-merge-rename.sh +++ b/t/t6022-merge-rename.sh @@ -685,7 +685,7 @@ test_expect_success 'setup avoid unnecessary update, dir->(file,nothing)' ' git add -A && git commit -mA && - git checkout -b side + git checkout -b side && git rm -rf df && git commit -mB && @@ -716,7 +716,7 @@ test_expect_success 'setup avoid unnecessary update, modify/delete' ' git add -A && git commit -mA && - git checkout -b side + git checkout -b side && git rm -f file && git commit -m "Delete file" && @@ -745,7 +745,7 @@ test_expect_success 'setup avoid unnecessary update, rename/add-dest' ' git add -A && git commit -mA && - git checkout -b side + git checkout -b side && cp file newfile && git add -A && git commit -m "Add file copy" && diff --git a/t/t6026-merge-attr.sh b/t/t6026-merge-attr.sh index 5e43997..3c21938 100755 --- a/t/t6026-merge-attr.sh +++ b/t/t6026-merge-attr.sh @@ -11,7 +11,7 @@ test_expect_success setup ' for f in text binary union do - echo Initial >$f && git add $f || break + echo Initial >$f && git add $f || return 1 done && test_tick && git commit -m Initial && @@ -19,7 +19,7 @@ test_expect_success setup ' git branch side && for f in text binary union do - echo Master >>$f && git add $f || break + echo Master >>$f && git add $f || return 1 done && test_tick && git commit -m Master && @@ -27,7 +27,7 @@ test_expect_success setup ' git checkout side && for f in text binary union do - echo Side >>$f && git add $f || break + echo Side >>$f && git add $f || return 1 done && test_tick && git commit -m Side && diff --git a/t/t6028-merge-up-to-date.sh b/t/t6028-merge-up-to-date.sh index c518e9c..7763c1b 100755 --- a/t/t6028-merge-up-to-date.sh +++ b/t/t6028-merge-up-to-date.sh @@ -83,7 +83,7 @@ test_expect_success 'merge fast-forward octopus' ' git reset --hard c0 && test_tick && - git merge c1 c2 + git merge c1 c2 && expect=$(git rev-parse c2) && current=$(git rev-parse HEAD) && test "$expect" = "$current" diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index e6abe65..06b4868 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -52,15 +52,8 @@ test_expect_success 'bisect starts with only one bad' ' test_expect_success 'bisect does not start with only one good' ' git bisect reset && git bisect start && - git bisect good $HASH1 || return 1 - - if git bisect next - then - echo Oops, should have failed. - false - else - : - fi + git bisect good $HASH1 && + test_must_fail git bisect next ' test_expect_success 'bisect start with one bad and good' ' @@ -191,34 +184,27 @@ test_expect_success 'bisect start: no ".git/BISECT_START" if checkout error' ' # but $HASH2 is bad, # so we should find $HASH2 as the first bad commit test_expect_success 'bisect skip: successful result' ' + test_when_finished git bisect reset && git bisect reset && git bisect start $HASH4 $HASH1 && git bisect skip && git bisect bad > my_bisect_log.txt && - grep "$HASH2 is the first bad commit" my_bisect_log.txt && - git bisect reset + grep "$HASH2 is the first bad commit" my_bisect_log.txt ' # $HASH1 is good, $HASH4 is bad, we skip $HASH3 and $HASH2 # so we should not be able to tell the first bad commit # among $HASH2, $HASH3 and $HASH4 test_expect_success 'bisect skip: cannot tell between 3 commits' ' + test_when_finished git bisect reset && git bisect start $HASH4 $HASH1 && - git bisect skip || return 1 - - if git bisect skip > my_bisect_log.txt - then - echo Oops, should have failed. - false - else - test $? -eq 2 && - grep "first bad commit could be any of" my_bisect_log.txt && - ! grep $HASH1 my_bisect_log.txt && - grep $HASH2 my_bisect_log.txt && - grep $HASH3 my_bisect_log.txt && - grep $HASH4 my_bisect_log.txt && - git bisect reset - fi + git bisect skip && + test_expect_code 2 git bisect skip >my_bisect_log.txt && + grep "first bad commit could be any of" my_bisect_log.txt && + ! grep $HASH1 my_bisect_log.txt && + grep $HASH2 my_bisect_log.txt && + grep $HASH3 my_bisect_log.txt && + grep $HASH4 my_bisect_log.txt ' # $HASH1 is good, $HASH4 is bad, we skip $HASH3 @@ -226,22 +212,15 @@ test_expect_success 'bisect skip: cannot tell between 3 commits' ' # so we should not be able to tell the first bad commit # among $HASH3 and $HASH4 test_expect_success 'bisect skip: cannot tell between 2 commits' ' + test_when_finished git bisect reset && git bisect start $HASH4 $HASH1 && - git bisect skip || return 1 - - if git bisect good > my_bisect_log.txt - then - echo Oops, should have failed. - false - else - test $? -eq 2 && - grep "first bad commit could be any of" my_bisect_log.txt && - ! grep $HASH1 my_bisect_log.txt && - ! grep $HASH2 my_bisect_log.txt && - grep $HASH3 my_bisect_log.txt && - grep $HASH4 my_bisect_log.txt && - git bisect reset - fi + git bisect skip && + test_expect_code 2 git bisect good >my_bisect_log.txt && + grep "first bad commit could be any of" my_bisect_log.txt && + ! grep $HASH1 my_bisect_log.txt && + ! grep $HASH2 my_bisect_log.txt && + grep $HASH3 my_bisect_log.txt && + grep $HASH4 my_bisect_log.txt ' # $HASH1 is good, $HASH4 is both skipped and bad, we skip $HASH3 @@ -249,24 +228,18 @@ test_expect_success 'bisect skip: cannot tell between 2 commits' ' # so we should not be able to tell the first bad commit # among $HASH3 and $HASH4 test_expect_success 'bisect skip: with commit both bad and skipped' ' + test_when_finished git bisect reset && git bisect start && git bisect skip && git bisect bad && git bisect good $HASH1 && git bisect skip && - if git bisect good > my_bisect_log.txt - then - echo Oops, should have failed. - false - else - test $? -eq 2 && - grep "first bad commit could be any of" my_bisect_log.txt && - ! grep $HASH1 my_bisect_log.txt && - ! grep $HASH2 my_bisect_log.txt && - grep $HASH3 my_bisect_log.txt && - grep $HASH4 my_bisect_log.txt && - git bisect reset - fi + test_expect_code 2 git bisect good >my_bisect_log.txt && + grep "first bad commit could be any of" my_bisect_log.txt && + ! grep $HASH1 my_bisect_log.txt && + ! grep $HASH2 my_bisect_log.txt && + grep $HASH3 my_bisect_log.txt && + grep $HASH4 my_bisect_log.txt ' # We want to automatically find the commit that @@ -601,8 +574,7 @@ test_expect_success 'test bisection on bare repo - --no-checkout specified' ' git bisect bad $HASH4 && git bisect run eval \ "test \$(git rev-list BISECT_HEAD ^$HASH2 --max-count=1 | wc -l) = 0" \ - >../nocheckout.log && - git bisect reset + >../nocheckout.log ) && grep "$HASH3 is the first bad commit" nocheckout.log ' @@ -617,8 +589,7 @@ test_expect_success 'test bisection on bare repo - --no-checkout defaulted' ' git bisect bad $HASH4 && git bisect run eval \ "test \$(git rev-list BISECT_HEAD ^$HASH2 --max-count=1 | wc -l) = 0" \ - >../defaulted.log && - git bisect reset + >../defaulted.log ) && grep "$HASH3 is the first bad commit" defaulted.log ' @@ -642,14 +613,14 @@ test_expect_success 'broken branch creation' ' mkdir missing && :> missing/MISSING && git add missing/MISSING && - git commit -m "6(broken): Added file that will be deleted" + git commit -m "6(broken): Added file that will be deleted" && git tag BROKEN_HASH6 && add_line_into_file "7(broken): second line on a broken branch" hello2 && git tag BROKEN_HASH7 && add_line_into_file "8(broken): third line on a broken branch" hello2 && git tag BROKEN_HASH8 && git rm missing/MISSING && - git commit -m "9(broken): Remove missing file" + git commit -m "9(broken): Remove missing file" && git tag BROKEN_HASH9 && rm .git/objects/39/f7e61a724187ab767d2e08442d9b6b9dab587d ' diff --git a/t/t6032-merge-large-rename.sh b/t/t6032-merge-large-rename.sh index 15beecc..0f79268 100755 --- a/t/t6032-merge-large-rename.sh +++ b/t/t6032-merge-large-rename.sh @@ -28,10 +28,10 @@ make_text() { test_rename() { test_expect_success "rename ($1, $2)" ' - n='$1' - expect='$2' + n='$1' && + expect='$2' && git checkout -f master && - git branch -D test$n || true && + test_might_fail git branch -D test$n && git reset --hard initial && for i in $(count $n); do make_text $i initial initial >$i diff --git a/t/t6034-merge-rename-nocruft.sh b/t/t6034-merge-rename-nocruft.sh index 65be95f..89871aa 100755 --- a/t/t6034-merge-rename-nocruft.sh +++ b/t/t6034-merge-rename-nocruft.sh @@ -73,33 +73,12 @@ test_expect_success 'merge white into red (A->B,M->N)' \ ' git checkout -b red-white red && git merge white && - git write-tree >/dev/null || { - echo "BAD: merge did not complete" - return 1 - } - - test -f B || { - echo "BAD: B does not exist in working directory" - return 1 - } - test -f N || { - echo "BAD: N does not exist in working directory" - return 1 - } - test -f R || { - echo "BAD: R does not exist in working directory" - return 1 - } - - test -f A && { - echo "BAD: A still exists in working directory" - return 1 - } - test -f M && { - echo "BAD: M still exists in working directory" - return 1 - } - return 0 + git write-tree && + test_path_is_file B && + test_path_is_file N && + test_path_is_file R && + test_path_is_missing A && + test_path_is_missing M ' # This test broke in 8371234ecaaf6e14fe3f2082a855eff1bbd79ae9 @@ -108,32 +87,13 @@ test_expect_success 'merge blue into white (A->B, mod A, A untracked)' \ git checkout -b white-blue white && echo dirty >A && git merge blue && - git write-tree >/dev/null || { - echo "BAD: merge did not complete" - return 1 - } - - test -f A || { - echo "BAD: A does not exist in working directory" - return 1 - } - test `cat A` = dirty || { - echo "BAD: A content is wrong" - return 1 - } - test -f B || { - echo "BAD: B does not exist in working directory" - return 1 - } - test -f N || { - echo "BAD: N does not exist in working directory" - return 1 - } - test -f M && { - echo "BAD: M still exists in working directory" - return 1 - } - return 0 + git write-tree && + test_path_is_file A && + echo dirty >expect && + test_cmp expect A && + test_path_is_file B && + test_path_is_file N && + test_path_is_missing M ' test_done diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh index a86087b..9d6621c 100755 --- a/t/t6036-recursive-corner-cases.sh +++ b/t/t6036-recursive-corner-cases.sh @@ -86,7 +86,7 @@ test_expect_success 'setup criss-cross + rename merges with basic modification' rm -rf .git && git init && - ten="0 1 2 3 4 5 6 7 8 9" + ten="0 1 2 3 4 5 6 7 8 9" && for i in $ten do echo line $i in a sample file @@ -195,12 +195,7 @@ test_expect_success 'git detects differently handled merges conflict' ' git reset --hard && git checkout D^0 && - git merge -s recursive E^0 && { - echo "BAD: should have conflicted" - test "Incorrectly merged content" = "$(cat new_a)" && - echo "BAD: Silently accepted wrong content" - return 1 - } + test_must_fail git merge -s recursive E^0 && test 3 = $(git ls-files -s | wc -l) && test 3 = $(git ls-files -u | wc -l) && @@ -533,7 +528,7 @@ test_expect_success 'merge of E2 & D fails but has appropriate contents' ' test $(git rev-parse :3:a) = $(git rev-parse B:a) && test $(git rev-parse :2:a/file) = $(git rev-parse E2:a/file) && - test $(git rev-parse :1:a/file) = $(git rev-parse C:a/file) + test $(git rev-parse :1:a/file) = $(git rev-parse C:a/file) && test $(git rev-parse :0:ignore-me) = $(git rev-parse A:ignore-me) && test -f a~D^0 diff --git a/t/t6039-merge-ignorecase.sh b/t/t6039-merge-ignorecase.sh index a977653..531850d 100755 --- a/t/t6039-merge-ignorecase.sh +++ b/t/t6039-merge-ignorecase.sh @@ -15,7 +15,7 @@ test_expect_success 'merge with case-changing rename' ' >TestCase && git add TestCase && git commit -m "add TestCase" && - git tag baseline + git tag baseline && git checkout -b with-camel && >foo && git add foo && diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh index 7ac8fd0..3d5c238 100755 --- a/t/t6040-tracking-info.sh +++ b/t/t6040-tracking-info.sh @@ -12,10 +12,9 @@ advance () { } test_expect_success setup ' - for i in a b c; - do - advance $i || break - done && + advance a && + advance b && + advance c && git clone . test && ( cd test && diff --git a/t/t6111-rev-list-treesame.sh b/t/t6111-rev-list-treesame.sh index 88b84df..32474c2 100755 --- a/t/t6111-rev-list-treesame.sh +++ b/t/t6111-rev-list-treesame.sh @@ -58,7 +58,7 @@ test_expect_success setup ' git checkout master && test_tick && git merge --no-ff fiddler-branch && - note K + note K && test_commit "file=Part 1" file "Part 1" L && @@ -92,10 +92,7 @@ check_outcome () { git log --format="$FMT" $param | unnote >actual && sed -e "$munge_actual" <actual >check && - test_cmp expect check || { - cat actual - false - } + test_cmp expect check ' } diff --git a/t/t6132-pathspec-exclude.sh b/t/t6132-pathspec-exclude.sh index 62049be..e1e1b1f 100755 --- a/t/t6132-pathspec-exclude.sh +++ b/t/t6132-pathspec-exclude.sh @@ -30,7 +30,7 @@ test_expect_success 'exclude only should error out' ' ' test_expect_success 't_e_i() exclude sub' ' - git log --oneline --format=%s -- . ":(exclude)sub" >actual + git log --oneline --format=%s -- . ":(exclude)sub" >actual && cat <<EOF >expect && sub2/file file @@ -39,7 +39,7 @@ EOF ' test_expect_success 't_e_i() exclude sub/sub/file' ' - git log --oneline --format=%s -- . ":(exclude)sub/sub/file" >actual + git log --oneline --format=%s -- . ":(exclude)sub/sub/file" >actual && cat <<EOF >expect && sub2/file sub/sub/sub/file @@ -51,7 +51,7 @@ EOF ' test_expect_success 't_e_i() exclude sub using mnemonic' ' - git log --oneline --format=%s -- . ":!sub" >actual + git log --oneline --format=%s -- . ":!sub" >actual && cat <<EOF >expect && sub2/file file @@ -60,7 +60,7 @@ EOF ' test_expect_success 't_e_i() exclude :(icase)SUB' ' - git log --oneline --format=%s -- . ":(exclude,icase)SUB" >actual + git log --oneline --format=%s -- . ":(exclude,icase)SUB" >actual && cat <<EOF >expect && sub2/file file @@ -71,7 +71,7 @@ EOF test_expect_success 't_e_i() exclude sub2 from sub' ' ( cd sub && - git log --oneline --format=%s -- :/ ":/!sub2" >actual + git log --oneline --format=%s -- :/ ":/!sub2" >actual && cat <<EOF >expect && sub/sub/sub/file sub/file2 @@ -84,7 +84,7 @@ EOF ' test_expect_success 't_e_i() exclude sub/*file' ' - git log --oneline --format=%s -- . ":(exclude)sub/*file" >actual + git log --oneline --format=%s -- . ":(exclude)sub/*file" >actual && cat <<EOF >expect && sub2/file sub/file2 @@ -94,7 +94,7 @@ EOF ' test_expect_success 't_e_i() exclude :(glob)sub/*/file' ' - git log --oneline --format=%s -- . ":(exclude,glob)sub/*/file" >actual + git log --oneline --format=%s -- . ":(exclude,glob)sub/*/file" >actual && cat <<EOF >expect && sub2/file sub/sub/sub/file @@ -106,7 +106,7 @@ EOF ' test_expect_success 'm_p_d() exclude sub' ' - git ls-files -- . ":(exclude)sub" >actual + git ls-files -- . ":(exclude)sub" >actual && cat <<EOF >expect && file sub2/file @@ -115,7 +115,7 @@ EOF ' test_expect_success 'm_p_d() exclude sub/sub/file' ' - git ls-files -- . ":(exclude)sub/sub/file" >actual + git ls-files -- . ":(exclude)sub/sub/file" >actual && cat <<EOF >expect && file sub/file @@ -127,7 +127,7 @@ EOF ' test_expect_success 'm_p_d() exclude sub using mnemonic' ' - git ls-files -- . ":!sub" >actual + git ls-files -- . ":!sub" >actual && cat <<EOF >expect && file sub2/file @@ -136,7 +136,7 @@ EOF ' test_expect_success 'm_p_d() exclude :(icase)SUB' ' - git ls-files -- . ":(exclude,icase)SUB" >actual + git ls-files -- . ":(exclude,icase)SUB" >actual && cat <<EOF >expect && file sub2/file @@ -147,7 +147,7 @@ EOF test_expect_success 'm_p_d() exclude sub2 from sub' ' ( cd sub && - git ls-files -- :/ ":/!sub2" >actual + git ls-files -- :/ ":/!sub2" >actual && cat <<EOF >expect && ../file file @@ -160,7 +160,7 @@ EOF ' test_expect_success 'm_p_d() exclude sub/*file' ' - git ls-files -- . ":(exclude)sub/*file" >actual + git ls-files -- . ":(exclude)sub/*file" >actual && cat <<EOF >expect && file sub/file2 @@ -170,7 +170,7 @@ EOF ' test_expect_success 'm_p_d() exclude :(glob)sub/*/file' ' - git ls-files -- . ":(exclude,glob)sub/*/file" >actual + git ls-files -- . ":(exclude,glob)sub/*/file" >actual && cat <<EOF >expect && file sub/file diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh index 54b5744..2e2fb0e 100755 --- a/t/t6200-fmt-merge-msg.sh +++ b/t/t6200-fmt-merge-msg.sh @@ -194,7 +194,7 @@ test_expect_success '--log=5 with custom comment character' ' ' test_expect_success 'merge.log=0 disables shortlog' ' - echo "Merge branch ${apos}left${apos}" >expected + echo "Merge branch ${apos}left${apos}" >expected && git -c merge.log=0 fmt-merge-msg <.git/FETCH_HEAD >actual && test_cmp expected actual ' diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh index 69f11bd..7b56081 100755 --- a/t/t7001-mv.sh +++ b/t/t7001-mv.sh @@ -161,10 +161,7 @@ test_expect_success "Michael Cassar's test case" ' git mv papers/unsorted/Thesis.pdf papers/all-papers/moo-blah.pdf && T=`git write-tree` && - git ls-tree -r $T | grep partA/outline.txt || { - git ls-tree -r $T - (exit 1) - } + git ls-tree -r $T | verbose grep partA/outline.txt ' rm -fr papers partA path? diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh index 66643e4..855afda 100755 --- a/t/t7003-filter-branch.sh +++ b/t/t7003-filter-branch.sh @@ -394,4 +394,14 @@ test_expect_success 'replace submodule revision' ' test $orig_head != `git show-ref --hash --head HEAD` ' +test_expect_success 'filter commit message without trailing newline' ' + git reset --hard original && + commit=$(printf "no newline" | git commit-tree HEAD^{tree}) && + git update-ref refs/heads/no-newline $commit && + git filter-branch -f refs/heads/no-newline && + echo $commit >expect && + git rev-parse refs/heads/no-newline >actual && + test_cmp expect actual +' + test_done diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh index 35c805a..d1ff5c9 100755 --- a/t/t7004-tag.sh +++ b/t/t7004-tag.sh @@ -1180,8 +1180,8 @@ test_expect_success 'message in editor has initial comment: first line' ' test_expect_success \ 'message in editor has initial comment: remainder' ' # remove commented lines from the remainder -- should be empty - >rest.expect - sed -e 1d -e '/^#/d' <actual >rest.actual && + >rest.expect && + sed -e 1d -e "/^#/d" <actual >rest.actual && test_cmp rest.expect rest.actual ' @@ -1459,14 +1459,42 @@ test_expect_success 'invalid sort parameter in configuratoin' ' test_cmp expect actual ' +test_expect_success 'version sort with prerelease reordering' ' + git config --unset tag.sort && + git config versionsort.prereleaseSuffix -rc && + git tag foo1.6-rc1 && + git tag foo1.6-rc2 && + git tag -l --sort=version:refname "foo*" >actual && + cat >expect <<-\EOF && + foo1.3 + foo1.6-rc1 + foo1.6-rc2 + foo1.6 + foo1.10 + EOF + test_cmp expect actual +' + +test_expect_success 'reverse version sort with prerelease reordering' ' + git tag -l --sort=-version:refname "foo*" >actual && + cat >expect <<-\EOF && + foo1.10 + foo1.6 + foo1.6-rc2 + foo1.6-rc1 + foo1.3 + EOF + test_cmp expect actual +' + run_with_limited_stack () { (ulimit -s 128 && "$@") } -test_lazy_prereq ULIMIT 'run_with_limited_stack true' +test_lazy_prereq ULIMIT_STACK_SIZE 'run_with_limited_stack true' # we require ulimit, this excludes Windows -test_expect_success ULIMIT '--contains works in a deep repo' ' +test_expect_success ULIMIT_STACK_SIZE '--contains works in a deep repo' ' >expect && i=1 && while test $i -lt 8000 diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh index da958a8..947b690 100755 --- a/t/t7006-pager.sh +++ b/t/t7006-pager.sh @@ -396,7 +396,7 @@ test_expect_success TTY 'command-specific pager overrides core.pager' ' sane_unset PAGER GIT_PAGER && echo "foo:initial" >expect && >actual && - test_config core.pager "exit 1" + test_config core.pager "exit 1" && test_config pager.log "sed s/^/foo:/ >actual" && test_terminal git log --format=%s -1 && test_cmp expect actual diff --git a/t/t7007-show.sh b/t/t7007-show.sh index 1b824fe..42d3db6 100755 --- a/t/t7007-show.sh +++ b/t/t7007-show.sh @@ -124,4 +124,8 @@ test_expect_success '--quiet suppresses diff' ' test_cmp expect actual ' +test_expect_success 'show --graph is forbidden' ' + test_must_fail git show --graph HEAD +' + test_done diff --git a/t/t7009-filter-branch-null-sha1.sh b/t/t7009-filter-branch-null-sha1.sh index a997f7a..c27f90f 100755 --- a/t/t7009-filter-branch-null-sha1.sh +++ b/t/t7009-filter-branch-null-sha1.sh @@ -13,7 +13,7 @@ test_expect_success 'setup: a commit with a bogus null sha1 in the tree' ' { git ls-tree HEAD && printf "160000 commit $_z40\\tbroken\\n" - } >broken-tree + } >broken-tree && echo "add broken entry" >msg && tree=$(git mktree <broken-tree) && diff --git a/t/t7061-wtstatus-ignore.sh b/t/t7061-wtstatus-ignore.sh index 460789b..cdc0747 100755 --- a/t/t7061-wtstatus-ignore.sh +++ b/t/t7061-wtstatus-ignore.sh @@ -20,6 +20,15 @@ test_expect_success 'status untracked directory with --ignored' ' test_cmp expected actual ' +test_expect_success 'same with gitignore starting with BOM' ' + printf "\357\273\277ignored\n" >.gitignore && + mkdir -p untracked && + : >untracked/ignored && + : >untracked/uncommitted && + git status --porcelain --ignored >actual && + test_cmp expected actual +' + cat >expected <<\EOF ?? .gitignore ?? actual diff --git a/t/t7201-co.sh b/t/t7201-co.sh index eae9e5a..8859236 100755 --- a/t/t7201-co.sh +++ b/t/t7201-co.sh @@ -88,14 +88,10 @@ test_expect_success "checkout with unrelated dirty tree without -m" ' git checkout -f master && fill 0 1 2 3 4 5 6 7 8 >same && - cp same kept + cp same kept && git checkout side >messages && - test_cmp same kept - (cat > messages.expect <<EOF -M same -EOF -) && - touch messages.expect && + test_cmp same kept && + printf "M\t%s\n" same >messages.expect && test_cmp messages.expect messages ' @@ -109,10 +105,7 @@ test_expect_success "checkout -m with dirty tree" ' test "$(git symbolic-ref HEAD)" = "refs/heads/side" && - (cat >expect.messages <<EOF -M one -EOF -) && + printf "M\t%s\n" one >expect.messages && test_cmp expect.messages messages && fill "M one" "A three" "D two" >expect.master && @@ -409,12 +402,12 @@ test_expect_success \ test_expect_success \ 'checkout w/autosetupmerge=always sets up tracking' ' + test_when_finished git config branch.autosetupmerge false && git config branch.autosetupmerge always && git checkout master && git checkout -b track2 && test "$(git config branch.track2.remote)" && - test "$(git config branch.track2.merge)" - git config branch.autosetupmerge false' + test "$(git config branch.track2.merge)"' test_expect_success 'checkout w/--track from non-branch HEAD fails' ' git checkout master^0 && @@ -591,7 +584,7 @@ test_expect_success 'checkout --conflict=merge, overriding config' ' ' test_expect_success 'checkout --conflict=diff3' ' - git config --unset merge.conflictstyle + test_unconfig merge.conflictstyle && setup_conflicting_index && echo "none of the above" >sample && echo ourside >expect && diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh index 04118ad..99be5d9 100755 --- a/t/t7300-clean.sh +++ b/t/t7300-clean.sh @@ -119,10 +119,7 @@ test_expect_success C_LOCALE_OUTPUT 'git clean with relative prefix' ' git clean -n ../src | sed -n -e "s|^Would remove ||p" ) && - test "$would_clean" = ../src/part3.c || { - echo "OOps <$would_clean>" - false - } + verbose test "$would_clean" = ../src/part3.c ' test_expect_success C_LOCALE_OUTPUT 'git clean with absolute path' ' @@ -134,10 +131,7 @@ test_expect_success C_LOCALE_OUTPUT 'git clean with absolute path' ' git clean -n "$(pwd)/../src" | sed -n -e "s|^Would remove ||p" ) && - test "$would_clean" = ../src/part3.c || { - echo "OOps <$would_clean>" - false - } + verbose test "$would_clean" = ../src/part3.c ' test_expect_success 'git clean with out of work tree relative path' ' diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 5811a98..540771c 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -766,7 +766,7 @@ test_expect_success 'moving the superproject does not break submodules' ' ( cd addtest && git submodule status >expect - ) + ) && mv addtest addtest2 && ( cd addtest2 && @@ -987,7 +987,7 @@ test_expect_success 'submodule with UTF-8 name' ' test_expect_success 'submodule add clone shallow submodule' ' mkdir super && - pwd=$(pwd) + pwd=$(pwd) && ( cd super && git init && diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index 29d3d2c..dda3929 100755 --- a/t/t7406-submodule-update.sh +++ b/t/t7406-submodule-update.sh @@ -754,7 +754,7 @@ test_expect_success SYMLINKS 'submodule update can handle symbolic links in pwd' test_expect_success 'submodule update clone shallow submodule' ' git clone cloned super3 && - pwd=$(pwd) + pwd=$(pwd) && (cd super3 && sed -e "s#url = ../#url = file://$pwd/#" <.gitmodules >.gitmodules.tmp && mv -f .gitmodules.tmp .gitmodules && diff --git a/t/t7410-submodule-checkout-to.sh b/t/t7410-submodule-checkout-to.sh new file mode 100755 index 0000000..8f30aed --- /dev/null +++ b/t/t7410-submodule-checkout-to.sh @@ -0,0 +1,50 @@ +#!/bin/sh + +test_description='Combination of submodules and multiple workdirs' + +. ./test-lib.sh + +base_path=$(pwd -P) + +test_expect_success 'setup: make origin' \ + 'mkdir -p origin/sub && ( cd origin/sub && git init && + echo file1 >file1 && + git add file1 && + git commit -m file1 ) && + mkdir -p origin/main && ( cd origin/main && git init && + git submodule add ../sub && + git commit -m "add sub" ) && + ( cd origin/sub && + echo file1updated >file1 && + git add file1 && + git commit -m "file1 updated" ) && + ( cd origin/main/sub && git pull ) && + ( cd origin/main && + git add sub && + git commit -m "sub updated" )' + +test_expect_success 'setup: clone' \ + 'mkdir clone && ( cd clone && + git clone --recursive "$base_path/origin/main")' + +rev1_hash_main=$(git --git-dir=origin/main/.git show --pretty=format:%h -q "HEAD~1") +rev1_hash_sub=$(git --git-dir=origin/sub/.git show --pretty=format:%h -q "HEAD~1") + +test_expect_success 'checkout main' \ + 'mkdir default_checkout && + (cd clone/main && + git checkout --to "$base_path/default_checkout/main" "$rev1_hash_main")' + +test_expect_failure 'can see submodule diffs just after checkout' \ + '(cd default_checkout/main && git diff --submodule master"^!" | grep "file1 updated")' + +test_expect_success 'checkout main and initialize independed clones' \ + 'mkdir fully_cloned_submodule && + (cd clone/main && + git checkout --to "$base_path/fully_cloned_submodule/main" "$rev1_hash_main") && + (cd fully_cloned_submodule/main && git submodule update)' + +test_expect_success 'can see submodule diffs after independed cloning' \ + '(cd fully_cloned_submodule/main && git diff --submodule master"^!" | grep "file1 updated")' + +test_done diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh index 051489e..2e0d557 100755 --- a/t/t7502-commit.sh +++ b/t/t7502-commit.sh @@ -370,7 +370,7 @@ exit 0 EOF test_expect_success !AUTOIDENT 'do not fire editor when committer is bogus' ' - >.git/result + >.git/result && >expect && echo >>negative && diff --git a/t/t7508-status.sh b/t/t7508-status.sh index 8ed5788..c3ed7cb 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -66,6 +66,12 @@ strip_comments () { rm "$1" && mv "$1".tmp "$1" } +cat >.gitignore <<\EOF +.gitignore +expect* +output* +EOF + test_expect_success 'status --column' ' cat >expect <<\EOF && # On branch master @@ -83,8 +89,8 @@ test_expect_success 'status --column' ' # Untracked files: # (use "git add <file>..." to include in what will be committed) # -# dir1/untracked dir2/untracked output -# dir2/modified expect untracked +# dir1/untracked dir2/untracked +# dir2/modified untracked # EOF COLUMNS=50 git -c status.displayCommentPrefix=true status --column="column dense" >output && @@ -116,8 +122,6 @@ cat >expect <<\EOF # dir1/untracked # dir2/modified # dir2/untracked -# expect -# output # untracked # EOF @@ -133,6 +137,23 @@ test_expect_success 'status with status.displayCommentPrefix=false' ' test_i18ncmp expect output ' +test_expect_success 'status -v' ' + (cat expect && git diff --cached) >expect-with-v && + git status -v >output && + test_i18ncmp expect-with-v output +' + +test_expect_success 'status -v -v' ' + (cat expect && + echo "Changes to be committed:" && + git -c diff.mnemonicprefix=true diff --cached && + echo "--------------------------------------------------" && + echo "Changes not staged for commit:" && + git -c diff.mnemonicprefix=true diff) >expect-with-v && + git status -v -v >output && + test_i18ncmp expect-with-v output +' + test_expect_success 'setup fake editor' ' cat >.git/editor <<-\EOF && #! /bin/sh @@ -167,8 +188,6 @@ Untracked files: dir1/untracked dir2/modified dir2/untracked - expect - output untracked EOF @@ -186,8 +205,6 @@ A dir2/added ?? dir1/untracked ?? dir2/modified ?? dir2/untracked -?? expect -?? output ?? untracked EOF @@ -201,7 +218,7 @@ test_expect_success 'status -s' ' test_expect_success 'status with gitignore' ' { echo ".gitignore" && - echo "expect" && + echo "expect*" && echo "output" && echo "untracked" } >.gitignore && @@ -222,6 +239,7 @@ test_expect_success 'status with gitignore' ' !! dir1/untracked !! dir2/untracked !! expect + !! expect-with-v !! output !! untracked EOF @@ -253,6 +271,7 @@ Ignored files: dir1/untracked dir2/untracked expect + expect-with-v output untracked @@ -264,7 +283,7 @@ EOF test_expect_success 'status with gitignore (nothing untracked)' ' { echo ".gitignore" && - echo "expect" && + echo "expect*" && echo "dir2/modified" && echo "output" && echo "untracked" @@ -285,6 +304,7 @@ test_expect_success 'status with gitignore (nothing untracked)' ' !! dir2/modified !! dir2/untracked !! expect + !! expect-with-v !! output !! untracked EOF @@ -312,6 +332,7 @@ Ignored files: dir2/modified dir2/untracked expect + expect-with-v output untracked @@ -320,7 +341,11 @@ EOF test_i18ncmp expect output ' -rm -f .gitignore +cat >.gitignore <<\EOF +.gitignore +expect* +output* +EOF cat >expect <<\EOF ## master @@ -329,8 +354,6 @@ A dir2/added ?? dir1/untracked ?? dir2/modified ?? dir2/untracked -?? expect -?? output ?? untracked EOF @@ -408,7 +431,7 @@ test_expect_success 'status -s -uno' ' ' test_expect_success 'status -s (status.showUntrackedFiles no)' ' - git config status.showuntrackedfiles no + git config status.showuntrackedfiles no && git status -s >output && test_cmp expect output ' @@ -434,8 +457,6 @@ Untracked files: dir2/modified dir2/untracked dir3/ - expect - output untracked EOF @@ -444,7 +465,7 @@ EOF ' test_expect_success 'status (status.showUntrackedFiles normal)' ' - test_config status.showuntrackedfiles normal + test_config status.showuntrackedfiles normal && git status >output && test_i18ncmp expect output ' @@ -456,8 +477,6 @@ A dir2/added ?? dir2/modified ?? dir2/untracked ?? dir3/ -?? expect -?? output ?? untracked EOF test_expect_success 'status -s -unormal' ' @@ -466,7 +485,7 @@ test_expect_success 'status -s -unormal' ' ' test_expect_success 'status -s (status.showUntrackedFiles normal)' ' - git config status.showuntrackedfiles normal + git config status.showuntrackedfiles normal && git status -s >output && test_cmp expect output ' @@ -493,8 +512,6 @@ Untracked files: dir2/untracked dir3/untracked1 dir3/untracked2 - expect - output untracked EOF @@ -503,7 +520,7 @@ EOF ' test_expect_success 'status (status.showUntrackedFiles all)' ' - test_config status.showuntrackedfiles all + test_config status.showuntrackedfiles all && git status >output && test_i18ncmp expect output ' @@ -518,12 +535,10 @@ A dir2/added ?? dir1/untracked ?? dir2/modified ?? dir2/untracked -?? expect -?? output ?? untracked EOF test_expect_success 'status -s -uall' ' - git config --unset status.showuntrackedfiles + test_unconfig status.showuntrackedfiles && git status -s -uall >output && test_cmp expect output ' @@ -554,8 +569,6 @@ Untracked files: untracked ../dir2/modified ../dir2/untracked - ../expect - ../output ../untracked EOF @@ -569,8 +582,6 @@ A ../dir2/added ?? untracked ?? ../dir2/modified ?? ../dir2/untracked -?? ../expect -?? ../output ?? ../untracked EOF test_expect_success 'status -s with relative paths' ' @@ -586,8 +597,6 @@ A dir2/added ?? dir1/untracked ?? dir2/modified ?? dir2/untracked -?? expect -?? output ?? untracked EOF @@ -625,8 +634,6 @@ Untracked files: <BLUE>dir1/untracked<RESET> <BLUE>dir2/modified<RESET> <BLUE>dir2/untracked<RESET> - <BLUE>expect<RESET> - <BLUE>output<RESET> <BLUE>untracked<RESET> EOF @@ -647,8 +654,6 @@ cat >expect <<\EOF <BLUE>??<RESET> dir1/untracked <BLUE>??<RESET> dir2/modified <BLUE>??<RESET> dir2/untracked -<BLUE>??<RESET> expect -<BLUE>??<RESET> output <BLUE>??<RESET> untracked EOF @@ -676,8 +681,6 @@ cat >expect <<\EOF <BLUE>??<RESET> dir1/untracked <BLUE>??<RESET> dir2/modified <BLUE>??<RESET> dir2/untracked -<BLUE>??<RESET> expect -<BLUE>??<RESET> output <BLUE>??<RESET> untracked EOF @@ -694,8 +697,6 @@ A dir2/added ?? dir1/untracked ?? dir2/modified ?? dir2/untracked -?? expect -?? output ?? untracked EOF @@ -755,8 +756,6 @@ Untracked files: dir1/untracked dir2/modified dir2/untracked - expect - output untracked EOF @@ -772,8 +771,6 @@ A dir2/added ?? dir1/untracked ?? dir2/modified ?? dir2/untracked -?? expect -?? output ?? untracked EOF @@ -798,8 +795,6 @@ Untracked files: dir1/untracked dir2/ - expect - output untracked EOF @@ -848,8 +843,6 @@ Untracked files: dir1/untracked dir2/modified dir2/untracked - expect - output untracked EOF @@ -870,8 +863,6 @@ A sm ?? dir1/untracked ?? dir2/modified ?? dir2/untracked -?? expect -?? output ?? untracked EOF test_expect_success 'status -s submodule summary is disabled by default' ' @@ -913,8 +904,6 @@ Untracked files: dir1/untracked dir2/modified dir2/untracked - expect - output untracked EOF @@ -940,8 +929,6 @@ A sm ?? dir1/untracked ?? dir2/modified ?? dir2/untracked -?? expect -?? output ?? untracked EOF test_expect_success 'status -s submodule summary' ' @@ -964,8 +951,6 @@ Untracked files: dir1/untracked dir2/modified dir2/untracked - expect - output untracked no changes added to commit (use "git add" and/or "git commit -a") @@ -983,8 +968,6 @@ cat >expect <<EOF ?? dir1/untracked ?? dir2/modified ?? dir2/untracked -?? expect -?? output ?? untracked EOF test_expect_success 'status -s submodule summary (clean submodule)' ' @@ -1025,8 +1008,6 @@ Untracked files: dir1/untracked dir2/modified dir2/untracked - expect - output untracked EOF @@ -1080,8 +1061,6 @@ Untracked files: dir1/untracked dir2/modified dir2/untracked - expect - output untracked EOF @@ -1192,8 +1171,6 @@ Untracked files: dir1/untracked dir2/modified dir2/untracked - expect - output untracked EOF @@ -1254,8 +1231,6 @@ Untracked files: dir1/untracked dir2/modified dir2/untracked - expect - output untracked EOF @@ -1336,8 +1311,6 @@ cat > expect << EOF ; dir1/untracked ; dir2/modified ; dir2/untracked -; expect -; output ; untracked ; EOF @@ -1369,8 +1342,6 @@ Untracked files: dir1/untracked dir2/modified dir2/untracked - expect - output untracked no changes added to commit (use "git add" and/or "git commit -a") @@ -1400,8 +1371,6 @@ Untracked files: dir1/untracked dir2/modified dir2/untracked - expect - output untracked EOF diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh index 474dab3..13331e5 100755 --- a/t/t7510-signed-commit.sh +++ b/t/t7510-signed-commit.sh @@ -42,7 +42,7 @@ test_expect_success GPG 'create signed commits' ' git tag seventh-unsigned && test_tick && git rebase -f HEAD^^ && git tag sixth-signed HEAD^ && - git tag seventh-signed + git tag seventh-signed && echo 8 >file && test_tick && git commit -a -m eighth -SB7227189 && git tag eighth-signed-alt @@ -86,8 +86,8 @@ test_expect_success GPG 'show signed commit with signature' ' git show -s --show-signature initial >show && git verify-commit -v initial >verify.1 2>verify.2 && git cat-file commit initial >cat && - grep -v "gpg: " show >show.commit && - grep "gpg: " show >show.gpg && + grep -v -e "gpg: " -e "Warning: " show >show.commit && + grep -e "gpg: " -e "Warning: " show >show.gpg && grep -v "^ " cat | grep -v "^gpgsig " >cat.commit && test_cmp show.commit commit && test_cmp show.gpg verify.2 && diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index b164621..75c50ee 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -133,7 +133,7 @@ test_expect_success 'setup' ' test_tick && git commit -m "commit 3" && git tag c3 && - c3=$(git rev-parse HEAD) + c3=$(git rev-parse HEAD) && git reset --hard "$c0" && create_merge_msgs ' diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh index f768c90..c6c44ec 100755 --- a/t/t7601-merge-pull-config.sh +++ b/t/t7601-merge-pull-config.sh @@ -45,6 +45,14 @@ test_expect_success 'fast-forward pull succeeds with "true" in pull.ff' ' test "$(git rev-parse HEAD)" = "$(git rev-parse c1)" ' +test_expect_success 'pull.ff=true overrides merge.ff=false' ' + git reset --hard c0 && + test_config merge.ff false && + test_config pull.ff true && + git pull . c1 && + test "$(git rev-parse HEAD)" = "$(git rev-parse c1)" +' + test_expect_success 'fast-forward pull creates merge with "false" in pull.ff' ' git reset --hard c0 && test_config pull.ff false && diff --git a/t/t7612-merge-verify-signatures.sh b/t/t7612-merge-verify-signatures.sh index 21a0bf8..8ae69a6 100755 --- a/t/t7612-merge-verify-signatures.sh +++ b/t/t7612-merge-verify-signatures.sh @@ -29,7 +29,7 @@ test_expect_success GPG 'create signed commits' ' git checkout -b side-untrusted && echo 3 >baz && git add baz && - test_tick && git commit -SB7227189 -m "untrusted on side" + test_tick && git commit -SB7227189 -m "untrusted on side" && git checkout master ' diff --git a/t/t7701-repack-unpack-unreachable.sh b/t/t7701-repack-unpack-unreachable.sh index aad8a9c..b66e383 100755 --- a/t/t7701-repack-unpack-unreachable.sh +++ b/t/t7701-repack-unpack-unreachable.sh @@ -57,7 +57,7 @@ compare_mtimes () { read tref rest && while read t rest; do - test "$tref" = "$t" || break + test "$tref" = "$t" || return 1 done } diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh index 2a3469b..16f1442 100755 --- a/t/t8003-blame-corner-cases.sh +++ b/t/t8003-blame-corner-cases.sh @@ -26,7 +26,7 @@ test_expect_success setup ' cat one >uno && mv two dos && cat one >>tres && - echo DEF >>mouse + echo DEF >>mouse && git add uno dos tres mouse && test_tick && GIT_AUTHOR_NAME=Second git commit -a -m Second && @@ -153,15 +153,15 @@ test_expect_success 'blame path that used to be a directory' ' ' test_expect_success 'blame to a commit with no author name' ' - TREE=`git rev-parse HEAD:` - cat >badcommit <<EOF + TREE=`git rev-parse HEAD:` && + cat >badcommit <<EOF && tree $TREE author <noname> 1234567890 +0000 committer David Reiss <dreiss@facebook.com> 1234567890 +0000 some message EOF - COMMIT=`git hash-object -t commit -w badcommit` + COMMIT=`git hash-object -t commit -w badcommit` && git --no-pager blame $COMMIT -- uno >/dev/null ' @@ -191,12 +191,24 @@ test_expect_success 'indent of line numbers, ten lines' ' test $(grep -c " " actual) = 9 ' -test_expect_success 'blaming files with CRLF newlines' ' +test_expect_success 'setup file with CRLF newlines' ' git config core.autocrlf false && - printf "testcase\r\n" >crlffile && + printf "testcase\n" >crlffile && git add crlffile && git commit -m testcase && - git -c core.autocrlf=input blame crlffile >actual && + printf "testcase\r\n" >crlffile +' + +test_expect_success 'blame file with CRLF core.autocrlf true' ' + git config core.autocrlf true && + git blame crlffile >actual && + grep "A U Thor" actual +' + +test_expect_success 'blame file with CRLF attributes text' ' + git config core.autocrlf false && + echo "crlffile text" >.gitattributes && + git blame crlffile >actual && grep "A U Thor" actual ' diff --git a/t/t8008-blame-formats.sh b/t/t8008-blame-formats.sh index d15f8b3..29f84a6 100755 --- a/t/t8008-blame-formats.sh +++ b/t/t8008-blame-formats.sh @@ -5,7 +5,7 @@ test_description='blame output in various formats on a simple case' test_expect_success 'setup' ' echo a >file && - git add file + git add file && test_tick && git commit -m one && echo b >>file && diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 0513055..7be14a4 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -818,25 +818,19 @@ test_expect_success $PREREQ '--confirm=compose' ' ' test_expect_success $PREREQ 'confirm by default (due to cc)' ' - CONFIRM=$(git config --get sendemail.confirm) && + test_when_finished git config sendemail.confirm never && git config --unset sendemail.confirm && test_confirm - ret="$?" - git config sendemail.confirm ${CONFIRM:-never} - test $ret = "0" ' test_expect_success $PREREQ 'confirm by default (due to --compose)' ' - CONFIRM=$(git config --get sendemail.confirm) && + test_when_finished git config sendemail.confirm never && git config --unset sendemail.confirm && test_confirm --suppress-cc=all --compose - ret="$?" - git config sendemail.confirm ${CONFIRM:-never} - test $ret = "0" ' test_expect_success $PREREQ 'confirm detects EOF (inform assumes y)' ' - CONFIRM=$(git config --get sendemail.confirm) && + test_when_finished git config sendemail.confirm never && git config --unset sendemail.confirm && rm -fr outdir && git format-patch -2 -o outdir && @@ -846,13 +840,10 @@ test_expect_success $PREREQ 'confirm detects EOF (inform assumes y)' ' --to=nobody@example.com \ --smtp-server="$(pwd)/fake.sendmail" \ outdir/*.patch </dev/null - ret="$?" - git config sendemail.confirm ${CONFIRM:-never} - test $ret = "0" ' test_expect_success $PREREQ 'confirm detects EOF (auto causes failure)' ' - CONFIRM=$(git config --get sendemail.confirm) && + test_when_finished git config sendemail.confirm never && git config sendemail.confirm auto && GIT_SEND_EMAIL_NOTTY=1 && export GIT_SEND_EMAIL_NOTTY && @@ -861,13 +852,10 @@ test_expect_success $PREREQ 'confirm detects EOF (auto causes failure)' ' --to=nobody@example.com \ --smtp-server="$(pwd)/fake.sendmail" \ $patches </dev/null - ret="$?" - git config sendemail.confirm ${CONFIRM:-never} - test $ret = "0" ' test_expect_success $PREREQ 'confirm does not loop forever' ' - CONFIRM=$(git config --get sendemail.confirm) && + test_when_finished git config sendemail.confirm never && git config sendemail.confirm auto && GIT_SEND_EMAIL_NOTTY=1 && export GIT_SEND_EMAIL_NOTTY && @@ -876,9 +864,6 @@ test_expect_success $PREREQ 'confirm does not loop forever' ' --to=nobody@example.com \ --smtp-server="$(pwd)/fake.sendmail" \ $patches - ret="$?" - git config sendemail.confirm ${CONFIRM:-never} - test $ret = "0" ' test_expect_success $PREREQ 'utf8 Cc is rfc2047 encoded' ' @@ -1325,7 +1310,7 @@ test_expect_success $PREREQ 'sendemail.transferencoding=7bit fails on 8bit data' test_expect_success $PREREQ '--transfer-encoding overrides sendemail.transferEncoding' ' clean_fake_sendmail && - git config sendemail.transferEncoding 8bit + git config sendemail.transferEncoding 8bit && test_must_fail git send-email \ --transfer-encoding=7bit \ --smtp-server="$(pwd)/fake.sendmail" \ diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh index 13b179e..83f17e1 100755 --- a/t/t9104-git-svn-follow-parent.sh +++ b/t/t9104-git-svn-follow-parent.sh @@ -72,16 +72,18 @@ test_expect_success 'follow larger parent' ' svn import -m "import a larger parent" import "$svnrepo"/larger-parent && svn cp -m "hi" "$svnrepo"/larger-parent "$svnrepo"/another-larger && git svn init --minimize-url -i larger \ - "$svnrepo"/another-larger/trunk/thunk/bump/thud && + "$svnrepo"/larger-parent/trunk/thunk/bump/thud && git svn fetch -i larger && + git svn init --minimize-url -i larger-parent \ + "$svnrepo"/another-larger/trunk/thunk/bump/thud && + git svn fetch -i larger-parent && git rev-parse --verify refs/remotes/larger && git rev-parse --verify \ - refs/remotes/larger-parent/trunk/thunk/bump/thud && + refs/remotes/larger-parent && test "`git merge-base \ - refs/remotes/larger-parent/trunk/thunk/bump/thud \ + refs/remotes/larger-parent \ refs/remotes/larger`" = \ "`git rev-parse refs/remotes/larger`" - true ' test_expect_success 'follow higher-level parent' ' diff --git a/t/t9158-git-svn-mergeinfo.sh b/t/t9158-git-svn-mergeinfo.sh index 8c9539e..13f78f2 100755 --- a/t/t9158-git-svn-mergeinfo.sh +++ b/t/t9158-git-svn-mergeinfo.sh @@ -34,7 +34,7 @@ test_expect_success 'change svn:mergeinfo' ' ' test_expect_success 'verify svn:mergeinfo' ' - mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk) + mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk) && test "$mergeinfo" = "/branches/foo:1-10" ' @@ -46,7 +46,7 @@ test_expect_success 'change svn:mergeinfo multiline' ' ' test_expect_success 'verify svn:mergeinfo multiline' ' - mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk) + mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk) && test "$mergeinfo" = "/branches/bar:1-10 /branches/other:3-5,8,10-11" ' diff --git a/t/t9161-git-svn-mergeinfo-push.sh b/t/t9161-git-svn-mergeinfo-push.sh index 6cb0909..f113aca 100755 --- a/t/t9161-git-svn-mergeinfo-push.sh +++ b/t/t9161-git-svn-mergeinfo-push.sh @@ -24,7 +24,7 @@ test_expect_success 'propagate merge information' ' ' test_expect_success 'check svn:mergeinfo' ' - mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) + mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) && test "$mergeinfo" = "/branches/svnb2:3,8" ' @@ -34,7 +34,7 @@ test_expect_success 'merge another branch' ' ' test_expect_success 'check primary parent mergeinfo respected' ' - mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) + mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) && test "$mergeinfo" = "/branches/svnb2:3,8 /branches/svnb3:4,9" ' @@ -45,7 +45,7 @@ test_expect_success 'merge existing merge' ' ' test_expect_success "check both parents' mergeinfo respected" ' - mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) + mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) && test "$mergeinfo" = "/branches/svnb2:3,8 /branches/svnb3:4,9 /branches/svnb4:5-6,10-12 @@ -70,7 +70,7 @@ test_expect_success 'second forward merge' ' ' test_expect_success 'check new mergeinfo added' ' - mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) + mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) && test "$mergeinfo" = "/branches/svnb2:3,8,16-17 /branches/svnb3:4,9 /branches/svnb4:5-6,10-12 @@ -84,7 +84,7 @@ test_expect_success 'reintegration merge' ' ' test_expect_success 'check reintegration mergeinfo' ' - mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb4) + mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb4) && test "$mergeinfo" = "/branches/svnb1:2-4,7-9,13-18 /branches/svnb2:3,8,16-17 /branches/svnb3:4,9 diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index c538e0a..aac126f 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -1132,7 +1132,7 @@ test_expect_success \ compare_diff_raw expect actual' test_expect_success PIPE 'N: read and copy directory' ' - cat >expect <<-\EOF + cat >expect <<-\EOF && :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file3/newf :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100 file2/oldf file3/oldf EOF @@ -2228,7 +2228,7 @@ test_expect_success 'R: feature import-marks-if-exists' ' >expect && git fast-import --import-marks-if-exists=not_io.marks \ - --export-marks=io.marks <<-\EOF + --export-marks=io.marks <<-\EOF && feature import-marks-if-exists=io.marks EOF test_cmp expect io.marks @@ -2853,8 +2853,8 @@ test_expect_success 'S: notemodify with garbage after mark commit-ish must fail' # from # test_expect_success 'S: from with garbage after mark must fail' ' - # no && - git fast-import --import-marks=marks --export-marks=marks <<-EOF 2>err + test_must_fail \ + git fast-import --import-marks=marks --export-marks=marks <<-EOF 2>err && commit refs/heads/S2 mark :303 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE @@ -2865,9 +2865,6 @@ test_expect_success 'S: from with garbage after mark must fail' ' M 100644 :403 hello.c EOF - ret=$? && - echo returned $ret && - test $ret -ne 0 && # failed, but it created the commit # go create the commit, need it for merge test git fast-import --import-marks=marks --export-marks=marks <<-EOF && diff --git a/t/t9402-git-cvsserver-refs.sh b/t/t9402-git-cvsserver-refs.sh index 1e266ef..d00df08 100755 --- a/t/t9402-git-cvsserver-refs.sh +++ b/t/t9402-git-cvsserver-refs.sh @@ -496,7 +496,7 @@ test_expect_success 'check [cvswork3] diff' ' ' test_expect_success 'merge early [cvswork3] b3 with b1' ' - ( cd gitwork3 && git merge "message" HEAD b1 ) && + ( cd gitwork3 && git merge -m "message" b1 ) && git fetch gitwork3 b3:b3 && git tag v3merged b3 && git push --tags gitcvs.git b3:b3 diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh index e74b9ab..e94b2f1 100755 --- a/t/t9500-gitweb-standalone-no-errors.sh +++ b/t/t9500-gitweb-standalone-no-errors.sh @@ -297,7 +297,7 @@ test_expect_success 'setup incomplete lines' ' echo "Dominus regit me," >file && echo "incomplete line" | tr -d "\\012" >>file && git commit -a -m "Change incomplete line" && - git tag incomplete_lines_chg + git tag incomplete_lines_chg && echo "Dominus regit me," >file && git commit -a -m "Remove incomplete line" && git tag incomplete_lines_rem @@ -779,7 +779,10 @@ test_expect_success \ test_expect_success \ 'unborn HEAD: "summary" page (with "heads" subview)' \ - 'git checkout orphan_branch || git checkout --orphan orphan_branch && + '{ + git checkout orphan_branch || + git checkout --orphan orphan_branch + } && test_when_finished "git checkout master" && gitweb_run "p=.git;a=summary"' diff --git a/t/t9502-gitweb-standalone-parse-output.sh b/t/t9502-gitweb-standalone-parse-output.sh index 86dfee2..0796a43 100755 --- a/t/t9502-gitweb-standalone-parse-output.sh +++ b/t/t9502-gitweb-standalone-parse-output.sh @@ -145,9 +145,11 @@ test_expect_success 'forks: not skipped unless "forks" feature enabled' ' grep -q ">fork of .*<" gitweb.body ' -cat >>gitweb_config.perl <<\EOF && -$feature{'forks'}{'default'} = [1]; -EOF +test_expect_success 'enable forks feature' ' + cat >>gitweb_config.perl <<-\EOF + $feature{"forks"}{"default"} = [1]; + EOF +' test_expect_success 'forks: forks skipped if "forks" feature enabled' ' gitweb_run "a=project_list" && @@ -173,7 +175,7 @@ test_expect_success 'forks: can access forked repository' ' ' test_expect_success 'forks: project_index lists all projects (incl. forks)' ' - cat >expected <<-\EOF + cat >expected <<-\EOF && .git foo.bar.git foo.git diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh index 2bf142d..0aafd03 100755 --- a/t/t9801-git-p4-branch.sh +++ b/t/t9801-git-p4-branch.sh @@ -504,6 +504,112 @@ test_expect_success 'use-client-spec detect-branches skips files in branches' ' ) ' +test_expect_success 'restart p4d' ' + kill_p4d && + start_p4d +' + +# +# 1: //depot/branch1/base/file1 +# //depot/branch1/base/file2 +# //depot/branch1/base/dir/sub_file1 +# 2: integrate //depot/branch1/base/... -> //depot/branch2/base/... +# 3: //depot/branch1/base/file3 +# 4: //depot/branch1/base/file2 (edit) +# 5: integrate //depot/branch1/base/... -> //depot/branch3/base/... +# +# Note: the client view removes the "base" folder from the workspace +# and moves sub_file1 one level up. +test_expect_success 'add simple p4 branches with common base folder on each branch' ' + ( + cd "$cli" && + client_view "//depot/branch1/base/... //client/branch1/..." \ + "//depot/branch1/base/dir/sub_file1 //client/branch1/sub_file1" \ + "//depot/branch2/base/... //client/branch2/..." \ + "//depot/branch3/base/... //client/branch3/..." && + mkdir -p branch1 && + cd branch1 && + echo file1 >file1 && + echo file2 >file2 && + mkdir dir && + echo sub_file1 >sub_file1 && + p4 add file1 file2 sub_file1 && + p4 submit -d "Create branch1" && + p4 integrate //depot/branch1/base/... //depot/branch2/base/... && + p4 submit -d "Integrate branch2 from branch1" && + echo file3 >file3 && + p4 add file3 && + p4 submit -d "add file3 in branch1" && + p4 open file2 && + echo update >>file2 && + p4 submit -d "update file2 in branch1" && + p4 integrate //depot/branch1/base/... //depot/branch3/base/... && + p4 submit -d "Integrate branch3 from branch1" + ) +' + +# Configure branches through git-config and clone them. +# All files are tested to make sure branches were cloned correctly. +# Finally, make an update to branch1 on P4 side to check if it is imported +# correctly by git p4. +# git p4 is expected to use the client view to also not include the common +# "base" folder in the imported directory structure. +test_expect_success 'git p4 clone simple branches with base folder on server side' ' + test_create_repo "$git" && + ( + cd "$git" && + git config git-p4.branchList branch1:branch2 && + git config --add git-p4.branchList branch1:branch3 && + git p4 clone --dest=. --use-client-spec --detect-branches //depot@all && + git log --all --graph --decorate --stat && + git reset --hard p4/depot/branch1 && + test -f file1 && + test -f file2 && + test -f file3 && + test -f sub_file1 && + grep update file2 && + git reset --hard p4/depot/branch2 && + test -f file1 && + test -f file2 && + test ! -f file3 && + test -f sub_file1 && + ! grep update file2 && + git reset --hard p4/depot/branch3 && + test -f file1 && + test -f file2 && + test -f file3 && + test -f sub_file1 && + grep update file2 && + cd "$cli" && + cd branch1 && + p4 edit file2 && + echo file2_ >>file2 && + p4 submit -d "update file2 in branch1" && + cd "$git" && + git reset --hard p4/depot/branch1 && + git p4 rebase && + grep file2_ file2 + ) +' + +# Now update a file in one of the branches in git and submit to P4 +test_expect_success 'Update a file in git side and submit to P4 using client view' ' + test_when_finished cleanup_git && + ( + cd "$git" && + git reset --hard p4/depot/branch1 && + echo "client spec" >> file1 && + git add -u . && + git commit -m "update file1 in branch1" && + git config git-p4.skipSubmitEdit true && + git p4 submit --verbose && + cd "$cli" && + p4 sync ... && + cd branch1 && + grep "client spec" file1 + ) +' + test_expect_success 'kill p4d' ' kill_p4d ' diff --git a/t/t9814-git-p4-rename.sh b/t/t9814-git-p4-rename.sh index 95f4421..c89992c 100755 --- a/t/t9814-git-p4-rename.sh +++ b/t/t9814-git-p4-rename.sh @@ -132,6 +132,9 @@ test_expect_success 'detect copies' ' cd "$git" && git config git-p4.skipSubmitEdit true && + echo "file8" >>file2 && + git commit -a -m "Differentiate file2" && + git p4 submit && cp file2 file8 && git add file8 && git commit -a -m "Copy file2 to file8" && @@ -140,6 +143,10 @@ test_expect_success 'detect copies' ' p4 filelog //depot/file8 && p4 filelog //depot/file8 | test_must_fail grep -q "branch from" && + echo "file9" >>file2 && + git commit -a -m "Differentiate file2" && + git p4 submit && + cp file2 file9 && git add file9 && git commit -a -m "Copy file2 to file9" && @@ -149,25 +156,39 @@ test_expect_success 'detect copies' ' p4 filelog //depot/file9 && p4 filelog //depot/file9 | test_must_fail grep -q "branch from" && + echo "file10" >>file2 && + git commit -a -m "Differentiate file2" && + git p4 submit && + echo "file2" >>file2 && cp file2 file10 && git add file2 file10 && git commit -a -m "Modify and copy file2 to file10" && git diff-tree -r -C HEAD && + src=$(git diff-tree -r -C HEAD | sed 1d | sed 2d | cut -f2) && + test "$src" = file2 && git p4 submit && p4 filelog //depot/file10 && - p4 filelog //depot/file10 | grep -q "branch from //depot/file" && + p4 filelog //depot/file10 | grep -q "branch from //depot/file2" && + + echo "file11" >>file2 && + git commit -a -m "Differentiate file2" && + git p4 submit && cp file2 file11 && git add file11 && git commit -a -m "Copy file2 to file11" && git diff-tree -r -C --find-copies-harder HEAD && src=$(git diff-tree -r -C --find-copies-harder HEAD | sed 1d | cut -f2) && - test "$src" = file10 && + test "$src" = file2 && git config git-p4.detectCopiesHarder true && git p4 submit && p4 filelog //depot/file11 && - p4 filelog //depot/file11 | grep -q "branch from //depot/file" && + p4 filelog //depot/file11 | grep -q "branch from //depot/file2" && + + echo "file12" >>file2 && + git commit -a -m "Differentiate file2" && + git p4 submit && cp file2 file12 && echo "some text" >>file12 && @@ -177,15 +198,16 @@ test_expect_success 'detect copies' ' level=$(git diff-tree -r -C --find-copies-harder HEAD | sed 1d | cut -f1 | cut -d" " -f5 | sed "s/C0*//") && test -n "$level" && test "$level" -gt 0 && test "$level" -lt 98 && src=$(git diff-tree -r -C --find-copies-harder HEAD | sed 1d | cut -f2) && - case "$src" in - file10 | file11) : ;; # happy - *) false ;; # not - && + test "$src" = file2 && git config git-p4.detectCopies $(($level + 2)) && git p4 submit && p4 filelog //depot/file12 && p4 filelog //depot/file12 | test_must_fail grep -q "branch from" && + echo "file13" >>file2 && + git commit -a -m "Differentiate file2" && + git p4 submit && + cp file2 file13 && echo "different text" >>file13 && git add file13 && @@ -194,27 +216,19 @@ test_expect_success 'detect copies' ' level=$(git diff-tree -r -C --find-copies-harder HEAD | sed 1d | cut -f1 | cut -d" " -f5 | sed "s/C0*//") && test -n "$level" && test "$level" -gt 2 && test "$level" -lt 100 && src=$(git diff-tree -r -C --find-copies-harder HEAD | sed 1d | cut -f2) && - case "$src" in - file10 | file11 | file12) : ;; # happy - *) false ;; # not - && + test "$src" = file2 && git config git-p4.detectCopies $(($level - 2)) && git p4 submit && p4 filelog //depot/file13 && - p4 filelog //depot/file13 | grep -q "branch from //depot/file" + p4 filelog //depot/file13 | grep -q "branch from //depot/file2" ) ' # See if configurables can be set, and in particular if the run.move.allow # variable exists, which allows admins to disable the "p4 move" command. -test_expect_success 'p4 configure command and run.move.allow are available' ' - p4 configure show run.move.allow >out ; retval=$? && - test $retval = 0 && - { - egrep ^run.move.allow: out && - test_set_prereq P4D_HAVE_CONFIGURABLE_RUN_MOVE_ALLOW || - true - } || true +test_lazy_prereq P4D_HAVE_CONFIGURABLE_RUN_MOVE_ALLOW ' + p4 configure show run.move.allow >out && + egrep ^run.move.allow: out ' # If move can be disabled, turn it off and test p4 move handling diff --git a/t/t9816-git-p4-locked.sh b/t/t9816-git-p4-locked.sh index e71e543..d048bd3 100755 --- a/t/t9816-git-p4-locked.sh +++ b/t/t9816-git-p4-locked.sh @@ -35,13 +35,13 @@ test_expect_success 'edit with lock not taken' ' ) ' -test_expect_failure 'add with lock not taken' ' +test_expect_success 'add with lock not taken' ' test_when_finished cleanup_git && git p4 clone --dest="$git" //depot && ( cd "$git" && echo line1 >>add-lock-not-taken && - git add file2 && + git add add-lock-not-taken && git commit -m "add add-lock-not-taken" && git config git-p4.skipSubmitEdit true && git p4 submit --verbose @@ -107,7 +107,7 @@ test_expect_failure 'chmod with lock taken' ' ) ' -test_expect_failure 'copy with lock taken' ' +test_expect_success 'copy with lock taken' ' lock_in_another_client && test_when_finished cleanup_git && test_when_finished "cd \"$cli\" && p4 revert file2 && rm -f file2" && @@ -130,8 +130,8 @@ test_expect_failure 'move with lock taken' ' git p4 clone --dest="$git" //depot && ( cd "$git" && - git mv file1 file2 && - git commit -m "mv file1 to file2" && + git mv file1 file3 && + git commit -m "mv file1 to file3" && git config git-p4.skipSubmitEdit true && git config git-p4.detectRenames true && git p4 submit --verbose diff --git a/t/t9818-git-p4-block.sh b/t/t9818-git-p4-block.sh new file mode 100755 index 0000000..153b20a --- /dev/null +++ b/t/t9818-git-p4-block.sh @@ -0,0 +1,64 @@ +#!/bin/sh + +test_description='git p4 fetching changes in multiple blocks' + +. ./lib-git-p4.sh + +test_expect_success 'start p4d' ' + start_p4d +' + +test_expect_success 'Create a repo with ~100 changes' ' + ( + cd "$cli" && + >file.txt && + p4 add file.txt && + p4 submit -d "Add file.txt" && + for i in $(test_seq 0 9) + do + >outer$i.txt && + p4 add outer$i.txt && + p4 submit -d "Adding outer$i.txt" && + for j in $(test_seq 0 9) + do + p4 edit file.txt && + echo $i$j >file.txt && + p4 submit -d "Commit $i$j" || exit + done || exit + done + ) +' + +test_expect_success 'Clone the repo' ' + git p4 clone --dest="$git" --changes-block-size=10 --verbose //depot@all +' + +test_expect_success 'All files are present' ' + echo file.txt >expected && + test_write_lines outer0.txt outer1.txt outer2.txt outer3.txt outer4.txt >>expected && + test_write_lines outer5.txt outer6.txt outer7.txt outer8.txt outer9.txt >>expected && + ls "$git" >current && + test_cmp expected current +' + +test_expect_success 'file.txt is correct' ' + echo 99 >expected && + test_cmp expected "$git/file.txt" +' + +test_expect_success 'Correct number of commits' ' + (cd "$git" && git log --oneline) >log && + test_line_count = 111 log +' + +test_expect_success 'Previous version of file.txt is correct' ' + (cd "$git" && git checkout HEAD^^) && + echo 97 >expected && + test_cmp expected "$git/file.txt" +' + +test_expect_success 'kill p4d' ' + kill_p4d +' + +test_done diff --git a/t/t9819-git-p4-case-folding.sh b/t/t9819-git-p4-case-folding.sh new file mode 100755 index 0000000..78f1d0f --- /dev/null +++ b/t/t9819-git-p4-case-folding.sh @@ -0,0 +1,54 @@ +#!/bin/sh + +test_description='interaction with P4 case-folding' + +. ./lib-git-p4.sh + +test_expect_success 'start p4d with case folding enabled' ' + start_p4d -C1 +' + +test_expect_success 'Create a repo, name is lowercase' ' + ( + client_view "//depot/... //client/..." && + cd "$cli" && + mkdir -p lc UC && + >lc/file.txt && >UC/file.txt && + p4 add lc/file.txt UC/file.txt && + p4 submit -d "Add initial lc and UC repos" + ) +' + +test_expect_success 'Check p4 is in case-folding mode' ' + ( + cd "$cli" && + >lc/FILE.TXT && + p4 add lc/FILE.TXT && + test_must_fail p4 submit -d "Cannot add file differing only in case" lc/FILE.TXT + ) +' + +# Check we created the repo properly +test_expect_success 'Clone lc repo using lc name' ' + git p4 clone //depot/lc/... && + test_path_is_file lc/file.txt && + git p4 clone //depot/UC/... && + test_path_is_file UC/file.txt +' + +# The clone should fail, since there is no repo called LC, but because +# we have case-insensitive p4d enabled, it appears to go ahead and work, +# but leaves an empty git repo in place. +test_expect_failure 'Clone lc repo using uc name' ' + test_must_fail git p4 clone //depot/LC/... +' + +test_expect_failure 'Clone UC repo with lc name' ' + test_must_fail git p4 clone //depot/uc/... +' + +test_expect_success 'kill p4d' ' + kill_p4d +' + +test_done diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index f10a752..2ba62fb 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -351,6 +351,59 @@ test_expect_success '__gitcomp_nl - doesnt fail because of invalid variable name __gitcomp_nl "$invalid_variable_name" ' +test_expect_success '__git_remotes - list remotes from $GIT_DIR/remotes and from config file' ' + cat >expect <<-EOF && + remote_from_file_1 + remote_from_file_2 + remote_in_config_1 + remote_in_config_2 + EOF + test_when_finished "rm -rf .git/remotes" && + mkdir -p .git/remotes && + >.git/remotes/remote_from_file_1 && + >.git/remotes/remote_from_file_2 && + test_when_finished "git remote remove remote_in_config_1" && + git remote add remote_in_config_1 git://remote_1 && + test_when_finished "git remote remove remote_in_config_2" && + git remote add remote_in_config_2 git://remote_2 && + __git_remotes >actual && + test_cmp expect actual +' + +test_expect_success '__git_get_config_variables' ' + cat >expect <<-EOF && + name-1 + name-2 + EOF + test_config interesting.name-1 good && + test_config interesting.name-2 good && + test_config subsection.interesting.name-3 bad && + __git_get_config_variables interesting >actual && + test_cmp expect actual +' + +test_expect_success '__git_pretty_aliases' ' + cat >expect <<-EOF && + author + hash + EOF + test_config pretty.author "%an %ae" && + test_config pretty.hash %H && + __git_pretty_aliases >actual && + test_cmp expect actual +' + +test_expect_success '__git_aliases' ' + cat >expect <<-EOF && + ci + co + EOF + test_config alias.ci commit && + test_config alias.co checkout && + __git_aliases >actual && + test_cmp expect actual +' + test_expect_success 'basic' ' run_completion "git " && # built-in @@ -549,7 +602,7 @@ test_expect_success 'complete files' ' test_completion "git commit " "modified" && : TODO .gitignore should not be here && - test_completion "git ls-files " <<-\EOF + test_completion "git ls-files " <<-\EOF && .gitignore dir modified diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh index 51ecd3e..49d58e6 100755 --- a/t/t9903-bash-prompt.sh +++ b/t/t9903-bash-prompt.sh @@ -166,7 +166,7 @@ test_expect_success 'prompt - inside bare repository' ' ' test_expect_success 'prompt - interactive rebase' ' - printf " (b1|REBASE-i 2/3)" >expected + printf " (b1|REBASE-i 2/3)" >expected && write_script fake_editor.sh <<-\EOF && echo "exec echo" >"$1" echo "edit $(git log -1 --format="%h")" >>"$1" @@ -397,6 +397,17 @@ test_expect_success 'prompt - untracked files status indicator - untracked files test_cmp expected "$actual" ' +test_expect_success 'prompt - untracked files status indicator - untracked files outside cwd' ' + printf " (master %%)" >expected && + ( + mkdir -p ignored_dir && + cd ignored_dir && + GIT_PS1_SHOWUNTRACKEDFILES=y && + __git_ps1 >"$actual" + ) && + test_cmp expected "$actual" +' + test_expect_success 'prompt - untracked files status indicator - shell variable unset with config disabled' ' printf " (master)" >expected && test_config bash.showUntrackedFiles false && diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index 0698ce7..e8d3c0f 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -348,11 +348,18 @@ test_declared_prereq () { return 1 } +test_verify_prereq () { + test -z "$test_prereq" || + expr >/dev/null "$test_prereq" : '[A-Z0-9_,!]*$' || + error "bug in the test script: '$test_prereq' does not look like a prereq" +} + test_expect_failure () { test_start_ test "$#" = 3 && { test_prereq=$1; shift; } || test_prereq= test "$#" = 2 || error "bug in the test script: not 2 or 3 parameters to test-expect-failure" + test_verify_prereq export test_prereq if ! test_skip "$@" then @@ -372,6 +379,7 @@ test_expect_success () { test "$#" = 3 && { test_prereq=$1; shift; } || test_prereq= test "$#" = 2 || error "bug in the test script: not 2 or 3 parameters to test-expect-success" + test_verify_prereq export test_prereq if ! test_skip "$@" then @@ -400,6 +408,7 @@ test_external () { error >&5 "bug in the test script: not 3 or 4 parameters to test_external" descr="$1" shift + test_verify_prereq export test_prereq if ! test_skip "$descr" "$@" then @@ -478,7 +487,7 @@ test_external_without_stderr () { test_path_is_file () { if ! test -f "$1" then - echo "File $1 doesn't exist. $*" + echo "File $1 doesn't exist. $2" false fi } @@ -486,7 +495,7 @@ test_path_is_file () { test_path_is_dir () { if ! test -d "$1" then - echo "Directory $1 doesn't exist. $*" + echo "Directory $1 doesn't exist. $2" false fi } diff --git a/t/test-lib.sh b/t/test-lib.sh index c096778..39da9c2 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -152,10 +152,7 @@ unset UNZIP case $(echo $GIT_TRACE |tr "[A-Z]" "[a-z]") in 1|2|true) - echo "* warning: Some tests will not work if GIT_TRACE" \ - "is set as to trace on STDERR ! *" - echo "* warning: Please set GIT_TRACE to something" \ - "other than 1, 2 or true ! *" + GIT_TRACE=4 ;; esac @@ -232,6 +229,12 @@ do --root=*) root=$(expr "z$1" : 'z[^=]*=\(.*\)') shift ;; + --chain-lint) + GIT_TEST_CHAIN_LINT=1 + shift ;; + --no-chain-lint) + GIT_TEST_CHAIN_LINT=0 + shift ;; -x) trace=t verbose=t @@ -299,6 +302,7 @@ die () { GIT_EXIT_OK= trap 'die' EXIT +trap 'exit $?' INT # The user-facing functions are loaded from a separate file so that # test_perf subshells can have them too @@ -524,6 +528,16 @@ test_eval_ () { test_run_ () { test_cleanup=: expecting_failure=$2 + + if test "${GIT_TEST_CHAIN_LINT:-1}" != 0; then + # 117 is magic because it is unlikely to match the exit + # code of other programs + test_eval_ "(exit 117) && $1" + if test "$?" != 117; then + error "bug in the test script: broken &&-chain: $1" + fi + fi + setup_malloc_check test_eval_ "$1" eval_ret=$? @@ -1064,3 +1078,9 @@ test_lazy_prereq UNZIP ' "$GIT_UNZIP" -v test $? -ne 127 ' + +run_with_limited_cmdline () { + (ulimit -s 128 && "$@") +} + +test_lazy_prereq CMDLINE_LIMIT 'run_with_limited_cmdline true' diff --git a/templates/hooks--applypatch-msg.sample b/templates/hooks--applypatch-msg.sample index 8b2a2fe..a5d7b84 100755 --- a/templates/hooks--applypatch-msg.sample +++ b/templates/hooks--applypatch-msg.sample @@ -10,6 +10,6 @@ # To enable this hook, rename this file to "applypatch-msg". . git-sh-setup -test -x "$GIT_DIR/hooks/commit-msg" && - exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} +commitmsg="$(git rev-parse --git-path hooks/commit-msg)" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} : diff --git a/templates/hooks--pre-applypatch.sample b/templates/hooks--pre-applypatch.sample index b1f187c..4142082 100755 --- a/templates/hooks--pre-applypatch.sample +++ b/templates/hooks--pre-applypatch.sample @@ -9,6 +9,6 @@ # To enable this hook, rename this file to "pre-applypatch". . git-sh-setup -test -x "$GIT_DIR/hooks/pre-commit" && - exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} : diff --git a/thread-utils.c b/thread-utils.c index 97396a7..a2135e0 100644 --- a/thread-utils.c +++ b/thread-utils.c @@ -35,7 +35,23 @@ int online_cpus(void) if (!pstat_getdynamic(&psd, sizeof(psd), (size_t)1, 0)) return (int)psd.psd_proc_cnt; -#endif +#elif defined(HAVE_BSD_SYSCTL) && defined(HW_NCPU) + int mib[2]; + size_t len; + int cpucount; + + mib[0] = CTL_HW; +# ifdef HW_AVAILCPU + mib[1] = HW_AVAILCPU; + len = sizeof(cpucount); + if (!sysctl(mib, 2, &cpucount, &len, NULL, 0)) + return cpucount; +# endif /* HW_AVAILCPU */ + mib[1] = HW_NCPU; + len = sizeof(cpucount); + if (!sysctl(mib, 2, &cpucount, &len, NULL, 0)) + return cpucount; +#endif /* defined(HAVE_BSD_SYSCTL) && defined(HW_NCPU) */ #ifdef _SC_NPROCESSORS_ONLN if ((ncpus = (long)sysconf(_SC_NPROCESSORS_ONLN)) > 0) @@ -310,6 +310,7 @@ void trace_repo_setup(const char *prefix) prefix = "(null)"; trace_printf_key(&key, "setup: git_dir: %s\n", quote_crnl(get_git_dir())); + trace_printf_key(&key, "setup: git_common_dir: %s\n", quote_crnl(get_git_common_dir())); trace_printf_key(&key, "setup: worktree: %s\n", quote_crnl(git_work_tree)); trace_printf_key(&key, "setup: cwd: %s\n", quote_crnl(cwd)); trace_printf_key(&key, "setup: prefix: %s\n", quote_crnl(prefix)); @@ -214,16 +214,6 @@ static struct trailer_item *remove_first(struct trailer_item **first) return item; } -static int read_from_command(struct child_process *cp, struct strbuf *buf) -{ - if (run_command(cp)) - return error("running trailer command '%s' failed", cp->argv[0]); - if (strbuf_read(buf, cp->out, 1024) < 1) - return error("reading from trailer command '%s' failed", cp->argv[0]); - strbuf_trim(buf); - return 0; -} - static const char *apply_command(const char *command, const char *arg) { struct strbuf cmd = STRBUF_INIT; @@ -240,14 +230,16 @@ static const char *apply_command(const char *command, const char *arg) cp.argv = argv; cp.env = local_repo_env; cp.no_stdin = 1; - cp.out = -1; cp.use_shell = 1; - if (read_from_command(&cp, &buf)) { + if (capture_command(&cp, &buf, 1024)) { + error("running trailer command '%s' failed", cmd.buf); strbuf_release(&buf); result = xstrdup(""); - } else + } else { + strbuf_trim(&buf); result = strbuf_detach(&buf, NULL); + } strbuf_release(&cmd); return result; diff --git a/transport.c b/transport.c index 0694a7c..f080e93 100644 --- a/transport.c +++ b/transport.c @@ -117,7 +117,7 @@ static void insert_packed_refs(const char *packed_refs, struct ref **list) return; } - if (hexval(buffer[0]) > 0xf) + if (!isxdigit(buffer[0])) continue; len = strlen(buffer); if (len && buffer[len - 1] == '\n') @@ -283,7 +283,6 @@ static int write_one_ref(const char *name, const unsigned char *sha1, { struct strbuf *buf = data; int len = buf->len; - FILE *f; /* when called via for_each_ref(), flags is non-zero */ if (flags && !starts_with(name, "refs/heads/") && @@ -292,10 +291,9 @@ static int write_one_ref(const char *name, const unsigned char *sha1, strbuf_addstr(buf, name); if (safe_create_leading_directories(buf->buf) || - !(f = fopen(buf->buf, "w")) || - fprintf(f, "%s\n", sha1_to_hex(sha1)) < 0 || - fclose(f)) - return error("problems writing temporary file %s", buf->buf); + write_file(buf->buf, 0, "%s\n", sha1_to_hex(sha1))) + return error("problems writing temporary file %s: %s", + buf->buf, strerror(errno)); strbuf_setlen(buf, len); return 0; } @@ -519,7 +517,7 @@ static int fetch_refs_via_pack(struct transport *transport, int nr_heads, struct ref **to_fetch) { struct git_transport_data *data = transport->data; - const struct ref *refs; + struct ref *refs; char *dest = xstrdup(transport->url); struct fetch_pack_args args; struct ref *refs_tmp = NULL; @@ -552,15 +550,17 @@ static int fetch_refs_via_pack(struct transport *transport, &transport->pack_lockfile); close(data->fd[0]); close(data->fd[1]); - if (finish_connect(data->conn)) + if (finish_connect(data->conn)) { + free_refs(refs); refs = NULL; + } data->conn = NULL; data->got_remote_heads = 0; data->options.self_contained_and_connected = args.self_contained_and_connected; free_refs(refs_tmp); - + free_refs(refs); free(dest); return (refs ? 0 : -1); } diff --git a/tree-diff.c b/tree-diff.c index e7b378c..290a1da 100644 --- a/tree-diff.c +++ b/tree-diff.c @@ -64,7 +64,7 @@ static int emit_diff_first_parent_only(struct diff_options *opt, struct combine_ { struct combine_diff_parent *p0 = &p->parent[0]; if (p->mode && p0->mode) { - opt->change(opt, p0->mode, p->mode, p0->sha1, p->sha1, + opt->change(opt, p0->mode, p->mode, p0->oid.hash, p->oid.hash, 1, 1, p->path, 0, 0); } else { @@ -74,11 +74,11 @@ static int emit_diff_first_parent_only(struct diff_options *opt, struct combine_ if (p->mode) { addremove = '+'; - sha1 = p->sha1; + sha1 = p->oid.hash; mode = p->mode; } else { addremove = '-'; - sha1 = p0->sha1; + sha1 = p0->oid.hash; mode = p0->mode; } @@ -151,7 +151,7 @@ static struct combine_diff_path *path_appendnew(struct combine_diff_path *last, memcpy(p->path + base->len, path, pathlen); p->path[len] = 0; p->mode = mode; - hashcpy(p->sha1, sha1 ? sha1 : null_sha1); + hashcpy(p->oid.hash, sha1 ? sha1 : null_sha1); return p; } @@ -238,7 +238,7 @@ static struct combine_diff_path *emit_path(struct combine_diff_path *p, } p->parent[i].mode = mode_i; - hashcpy(p->parent[i].sha1, sha1_i ? sha1_i : null_sha1); + hashcpy(p->parent[i].oid.hash, sha1_i ? sha1_i : null_sha1); } keep = 1; diff --git a/upload-pack.c b/upload-pack.c index b531a32..745fda8 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -74,7 +74,7 @@ static int write_one_shallow(const struct commit_graft *graft, void *cb_data) { FILE *fp = cb_data; if (graft->nr_parent == -1) - fprintf(fp, "--shallow %s\n", sha1_to_hex(graft->sha1)); + fprintf(fp, "--shallow %s\n", oid_to_hex(&graft->oid)); return 0; } @@ -681,7 +681,7 @@ static void receive_needs(void) } /* return non-zero if the ref is hidden, otherwise 0 */ -static int mark_our_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data) +static int mark_our_ref(const char *refname, const unsigned char *sha1) { struct object *o = lookup_unknown_object(sha1); @@ -689,12 +689,16 @@ static int mark_our_ref(const char *refname, const unsigned char *sha1, int flag o->flags |= HIDDEN_REF; return 1; } - if (!o) - die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1)); o->flags |= OUR_REF; return 0; } +static int check_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data) +{ + mark_our_ref(refname, sha1); + return 0; +} + static void format_symref_info(struct strbuf *buf, struct string_list *symref) { struct string_list_item *item; @@ -713,7 +717,7 @@ static int send_ref(const char *refname, const unsigned char *sha1, int flag, vo const char *refname_nons = strip_namespace(refname); unsigned char peeled[20]; - if (mark_our_ref(refname, sha1, flag, NULL)) + if (mark_our_ref(refname, sha1)) return 0; if (capabilities) { @@ -767,8 +771,8 @@ static void upload_pack(void) advertise_shallow_grafts(1); packet_flush(1); } else { - head_ref_namespaced(mark_our_ref, NULL); - for_each_namespaced_ref(mark_our_ref, NULL); + head_ref_namespaced(check_ref, NULL); + for_each_namespaced_ref(check_ref, NULL); } string_list_clear(&symref, 1); if (advertise_refs) @@ -633,3 +633,14 @@ int is_hfs_dotgit(const char *path) return 1; } + +const char utf8_bom[] = "\357\273\277"; + +int skip_utf8_bom(char **text, size_t len) +{ + if (len < strlen(utf8_bom) || + memcmp(*text, utf8_bom, strlen(utf8_bom))) + return 0; + *text += strlen(utf8_bom); + return 1; +} @@ -13,6 +13,9 @@ int same_encoding(const char *, const char *); __attribute__((format (printf, 2, 3))) int utf8_fprintf(FILE *, const char *, ...); +extern const char utf8_bom[]; +extern int skip_utf8_bom(char **, size_t); + void strbuf_add_wrapped_text(struct strbuf *buf, const char *text, int indent, int indent2, int width); void strbuf_add_wrapped_bytes(struct strbuf *buf, const char *data, int len, diff --git a/versioncmp.c b/versioncmp.c index 7511e08..80bfd10 100644 --- a/versioncmp.c +++ b/versioncmp.c @@ -1,4 +1,5 @@ #include "cache.h" +#include "string-list.h" /* * versioncmp(): copied from string/strverscmp.c in glibc commit @@ -20,6 +21,48 @@ #define CMP 2 #define LEN 3 +static const struct string_list *prereleases; +static int initialized; + +/* + * p1 and p2 point to the first different character in two strings. If + * either p1 or p2 starts with a prerelease suffix, it will be forced + * to be on top. + * + * If both p1 and p2 start with (different) suffix, the order is + * determined by config file. + * + * Note that we don't have to deal with the situation when both p1 and + * p2 start with the same suffix because the common part is already + * consumed by the caller. + * + * Return non-zero if *diff contains the return value for versioncmp() + */ +static int swap_prereleases(const void *p1_, + const void *p2_, + int *diff) +{ + const char *p1 = p1_; + const char *p2 = p2_; + int i, i1 = -1, i2 = -1; + + for (i = 0; i < prereleases->nr; i++) { + const char *suffix = prereleases->items[i].string; + if (i1 == -1 && starts_with(p1, suffix)) + i1 = i; + if (i2 == -1 && starts_with(p2, suffix)) + i2 = i; + } + if (i1 == -1 && i2 == -1) + return 0; + if (i1 >= 0 && i2 >= 0) + *diff = i1 - i2; + else if (i1 >= 0) + *diff = -1; + else /* if (i2 >= 0) */ + *diff = 1; + return 1; +} /* * Compare S1 and S2 as strings holding indices/version numbers, @@ -74,6 +117,13 @@ int versioncmp(const char *s1, const char *s2) state += (c1 == '0') + (isdigit (c1) != 0); } + if (!initialized) { + initialized = 1; + prereleases = git_config_get_value_multi("versionsort.prereleasesuffix"); + } + if (prereleases && swap_prereleases(p1 - 1, p2 - 1, &diff)) + return diff; + state = result_type[state * 3 + (((c2 == '0') + (isdigit (c2) != 0)))]; switch (state) { @@ -564,3 +564,34 @@ char *xgetcwd(void) die_errno(_("unable to get current working directory")); return strbuf_detach(&sb, NULL); } + +int write_file(const char *path, int fatal, const char *fmt, ...) +{ + struct strbuf sb = STRBUF_INIT; + va_list params; + int fd = open(path, O_RDWR | O_CREAT | O_TRUNC, 0666); + if (fd < 0) { + if (fatal) + die_errno(_("could not open %s for writing"), path); + return -1; + } + va_start(params, fmt); + strbuf_vaddf(&sb, fmt, params); + va_end(params); + if (write_in_full(fd, sb.buf, sb.len) != sb.len) { + int err = errno; + close(fd); + strbuf_release(&sb); + errno = err; + if (fatal) + die_errno(_("could not write to %s"), path); + return -1; + } + strbuf_release(&sb); + if (close(fd)) { + if (fatal) + die_errno(_("could not close %s"), path); + return -1; + } + return 0; +} diff --git a/wt-status.c b/wt-status.c index fc1b82e..33452f1 100644 --- a/wt-status.c +++ b/wt-status.c @@ -731,7 +731,6 @@ static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitt struct strbuf cmd_stdout = STRBUF_INIT; struct strbuf summary = STRBUF_INIT; char *summary_content; - size_t len; argv_array_pushf(&sm_summary.env_array, "GIT_INDEX_FILE=%s", s->index_file); @@ -747,15 +746,11 @@ static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitt sm_summary.git_cmd = 1; sm_summary.no_stdin = 1; - fflush(s->fp); - sm_summary.out = -1; - run_command(&sm_summary); - - len = strbuf_read(&cmd_stdout, sm_summary.out, 1024); + capture_command(&sm_summary, &cmd_stdout, 1024); /* prepend header, only if there's an actual output */ - if (len) { + if (cmd_stdout.len) { if (uncommitted) strbuf_addstr(&summary, _("Submodules changed but not updated:")); else @@ -766,6 +761,7 @@ static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitt strbuf_release(&cmd_stdout); if (s->display_comment_prefix) { + size_t len; summary_content = strbuf_detach(&summary, &len); strbuf_add_commented_lines(&summary, summary_content, len); free(summary_content); @@ -851,6 +847,8 @@ static void wt_status_print_verbose(struct wt_status *s) { struct rev_info rev; struct setup_revision_opt opt; + int dirty_submodules; + const char *c = color(WT_STATUS_HEADER, s); init_revisions(&rev, NULL); DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV); @@ -875,7 +873,25 @@ static void wt_status_print_verbose(struct wt_status *s) rev.diffopt.use_color = 0; wt_status_add_cut_line(s->fp); } + if (s->verbose > 1 && s->commitable) { + /* print_updated() printed a header, so do we */ + if (s->fp != stdout) + wt_status_print_trailer(s); + status_printf_ln(s, c, _("Changes to be committed:")); + rev.diffopt.a_prefix = "c/"; + rev.diffopt.b_prefix = "i/"; + } /* else use prefix as per user config */ run_diff_index(&rev, 1); + if (s->verbose > 1 && + wt_status_check_worktree_changes(s, &dirty_submodules)) { + status_printf_ln(s, c, + "--------------------------------------------------"); + status_printf_ln(s, c, _("Changes not staged for commit:")); + setup_work_tree(); + rev.diffopt.a_prefix = "i/"; + rev.diffopt.b_prefix = "w/"; + run_diff_files(&rev, 0); + } } static void wt_status_print_tracking(struct wt_status *s) @@ -1224,6 +1240,8 @@ static void wt_status_get_detached_from(struct wt_status_state *state) state->detached_from = xstrdup(find_unique_abbrev(cb.nsha1, DEFAULT_ABBREV)); hashcpy(state->detached_sha1, cb.nsha1); + state->detached_at = !get_sha1("HEAD", sha1) && + !hashcmp(sha1, state->detached_sha1); free(ref); strbuf_release(&cb.buf); @@ -1312,10 +1330,8 @@ void wt_status_print(struct wt_status *s) on_what = _("rebase in progress; onto "); branch_name = state.onto; } else if (state.detached_from) { - unsigned char sha1[20]; branch_name = state.detached_from; - if (!get_sha1("HEAD", sha1) && - !hashcmp(sha1, state.detached_sha1)) + if (state.detached_at) on_what = _("HEAD detached at "); else on_what = _("HEAD detached from "); @@ -1536,6 +1552,7 @@ static void wt_shortstatus_print_tracking(struct wt_status *s) base = shorten_unambiguous_ref(base, 0); color_fprintf(s->fp, header_color, "..."); color_fprintf(s->fp, branch_color_remote, "%s", base); + free((char *)base); if (!upstream_is_gone && !num_ours && !num_theirs) { fputc(s->null_termination ? '\0' : '\n', s->fp); diff --git a/wt-status.h b/wt-status.h index 283a9fe..e0a99f7 100644 --- a/wt-status.h +++ b/wt-status.h @@ -84,6 +84,7 @@ struct wt_status_state { int cherry_pick_in_progress; int bisect_in_progress; int revert_in_progress; + int detached_at; char *branch; char *onto; char *detached_from; @@ -159,6 +159,7 @@ void git_deflate_init(git_zstream *strm, int level) { int status; + memset(strm, 0, sizeof(*strm)); zlib_pre_call(strm); status = deflateInit(&strm->z, level); zlib_post_call(strm); @@ -172,6 +173,7 @@ static void do_git_deflate_init(git_zstream *strm, int level, int windowBits) { int status; + memset(strm, 0, sizeof(*strm)); zlib_pre_call(strm); status = deflateInit2(&strm->z, level, Z_DEFLATED, windowBits, |